@@ -1455,6 +1455,8 @@ EXPORT_SYMBOL(genphy_c45_ethtool_get_eee);
*
* Description: it reportes the Supported/Advertisement/LP Advertisement
* capabilities.
+ * Returns either error code, 0 if there was no change, or positive if
+ * there was a change which triggered auto-neg.
*/
int genphy_c45_ethtool_set_eee(struct phy_device *phydev,
struct ethtool_eee *data)
@@ -1488,9 +1490,12 @@ int genphy_c45_ethtool_set_eee(struct phy_device *phydev,
ret = genphy_c45_an_config_eee_aneg(phydev);
if (ret < 0)
return ret;
- if (ret > 0)
- return phy_restart_aneg(phydev);
-
+ if (ret > 0) {
+ ret = phy_restart_aneg(phydev);
+ if (ret < 0)
+ return ret;
+ return 1;
+ }
return 0;
}
EXPORT_SYMBOL(genphy_c45_ethtool_set_eee);
@@ -918,7 +918,7 @@ static void phy_update_eee_active(struct phy_device *phydev)
if (err < 0)
phydev->eee_active = false;
else
- phydev->eee_active = err;
+ phydev->eee_active = (err & phydev->tx_lpi_enabled);
}
/**
@@ -1632,11 +1632,21 @@ int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data)
mutex_lock(&phydev->lock);
ret = genphy_c45_ethtool_set_eee(phydev, data);
- if (!ret)
+ if (ret >= 0) {
+ if (ret == 0) {
+ /* auto-neg not triggered */
+ if (phydev->tx_lpi_enabled != data->tx_lpi_enabled) {
+ phydev->tx_lpi_enabled = data->tx_lpi_enabled;
+ phy_update_eee_active(phydev);
+ if (phydev->link)
+ phy_link_up(phydev);
+ }
+ }
phydev->tx_lpi_enabled = data->tx_lpi_enabled;
+ }
mutex_unlock(&phydev->lock);
- return ret;
+ return (ret < 0 ? ret : 0);
}
EXPORT_SYMBOL(phy_ethtool_set_eee);
The MAC driver changes its EEE hardware configuration in its adjust_link callback. This is called when auto-neg completes. If set_eee is called with a change to tx_lpi_enabled which does not trigger an auto-neg, it is necessary to call the adjust_link callback so that the MAC is reconfigured to take this change into account. When setting phydev->eee_active, take tx_lpi_enabled into account, so the MAC drivers don't need to consider tx_lpi_enabled. Signed-off-by: Andrew Lunn <andrew@lunn.ch> --- v3: Update phydev->eee_active --- drivers/net/phy/phy-c45.c | 11 ++++++++--- drivers/net/phy/phy.c | 16 +++++++++++++--- 2 files changed, 21 insertions(+), 6 deletions(-)