From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B5D8F45610 for ; Fri, 12 Jul 2024 12:48:39 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B0B16410DF; Fri, 12 Jul 2024 12:48:39 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2054.outbound.protection.outlook.com [40.107.220.54]) by mails.dpdk.org (Postfix) with ESMTP id A8D3C406B8 for ; Fri, 12 Jul 2024 12:48:37 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OM9A0GI9uboRxmy4pO3M6ST3Uk56TbzWtdgcsnJmReN2tgy5C4ggvf1K7X0edQT80Akp7fhPs8Rzn4ElTwnyb5dRtzpp/EBuQXtFxxCLGBtHaY21BOdgTHol0b1VSKjiJekNMJO/CgKMzz0xfyKEsOIc2XH7m79QHpyQ4KxmfUYIs0/7FiX2HsyGXCB/ZCJTXwhno2z80mOkiXN+S3z0EdrepbV7cckW83DiCfp1fc8VSIYtSfZgWPW6i9cvrInXMfONIVXXp4zMuUhRE/uiK48eJHDm+oN3Yz2xNh4asU3QIZZzknxOjVj13ymH4BOiKzoeNifpSKqZ5wo6OHctLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8v4Za9UDq4iAdgao+9BWN2cl1GOqU+xnIFp6r2/EKc0=; b=irk/gku4WDTZtCl+aRCEXZDNN0IvfgnvxlQIukDb1837EGJWE76yLeh98hSTmC2lTvX6M42ooZ+NU9pvFfWah8+oO6Qt1zmEhfqTUS4k+q6cmd8SclNdL4jkJoJbZit1jkktWdgtHVgb4h46qyV7RDj46WNFFXsyMd6mqMuphPFYLW93ix0DrPcwb81+KabketZSAKH7JBOLX92AddKg5Pz4E/IzAwdGLFYpqljvDVwcigtaFjqE6TmzghT1+UrCKzNXaPVMpiw0qkg5y2gAHdiqi1yxp1DhwEK5XdGy8K0XMA6eE6r4hUq20IkPfSO/qdG0iGovRZA8M6mAuySYCA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=amd.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8v4Za9UDq4iAdgao+9BWN2cl1GOqU+xnIFp6r2/EKc0=; b=Wl2rZ0MraKWUHvRL0qGFbuCbY2iXJvHVwu3hw+N17bKXwqsbiFReCMmuUKG8tv9nQ6OE0cjdU/xTXb0uv5QrK4sPUFrT28BcS9rDtR+PCEGW8ZT+1IM1YzbmEk3z4SEd3d2GS9fqx417M0L7dzSy0g42D8R0yCuLrR+3DX3ZMssp+wj36I6VZW9ZhFgJQ5E6JGSCfWObSSvMmwz74rBCW5hBs9vtcgAl3tIPV5rkNeXPp9SWzbep+BtgeZIyGjpsIanMqfoo4uOT6vm7NocJbRCrMvrYGOQC7Q16yRMqSy4myS9kx8htUPX0R2b17oXUcsj9mbLQGKAm1HD3WewnRA== Received: from DS7PR03CA0045.namprd03.prod.outlook.com (2603:10b6:5:3b5::20) by CH2PR12MB4118.namprd12.prod.outlook.com (2603:10b6:610:a4::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.22; Fri, 12 Jul 2024 10:48:34 +0000 Received: from DS1PEPF0001709A.namprd05.prod.outlook.com (2603:10b6:5:3b5:cafe::f4) by DS7PR03CA0045.outlook.office365.com (2603:10b6:5:3b5::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:48:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DS1PEPF0001709A.mail.protection.outlook.com (10.167.18.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 10:48:33 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:48:22 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:48:20 -0700 From: Xueming Li To: Venkat Kumar Ande CC: Selwin Sebastian , dpdk stable Subject: patch 'net/axgbe: fix MDIO access for non-zero ports and CL45 PHYs' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:15 +0800 Message-ID: <20240712104528.308638-30-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0001709A:EE_|CH2PR12MB4118:EE_ X-MS-Office365-Filtering-Correlation-Id: 839cccc1-c434-488a-35de-08dca2602d46 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ar2UIg9Z2vD5tDDaNm2sBxforyOmMx4BPFen0mfhG3PRJod+YvDZxi6WO2xN?= =?us-ascii?Q?8sOhD8TZ+RX/+rQmagySMQyE6hyXb/qcrPLxaF2AtzJ2uiwatFcX71S1Cagz?= =?us-ascii?Q?Nrugsae3DQTy0PYZtAYoIU0iXDulj5Ww3CZ2at/0X514FMO3hk09rMzaM3PQ?= =?us-ascii?Q?73YM3RY2wfqSpvyX5jOv3ac0awu6RnWgk/JYBR1mXlKtFooRgOmPZ4otMheZ?= =?us-ascii?Q?EeEbI13ZikAl5qegRdD87kGMqz/d8MLw3xA3KNFrTMWZgunNdw8TIRqearUQ?= =?us-ascii?Q?MfR8I3MdW+Po8H1ue7VhZsPUX81OzmEW3eZgbrOrlT1zsrI2qT++iUfEh9PF?= =?us-ascii?Q?OJrx2tGyZ9UihiH3NjnoDK9p9RVhgSFGTlnK9vJetIb2HQ+3BeOXPD6fedmv?= =?us-ascii?Q?ZeCrvORPdL2gJw4sKhLTvnZxvlKcHXdKv6PZTp2daDS+xQCZTryLo3mjIrGb?= =?us-ascii?Q?xyJ0LR0Iz9OQYf7vyaYag/efe2ir+nCZJLm1qULQRBuI/iahTuxs1XB0sk0g?= =?us-ascii?Q?o4MYJehQlIMn8rl81ZSERygS5GjJUxkEv/Vqk1zb0szt3u5JGGew/oV3IB5D?= =?us-ascii?Q?pbRGzYnYk7s5SoqXoCuAU9G6JaoErHXRbziQRZnyC3ns4utNwqVnDS6LYSoM?= =?us-ascii?Q?OSVQG7Y3+yNhnfSZrwsKYj2QtnCVqx5R3+dIF1u49d4x6/ARsbApGIYKkuu+?= =?us-ascii?Q?DvyOK7rT07qRLRCZWXilgtBCuduJzfCO3gtn2kIqbgQuTP8B4m62YVC9idzR?= =?us-ascii?Q?BVbNm3fgogsY80KH1rZjqxiTeRoAh4cg1URwRLbl6kX7ACmBEMVOb7EYwI97?= =?us-ascii?Q?Hxh4ZNtymGI1RottxY9YkfqGvy9gyz+HLHl+8ULk2uvUPD5kzZt83Jeg2DyW?= =?us-ascii?Q?tAPSYpI4EWk6udkp7O00gHPwaBKcufkyWtTGhf6ODFccIFTru+lXrMeOdTY4?= =?us-ascii?Q?KtJQQf/y+Y4xV8RE0EendW33V/QZHrzXeJMdsazHkzlvj2y7xJMwnx5KgaGQ?= =?us-ascii?Q?Bic/1PokPHS+ALVLu8/IaJvjPDdAmoeBjF74lApsLPvKOjx+0aPgfRBzCwps?= =?us-ascii?Q?XnjrPudTIB+BPcm2OK7jL+1+pnc5iVfRP+jJa9eT0JXglq5nbPFWYhgwTsD9?= =?us-ascii?Q?b1YXqm+QxnNLG9Fr0LTdRTCeTCsfCLRg29s4/sa0LDtWH0U+//EEp2MqpHCf?= =?us-ascii?Q?f7RVrxpYoLWMIZd4b8CmlGZPdF+KVBE4MHkB0UlQ4VhubTCjIeREXOvJmi8R?= =?us-ascii?Q?DdtTbT+5L6bmGTkrcnQpz7h2h5pycJMa8SM+tfbPtARAaD36NVxqpmj4eA7l?= =?us-ascii?Q?GxaW3aJtLXWfO/vRISwGjt4bENEMD55HmmlsgySPIA+955EnztwrPJuMnx1v?= =?us-ascii?Q?KkpwbfIIsMI0Yngh0hJ3gYKenUlvzn5BY5VfR+I5p/3EWCZAVzKln2H59Cnu?= =?us-ascii?Q?nkSLWuoQ+hk395tPENs45Id0ty/fDaws?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:48:33.8497 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 839cccc1-c434-488a-35de-08dca2602d46 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0001709A.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4118 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 23.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=e04e7fb18d286d57f50ee3a11d14cfceffb99c2e Thanks. Xueming Li --- >From e04e7fb18d286d57f50ee3a11d14cfceffb99c2e Mon Sep 17 00:00:00 2001 From: Venkat Kumar Ande Date: Tue, 4 Jun 2024 17:41:33 +0530 Subject: [PATCH] net/axgbe: fix MDIO access for non-zero ports and CL45 PHYs Cc: Xueming Li [ upstream commit d06394d2641e3fdc0538a23354d9ff7c5aa9b277 ] 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 PHY device is not detected and can't be usable. 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") Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian --- 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; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:15.536784355 +0800 +++ 0029-net-axgbe-fix-MDIO-access-for-non-zero-ports-and-CL4.patch 2024-07-12 18:40:13.986594241 +0800 @@ -1 +1 @@ -From d06394d2641e3fdc0538a23354d9ff7c5aa9b277 Mon Sep 17 00:00:00 2001 +From e04e7fb18d286d57f50ee3a11d14cfceffb99c2e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d06394d2641e3fdc0538a23354d9ff7c5aa9b277 ] @@ -24 +26,0 @@ -Cc: stable@dpdk.org