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 CF66B45610 for ; Fri, 12 Jul 2024 12:52:43 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C7598402E5; Fri, 12 Jul 2024 12:52:43 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2079.outbound.protection.outlook.com [40.107.102.79]) by mails.dpdk.org (Postfix) with ESMTP id 2ECF240261 for ; Fri, 12 Jul 2024 12:52:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=INiIKqTKLPxhUj7y+UQPhTTySE1n2xmqCSgH8XQ52ZHOU2+Qld/ByO6O52pnp70NjdSxP2JTuH93jTUi3Rfg1h0i6saepoTwJeZ9txy8FRXChzR+wl+zY/ruD/6BYC4xQ7PeZpLAu/MxK+KOAt4CvWP0+uy0Gyxr5ha3izSWRO3+VFOj5HW9W9oi0Po50zn+2ZRLKO0QFUe2cvdx95FDUOt5J+meae1dVdQkSu30+ApCVs03vm/Wv2PMhC9OPC5BCLUe6LCllVvWnKWr6vPlqA8OA6VfKTMbe1NYLJYTIAcpjljtKvxg7oqToEF1uv5/I4e64xgg/cQAjkqPhNSpnw== 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=enEaQqEJniaoWDXOTGRJYA2HTolP021WWjT6Y3mNyrg=; b=gQkz3iXpdZukPHriYPDF03KKHuBvqj9Eg2lIMF5UiN1cYaxv92ggm/OrXCwNWSCvkdpWtbMy7Ldbln0HCpkU+wobFS5xuO5MuOiyAet7yzPhBqT2bdYqkzEAckxEWGV1egqDxA4FmEayIMpylTUZyN2JHSRtLX2GX59YK37gHSlSA8kYwXp9JM9xqJNgk1f3xe9pYIrcPNruywQG0uLpDwaG9Nu3YmuP4aZgV+FamVoOheqyiYuAPAZwquqNqy6PlvxBi/2glox6cSnaRNKb+ZRh0vb83ty6m9aoxkIK+x/o3xuZFZM9Y8iibwBemsourEGMWVRz0zJKTzPkulgjgQ== 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=enEaQqEJniaoWDXOTGRJYA2HTolP021WWjT6Y3mNyrg=; b=pptc1Ac4S6hj6nIIX+sRoI4ku7H0NiviD51yhNkGYy2bdVgCnfiM1WfMMhaBQ5fnr383ZBrUhKnp0NSBncQ1wQtX7bq/OhPuVanxmpaYR5wMEbn1GWHIl0LUG1RDlPFs67yGkgKYnG5v9A5UqW+nQ6IedRxeDGJP//L4qURDA2S5ByWJU2QcFhcR1QMzg9Ms70Vo+wHxhhVzZA3OmK9QqTdwM7X5AEv6WzkstagXUxx84UELAOSczqrMfbVtdNCa0etw34KB6Qy8SsERC9/k+MlHDrohvKs0Djbp7/QRMdZW3YXOZvrmuNX10280NH9aGmEOrwwtNJnJSmu9oocraw== Received: from PH7PR13CA0001.namprd13.prod.outlook.com (2603:10b6:510:174::7) by IA1PR12MB6410.namprd12.prod.outlook.com (2603:10b6:208:38a::21) 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:52:35 +0000 Received: from SJ5PEPF000001D5.namprd05.prod.outlook.com (2603:10b6:510:174:cafe::60) by PH7PR13CA0001.outlook.office365.com (2603:10b6:510:174::7) 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:52:35 +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 SJ5PEPF000001D5.mail.protection.outlook.com (10.167.242.57) 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:35 +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:26 -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:23 -0700 From: Xueming Li To: Piotr Pietruszewski CC: Piotr Skajewski , Marek Mical , Jeff Kirsher , "Alice Michael" , dpdk stable Subject: patch 'net/ixgbe/base: revert advertising for X550 2.5G/5G' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:52 +0800 Message-ID: <20240712104528.308638-67-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-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit 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: SJ5PEPF000001D5:EE_|IA1PR12MB6410:EE_ X-MS-Office365-Filtering-Correlation-Id: 1a52148f-47ae-4df5-e2c0-08dca260bd2d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?B?bkZ1UUh3dzUxT09ucUw2UFp1T1JaYmZpZ0hyOFRpNGdGaGR5L3lDaFRtZzJl?= =?utf-8?B?Qkk2M1FBS3FTak9IV1JHZlN5TWxob0xQbWYyQ1Q4QlNJeTB1OGdISWFwWUdh?= =?utf-8?B?NHc2QnZNZTRZSk9GMWNpRGZmRDZ2dDRpQi9WakUzOVdDN2IrMFg1anRNcElJ?= =?utf-8?B?aVdJYTVzcFFNdmpsbkZQOFZyVUFNdWM1YVV1UTNQNTZ3NnRJQSsrNndYYlR3?= =?utf-8?B?emtrcmtoZ2d0MklBSTAzTjl3QXhXUjltZHY4TDhtSDQ5RWdpNTgrRy9oVTRM?= =?utf-8?B?bExOY24ybTB1UFRxNjRnaWJ2c2k2QVZyQnozWU9zeFVaVDdydm50a0JLRmg0?= =?utf-8?B?T0REMVZNWHNIY01VTzhaTUt4aDlJZnJFVmtHQjd5aDhPeDF4YzFkeTdpL0RM?= =?utf-8?B?M1RjL0ljTWRtcDVtajUyeEtOVXZZSUIvNXYvNlRzUzNONzZTNkozdmd3b2Zp?= =?utf-8?B?cGlJQmF5OTZRa0NPRG8wRVE5a2hPbEVqN3Q4TnlFV1kvdGxVMW1nTCszZUZp?= =?utf-8?B?Z2VqRGdvZklzc2pHOHhDM1ZxemJnZHB3Z3lDTWtISENCMzNydXlST0ZFeEE1?= =?utf-8?B?UFd4U3VJRk42R0xhVmJUTHZhcEViM2VlelFIbHVrSEZ4QVlxUnQ5VWVoWkZR?= =?utf-8?B?OG51T0F3bUdEMk0yZU00VEszUWN1RXJCdVZNdzcvVEVTVmhvemptTE1DRWlo?= =?utf-8?B?eFlYMkcrWXhGcFhMYnRCK0NwMGZGbTJPdmE1RFA0VVJxT3dCZEVqOEErNXh3?= =?utf-8?B?K282NHJQaUhIVzVCN1FYaXZCUkxORVB2bHJLenE1NFdhUG5vQUlyRGRjT2hP?= =?utf-8?B?UWRLNlpDZ1RaODVXWkphalY1VFF5b2VVQTFSQTJkWE5EQnlvcmxMV0dUV0tK?= =?utf-8?B?Q0loNSt3Q3FCMVV4TFRoMDM2ZCtzdDh4NTl1Z29iOHNiaGZnZlZaU3cwUkJm?= =?utf-8?B?VmJOczlIbFVxZnJlcUZjSEQ3R09JNmVQTUNKeTNmRUhBak9MTnVHZ3hxSnRr?= =?utf-8?B?d1FsRVcwekhRMERDU1hSMlZvckpvTFA5VW1YeHVNZjd5VjlNcXArU2IzdmZM?= =?utf-8?B?dXBxNjlYU25PallGZ09UUU5yUDJrbUNKUlhCM3Y3TGJwUWhURy8xSTA5L0RU?= =?utf-8?B?ajA1M3RIS2hkUGhSMEdZZWlPa2J1VlhHQ1RESVhyY0Nzb1BtYSs5MVFYRWhi?= =?utf-8?B?dk51aExFMksrcC9oTlFmM1ArU3BqSm1qMzM3SzNyL3htM0FYdmZObWRNQmwx?= =?utf-8?B?OGVxbUlweDJVZVp4anVocTFQMGhMUU5WQVNlbUhkQ09IRTFXZlUvZml1cnln?= =?utf-8?B?K0JodzQ4dnBSd3ZjN3hWWjRHdHE5TVlDTUt3OFh3OVZQa0syaGhybVZSbUth?= =?utf-8?B?ME9PTXh5N2U0aXN3OTZFUE9jZG1rNm8yK2pkYVVOZDZaa3lZMjgvREVVWllL?= =?utf-8?B?RElIMHFHQjRTaE1ydXMxTGNBYVprSk5kOER1czJzWEpocDBaVzZqdEp2WHYy?= =?utf-8?B?aGU0MEtLc0lsMVNZekJ0cEJCeE5yZFdqSy8xSm5FcHQ1OXJZWFJkaStNamtG?= =?utf-8?B?TDVUNTRtdyt6ajRnbm14ZjZPZ0t4c3VvTk51ZmtSNFh0b1pVa21vT055bVJB?= =?utf-8?B?eHdMRlBMN1I1S1pCUVc5a2tzMWR5Q3d1MEJ6VEg0TWtRUnRZT1VJWEc1Unlj?= =?utf-8?B?TjM1ejRkSzhTdDBIM01YY2hWZzExRDBVS1N5S3FmUUFNdFhReG5ZZzRmVmYz?= =?utf-8?B?TzFoZlNKVERrL21sY2JYdCt1STM3SnUrdU9xVjJjMFRMbUxNSHgxZnlHbW8r?= =?utf-8?B?RVpjYURReWNFdXp0U3F2UVUvVUpxUDZ1OUJ4WjZXbVJPbDdoYTJzeHVQeWsv?= =?utf-8?B?WWxlaHNXMHlCUTc3TWNobzV5d3ZyMVI3VkV0L2kxaXdFT1haOXBxYXg2MGZ4?= =?utf-8?Q?aCigxdh+phu/UqxX+GwX09a4yY+j1eUh?= 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)(376014)(82310400026)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:52:35.3916 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1a52148f-47ae-4df5-e2c0-08dca260bd2d 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: SJ5PEPF000001D5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6410 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=a215045fcde570004479099286ab4c6ee88a57c5 Thanks. Xueming Li --- >From a215045fcde570004479099286ab4c6ee88a57c5 Mon Sep 17 00:00:00 2001 From: Piotr Pietruszewski Date: Thu, 30 May 2024 12:13:34 +0100 Subject: [PATCH] net/ixgbe/base: revert advertising for X550 2.5G/5G Cc: Xueming Li [ upstream commit 9ac063a739b00188281ba4ef5c6a0e43cc59a3b8 ] The commit removing advertising 2.5G and 5G speeds from ixgbe_get_copper_speeds_supported() was supposed to disable 2.5G and 5G during the autonegotiation with default settings. However, that change prevented OS-specific part of the driver from forcing these speeds at user request. This change reverts the commit and adds 2.5G and 5G as speeds supported by the X550. Fixes: 13de2444449e ("net/ixgbe/base: remove default advertising for x550 2.5G/5G") Signed-off-by: Piotr Pietruszewski Reviewed-by: Piotr Skajewski Reviewed-by: Marek Mical Reviewed-by: Jeff Kirsher Reviewed-by: Alice Michael --- .mailmap | 1 + drivers/net/ixgbe/base/ixgbe_phy.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.mailmap b/.mailmap index 6ac0fa9103..0cc726ea37 100644 --- a/.mailmap +++ b/.mailmap @@ -882,6 +882,7 @@ Marcin Wojtas Marcin Zapolski Marco Varlese Marc Sune +Marek Mical Maria Lingemark Mario Carrillo Mário Kuka diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c b/drivers/net/ixgbe/base/ixgbe_phy.c index 74c5db16fa..3a8e603472 100644 --- a/drivers/net/ixgbe/base/ixgbe_phy.c +++ b/drivers/net/ixgbe/base/ixgbe_phy.c @@ -915,6 +915,10 @@ static s32 ixgbe_get_copper_speeds_supported(struct ixgbe_hw *hw) hw->phy.speeds_supported |= IXGBE_LINK_SPEED_100_FULL; switch (hw->mac.type) { + case ixgbe_mac_X550: + hw->phy.speeds_supported |= IXGBE_LINK_SPEED_2_5GB_FULL; + hw->phy.speeds_supported |= IXGBE_LINK_SPEED_5GB_FULL; + break; case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_a: hw->phy.speeds_supported &= ~IXGBE_LINK_SPEED_100_FULL; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:17.157152561 +0800 +++ 0066-net-ixgbe-base-revert-advertising-for-X550-2.5G-5G.patch 2024-07-12 18:40:14.166594220 +0800 @@ -1 +1 @@ -From 9ac063a739b00188281ba4ef5c6a0e43cc59a3b8 Mon Sep 17 00:00:00 2001 +From a215045fcde570004479099286ab4c6ee88a57c5 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9ac063a739b00188281ba4ef5c6a0e43cc59a3b8 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -29 +31 @@ -index 075ea40f17..508d4eba24 100644 +index 6ac0fa9103..0cc726ea37 100644 @@ -32 +34 @@ -@@ -892,6 +892,7 @@ Marcin Wojtas +@@ -882,6 +882,7 @@ Marcin Wojtas