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 252D645610 for ; Fri, 12 Jul 2024 12:52:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1F04D402E5; Fri, 12 Jul 2024 12:52:48 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2072.outbound.protection.outlook.com [40.107.223.72]) by mails.dpdk.org (Postfix) with ESMTP id 8E8B340261 for ; Fri, 12 Jul 2024 12:52:46 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PEicrsSpxPPpsVZiwdPRhqpVcwxXqs2QD5SfqxUMSTvDDEHThZP694suChp8bmtbV2R6sKDGKCO8Dh63gzTAqiqJB6BtLtTFvzr9jonQv6sv7wbWIFLumYZA8W+B7lOVf+0LxxAbXpC6yadn6jKx1NcW1FgOzLUkAmlLoEVTYvnpLPgyZUuYpUklUc6ZepOcsUAFxmJcU05CpHnFrwgSdriT5ZZu3J5vVVEqozoPBDs8SmF+tJd3oSWy5qnmUOHYtaLAMjR1wvZDNAs+WxgHDYuaCRvjCg3DhkIKSyVJNHKzBuspbAjC+I6IGZmTw45Lgjoujfu0rhgtVGPUmbSKmw== 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=ukEbX5yHa5pOPrlAwkD6a84rNiJkyXkAOAtjZWq7u9A=; b=uh6Ryn8lzaKieQczkQo+9dSHXCEtuQ7o0GgyRlgNiB7u/paMtn5w63mSDKT8aL6vyRr9wp5BfdZ82btQwcO4oC2VpbT6Pfxt6mKToriCLnuW1IBDZ6zc9VQYZaRRGyuyYrFM0HeZs7KNToE8iP3tS8YbQ0OvrRqN1khSx9qaWpVsi//5fyv5LtNZysCeHwKlkrxLIyXvBT9ZJajobg2R9ezv3w8peUBErlbdnvJAJmbBAyDuPMLhkMTbH3Jwe3weKpNGCJw/NUfAUJizHnocGaklglkL80TE7cADS0XlP+jJRTqhxF3QXkHCv152aYnpo4y8ZiUhef8bYlq2sz/reg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.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=ukEbX5yHa5pOPrlAwkD6a84rNiJkyXkAOAtjZWq7u9A=; b=E/RuJ2GTXtR/fzJLbErG5hN0lqZ1YQPiFKe8CKlxoxG2f0BRTKDgclFeEdY5f79JsTGUoTmvkIBzuMmNKN6KsQ0FU2JdnY6A4Z7BOwg44ooskeictec8glNqecenAdhg3/0K2jrxtM9TAAMjUDrRkhOuhS7oXhmAwdOg0ydvP+svHokiH1CmDoNJ5GEOsjOJRqd0zve+IRBNGZtJuJSB+HG1SKQtPYpG1luaDCTblc8HoD577MP50VCk+b6m4T6y9U5wKr0J3f9kE+/+EBuMgSJCyU2vm3Wp1tCsJ3p8UX52Sowz0iwVA3rDfXzqR9l0S5HlugOjHShxJExaZO5Niw== Received: from SJ0PR05CA0093.namprd05.prod.outlook.com (2603:10b6:a03:334::8) by DM6PR12MB4138.namprd12.prod.outlook.com (2603:10b6:5:220::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23; Fri, 12 Jul 2024 10:52:43 +0000 Received: from SJ5PEPF000001D2.namprd05.prod.outlook.com (2603:10b6:a03:334:cafe::4e) by SJ0PR05CA0093.outlook.office365.com (2603:10b6:a03:334::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.20 via Frontend Transport; Fri, 12 Jul 2024 10:52: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 SJ5PEPF000001D2.mail.protection.outlook.com (10.167.242.54) 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:52:43 +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:52:31 -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:52:29 -0700 From: Xueming Li To: Radoslaw Tyl CC: Piotr Skajewski , Alice Michael , dpdk stable Subject: patch 'net/ixgbe/base: fix PHY ID for X550' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:54 +0800 Message-ID: <20240712104528.308638-69-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: SJ5PEPF000001D2:EE_|DM6PR12MB4138:EE_ X-MS-Office365-Filtering-Correlation-Id: 69ee1016-0505-46fc-3cc4-08dca260c1ba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?adL0tjDL30YQP5wKzhSF8+u5R5/MPJP6AoPSeoA7JJfq8gnA3rTLfh8eNBiJ?= =?us-ascii?Q?CIiML2k6LTfV95+PFH5OzMKJvexirHSQcfg8Y7f2moHsvWTyTfCTgE5W4Lda?= =?us-ascii?Q?o90ptJQxvp3cIMjCfrTtiih2SH3SeLrL2l/5iO3Tq8lDQCsk7YCH8LLha9rg?= =?us-ascii?Q?oGwqgxtUxG/qXOgYaVO3ULJXiY3llMVgMlEYafkAELJb0t35eNPCuIOPnNwh?= =?us-ascii?Q?8qTZ3lGimQbdwI8O1O/zMCd3TPDopEFgf5K3zly5MCoL5+a8F2lLIa6sxnae?= =?us-ascii?Q?D0++/6UCk6iL2Bpz23OnBM6n41WvA8Khsu3743HH9i2UUd85nshj7/r8x39c?= =?us-ascii?Q?4fNNXYNZKIyPodxTHK7e6v5LAakBt2f4orrzTAefif84xQiWHUlDvKR5FFH4?= =?us-ascii?Q?D5Fr0V0JwG/7HaF5VkusmoEjPCwmTpXa6fqOBV6GrpgG/pxgGVNh9jM1G6Ys?= =?us-ascii?Q?oFlQh/YKJrDIGXeSiDc4jURwgX3uSviQ4xnI5fGzkMKxbBqfhV1DMdWRsIuV?= =?us-ascii?Q?xkx66S07z5hjnYK5lE1jKDwAPgODzLp/EzWqzju+tyEzxODQNZGwWsEDimI7?= =?us-ascii?Q?w/hdaNgtroCfuG5ST9pFmjinofcTPIakF7Go/acSmSNlkdcEooGm3wLh+UHQ?= =?us-ascii?Q?AgCf74XBxo/abgXYOw7ShFDuAnbHOsZetjT24QdieuPe1uCjL8pyq2zjpGcP?= =?us-ascii?Q?OeoBhHCxJ92iiqO8G1Y8la/K8vQv4gpFmXKMV+jBkjtvGoygezGI3EC4DUyG?= =?us-ascii?Q?wfM/tORWxXbj+SOWAn5EISEySNrwCyflS+NiVQ7t+h+xunMtGOAZLYtWlCLl?= =?us-ascii?Q?fVb+rE3jEQO27cb+SNLHraC29bSLgki9rZi712Xzkr1afrmGzv19gf3GWiLd?= =?us-ascii?Q?AsfKoLA+fShZFKSR66HhFnWgVYpj+j3XJq87+QQQhEYDaY33W90oGSomAStF?= =?us-ascii?Q?XBe/5Xy9OhrXTHHEimMmstA8rbd9Gw/FK78CMvmGarLGe5+gfv6BlMN0Gqzz?= =?us-ascii?Q?5zu9rGo2fs3ReeO793X+1+FLT7cWM6UZISMghCyy7J7QAS/4BWjYe+/womXn?= =?us-ascii?Q?Ls/B9//i/OjLpsO9UiLn8RcxmYrRF/W62m3nm7yWZ8aCrSfE4H4cE77NkbyN?= =?us-ascii?Q?HA7QTeC/lGf/7vAk3IIKNmcpBReYBrFAFmheGgWwyN8eVVJj4UFOmNtx6jvh?= =?us-ascii?Q?OFg+zd5Q9+OpVxhAF9S8/oReF+xwCB2ZBHS6qSL7C3yKcL9aWOM0wWyPDZgH?= =?us-ascii?Q?GSel37KdrDRCe/WaEqdhZRjzN0C0HglHidducjx5AHd9YebQDu1FaAkrgGbP?= =?us-ascii?Q?kUNucg08T+qq94/ZBuCTaxYvuFx98teRKxN479uZw1z+w1srSoWLit9Fx8XW?= =?us-ascii?Q?9ML2acLTy9JWPdja2OTzaZJn5NyV1Obhxgcob/ujGcujpZyf/eZorZnPb+9k?= =?us-ascii?Q?KQbVX4bfJ/A2dtqXbmvZV3hVKZ2CqU4g?= 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)(1800799024)(36860700013)(82310400026)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:52:43.0379 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 69ee1016-0505-46fc-3cc4-08dca260c1ba 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: SJ5PEPF000001D2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4138 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=6b47aa312c0d274f8bcb0fd1d7a684354b86bb8b Thanks. Xueming Li --- >From 6b47aa312c0d274f8bcb0fd1d7a684354b86bb8b Mon Sep 17 00:00:00 2001 From: Radoslaw Tyl Date: Thu, 30 May 2024 12:13:36 +0100 Subject: [PATCH] net/ixgbe/base: fix PHY ID for X550 Cc: Xueming Li [ upstream commit a9f5a3bd4c179e54b5ca95b0ce191bf4f33d2add ] Function ixgbe_get_phy_type_from_id() for X550_PHY_ID2 and X550_PHY_ID3 always return ixgbe_phy_unknown instead of ixgbe_phy_aq because phy ID's last 4 bits are always masked, and should not be taken into account when selecting phy type. This patch adds default PHY ID for X550 devices with mask on last 4 bits (0xFFFFFFF0), and fixes the switch statement to use it. Fixes: 58ddc803e412 ("ixgbe/base: add new X550 PHY ids") Signed-off-by: Radoslaw Tyl Reviewed-by: Piotr Skajewski Reviewed-by: Alice Michael --- drivers/net/ixgbe/base/ixgbe_phy.c | 3 +-- drivers/net/ixgbe/base/ixgbe_type.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c b/drivers/net/ixgbe/base/ixgbe_phy.c index 3a8e603472..56267bb00d 100644 --- a/drivers/net/ixgbe/base/ixgbe_phy.c +++ b/drivers/net/ixgbe/base/ixgbe_phy.c @@ -432,8 +432,7 @@ enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id) case TN1010_PHY_ID: phy_type = ixgbe_phy_tn; break; - case X550_PHY_ID2: - case X550_PHY_ID3: + case X550_PHY_ID: case X540_PHY_ID: phy_type = ixgbe_phy_aq; break; diff --git a/drivers/net/ixgbe/base/ixgbe_type.h b/drivers/net/ixgbe/base/ixgbe_type.h index 35212a561b..f709681df2 100644 --- a/drivers/net/ixgbe/base/ixgbe_type.h +++ b/drivers/net/ixgbe/base/ixgbe_type.h @@ -1664,6 +1664,7 @@ struct ixgbe_dmac_config { #define TN1010_PHY_ID 0x00A19410 #define TNX_FW_REV 0xB #define X540_PHY_ID 0x01540200 +#define X550_PHY_ID 0x01540220 #define X550_PHY_ID2 0x01540223 #define X550_PHY_ID3 0x01540221 #define X557_PHY_ID 0x01540240 -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:17.236970551 +0800 +++ 0068-net-ixgbe-base-fix-PHY-ID-for-X550.patch 2024-07-12 18:40:14.176594219 +0800 @@ -1 +1 @@ -From a9f5a3bd4c179e54b5ca95b0ce191bf4f33d2add Mon Sep 17 00:00:00 2001 +From 6b47aa312c0d274f8bcb0fd1d7a684354b86bb8b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a9f5a3bd4c179e54b5ca95b0ce191bf4f33d2add ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org