summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2014-07-22 02:29:28 +0400
committerDavid S. Miller <davem@davemloft.net>2014-07-22 03:04:31 +0400
commit8c90db72f92603d7972488bb2e7efcf23b311655 (patch)
tree0f3ff2aeec3b3fb403f19bdac0af6fbd72b388d3
parent1c3c1e7996c1f99ab96b7d499d9d90072147909e (diff)
downloadlinux-8c90db72f92603d7972488bb2e7efcf23b311655.tar.xz
net: bcmgenet: suspend and resume from Wake-on-LAN
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>
-rw-r--r--drivers/net/ethernet/broadcom/genet/bcmgenet.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 1925ae1dc1e6..62ef49c85980 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -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);