From: Venkat Kumar Ande <VenkatKumar.Ande@amd.com>
To: <dev@dpdk.org>
Cc: <Selwin.Sebastian@amd.com>, Venkat Kumar Ande <VenkatKumar.Ande@amd.com>
Subject: [PATCH 18/24] net/axgbe: delay AN timeout during KR training
Date: Fri, 12 Apr 2024 08:52:43 -0400 [thread overview]
Message-ID: <20240412125249.10625-18-VenkatKumar.Ande@amd.com> (raw)
In-Reply-To: <20240412125249.10625-1-VenkatKumar.Ande@amd.com>
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.
Signed-off-by: Venkat Kumar Ande <VenkatKumar.Ande@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 127427c736..4dcbf6d9a2 100644
--- a/drivers/net/axgbe/axgbe_ethdev.h
+++ b/drivers/net/axgbe/axgbe_ethdev.h
@@ -111,6 +111,7 @@
/* Auto-negotiation */
#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)
#define AXGBE_SGMII_AN_LINK_SPEED (BIT(2) | BIT(3))
@@ -689,6 +690,7 @@ struct axgbe_port {
unsigned int parallel_detect;
unsigned int fec_ability;
unsigned long an_start;
+ unsigned long kr_start_time;
enum axgbe_an_mode an_mode;
/* I2C support */
diff --git a/drivers/net/axgbe/axgbe_mdio.c b/drivers/net/axgbe/axgbe_mdio.c
index 4307a7560a..9fe30e83bc 100644
--- a/drivers/net/axgbe/axgbe_mdio.c
+++ b/drivers/net/axgbe/axgbe_mdio.c
@@ -370,6 +370,7 @@ static enum axgbe_an axgbe_an73_tx_training(struct axgbe_port *pdata,
reg |= AXGBE_KR_TRAINING_ENABLE;
reg |= AXGBE_KR_TRAINING_START;
XMDIO_WRITE(pdata, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_PMD_CTRL, reg);
+ pdata->kr_start_time = rte_get_timer_cycles();
PMD_DRV_LOG(DEBUG, "KR training initiated\n");
if (pdata->phy_if.phy_impl.kr_training_post)
@@ -500,6 +501,7 @@ 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);
return AXGBE_AN_INCOMPAT_LINK;
@@ -988,11 +990,34 @@ 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 *
2 * rte_get_timer_hz());
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.34.1
next prev parent reply other threads:[~2024-04-12 12:55 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-12 12:52 [PATCH 01/24] net/axgbe: remove use of comm_owned field Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 02/24] net/axgbe: remove field of SFP diagnostic support Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 03/24] net/axgbe: improve SFP 100Mbps auto-negotiation Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 04/24] net/axgbe: check mdio for non-zero ports and CL45 PHYs Venkat Kumar Ande
2024-04-22 15:21 ` Ferruh Yigit
2024-04-12 12:52 ` [PATCH 05/24] net/axgbe: remove unnecessary conversion to bool Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 06/24] net/axgbe: reset link when the link never comes back Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 07/24] net/axgbe: check fluctuations for 1G BELFUSE SFP Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 08/24] net/axgbe: update DMA coherency values Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 09/24] net/axgbe: disable interrupts during device removal Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 10/24] net/axgbe: yellow carp devices do not need rrc Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 11/24] net/axgbe: use definitions for mailbox commands Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 12/24] net/axgbe: enable PLL control for fixed PHY modes only Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 13/24] net/axgbe: improve the SFP codes check for DAC cables Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 14/24] net/axgbe: improve logic around active and passive cables Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 15/24] net/axgbe: check only the minimum speed for cables Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 16/24] net/axgbe: add support for 10 Mbps speed Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 17/24] net/axgbe: flow Tx Ctrl Registers are h/w ver dependent Venkat Kumar Ande
2024-04-12 12:52 ` Venkat Kumar Ande [this message]
2024-04-12 12:52 ` [PATCH 19/24] net/axgbe: separate C22 and C45 transactions Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 20/24] net/axgbe: replace mii generic macro for c45 with AXGBE Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 21/24] net/axgbe: add 2.5GbE support to 10G BaseT mode Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 22/24] net/axgbe: add support for Rx adaptation Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 23/24] net/axgbe: improve the false linkup in axgbe PHY status Venkat Kumar Ande
2024-04-12 12:52 ` [PATCH 24/24] net/axgbe: extend 10Mbps support to MAC version 21H Venkat Kumar Ande
2024-04-22 15:12 ` [PATCH 01/24] net/axgbe: remove use of comm_owned field Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240412125249.10625-18-VenkatKumar.Ande@amd.com \
--to=venkatkumar.ande@amd.com \
--cc=Selwin.Sebastian@amd.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).