patch 'net/txgbe/base: fix Tx with fiber hotplug' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.5

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

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

Thanks.

Kevin

---
>From 1a7755214b84bd8621a515a131ac37049e62579a Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu at trustnetic.com>
Date: Wed, 14 Jun 2023 10:34:21 +0800
Subject: [PATCH] net/txgbe/base: fix Tx with fiber hotplug

[ upstream commit 196e412b80afe165ca78457d5f9bb1a5bace28ea ]

Under heavy traffic, unplugging and plugging fiber optic cables may cause
Tx failure. The reason is that there is still traffic passing through at
PCS VR reset, during txgbe_set_link_to_*. So totally disable Rx and Tx
before PCS VR reset to fix it.

Fixes: 01c3cf5c85a7 ("net/txgbe: add autoneg control read and write")

Signed-off-by: Jiawen Wu <jiawenwu at trustnetic.com>
---
 drivers/net/txgbe/base/txgbe_phy.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/net/txgbe/base/txgbe_phy.c b/drivers/net/txgbe/base/txgbe_phy.c
index 87935abdaa..6bbb2a5e71 100644
--- a/drivers/net/txgbe/base/txgbe_phy.c
+++ b/drivers/net/txgbe/base/txgbe_phy.c
@@ -1520,6 +1520,7 @@ txgbe_set_link_to_kx4(struct txgbe_hw *hw, bool autoneg)
 	}
 
-	wr32m(hw, TXGBE_MACTXCFG, TXGBE_MACTXCFG_TXE,
-			~TXGBE_MACTXCFG_TXE);
+	wr32m(hw, TXGBE_MACTXCFG, TXGBE_MACTXCFG_TXE, ~TXGBE_MACTXCFG_TXE);
+	wr32m(hw, TXGBE_MACRXCFG, TXGBE_MACRXCFG_ENA, ~TXGBE_MACRXCFG_ENA);
+	hw->mac.disable_sec_tx_path(hw);
 
 	/* 2. Disable xpcs AN-73 */
@@ -1735,6 +1736,7 @@ txgbe_set_link_to_kx(struct txgbe_hw *hw,
 	}
 
-	wr32m(hw, TXGBE_MACTXCFG, TXGBE_MACTXCFG_TXE,
-				~TXGBE_MACTXCFG_TXE);
+	wr32m(hw, TXGBE_MACTXCFG, TXGBE_MACTXCFG_TXE, ~TXGBE_MACTXCFG_TXE);
+	wr32m(hw, TXGBE_MACRXCFG, TXGBE_MACRXCFG_ENA, ~TXGBE_MACRXCFG_ENA);
+	hw->mac.disable_sec_tx_path(hw);
 
 	/* 2. Disable xpcs AN-73 */
@@ -1942,6 +1944,7 @@ txgbe_set_link_to_sfi(struct txgbe_hw *hw,
 	}
 
-	wr32m(hw, TXGBE_MACTXCFG, TXGBE_MACTXCFG_TXE,
-			~TXGBE_MACTXCFG_TXE);
+	wr32m(hw, TXGBE_MACTXCFG, TXGBE_MACTXCFG_TXE, ~TXGBE_MACTXCFG_TXE);
+	wr32m(hw, TXGBE_MACRXCFG, TXGBE_MACRXCFG_ENA, ~TXGBE_MACRXCFG_ENA);
+	hw->mac.disable_sec_tx_path(hw);
 
 	/* 2. Disable xpcs AN-73 */
@@ -2294,4 +2297,6 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc)
 	}
 
+	hw->mac.enable_sec_tx_path(hw);
+
 	if (speed == TXGBE_LINK_SPEED_10GB_FULL)
 		mactxcfg = TXGBE_MACTXCFG_SPEED_10G;
@@ -2303,4 +2308,5 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc)
 		TXGBE_MACTXCFG_SPEED_MASK | TXGBE_MACTXCFG_TXE,
 		mactxcfg | TXGBE_MACTXCFG_TXE);
+	wr32m(hw, TXGBE_MACRXCFG, TXGBE_MACRXCFG_ENA, TXGBE_MACRXCFG_ENA);
 }
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-20 16:18:05.912925687 +0100
+++ 0090-net-txgbe-base-fix-Tx-with-fiber-hotplug.patch	2023-07-20 16:17:54.973751782 +0100
@@ -1 +1 @@
-From 196e412b80afe165ca78457d5f9bb1a5bace28ea Mon Sep 17 00:00:00 2001
+From 1a7755214b84bd8621a515a131ac37049e62579a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 196e412b80afe165ca78457d5f9bb1a5bace28ea ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index f4cadcc510..1eb45b068a 100644
+index 87935abdaa..6bbb2a5e71 100644
@@ -23 +24 @@
-@@ -1542,6 +1542,7 @@ txgbe_set_link_to_kx4(struct txgbe_hw *hw, bool autoneg)
+@@ -1520,6 +1520,7 @@ txgbe_set_link_to_kx4(struct txgbe_hw *hw, bool autoneg)
@@ -33 +34 @@
-@@ -1757,6 +1758,7 @@ txgbe_set_link_to_kx(struct txgbe_hw *hw,
+@@ -1735,6 +1736,7 @@ txgbe_set_link_to_kx(struct txgbe_hw *hw,
@@ -43 +44 @@
-@@ -1964,6 +1966,7 @@ txgbe_set_link_to_sfi(struct txgbe_hw *hw,
+@@ -1942,6 +1944,7 @@ txgbe_set_link_to_sfi(struct txgbe_hw *hw,
@@ -53 +54 @@
-@@ -2316,4 +2319,6 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc)
+@@ -2294,4 +2297,6 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc)
@@ -60 +61 @@
-@@ -2325,4 +2330,5 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc)
+@@ -2303,4 +2308,5 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc)