Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a477a6f authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: phy: keep track of the PHY suspend state 



In order to avoid double calls to phydev->drv->suspend and resume, keep
track of whether the PHY has already been suspended as a consequence of
a successful call to phy_suspend(). We will use this in our MDIO bus
suspend/resume hooks to avoid a double suspend call.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aae88261

drivers/net/phy/phy_device.c

+18 −4
Original line number Diff line number Diff line
@@ -699,6 +699,7 @@ int phy_suspend(struct phy_device *phydev) 
{

	struct phy_driver *phydrv = to_phy_driver(phydev->dev.driver);

	struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };

	int ret = 0;



	/* If the device has WOL enabled, we cannot suspend the PHY */

	phy_ethtool_get_wol(phydev, &wol);
@@ -706,18 +707,31 @@ int phy_suspend(struct phy_device *phydev) 
		return -EBUSY;



	if (phydrv->suspend)

		return phydrv->suspend(phydev);

	return 0;

		ret = phydrv->suspend(phydev);



	if (ret)

		return ret;



	phydev->suspended = true;



	return ret;

}

EXPORT_SYMBOL(phy_suspend);



int phy_resume(struct phy_device *phydev)

{

	struct phy_driver *phydrv = to_phy_driver(phydev->dev.driver);

	int ret = 0;



	if (phydrv->resume)

		return phydrv->resume(phydev);

	return 0;

		ret = phydrv->resume(phydev);



	if (ret)

		return ret;



	phydev->suspended = false;



	return ret;

}

EXPORT_SYMBOL(phy_resume);

include/linux/phy.h

+2 −0
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ struct phy_c45_device_ids { 
 * is_c45:  Set to true if this phy uses clause 45 addressing.

 * is_internal: Set to true if this phy is internal to a MAC.

 * has_fixups: Set to true if this phy has fixups/quirks.

 * suspended: Set to true if this phy has been suspended successfully.

 * state: state of the PHY for management purposes

 * dev_flags: Device-specific flags used by the PHY driver.

 * addr: Bus address of PHY
@@ -365,6 +366,7 @@ struct phy_device { 
	bool is_c45;

	bool is_internal;

	bool has_fixups;

	bool suspended;



	enum phy_state state;