Commit 458c058c authored by David S. Miller's avatar David S. Miller Committed by Greg Kroah-Hartman

phy: Revert toggling reset changes.

commit 7b566f70 upstream.

This reverts:

ef1b5bf5 ("net: phy: Fix not to call phy_resume() if PHY is not attached")
8c85f4b8 ("net: phy: micrel: add toggling phy reset if PHY is not  attached")

Andrew Lunn informs me that there are alternative efforts
underway to fix this more properly.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
[just take the ef1b5bf5 revert - gregkh]
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 339485c9
...@@ -76,7 +76,7 @@ static LIST_HEAD(phy_fixup_list); ...@@ -76,7 +76,7 @@ static LIST_HEAD(phy_fixup_list);
static DEFINE_MUTEX(phy_fixup_lock); static DEFINE_MUTEX(phy_fixup_lock);
#ifdef CONFIG_PM #ifdef CONFIG_PM
static bool mdio_bus_phy_may_suspend(struct phy_device *phydev, bool suspend) static bool mdio_bus_phy_may_suspend(struct phy_device *phydev)
{ {
struct device_driver *drv = phydev->mdio.dev.driver; struct device_driver *drv = phydev->mdio.dev.driver;
struct phy_driver *phydrv = to_phy_driver(drv); struct phy_driver *phydrv = to_phy_driver(drv);
...@@ -88,11 +88,10 @@ static bool mdio_bus_phy_may_suspend(struct phy_device *phydev, bool suspend) ...@@ -88,11 +88,10 @@ static bool mdio_bus_phy_may_suspend(struct phy_device *phydev, bool suspend)
/* PHY not attached? May suspend if the PHY has not already been /* PHY not attached? May suspend if the PHY has not already been
* suspended as part of a prior call to phy_disconnect() -> * suspended as part of a prior call to phy_disconnect() ->
* phy_detach() -> phy_suspend() because the parent netdev might be the * phy_detach() -> phy_suspend() because the parent netdev might be the
* MDIO bus driver and clock gated at this point. Also may resume if * MDIO bus driver and clock gated at this point.
* PHY is not attached.
*/ */
if (!netdev) if (!netdev)
return suspend ? !phydev->suspended : phydev->suspended; return !phydev->suspended;
if (netdev->wol_enabled) if (netdev->wol_enabled)
return false; return false;
...@@ -127,7 +126,7 @@ static int mdio_bus_phy_suspend(struct device *dev) ...@@ -127,7 +126,7 @@ static int mdio_bus_phy_suspend(struct device *dev)
if (phydev->attached_dev && phydev->adjust_link) if (phydev->attached_dev && phydev->adjust_link)
phy_stop_machine(phydev); phy_stop_machine(phydev);
if (!mdio_bus_phy_may_suspend(phydev, true)) if (!mdio_bus_phy_may_suspend(phydev))
return 0; return 0;
return phy_suspend(phydev); return phy_suspend(phydev);
...@@ -138,7 +137,7 @@ static int mdio_bus_phy_resume(struct device *dev) ...@@ -138,7 +137,7 @@ static int mdio_bus_phy_resume(struct device *dev)
struct phy_device *phydev = to_phy_device(dev); struct phy_device *phydev = to_phy_device(dev);
int ret; int ret;
if (!mdio_bus_phy_may_suspend(phydev, false)) if (!mdio_bus_phy_may_suspend(phydev))
goto no_resume; goto no_resume;
ret = phy_resume(phydev); ret = phy_resume(phydev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment