patch 'net/bnxt: fix Tx queue startup state' has been queued to stable release 19.11.11

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before December 10th 2021. 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://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/fdfed7e0ab02c2ea05a036d671845d44015637e0

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From fdfed7e0ab02c2ea05a036d671845d44015637e0 Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde at broadcom.com>
Date: Fri, 17 Sep 2021 13:20:45 -0700
Subject: [PATCH] net/bnxt: fix Tx queue startup state

[ upstream commit 0f22fe124bffcbfa15a8179b9cc835ae64b1a3fe ]

Default queue state of Tx queues on startup is not correct.
Fix this by setting the state when the port is started.

Fixes: 6eb3cc2294fd ("net/bnxt: add initial Tx code")

Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
Reviewed-by: Lance Richardson <lance.richardson at broadcom.com>
---
 drivers/net/bnxt/bnxt_ethdev.c | 10 ++++++++++
 drivers/net/bnxt/bnxt_txq.c    |  5 -----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 2a58496d71..69ecc6d21a 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -444,6 +444,16 @@ skip_cosq_cfg:
 			goto err_out;
 	}
 
+	for (j = 0; j < bp->tx_nr_rings; j++) {
+		struct bnxt_tx_queue *txq = bp->tx_queues[j];
+
+		if (!txq->tx_deferred_start) {
+			bp->eth_dev->data->tx_queue_state[j] =
+				RTE_ETH_QUEUE_STATE_STARTED;
+			txq->tx_started = true;
+		}
+	}
+
 	rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, &bp->vnic_info[0], 0, NULL);
 	if (rc) {
 		PMD_DRV_LOG(ERR,
diff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c
index 8f5ba73c09..129bd5b541 100644
--- a/drivers/net/bnxt/bnxt_txq.c
+++ b/drivers/net/bnxt/bnxt_txq.c
@@ -160,11 +160,6 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
 
 	eth_dev->data->tx_queues[queue_idx] = txq;
 
-	if (txq->tx_deferred_start)
-		txq->tx_started = false;
-	else
-		txq->tx_started = true;
-
 	return 0;
 err:
 	bnxt_tx_queue_release_op(txq);
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-30 16:50:08.996139765 +0100
+++ 0050-net-bnxt-fix-Tx-queue-startup-state.patch	2021-11-30 16:50:05.686872767 +0100
@@ -1 +1 @@
-From 0f22fe124bffcbfa15a8179b9cc835ae64b1a3fe Mon Sep 17 00:00:00 2001
+From fdfed7e0ab02c2ea05a036d671845d44015637e0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0f22fe124bffcbfa15a8179b9cc835ae64b1a3fe ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index dc7dee1d2a..08537d8b87 100644
+index 2a58496d71..69ecc6d21a 100644
@@ -23,2 +24,2 @@
-@@ -814,6 +814,16 @@ skip_cosq_cfg:
- 		}
+@@ -444,6 +444,16 @@ skip_cosq_cfg:
+ 			goto err_out;
@@ -41 +42 @@
-index 830416af3d..3ffc334cff 100644
+index 8f5ba73c09..129bd5b541 100644
@@ -44 +45 @@
-@@ -166,11 +166,6 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
+@@ -160,11 +160,6 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,