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 D702645E41 for ; Sat, 7 Dec 2024 09:06:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CED9B40281; Sat, 7 Dec 2024 09:06:48 +0100 (CET) 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 8921240281 for ; Sat, 7 Dec 2024 09:06:47 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SNiFfyZ84CNsp3oEQAenk0M/W18LrPhbh+/UUlY6GAw4JNWd5tWw5I82dUlV9Bfi3QzPcbE017EfUqfZrqxC53sJ9dVbz4gecGRQnvmoL35nHvj9MIaf4dkRlFR503+tDzb00r+fq6+zLgs42ciLJNqa8nKR1UrNm6CG6vHxgsBLJ1PUS+1NBBuw0jSgIFlvLhYk4JDtqmoqzMHW8ir8r5EkfJ5HoTWCfq9xnc2px3NToMrSGrKqTWL8G3uO9uc2feBUjZ6HmNlEskcrW7nBt3FrEJWrH+EPuXUKaFLtxIYLkpP3y9tRkMa4uu1bb4q2cTxwVgJv6tMwGURT+YcZDw== 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=CL+FubrWXy/w1amBOwCAWAiwSrry2SgQK5WZfHMw31A=; b=C/Kfuez4r8bRePthuZa8k3K536XSXVbL/w/eDzPVj+NYlncsABdHo1Qm74radFNjK53oNhM5ucZ3v6/5cZDQOSGgKgAUv21RhV1e+5KkS1SqXgW8wIFlsX7JxR+VHTnTSywj4b2S0ESpC7S6bg7F9/vTT7Xe9QV0Ts9QzH56AKEo0/gogvD4WrQgxgseDJqFE4DgHQEe+Zt9UP54KFJ7eeoHnekGJrlkDWumeDwX4RoE36HJ7VWtWt816xKWW+qdSC9Z4QfnhmDWWZyExtR2T+Ee9Y0oc/WjvzeGffBZKb6ly05JTymD7m+eW8bmEHth9RQXE5N9mrB+6Og/gkeffw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=graphiant.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=CL+FubrWXy/w1amBOwCAWAiwSrry2SgQK5WZfHMw31A=; b=Knd7vHGo+pb2LTEdRLsrQhCXN6DuaWuQhGkZMtLdEGhbMfN0cgi7QjjwolE6w1EcPlSYMC7HPrihmWMPU/HUuGXfgrbFJZ0UMyu90rcNJ82lULjjW6+xAXDZ0V9FiKO9uc2tcQQjDGdN4Sluu3r2tr5nHxzVIVcfi3MJTyNUdhN1fPuLFM83OHOED0PK5le18aapPCbVkmK+uAU+mL/cfUYOu8oGd5kfyCwcvNYoSvXGg/5qE9FQ1Ce/G/MB9EF2s+F16efHVdPK68upjFihs1EK/vV10/ftpK7R3WsY3D++3T1WmBE+Qyjx7qeLHbPZOumDzJzz7bxZ81OirdDO/A== Received: from MN2PR08CA0019.namprd08.prod.outlook.com (2603:10b6:208:239::24) by SJ0PR12MB6712.namprd12.prod.outlook.com (2603:10b6:a03:44e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.12; Sat, 7 Dec 2024 08:06:43 +0000 Received: from BL02EPF00021F6F.namprd02.prod.outlook.com (2603:10b6:208:239:cafe::ec) by MN2PR08CA0019.outlook.office365.com (2603:10b6:208:239::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8207.17 via Frontend Transport; Sat, 7 Dec 2024 08:06:43 +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 BL02EPF00021F6F.mail.protection.outlook.com (10.167.249.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Sat, 7 Dec 2024 08:06:42 +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; Sat, 7 Dec 2024 00:06:29 -0800 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; Sat, 7 Dec 2024 00:06:27 -0800 From: Xueming Li To: Peter Morrow CC: Xueming Li , Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix reading SFF-8436 SFP EEPROMs' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 16:00:13 +0800 Message-ID: <20241207080055.488538-56-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241207080055.488538-1-xuemingl@nvidia.com> References: <20241111062847.216344-122-xuemingl@nvidia.com> <20241207080055.488538-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF00021F6F:EE_|SJ0PR12MB6712:EE_ X-MS-Office365-Filtering-Correlation-Id: dc699927-a676-45e1-f9f7-08dd16961633 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|1800799024|36860700013|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?MQ4SMdzJGVSUYjh34+UMQbXFmNtku8O89GPjb2z39zjrWS6P1oksyy845OjQ?= =?us-ascii?Q?URKP9Rs4OKfieoeq+8igz8cWxuyB7TxZ08miTJ78E4B4wFUB05NATId1nm2/?= =?us-ascii?Q?eq/H8Woz7EDgcTMn+d+rFPb0846bxs5y60lJGb9XW9RSLYONWcK+/k3bWSOM?= =?us-ascii?Q?iM/4QwZ1feKJZmuBDPaORaqTOvZLpUmqUtQUxxRZsSm0x1yUncHO0sB8I9iH?= =?us-ascii?Q?LR8l5F7UXEPzBMN5NSH1KJ7WGChhCLOclTGzB+Rg0OupO42Azuhz+OJ6ZHZn?= =?us-ascii?Q?IjYs9Cv2vDfrPhAJKyb9XMd4WZyvYD1V09lM+vTTkG1D6IsOc3hGWm5Lq5yR?= =?us-ascii?Q?1gLXftOOflJgsNMQ66tHyicXeAlN/TaQIps0b48A7wyN/klgZy2qD1YveHr/?= =?us-ascii?Q?tN4hQ4JvRc+XCRdAeMqWuUwqmRvjJwr11+EruEehnkO4zjMu+k/uPLlkZq/d?= =?us-ascii?Q?JMQdrKVWbc0UXC1BI/GjCmJcISJUpDEzHEDLhcHWrXTiyKH8kIwx5hk/EV10?= =?us-ascii?Q?INSX0QRyvhz2MalEUKg7FSZCJErbg6Tg1MeV41EcPP8fIeG9tyPfuGINktBF?= =?us-ascii?Q?NlXzu53rboPshftB6fO+ZLuxKJZfOTfPertqXjmcTzSVEYHOUTer9bQDbeq+?= =?us-ascii?Q?sA2wTVkLP5pimcH+6ay41vDIu7NJMHdMvsqvpSdeICB7K1EmbVT1XTPrJBYV?= =?us-ascii?Q?N/jTqs5TlMbh1kgKxxJ5pifoBrhOIdx43PmBOOJLoXpjYfbUEAK0nQR1Dtbh?= =?us-ascii?Q?3YOdADAVVOiVviY+PJXo3hBIpY/pDcvc2cfihfnyHDAGet7R+wEoZn4KE3iF?= =?us-ascii?Q?mt5TSqCnqXxxg1HflnU7Za3wL7LaFeovLDiGWz4dkIWIA0LVtSc5oI80KN8j?= =?us-ascii?Q?q7M2edG3x3Jj26MZNrmNqLrQ7u4jtWj5BW08pLHbGueX/31X6cN1KtqHHHXq?= =?us-ascii?Q?gzVVu/LTuDBEzI9NFzjS8/QIC5yqll86IHXDQ4r+pIIy/6aFP4FmjfF90FFT?= =?us-ascii?Q?MM/zvhUNrkCBO92xRSoNn8PtUUCXAEzNeNGvk5zcWwY+TWnZaC7jd9W5xZeS?= =?us-ascii?Q?pNHXm1tO8rO/SyyOdBA6arn4Naqqq3mRi/fT/b/66DCcpXNUj7FlTmLmXO9f?= =?us-ascii?Q?BheYWMWlPuN4Cs336xiQ3mvugGqmlYOjP1Q0jiUVNgWfujFb6lc6PJyNU765?= =?us-ascii?Q?/r9A66m+w6G4K+b2ZMkD+ttqNmsGzShJ7KyfxOqtYxVmRtOc+d7hC8LrNxhI?= =?us-ascii?Q?FqomeQNoyK/JbWPgIRj1jTqKtGsbKA5ey+sIGYe1gHhLvWbzF9DnWy8wDVUJ?= =?us-ascii?Q?SqJ6dE6YOWUTIt3sljdmfnpORPO/ED50/8iwpGHK630JCQyY9ZKLHQROX9vF?= =?us-ascii?Q?Yn/u18f8aVl6VYZh2qqABUYGuva7lniwp0AMDdvQVALqgiJlenuFLnBHptB7?= =?us-ascii?Q?nkDLDzdzH1Oe754aA7AJhK/jRGlH+AwO?= 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)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:06:42.7857 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dc699927-a676-45e1-f9f7-08dd16961633 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: BL02EPF00021F6F.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB6712 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/10/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=09537001bacc6acc7586e85df022e49dc172d358 Thanks. Xueming Li --- >From 09537001bacc6acc7586e85df022e49dc172d358 Mon Sep 17 00:00:00 2001 From: Peter Morrow Date: Mon, 12 Aug 2024 11:34:05 +0100 Subject: [PATCH] net/bnxt: fix reading SFF-8436 SFP EEPROMs Cc: Xueming Li [ upstream commit 7b8400464f14637ed2669dbf732c256bf2447de6 ] If a SFP which supports SFF-8436 is present then currently the DDM information present in the eeprom is not read. Furthermore bnxt_get_module_eeprom() will return -EINVAL for these eeproms since the length of these eeproms is 512 bytes but we are only ever selecting 2 pages (256 bytes) to read. Fixes: 6253a23491a4 ("net/bnxt: dump SFP module info") Signed-off-by: Peter Morrow Reviewed-by: Ajit Khaparde --- .mailmap | 1 + drivers/net/bnxt/bnxt_ethdev.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 67ff5b21c6..ff5b0821ba 100644 --- a/.mailmap +++ b/.mailmap @@ -1123,6 +1123,7 @@ Peng Yu Peng Zhang Pengzhen Liu Peter Mccarthy +Peter Morrow Peter Nilsson Peter Spreadborough Petr Houska diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 0fc561d258..988895a065 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -4006,7 +4006,6 @@ static int bnxt_get_module_eeprom(struct rte_eth_dev *dev, switch (module_info[0]) { case SFF_MODULE_ID_SFP: - module_info[SFF_DIAG_SUPPORT_OFFSET] = 0; if (module_info[SFF_DIAG_SUPPORT_OFFSET]) { pg_addr[2] = I2C_DEV_ADDR_A2; pg_addr[3] = I2C_DEV_ADDR_A2; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-12-06 23:26:45.917753406 +0800 +++ 0055-net-bnxt-fix-reading-SFF-8436-SFP-EEPROMs.patch 2024-12-06 23:26:43.963044828 +0800 @@ -1 +1 @@ -From 7b8400464f14637ed2669dbf732c256bf2447de6 Mon Sep 17 00:00:00 2001 +From 09537001bacc6acc7586e85df022e49dc172d358 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7b8400464f14637ed2669dbf732c256bf2447de6 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index f293f89167..5a8ec89d47 100644 +index 67ff5b21c6..ff5b0821ba 100644 @@ -27 +29 @@ -@@ -1179,6 +1179,7 @@ Peng Yu +@@ -1123,6 +1123,7 @@ Peng Yu @@ -36 +38 @@ -index 2f5c055086..5edb162430 100644 +index 0fc561d258..988895a065 100644 @@ -39 +41 @@ -@@ -4222,7 +4222,6 @@ static int bnxt_get_module_eeprom(struct rte_eth_dev *dev, +@@ -4006,7 +4006,6 @@ static int bnxt_get_module_eeprom(struct rte_eth_dev *dev,