From patchwork Tue May 7 12:42:41 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: 139964 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 432D143FC9; Tue, 7 May 2024 14:43:39 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2CD5543389; Tue, 7 May 2024 14:43:35 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2048.outbound.protection.outlook.com [40.107.236.48]) by mails.dpdk.org (Postfix) with ESMTP id 1749543385; Tue, 7 May 2024 14:43:34 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OUaESd3z88xjkIhrxRRZBzltpi0vd2UX7Q4opfN3QkdPHIYdoO+gqg5763xs40Si96D2fGYsnpSo5wGZAerztL2R/+8Aov7U2oeB5C/WL9JVHqggbWpahIihme82W4i/JbAEcYzpHl+Gr4s9CqZ9U1svJd7vxrn5lJLGxNOAjfaGzYQXw5ziVyWrELB9gq4e6mAZmu4sL5Bzw3SipL59iyI408wHefyOWz7TWbJRaQ+tdcJVsx2+LGd23kEODaN1yq7MkFwTQv4M394q4FKEHIMWn5QL9XNRsTKv2aWzCQVoY0z803EXMSrApi0I1Wlu4PGkHD5m8mSwVvwkqvxhVw== 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=gUZVdb0/EQ7+imRhY4rHHWLRz/PndfPyNZ64yYeAcQ4=; b=Up98WR9H8ZnuCrTfShVb+3nKKrC5BYyq/yN5WL5O2XNKouB2zJ+ic/63W4Y+l6Fq9evBZboBph5HHEGLb5acBe88jQO9NMQM0ZKBX58WDX1H2KYY53+xr+/7sVTbk6vqkBC5npwlDoazW6vUPFdmhTLYMLZVWdp8tKxY4yRINGziCJtKC1YiLbb2xE6Uzkwx5ttOihgNLRdWd3NoIHAYmCpGAWckbr8/DvX1xlB9PWi9x2vwTJ/sXSYb3v8f7NSJthpHUmYiTZ6zCHh4Ddom94AcnmeV1dvuo89sYFQmjP2PDQ10sMPdB7k/6DvwXQNChUiC/KWSD5lUx6+mb/DFaA== 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=gUZVdb0/EQ7+imRhY4rHHWLRz/PndfPyNZ64yYeAcQ4=; b=wzmHBp4KdQ3sgaS/HTq+7qNKV29ZqjRmxEPhPrIQBmp76xsSSMrr8PVfhONxTGIpOCtt2jDHvqRq8uzNRpuyM6gPWFERXbKWNbtOExjkz10vnMqqEgP8+stgP4XN1c5TgxmyT5zyA15jgOVVOPLrjggU/ngPH+8gEmKcviQC4G0= Received: from PH8PR15CA0015.namprd15.prod.outlook.com (2603:10b6:510:2d2::23) by LV3PR12MB9260.namprd12.prod.outlook.com (2603:10b6:408:1b4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42; Tue, 7 May 2024 12:43:29 +0000 Received: from SN1PEPF00036F43.namprd05.prod.outlook.com (2603:10b6:510:2d2:cafe::4) by PH8PR15CA0015.outlook.office365.com (2603:10b6:510:2d2::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.43 via Frontend Transport; Tue, 7 May 2024 12:43:29 +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 SN1PEPF00036F43.mail.protection.outlook.com (10.167.248.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:43:29 +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; Tue, 7 May 2024 07:43:27 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande , Subject: [PATCH v2 01/25] net/axgbe: fix mdio access for non-zero ports and CL45 PHYs Date: Tue, 7 May 2024 18:12:41 +0530 Message-ID: <20240507124305.2318-1-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F43:EE_|LV3PR12MB9260:EE_ X-MS-Office365-Filtering-Correlation-Id: b5accf6e-952c-4def-dd4c-08dc6e934bd1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|1800799015|376005|36860700004|82310400017; X-Microsoft-Antispam-Message-Info: UpAupvoYrjS4KtyMf1TiK0DshHfqjWKEbHLzl+qdF8pU5okxyGgR3xZ4wkQFIXO9ISMSow8cUAUn3Bmhe6a6QTPbTYYBFLNScIXX99dx7Kd0M50umcVdyPxHN2nUNmDNvWOdK0cVEQuq58z8a+ot8JBGRTibXwwUZ5S+FKyYswiLeFN1QCT2FAh5yEeMZ52bZjSZYeMpwDmo0b0u8Sa1H2d9wywJlhUbj2GwR91eRwwCuwKciqZxDGG5XWiXHALTHGbURK3gLdjqlTxtUnE8fzhSOKMgSX9+fGDJ5o5guZal9yvdhOY6a1wAIH08cjiUuWlwL0QyDyAsfuLqY50v3RFdLKXXgkxrcIF3QC/hW55vfpokXMCxYobWiBPifTb3S6cbMph6tOgwxB8l5UN1NqEkjbGiPmFFM2kW1iSCsGXqBqaEe397qrVtND3u7tMl0XZ9WZlYW0CvQqkE50hdZDUqq9p68ivwColAfbKewzS5NU4QQx//setglVkl8eTwu9fnjmt/UrMscB3s2xi4UID2Ls2DkbPISnd6RVnOfsHKcAQXgruYZ6rp7AhAvLOaV3AxWCbnOIG4CGCmFfu3n18zjciPFP+FiRixmoD9331YaDmCI2IzPDeQippI4uCy4YN72aF5zXUwXxyd9lqHt9TK7m+j+gBcJz4kmpqkRRFLnMVDjj3PazzTN5UBX2DFBMe5ADfujhL9gHy4a5ysqnaP8517urV+gtLZVRBHDBaHFd0Krsf/P2oikVHKKkzXyKPArLTTMYRT0xf+W5tmC/2ArxK59P3a0GvT53Npde6VFgZsE3RLZje42cqxdzjfQYtcK+zVJGqePRt9AwyPyx4dg6qbqNpjOOx9m7EdgTD712t7dQ/GuS7Iq6Axz9W7ldF21/M79NeBBavKLD5J9dzMHbrJOj5OryqzNKfcpeKfqQdLw26t9iaMHyKxIfahWXX9mvSgIGQ0nUX3hSWRvVJ6m6mB8xFqWGm3Ld57vtssnA1kY3nRz3zbPQN/nJ1bTeXS49wsDOwMLfhcXjHa+l2sY8xJRLoOkLY9B4LvvSycTof3A26XnH8rtv0udeYT9C+XVDoDaV5AlrIRNqTzxGfyVLAzdXT4T3L7JLLR1zbnY1Md0wIugDH8h0J+w8vfQbp5sZAqewmXuRTaazGNytOLz4Dti86SHJ/aSRq0DmePvKULmvvEmRz6cBymja2ZsvvN1E5iTu6PfS8P/7v+yStOveFIUcQH5JZ98lqu2AvTSBxzJgAkrFI62V4rdMlGW6V6l4e+EQEGbYpUQvSCwI42Ob/yeSiQA84NpesLS2gmeDzV3RnwxQ2vFujQzaPTxx2cFjQB+0Vx/PB6p1Fg1duT9DpfK1aUjaNtGSmjMDhkDY/A36CLF02lK1851cpc 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)(1800799015)(376005)(36860700004)(82310400017); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:43:29.0279 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b5accf6e-952c-4def-dd4c-08dc6e934bd1 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: SN1PEPF00036F43.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9260 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 The XGBE supports performing MDIO operations using an MDIO command request. The driver mistakenly uses the mdio port address as the MDIO command request device address instead of the MDIO command request port address. Additionally, the driver does not properly check for and create a clause 45 MDIO command Without the fix user will get a incorrect value from PHY device. Check the supplied MDIO register to determine if the request is a clause 45 operation (MII_ADDR_C45). For a clause 45 operation, extract device address and register number from the supplied MDIO register and use them to set the MDIO command request device address and register number fields. For a clause 22 operation, the MDIO request device address is set to zero and the MDIO command request register number is set to the supplied MDIO register. In either case, the supplied MDIO port address is used as the MDIO command request port address. Fixes: 4ac7516b8b39 ("net/axgbe: add phy init and related APIs") Cc: stable@dpdk.org Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_common.h | 2 -- drivers/net/axgbe/axgbe_dev.c | 22 ++++++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/net/axgbe/axgbe_common.h b/drivers/net/axgbe/axgbe_common.h index a5d11c5832..51532fb34a 100644 --- a/drivers/net/axgbe/axgbe_common.h +++ b/drivers/net/axgbe/axgbe_common.h @@ -407,8 +407,6 @@ #define MAC_MDIOSCAR_PA_WIDTH 5 #define MAC_MDIOSCAR_RA_INDEX 0 #define MAC_MDIOSCAR_RA_WIDTH 16 -#define MAC_MDIOSCAR_REG_INDEX 0 -#define MAC_MDIOSCAR_REG_WIDTH 21 #define MAC_MDIOSCCDR_BUSY_INDEX 22 #define MAC_MDIOSCCDR_BUSY_WIDTH 1 #define MAC_MDIOSCCDR_CMD_INDEX 16 diff --git a/drivers/net/axgbe/axgbe_dev.c b/drivers/net/axgbe/axgbe_dev.c index 6a7fddffca..3389954aa6 100644 --- a/drivers/net/axgbe/axgbe_dev.c +++ b/drivers/net/axgbe/axgbe_dev.c @@ -63,15 +63,27 @@ static int mdio_complete(struct axgbe_port *pdata) return 0; } +static unsigned int axgbe_create_mdio_sca(int port, int reg) +{ + unsigned int mdio_sca, da; + + da = (reg & MII_ADDR_C45) ? reg >> 16 : 0; + + mdio_sca = 0; + AXGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, RA, reg); + AXGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, PA, port); + AXGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, DA, da); + + return mdio_sca; +} + static int axgbe_write_ext_mii_regs(struct axgbe_port *pdata, int addr, int reg, u16 val) { unsigned int mdio_sca, mdio_sccd; uint64_t timeout; - mdio_sca = 0; - AXGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, REG, reg); - AXGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, DA, addr); + mdio_sca = axgbe_create_mdio_sca(addr, reg); AXGMAC_IOWRITE(pdata, MAC_MDIOSCAR, mdio_sca); mdio_sccd = 0; @@ -97,9 +109,7 @@ static int axgbe_read_ext_mii_regs(struct axgbe_port *pdata, int addr, unsigned int mdio_sca, mdio_sccd; uint64_t timeout; - mdio_sca = 0; - AXGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, REG, reg); - AXGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, DA, addr); + mdio_sca = axgbe_create_mdio_sca(addr, reg); AXGMAC_IOWRITE(pdata, MAC_MDIOSCAR, mdio_sca); mdio_sccd = 0; From patchwork Tue May 7 12:42:42 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: 139965 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 E65B843FC9; Tue, 7 May 2024 14:43:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CC08043392; Tue, 7 May 2024 14:43:46 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2088.outbound.protection.outlook.com [40.107.220.88]) by mails.dpdk.org (Postfix) with ESMTP id A80884338E; Tue, 7 May 2024 14:43:44 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iVUKFrZu9pNW1AkXQAwkvAZieC7se+qfD9+tFg+JCq8Ph+aBQlGgvx6fHOdDMIeFEFwyLZ2EDxAIRek6zjoevqHTPqfa+ncu5myNIRmbSlDLA4Y7opZPq5tPHj/76U+VnfHtvaodadmMgqi3v/U//c0xa2d99Zri15fWu9hDVyWTwqe4ZUrxocWMPVMucxjiaNuZeXRqWzphmaFPAuw8cV5HFMS13+ds/ufCELuyf3SxOgCKO98ufgbGKvu7nl5W7b4yn5tkR4/TUPtYLOwLDLiZy4LyR+2sgHtWGl43GA6PB/tY7+rOxanKb7/ISb8QFSyBGyMZDjg8csR7JcO/ww== 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=mai416eg24Sohql0vZV4j8PZvzCDit2VkFpMvEdjIsE=; b=hMHyAHXER/Ld1qdSqiM+V/qsUPISUXSMpnQLBhnYl6B1hhg8EMpoFQlY8o+3zwQPF1YFG/FldpXH1l16W2gEjNeUbUlD3s/o5gN9sozIcXy0AyTm0mBmd29v1BQfGkP13z7jWEM0K0R8tV36gaOxbvMRcmwd3ogVGEZTvCkG+Cgkpa979zr9npU5ZXUfKzWoStHJxXj1r6bzjGSgI6Tth1VYnJ7i3qlxX/FhlaKSXihinxiD+a5g7tDffyEOchJhifK9kIySD5mlgA9zZipfQrHsTZvH0k4IEjFFvDvJzkWvEk8dSWIAAuTKfLNaW6x57We1G8kc/CWmwnZbGRlFeA== 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=mai416eg24Sohql0vZV4j8PZvzCDit2VkFpMvEdjIsE=; b=My9JURk3Fz6KbLexyEhOx8QLW6sXZy2mvU+FoXCf2ZZHEzEyDP92RsD7K9juaXs5qF/+Ke7DpW82KUQgrdT4kK4izhz5tu2l2qrMwW1801raySTUVxxhGQQOJzLCaUJbY2dom0sx6SiOW/02Xo1NwNFMWvQBa40h5+cYjK2DLbg= Received: from PH7P220CA0040.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:32b::24) by PH7PR12MB5783.namprd12.prod.outlook.com (2603:10b6:510:1d2::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41; Tue, 7 May 2024 12:43:42 +0000 Received: from SN1PEPF00036F43.namprd05.prod.outlook.com (2603:10b6:510:32b:cafe::7e) by PH7P220CA0040.outlook.office365.com (2603:10b6:510:32b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42 via Frontend Transport; Tue, 7 May 2024 12:43:41 +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 SN1PEPF00036F43.mail.protection.outlook.com (10.167.248.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:43:41 +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; Tue, 7 May 2024 07:43:31 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande , Subject: [PATCH v2 02/25] net/axgbe: reset link when the link never comes back Date: Tue, 7 May 2024 18:12:42 +0530 Message-ID: <20240507124305.2318-2-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F43:EE_|PH7PR12MB5783:EE_ X-MS-Office365-Filtering-Correlation-Id: 946f1cf0-c2f8-4046-e5ea-08dc6e935374 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|36860700004|82310400017|1800799015|376005; X-Microsoft-Antispam-Message-Info: +0p2OqyY2Jp1CX20F2N6ixl/2Y8tva22XNpE9nmTtR6h+H6wotWO4ZKuQJ4RkVOSdYulNa2knXrXqdYTrCP6vESFJtgEQVBty7Da794KsJTb/BEWrDHmRKJvHXpeOrJXkq6zzZq06XqgcybjsOpMFt7bQ/LcNemPY3b5WdFrP1gTUy39aSDAIBJ+JLTf6irFBD9rqFx8RVl7Xa/K641m3svy9dCVI5RGSnN6GMcd3hu75FkRZ1ByvajDBWuMGehUb3p7pKvBw3/C5+682IFm+N/TK2ww30OMd+oIU/qnEXyEb+VQhgDVrC7+CNtLx8q23d+3JYXR43aoeHIoLsYrh7UiQ0+9req6OdtxL9hiaXpuVMVXs/qhTWb2gBNXsnyG4D1/XFZoDikVxV+hsyaPTIL6kmYabhpdA2Hz9wSGswffPtUikd0n39JStSVJ/k3pTp9MmPkFdWbf4b5pQccaYXSaDe2vAOhBXcV/uxhM+pCSt9eR8++/uy4m9BZmEWKagnioDg6Tgk5vkPEXftGs0wVFSxn3pQFarfDYAAjwDeFLmVr1Fg1ZoMxYgXatQX0/BiF7ZG4t0YocVCf3GgITQVDmzonGGOm+OimE/MhyktubiWQkG8Jb3+vO89TfxTUFN+Woo7/+AhsKc2WY/DNxRkHoB9wfzo+FcJQCbHr4HN0Ef7swvv0vO1g6CBOFA0jvP1yw9vwqIAGIxTZ9SefW9NXRDB5pDG163DXKOcC4GMVsHHNNuCJFAvnvVcuCbdrCqHod9a2ML1JObut4r8JF1L4UZ7rQTyFveiKKltqEpUF/c9RokQpsZcwPapDE8GrRoTXJum42vn3Q9Bh4SpfGCRiW6xKNhLVsWtor0zEVxdL0Z5rT3HbPjYNVEf3ocf4J3Jx09BgsaJ//itUg9er/29kAO3ym33xxEV34fLbSpQAQt7ZZE1kM1/Eyl/EEUFOAq5Z5PWR8MeuYgRRuoi9UmfL45X9GtC6aISj7CuGo6pi0VgLuozb5U/LNfG31Db2iH2PQBTIp54B7ePhk6IiAj+ltb8KcIg9OEypEWHRvzFwLbnWtdxaimZE1tNIJ7q/LgYuoRFLLJ05tfKTnmESRz3IMd0C4rUEcWNROGDMjTOCWphjyKUH+IMsRNFWn0A/8h36ny2NoOuidpYs56HDAUGHuxc4nYQ5JIEwPVgv5jv6DKh+CEZV+1xumbaJWDdWHVt3bMCunvo6atWa87boFL9QoScFQSCMWxn0MeQLh2GSc7c0TQDYJH/pDxHNcV5grd57+903eWc/SOBa6BIh3j8sQD0OpUpKaIkJkgnFMaRtPWWwyFhN9Gco4IMUv+PgBSiEG4XVKDnnmcSSk/AEWgOpZ1LC0332rGndTHO769e1zEPMJxAdBOAbiWyt5Vz0W 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)(36860700004)(82310400017)(1800799015)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:43:41.8560 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 946f1cf0-c2f8-4046-e5ea-08dc6e935374 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: SN1PEPF00036F43.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5783 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 Normally, auto negotiation and reconnect should be automatically done by the hardware. But there seems to be an issue where auto negotiation has to be restarted manually. This happens because of link training and so even though still connected to the partner the link never "comes back". This needs an auto-negotiation restart. Without the fix the user will not see the link up status Fixes: a5c7273771e8 ("net/axgbe: add phy programming APIs") Cc: stable@dpdk.org Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_mdio.c | 2 +- drivers/net/axgbe/axgbe_phy_impl.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/axgbe/axgbe_mdio.c b/drivers/net/axgbe/axgbe_mdio.c index 913ceada0d..b03bc471cb 100644 --- a/drivers/net/axgbe/axgbe_mdio.c +++ b/drivers/net/axgbe/axgbe_mdio.c @@ -1051,7 +1051,7 @@ static void axgbe_phy_status(struct axgbe_port *pdata) &an_restart); if (an_restart) { axgbe_phy_config_aneg(pdata); - return; + goto adjust_link; } if (pdata->phy.link) { diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index 44ff28517c..54fe9faae0 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -1697,6 +1697,13 @@ static int axgbe_phy_link_status(struct axgbe_port *pdata, int *an_restart) if (reg & MDIO_STAT1_LSTATUS) return 1; + if (pdata->phy.autoneg == AUTONEG_ENABLE && + phy_data->port_mode == AXGBE_PORT_MODE_BACKPLANE) { + if (rte_bit_relaxed_get32(AXGBE_LINK_INIT, &pdata->dev_state)) { + *an_restart = 1; + } + } + /* No link, attempt a receiver reset cycle */ if (phy_data->rrc_count++) { phy_data->rrc_count = 0; From patchwork Tue May 7 12:42: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: 139966 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 5E9AA43FC9; Tue, 7 May 2024 14:43:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C40AC43398; Tue, 7 May 2024 14:43:48 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2078.outbound.protection.outlook.com [40.107.220.78]) by mails.dpdk.org (Postfix) with ESMTP id 3941B4338B; Tue, 7 May 2024 14:43:45 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bkK4VO/CcIrqslW7FEt1t2JrRfYuvA/U5mGYPqpJ5Hxyv5P87myBJe+0cXqYRHQcei7JUya6nQrlJVynhGRsRDm7x4MlSINphsUgprKzac9cYKUULBaZCxvlkZhnKFxHPbmlxM8gTtW/wlWDobSiMDBKbwrsSaCe9vQzXdywuXXB0z+nn7qjo+swkZU6wTyAIj6fe8hdVt8mrLrR/377bLLQ8wJ2VMHq7hHCUvnBxg1b0Av9bnywVlPevvhzqeBzIKvzsXLBbrTklQaQZFm4qJr5aXWU1envCCUoN2s/0Bm84e9ZxcyHCCE29xYzSZ6ce9MBZ5IHe5FdUlHh/dErYw== 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=85y1OWZ5bRELxKztXVFOi+N3mU8TwOZVpw59DIX4Nwc=; b=VEYHN4czI2i8SK18VUyGjDrWur+H2YkFylxQ1jPPgrr/TN/+URClnS91pWmUv6JAUaefJyOKhQu/j1Sfb7K8lizjLg03rq83nfhXkXHNReUEcXUot/0aGEkJqS5pWlOjHhjm4ybRljDOrhusuDS4tbNF811vsnspivS4gePEiy9wB7RpfTI9ts2llvQfJE085JwCNuKXODXdDuZ86QjijhQ2/Hi9CNr8ZlAqDZJZ7oYGnCSNKAKxLGgGIrAziSGn39cXFDr7qyrdWgAg7iZh8dGQVGpJhO8jmm0w3WKRpERrlSx+YFRCyvgFaUj5Ku+DN8pC/iewoujYipQJWHxvVQ== 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=85y1OWZ5bRELxKztXVFOi+N3mU8TwOZVpw59DIX4Nwc=; b=Y/xPfiB+i9nhIOf4wMQ6aVgPa9Ld27fEteyue+3irD3GuH3XbRacbuTwgoe2Nw1RdEyMINjAUEW023Gz0FCJ1mjiyMXyLJnvIDREg6o7Ln8Pwsc17jcVg7hHo06S8mAStwZLfLIGfJ//7P/Mzq9+7t0Vx5dLR03nzOODxTIMzWY= Received: from PH7P220CA0033.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:32b::33) by DM4PR12MB7599.namprd12.prod.outlook.com (2603:10b6:8:109::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42; Tue, 7 May 2024 12:43:42 +0000 Received: from SN1PEPF00036F43.namprd05.prod.outlook.com (2603:10b6:510:32b:cafe::8a) by PH7P220CA0033.outlook.office365.com (2603:10b6:510:32b::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.45 via Frontend Transport; Tue, 7 May 2024 12:43:42 +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 SN1PEPF00036F43.mail.protection.outlook.com (10.167.248.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:43:42 +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; Tue, 7 May 2024 07:43:34 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande , Subject: [PATCH v2 03/25] net/axgbe: fix fluctuations for 1G BELFUSE SFP Date: Tue, 7 May 2024 18:12:43 +0530 Message-ID: <20240507124305.2318-3-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F43:EE_|DM4PR12MB7599:EE_ X-MS-Office365-Filtering-Correlation-Id: d7109a7b-44d9-4993-1d04-08dc6e9353cd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|36860700004|376005|1800799015|82310400017; X-Microsoft-Antispam-Message-Info: LEvo89pT/snpJq4i13cmPnXopMLBCjRATFaK62id2ErPRsMerPFP9QbkyNKUTQSZhJdfFzYfxTPrSmxDfbWv7SyneF4T8oacCI+GIrlQKFgt8u/ZnEej7YatkvS+p1ae8Slqn1THwBIzZnVy8WwyYpEbkbImnMh2SmGDN40WafbIik27wln9a6EZKUnrCTXpBWlgIXdPm+SG4T+qosdV06geZGMY17YgkEwkfA/e0HzH7yB7z5aB9LT6NKf3xdcT/mkuSAB4b6Y6sEEh61LomPizvRbFAfjGO+NIb5D1bdH9uZu1Tjs94DWtotuwyKimpc+yboPL4/DVmr9upfO7g/YQhqwaDhGWwxawVWtFMJUzOqFYxpdRg2hfKyeATA8IgOmIs5xrnchDS8OvTGFEGt9gxAcd3GBIK4UyYfrMqBrGmdmoT1q5Z+yM803JExBPrAGP5UsdsCXu7wI7eYgc+DtAm2o5Exp/ArhWXtAtypFgOaTzEZCcsd86kIAbpeMaoLjrV2/eDj9DCLZ2aYd/qcsMDQ1vhNC8FaKYGKOuLEa0PkmCZmzSzpjCgrs99byKKs9B9C4R+27iLSFe5zrF4pbtgRpv6igntLXG3SATZ4eN6Rw5847qySfGedVYiI6OCDAj8a2bdIPr+Xuo1Ki9fTl0ehNPJqofxMGjzvHJvlO5EuoIUUwMTLlB9F+FQ4ycwWcQJTm1Fz18hrVNFR3ivUzcEOZ+iyRwq4FqUKhmt0p/jAKURdL3Lq/HJyU9oWKm9M6znjqiQU3P9Eq0MDppKtx1fyJrQ78tPPpx6PFexAmUORD8B2abORqfYzsvuw+Xxn6xpHgCtoVbcOV8Woo1RTZUi7t6IiIz0U8yPdwV3vuWav0xbEyzZOQXi+vwxRDDJnQOefKjN6sKGgW0/kT7XWwuqVHLldSeOzJe9UTBd3Ib4+M+Gjt6aj5CBxG2a8O/RUFNyAm2k587KXG9rTCOSjGeWXO/KzjhIZOj5pQY4V8zQysQ6B3m/T8SYt6DA4gVkxGh7VpY9MecL6NVMUZjBwwd5q2A2zn+ilZueXhj01iWjvYNSgFuZtyXk7v6FkQ92n5y/pjdtRrKknwgUieEf06x/yePnOfttYmImWCnHbgwQYC86wcehMAGP0xGvHt8iI2IlOBPfbmjegz7QW67PqOu2B33EqrgTig0jpHhh2PHBN2Cd8E5u+z7I3Avf7a2hnly6NkAWvKnDU4eCp5n1YXf2LwwZZA5NLrPhEboFPzUGJUmVZyTp0tIqdhncpO4jS3vsKql0gCke3ZPoBnCMqyWcvNUs7joNnwk3abvRES/kRXhK5O2UAtak1G7hxHpnP7NRIbzEEGnyH/Ammxv4YhgOyQp0q86AWMYCqCVUVQcHt+FKYr2N+HMp0Uoc2N6 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)(36860700004)(376005)(1800799015)(82310400017); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:43:42.4341 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d7109a7b-44d9-4993-1d04-08dc6e9353cd 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: SN1PEPF00036F43.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7599 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 Frequent link up/down events can happen when a Bel Fuse SFP part is connected to the amd-xgbe device. Try to avoid the frequent link issues by resetting the PHY as documented in Bel Fuse SFP datasheets. Without the fix user will see continuous port link up and down. Fixes: a5c7273771e8 ("net/axgbe: add phy programming APIs") Cc: stable@dpdk.org Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_phy_impl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index 54fe9faae0..ee9dcbe3da 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -578,6 +578,9 @@ static bool axgbe_phy_belfuse_parse_quirks(struct axgbe_port *pdata) AXGBE_BEL_FUSE_VENDOR, strlen(AXGBE_BEL_FUSE_VENDOR))) return false; + /* Reset PHY - wait for self-clearing reset bit to clear */ + pdata->phy_if.phy_impl.reset(pdata); + if (!memcmp(&sfp_eeprom->base[AXGBE_SFP_BASE_VENDOR_PN], AXGBE_BEL_FUSE_PARTNO, strlen(AXGBE_BEL_FUSE_PARTNO))) { phy_data->sfp_base = AXGBE_SFP_BASE_1000_SX; From patchwork Tue May 7 12:42:44 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: 139967 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 31F5343FC9; Tue, 7 May 2024 14:44:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 30DF5433AA; Tue, 7 May 2024 14:43:51 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2058.outbound.protection.outlook.com [40.107.243.58]) by mails.dpdk.org (Postfix) with ESMTP id 6E5834338E; Tue, 7 May 2024 14:43:45 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iRfIXrzuYmxcyzZIrHVANg1rXCns3Cdqy3YEL6zefUCUQJ/HG/O9RLgk3MFV7zN8GIRragF5AExH2qHCoN+NY8aEowTuVvrbuNrHyJxCS4Sv21ODzrZqAbgo6hyuCvjTztEfQnUIadp7RBGKjtS02sthkVSS4nYsS6RO9evsLjBjHwwRlWIcoFnsaKy/3PzDwghMG2FAaUyFFyNk2QQ6yjwpXDAX1ud44nDH8Uufg4qc9p0XvLpf15BTShvAKWeEnMwa0cgD+lSDlMtFZuw9z+F4Bs6o1Tt6ClJUy7QMtc8WQXLMQwpCfoH5MS3/3VGhZulvVfJvCy3EUgQzv4rRdg== 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=s7B8pdwy9vsxWH4lBnKGLK6jSsKvN2cNFDAEx8XhfqU=; b=DVqaOxhUOTsYH/Ta4wQQCPgQ3bwg0Z5oDnOrIRL2hHSZ1mXjb54lqPyJIC3g05Hzn7dv4yO/lPbCYCqinMoi7ZRkfBgU6+iPYyNFGBZiyaedB0ka3zusNca1G7tA+mRoWxnDcoLktYMkyBxrdq+tiGr5vaSnXdkv9vTGNuV4d4EqL7IVhlzW+eOvzO0c3zXhdpfEH7wJEsCUtApFb7X4Ik8Zq9kMN2rRHbLTmwa7eh+Rod92BOXif1Q9lIOcfwqNmkGF8xVpHXc6oayaS2pP4GTyA/n7QCGxgz2wSjKR2Ik8h0rNVFHzswD9gtwIFAVqxfRaSd/Q9IaBe36XgMz5cw== 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=s7B8pdwy9vsxWH4lBnKGLK6jSsKvN2cNFDAEx8XhfqU=; b=RP9QnCb2hLeHTKPtaIDKWIumVxaOH0Y7p+k98Z2/f2nmmaeMo6ngqLiR74u685CB+RCcmOiJA5MeaMjwI9kJvTvTvzONVJFc5zjc8fzMPdOnQWUpwFzr9MNo6JCl6ChBMRfXeX/WyA8xKww4nJcX+zvOX3SD9HfX4VzE6gT15bY= Received: from PH7P220CA0041.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:32b::27) by SA1PR12MB8118.namprd12.prod.outlook.com (2603:10b6:806:333::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42; Tue, 7 May 2024 12:43:43 +0000 Received: from SN1PEPF00036F43.namprd05.prod.outlook.com (2603:10b6:510:32b:cafe::37) by PH7P220CA0041.outlook.office365.com (2603:10b6:510:32b::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.43 via Frontend Transport; Tue, 7 May 2024 12:43:43 +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 SN1PEPF00036F43.mail.protection.outlook.com (10.167.248.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:43:43 +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; Tue, 7 May 2024 07:43:40 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande , Subject: [PATCH v2 04/25] net/axgbe: update DMA coherency values Date: Tue, 7 May 2024 18:12:44 +0530 Message-ID: <20240507124305.2318-4-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F43:EE_|SA1PR12MB8118:EE_ X-MS-Office365-Filtering-Correlation-Id: 90a2984c-677f-412a-a222-08dc6e935433 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|82310400017|1800799015|36860700004|376005; X-Microsoft-Antispam-Message-Info: qO2004onKFfPv0mYVWoNGT/22nTHfdmpRkEPH3HXqF+qy2lJ2fe2M6fpGaIAWLPD4/GCzgNDEEGO7CPy+u8ZPa2kdb0BrUrFjKSVP+8jFRyCx+H2B/dZ6k7kIs9OfO7RsCCGI0At4TToqi+2tQrrPB0vpUsbJg3OBRQfIQgtF72vGQQCnruhFp+QPS4iCl6c5lTcYKnyNGsiQQYXh4KBMdZqXI0Kt64NthRJZn7hDbpELFC3525d/S8hRiLElPhv8pF4H9pd9zMFi3++3lWXM/anLNn18fQjxAmuyfrSK0H8bqY85xDNN3trxM6Y85aNnVmNTwRrqTjE2PiS2j4S5IHmxRichj8Hc5rvoJ9sWu8o+Oaeb0QUE2uRCxO0zmodL2qmZkiuy3U+WwOCySOF1U2O7HgqQyQom/kBc0am4/6IzrG1emsk8/0m/937J/ywUgauDcBcOqIIdWfP/ssxpbXdfJj6XWysCVnDOypLPJ0sDjIOYzHqiSIkxpCLzRStYHu00yhGwLJm8RuNG1L+1UZJzHDPY/fq6u7TQ5STj1mVKwaYINEZfBQ0R/eO3asaaVDIoAd1bLV+RCQtXEzT45NFtPUsEttxXIc3vfMf/J1bQpCky5UhfGlSCUZ1wlIMqoMIKeqbzKtXIxvBiCYppweUC+qZezWp+O41mJARTY3/FdAf36ovd7DEr1vXepXzft9PdSjDAsQ5K0K4VMHnfnxGojXM5wIiq5En6F5c2KImO+wDgwm8/zH6EYAMsimuec2x+9I2RQkG2X5d2cgx8HzKSpLl8AcCRIf/P0GvnmJYK9VHhMKjR3KNmxERVBintWREgNsKtgiHpMigbP7tKBZAuDDEBEE5jd2BkW0w5aB5GyF84xDJeBlXTAsq/qOz2n2ZCEfdCWEeauk9JFDgptlHbdXVqy7nG8/tN6WvLs89qg7V1laIOzj42zSsaPHuMVKahZCNbzFv+G4rN/iHI6ClirlSnOSRteoL6FkE9TP/Yv2q8jdV0vsm1aNDH489ukwVkslv6vAT0sfij/h/4BXqWa7+M61JTvSYGfR6953NisAOyNYG+dUMockG09QmyXjiCHIENLfEwJY8u0wp2BAw/8flAXMWZ/q7T0rPWtkFnGpXD/1jj+i9wA7VszEGhgIicIYvjfubHxvg2M9vFuonc/nMcoiP8gGViD3AirssG/pIyLJDWaGPCp9j4cWoJ2fAhtigYbVb5RwI/kM0n1B+icXbOm3QYZmY3tAaiFT6riyAw7bGCDCkEC8o9ZnDzgjc1L5hqjoqtg3zEeYq9rTJTcEYdt+OUkOzZpwV9uYiD0TzJCvlXGiPk8S/YVDHbNhOAXnxCujHlb6vFMzJ8dWM2E3q8Ohq0PLIgIyBXwj5/n4hH2mV2ngOpLLgVBVi 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)(82310400017)(1800799015)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:43:43.0904 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 90a2984c-677f-412a-a222-08dc6e935433 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: SN1PEPF00036F43.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB8118 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 Based on the IOMMU configuration, the current cache control settings can result in possible coherency issues. The hardware team has recommended new settings for the PCI device path to eliminate the issue. Without the fix the user will get incorrect data in TSO functionality Fixes: 7c4158a5b592 ("net/axgbe: add DMA programming and start/stop") Cc: stable@dpdk.org Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_dev.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/net/axgbe/axgbe_dev.c b/drivers/net/axgbe/axgbe_dev.c index 3389954aa6..9b0073eea6 100644 --- a/drivers/net/axgbe/axgbe_dev.c +++ b/drivers/net/axgbe/axgbe_dev.c @@ -647,23 +647,21 @@ static void axgbe_config_dma_cache(struct axgbe_port *pdata) unsigned int arcache, awcache, arwcache; arcache = 0; - AXGMAC_SET_BITS(arcache, DMA_AXIARCR, DRC, 0x3); + AXGMAC_SET_BITS(arcache, DMA_AXIARCR, DRC, 0xf); + AXGMAC_SET_BITS(arcache, DMA_AXIARCR, TEC, 0xf); + AXGMAC_SET_BITS(arcache, DMA_AXIARCR, THC, 0xf); AXGMAC_IOWRITE(pdata, DMA_AXIARCR, arcache); awcache = 0; - AXGMAC_SET_BITS(awcache, DMA_AXIAWCR, DWC, 0x3); - AXGMAC_SET_BITS(awcache, DMA_AXIAWCR, RPC, 0x3); - AXGMAC_SET_BITS(awcache, DMA_AXIAWCR, RPD, 0x1); - AXGMAC_SET_BITS(awcache, DMA_AXIAWCR, RHC, 0x3); - AXGMAC_SET_BITS(awcache, DMA_AXIAWCR, RHD, 0x1); - AXGMAC_SET_BITS(awcache, DMA_AXIAWCR, RDC, 0x3); - AXGMAC_SET_BITS(awcache, DMA_AXIAWCR, RDD, 0x1); + AXGMAC_SET_BITS(awcache, DMA_AXIAWCR, DWC, 0xf); + AXGMAC_SET_BITS(awcache, DMA_AXIAWCR, RPC, 0xf); + AXGMAC_SET_BITS(awcache, DMA_AXIAWCR, RHC, 0xf); + AXGMAC_SET_BITS(awcache, DMA_AXIAWCR, RDC, 0xf); AXGMAC_IOWRITE(pdata, DMA_AXIAWCR, awcache); arwcache = 0; - AXGMAC_SET_BITS(arwcache, DMA_AXIAWRCR, TDWD, 0x1); - AXGMAC_SET_BITS(arwcache, DMA_AXIAWRCR, TDWC, 0x3); - AXGMAC_SET_BITS(arwcache, DMA_AXIAWRCR, RDRC, 0x3); + AXGMAC_SET_BITS(arwcache, DMA_AXIAWRCR, TDWC, 0xf); + AXGMAC_SET_BITS(arwcache, DMA_AXIAWRCR, RDRC, 0xf); AXGMAC_IOWRITE(pdata, DMA_AXIAWRCR, arwcache); } From patchwork Tue May 7 12:42:45 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: 139968 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 40CDD43FC9; Tue, 7 May 2024 14:44:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E262C433B1; Tue, 7 May 2024 14:43:53 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2077.outbound.protection.outlook.com [40.107.237.77]) by mails.dpdk.org (Postfix) with ESMTP id CEAFE4339A; Tue, 7 May 2024 14:43:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CVnBFhSHQfEY6o7AKabgPo3ip5J4R3OOrTJ/yQInogi9kd6GeiSKTCll7uyzwWbXAkn9ZMKmgJGEAKw4fXFMH7SCe+MskNfmSV9Zt3lKlkmmn7y83O98S8y2S4FQWx0UL/7bnUXWZy1SZlCLPZ4O31Tj7nPEiOHPU+anq5FrWYb7T57nZjAGQyyio+N3IwNgKbmS55R3pVeoEXiqRA0Gvnxjwi8FdBWBW/al+EEO6l88k/yVxmijovvbu07djc4X4Ek+J8zvjx3ZsDkUZxl+0Wq4k2iWg0ISEKuuMCwgj4e2nFN8pR2nq8phI2UCwgxh6GbHFzXN1ePpr99Dn7absA== 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=GQUUjxxfUFLw1XyFoC4UzBQJB8MlxCS5QdD5IYY2ezo=; b=NCab+Zlc6rX6Ess8aBXLvN74gEE8tMIuDihZQZl1aDr37E7//YUc6oBFpH+yy6yIxi4AajDdTgfj4HkejixCiE7y1PstTjPLA+q0489GhkCZSkHNlaAQ10a/vJzhKWpjDXEelBPmSKfNMO2S6IVoCkekVuoA0GTeDjEsJHV6mSs6VQbk6x1dzW0ujIgWKsWy7XZ1A5MzZPIIIYSFqLbPCAeBYWt+96kVlVeesRT8feRTEdrjla39Yn0KzRE7o5q7r9Hq7W6ioM9Q8ocIKxOdWzgRTPZpa2zG0qc96V+uJBZq4wCmZmXZ9nRTqDMXhX84gefE3RZpoRRIs+Mcb9Fh+w== 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=GQUUjxxfUFLw1XyFoC4UzBQJB8MlxCS5QdD5IYY2ezo=; b=Cow9JOqaUSk7SppplJijNG/rnX/mmR/F7LjYRFzRBWw76q6X8w47zVFoUD9p1PzboGawXQe6BQqP+8waQQ53WDshhpswWG83oZ27E0qBXwu1BehSzxK1n/9/8fd0fTY5WjZBG0qIChVtvLlyVX2XICnG8J+6bs5Dl4tgptanFLk= Received: from PH7P220CA0052.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:32b::34) by CH3PR12MB9394.namprd12.prod.outlook.com (2603:10b6:610:1cf::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41; Tue, 7 May 2024 12:43:45 +0000 Received: from SN1PEPF00036F43.namprd05.prod.outlook.com (2603:10b6:510:32b:cafe::f) by PH7P220CA0052.outlook.office365.com (2603:10b6:510:32b::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.43 via Frontend Transport; Tue, 7 May 2024 12:43:44 +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 SN1PEPF00036F43.mail.protection.outlook.com (10.167.248.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:43:44 +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; Tue, 7 May 2024 07:43:42 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande , Subject: [PATCH v2 05/25] net/axgbe: disable interrupts during device removal Date: Tue, 7 May 2024 18:12:45 +0530 Message-ID: <20240507124305.2318-5-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F43:EE_|CH3PR12MB9394:EE_ X-MS-Office365-Filtering-Correlation-Id: 0848eaa6-e5c9-4f67-e510-08dc6e935539 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|376005|1800799015|36860700004|82310400017; X-Microsoft-Antispam-Message-Info: eFYqsEa6N0ARtMBxSM2ugPsD62bt2nfJ0y0nt6EpCOYrH9znnB58pQbaaeIJV2XGsHl1QpSH5m11IkYUCeRFfT2dLI/NlCOqcjXRrcjfSWiOqJ4jaj+DXgeStQjwe9UMT5R2AilXQrta2wz1Woyl4Ms/o+7Fe4LTRJd+XbgUnyRP7MpTqZi+wToRCA28JEG4ok4g78AdXOPCy18u9QFXHYtnDxCs97Il5PgV3ukw/nCtVtLTFLI4XEzjsimHjPWKe5Q0Ly6xgWa2liVc/R3J0zCjhex0tGjlgtyItGg7eYWYueaa8DM466tS+g8B7DLpT6wE0dz1M95ZOwkXKDaQLtje7ub2Wayi9ZBiPxhy5iAAQl/LiQoyQ84m6rSfPXLzOxniTVQb+ehlQQSjZJ9+RbetUcgSGdxTRvxpuaS01mGtdcz9NKmPaKOFbB9pbJj1cmDyp3d3B6D3Dpy2OsWDU+1cp/iotgOMXclWliYVBnP7nDUujZbPU5b1qQpe9DudRtFHPbI8yMLq2aPyZsEXOyAGy0DDhdINKn1XaETz7UD+ldm2GPAUyY1wImDzq3B524YTr+V3jRMK1hgl+r1KuX1dukMoz5bEhDzv+xA5eEvKFIBtqnKKTHiEl6xxmpNJ3hrf6yjvoMDoALmBHGO0gbrBou0Q+qP2ygsFyiXxhuLGYOnTUWVc3r8mBAA6xeTHIjYjDKGjHBTeHmq6AHRhv5/bBNG5Q78lO/R33aEQO4CTfqrkMIxGfQqrugCByiIjSNycLxFluud8fg9f7v6hp20/eG8NAUnIr/ih7tfPUyfCYKfRqKkqQOBeZJDqUDZ9Rb8D5W+LtLUXFxsMagzv4iVJjiUmA2me03dOC5OfFFx87Yhe5i1Def+OuVHM0j7xtYaaCkqBUMOG5IlasBkvwEL3Gi0SC90BFzEmwbN1wu9U9AowdyWiAGu1EC7QatBWIGoF0/A5hnA/9HIiyGNDonfxJrC0mUCKjGKFR4KySH2r59wrexR71Ov6Mtw4vj4GgNaGkELYrwZaRXe/cvCSmSMkcE1gP5uMLbL2zzuPc0VFW37AIvnEdJJNFuV/0o+Q93OphhyP0x4BBUJAu0bImh0Oet3efjcOBuS067cu81ADgSQCzR6F0lLkH1ER5OTIRccyl66ck1Q/617OVL2uHIzvhMgGAx2z/0CkGndgSj3fcOlzuo8uDqyDLl5Sx5w1uR2vj35vSTaYvsj+Ap8+r7Er5hqkBlcMOaTUlPRYN4Bkey7q748r393EKhislr4JydTIV5hfgsjyt14zeU8f3ka+l4YZuT01A3sgQVEHpDtUDSx9cYUgesyUqiToxK+bguQMnitVd4GuVgVxlygOEsHb5qSZf55oxqfol4Mwo7YVv8p7j1rNmuep0oupL2Q8 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)(1800799015)(36860700004)(82310400017); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:43:44.8248 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0848eaa6-e5c9-4f67-e510-08dc6e935539 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: SN1PEPF00036F43.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9394 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 Hardware interrupts are enabled during the init, however, they are not disabled during close. Disable all hardware interrupts during close operation to avoid any issues. Fixes: 9e890103267e ("net/axgbe: add Rx/Tx setup") Cc: stable@dpdk.org Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_ethdev.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c index dd681f15a0..e5d8f7db02 100644 --- a/drivers/net/axgbe/axgbe_ethdev.c +++ b/drivers/net/axgbe/axgbe_ethdev.c @@ -2411,12 +2411,14 @@ static int axgbe_dev_close(struct rte_eth_dev *eth_dev) { struct rte_pci_device *pci_dev; + struct axgbe_port *pdata; PMD_INIT_FUNC_TRACE(); if (rte_eal_process_type() != RTE_PROC_PRIMARY) return 0; + pdata = eth_dev->data->dev_private; pci_dev = RTE_DEV_TO_PCI(eth_dev->device); axgbe_dev_clear_queues(eth_dev); @@ -2426,6 +2428,9 @@ axgbe_dev_close(struct rte_eth_dev *eth_dev) axgbe_dev_interrupt_handler, (void *)eth_dev); + /* Disable all interrupts in the hardware */ + XP_IOWRITE(pdata, XP_INT_EN, 0x0); + return 0; } From patchwork Tue May 7 12:42:46 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: 139969 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 9743243FC9; Tue, 7 May 2024 14:44:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 21924433B6; Tue, 7 May 2024 14:43:56 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2079.outbound.protection.outlook.com [40.107.223.79]) by mails.dpdk.org (Postfix) with ESMTP id 24F85433A5; Tue, 7 May 2024 14:43:53 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gAVOQLwCwoG4OPbRvcE1/fh1XKfK31soFCRj3Q5HObpSS9kkr7PxuEojQBwNZjurxDNYyuhMaS4nHR1z94m5iXBdJahTOckCzfuqDqkwahE/cdSNOjU3QHBH7vegz81MQsaVcL0BZ90rIVvE583Jl2X1VT/F0MD8I7KA7dSoDjogwUCZFbPsaMrEWhCzXvXdY3l/MEbdZ4AAu01/PPv9M+Ci2cduKjd6hZEi3NFR1giKp9pyTuNDqSrz4xubiICCDfIjRxmbgjkz2U14MoqPTidlfRK40HsTZBHRiPOO/KuLpe8/NksYfOpVMwR5Do4JTd1g3UZRnY1bveOrcPoL9g== 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=g6VQZQqpG5NPBEPGBvEJKe0Q+PPM2+Ca+RmPZdwJABU=; b=lTh31rtSkX2ZKEIl426BD8FsNQZPCd2NfDxS/RI3z9nDsM6Zf6S4oMrrdiLdIcq0A6w8kC6l+aIA9l4VkEiPYyzY3/KM5Bq/OsfFZu40oVOqgIG+alrda6qDsZcKoDVYAARCAKObV66H8HjSYOcdc4l+K9rlgLd5myHRLlIeY4lL4+BBPK4x34TFViT5XmKpSTlFHf6dWO2C+0/8Uv/Q2WjB3Nyn7/Absz37j0JX/mKfLg1LPxlMun7+INbn/ehqfxz2YliszZ816zXyaKN9+JkYRo7VvUMEjLOZq1pSZDESIXzo8yJjE7YlTzyL8N/daGWm5c6TPggdE4M9Y75RgQ== 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=g6VQZQqpG5NPBEPGBvEJKe0Q+PPM2+Ca+RmPZdwJABU=; b=RN82hsf2wS/k5PKRVDlWfzhekN5JfmULrPoey2/ziUQhpXwepjfN0qHG1qRT5a7IlApbfg78q+QDVHWHIHZ+e59HzpbEa/G3Ks8KLv6f4K9eWjN+lDw1yFYbOvmHF4l9z1RpiXPH7fBAgcgeUxP7cXHq4HUshr07pAgKziHj8Go= Received: from SA1P222CA0010.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:22c::12) by IA0PR12MB8351.namprd12.prod.outlook.com (2603:10b6:208:40e::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42; Tue, 7 May 2024 12:43:48 +0000 Received: from SN1PEPF00036F40.namprd05.prod.outlook.com (2603:10b6:806:22c:cafe::7d) by SA1P222CA0010.outlook.office365.com (2603:10b6:806:22c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42 via Frontend Transport; Tue, 7 May 2024 12:43:47 +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 SN1PEPF00036F40.mail.protection.outlook.com (10.167.248.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:43:47 +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; Tue, 7 May 2024 07:43:45 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande , Subject: [PATCH v2 06/25] net/axgbe: yellow carp devices do not need rrc Date: Tue, 7 May 2024 18:12:46 +0530 Message-ID: <20240507124305.2318-6-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F40:EE_|IA0PR12MB8351:EE_ X-MS-Office365-Filtering-Correlation-Id: 518f642b-b6a1-49f9-4532-08dc6e9356ea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|376005|36860700004|1800799015|82310400017; X-Microsoft-Antispam-Message-Info: OLIQ+qkuoA/z+h933tox80X1HqBiTmNoOzGM2/bKkziAXoXEc92u7hFngtP8+az5rBCTTOw6uQ69HP4xHi0mXdHRbvCkTUSnOJzdrL7+wzzNtObnr0OfPrvY3+l8/sVNyxDeB2QU3mYkMBBFt2sz2Rb5cuUbnRrg8vGXmqXm8L/qbo6wnVyph4bm2bgdI5zLwh4iL52IjttYs+keFhjg86KrqB+Bny7ZF3lABnwYeeCY1uMZ4uakzlgl4E8c3IyRlIku03+UMcwYr6BmDssh8L2Dip2V1fZO8f9otnNp5lhlTWliCpuW4Jepbj5m0rAlpN6C9DcAyMeAQQDgzSAjsHpbDXEagA7fB+KJfTZkPnShCkv1YQmwaGlHzWYgX2evRO3DWlIvai1q0tAGQEI/Uh0PJuDp6i2sBAFUOgqRDeLsVUWYIGuKxKc16tAKmKbQV/QrcQoTGhv4xbs+wbb/oEv4+eHElp5WlhFP17UKQv9oC89tHkYvwRN4FW1o+JIfsIh4nyAJ+JTCwlD/E9pjKeyQgY/TtTIw20ngYGUm8IAbHqwFCk7Nrr34YapB4+7sGRAwRbJ9KTau72nMSb6q06ldX9XFMFCFJLdZiLw73QqFTwJ58xS74FSDDtdRV01CRdnYQJ0hV/yQMrB3ptniFqdGwtkJqdsMsj3ainFq813yJrKzGuHc2UymTcGIEuFV4WxgekY489NeyEp2y0aXTPlb6zT7Kn2r/Mn1tjigrhzCZYC70Gv2lrnwXwuW4tZE9SPF+FUdd6ogx5/Oy2vBM0ZvvAGZBurIrO8w+BELwBolAiiMDgL9lmfAtZObnij45F/uAljuNT+8ujIbOoHl+31rQN6rNmUM9fXuRgbJc1MTkLNJPJ3bW36MlFibmzEc0+TlwWMx4YSLPN+KfmbfQTWUMeyy92KIdj8k7/KcB1B29XIVNyxD9OsIDvqhvpnR+jHrB+c41EIq4zUsBpByA8DxBSwtkK4A7PMubXUU5LbYM9bW7IuEy8Z4wVK9tmBEp7bYJoLgfnaYngyrhjxgSO4Tc5Lo1yxBgs8XqgbLD+rmdBVVsVatSWWJyCr6xe5ArP3v2jCmUNHyi9LyWlLTUzRY0D9TpfL9RMPxAKBTq2ZFkAEFoFzJ2zxzS8VY+sgS73OHBC5LpP9vkxdxlIJ4uJEF0CJK5BDcEZll0cgByp4aj08kreeSY7soC3mKgULzmuC9tvBH0JFELUAkpPNlE82/G3h3P47mxht1IYoGN7apgXErYKae491BmqwLCsvXWsPARsWnnQffjzMKvSUMBuSf4ICx8HGYWlylIisZCIKccy5RNpzFOt9+nVrWIGs5hGMnsuLj2PAl/61dMh3AWUgZJ8U1o8iPnyFNubdNTkMbKPPWF6e2LoLIRyvRnn/Z 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)(1800799015)(82310400017); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:43:47.6428 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 518f642b-b6a1-49f9-4532-08dc6e9356ea 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: SN1PEPF00036F40.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8351 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 Link stability issues are noticed on Yellow carp platforms when Receiver Reset Cycle is issued. Since the CDR workaround is disabled on these platforms, the Receiver Reset Cycle is not needed. So, avoid issuing rrc on Yellow carp platforms. Without the fix the user will not get the link UP. Fixes: a5c7273771e8 ("net/axgbe: add phy programming APIs") Cc: stable@dpdk.org Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_ethdev.c | 5 +++++ drivers/net/axgbe/axgbe_ethdev.h | 1 + drivers/net/axgbe/axgbe_phy_impl.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c index e5d8f7db02..86c2ec64e0 100644 --- a/drivers/net/axgbe/axgbe_ethdev.c +++ b/drivers/net/axgbe/axgbe_ethdev.c @@ -208,6 +208,7 @@ static struct axgbe_version_data axgbe_v2a = { .ecc_support = 1, .i2c_support = 1, .an_cdr_workaround = 1, + .enable_rrc = 1, }; static struct axgbe_version_data axgbe_v2b = { @@ -220,6 +221,7 @@ static struct axgbe_version_data axgbe_v2b = { .ecc_support = 1, .i2c_support = 1, .an_cdr_workaround = 1, + .enable_rrc = 1, }; static const struct rte_eth_desc_lim rx_desc_lim = { @@ -2269,6 +2271,9 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev) /* Yellow Carp devices do not need cdr workaround */ pdata->vdata->an_cdr_workaround = 0; + + /* Yellow Carp devices do not need rrc */ + pdata->vdata->enable_rrc = 0; } else { unknown_cpu = 1; } diff --git a/drivers/net/axgbe/axgbe_ethdev.h b/drivers/net/axgbe/axgbe_ethdev.h index df5d63c493..f122dfd516 100644 --- a/drivers/net/axgbe/axgbe_ethdev.h +++ b/drivers/net/axgbe/axgbe_ethdev.h @@ -463,6 +463,7 @@ struct axgbe_version_data { unsigned int ecc_support; unsigned int i2c_support; unsigned int an_cdr_workaround; + unsigned int enable_rrc; }; struct axgbe_mmc_stats { diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index ee9dcbe3da..f51830f800 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -1708,7 +1708,7 @@ static int axgbe_phy_link_status(struct axgbe_port *pdata, int *an_restart) } /* No link, attempt a receiver reset cycle */ - if (phy_data->rrc_count++) { + if (pdata->vdata->enable_rrc && phy_data->rrc_count++) { phy_data->rrc_count = 0; axgbe_phy_rrc(pdata); } From patchwork Tue May 7 12:42:47 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: 139970 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 447BD43FC9; Tue, 7 May 2024 14:44:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E74D3433BC; Tue, 7 May 2024 14:43:59 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2089.outbound.protection.outlook.com [40.107.93.89]) by mails.dpdk.org (Postfix) with ESMTP id 2C220433AF; Tue, 7 May 2024 14:43:53 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z9IwwXGjgCOB1a24lp2/04ASOnN88t0/WEPqAYfTQjsEhqXf5fwMWtRKJUWqg9TWSO+d9npni4XjWudW7654GKEP6H68qCb741DC+u7AzYIctU0K9GOVxA70d92hOQKgJKs7s0PlU/pBNlAKCVzdO6HfU7ptZzAtyTmRLYT+BsknREmeaiM/qABe4ei35OcGj4G8TiZMfvYOlA7LdJ8LzZZYlFa2qjZapiq+/4KQaN4ikVT4U5OHrpnIDXdxwVkdbCGSE5LyNuyXF8abjEbcCipAYOQMUIgWmA47RYRtDoi+NbTdsTPiFU8jPKa2EzwqpafuGPBZ6wuPqGifLsV4jw== 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=8+SZgAUJa2Uf525tv5gmmu+onoygSKwGWRtMmOv9zso=; b=Hgan/BxFWAbyXHgrOmglAhxictZXElamZ5UAHWgdFHoKdhhcPc6QkUjPxrVee2otIhdbytpCVyx/4UI3Iq8ix0gOSyEdNvVLlbsBeuW1G2xFMQsuJHUDzQCyHD4S0+UsHlto7mUKly253p5WdxosMhx+MvQCC4yyldln1+qGfhH0QraGTTm7eaMypZelvlswfj89azzqsgstvcn3yFd3YzTKYONXKF4TiIbS6eGJ5DVycgnqdUJIWkTpKNQZ2axbV6XmQbVMBg4t+/6RKz/M8ioX+0i2rufsXKv3feKCg1rhbCSLotC1WkOLkj/nWgww3j/zEdwsmfaTCmqDLAP7Uw== 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=8+SZgAUJa2Uf525tv5gmmu+onoygSKwGWRtMmOv9zso=; b=uhucuG1r4pNp4Kb2iU5CFP0hc3HWQkGwV3GSBW50M7bwgOo8fyy0L2hDY1m/2T1cXMr/AiFSWCepOQXxXTR6FF9tOeCr/lBW6wnDuuRlwQ5buYinJYix59rpnmRSdBSAhpGOmRz8J5YUAqh3eYUabVwz8tDmJWRun3kdSh3mqJQ= Received: from PH7P220CA0037.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:32b::18) by IA1PR12MB8080.namprd12.prod.outlook.com (2603:10b6:208:3fd::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42; Tue, 7 May 2024 12:43:50 +0000 Received: from SN1PEPF00036F43.namprd05.prod.outlook.com (2603:10b6:510:32b:cafe::29) by PH7P220CA0037.outlook.office365.com (2603:10b6:510:32b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42 via Frontend Transport; Tue, 7 May 2024 12:43:50 +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 SN1PEPF00036F43.mail.protection.outlook.com (10.167.248.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:43:50 +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; Tue, 7 May 2024 07:43:48 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande , Subject: [PATCH v2 07/25] net/axgbe: enable PLL control for fixed PHY modes only Date: Tue, 7 May 2024 18:12:47 +0530 Message-ID: <20240507124305.2318-7-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F43:EE_|IA1PR12MB8080:EE_ X-MS-Office365-Filtering-Correlation-Id: 287de0ba-583b-4ad7-211c-08dc6e935881 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|82310400017|1800799015|376005|36860700004; X-Microsoft-Antispam-Message-Info: nEjLcN71J0tPsYfoQ9m45cn/f7AEzKzUBa89+rOxgDBRvfRT0zOzDVfUu29fUgKZiOyNif22nR+UVKGa+x86e/L2YS1bRg0Bb3EwMNVrJ54phUm/aHpDMhY1nDiPEbeBdplwtwO5KVreAqdLS7qbCYAEc2c3EI/5Udy9CV96F+mUzkqpv22iVv7t0hrTfqbXEAFAiCuBPBJ43Z9k2VYdSZBtz3q0FSOVdSPZb1XUYiVxTiEhvg8mu9iwRZ64v7kgxCOZU3AEqhUlnaBiAkvVULJb473rrJyJbNyjBuqBLiGtXjBrlcuiYWnSYZwN3urM2CkU/lB+NDPlq42SZKjhbm2F4ayh6wRWmEop0MThqjwoNQWR09+tRdBB64xa+rfRwZDbRY7W0ZClUkFISmPEYeZJkhCfBRvSvUj4fP5SQ7YyRj4QXLg9EkiSOZDAvLgUc8HBJlfI0K9mL/VQj6+4fkUX8VcCLHn+TpR0MisB+wm7QEnT8kTX10/7+BTL/G8TZe5fdMM9sgghbw333+YOEeTAIEAG5IBJ4PqMkMDhJWMS/pQmQKP3YXQDMgx8ukiXkTYnDm4AUsPWoup8kbYRCnX2eaFiq98qNSxtwzgI+cmd24Jx8mxYGPlNH3eBVFH08pRnjBHXQxFVHVTd8RuunzX/dm4rvLu2ZR15C7f5oqY2QMamVuubHcExlr3sX3FKhuWBWMBsrVsapIHlSu8QAm298+hfQlp8nxWMiGGT/HEpzHVghNjdi1jIwGXYecgOEh9oBJ8J729mJz7o/ZnNkUivdNOb4p2FloYnABin+a6X/sH9QfTZY+tH3yPf7U/tTrr6MYBEorQ1QA4y7dEbJxDjPWhmMGqTvMBULKFtkfhTQm2wsgOqortNoS5xC3Q+c7exp2tFS1zicP9hvedT92LgiJWBFu8s39zUUSJGUAnHZ4/uiZElYfQeRVzAdNM10C49E79ycNhNxgUefQdKX2+ye2BZm+YMGYL73vBou+RE3RdMZ0exab3Flomff6UhfOs2cL7qrLa1X7p9TQcHyg7a8Z8WLRHKRtS2Mfd1c1dztC/FnmEmA95c/2/eJQI8+POB5iPNkt8XK4rD+WmvYMIarhF6JzXuh4B09WPOVYN1cMUzqDUWfR4mJo4aU2Wv5XftD0HsD94B+uwyrHOoNpZbo9u1YdlPt04PsZkI2DkdcMxo8RkyWRUqBYxM434vOAs9VOrE52w09lLBfrJOye9eq+ihzMlGWGQ+2rYoWxVbmMWii0Mq3AcO4suzJHCFAFGjUMA/jES1SUPQ+jMpgTZpGGO6jNuBvVnrxrWVA1VFFB+bwjiS0ADRNtpVtouHhGOw1RiEPE+bBJGalA4hYs1cbV8MIOc4ipJuOAP9AZiWah/v/mH7TsusQcZ4ikgq 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)(82310400017)(1800799015)(376005)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:43:50.3248 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 287de0ba-583b-4ad7-211c-08dc6e935881 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: SN1PEPF00036F43.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8080 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 PLL control setting(RRC) is needed only in fixed PHY configuration to fix the peer-peer issues. Without the PLL control setting, the link up takes longer time in a fixed phy configuration. Without the fix the user will not get the link come UP. Driver implements SW RRC for Autoneg On configuration, hence PLL control setting (RRC) is not needed for AN On configuration, and can be skipped. Also, PLL re-initialization is not needed for PHY Power Off and RRC commands. Otherwise, they lead to mailbox errors. Added the changes accordingly. Fixes: 09b0a36cc7ae ("net/axgbe: toggle PLL settings during rate change") Cc: stable@dpdk.org Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_phy_impl.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index f51830f800..9c2ae7bba0 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -1228,6 +1228,10 @@ static void axgbe_phy_rx_reset(struct axgbe_port *pdata) static void axgbe_phy_pll_ctrl(struct axgbe_port *pdata, bool enable) { + /* PLL_CTRL feature needs to be enabled for fixed PHY modes (Non-Autoneg) only */ + if (pdata->phy.autoneg != AUTONEG_DISABLE) + return; + XMDIO_WRITE_BITS(pdata, MDIO_MMD_PMAPMD, MDIO_VEND2_PMA_MISC_CTRL0, XGBE_PMA_PLL_CTRL_MASK, enable ? XGBE_PMA_PLL_CTRL_SET @@ -1272,8 +1276,10 @@ static void axgbe_phy_perform_ratechange(struct axgbe_port *pdata, axgbe_phy_rx_reset(pdata); reenable_pll: - /* Re-enable the PLL control */ - axgbe_phy_pll_ctrl(pdata, true); + /* Enable PLL re-initialization, not needed for PHY Power Off and RRC cmds */ + if (cmd != AXGBE_MB_CMD_POWER_OFF && + cmd != AXGBE_MB_CMD_RRC) + axgbe_phy_pll_ctrl(pdata, true); PMD_DRV_LOG(NOTICE, "firmware mailbox command did not complete\n"); } From patchwork Tue May 7 12:42:48 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: 139971 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 7959C43FC9; Tue, 7 May 2024 14:44:39 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4A0B0433B0; Tue, 7 May 2024 14:44:02 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2049.outbound.protection.outlook.com [40.107.243.49]) by mails.dpdk.org (Postfix) with ESMTP id 10266433B5; Tue, 7 May 2024 14:43:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wr4n9HV6jr78jL5fSsA0Va+KZs/Xcroc3/3H2GM1OGu0yRsfJP554BClXtVQwzSbX/UTYSqMg8imUe/NwV1SSGGwSx4XoDP6KKnzW+y+Nj/iT4lZuLH6DF+y8jxo+YNXjlQGdnvkYjp3YRHwfUaiPEx1waxIiPz5E2/BjZSx9dkXbY7PPKjS43bthTngagzBkAfgL73DvG81j5AjFzwLScGVPpt7ViEiZBylmeKCKmVA++SAJUILDFUzj+N3F8mX4xb16DYsEdkrwffIhilMq/X9tiMkuCuoIdOtBSRqi9BPfWauyLrXUcZfLwdsToZuj4C2+MI0oNc2B+7cGqPG0A== 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=ZUnhPzYLKuVcGpGBnxJS1cBfprUXJ9apRrKC8j12efw=; b=VucGwapG8q0UFCTWeKqFRjloiQKPbLP3jL8J1f70OxZO5EFfCunAYsOLBwCVIQ0EemCLJY+IEZg2bOdausEtpKtf1P+p+Pnkhf8vyQ5a89AcP7IAtTh1esa1y6CtrUukFj+Q465eEAZIh0LYc+ybHFQDpeF2honF/MjcrI4E2GkYZ7OtIYbxOjnqW2He2tgRtYcaylBiNpfDQILGD7R9ttMUiGnHewx79+BPPr2nVKUEzx+wJ42c8Frbd0nzpXNBLIOMv148+b8bB1K/UjHNl2b8ZfOMnHO64D2fVMrXOH2h5JZkO/MKTxT7vXjBXXOZfaJm5ydeUuAmxOd5ukIMKA== 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=ZUnhPzYLKuVcGpGBnxJS1cBfprUXJ9apRrKC8j12efw=; b=vXQ2rFUsN/Nt37qkvzNVg7d0yO+5PWC8fuGGfcmB+FY2j6KbEbk6UeHeYFujMUutyWYSBcWRPy8XnCTFEX/zFTDtM/qtAqihDYpSDPcHJ+M6DLDRqJ1T+jHPP7M2N8HAf1gSRXLyPf7IGBkqfz6ldqM2+rE3cLo59NASh+JZyPY= Received: from SA9PR13CA0038.namprd13.prod.outlook.com (2603:10b6:806:22::13) by DM4PR12MB6638.namprd12.prod.outlook.com (2603:10b6:8:b5::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41; Tue, 7 May 2024 12:43:53 +0000 Received: from SN1PEPF00036F3E.namprd05.prod.outlook.com (2603:10b6:806:22:cafe::36) by SA9PR13CA0038.outlook.office365.com (2603:10b6:806:22::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42 via Frontend Transport; Tue, 7 May 2024 12:43:53 +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 SN1PEPF00036F3E.mail.protection.outlook.com (10.167.248.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:43:53 +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; Tue, 7 May 2024 07:43:51 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande , Subject: [PATCH v2 08/25] net/axgbe: fix the SFP codes check for DAC cables Date: Tue, 7 May 2024 18:12:48 +0530 Message-ID: <20240507124305.2318-8-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F3E:EE_|DM4PR12MB6638:EE_ X-MS-Office365-Filtering-Correlation-Id: 3de74de1-1bf8-4b46-bdc4-08dc6e935a61 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|1800799015|36860700004|376005|82310400017; X-Microsoft-Antispam-Message-Info: QxzFVT+t9DOs5wFh8yGEGxjlftXCpxmDrrgqPYJ9FzOQuNZDVOJVSW/coleedzEaKUnBG7m/VrRcY4uvk1n86g60kf7RUnfLnbSH1qldV+chKSPJ+MntD+vuJHTBp8SOJWMrDAqrcE4tWEBXzAc6wgCxVtbMc8sXSi3kZVg+5GiqCgPaNPerQz2b4BjR6aBy7AELryh/omlHBWF7mjCRlX54eixlizXvECHvwev0/b/EYUKrr6drLlLk5HGOfnh5akbtq4kc1jiDOm3C8xXA8hwL9vgEAmkRmy17TYAQATqiodPyjALDE/F0R6vtoMjXwbye0oIQCGeVCJXG7oxIrOX3y4n/zoq/Zy/sJPG9ewmrv2FTqvxO+9WvPYm1t7Q1LFn8u53+Jqs4CBZtbjSPXdLoP3WteG5zr47YmacTL91Qt1RZWt87SWL4goh5g+xo0ViU/mkwPlIfzJLhR3yN+vKNSq6fETtmuaf0UPzxo7r4I+3YFD6f/X6yHavptoZhV4raLrLMr6tBhIMPlXvxaPe+Kb8lGNuUkMjrrLL7EgZWJu0zpiddTLOn34sNupKvwmhkX5HVDVcQPkgpaLC8f0ufhT1VbEF75QsQMaDH4vYYbhPXxE85fqV0v2m5a6pbPpYdOQDLXql21HYROecH/W5JwV9w7zoNT1ngMdIeWfEtj8Df3HRzJFXdqdSBIpohSWkgLvhbnPylYtVvz0raYfEwRjIN69DhHnOfbQ1jhVZo4k153pkIf44NHLqFNn4aj4B1mxaedQbGEzFWIWku2+V8LV1wDeYv5GPmyck7JoXGe9HColfwo2UmqdqavYlgWyLz8DBqA7mnicZs+UN1aIPIKoCCrqro5vLqBHM8ZcVDEaOyPVVTOT0LbgcOhxtOyQhFf7KkvldLak85cgeI5VmATQXkBg3nxZoNZTgx4eu9Yf81fPI4iHxdpJNgL3JmHY4AdE6ZiBh40MhVmY+Jvcjzz26IKj7pYbO+A6KsCFwV4lYmLlU9pzIKpskN5mf+D3JP+R4/M3iaLHdlKqoDcroKe8iEAxbE3q7GNbploxualXy7CyGDMqgqEELaEwKLV2O2qWbH/Sipxa88yIAajKSeeQKokqW16G+e8WVFGRAuZrwk9xgEVW+irOVwx4SVgp/hLPi3XfkftivhtpSpUT2n0d4XAYpa8ibDjNFeUOh1Lsc8MKxpL/OgLRUhP3nagMTSooWPNDMfs/0zMTsQU3ZWsTV0IyqmyUCZPXsOGnUXr2YAlFgokkoZhW8t6dNfjgnVKJlmtt8jo//FKm9LwERn0jTRJPexEqSsXMpxs8+NJcfXQ9IMm9BsFOmbTMXqcjss7TOo8U1dO1vuj/jFtbofttXHrlAy+kCWr6o3Pij6Y7wPkxev/pFWo2mrjnrd 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)(1800799015)(36860700004)(376005)(82310400017); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:43:53.4433 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3de74de1-1bf8-4b46-bdc4-08dc6e935a61 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: SN1PEPF00036F3E.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6638 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 The current AXGBE code assumes that offset 6 of EEPROM SFP DAC (passive) cables is NULL. However, some cables (the 5 meter and 7 meter Molex passive cables) have non-zero data at offset 6. Fix the logic by moving the passive cable check above the active checks, so as not to be improperly identified as an active cable. This will fix the issue for any passive cable that advertises 1000Base-CX in offset 6. Without the fix the user will not get link UP for few DAC cables. Fixes: a5c7273771e8 ("net/axgbe: add phy programming APIs") Cc: stable@dpdk.org Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_phy_impl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index 9c2ae7bba0..d4c4a89517 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -625,7 +625,10 @@ static void axgbe_phy_sfp_parse_eeprom(struct axgbe_port *pdata) } /* Determine the type of SFP */ - if (sfp_base[AXGBE_SFP_BASE_10GBE_CC] & AXGBE_SFP_BASE_10GBE_CC_SR) + if (phy_data->sfp_cable == AXGBE_SFP_CABLE_PASSIVE && + axgbe_phy_sfp_bit_rate(sfp_eeprom, AXGBE_SFP_SPEED_10000)) + phy_data->sfp_base = AXGBE_SFP_BASE_10000_CR; + else if (sfp_base[AXGBE_SFP_BASE_10GBE_CC] & AXGBE_SFP_BASE_10GBE_CC_SR) phy_data->sfp_base = AXGBE_SFP_BASE_10000_SR; else if (sfp_base[AXGBE_SFP_BASE_10GBE_CC] & AXGBE_SFP_BASE_10GBE_CC_LR) phy_data->sfp_base = AXGBE_SFP_BASE_10000_LR; @@ -642,9 +645,6 @@ static void axgbe_phy_sfp_parse_eeprom(struct axgbe_port *pdata) phy_data->sfp_base = AXGBE_SFP_BASE_1000_CX; else if (sfp_base[AXGBE_SFP_BASE_1GBE_CC] & AXGBE_SFP_BASE_1GBE_CC_T) phy_data->sfp_base = AXGBE_SFP_BASE_1000_T; - else if ((phy_data->sfp_cable == AXGBE_SFP_CABLE_PASSIVE) && - axgbe_phy_sfp_bit_rate(sfp_eeprom, AXGBE_SFP_SPEED_10000)) - phy_data->sfp_base = AXGBE_SFP_BASE_10000_CR; switch (phy_data->sfp_base) { case AXGBE_SFP_BASE_1000_T: From patchwork Tue May 7 12:42:49 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: 139972 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 6387343FC9; Tue, 7 May 2024 14:44:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E336F433D1; Tue, 7 May 2024 14:44:03 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2087.outbound.protection.outlook.com [40.107.236.87]) by mails.dpdk.org (Postfix) with ESMTP id 77D50433B8; Tue, 7 May 2024 14:43:58 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ngd0vihhvaiSKYuMf9VwJKfcnLoWQWdyaoqOGBAdbu9GSryVJ8uIjBpxABeZ9xPOhMua5qVzxV7lx/dOgHsQPtUx9vqyVEX6YtXYOM17ZHURtR9A65j48z0GlaQOo/L/4XMI79FbVj7Q+/x/Edu4QaJTBtYFVMbzqXWOkyOEGxh2RpDfSw6b02nsXFPSx6uXKaolA3ee5X55ZlcW3eykBmmd+qKl8D7zISs4B6rwNETiLvRkk23kd7O6xa1XgvX7XAJC5b+gdnXPdvoOCA7aAL+tVj1Y+P6BF4X2UItVp4iMraF291OXSrT0jW4NeAItu9CmEYo+qr2wi7r4zoL8yw== 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=9KcyhoDkRwo6jfboYdJ8C8hazj3+nUQxbbb1yoL521U=; b=Wx65IUS1K/3mMD1CnYe/FoH/H915kBFfjlpylkqDxC5LZnosjjrUl+MNpP+PF1QRMhhMX5I6mkaQVBcuSbBdSoX2NpjwUbyqT7VtLYd812s85N/GaNLa7L2t8YrNaAn6Vp2d3P/rI2vm5QG2ARG1H6eS+r4MDBcqleztXIReRSflLP7zv1W9/I9XdTqzBIbeigdNzBsx+oKffH6v1k78AejxHHkrHJEgcN1KZnKe/SiU6qdVqe/k1Kbnzk6V8ypqTVqwdYuxgiaeYcron79FnyoV8nUvhMuOmbEs4qHbwLQUK+LtqjGi5/OcKsDbc/bFJJKfzwftGX4CQOStKh7irw== 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=9KcyhoDkRwo6jfboYdJ8C8hazj3+nUQxbbb1yoL521U=; b=2aqic2r35FjGAxmfT/7RhsB+WvW0JwcDyUjqus3E9VhF0F406SFsbzy7Vrdo5R8SLZXSYlYiuN2anGGSWvobs7gQm4PD8QiXJ1JxnVg2FQyeDZvT4SLAGSkWh+knueu55Lxb2RwaFoTcwYUyxZ4U6CC/p6s7V7qxYaUa9/O7fS8= Received: from PH7PR17CA0066.namprd17.prod.outlook.com (2603:10b6:510:325::15) by DM6PR12MB4283.namprd12.prod.outlook.com (2603:10b6:5:211::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.43; Tue, 7 May 2024 12:43:56 +0000 Received: from SN1PEPF00036F3D.namprd05.prod.outlook.com (2603:10b6:510:325:cafe::7f) by PH7PR17CA0066.outlook.office365.com (2603:10b6:510:325::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.43 via Frontend Transport; Tue, 7 May 2024 12:43:55 +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 SN1PEPF00036F3D.mail.protection.outlook.com (10.167.248.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:43:55 +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; Tue, 7 May 2024 07:43:53 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande , Subject: [PATCH v2 09/25] net/axgbe: fix logic around active and passive cables Date: Tue, 7 May 2024 18:12:49 +0530 Message-ID: <20240507124305.2318-9-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F3D:EE_|DM6PR12MB4283:EE_ X-MS-Office365-Filtering-Correlation-Id: 7daf96df-34c1-4369-a71d-08dc6e935bc1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|376005|1800799015|36860700004|82310400017; X-Microsoft-Antispam-Message-Info: eaN/sjo7mmobuFqtZ/h9pPUDvEkRZmsP8QV4bUjrN4iMX/6CCODBYXinZdozuflPDFzjA3ojgLh1IL7WD2gt7/Rvr2MhRuUDKFFR+9xRezJCn4cUPW/qjRDan9wH0A1h0glwDZMaqj6DxHrXEtpGCM1c0f6QDwb25wEHe8ptTaV+OZlpRLNbll3ZySq5taEK0h4WGkpE5M0UiURi5nWD6EMc0KJOQJBSrIASpqzCTNI4QmJgdJnO1793Y16F2UdasvA+JqOezaxdQtiSeGMNx8m3jvC67F/WdxWSaSZTnACTvURar6nb78lCK3dm0GQRC/t6Y/li5YKjVunHp9G8m7hutD6/Dmeb12vMXW4WMZO0SsWobrc7xDxzm3xzVwX6Je15hI/mlEuUlYIVhxdSnW/WQQq1ppRZxcxi/Ma9E3Sol2UYY/YxHHVp5WW8wGTNvvsVXf53yNwALSGYh8/5dCko3t8UmZCIWf/DXskhuyPoxqsK7JQ9iv9MQlpVOcw+w0MNtZ9bFP5rMtTohuPqmb49NdFVOxAAvZDXPfnOGmip1Qmg7Y0fNcHGWCeUasq1fI3Rs5e1Z9ZURRYBk8zQ55fUT4xJsA9Wq8MmICMEPyRdiuOoXkztNlQndax7yP3LhWqACrBnQC090FRhnNln9VDj7GX2muiZmQk2ydErqrKjEcvupNVgshT+6CNZPJVVLK/j7qfTpN5svExgRrwaZJmZe4+VjTX2/aFOGuxdmJXk5T5eoTmYfHKEMKF34ZRn23uWkIr27dVym1tlBuHAIRTiKBjEZqBOWG/ihPjnJLxX4eFUOWTeGAIBoQdcZLTLYWnj5LzLHK0Bqnw5PLbKdUNsPMidbRqCVSbp+tB2q2hJxXd27V/7g5c3HHwNUcOvqZKIggfjR4DCVpDdpbvCD/rfobyG7D59BurK1tAdIEWCOsU15JqNhzjyq0YAIFF/gbJPMSVVdrOt4ZsJ670z732Rn29TDi2lDBLilQdGKoWReh1LMYjwsh4wdP0sKWT8PXb7V9m3J8y7cDw+NocPwDiPXzMyFaaWJ5ewJdkISIQzQkLQ95rDKFaV5zlj96Y95qumTfCcafUQlJU0/CDVroA5qdV73iXwG9DnADvFVQ0lcFsnd7Ux4zNmNAQtEClGBILYvBxkeregZs3dTWc0lEV3gcNnpcII9gxtAQ2178+ZsqsLZzVTkcE+EZOpoya29vytVKpsClzwtKWUA8pB8KyyuktqTJ+J4vPrXuf9eU5XyhRTwse1E6X8hgx29imdf7AMkHL7PFtIZIPfoV3t5xF3pySBGA0wmlUzv6iGnB3x6kq1Wf07PQ3ftO1QHVH67Ndr45UAliDIDKCQZxOntZrUrpe+NFZJuNgnpiLlKBR78+eIKvVdfdhFtNAnMJBM 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)(1800799015)(36860700004)(82310400017); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:43:55.7808 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7daf96df-34c1-4369-a71d-08dc6e935bc1 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: SN1PEPF00036F3D.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4283 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 SFP+ active and passive cables are copper cables with fixed SFP+ end connectors. Due to a misinterpretation of this, SFP+ active cables could end up not being recognized, causing the driver to fail to establish a connection. Introduce a new enum in SFP+ cable types, XGBE_SFP_CABLE_FIBER, that is the default cable type, and handle active and passive cables when they are specifically detected. Fixes: a5c7273771e8 ("net/axgbe: add phy programming APIs") Cc: stable@dpdk.org Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_phy_impl.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index d4c4a89517..8b66def631 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -69,6 +69,7 @@ enum axgbe_sfp_cable { AXGBE_SFP_CABLE_UNKNOWN = 0, AXGBE_SFP_CABLE_ACTIVE, AXGBE_SFP_CABLE_PASSIVE, + AXGBE_SFP_CABLE_FIBER, }; enum axgbe_sfp_base { @@ -616,16 +617,18 @@ static void axgbe_phy_sfp_parse_eeprom(struct axgbe_port *pdata) axgbe_phy_sfp_parse_quirks(pdata); - /* Assume ACTIVE cable unless told it is PASSIVE */ + /* Assume FIBER cable unless told otherwise */ if (sfp_base[AXGBE_SFP_BASE_CABLE] & AXGBE_SFP_BASE_CABLE_PASSIVE) { phy_data->sfp_cable = AXGBE_SFP_CABLE_PASSIVE; phy_data->sfp_cable_len = sfp_base[AXGBE_SFP_BASE_CU_CABLE_LEN]; - } else { + } else if (sfp_base[AXGBE_SFP_BASE_CABLE] & AXGBE_SFP_BASE_CABLE_ACTIVE) { phy_data->sfp_cable = AXGBE_SFP_CABLE_ACTIVE; + } else { + phy_data->sfp_cable = AXGBE_SFP_CABLE_FIBER; } /* Determine the type of SFP */ - if (phy_data->sfp_cable == AXGBE_SFP_CABLE_PASSIVE && + if (phy_data->sfp_cable != AXGBE_SFP_CABLE_FIBER && axgbe_phy_sfp_bit_rate(sfp_eeprom, AXGBE_SFP_SPEED_10000)) phy_data->sfp_base = AXGBE_SFP_BASE_10000_CR; else if (sfp_base[AXGBE_SFP_BASE_10GBE_CC] & AXGBE_SFP_BASE_10GBE_CC_SR) From patchwork Tue May 7 12:42:50 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: 139973 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 E69A643FC9; Tue, 7 May 2024 14:44:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4C878433CA; Tue, 7 May 2024 14:44:06 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2058.outbound.protection.outlook.com [40.107.236.58]) by mails.dpdk.org (Postfix) with ESMTP id EDE7B433B8; Tue, 7 May 2024 14:44:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SETuf7oX/UA1aIKyhsIHJcWC7pc4TRKkM68yJk24VaA/qQt7uhhIsLTwAS5u1+gabbm9PTci1X/aWb1FWxlLTYrSOsIa1mQ1rvSiA3LgyZuqJmxiO8Z7S+U2yezOxQI7HujZbJBjwG/0R/dspfBfV6/uYmfczHC+YgHIshehOFOKi4v5LxE19OyILZl9/qxxPaa6xsieBL7uk/ob7bO0XGL7yiJnlR7OXyS679jTasmT0JkZ5KBZR7884ygeyDBRvnbVCNZyfCOYccIrHCcdPtHuNpe+eC+HHwe6EUWRTqEzZBSR1OZ3YRHs5G/AWzHOyaFLvltnNPQv2flwhPqyZA== 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=jXh6X9aKoxbamd6APTYiRjXFpqnuzF4uHEsFtqtoF9w=; b=lhx1z2i0j+ZaqptAb6KErKhSwVjwSMAt3DsU7aMo/+XuQbbdQDuVQIU6y1G0RuzKU6j5FovPYjv7c+VRX3RDxjc/I+UiHHjGcI9PT2VLDY0+FZpoOROc+YFmf0hy+2T/b70nWuHHsY+6J080dL7oivLcYSXmwvO8gigFXd1h8dl+Qf8slylrPZVoFHHqNfcp0K+Q6CHRms6hC22qEWSmk5+ziAcDNfEy9XbMaPQPQSOiy0yU947JgiQ2Etg0voLPtkGPyRyseCMIHU0N/5NAp1UcMyq3qVTujjCSy81HZ7nMdBXrDNN1SFGBi5PBVE1aj+f4mntkHfnSivRTVcCShA== 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=jXh6X9aKoxbamd6APTYiRjXFpqnuzF4uHEsFtqtoF9w=; b=fGsoTEaSeX5FOBfkRvkJYXrD32cAkK/KGxt+raGkWHLm7qrtdUrOEdC5C1SvaOsGP4hpZC92teA6HMygWqXTKvkJU2Zh3ZmFseWoUI+d6PEyCR7xI2WeEhgWxEmWqczSgFOq913wK0liU+UZzyLBBgulj/4fxJJYwbIEcD8NB6g= Received: from SA1P222CA0007.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:22c::22) by PH0PR12MB5679.namprd12.prod.outlook.com (2603:10b6:510:14f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.43; Tue, 7 May 2024 12:43:58 +0000 Received: from SN1PEPF00036F40.namprd05.prod.outlook.com (2603:10b6:806:22c:cafe::f1) by SA1P222CA0007.outlook.office365.com (2603:10b6:806:22c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.40 via Frontend Transport; Tue, 7 May 2024 12:43:58 +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 SN1PEPF00036F40.mail.protection.outlook.com (10.167.248.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:43:58 +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; Tue, 7 May 2024 07:43:56 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande , Subject: [PATCH v2 10/25] net/axgbe: check only the minimum speed for cables Date: Tue, 7 May 2024 18:12:50 +0530 Message-ID: <20240507124305.2318-10-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F40:EE_|PH0PR12MB5679:EE_ X-MS-Office365-Filtering-Correlation-Id: c51900fd-db48-4952-dd8e-08dc6e935d4d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|1800799015|82310400017|376005|36860700004; X-Microsoft-Antispam-Message-Info: e2JdK4wDdjQ+849AM+Up6dXJg0axya0JOL70nUPMXeJRXWoV1obh3Msmhqjy9F7Hx6DoDGXYvJQgSgwIQfIWjuj8HzNQPqGCD8tm84I9n+3nsLtbKzRGXL9L1zs5aLGy3gG0/VAYHz5BVyKLABXQwQmpIg3joNxsKgEefUItuotutUZdziJdjVGMyxU+Nkj6s6we8zLjfqFND5ueZF9Shnq4BEBv/5U5G2ePIzXxl6UkgdhwjiJcafKBsKVdABxk71qPSPBmoWcuVVJ7Jv7UIJOlOgGoTWtlHLMwLq7vv906jQxQYx+eWIEvL41bofpvlQwgU8+xvF8OUeH4bUuroc0rwvVebnjxKM7/V+VOyRLq8xFdMeDgkvfRYbE+JundWDTsfU6EGbn7T86kishCCQcqSWEYHJEv6ZIpLEMiww34Jxwr6nZYuC5FTpPrxvQWTVWX8Nh2pheA24tt3UrnYfoyhmDXImBL7T4KV3e0lTPJ0z9HWQoGSC1r6XWTXv5y4zTMP7fHQ9RbrcQBLdgQx5c1jq8V5q7CN19IluEuokaNUGGWP5EzUmJ5TjBFf/ZiVrtgcX+qie8Dr2DLcQxjn2lq7sTjF9gkSpo5VxS65NgcncjXN1YCb7OlHPXRe0CuE3wX7sTAlTvkno86scpR15PQJFYIesIdH/Vy+kEFFEKy+oTgF2TjNX521HWLATcc4yzaYR4VsPfhQFnJsHkWhfP4cx/Lf/QdGNkv0xfv/6NE9HHBFByjNfBSCzPbm3k4sMvuy4U4gLk2TGQWngVTjWOXYbemCwCO4NZTJs2sfuZSuK3eKUloGInrPaTH7pZetfy/hlBQ7fEZy8Ex6KCPDy1pT/RR+Gto4RSPVD770Pm2oswek/FH/pHjGvHNTF0eFMimftVFTpqKinAQoXO02LnBGpaNMHB2yKl00iZ+eyw74DymGRX1K2zMHQvzLiVDD2DmDX7dLRnOjP3w/c7lglWyKh3lMAhLAeROjVwBGLeaNAIjrJ5oOdB5NSaV85hIY8bj3Icj1xWnmWma3yf6NKIZt5S+aMn7X3h0WCwlVNv4zk9XIysL0JFUwCWYuL+Fnxjhv9sAKr2IXu2ejr0yKUv+xo8bGz4yY0TXNs0WLRQI8HyVeeEE+mWZBEVFiSCvUZMk1N56LOY/sCy7OveQ45a0bjt8jtf3VdGKS4QcMwibVlI8t/eNppPiBgNbVA52o3lwR6SBjjX2au9I2o/z4QKGX3xBVHhwMSH+iChK4ie3fyBJSrxrEjv7cnDAIoIccgbEI7VX+ongqIpd10GjZwh9A3CQ5UmMVn3o9mapADPPacVIY2KvWRsWh71RFlwfl3yklu7Ec5onS0gd0NaffsrTiSi2tdstsRmBfWn8OaWRqPWJaf/wbNPX6+E+zVap 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)(1800799015)(82310400017)(376005)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:43:58.3774 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c51900fd-db48-4952-dd8e-08dc6e935d4d 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: SN1PEPF00036F40.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB5679 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 There are cables that exist that can support speeds in excess of 10GbE. The driver, however, restricts the EEPROM advertised nominal bitrate to a specific range, which can prevent usage of cables that can support, for example, up to 25GbE. Rather than checking that an active or passive cable supports a specific range, only check for a minimum supported speed. Fixes: a5c7273771e8 ("net/axgbe: add phy programming APIs") Cc: stable@dpdk.org Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_phy_impl.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index 8b66def631..0ad5b4ba85 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -117,9 +117,7 @@ enum axgbe_sfp_speed { #define AXGBE_SFP_BASE_BR 12 #define AXGBE_SFP_BASE_BR_1GBE_MIN 0x0a -#define AXGBE_SFP_BASE_BR_1GBE_MAX 0x0d #define AXGBE_SFP_BASE_BR_10GBE_MIN 0x64 -#define AXGBE_SFP_BASE_BR_10GBE_MAX 0x68 #define AXGBE_SFP_BASE_CU_CABLE_LEN 18 @@ -536,25 +534,22 @@ static void axgbe_phy_sfp_phy_settings(struct axgbe_port *pdata) static bool axgbe_phy_sfp_bit_rate(struct axgbe_sfp_eeprom *sfp_eeprom, enum axgbe_sfp_speed sfp_speed) { - u8 *sfp_base, min, max; + u8 *sfp_base, min; sfp_base = sfp_eeprom->base; switch (sfp_speed) { case AXGBE_SFP_SPEED_1000: min = AXGBE_SFP_BASE_BR_1GBE_MIN; - max = AXGBE_SFP_BASE_BR_1GBE_MAX; break; case AXGBE_SFP_SPEED_10000: min = AXGBE_SFP_BASE_BR_10GBE_MIN; - max = AXGBE_SFP_BASE_BR_10GBE_MAX; break; default: return false; } - return ((sfp_base[AXGBE_SFP_BASE_BR] >= min) && - (sfp_base[AXGBE_SFP_BASE_BR] <= max)); + return sfp_base[AXGBE_SFP_BASE_BR] >= min; } static void axgbe_phy_sfp_external_phy(struct axgbe_port *pdata) From patchwork Tue May 7 12:42:51 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: 139976 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 D926F43FC9; Tue, 7 May 2024 14:45:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D9316433DB; Tue, 7 May 2024 14:44:13 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2057.outbound.protection.outlook.com [40.107.237.57]) by mails.dpdk.org (Postfix) with ESMTP id F2F34433CF; Tue, 7 May 2024 14:44:09 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cq+EH7FLc2Qk0QKW4AS9k0aGPfQvwD80dWlAYsn23mUw1GdQ5UZwTxHUPPks7h1IXzjFuzWG3pCG3ePWluH0t4tDK9he3LpK1zv9ingAQ6Gzd8RZXX4aR6O/j295D4MToyswVP/O4FFzpU+dSUnil/cZcxCNvHjdIykqAM0DHRPmkqLXbfQ538oOAuvLhiY07b93LeQPCMcmayM5MIeMOPRVzwGVpWYyjmK/atj40w6nNVLictKCuihxXTrHsAnzGayol36SQ5fWndZSeaow4PYF7Plv0WjdFB+pKR3x7x/mWm0x7jaM5iwHgGAN3FNKJHaUCKQAck5iPyvSxHg5uw== 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=lFYBTYKkKj42KcSqzZDWYcVm7Pdup6xff7aOSAPidck=; b=G+U1vkARonH3qIasPQBdoSvSMuEMjQaARfHKIs5fTgRDE6i6Gy4V3hS5AsQkxAo+mISPtkPjrLlOsZEUFPVWoAo1mxGvygDMHIU4VQ5Fu9nFW4+WuBL64u3JYp3mxrAbETqKc1heYte1cO11JbGnQmex3EDkcAILKzpadsJkGe/7nnXQ+gwgfANrcCGzuOHqltHB5ogfkm/pXgL9Qy1gYYQTnLQU0sDJx9BXROS+m1gtm8M8ST0lYzXE1SWypaABo56UrYKeTgVPpW9lYDUJ1HzJjjbINgXg8zGk7PcfKFJfSFPmA2ZreZdy2sH6EjFJhEa8pV+CBWQRhAQLpoOWNw== 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=lFYBTYKkKj42KcSqzZDWYcVm7Pdup6xff7aOSAPidck=; b=mYtcTiecLGlJ1heUnAjRd3OT9/38TLxAihoNi+dA5qq+mJ/WgUqxzMEhRkfhFdRkNxu6D2lSxMp14UCV51gFtrNeCVrVgEd9Y3NiS3xQNJvJIxxBM/qsEUIC84n0032uJOT57DOxuFiCWY147ezQDJKbZBE0IMmmyqiVcI7HVS8= Received: from SA9PR13CA0038.namprd13.prod.outlook.com (2603:10b6:806:22::13) by CH3PR12MB8972.namprd12.prod.outlook.com (2603:10b6:610:169::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42; Tue, 7 May 2024 12:44:01 +0000 Received: from SN1PEPF00036F3E.namprd05.prod.outlook.com (2603:10b6:806:22:cafe::d9) by SA9PR13CA0038.outlook.office365.com (2603:10b6:806:22::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42 via Frontend Transport; Tue, 7 May 2024 12:44:01 +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 SN1PEPF00036F3E.mail.protection.outlook.com (10.167.248.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:44:01 +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; Tue, 7 May 2024 07:43:59 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande , Subject: [PATCH v2 11/25] net/axgbe: flow Tx Ctrl Registers are h/w version dependent Date: Tue, 7 May 2024 18:12:51 +0530 Message-ID: <20240507124305.2318-11-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F3E:EE_|CH3PR12MB8972:EE_ X-MS-Office365-Filtering-Correlation-Id: 8d3b6a86-ee5e-4ba8-d8d7-08dc6e935eea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|1800799015|82310400017|376005|36860700004; X-Microsoft-Antispam-Message-Info: F8LR0sWi2YPwYr+TdQOR/C5OBQjpdJYl8vpvMJOdnj8BtYDOZudskisQGRIUZMK+aA+OZGomMA3XHhgvlj9oyl1ew/wz26bzvGdkVkH5TUkbR9Mw6ymqJmBOQ/DtG+xroHDS9Doalem4BHq/NwBYy0AZAo+UFYDaEJFBEFyP73q2fZ15io3ShUbQKVa6obb6CYHsClWPqfCY0WVRue6p4CLyASdx1OeyL0sSXRpvRhfW2kBawshWUItGUBRU3q55OddcU8ggJ+q9J7NjvMrN4fOQRInufQG17Ob3fhl+f5YLZOh5m99Tpt1zhIWmu9GItJUDs3IOS8cuY/5A1v2cnlK3ImYQdm7a4uuS1gc3AJZhz8ueaSeIJiJo3FQoaIgojNZLb1kCOc5qYkEpX8dlMn6JroZkBFJnc4MN3ymA/wxAkiJlLBn8VneLbkBbI1AQksHNng85DmkaEyp87alluNxjBTewMocsYOwtwPMNaQAO/3kqxRS1zF54bNzDttAcJjk8QLNibI3xusfFYmrJb/2YXSm7+V90kGeiFrUsjE7FwZkDSN7kqQs3jU4ziFisvC0/f7R+rIU2wEZ2Ylh/IQZIu5i38jhSt9Gnd5K17db4dOSrjP6tnh0V5QTQVS0aWKbHH5Y9FPAocxZTTDI8vzpOJNtfr0JfEtbsEq8jj2r8DTm5E2nbhRXd0HWgyYzEEUoR0OJ7+3aGL4WA2seuiRVF4W4zfKZ4CUauidBQ702GW4pJXOVOBRliojRgzAKaorLxpBeGLlhLiKShPvhJixCxRHU6PiMnmkAYWf6kPztplpZ3ShRpqyF4FlqAoJ5Y/A+mFcjJT6RqBSpmxv1BXGVkGnpAVby0EDN3lEZb9+XPJPw6xUGXGxBgOqv9Y58J9zOUvYu91bNZqyQj2nT1eRt9+T+3FDZcK3h5k/7bt80QiZRWWfmIL65VgnvvRqYtzYylsWUpcF4wADRnm7zwj6wsNoDLJZXIGRqjukBg6CzlsObPlOWG8Tm6EqgyM3DU2Fz1F++Xgl6vViA20JLAy3R/k3iyD1fFkfliEFfNG6tpBr6HebEe2cyScJWpHX0gJynRzGw3TcON+6GTD0vwktld+D59+MmpsNVr3mqF8+V8tdF5QtSs0xhXwb5exrHlUkyu5VNXA+/JBjxowtm0et8IEYVrVHbZ4dKqhmJd7VoW35Kn/dgj1nn16fpcXkdX6RYJbAl30UPzjAVB8t6hQ8+2rVs+Q1IfglNFWRS4sgx8bStsjqtkwzSiyxgEBJa0mzS3pzHNM/+lH8ZsMYX6UL6htDrU3p2pT/xTkT6B8WyTazbosSdavPe65A4VH/ekntBF5fCa2e9THUWXVfyApsqzU/9tkUkspj0ZWcVRQ9H47gHgplk8DiZ0/UC8paCE 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)(1800799015)(82310400017)(376005)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:44:01.0683 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8d3b6a86-ee5e-4ba8-d8d7-08dc6e935eea 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: SN1PEPF00036F3E.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8972 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 There is difference in the TX Flow Control registers (TFCR) between the revisions of the hardware. The older revisions of hardware used to have single register per queue. Whereas, the newer revision of hardware (from ver 30H onwards) have one register per priority. Without the fix the user will face problem in TX operation on new 30H HW Fixes: 7c4158a5b592 ("net/axgbe: add DMA programming and start/stop") Cc: stable@dpdk.org Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_dev.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/net/axgbe/axgbe_dev.c b/drivers/net/axgbe/axgbe_dev.c index 9b0073eea6..5233633a53 100644 --- a/drivers/net/axgbe/axgbe_dev.c +++ b/drivers/net/axgbe/axgbe_dev.c @@ -269,20 +269,28 @@ static int axgbe_set_speed(struct axgbe_port *pdata, int speed) return 0; } +static unsigned int axgbe_get_fc_queue_count(struct axgbe_port *pdata) +{ + unsigned int max_q_count = AXGMAC_MAX_FLOW_CONTROL_QUEUES; + + /* From MAC ver 30H the TFCR is per priority, instead of per queue */ + if (AXGMAC_GET_BITS(pdata->hw_feat.version, MAC_VR, SNPSVER) >= 0x30) + return max_q_count; + else + return (RTE_MIN(pdata->tx_q_count, max_q_count)); +} + static int axgbe_disable_tx_flow_control(struct axgbe_port *pdata) { - unsigned int max_q_count, q_count; unsigned int reg, reg_val; - unsigned int i; + unsigned int i, q_count; /* Clear MTL flow control */ for (i = 0; i < pdata->rx_q_count; i++) AXGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_RQOMR, EHFC, 0); /* Clear MAC flow control */ - max_q_count = AXGMAC_MAX_FLOW_CONTROL_QUEUES; - q_count = RTE_MIN(pdata->tx_q_count, - max_q_count); + q_count = axgbe_get_fc_queue_count(pdata); reg = MAC_Q0TFCR; for (i = 0; i < q_count; i++) { reg_val = AXGMAC_IOREAD(pdata, reg); @@ -297,9 +305,8 @@ static int axgbe_disable_tx_flow_control(struct axgbe_port *pdata) static int axgbe_enable_tx_flow_control(struct axgbe_port *pdata) { - unsigned int max_q_count, q_count; unsigned int reg, reg_val; - unsigned int i; + unsigned int i, q_count; /* Set MTL flow control */ for (i = 0; i < pdata->rx_q_count; i++) { @@ -316,9 +323,7 @@ static int axgbe_enable_tx_flow_control(struct axgbe_port *pdata) } /* Set MAC flow control */ - max_q_count = AXGMAC_MAX_FLOW_CONTROL_QUEUES; - q_count = RTE_MIN(pdata->tx_q_count, - max_q_count); + q_count = axgbe_get_fc_queue_count(pdata); reg = MAC_Q0TFCR; for (i = 0; i < q_count; i++) { reg_val = AXGMAC_IOREAD(pdata, reg); From patchwork Tue May 7 12:42:52 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: 139974 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 F17EE43FC9; Tue, 7 May 2024 14:44:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0523B433D7; Tue, 7 May 2024 14:44:10 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2045.outbound.protection.outlook.com [40.107.93.45]) by mails.dpdk.org (Postfix) with ESMTP id B7EFF433C7; Tue, 7 May 2024 14:44:07 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lVvEJgWq8R55p3UZJIa1LPcwTINSCRC2NNp6OSDRifqyQDskDSrfxrzkcgcUByZcV9mmtaSUIfatUWb6zJRNSSgRl3hmJMLpRcBZd/AEuu6YWYaaMyVwOAgNR4gFGIAB4w0e+JD1tIYvLltSBihdb7kG7N/jGLxA4okuy+gw+u/mmmEeINFVoj/FNmkPtb4SqdhTCNLzWN2QSlVDyDe5kLy/vhGlS9e1JOMimsEKBa7jwJ4u+KbNtAGJxVkyC2xIxtZ1J4fszjKU2qWO91TJegVMqF8kBGl7rN2eVQp7RzdHoUry5BdB/FUrbOM9XZGK16t7pPYcmfxRBp44/siQ5w== 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=4C6WUrfnRtBasiF4Qk7C2+/3Uo3/RkGocpAsjy8ebiY=; b=kt5hTa4ZWUJb6CCC4af/dS4EYI7WxP/YG6/3fXy+93URwFMaeppPd7iuzOr50rMlIeivQ/7ruw2pGz/ZG4AuZgFvAkCfPuc9rM9tIx4Uky48zgPzyYyCWop79uwmpD0ggrkfdznEHX35V80tjR2Fj7+eIwPx1VeiYigF7jVRInK9lRON30kClJ0mA2UFrahjhEQp4xVAuQJy86CLY+QI8rxduzY3ebchKR2OnrSZx4Sb1HzUJwQkGGtSVRxq2N5B5PcxOUyu8yTGhNyn+z4c23SjVcCmUu+cWcAwphq3Te1c3RlMdz1fa+uO5VyokM7TBgd8x7jv/Smghx4vv5V2iQ== 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=4C6WUrfnRtBasiF4Qk7C2+/3Uo3/RkGocpAsjy8ebiY=; b=ebD7J0uUZihp6iPd+WdCQ7xiuRVx+ZSk7jfKi0Bkc9FXeteFwPFlkrH+397nDueBp4hfI55nfuA/dyWX4+s7i2Nf02Pg6QKzoqRewLGVpsYE4uQcBCcM0s+4jrnQNOnJXAAWtKVzQ8bCXCmNqm5xVFAcwZKVozUd7OuxKupmE8s= Received: from PH7PR03CA0005.namprd03.prod.outlook.com (2603:10b6:510:339::31) by PH8PR12MB7447.namprd12.prod.outlook.com (2603:10b6:510:215::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42; Tue, 7 May 2024 12:44:04 +0000 Received: from SN1PEPF00036F3F.namprd05.prod.outlook.com (2603:10b6:510:339:cafe::79) by PH7PR03CA0005.outlook.office365.com (2603:10b6:510:339::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.43 via Frontend Transport; Tue, 7 May 2024 12:44:04 +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 SN1PEPF00036F3F.mail.protection.outlook.com (10.167.248.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:44:03 +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; Tue, 7 May 2024 07:44:01 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande , Subject: [PATCH v2 12/25] net/axgbe: delay AN timeout during KR training Date: Tue, 7 May 2024 18:12:52 +0530 Message-ID: <20240507124305.2318-12-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F3F:EE_|PH8PR12MB7447:EE_ X-MS-Office365-Filtering-Correlation-Id: 7552371d-dfbe-44ff-2a29-08dc6e936091 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|82310400017|36860700004|1800799015|376005; X-Microsoft-Antispam-Message-Info: wGWtdVADVJwiAn3/6ItF0OiC9ud0N7Maat0fVCqXemyQeWkQu7y4SChih9IJy3TEVI5M2RH54C3h627G3mA9wq+Zs+XhPosVY+VocEK2FuznwI0xY5IIVlenM9CrCUg4Of6KFGkgKUFMUaQ/IhQruGahvA7h6FFr7RcHY/92yt2eZ+Ic6PRyCMisyjN+aU5nSchONTnn353ZADtKk3v3dvwZWaY9t6wvxZYB65RnTR5D7qC0jc7smqctmRkOMrPlqb+3GLV4TY03raVJC2jlZTFav4GPXS19MuYdzlSAMNz0yC6r4QOdTq0+IPpcuJ8ZoqZWE2m8ys9REfenj/JsbkVo3hGJxcOn9WsXNqrdhvkaVHyoFdxNWWoeayLBA7G3uOJFoEMT61zvfTVoszUYdtQMrDE1MUw6LM10yLu68toxAnxgnU3kKdnZ3NhT0DWvLTSVHlab3n6UNqd4OYqScy9vizDKmD7fPQTLWg9bC9xKpg1Z8Mgg99r7N17yu1CLRboAEYjB/LVNmt6gSLHqu2rqlrcogoJEVkHJE+jeiQBpgsoyZ4u5aDruBAnr2hWuXuTUvM/othpOU5gulatoKrTK5/3925nZQhebjJLGEdedB/zddcA/ymXW4o3IOwz5gTqrVRclUtNnTtQ4SOJKmtDcCs1w0hWP9toI2jxbiXqffEk7lVLRhINgwBrzn8hE5VnZCbSgA9VG4lKa1wxmEghqdgYJYqdqUklXCbfvl7u2ljRg6lrnM/KheFCXKSi2o2IF1NSakescieOALyOX4xeOSI0gcbY4Th+/X9x3bDf89oW/xQDK6AXwzzIDmyL3PRhW4NaqAipAJ3Kgdl1YwoHKtYkjlpgsHqylsqAvciTWofshiKDueuvYoyg1bES5U3qnLJ0sUC7tvzejyUITbuLaxQa6KiWzSMdoshvHxRPWSyip8vRNXzECAb+4yegdm29VZ/iAut0UvPlEzG/LLZytmcNxF4HufHD+4TNBZOLrMnmRTDPCWuwUnkDQHK99U0VL8vFyC9elIn9bnAiBIBZ6nbNNxjJgkrOHK7/Bmfmf5XonqhqhsbN9RI3BOyfjiwSHYQ690Ecz7i2P67cZPn5o2b4vlyWFwM8IHRXPnW0jJCuCSxDDT54FxZRzH5Ni/lXZx5YUOrymC6im1/OLUJbmS8zLqTTQIOFFcwI8MCpOEmrbaWTEodzNkcEK9FPVsDWWsdmXGp3+aEIlZAK2OnFBPZUZ3MPMPQCYCdCpf61Q4sBgeun1dj4HMRzEeKh+irWt+tALzoIARcHwuWZg+RvdFy84Sg5E7OBoqo8X2hPr5Ej/GF8WTn852RTYx/c/g8qiKWuP0hh0Rc4bcVox1V/iXaDaZ2D4b1SMcv/ptvOZO+FMWC5uR+FnUIWpMKju 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)(82310400017)(36860700004)(1800799015)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:44:03.8516 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7552371d-dfbe-44ff-2a29-08dc6e936091 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: SN1PEPF00036F3F.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7447 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. Without the fix the user will face KR training failure issues. Fixes: a5c7273771e8 ("net/axgbe: add phy programming APIs") Cc: stable@dpdk.org Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian 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 f122dfd516..d1fac667c2 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)) @@ -661,6 +662,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); } From patchwork Tue May 7 12:42:53 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: 139975 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 D6A5743FC9; Tue, 7 May 2024 14:45:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 50A1B433DA; Tue, 7 May 2024 14:44:12 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2052.outbound.protection.outlook.com [40.107.94.52]) by mails.dpdk.org (Postfix) with ESMTP id DDD77433C7 for ; Tue, 7 May 2024 14:44:08 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Meqd24kRIpoffm65x9p0o3kHs9OKHYb2Ic4QcjYT/rPnJqOJP7GKdQuzij0pl8DiCayHpBO/J33lu2STE/c7t/7GlgF8Ctp3XBkK8uSpMN7O3HR9y6/KnW4OE3J/fOOXn/207qhRCOw7D8bKCnnXzz3ZHU20F3CArKOipSFKLUPHIqsMgEkqTUTJ6sPaHShhCUCBidM/Ty/FSXMXccpiHxVgpMyFwdSXkuoHT4cSMV9uBCAqpP2meAPNvA3fp+npnFfHw5J66ABUBhb5yWjLUayAJAr41LZt+l7jSgKjuokCXetWVnq8xzgLRiivS3TZgzAOlRgBmTg+o9ecHdYHng== 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=aQ8fUqNXfPcZBcnJHAtnZMJ2TNQp+R0GhU3t0nyvfXA=; b=a6JlD+zfeO5QRjeysDLnpPK/X0D11Z26/C7GvPKyipgeNnTrDASjsgGDJDkVSK85dc5OIK9cMb2yHCvls21bkfDk7hN6Qqji+Ul0lrAaJ5Kp1VmoyqzUiXer7GHHcYux62GYHzmzbvmbTogFNFJJb3g2YO1uCuQzKkMd3NOveWMpIEjjAftWjE1SitUku2d6IpfvSTF3ZgzF2jpzXlTrIY+MsZnK7KrcmTgTqXnlmGuPOYoWRGZNm6logWis/awdWqgIimerDU+tXtqJFw8S8sjp+VXeJem7Nq+Z4hk59Xgo11L5zKUUtny+fsGdE50fN2RMuYuVcZIObdB0VTgF/g== 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=aQ8fUqNXfPcZBcnJHAtnZMJ2TNQp+R0GhU3t0nyvfXA=; b=3t8TVJHfldb7+acL5tpyee/nlAqouO61t1xffHN5pkxANiSozuNKRmz1NyKHMwWuOBIBVBTIFqxazHmtvITSDKM+vmT37yFdqCiJ+vZgV0AvHlE+1ZiOImUxh2pvu0AasT3WN46wvcFs9piob6/JcHR5JTwNIDV2dDOwpZzSLOA= Received: from PH7PR03CA0014.namprd03.prod.outlook.com (2603:10b6:510:339::10) by DM4PR12MB7576.namprd12.prod.outlook.com (2603:10b6:8:10c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41; Tue, 7 May 2024 12:44:06 +0000 Received: from SN1PEPF00036F3F.namprd05.prod.outlook.com (2603:10b6:510:339:cafe::f1) by PH7PR03CA0014.outlook.office365.com (2603:10b6:510:339::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.43 via Frontend Transport; Tue, 7 May 2024 12:44:06 +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 SN1PEPF00036F3F.mail.protection.outlook.com (10.167.248.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:44:06 +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; Tue, 7 May 2024 07:44:04 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande Subject: [PATCH v2 13/25] net/axgbe: remove use of comm owned field Date: Tue, 7 May 2024 18:12:53 +0530 Message-ID: <20240507124305.2318-13-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F3F:EE_|DM4PR12MB7576:EE_ X-MS-Office365-Filtering-Correlation-Id: 92bc42ba-dcaa-47c6-8fa0-08dc6e9361fb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|376005|1800799015|36860700004|82310400017; X-Microsoft-Antispam-Message-Info: wmll7CiDh7YCVdiwaaAuWHk7nzy9Krtw0z2QK4LE1exQGjqfLhs48TH6/WUypJEBDEP/gcB71hPGlQP/JiSwVmjSs0ZT9+vmx8+xL8YUzIdI4Qw7v8OKk0WFDMW2/hMUDx9vSRohpCAjtYc4l2q4DJavef6ZSRwvSaSaWoNR6mgzveUEfR8onVohz2oZe38AeGKKFQIMjufN3jYf1y+FOlwmfglrLbb300J7Z2O0V9JO3lczAiQ2mSV0QBhtDLroqjSi02FAHxLMcw5oDA1OBG9ZZeGRRB3Yr5CPBQJfvg9d2MAd/PcmmCkG3Hho+Yp2jjoFs+YQK0BYUpKsPQQq/X4vHdZ1Ok8gZriiZi8WE/lyoJC2xIlBYiFAsiOjjDJI1ksobtrltzYd9zFbvOHFCAvYQ5ZWv8/zCSASYMxizHBcwZCjSaC6keZKrdzDu+xJBNTqcpiNixPh7oCi0l/vWyxmSNxYqJghUNEn9ZN3N100z6hLT017fvMpviUiQUMR9o9B1wMDsDnnjpgKMQ9pf0jBKYcv/PqoZQ3+I3u0gPsqgb/D8pYYFp86VByW3u3Vs8DAxLMzS/jySh4Dzsht/VxLSGJXr+mnjwZsPqpxLej9yMi9qandSlCVizESQziWbngqx5TN3b/I+YjTsb6YszMEs6qT1npX+bemhOACIM+zdLo4M3HIds/T7UgjxgFIO8KgX5+ZTZYyHIGdsP7TkVSr9ejdoVeCi7LS0iZ3pe05lL4n3MGUuHo5e91+nkxuq+knUCwRbAz3ZA3h39gX+EhpVG7sWrAGOaxtWkPH51pO3VJuJNMzpfKQy+bIsD4jpdIiUKmTD8nj21D6REhAbQUcisMk07V5C8tRojpCb27pMkXScjJDFhdmK/WCABYZ2uFVTgcQta3Vq4weCcZxqG4BtvTvT4zskn0DuIHoMQuz8n7kOYXD5dsSxESssAnOzCZsXE5W5G/AXeZudC3qQaKPB60mAT8wR4gPL+ICkR4oSRCeiomN+Q7QEkqYySgfktcyNV+oiZR08rupjYnpBBJy/IRkzZG+jZJcGpMCf2U2PmvX1cCOiz/8/JyXmHogOHu8HTBjS3AHQXj+R690VUOMb6dqmyI1cU/bxqrpmyymmOaoH2mc6L4AMvXFmTDeCFS7h/QheiruFh4b7mY5xVYHjH5gHEKBW+szHyVO6rrAHPNTjoGL8bCGGYNrrZIiWGVI2r6p930w+3zT33TjIB263HH5S9At/l2jG3gXbzbRbzKfTIJ3WR5Jl2GV1g4fgoWFkEuc/alFAT2PPULVRf/Ty1FDQsfZmgb22jnKTvo+DGb9YCzIn1MnIm5UnRnudeEDBl+N/B3hC5YGtIxzFoSYuO2R/7VCe9rhKAMshhrSGKbL7ztWRMnh7Tb37F7d 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)(1800799015)(36860700004)(82310400017); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:44:06.2266 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 92bc42ba-dcaa-47c6-8fa0-08dc6e9361fb 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: SN1PEPF00036F3F.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7576 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 The comm_owned field can hide logic where double locking is attempted and prevent multiple threads for the same device from accessing the mutex properly. Remove the comm_owned field and use the mutex API exclusively for gaining ownership. Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_phy_impl.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index 0ad5b4ba85..d2a2b124be 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -204,8 +204,6 @@ struct axgbe_phy_data { unsigned int mdio_addr; - unsigned int comm_owned; - /* SFP Support */ enum axgbe_sfp_comm sfp_comm; unsigned int sfp_mux_address; @@ -253,12 +251,6 @@ static enum axgbe_an_mode axgbe_phy_an_mode(struct axgbe_port *pdata); static int axgbe_phy_i2c_xfer(struct axgbe_port *pdata, struct axgbe_i2c_op *i2c_op) { - struct axgbe_phy_data *phy_data = pdata->phy_data; - - /* Be sure we own the bus */ - if (!phy_data->comm_owned) - return -EIO; - return pdata->i2c_if.i2c_xfer(pdata, i2c_op); } @@ -399,10 +391,6 @@ static int axgbe_phy_sfp_get_mux(struct axgbe_port *pdata) static void axgbe_phy_put_comm_ownership(struct axgbe_port *pdata) { - struct axgbe_phy_data *phy_data = pdata->phy_data; - - phy_data->comm_owned = 0; - pthread_mutex_unlock(&pdata->phy_mutex); } @@ -418,9 +406,6 @@ static int axgbe_phy_get_comm_ownership(struct axgbe_port *pdata) */ pthread_mutex_lock(&pdata->phy_mutex); - if (phy_data->comm_owned) - return 0; - /* Clear the mutexes */ XP_IOWRITE(pdata, XP_I2C_MUTEX, AXGBE_MUTEX_RELEASE); XP_IOWRITE(pdata, XP_MDIO_MUTEX, AXGBE_MUTEX_RELEASE); @@ -443,7 +428,6 @@ static int axgbe_phy_get_comm_ownership(struct axgbe_port *pdata) XP_IOWRITE(pdata, XP_I2C_MUTEX, mutex_id); XP_IOWRITE(pdata, XP_MDIO_MUTEX, mutex_id); - phy_data->comm_owned = 1; return 0; } From patchwork Tue May 7 12:42:54 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: 139977 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 7F08943FC9; Tue, 7 May 2024 14:45:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6BBF3433CC; Tue, 7 May 2024 14:44:15 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2069.outbound.protection.outlook.com [40.107.244.69]) by mails.dpdk.org (Postfix) with ESMTP id B2365433B4 for ; Tue, 7 May 2024 14:44:13 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hN9XbgGRCR4kzcCoVlxJYUhmN1GDxOUGiraQwRfBwn9ZaTHtJcRneBNoTzqFoO/Yat5tGnWKIn7rmi++44jKaPvuoRkMeINQBdCPSs8oPwytbELrjk5IdLSmut4c+gXwgaVZEVcFOTdYW2wVeldXObCd9P94CIrQYAuLDGkGMJvQ+TywG00FHM55nRTRriMo9PuE/3v6M7FtWKMPniGQ2icrppB34B63raau0B9TUowvczns0AzFZtxGh0CY7m7enm5gBoPNV/qM0Ek35H6b1SjkYQRS6+mgPTKApqbrMR34nXIE7pAGcegabaXHxklEeYxAAYgTE4Upjfa5bpWJTA== 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=2xP0v/ui/VwTAlj9C4RWXzuoVFZIVFRHLaZg8tcZvE4=; b=Ha02tFaS8QWNp2Vu+4kjv3Si1vp8335Fz6LGyoa18onMtG/TudUnCBKU90aK1jOZrf8QaO5fvTQ4oTQAUskSYLgdppmMtSGmcxA953NWvMtoeo9XJuPlNNKzPTS8Cg640HeTei/uABsYQ37asBvpXoi2/DRTEwNGoUwR2Ec8q2HkU8+Ld8WpJR7rjmOrB7zAFAuEBgXXuS7kdifOZIxzn0hlb796dRVxL9rw83xnm7lm9OnzDUzJku9FDJKFTbCUxBHHbf+0wzwdGPVQGdmefm7AIZpvDDnN1KJtqt8SmwpPmTa2ZwZQbOx251bwe0tta17Dz+6sQHISHZ5WL5yjmg== 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=2xP0v/ui/VwTAlj9C4RWXzuoVFZIVFRHLaZg8tcZvE4=; b=3UGDn0qEZKT8bjTOsP5mWFOq2YkQgaUU0FelW8jT5ttD2Sf2p6oUHl90vhUyLRvncqhuwg5iuD8ptuM2T8HupJILFiB/K5iXtSa9engNGZmUavQtjSRcXrO+gzW4EwN9s17OVH3BJ05Djk1UUY6c7MIc09MtAB4QaPIaerxqUHs= Received: from PR2P264CA0010.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::22) by SA3PR12MB9105.namprd12.prod.outlook.com (2603:10b6:806:382::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41; Tue, 7 May 2024 12:44:10 +0000 Received: from SN1PEPF00036F42.namprd05.prod.outlook.com (2603:10a6:101:0:cafe::1b) by PR2P264CA0010.outlook.office365.com (2603:10a6:101::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42 via Frontend Transport; Tue, 7 May 2024 12:44:09 +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 SN1PEPF00036F42.mail.protection.outlook.com (10.167.248.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:44:08 +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; Tue, 7 May 2024 07:44:06 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande Subject: [PATCH v2 14/25] net/axgbe: remove field of SFP diagnostic support Date: Tue, 7 May 2024 18:12:54 +0530 Message-ID: <20240507124305.2318-14-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F42:EE_|SA3PR12MB9105:EE_ X-MS-Office365-Filtering-Correlation-Id: 94769724-587b-486f-5b35-08dc6e93637d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|1800799015|376005|36860700004|82310400017; X-Microsoft-Antispam-Message-Info: drntu6FHXNMZar+xcG5G0ZEGGIZi6Z4ePhwW0wxpv/ZLzfeBqAveAfymuN/5zC38XboSccij2dfjrB+suPt3h7OkiijY0L+uz8/jHYCGcCFENUSG0bIjYTrjmDZ5v9xUlPsvF2VErwwe85/EzAVDlZOfIQ5pOtWtuKaD4nYaj4dH2eWYiDvrFDu6L1R7fulhk4MLJUMLtAtze9jwHRe0FDFKMJFtJzbH0BUyN1YFfeMqLvmqmkwafzu037APzKvShcFy8A5Bb/PDYFSSM4Iq2L9XB3g5SotpgrpV6Rsx5iwjxY7agnQLFNHi45bF+fycNK5sJHp/wJUaZ09yio9QoB4Vsf+4zlqxvzJ5rnVthTBoegOKs1HYPMS2fvd13seu9kUQqm3MPb3Dxj9XqSXh8q6fyiX2snTa9pz94dnMrOG+vAXuuUL38Bq/+OU4ZiYflIx4OR7yRqyu4XcPKjY34258WdBil20vyb45zY1tGOj2ttyhTvXRsGBp9/op8MH0lwiOdfAf5QoVfTmzx0lBPu3uFnKFQTZZAoaMB0yloiPi0RtaJE8fvExWlDO8ySLCt6XgZnoMsMK4qQV/va5TVdHt1QKSEXvD/uwinpf0Blne9c+RAyYbvlEnCMV0Jiz97ZV4ljE3DyNAxvunJM/krPdb7L5p/1fBYMoASq7a5dgW2Skz3Lj0pwgeTXIVa1+9CkFAmbsPTXXeWqVuXBKsD7XORm/BKUFmeSkMXkNmQ5d5Not86jk4Zcrk2DosgX1jW2Lw6mCfULJjrv3fj2CvGIY7qc7UHwO3ejUBU8AFyZMBsWR1tDXyIYQ10DdwkRhLXZt4iHYOBTtVfcumh0qrcTLHKrkeqC3DMww5QJraIXhJ/U11v6ijL7RHdfJdRH0nu1SakUzYphm7ljmbqTxtixJjw47NzaB9QW0nwqpD78NXh13N1C1hbjUwWSrNgTbagvxKOMQWUo08+VlMafqtGbOW7cgjUI5Mp1r/GnzS2U4ZqJxUw9oHYBgXXqPMGDxMW6h9WrgWXwMKjAzDFJWdLm0KNzs8KnZiXvMeSBLlVElHDIwx7vUjAc44hst48SaXJ9xF3Asj8DYO4vOuZ3tR32eR0CKEOQcb4bsBKLkmNLXQj0JEfLcmBan/ebUR15+C/lNVlPK0Js13q9aW7PzPfRbXBzzJ8DEwf+G+8mBUBGxIW53r1/rIhgYnKvTxcNs6kwLMvSjyFMxk4TmFz4NODGpl2ZAWoRhyVsW0+tme2cqDisFUFnjvo5P9WUEBJwvtW35wIXo01kTyUFCptNvzBi888jCPRoGa/eFVPELJjsOBOpWFeWCZ9YwdXJZk+vYxZcXpXHawbuZsWgyB0aXOAumyvmn+qTEFkBNMTM43RQxn+OwGe2wrJN3vf052Wt6A 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)(1800799015)(376005)(36860700004)(82310400017); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:44:08.7081 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 94769724-587b-486f-5b35-08dc6e93637d 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: SN1PEPF00036F42.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB9105 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 The driver currently sets an indication of whether the SFP supports, and that the driver can obtain, diagnostics data. This isn't currently used by the driver. Remove this field and the logic supporting it. Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_phy_impl.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index d2a2b124be..4dab2ccad0 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -219,7 +219,6 @@ struct axgbe_phy_data { unsigned int sfp_rx_los; unsigned int sfp_tx_fault; unsigned int sfp_mod_absent; - unsigned int sfp_diags; unsigned int sfp_changed; unsigned int sfp_phy_avail; unsigned int sfp_cable_len; @@ -702,14 +701,6 @@ static int axgbe_phy_sfp_read_eeprom(struct axgbe_port *pdata) if (memcmp(&phy_data->sfp_eeprom, &sfp_eeprom, sizeof(sfp_eeprom))) { phy_data->sfp_changed = 1; memcpy(&phy_data->sfp_eeprom, &sfp_eeprom, sizeof(sfp_eeprom)); - - if (sfp_eeprom.extd[AXGBE_SFP_EXTD_SFF_8472]) { - uint8_t diag_type; - diag_type = sfp_eeprom.extd[AXGBE_SFP_EXTD_DIAG]; - - if (!(diag_type & AXGBE_SFP_EXTD_DIAG_ADDR_CHANGE)) - phy_data->sfp_diags = 1; - } } else { phy_data->sfp_changed = 0; } @@ -770,7 +761,6 @@ static void axgbe_phy_sfp_reset(struct axgbe_phy_data *phy_data) phy_data->sfp_rx_los = 0; phy_data->sfp_tx_fault = 0; phy_data->sfp_mod_absent = 1; - phy_data->sfp_diags = 0; phy_data->sfp_base = AXGBE_SFP_BASE_UNKNOWN; phy_data->sfp_cable = AXGBE_SFP_CABLE_UNKNOWN; phy_data->sfp_speed = AXGBE_SFP_SPEED_UNKNOWN; From patchwork Tue May 7 12:42:55 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: 139978 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 2419643FC9; Tue, 7 May 2024 14:45:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E361C433EA; Tue, 7 May 2024 14:44:17 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2066.outbound.protection.outlook.com [40.107.220.66]) by mails.dpdk.org (Postfix) with ESMTP id 4838C433EA for ; Tue, 7 May 2024 14:44:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PvrF0k7MW1bRASc3Q3yGWIY3N+oAvTgc/7vSTPVlXQAinpHYzxWw3mMI31Qpw2mKgGfUvdzF/mvV+BAvtb4ycOiTOiQQ7VH83UP35JbRhr6Dt1xETHy4k0gj4Y6fJgau6JSySdzy0L9TBHR2KHIno2sIN5hatRwsy+oAXLPTDnuP3CdvAszEKd0IfykrVgcCqcq3ISsgfG0v3yPgjac5hp/HPJSVI9Gko6EyLSobnvotUN0Gr99jhjCuuWlb7b2jUsvuLJxyCqyP/FH/SEdL3jC9NkZMoYJ+jjsb2EiuLjpmb3nNbx6YVgwfWCjS8+Z0xrEGBlAdlrAxDUYZXGpBKw== 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=61Xr1pG0e0X9HzcfKz7U3h5J/chS/sP0zZq7vf5oGDE=; b=V78OC/ZD9+B6F9yTd+zGClWvUQc9t195WFjb/aKjm/CS2ZsLeEngfHCK2d5TG20XpVq3/Wzzc24gUz1NntpE+0T2VyQSsFZICjyj81VUgXkyKvQwMowhP8sl/BA0EJ55UQEgGlZzBuL5qwlbXSXoaS36aVWEjNBf7F/sanWH28KDdCFNvxvj/OGda8swp76KUVXyoRE4e4VMd3hON/8xVWkIFjfw2nNuAasJvF3Ox2Ymc4DqcDJOfa6SbnJh82nusbKTkxaqgM5m6tl0pdBcKXTwRAu+3KGYFR+/pEoz02c/CIWoO+1fqWXYNElsigC6BGP9wOLmD/ij4TPVrTuEzw== 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=61Xr1pG0e0X9HzcfKz7U3h5J/chS/sP0zZq7vf5oGDE=; b=0DtqLo4GE129Yfc7UHYiEI1XQ2rcKjWSrMIMFxz7GeIhxS3YgJ33eDrKUNMZayUIk6DNkiomNznBRWjvyOhvDNpVY7xWuxzfVfG1U8eA6KZq01grPSgzA03maS6+Tslfl0GUKmYRijHOXZXl6nH36EiC3tRHWC+sLS4lBrB0Uo8= Received: from PR2P264CA0023.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::35) by DM6PR12MB4156.namprd12.prod.outlook.com (2603:10b6:5:218::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.43; Tue, 7 May 2024 12:44:14 +0000 Received: from SN1PEPF00036F42.namprd05.prod.outlook.com (2603:10a6:101:0:cafe::29) by PR2P264CA0023.outlook.office365.com (2603:10a6:101::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41 via Frontend Transport; Tue, 7 May 2024 12:44:13 +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 SN1PEPF00036F42.mail.protection.outlook.com (10.167.248.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:44:13 +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; Tue, 7 May 2024 07:44:09 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande Subject: [PATCH v2 15/25] net/axgbe: improve SFP 100Mbps auto-negotiation Date: Tue, 7 May 2024 18:12:55 +0530 Message-ID: <20240507124305.2318-15-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F42:EE_|DM6PR12MB4156:EE_ X-MS-Office365-Filtering-Correlation-Id: e06bc73b-b806-421b-b326-08dc6e93661d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|376005|1800799015|36860700004|82310400017; X-Microsoft-Antispam-Message-Info: rfrM8YmaRewijgy1WVPFRbFweLY4wzrGIzScMN1S+SkP68C4bk9hEFd5CTXKHJ4EKwRWBTAf9TOiV3b2y7QOUwL4ejkRrDgdLIEuYrrIldtewype2NtkyEhYKMRbXvRfC6y4aLGhAsRQjQVpX7itM21+4ytQsVxUU83v64b3fu8rnP7ZSsREFQwBv7wVEhyJD9t8NQInRPc6SCGkuY2ElPiAdSbwjZNvkhQcGEOkG2dg0mOzUgSPkavznSQXebLz5gYOwBu1dTlLxnnqaxxmE81ByXz4BjV2I6aMWHD00LwL4ojhTQ4cnBSwDNA3BFFX6QzJ/56M5Hs+2s2EBg51/fJVLpURsVXot+PNT0ubsucWfO9ee3YoinPvYpDAjKGC7QnFQtLa9k+SDdZe6YRQXNpEC88HyaxcHxO214gqhaFysWs8wIipN/uwXhzPZ974clL2I90ZtOve0irYmh/Pv42Tj0D3J6OkN0DtRAJV9Q+Jqx71C+VEwGTLc+qAwT5aFWPCMZ70xeqcmdzlwgGo9mteZrvq2hsx/B0+8vUUbwf0e9jFEh4qXJLMppc+DzOFJChq/hvatLXK+9wkeg+DPUznCAe37Z+kHd4EXQfZS3fClWCElDzJX3lMu7mv0UmpQT3Pvw3q8AGbae2Zvnb7tbBjRPDKQ2Pqm4ZgUNjqk7q0ZqCZw26FHUgmffae7yP1ZcLXQYiyIrwIMqjsP23VwBECkDkuFmYVhUXqTKGICnTaLoRQ3WAIp7DhcJvcVcyy+ZshL0WEnFKIo1vvi44ByFFqRRd23esQzYXaZ/27YPGhGEA0IA4ktgydy0I2IXk70h+r6CPRT5t0FLHsEdQoKoVFQfeKe/K7cLMSd0vwYsYoaFCFAqyIWB5NNIaaoeGjK9/JdOgD7oCpmItmb1BW1hfegkDq02iZQBvQgmVVqroYEKWZmcNu4D2H9BdtqM345VqE4l79a+2mI+gYl5jMpf39ciVHYWFWmDqEKLlfpqzrYqDgeez30IWd1p0XZWp3OTk+Ng56dBSWKhZrTUYlu6wmXYbaZFBGvH6kF6sUNhUPKHsio2jzjAIPJqs48ezKskn1C92HS5S69eq4h7UpfZ0zBDh8UqbTIp98L1f8tXRg3EKKtZvv7Jh6tsAHD/bLEhH4GmBnIMMoStLR2wBYJXjn6h3KNrdpF9ex8eD29JInC+dN1yZEOunrGiVnRKm+33BOTD0gq2NYFYT5qT+AFWNrf8Er3tHUfIftueXJ2+EHMXxNlKoPeWnSHNFubvvS7JG4KDTaZtTQi1FByXsQYquQE7WcX5HW8+b51+J6FzTScEXMSceQ42gGe3uCg0mHk4Xh71eTOKd6pghL3eALAZZHOGmCRKtQzuqMPofb5Uj7bxNM9fmlO+1GFjOC35eL 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)(1800799015)(36860700004)(82310400017); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:44:13.1613 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e06bc73b-b806-421b-b326-08dc6e93661d 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: SN1PEPF00036F42.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4156 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 After changing speed to 100Mbps as a result of auto-negotiation (AN), some 10/100/1000Mbps SFPs indicate a successful link (no faults or loss of signal), but cannot successfully transmit or receive data. These SFPs required an extra auto-negotiation (AN) after the speed change in order to operate properly. Add a quirk for these SFPs so that if the outcome of the AN actually results in changing to a new speed, re-initiate AN at that new speed. Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_ethdev.h | 1 + drivers/net/axgbe/axgbe_mdio.c | 73 ++++++++++++++++-------------- drivers/net/axgbe/axgbe_phy_impl.c | 5 ++ 3 files changed, 46 insertions(+), 33 deletions(-) diff --git a/drivers/net/axgbe/axgbe_ethdev.h b/drivers/net/axgbe/axgbe_ethdev.h index d1fac667c2..b9d8a4e74f 100644 --- a/drivers/net/axgbe/axgbe_ethdev.h +++ b/drivers/net/axgbe/axgbe_ethdev.h @@ -658,6 +658,7 @@ struct axgbe_port { enum axgbe_an an_state; enum axgbe_rx kr_state; enum axgbe_rx kx_state; + unsigned int an_again; unsigned int an_supported; unsigned int parallel_detect; unsigned int fec_ability; diff --git a/drivers/net/axgbe/axgbe_mdio.c b/drivers/net/axgbe/axgbe_mdio.c index e1a737cf62..faa7cdbf0a 100644 --- a/drivers/net/axgbe/axgbe_mdio.c +++ b/drivers/net/axgbe/axgbe_mdio.c @@ -200,13 +200,14 @@ static void axgbe_switch_mode(struct axgbe_port *pdata) axgbe_change_mode(pdata, pdata->phy_if.phy_impl.switch_mode(pdata)); } -static void axgbe_set_mode(struct axgbe_port *pdata, +static bool axgbe_set_mode(struct axgbe_port *pdata, enum axgbe_mode mode) { if (mode == axgbe_cur_mode(pdata)) - return; + return false; axgbe_change_mode(pdata, mode); + return true; } static bool axgbe_use_mode(struct axgbe_port *pdata, @@ -882,21 +883,22 @@ static int axgbe_phy_config_fixed(struct axgbe_port *pdata) return 0; } -static int __axgbe_phy_config_aneg(struct axgbe_port *pdata) +static int __axgbe_phy_config_aneg(struct axgbe_port *pdata, bool set_mode) { int ret; + pthread_mutex_lock(&pdata->an_mutex); rte_bit_relaxed_set32(AXGBE_LINK_INIT, &pdata->dev_state); pdata->link_check = rte_get_timer_cycles(); ret = pdata->phy_if.phy_impl.an_config(pdata); if (ret) - return ret; + goto out; if (pdata->phy.autoneg != AUTONEG_ENABLE) { ret = axgbe_phy_config_fixed(pdata); if (ret || !pdata->kr_redrv) - return ret; + goto out; PMD_DRV_LOG(DEBUG, "AN redriver support\n"); } else { PMD_DRV_LOG(DEBUG, "AN PHY configuration\n"); @@ -906,23 +908,26 @@ static int __axgbe_phy_config_aneg(struct axgbe_port *pdata) rte_intr_disable(pdata->pci_dev->intr_handle); /* Start auto-negotiation in a supported mode */ - if (axgbe_use_mode(pdata, AXGBE_MODE_KR)) { - axgbe_set_mode(pdata, AXGBE_MODE_KR); - } else if (axgbe_use_mode(pdata, AXGBE_MODE_KX_2500)) { - axgbe_set_mode(pdata, AXGBE_MODE_KX_2500); - } else if (axgbe_use_mode(pdata, AXGBE_MODE_KX_1000)) { - axgbe_set_mode(pdata, AXGBE_MODE_KX_1000); - } else if (axgbe_use_mode(pdata, AXGBE_MODE_SFI)) { - axgbe_set_mode(pdata, AXGBE_MODE_SFI); - } else if (axgbe_use_mode(pdata, AXGBE_MODE_X)) { - axgbe_set_mode(pdata, AXGBE_MODE_X); - } else if (axgbe_use_mode(pdata, AXGBE_MODE_SGMII_1000)) { - axgbe_set_mode(pdata, AXGBE_MODE_SGMII_1000); - } else if (axgbe_use_mode(pdata, AXGBE_MODE_SGMII_100)) { - axgbe_set_mode(pdata, AXGBE_MODE_SGMII_100); - } else { - rte_intr_enable(pdata->pci_dev->intr_handle); - return -EINVAL; + if (set_mode) { + if (axgbe_use_mode(pdata, AXGBE_MODE_KR)) { + axgbe_set_mode(pdata, AXGBE_MODE_KR); + } else if (axgbe_use_mode(pdata, AXGBE_MODE_KX_2500)) { + axgbe_set_mode(pdata, AXGBE_MODE_KX_2500); + } else if (axgbe_use_mode(pdata, AXGBE_MODE_KX_1000)) { + axgbe_set_mode(pdata, AXGBE_MODE_KX_1000); + } else if (axgbe_use_mode(pdata, AXGBE_MODE_SFI)) { + axgbe_set_mode(pdata, AXGBE_MODE_SFI); + } else if (axgbe_use_mode(pdata, AXGBE_MODE_X)) { + axgbe_set_mode(pdata, AXGBE_MODE_X); + } else if (axgbe_use_mode(pdata, AXGBE_MODE_SGMII_1000)) { + axgbe_set_mode(pdata, AXGBE_MODE_SGMII_1000); + } else if (axgbe_use_mode(pdata, AXGBE_MODE_SGMII_100)) { + axgbe_set_mode(pdata, AXGBE_MODE_SGMII_100); + } else { + rte_intr_enable(pdata->pci_dev->intr_handle); + ret = -EINVAL; + goto out; + } } /* Disable and stop any in progress auto-negotiation */ @@ -940,16 +945,7 @@ static int __axgbe_phy_config_aneg(struct axgbe_port *pdata) axgbe_an_init(pdata); axgbe_an_restart(pdata); - return 0; -} - -static int axgbe_phy_config_aneg(struct axgbe_port *pdata) -{ - int ret; - - pthread_mutex_lock(&pdata->an_mutex); - - ret = __axgbe_phy_config_aneg(pdata); +out: if (ret) rte_bit_relaxed_set32(AXGBE_LINK_ERR, &pdata->dev_state); else @@ -960,6 +956,16 @@ static int axgbe_phy_config_aneg(struct axgbe_port *pdata) return ret; } +static int axgbe_phy_config_aneg(struct axgbe_port *pdata) +{ + return __axgbe_phy_config_aneg(pdata, true); +} + +static int axgbe_phy_reconfig_aneg(struct axgbe_port *pdata) +{ + return __axgbe_phy_config_aneg(pdata, false); +} + static bool axgbe_phy_aneg_done(struct axgbe_port *pdata) { return pdata->an_result == AXGBE_AN_COMPLETE; @@ -1041,7 +1047,8 @@ static void axgbe_phy_status_result(struct axgbe_port *pdata) pdata->phy.duplex = DUPLEX_FULL; - axgbe_set_mode(pdata, mode); + if (axgbe_set_mode(pdata, mode) && pdata->an_again) + axgbe_phy_reconfig_aneg(pdata); } static int autoneg_time_out(unsigned long autoneg_start_time) diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index 4dab2ccad0..87ef8b6048 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -556,6 +556,8 @@ static bool axgbe_phy_belfuse_parse_quirks(struct axgbe_port *pdata) if (memcmp(&sfp_eeprom->base[AXGBE_SFP_BASE_VENDOR_NAME], AXGBE_BEL_FUSE_VENDOR, strlen(AXGBE_BEL_FUSE_VENDOR))) return false; + /* For Bel-Fuse, use the extra AN flag */ + pdata->an_again = 1; /* Reset PHY - wait for self-clearing reset bit to clear */ pdata->phy_if.phy_impl.reset(pdata); @@ -797,6 +799,9 @@ static void axgbe_phy_sfp_detect(struct axgbe_port *pdata) struct axgbe_phy_data *phy_data = pdata->phy_data; int ret; + /* Clear the extra AN flag */ + pdata->an_again = 0; + /* Reset the SFP signals and info */ axgbe_phy_sfp_reset(phy_data); From patchwork Tue May 7 12:42:56 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: 139980 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 DECFC43FC9; Tue, 7 May 2024 14:45:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 340D4433CB; Tue, 7 May 2024 14:44:29 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2063.outbound.protection.outlook.com [40.107.220.63]) by mails.dpdk.org (Postfix) with ESMTP id 34F6D43397 for ; Tue, 7 May 2024 14:44:26 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jpTlt6jA2TaHOi34aCVM+M/4TytbMnElGzUWRqaSoKuaCZXmtz6nCTnZ+usWjix6xSFJzMcEkj+QvaV77oECXfxOCG69Qsz1qSQ2Dn73BA8GYh/RHQv7orVcxIyQPzlxCKsGeTwEpbMR4HQ7004GwNgpfMrtRiJCwqEG5nbo+0J+aCTJhhTdwvHrfc/NGcJGxgWNACxTQN9uf5l8lIl2HRsnV5voGlSMzpGT1vm/k7XFjFLCkxIjT41Cbg0jpc7H3sJ4Yt2KDZKhoQEEoGAVwJrsXtaYvZijNuNIQ25LiwyMIhHi70Bms2mWqDKdgoIjS5OUa5e24g/mccvhSaHGKg== 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=jaFemUluKUSaNEuGQFnQdhfWVSXr+9lpC3swx+jdFn8=; b=i81V4ysEPPtTlGqaipnKPAR4NLRztmXKcUceJyMd+3xi63LOAUcYmKE037F6uUm5ot2rbJQhkvabTzjI4Bojn8A/TlHewXlTo9kj5p93OCJOdQ9fZLJBHC9XS4WAuxJEGUJfP08MlG5TFv0HT6aEq39GjpAp/C/6YvG/hle7jcXfxp2WQ86CGeeCiEep89NRc5u2nQUE/eSACfIUjiNJiUrlTmn5sDcBTMx0Hen2Z83A21w+BadKgayE+oVXgIAuVW0k+w/b3l8ajmrQQ6OJE1yxy1yRAEmNOBTKOQctMdv94y20BeAHeN3lSdjMPF6sWoiMidRGYkjRsp6dx7X4Ig== 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=jaFemUluKUSaNEuGQFnQdhfWVSXr+9lpC3swx+jdFn8=; b=k5Gz4nuKBqt5+UW0iqVU+8ajWzgeScc0Bf4/u2Rti4Azj6sUfwS/H5AJiE4SE80yT15vLdUaNc7zL2qQzFP0lAA/PeZBa7MeIaVdKHjTuCjLoauEe+kaR2sUkG3Xc20O8IKgog7aZp3Ml2cq/qukah5atI8Is3E+KJIGe6frHrM= Received: from PR2P264CA0009.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::21) by PH7PR12MB6884.namprd12.prod.outlook.com (2603:10b6:510:1ba::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.40; Tue, 7 May 2024 12:44:19 +0000 Received: from SN1PEPF00036F42.namprd05.prod.outlook.com (2603:10a6:101:0:cafe::19) by PR2P264CA0009.outlook.office365.com (2603:10a6:101::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41 via Frontend Transport; Tue, 7 May 2024 12:44:15 +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 SN1PEPF00036F42.mail.protection.outlook.com (10.167.248.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:44:14 +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; Tue, 7 May 2024 07:44:11 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande Subject: [PATCH v2 16/25] net/axgbe: remove unnecessary conversion to bool Date: Tue, 7 May 2024 18:12:56 +0530 Message-ID: <20240507124305.2318-16-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F42:EE_|PH7PR12MB6884:EE_ X-MS-Office365-Filtering-Correlation-Id: eb8ad90a-edcf-459b-f7a0-08dc6e936704 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|36860700004|82310400017|1800799015|376005; X-Microsoft-Antispam-Message-Info: xlGWTU/YE4xgssN/i6FoKH2X1oRyNE7vLeecIAidGG0qmifCZWJyZZY1BsXoBgPssXKpy0seh4tYWALFPlBLOitKEW/9y2ChzzF8FPTN6xslapDSh2o/B9NC7npqM1rl2iwd/gWEo25T2gHDuUMy+UMWmr1yE2c+HH7fSgfqYwnuK8cz4RGWu6M6gnsh+LEw0RDB0PnlSodLt+VvOZVNga6ZHA31hVe3kuBy3ONwYMtt29D/4mFHwSy3C9n/Ct5UFHxqP/JymPr9PYN3WbRsKM6voeIGlcXZesrFPzerSe36EqGebYaRos1w3IgDKlN+N3tBozuAwZExOchZZ+zVDTPk5bwlGCE4ZB6UO7c4p9kh3e+WuPA43S+LmYIWczybN53ulwRdx0C0OPL7qESyPugBtQR2Zsyzl4JQGrDbdKckKMWg0fEf7hze6jP7+rEupmVsw04bvwhs21x25g5fzMIxOA8qHhnleSeFM2gtTUSyawhHj/ZEwmqLyzCW9F7oj1hqY6/OvF5xno/dC5eiGxJ/XxBzFKT0xknc2ZgDZrqVEIIv0mWFLapCE/3G27ZMkGSw1rli6No1a/7WyZOx5DwvuCjxkwQ9WzFhDeb8kFfTNBVXwNjHLe849LaaDy47ciLIo1jSS2c3MVw4AsJjKO6lFF6kITGJnjCLjUFLy5s3KUPA4ksMtDZUtqxAWK3yiss8JzOouC3+mOb6DTR1k7vHJ1GrlLioUJ1Gx9yvYqJ7TI4JvHZTuPNIg81H0wG1br91jaznogJlm8+0nqW2vPBOYHKcR3pqWuxnuGZvDaOAoTpyeitKeYZlRKgDPtsS4T2JlYEnofqf7FI/XIlOaNwp44E6BXdqrtPJOBtzyH8Hk8Bjf+ZiCwd+Ifk0ZZ7632SRiXsaGmF7R1LWRiFjP0U1WCG3rhvkyZIvbZW5/zUTNUMpPDK00/Y/IiXHvvTiyDI/sW2wo6j6ZKva7N+lgPRnCxl9Q0ndKXAuHq1sV7rwXAOGCIe8k89DG7U8K0d65IOIY2o5CKvBwCe2a47BdqOL8jUL3coLEeDzAyDwKtNqYW4cmJn5LDJSZlKoESiKj07DmrRTQNP9LoqQhT5YCHl7iwWMvOZZLAylKu7anQjjBt/QIsuM53aJfSnuZFqlFwwpHbjU8nyjKVZhj0XMoxMUZxJUdIxEgEOYGcv0ofQ22V0pRovjmCbEs9JNAjUA8cYaBeWA7j/inXC0Ost5oxXbwHdQsNOcOoZLhSQOxGRjoXQUQTRw8I8t73NTRZqLGrw/0twYY322u0SBSxLb8jjKGxfBFodaDkahGw5PxJPzrL9xyWWSWJpR2f9X+1wPPG9ZI/7JSIWfP7SxqytwrGOwEeCvpUxCQqtn8c80jag= 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)(36860700004)(82310400017)(1800799015)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:44:14.6769 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eb8ad90a-edcf-459b-f7a0-08dc6e936704 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: SN1PEPF00036F42.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6884 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 The conversion to bool is not needed, remove it. Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_phy_impl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index 87ef8b6048..2620d44dfb 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -658,7 +658,7 @@ static bool axgbe_phy_sfp_verify_eeprom(uint8_t cc_in, uint8_t *buf, for (cc = 0; len; buf++, len--) cc += *buf; - return (cc == cc_in) ? true : false; + return cc == cc_in; } static int axgbe_phy_sfp_read_eeprom(struct axgbe_port *pdata) From patchwork Tue May 7 12:42:57 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: 139979 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 2387643FC9; Tue, 7 May 2024 14:45:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C7D3A433BB; Tue, 7 May 2024 14:44:27 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2066.outbound.protection.outlook.com [40.107.100.66]) by mails.dpdk.org (Postfix) with ESMTP id 722A943399 for ; Tue, 7 May 2024 14:44:26 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UEqCXaeOSpuM5KwbtwqIcaarfStU2tc4VrywZVO4FlSn2ZILfIQfh9w0p8e7PmApdVXBdqYV20JkU5E8QhUgUmp1bs93ZCOtI/zp5VCeUvHhNbRU7YF7JlubuZNsoqYCOf+CmKRIbsFqa4H0DkuB9bT1M0XSGiF63g6t/nNCRsAXlucJHdkW2Xr/k/UhM4USJJjVaA8lKQs33r9X8ljrrdw4ZGufaS6n7huWl5cD5rKk1I/TYMs3Fl6gpRtTkgInQ2bJK6G7QLt0zh1wdNLol9I5/4u3/gnFXkUVaL27a37Eg3Oe9rlOUpkekdS0fAaG3v3RZJdk8hCy4zuTvYv2pg== 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=4w1IE3Lbewl0c22GGy3WHauCbqGZcp0MuhXUpltgFxY=; b=YphSdmUY/0mOa8YrJUtVjIjBXcOdY4J4yy2JNPEYNjxHg+mowUXoyrRGai20cYGSIcThL8hLcrIP3J0VgeBI+H+w1ZZGIcX1Q1wJ7L2AqebbV6FTMQkZmRIhu78EC9uq5qCDKCh/wFVHi4kQAUCTKd6g1gEpuymuJTkjv23TKYkSD0QHT2mcUlDrsuxMz/0+AmiTqTQzrh1EWyioDhtdjvJ/Z82RmIDesJCgKoKPtdMLUT5jbQQPNCckH1Wa4O0rMjS+wGuCpYQ9bElUF4oyqlyQCdDnT8lMpjGvxn2ajBa6j/JI8fzIqZavERYyl61XEQ8eQ+9X9Zgc9G5JHtaC+g== 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=4w1IE3Lbewl0c22GGy3WHauCbqGZcp0MuhXUpltgFxY=; b=5hQi2ZaBv3kRkPUyFVA7+/SBre9XN2euWmZ+3eEoLpndGnlbjxry2PyWAF0haPmF6XEc+QhiY5umSszUzc6V9fna2ThnuQcsjUDO0j84dlEU0FzTrG08XqrwK8A8Z9A5EFfK2ZH5UqrZWaxcMLK8o0iMUxOk7MIB5UlWJoLIJ1Y= Received: from PR2P264CA0008.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::20) by MN2PR12MB4488.namprd12.prod.outlook.com (2603:10b6:208:24e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42; Tue, 7 May 2024 12:44:23 +0000 Received: from SN1PEPF00036F42.namprd05.prod.outlook.com (2603:10a6:101:0:cafe::50) by PR2P264CA0008.outlook.office365.com (2603:10a6:101::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42 via Frontend Transport; Tue, 7 May 2024 12:44:20 +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 SN1PEPF00036F42.mail.protection.outlook.com (10.167.248.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:44:20 +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; Tue, 7 May 2024 07:44:14 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande Subject: [PATCH v2 17/25] net/axgbe: use definitions for mailbox commands Date: Tue, 7 May 2024 18:12:57 +0530 Message-ID: <20240507124305.2318-17-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F42:EE_|MN2PR12MB4488:EE_ X-MS-Office365-Filtering-Correlation-Id: 892ca5c9-3ed7-427e-8147-08dc6e936a79 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|82310400017|1800799015|36860700004|376005; X-Microsoft-Antispam-Message-Info: r7L+USaphBBqWIgWQo0trLhgF5vALoIwG/UiJac1SrZ+xlTCKal/C1pv89i97+gPct28e1cSyYAHgvE6Am2X6n8KL5svdhaayIGjuerclzgJtSDyE48yBtrx0W1bvQSRpdhIuAP7OokKO7Pxnqd0cExFtkFHX43VJNR5+ATsBlw8HfJLW5NklgBhn27QmBSnw6d94EhaU7FwOzeHsNTyo79pljjHqxMH2CgBCs3lJBt04C8dUNXcemTT1mrQ2AT7pv3ctleWzCLfkbmfIYX0Wn1bKmUWnjIp/OuBg9mxr04Sw/rwLqCBGPqdE51j32S1+F4af1kEqcGXPPTd0aNRlrT/qq1HE0u6nQHm//WQBDuEeupYb9wHoxz3xGeihZ2SuPYRdrP9Xvgo4V6UQWBLpCw5E1/7jp1zwhvKbEhqXnmcwQlZDsea1Zuw1202elH1eUIQHLLNfQ8VmmDtGGAuhYLxcxTmDTFMZpfA6STCpBoTAIz5JZYnoqWPRAMnw/BuQ7dc5m3oWB3WpjnZV2t579pJZ/THnqFkei+acp10AWSBVlFrzy2kTRGteYe5T7E/ZgqAVPTmZbGdU9B4AdDT40m4gZtefqTkF1BwIoZKP9unqhJeHPyCnUtuEyvGgz9cY0MVKvm5vFkdmNCXH1UbQRzPm4eJLNRigsuGWmoshRSXTHShbSxZzwkZOywJfXhy/1iIVGGtlMvBe3xxy/FSHC4dsWrdAwCrs+IHrknmPqF+8rV2FDfEl2ae+b8t56Uy7cLrpaRv9YaNdZOHnxTH8InORGC2jYtiHIDMdnkQ+Wamu0zX4XkAcr+96OA2IgBxI2JXd3TaXzmfnFQ/rHJtNl0autBe269HfCZwHREsee+ROIXhQtzReo8ibwWsyefrXUZZfEsOyM4HzcIV8MH+X4b0IhlvjKsGiONN4HlxVaKGNhjFvqzVoAt0WqNxzR2RsUNgh/p759ShTN0b+hzrjuYiQDI4AaGzdVSsvQHqqVp6coh8W4ne+ntrG6S7Hj0uTZ3VJoXEvvogcYpY720CCu6jathMqN/6m0zwiuj/MZ0J0ooyu7RY16uD1C2ExNC3qOQcnWpajPinXy7hBiuz+sEXb8gLdTmfj9zwSNvi/7875tqcMprtBHH4hTehCeqLbattfGa1Ze1RrqM0XCcJhWKLRsSE/XElZO7jfMYexT0IRo+RQO/0omoDNFMaXQc5CcZ7I4jwAQXk2L/9GnyhgFFZes9bO9f8adjgeIgogJjF9ziAj+zF59oRkKVVHV+0Az7J2Ml2CaLSyYSKtSHvEbcqB6gXZLZOsz8mxkAC5h9Jp+eaHrgSyz8OsQoep40FQlIAe6FeEcP6286MiZUMOVPmA6k/SULSZ0LeGvsrBqroZYuwZXNdYPdMH+dG8dJV 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)(82310400017)(1800799015)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:44:20.4582 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 892ca5c9-3ed7-427e-8147-08dc6e936a79 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: SN1PEPF00036F42.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4488 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 Instead of using hardcoded values, use enumerations for mailbox command and sub commands. Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_ethdev.h | 25 +++++++++++++++++++++++++ drivers/net/axgbe/axgbe_phy_impl.c | 25 +++++++++++++++---------- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/drivers/net/axgbe/axgbe_ethdev.h b/drivers/net/axgbe/axgbe_ethdev.h index b9d8a4e74f..6dc1c1274b 100644 --- a/drivers/net/axgbe/axgbe_ethdev.h +++ b/drivers/net/axgbe/axgbe_ethdev.h @@ -231,6 +231,31 @@ enum axgbe_mdio_mode { AXGBE_MDIO_MODE_CL45, }; +enum axgbe_mb_cmd { + AXGBE_MB_CMD_POWER_OFF = 0, + AXGBE_MB_CMD_SET_1G, + AXGBE_MB_CMD_SET_2_5G, + AXGBE_MB_CMD_SET_10G_SFI, + AXGBE_MB_CMD_SET_10G_KR, + AXGBE_MB_CMD_RRC +}; + +enum axgbe_mb_subcmd { + AXGBE_MB_SUBCMD_NONE = 0, + + /* 10GbE SFP subcommands */ + AXGBE_MB_SUBCMD_ACTIVE = 0, + AXGBE_MB_SUBCMD_PASSIVE_1M, + AXGBE_MB_SUBCMD_PASSIVE_3M, + AXGBE_MB_SUBCMD_PASSIVE_OTHER, + + /* 1GbE Mode subcommands */ + AXGBE_MB_SUBCMD_10MBITS = 0, + AXGBE_MB_SUBCMD_100MBITS, + AXGBE_MB_SUBCMD_1G_SGMII, + AXGBE_MB_SUBCMD_1G_KX +}; + struct axgbe_phy { uint32_t supported; uint32_t advertising; diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index 2620d44dfb..67a18e7c55 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -1219,7 +1219,7 @@ static void axgbe_phy_pll_ctrl(struct axgbe_port *pdata, bool enable) } static void axgbe_phy_perform_ratechange(struct axgbe_port *pdata, - unsigned int cmd, unsigned int sub_cmd) + enum axgbe_mb_cmd cmd, enum axgbe_mb_subcmd sub_cmd) { unsigned int s0 = 0; unsigned int wait; @@ -1266,7 +1266,7 @@ static void axgbe_phy_rrc(struct axgbe_port *pdata) /* Receiver Reset Cycle */ - axgbe_phy_perform_ratechange(pdata, 5, 0); + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_RRC, AXGBE_MB_SUBCMD_NONE); PMD_DRV_LOG(DEBUG, "receiver reset complete\n"); } @@ -1276,7 +1276,7 @@ static void axgbe_phy_power_off(struct axgbe_port *pdata) struct axgbe_phy_data *phy_data = pdata->phy_data; /* Power off */ - axgbe_phy_perform_ratechange(pdata, 0, 0); + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_POWER_OFF, AXGBE_MB_SUBCMD_NONE); phy_data->cur_mode = AXGBE_MODE_UNKNOWN; @@ -1291,14 +1291,18 @@ static void axgbe_phy_sfi_mode(struct axgbe_port *pdata) /* 10G/SFI */ if (phy_data->sfp_cable != AXGBE_SFP_CABLE_PASSIVE) { - axgbe_phy_perform_ratechange(pdata, 3, 0); + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI, + AXGBE_MB_SUBCMD_ACTIVE); } else { if (phy_data->sfp_cable_len <= 1) - axgbe_phy_perform_ratechange(pdata, 3, 1); + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI, + AXGBE_MB_SUBCMD_PASSIVE_1M); else if (phy_data->sfp_cable_len <= 3) - axgbe_phy_perform_ratechange(pdata, 3, 2); + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI, + AXGBE_MB_SUBCMD_PASSIVE_3M); else - axgbe_phy_perform_ratechange(pdata, 3, 3); + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI, + AXGBE_MB_SUBCMD_PASSIVE_OTHER); } phy_data->cur_mode = AXGBE_MODE_SFI; @@ -1313,7 +1317,8 @@ static void axgbe_phy_kr_mode(struct axgbe_port *pdata) axgbe_phy_set_redrv_mode(pdata); /* 10G/KR */ - axgbe_phy_perform_ratechange(pdata, 4, 0); + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_KR, + AXGBE_MB_SUBCMD_NONE); phy_data->cur_mode = AXGBE_MODE_KR; PMD_DRV_LOG(DEBUG, "10GbE KR mode set\n"); @@ -1326,7 +1331,7 @@ static void axgbe_phy_kx_2500_mode(struct axgbe_port *pdata) axgbe_phy_set_redrv_mode(pdata); /* 2.5G/KX */ - axgbe_phy_perform_ratechange(pdata, 2, 0); + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_2_5G, AXGBE_MB_SUBCMD_NONE); phy_data->cur_mode = AXGBE_MODE_KX_2500; } @@ -1337,7 +1342,7 @@ static void axgbe_phy_sgmii_1000_mode(struct axgbe_port *pdata) axgbe_phy_set_redrv_mode(pdata); /* 1G/SGMII */ - axgbe_phy_perform_ratechange(pdata, 1, 2); + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_1G, AXGBE_MB_SUBCMD_1G_SGMII); phy_data->cur_mode = AXGBE_MODE_SGMII_1000; } From patchwork Tue May 7 12:42:58 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: 139981 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 736B943FC9; Tue, 7 May 2024 14:45:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 97123433F4; Tue, 7 May 2024 14:44:30 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2082.outbound.protection.outlook.com [40.107.223.82]) by mails.dpdk.org (Postfix) with ESMTP id DC33F433ED for ; Tue, 7 May 2024 14:44:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G+hL8+12KhAKQbNkygZgAb9DFH2qmqOzwVqZf4/9kGoYXvjnuISLK74t4khnbyajBeIzlO9C9uDdPJ7sBl48eVmztDATuGFsBKr6/eldkcM6a3M56q9Dok6MaZU6XKvMu6tanbgzOBpLw82pUX7xk4dYctEAPm1g37gow0wHuQ1muBi+w+rCh9gTz8zBB4ltqvq6N1sSh/RRAiCO8U7uEoijVtSr0MWzOjY01HKi9MywWsnAFtk9EzrHTpo8dGKWVujYrbLMavga5fq4se5yZCWU157nWHuLH2DrETx6gBCOI+a2cIicnqTtNCXsPUVg8ZWSul6TnvcvJ5AbS13zJA== 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=RBkkzdZT6F+4UgEzxWsn+D0cAdiCi4Ka/2wcz2+SFnk=; b=QwMJ7F5//Nl2iVMaeaHYnJiln7DN0LZP+EMtrSOTz+VcqcFkyuKhgBiO3RUJLkhPEV2ujrKZ3MPjZOWXA5Au+nuy56l3mBJyvaRN5snEL0ft2SeQxlpQLkZ6+eblUqRBp6W2oZEZYSw7qc+wbvDoM2jvrz9/dlcUeHz02ZnmPSC0PvAm7MoTRB2MSx/fnmg6poBmxO0laqzo867CIBtIUFlEhi7Wm8iOiIL8WM79occAO5W2buFbDxiLJQmvJZQQGpkI2C2GadLKPto/F5q/beXbuD4WXlHDTHEa5OjGEUcN4HR8VlPGVqjlLkjsadUaKHYFTd/b7xOhmuHyHblYjw== 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=RBkkzdZT6F+4UgEzxWsn+D0cAdiCi4Ka/2wcz2+SFnk=; b=dG13a5CeTf9bc/O+UkvJysLoaLWXyJKCUmxCJmupmr3/fu9gRkIvaIFOBXzjoCBKEpqP/7GQOhioLrdkpcKCL+7m634L9HedEv6vf5aWDSm9jVq7oi0A1WexgHqFVPMPvJtH3Cv+SqKPYYBpfYahl/NaDt9h2iDOVzED50YRRts= Received: from PR2P264CA0014.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::26) by IA1PR12MB8288.namprd12.prod.outlook.com (2603:10b6:208:3fe::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42; Tue, 7 May 2024 12:44:26 +0000 Received: from SN1PEPF00036F42.namprd05.prod.outlook.com (2603:10a6:101:0:cafe::ff) by PR2P264CA0014.outlook.office365.com (2603:10a6:101::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41 via Frontend Transport; Tue, 7 May 2024 12:44:24 +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 SN1PEPF00036F42.mail.protection.outlook.com (10.167.248.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:44:24 +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; Tue, 7 May 2024 07:44:16 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande Subject: [PATCH v2 18/25] net/axgbe: add support for 10 Mbps speed Date: Tue, 7 May 2024 18:12:58 +0530 Message-ID: <20240507124305.2318-18-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F42:EE_|IA1PR12MB8288:EE_ X-MS-Office365-Filtering-Correlation-Id: d85f9fb7-3de1-4659-a0bd-08dc6e936ce0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|376005|36860700004|82310400017|1800799015; X-Microsoft-Antispam-Message-Info: LOz7p283Tw7NZHLjevTfPQzu37kaedcWtHZY5WSFI+L0bXu8m9bt0V0x0yAoch9xT7Ji/YjxYWiidNP22Ks7dqPoRB5kDks2omrN7rurVkZH4qReJhdTVSh13VxMO6JiFSAqq8Pg44uODSeW81k4/NnZfuDlDknqPUVDMtfUj7G9MowvErXgfkD4sVDLZPqGexZM2v1uK5S+rTy+KS72lIji/X19NsEVcyyNueVf1x5n6LPoyVpnNhuo2FFaoHz1HzHRMsQQ3oNGdoXdOtIxE+/tw1VljUOoJSLO7OIO1tnfp4OJ8GZz94+Jz9p6VX+LilnuuXk/LTrfYkoQP43WS/VTEQ78zmZ25dd/OYgWRKWvBPcmrDFrR0gBtxc6as77iEnvr+MpVgNomH6wPc6SvVXHiu21A+xtDQ63Lgib8SKtX9P1H/wVK+kY78a22OU52fSYThZkrAM/e3KfZ/vjMw1+JVkY/Ehf6krJFHfhyddUwzvqL86OoBBylcW4aB0Qmr0ybhBOBTeznNpoqA5RN91QDSTOwsYeJxOWTiIumz9WqEKjROzuJBD8QBn2AL06GXrcOO7P/YXbn7LF5IL6KUFukHtTjR3CIEJYs2Qjxxka3JmJofnUhG1wjRd1D/LS7EnHdJsbgXSH/63GL5xJfQtn927c6mttEbjb1anbLNpUwNIS5BKF9hzNP/a5QVV7A4VbHIzz77darqedAx2uXxMm5ArGLdd55eIdXMP6ypJYKQnRGo8AmDrlZpuwfnJ/kNQT+s9+rT5X2urOcbDzxX0gYIXQCIiviLWlRDSQhgD7NC6F9c/OjTR7tn2UiT5LJelHiGD/vfA8dX+NVjsXJLAMSP8Xgr6nHVVh7nqDoWEhKJCAWBMAUaZAj+8T0R44y4AACGKuCl8fQrAxH1GmsEl0C9F10LN2eXzDcvVLPQLMjHE84f7zuopeBlM2hxAk/mxRpCjMTbJMMoVm7o+P7iYeKhkBuW4ZjKN5vBnovle6U6aCYKP4SzO7tnrQmeM7gnXWT4GMFJo93KYLD3seB9KSQ0VjOpBPLgWSKmiHY0fAT32ITLR0wTYBxlFQLiR6+k7odootMob7DMT2b7awbYbtaVpjlOv1GKRPZ0yMN7RyLgAMoKQWvtmiMlEXNTTdCnWDqwyRHB5z52EB2B/1wcfhtw/OLe+rQQh1mr+tuiJ1NURP3n13tatr+rx/dqgkTiXFPzgOyjOUfObGnTQq5yzPLO4EbVXRr+XkPQC/K48y6o0DPl44htDqoz1zz9sVNVxXlRL+PHMD1VBsSHWdc0aeiTOuaJsQVO87fr7HygFBFMu337NcCpwj0knIP2U8bOvAIOz4QdIrikGKvtsfwaG6cb0FLCrARusVxFOvU/c= 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)(82310400017)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:44:24.4894 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d85f9fb7-3de1-4659-a0bd-08dc6e936ce0 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: SN1PEPF00036F42.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8288 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 Add the necessary changes to support 10 Mbps speed for BaseT and SFP port modes. This is supported in MAC ver >= 30H. Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_dev.c | 3 ++ drivers/net/axgbe/axgbe_ethdev.h | 2 + drivers/net/axgbe/axgbe_mdio.c | 22 +++++++++ drivers/net/axgbe/axgbe_phy.h | 2 + drivers/net/axgbe/axgbe_phy_impl.c | 75 ++++++++++++++++++++++++++++-- 5 files changed, 100 insertions(+), 4 deletions(-) diff --git a/drivers/net/axgbe/axgbe_dev.c b/drivers/net/axgbe/axgbe_dev.c index 5233633a53..6b413160c2 100644 --- a/drivers/net/axgbe/axgbe_dev.c +++ b/drivers/net/axgbe/axgbe_dev.c @@ -250,6 +250,9 @@ static int axgbe_set_speed(struct axgbe_port *pdata, int speed) unsigned int ss; switch (speed) { + case SPEED_10: + ss = 0x07; + break; case SPEED_1000: ss = 0x03; break; diff --git a/drivers/net/axgbe/axgbe_ethdev.h b/drivers/net/axgbe/axgbe_ethdev.h index 6dc1c1274b..4dcbf6d9a2 100644 --- a/drivers/net/axgbe/axgbe_ethdev.h +++ b/drivers/net/axgbe/axgbe_ethdev.h @@ -115,6 +115,7 @@ #define AXGBE_SGMII_AN_LINK_STATUS BIT(1) #define AXGBE_SGMII_AN_LINK_SPEED (BIT(2) | BIT(3)) +#define AXGBE_SGMII_AN_LINK_SPEED_10 0x00 #define AXGBE_SGMII_AN_LINK_SPEED_100 0x04 #define AXGBE_SGMII_AN_LINK_SPEED_1000 0x08 #define AXGBE_SGMII_AN_LINK_DUPLEX BIT(4) @@ -214,6 +215,7 @@ enum axgbe_mode { AXGBE_MODE_KX_2500, AXGBE_MODE_KR, AXGBE_MODE_X, + AXGBE_MODE_SGMII_10, AXGBE_MODE_SGMII_100, AXGBE_MODE_SGMII_1000, AXGBE_MODE_SFI, diff --git a/drivers/net/axgbe/axgbe_mdio.c b/drivers/net/axgbe/axgbe_mdio.c index faa7cdbf0a..9fe30e83bc 100644 --- a/drivers/net/axgbe/axgbe_mdio.c +++ b/drivers/net/axgbe/axgbe_mdio.c @@ -143,6 +143,15 @@ static void axgbe_sgmii_1000_mode(struct axgbe_port *pdata) pdata->phy_if.phy_impl.set_mode(pdata, AXGBE_MODE_SGMII_1000); } +static void axgbe_sgmii_10_mode(struct axgbe_port *pdata) +{ + /* Set MAC to 10M speed */ + pdata->hw_if.set_speed(pdata, SPEED_10); + + /* Call PHY implementation support to complete rate change */ + pdata->phy_if.phy_impl.set_mode(pdata, AXGBE_MODE_SGMII_10); +} + static void axgbe_sgmii_100_mode(struct axgbe_port *pdata) { @@ -176,6 +185,9 @@ static void axgbe_change_mode(struct axgbe_port *pdata, case AXGBE_MODE_KR: axgbe_kr_mode(pdata); break; + case AXGBE_MODE_SGMII_10: + axgbe_sgmii_10_mode(pdata); + break; case AXGBE_MODE_SGMII_100: axgbe_sgmii_100_mode(pdata); break; @@ -864,6 +876,7 @@ static int axgbe_phy_config_fixed(struct axgbe_port *pdata) case AXGBE_MODE_KX_1000: case AXGBE_MODE_KX_2500: case AXGBE_MODE_KR: + case AXGBE_MODE_SGMII_10: case AXGBE_MODE_SGMII_100: case AXGBE_MODE_SGMII_1000: case AXGBE_MODE_X: @@ -923,6 +936,8 @@ static int __axgbe_phy_config_aneg(struct axgbe_port *pdata, bool set_mode) axgbe_set_mode(pdata, AXGBE_MODE_SGMII_1000); } else if (axgbe_use_mode(pdata, AXGBE_MODE_SGMII_100)) { axgbe_set_mode(pdata, AXGBE_MODE_SGMII_100); + } else if (axgbe_use_mode(pdata, AXGBE_MODE_SGMII_10)) { + axgbe_set_mode(pdata, AXGBE_MODE_SGMII_10); } else { rte_intr_enable(pdata->pci_dev->intr_handle); ret = -EINVAL; @@ -1025,6 +1040,9 @@ static void axgbe_phy_status_result(struct axgbe_port *pdata) mode = axgbe_phy_status_aneg(pdata); switch (mode) { + case AXGBE_MODE_SGMII_10: + pdata->phy.speed = SPEED_10; + break; case AXGBE_MODE_SGMII_100: pdata->phy.speed = SPEED_100; break; @@ -1173,6 +1191,8 @@ static int axgbe_phy_start(struct axgbe_port *pdata) axgbe_sgmii_1000_mode(pdata); } else if (axgbe_use_mode(pdata, AXGBE_MODE_SGMII_100)) { axgbe_sgmii_100_mode(pdata); + } else if (axgbe_use_mode(pdata, AXGBE_MODE_SGMII_10)) { + axgbe_sgmii_10_mode(pdata); } else { ret = -EINVAL; goto err_stop; @@ -1220,6 +1240,8 @@ static int axgbe_phy_best_advertised_speed(struct axgbe_port *pdata) return SPEED_1000; else if (pdata->phy.advertising & ADVERTISED_100baseT_Full) return SPEED_100; + else if (pdata->phy.advertising & ADVERTISED_10baseT_Full) + return SPEED_10; return SPEED_UNKNOWN; } diff --git a/drivers/net/axgbe/axgbe_phy.h b/drivers/net/axgbe/axgbe_phy.h index 77ee20a31a..5b844e81cd 100644 --- a/drivers/net/axgbe/axgbe_phy.h +++ b/drivers/net/axgbe/axgbe_phy.h @@ -168,6 +168,7 @@ #define ADVERTISED_1000baseKX_Full (1 << 17) #define ADVERTISED_1000baseT_Full (1 << 5) #define ADVERTISED_100baseT_Full (1 << 3) +#define ADVERTISED_10baseT_Full (1 << 2) #define ADVERTISED_TP (1 << 7) #define ADVERTISED_FIBRE (1 << 10) #define ADVERTISED_Backplane (1 << 16) @@ -175,6 +176,7 @@ #define SUPPORTED_1000baseKX_Full (1 << 17) #define SUPPORTED_10000baseKR_Full (1 << 19) #define SUPPORTED_2500baseX_Full (1 << 15) +#define SUPPORTED_10baseT_Full (1 << 3) #define SUPPORTED_100baseT_Full (1 << 2) #define SUPPORTED_1000baseT_Full (1 << 5) #define SUPPORTED_10000baseT_Full (1 << 12) diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index 67a18e7c55..9c2c411b4f 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -7,6 +7,7 @@ #include "axgbe_common.h" #include "axgbe_phy.h" +#define AXGBE_PHY_PORT_SPEED_10 BIT(0) #define AXGBE_PHY_PORT_SPEED_100 BIT(1) #define AXGBE_PHY_PORT_SPEED_1000 BIT(2) #define AXGBE_PHY_PORT_SPEED_2500 BIT(3) @@ -490,6 +491,8 @@ static void axgbe_phy_sfp_phy_settings(struct axgbe_port *pdata) switch (phy_data->sfp_speed) { case AXGBE_SFP_SPEED_100_1000: + if (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_10) + pdata->phy.advertising |= ADVERTISED_10baseT_Full; if (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_100) pdata->phy.advertising |= ADVERTISED_100baseT_Full; if (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_1000) @@ -511,6 +514,8 @@ static void axgbe_phy_sfp_phy_settings(struct axgbe_port *pdata) pdata->phy.advertising |= ADVERTISED_1000baseT_Full; else if (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_100) pdata->phy.advertising |= ADVERTISED_100baseT_Full; + else if (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_10) + pdata->phy.advertising |= ADVERTISED_10baseT_Full; } } @@ -980,6 +985,14 @@ static enum axgbe_mode axgbe_phy_an37_sgmii_outcome(struct axgbe_port *pdata) axgbe_phy_phydev_flowctrl(pdata); switch (pdata->an_status & AXGBE_SGMII_AN_LINK_SPEED) { + case AXGBE_SGMII_AN_LINK_SPEED_10: + if (pdata->an_status & AXGBE_SGMII_AN_LINK_DUPLEX) { + pdata->phy.lp_advertising |= ADVERTISED_10baseT_Full; + mode = AXGBE_MODE_SGMII_10; + } else { + mode = AXGBE_MODE_UNKNOWN; + } + break; case AXGBE_SGMII_AN_LINK_SPEED_100: if (pdata->an_status & AXGBE_SGMII_AN_LINK_DUPLEX) { pdata->phy.lp_advertising |= ADVERTISED_100baseT_Full; @@ -1347,6 +1360,18 @@ static void axgbe_phy_sgmii_1000_mode(struct axgbe_port *pdata) phy_data->cur_mode = AXGBE_MODE_SGMII_1000; } +static void axgbe_phy_sgmii_10_mode(struct axgbe_port *pdata) +{ + struct axgbe_phy_data *phy_data = pdata->phy_data; + + axgbe_phy_set_redrv_mode(pdata); + + /* 10M/SGMII */ + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_1G, AXGBE_MB_SUBCMD_10MBITS); + + phy_data->cur_mode = AXGBE_MODE_SGMII_10; +} + static enum axgbe_mode axgbe_phy_cur_mode(struct axgbe_port *pdata) { struct axgbe_phy_data *phy_data = pdata->phy_data; @@ -1363,6 +1388,7 @@ static enum axgbe_mode axgbe_phy_switch_baset_mode(struct axgbe_port *pdata) return axgbe_phy_cur_mode(pdata); switch (axgbe_phy_cur_mode(pdata)) { + case AXGBE_MODE_SGMII_10: case AXGBE_MODE_SGMII_100: case AXGBE_MODE_SGMII_1000: return AXGBE_MODE_KR; @@ -1433,6 +1459,8 @@ static enum axgbe_mode axgbe_phy_get_baset_mode(struct axgbe_phy_data *phy_data int speed) { switch (speed) { + case SPEED_10: + return AXGBE_MODE_SGMII_10; case SPEED_100: return AXGBE_MODE_SGMII_100; case SPEED_1000: @@ -1448,6 +1476,8 @@ static enum axgbe_mode axgbe_phy_get_sfp_mode(struct axgbe_phy_data *phy_data, int speed) { switch (speed) { + case SPEED_10: + return AXGBE_MODE_SGMII_10; case SPEED_100: return AXGBE_MODE_SGMII_100; case SPEED_1000: @@ -1525,6 +1555,9 @@ static void axgbe_phy_set_mode(struct axgbe_port *pdata, enum axgbe_mode mode) case AXGBE_MODE_SGMII_1000: axgbe_phy_sgmii_1000_mode(pdata); break; + case AXGBE_MODE_SGMII_10: + axgbe_phy_sgmii_10_mode(pdata); + break; default: break; } @@ -1566,6 +1599,9 @@ static bool axgbe_phy_use_baset_mode(struct axgbe_port *pdata, enum axgbe_mode mode) { switch (mode) { + case AXGBE_MODE_SGMII_10: + return axgbe_phy_check_mode(pdata, mode, + ADVERTISED_10baseT_Full); case AXGBE_MODE_SGMII_100: return axgbe_phy_check_mode(pdata, mode, ADVERTISED_100baseT_Full); @@ -1591,6 +1627,11 @@ static bool axgbe_phy_use_sfp_mode(struct axgbe_port *pdata, return false; return axgbe_phy_check_mode(pdata, mode, ADVERTISED_1000baseT_Full); + case AXGBE_MODE_SGMII_10: + if (phy_data->sfp_base != AXGBE_SFP_BASE_1000_T) + return false; + return axgbe_phy_check_mode(pdata, mode, + ADVERTISED_10baseT_Full); case AXGBE_MODE_SGMII_100: if (phy_data->sfp_base != AXGBE_SFP_BASE_1000_T) return false; @@ -1803,6 +1844,12 @@ static int axgbe_phy_mdio_reset_setup(struct axgbe_port *pdata) static bool axgbe_phy_port_mode_mismatch(struct axgbe_port *pdata) { struct axgbe_phy_data *phy_data = pdata->phy_data; + unsigned int ver; + + /* 10 Mbps speed is not supported in ver < 30H */ + ver = AXGMAC_GET_BITS(pdata->hw_feat.version, MAC_VR, SNPSVER); + if (ver < 0x30 && phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_10) + return true; switch (phy_data->port_mode) { case AXGBE_PORT_MODE_BACKPLANE: @@ -1816,7 +1863,8 @@ static bool axgbe_phy_port_mode_mismatch(struct axgbe_port *pdata) return false; break; case AXGBE_PORT_MODE_1000BASE_T: - if ((phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_100) || + if ((phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_10) || + (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_100) || (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_1000)) return false; break; @@ -1825,13 +1873,15 @@ static bool axgbe_phy_port_mode_mismatch(struct axgbe_port *pdata) return false; break; case AXGBE_PORT_MODE_NBASE_T: - if ((phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_100) || + if ((phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_10) || + (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_100) || (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_1000) || (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_2500)) return false; break; case AXGBE_PORT_MODE_10GBASE_T: - if ((phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_100) || + if ((phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_10) || + (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_100) || (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_1000) || (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_10000)) return false; @@ -1841,7 +1891,8 @@ static bool axgbe_phy_port_mode_mismatch(struct axgbe_port *pdata) return false; break; case AXGBE_PORT_MODE_SFP: - if ((phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_100) || + if ((phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_10) || + (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_100) || (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_1000) || (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_10000)) return false; @@ -2150,6 +2201,10 @@ static int axgbe_phy_init(struct axgbe_port *pdata) pdata->phy.supported |= SUPPORTED_Autoneg; pdata->phy.supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause; pdata->phy.supported |= SUPPORTED_TP; + if (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_10) { + pdata->phy.supported |= SUPPORTED_10baseT_Full; + phy_data->start_mode = AXGBE_MODE_SGMII_10; + } if (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_100) { pdata->phy.supported |= SUPPORTED_100baseT_Full; phy_data->start_mode = AXGBE_MODE_SGMII_100; @@ -2178,6 +2233,10 @@ static int axgbe_phy_init(struct axgbe_port *pdata) pdata->phy.supported |= SUPPORTED_Autoneg; pdata->phy.supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause; pdata->phy.supported |= SUPPORTED_TP; + if (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_10) { + pdata->phy.supported |= SUPPORTED_10baseT_Full; + phy_data->start_mode = AXGBE_MODE_SGMII_10; + } if (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_100) { pdata->phy.supported |= SUPPORTED_100baseT_Full; phy_data->start_mode = AXGBE_MODE_SGMII_100; @@ -2199,6 +2258,10 @@ static int axgbe_phy_init(struct axgbe_port *pdata) pdata->phy.supported |= SUPPORTED_Autoneg; pdata->phy.supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause; pdata->phy.supported |= SUPPORTED_TP; + if (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_10) { + pdata->phy.supported |= SUPPORTED_10baseT_Full; + phy_data->start_mode = AXGBE_MODE_SGMII_10; + } if (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_100) { pdata->phy.supported |= SUPPORTED_100baseT_Full; phy_data->start_mode = AXGBE_MODE_SGMII_100; @@ -2234,6 +2297,10 @@ static int axgbe_phy_init(struct axgbe_port *pdata) pdata->phy.supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause; pdata->phy.supported |= SUPPORTED_TP; pdata->phy.supported |= SUPPORTED_FIBRE; + if (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_10) { + pdata->phy.supported |= SUPPORTED_10baseT_Full; + phy_data->start_mode = AXGBE_MODE_SGMII_10; + } if (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_100) { pdata->phy.supported |= SUPPORTED_100baseT_Full; phy_data->start_mode = AXGBE_MODE_SGMII_100; From patchwork Tue May 7 12:42:59 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: 139982 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 80E7043FC9; Tue, 7 May 2024 14:45:54 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0863443400; Tue, 7 May 2024 14:44:33 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2084.outbound.protection.outlook.com [40.107.244.84]) by mails.dpdk.org (Postfix) with ESMTP id 10FF6433FA for ; Tue, 7 May 2024 14:44:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fw6HKrkTVX9JDjvyaxwlFhSWMTXCgdnq/fpq6keut6MYEz8hBqO0GUnNmweqHTTkNClVoV2mSJwvnBYYvZQtoShGMD0iEriYqi0OOUd9EpiNck2FLZbzv4HhfWoZRbJz7QhRitEgkaGzkNjxo+p2SkM7LRJ4sT4GgaMf6dPfmhY713u0tHnfqP55W7cXGYxT5KuYxBnpXLTbfEqOuevaCdAJB5Z6wiW0KyZedO8Vfjgdrj+QijAiD5cSh1kHinenLc1YCJnTgZyK0Yx1B2NCUBPkcnTfja2T3QwLoMehtp1PCdgBA4SA9U3R6TVTZA6ycibVndePgQdMRvJYbK8uzg== 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=AvDa/CC1Z+qxaOzGe5oCjCZFYYT+3KPhUBEhDSHp4sE=; b=G0zsZkzrpwGzDHqrupWtjVeibvAtA8tnY7R4+yv3QjOBUX9OHqFJDQ1/nJQDrRJ1RFIdQSHsJDebHimD+rGD1xkFm4s7m0nDpyHh5acENtXTxF07ZFXIT6WRFWBN6iM9xdd72EPzD5UflOYlSFSZqhChKY9Z3BV6pWaABB1RLvWEfn6ZRaSwHqnmA+Z5W7RdsVxce2Zs7xKL315QwSSXxRll76EtLQEpHSdt273vjAmvjUfY2xTPWdZDrtcHGWKwWKgmoQpNG04ABfPFthMgOUZkfEr6i1pfc86GnkoivjYVtx2+b+YJy1kTxM6fGNSGSYA6jmx6eZPRV68BUhEL+g== 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=AvDa/CC1Z+qxaOzGe5oCjCZFYYT+3KPhUBEhDSHp4sE=; b=HEjFmCDqD0f1YXchtia9f7CO6zUCG6cGWf+McTgsy8ZGCIavLgL8nobabwuXRmHBthf7xz/w9M1sbylCI0aka1nuJWrp/DIFuuqVhj9HSS3NhxbKA9lwCfy3IjrBkfziYzxLbV0SPNW1shT8gWQuckEtUzeQFNb6Nlmrm/BbVuU= Received: from PR2P264CA0014.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::26) by SN7PR12MB6690.namprd12.prod.outlook.com (2603:10b6:806:272::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41; Tue, 7 May 2024 12:44:28 +0000 Received: from SN1PEPF00036F42.namprd05.prod.outlook.com (2603:10a6:101:0:cafe::be) by PR2P264CA0014.outlook.office365.com (2603:10a6:101::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41 via Frontend Transport; Tue, 7 May 2024 12:44: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 SN1PEPF00036F42.mail.protection.outlook.com (10.167.248.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:44: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; Tue, 7 May 2024 07:44:18 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande Subject: [PATCH v2 19/25] net/axgbe: separate C22 and C45 transactions Date: Tue, 7 May 2024 18:12:59 +0530 Message-ID: <20240507124305.2318-19-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F42:EE_|SN7PR12MB6690:EE_ X-MS-Office365-Filtering-Correlation-Id: 78e3a9cc-c2c8-49e7-f550-08dc6e936e18 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|36860700004|376005|1800799015|82310400017; X-Microsoft-Antispam-Message-Info: 3nUZcmsLlqEk+UzMkX9Gh+0BrAwTowbzIDcFcQ0ZF61gI8/WJFy6WmP0l1apz8LURkI6CSrP8/pzxO8RzDfeOLZH2I3rQRzE+ZtBYqTRrziyRD92Ma4GpdTgqdiRCdKStRbzm7Zz2Z6VQpAxv+K/qY4/6FDO5/bLigRuv5fby/kANaGtEjZchPnDZw0CSl0GsJxFovfpg/Wn62t9P8Gvz2B4C+82h5pWvpwroGwSsqaD/fF+fvypW+lNkszSIn3fNRrXClCGiTAfGqNo9x79t4RnncBJ7AS5iSW/47bWhhUKjSiwo3ZJJ6FRKMgKqCp5zuYs65+b05hgwB2hhKQkwFOh6iFUc1/yR4Mm+HrCVd91fceyHqH6x/uhTZE4EdcXmkQBbXLuYgkF8LRoRlPwTGawcY361JjHm9cVosesiH3nF1G7fmtal0kCQgl84IL8luz7kM7eHEQRE9USEvadReTccbJlpJ3rx2VShfsQRjwFBVyspkHdjDOZNm8g0/EPvnEdsMMYKUyOiFFwIkxPsNObo+ussOoS+DwudrIJDstxxwLSrPLpHdnnFZZSsicHaHsqBZxWvf1LAxztm5FhuuDPo1GdN5bdIKYfipF89Y5kJtN2yWIFNTnvwI7g3M+3+TbIdva9IzUmgFvufqdV5kRyFkvWIQXhvGjtB4PS/FY9dw/qFNYVo3XRuzXrgx5UpyJ7MQu3twQ8aHDtzr5wdQbuzI0dmKwyZNUGWSh1nWpiHASOu52qP8iD1AF9RKmDvweglyP0mNSisXG40N4/cBVIwPVfYiLYMg5lMJijEGOrjZGzNbdAX661mb/nVDhGQfT/C3l8IxSBO25PE37qiJaE2NtdjJDhB/tmlCA5qgTe7nHF31S3G31zMSxIU4GGzyum0tWiTqHCiyrsfeo/0Qka2o3Xs7awBybXecEWq8STKCz4E2PY3q7FQs5CO1XbfbKh0nZ3aVtx2wAK2XnZCdJSYc9sGc27cM2YGRsPG6PAwX8wLlzJvc6YuJjCVJCnfVcnJZ3rCiR1ahAcS3/gZwTzXgJM58cfFWkNmBgUd67jOK032ayg2Zg3U/IoE6Yy5KDcpwkC80xIx7ShmUytu4ns4ksxVyQkb3/Ul9etkKP58ZVvsT4BrX/FbrLJLy5yHQF1+33CDMp6ovs2vo8I6X7oEG+rpYaztfaZzajEO6JNk4C5iai4R0GKATvo6TbZRgCZQYKccv25jjFFCY39M4c66qHOywBq1Mei1t8Rb8plfzVDt46blqpLWFmq7A8enQl4j++mzmoPvVExvC7e6fH70HITval4TgrVY7DBxrYsieYlH8r90Qhf+QxO5iW1NPRtTk5L6JUG/z7XfDFs65sL53Q/O6r74ORNXK5/UGs7cbzzmb5oWp3pHYfQpm91 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)(36860700004)(376005)(1800799015)(82310400017); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:44:26.5363 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 78e3a9cc-c2c8-49e7-f550-08dc6e936e18 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: SN1PEPF00036F42.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6690 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 The xgbe MDIO bus driver can perform both C22 and C45 transfers, when using its MDIO bus hardware. The SFP I2C mdio bus driver only supports C22. Create separate functions for each and register the C45 versions using the new API calls where appropriate. Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_dev.c | 77 +++++++++++++++++++++++++----- drivers/net/axgbe/axgbe_ethdev.h | 7 ++- drivers/net/axgbe/axgbe_phy_impl.c | 4 +- 3 files changed, 71 insertions(+), 17 deletions(-) diff --git a/drivers/net/axgbe/axgbe_dev.c b/drivers/net/axgbe/axgbe_dev.c index 6b413160c2..fa7324efa7 100644 --- a/drivers/net/axgbe/axgbe_dev.c +++ b/drivers/net/axgbe/axgbe_dev.c @@ -63,11 +63,20 @@ static int mdio_complete(struct axgbe_port *pdata) return 0; } -static unsigned int axgbe_create_mdio_sca(int port, int reg) +static unsigned int axgbe_create_mdio_sca_c22(int port, int reg) { - unsigned int mdio_sca, da; + unsigned int mdio_sca; - da = (reg & MII_ADDR_C45) ? reg >> 16 : 0; + mdio_sca = 0; + AXGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, RA, reg); + AXGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, PA, port); + + return mdio_sca; +} + +static unsigned int axgbe_create_mdio_sca_c45(int port, unsigned int da, int reg) +{ + unsigned int mdio_sca; mdio_sca = 0; AXGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, RA, reg); @@ -77,13 +86,12 @@ static unsigned int axgbe_create_mdio_sca(int port, int reg) return mdio_sca; } -static int axgbe_write_ext_mii_regs(struct axgbe_port *pdata, int addr, - int reg, u16 val) +static int axgbe_write_ext_mii_regs(struct axgbe_port *pdata, + unsigned int mdio_sca, u16 val) { - unsigned int mdio_sca, mdio_sccd; + unsigned int mdio_sccd; uint64_t timeout; - mdio_sca = axgbe_create_mdio_sca(addr, reg); AXGMAC_IOWRITE(pdata, MAC_MDIOSCAR, mdio_sca); mdio_sccd = 0; @@ -103,13 +111,34 @@ static int axgbe_write_ext_mii_regs(struct axgbe_port *pdata, int addr, return -ETIMEDOUT; } -static int axgbe_read_ext_mii_regs(struct axgbe_port *pdata, int addr, - int reg) + +static int axgbe_write_ext_mii_regs_c22(struct axgbe_port *pdata, + int addr, int reg, u16 val) +{ + unsigned int mdio_sca; + + mdio_sca = axgbe_create_mdio_sca_c22(addr, reg); + + return axgbe_write_ext_mii_regs(pdata, mdio_sca, val); +} + +static int axgbe_write_ext_mii_regs_c45(struct axgbe_port *pdata, + int addr, int devad, int reg, u16 val) { - unsigned int mdio_sca, mdio_sccd; + unsigned int mdio_sca; + + mdio_sca = axgbe_create_mdio_sca_c45(addr, devad, reg); + + return axgbe_write_ext_mii_regs(pdata, mdio_sca, val); +} + + +static int axgbe_read_ext_mii_regs(struct axgbe_port *pdata, + unsigned int mdio_sca) +{ + unsigned int mdio_sccd; uint64_t timeout; - mdio_sca = axgbe_create_mdio_sca(addr, reg); AXGMAC_IOWRITE(pdata, MAC_MDIOSCAR, mdio_sca); mdio_sccd = 0; @@ -132,6 +161,25 @@ static int axgbe_read_ext_mii_regs(struct axgbe_port *pdata, int addr, return AXGMAC_IOREAD_BITS(pdata, MAC_MDIOSCCDR, DATA); } +static int axgbe_read_ext_mii_regs_c22(struct axgbe_port *pdata, int addr, int reg) +{ + unsigned int mdio_sca; + + mdio_sca = axgbe_create_mdio_sca_c22(addr, reg); + + return axgbe_read_ext_mii_regs(pdata, mdio_sca); +} + +static int axgbe_read_ext_mii_regs_c45(struct axgbe_port *pdata, int addr, + int devad, int reg) +{ + unsigned int mdio_sca; + + mdio_sca = axgbe_create_mdio_sca_c45(addr, devad, reg); + + return axgbe_read_ext_mii_regs(pdata, mdio_sca); +} + static int axgbe_set_ext_mii_mode(struct axgbe_port *pdata, unsigned int port, enum axgbe_mdio_mode mode) { @@ -1373,8 +1421,11 @@ void axgbe_init_function_ptrs_dev(struct axgbe_hw_if *hw_if) hw_if->set_speed = axgbe_set_speed; hw_if->set_ext_mii_mode = axgbe_set_ext_mii_mode; - hw_if->read_ext_mii_regs = axgbe_read_ext_mii_regs; - hw_if->write_ext_mii_regs = axgbe_write_ext_mii_regs; + hw_if->read_ext_mii_regs_c22 = axgbe_read_ext_mii_regs_c22; + hw_if->write_ext_mii_regs_c22 = axgbe_write_ext_mii_regs_c22; + hw_if->read_ext_mii_regs_c45 = axgbe_read_ext_mii_regs_c45; + hw_if->write_ext_mii_regs_c45 = axgbe_write_ext_mii_regs_c45; + /* For FLOW ctrl */ hw_if->config_tx_flow_control = axgbe_config_tx_flow_control; hw_if->config_rx_flow_control = axgbe_config_rx_flow_control; diff --git a/drivers/net/axgbe/axgbe_ethdev.h b/drivers/net/axgbe/axgbe_ethdev.h index 4dcbf6d9a2..cb3df47a63 100644 --- a/drivers/net/axgbe/axgbe_ethdev.h +++ b/drivers/net/axgbe/axgbe_ethdev.h @@ -325,8 +325,11 @@ struct axgbe_hw_if { int (*set_ext_mii_mode)(struct axgbe_port *, unsigned int, enum axgbe_mdio_mode); - int (*read_ext_mii_regs)(struct axgbe_port *, int, int); - int (*write_ext_mii_regs)(struct axgbe_port *, int, int, uint16_t); + int (*read_ext_mii_regs_c22)(struct axgbe_port *pdata, int addr, int reg); + int (*write_ext_mii_regs_c22)(struct axgbe_port *pdata, int addr, int reg, uint16_t val); + int (*read_ext_mii_regs_c45)(struct axgbe_port *pdata, int addr, int devad, int reg); + int (*write_ext_mii_regs_c45)(struct axgbe_port *pdata, int addr, int devad, + int reg, uint16_t val); /* For FLOW ctrl */ int (*config_tx_flow_control)(struct axgbe_port *); diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index 9c2c411b4f..d173545e83 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -1148,8 +1148,8 @@ static int axgbe_phy_set_redrv_mode_mdio(struct axgbe_port *pdata, redrv_reg = AXGBE_PHY_REDRV_MODE_REG + (phy_data->redrv_lane * 0x1000); redrv_val = (u16)mode; - return pdata->hw_if.write_ext_mii_regs(pdata, phy_data->redrv_addr, - redrv_reg, redrv_val); + return pdata->hw_if.write_ext_mii_regs_c22(pdata, + phy_data->redrv_addr, redrv_reg, redrv_val); } static int axgbe_phy_set_redrv_mode_i2c(struct axgbe_port *pdata, From patchwork Tue May 7 12:43:00 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: 139983 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 7C81D43FC9; Tue, 7 May 2024 14:46:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 756A142FA9; Tue, 7 May 2024 14:44:36 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2063.outbound.protection.outlook.com [40.107.237.63]) by mails.dpdk.org (Postfix) with ESMTP id 209E1433FB for ; Tue, 7 May 2024 14:44:35 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jwluKCDjyQu+3pr9ZG6P+6QiGQyE+NMPUqqtIe9jk7kxTqTifx/Cd42Yto+6TNzQaOrBq5RUhyk7i5GRypWWs0PexdXxbgui4eFmm4LONb7/v1lK4r5Q1CFTP6R82MEp6BwiP0w3KmGCJtTVhv6jNQTx/s3TQgFp0NCOhps2c/5egXAm69Fl7TS1NRIp9Xv54IcRChG8yEUaEzVmV+oC6Fiq0AyipDVHyImMLBMDMRBbehs/On1Mza9d9HmnTKj4Qs7GlqYQiIO1H/GZ2DnMcVhH9suM+Y+ssNDnc6RLChLPForop4fLZy62xbaz7WUyrvzzBeQXjCRSe6KInwRSyw== 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=8Rwk3KYCCmusVcF4itrRs0kXBwm3rAH7tatDu+7uqs8=; b=fXfQadVqjsb46giKVIUKTVBhP2/h11bgjmmlXY+lzMaAo25fUf7yTjHUlRFL6f/Y+k5H73qq4X+Ef4Cmkk0KoSstg7Tv9NMdEcWbxQw/NwpzJ2oh3qAIfiYKkE/KJXjTp+YODaWb9gEaxgoCN/Re67J3hU1jGBToCRSlFGSTSfkp9Ae0cUNN89hA9+aEEtnGwz6Buxu4We7AfSjirgV4n5SVpQ8jnVGEBpy/j4Wria3Oafe4JYYjGzKMqgh8vcuaRtF6s71wsE0u08D9/N0Yq1kY5DHNQzleio9OesZjeBz99bcQoOTlTdzYW2iDoZJJDi/p9Pa7tYMwZEPrLoljUw== 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=8Rwk3KYCCmusVcF4itrRs0kXBwm3rAH7tatDu+7uqs8=; b=cP5yPUW4lbF+dnVMQNNXDmj7ZNxndl27Edj0EfFs9SPpOps0G9w9yEiT1NmJ8JUnG214W8LFuUJ4jFxAp0BZjiWESijjjzdMzsPr8bnGAYQRT7ebwNULfjSnxn966ij7RoU5SXy6ADha57RFhoq2x0GCilF2X8nUWGEsRvt0/M8= Received: from PR2P264CA0014.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::26) by DM4PR12MB8474.namprd12.prod.outlook.com (2603:10b6:8:181::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42; Tue, 7 May 2024 12:44:30 +0000 Received: from SN1PEPF00036F42.namprd05.prod.outlook.com (2603:10a6:101:0:cafe::1a) by PR2P264CA0014.outlook.office365.com (2603:10a6:101::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41 via Frontend Transport; Tue, 7 May 2024 12:44:29 +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 SN1PEPF00036F42.mail.protection.outlook.com (10.167.248.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:44:28 +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; Tue, 7 May 2024 07:44:21 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande Subject: [PATCH v2 20/25] net/axgbe: replace mii generic macro for c45 with AXGBE Date: Tue, 7 May 2024 18:13:00 +0530 Message-ID: <20240507124305.2318-20-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F42:EE_|DM4PR12MB8474:EE_ X-MS-Office365-Filtering-Correlation-Id: ef22d661-76c9-4eff-f89c-08dc6e936f80 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|1800799015|36860700004|82310400017|376005; X-Microsoft-Antispam-Message-Info: qZHalazcQKIWKp/ufC95WnFj2XagLuQkp+OogipIpigHyxopILTPnahAQyy5lS1SgvB35O9lMcDCdw2E0Q8UEyNGeP1S8E8Tk7o0FX2jCyiEDonECJ/457KC+TwHsqrqtcM3lL/8V5csMuzFeSvwPZwVulEZWEM2dD7MUht4Cgxf3DV5CwvNVr1WvyQ9xVNXPygXtSovG+pFf7RJnxsiqXkirQ5NC9DlCKWh3szURW6MOl817cBlS2m0pm4ZhcmylkQYwpZAflDbVwuCKAZwn3b1OoDldDuQlcPCEUK5bg+Z8qSV9qPcm327Ky0eo8I3De8ZlQl530+Lf8KAku8gyLcuhSOPOkJkH8s8zJLrEhTiQleJj4znko4JtPlpV5l1/ZeKPIIQOCGgYr44h+IRMI7mHdN7HrnVLXf+LttnIE+TPWqGGfRAYKemWmQO42PlOrplTSmtIYkS4q3rveFXAOTWBQORlkD+9/YNA+13oUcwL7bV1l6C2OMvMzxbzV1pH7E6930t3yj/qV3yRS68pvzLGw9ZtYKmgF6LMPw60WTBBlnm6hZMzA+KQpZEr3JTypJySA//6oWmhoXrCMLG7uT7OYBcNRN4O22DG1W7M9T6jgssyxvQ+Lp41Wlr1bUIQBXQUkPE2NaH5HwrILHBeoXZ9VJl92tbL/ge7M/lIA8cv3XsP4fpyMKEqM+VzDrFzBhOnNiQFpmpQrAOlbUyvndQ3UQZKoBYO2bx0JCe9mfIMar0krAczr+GG/5Zar9zbHxCpGtDGLuo0EBgEE7l2nznA4qbZpgb3MNMgvjBJOQEGzuMCo+Ny2YsE8N57SZjIpbgaNNeE4XEf5O84gDyQUUwZ6bMn0+KpkgWhJnK96OilrTUZ4kY/K8WYiEyFeDJKY8OIqXJGLFUYYdQ9FovMXrZDD3HowTTYBJnudM3HEI8zYcML3fI5TTxWiLXxaSsek1tEKIdtL6UsTyOD7fAb6DBX2PbnXzpKwwEGwhQwICSaW1wdeCm6XNsRRL2VUrJFtLZWSgh094zuMB/1h21fXf/i3CzMvcMHmTbRFHVM/YzncNQxnw2lacC25KjzZp1migMSeLMVCinGZGv8flXZ/aFMu3s1rh+iToYSsbzPeWZ+XORiZs6rHqGrGNHheAlegavqOTKK5K/qH+GrjS3guD2YMWDapfGYKJ6AsmKHxoIi05tkZDi972Ccn8ZUyJea7vBvXbHXPln29fbYOVP7kx3Mc53tMrvc4qqbcUojO/xUtsh/NP6bEml1DX1ZY2RRWijr4q4MH5xetTTYqCclbt1WwBL3fhz+uFq9HSeC6wjqwdFXqp645Vo/Qwz6EdxXDWSzz/lJYKUmn0TYDnhfplyLqKXmuZa2BritDKItUnfQT8YpISkNkOxzcrdPVTR 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)(1800799015)(36860700004)(82310400017)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:44:28.9113 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ef22d661-76c9-4eff-f89c-08dc6e936f80 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: SN1PEPF00036F42.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB8474 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 The axgbe driver reuses MII_ADDR_C45 for its own purpose. The values derived with it are never passed to phylib or a linux MDIO bus driver. In order that MII_ADDR_C45 can be removed, add an AXGBE specific Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_common.h | 4 ++-- drivers/net/axgbe/axgbe_dev.c | 8 ++++---- drivers/net/axgbe/axgbe_phy.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/axgbe/axgbe_common.h b/drivers/net/axgbe/axgbe_common.h index 51532fb34a..1a43192630 100644 --- a/drivers/net/axgbe/axgbe_common.h +++ b/drivers/net/axgbe/axgbe_common.h @@ -1732,14 +1732,14 @@ do { \ */ #define XMDIO_READ(_pdata, _mmd, _reg) \ ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \ - MII_ADDR_C45 | ((_mmd) << 16) | ((_reg) & 0xffff))) + AXGBE_ADDR_C45 | ((_mmd) << 16) | ((_reg) & 0xffff))) #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \ (XMDIO_READ((_pdata), _mmd, _reg) & _mask) #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \ ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \ - MII_ADDR_C45 | ((_mmd) << 16) | ((_reg) & 0xffff), (_val))) + AXGBE_ADDR_C45 | ((_mmd) << 16) | ((_reg) & 0xffff), (_val))) #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \ do { \ diff --git a/drivers/net/axgbe/axgbe_dev.c b/drivers/net/axgbe/axgbe_dev.c index fa7324efa7..ebe64295aa 100644 --- a/drivers/net/axgbe/axgbe_dev.c +++ b/drivers/net/axgbe/axgbe_dev.c @@ -207,8 +207,8 @@ static int axgbe_read_mmd_regs_v2(struct axgbe_port *pdata, unsigned int mmd_address, index, offset; int mmd_data; - if (mmd_reg & MII_ADDR_C45) - mmd_address = mmd_reg & ~MII_ADDR_C45; + if (mmd_reg & AXGBE_ADDR_C45) + mmd_address = mmd_reg & ~AXGBE_ADDR_C45; else mmd_address = (pdata->mdio_mmd << 16) | (mmd_reg & 0xffff); @@ -241,8 +241,8 @@ static void axgbe_write_mmd_regs_v2(struct axgbe_port *pdata, { unsigned int mmd_address, index, offset; - if (mmd_reg & MII_ADDR_C45) - mmd_address = mmd_reg & ~MII_ADDR_C45; + if (mmd_reg & AXGBE_ADDR_C45) + mmd_address = mmd_reg & ~AXGBE_ADDR_C45; else mmd_address = (pdata->mdio_mmd << 16) | (mmd_reg & 0xffff); diff --git a/drivers/net/axgbe/axgbe_phy.h b/drivers/net/axgbe/axgbe_phy.h index 5b844e81cd..eee3afc370 100644 --- a/drivers/net/axgbe/axgbe_phy.h +++ b/drivers/net/axgbe/axgbe_phy.h @@ -16,7 +16,7 @@ /* Or MII_ADDR_C45 into regnum for read/write on mii_bus to enable the 21 bit * IEEE 802.3ae clause 45 addressing mode used by 10GIGE phy chips. */ -#define MII_ADDR_C45 (1 << 30) +#define AXGBE_ADDR_C45 (1 << 30) /* Basic mode status register. */ #define BMSR_LSTATUS 0x0004 /* Link status */ From patchwork Tue May 7 12:43:01 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: 139984 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 E920C43FC9; Tue, 7 May 2024 14:46:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F0F5E43401; Tue, 7 May 2024 14:44:37 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2067.outbound.protection.outlook.com [40.107.93.67]) by mails.dpdk.org (Postfix) with ESMTP id 4BF3A43401 for ; Tue, 7 May 2024 14:44:35 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lhimsWcH8mv57vMRRbbVQKZC0iZyzObMvdC93+XR+DQrVFgJn67Jvkv3+qmJw49QxfYVfcrYAE+PhEn+MgyLhlZFL7/os6cXogNYfeLtV9MDE+qNK5wXi1gcM1xQXKMQkwY19AqrnOOr9Slu8FQ0KQQFhK19JiUA7+aINpmgwtaFtulHcw53YwJfplVKAzhUgCFiLEMr8h1ZJM26tCchn5oOEfmUjr6f3y+8TTxs/G/L/V0snqVGLoe+SyAZsZ/VXK/uAwCMr67WxIFkUQC4Nyb5zFWvQqgmRM9WeuE6AsPA7xgasuweRwIkIs5MZA+1PWoSfhU4TrvnIdvJSVU1QA== 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=phCG9qlMYwZEesJ6rUpikGO+a5n50+63upUY/QNqTWg=; b=ZC3+gtiQq35MrNK1q9ca0CrfKYvnVRwEbCLP3CX8rn/Rg/0ojwA8Y4mlGJ6MhP2f+STym8kvTJjAs/eLs1jrwd0ebXUts2v69ojpcLVkIclPNwEJymcg6nj7AASDiu7HR7UdeXfJ11KvbKNSLKcdHrGE/t0BYPh2seSPARRYSZrpDppTQDDJrviECshYRqMD5NJqkpl9uvEZMVqInWvIS79ydg2/w18Zt9X2eq7fYqrO1buBHKmr44/nDYWoYSF51QONiepoEcidDs6L9wUhOp0qzTL2lFdYjrzETe3kQQb4yvptZ2YTpB0MGd7sMqGvxKB/sBkEzpYgPgBUes/yoA== 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=phCG9qlMYwZEesJ6rUpikGO+a5n50+63upUY/QNqTWg=; b=Y34DLrAqiWFBnTf6SCI9BmIEsLpZ2bgN9r7y6klAUWP+ZJfc7tMFRZ+bTeQGN837VN9ZUFkYUM03vrmnbgD3tL+TKGGe5am8iZLXmegIkZaHQKxoKkYX4zSxNa5cDl+CPE0tzKYpLjY8uN07/ZJTp4UR+dWNh8j5riMOwNuIHik= Received: from PR2P264CA0009.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::21) by MW3PR12MB4427.namprd12.prod.outlook.com (2603:10b6:303:52::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42; Tue, 7 May 2024 12:44:33 +0000 Received: from SN1PEPF00036F42.namprd05.prod.outlook.com (2603:10a6:101:0:cafe::bb) by PR2P264CA0009.outlook.office365.com (2603:10a6:101::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41 via Frontend Transport; Tue, 7 May 2024 12:44:31 +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 SN1PEPF00036F42.mail.protection.outlook.com (10.167.248.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:44:31 +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; Tue, 7 May 2024 07:44:23 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande Subject: [PATCH v2 21/25] net/axgbe: add 2.5GbE support to 10G BaseT mode Date: Tue, 7 May 2024 18:13:01 +0530 Message-ID: <20240507124305.2318-21-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F42:EE_|MW3PR12MB4427:EE_ X-MS-Office365-Filtering-Correlation-Id: fe172d80-e8b7-49ef-7e2e-08dc6e9370cc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|36860700004|82310400017|1800799015|376005; X-Microsoft-Antispam-Message-Info: uNp4rdGkiTKC+plvo3PStYnRsxrFjNROMFgDPw9e+q7RNCirGqXqXJCu28rhGQWBtR9DQwe0hgatglShBgf/Cbr7pWMqAJeum+g9Uwy2Eh5tLwTn93gkCjvl7FMEcln5ABf5a2kDWDBA40W0qRvmuGeSu1puSQ1iFrklX2m2PWTqZgD2neo00rgiWmDOoFfxQZj5isCdYr0jhFCvkxOxHpjlYcA5IoC+vGvig56TsJ3qGuHJXK1E5g3LDTTE3IZ34/ma7xGJDJwn1hunQf5VwNOguOQme3iaal0ZzAlRsAFOdiFlJ+66Z1sgkTzzeFOH1dyqO1yTO9QgvehTLkTAo7HWpQrfxNNI20q9/ej8VBLMsQfqw/TRUt1iHp9frhTuBzona+ZW7hskotPjRIZUq5fcduFTpm6I1doK1RdD5VNZ8+zRM5j1MB84vWA+Ut6Gq/FEWsVYQp/Rk49KQhywJFCd19v6wyApMV8DQzZ/edNzYB50uGLmXr8QU2HmkHLjrb0bgPo8jDSMwnZfZJYk+AI9wCgCwHGvyJQ2jUT5Wxw8S9HKenKLHzSEQX4fF2xDv6NEVTIDc2hPjaqBHJbBF7VY8uj7m2btiPMr2KsRksPRUhztIWoWwhG6PlhFaDSzaehaP65N7d1offMwaOn/LvdPrcGMDU46N5fZbT+FCBhsKA6ggArqJ4b7WhzuYLtHddGmhYoBliF+dvUpdm8TjtIxZ+EZtGHJ6Q017YkaczDDByXHAfx60nMIMuTx7MHX+XXca0SUS3JqqBOA6bGbrUmwvgrREul2XvBiB7OqBjSxSI90v3AhlW6mNas8q4kuUbfsj/1+xIlFoURFhkh/JZ8nsYUtFvU+FPAoePKXoyjaWyd9uLvqdt8LOnGw9tzo00FcC70Fi6a6ltNU9oENfhI8KQONlkJCAgCyH+CSN3ij3HXg7mmYNcfa1Mj1b2GOsUbvCG2C6rVk+YdMD/0wrILPkPqgWjDNevVOl6cf1vIr9nUu5OJGg58rrYBvnx11cVb+GMBaTM3cGJekJpbCGHFI1Qi1AFcjGrOHcR9omIAaw2kH2i8+K+OT2U/J1C70/+W9nioGGBxPc/48o6re3rQ7leumBbZXiowz/qAf1uFatEyFhX5XFJOuIG4JlRzrH9tBi9TPVwVficte23vZ+Sb++spbz8Ww4BlLy0gPuKTz6pDbawzrVHMEAc8tEh8i/QsNGIZ4/15ja7uDJZLHkYixLtOptLYwRiYp04DLHZMzbCEBrqGNTAT7A0ZOD5uYbi/MqdCLzUAv54tqLb8kLARn2I6x0HjaZOLJ8RADiW2BSkPwAjT4tYpMT64fI3S1Mm3c3/tJX8/QBgHIeVZ3iRCpH7JN097SG0nap+aX8mAmQIMkmfuxTAT6BvsrMurw 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)(36860700004)(82310400017)(1800799015)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:44:31.0676 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fe172d80-e8b7-49ef-7e2e-08dc6e9370cc 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: SN1PEPF00036F42.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4427 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 Add support to the driver to fully recognize and enable 2.5GbE speed in 10GBaseT mode. Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_phy_impl.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index d173545e83..13b37e9b8b 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -1392,9 +1392,11 @@ static enum axgbe_mode axgbe_phy_switch_baset_mode(struct axgbe_port *pdata) case AXGBE_MODE_SGMII_100: case AXGBE_MODE_SGMII_1000: return AXGBE_MODE_KR; + case AXGBE_MODE_KX_2500: + return AXGBE_MODE_SGMII_1000; case AXGBE_MODE_KR: default: - return AXGBE_MODE_SGMII_1000; + return AXGBE_MODE_KX_2500; } } @@ -1883,6 +1885,7 @@ static bool axgbe_phy_port_mode_mismatch(struct axgbe_port *pdata) if ((phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_10) || (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_100) || (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_1000) || + (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_2500) || (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_10000)) return false; break; @@ -2270,6 +2273,10 @@ static int axgbe_phy_init(struct axgbe_port *pdata) pdata->phy.supported |= SUPPORTED_1000baseT_Full; phy_data->start_mode = AXGBE_MODE_SGMII_1000; } + if (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_2500) { + pdata->phy.supported |= SUPPORTED_2500baseX_Full; + phy_data->start_mode = AXGBE_MODE_KX_2500; + } if (phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_10000) { pdata->phy.supported |= SUPPORTED_10000baseT_Full; phy_data->start_mode = AXGBE_MODE_KR; From patchwork Tue May 7 12:43:02 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: 139985 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 6DF2343FC9; Tue, 7 May 2024 14:46:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F31DF433C7; Tue, 7 May 2024 14:44:40 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2086.outbound.protection.outlook.com [40.107.92.86]) by mails.dpdk.org (Postfix) with ESMTP id E646D433D9 for ; Tue, 7 May 2024 14:44:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h+B8NE4256E75gSX107aYEwXSIv4Jp5DMdpeCzaDn3/NH0X1/pB54wVxc23aVXOQ5MdHIzU1fA8ZDNf/REfYkrQuQq2wItO6nB/LNCBvtfZYO83dlHbBbdHgomhpSHt/lw9lBARi/1hErz+2TsWcnXzvEGtWZqSet+s3dcltWOv16N/gtrdzWvPe8Dwxn5BtGcygrCAg9haTycchp0gUcbhYheMJQFfj4GqADY1WJf7c8vpRM38OsZqI5iNcMvEIMDZ2E3KKZcKecEZ74l/N2tqmRFo91zRA2mvIhKsAjAU5tGxlsFGFE4w1nu2qOi6wf3WNdYc52gfwcClNoTlTTw== 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=sqqMen0GE9PckLPny4gOoGY0p3ivgyrPK3mNL0j8IEc=; b=SLDP+hhL9xi6KXY5uclVpK+T6lkFy9cFkbvELN/0xjAbaeJmpfOQllrry/BXirBD9MrNds3xd5mW256rVEDFp9qaUiiFnY+0KPOcMk44g+wMWTXmHC1/19Eww8YfcZE2OWYkJFqQCLgHg9VTHqHlwFH2fXfqfP4jf01ZCOKHXMPo/+fr1An2PE2LsZmw6hsd1JK69kJUhGIEgS4TQvwn48IHJrAVx156E5F/9wqiWhjbzIu0gQ+wZ4vZJSvd0H6t+Se+KAxKlShttzYJB63bVQrGYr7GtgpMjAwaShkphCtlCZAJEllPVUYy2GWnMJPVcu1h0bEhjlaA7LEF4kA//w== 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=sqqMen0GE9PckLPny4gOoGY0p3ivgyrPK3mNL0j8IEc=; b=SuhMREzxN+BmaeqBdhJPCZC6zM9sVyU3jIrmq3YIhv0G+1bhozWR4bOyY2bbH7dsWa09nTmAMouSQpmg9BRemJaX41DBbK6gXIV8/pn7CkE9Ocdi3x3CA2yqGDpdXjaYHTux87OeR1zF3VfXddyzggq5KL/c4GowDfsTwv0baco= Received: from PR2P264CA0013.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::25) by PH7PR12MB7188.namprd12.prod.outlook.com (2603:10b6:510:204::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.29; Tue, 7 May 2024 12:44:35 +0000 Received: from SN1PEPF00036F42.namprd05.prod.outlook.com (2603:10a6:101:0:cafe::1) by PR2P264CA0013.outlook.office365.com (2603:10a6:101::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41 via Frontend Transport; Tue, 7 May 2024 12:44:35 +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 SN1PEPF00036F42.mail.protection.outlook.com (10.167.248.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:44:33 +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; Tue, 7 May 2024 07:44:26 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande Subject: [PATCH v2 22/25] net/axgbe: add support for Rx adaptation Date: Tue, 7 May 2024 18:13:02 +0530 Message-ID: <20240507124305.2318-22-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F42:EE_|PH7PR12MB7188:EE_ X-MS-Office365-Filtering-Correlation-Id: ffd7d962-36d9-43a4-12a6-08dc6e937264 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|82310400017|36860700004|376005|1800799015; X-Microsoft-Antispam-Message-Info: iir8RGVoopHmK/xNS3mwuu0meRgEGk8ON04bBVHeh0zM6ZzyNcXzHTeO6+N3DLbWKvPTUtTx7Aor5X5tR3zPWUX9Bb4ZZSo6bPpcqyRm/4tBTODAv0w5WShFHj7uF0q+5fzSa5k1GhEwWHTey5anOVvhF6GKwxQoJlnZNRsmtEHgj0WDEHuEIUwdxjbndX7YVjXExemr1ioRnArk35RlhyJXwYJ8X8BwrbASJPgPSfL6APw8rj3gNhi9tvH80hydGpYELPl8e5n2HJO3aqfDsWpqX2BZlp40T0CgjP2CwQrsONXdyuHOPCDIlVaLXlTTuuDCg3iM5ZIXLTO/HG5Fgd83gpjceuxzsriksWz/7KrDWFv2xN9X8YA2gYNxjOzSAdOgJxdx3+JlyHAnhEijbaCba85kcyI/R5xvZ8/rSK+69v5Br69+YS754NcdIxdMhQu+rbYvwrQe3nTvukxePLoDYDMgt5VJlHP3pg3oWG4QoMu2cZruWJC2v8bhBeY+28aystbSnoQxjKtHsozFGdk9xGhB7VZDKsSg3m1B9Z86a+WJ96jWJgTRljtil89MfJSEBTPTDijqyNAv2DgUHgtjsT+gjZRc4zG5RxHqGeEBiSLMKLXQcoRlSJ0XhlKtOaIIZiy3AFmnKNRJN0yEwJD4X8Umr6CvZyIAfInYHe+eZaxnL4060AGA0p+xtQHyCFjSDW3Z2/4N/50n3GxBbI4UxC3lREYGCEU+g7gZf2jR2nsXjs+POoDFyExn0T5Ms9r5FxcELtuAFKcPVodqIdJqaMjGgfImCs7vUMruzPuhQUOEj+D2ABfTckN2kdR6huhjKSITctxSXZ3Y/qPQ0wMFLTabcYlacSpvJUVFoQjxDjaf62qQ/Sxy8lBh7WKpa7spEGE1/rTDHdi9WXCPze6wUIp9G+bGxflyK0EqBVAdgrxAuPLeUqOAO0qpPb3BEcZyroaQIHS6wTRE/qBR+XLmxs3o+GbxPAQNNp3N0hpD9jIgqvTYFDpr6mvVBk8Y+ag85MAoA7bYMCfvViCSCQsj30G2hrEie1FZXig8Gprk8R/pUQqLZO/wLfkb9ihzarkMnV/c7hKkLkNL3c0ug7KgW/r7ilSJd5b6kuriIRmRV23Rxdlx4/4MVIX2aUKczKgTXxJT7LbR0E29jxeUnlSzYr62Yro+vtTg5oXqTiQvsPRumhBNj7NuHT9CWrQCI8qp1SalbWVgOxW7JVhR/UwQUITPuTJiLV8nphuJlYoqzCKKCXVtrMeoMkbAHF91Bl3c0cH1IsjzMVzCve0GFIRTi22sADYJ6Y18C8uz/F0sDahfUmoEMqllIoqSNaVcCDj1RDRGRJjdgSDBzCu1enMS+VY7wx2LctpR/vyIHNl8xRkWQSxvmjMUb4bzLhV/ 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)(82310400017)(36860700004)(376005)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:44:33.7551 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ffd7d962-36d9-43a4-12a6-08dc6e937264 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: SN1PEPF00036F42.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7188 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 The existing implementation for non-Autonegotiation 10G speed modes does not enable RX adaptation in the Driver and FW. The RX Equalization settings (AFE settings alone) are manually configured and the existing link-up sequence in the driver does not perform rx adaptation process as mentioned in the Synopsys databook. There's a customer request for 10G backplane mode without Auto-negotiation and for the DAC cables of more significant length that follow the non-Autonegotiation mode. These modes require PHY to perform RX Adaptation. The proposed logic adds the necessary changes to Yellow Carp devices to ensure seamless RX Adaptation for 10G-SFI (LONG DAC) and 10G-KR without AN (CL72 not present). The RX adaptation core algorithm is executed by firmware, however, to achieve that a new mailbox sub-command is required to be sent by the driver. Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_common.h | 38 +++++++ drivers/net/axgbe/axgbe_ethdev.h | 5 + drivers/net/axgbe/axgbe_phy_impl.c | 170 ++++++++++++++++++++++++++++- 3 files changed, 210 insertions(+), 3 deletions(-) diff --git a/drivers/net/axgbe/axgbe_common.h b/drivers/net/axgbe/axgbe_common.h index 1a43192630..0e1b2c1500 100644 --- a/drivers/net/axgbe/axgbe_common.h +++ b/drivers/net/axgbe/axgbe_common.h @@ -1274,6 +1274,22 @@ #define MDIO_PMA_RX_CTRL1 0x8051 #endif +#ifndef MDIO_PMA_RX_LSTS +#define MDIO_PMA_RX_LSTS 0x018020 +#endif + +#ifndef MDIO_PMA_RX_EQ_CTRL4 +#define MDIO_PMA_RX_EQ_CTRL4 0x0001805C +#endif + +#ifndef MDIO_PMA_MP_MISC_STS +#define MDIO_PMA_MP_MISC_STS 0x0078 +#endif + +#ifndef MDIO_PMA_PHY_RX_EQ_CEU +#define MDIO_PMA_PHY_RX_EQ_CEU 0x1800E +#endif + #ifndef MDIO_PCS_DIG_CTRL #define MDIO_PCS_DIG_CTRL 0x8000 #endif @@ -1415,6 +1431,28 @@ static inline uint32_t high32_value(uint64_t addr) #define XGBE_PMA_RX_RST_0_RESET_ON 0x10 #define XGBE_PMA_RX_RST_0_RESET_OFF 0x00 +#define XGBE_PMA_RX_SIG_DET_0_MASK BIT(4) +#define XGBE_PMA_RX_SIG_DET_0_ENABLE BIT(4) +#define XGBE_PMA_RX_SIG_DET_0_DISABLE 0x0000 + +#define XGBE_PMA_RX_VALID_0_MASK BIT(12) +#define XGBE_PMA_RX_VALID_0_ENABLE BIT(12) +#define XGBE_PMA_RX_VALID_0_DISABLE 0x0000 + +#define XGBE_PMA_RX_AD_REQ_MASK BIT(12) +#define XGBE_PMA_RX_AD_REQ_ENABLE BIT(12) +#define XGBE_PMA_RX_AD_REQ_DISABLE 0x0000 + +#define XGBE_PMA_RX_ADPT_ACK_MASK BIT(12) +#define XGBE_PMA_RX_ADPT_ACK BIT(12) + +#define XGBE_PMA_CFF_UPDTM1_VLD BIT(8) +#define XGBE_PMA_CFF_UPDT0_VLD BIT(9) +#define XGBE_PMA_CFF_UPDT1_VLD BIT(10) +#define XGBE_PMA_CFF_UPDT_MASK (XGBE_PMA_CFF_UPDTM1_VLD |\ + XGBE_PMA_CFF_UPDT0_VLD | \ + XGBE_PMA_CFF_UPDT1_VLD) + /*END*/ /* Bit setting and getting macros diff --git a/drivers/net/axgbe/axgbe_ethdev.h b/drivers/net/axgbe/axgbe_ethdev.h index cb3df47a63..dd00ae8af5 100644 --- a/drivers/net/axgbe/axgbe_ethdev.h +++ b/drivers/net/axgbe/axgbe_ethdev.h @@ -244,6 +244,7 @@ enum axgbe_mb_cmd { enum axgbe_mb_subcmd { AXGBE_MB_SUBCMD_NONE = 0, + AXGBE_MB_SUBCMD_RX_ADAP, /* 10GbE SFP subcommands */ AXGBE_MB_SUBCMD_ACTIVE = 0, @@ -722,6 +723,10 @@ struct axgbe_port { struct rte_timecounter tx_tstamp; unsigned int tstamp_addend; + bool en_rx_adap; + int rx_adapt_retries; + bool rx_adapt_done; + bool mode_set; }; void axgbe_init_function_ptrs_dev(struct axgbe_hw_if *hw_if); diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index 13b37e9b8b..a1c42b7dd4 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -247,6 +247,10 @@ struct axgbe_phy_data { }; static enum axgbe_an_mode axgbe_phy_an_mode(struct axgbe_port *pdata); +static void axgbe_phy_perform_ratechange(struct axgbe_port *pdata, + enum axgbe_mb_cmd cmd, enum axgbe_mb_subcmd sub_cmd); +static void axgbe_phy_rrc(struct axgbe_port *pdata); + static int axgbe_phy_i2c_xfer(struct axgbe_port *pdata, struct axgbe_i2c_op *i2c_op) @@ -1194,6 +1198,92 @@ static void axgbe_phy_set_redrv_mode(struct axgbe_port *pdata) axgbe_phy_put_comm_ownership(pdata); } +#define MAX_RX_ADAPT_RETRIES 1 +#define XGBE_PMA_RX_VAL_SIG_MASK (XGBE_PMA_RX_SIG_DET_0_MASK | \ + XGBE_PMA_RX_VALID_0_MASK) + +static void axgbe_set_rx_adap_mode(struct axgbe_port *pdata, + enum axgbe_mode mode) +{ + if (pdata->rx_adapt_retries++ >= MAX_RX_ADAPT_RETRIES) { + pdata->rx_adapt_retries = 0; + return; + } + + axgbe_phy_perform_ratechange(pdata, + mode == AXGBE_MODE_KR ? + AXGBE_MB_CMD_SET_10G_KR : + AXGBE_MB_CMD_SET_10G_SFI, + AXGBE_MB_SUBCMD_RX_ADAP); +} + +static void axgbe_rx_adaptation(struct axgbe_port *pdata) +{ + struct axgbe_phy_data *phy_data = pdata->phy_data; + unsigned int reg; + + /* step 2: force PCS to send RX_ADAPT Req to PHY */ + XMDIO_WRITE_BITS(pdata, MDIO_MMD_PMAPMD, MDIO_PMA_RX_EQ_CTRL4, + XGBE_PMA_RX_AD_REQ_MASK, XGBE_PMA_RX_AD_REQ_ENABLE); + + /* Step 3: Wait for RX_ADAPT ACK from the PHY */ + rte_delay_ms(200); + + /* Software polls for coefficient update command (given by local PHY) */ + reg = XMDIO_READ(pdata, MDIO_MMD_PMAPMD, MDIO_PMA_PHY_RX_EQ_CEU); + + /* Clear the RX_AD_REQ bit */ + XMDIO_WRITE_BITS(pdata, MDIO_MMD_PMAPMD, MDIO_PMA_RX_EQ_CTRL4, + XGBE_PMA_RX_AD_REQ_MASK, XGBE_PMA_RX_AD_REQ_DISABLE); + + /* Check if coefficient update command is set */ + if ((reg & XGBE_PMA_CFF_UPDT_MASK) != XGBE_PMA_CFF_UPDT_MASK) + goto set_mode; + + /* Step 4: Check for Block lock */ + + /* Link status is latched low, so read once to clear + * and then read again to get current state + */ + reg = XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_STAT1); + reg = XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_STAT1); + if (reg & MDIO_STAT1_LSTATUS) { + /* If the block lock is found, update the helpers + * and declare the link up + */ + PMD_DRV_LOG(NOTICE, "Rx adaptation - Block_lock done\n"); + pdata->rx_adapt_done = true; + pdata->mode_set = false; + return; + } + +set_mode: + axgbe_set_rx_adap_mode(pdata, phy_data->cur_mode); +} + +static void axgbe_phy_rx_adaptation(struct axgbe_port *pdata) +{ + unsigned int reg; + +rx_adapt_reinit: + reg = XMDIO_READ_BITS(pdata, MDIO_MMD_PMAPMD, MDIO_PMA_RX_LSTS, + XGBE_PMA_RX_VAL_SIG_MASK); + + /* step 1: Check for RX_VALID && LF_SIGDET */ + if ((reg & XGBE_PMA_RX_VAL_SIG_MASK) != XGBE_PMA_RX_VAL_SIG_MASK) { + PMD_DRV_LOG(NOTICE, "RX_VALID or LF_SIGDET is unset, issue rrc\n"); + axgbe_phy_rrc(pdata); + if (pdata->rx_adapt_retries++ >= MAX_RX_ADAPT_RETRIES) { + pdata->rx_adapt_retries = 0; + return; + } + goto rx_adapt_reinit; + } + + /* perform rx adaptation */ + axgbe_rx_adaptation(pdata); +} + static void axgbe_phy_rx_reset(struct axgbe_port *pdata) { int reg; @@ -1258,12 +1348,27 @@ static void axgbe_phy_perform_ratechange(struct axgbe_port *pdata, wait = AXGBE_RATECHANGE_COUNT; while (wait--) { if (!XP_IOREAD_BITS(pdata, XP_DRIVER_INT_RO, STATUS)) - goto reenable_pll; + goto do_rx_adaptation; rte_delay_us(1500); } PMD_DRV_LOG(NOTICE, "firmware mailbox command did not complete\n"); /* Reset on error */ axgbe_phy_rx_reset(pdata); + goto reenable_pll; + + +do_rx_adaptation: + if (pdata->en_rx_adap && sub_cmd == AXGBE_MB_SUBCMD_RX_ADAP && + (cmd == AXGBE_MB_CMD_SET_10G_KR || cmd == AXGBE_MB_CMD_SET_10G_SFI)) { + PMD_DRV_LOG(NOTICE, "Enabling RX adaptation\n"); + pdata->mode_set = true; + axgbe_phy_rx_adaptation(pdata); + /* return from here to avoid enabling PLL ctrl + * during adaptation phase + */ + return; + } + reenable_pll: /* Enable PLL re-initialization, not needed for PHY Power Off and RRC cmds */ @@ -1296,6 +1401,31 @@ static void axgbe_phy_power_off(struct axgbe_port *pdata) PMD_DRV_LOG(DEBUG, "phy powered off\n"); } +static bool enable_rx_adap(struct axgbe_port *pdata, enum axgbe_mode mode) +{ + struct axgbe_phy_data *phy_data = pdata->phy_data; + unsigned int ver; + + /* Rx-Adaptation is not supported on older platforms(< 0x30H) */ + ver = AXGMAC_GET_BITS(pdata->hw_feat.version, MAC_VR, SNPSVER); + if (ver < 0x30) + return false; + + /* Re-driver models 4223 && 4227 do not support Rx-Adaptation */ + if (phy_data->redrv && + (phy_data->redrv_model == AXGBE_PHY_REDRV_MODEL_4223 || + phy_data->redrv_model == AXGBE_PHY_REDRV_MODEL_4227)) + return false; + + /* 10G KR mode with AN does not support Rx-Adaptation */ + if (mode == AXGBE_MODE_KR && + phy_data->port_mode != AXGBE_PORT_MODE_BACKPLANE_NO_AUTONEG) + return false; + + pdata->en_rx_adap = 1; + return true; +} + static void axgbe_phy_sfi_mode(struct axgbe_port *pdata) { struct axgbe_phy_data *phy_data = pdata->phy_data; @@ -1304,8 +1434,13 @@ static void axgbe_phy_sfi_mode(struct axgbe_port *pdata) /* 10G/SFI */ if (phy_data->sfp_cable != AXGBE_SFP_CABLE_PASSIVE) { + pdata->en_rx_adap = 0; axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI, AXGBE_MB_SUBCMD_ACTIVE); + } else if ((phy_data->sfp_cable == AXGBE_SFP_CABLE_PASSIVE) && + (enable_rx_adap(pdata, AXGBE_MODE_SFI))) { + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI, + AXGBE_MB_SUBCMD_RX_ADAP); } else { if (phy_data->sfp_cable_len <= 1) axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI, @@ -1330,6 +1465,10 @@ static void axgbe_phy_kr_mode(struct axgbe_port *pdata) axgbe_phy_set_redrv_mode(pdata); /* 10G/KR */ + if (enable_rx_adap(pdata, AXGBE_MODE_KR)) + axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_KR, + AXGBE_MB_SUBCMD_RX_ADAP); + else axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_KR, AXGBE_MB_SUBCMD_NONE); phy_data->cur_mode = AXGBE_MODE_KR; @@ -1719,8 +1858,11 @@ static int axgbe_phy_link_status(struct axgbe_port *pdata, int *an_restart) return 0; } - if (phy_data->sfp_mod_absent || phy_data->sfp_rx_los) + if (phy_data->sfp_mod_absent || phy_data->sfp_rx_los) { + if (pdata->en_rx_adap) + pdata->rx_adapt_done = false; return 0; + } } /* Link status is latched low, so read once to clear @@ -1728,7 +1870,29 @@ static int axgbe_phy_link_status(struct axgbe_port *pdata, int *an_restart) */ reg = XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_STAT1); reg = XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_STAT1); - if (reg & MDIO_STAT1_LSTATUS) + + if (pdata->en_rx_adap) { + /* if the link is available and adaptation is done, + * declare link up + */ + if ((reg & MDIO_STAT1_LSTATUS) && pdata->rx_adapt_done) + return 1; + /* If either link is not available or adaptation is not done, + * retrigger the adaptation logic. (if the mode is not set, + * then issue mailbox command first) + */ + if (pdata->mode_set) { + axgbe_phy_rx_adaptation(pdata); + } else { + pdata->rx_adapt_done = false; + axgbe_phy_set_mode(pdata, phy_data->cur_mode); + } + + /* check again for the link and adaptation status */ + reg = XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_STAT1); + if ((reg & MDIO_STAT1_LSTATUS) && pdata->rx_adapt_done) + return 1; + } else if (reg & MDIO_STAT1_LSTATUS) return 1; if (pdata->phy.autoneg == AUTONEG_ENABLE && From patchwork Tue May 7 12:43:03 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: 139986 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 9EFF143FC9; Tue, 7 May 2024 14:46:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D49B94338B; Tue, 7 May 2024 14:44:42 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2055.outbound.protection.outlook.com [40.107.92.55]) by mails.dpdk.org (Postfix) with ESMTP id CEDFB433C0; Tue, 7 May 2024 14:44:40 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S0yDblOMXvmGMQsNJrxHM0d/8mQr3u/Lo5l8O/1txnnnFZXdp9WyhQet/06YZ3EQJranNsxey3BGzlfXrrfMMilHO33E779O65XpRYXUCTyIlvso8AdRdNWiPXE8rj189VHhTtashvc15EbgD6FCJE4LFouAH62jF+XuPUxdVLBkW/3b/2GPUxcrFOVyrAD28eg95vErHMw12rGjfcCG5q52OxaVUuuamtH3OIsMIYmovTTEqtRN6P6WRitKEelerBH3uvqjhAul9HQ3wGKTczyNBxeh2meto4Lf/w6YZRVqjn7/ofntFZrxvr2myrweBXtQ17Bvs2EkpCDsNRAmZw== 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=daOCjbN5Y1j/CO3DYdSNbANIUhg+AgINEDMsQKPOXu0=; b=EOK41WZBfGWWFizClolbyWVPiGahWeFsQIjRM8fOLF3ldcRWNX+5YiiqAdZ7rtYclQhAlCocCNUAwuiPLaF5NdnOSmeUT92tEV+BzA3oZd0RxKgfMrTNiCH9ir1XnMm35/JLShYbse/j2sKt7FjFypbjVA/6uJsWT6BWG2Lq+KLtPPgg4KmOPRi8ycXJoxP2n1iKux8PtIZHOthS5mp6jsGp6UPIyvczl53qnKSxPu3Cs1Er1eIfcPEVgd0L9nXJjNzqG9yNe28csVfxMrty0Il90miH85k8AR6tvbUa6WFZzqNyqiEHjmUVhinDdWeydSeq9PdzZ8zbcTrM0Y1G+Q== 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=daOCjbN5Y1j/CO3DYdSNbANIUhg+AgINEDMsQKPOXu0=; b=NOF1ybdqPzrJ6IIXjhkf4W5MovxLPxnG+8K4sbhedHiqaWyYrQTyP/jmsDfz1d4dce9v3owdBphLwtQKB7GjrGd6aHs6mA1DjbzbueRdZBupqtMskRo1h5Cy0c5sqQHDf7hrZ5pc2G5wgYGJHqrO82APpUuUJS1abgJjTxQ0iWM= Received: from PR2P264CA0002.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::14) by DS0PR12MB9039.namprd12.prod.outlook.com (2603:10b6:8:de::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41; Tue, 7 May 2024 12:44:37 +0000 Received: from SN1PEPF00036F42.namprd05.prod.outlook.com (2603:10a6:101:0:cafe::25) by PR2P264CA0002.outlook.office365.com (2603:10a6:101::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42 via Frontend Transport; Tue, 7 May 2024 12:44:36 +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 SN1PEPF00036F42.mail.protection.outlook.com (10.167.248.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:44:36 +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; Tue, 7 May 2024 07:44:28 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande , Subject: [PATCH v2 23/25] net/axgbe: fix the false linkup in axgbe PHY status Date: Tue, 7 May 2024 18:13:03 +0530 Message-ID: <20240507124305.2318-23-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F42:EE_|DS0PR12MB9039:EE_ X-MS-Office365-Filtering-Correlation-Id: f15f7a07-76fc-4103-00b2-08dc6e9373f7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|36860700004|82310400017|1800799015|376005; X-Microsoft-Antispam-Message-Info: O7/NW0y5wlRHJDb/7bNg3gk3xGnthEZMWzdhZo9guXsnLpEB/S1oZ/fjpmsu+B5iqaeST7hkV/yZCStXRnVgJFSakEmTAbRra2U6oITzrc3KhQ9WKY+cb3XYXrA3Lxiv3IOa474bfMJGx7wukrJwKnpB1zU04P7eX5tuAyX+W91xyQeTQn5pKlWdYdWb67FDlyicx80q8JdeH/8v6MSrLqRyCEveBlB6El2zgLcmfSXA11W5YvThAQ3wftZ3hVMeoSTUkTTWGdRaHRTSh5f8AKy/x0mekYJMDsIj90sPgykjspPHkOUfq+cYB29uWfHZ0oTyWSJMnOcJy7LgCdb1rRWof7AdMNYP7J7luEbOUbqltfmlTK3iXJryoNZXTPQTlBlPA2Q4GbJ/BZUMesj6aHoh1azNv1jeFtWaFqdTxWM9Jln33d3XJb8uMq8xnjkEYpInjJMPysntJd2CspZAzXs7qR3eUBUUP4BqwLpz6EHtp4z6gmKs6qhqyX+phTf+/jgxj72aqPOdj4/Z1+nLU8QGRtgf5n5Q7Bb2bBEYdKdvwhDszPWTdE4OiacmEk3Un0pVSX6UpbDC2bpzgdRA9rOiZOKc7pkR8GYC3xj/GSF4IgpjCqf6zTlC1WK8/KhKtBsn6tFJ1pCJQKRlay6mcBHW3OmPGI3u63reMOEWei4alW6rKLUDw1TJicTDnDYjTBH/dIuE0I1EXx8phG1TwxY5QbAEpypy+YPpuLlvXIp7zGffciofhzX3G2P9z7tcVMebxerEIcc2RejzZd/+G1MyIoOZm2yIPoxZLknxxf5xo+VYdcb+CB6QAA2Hv7Rde1N0H5HSPnoIofsYA3SfvTofU1B2DeIOXf61ynQ2O7Grf8H5AWnRypWUwjKj+pYpU6jcQTAhi5ZYKkuifH69JvZ/sRmF8tPfiFpDxnEM1Le5PkYowADgxn5GzyrgG07VOT/dp10Y4Bu4b8vqmkKXOKtWsBo4LGzUsjhD/j0Cu/JioYxtpTM+4FsY3cRm3yTx1f8LaDVjTQKfxAB6UM5PYIBtrmhWVBExlIQEEI5Z83oFw+2KeNO+IeqEtCqgEqkhOJQYfvDngHZ865jKahZPWNBDxznqpUFnv/P1z1Lk7r43Lh1ucZJTdMcWI3+go8mR3Qd5xCs2c5m/ANZKr2auz05khJRluMdRunXI0fqbJ2p0G4R1Ua07nEMPm8YJ6POU3eu6RrfqILDzvtUDa1eFDf/kVg8k5Usm1X3sw7oV6AV1Bv7SBcgC2ZKENhJ0VhsXtFPlEIxXOaX9iUrch6SWg4LgC+Wyc1ebOUIIJ/CkF+atW80hcgUPaJ0rXiEOHxZkYGjytp7f3Xy3QhrtoYuXt4fmtODru90In6Od7P4kPVrzF6dcm43lQUTyNnl7XbDD 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)(36860700004)(82310400017)(1800799015)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:44:36.3801 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f15f7a07-76fc-4103-00b2-08dc6e9373f7 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: SN1PEPF00036F42.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9039 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 In the event of a change in AXGBE mode, the current auto-negotiation needs to be reset and the AN cycle needs to be re-triggered. However, the current code ignores the return value of axgbe_set_mode(), leading to false information as the link is declared without checking the status register. Fix this by propagating the mode switch status information to axgbe_phy_status(). Fixes: 102b6ec3d5c3 ("net/axgbe: support auto-negotiation for 1Gbps") Cc: stable@dpdk.org Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_mdio.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/axgbe/axgbe_mdio.c b/drivers/net/axgbe/axgbe_mdio.c index 9fe30e83bc..130a67479e 100644 --- a/drivers/net/axgbe/axgbe_mdio.c +++ b/drivers/net/axgbe/axgbe_mdio.c @@ -1028,7 +1028,7 @@ static enum axgbe_mode axgbe_phy_status_aneg(struct axgbe_port *pdata) return pdata->phy_if.phy_impl.an_outcome(pdata); } -static void axgbe_phy_status_result(struct axgbe_port *pdata) +static bool axgbe_phy_status_result(struct axgbe_port *pdata) { enum axgbe_mode mode; @@ -1065,8 +1065,13 @@ static void axgbe_phy_status_result(struct axgbe_port *pdata) pdata->phy.duplex = DUPLEX_FULL; - if (axgbe_set_mode(pdata, mode) && pdata->an_again) + if (!axgbe_set_mode(pdata, mode)) + return false; + + if (pdata->an_again) axgbe_phy_reconfig_aneg(pdata); + + return true; } static int autoneg_time_out(unsigned long autoneg_start_time) @@ -1133,7 +1138,10 @@ static void axgbe_phy_status(struct axgbe_port *pdata) return; } } - axgbe_phy_status_result(pdata); + + if (axgbe_phy_status_result(pdata)) + return; + if (rte_bit_relaxed_get32(AXGBE_LINK_INIT, &pdata->dev_state)) rte_bit_relaxed_clear32(AXGBE_LINK_INIT, &pdata->dev_state); From patchwork Tue May 7 12:43:04 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: 139987 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 730E843FC9; Tue, 7 May 2024 14:46:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9B914433EE; Tue, 7 May 2024 14:44:49 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2046.outbound.protection.outlook.com [40.107.101.46]) by mails.dpdk.org (Postfix) with ESMTP id AB1E3433B9 for ; Tue, 7 May 2024 14:44:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dTjUyyuNXmJGbm4b3CE5V6xuP7eRK6p93IcNLY2WAy3noc2+uARXzeYMSeimN/VEPReQ7b89iXFhm8sFXYnSazHLuYIxSj/z8+ywp1W4/BviTPhTlK+SOdms3LEUaMhqhr/iXQrjyncrEL+pbWDx7ZNUIoslvzLBXW1JQ2/Jpk15/ZVj09dJMMRyOaPKX9jmLY/SHcGoAmxsOJs1C6NTpxchlUbfhXmFL0feRoCA6/b/mzsEzHAC1h4d1t3eQG7KyT80gLgYm14zyJA/mzPmSKtMYXn9rO9XEOAYvG9kjDsqrjnUenbHXAZT1HWklmR1P+YVk7wZoprjwI49H6rJrg== 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=1B2FkfTOPTXoXK5rWsXcFiCSMPUSU596Rx2AGqYacKk=; b=aA1s9Q89T2YO467bxs5jvAJIVmzzV/nWGYB2pTe2LDw1L/yuUGHV8jRDZ/S7EH+YlvvuPtYOVCPjVz+YgKxzhBQZM0UDbSzRpqU9ymnR7OsnCcZDzx1WcWs+hA3Ldv88IyFxn4XGCOp7LYIsyoEhdNgc/2LXFUmvNMaIPxu1tZQQYzLvDLC3yFVBOc+YiB9YLht56JOBkIn95349iBERBivpE6JCS7/PXvJGd/DCXJqBF49OEoFe1hAxRL8PBs8+IbdbIMkzsBSu3jjAwdCLwZFQO0MztV6H2ItuJNNIwJPHERyOT9T7N+lgzJJ/ZOnQGT2AC4zvrHWmNHNIXLrvVg== 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=1B2FkfTOPTXoXK5rWsXcFiCSMPUSU596Rx2AGqYacKk=; b=mNuALAW5Lx9ZJcIURVCk/slgkKjhrTkEcRwqMO08jUfLoEtQ9AjqpRC4zsS4hsQtogR0PK464uQD68brVaxDUbSsIuBliZ3Ezmo+Hly84CiCTdi5kWfI05pqpK7n+Rv0K3V8wX1fWzbN2qzJCX8LkglnRuOmgY8to8KtoM3UFJ0= Received: from PR2P264CA0010.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::22) by IA1PR12MB7688.namprd12.prod.outlook.com (2603:10b6:208:420::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.35; Tue, 7 May 2024 12:44:44 +0000 Received: from SN1PEPF00036F42.namprd05.prod.outlook.com (2603:10a6:101:0:cafe::4) by PR2P264CA0010.outlook.office365.com (2603:10a6:101::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42 via Frontend Transport; Tue, 7 May 2024 12:44:38 +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 SN1PEPF00036F42.mail.protection.outlook.com (10.167.248.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:44:37 +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; Tue, 7 May 2024 07:44:31 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande Subject: [PATCH v2 24/25] net/axgbe: extend 10Mbps support to MAC version 21H Date: Tue, 7 May 2024 18:13:04 +0530 Message-ID: <20240507124305.2318-24-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F42:EE_|IA1PR12MB7688:EE_ X-MS-Office365-Filtering-Correlation-Id: 47e3581d-70d6-4ecd-9358-08dc6e9374ec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|36860700004|82310400017|376005|1800799015; X-Microsoft-Antispam-Message-Info: jsfZPqY54fdAlJ7ELeZir/vEah60R4OIifyxxjmV/+9JwLkQSNNlw0DdliPe3PuB2tWYmymMesyKAq8/sHbhgmLCDuIWHtuB6l5FYkKcITLMQ0mKAIJUaHRHp33t4MopiEN/KABMA4SGzWasqj+7VIzf85fcbYFM7jsIehht7dAgRzWY/F1VgowTicLT42LVfM0vWspIUlyMRII+ph+eVEn5kyQNe6RBkmOKt3B3yX3v/ARvfpJElBakHYY7trvJCuN078k+0clWZ4kHqPW4qsztjkL5ls29foUbse9WPRPo9V0o6BTHdnw/hBr3AvbzXb4GPLRMyZsq6dCogyAb+IR3jBeRsysaz8wltfPx1EIDQ2DzW93jp962wHH/uOQxa1HToWJHENIG6sz8qgVUVdcSCZQYLxg+fTeIW1EGW2xv3YzOhhTdWhFLzGQELc4zb4AhM1dgOCQsb0+jw29Rxr/2t9i1Hnz3JBi/P1P/5q7vDmqsJzmw2Ajxf8XfQeg1o+6T/AvwWeBaC8LwUqn58uh8VfBfIPqYLvX2Yfe1VDORHnFesZ6AtN5IOqA2HeJo0x2cCfF5PZCkFuyRjeckXT9wmUer9B9dIjhJr/TqKghiiX91v6/P37Zl7gprPHiEFeOgY7DUJd2zij+SUdQiV6u8Np6OmKO+/TrrqnW4tuGVD9ObePvn4+POeW/5My4DwohUEM7V7Rv/WC9TL7zr3UfabR/BgyfFoyJV612zKd+yaTQ73oXo4015jF5pYu3R1wBiYoK7zTCTFKO87RKIWskNK52YRu1JvuK34QBTU5JE40ZHEvZTC6JYVb72v2s2Fy5tUoFKgGAnkqcyN9ntTIRkeUvsAOhBVPYw1aLwgvF+RbjXKADoeOYc0Ag4X0KkqntWKEhQ9XZJGaPtJw05yqZZImHNYSaoGeRQ4FVQt3FLI9P4YMpLh+R79ZfXYtFmrZFtKOh0Yz1yXeMe5dkW/f31HCxCKA1IzqJg9SNDRGINdAIQe23gxoxlhbSrcqk3FHnVVA3Hr1H5oZ57OtMcF5aECkUJORYWlWI+8QAJpbLbokUS4r/+EdHY6fDDx6767X+gvuJ7xeaROY6lvMKqmI7tkfm3xMfHvMP6gIViyF4Q5Gnm6OP3DH/9reer4D/ph/gDARJ8+vp1CCj7fH7BuDrWCrO1fLmmbUirIt8YnMHIpLBbuZIvr2TqtN1Fj29KuAI3wn5v3Bm8C8l5pu31Bbt4A5SzqmAaxerU/QmlXxb1At7WDiqceMdKHPxZk1RYOwljyclWSaluyXDwtRgS/X7NfRifYVWAetTw/AlJIRv5nzJYRFrdSjipCsnZyX3HCDWeCvj8rLXbm9irWhMQhdPn3NH8H9BTk7FsI5SK+sZ6R6t3wT3Ut4e2svRyMXfg 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)(36860700004)(82310400017)(376005)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:44:37.9895 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 47e3581d-70d6-4ecd-9358-08dc6e9374ec 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: SN1PEPF00036F42.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7688 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 MAC version 21H supports the 10Mbps speed. So, extend support to platforms that support it. Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_phy_impl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index a1c42b7dd4..d41c6e9bc7 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -2012,9 +2012,9 @@ static bool axgbe_phy_port_mode_mismatch(struct axgbe_port *pdata) struct axgbe_phy_data *phy_data = pdata->phy_data; unsigned int ver; - /* 10 Mbps speed is not supported in ver < 30H */ + /* 10 Mbps speed is supported in ver 21H and ver >= 30H */ ver = AXGMAC_GET_BITS(pdata->hw_feat.version, MAC_VR, SNPSVER); - if (ver < 0x30 && phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_10) + if ((ver < 0x30 && ver != 0x21) && phy_data->port_speeds & AXGBE_PHY_PORT_SPEED_10) return true; switch (phy_data->port_mode) { From patchwork Tue May 7 12:43:05 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: 139988 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 2D23443FC9; Tue, 7 May 2024 14:46:36 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6A84C433B9; Tue, 7 May 2024 14:44:53 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2060.outbound.protection.outlook.com [40.107.93.60]) by mails.dpdk.org (Postfix) with ESMTP id 3A08D43414 for ; Tue, 7 May 2024 14:44:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jDlK+rQpRjMcYyFNB6s8v8PwvWEnk10S8hVovoGfwLdLHjAF78AlZPGVhWLHcaKj1DnvKvi35YF+fMT4wAZRgRQSxUTgs47smctlOe4BANZ0jmHRf0BXLuOZps6RjfADiZ/sBj5xE/or+fT0M3nGZzfW5Y19Txw8l22w7y++0X8scZFji3Ky8T4IQvrXucA/LGSQnkO7j8kiiNSQmAy9A7KzWkNICh+VUzAF+coetWk/mqWaTxpMwhkvFeDh7VXL7HOZOZeVXhiEhu6tWke6tnMUHnEZbqyQUEZVD32brbyMxiaLpbDSF12s29L8hzoz7Se/IvhViAkq/4KO21NTyQ== 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=xvwl2nsTQHEPhUIX2vr5y+aYe8AVUNPIHq4x/8dgbfg=; b=kQ4Hdb8llI1tuVMUGGxVAzihquMI0PKjYVsYqlgJJFrBMxY4TNiglQLP8C0R5GuwzzGjHihQCycwwycfZDdGQvo0BG8tyfDPLU9bPzVeBoXHyFSKHA/+g40QlqirrMdlDVh7bPmfOeF8PhDjd8KcUTlKU22NUZwC/+oL2yvm+kw/qfTkGlJ6pTxnfInxezwCVkYT6THV+AODZvtz0uuquDLpghCX3dr81XLrysdDfezRINOG1sHlhat241Lr+i0SGAbYpvfA+Nw/JvDzvoTPvXNv4Wgx3/35EDByufSnUEbaNzOjyH13bukJmElBUcM+8dP75/3JJD7WnY9JuJmB2g== 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=xvwl2nsTQHEPhUIX2vr5y+aYe8AVUNPIHq4x/8dgbfg=; b=2C31wofd8JClHKdkyTplfIyVt4grRRIvWsposOuMzCuDQxLCzIlrVTvCIQQoch1kYqoc5TPb9HzOphRZ28cbX0A9QdGukaPmg75AsGjSgbhzJ6KRsedzTi6VSDpAzYSMLaS/eK1yq5a8zkox8Hfv24IL+GTkoGgTgbpOC3hhLVA= Received: from PR2P264CA0010.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::22) by BY5PR12MB4305.namprd12.prod.outlook.com (2603:10b6:a03:213::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42; Tue, 7 May 2024 12:44:47 +0000 Received: from SN1PEPF00036F42.namprd05.prod.outlook.com (2603:10a6:101:0:cafe::4) by PR2P264CA0010.outlook.office365.com (2603:10a6:101::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42 via Frontend Transport; Tue, 7 May 2024 12:44:46 +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 SN1PEPF00036F42.mail.protection.outlook.com (10.167.248.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Tue, 7 May 2024 12:44:45 +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; Tue, 7 May 2024 07:44:39 -0500 From: Venkat Kumar Ande To: CC: , Venkat Kumar Ande Subject: [PATCH v2 25/25] net/axgbe: modify debug messages Date: Tue, 7 May 2024 18:13:05 +0530 Message-ID: <20240507124305.2318-25-venkatkumar.ande@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F42:EE_|BY5PR12MB4305:EE_ X-MS-Office365-Filtering-Correlation-Id: 624ef8a7-245d-4dc7-2357-08dc6e93798b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|36860700004|82310400017|376005|1800799015; X-Microsoft-Antispam-Message-Info: u9q3PbbVgNLpQZ33Nppw/IeDH6lF39oCVcz4HJF9bLRlPdhET3RigCNq85ZC4o0+lO9ZBo+DjlIc84g9qqhUBNoC0Knod5EnOohAW2y6ffAb4bQDQQHTrtGWJeBNCgJUojHDxtKdsJb6OonWoZN4p0B1NDQ+dY1KFEtLkdtv4WNUw4gNsJ7QiT4m9VxqhXj4v1YM7CDSNS8Sl7YtUCn7H/LC9BYOLvkS/KWrzwHex85gnAelIAg6lbNZMchWMvZUXp5M9BcOJOfGrdiI4x8ZVlV6gcusQoeikEGqXXE11mdcE76fHeF1cj6SB1XxdMT9LSVp3CcWwLc0Amwu4mp5GhLDuM7XF1pO4pkPsy1hZJXiI0jEU9hFkr87UPl7mk/hVDH4HYNmhB4/QzboKS2Dwp5wYTzsRlDY7SHju4UvEs/CYN5CwczCniccWNDJMXjERKsl+DOJEpwkCHurAJwxlmQr7zH48BggTzSF3b4d7M9JZvzAyjgUfEj15WZol0qQIJtdCgpArS1qgl9SNcjiLTkLxxOhKGq43x/SSRNdOx+IBpH7Gx566pUJEMcA5UX9Fst12zzSL/V/vBfTeESf7C8GEnS7+iCLCBE0nlHJ2kn2dsHMwqwJgmngSdDjzw1NRREKb4XMB9Fio5UPEIhMSgi/1o3PcauJ4a5cuHYNr5kiTFFsPymBk5u+g23kfy2wZMWaHx2WIs7ZCLqtBFmsDOJGaJSax0kvH8xgakcR2RXXE3Ez9/+zSB3Y1JD3n+JzYwKjZIe4eamPL0awbBA/juRWUhzfm2o0sgU/mdwMM7saalvT6gtoGuQymqoJ1Qj5TWuQBhmsz9cKOFliU1dwbkouPmr/MOaAZpf4Ezwy0Yb8AqCa2J4RpcIe0S3UfGSq8Lcu04oqKFv3Q67aYYoq8q5rBr9qqIOOq6HppH597WziTeDlO+Ym7K/pf5JU7jSK/c8HHtA9i7QE+/HuTWuipzBdoVgm91zasUDfb0R8vsrxrDlhf6/n1D7WNKSeRKaIuYD+i2IHPgo0v3dyGsNgO5lI/p7HEyod7J1LjmZ7lq4x7D+0FXB/eApDQCQFHXIgd0++vNnwKx6M7BgpRfY3z+vRrwbuJpAZALzJlGg/2TPsDoWs7nLVBJbM+zS6GGX6DCRrXNRuEuNzCgLODxnpFfxdGaivWpGqxkAkzpfLOZnjbc69AbDKkR7ZNagYYXZuEvGEoBJ5hLgZy+ZvDJ/7a9pxGk9A9FhDYtkqL/Ah7DH1dZkxBFta4gQap2PIkgRCu2ryPb8BO+SLFzd+slb6iBG50pfuVIy2F+6InMBqR3nRJNs/Ucqt2yAOzxtxfhLrVlTk40zOUOr29m85iWLuRBm0DRFxfkRBbLyMZSjhuZ22NzbtrxsRkWn6P0W7EkSc 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)(36860700004)(82310400017)(376005)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 12:44:45.7396 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 624ef8a7-245d-4dc7-2357-08dc6e93798b 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: SN1PEPF00036F42.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4305 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 Modify debug messages to get better information from debug logs Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian Signed-off-by: Venkat Kumar Ande --- drivers/net/axgbe/axgbe_ethdev.c | 4 ++-- drivers/net/axgbe/axgbe_phy_impl.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c index 86c2ec64e0..8b1f3b2742 100644 --- a/drivers/net/axgbe/axgbe_ethdev.c +++ b/drivers/net/axgbe/axgbe_ethdev.c @@ -783,8 +783,8 @@ axgbe_dev_link_update(struct rte_eth_dev *dev, link.link_autoneg = !(dev->data->dev_conf.link_speeds & RTE_ETH_LINK_SPEED_FIXED); ret = rte_eth_linkstatus_set(dev, &link); - if (ret == -1) - PMD_DRV_LOG(ERR, "No change in link status\n"); + if (ret == 0) + PMD_DRV_LOG(ERR, "Link status changed\n"); return ret; } diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index d41c6e9bc7..0af1a7cac5 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -1375,8 +1375,6 @@ static void axgbe_phy_perform_ratechange(struct axgbe_port *pdata, if (cmd != AXGBE_MB_CMD_POWER_OFF && cmd != AXGBE_MB_CMD_RRC) axgbe_phy_pll_ctrl(pdata, true); - - PMD_DRV_LOG(NOTICE, "firmware mailbox command did not complete\n"); } static void axgbe_phy_rrc(struct axgbe_port *pdata)