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 4A4DF45610 for ; Fri, 12 Jul 2024 12:49:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4422B42EA3; Fri, 12 Jul 2024 12:49:28 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2079.outbound.protection.outlook.com [40.107.237.79]) by mails.dpdk.org (Postfix) with ESMTP id 85F0440261 for ; Fri, 12 Jul 2024 12:49:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=O0ow/TrP4NRjrv1AzoG8rTXbh8B7kiUPX7czD3pl7vrTP6zyikU5yl+7s4S7GzBYYUQBHF3KqewFUiBub5uamFcl2fUKK2UjMrzHPcm4uqhV1LXeq3WIHVgfYaybyz2G2dNAaqvZZ6xzcOrr224kYYgi6SeUkF5jX7ddgeJ5tKhYxyyFt0JbKocGMDClQ001Yjo0OdBLa2rHH3yxTYtCV9tQADP/AoQcGkofZJ632PpKo4Ga3khf7Kb4+LIZ8ufJO1c0wh4Yzte14lpgHHazbcctYsskcu/xaL0IB2p6WlLNYehVEtN18+DuymoctwRYgEHxAx3/SnjyNARc8cMBnw== 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=O9DiiD9Xf4EjcGGEuK3QpR2Detl66A4EgfrnbpL2P1E=; b=kjpVS9BaptWSc1pwo0V+rEcU8kYJ6aL2XA0KPrcxHyzK+QBv+hZantlpYC50ra08FgbGmVRq/7ciUwHwSn7I6Oq0KaOhlTEODmYrt9h4XZftqPpModle787/xmHZ3/T6qME6kUB100Wb/92DSyIHaY7f7Ey2UYDOyIAqn2rcEFL4BIEsMyoyJXOMaF5GxGtlG0LzHRGpXLobvMSfKNU2Ar8pINVN8ROkKfQCAvDuKpGEyJTar/o6jC06BKPIgduMiB67oaEwUxQ2AwzEGVX2Sckm+fMFkdzhxlYDbq6g7ww8Cf3IPVtL/sOgc/ey0GJD2BBP4CFAwMsUAJKhdCie3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=amd.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=O9DiiD9Xf4EjcGGEuK3QpR2Detl66A4EgfrnbpL2P1E=; b=LaOR0VgDcecoFGpvK1V159d2rRzp3Wau584izHIQiq9BiGqsiW3MsN39pgz0iVYGhOuLaF0lavELhujlYliJUx2h+I5lPsDlqYptbDuJmeJf2c0czTC6ow/qmzA6ZhPMP4LD9r9ZB21C9KcK5DBa2Ah33BWrxCC3GoF84Z4R1UbekvEcyfZ1lQnA2Irq9pSt0M4Y5FKz7Byz/nEtJ7Y6YMzOtwmzsg0KzxScywFVGGV1sIygfZ4u1XG6SpbP8lCo6MKVmBlLWJ6Nf/8CejDLHUgHdM+IVT2KCQj5pL4Xl847fZNBKS0D1GsoqZnrOC4Ec15inwWfYt1WheXyiA8NpQ== Received: from BYAPR06CA0037.namprd06.prod.outlook.com (2603:10b6:a03:14b::14) by IA0PR12MB7529.namprd12.prod.outlook.com (2603:10b6:208:431::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.36; Fri, 12 Jul 2024 10:49:24 +0000 Received: from SJ1PEPF000023DA.namprd21.prod.outlook.com (2603:10b6:a03:14b::4) by BYAPR06CA0037.outlook.office365.com (2603:10b6:a03:14b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:49:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ1PEPF000023DA.mail.protection.outlook.com (10.167.244.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.5 via Frontend Transport; Fri, 12 Jul 2024 10:49:23 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:49:16 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:49:14 -0700 From: Xueming Li To: Venkat Kumar Ande CC: Selwin Sebastian , dpdk stable Subject: patch 'net/axgbe: fix connection for SFP+ active cables' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:23 +0800 Message-ID: <20240712104528.308638-38-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: SJ1PEPF000023DA:EE_|IA0PR12MB7529:EE_ X-MS-Office365-Filtering-Correlation-Id: ab7b4836-4e0f-4813-d3ed-08dca2604a82 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?TTSYNK7un4tvCW3xqDGTBP7Armf9G8wFfz+ZWEMLQx0tWKOsN+wzwT2+gY86?= =?us-ascii?Q?2JJaWg1l7TTDiYC9ecl7vSFyD5aCPhbNwFBZuA123QZ3uc0Jdj0ykQ4ja2RG?= =?us-ascii?Q?byzQxPsusTMD/aTC7FyizP0CcJQJJ/MRRmHINTd4H8lKIVRM9Qn40hNaeVbr?= =?us-ascii?Q?FvVLDwm6f+lxVVOWQzU+b/KtvWXFdoTTETOPRRWp1iHufD+mZnZrk3aST7Nf?= =?us-ascii?Q?EkSNoLcdWRaS5zViR6+n2crQfQBT8DjbKZKAYPl6uAZQphvsaK9eVsycqz9k?= =?us-ascii?Q?+Fp8jyIXKhAElp8Ewhz0d0dYRw0wQt0fzTWFWOomqvN9axHFp40By7uLeq/A?= =?us-ascii?Q?Q/8vy630QVbixmpA6kC2jdNE4CISKZFaloev2yjmvDNVRec5O1FNOxKRjNy3?= =?us-ascii?Q?JhnDBE9RdmV/sZuTCzApHkK+O8VcLg8LxpbJphUW3K814zC2aFo93S9gLmMv?= =?us-ascii?Q?+rsZIZd8W3fZAxbYFvmvtHBpx8R/ddLUlFBjiRbwm4rFMiiCvGHCe8DmHcD6?= =?us-ascii?Q?SBuaVcb5TMpr51NchLOh4NlgoC5eIP7dtyAA7RkfcKDqVuvyyHbuvmmbq4/B?= =?us-ascii?Q?jLROsPjEwrpUyhwJR9C1lGBDayuaBn7+QKcly9ntD7plUQpG1Eu3m2GU97ZM?= =?us-ascii?Q?PfpH4HuXmO8zklckOMn4uJaDcIBa+yWNF/6f0OaVJd/lIAg2QJwKHf7rLf0F?= =?us-ascii?Q?HjWYbs/FKCUDG7JR5qWHMPvxwfuqg4rzutd613OzVDBrD0ma/oR9ellJlcos?= =?us-ascii?Q?H8fYhsxZVt2vhSPhiRiiBTY7frhUYUgYAsQ4Ly9ijZFaw0wSTs9ykfXqag//?= =?us-ascii?Q?FbI9Q9dLOTfnR2MNqTo05tPRMbq3syLwc26cNjetckjixpjSEHOXy5z4wosC?= =?us-ascii?Q?eYVZlkvQ7yQGAzf8gz6nxpzve/li/nxZ9d1LyHqY6uu88YysOqyivXHKtJMv?= =?us-ascii?Q?QqlUyXB6W/UJVfzF1WTCct2sHHfMnGXS3fAuPtc14HlQpeJ4hMFJOhhnW8z8?= =?us-ascii?Q?z6eBK3tUHU1CYpqjHyO33sYj72DWAovn28TVsXCbGPYcy2NJ42IT9mnsk74L?= =?us-ascii?Q?zMZIeI+iy3Ag2mGSDaq42FwWvednjfEGQK1Z9BougILnyKAOHPc/6LE3KF+2?= =?us-ascii?Q?GuS+DkxyG6N82uA7Ii/n+WqK/e+T5ECx6pLil3a+9/WE363fNczeP4N0/kEz?= =?us-ascii?Q?0gAN6LF47qTPK04wXSTzD4aVcLuNg1IAYbQtuR/MPIO3HSue5TCEQ0AbLPlL?= =?us-ascii?Q?jNRqiX+eSy+s+HIsNISoMhhhCAD38WzTfc8Plz11vDlOJ/oJ0PJ0W3IFzbW4?= =?us-ascii?Q?WCWrfwgHfm3RnnhnbS84+Y6LphB//5oCuTk0Tnseg9UBwKdN77EFdiHsoMie?= =?us-ascii?Q?bI4kp7s2L2dfg03VvLtTLxEEEn3BJqNFSf5feaWnWqWLf0GWxb5z+3GlDGjK?= =?us-ascii?Q?w6OsKYa7ZInYWL5h1dkYGM4PC+otpJap?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:49:23.0103 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ab7b4836-4e0f-4813-d3ed-08dca2604a82 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000023DA.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7529 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=3f5bcab86529a756114e428736e1d7f46e663698 Thanks. Xueming Li --- >From 3f5bcab86529a756114e428736e1d7f46e663698 Mon Sep 17 00:00:00 2001 From: Venkat Kumar Ande Date: Tue, 4 Jun 2024 17:41:41 +0530 Subject: [PATCH] net/axgbe: fix connection for SFP+ active cables Cc: Xueming Li [ upstream commit 4823ccdbbd887bb84339a4d35febd92292d07b97 ] 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") Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian --- 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 9aadbefaba..85b01bfa10 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) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:15.852245217 +0800 +++ 0037-net-axgbe-fix-connection-for-SFP-active-cables.patch 2024-07-12 18:40:14.016594238 +0800 @@ -1 +1 @@ -From 4823ccdbbd887bb84339a4d35febd92292d07b97 Mon Sep 17 00:00:00 2001 +From 3f5bcab86529a756114e428736e1d7f46e663698 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4823ccdbbd887bb84339a4d35febd92292d07b97 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 10196cae94..d9585a7404 100644 +index 9aadbefaba..85b01bfa10 100644