ice: Refactor finding advertised link speed

Refactor ice_get_link_ksettings to using forced speed to link modes
mapping.

Suggested-by : Alexander Lobakin <aleksander.lobakin@intel.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: Pawel Chmielewski <pawel.chmielewski@intel.com>
Signed-off-by: Paul Greenwalt <paul.greenwalt@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index fcaa5c3b8ec0da7b0fd10704aa2539afae6ed887..988b177d938836d342a8391539c20d8c8941561f 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -960,6 +960,7 @@ int ice_stop(struct net_device *netdev);
 void ice_service_task_schedule(struct ice_pf *pf);
 int ice_load(struct ice_pf *pf);
 void ice_unload(struct ice_pf *pf);
+void ice_adv_lnk_speed_maps_init(void);
 
 /**
  * ice_set_rdma_cap - enable RDMA support

diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
index d3cb08e66dcbc591e79df5ac88ddaa8aad9bc55a..d406eca03cde656fae6337015f50033ce7943e43 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -345,6 +345,79 @@ static const struct ice_priv_flag ice_gstrings_priv_flags[] = {
 
 #define ICE_PRIV_FLAG_ARRAY_SIZE       ARRAY_SIZE(ice_gstrings_priv_flags)
 
+static const u32 ice_adv_lnk_speed_100[] __initconst = {
+       ETHTOOL_LINK_MODE_100baseT_Full_BIT,
+};
+
+static const u32 ice_adv_lnk_speed_1000[] __initconst = {
+       ETHTOOL_LINK_MODE_1000baseX_Full_BIT,
+       ETHTOOL_LINK_MODE_1000baseT_Full_BIT,
+       ETHTOOL_LINK_MODE_1000baseKX_Full_BIT,
+};
+
+static const u32 ice_adv_lnk_speed_2500[] __initconst = {
+       ETHTOOL_LINK_MODE_2500baseT_Full_BIT,
+       ETHTOOL_LINK_MODE_2500baseX_Full_BIT,
+};
+
+static const u32 ice_adv_lnk_speed_5000[] __initconst = {
+       ETHTOOL_LINK_MODE_5000baseT_Full_BIT,
+};
+
+static const u32 ice_adv_lnk_speed_10000[] __initconst = {
+       ETHTOOL_LINK_MODE_10000baseT_Full_BIT,
+       ETHTOOL_LINK_MODE_10000baseKR_Full_BIT,
+       ETHTOOL_LINK_MODE_10000baseSR_Full_BIT,
+       ETHTOOL_LINK_MODE_10000baseLR_Full_BIT,
+};
+
+static const u32 ice_adv_lnk_speed_25000[] __initconst = {
+       ETHTOOL_LINK_MODE_25000baseCR_Full_BIT,
+       ETHTOOL_LINK_MODE_25000baseSR_Full_BIT,
+       ETHTOOL_LINK_MODE_25000baseKR_Full_BIT,
+};
+
+static const u32 ice_adv_lnk_speed_40000[] __initconst = {
+       ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT,
+       ETHTOOL_LINK_MODE_40000baseSR4_Full_BIT,
+       ETHTOOL_LINK_MODE_40000baseLR4_Full_BIT,
+       ETHTOOL_LINK_MODE_40000baseKR4_Full_BIT,
+};
+
+static const u32 ice_adv_lnk_speed_50000[] __initconst = {
+       ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT,
+       ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT,
+       ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT,
+};
+
+static const u32 ice_adv_lnk_speed_100000[] __initconst = {
+       ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT,
+       ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT,
+       ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT,
+       ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT,
+       ETHTOOL_LINK_MODE_100000baseCR2_Full_BIT,
+       ETHTOOL_LINK_MODE_100000baseSR2_Full_BIT,
+       ETHTOOL_LINK_MODE_100000baseKR2_Full_BIT,
+};
+
+static struct ethtool_forced_speed_map ice_adv_lnk_speed_maps[] __ro_after_init = {
+       ETHTOOL_FORCED_SPEED_MAP(ice_adv_lnk_speed, 100),
+       ETHTOOL_FORCED_SPEED_MAP(ice_adv_lnk_speed, 1000),
+       ETHTOOL_FORCED_SPEED_MAP(ice_adv_lnk_speed, 2500),
+       ETHTOOL_FORCED_SPEED_MAP(ice_adv_lnk_speed, 5000),
+       ETHTOOL_FORCED_SPEED_MAP(ice_adv_lnk_speed, 10000),
+       ETHTOOL_FORCED_SPEED_MAP(ice_adv_lnk_speed, 25000),
+       ETHTOOL_FORCED_SPEED_MAP(ice_adv_lnk_speed, 40000),
+       ETHTOOL_FORCED_SPEED_MAP(ice_adv_lnk_speed, 50000),
+       ETHTOOL_FORCED_SPEED_MAP(ice_adv_lnk_speed, 100000),
+};
+
+void __init ice_adv_lnk_speed_maps_init(void)
+{
+       ethtool_forced_speed_maps_init(ice_adv_lnk_speed_maps,
+                                      ARRAY_SIZE(ice_adv_lnk_speed_maps));
+}
+
 static void
 __ice_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo,
                  struct ice_vsi *vsi)
@@ -2007,6 +2080,55 @@ done:
        return err;
 }
 
+/**
+ * ice_speed_to_aq_link - Get AQ link speed by Ethtool forced speed
+ * @speed: ethtool forced speed
+ */
+static u16 ice_speed_to_aq_link(int speed)
+{
+       int aq_speed;
+
+       switch (speed) {
+       case SPEED_10:
+               aq_speed = ICE_AQ_LINK_SPEED_10MB;
+               break;
+       case SPEED_100:
+               aq_speed = ICE_AQ_LINK_SPEED_100MB;
+               break;
+       case SPEED_1000:
+               aq_speed = ICE_AQ_LINK_SPEED_1000MB;
+               break;
+       case SPEED_2500:
+               aq_speed = ICE_AQ_LINK_SPEED_2500MB;
+               break;
+       case SPEED_5000:
+               aq_speed = ICE_AQ_LINK_SPEED_5GB;
+               break;
+       case SPEED_10000:
+               aq_speed = ICE_AQ_LINK_SPEED_10GB;
+               break;
+       case SPEED_20000:
+               aq_speed = ICE_AQ_LINK_SPEED_20GB;
+               break;
+       case SPEED_25000:
+               aq_speed = ICE_AQ_LINK_SPEED_25GB;
+               break;
+       case SPEED_40000:
+               aq_speed = ICE_AQ_LINK_SPEED_40GB;
+               break;
+       case SPEED_50000:
+               aq_speed = ICE_AQ_LINK_SPEED_50GB;
+               break;
+       case SPEED_100000:
+               aq_speed = ICE_AQ_LINK_SPEED_100GB;
+               break;
+       default:
+               aq_speed = ICE_AQ_LINK_SPEED_UNKNOWN;
+               break;
+       }
+       return aq_speed;
+}
+
 /**
  * ice_ksettings_find_adv_link_speed - Find advertising link speed
  * @ks: ethtool ksettings
@@ -2014,73 +2136,14 @@ done:
 static u16
 ice_ksettings_find_adv_link_speed(const struct ethtool_link_ksettings *ks)
 {
+       const struct ethtool_forced_speed_map *map;
        u16 adv_link_speed = 0;
 
-       if (ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 100baseT_Full))
-               adv_link_speed |= ICE_AQ_LINK_SPEED_100MB;
-       if (ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 1000baseX_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 1000baseT_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 1000baseKX_Full))
-               adv_link_speed |= ICE_AQ_LINK_SPEED_1000MB;
-       if (ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 2500baseT_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 2500baseX_Full))
-               adv_link_speed |= ICE_AQ_LINK_SPEED_2500MB;
-       if (ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 5000baseT_Full))
-               adv_link_speed |= ICE_AQ_LINK_SPEED_5GB;
-       if (ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 10000baseT_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 10000baseKR_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 10000baseSR_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 10000baseLR_Full))
-               adv_link_speed |= ICE_AQ_LINK_SPEED_10GB;
-       if (ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 25000baseCR_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 25000baseSR_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 25000baseKR_Full))
-               adv_link_speed |= ICE_AQ_LINK_SPEED_25GB;
-       if (ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 40000baseCR4_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 40000baseSR4_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 40000baseLR4_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 40000baseKR4_Full))
-               adv_link_speed |= ICE_AQ_LINK_SPEED_40GB;
-       if (ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 50000baseCR2_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 50000baseKR2_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 50000baseSR2_Full))
-               adv_link_speed |= ICE_AQ_LINK_SPEED_50GB;
-       if (ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 100000baseCR4_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 100000baseSR4_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 100000baseLR4_ER4_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 100000baseKR4_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 100000baseCR2_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 100000baseSR2_Full) ||
-           ethtool_link_ksettings_test_link_mode(ks, advertising,
-                                                 100000baseKR2_Full))
-               adv_link_speed |= ICE_AQ_LINK_SPEED_100GB;
+       for (u32 i = 0; i < ARRAY_SIZE(ice_adv_lnk_speed_maps); i++) {
+               map = ice_adv_lnk_speed_maps + i;
+               if (linkmode_intersects(ks->link_modes.advertising, map->caps))
+                       adv_link_speed |= ice_speed_to_aq_link(map->speed);
+       }
 
        return adv_link_speed;
 }

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index c726913bc6353be87f743d588029a8779fd6abed..0dd7f23395b079f71189aac028895af48b161182 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -5633,6 +5633,8 @@ static int __init ice_module_init(void)
        pr_info("%s\n", ice_driver_string);
        pr_info("%s\n", ice_copyright);
 
+       ice_adv_lnk_speed_maps_init();
+
        ice_wq = alloc_workqueue("%s", 0, 0, KBUILD_MODNAME);
        if (!ice_wq) {
                pr_err("Failed to create workqueue\n");