bnxt_en: Do not free FW log context memory

If FW supports appending new FW logs to an offset in the context
memory after FW reset, then do not free this type of context memory
during reset.  The driver will provide the initial offset to the FW
when configuring this type of context memory.  This way, we don't lose
the older FW logs after reset.

Signed-off-by: Hongguang Gao <hongguang.gao@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Link: https://patch.msgid.link/20241115151438.550106-8-michael.chan@broadcom.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 07510df4497bd0e9dd396e22ab70c770aaa32dda..b0f3b431708c543deb0f5b5084962fffe7a42d48 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -8300,6 +8300,9 @@ static int bnxt_alloc_all_ctx_pg_info(struct bnxt *bp, int ctx_max)
        return 0;
 }
 
+static void bnxt_free_one_ctx_mem(struct bnxt *bp,
+                                 struct bnxt_ctx_mem_type *ctxm, bool force);
+
 #define BNXT_CTX_INIT_VALID(flags)     \
        (!!((flags) &                   \
            FUNC_BACKING_STORE_QCAPS_V2_RESP_FLAGS_ENABLE_CTX_KIND_INIT))
@@ -8328,6 +8331,8 @@ static int bnxt_hwrm_func_backing_store_qcaps_v2(struct bnxt *bp)
        for (type = 0; type < BNXT_CTX_V2_MAX; ) {
                struct bnxt_ctx_mem_type *ctxm = &ctx->ctx_arr[type];
                u8 init_val, init_off, i;
+               u32 max_entries;
+               u16 entry_size;
                __le32 *p;
                u32 flags;
 
@@ -8337,15 +8342,26 @@ static int bnxt_hwrm_func_backing_store_qcaps_v2(struct bnxt *bp)
                        goto ctx_done;
                flags = le32_to_cpu(resp->flags);
                type = le16_to_cpu(resp->next_valid_type);
-               if (!(flags & FUNC_BACKING_STORE_QCAPS_V2_RESP_FLAGS_TYPE_VALID))
+               if (!(flags & BNXT_CTX_MEM_TYPE_VALID)) {
+                       bnxt_free_one_ctx_mem(bp, ctxm, true);
                        continue;
-
+               }
+               entry_size = le16_to_cpu(resp->entry_size);
+               max_entries = le32_to_cpu(resp->max_num_entries);
+               if (ctxm->mem_valid) {
+                       if (!(flags & BNXT_CTX_MEM_PERSIST) ||
+                           ctxm->entry_size != entry_size ||
+                           ctxm->max_entries != max_entries)
+                               bnxt_free_one_ctx_mem(bp, ctxm, true);
+                       else
+                               continue;
+               }
                ctxm->type = le16_to_cpu(resp->type);
-               ctxm->entry_size = le16_to_cpu(resp->entry_size);
+               ctxm->entry_size = entry_size;
                ctxm->flags = flags;
                ctxm->instance_bmap = le32_to_cpu(resp->instance_bit_map);
                ctxm->entry_multiple = resp->entry_multiple;
-               ctxm->max_entries = le32_to_cpu(resp->max_num_entries);
+               ctxm->max_entries = max_entries;
                ctxm->min_entries = le32_to_cpu(resp->min_num_entries);
                init_val = resp->ctx_init_value;
                init_off = resp->ctx_init_offset;
@@ -8790,6 +8806,16 @@ static int bnxt_hwrm_func_backing_store_cfg_v2(struct bnxt *bp,
        hwrm_req_hold(bp, req);
        req->type = cpu_to_le16(ctxm->type);
        req->entry_size = cpu_to_le16(ctxm->entry_size);
+       if ((ctxm->flags & BNXT_CTX_MEM_PERSIST) &&
+           bnxt_bs_trace_avail(bp, ctxm->type)) {
+               struct bnxt_bs_trace_info *bs_trace;
+               u32 enables;
+
+               enables = FUNC_BACKING_STORE_CFG_V2_REQ_ENABLES_NEXT_BS_OFFSET;
+               req->enables = cpu_to_le32(enables);
+               bs_trace = &bp->bs_trace[bnxt_bstore_to_trace[ctxm->type]];
+               req->next_bs_offset = cpu_to_le32(bs_trace->last_offset);
+       }
        req->subtype_valid_cnt = ctxm->split_entry_cnt;
        for (i = 0, p = &req->split_entry_0; i < ctxm->split_entry_cnt; i++)
                p[i] = cpu_to_le32(ctxm->split[i]);
@@ -8884,6 +8910,7 @@ static void bnxt_free_one_ctx_mem(struct bnxt *bp,
                ctxm->pg_info = NULL;
                ctxm->mem_valid = 0;
        }
+       memset(ctxm, 0, sizeof(*ctxm));
 }
 
 void bnxt_free_ctx_mem(struct bnxt *bp, bool force)
@@ -11862,7 +11889,7 @@ static int bnxt_hwrm_if_change(struct bnxt *bp, bool up)
                        set_bit(BNXT_STATE_FW_RESET_DET, &bp->state);
                        if (!test_bit(BNXT_STATE_IN_FW_RESET, &bp->state))
                                bnxt_ulp_irq_stop(bp);
-                       bnxt_free_ctx_mem(bp, true);
+                       bnxt_free_ctx_mem(bp, false);
                        bnxt_dcb_free(bp);
                        rc = bnxt_fw_init_one(bp);
                        if (rc) {
@@ -13575,7 +13602,7 @@ static void bnxt_fw_reset_close(struct bnxt *bp)
        bnxt_hwrm_func_drv_unrgtr(bp);
        if (pci_is_enabled(bp->pdev))
                pci_disable_device(bp->pdev);
-       bnxt_free_ctx_mem(bp, true);
+       bnxt_free_ctx_mem(bp, false);
 }
 
 static bool is_bnxt_fw_ok(struct bnxt *bp)
@@ -16128,7 +16155,7 @@ static int bnxt_suspend(struct device *device)
        }
        bnxt_hwrm_func_drv_unrgtr(bp);
        pci_disable_device(bp->pdev);
-       bnxt_free_ctx_mem(bp, true);
+       bnxt_free_ctx_mem(bp, false);
        rtnl_unlock();
        return rc;
 }
@@ -16240,7 +16267,7 @@ static pci_ers_result_t bnxt_io_error_detected(struct pci_dev *pdev,
 
        if (pci_is_enabled(pdev))
                pci_disable_device(pdev);
-       bnxt_free_ctx_mem(bp, true);
+       bnxt_free_ctx_mem(bp, false);
        rtnl_unlock();
 
        /* Request a slot slot reset. */

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
index 901fd36757ed67a079677261b0b27033f3f57f3d..ef8288fd68f4cb454b6800f4b4028805b4fc3cf5 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -463,7 +463,7 @@ static int bnxt_dl_reload_down(struct devlink *dl, bool netns_change,
                        break;
                }
                bnxt_cancel_reservations(bp, false);
-               bnxt_free_ctx_mem(bp, true);
+               bnxt_free_ctx_mem(bp, false);
                break;
        }
        case DEVLINK_RELOAD_ACTION_FW_ACTIVATE: {