Commit 7b566f70 authored by David S. Miller's avatar David S. Miller

phy: Revert toggling reset changes.

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>
parent a2c741df
......@@ -23,7 +23,6 @@
* ksz9477
*/
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/phy.h>
......@@ -836,13 +835,6 @@ static int kszphy_resume(struct phy_device *phydev)
{
int ret;
if (!phydev->attached_dev) {
/* If the PHY is not attached, toggle the reset */
phy_device_reset(phydev, 1);
udelay(1);
phy_device_reset(phydev, 0);
}
genphy_resume(phydev);
ret = kszphy_config_reset(phydev);
......
......@@ -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, bool suspend)
static bool mdio_bus_phy_may_suspend(struct phy_device *phydev)
{
struct device_driver *drv = phydev->mdio.dev.driver;
struct phy_driver *phydrv = to_phy_driver(drv);
......@@ -232,11 +232,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
* 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. Also may resume if
* PHY is not attached.
* MDIO bus driver and clock gated at this point.
*/
if (!netdev)
return suspend ? !phydev->suspended : phydev->suspended;
return !phydev->suspended;
if (netdev->wol_enabled)
return false;
......@@ -271,7 +270,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, true))
if (!mdio_bus_phy_may_suspend(phydev))
return 0;
return phy_suspend(phydev);
......@@ -282,7 +281,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, false))
if (!mdio_bus_phy_may_suspend(phydev))
goto no_resume;
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