]> git.droids-corp.org - dpdk.git/commitdiff
common/cnxk: allocate link map array if HWS is available
authorShijith Thotton <sthotton@marvell.com>
Fri, 3 Jun 2022 05:10:45 +0000 (10:40 +0530)
committerJerin Jacob <jerinj@marvell.com>
Mon, 13 Jun 2022 07:17:34 +0000 (09:17 +0200)
Link map array is required only if work slots are available.

Signed-off-by: Shijith Thotton <sthotton@marvell.com>
drivers/common/cnxk/roc_sso.c

index 7c864748098c7f12fd194d0d011f932d0e0a2901..126a9cba999ce791a3f1545519cdc5d2a3f117dc 100644 (file)
@@ -784,29 +784,34 @@ roc_sso_dev_init(struct roc_sso *roc_sso)
        }
        rc = -ENOMEM;
 
-       sso->link_map =
-               plt_zmalloc(sizeof(struct plt_bitmap *) * roc_sso->max_hws, 0);
-       if (sso->link_map == NULL) {
-               plt_err("Failed to allocate memory for link_map array");
-               goto rsrc_fail;
-       }
+       if (roc_sso->max_hws) {
+               sso->link_map = plt_zmalloc(
+                       sizeof(struct plt_bitmap *) * roc_sso->max_hws, 0);
+               if (sso->link_map == NULL) {
+                       plt_err("Failed to allocate memory for link_map array");
+                       goto rsrc_fail;
+               }
 
-       link_map_sz = plt_bitmap_get_memory_footprint(roc_sso->max_hwgrp);
-       sso->link_map_mem = plt_zmalloc(link_map_sz * roc_sso->max_hws, 0);
-       if (sso->link_map_mem == NULL) {
-               plt_err("Failed to get link_map memory");
-               goto rsrc_fail;
-       }
+               link_map_sz =
+                       plt_bitmap_get_memory_footprint(roc_sso->max_hwgrp);
+               sso->link_map_mem =
+                       plt_zmalloc(link_map_sz * roc_sso->max_hws, 0);
+               if (sso->link_map_mem == NULL) {
+                       plt_err("Failed to get link_map memory");
+                       goto rsrc_fail;
+               }
 
-       link_mem = sso->link_map_mem;
-       for (i = 0; i < roc_sso->max_hws; i++) {
-               sso->link_map[i] = plt_bitmap_init(roc_sso->max_hwgrp, link_mem,
-                                                  link_map_sz);
-               if (sso->link_map[i] == NULL) {
-                       plt_err("Failed to allocate link map");
-                       goto link_mem_free;
+               link_mem = sso->link_map_mem;
+
+               for (i = 0; i < roc_sso->max_hws; i++) {
+                       sso->link_map[i] = plt_bitmap_init(
+                               roc_sso->max_hwgrp, link_mem, link_map_sz);
+                       if (sso->link_map[i] == NULL) {
+                               plt_err("Failed to allocate link map");
+                               goto link_mem_free;
+                       }
+                       link_mem = PLT_PTR_ADD(link_mem, link_map_sz);
                }
-               link_mem = PLT_PTR_ADD(link_mem, link_map_sz);
        }
        idev_sso_pffunc_set(sso->dev.pf_func);
        idev_sso_set(roc_sso);