bnxt_en: Initialize context memory to the value specified by firmware.

Some chips that need host context memory as a backing store requires
the memory to be initialized to a non-zero value.  Query the
value from firmware and initialize the context memory accordingly.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 6a12ab5..0e384c5 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -2688,6 +2688,9 @@ static int bnxt_alloc_ring(struct bnxt *bp, struct bnxt_ring_mem_info *rmem)
                if (!rmem->pg_arr[i])
                        return -ENOMEM;
 
+               if (rmem->init_val)
+                       memset(rmem->pg_arr[i], rmem->init_val,
+                              rmem->page_size);
                if (rmem->nr_pages > 1 || rmem->depth > 0) {
                        if (i == rmem->nr_pages - 2 &&
                            (rmem->flags & BNXT_RMEM_RING_PTE_FLAG))
@@ -6487,6 +6490,7 @@ static int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp)
                        le16_to_cpu(resp->mrav_num_entries_units);
                ctx->tim_entry_size = le16_to_cpu(resp->tim_entry_size);
                ctx->tim_max_entries = le32_to_cpu(resp->tim_max_entries);
+               ctx->ctx_kind_initializer = resp->ctx_kind_initializer;
        } else {
                rc = 0;
        }
@@ -6641,7 +6645,7 @@ static int bnxt_alloc_ctx_mem_blk(struct bnxt *bp,
 
 static int bnxt_alloc_ctx_pg_tbls(struct bnxt *bp,
                                  struct bnxt_ctx_pg_info *ctx_pg, u32 mem_size,
-                                 u8 depth)
+                                 u8 depth, bool use_init_val)
 {
        struct bnxt_ring_mem_info *rmem = &ctx_pg->ring_mem;
        int rc;
@@ -6679,6 +6683,8 @@ static int bnxt_alloc_ctx_pg_tbls(struct bnxt *bp,
                        rmem->pg_tbl_map = ctx_pg->ctx_dma_arr[i];
                        rmem->depth = 1;
                        rmem->nr_pages = MAX_CTX_PAGES;
+                       if (use_init_val)
+                               rmem->init_val = bp->ctx->ctx_kind_initializer;
                        if (i == (nr_tbls - 1)) {
                                int rem = ctx_pg->nr_pages % MAX_CTX_PAGES;
 
@@ -6693,6 +6699,8 @@ static int bnxt_alloc_ctx_pg_tbls(struct bnxt *bp,
                rmem->nr_pages = DIV_ROUND_UP(mem_size, BNXT_PAGE_SIZE);
                if (rmem->nr_pages > 1 || depth)
                        rmem->depth = 1;
+               if (use_init_val)
+                       rmem->init_val = bp->ctx->ctx_kind_initializer;
                rc = bnxt_alloc_ctx_mem_blk(bp, ctx_pg);
        }
        return rc;
@@ -6783,21 +6791,21 @@ static int bnxt_alloc_ctx_mem(struct bnxt *bp)
        ctx_pg->entries = ctx->qp_min_qp1_entries + ctx->qp_max_l2_entries +
                          extra_qps;
        mem_size = ctx->qp_entry_size * ctx_pg->entries;
-       rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, pg_lvl);
+       rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, pg_lvl, true);
        if (rc)
                return rc;
 
        ctx_pg = &ctx->srq_mem;
        ctx_pg->entries = ctx->srq_max_l2_entries + extra_srqs;
        mem_size = ctx->srq_entry_size * ctx_pg->entries;
-       rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, pg_lvl);
+       rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, pg_lvl, true);
        if (rc)
                return rc;
 
        ctx_pg = &ctx->cq_mem;
        ctx_pg->entries = ctx->cq_max_l2_entries + extra_qps * 2;
        mem_size = ctx->cq_entry_size * ctx_pg->entries;
-       rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, pg_lvl);
+       rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, pg_lvl, true);
        if (rc)
                return rc;
 
@@ -6805,14 +6813,14 @@ static int bnxt_alloc_ctx_mem(struct bnxt *bp)
        ctx_pg->entries = ctx->vnic_max_vnic_entries +
                          ctx->vnic_max_ring_table_entries;
        mem_size = ctx->vnic_entry_size * ctx_pg->entries;
-       rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, 1);
+       rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, 1, true);
        if (rc)
                return rc;
 
        ctx_pg = &ctx->stat_mem;
        ctx_pg->entries = ctx->stat_max_entries;
        mem_size = ctx->stat_entry_size * ctx_pg->entries;
-       rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, 1);
+       rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, 1, true);
        if (rc)
                return rc;
 
@@ -6828,7 +6836,7 @@ static int bnxt_alloc_ctx_mem(struct bnxt *bp)
        num_ah = 1024 * 128;
        ctx_pg->entries = num_mr + num_ah;
        mem_size = ctx->mrav_entry_size * ctx_pg->entries;
-       rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, 2);
+       rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, 2, true);
        if (rc)
                return rc;
        ena = FUNC_BACKING_STORE_CFG_REQ_ENABLES_MRAV;
@@ -6840,7 +6848,7 @@ static int bnxt_alloc_ctx_mem(struct bnxt *bp)
        ctx_pg = &ctx->tim_mem;
        ctx_pg->entries = ctx->qp_mem.entries;
        mem_size = ctx->tim_entry_size * ctx_pg->entries;
-       rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, 1);
+       rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, 1, false);
        if (rc)
                return rc;
        ena |= FUNC_BACKING_STORE_CFG_REQ_ENABLES_TIM;
@@ -6854,7 +6862,7 @@ skip_rdma:
                ctx_pg = ctx->tqm_mem[i];
                ctx_pg->entries = entries;
                mem_size = ctx->tqm_entry_size * entries;
-               rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, 1);
+               rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, 1, false);
                if (rc)
                        return rc;
                ena |= FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_SP << i;

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 35c483b..dbdd097 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -721,6 +721,7 @@ struct bnxt_ring_mem_info {
 #define BNXT_RMEM_USE_FULL_PAGE_FLAG   4
 
        u16                     depth;
+       u8                      init_val;
 
        void                    **pg_arr;
        dma_addr_t              *dma_arr;
@@ -1352,6 +1353,7 @@ struct bnxt_ctx_mem_info {
        u32     tim_max_entries;
        u16     mrav_num_entries_units;
        u8      tqm_entries_multiple;
+       u8      ctx_kind_initializer;
 
        u32     flags;
        #define BNXT_CTX_FLAG_INITED    0x01