diff mbox series

[iwl-next,2/7] ice: Refactor finding advertised link speed

Message ID 20230816235719.1120726-3-paul.greenwalt@intel.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series ice: Add basic E830 support | expand

Checks

Context Check Description
netdev/series_format warning Target tree name not specified in the subject
netdev/tree_selection success Guessed tree name to be net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 1330 this patch: 1330
netdev/cc_maintainers warning 5 maintainers not CCed: kuba@kernel.org davem@davemloft.net anthony.l.nguyen@intel.com pabeni@redhat.com edumazet@google.com
netdev/build_clang success Errors and warnings before: 1353 this patch: 1353
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 1353 this patch: 1353
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 195 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Greenwalt, Paul Aug. 16, 2023, 11:57 p.m. UTC 
From: Pawel Chmielewski <pawel.chmielewski@intel.com>

Refactor ice_get_link_ksettings by using lightweight static link mode
maps, populated at module init. This is an efficient solution introduced
in commit 1d4e4ecccb11 ("qede: populate supported link modes maps on
module init") for qede driver

Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Suggested-by : Alexander Lobakin <aleksander.lobakin@intel.com>
Signed-off-by: Pawel Chmielewski <pawel.chmielewski@intel.com>
Signed-off-by: Paul Greenwalt <paul.greenwalt@intel.com>
---
 drivers/net/ethernet/intel/ice/ice.h         |   1 +
 drivers/net/ethernet/intel/ice/ice_ethtool.c | 166 +++++++++++--------
 drivers/net/ethernet/intel/ice/ice_main.c    |   2 +
 3 files changed, 104 insertions(+), 65 deletions(-)

Comments

Andrew Lunn Aug. 17, 2023, 1 a.m. UTC | #1 
On Wed, Aug 16, 2023 at 04:57:14PM -0700, Paul Greenwalt wrote:
> From: Pawel Chmielewski <pawel.chmielewski@intel.com>
> 
> Refactor ice_get_link_ksettings by using lightweight static link mode
> maps, populated at module init. This is an efficient solution introduced
> in commit 1d4e4ecccb11 ("qede: populate supported link modes maps on
> module init") for qede driver

Could this actually be partially shared with that driver? Some are
identical. Maybe a generic implementation in net/ethtool/ ?

	   Andrew
Greenwalt, Paul Aug. 18, 2023, 4:29 p.m. UTC | #2 
Thanks for the good idea Andrew, and I'm working on a solution.

On 8/16/2023 6:00 PM, Andrew Lunn wrote:
> On Wed, Aug 16, 2023 at 04:57:14PM -0700, Paul Greenwalt wrote:
>> From: Pawel Chmielewski <pawel.chmielewski@intel.com>
>>
>> Refactor ice_get_link_ksettings by using lightweight static link mode
>> maps, populated at module init. This is an efficient solution introduced
>> in commit 1d4e4ecccb11 ("qede: populate supported link modes maps on
>> module init") for qede driver
> 
> Could this actually be partially shared with that driver? Some are
> identical. Maybe a generic implementation in net/ethtool/ ?
> 
> 	   Andrew
Paul Menzel Aug. 19, 2023, 5:11 a.m. UTC | #3 
Dear Paul, dear Pawel,


Thank you for your patch.

Am 17.08.23 um 01:57 schrieb Paul Greenwalt:
> From: Pawel Chmielewski <pawel.chmielewski@intel.com>
> 
> Refactor ice_get_link_ksettings by using lightweight static link mode
> maps, populated at module init. This is an efficient solution introduced
> in commit 1d4e4ecccb11 ("qede: populate supported link modes maps on
> module init") for qede driver

Please add a dot/period at the end of sentences.

It’d be great if you elaborated and maybe even added the measurements, 
how much more lightweight it is.

> Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> Suggested-by : Alexander Lobakin <aleksander.lobakin@intel.com>
> Signed-off-by: Pawel Chmielewski <pawel.chmielewski@intel.com>
> Signed-off-by: Paul Greenwalt <paul.greenwalt@intel.com>
> ---
>   drivers/net/ethernet/intel/ice/ice.h         |   1 +
>   drivers/net/ethernet/intel/ice/ice_ethtool.c | 166 +++++++++++--------
>   drivers/net/ethernet/intel/ice/ice_main.c    |   2 +
>   3 files changed, 104 insertions(+), 65 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
> index 5d307bacf7c6..1030a4d1d94e 100644
> --- a/drivers/net/ethernet/intel/ice/ice.h
> +++ b/drivers/net/ethernet/intel/ice/ice.h
> @@ -974,6 +974,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 d3cb08e66dcb..9a858d8ae26e 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
> @@ -345,6 +345,100 @@ 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,
> +};
> +
> +struct ice_adv_lnk_speed_map {
> +	__ETHTOOL_DECLARE_LINK_MODE_MASK(caps);
> +	const u32	*cap_arr;
> +	u16		arr_size;
> +	u16		aqc_link_speed;
> +};
> +
> +#define ICE_ADV_LNK_SPEED_MAP(value, aqc_value)			\
> +{								\
> +	.cap_arr	= ice_adv_lnk_speed_##value,		\
> +	.arr_size	= ARRAY_SIZE(ice_adv_lnk_speed_##value),\
> +	.aqc_link_speed	= ICE_AQ_LINK_SPEED_##aqc_value,	\
> +}
> +
> +static struct ice_adv_lnk_speed_map ice_adv_lnk_speed_maps[] __ro_after_init = {
> +	ICE_ADV_LNK_SPEED_MAP(100, 100MB),
> +	ICE_ADV_LNK_SPEED_MAP(1000, 1000MB),
> +	ICE_ADV_LNK_SPEED_MAP(2500, 2500MB),
> +	ICE_ADV_LNK_SPEED_MAP(5000, 5GB),
> +	ICE_ADV_LNK_SPEED_MAP(10000, 10GB),
> +	ICE_ADV_LNK_SPEED_MAP(25000, 25GB),
> +	ICE_ADV_LNK_SPEED_MAP(40000, 40GB),
> +	ICE_ADV_LNK_SPEED_MAP(50000, 50GB),
> +	ICE_ADV_LNK_SPEED_MAP(100000, 100GB),
> +};
> +
> +void __init ice_adv_lnk_speed_maps_init(void)
> +{
> +	u32 i;

Maybe even use the non-fixed length type `unsigned int` [1]?

> +
> +	for (i = 0; i < ARRAY_SIZE(ice_adv_lnk_speed_maps); i++) {
> +		struct ice_adv_lnk_speed_map *map = &ice_adv_lnk_speed_maps[i];
> +
> +		linkmode_set_bit_array(map->cap_arr, map->arr_size, map->caps);
> +		map->cap_arr = NULL;
> +		map->arr_size = 0;
> +	}
> +}
> +
>   static void
>   __ice_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo,
>   		  struct ice_vsi *vsi)
> @@ -2014,73 +2108,15 @@ ice_get_link_ksettings(struct net_device *netdev,
>   static u16
>   ice_ksettings_find_adv_link_speed(const struct ethtool_link_ksettings *ks)
>   {
> +	const struct ice_adv_lnk_speed_map *map;
>   	u16 adv_link_speed = 0;
> +	u32 i;
>   
> -	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 (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 |= map->aqc_link_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 356bf8884a63..ffed5543a5aa 100644
> --- a/drivers/net/ethernet/intel/ice/ice_main.c
> +++ b/drivers/net/ethernet/intel/ice/ice_main.c
> @@ -5672,6 +5672,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");


Kind regards,

Paul
diff mbox series

Patch

diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index 5d307bacf7c6..1030a4d1d94e 100644
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -974,6 +974,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 d3cb08e66dcb..9a858d8ae26e 100644
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -345,6 +345,100 @@  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,
+};
+
+struct ice_adv_lnk_speed_map {
+	__ETHTOOL_DECLARE_LINK_MODE_MASK(caps);
+	const u32	*cap_arr;
+	u16		arr_size;
+	u16		aqc_link_speed;
+};
+
+#define ICE_ADV_LNK_SPEED_MAP(value, aqc_value)			\
+{								\
+	.cap_arr	= ice_adv_lnk_speed_##value,		\
+	.arr_size	= ARRAY_SIZE(ice_adv_lnk_speed_##value),\
+	.aqc_link_speed	= ICE_AQ_LINK_SPEED_##aqc_value,	\
+}
+
+static struct ice_adv_lnk_speed_map ice_adv_lnk_speed_maps[] __ro_after_init = {
+	ICE_ADV_LNK_SPEED_MAP(100, 100MB),
+	ICE_ADV_LNK_SPEED_MAP(1000, 1000MB),
+	ICE_ADV_LNK_SPEED_MAP(2500, 2500MB),
+	ICE_ADV_LNK_SPEED_MAP(5000, 5GB),
+	ICE_ADV_LNK_SPEED_MAP(10000, 10GB),
+	ICE_ADV_LNK_SPEED_MAP(25000, 25GB),
+	ICE_ADV_LNK_SPEED_MAP(40000, 40GB),
+	ICE_ADV_LNK_SPEED_MAP(50000, 50GB),
+	ICE_ADV_LNK_SPEED_MAP(100000, 100GB),
+};
+
+void __init ice_adv_lnk_speed_maps_init(void)
+{
+	u32 i;
+
+	for (i = 0; i < ARRAY_SIZE(ice_adv_lnk_speed_maps); i++) {
+		struct ice_adv_lnk_speed_map *map = &ice_adv_lnk_speed_maps[i];
+
+		linkmode_set_bit_array(map->cap_arr, map->arr_size, map->caps);
+		map->cap_arr = NULL;
+		map->arr_size = 0;
+	}
+}
+
 static void
 __ice_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo,
 		  struct ice_vsi *vsi)
@@ -2014,73 +2108,15 @@  ice_get_link_ksettings(struct net_device *netdev,
 static u16
 ice_ksettings_find_adv_link_speed(const struct ethtool_link_ksettings *ks)
 {
+	const struct ice_adv_lnk_speed_map *map;
 	u16 adv_link_speed = 0;
+	u32 i;
 
-	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 (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 |= map->aqc_link_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 356bf8884a63..ffed5543a5aa 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -5672,6 +5672,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");