korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 08:44:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: phy: fix MDIO bus PM PHY resuming

Browse Source 
So far we have the unfortunate situation that mdio_bus_phy_may_suspend()
is called in suspend AND resume path, assuming that function result is
the same. After the original change this is no longer the case,
resulting in broken resume as reported by Geert.

To fix this call mdio_bus_phy_may_suspend() in the suspend path only,
and let the phy_device store the info whether it was suspended by
MDIO bus PM.

Fixes: 503ba7c696 ("net: phy: Avoid multiple suspends")
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Heiner Kallweit 2020-03-12 22:25:20 +01:00 committed by David S. Miller
parent e4792ffe97
commit 611d779af7
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/phy/phy_device.c
View File

@ -286,6 +286,8 @@ static int mdio_bus_phy_suspend(struct device *dev)
if (!mdio_bus_phy_may_suspend(phydev)) if (!mdio_bus_phy_may_suspend(phydev))
return 0; return 0;
phydev->suspended_by_mdio_bus = 1;
return phy_suspend(phydev); return phy_suspend(phydev);
} }
@ -294,9 +296,11 @@ 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)) if (!phydev->suspended_by_mdio_bus)
goto no_resume; goto no_resume;
phydev->suspended_by_mdio_bus = 0;
ret = phy_resume(phydev); ret = phy_resume(phydev);
if (ret < 0) if (ret < 0)
return ret; return ret;

2
include/linux/phy.h
View File

@ -357,6 +357,7 @@ struct macsec_ops;
* is_gigabit_capable: Set to true if PHY supports 1000Mbps * is_gigabit_capable: Set to true if PHY supports 1000Mbps
* has_fixups: Set to true if this phy has fixups/quirks. * has_fixups: Set to true if this phy has fixups/quirks.
* suspended: Set to true if this phy has been suspended successfully. * suspended: Set to true if this phy has been suspended successfully.
* suspended_by_mdio_bus: Set to true if this phy was suspended by MDIO bus.
* sysfs_links: Internal boolean tracking sysfs symbolic links setup/removal. * sysfs_links: Internal boolean tracking sysfs symbolic links setup/removal.
* loopback_enabled: Set true if this phy has been loopbacked successfully. * loopback_enabled: Set true if this phy has been loopbacked successfully.
* state: state of the PHY for management purposes * state: state of the PHY for management purposes
@ -396,6 +397,7 @@ struct phy_device {
unsigned is_gigabit_capable:1; unsigned is_gigabit_capable:1;
unsigned has_fixups:1; unsigned has_fixups:1;
unsigned suspended:1; unsigned suspended:1;
unsigned suspended_by_mdio_bus:1;
unsigned sysfs_links:1; unsigned sysfs_links:1;
unsigned loopback_enabled:1; unsigned loopback_enabled:1;