Commit 8d3dc3ac authored by Russell King's avatar Russell King Committed by David S. Miller
Browse files

net: phy: extract link partner advertisement reading 



Move reading the link partner advertisement out of genphy_read_status()
into its own separate function.  This will allow re-use of this code by
PHY drivers that are able to read the resolved status from the PHY.

Tested-by: default avatartinywrkb <tinywrkb@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4cf6c57e

drivers/net/phy/phy_device.c

+40 −25
Original line number Diff line number Diff line
@@ -1783,32 +1783,9 @@ done: 
}

EXPORT_SYMBOL(genphy_update_link);



/**

 * genphy_read_status - check the link status and update current link state

 * @phydev: target phy_device struct

 *

 * Description: Check the link, then figure out the current state

 *   by comparing what we advertise with what the link partner

 *   advertises.  Start by checking the gigabit possibilities,

 *   then move on to 10/100.

 */

int genphy_read_status(struct phy_device *phydev)

int genphy_read_lpa(struct phy_device *phydev)

{

	int lpa, lpagb, err, old_link = phydev->link;



	/* Update the link, but return if there was an error */

	err = genphy_update_link(phydev);

	if (err)

		return err;



	/* why bother the PHY if nothing can have changed */

	if (phydev->autoneg == AUTONEG_ENABLE && old_link && phydev->link)

		return 0;



	phydev->speed = SPEED_UNKNOWN;

	phydev->duplex = DUPLEX_UNKNOWN;

	phydev->pause = 0;

	phydev->asym_pause = 0;

	int lpa, lpagb;



	if (phydev->autoneg == AUTONEG_ENABLE && phydev->autoneg_complete) {

		if (phydev->is_gigabit_capable) {
@@ -1838,6 +1815,44 @@ int genphy_read_status(struct phy_device *phydev) 
			return lpa;



		mii_lpa_mod_linkmode_lpa_t(phydev->lp_advertising, lpa);

	}



	return 0;

}

EXPORT_SYMBOL(genphy_read_lpa);



/**

 * genphy_read_status - check the link status and update current link state

 * @phydev: target phy_device struct

 *

 * Description: Check the link, then figure out the current state

 *   by comparing what we advertise with what the link partner

 *   advertises.  Start by checking the gigabit possibilities,

 *   then move on to 10/100.

 */

int genphy_read_status(struct phy_device *phydev)

{

	int err, old_link = phydev->link;



	/* Update the link, but return if there was an error */

	err = genphy_update_link(phydev);

	if (err)

		return err;



	/* why bother the PHY if nothing can have changed */

	if (phydev->autoneg == AUTONEG_ENABLE && old_link && phydev->link)

		return 0;



	phydev->speed = SPEED_UNKNOWN;

	phydev->duplex = DUPLEX_UNKNOWN;

	phydev->pause = 0;

	phydev->asym_pause = 0;



	err = genphy_read_lpa(phydev);

	if (err < 0)

		return err;



	if (phydev->autoneg == AUTONEG_ENABLE && phydev->autoneg_complete) {

		phy_resolve_aneg_linkmode(phydev);

	} else if (phydev->autoneg == AUTONEG_DISABLE) {

		int bmcr = phy_read(phydev, MII_BMCR);

include/linux/phy.h

+1 −0
Original line number Diff line number Diff line
@@ -1076,6 +1076,7 @@ int genphy_config_eee_advert(struct phy_device *phydev); 
int __genphy_config_aneg(struct phy_device *phydev, bool changed);

int genphy_aneg_done(struct phy_device *phydev);

int genphy_update_link(struct phy_device *phydev);

int genphy_read_lpa(struct phy_device *phydev);

int genphy_read_status(struct phy_device *phydev);

int genphy_suspend(struct phy_device *phydev);

int genphy_resume(struct phy_device *phydev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE