| Message ID | E1rWbMs-002cCV-EE@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0cb6daf549f99cc978fe4dd531d2426313fc08e4 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: eee network driver cleanups | expand |
On Sun, Feb 04, 2024 at 12:13:02PM +0000, Russell King (Oracle) wrote: > stmmac_ethtool_op_get_eee() sets both eee_enabled and eee_active, and > then goes on to call phylink_ethtool_get_eee(). > > phylink_ethtool_get_eee() will return -EOPNOTSUPP if there is no PHY > present, otherwise calling phy_ethtool_get_eee() which in turn will call > genphy_c45_ethtool_get_eee(). > > genphy_c45_ethtool_get_eee() will overwrite eee_enabled and eee_active > with its own interpretation from the PHYs settings and negotiation > result. > > Thus, when there is no PHY, stmmac_ethtool_op_get_eee() will fail with > -EOPNOTSUPP, meaning eee_enabled and eee_active will not be returned to > userspace. When there is a PHY, eee_enabled and eee_active will be > overwritten by phylib, making the setting of these members in > stmmac_ethtool_op_get_eee() entirely unnecessary. > > Remove this code, thus simplifying stmmac_ethtool_op_get_eee(). Right. and AFAICS stmmac_priv::{eee_active,eee_enabled} will be in sync with the ethtool_eee::{eee_active,eee_enabled} values since they are basically determined by means of the genphy_c45_eee_is_active() method too. But damn it wasn't that easy to figure out... Anyway thanks for the patch: Reviewed-by: Serge Semin <fancer.lancer@gmail.com> -Serge(y) > > Reviewed-by: Andrew Lunn <andrew@lunn.ch> > Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c > index bbecb3b89535..411c3ac8cb17 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c > @@ -859,8 +859,6 @@ static int stmmac_ethtool_op_get_eee(struct net_device *dev, > if (!priv->dma_cap.eee) > return -EOPNOTSUPP; > > - edata->eee_enabled = priv->eee_enabled; > - edata->eee_active = priv->eee_active; > edata->tx_lpi_timer = priv->tx_lpi_timer; > edata->tx_lpi_enabled = priv->tx_lpi_enabled; > > -- > 2.30.2 > >
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c index bbecb3b89535..411c3ac8cb17 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c @@ -859,8 +859,6 @@ static int stmmac_ethtool_op_get_eee(struct net_device *dev, if (!priv->dma_cap.eee) return -EOPNOTSUPP; - edata->eee_enabled = priv->eee_enabled; - edata->eee_active = priv->eee_active; edata->tx_lpi_timer = priv->tx_lpi_timer; edata->tx_lpi_enabled = priv->tx_lpi_enabled;