net: stmmac: Support WOL with phy

Currently, the stmmac driver WOL implementation relies on MAC's PMT
feature. We have a case: the MAC HW doesn't enable PMT, instead, we
rely on the phy to support WOL. Implement the support for this case.

Signed-off-by: Jisheng Zhang <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index 79795bebd3a2824a32e94bf8ddf3b48939ece375..05d63963fdb7a327bb3adb97f24da412a36dedfb 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -600,6 +600,9 @@ static void stmmac_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
        struct stmmac_priv *priv = netdev_priv(dev);
 
+       if (!priv->plat->pmt)
+               return phylink_ethtool_get_wol(priv->phylink, wol);
+
        mutex_lock(&priv->lock);
        if (device_can_wakeup(priv->device)) {
                wol->supported = WAKE_MAGIC | WAKE_UCAST;
@@ -618,6 +621,14 @@ static int stmmac_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
        if (!device_can_wakeup(priv->device))
                return -EOPNOTSUPP;
 
+       if (!priv->plat->pmt) {
+               int ret = phylink_ethtool_set_wol(priv->phylink, wol);
+
+               if (!ret)
+                       device_set_wakeup_enable(&dev->dev, !!wol->wolopts);
+               return ret;
+       }
+
        /* By default almost all GMAC devices support the WoL via
         * magic frame but we can disable it if the HW capability
         * register shows no support for pmt_magic_frame. */

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 358fd3bf9ef59fb879164f0a5d298e43bca9f521..32c0c9647b87a6ea6ea7cea412b6e1af6ea9483d 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1075,6 +1075,7 @@ static void stmmac_check_pcs_mode(struct stmmac_priv *priv)
  */
 static int stmmac_init_phy(struct net_device *dev)
 {
+       struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };
        struct stmmac_priv *priv = netdev_priv(dev);
        struct device_node *node;
        int ret;
@@ -1100,6 +1101,9 @@ static int stmmac_init_phy(struct net_device *dev)
                ret = phylink_connect_phy(priv->phylink, phydev);
        }
 
+       phylink_ethtool_get_wol(priv->phylink, &wol);
+       device_set_wakeup_capable(priv->device, !!wol.supported);
+
        return ret;
 }