leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: phy: restart phy autonegotiation after EEE advertisment change

Browse Source 
When the EEE advertisment is changed, we should restart autonegotiation
to update the link partner with the new EEE settings.  Add this trigger
but only if the advertisment has changed.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Russell King 2017-03-31 10:37:12 +01:00 committed by David S. Miller
parent 83ea067fe2
commit f75abeb833
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/net/phy/phy.c
View File

@ -1332,7 +1332,7 @@ EXPORT_SYMBOL(phy_ethtool_get_eee);
*/ */
int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data) int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data)
{ {
int cap, adv; int cap, old_adv, adv, ret;
if (!phydev->drv) if (!phydev->drv)
return -EIO; return -EIO;
@ -1342,12 +1342,29 @@ int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data)
if (cap < 0) if (cap < 0)
return cap; return cap;
old_adv = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV);
if (old_adv < 0)
return old_adv;
adv = ethtool_adv_to_mmd_eee_adv_t(data->advertised) & cap; adv = ethtool_adv_to_mmd_eee_adv_t(data->advertised) & cap;
/* Mask prohibited EEE modes */ /* Mask prohibited EEE modes */
adv &= ~phydev->eee_broken_modes; adv &= ~phydev->eee_broken_modes;
return phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, adv); if (old_adv != adv) {
ret = phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, adv);
if (ret < 0)
return ret;
/* Restart autonegotiation so the new modes get sent to the
* link partner.
*/
ret = genphy_restart_aneg(phydev);
if (ret < 0)
return ret;
}
return 0;
} }
EXPORT_SYMBOL(phy_ethtool_set_eee); EXPORT_SYMBOL(phy_ethtool_set_eee);