patch 'net/txgbe: fix KR auto-negotiation' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.1

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

Thanks.

Kevin

---
>From abfad6b59cc47b1365b7c87df4717e349cf7549b Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu at trustnetic.com>
Date: Wed, 9 Feb 2022 18:42:13 +0800
Subject: [PATCH] net/txgbe: fix KR auto-negotiation

[ upstream commit 238170abe7e41c75bbf77897eb84f637fb8936fd ]

Fix failure to enter auto-negotiation mode on some firmware versions for
KR NICs.

Fixes: f611dada1af8 ("net/txgbe: update link setup process of backplane NICs")

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

diff --git a/drivers/net/txgbe/base/txgbe_phy.c b/drivers/net/txgbe/base/txgbe_phy.c
index 3f5229ecc2..3fb929f37a 100644
--- a/drivers/net/txgbe/base/txgbe_phy.c
+++ b/drivers/net/txgbe/base/txgbe_phy.c
@@ -1456,4 +1456,8 @@ txgbe_set_link_to_kr(struct txgbe_hw *hw, bool autoneg)
 			wr32_epcs(hw, SR_AN_CTRL, 0);
 			wr32_epcs(hw, VR_AN_KR_MODE_CL, 0);
+		} else {
+			value = rd32_epcs(hw, TXGBE_PHY_TX_EQ_CTL1);
+			value &= ~(1 << 6);
+			wr32_epcs(hw, TXGBE_PHY_TX_EQ_CTL1, value);
 		}
 		if (hw->devarg.present == 1) {
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-21 15:22:48.524799612 +0000
+++ 0184-net-txgbe-fix-KR-auto-negotiation.patch	2022-02-21 15:22:44.363704739 +0000
@@ -1 +1 @@
-From 238170abe7e41c75bbf77897eb84f637fb8936fd Mon Sep 17 00:00:00 2001
+From abfad6b59cc47b1365b7c87df4717e349cf7549b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 238170abe7e41c75bbf77897eb84f637fb8936fd ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org