bnxt_en: Improve bnxt_backing_store_cfg_v2()

Improve the logic that determines the last_type in this function.
The different context memory types are configured in a loop.  The
last_type signals the last context memory type to be configured
which requires the ALL_DONE flag to be set for the FW.

The existing logic makes some assumptions that TIM is the last_type
when RDMA is enabled or FTQM is the last_type when only L2 is
enabled.  Improve it to just search for the last_type so that we
don't need to make these assumptions that won't necessary be true
for future devices.

Reviewed-by: Shruti Parab <shruti.parab@broadcom.com>
Reviewed-by: Hongguang Gao <hongguang.gao@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Link: https://patch.msgid.link/20250917040839.1924698-5-michael.chan@broadcom.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index a74b50130cc031b5caee225c6fec85619bdc4542..b4732276f0cae11271b6ea32232b68c6fca06804 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -9150,7 +9150,7 @@ static int bnxt_hwrm_func_backing_store_cfg_v2(struct bnxt *bp,
        return rc;
 }
 
-static int bnxt_backing_store_cfg_v2(struct bnxt *bp, u32 ena)
+static int bnxt_backing_store_cfg_v2(struct bnxt *bp)
 {
        struct bnxt_ctx_mem_info *ctx = bp->ctx;
        struct bnxt_ctx_mem_type *ctxm;
@@ -9176,12 +9176,13 @@ static int bnxt_backing_store_cfg_v2(struct bnxt *bp, u32 ena)
        }
 
        if (last_type == BNXT_CTX_INV) {
-               if (!ena)
+               for (type = 0; type < BNXT_CTX_MAX; type++) {
+                       ctxm = &ctx->ctx_arr[type];
+                       if (ctxm->mem_valid)
+                               last_type = type;
+               }
+               if (last_type == BNXT_CTX_INV)
                        return 0;
-               else if (ena & FUNC_BACKING_STORE_CFG_REQ_ENABLES_TIM)
-                       last_type = BNXT_CTX_MAX - 1;
-               else
-                       last_type = BNXT_CTX_L2_MAX - 1;
        }
        ctx->ctx_arr[last_type].last = 1;
 
@@ -9411,7 +9412,7 @@ skip_rdma:
        ena |= FUNC_BACKING_STORE_CFG_REQ_DFLT_ENABLES;
 
        if (bp->fw_cap & BNXT_FW_CAP_BACKING_STORE_V2)
-               rc = bnxt_backing_store_cfg_v2(bp, ena);
+               rc = bnxt_backing_store_cfg_v2(bp);
        else
                rc = bnxt_hwrm_func_backing_store_cfg(bp, ena);
        if (rc) {