aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2019-02-07 20:22:20 +0100
committerDavid S. Miller <davem@davemloft.net>2019-02-08 23:01:49 -0800
commitc397ab21ba362d5c5215e53f36685a9fffc45f66 (patch)
tree7a96407c8fcaff6869aa3e42c4b892c5f31381f3 /drivers/net
parentfm10k: use struct_size() in kzalloc() (diff)
downloadlinux-dev-c397ab21ba362d5c5215e53f36685a9fffc45f66.tar.xz
linux-dev-c397ab21ba362d5c5215e53f36685a9fffc45f66.zip
net: phy: don't double-read link status register if link is up
The link status register latches link-down events. Therefore, if link is reported as being up, there's no need for a second read. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/phy/phy-c45.c2
-rw-r--r--drivers/net/phy/phy_device.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c
index 706a92a8c1b2..eff9e5a4d831 100644
--- a/drivers/net/phy/phy-c45.c
+++ b/drivers/net/phy/phy-c45.c
@@ -148,6 +148,8 @@ int genphy_c45_read_link(struct phy_device *phydev)
val = phy_read_mmd(phydev, devad, MDIO_STAT1);
if (val < 0)
return val;
+ else if (val & MDIO_STAT1_LSTATUS)
+ continue;
}
val = phy_read_mmd(phydev, devad, MDIO_STAT1);
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index d490cd2a8962..9369e1323c39 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1735,8 +1735,12 @@ int genphy_update_link(struct phy_device *phydev)
*/
if (!phy_polling_mode(phydev)) {
status = phy_read(phydev, MII_BMSR);
- if (status < 0)
+ if (status < 0) {
return status;
+ } else if (status & BMSR_LSTATUS) {
+ phydev->link = 1;
+ return 0;
+ }
}
/* Read link and autonegotiation status */