kevin/linux
1
Fork 0
Code

net: ethtool: plca: Target the command to the requested PHY

Browse Source 
PLCA is a PHY-specific command. Instead of targeting the command
towards dev->phydev, use the request to pick the targeted PHY.

Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Tested-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Maxime Chevallier 2024-08-21 17:10:03 +02:00 committed by David S. Miller
parent d3d9a3e48a
commit 02180fb525
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
net/ethtool/plca.c
View File

@ -25,7 +25,7 @@ struct plca_reply_data {
const struct nla_policy ethnl_plca_get_cfg_policy[] = { const struct nla_policy ethnl_plca_get_cfg_policy[] = {
[ETHTOOL_A_PLCA_HEADER] = [ETHTOOL_A_PLCA_HEADER] =
NLA_POLICY_NESTED(ethnl_header_policy), NLA_POLICY_NESTED(ethnl_header_policy_phy),
}; };
static void plca_update_sint(int *dst, struct nlattr **tb, u32 attrid, static void plca_update_sint(int *dst, struct nlattr **tb, u32 attrid,
@ -58,10 +58,14 @@ static int plca_get_cfg_prepare_data(const struct ethnl_req_info *req_base,
struct plca_reply_data *data = PLCA_REPDATA(reply_base); struct plca_reply_data *data = PLCA_REPDATA(reply_base);
struct net_device *dev = reply_base->dev; struct net_device *dev = reply_base->dev;
const struct ethtool_phy_ops *ops; const struct ethtool_phy_ops *ops;
struct nlattr **tb = info->attrs;
struct phy_device *phydev;
int ret; int ret;
phydev = ethnl_req_get_phydev(req_base, tb[ETHTOOL_A_PLCA_HEADER],
info->extack);
// check that the PHY device is available and connected // check that the PHY device is available and connected
if (!dev->phydev) { if (IS_ERR_OR_NULL(phydev)) {
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
goto out; goto out;
} }
@ -80,7 +84,7 @@ static int plca_get_cfg_prepare_data(const struct ethnl_req_info *req_base,
memset(&data->plca_cfg, 0xff, memset(&data->plca_cfg, 0xff,
sizeof_field(struct plca_reply_data, plca_cfg)); sizeof_field(struct plca_reply_data, plca_cfg));
ret = ops->get_plca_cfg(dev->phydev, &data->plca_cfg); ret = ops->get_plca_cfg(phydev, &data->plca_cfg);
ethnl_ops_complete(dev); ethnl_ops_complete(dev);
out: out:
@ -129,7 +133,7 @@ static int plca_get_cfg_fill_reply(struct sk_buff *skb,
const struct nla_policy ethnl_plca_set_cfg_policy[] = { const struct nla_policy ethnl_plca_set_cfg_policy[] = {
[ETHTOOL_A_PLCA_HEADER] = [ETHTOOL_A_PLCA_HEADER] =
NLA_POLICY_NESTED(ethnl_header_policy), NLA_POLICY_NESTED(ethnl_header_policy_phy),
[ETHTOOL_A_PLCA_ENABLED] = NLA_POLICY_MAX(NLA_U8, 1), [ETHTOOL_A_PLCA_ENABLED] = NLA_POLICY_MAX(NLA_U8, 1),
[ETHTOOL_A_PLCA_NODE_ID] = NLA_POLICY_MAX(NLA_U32, 255), [ETHTOOL_A_PLCA_NODE_ID] = NLA_POLICY_MAX(NLA_U32, 255),
[ETHTOOL_A_PLCA_NODE_CNT] = NLA_POLICY_RANGE(NLA_U32, 1, 255), [ETHTOOL_A_PLCA_NODE_CNT] = NLA_POLICY_RANGE(NLA_U32, 1, 255),
@ -141,15 +145,17 @@ const struct nla_policy ethnl_plca_set_cfg_policy[] = {
static int static int
ethnl_set_plca(struct ethnl_req_info *req_info, struct genl_info *info) ethnl_set_plca(struct ethnl_req_info *req_info, struct genl_info *info)
{ {
struct net_device *dev = req_info->dev;
const struct ethtool_phy_ops *ops; const struct ethtool_phy_ops *ops;
struct nlattr **tb = info->attrs; struct nlattr **tb = info->attrs;
struct phy_plca_cfg plca_cfg; struct phy_plca_cfg plca_cfg;
struct phy_device *phydev;
bool mod = false; bool mod = false;
int ret; int ret;
phydev = ethnl_req_get_phydev(req_info, tb[ETHTOOL_A_PLCA_HEADER],
info->extack);
// check that the PHY device is available and connected // check that the PHY device is available and connected
if (!dev->phydev) if (IS_ERR_OR_NULL(phydev))
return -EOPNOTSUPP; return -EOPNOTSUPP;
ops = ethtool_phy_ops; ops = ethtool_phy_ops;
@ -168,7 +174,7 @@ ethnl_set_plca(struct ethnl_req_info *req_info, struct genl_info *info)
if (!mod) if (!mod)
return 0; return 0;
ret = ops->set_plca_cfg(dev->phydev, &plca_cfg, info->extack); ret = ops->set_plca_cfg(phydev, &plca_cfg, info->extack);
return ret < 0 ? ret : 1; return ret < 0 ? ret : 1;
} }
@ -191,7 +197,7 @@ const struct ethnl_request_ops ethnl_plca_cfg_request_ops = {
const struct nla_policy ethnl_plca_get_status_policy[] = { const struct nla_policy ethnl_plca_get_status_policy[] = {
[ETHTOOL_A_PLCA_HEADER] = [ETHTOOL_A_PLCA_HEADER] =
NLA_POLICY_NESTED(ethnl_header_policy), NLA_POLICY_NESTED(ethnl_header_policy_phy),
}; };
static int plca_get_status_prepare_data(const struct ethnl_req_info *req_base, static int plca_get_status_prepare_data(const struct ethnl_req_info *req_base,
@ -201,10 +207,14 @@ static int plca_get_status_prepare_data(const struct ethnl_req_info *req_base,
struct plca_reply_data *data = PLCA_REPDATA(reply_base); struct plca_reply_data *data = PLCA_REPDATA(reply_base);
struct net_device *dev = reply_base->dev; struct net_device *dev = reply_base->dev;
const struct ethtool_phy_ops *ops; const struct ethtool_phy_ops *ops;
struct nlattr **tb = info->attrs;
struct phy_device *phydev;
int ret; int ret;
phydev = ethnl_req_get_phydev(req_base, tb[ETHTOOL_A_PLCA_HEADER],
info->extack);
// check that the PHY device is available and connected // check that the PHY device is available and connected
if (!dev->phydev) { if (IS_ERR_OR_NULL(phydev)) {
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
goto out; goto out;
} }
@ -223,7 +233,7 @@ static int plca_get_status_prepare_data(const struct ethnl_req_info *req_base,
memset(&data->plca_st, 0xff, memset(&data->plca_st, 0xff,
sizeof_field(struct plca_reply_data, plca_st)); sizeof_field(struct plca_reply_data, plca_st));
ret = ops->get_plca_status(dev->phydev, &data->plca_st); ret = ops->get_plca_status(phydev, &data->plca_st);
ethnl_ops_complete(dev); ethnl_ops_complete(dev);
out: out:
return ret; return ret;