diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2020-02-27 09:44:49 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-02-27 11:17:21 -0800 |
| commit | b82cf17ff1957ec35eaee7dc519c365ecd06ba38 (patch) | |
| tree | 2760bc9d209720e387df4bb60f45f48c8b26d704 /drivers | |
| parent | mlx5: register lag notifier for init network namespace only (diff) | |
| download | linux-dev-b82cf17ff1957ec35eaee7dc519c365ecd06ba38.tar.xz linux-dev-b82cf17ff1957ec35eaee7dc519c365ecd06ba38.zip | |
net: phy: marvell: don't interpret PHY status unless resolved
Don't attempt to interpret the PHY specific status register unless
the PHY is indicating that the resolution is valid.
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/marvell.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 28e33ece4ce1..9a8badafea8a 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -1306,6 +1306,9 @@ static int marvell_read_status_page_an(struct phy_device *phydev, } } + if (!(status & MII_M1011_PHY_STATUS_RESOLVED)) + return 0; + if (status & MII_M1011_PHY_STATUS_FULLDUPLEX) phydev->duplex = DUPLEX_FULL; else @@ -1365,6 +1368,8 @@ static int marvell_read_status_page(struct phy_device *phydev, int page) linkmode_zero(phydev->lp_advertising); phydev->pause = 0; phydev->asym_pause = 0; + phydev->speed = SPEED_UNKNOWN; + phydev->duplex = DUPLEX_UNKNOWN; if (phydev->autoneg == AUTONEG_ENABLE) err = marvell_read_status_page_an(phydev, fiber, status); |