ixgbe: advertise highest capable link speed

On module insert advertise highest capable link speed. If module is
capable of 10G, then advertise 10G, else advertise modules capable
link speeds.

Signed-off-by: Paul Greenwalt <paul.greenwalt@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 43ca5b0d5999fb5c4b16f8d6ff2fca983f02aa57..07d929bf4b506edd33b11e05a318d8f1b1346e14 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7656,6 +7656,7 @@ sfp_out:
 static void ixgbe_sfp_link_config_subtask(struct ixgbe_adapter *adapter)
 {
        struct ixgbe_hw *hw = &adapter->hw;
+       u32 cap_speed;
        u32 speed;
        bool autoneg = false;
 
@@ -7668,16 +7669,14 @@ static void ixgbe_sfp_link_config_subtask(struct ixgbe_adapter *adapter)
 
        adapter->flags &= ~IXGBE_FLAG_NEED_LINK_CONFIG;
 
-       speed = hw->phy.autoneg_advertised;
-       if ((!speed) && (hw->mac.ops.get_link_capabilities)) {
-               hw->mac.ops.get_link_capabilities(hw, &speed, &autoneg);
+       hw->mac.ops.get_link_capabilities(hw, &cap_speed, &autoneg);
 
-               /* setup the highest link when no autoneg */
-               if (!autoneg) {
-                       if (speed & IXGBE_LINK_SPEED_10GB_FULL)
-                               speed = IXGBE_LINK_SPEED_10GB_FULL;
-               }
-       }
+       /* advertise highest capable link speed */
+       if (!autoneg && (cap_speed & IXGBE_LINK_SPEED_10GB_FULL))
+               speed = IXGBE_LINK_SPEED_10GB_FULL;
+       else
+               speed = cap_speed & (IXGBE_LINK_SPEED_10GB_FULL |
+                                    IXGBE_LINK_SPEED_1GB_FULL);
 
        if (hw->mac.ops.setup_link)
                hw->mac.ops.setup_link(hw, speed, true);