Commit 810799a0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ethtool-forced-speed' 

Paul Greenwalt says:

====================
ethtool: Add link mode maps for forced speeds

The following patch set was initially a part of [1]. As the purpose of the
original series was to add the support of the new hardware to the intel ice
driver, the refactoring of advertised link modes mapping was extracted to a
new set.

The patch set adds a common mechanism for mapping Ethtool forced speeds
with Ethtool supported link modes, which can be used in drivers code.

[1] https://lore.kernel.org/netdev/20230823180633.2450617-1-pawel.chmielewski@intel.com



Changelog:
v4->v5:
Separated ethtool and qede changes into two patches, fixed indentation,
and moved ethtool_forced_speed_maps_init() from ioctl.c to ethtool.h

v3->v4:
Moved the macro for setting fields into the common header file

v2->v3:
Fixed whitespaces, added missing line at end of file

v1->v2:
Fixed formatting, typo, moved declaration of iterator to loop line.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a0a86022 982b0192

drivers/net/ethernet/intel/ice/ice.h

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/net/ethernet/intel/ice/ice_ethtool.c

+128 −65
Original line number Diff line number Diff line
@@ -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 @@ ice_get_link_ksettings(struct net_device *netdev, 
	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 @@ ice_get_link_ksettings(struct net_device *netdev, 
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;

}

drivers/net/ethernet/intel/ice/ice_main.c

+2 −0
Original line number Diff line number Diff line
@@ -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");

drivers/net/ethernet/qlogic/qede/qede_ethtool.c

+12 −34
Original line number Diff line number Diff line
@@ -201,21 +201,6 @@ static const char qede_tests_str_arr[QEDE_ETHTOOL_TEST_MAX][ETH_GSTRING_LEN] = { 


/* Forced speed capabilities maps */



struct qede_forced_speed_map {

	u32		speed;

	__ETHTOOL_DECLARE_LINK_MODE_MASK(caps);



	const u32	*cap_arr;

	u32		arr_size;

};



#define QEDE_FORCED_SPEED_MAP(value)					\

{									\

	.speed		= SPEED_##value,				\

	.cap_arr	= qede_forced_speed_##value,			\

	.arr_size	= ARRAY_SIZE(qede_forced_speed_##value),	\

}



static const u32 qede_forced_speed_1000[] __initconst = {

	ETHTOOL_LINK_MODE_1000baseT_Full_BIT,

	ETHTOOL_LINK_MODE_1000baseKX_Full_BIT,
@@ -263,28 +248,21 @@ static const u32 qede_forced_speed_100000[] __initconst = { 
	ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT,

};



static struct qede_forced_speed_map qede_forced_speed_maps[] __ro_after_init = {

	QEDE_FORCED_SPEED_MAP(1000),

	QEDE_FORCED_SPEED_MAP(10000),

	QEDE_FORCED_SPEED_MAP(20000),

	QEDE_FORCED_SPEED_MAP(25000),

	QEDE_FORCED_SPEED_MAP(40000),

	QEDE_FORCED_SPEED_MAP(50000),

	QEDE_FORCED_SPEED_MAP(100000),

static struct ethtool_forced_speed_map

qede_forced_speed_maps[] __ro_after_init = {

	ETHTOOL_FORCED_SPEED_MAP(qede_forced_speed, 1000),

	ETHTOOL_FORCED_SPEED_MAP(qede_forced_speed, 10000),

	ETHTOOL_FORCED_SPEED_MAP(qede_forced_speed, 20000),

	ETHTOOL_FORCED_SPEED_MAP(qede_forced_speed, 25000),

	ETHTOOL_FORCED_SPEED_MAP(qede_forced_speed, 40000),

	ETHTOOL_FORCED_SPEED_MAP(qede_forced_speed, 50000),

	ETHTOOL_FORCED_SPEED_MAP(qede_forced_speed, 100000),

};



void __init qede_forced_speed_maps_init(void)

{

	struct qede_forced_speed_map *map;

	u32 i;



	for (i = 0; i < ARRAY_SIZE(qede_forced_speed_maps); i++) {

		map = qede_forced_speed_maps + i;



		linkmode_set_bit_array(map->cap_arr, map->arr_size, map->caps);

		map->cap_arr = NULL;

		map->arr_size = 0;

	}

	ethtool_forced_speed_maps_init(qede_forced_speed_maps,

				       ARRAY_SIZE(qede_forced_speed_maps));

}



/* Ethtool callbacks */
@@ -564,8 +542,8 @@ static int qede_set_link_ksettings(struct net_device *dev, 
				   const struct ethtool_link_ksettings *cmd)

{

	const struct ethtool_link_settings *base = &cmd->base;

	const struct ethtool_forced_speed_map *map;

	struct qede_dev *edev = netdev_priv(dev);

	const struct qede_forced_speed_map *map;

	struct qed_link_output current_link;

	struct qed_link_params params;

	u32 i;

include/linux/ethtool.h

+37 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#ifndef _LINUX_ETHTOOL_H

#define _LINUX_ETHTOOL_H



#include <linux/linkmode.h>

#include <linux/bitmap.h>

#include <linux/compat.h>

#include <linux/if_ether.h>
@@ -1052,4 +1053,40 @@ static inline int ethtool_mm_frag_size_min_to_add(u32 val_min, u32 *val_add, 
 * next string.

 */

extern __printf(2, 3) void ethtool_sprintf(u8 **data, const char *fmt, ...);



/* Link mode to forced speed capabilities maps */

struct ethtool_forced_speed_map {

	u32		speed;

	__ETHTOOL_DECLARE_LINK_MODE_MASK(caps);



	const u32	*cap_arr;

	u32		arr_size;

};



#define ETHTOOL_FORCED_SPEED_MAP(prefix, value)				\

{									\

	.speed		= SPEED_##value,				\

	.cap_arr	= prefix##_##value,				\

	.arr_size	= ARRAY_SIZE(prefix##_##value),			\

}



/**

 * ethtool_forced_speed_maps_init

 * @maps: Pointer to an array of Ethtool forced speed map

 * @size: Array size

 *

 * Initialize an array of Ethtool forced speed map to Ethtool link modes. This

 * should be called during driver module init.

 */

static inline void

ethtool_forced_speed_maps_init(struct ethtool_forced_speed_map *maps, u32 size)

{

	for (u32 i = 0; i < size; i++) {

		struct ethtool_forced_speed_map *map = &maps[i];



		linkmode_set_bit_array(map->cap_arr, map->arr_size, map->caps);

		map->cap_arr = NULL;

		map->arr_size = 0;

	}

}

#endif /* _LINUX_ETHTOOL_H */