patch 'net/ixgbe/base: remove 2.5/5G from auto-negotiation for E610' has been queued to stable release 24.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.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 02/17/25. 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/f3fddb3b103dd339d2fe5d6ceaf91ef8679b70bf

Thanks.

Kevin

---
>From f3fddb3b103dd339d2fe5d6ceaf91ef8679b70bf Mon Sep 17 00:00:00 2001
From: Piotr Kwapulinski <piotr.kwapulinski at intel.com>
Date: Tue, 14 Jan 2025 18:10:13 +0800
Subject: [PATCH] net/ixgbe/base: remove 2.5/5G from auto-negotiation for E610

[ upstream commit c38b4274255703a48d0177c013ee95afb4bde910 ]

2.5 and 5 Gbps link speeds must be excluded from the auto-negotiation set
used during driver initialization due to compatibility issues with
certain switches. Those issues do not exist in case of E610 2.5G SKU
device (0x57b1).

Fixes: c6cb313da739 ("net/ixgbe/base: add link management for E610")

Signed-off-by: Piotr Kwapulinski <piotr.kwapulinski at intel.com>
Signed-off-by: Yuan Wang <yuanx.wang at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/net/ixgbe/base/ixgbe_e610.c | 37 +++++++++++++++++++----------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_e610.c b/drivers/net/ixgbe/base/ixgbe_e610.c
index b0d55a2411..31c2d986aa 100644
--- a/drivers/net/ixgbe/base/ixgbe_e610.c
+++ b/drivers/net/ixgbe/base/ixgbe_e610.c
@@ -4228,4 +4228,23 @@ s32 ixgbe_identify_phy_E610(struct ixgbe_hw *hw)
 	    pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_1G_USXGMII)
 		hw->phy.speeds_supported |= IXGBE_LINK_SPEED_1GB_FULL;
+	if (pcaps.phy_type_low  & IXGBE_PHY_TYPE_LOW_10GBASE_T       ||
+	    pcaps.phy_type_low  & IXGBE_PHY_TYPE_LOW_10G_SFI_DA      ||
+	    pcaps.phy_type_low  & IXGBE_PHY_TYPE_LOW_10GBASE_SR      ||
+	    pcaps.phy_type_low  & IXGBE_PHY_TYPE_LOW_10GBASE_LR      ||
+	    pcaps.phy_type_low  & IXGBE_PHY_TYPE_LOW_10GBASE_KR_CR1  ||
+	    pcaps.phy_type_low  & IXGBE_PHY_TYPE_LOW_10G_SFI_AOC_ACC ||
+	    pcaps.phy_type_low  & IXGBE_PHY_TYPE_LOW_10G_SFI_C2C     ||
+	    pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_10G_USXGMII)
+		hw->phy.speeds_supported |= IXGBE_LINK_SPEED_10GB_FULL;
+
+	/* 2.5 and 5 Gbps link speeds must be excluded from the
+	 * auto-negotiation set used during driver initialization due to
+	 * compatibility issues with certain switches. Those issues do not
+	 * exist in case of E610 2.5G SKU device (0x57b1).
+	 */
+	if (!hw->phy.autoneg_advertised &&
+	    hw->device_id != IXGBE_DEV_ID_E610_2_5G_T)
+		hw->phy.autoneg_advertised = hw->phy.speeds_supported;
+
 	if (pcaps.phy_type_low  & IXGBE_PHY_TYPE_LOW_2500BASE_T   ||
 	    pcaps.phy_type_low  & IXGBE_PHY_TYPE_LOW_2500BASE_X   ||
@@ -4234,21 +4253,13 @@ s32 ixgbe_identify_phy_E610(struct ixgbe_hw *hw)
 	    pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_2500M_USXGMII)
 		hw->phy.speeds_supported |= IXGBE_LINK_SPEED_2_5GB_FULL;
+
+	if (!hw->phy.autoneg_advertised &&
+	    hw->device_id == IXGBE_DEV_ID_E610_2_5G_T)
+		hw->phy.autoneg_advertised = hw->phy.speeds_supported;
+
 	if (pcaps.phy_type_low  & IXGBE_PHY_TYPE_LOW_5GBASE_T  ||
 	    pcaps.phy_type_low  & IXGBE_PHY_TYPE_LOW_5GBASE_KR ||
 	    pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_5G_USXGMII)
 		hw->phy.speeds_supported |= IXGBE_LINK_SPEED_5GB_FULL;
-	if (pcaps.phy_type_low  & IXGBE_PHY_TYPE_LOW_10GBASE_T       ||
-	    pcaps.phy_type_low  & IXGBE_PHY_TYPE_LOW_10G_SFI_DA      ||
-	    pcaps.phy_type_low  & IXGBE_PHY_TYPE_LOW_10GBASE_SR      ||
-	    pcaps.phy_type_low  & IXGBE_PHY_TYPE_LOW_10GBASE_LR      ||
-	    pcaps.phy_type_low  & IXGBE_PHY_TYPE_LOW_10GBASE_KR_CR1  ||
-	    pcaps.phy_type_low  & IXGBE_PHY_TYPE_LOW_10G_SFI_AOC_ACC ||
-	    pcaps.phy_type_low  & IXGBE_PHY_TYPE_LOW_10G_SFI_C2C     ||
-	    pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_10G_USXGMII)
-		hw->phy.speeds_supported |= IXGBE_LINK_SPEED_10GB_FULL;
-
-	/* Initialize autoneg speeds */
-	if (!hw->phy.autoneg_advertised)
-		hw->phy.autoneg_advertised = hw->phy.speeds_supported;
 
 	/* Set PHY ID */
-- 
2.48.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-02-12 17:29:37.306473561 +0000
+++ 0025-net-ixgbe-base-remove-2.5-5G-from-auto-negotiation-f.patch	2025-02-12 17:29:34.271945458 +0000
@@ -1 +1 @@
-From c38b4274255703a48d0177c013ee95afb4bde910 Mon Sep 17 00:00:00 2001
+From f3fddb3b103dd339d2fe5d6ceaf91ef8679b70bf Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c38b4274255703a48d0177c013ee95afb4bde910 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index ee8614d3db..a7d642887f 100644
+index b0d55a2411..31c2d986aa 100644
@@ -25 +26 @@
-@@ -4257,4 +4257,23 @@ s32 ixgbe_identify_phy_E610(struct ixgbe_hw *hw)
+@@ -4228,4 +4228,23 @@ s32 ixgbe_identify_phy_E610(struct ixgbe_hw *hw)
@@ -49 +50 @@
-@@ -4263,21 +4282,13 @@ s32 ixgbe_identify_phy_E610(struct ixgbe_hw *hw)
+@@ -4234,21 +4253,13 @@ s32 ixgbe_identify_phy_E610(struct ixgbe_hw *hw)