From 92bcd861b8f60c3315abbdfc254cccac7b20ae27 Mon Sep 17 00:00:00 2001 From: Christian Hemp Date: Fri, 20 Jan 2017 15:29:36 +0100 Subject: net: phy: micrel: fix too late link up MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since commit a4cee7207a1 ("net: phy: micrel: Add workaround for bad autoneg") by Philipp Zabel : Based on kernel commit d2fd719bcb0e ("net/phy: micrel: Add workaround for bad autoneg") by Nathan Sullivan : 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 Tested-by: Stefan Müller-Klieser --- drivers/net/phy/micrel.c | 1 + 1 file changed, 1 insertion(+) 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; -- cgit v1.2.3