| Message ID | 1386171888-28190-4-git-send-email-sebastian.hesselbarth@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2013/12/4 Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>: > This adds helper functions to resume and suspend a given phy_device > by calling the corresponding driver callbacks if available. > > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > --- > Changelog: > RFCv1->RFCv2: > - only suspend if WOL is not enabled > - remove EXPORT_SYMBOL for phy_suspend/resume > > Cc: David Miller <davem@davemloft.net> > Cc: Florian Fainelli <f.fainelli@gmail.com> > Cc: Mugunthan V N <mugunthanvnm@ti.com> > Cc: netdev@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > --- > drivers/net/phy/phy_device.c | 24 ++++++++++++++++++++++++ > include/linux/phy.h | 2 ++ > 2 files changed, 26 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c > index d6447b3..6f0e9e4 100644 > --- a/drivers/net/phy/phy_device.c > +++ b/drivers/net/phy/phy_device.c > @@ -625,6 +625,30 @@ void phy_detach(struct phy_device *phydev) > } > EXPORT_SYMBOL(phy_detach); > > +int phy_suspend(struct phy_device *phydev) > +{ > + struct phy_driver *phydrv = to_phy_driver(phydev->dev.driver); > + struct ethtool_wolinfo wol; > + > + /* If the device has WOL enabled, we cannot suspend the PHY */ > + wol.cmd = ETHTOOL_GWOL; > + phy_ethtool_get_wol(phydev, &wol); > + if (wol.wolopts) > + return -EBUSY; I wonder if we should not set a flag in the phy device structure which says "someone called my phydrv->set_wol() callback, this succeeded and WoL is now enabled for me", rather than using this potentially racy call? This would have to be modified in phy_ethtool_set_wol() for instance? This is kind of theoretical though as I can't picture a case where this sequence of events would happen in real-life. -- Florian
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index d6447b3..6f0e9e4 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -625,6 +625,30 @@ void phy_detach(struct phy_device *phydev) } EXPORT_SYMBOL(phy_detach); +int phy_suspend(struct phy_device *phydev) +{ + struct phy_driver *phydrv = to_phy_driver(phydev->dev.driver); + struct ethtool_wolinfo wol; + + /* If the device has WOL enabled, we cannot suspend the PHY */ + wol.cmd = ETHTOOL_GWOL; + phy_ethtool_get_wol(phydev, &wol); + if (wol.wolopts) + return -EBUSY; + + if (phydrv->suspend) + return phydrv->suspend(phydev); + return 0; +} + +int phy_resume(struct phy_device *phydev) +{ + struct phy_driver *phydrv = to_phy_driver(phydev->dev.driver); + + if (phydrv->resume) + return phydrv->resume(phydev); + return 0; +} /* Generic PHY support and helper functions */ diff --git a/include/linux/phy.h b/include/linux/phy.h index 48a4dc3..1070ee3 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -538,6 +538,8 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, int phy_id, struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45); int phy_device_register(struct phy_device *phy); int phy_init_hw(struct phy_device *phydev); +int phy_suspend(struct phy_device *phydev); +int phy_resume(struct phy_device *phydev); struct phy_device * phy_attach(struct net_device *dev, const char *bus_id, phy_interface_t interface); struct phy_device *phy_find_first(struct mii_bus *bus);
This adds helper functions to resume and suspend a given phy_device by calling the corresponding driver callbacks if available. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> --- Changelog: RFCv1->RFCv2: - only suspend if WOL is not enabled - remove EXPORT_SYMBOL for phy_suspend/resume Cc: David Miller <davem@davemloft.net> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: Mugunthan V N <mugunthanvnm@ti.com> Cc: netdev@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/net/phy/phy_device.c | 24 ++++++++++++++++++++++++ include/linux/phy.h | 2 ++ 2 files changed, 26 insertions(+), 0 deletions(-)