ice: Advertise supported link modes if none requested

User requested link modes affect what is returned as an advertised
link mode.  If no modes have been requested, we are not advertising
any link modes.  Advertise what we are capable of supporting if no
link modes have been requested.

Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@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/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
index c1511393846f08aa49213974ddb8ab6e4d4f9778..91e3c451c66cceb7e26b57ace48386da763f5924 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -628,7 +628,8 @@ ice_phy_type_to_ethtool(struct net_device *netdev,
            phy_types_low & ICE_PHY_TYPE_LOW_100M_SGMII) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     100baseT_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_100MB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_100MB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             100baseT_Full);
        }
@@ -636,14 +637,16 @@ ice_phy_type_to_ethtool(struct net_device *netdev,
            phy_types_low & ICE_PHY_TYPE_LOW_1G_SGMII) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     1000baseT_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_1000MB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_1000MB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             1000baseT_Full);
        }
        if (phy_types_low & ICE_PHY_TYPE_LOW_1000BASE_KX) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     1000baseKX_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_1000MB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_1000MB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             1000baseKX_Full);
        }
@@ -651,14 +654,16 @@ ice_phy_type_to_ethtool(struct net_device *netdev,
            phy_types_low & ICE_PHY_TYPE_LOW_1000BASE_LX) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     1000baseX_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_1000MB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_1000MB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             1000baseX_Full);
        }
        if (phy_types_low & ICE_PHY_TYPE_LOW_2500BASE_T) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     2500baseT_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_2500MB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_2500MB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             2500baseT_Full);
        }
@@ -666,7 +671,8 @@ ice_phy_type_to_ethtool(struct net_device *netdev,
            phy_types_low & ICE_PHY_TYPE_LOW_2500BASE_KX) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     2500baseX_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_2500MB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_2500MB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             2500baseX_Full);
        }
@@ -674,7 +680,8 @@ ice_phy_type_to_ethtool(struct net_device *netdev,
            phy_types_low & ICE_PHY_TYPE_LOW_5GBASE_KR) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     5000baseT_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_5GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_5GB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             5000baseT_Full);
        }
@@ -684,28 +691,32 @@ ice_phy_type_to_ethtool(struct net_device *netdev,
            phy_types_low & ICE_PHY_TYPE_LOW_10G_SFI_C2C) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     10000baseT_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_10GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_10GB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             10000baseT_Full);
        }
        if (phy_types_low & ICE_PHY_TYPE_LOW_10GBASE_KR_CR1) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     10000baseKR_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_10GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_10GB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             10000baseKR_Full);
        }
        if (phy_types_low & ICE_PHY_TYPE_LOW_10GBASE_SR) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     10000baseSR_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_10GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_10GB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             10000baseSR_Full);
        }
        if (phy_types_low & ICE_PHY_TYPE_LOW_10GBASE_LR) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     10000baseLR_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_10GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_10GB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             10000baseLR_Full);
        }
@@ -717,7 +728,8 @@ ice_phy_type_to_ethtool(struct net_device *netdev,
            phy_types_low & ICE_PHY_TYPE_LOW_25G_AUI_C2C) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     25000baseCR_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_25GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_25GB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             25000baseCR_Full);
        }
@@ -725,7 +737,8 @@ ice_phy_type_to_ethtool(struct net_device *netdev,
            phy_types_low & ICE_PHY_TYPE_LOW_25GBASE_LR) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     25000baseSR_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_25GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_25GB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             25000baseSR_Full);
        }
@@ -734,14 +747,16 @@ ice_phy_type_to_ethtool(struct net_device *netdev,
            phy_types_low & ICE_PHY_TYPE_LOW_25GBASE_KR1) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     25000baseKR_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_25GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_25GB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             25000baseKR_Full);
        }
        if (phy_types_low & ICE_PHY_TYPE_LOW_40GBASE_KR4) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     40000baseKR4_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_40GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_40GB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             40000baseKR4_Full);
        }
@@ -750,21 +765,24 @@ ice_phy_type_to_ethtool(struct net_device *netdev,
            phy_types_low & ICE_PHY_TYPE_LOW_40G_XLAUI) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     40000baseCR4_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_40GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_40GB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             40000baseCR4_Full);
        }
        if (phy_types_low & ICE_PHY_TYPE_LOW_40GBASE_SR4) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     40000baseSR4_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_40GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_40GB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             40000baseSR4_Full);
        }
        if (phy_types_low & ICE_PHY_TYPE_LOW_40GBASE_LR4) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     40000baseLR4_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_40GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_40GB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             40000baseLR4_Full);
        }
@@ -779,7 +797,8 @@ ice_phy_type_to_ethtool(struct net_device *netdev,
            phy_types_low & ICE_PHY_TYPE_LOW_50G_AUI1) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     50000baseCR2_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_50GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_50GB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             50000baseCR2_Full);
        }
@@ -787,7 +806,8 @@ ice_phy_type_to_ethtool(struct net_device *netdev,
            phy_types_low & ICE_PHY_TYPE_LOW_50GBASE_KR_PAM4) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     50000baseKR2_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_50GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_50GB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             50000baseKR2_Full);
        }
@@ -797,7 +817,8 @@ ice_phy_type_to_ethtool(struct net_device *netdev,
            phy_types_low & ICE_PHY_TYPE_LOW_50GBASE_LR) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     50000baseSR2_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_50GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_50GB)
                        ethtool_link_ksettings_add_link_mode(ks, advertising,
                                                             50000baseSR2_Full);
        }
@@ -814,7 +835,8 @@ ice_phy_type_to_ethtool(struct net_device *netdev,
            phy_types_high & ICE_PHY_TYPE_HIGH_100G_AUI2) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     100000baseCR4_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_100GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_100GB)
                        need_add_adv_mode = true;
        }
        if (need_add_adv_mode) {
@@ -826,7 +848,8 @@ ice_phy_type_to_ethtool(struct net_device *netdev,
            phy_types_low & ICE_PHY_TYPE_LOW_100GBASE_SR2) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     100000baseSR4_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_100GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_100GB)
                        need_add_adv_mode = true;
        }
        if (need_add_adv_mode) {
@@ -838,7 +861,8 @@ ice_phy_type_to_ethtool(struct net_device *netdev,
            phy_types_low & ICE_PHY_TYPE_LOW_100GBASE_DR) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     100000baseLR4_ER4_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_100GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_100GB)
                        need_add_adv_mode = true;
        }
        if (need_add_adv_mode) {
@@ -851,7 +875,8 @@ ice_phy_type_to_ethtool(struct net_device *netdev,
            phy_types_high & ICE_PHY_TYPE_HIGH_100GBASE_KR2_PAM4) {
                ethtool_link_ksettings_add_link_mode(ks, supported,
                                                     100000baseKR4_Full);
-               if (hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_100GB)
+               if (!hw_link_info->req_speeds ||
+                   hw_link_info->req_speeds & ICE_AQ_LINK_SPEED_100GB)
                        need_add_adv_mode = true;
        }
        if (need_add_adv_mode)