netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH net-next 10/11] net: bcmgenet: suspend and resume from Wake-on-LAN
Date: Thu, 10 Jul 2014 15:46:23 -0700	[thread overview]
Message-ID: <1405032384-24006-11-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1405032384-24006-1-git-send-email-f.fainelli@gmail.com>

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>
---
 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 5b2b9c546ee7..e80afa3cc321 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -2639,6 +2639,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);
 
@@ -2667,6 +2673,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, 0);
 
-- 
1.9.1

  parent reply	other threads:[~2014-07-10 22:46 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-10 22:46 [PATCH net-next 00/11] net: bcmgenet: PM and Wake-on-LAN Florian Fainelli
2014-07-10 22:46 ` [PATCH net-next 01/11] net: bcmgenet: remove wol_enabled conditional code Florian Fainelli
2014-07-10 22:46 ` [PATCH net-next 02/11] net: bcmgenet: add umac_enable_set helper Florian Fainelli
2014-07-11 20:39   ` David Miller
2014-07-10 22:46 ` [PATCH net-next 03/11] net: bcmgenet: modularize bcmgenet_{open,close} Florian Fainelli
2014-07-10 22:46 ` [PATCH net-next 04/11] net: bcmgenet: add suspend/resume callbacks Florian Fainelli
2014-07-10 22:46 ` [PATCH net-next 05/11] net: bcmgenet: request Wake-on-LAN interrupt Florian Fainelli
2014-07-11 20:41   ` David Miller
2014-07-10 22:46 ` [PATCH net-next 06/11] net: bcmgenet: add Wake-on-LAN support code Florian Fainelli
2014-07-10 22:46 ` [PATCH net-next 07/11] net: bcmgenet: handle GENET_POWER_WOL_MAGIC Florian Fainelli
2014-07-10 22:46 ` [PATCH net-next 08/11] net: bcmgenet: handle UMAC_IRQ_MPD_R interrupt bit Florian Fainelli
2014-07-10 22:46 ` [PATCH net-next 09/11] net: bcmgenet: fix bcmgenet_wol_resume Florian Fainelli
2014-07-10 22:46 ` Florian Fainelli [this message]
2014-07-10 22:46 ` [PATCH net-next 11/11] net: bcmgenet: hook ethtool set/get_wol operations Florian Fainelli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1405032384-24006-11-git-send-email-f.fainelli@gmail.com \
    --to=f.fainelli@gmail.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).