From: Piotr Kwapulinski <piotr.kwapulin...@intel.com>
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)
Cc: sta...@dpdk.org
Signed-off-by: Piotr Kwapulinski <piotr.kwapulin...@intel.com>
Signed-off-by: Yuan Wang <yuanx.w...@intel.com>
---
drivers/net/ixgbe/base/ixgbe_e610.c | 35 +++++++++++++++++++----------
1 file changed, 23 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_e610.c
b/drivers/net/ixgbe/base/ixgbe_e610.c
index ee8614d3db..a7d642887f 100644
--- a/drivers/net/ixgbe/base/ixgbe_e610.c
+++ b/drivers/net/ixgbe/base/ixgbe_e610.c
@@ -4256,16 +4256,6 @@ s32 ixgbe_identify_phy_E610(struct ixgbe_hw *hw)
pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_1G_SGMII ||
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_2500BASE_T ||
- pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_2500BASE_X ||
- pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_2500BASE_KX ||
- pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_2500M_SGMII ||
- pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_2500M_USXGMII)
- hw->phy.speeds_supported |= IXGBE_LINK_SPEED_2_5GB_FULL;
- 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 ||
@@ -4276,10 +4266,31 @@ s32 ixgbe_identify_phy_E610(struct ixgbe_hw *hw)
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)
+ /* 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 ||
+ pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_2500BASE_KX ||
+ pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_2500M_SGMII ||
+ 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;
+
/* Set PHY ID */
memcpy(&hw->phy.id, pcaps.phy_id_oui, sizeof(u32));
--
2.43.5
