Prepare to introduce new attributes to ethtool module API by making
some of the names more generic.
Rename:
ethtool_module_power_mode_params -> ethtool_module_power_params
This structure will have more fields than just mode or mode_policy.
get_module_power_mode -> get_module_power_cfg
set_module_power_mode -> set_module_power_cfg
Those operations are going to be used for more cases than just
setting or getting power mode.
Reviewed-by: Marcin Szycik <marcin.szy...@linux.intel.com>
Signed-off-by: Wojciech Drewek <wojciech.dre...@intel.com>
---
.../net/ethernet/mellanox/mlxsw/core_env.c | 2 +-
.../net/ethernet/mellanox/mlxsw/core_env.h | 2 +-
drivers/net/ethernet/mellanox/mlxsw/minimal.c | 8 +++---
.../mellanox/mlxsw/spectrum_ethtool.c | 8 +++---
include/linux/ethtool.h | 20 ++++++-------
net/ethtool/module.c | 28 +++++++++----------
6 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_env.c
b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
index 53b150b7ae4e..3d7841f0ceec 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core_env.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
@@ -581,7 +581,7 @@ EXPORT_SYMBOL(mlxsw_env_reset_module);
int
mlxsw_env_get_module_power_mode(struct mlxsw_core *mlxsw_core, u8 slot_index,
u8 module,
- struct ethtool_module_power_mode_params *params,
+ struct ethtool_module_power_params *params,
struct netlink_ext_ack *extack)
{
struct mlxsw_env *mlxsw_env = mlxsw_core_env(mlxsw_core);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_env.h
b/drivers/net/ethernet/mellanox/mlxsw/core_env.h
index a197e3ae069c..979a35e967b3 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core_env.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_env.h
@@ -35,7 +35,7 @@ int mlxsw_env_reset_module(struct net_device *netdev,
int
mlxsw_env_get_module_power_mode(struct mlxsw_core *mlxsw_core, u8 slot_index,
u8 module,
- struct ethtool_module_power_mode_params *params,
+ struct ethtool_module_power_params *params,
struct netlink_ext_ack *extack);
int
diff --git a/drivers/net/ethernet/mellanox/mlxsw/minimal.c
b/drivers/net/ethernet/mellanox/mlxsw/minimal.c
index f0ceb196a6ce..df46962e92b4 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/minimal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/minimal.c
@@ -152,7 +152,7 @@ static int mlxsw_m_reset(struct net_device *netdev, u32
*flags)
static int
mlxsw_m_get_module_power_mode(struct net_device *netdev,
- struct ethtool_module_power_mode_params *params,
+ struct ethtool_module_power_params *params,
struct netlink_ext_ack *extack)
{
struct mlxsw_m_port *mlxsw_m_port = netdev_priv(netdev);
@@ -165,7 +165,7 @@ mlxsw_m_get_module_power_mode(struct net_device *netdev,
static int
mlxsw_m_set_module_power_mode(struct net_device *netdev,
- const struct ethtool_module_power_mode_params
*params,
+ const struct ethtool_module_power_params *params,
struct netlink_ext_ack *extack)
{
struct mlxsw_m_port *mlxsw_m_port = netdev_priv(netdev);
@@ -182,8 +182,8 @@ static const struct ethtool_ops mlxsw_m_port_ethtool_ops = {
.get_module_eeprom = mlxsw_m_get_module_eeprom,
.get_module_eeprom_by_page = mlxsw_m_get_module_eeprom_by_page,
.reset = mlxsw_m_reset,
- .get_module_power_mode = mlxsw_m_get_module_power_mode,
- .set_module_power_mode = mlxsw_m_set_module_power_mode,
+ .get_module_power_cfg = mlxsw_m_get_module_power_mode,
+ .set_module_power_cfg = mlxsw_m_set_module_power_mode,
};
static int
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c
b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c
index 0f29e9c19411..5ea7241bfaba 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c
@@ -1214,7 +1214,7 @@ static int mlxsw_sp_reset(struct net_device *dev, u32
*flags)
static int
mlxsw_sp_get_module_power_mode(struct net_device *dev,
- struct ethtool_module_power_mode_params *params,
+ struct ethtool_module_power_params *params,
struct netlink_ext_ack *extack)
{
struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);
@@ -1228,7 +1228,7 @@ mlxsw_sp_get_module_power_mode(struct net_device *dev,
static int
mlxsw_sp_set_module_power_mode(struct net_device *dev,
- const struct ethtool_module_power_mode_params
*params,
+ const struct ethtool_module_power_params *params,
struct netlink_ext_ack *extack)
{
struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);
@@ -1262,8 +1262,8 @@ const struct ethtool_ops mlxsw_sp_port_ethtool_ops = {
.get_eth_ctrl_stats = mlxsw_sp_get_eth_ctrl_stats,
.get_rmon_stats = mlxsw_sp_get_rmon_stats,
.reset = mlxsw_sp_reset,
- .get_module_power_mode = mlxsw_sp_get_module_power_mode,
- .set_module_power_mode = mlxsw_sp_set_module_power_mode,
+ .get_module_power_cfg = mlxsw_sp_get_module_power_mode,
+ .set_module_power_cfg = mlxsw_sp_set_module_power_mode,
};
struct mlxsw_sp1_port_link_mode {
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 9901e563f706..f3af6b31c9f1 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -506,12 +506,12 @@ struct ethtool_module_eeprom {
};
/**
- * struct ethtool_module_power_mode_params - module power mode parameters
+ * struct ethtool_module_power_params - module power parameters
* @policy: The power mode policy enforced by the host for the plug-in module.
* @mode: The operational power mode of the plug-in module. Should be filled by
* device drivers on get operations.
*/
-struct ethtool_module_power_mode_params {
+struct ethtool_module_power_params {
enum ethtool_module_power_mode_policy policy;
enum ethtool_module_power_mode mode;
};
@@ -804,10 +804,10 @@ struct ethtool_rxfh_param {
* @get_eth_ctrl_stats: Query some of the IEEE 802.3 MAC Ctrl statistics.
* @get_rmon_stats: Query some of the RMON (RFC 2819) statistics.
* Set %ranges to a pointer to zero-terminated array of byte ranges.
- * @get_module_power_mode: Get the power mode policy for the plug-in module
+ * @get_module_power_cfg: Get the power mode policy for the plug-in module
* used by the network device and its operational power mode, if
* plugged-in.
- * @set_module_power_mode: Set the power mode policy for the plug-in module
+ * @set_module_power_cfg: Set the power mode policy for the plug-in module
* used by the network device.
* @get_mm: Query the 802.3 MAC Merge layer state.
* @set_mm: Set the 802.3 MAC Merge layer parameters.
@@ -940,12 +940,12 @@ struct ethtool_ops {
void (*get_rmon_stats)(struct net_device *dev,
struct ethtool_rmon_stats *rmon_stats,
const struct ethtool_rmon_hist_range
**ranges);
- int (*get_module_power_mode)(struct net_device *dev,
- struct
ethtool_module_power_mode_params *params,
- struct netlink_ext_ack *extack);
- int (*set_module_power_mode)(struct net_device *dev,
- const struct
ethtool_module_power_mode_params *params,
- struct netlink_ext_ack *extack);
+ int (*get_module_power_cfg)(struct net_device *dev,
+ struct ethtool_module_power_params
*params,
+ struct netlink_ext_ack *extack);
+ int (*set_module_power_cfg)(struct net_device *dev,
+ const struct
ethtool_module_power_params *params,
+ struct netlink_ext_ack *extack);
int (*get_mm)(struct net_device *dev, struct ethtool_mm_state
*state);
int (*set_mm)(struct net_device *dev, struct ethtool_mm_cfg *cfg,
struct netlink_ext_ack *extack);
diff --git a/net/ethtool/module.c b/net/ethtool/module.c
index ceb575efc290..193ca4642e04 100644
--- a/net/ethtool/module.c
+++ b/net/ethtool/module.c
@@ -12,7 +12,7 @@ struct module_req_info {
struct module_reply_data {
struct ethnl_reply_data base;
- struct ethtool_module_power_mode_params power;
+ struct ethtool_module_power_params power;
};
#define MODULE_REPDATA(__reply_base) \
@@ -24,16 +24,16 @@ const struct nla_policy
ethnl_module_get_policy[ETHTOOL_A_MODULE_HEADER + 1] = {
[ETHTOOL_A_MODULE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy),
};
-static int module_get_power_mode(struct net_device *dev,
- struct module_reply_data *data,
- struct netlink_ext_ack *extack)
+static int module_get_power_cfg(struct net_device *dev,
+ struct module_reply_data *data,
+ struct netlink_ext_ack *extack)
{
const struct ethtool_ops *ops = dev->ethtool_ops;
- if (!ops->get_module_power_mode)
+ if (!ops->get_module_power_cfg)
return 0;
- return ops->get_module_power_mode(dev, &data->power, extack);
+ return ops->get_module_power_cfg(dev, &data->power, extack);
}
static int module_prepare_data(const struct ethnl_req_info *req_base,
@@ -48,7 +48,7 @@ static int module_prepare_data(const struct ethnl_req_info
*req_base,
if (ret < 0)
return ret;
- ret = module_get_power_mode(dev, data, info->extack);
+ ret = module_get_power_cfg(dev, data, info->extack);
if (ret < 0)
goto out_complete;
@@ -109,10 +109,8 @@ ethnl_set_module_validate(struct ethnl_req_info *req_info,
if (!tb[ETHTOOL_A_MODULE_POWER_MODE_POLICY])
return 0;
- if (!ops->get_module_power_mode || !ops->set_module_power_mode) {
- NL_SET_ERR_MSG_ATTR(info->extack,
- tb[ETHTOOL_A_MODULE_POWER_MODE_POLICY],
- "Setting power mode policy is not supported
by this device");
+ if (!ops->get_module_power_cfg || !ops->set_module_power_cfg) {
+ NL_SET_ERR_MSG(info->extack, "Setting power config is not
supported by this device");
return -EOPNOTSUPP;
}
@@ -122,8 +120,8 @@ ethnl_set_module_validate(struct ethnl_req_info *req_info,
static int
ethnl_set_module(struct ethnl_req_info *req_info, struct genl_info *info)
{
- struct ethtool_module_power_mode_params power = {};
- struct ethtool_module_power_mode_params power_new;
+ struct ethtool_module_power_params power = {};
+ struct ethtool_module_power_params power_new;
const struct ethtool_ops *ops;
struct net_device *dev = req_info->dev;
struct nlattr **tb = info->attrs;
@@ -132,14 +130,14 @@ ethnl_set_module(struct ethnl_req_info *req_info, struct
genl_info *info)
ops = dev->ethtool_ops;
power_new.policy = nla_get_u8(tb[ETHTOOL_A_MODULE_POWER_MODE_POLICY]);
- ret = ops->get_module_power_mode(dev, &power, info->extack);
+ ret = ops->get_module_power_cfg(dev, &power, info->extack);
if (ret < 0)
return ret;
if (power_new.policy == power.policy)
return 0;
- ret = ops->set_module_power_mode(dev, &power_new, info->extack);
+ ret = ops->set_module_power_cfg(dev, &power_new, info->extack);
return ret < 0 ? ret : 1;
}
--
2.40.1
