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 73E0145610 for ; Fri, 12 Jul 2024 12:49:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 69FD4402E5; Fri, 12 Jul 2024 12:49:30 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2077.outbound.protection.outlook.com [40.107.94.77]) by mails.dpdk.org (Postfix) with ESMTP id D6DAA40261 for ; Fri, 12 Jul 2024 12:49:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IO1aE+sGA+qraJHX/3L7NMFvrdQmlMpdVVDgnmhRYpc0LACHDq2QM/e66FBthGDSiA6LjVpnYWeFQiDNOXXj25QOhGjmYr1bfvyYhE7ihX85WUJb3DHj/nw9jFtXCFnEe4XGl7fm2d0IXusduaOfz4f8X4iXCbJfdZBIBSKOh1Cd+ObRdhKHKsy1Xz5VN5DBPk84ZttfAHaPviYUldvnDU+WkVULtZqWXJLY2VPMcl5RAplNu2EkBy3pJ74lF7kudU2SMSh/ovsZ0xw1zPfO4LbLtIOzppsVqnhXRbsh74KaDzLddWrKcHpFl8l5V6u9VO+jlX3iFY2vc9vASfBzZw== 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=f/Sm78xI2Ak9V5oG/5rRvBTBwFLTbMnk7Hq5xksdqGw=; b=azTsr/Y2VHpr+Ql0BoXhjzW7HnpNrx/EGz27d6DGQX5Vi39kNlEBQgHU+ByKINLCX5dOEGmxY5bNM9CHKzGzCdWuTLs94mvnbm44cNriv5K6kVQxWW+moNTVMbcOIQUDJESB9cRsFSFayRsMZwBB0VF9/+QBbS8ELKZTun9XuFywYdNOT/mESEjhv1jpPQAZf7TY2cUcMcoH/bEl4aPrffFK3F5/7NdQ22EtK9oMXIQ3BpDGTBC/HH50OplqsWFCfgAxo7eVp7apASDBDrqlBiMhr4kZhLRh5WSd3ZOeQm1RXKo/JFVzi8eZM6Wze8S2hRlYDz7OQRhIpr7NlFzX3A== 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=f/Sm78xI2Ak9V5oG/5rRvBTBwFLTbMnk7Hq5xksdqGw=; b=ml6Phb1R38lkEdcn1odwkgxPlHPR2NgCEQ89uTNmRJl/QSqc2WwlewlGb9PbfHPn28lyQU2DSC+RT/AmoIVCAolrYNWZta2Jj4+Akd64qNP1Cs7jf6c4/yoT2OLFjkLHW8a84KVSGuOITt26M3FvcOeVF5wg0n8oH+XzFAO1Ee/NB9ZMq8FABx+9SXiyC3T1WhKT5h3CUo+17Q7a06NtX6hxegUqSFkd2Wgu4KcO9ps257ePZH8Jwk1ZU69ASchik3H+KwUlvygiTLY9XJvaAxSNCPlwtEbXIXRV5DvnqNC81ZcvDWWxsnSsLSXB62TnzSh37x58W+XYILUJs/Ls1A== Received: from DM6PR21CA0024.namprd21.prod.outlook.com (2603:10b6:5:174::34) by SN7PR12MB7372.namprd12.prod.outlook.com (2603:10b6:806:29b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Fri, 12 Jul 2024 10:49:25 +0000 Received: from DS1PEPF0001709C.namprd05.prod.outlook.com (2603:10b6:5:174:cafe::54) by DM6PR21CA0024.outlook.office365.com (2603:10b6:5:174::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.8 via Frontend Transport; Fri, 12 Jul 2024 10:49:25 +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 DS1PEPF0001709C.mail.protection.outlook.com (10.167.18.106) 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:49:25 +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:49:14 -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:12 -0700 From: Xueming Li To: Venkat Kumar Ande CC: Selwin Sebastian , dpdk stable Subject: patch 'net/axgbe: fix SFP codes check for DAC cables' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:22 +0800 Message-ID: <20240712104528.308638-37-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: DS1PEPF0001709C:EE_|SN7PR12MB7372:EE_ X-MS-Office365-Filtering-Correlation-Id: dbd95f1a-0bb6-44f6-3cb3-08dca2604bc6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?qDhgr3R/ZEvyom316xr5v1X04IxTPylej0bfN1LoZrPKZpze7cabJL4lL88K?= =?us-ascii?Q?L2cnjY2slNXMaMf9eCjnThU+aCzlK0tMcuQ93J/KcwLyjM7rFjNg2FyqniaV?= =?us-ascii?Q?sbTKzAyJmqeay93WXXKQFa19NtEtNM8Lx8poMvxLI4sDamIH/wocfGrgS0vp?= =?us-ascii?Q?8lPYCDB+bk3S1ubCCEvSD4DQjMq7osTpCXKhAc25gxTjl8PEGeNNDWaQitKi?= =?us-ascii?Q?oI14WQHlA7e2wMdTWRYfGfA+2Ple3HEbQ65OI7XoRtozd4ag7EvPO1fIcNdO?= =?us-ascii?Q?j7FM+IcV+7ZO2luDYiGQ1YRgbFKiEjyRDw4LYJODBHP8GspRZpxly1tQ867T?= =?us-ascii?Q?3Bmbky2+XTpQlT6sq0zWnJ4sCzb55wWpBpe3RpHabqu3ypHM039O9NWvJJD3?= =?us-ascii?Q?1hnngg+jbuGUVUSSBCGpi4pl1XV0cgY8GvBbUOZ473zdrR5hYQZRz+JlYVCS?= =?us-ascii?Q?vvO/BirjjdIcheXLdV98FKekutmVefY0z/Y4HhplbT7+zMpQjearts1n9M83?= =?us-ascii?Q?J6BNEqfxoTn8Yco2m1CPpRLW6Go7rbCTmSWSCbWCI3TVK05ijFFLynW8Bs/P?= =?us-ascii?Q?Hw3TBYlnyZ4PPgJxGZPZMuDkdaN78aY6sKDKjld1F1yrXqHmJRUmCSpxXph3?= =?us-ascii?Q?4ly+8lEMkOcUc7D3MwdZkEWzw4CaXvePpcXlWLxG+WzjG4A9U+D+x90/Pv5Z?= =?us-ascii?Q?eZwEtOTddMqC3LnIu8uoVnUQ6SHvDJn3NosK1/4JDh4N8djCXSpIXidS+3JX?= =?us-ascii?Q?odNINO5XPBiGD8p3QPwNYFl1Y3ihofP0rCH3SXYMX874+gLwW8N5afvRE5aR?= =?us-ascii?Q?ZmYJ86nl3PytiCPcEvIG0NIb27Nd3jccBWD0iPv480QXfUFYa645E34pvOqQ?= =?us-ascii?Q?M1m7/ppcXtXp/QG4mhJl1nwwJY1+XBECrhA7wRl9Ez3riuOP7KViWhv8ZT5m?= =?us-ascii?Q?pneXmhPwxmW+YSkwhMkaZDUmlNrLQ6nG8Va1ackyre9RyUf9WIjZbaG9HX4w?= =?us-ascii?Q?sDScqv0Z/NAZjp7NcXLw7coJaFaH7VelrRktyQtk76iQjrkSqVd2rI/RmvrB?= =?us-ascii?Q?Tc/AP/9h/PIc+TfBn7f3qDzit7OHuI+bQsQTv8p0FjDbp4dM5uac9CGZfS6V?= =?us-ascii?Q?JfI5BB8FJgKLyoy3x7YY+3Qhgi2LVZhyK4Q3C/0s+5TsnV2kINaqcU5R9jp4?= =?us-ascii?Q?M/3BOrB/eUftA4F1Uz18P/CVU7fJ/M03iSkBfGOvVv6tTnEpZj+G3eNE08qp?= =?us-ascii?Q?vHp33k/SM8G8xLpJAzn6rSYiqTnb+C7hCRnNFsosY+NYMM7GiH6XkxsjHnAa?= =?us-ascii?Q?TIe40RFoQFN8tF8xduXyhnbjKQsTkIgbGd8HKhRHBphP+/B4TkQ4z1SVt7nj?= =?us-ascii?Q?A+do0aZXyR5+yzn02zBiTqkc66KeV8H9Q/1mX4euHFE85cVz3lAirBsz26XG?= =?us-ascii?Q?Zqrdw5CgVbXlSKPvH5oQ1WjPViXDzRgz?= 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)(1800799024)(36860700013)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:49:25.0048 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dbd95f1a-0bb6-44f6-3cb3-08dca2604bc6 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: DS1PEPF0001709C.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7372 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=f8e2f1ea54dbc4020f462170622743c8f7369899 Thanks. Xueming Li --- >From f8e2f1ea54dbc4020f462170622743c8f7369899 Mon Sep 17 00:00:00 2001 From: Venkat Kumar Ande Date: Tue, 4 Jun 2024 17:41:40 +0530 Subject: [PATCH] net/axgbe: fix SFP codes check for DAC cables Cc: Xueming Li [ upstream commit 4eefb1b16acaa69bd757057e0c54c58f11577ba3 ] 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") Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian --- 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 040176b8ef..9aadbefaba 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: -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:15.809256223 +0800 +++ 0036-net-axgbe-fix-SFP-codes-check-for-DAC-cables.patch 2024-07-12 18:40:14.006594239 +0800 @@ -1 +1 @@ -From 4eefb1b16acaa69bd757057e0c54c58f11577ba3 Mon Sep 17 00:00:00 2001 +From f8e2f1ea54dbc4020f462170622743c8f7369899 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4eefb1b16acaa69bd757057e0c54c58f11577ba3 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index bcefbf28f2..10196cae94 100644 +index 040176b8ef..9aadbefaba 100644