diff options
author | Heiner Kallweit <hkallweit1@gmail.com> | 2018-07-21 15:48:47 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-07-24 23:41:08 +0200 |
commit | b8f8c8eb408b36ad55dd41a616b3f51998880fb6 (patch) | |
tree | 53949ff2a01904ec6b05ab9a4e00b2450cf3af1b /drivers/net/phy/phy_device.c | |
parent | Merge branch 'net-whitespace-cleanups' (diff) | |
download | linux-b8f8c8eb408b36ad55dd41a616b3f51998880fb6.tar.xz linux-b8f8c8eb408b36ad55dd41a616b3f51998880fb6.zip |
net: phy: add GBit master / slave error detection
Certain PHY's have issues when operating in GBit slave mode and can
be forced to master mode. Examples are RTL8211C, also the Micrel PHY
driver has a DT setting to force master mode.
If two such chips are link partners the autonegotiation will fail.
Standard defines a self-clearing on read, latched-high bit to
indicate this error. Check this bit to inform the user.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/phy_device.c')
-rw-r--r-- | drivers/net/phy/phy_device.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index b9f5f40a7ac1..db1172db1e7c 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1555,6 +1555,14 @@ int genphy_read_status(struct phy_device *phydev) if (adv < 0) return adv; + if (lpagb & LPA_1000MSFAIL) { + if (adv & CTL1000_ENABLE_MASTER) + phydev_err(phydev, "Master/Slave resolution failed, maybe conflicting manual settings?\n"); + else + phydev_err(phydev, "Master/Slave resolution failed\n"); + return -ENOLINK; + } + phydev->lp_advertising = mii_stat1000_to_ethtool_lpa_t(lpagb); common_adv_gb = lpagb & adv << 2; |