patch 'net/txgbe: reconfigure more MAC Rx registers' has been queued to stable release 21.11.8

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.8

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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/df4ec1ced28446b1f3a2262d797f9079fd0f6e46

Thanks.

Kevin

---
>From df4ec1ced28446b1f3a2262d797f9079fd0f6e46 Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu at trustnetic.com>
Date: Tue, 18 Jun 2024 15:11:36 +0800
Subject: [PATCH] net/txgbe: reconfigure more MAC Rx registers

[ upstream commit 3056288933f06afa72f8611ab7c4accdd01899fa ]

When link status changes, there is a probability that no more packets
can be received on the port, due to hardware defects. These MAC Rx
registers should be reconfigured to fix this problem.

Fixes: 950a6954df13 ("net/txgbe: reconfigure MAC Rx when link update")

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

diff --git a/drivers/net/txgbe/base/txgbe_regs.h b/drivers/net/txgbe/base/txgbe_regs.h
index c96bdd984b..d151123882 100644
--- a/drivers/net/txgbe/base/txgbe_regs.h
+++ b/drivers/net/txgbe/base/txgbe_regs.h
@@ -1021,4 +1021,6 @@ enum txgbe_5tuple_protocol {
 #define   TXGBE_MACRXFLT_RXALL          MS(31, 0x1)
 
+#define TXGBE_MAC_WDG_TIMEOUT           0x01100C
+
 /******************************************************************************
  * Statistic Registers
diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 39874c67a9..3ff8da2de9 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -2714,4 +2714,5 @@ txgbe_dev_link_update_share(struct rte_eth_dev *dev,
 	int err;
 	int wait = 1;
+	u32 reg;
 
 	memset(&link, 0, sizeof(link));
@@ -2786,7 +2787,12 @@ txgbe_dev_link_update_share(struct rte_eth_dev *dev,
 
 	/* Re configure MAC RX */
-	if (hw->mac.type == txgbe_mac_raptor)
+	if (hw->mac.type == txgbe_mac_raptor) {
+		reg = rd32(hw, TXGBE_MACRXCFG);
+		wr32(hw, TXGBE_MACRXCFG, reg);
 		wr32m(hw, TXGBE_MACRXFLT, TXGBE_MACRXFLT_PROMISC,
 			TXGBE_MACRXFLT_PROMISC);
+		reg = rd32(hw, TXGBE_MAC_WDG_TIMEOUT);
+		wr32(hw, TXGBE_MAC_WDG_TIMEOUT, reg);
+	}
 
 	return rte_eth_linkstatus_set(dev, &link);
-- 
2.46.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-08-23 17:18:12.611299179 +0100
+++ 0098-net-txgbe-reconfigure-more-MAC-Rx-registers.patch	2024-08-23 17:18:09.822430462 +0100
@@ -1 +1 @@
-From 3056288933f06afa72f8611ab7c4accdd01899fa Mon Sep 17 00:00:00 2001
+From df4ec1ced28446b1f3a2262d797f9079fd0f6e46 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3056288933f06afa72f8611ab7c4accdd01899fa ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 86896d11dc..a2984f1106 100644
+index c96bdd984b..d151123882 100644
@@ -23 +24 @@
-@@ -1023,4 +1023,6 @@ enum txgbe_5tuple_protocol {
+@@ -1021,4 +1021,6 @@ enum txgbe_5tuple_protocol {
@@ -31 +32 @@
-index a59d964a5b..699ff1c920 100644
+index 39874c67a9..3ff8da2de9 100644
@@ -34 +35 @@
-@@ -2880,4 +2880,5 @@ txgbe_dev_link_update_share(struct rte_eth_dev *dev,
+@@ -2714,4 +2714,5 @@ txgbe_dev_link_update_share(struct rte_eth_dev *dev,
@@ -40 +41 @@
-@@ -2969,7 +2970,12 @@ txgbe_dev_link_update_share(struct rte_eth_dev *dev,
+@@ -2786,7 +2787,12 @@ txgbe_dev_link_update_share(struct rte_eth_dev *dev,