patch 'net/bnxt: fix bad action offset in Tx BD' has been queued to stable release 23.11.3

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.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 12/10/24. 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=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=1cc98f6f93302133b9b735a9f9b09267f9fb659a

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 1cc98f6f93302133b9b735a9f9b09267f9fb659a Mon Sep 17 00:00:00 2001
From: Peter Spreadborough <peter.spreadborough at broadcom.com>
Date: Tue, 16 Apr 2024 14:15:56 -0400
Subject: [PATCH] net/bnxt: fix bad action offset in Tx BD
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit b019ddf9b1de65491b4c07c25bbab3dc70c15f79 ]

This change ensures that the high part of an action table entry
offset stored in the Tx BD is set correctly. A bad value will
cause the PDCU to abort a fetch an may stall the pipeline.

Fixes: 527b10089cc5 ("net/bnxt: optimize Tx completion handling")

Signed-off-by: Peter Spreadborough <peter.spreadborough at broadcom.com>
Reviewed-by: Kishore Padmanabha <kishore.padmanabha at broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt_txr.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index 67e8a9990b..6500738ff2 100644
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -303,10 +303,15 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
 		 */
 		txbd1->kid_or_ts_high_mss = 0;

-		if (txq->vfr_tx_cfa_action)
-			txbd1->cfa_action = txq->vfr_tx_cfa_action;
-		else
-			txbd1->cfa_action = txq->bp->tx_cfa_action;
+		if (txq->vfr_tx_cfa_action) {
+			txbd1->cfa_action = txq->vfr_tx_cfa_action & 0xffff;
+			txbd1->cfa_action_high = (txq->vfr_tx_cfa_action >> 16) &
+				TX_BD_LONG_CFA_ACTION_HIGH_MASK;
+		} else {
+			txbd1->cfa_action = txq->bp->tx_cfa_action & 0xffff;
+			txbd1->cfa_action_high = (txq->bp->tx_cfa_action >> 16) &
+				TX_BD_LONG_CFA_ACTION_HIGH_MASK;
+		}

 		if (tx_pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) {
 			uint16_t hdr_size;
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-12-06 23:26:45.976852005 +0800
+++ 0057-net-bnxt-fix-bad-action-offset-in-Tx-BD.patch	2024-12-06 23:26:43.973044828 +0800
@@ -1 +1 @@
-From b019ddf9b1de65491b4c07c25bbab3dc70c15f79 Mon Sep 17 00:00:00 2001
+From 1cc98f6f93302133b9b735a9f9b09267f9fb659a Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit b019ddf9b1de65491b4c07c25bbab3dc70c15f79 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +23 @@
-index 38f858f27f..c82b11e733 100644
+index 67e8a9990b..6500738ff2 100644
@@ -24 +26 @@
-@@ -308,10 +308,15 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
+@@ -303,10 +303,15 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
@@ -42,2 +44,2 @@
- 		if (tx_pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG ||
- 		    tx_pkt->ol_flags & RTE_MBUF_F_TX_UDP_SEG) {
+ 		if (tx_pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) {
+ 			uint16_t hdr_size;