diff mbox series

[net-next,02/10] bnxt_en Refactor completion ring allocation logic for P5_PLUS chips

Message ID 20250113063927.4017173-3-michael.chan@broadcom.com (mailing list archive)
State New
Delegated to: Netdev Maintainers
Headers show
Series bnxt_en: Add NPAR 1.2 and TPH support | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 1 this patch: 1
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 5 of 5 maintainers
netdev/build_clang success Errors and warnings before: 2 this patch: 2
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 1 this patch: 1
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 66 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 2 this patch: 2
netdev/source_inline success Was 0 now: 0

Commit Message

Michael Chan Jan. 13, 2025, 6:39 a.m. UTC 
Add a new bnxt_hwrm_cp_ring_alloc_p5() function to handle allocating
one completion ring on P5_PLUS chips.  This simplifies the existing code
and will be useful later in the series.

Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 44 +++++++++++------------
 1 file changed, 21 insertions(+), 23 deletions(-)

Comments

Michal Swiatkowski Jan. 13, 2025, 7:59 a.m. UTC | #1 
On Sun, Jan 12, 2025 at 10:39:19PM -0800, Michael Chan wrote:
> Add a new bnxt_hwrm_cp_ring_alloc_p5() function to handle allocating
> one completion ring on P5_PLUS chips.  This simplifies the existing code
> and will be useful later in the series.
> 
> Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
> Signed-off-by: Michael Chan <michael.chan@broadcom.com>
> ---
>  drivers/net/ethernet/broadcom/bnxt/bnxt.c | 44 +++++++++++------------
>  1 file changed, 21 insertions(+), 23 deletions(-)
> 
> diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> index 8527788bed91..d364a707664b 100644
> --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> @@ -7172,6 +7172,25 @@ static int bnxt_hwrm_rx_agg_ring_alloc(struct bnxt *bp,
>  	return 0;
>  }
>  
> +static int bnxt_hwrm_cp_ring_alloc_p5(struct bnxt *bp,
> +				      struct bnxt_cp_ring_info *cpr)
> +{
> +	struct bnxt_napi *bnapi = cpr->bnapi;
> +	u32 type = HWRM_RING_ALLOC_CMPL;
Nit, can be const

> +	struct bnxt_ring_struct *ring;
> +	u32 map_idx = bnapi->index;
> +	int rc;
> +
> +	ring = &cpr->cp_ring_struct;
> +	ring->handle = BNXT_SET_NQ_HDL(cpr);
> +	rc = hwrm_ring_alloc_send_msg(bp, ring, type, map_idx);
> +	if (rc)
> +		return rc;
> +	bnxt_set_db(bp, &cpr->cp_db, type, map_idx, ring->fw_ring_id);
> +	bnxt_db_cq(bp, &cpr->cp_db, cpr->cp_raw_cons);
> +	return 0;
> +}
> +
>  static int bnxt_hwrm_ring_alloc(struct bnxt *bp)
>  {
>  	bool agg_rings = !!(bp->flags & BNXT_FLAG_AGG_RINGS);
> @@ -7215,19 +7234,9 @@ static int bnxt_hwrm_ring_alloc(struct bnxt *bp)
>  		u32 map_idx;
>  
>  		if (bp->flags & BNXT_FLAG_CHIP_P5_PLUS) {
> -			struct bnxt_cp_ring_info *cpr2 = txr->tx_cpr;
> -			struct bnxt_napi *bnapi = txr->bnapi;
> -			u32 type2 = HWRM_RING_ALLOC_CMPL;
> -
> -			ring = &cpr2->cp_ring_struct;
> -			ring->handle = BNXT_SET_NQ_HDL(cpr2);
> -			map_idx = bnapi->index;
> -			rc = hwrm_ring_alloc_send_msg(bp, ring, type2, map_idx);
> +			rc = bnxt_hwrm_cp_ring_alloc_p5(bp, txr->tx_cpr);
>  			if (rc)
>  				goto err_out;
> -			bnxt_set_db(bp, &cpr2->cp_db, type2, map_idx,
> -				    ring->fw_ring_id);
> -			bnxt_db_cq(bp, &cpr2->cp_db, cpr2->cp_raw_cons);
>  		}
>  		ring = &txr->tx_ring_struct;
>  		map_idx = i;
> @@ -7247,20 +7256,9 @@ static int bnxt_hwrm_ring_alloc(struct bnxt *bp)
>  		if (!agg_rings)
>  			bnxt_db_write(bp, &rxr->rx_db, rxr->rx_prod);
>  		if (bp->flags & BNXT_FLAG_CHIP_P5_PLUS) {
> -			struct bnxt_cp_ring_info *cpr2 = rxr->rx_cpr;
> -			struct bnxt_napi *bnapi = rxr->bnapi;
> -			u32 type2 = HWRM_RING_ALLOC_CMPL;
> -			struct bnxt_ring_struct *ring;
> -			u32 map_idx = bnapi->index;
> -
> -			ring = &cpr2->cp_ring_struct;
> -			ring->handle = BNXT_SET_NQ_HDL(cpr2);
> -			rc = hwrm_ring_alloc_send_msg(bp, ring, type2, map_idx);
> +			rc = bnxt_hwrm_cp_ring_alloc_p5(bp, rxr->rx_cpr);
>  			if (rc)
>  				goto err_out;
> -			bnxt_set_db(bp, &cpr2->cp_db, type2, map_idx,
> -				    ring->fw_ring_id);
> -			bnxt_db_cq(bp, &cpr2->cp_db, cpr2->cp_raw_cons);
>  		}
>  	}
>  
> -- 
> 2.30.1

Nice simplification
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
diff mbox series

Patch

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 8527788bed91..d364a707664b 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -7172,6 +7172,25 @@  static int bnxt_hwrm_rx_agg_ring_alloc(struct bnxt *bp,
 	return 0;
 }
 
+static int bnxt_hwrm_cp_ring_alloc_p5(struct bnxt *bp,
+				      struct bnxt_cp_ring_info *cpr)
+{
+	struct bnxt_napi *bnapi = cpr->bnapi;
+	u32 type = HWRM_RING_ALLOC_CMPL;
+	struct bnxt_ring_struct *ring;
+	u32 map_idx = bnapi->index;
+	int rc;
+
+	ring = &cpr->cp_ring_struct;
+	ring->handle = BNXT_SET_NQ_HDL(cpr);
+	rc = hwrm_ring_alloc_send_msg(bp, ring, type, map_idx);
+	if (rc)
+		return rc;
+	bnxt_set_db(bp, &cpr->cp_db, type, map_idx, ring->fw_ring_id);
+	bnxt_db_cq(bp, &cpr->cp_db, cpr->cp_raw_cons);
+	return 0;
+}
+
 static int bnxt_hwrm_ring_alloc(struct bnxt *bp)
 {
 	bool agg_rings = !!(bp->flags & BNXT_FLAG_AGG_RINGS);
@@ -7215,19 +7234,9 @@  static int bnxt_hwrm_ring_alloc(struct bnxt *bp)
 		u32 map_idx;
 
 		if (bp->flags & BNXT_FLAG_CHIP_P5_PLUS) {
-			struct bnxt_cp_ring_info *cpr2 = txr->tx_cpr;
-			struct bnxt_napi *bnapi = txr->bnapi;
-			u32 type2 = HWRM_RING_ALLOC_CMPL;
-
-			ring = &cpr2->cp_ring_struct;
-			ring->handle = BNXT_SET_NQ_HDL(cpr2);
-			map_idx = bnapi->index;
-			rc = hwrm_ring_alloc_send_msg(bp, ring, type2, map_idx);
+			rc = bnxt_hwrm_cp_ring_alloc_p5(bp, txr->tx_cpr);
 			if (rc)
 				goto err_out;
-			bnxt_set_db(bp, &cpr2->cp_db, type2, map_idx,
-				    ring->fw_ring_id);
-			bnxt_db_cq(bp, &cpr2->cp_db, cpr2->cp_raw_cons);
 		}
 		ring = &txr->tx_ring_struct;
 		map_idx = i;
@@ -7247,20 +7256,9 @@  static int bnxt_hwrm_ring_alloc(struct bnxt *bp)
 		if (!agg_rings)
 			bnxt_db_write(bp, &rxr->rx_db, rxr->rx_prod);
 		if (bp->flags & BNXT_FLAG_CHIP_P5_PLUS) {
-			struct bnxt_cp_ring_info *cpr2 = rxr->rx_cpr;
-			struct bnxt_napi *bnapi = rxr->bnapi;
-			u32 type2 = HWRM_RING_ALLOC_CMPL;
-			struct bnxt_ring_struct *ring;
-			u32 map_idx = bnapi->index;
-
-			ring = &cpr2->cp_ring_struct;
-			ring->handle = BNXT_SET_NQ_HDL(cpr2);
-			rc = hwrm_ring_alloc_send_msg(bp, ring, type2, map_idx);
+			rc = bnxt_hwrm_cp_ring_alloc_p5(bp, rxr->rx_cpr);
 			if (rc)
 				goto err_out;
-			bnxt_set_db(bp, &cpr2->cp_db, type2, map_idx,
-				    ring->fw_ring_id);
-			bnxt_db_cq(bp, &cpr2->cp_db, cpr2->cp_raw_cons);
 		}
 	}