diff options
| author | Nathan Sullivan <nathan.sullivan@ni.com> | 2015-10-21 14:17:04 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-23 02:57:26 -0700 |
| commit | d2fd719bcb0e83cb39cfee22ee800f98a56eceb3 (patch) | |
| tree | 7ef7a63150312fb62b7fb0b4e4dab7cbcf8d3825 | |
| parent | ec3661b42257d9a06cf0d318175623ac7a660113 (diff) | |
| download | op-kernel-dev-d2fd719bcb0e83cb39cfee22ee800f98a56eceb3.zip op-kernel-dev-d2fd719bcb0e83cb39cfee22ee800f98a56eceb3.tar.gz | |
net/phy: micrel: Add workaround for bad autoneg
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.
Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/phy/micrel.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 499185e..cf6312f 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -514,6 +514,27 @@ static int ksz8873mll_read_status(struct phy_device *phydev) return 0; } +static int ksz9031_read_status(struct phy_device *phydev) +{ + int err; + int regval; + + err = genphy_read_status(phydev); + if (err) + return err; + + /* Make sure the PHY is not broken. Read idle error count, + * and reset the PHY if it is maxed out. + */ + regval = phy_read(phydev, MII_STAT1000); + if ((regval & 0xFF) == 0xFF) { + phy_init_hw(phydev); + phydev->link = 0; + } + + return 0; +} + static int ksz8873mll_config_aneg(struct phy_device *phydev) { return 0; @@ -772,7 +793,7 @@ static struct phy_driver ksphy_driver[] = { .driver_data = &ksz9021_type, .config_init = ksz9031_config_init, .config_aneg = genphy_config_aneg, - .read_status = genphy_read_status, + .read_status = ksz9031_read_status, .ack_interrupt = kszphy_ack_interrupt, .config_intr = kszphy_config_intr, .suspend = genphy_suspend, |
