From patchwork Fri Apr 12 12:52:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkat Kumar Ande X-Patchwork-Id: 139267 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 059D943E52; Fri, 12 Apr 2024 14:55:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 744B7427E5; Fri, 12 Apr 2024 14:54:34 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2082.outbound.protection.outlook.com [40.107.236.82]) by mails.dpdk.org (Postfix) with ESMTP id 45BA9427E9 for ; Fri, 12 Apr 2024 14:54:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DxAEFazJE37hT04U6AruuD6JZxNXKGzNtXYFoRRq/jugxBXWcPbQlZhHT9JcG9rF5JCAC9phsqPFc7ArZE9T52c89L9kg8hjpez2OSC/AX4u0hdLoOIrM1THXDFg1AnkLnsvrqKwMLm/ZeIKdl9j91dq4dNBar8sCWA7pwGOP3NgDEMEWMXYsYkc6+PZQc0adCs/Df4SiNhcmMeoxAGBGAI4hv2xGf2mmChZwGscXxg9K5shXa8IENL/MrPjMzzj01sNeMBybtAPYngnWk+g/jQ26Q78+zM+wvcWPw9S20JaaRTCO8OTipxmS8bVpZSYX3cWMA0TOyH3KSYmiYrWzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=LuVEF6kXdMf+WVrBmtxOexXN/dF9sBPZXmTCZQms9EY=; b=JyaF9/fPVUwp511Ze5ujSZzyAwudPiNODQWQ7lDROHf1p8Ycg/kbKRB0PTKqFiby1SV4Hky5YhEO0C1kmFcAXCrSHLUhVO3D0M3Bl52a+OEOCI4UWcQwEjFmjKYJuiC2k802qEJHSRogt+G/HHztJKP3v8/kn+jtTBjw5q0IpfXXieq3xQSDFrTKJjKSRVXprTBlBcPVJSdtTN6rCb5Hwp/+xFDbLnE2pNWR2Uw+B8qlkYC65fnbVYX6SiYeSicSdOsnaIWJPqxHCUCbHX2sJ+B0jszY/GoeJiV7qXQvYfQF+elUB6IZqca9/0oDS18EKy43u94HzZldLyxi8+d6KA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LuVEF6kXdMf+WVrBmtxOexXN/dF9sBPZXmTCZQms9EY=; b=bQnXYCTciwV4PBAUbAfcYYgeq6q66JSt5r3YsZCLkzWTI+4XdiIwc9nf5sC3zs2hJPoBaQaeu/i9jLU7xljeiTYso//ew2Q6fHMX3d4GxG8owBLjEsDVQZZwQbA1yzBVodFwOwdudPnAbeoZGcPEyA1ktwaVWkcF7SDE672fjgs= Received: from BL0PR05CA0029.namprd05.prod.outlook.com (2603:10b6:208:91::39) by CYYPR12MB8703.namprd12.prod.outlook.com (2603:10b6:930:c4::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Fri, 12 Apr 2024 12:54:26 +0000 Received: from BL6PEPF00020E5F.namprd04.prod.outlook.com (2603:10b6:208:91:cafe::b5) by BL0PR05CA0029.outlook.office365.com (2603:10b6:208:91::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7495.12 via Frontend Transport; Fri, 12 Apr 2024 12:54:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL6PEPF00020E5F.mail.protection.outlook.com (10.167.249.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7452.22 via Frontend Transport; Fri, 12 Apr 2024 12:54:26 +0000 Received: from cae-Lilac-RMB.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Fri, 12 Apr 2024 07:54:15 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande Subject: [PATCH 18/24] net/axgbe: delay AN timeout during KR training Date: Fri, 12 Apr 2024 08:52:43 -0400 Message-ID: <20240412125249.10625-18-VenkatKumar.Ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412125249.10625-1-VenkatKumar.Ande@amd.com> References: <20240412125249.10625-1-VenkatKumar.Ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF00020E5F:EE_|CYYPR12MB8703:EE_ X-MS-Office365-Filtering-Correlation-Id: 893ecbff-578c-406d-9561-08dc5aefaf2d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ByisdFapkK6sjgUzT3swhf/GAuKEbYyoY1NCDYfKkuuow601lJnx0uA479jsLFlnwxln0fH+EUT+gCajqSKAt0gSIM9pH04uqMzxs9WOJTY1UGzh/+lCLln2FL8sg1b8kIS0hlmFB0GnU13P0fMcvWiTlDKmWPgiacueXj7f5SAa4Ou/q1tr41teYu/G7Sj/6E2smVEDcjlfhuYKEUFzyH4XWeXaZwSLq4uYzAjxHpIORk9BGUqYJvAR1RqBzgaN8TkaC0w0FPyY7FMxvtMNrkULGuYMj63nc+yesoIEdhbUfCBv9rEI21f2pyGWbwpF0krBl8LddBLT5b1YMp8QmHy2A8n/8X8TWv7d0jlTYvvljzLE/d0I0eIlYhWh9JdvKdCEyhKm1METUk8Wp+99HpW8XS4+78rxGVbAso6GJ+DHZ1EKEfWVxN7n7eZjpIYlwWPE7E6frm+ZsTycjN8KdJm0l9KfKUUycY+1rwNtBSHm4c1G3k180YNKRN8VPfFF+q9Yhi3PCaVtohnFvQMeZao9rqGWGtnlHvPpifI0rU7IDLrEShLmm5KW4eeC2FO5PqjIFsSzzi2bgGU8+H9XQsgIq9focukSSWGqwm1AEGdkSjtReLjjrKN9Y8t9AZzVhdHSyQQe4RCid8KS/b/510481T59q3evf/4IE7jjXMlSdo9G4PXahq6X0rxlXK3gC3FY1dKUAyXUVXJTXhVy1GThTkTrLzib9LJ5SP1t1fm9QIoFO+LEncpt626V+Mgf X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(376005)(36860700004)(82310400014)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2024 12:54:26.1982 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 893ecbff-578c-406d-9561-08dc5aefaf2d X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF00020E5F.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR12MB8703 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 --- 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); }