Skip to content

Commit

Permalink
net/phy: micrel: Add workaround for bad autoneg
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nathan Sullivan authored and David S. Miller committed Oct 23, 2015
1 parent ec3661b commit d2fd719
Showing 1 changed file with 22 additions and 1 deletion.
23 changes: 22 additions & 1 deletion drivers/net/phy/micrel.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit d2fd719

Please sign in to comment.