patch 'net/txgbe: add Tx queue maximum limit' has been queued to stable release 22.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 22.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/15/23. 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.

Queued patches are on a temporary branch at:
https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=2c62e368053a7ce0c26f241844d04694c410927b

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 2c62e368053a7ce0c26f241844d04694c410927b Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu at trustnetic.com>
Date: Thu, 28 Sep 2023 17:47:48 +0800
Subject: [PATCH] net/txgbe: add Tx queue maximum limit
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit afcba8586daa5abc3868180e96601babfef3cfc1 ]

Limit TX queue maximum to 64 when neither VT nor DCB are enabled,
since hardware doesn't support it.

Fixes: 75cbb1f0e8a6 ("net/txgbe: add device configuration")

Signed-off-by: Jiawen Wu <jiawenwu at trustnetic.com>
---
 drivers/net/txgbe/txgbe_ethdev.c | 13 +++++++++++++
 drivers/net/txgbe/txgbe_ethdev.h |  1 +
 2 files changed, 14 insertions(+)

diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 2c7d71c0db..7f0b3c9b50 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -1498,6 +1498,19 @@ txgbe_check_mq_mode(struct rte_eth_dev *dev)
 				return -EINVAL;
 			}
 		}
+
+		/*
+		 * When DCB/VT is off, maximum number of queues changes
+		 */
+		if (dev_conf->txmode.mq_mode == RTE_ETH_MQ_TX_NONE) {
+			if (nb_tx_q > TXGBE_NONE_MODE_TX_NB_QUEUES) {
+				PMD_INIT_LOG(ERR,
+					     "Neither VT nor DCB are enabled, "
+					     "nb_tx_q > %d.",
+					     TXGBE_NONE_MODE_TX_NB_QUEUES);
+				return -EINVAL;
+			}
+		}
 	}
 	return 0;
 }
diff --git a/drivers/net/txgbe/txgbe_ethdev.h b/drivers/net/txgbe/txgbe_ethdev.h
index b8a39204e2..545ce4c9e1 100644
--- a/drivers/net/txgbe/txgbe_ethdev.h
+++ b/drivers/net/txgbe/txgbe_ethdev.h
@@ -40,6 +40,7 @@
 /*Default value of Max Rx Queue*/
 #define TXGBE_MAX_RX_QUEUE_NUM	128
 #define TXGBE_VMDQ_DCB_NB_QUEUES     TXGBE_MAX_RX_QUEUE_NUM
+#define TXGBE_NONE_MODE_TX_NB_QUEUES 64

 #ifndef NBBY
 #define NBBY	8	/* number of bits in a byte */
--
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-10-22 22:17:35.368444200 +0800
+++ 0025-net-txgbe-add-Tx-queue-maximum-limit.patch	2023-10-22 22:17:34.166723700 +0800
@@ -1 +1 @@
-From afcba8586daa5abc3868180e96601babfef3cfc1 Mon Sep 17 00:00:00 2001
+From 2c62e368053a7ce0c26f241844d04694c410927b Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit afcba8586daa5abc3868180e96601babfef3cfc1 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
-index 15911a3621..479cd810f8 100644
+index 2c7d71c0db..7f0b3c9b50 100644
@@ -22 +24 @@
-@@ -1499,6 +1499,19 @@ txgbe_check_mq_mode(struct rte_eth_dev *dev)
+@@ -1498,6 +1498,19 @@ txgbe_check_mq_mode(struct rte_eth_dev *dev)
@@ -43 +45 @@
-index 6b296d6fd1..7feb45d0cf 100644
+index b8a39204e2..545ce4c9e1 100644
@@ -46 +48 @@
-@@ -41,6 +41,7 @@
+@@ -40,6 +40,7 @@