From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6843B45804 for ; Fri, 23 Aug 2024 18:20:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 62C184336F; Fri, 23 Aug 2024 18:20:38 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id C78224336D for ; Fri, 23 Aug 2024 18:20:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GzB7xh4Bn9lKdYVCmsTlYT/Luuxcx3qauNpZY5mel8k=; b=cv3sFK/6mh4Jt+fHhMjynls/2HQz9RFMgsYcH2ee2gcu0Umx5Z/Yh0QIgE+FulB1RbgnM1 9UY5TplUizVgPpj14T3AoNulsKChliBrL3n7DghoDxYF5IemRHgI7uhZFk5ICVW6qbXTRc 1I5NEPg8+9vMQtWrcvTowcw1f5fLcnU= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-422-xbJy6KdqPxai1mF6I0lDCw-1; Fri, 23 Aug 2024 12:20:33 -0400 X-MC-Unique: xbJy6KdqPxai1mF6I0lDCw-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A53F51955BED; Fri, 23 Aug 2024 16:20:32 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 55C841956053; Fri, 23 Aug 2024 16:20:31 +0000 (UTC) From: Kevin Traynor To: Venkat Kumar Ande Cc: Selwin Sebastian , dpdk stable Subject: patch 'net/axgbe: delay AN timeout during KR training' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:17:34 +0100 Message-ID: <20240823161929.1004778-26-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 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 Acked-by: Selwin Sebastian --- 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@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)