From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> These are couple of bnxt PMD bug fixes. Please apply. Kalesh AP (2): net/bnxt: fix segmentation fault handling async events on port stop net/bnxt: fix race when port is stopped and async events are received drivers/net/bnxt/bnxt_cpr.c | 6 ++++++ drivers/net/bnxt/bnxt_hwrm.c | 12 +++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) -- 2.10.1
On Wed, Feb 19, 2020 at 7:55 PM Kalesh A P < kalesh-anakkur.purayil@broadcom.com> wrote: > From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> > > These are couple of bnxt PMD bug fixes. Please apply. > Patches applied to dpdk-next-net-brcm. > > Kalesh AP (2): > net/bnxt: fix segmentation fault handling async events on port stop > net/bnxt: fix race when port is stopped and async events are received > > drivers/net/bnxt/bnxt_cpr.c | 6 ++++++ > drivers/net/bnxt/bnxt_hwrm.c | 12 +++++++++--- > 2 files changed, 15 insertions(+), 3 deletions(-) > > -- > 2.10.1 > >
From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> Please apply. Kalesh AP (1): net/bnxt: fix to reset VNIC rxq count on VNIC free Rahul Gupta (1): net/bnxt: fix for memleak during queue restart drivers/net/bnxt/bnxt_ethdev.c | 2 ++ drivers/net/bnxt/bnxt_hwrm.c | 12 ------------ drivers/net/bnxt/bnxt_rxr.c | 44 ++++++++++++++++++++++++------------------ 3 files changed, 27 insertions(+), 31 deletions(-) -- 2.10.1
On Thu, Apr 23, 2020 at 7:46 AM Kalesh A P < kalesh-anakkur.purayil@broadcom.com> wrote: > From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> > > Please apply. > Applied to dpdk-next-net-brcm. Thanks > > Kalesh AP (1): > net/bnxt: fix to reset VNIC rxq count on VNIC free > > Rahul Gupta (1): > net/bnxt: fix for memleak during queue restart > > drivers/net/bnxt/bnxt_ethdev.c | 2 ++ > drivers/net/bnxt/bnxt_hwrm.c | 12 ------------ > drivers/net/bnxt/bnxt_rxr.c | 44 > ++++++++++++++++++++++++------------------ > 3 files changed, 27 insertions(+), 31 deletions(-) > > -- > 2.10.1 > >
From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> Please apply. Kalesh AP (2): net/bnxt: fix to alloc FW specified TQM ring context memory net/bnxt: fix TQM ring context memory sizing formulas drivers/net/bnxt/bnxt.h | 2 +- drivers/net/bnxt/bnxt_ethdev.c | 21 +++++++++++++-------- drivers/net/bnxt/bnxt_hwrm.c | 31 +++++++++++++++++++------------ 3 files changed, 33 insertions(+), 21 deletions(-) -- 2.10.1
From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> Newer firmware advertises the number of TQM rings to allocate context memory for. Use the firmware specified value and fall back to the old value derived from "bp->max_q" if it is not available. Fixes: f8168ca0e690 ("net/bnxt: support thor controller") Cc: stable@dpdk.org Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com> Reviewed-by: Ajit Kumar Khaparde <ajit.khaparde@broadcom.com> --- drivers/net/bnxt/bnxt.h | 2 +- drivers/net/bnxt/bnxt_ethdev.c | 5 ++--- drivers/net/bnxt/bnxt_hwrm.c | 31 +++++++++++++++++++------------ 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 12fed1e..bf5b39c 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -362,7 +362,6 @@ struct bnxt_coal { #define BNXT_MAX_TC 8 #define BNXT_MAX_QUEUE 8 #define BNXT_MAX_TC_Q (BNXT_MAX_TC + 1) -#define BNXT_MAX_Q (bp->max_q + 1) #define BNXT_PAGE_SHFT 12 #define BNXT_PAGE_SIZE (1 << BNXT_PAGE_SHFT) #define MAX_CTX_PAGES (BNXT_PAGE_SIZE / 8) @@ -421,6 +420,7 @@ struct bnxt_ctx_mem_info { uint16_t tim_entry_size; uint32_t tim_max_entries; uint8_t tqm_entries_multiple; + uint8_t tqm_fp_rings_count; uint32_t flags; #define BNXT_CTX_FLAG_INITED 0x01 diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index c2bee54..d877ff6 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -4644,7 +4644,7 @@ static void bnxt_free_ctx_mem(struct bnxt *bp) rte_memzone_free(bp->ctx->vnic_mem.ring_mem.pg_tbl_mz); rte_memzone_free(bp->ctx->stat_mem.ring_mem.pg_tbl_mz); - for (i = 0; i < BNXT_MAX_Q; i++) { + for (i = 0; i < bp->ctx->tqm_fp_rings_count + 1; i++) { if (bp->ctx->tqm_mem[i]) rte_memzone_free(bp->ctx->tqm_mem[i]->ring_mem.mz); } @@ -4725,9 +4725,8 @@ int bnxt_alloc_ctx_mem(struct bnxt *bp) entries = bnxt_roundup(entries, ctx->tqm_entries_multiple); entries = clamp_t(uint32_t, entries, ctx->tqm_min_entries_per_ring, ctx->tqm_max_entries_per_ring); - for (i = 0, ena = 0; i < BNXT_MAX_Q; i++) { + for (i = 0, ena = 0; i < ctx->tqm_fp_rings_count + 1; i++) { ctx_pg = ctx->tqm_mem[i]; - /* use min tqm entries for now. */ ctx_pg->entries = entries; mem_size = ctx->tqm_entry_size * ctx_pg->entries; rc = bnxt_alloc_ctx_mem_blk(bp, ctx_pg, mem_size, "tqm_mem", i); diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index b0a7835..ef65107 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -4694,7 +4694,7 @@ int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp) struct bnxt_ctx_pg_info *ctx_pg; struct bnxt_ctx_mem_info *ctx; int total_alloc_len; - int rc, i; + int rc, i, tqm_rings; if (!BNXT_CHIP_THOR(bp) || bp->hwrm_spec_code < HWRM_VERSION_1_9_2 || @@ -4714,17 +4714,6 @@ int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp) goto ctx_err; } - ctx_pg = rte_malloc("bnxt_ctx_pg_mem", - sizeof(*ctx_pg) * BNXT_MAX_Q, - RTE_CACHE_LINE_SIZE); - if (!ctx_pg) { - rc = -ENOMEM; - goto ctx_err; - } - for (i = 0; i < BNXT_MAX_Q; i++, ctx_pg++) - ctx->tqm_mem[i] = ctx_pg; - - bp->ctx = ctx; ctx->qp_max_entries = rte_le_to_cpu_32(resp->qp_max_entries); ctx->qp_min_qp1_entries = rte_le_to_cpu_16(resp->qp_min_qp1_entries); @@ -4760,6 +4749,24 @@ int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp) ctx->mrav_entry_size = rte_le_to_cpu_16(resp->mrav_entry_size); ctx->tim_entry_size = rte_le_to_cpu_16(resp->tim_entry_size); ctx->tim_max_entries = rte_le_to_cpu_32(resp->tim_max_entries); + ctx->tqm_fp_rings_count = resp->tqm_fp_rings_count; + + if (!ctx->tqm_fp_rings_count) + ctx->tqm_fp_rings_count = bp->max_q; + + tqm_rings = ctx->tqm_fp_rings_count + 1; + + ctx_pg = rte_malloc("bnxt_ctx_pg_mem", + sizeof(*ctx_pg) * tqm_rings, + RTE_CACHE_LINE_SIZE); + if (!ctx_pg) { + rc = -ENOMEM; + goto ctx_err; + } + for (i = 0; i < tqm_rings; i++, ctx_pg++) + ctx->tqm_mem[i] = ctx_pg; + + bp->ctx = ctx; ctx_err: HWRM_UNLOCK(); return rc; -- 2.10.1
From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> The current formulas to calculate the TQM slow path and fast path ring context memory sizes are not quite correct. TQM slow path entry is array index 0 of ctx->tqm_mem[]. The other array entries are for fast path. Fix these sizes according to firmware spec. for 57500 and newer chips. Fixes: cc5e26b8ef98 ("net/bnxt: increase TQM entry allocation") Cc: stable@dpdk.org Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com> Reviewed-by: Ajit Kumar Khaparde <ajit.khaparde@broadcom.com> --- drivers/net/bnxt/bnxt_ethdev.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index d877ff6..dab291c 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -4672,6 +4672,7 @@ int bnxt_alloc_ctx_mem(struct bnxt *bp) struct bnxt_ctx_pg_info *ctx_pg; struct bnxt_ctx_mem_info *ctx; uint32_t mem_size, ena, entries; + uint32_t entries_sp, min; int i, rc; rc = bnxt_hwrm_func_backing_store_qcaps(bp); @@ -4719,15 +4720,20 @@ int bnxt_alloc_ctx_mem(struct bnxt *bp) if (rc) return rc; - entries = ctx->qp_max_l2_entries + - ctx->vnic_max_vnic_entries + - ctx->tqm_min_entries_per_ring; + min = ctx->tqm_min_entries_per_ring; + + entries_sp = ctx->qp_max_l2_entries + + ctx->vnic_max_vnic_entries + + 2 * ctx->qp_min_qp1_entries + min; + entries_sp = bnxt_roundup(entries_sp, ctx->tqm_entries_multiple); + + entries = ctx->qp_max_l2_entries + ctx->qp_min_qp1_entries; entries = bnxt_roundup(entries, ctx->tqm_entries_multiple); - entries = clamp_t(uint32_t, entries, ctx->tqm_min_entries_per_ring, + entries = clamp_t(uint32_t, entries, min, ctx->tqm_max_entries_per_ring); for (i = 0, ena = 0; i < ctx->tqm_fp_rings_count + 1; i++) { ctx_pg = ctx->tqm_mem[i]; - ctx_pg->entries = entries; + ctx_pg->entries = i ? entries : entries_sp; mem_size = ctx->tqm_entry_size * ctx_pg->entries; rc = bnxt_alloc_ctx_mem_blk(bp, ctx_pg, mem_size, "tqm_mem", i); if (rc) -- 2.10.1
On Tue, May 5, 2020 at 11:11 PM Kalesh A P < kalesh-anakkur.purayil@broadcom.com> wrote: > From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> > > Please apply. > > Kalesh AP (2): > net/bnxt: fix to alloc FW specified TQM ring context memory > net/bnxt: fix TQM ring context memory sizing formulas > Thanks Kalesh, Patches applied to dpdk-next-net-brcm. > > drivers/net/bnxt/bnxt.h | 2 +- > drivers/net/bnxt/bnxt_ethdev.c | 21 +++++++++++++-------- > drivers/net/bnxt/bnxt_hwrm.c | 31 +++++++++++++++++++------------ > 3 files changed, 33 insertions(+), 21 deletions(-) > > -- > 2.10.1 > >
[-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain; charset=y, Size: 576 bytes --] From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> These are two bug fixes observed during regression testing with DPDK 20.05-rc3. Please apply. Kalesh AP (1): net/bnxt: fix the check for validating link speed Rahul Gupta (1): net/bnxt: performance fix for Arm drivers/net/bnxt/bnxt.h | 1 + drivers/net/bnxt/bnxt_cpr.h | 6 +++--- drivers/net/bnxt/bnxt_ethdev.c | 2 +- drivers/net/bnxt/bnxt_hwrm.c | 14 +++++++++----- drivers/net/bnxt/bnxt_ring.h | 24 +++++++++++++----------- 5 files changed, 27 insertions(+), 20 deletions(-) -- 2.10.1
From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> This series contain couple of bug fixes in bnxt PMD. Kalesh AP (2): net/bnxt: fix HWRM and FW incompatibility handling net/bnxt: mute some failure logs drivers/net/bnxt/bnxt_hwrm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.10.1
[-- Attachment #1: Type: text/plain, Size: 472 bytes --] On Tue, Mar 9, 2021 at 11:28 PM Kalesh A P <kalesh-anakkur.purayil@broadcom.com> wrote: > > From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> > > This series contain couple of bug fixes in bnxt PMD. > > Kalesh AP (2): > net/bnxt: fix HWRM and FW incompatibility handling > net/bnxt: mute some failure logs Patchset applied to dpdk-next-net-brcm. > > drivers/net/bnxt/bnxt_hwrm.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > -- > 2.10.1 >