UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: phy: marvell: use phy_modify_changed() 

Use phy_modify_changed() to change the fiber advertisement register
rather than open coding this functionality.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Russell King 2019-12-17 13:39:47 +00:00 committed by David S. Miller
parent 20ecf424d0
commit 9f4bae704f
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/phy/marvell.c
View File

@ -513,7 +513,7 @@ static int marvell_config_aneg_fiber(struct phy_device *phydev)
{ {
int changed = 0; int changed = 0;
int err; int err;
int adv, oldadv; u16 adv;
if (phydev->autoneg != AUTONEG_ENABLE) if (phydev->autoneg != AUTONEG_ENABLE)
return genphy_setup_forced(phydev); return genphy_setup_forced(phydev);
@ -522,23 +522,17 @@ static int marvell_config_aneg_fiber(struct phy_device *phydev)
linkmode_and(phydev->advertising, phydev->advertising, linkmode_and(phydev->advertising, phydev->advertising,
phydev->supported); phydev->supported);
adv = linkmode_adv_to_fiber_adv_t(phydev->advertising);
/* Setup fiber advertisement */ /* Setup fiber advertisement */
adv = phy_read(phydev, MII_ADVERTISE); err = phy_modify_changed(phydev, MII_ADVERTISE,
if (adv < 0) ADVERTISE_1000XHALF | ADVERTISE_1000XFULL |
return adv; ADVERTISE_1000XPAUSE | ADVERTISE_1000XPSE_ASYM,
adv);
oldadv = adv; if (err < 0)
adv &= ~(ADVERTISE_1000XHALF | ADVERTISE_1000XFULL | return err;
ADVERTISE_1000XPAUSE | ADVERTISE_1000XPSE_ASYM); if (err > 0)
adv |= linkmode_adv_to_fiber_adv_t(phydev->advertising);
if (adv != oldadv) {
err = phy_write(phydev, MII_ADVERTISE, adv);
if (err < 0)
return err;
changed = 1; changed = 1;
}
if (changed == 0) { if (changed == 0) {
/* Advertisement hasn't changed, but maybe aneg was never on to /* Advertisement hasn't changed, but maybe aneg was never on to