dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

mdio: Check MDIO_STAT1_FAULT in mdio45_links_ok() 

Some PHYs will report that the link is up even though there is a fault
condition.  Therefore, check the fault flag too.  We must also read
STAT2 to reset this flag.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ben Hutchings 2009-08-26 08:16:58 +00:00 committed by David S. Miller
parent d4ec09acdb
commit 771046d7b1
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/mdio.c
View File

@ -109,13 +109,20 @@ int mdio45_links_ok(const struct mdio_if_info *mdio, u32 mmd_mask)
if (mmd_mask & (1 << devad)) {
mmd_mask &= ~(1 << devad);
/* Read twice because link state is latched and a
* read moves the current state into the register */
/* Reset the latched status and fault flags */
mdio->mdio_read(mdio->dev, mdio->prtad,
devad, MDIO_STAT1);
if (devad == MDIO_MMD_PMAPMD || devad == MDIO_MMD_PCS ||
devad == MDIO_MMD_PHYXS || devad == MDIO_MMD_DTEXS)
mdio->mdio_read(mdio->dev, mdio->prtad,
devad, MDIO_STAT2);
/* Check the current status and fault flags */
reg = mdio->mdio_read(mdio->dev, mdio->prtad,
devad, MDIO_STAT1);
if (reg < 0 || !(reg & MDIO_STAT1_LSTATUS))
if (reg < 0 ||
(reg & (MDIO_STAT1_FAULT | MDIO_STAT1_LSTATUS)) !=
MDIO_STAT1_LSTATUS)
return false;
}
}