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 0FA4C45610 for ; Fri, 12 Jul 2024 12:50:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 094BD402E5; Fri, 12 Jul 2024 12:50:01 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2079.outbound.protection.outlook.com [40.107.96.79]) by mails.dpdk.org (Postfix) with ESMTP id 3B7E040261 for ; Fri, 12 Jul 2024 12:49:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xZPF7+0Ou/LE7AeR4QfS4PZUUl5u7cMxvVaCXmNhv1sSIfEgwID6KA9valJcc4kzlmm6rUWP166326rj8xTRcRBCe7iJdCzuBtxb69F8zHKN6WrWJa6l5vtWnDGqMm1OkUvjo159YEaWx1ZayassIHLkPFH7E9nfTfET7T6g4Jb6bzNuL7ZGrz+Pvk2WfRqQVJINKWP4eIHwXoYWaaYvOLDrqa62lLfgfGXk3gFay4VMPmQFoV3Bwnm2jV2/SoBri4wuUzAl8se9ZStBXKXAoKfO5OG4kh+rWQIQZJmwymhVPAZUowq8NF9oGKZNrJg/FmhLb/IHNYaAzvNlwidZIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wDIelkw9LwSaZntx9vseuIi3fk8t8CaCyLaiBVW5tLY=; b=sxmI/+3axCjqxISJ5EZR5fGlmbCRk8Uxs39VsoFR5/xs/XIbmSnU0Mp9nudQ11Lcf9kk3FENiAGtkh3IOiPqe11MzV6zdd9AZXJH2ncMPDt8xA1q5MqTC2JA2hxnt1TfOVA4xe873dOF/C7k4RcK8kktMSf+GvnAUPewmbhSGhUTgtFDIN8s1VmFCtZC8TehfB4w1ci0eH0UCYHqFBbxHUtHezFPhDUnNZe6pldwA7M8VghSNOYLioN9+rehF0kvfcwkwp+e5wqcvBde6S/ldbG8BwVxlCsBag9dBaTABa5PP1HM8fya1xrCl8pwblS0lBpqGiz/6/9Nz5+c2izKUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=amd.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wDIelkw9LwSaZntx9vseuIi3fk8t8CaCyLaiBVW5tLY=; b=tV3jUv3tzXscLMR08/Jq2+3rxU/P9tXXxrmBb1zP9hGaDgYsogN55GfPGSSDKlhzvXcTSqFAGaqqPrIt3JNi8tjb5/U2QZYZt8XCABieFqjAu0Ch45qW+sVRddCYQOqJ4UJRmtWl0mhFNwmKXk5J4MuaUxTrlWaS2KFXEMrINmF6wGNiQdpXdGxsc6eTpefFAla56DUFBDBpwMxkEBJSpYiCd9RqnCmtc3vlZ7yuuFXVc5pLHxTB2XnN9iYxxeKoz/GpVjlWbi0P8Jl/4S9M4hHxc+6KX7iXEjb4h6ie9+OdRCsXxEPDRHOFd0e+T80lnQhXpsTUPkTb0W52pfbk1w== Received: from BYAPR02CA0056.namprd02.prod.outlook.com (2603:10b6:a03:54::33) by CH0PR12MB8507.namprd12.prod.outlook.com (2603:10b6:610:189::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.29; Fri, 12 Jul 2024 10:49:56 +0000 Received: from SJ1PEPF000023D6.namprd21.prod.outlook.com (2603:10b6:a03:54:cafe::ef) by BYAPR02CA0056.outlook.office365.com (2603:10b6:a03:54::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:49:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ1PEPF000023D6.mail.protection.outlook.com (10.167.244.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.5 via Frontend Transport; Fri, 12 Jul 2024 10:49:55 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:49:42 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:49:40 -0700 From: Xueming Li 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 23.11.2 Date: Fri, 12 Jul 2024 18:44:26 +0800 Message-ID: <20240712104528.308638-41-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000023D6:EE_|CH0PR12MB8507:EE_ X-MS-Office365-Filtering-Correlation-Id: 199fc60b-94cf-4fd1-2291-08dca2605e08 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?PayFfVDGHM06Tg7L+CrBajKRHN1t+yjFNr780cDY3RVWDSDsQY9CIeH0RNj2?= =?us-ascii?Q?pM3Dpdmsiixr4UgcEoWYBkn/F8iCAcoyFPkDIgK8324NwfCtL8hOJtt1RGbO?= =?us-ascii?Q?YAC1mccvTNewxETFUWpZtfeYRwKQfsYihDzMmEKbN9f2kBWc0/IzLx1MV5S4?= =?us-ascii?Q?TyF0PA9kDg/1j/yVX3cqkdvdc1VNR5irUb2OrRc26TL35uY7xQcTGz7RLp6J?= =?us-ascii?Q?9tQnpsKF/1YxQSfXR9xJW22+sSe3g2+2zRq2LxXvXbYtLot2ROxk1TXj79eG?= =?us-ascii?Q?BEsFGij7YaucEHl5JPR7Ym41iDnDf5gkJ8huytY2acpgZ+ayD7yYNqryBsyI?= =?us-ascii?Q?VhkGqzrbF2egsKaCB164P84Or/oBGc6Lr851AjYj8NHaYlOZ0paiYySeknxe?= =?us-ascii?Q?5ud7/1bKux/HS4q8Tc+N0vuaJ6Imcdud1s35vQFUj7JHhIbbY4BZ3Qr8TXp5?= =?us-ascii?Q?BrnXK8jGKAUn7y8mlddpSQBCw49SngZ28/pbN0HAgYwcRTvq05hGiSfDHaHr?= =?us-ascii?Q?xZWnac176tvINRpQROLWcJik68dntPOo0d0hVSHekPylLF7V3zzumAhjWGIn?= =?us-ascii?Q?KDHtry94v5V9prFCGI/klFUheplK3UOvIdasiGvQaD/Y3qGGSq/bN25AiDA5?= =?us-ascii?Q?V5Otw6A+xoqbnLIJyuV6MtVey5FnhLiKNnVGg9kiMoZpMs9S3LTKcXiwG24+?= =?us-ascii?Q?aROgtk4Np6/1SvlIP9QA0jFzVKzTsIXteJC9gpEW49Z4w2vw8N++7SuORSNQ?= =?us-ascii?Q?S2bdY2vccpgNOlNfVTumymzv3/ccZ3NWv7ItUtGTzoStWXfN+/4E3JXYHz8W?= =?us-ascii?Q?1Bbm0lWxmGSy69chRJX2BEQ7lbHA/3tOv8mR4KlEePYUlkZGw7jz1is8qZnB?= =?us-ascii?Q?wOYqqi1NTdjyGEJ/zdu1QSil331zwzAbn/MlEiXrITIpb8kqjy/6HZfXGbR2?= =?us-ascii?Q?kLO+TE9Xwsi5vT3JJX3PyYZcx+ugVfwI4sMag+vLDdl01ThwiXUyqzf/OqP+?= =?us-ascii?Q?KnNc3Ah8TXpxS+IcS3yOaby89a8OzheeG6WWXUSqfgnZOb4c2M1W7Lhpk9Wa?= =?us-ascii?Q?RcrA/fUGFqZ0TqEN1MLS55ZhMVK823MNoTgQQUtack5JdIoxSRSZdR5bzqty?= =?us-ascii?Q?AId+zBvZFsfIF1cJ5ZzN6BhFAwLDJvMcwhrPxd1dIe0VtWsCfNsuHXm4E+1B?= =?us-ascii?Q?dgHFR6+eg07RF2lQfih6ULv8wW+8lRhCeGz3OOel0v54YkZRPi/nylPfnjzn?= =?us-ascii?Q?+x/31TOOSd2DudnNEUfsWUy/GA8hsg/qeHhEHeqf6K1SXPQhsGYVMbY/Ie/G?= =?us-ascii?Q?ybkGDp9iD7wzCcAKoFcV2AvJH3iPpyOSavHG0X0gUFJClyJ/wivkadLiMzc8?= =?us-ascii?Q?5yClFSy+MYCrLUDJYDoIWXk9Voe86eEfUFqFkvXDi430jV5ymv7aUt0skYiP?= =?us-ascii?Q?Zi9c90doxI6+IMdVoJS2H7pJbqx8gcQU?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(1800799024)(82310400026)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:49:55.7606 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 199fc60b-94cf-4fd1-2291-08dca2605e08 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000023D6.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB8507 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 23.11.2 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/14/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=fb6d056d538f8e72d043b7144e3630535f23798e Thanks. Xueming Li --- >From fb6d056d538f8e72d043b7144e3630535f23798e 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 Cc: Xueming Li [ 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 ae57aeaa00..b4bd56e239 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)) @@ -654,6 +655,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 b03bc471cb..e1a737cf62 100644 --- a/drivers/net/axgbe/axgbe_mdio.c +++ b/drivers/net/axgbe/axgbe_mdio.c @@ -357,6 +357,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) @@ -487,6 +488,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; @@ -967,11 +969,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 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:15.961564604 +0800 +++ 0040-net-axgbe-delay-AN-timeout-during-KR-training.patch 2024-07-12 18:40:14.016594238 +0800 @@ -1 +1 @@ -From 323e8c91a7c434915920fe8668ca5664b65ea198 Mon Sep 17 00:00:00 2001 +From fb6d056d538f8e72d043b7144e3630535f23798e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 323e8c91a7c434915920fe8668ca5664b65ea198 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index f122dfd516..d1fac667c2 100644 +index ae57aeaa00..b4bd56e239 100644 @@ -34 +36 @@ -@@ -661,6 +662,7 @@ struct axgbe_port { +@@ -654,6 +655,7 @@ struct axgbe_port {