patch 'net/axgbe: delay AN timeout during KR training' 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/63539e77be9aef61f4aa01cf74dda54f75067281

Thanks.

Kevin

---
>From 63539e77be9aef61f4aa01cf74dda54f75067281 Mon Sep 17 00:00:00 2001
From: Venkat Kumar Ande <venkatkumar.ande at amd.com>
Date: Tue, 4 Jun 2024 17:41:44 +0530
Subject: [PATCH] net/axgbe: delay AN timeout during KR training

[ upstream commit 323e8c91a7c434915920fe8668ca5664b65ea198 ]

AN restart triggered during KR training not only aborts the KR training
process but also move the HW to unstable state. Driver has to wait up to
500ms or until the KR training is completed before restarting AN cycle.

Without the fix the user will face KR training failure issues.

Fixes: a5c7273771e8 ("net/axgbe: add phy programming APIs")

Signed-off-by: Venkat Kumar Ande <venkatkumar.ande at amd.com>
Acked-by: Selwin Sebastian <selwin.sebastian at amd.com>
---
 drivers/net/axgbe/axgbe_ethdev.h |  2 ++
 drivers/net/axgbe/axgbe_mdio.c   | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/drivers/net/axgbe/axgbe_ethdev.h b/drivers/net/axgbe/axgbe_ethdev.h
index e06d40f9eb..54cad56b21 100644
--- a/drivers/net/axgbe/axgbe_ethdev.h
+++ b/drivers/net/axgbe/axgbe_ethdev.h
@@ -112,4 +112,5 @@
 #define AXGBE_AN_MS_TIMEOUT		500
 #define AXGBE_LINK_TIMEOUT		5
+#define AXGBE_KR_TRAINING_WAIT_ITER	50
 
 #define AXGBE_SGMII_AN_LINK_STATUS	BIT(1)
@@ -653,4 +654,5 @@ struct axgbe_port {
 	unsigned int fec_ability;
 	unsigned long an_start;
+	unsigned long kr_start_time;
 	enum axgbe_an_mode an_mode;
 
diff --git a/drivers/net/axgbe/axgbe_mdio.c b/drivers/net/axgbe/axgbe_mdio.c
index 523b6c0f07..e573ecc4d9 100644
--- a/drivers/net/axgbe/axgbe_mdio.c
+++ b/drivers/net/axgbe/axgbe_mdio.c
@@ -384,4 +384,5 @@ static enum axgbe_an axgbe_an73_tx_training(struct axgbe_port *pdata,
 		if (pdata->phy_if.phy_impl.kr_training_pre)
 			pdata->phy_if.phy_impl.kr_training_pre(pdata);
+	pdata->kr_start_time = rte_get_timer_cycles();
 
 		reg |= AXGBE_KR_TRAINING_START;
@@ -520,4 +521,5 @@ static enum axgbe_an axgbe_an73_incompat_link(struct axgbe_port *pdata)
 	axgbe_an_disable(pdata);
 	axgbe_switch_mode(pdata);
+	pdata->an_result = AXGBE_AN_READY;
 	axgbe_an_restart(pdata);
 
@@ -1000,4 +1002,6 @@ static void axgbe_check_link_timeout(struct axgbe_port *pdata)
 	unsigned long link_timeout;
 	unsigned long ticks;
+	unsigned long kr_time;
+	int wait;
 
 	link_timeout = pdata->link_check + (AXGBE_LINK_TIMEOUT *
@@ -1005,4 +1009,25 @@ static void axgbe_check_link_timeout(struct axgbe_port *pdata)
 	ticks = rte_get_timer_cycles();
 	if (time_after(ticks, link_timeout)) {
+		if ((axgbe_cur_mode(pdata) == AXGBE_MODE_KR) &&
+		    pdata->phy.autoneg == AUTONEG_ENABLE) {
+			/* AN restart should not happen while KR training is in progress.
+			 * The while loop ensures no AN restart during KR training,
+			 * waits up to 500ms and AN restart is triggered only if KR
+			 * training is failed.
+			 */
+			wait = AXGBE_KR_TRAINING_WAIT_ITER;
+			while (wait--) {
+				kr_time = pdata->kr_start_time +
+					  msecs_to_timer_cycles(AXGBE_AN_MS_TIMEOUT);
+				ticks = rte_get_timer_cycles();
+				if (time_after(ticks, kr_time))
+					break;
+				/* AN restart is not required, if AN result is COMPLETE */
+				if (pdata->an_result == AXGBE_AN_COMPLETE)
+					return;
+				rte_delay_us(10500);
+			}
+		}
+
 		PMD_DRV_LOG(NOTICE, "AN link timeout\n");
 		axgbe_phy_config_aneg(pdata);
-- 
2.46.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-08-23 17:18:10.757776868 +0100
+++ 0026-net-axgbe-delay-AN-timeout-during-KR-training.patch	2024-08-23 17:18:09.645429843 +0100
@@ -1 +1 @@
-From 323e8c91a7c434915920fe8668ca5664b65ea198 Mon Sep 17 00:00:00 2001
+From 63539e77be9aef61f4aa01cf74dda54f75067281 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 323e8c91a7c434915920fe8668ca5664b65ea198 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index f122dfd516..d1fac667c2 100644
+index e06d40f9eb..54cad56b21 100644
@@ -32 +33 @@
-@@ -662,4 +663,5 @@ struct axgbe_port {
+@@ -653,4 +654,5 @@ struct axgbe_port {
@@ -39 +40 @@
-index b03bc471cb..e1a737cf62 100644
+index 523b6c0f07..e573ecc4d9 100644
@@ -42,3 +43,3 @@
-@@ -358,4 +358,5 @@ static enum axgbe_an axgbe_an73_tx_training(struct axgbe_port *pdata,
- 	reg |= AXGBE_KR_TRAINING_START;
- 	XMDIO_WRITE(pdata, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_PMD_CTRL, reg);
+@@ -384,4 +384,5 @@ static enum axgbe_an axgbe_an73_tx_training(struct axgbe_port *pdata,
+ 		if (pdata->phy_if.phy_impl.kr_training_pre)
+ 			pdata->phy_if.phy_impl.kr_training_pre(pdata);
@@ -47,2 +48,2 @@
- 	PMD_DRV_LOG(DEBUG, "KR training initiated\n");
-@@ -488,4 +489,5 @@ static enum axgbe_an axgbe_an73_incompat_link(struct axgbe_port *pdata)
+ 		reg |= AXGBE_KR_TRAINING_START;
+@@ -520,4 +521,5 @@ static enum axgbe_an axgbe_an73_incompat_link(struct axgbe_port *pdata)
@@ -54 +55 @@
-@@ -968,4 +970,6 @@ static void axgbe_check_link_timeout(struct axgbe_port *pdata)
+@@ -1000,4 +1002,6 @@ static void axgbe_check_link_timeout(struct axgbe_port *pdata)
@@ -61 +62 @@
-@@ -973,4 +977,25 @@ static void axgbe_check_link_timeout(struct axgbe_port *pdata)
+@@ -1005,4 +1009,25 @@ static void axgbe_check_link_timeout(struct axgbe_port *pdata)