Skip to content

Commit

Permalink
net: phy: Fix not to call phy_resume() if PHY is not attached
Browse files Browse the repository at this point in the history
This patch fixes an issue that mdio_bus_phy_resume() doesn't call
phy_resume() if the PHY is not attached.

Fixes: 803dd9c ("net: phy: avoid suspending twice a PHY")
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Yoshihiro Shimoda authored and David S. Miller committed Dec 3, 2018
1 parent 4e4b08e commit ef1b5bf
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions drivers/net/phy/phy_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ static LIST_HEAD(phy_fixup_list);
static DEFINE_MUTEX(phy_fixup_lock);

#ifdef CONFIG_PM
static bool mdio_bus_phy_may_suspend(struct phy_device *phydev)
static bool mdio_bus_phy_may_suspend(struct phy_device *phydev, bool suspend)
{
struct device_driver *drv = phydev->mdio.dev.driver;
struct phy_driver *phydrv = to_phy_driver(drv);
Expand All @@ -232,10 +232,11 @@ static bool mdio_bus_phy_may_suspend(struct phy_device *phydev)
/* PHY not attached? May suspend if the PHY has not already been
* suspended as part of a prior call to phy_disconnect() ->
* phy_detach() -> phy_suspend() because the parent netdev might be the
* MDIO bus driver and clock gated at this point.
* MDIO bus driver and clock gated at this point. Also may resume if
* PHY is not attached.
*/
if (!netdev)
return !phydev->suspended;
return suspend ? !phydev->suspended : phydev->suspended;

if (netdev->wol_enabled)
return false;
Expand Down Expand Up @@ -270,7 +271,7 @@ static int mdio_bus_phy_suspend(struct device *dev)
if (phydev->attached_dev && phydev->adjust_link)
phy_stop_machine(phydev);

if (!mdio_bus_phy_may_suspend(phydev))
if (!mdio_bus_phy_may_suspend(phydev, true))
return 0;

return phy_suspend(phydev);
Expand All @@ -281,7 +282,7 @@ static int mdio_bus_phy_resume(struct device *dev)
struct phy_device *phydev = to_phy_device(dev);
int ret;

if (!mdio_bus_phy_may_suspend(phydev))
if (!mdio_bus_phy_may_suspend(phydev, false))
goto no_resume;

ret = phy_resume(phydev);
Expand Down

0 comments on commit ef1b5bf

Please sign in to comment.