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 825BB45804 for ; Fri, 23 Aug 2024 18:21:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7C4CA402BE; Fri, 23 Aug 2024 18:21:20 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 13C8F40295 for ; Fri, 23 Aug 2024 18:21:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yKIvCnISILoxD11IgiDFF2t/MR5vWh+gHdwtwsTWuKc=; b=YYUrWiFIYf7flhtcmqEawihATP9Lhf68Zypfte+Y6mvNgAio61Y4WdGQXqhHKaNz+TzAQQ ygckiGTxnyZ8yM+WPSF8xPHh+xDGN7QRKJRObIwanIOUvSGcOxh3eoNkzaeOWcbBf8rR1r rjonzxVpqf8Xh6W4oqJKyXiL3MnPh34= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-62-YuMHNE2SPq-VUp7MhOvRYw-1; Fri, 23 Aug 2024 12:21:15 -0400 X-MC-Unique: YuMHNE2SPq-VUp7MhOvRYw-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0877E1955D47; Fri, 23 Aug 2024 16:21:14 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2A8031956053; Fri, 23 Aug 2024 16:21:11 +0000 (UTC) From: Kevin Traynor 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 21.11.8 Date: Fri, 23 Aug 2024 17:17:52 +0100 Message-ID: <20240823161929.1004778-44-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/ea2d868cc504cb5af036e7ad87c0dc25653b3737 Thanks. Kevin --- >From ea2d868cc504cb5af036e7ad87c0dc25653b3737 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 [ 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 49e574c3ef..9a98b67569 100644 --- a/.mailmap +++ b/.mailmap @@ -1113,4 +1113,5 @@ Qun Wan Radha Mohan Chintakuntla Radoslaw Biernacki +Radoslaw Tyl Radu Bulie Radu Nicolau 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 @@ -586,5 +586,5 @@ s32 ixgbe_check_mac_link_vf(struct ixgbe_hw *hw, ixgbe_link_speed *speed, 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; @@ -596,5 +596,5 @@ s32 ixgbe_check_mac_link_vf(struct ixgbe_hw *hw, ixgbe_link_speed *speed, 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; @@ -604,5 +604,5 @@ s32 ixgbe_check_mac_link_vf(struct ixgbe_hw *hw, ixgbe_link_speed *speed, *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; -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:11.243963110 +0100 +++ 0044-net-ixgbe-base-fix-5G-link-speed-reported-on-VF.patch 2024-08-23 17:18:09.694430014 +0100 @@ -1 +1 @@ -From 9eb7fdbd47cf02068715a6e8bef767b0deea6f94 Mon Sep 17 00:00:00 2001 +From ea2d868cc504cb5af036e7ad87c0dc25653b3737 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9eb7fdbd47cf02068715a6e8bef767b0deea6f94 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 508d4eba24..be16cabd07 100644 +index 49e574c3ef..9a98b67569 100644 @@ -27 +28 @@ -@@ -1174,4 +1174,5 @@ Qun Wan +@@ -1113,4 +1113,5 @@ Qun Wan