iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: phy: consider AN_RESTART status when reading link status

Browse Source 
After configuring and restarting aneg we immediately try to read the
link status. On some systems the PHY may not yet have cleared the
"aneg complete" and "link up" bits, resulting in a false link-up
signal. See [0] for a report.
Clause 22 and 45 both require the PHY to keep the AN_RESTART
bit set until the PHY actually starts auto-negotiation.
Let's consider this in the generic functions for reading link status.
The commit marked as fixed is the first one where the patch applies
cleanly.

[0] https://marc.info/?t=156518400300003&r=1&w=2

Fixes: c1164bb1a6 ("net: phy: check PMAPMD link status only in genphy_c45_read_link")
Tested-by: Yonglong Liu <liuyonglong@huawei.com>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
This commit is contained in:
Heiner Kallweit 2019-08-12 21:20:02 +02:00 committed by Jakub Kicinski
parent 48ec7014c5
commit c36757eb9d
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/phy/phy-c45.c
View File

@ -219,6 +219,20 @@ int genphy_c45_read_link(struct phy_device *phydev)
int val, devad; int val, devad;
bool link = true; bool link = true;
if (phydev->c45_ids.devices_in_package & MDIO_DEVS_AN) {
val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_CTRL1);
if (val < 0)
return val;
/* Autoneg is being started, therefore disregard current
* link status and report link as down.
*/
if (val & MDIO_AN_CTRL1_RESTART) {
phydev->link = 0;
return 0;
}
}
while (mmd_mask && link) { while (mmd_mask && link) {
devad = __ffs(mmd_mask); devad = __ffs(mmd_mask);
mmd_mask &= ~BIT(devad); mmd_mask &= ~BIT(devad);

12
drivers/net/phy/phy_device.c
View File

@ -1752,7 +1752,17 @@ EXPORT_SYMBOL(genphy_aneg_done);
*/ */
int genphy_update_link(struct phy_device *phydev) int genphy_update_link(struct phy_device *phydev)
{ {
int status; int status = 0, bmcr;
bmcr = phy_read(phydev, MII_BMCR);
if (bmcr < 0)
return bmcr;
/* Autoneg is being started, therefore disregard BMSR value and
* report link as down.
*/
if (bmcr & BMCR_ANRESTART)
goto done;
/* The link state is latched low so that momentary link /* The link state is latched low so that momentary link
* drops can be detected. Do not double-read the status * drops can be detected. Do not double-read the status