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 4682E45610 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 403C142F39; Fri, 12 Jul 2024 12:52:48 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2073.outbound.protection.outlook.com [40.107.237.73]) by mails.dpdk.org (Postfix) with ESMTP id BFDB642F0E 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=uWqKznN8HEg3ZDAD2wHoEboOPO5iP+fGA75VMdOiZt41An6k85t9mXNRhct8GbHs8l2bhTtcQTWt2mDN9xKb1EWOqyieARPxzYE4iuQvsYTLSgBEuf13+Qk5tVJSfVwzLAMqGzNY4VecsB2qJtiJF9HDgcc4SzkZoiEyKhfMnuqc0I7OeeNClzJaCxtURzaUUC2RqimE/94i1dlxlK+vTueYOUrSsQdZJxjq1zGwD1BbxVMKJGZMwFV+ASoudnDY2NCHNomHo51B8AkztQwzgCftFWfdDB5WWDasax7lk/l7jxUKGKZrb8XtCB6a3DoGk1ppn9eukA+JdDieyGYSpQ== 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=A0QQZg4laGC1OJALKxAKkfDFXfGnorcszWvdJ9QIbM4=; b=NBkNbInlSrjh+6kms5t167pRUJFhH+6XAShULE+Ox6sBGiQ4wI95dYywFXmPtvUPpIhIJ1rHlOuFdx/d0i8FPTSgUL32YMa3LF8+LSXQl8BWOxHkH+K2OdKzOsA9UyTyOBb94E7CJX0vfW3r5Dj7QS/yJMpn9wvuFzLtyuQ2gEYYSonK4VFbbudGugXUUivgpuQBBkJQQyTWLM5wB3gIM+qP7eDpntOtdQ6zwA/W1a6VUOqo4aCm9i3mIsxFTWQRyTPorjTYlQSrnKEjA5/96CmloX99OS0ERiQjvYiO8yiKpO2ANJfvSnwgJfhj9fFmiFxUv4LRdTqQW3L4EMS4SA== 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=A0QQZg4laGC1OJALKxAKkfDFXfGnorcszWvdJ9QIbM4=; b=QZgYfKpntDWZPMIHSsmXYkLqF4+nP4T/iT1UeNICdbvbsxwA8JeE5+6kv1H4Bt+2Q5U1h5ydrg8/CbrDjhYJm2CKywMVtD1i3lPDnPM1Vho1ni6uOyKVHJXrlFrGtf9VnDQnwk18yGV36jdBrGdvyhh5FlHWQX1iRGzQogJuBzxXA6gZQmpqHVv8uvgxKqG9Y1Pqr3vayV8SkrqpqaVqhuYzh3lwwZi5bq4vUJoOTrKXjvLliV8kQy9pDmUTX0ABa8Omeod/IviHusC+j3/IX0PeY7HRNgOFaeQpNsy/TWBOUofzMlGt9xDyyoyhCAjAx4WACuA+qn5IzlhN42UPBQ== Received: from PH7PR13CA0015.namprd13.prod.outlook.com (2603:10b6:510:174::21) by PH7PR12MB8794.namprd12.prod.outlook.com (2603:10b6:510:27d::22) 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:52:38 +0000 Received: from SJ5PEPF000001D5.namprd05.prod.outlook.com (2603:10b6:510:174:cafe::a6) by PH7PR13CA0015.outlook.office365.com (2603:10b6:510:174::21) 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:52:38 +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:37 +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:29 -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:26 -0700 From: Xueming Li To: Piotr Skajewski CC: Radoslaw Tyl , Slawomir Mrozowicz , Alice Michael , dpdk stable Subject: patch 'net/ixgbe/base: fix 5G link speed reported on VF' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:53 +0800 Message-ID: <20240712104528.308638-68-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_|PH7PR12MB8794:EE_ X-MS-Office365-Filtering-Correlation-Id: 8c3d2ecf-63c2-4b5b-d0e8-08dca260bea1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?B?U3JERmNpckJMbitaMUxsWFJVam9Nb1hhV09nNUZzM2xQOUtjZCtSazlmOHhP?= =?utf-8?B?THBjY1JqTDFqYXpGNUNCeXRjd0ZKbzhITzhuWXA1VEtKMUZMdHk2eFc4MnJx?= =?utf-8?B?SFcxRmdvQXpESEI2YmlZQUQzZjdKdGRrR3g5K1NjUW9tcVhPbVQraFlkMVlI?= =?utf-8?B?TUJ3UG5ta09HSG5zUEltZGpIMElMMkFsWG00bndtd0VEN2hwR1BsNXMvcUp6?= =?utf-8?B?QlJGRVNidTZGaWZZeTczWGtPSElhNmhsekVlKzdnejBETDUrdjZhMk5ZZktZ?= =?utf-8?B?R280MlByb2E4bXdYZWJtSjQzZHJJSVBHMm5NbmdWbHJ5TjRCY1BLaEsrWEVX?= =?utf-8?B?M04zWDFRR3RVcTRTU2JtV0VYUVE5R1JCR25XZW1UYzNOVlM3UmFsTDJkQXF6?= =?utf-8?B?VUs3WmtxN1laUjR3SnJUTzhocEFsWjRrUTM4SzJBOXdiaFJWdjdoT2Y2d0Yr?= =?utf-8?B?T3VIbGpTaXJQU0o0b1AySTEyaVRhT09lM3MzR0FJcytuQ2wrRTB0YWFMNWla?= =?utf-8?B?d3haMzlKSW81dU01TG02WWRta0lxcks3aGdhMUt1VDBFRVZ1d2xBMkl3ZUFw?= =?utf-8?B?VFdzbzgrMFpXUlNwZ1d4aXJIYVpHUkZvNGEvL1JtajBwTWMvWncrZjdHbUxZ?= =?utf-8?B?Q2RnYkdHRGZwQldrN2U5T0hTOUFERFNsQnp1dXdCeVFkckw2UU9mZzNRSWFw?= =?utf-8?B?OC9Hek1Hdk40UFVJOEJhNE4vY3Uya3h5TDRrTEJrSGQ3TUpqMGZHaGo2OEd3?= =?utf-8?B?MStTVG81QXNxWU1iVTNhblc5eWxpMkdYMEZVYUM4cUxLaEx1TlpNYSt6NlJC?= =?utf-8?B?UzQ1MDRUc3JJWERGSkZaV2lHcGlpemZ2MjdzRHRxU3ZIR1h5UExjOWNLN1dq?= =?utf-8?B?ZCtLeEVPa2cvT0tZTzhvc3hvRGhrUEhUM0VielFNRnJFcWFDdSt0K052WnRV?= =?utf-8?B?aTNWRW1hb2dBc0p3bElOdWNLanM4TDdpNTJXWjN4dWxWbjF4WDlyRzlmZHky?= =?utf-8?B?TEc2ZlZUdm5pMUtzTjhqcnpKUm0wcmxGMjdkWHg0eEZ0UlZaVGNLZUROTFND?= =?utf-8?B?c0Rvb293bytoWUM5MzhWcWFqaldrVTBYekZtcVFzQmV4clBlNUIxem9UeFNq?= =?utf-8?B?VTVBc0U5WjlTK2JwazhZaGgwNXI3SW1aaE02UENFZ3loZ0dDWUxoUENWQ0dk?= =?utf-8?B?eUcvOWJxaURHQ3dXY2FsMlhJYVlsRFJaRFJKcVJqbjI1Q2N2cFV3Tlp2NFJ3?= =?utf-8?B?NHNPNWw0NWppRkFWREtpR1V1VlRtK0ZCV0lrYWJYS1c1L1hDZDZRdHFkdTVi?= =?utf-8?B?OHB4aXZSRkV4MTdzSk1lWHFvMlpGbGRhM2hUUndqM254WExIU2hRVTI3bDhm?= =?utf-8?B?SVNYOVlMa1dhYmR0VGRLNDhlUTVDbHFxRkx0ZDhZZWMxMVEvY09yNUZYdzFq?= =?utf-8?B?RkdRM2ozQ0RLWXY0SDlMYkE0WGsrSDZqK0xGdG9OaS9lQjF4aHl3aGpzVTRi?= =?utf-8?B?SXE3QjROMklMYXhaRnNhL3djbjkvSTV1eE1hTk4yRjBPeG9rOXVoNDZyYjZy?= =?utf-8?B?TVdPdWVnd1pucmJoeFB0UjZNMGc2Z1JqLzNTOEJ3NkdqWHZpVTlWV1JFN3Vp?= =?utf-8?B?b29oaEpya1Q1N2xKbzJMU05lb2s0b0pnc3YxRXRERi9abXJEOVRUREZmcklh?= =?utf-8?B?QWlFMWc3VUZFQU5PQVE2T2JpWHFXMUVPdGEzSGc4cFo5SXo4YlRSTlVYU1Ux?= =?utf-8?B?UmpVOUZqOHRRdUd4enMwM3c5L1N1TDdBU01odDJsK01ibFg4anFNTnNNbVFr?= =?utf-8?B?QStRVnZ1ZHhKT3VWTmlsOHBudHRGRGcvTXF2QmRWZlZCNWMrZVhvZmVKaHo2?= =?utf-8?B?UDR1L1NUSy91OFdrdk9WcjVsVmk2VUxvMGJpN1FwVUZmeUdTS09CM1VtM2pZ?= =?utf-8?Q?R1XuqugD/RgMvq9xITTj+gSSOW1hUHs0?= 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)(82310400026)(376014)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:52:37.8291 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8c3d2ecf-63c2-4b5b-d0e8-08dca260bea1 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: PH7PR12MB8794 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=0e1354a6ea9b4abfa16de9912002722cfc577184 Thanks. Xueming Li --- >From 0e1354a6ea9b4abfa16de9912002722cfc577184 Mon Sep 17 00:00:00 2001 From: Piotr Skajewski Date: Thu, 30 May 2024 12:13:35 +0100 Subject: [PATCH] net/ixgbe/base: fix 5G link speed reported on VF Cc: Xueming Li [ upstream commit 9eb7fdbd47cf02068715a6e8bef767b0deea6f94 ] When 5000 Base-T was set on PF the VF reported 100 Base-T. This patch changes ixgbe_check_mac_link_vf function where there was an incorrect conditional which checks using PF mac types, now it is correctly using VF mac types. Fixes: 12e20906905c ("net/ixgbe/base: include new speeds in VFLINK interpretation") Signed-off-by: Piotr Skajewski Reviewed-by: Radoslaw Tyl Reviewed-by: Slawomir Mrozowicz Reviewed-by: Alice Michael --- .mailmap | 1 + drivers/net/ixgbe/base/ixgbe_vf.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.mailmap b/.mailmap index 0cc726ea37..ac2268a1d1 100644 --- a/.mailmap +++ b/.mailmap @@ -1158,6 +1158,7 @@ Quentin Armitage Qun Wan Radha Mohan Chintakuntla Radoslaw Biernacki +Radoslaw Tyl Radu Bulie Radu Nicolau Rafael Ávila de Espíndola diff --git a/drivers/net/ixgbe/base/ixgbe_vf.c b/drivers/net/ixgbe/base/ixgbe_vf.c index 5e3ae1b519..11dbbe2a86 100644 --- a/drivers/net/ixgbe/base/ixgbe_vf.c +++ b/drivers/net/ixgbe/base/ixgbe_vf.c @@ -585,7 +585,7 @@ s32 ixgbe_check_mac_link_vf(struct ixgbe_hw *hw, ixgbe_link_speed *speed, switch (links_reg & IXGBE_LINKS_SPEED_82599) { case IXGBE_LINKS_SPEED_10G_82599: *speed = IXGBE_LINK_SPEED_10GB_FULL; - if (hw->mac.type >= ixgbe_mac_X550) { + if (hw->mac.type >= ixgbe_mac_X550_vf) { if (links_reg & IXGBE_LINKS_SPEED_NON_STD) *speed = IXGBE_LINK_SPEED_2_5GB_FULL; } @@ -595,7 +595,7 @@ s32 ixgbe_check_mac_link_vf(struct ixgbe_hw *hw, ixgbe_link_speed *speed, break; case IXGBE_LINKS_SPEED_100_82599: *speed = IXGBE_LINK_SPEED_100_FULL; - if (hw->mac.type == ixgbe_mac_X550) { + if (hw->mac.type == ixgbe_mac_X550_vf) { if (links_reg & IXGBE_LINKS_SPEED_NON_STD) *speed = IXGBE_LINK_SPEED_5GB_FULL; } @@ -603,7 +603,7 @@ s32 ixgbe_check_mac_link_vf(struct ixgbe_hw *hw, ixgbe_link_speed *speed, case IXGBE_LINKS_SPEED_10_X550EM_A: *speed = IXGBE_LINK_SPEED_UNKNOWN; /* Since Reserved in older MAC's */ - if (hw->mac.type >= ixgbe_mac_X550) + if (hw->mac.type >= ixgbe_mac_X550_vf) *speed = IXGBE_LINK_SPEED_10_FULL; break; default: -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:17.200230955 +0800 +++ 0067-net-ixgbe-base-fix-5G-link-speed-reported-on-VF.patch 2024-07-12 18:40:14.166594220 +0800 @@ -1 +1 @@ -From 9eb7fdbd47cf02068715a6e8bef767b0deea6f94 Mon Sep 17 00:00:00 2001 +From 0e1354a6ea9b4abfa16de9912002722cfc577184 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9eb7fdbd47cf02068715a6e8bef767b0deea6f94 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 508d4eba24..be16cabd07 100644 +index 0cc726ea37..ac2268a1d1 100644 @@ -27 +29 @@ -@@ -1173,6 +1173,7 @@ Quentin Armitage +@@ -1158,6 +1158,7 @@ Quentin Armitage