]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
net: bcmgenet: suspend and resume from Wake-on-LAN
authorFlorian Fainelli <f.fainelli@gmail.com>
Mon, 21 Jul 2014 22:29:28 +0000 (15:29 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 21 Jul 2014 23:04:31 +0000 (16:04 -0700)
Update bcmgenet_suspend() to prepare the hardware for being put into
Wake-on-LAN mode if the device can wakeup the system, and Wake-on-LAN is
enabled. Whether we resume from Wake-on-LAN or not, make sure that
bcmgenet_resume() disables the UniMAC MagicPacket matching mode and puts
the hardware in a state where it can receive all incoming packets.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/genet/bcmgenet.c

index 1925ae1dc1e60b317b6b00b0ab18a0b5c9ebdfb5..62ef49c8598067241cdc51cdfcb544494c0bbfd6 100644 (file)
@@ -2635,6 +2635,12 @@ static int bcmgenet_suspend(struct device *d)
        bcmgenet_tx_reclaim_all(dev);
        bcmgenet_fini_dma(priv);
 
+       /* Prepare the device for Wake-on-LAN and switch to the slow clock */
+       if (device_may_wakeup(d) && priv->wolopts) {
+               bcmgenet_power_down(priv, GENET_POWER_WOL_MAGIC);
+               clk_prepare_enable(priv->clk_wol);
+       }
+
        /* Turn off the clocks */
        clk_disable_unprepare(priv->clk);
 
@@ -2663,6 +2669,12 @@ static int bcmgenet_resume(struct device *d)
        if (ret)
                goto out_clk_disable;
 
+       if (priv->wolopts)
+               ret = bcmgenet_wol_resume(priv);
+
+       if (ret)
+               goto out_clk_disable;
+
        /* disable ethernet MAC while updating its registers */
        umac_enable_set(priv, CMD_TX_EN | CMD_RX_EN, false);