[PATCH net-next 4/7] net: freescale: ucc_geth: Fix WOL configuration

[Maxime Chevallier]

The get/set_wol ethtool ops rely on querying the PHY for its WoL
capabilities, checking for the presence of a PHY and a PHY interrupts
isn't enough. Address that by cleaning up the WoL configuration
sequence.

Signed-off-by: Maxime Chevallier <maxime.chevall...@bootlin.com>
---
 .../net/ethernet/freescale/ucc_geth_ethtool.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/freescale/ucc_geth_ethtool.c 
b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
index fb5254d7d1ba..2a085f8f34b2 100644
--- a/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
+++ b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
@@ -346,26 +346,37 @@ static void uec_get_wol(struct net_device *netdev, struct 
ethtool_wolinfo *wol)
        struct ucc_geth_private *ugeth = netdev_priv(netdev);
        struct phy_device *phydev = netdev->phydev;
 
-       if (phydev && phydev->irq)
-               wol->supported |= WAKE_PHY;
+       wol->supported = 0;
+       wol->wolopts = 0;
+
+       if (phydev)
+               phy_ethtool_get_wol(phydev, wol);
+
        if (qe_alive_during_sleep())
                wol->supported |= WAKE_MAGIC;
 
-       wol->wolopts = ugeth->wol_en;
+       wol->wolopts |= ugeth->wol_en;
 }
 
 static int uec_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
 {
        struct ucc_geth_private *ugeth = netdev_priv(netdev);
        struct phy_device *phydev = netdev->phydev;
+       int ret = 0;
 
        if (wol->wolopts & ~(WAKE_PHY | WAKE_MAGIC))
                return -EINVAL;
-       else if (wol->wolopts & WAKE_PHY && (!phydev || !phydev->irq))
+       else if ((wol->wolopts & WAKE_PHY) && !phydev)
                return -EINVAL;
        else if (wol->wolopts & WAKE_MAGIC && !qe_alive_during_sleep())
                return -EINVAL;
 
+       if (wol->wolopts & WAKE_PHY)
+               ret = phy_ethtool_set_wol(phydev, wol);
+
+       if (ret)
+               return ret;
+
        ugeth->wol_en = wol->wolopts;
        device_set_wakeup_enable(&netdev->dev, ugeth->wol_en);
 
-- 
2.47.0