patch 'net/ixgbe/base: fix 5G link speed reported on VF' has been queued to stable release 23.11.2

[Xueming Li]

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 <xuemingl at nvidia.com>

---
>From 0e1354a6ea9b4abfa16de9912002722cfc577184 Mon Sep 17 00:00:00 2001
From: Piotr Skajewski <piotrx.skajewski at intel.com>
Date: Thu, 30 May 2024 12:13:35 +0100
Subject: [PATCH] net/ixgbe/base: fix 5G link speed reported on VF
Cc: Xueming Li <xuemingl at nvidia.com>

[ 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 <piotrx.skajewski at intel.com>
Reviewed-by: Radoslaw Tyl <radoslawx.tyl at intel.com>
Reviewed-by: Slawomir Mrozowicz <slawomirx.mrozowicz at intel.com>
Reviewed-by: Alice Michael <alice.michael at intel.com>
---
 .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 <quentin at armitage.org.uk>
 Qun Wan <qun.wan at intel.com>
 Radha Mohan Chintakuntla <radhac at marvell.com>
 Radoslaw Biernacki <rad at semihalf.com> <radoslaw.biernacki at linaro.org>
+Radoslaw Tyl <radoslawx.tyl at intel.com>
 Radu Bulie <radu-andrei.bulie at nxp.com>
 Radu Nicolau <radu.nicolau at intel.com>
 Rafael Ávila de Espíndola <espindola at scylladb.com>
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 <xuemingl at nvidia.com>
+
+[ upstream commit 9eb7fdbd47cf02068715a6e8bef767b0deea6f94 ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -24 +26 @@
-index 508d4eba24..be16cabd07 100644
+index 0cc726ea37..ac2268a1d1 100644
@@ -27 +29 @@
-@@ -1173,6 +1173,7 @@ Quentin Armitage <quentin at armitage.org.uk>
+@@ -1158,6 +1158,7 @@ Quentin Armitage <quentin at armitage.org.uk>