sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

net: phy: introduce phy_aneg_done 

phy_wait_aneg_done() is directly called by the network code, so it
should not read phy registers directly. Introduce phy_aneg_done to
give phy drivers the chance to do something different to poll for
autonegotiation completion.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2014-09-17 14:39:36 +02:00
parent 5c0bd50319
commit e209158d5a
2 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
drivers/net/phy/phy.c
View File

@ -31,6 +31,21 @@
static struct phy_driver genphy_driver;
static int genphy_config_init(struct phy_device *phydev);
/**
* phy_aneg_done - return auto-negotiation status
* @phydev: target phy_device struct
*
* Description: Return the auto-negotiation status from this @phydev
* Returns > 0 on success or < 0 on error. 0 means that auto-negotiation
* is still pending.
*/
static int phy_aneg_done(struct phy_device *phydev)
{
struct phy_driver *drv = to_phy_driver(phydev->dev.driver);
return drv->aneg_done(phydev);
}
int phy_update_status(struct phy_device *dev)
{
struct phy_driver *drv = to_phy_driver(dev->dev.driver);
@ -477,25 +492,15 @@ int genphy_setup_forced(struct phy_device *phydev)
int phy_wait_aneg_done(struct phy_device *phydev)
{
uint64_t start = get_time_ns();
int ctl;
if (phydev->autoneg == AUTONEG_DISABLE)
return 0;
while (!is_timeout(start, PHY_AN_TIMEOUT * SECOND)) {
ctl = phy_read(phydev, MII_BMSR);
if (ctl & BMSR_ANEGCOMPLETE) {
if (phy_aneg_done(phydev) > 0) {
phydev->link = 1;
return 0;
}
/* Restart auto-negotiation if remote fault */
if (ctl & BMSR_RFAULT) {
puts("PHY remote fault detected\n"
"PHY restarting auto-negotiation\n");
phy_write(phydev, MII_BMCR,
BMCR_ANENABLE | BMCR_ANRESTART);
}
}
phydev->link = 0;
@ -571,6 +576,33 @@ int genphy_config_aneg(struct phy_device *phydev)
return result;
}
/**
* genphy_aneg_done - return auto-negotiation status
* @phydev: target phy_device struct
*
* Description: Reads the status register and returns 0 either if
* auto-negotiation is incomplete, or if there was an error.
* Returns BMSR_ANEGCOMPLETE if auto-negotiation is done.
*/
int genphy_aneg_done(struct phy_device *phydev)
{
int bmsr = phy_read(phydev, MII_BMSR);
if (bmsr < 0)
return bmsr;
/* Restart auto-negotiation if remote fault */
if (bmsr & BMSR_RFAULT) {
puts("PHY remote fault detected\n"
"PHY restarting auto-negotiation\n");
phy_write(phydev, MII_BMCR,
BMCR_ANENABLE | BMCR_ANRESTART);
}
return bmsr & BMSR_ANEGCOMPLETE;
}
EXPORT_SYMBOL(genphy_aneg_done);
/**
* genphy_update_link - update link status in @phydev
* @phydev: target phy_device struct
@ -825,6 +857,9 @@ int phy_driver_register(struct phy_driver *phydrv)
if (!phydrv->config_aneg)
phydrv->config_aneg = genphy_config_aneg;
if (!phydrv->aneg_done)
phydrv->aneg_done = genphy_aneg_done;
if (!phydrv->read_status)
phydrv->read_status = genphy_read_status;

4
include/linux/phy.h
View File

@ -234,6 +234,9 @@ struct phy_driver {
*/
int (*config_aneg)(struct phy_device *phydev);
/* Determines the auto negotiation result */
int (*aneg_done)(struct phy_device *phydev);
/* Determines the negotiated speed and duplex */
int (*read_status)(struct phy_device *phydev);
@ -295,6 +298,7 @@ int phy_wait_aneg_done(struct phy_device *phydev);
/* Generic PHY support and helper functions */
int genphy_restart_aneg(struct phy_device *phydev);
int genphy_config_aneg(struct phy_device *phydev);
int genphy_aneg_done(struct phy_device *phydev);
int genphy_update_link(struct phy_device *phydev);
int genphy_read_status(struct phy_device *phydev);
int genphy_config_advert(struct phy_device *phydev);