2023-02-20 13:56:50

by Oleksij Rempel

Subject: [PATCH net-next v1 4/4] net: phy: c45: genphy_c45_ethtool_set_eee: validate EEE link modes

Currently, it is possible to let some PHYs to advertise not supported
EEE link modes. So, validate them before overwriting existing
configuration.

Signed-off-by: Oleksij Rempel <[email protected]>
---
drivers/net/phy/phy-c45.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c
index 974d6e96fc71..34efade0e2c3 100644
--- a/drivers/net/phy/phy-c45.c
+++ b/drivers/net/phy/phy-c45.c
@@ -1439,8 +1439,18 @@ int genphy_c45_ethtool_set_eee(struct phy_device *phydev,

if (data->eee_enabled) {
phydev->eee_enabled = true;
- if (data->advertised)
+ if (data->advertised) {
+ __ETHTOOL_DECLARE_LINK_MODE_MASK(adv) = {};
+
+ adv[0] = data->advertised;
+ linkmode_andnot(adv, adv, phydev->supported_eee);
+ if (!linkmode_empty(adv)) {
+ phydev_warn(phydev, "At least some EEE link modes are not supported.\n");
+ return -EINVAL;
+ }
+
phydev->advertising_eee[0] = data->advertised;
+ }
} else {
phydev->eee_enabled = false;
}
--
2.30.2

2023-02-20 15:35:10

by Andrew Lunn

Subject: Re: [PATCH net-next v1 4/4] net: phy: c45: genphy_c45_ethtool_set_eee: validate EEE link modes

> + adv[0] = data->advertised;

Same here please.

> + linkmode_andnot(adv, adv, phydev->supported_eee);
> + if (!linkmode_empty(adv)) {
> + phydev_warn(phydev, "At least some EEE link modes are not supported.\n");
> + return -EINVAL;
> + }
> +
> phydev->advertising_eee[0] = data->advertised;

...

Andrew