* [PATCH iwl-next 0/2] ethtool: Add link mode maps for forced speeds
@ 2023-09-21 13:51 Pawel Chmielewski
2023-09-21 13:51 ` [PATCH net-next v2 1/2] ethtool: Add forced speed to supported link modes maps Pawel Chmielewski
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Pawel Chmielewski @ 2023-09-21 13:51 UTC (permalink / raw)
To: netdev; +Cc: intel-wired-lan, andrew, aelior, manishc, horms,
Pawel Chmielewski
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:
v1->v2:
Fixed formatting, typo, moved declaration of iterator to loop line.
Paul Greenwalt (1):
ethtool: Add forced speed to supported link modes maps
Pawel Chmielewski (1):
ice: Refactor finding advertised link speed
drivers/net/ethernet/intel/ice/ice.h | 1 +
drivers/net/ethernet/intel/ice/ice_ethtool.c | 201 ++++++++++++------
drivers/net/ethernet/intel/ice/ice_main.c | 2 +
.../net/ethernet/qlogic/qede/qede_ethtool.c | 24 +--
include/linux/ethtool.h | 20 ++
net/ethtool/ioctl.c | 15 ++
6 files changed, 178 insertions(+), 85 deletions(-)
--
2.37.3
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net-next v2 1/2] ethtool: Add forced speed to supported link modes maps
2023-09-21 13:51 [PATCH iwl-next 0/2] ethtool: Add link mode maps for forced speeds Pawel Chmielewski
@ 2023-09-21 13:51 ` Pawel Chmielewski
2023-09-21 13:51 ` [PATCH net-next v2 2/2] ice: Refactor finding advertised link speed Pawel Chmielewski
2023-09-22 11:05 ` [Intel-wired-lan] [PATCH iwl-next 0/2] ethtool: Add link mode maps for forced speeds Przemek Kitszel
2 siblings, 0 replies; 5+ messages in thread
From: Pawel Chmielewski @ 2023-09-21 13:51 UTC (permalink / raw)
To: netdev
Cc: intel-wired-lan, andrew, aelior, manishc, horms, Paul Greenwalt,
Pawel Chmielewski
From: Paul Greenwalt <paul.greenwalt@intel.com>
The need to map Ethtool forced speeds to Ethtool supported link modes is
common among drivers. To support this, add a common structure for forced
speed maps and a function to init them. This is solution was originally
introduced in commit 1d4e4ecccb11 ("qede: populate supported link modes
maps on module init") for qede driver.
ethtool_forced_speed_maps_init() should be called during driver init
with an array of struct ethtool_forced_speed_map to populate the mapping.
Definitions for maps themselves are left in the driver code, as the sets
of supported link modes may vary between the devices.
The qede driver was compile tested only.
Suggested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Paul Greenwalt <paul.greenwalt@intel.com>
Signed-off-by: Pawel Chmielewski <pawel.chmielewski@intel.com>
---
.../net/ethernet/qlogic/qede/qede_ethtool.c | 39 ++++++-------------
include/linux/ethtool.h | 20 ++++++++++
net/ethtool/ioctl.c | 13 +++++++
3 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
index 95820cf1cd6c..f018afb2362f 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
@@ -201,14 +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, \
@@ -263,28 +255,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 = {
+ 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),
};
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 +549,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;
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 62b61527bcc4..4e2c1d07df38 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -1052,4 +1052,24 @@ 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;
+};
+
+/**
+ * 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.
+ */
+void ethtool_forced_speed_maps_init(struct ethtool_forced_speed_map *maps,
+ u32 size);
#endif /* _LINUX_ETHTOOL_H */
diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index 0b0ce4f81c01..9e62066376da 100644
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -3388,3 +3388,16 @@ void ethtool_rx_flow_rule_destroy(struct ethtool_rx_flow_rule *flow)
kfree(flow);
}
EXPORT_SYMBOL(ethtool_rx_flow_rule_destroy);
+
+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;
+ }
+}
+EXPORT_SYMBOL(ethtool_forced_speed_maps_init);
\ No newline at end of file
--
2.37.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net-next v2 2/2] ice: Refactor finding advertised link speed
2023-09-21 13:51 [PATCH iwl-next 0/2] ethtool: Add link mode maps for forced speeds Pawel Chmielewski
2023-09-21 13:51 ` [PATCH net-next v2 1/2] ethtool: Add forced speed to supported link modes maps Pawel Chmielewski
@ 2023-09-21 13:51 ` Pawel Chmielewski
2023-09-22 11:04 ` [Intel-wired-lan] " Przemek Kitszel
2023-09-22 11:05 ` [Intel-wired-lan] [PATCH iwl-next 0/2] ethtool: Add link mode maps for forced speeds Przemek Kitszel
2 siblings, 1 reply; 5+ messages in thread
From: Pawel Chmielewski @ 2023-09-21 13:51 UTC (permalink / raw)
To: netdev
Cc: intel-wired-lan, andrew, aelior, manishc, horms,
Pawel Chmielewski, Paul Greenwalt
Refactor ice_get_link_ksettings to using forced speed to link modes mapping.
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 | 200 +++++++++++++------
drivers/net/ethernet/intel/ice/ice_main.c | 2 +
3 files changed, 138 insertions(+), 65 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index 5022b036ca4f..5eda0fa39d81 100644
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -942,6 +942,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 ad4d4702129f..8b84bb539e1a 100644
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -345,6 +345,86 @@ 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,
+};
+
+#define ICE_ADV_LNK_SPEED_MAP(value) \
+{ \
+ .speed = SPEED_##value, \
+ .cap_arr = ice_adv_lnk_speed_##value, \
+ .arr_size = ARRAY_SIZE(ice_adv_lnk_speed_##value), \
+}
+
+static struct ethtool_forced_speed_map ice_adv_lnk_speed_maps[] __ro_after_init = {
+ ICE_ADV_LNK_SPEED_MAP(100),
+ ICE_ADV_LNK_SPEED_MAP(1000),
+ ICE_ADV_LNK_SPEED_MAP(2500),
+ ICE_ADV_LNK_SPEED_MAP(5000),
+ ICE_ADV_LNK_SPEED_MAP(10000),
+ ICE_ADV_LNK_SPEED_MAP(25000),
+ ICE_ADV_LNK_SPEED_MAP(40000),
+ ICE_ADV_LNK_SPEED_MAP(50000),
+ ICE_ADV_LNK_SPEED_MAP(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 +2087,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 +2143,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;
}
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index c8286adae946..04047f869a99 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -5627,6 +5627,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");
--
2.37.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Intel-wired-lan] [PATCH net-next v2 2/2] ice: Refactor finding advertised link speed
2023-09-21 13:51 ` [PATCH net-next v2 2/2] ice: Refactor finding advertised link speed Pawel Chmielewski
@ 2023-09-22 11:04 ` Przemek Kitszel
0 siblings, 0 replies; 5+ messages in thread
From: Przemek Kitszel @ 2023-09-22 11:04 UTC (permalink / raw)
To: Pawel Chmielewski, netdev
Cc: andrew, aelior, manishc, intel-wired-lan, horms, Paul Greenwalt
On 9/21/23 15:51, Pawel Chmielewski wrote:
> Refactor ice_get_link_ksettings to using forced speed to link modes mapping.
>
> 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>
minor: your SB should be last
> ---
> drivers/net/ethernet/intel/ice/ice.h | 1 +
> drivers/net/ethernet/intel/ice/ice_ethtool.c | 200 +++++++++++++------
> drivers/net/ethernet/intel/ice/ice_main.c | 2 +
> 3 files changed, 138 insertions(+), 65 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
> index 5022b036ca4f..5eda0fa39d81 100644
> --- a/drivers/net/ethernet/intel/ice/ice.h
> +++ b/drivers/net/ethernet/intel/ice/ice.h
> @@ -942,6 +942,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 ad4d4702129f..8b84bb539e1a 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
> @@ -345,6 +345,86 @@ 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,
> +};
> +
> +#define ICE_ADV_LNK_SPEED_MAP(value) \
> +{ \
> + .speed = SPEED_##value, \
> + .cap_arr = ice_adv_lnk_speed_##value, \
> + .arr_size = ARRAY_SIZE(ice_adv_lnk_speed_##value), \
> +}
> +
> +static struct ethtool_forced_speed_map ice_adv_lnk_speed_maps[] __ro_after_init = {
> + ICE_ADV_LNK_SPEED_MAP(100),
> + ICE_ADV_LNK_SPEED_MAP(1000),
> + ICE_ADV_LNK_SPEED_MAP(2500),
> + ICE_ADV_LNK_SPEED_MAP(5000),
> + ICE_ADV_LNK_SPEED_MAP(10000),
> + ICE_ADV_LNK_SPEED_MAP(25000),
> + ICE_ADV_LNK_SPEED_MAP(40000),
> + ICE_ADV_LNK_SPEED_MAP(50000),
> + ICE_ADV_LNK_SPEED_MAP(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 +2087,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;
minor: wrong whitespaces
> + break;
> + }
> + return aq_speed;
> +}
> +
> /**
> * ice_ksettings_find_adv_link_speed - Find advertising link speed
> * @ks: ethtool ksettings
> @@ -2014,73 +2143,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;
> }
> diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
> index c8286adae946..04047f869a99 100644
> --- a/drivers/net/ethernet/intel/ice/ice_main.c
> +++ b/drivers/net/ethernet/intel/ice/ice_main.c
> @@ -5627,6 +5627,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");
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-wired-lan] [PATCH iwl-next 0/2] ethtool: Add link mode maps for forced speeds
2023-09-21 13:51 [PATCH iwl-next 0/2] ethtool: Add link mode maps for forced speeds Pawel Chmielewski
2023-09-21 13:51 ` [PATCH net-next v2 1/2] ethtool: Add forced speed to supported link modes maps Pawel Chmielewski
2023-09-21 13:51 ` [PATCH net-next v2 2/2] ice: Refactor finding advertised link speed Pawel Chmielewski
@ 2023-09-22 11:05 ` Przemek Kitszel
2 siblings, 0 replies; 5+ messages in thread
From: Przemek Kitszel @ 2023-09-22 11:05 UTC (permalink / raw)
To: Pawel Chmielewski, netdev; +Cc: andrew, aelior, manishc, intel-wired-lan, horms
On 9/21/23 15:51, Pawel Chmielewski wrote:
> 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:
> v1->v2:
> Fixed formatting, typo, moved declaration of iterator to loop line.
>
> Paul Greenwalt (1):
> ethtool: Add forced speed to supported link modes maps
>
> Pawel Chmielewski (1):
> ice: Refactor finding advertised link speed
>
> drivers/net/ethernet/intel/ice/ice.h | 1 +
> drivers/net/ethernet/intel/ice/ice_ethtool.c | 201 ++++++++++++------
> drivers/net/ethernet/intel/ice/ice_main.c | 2 +
> .../net/ethernet/qlogic/qede/qede_ethtool.c | 24 +--
> include/linux/ethtool.h | 20 ++
> net/ethtool/ioctl.c | 15 ++
> 6 files changed, 178 insertions(+), 85 deletions(-)
>
Thanks,
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
(one minor whitespace error found,
for me personally we could go with it)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-09-22 11:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-21 13:51 [PATCH iwl-next 0/2] ethtool: Add link mode maps for forced speeds Pawel Chmielewski
2023-09-21 13:51 ` [PATCH net-next v2 1/2] ethtool: Add forced speed to supported link modes maps Pawel Chmielewski
2023-09-21 13:51 ` [PATCH net-next v2 2/2] ice: Refactor finding advertised link speed Pawel Chmielewski
2023-09-22 11:04 ` [Intel-wired-lan] " Przemek Kitszel
2023-09-22 11:05 ` [Intel-wired-lan] [PATCH iwl-next 0/2] ethtool: Add link mode maps for forced speeds Przemek Kitszel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).