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: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 3fc91e89f5a564bb36ab251c81ec083fc7cab68d..bdfe51fc3a6507154edfcaf8be3413884bcf702f 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -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);
 

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 1b3690b597d53d5d3d64fdc6bd50f770dd365a47..685809835b5c0edc5b80a3398e849c3a53d5b17c 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -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;