bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ethtool: netlink: do not return SQI value if link is down

Browse source 
[ Upstream commit c184cf94e73b04ff7048d045f5413899bc664788 ]

Do not attach SQI value if link is down. "SQI values are only valid if
link-up condition is present" per OpenAlliance specification of
100Base-T1 Interoperability Test suite [1]. The same rule would apply
for other link types.

[1] https://opensig.org/automotive-ethernet-specifications/#

Fixes: 8066021915 ("ethtool: provide UAPI for PHY Signal Quality Index (SQI)")
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Woojung Huh <woojung.huh@microchip.com>
Link: https://patch.msgid.link/20240709061943.729381-1-o.rempel@pengutronix.de
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Oleksij Rempel 2024-07-09 08:19:43 +02:00 • committed by Greg Kroah-Hartman
parent 099502ca41
commit feeeeb4c0a
1 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

41
net/ethtool/linkstate.c
View file

@ -37,6 +37,8 @@ static int linkstate_get_sqi(struct net_device *dev)
mutex_lock(&phydev->lock); mutex_lock(&phydev->lock);
if (!phydev->drv || !phydev->drv->get_sqi) if (!phydev->drv || !phydev->drv->get_sqi)
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
else if (!phydev->link)
ret = -ENETDOWN;
else else
ret = phydev->drv->get_sqi(phydev); ret = phydev->drv->get_sqi(phydev);
mutex_unlock(&phydev->lock); mutex_unlock(&phydev->lock);
@ -55,6 +57,8 @@ static int linkstate_get_sqi_max(struct net_device *dev)
mutex_lock(&phydev->lock); mutex_lock(&phydev->lock);
if (!phydev->drv || !phydev->drv->get_sqi_max) if (!phydev->drv || !phydev->drv->get_sqi_max)
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
else if (!phydev->link)
ret = -ENETDOWN;
else else
ret = phydev->drv->get_sqi_max(phydev); ret = phydev->drv->get_sqi_max(phydev);
mutex_unlock(&phydev->lock); mutex_unlock(&phydev->lock);
@ -62,6 +66,17 @@ static int linkstate_get_sqi_max(struct net_device *dev)
return ret; return ret;
}; };
static bool linkstate_sqi_critical_error(int sqi)
{
return sqi < 0 && sqi != -EOPNOTSUPP && sqi != -ENETDOWN;
}
static bool linkstate_sqi_valid(struct linkstate_reply_data *data)
{
return data->sqi >= 0 && data->sqi_max >= 0 &&
data->sqi <= data->sqi_max;
}
static int linkstate_get_link_ext_state(struct net_device *dev, static int linkstate_get_link_ext_state(struct net_device *dev,
struct linkstate_reply_data *data) struct linkstate_reply_data *data)
{ {
@ -93,12 +108,12 @@ static int linkstate_prepare_data(const struct ethnl_req_info *req_base,
data->link = __ethtool_get_link(dev); data->link = __ethtool_get_link(dev);
ret = linkstate_get_sqi(dev); ret = linkstate_get_sqi(dev);
if (ret < 0 && ret != -EOPNOTSUPP) if (linkstate_sqi_critical_error(ret))
goto out; goto out;
data->sqi = ret; data->sqi = ret;
ret = linkstate_get_sqi_max(dev); ret = linkstate_get_sqi_max(dev);
if (ret < 0 && ret != -EOPNOTSUPP) if (linkstate_sqi_critical_error(ret))
goto out; goto out;
data->sqi_max = ret; data->sqi_max = ret;
@ -136,11 +151,10 @@ static int linkstate_reply_size(const struct ethnl_req_info *req_base,
len = nla_total_size(sizeof(u8)) /* LINKSTATE_LINK */ len = nla_total_size(sizeof(u8)) /* LINKSTATE_LINK */
+ 0; + 0;
if (data->sqi != -EOPNOTSUPP) if (linkstate_sqi_valid(data)) {
len += nla_total_size(sizeof(u32)); len += nla_total_size(sizeof(u32)); /* LINKSTATE_SQI */
len += nla_total_size(sizeof(u32)); /* LINKSTATE_SQI_MAX */
if (data->sqi_max != -EOPNOTSUPP) }
len += nla_total_size(sizeof(u32));
if (data->link_ext_state_provided) if (data->link_ext_state_provided)
len += nla_total_size(sizeof(u8)); /* LINKSTATE_EXT_STATE */ len += nla_total_size(sizeof(u8)); /* LINKSTATE_EXT_STATE */
@ -164,13 +178,14 @@ static int linkstate_fill_reply(struct sk_buff *skb,
nla_put_u8(skb, ETHTOOL_A_LINKSTATE_LINK, !!data->link)) nla_put_u8(skb, ETHTOOL_A_LINKSTATE_LINK, !!data->link))
return -EMSGSIZE; return -EMSGSIZE;
if (data->sqi != -EOPNOTSUPP && if (linkstate_sqi_valid(data)) {
nla_put_u32(skb, ETHTOOL_A_LINKSTATE_SQI, data->sqi)) if (nla_put_u32(skb, ETHTOOL_A_LINKSTATE_SQI, data->sqi))
return -EMSGSIZE; return -EMSGSIZE;
if (data->sqi_max != -EOPNOTSUPP && if (nla_put_u32(skb, ETHTOOL_A_LINKSTATE_SQI_MAX,
nla_put_u32(skb, ETHTOOL_A_LINKSTATE_SQI_MAX, data->sqi_max)) data->sqi_max))
return -EMSGSIZE; return -EMSGSIZE;
}
if (data->link_ext_state_provided) { if (data->link_ext_state_provided) {
if (nla_put_u8(skb, ETHTOOL_A_LINKSTATE_EXT_STATE, if (nla_put_u8(skb, ETHTOOL_A_LINKSTATE_EXT_STATE,