summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hemp <c.hemp@phytec.de>2017-01-20 15:29:36 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2018-04-12 09:34:19 +0200
commit92bcd861b8f60c3315abbdfc254cccac7b20ae27 (patch)
tree5b2ab093f5752fed44d4e199796cfc1e17eb3052
parentb0f7425f922d371737804a5a9a213232c6fe0265 (diff)
downloadbarebox-92bcd861b8f60c3315abbdfc254cccac7b20ae27.tar.gz
barebox-92bcd861b8f60c3315abbdfc254cccac7b20ae27.tar.xz
net: phy: micrel: fix too late link up
Since commit a4cee7207a1 ("net: phy: micrel: Add workaround for bad autoneg") by Philipp Zabel <p.zabel@pengutronix.de>: Based on kernel commit d2fd719bcb0e ("net/phy: micrel: Add workaround for bad autoneg") by Nathan Sullivan <nathan.sullivan@ni.com>: Very rarely, the KSZ9031 will appear to complete autonegotiation, but will drop all traffic afterwards. When this happens, the idle error count will read 0xFF after autonegotiation completes. Reset the PHY when in that state. is it possible that we get the link to late and barebox reports "Network is down". The problem is that ksz9031_config_init is called again in an error case. In this case autoneg will restart but waiting for finish is missing. Signed-off-by: Christian Hemp <c.hemp@phytec.de> Tested-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--drivers/net/phy/micrel.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 0ca359b0ba..fe71bfd1a6 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -293,6 +293,7 @@ static int ksz9031_read_status(struct phy_device *phydev)
if ((regval & 0xff) == 0xff) {
phy_init_hw(phydev);
phydev->link = 0;
+ phy_wait_aneg_done(phydev);
}
return 0;