[dpdk-stable] patch 'net/bnxt: fix max ring count' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From fe42bb4b74d1d537fc8c758341e1b9afc44afe44 Mon Sep 17 00:00:00 2001
From: Somnath Kotur <somnath.kotur at broadcom.com>
Date: Fri, 24 Apr 2020 16:30:54 +0530
Subject: [PATCH] net/bnxt: fix max ring count

[ upstream commit 9bccd7010f1f627895409fe189627b2dd5a2c460 ]

Max Rx Ring count could be < Max stat contexts. While accounting
for stat contexts, this should be also considered and
the max ring count adjusted accordingly.

Fixes: f03e66cb64ce ("net/bnxt: limit queue count for NS3/Stingray devices")

Signed-off-by: Somnath Kotur <somnath.kotur at broadcom.com>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
---
 drivers/net/bnxt/bnxt.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index cfd6f197da..0ef0282d2a 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -630,10 +630,10 @@ struct bnxt {
 #define MAX_STINGRAY_RINGS		128U
 /* For sake of symmetry, max Tx rings == max Rx rings, one stat ctx for each */
 #define BNXT_MAX_RX_RINGS(bp) \
-	(BNXT_STINGRAY(bp) ? RTE_MIN(RTE_MIN(bp->max_rx_rings, \
+	(BNXT_STINGRAY(bp) ? RTE_MIN(RTE_MIN(bp->max_rx_rings / 2U, \
 					     MAX_STINGRAY_RINGS), \
 				     bp->max_stat_ctx / 2U) : \
-				RTE_MIN(bp->max_rx_rings, \
+				RTE_MIN(bp->max_rx_rings / 2U, \
 					bp->max_stat_ctx / 2U))
 #define BNXT_MAX_TX_RINGS(bp) \
 	(RTE_MIN((bp)->max_tx_rings, BNXT_MAX_RX_RINGS(bp)))
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:49.970202575 +0100
+++ 0136-net-bnxt-fix-max-ring-count.patch	2020-05-19 14:04:44.448652578 +0100
@@ -1,14 +1,15 @@
-From 9bccd7010f1f627895409fe189627b2dd5a2c460 Mon Sep 17 00:00:00 2001
+From fe42bb4b74d1d537fc8c758341e1b9afc44afe44 Mon Sep 17 00:00:00 2001
 From: Somnath Kotur <somnath.kotur at broadcom.com>
 Date: Fri, 24 Apr 2020 16:30:54 +0530
 Subject: [PATCH] net/bnxt: fix max ring count
 
+[ upstream commit 9bccd7010f1f627895409fe189627b2dd5a2c460 ]
+
 Max Rx Ring count could be < Max stat contexts. While accounting
 for stat contexts, this should be also considered and
 the max ring count adjusted accordingly.
 
 Fixes: f03e66cb64ce ("net/bnxt: limit queue count for NS3/Stingray devices")
-Cc: stable at dpdk.org
 
 Signed-off-by: Somnath Kotur <somnath.kotur at broadcom.com>
 Reviewed-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
@@ -17,10 +18,10 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
-index 586d3f5349..12fed1e9d7 100644
+index cfd6f197da..0ef0282d2a 100644
 --- a/drivers/net/bnxt/bnxt.h
 +++ b/drivers/net/bnxt/bnxt.h
-@@ -653,10 +653,10 @@ struct bnxt {
+@@ -630,10 +630,10 @@ struct bnxt {
  #define MAX_STINGRAY_RINGS		128U
  /* For sake of symmetry, max Tx rings == max Rx rings, one stat ctx for each */
  #define BNXT_MAX_RX_RINGS(bp) \