diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2019-08-15 13:15:19 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-08-15 11:41:49 -0700 |
| commit | 916e571ebad37b820a2a4465dc2ea7643f2007fc (patch) | |
| tree | 897488759c150d6bd9cce66b513d6f036f149d83 /drivers/net/phy/phy_device.c | |
| parent | net/rds: Add RDS6_INFO_SOCKETS and RDS6_INFO_RECV_MESSAGES options (diff) | |
| download | linux-dev-916e571ebad37b820a2a4465dc2ea7643f2007fc.tar.xz linux-dev-916e571ebad37b820a2a4465dc2ea7643f2007fc.zip | |
net: phy: read MII_CTRL1000 in genphy_read_status only if needed
Value of MII_CTRL1000 is needed only if LPA_1000MSFAIL is set.
Therefore move reading this register.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/phy_device.c')
| -rw-r--r-- | drivers/net/phy/phy_device.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index b039632de73a..9c546bae9ec9 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1784,7 +1784,7 @@ EXPORT_SYMBOL(genphy_update_link); */ int genphy_read_status(struct phy_device *phydev) { - int adv, lpa, lpagb, err, old_link = phydev->link; + int lpa, lpagb, err, old_link = phydev->link; /* Update the link, but return if there was an error */ err = genphy_update_link(phydev); @@ -1806,11 +1806,12 @@ int genphy_read_status(struct phy_device *phydev) if (lpagb < 0) return lpagb; - adv = phy_read(phydev, MII_CTRL1000); - if (adv < 0) - return adv; - if (lpagb & LPA_1000MSFAIL) { + int adv = phy_read(phydev, MII_CTRL1000); + + if (adv < 0) + return adv; + if (adv & CTL1000_ENABLE_MASTER) phydev_err(phydev, "Master/Slave resolution failed, maybe conflicting manual settings?\n"); else |