patch 'net/ixgbe/base: revert advertising for X550 2.5G/5G' has been queued to stable release 21.11.8

[Kevin Traynor]

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/2b53ce832bf9b6661549217e738b2e7725fa47c2

Thanks.

Kevin

---
>From 2b53ce832bf9b6661549217e738b2e7725fa47c2 Mon Sep 17 00:00:00 2001
From: Piotr Pietruszewski <piotr.pietruszewski at intel.com>
Date: Thu, 30 May 2024 12:13:34 +0100
Subject: [PATCH] net/ixgbe/base: revert advertising for X550 2.5G/5G

[ 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 <piotr.pietruszewski at intel.com>
Reviewed-by: Piotr Skajewski <piotrx.skajewski at intel.com>
Reviewed-by: Marek Mical <marekx.mical at intel.com>
Reviewed-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Reviewed-by: Alice Michael <alice.michael at intel.com>
---
 .mailmap                           | 1 +
 drivers/net/ixgbe/base/ixgbe_phy.c | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/.mailmap b/.mailmap
index 7aaed03aab..49e574c3ef 100644
--- a/.mailmap
+++ b/.mailmap
@@ -847,4 +847,5 @@ Marcin Zapolski <marcinx.a.zapolski at intel.com>
 Marco Varlese <mvarlese at suse.de>
 Marc Sune <marcdevel at gmail.com> <marc.sune at bisdn.de>
+Marek Mical <marekx.mical at intel.com>
 Maria Lingemark <maria.lingemark at ericsson.com>
 Mario Carrillo <mario.alfredo.c.arevalo at intel.com>
diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c b/drivers/net/ixgbe/base/ixgbe_phy.c
index 8d4d9bbfef..f859b152ec 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.c
+++ b/drivers/net/ixgbe/base/ixgbe_phy.c
@@ -916,4 +916,8 @@ static s32 ixgbe_get_copper_speeds_supported(struct ixgbe_hw *hw)
 
 	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:
-- 
2.46.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-08-23 17:18:11.216146382 +0100
+++ 0043-net-ixgbe-base-revert-advertising-for-X550-2.5G-5G.patch	2024-08-23 17:18:09.692430008 +0100
@@ -1 +1 @@
-From 9ac063a739b00188281ba4ef5c6a0e43cc59a3b8 Mon Sep 17 00:00:00 2001
+From 2b53ce832bf9b6661549217e738b2e7725fa47c2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9ac063a739b00188281ba4ef5c6a0e43cc59a3b8 ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -29 +30 @@
-index 075ea40f17..508d4eba24 100644
+index 7aaed03aab..49e574c3ef 100644
@@ -32 +33 @@
-@@ -893,4 +893,5 @@ Marcin Zapolski <marcinx.a.zapolski at intel.com>
+@@ -847,4 +847,5 @@ Marcin Zapolski <marcinx.a.zapolski at intel.com>
@@ -39 +40 @@
-index 74c5db16fa..3a8e603472 100644
+index 8d4d9bbfef..f859b152ec 100644