Skip to content

Commit

Permalink
ethtool: add linkmode bitmap support to struct ethtool_keee
Browse files Browse the repository at this point in the history 
Add linkmode bitmap members to struct ethtool_keee, but keep the legacy
u32 bitmaps for compatibility with existing drivers.
Use linkmode "supported" not being empty as indicator that a user wants
to use the linkmode bitmap members instead of the legacy bitmaps.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Heiner Kallweit authored and David S. Miller committed Jan 31, 2024
1 parent 1d756ff commit 1f069de
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 17 deletions.
3 changes: 3 additions & 0 deletions include/linux/ethtool.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,9 @@ __ethtool_get_link_ksettings(struct net_device *dev,
struct ethtool_link_ksettings *link_ksettings);

struct ethtool_keee {
__ETHTOOL_DECLARE_LINK_MODE_MASK(supported);
__ETHTOOL_DECLARE_LINK_MODE_MASK(advertised);
__ETHTOOL_DECLARE_LINK_MODE_MASK(lp_advertised);
u32 supported_u32;
u32 advertised_u32;
u32 lp_advertised_u32;
Expand Down
5 changes: 5 additions & 0 deletions net/ethtool/common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -712,3 +712,8 @@ ethtool_forced_speed_maps_init(struct ethtool_forced_speed_map *maps, u32 size)
}
}
EXPORT_SYMBOL_GPL(ethtool_forced_speed_maps_init);

bool ethtool_eee_use_linkmodes(const struct ethtool_keee *eee)
{
return !linkmode_empty(eee->supported);
}
1 change: 1 addition & 0 deletions net/ethtool/common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,6 @@ int ethtool_get_module_eeprom_call(struct net_device *dev,
struct ethtool_eeprom *ee, u8 *data);

bool __ethtool_dev_mm_supported(struct net_device *dev);
bool ethtool_eee_use_linkmodes(const struct ethtool_keee *eee);

#endif /* _ETHTOOL_COMMON_H */
49 changes: 35 additions & 14 deletions net/ethtool/eee.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,26 @@ static int eee_prepare_data(const struct ethnl_req_info *req_base,
{
struct eee_reply_data *data = EEE_REPDATA(reply_base);
struct net_device *dev = reply_base->dev;
struct ethtool_keee *eee = &data->eee;
int ret;

if (!dev->ethtool_ops->get_eee)
return -EOPNOTSUPP;
ret = ethnl_ops_begin(dev);
if (ret < 0)
return ret;
ret = dev->ethtool_ops->get_eee(dev, &data->eee);
ret = dev->ethtool_ops->get_eee(dev, eee);
ethnl_ops_complete(dev);

if (!ret && !ethtool_eee_use_linkmodes(eee)) {
ethtool_convert_legacy_u32_to_link_mode(eee->supported,
eee->supported_u32);
ethtool_convert_legacy_u32_to_link_mode(eee->advertised,
eee->advertised_u32);
ethtool_convert_legacy_u32_to_link_mode(eee->lp_advertised,
eee->lp_advertised_u32);
}

return ret;
}

Expand All @@ -58,14 +68,16 @@ static int eee_reply_size(const struct ethnl_req_info *req_base,
EEE_MODES_COUNT);

/* MODES_OURS */
ret = ethnl_bitset32_size(&eee->advertised_u32, &eee->supported_u32,
EEE_MODES_COUNT, link_mode_names, compact);
ret = ethnl_bitset_size(eee->advertised, eee->supported,
__ETHTOOL_LINK_MODE_MASK_NBITS,
link_mode_names, compact);
if (ret < 0)
return ret;
len += ret;
/* MODES_PEERS */
ret = ethnl_bitset32_size(&eee->lp_advertised_u32, NULL,
EEE_MODES_COUNT, link_mode_names, compact);
ret = ethnl_bitset_size(eee->lp_advertised, NULL,
__ETHTOOL_LINK_MODE_MASK_NBITS,
link_mode_names, compact);
if (ret < 0)
return ret;
len += ret;
Expand All @@ -87,14 +99,16 @@ static int eee_fill_reply(struct sk_buff *skb,
const struct ethtool_keee *eee = &data->eee;
int ret;

ret = ethnl_put_bitset32(skb, ETHTOOL_A_EEE_MODES_OURS,
&eee->advertised_u32, &eee->supported_u32,
EEE_MODES_COUNT, link_mode_names, compact);
ret = ethnl_put_bitset(skb, ETHTOOL_A_EEE_MODES_OURS,
eee->advertised, eee->supported,
__ETHTOOL_LINK_MODE_MASK_NBITS,
link_mode_names, compact);
if (ret < 0)
return ret;
ret = ethnl_put_bitset32(skb, ETHTOOL_A_EEE_MODES_PEER,
&eee->lp_advertised_u32, NULL, EEE_MODES_COUNT,
link_mode_names, compact);
ret = ethnl_put_bitset(skb, ETHTOOL_A_EEE_MODES_PEER,
eee->lp_advertised, NULL,
__ETHTOOL_LINK_MODE_MASK_NBITS,
link_mode_names, compact);
if (ret < 0)
return ret;

Expand Down Expand Up @@ -140,9 +154,16 @@ ethnl_set_eee(struct ethnl_req_info *req_info, struct genl_info *info)
if (ret < 0)
return ret;

ret = ethnl_update_bitset32(&eee.advertised_u32, EEE_MODES_COUNT,
tb[ETHTOOL_A_EEE_MODES_OURS],
link_mode_names, info->extack, &mod);
if (ethtool_eee_use_linkmodes(&eee)) {
ret = ethnl_update_bitset(eee.advertised,
__ETHTOOL_LINK_MODE_MASK_NBITS,
tb[ETHTOOL_A_EEE_MODES_OURS],
link_mode_names, info->extack, &mod);
} else {
ret = ethnl_update_bitset32(&eee.advertised_u32, EEE_MODES_COUNT,
tb[ETHTOOL_A_EEE_MODES_OURS],
link_mode_names, info->extack, &mod);
}
if (ret < 0)
return ret;
ethnl_update_bool(&eee.eee_enabled, tb[ETHTOOL_A_EEE_ENABLED], &mod);
Expand Down
27 changes: 24 additions & 3 deletions net/ethtool/ioctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1520,20 +1520,41 @@ static void eee_to_keee(struct ethtool_keee *keee,
keee->eee_enabled = eee->eee_enabled;
keee->tx_lpi_enabled = eee->tx_lpi_enabled;
keee->tx_lpi_timer = eee->tx_lpi_timer;

ethtool_convert_legacy_u32_to_link_mode(keee->supported,
eee->supported);
ethtool_convert_legacy_u32_to_link_mode(keee->advertised,
eee->advertised);
ethtool_convert_legacy_u32_to_link_mode(keee->lp_advertised,
eee->lp_advertised);
}

static void keee_to_eee(struct ethtool_eee *eee,
const struct ethtool_keee *keee)
{
memset(eee, 0, sizeof(*eee));

eee->supported = keee->supported_u32;
eee->advertised = keee->advertised_u32;
eee->lp_advertised = keee->lp_advertised_u32;
eee->eee_active = keee->eee_active;
eee->eee_enabled = keee->eee_enabled;
eee->tx_lpi_enabled = keee->tx_lpi_enabled;
eee->tx_lpi_timer = keee->tx_lpi_timer;

if (ethtool_eee_use_linkmodes(keee)) {
bool overflow;

overflow = !ethtool_convert_link_mode_to_legacy_u32(&eee->supported,
keee->supported);
ethtool_convert_link_mode_to_legacy_u32(&eee->advertised,
keee->advertised);
ethtool_convert_link_mode_to_legacy_u32(&eee->lp_advertised,
keee->lp_advertised);
if (overflow)
pr_warn("Ethtool ioctl interface doesn't support passing EEE linkmodes beyond bit 32\n");
} else {
eee->supported = keee->supported_u32;
eee->advertised = keee->advertised_u32;
eee->lp_advertised = keee->lp_advertised_u32;
}
}

static int ethtool_get_eee(struct net_device *dev, char __user *useraddr)
Expand Down

0 comments on commit 1f069de

Please sign in to comment.