Page MenuHomeFreeBSD
Files F171767863

D57339.id184164.diff
No OneTemporary
Actions

D57339.id184164.diff
View Options

diff --git a/sys/dev/ixgbe/ixgbe_e610.c b/sys/dev/ixgbe/ixgbe_e610.c
--- a/sys/dev/ixgbe/ixgbe_e610.c
+++ b/sys/dev/ixgbe/ixgbe_e610.c
@@ -5191,6 +5191,16 @@
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 ||
@@ -5201,31 +5211,10 @@
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)
+ /* Initialize autoneg speeds */
+ if (!hw->phy.autoneg_advertised)
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));

File Metadata

Mime Type
text/plain
Expires
Mon, Sep 14, 9:30 AM (5 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36889181
Default Alt Text
D57339.id184164.diff (2 KB)

Event Timeline