diff mbox series

[2/2] net/bnxt: fix stat context allocation

Message ID 20211030035020.31813-2-kalesh-anakkur.purayil@broadcom.com (mailing list archive)
State Accepted, archived
Delegated to: Ajit Khaparde
Headers
Series [1/2] net/bnxt: fix freeing aggregation rings |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-broadcom-Functional success Functional Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-mellanox-Performance success Performance Testing PASS
ci/intel-Testing success Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-x86_64-unit-testing fail Testing issues
ci/iol-x86_64-compile-testing success Testing PASS
ci/github-robot: build success github build: passed
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS

Commit Message

Kalesh A P Oct. 30, 2021, 3:50 a.m. UTC 
  From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>

stat_ctx_alloc is called within the context of each rx/tx ring.
i.e from bnxt_alloc_hwrm_rx_ring and bnxt_alloc_hwrm_tx_ring().
So, there is no need to invoke bnxt_alloc_all_hwrm_stat_ctxs()
from bnxt_start_nic().

Fixes: 657c2a7f1dd4 ("net/bnxt: create aggregation rings when needed")

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
---
 drivers/net/bnxt/bnxt_ethdev.c |  6 ------
 drivers/net/bnxt/bnxt_hwrm.c   | 31 -------------------------------
 drivers/net/bnxt/bnxt_hwrm.h   |  1 -
 3 files changed, 38 deletions(-)

Comments

Ajit Khaparde Oct. 31, 2021, 4:05 p.m. UTC | #1 
On Fri, Oct 29, 2021 at 8:30 PM Kalesh A P
<kalesh-anakkur.purayil@broadcom.com> wrote:
>
> From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
>
> stat_ctx_alloc is called within the context of each rx/tx ring.
> i.e from bnxt_alloc_hwrm_rx_ring and bnxt_alloc_hwrm_tx_ring().
> So, there is no need to invoke bnxt_alloc_all_hwrm_stat_ctxs()
> from bnxt_start_nic().
>
> Fixes: 657c2a7f1dd4 ("net/bnxt: create aggregation rings when needed")
>
> Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
> Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
> Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
Patch applied to dpdk-next-net-brcm. Thanks

> ---
>  drivers/net/bnxt/bnxt_ethdev.c |  6 ------
>  drivers/net/bnxt/bnxt_hwrm.c   | 31 -------------------------------
>  drivers/net/bnxt/bnxt_hwrm.h   |  1 -
>  3 files changed, 38 deletions(-)
>
> diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
> index 91f114e..c8dad8a 100644
> --- a/drivers/net/bnxt/bnxt_ethdev.c
> +++ b/drivers/net/bnxt/bnxt_ethdev.c
> @@ -747,12 +747,6 @@ static int bnxt_start_nic(struct bnxt *bp)
>         if (BNXT_CHIP_P5(bp))
>                 bp->max_ring_grps = BNXT_MAX_RSS_CTXTS_P5;
>
> -       rc = bnxt_alloc_all_hwrm_stat_ctxs(bp);
> -       if (rc) {
> -               PMD_DRV_LOG(ERR, "HWRM stat ctx alloc failure rc: %x\n", rc);
> -               goto err_out;
> -       }
> -
>         rc = bnxt_alloc_hwrm_rings(bp);
>         if (rc) {
>                 PMD_DRV_LOG(ERR, "HWRM ring alloc failure rc: %x\n", rc);
> diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
> index 82e89b7..55dcb1d 100644
> --- a/drivers/net/bnxt/bnxt_hwrm.c
> +++ b/drivers/net/bnxt/bnxt_hwrm.c
> @@ -2648,37 +2648,6 @@ bnxt_free_all_hwrm_stat_ctxs(struct bnxt *bp)
>         return 0;
>  }
>
> -int bnxt_alloc_all_hwrm_stat_ctxs(struct bnxt *bp)
> -{
> -       struct bnxt_cp_ring_info *cpr;
> -       unsigned int i;
> -       int rc = 0;
> -
> -       for (i = 0; i < bp->rx_cp_nr_rings; i++) {
> -               struct bnxt_rx_queue *rxq = bp->rx_queues[i];
> -
> -               cpr = rxq->cp_ring;
> -               if (cpr->hw_stats_ctx_id == HWRM_NA_SIGNATURE) {
> -                       rc = bnxt_hwrm_stat_ctx_alloc(bp, cpr);
> -                       if (rc)
> -                               return rc;
> -               }
> -       }
> -
> -       for (i = 0; i < bp->tx_cp_nr_rings; i++) {
> -               struct bnxt_tx_queue *txq = bp->tx_queues[i];
> -
> -               cpr = txq->cp_ring;
> -               if (cpr->hw_stats_ctx_id == HWRM_NA_SIGNATURE) {
> -                       rc = bnxt_hwrm_stat_ctx_alloc(bp, cpr);
> -                       if (rc)
> -                               return rc;
> -               }
> -       }
> -
> -       return rc;
> -}
> -
>  static int
>  bnxt_free_all_hwrm_ring_grps(struct bnxt *bp)
>  {
> diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h
> index 6dc23b9..72d4864 100644
> --- a/drivers/net/bnxt/bnxt_hwrm.h
> +++ b/drivers/net/bnxt/bnxt_hwrm.h
> @@ -188,7 +188,6 @@ int bnxt_hwrm_vnic_plcmode_cfg(struct bnxt *bp,
>  int bnxt_hwrm_vnic_tpa_cfg(struct bnxt *bp,
>                            struct bnxt_vnic_info *vnic, bool enable);
>
> -int bnxt_alloc_all_hwrm_stat_ctxs(struct bnxt *bp);
>  int bnxt_clear_all_hwrm_stat_ctxs(struct bnxt *bp);
>  int bnxt_alloc_all_hwrm_ring_grps(struct bnxt *bp);
>  void bnxt_free_cp_ring(struct bnxt *bp, struct bnxt_cp_ring_info *cpr);
> --
> 2.10.1
>
diff mbox series

Patch

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 91f114e..c8dad8a 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -747,12 +747,6 @@  static int bnxt_start_nic(struct bnxt *bp)
 	if (BNXT_CHIP_P5(bp))
 		bp->max_ring_grps = BNXT_MAX_RSS_CTXTS_P5;
 
-	rc = bnxt_alloc_all_hwrm_stat_ctxs(bp);
-	if (rc) {
-		PMD_DRV_LOG(ERR, "HWRM stat ctx alloc failure rc: %x\n", rc);
-		goto err_out;
-	}
-
 	rc = bnxt_alloc_hwrm_rings(bp);
 	if (rc) {
 		PMD_DRV_LOG(ERR, "HWRM ring alloc failure rc: %x\n", rc);
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 82e89b7..55dcb1d 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -2648,37 +2648,6 @@  bnxt_free_all_hwrm_stat_ctxs(struct bnxt *bp)
 	return 0;
 }
 
-int bnxt_alloc_all_hwrm_stat_ctxs(struct bnxt *bp)
-{
-	struct bnxt_cp_ring_info *cpr;
-	unsigned int i;
-	int rc = 0;
-
-	for (i = 0; i < bp->rx_cp_nr_rings; i++) {
-		struct bnxt_rx_queue *rxq = bp->rx_queues[i];
-
-		cpr = rxq->cp_ring;
-		if (cpr->hw_stats_ctx_id == HWRM_NA_SIGNATURE) {
-			rc = bnxt_hwrm_stat_ctx_alloc(bp, cpr);
-			if (rc)
-				return rc;
-		}
-	}
-
-	for (i = 0; i < bp->tx_cp_nr_rings; i++) {
-		struct bnxt_tx_queue *txq = bp->tx_queues[i];
-
-		cpr = txq->cp_ring;
-		if (cpr->hw_stats_ctx_id == HWRM_NA_SIGNATURE) {
-			rc = bnxt_hwrm_stat_ctx_alloc(bp, cpr);
-			if (rc)
-				return rc;
-		}
-	}
-
-	return rc;
-}
-
 static int
 bnxt_free_all_hwrm_ring_grps(struct bnxt *bp)
 {
diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h
index 6dc23b9..72d4864 100644
--- a/drivers/net/bnxt/bnxt_hwrm.h
+++ b/drivers/net/bnxt/bnxt_hwrm.h
@@ -188,7 +188,6 @@  int bnxt_hwrm_vnic_plcmode_cfg(struct bnxt *bp,
 int bnxt_hwrm_vnic_tpa_cfg(struct bnxt *bp,
 			   struct bnxt_vnic_info *vnic, bool enable);
 
-int bnxt_alloc_all_hwrm_stat_ctxs(struct bnxt *bp);
 int bnxt_clear_all_hwrm_stat_ctxs(struct bnxt *bp);
 int bnxt_alloc_all_hwrm_ring_grps(struct bnxt *bp);
 void bnxt_free_cp_ring(struct bnxt *bp, struct bnxt_cp_ring_info *cpr);