[dpdk-stable] [PATCH 20.11] net/bnxt: fix ring count calculation for Thor

[Xueming(Steven) Li]

Thanks, applied to 20.11 work queue.

> -----Original Message-----
> From: stable <stable-bounces at dpdk.org> On Behalf Of Kalesh A P
> Sent: Thursday, May 27, 2021 1:06 PM
> To: stable at dpdk.org
> Subject: [dpdk-stable] [PATCH 20.11] net/bnxt: fix ring count calculation for Thor
> 
> From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
> 
> [ upstream commit a49844ffa39df02bbcb8353436ae10b830bfed73 ]
> 
> For Thor devices, RSS table can only accommodate 512 Rx queues.
> Cap the max Rx rings to 512.
> 
> Fixes: d819382543f3 ("net/bnxt: add RSS redirection table operations")
> 
> Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
> Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
> Reviewed-by: Lance Richardson <lance.richardson at broadcom.com>
> ---
>  drivers/net/bnxt/bnxt.h        | 6 ++++++
>  drivers/net/bnxt/bnxt_ethdev.c | 7 ++++---
>  2 files changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index b912fd8..555ff04 100644
> --- a/drivers/net/bnxt/bnxt.h
> +++ b/drivers/net/bnxt/bnxt.h
> @@ -831,6 +831,12 @@ inline uint16_t bnxt_max_rings(struct bnxt *bp)
>  				       bp->max_stat_ctx / 2U);
>  	}
> 
> +	/* RSS table size in Thor is 512.
> +	 * Cap max Rx rings to the same value for RSS.
> +	 */
> +	if (BNXT_CHIP_THOR(bp))
> +		max_rx_rings = RTE_MIN(max_rx_rings, BNXT_RSS_TBL_SIZE_THOR);
> +
>  	max_tx_rings = RTE_MIN(max_tx_rings, max_rx_rings);
>  	if (max_cp_rings > BNXT_NUM_ASYNC_CPR(bp))
>  		max_cp_rings -= BNXT_NUM_ASYNC_CPR(bp); diff --git a/drivers/net/bnxt/bnxt_ethdev.c
> b/drivers/net/bnxt/bnxt_ethdev.c index 3aa346d..78d9f15 100644
> --- a/drivers/net/bnxt/bnxt_ethdev.c
> +++ b/drivers/net/bnxt/bnxt_ethdev.c
> @@ -427,12 +427,13 @@ static int bnxt_setup_one_vnic(struct bnxt *bp, uint16_t vnic_id)
>  	if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS) {
>  		int j, nr_ctxs = bnxt_rss_ctxts(bp);
> 
> +		/* RSS table size in Thor is 512.
> +		 * Cap max Rx rings to same value
> +		 */
>  		if (bp->rx_nr_rings > BNXT_RSS_TBL_SIZE_THOR) {
>  			PMD_DRV_LOG(ERR, "RxQ cnt %d > reta_size %d\n",
>  				    bp->rx_nr_rings, BNXT_RSS_TBL_SIZE_THOR);
> -			PMD_DRV_LOG(ERR,
> -				    "Only queues 0-%d will be in RSS table\n",
> -				    BNXT_RSS_TBL_SIZE_THOR - 1);
> +			goto err_out;
>  		}
> 
>  		rc = 0;
> --
> 2.10.1