From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, Florian Fainelli <f.fainelli@gmail.com>,
jaedon.shin@gmail.com, pgynther@google.com
Subject: [PATCH net-next v2 7/7] net: bcmgenet: power down and up GPHY during suspend/resume
Date: Mon, 23 Mar 2015 15:09:57 -0700 [thread overview]
Message-ID: <1427148597-28337-8-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1427148597-28337-1-git-send-email-f.fainelli@gmail.com>
In case the interface is not used, power down the integrated GPHY during
suspend. Similarly to bcmgenet_open(), bcmgenet_resume() powers on the GPHY
prior to any UniMAC activity.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index c6b15c3cf023..c38d5429e27a 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -3107,6 +3107,8 @@ static int bcmgenet_suspend(struct device *d)
if (device_may_wakeup(d) && priv->wolopts) {
ret = bcmgenet_power_down(priv, GENET_POWER_WOL_MAGIC);
clk_prepare_enable(priv->clk_wol);
+ } else if (phy_is_internal(priv->phydev)) {
+ ret = bcmgenet_power_down(priv, GENET_POWER_PASSIVE);
}
/* Turn off the clocks */
@@ -3131,6 +3133,12 @@ static int bcmgenet_resume(struct device *d)
if (ret)
return ret;
+ /* If this is an internal GPHY, power it back on now, before UniMAC is
+ * brought out of reset as absolutely no UniMAC activity is allowed
+ */
+ if (phy_is_internal(priv->phydev))
+ bcmgenet_power_up(priv, GENET_POWER_PASSIVE);
+
bcmgenet_umac_reset(priv);
ret = init_umac(priv);
--
2.1.0
next prev parent reply other threads:[~2015-03-23 22:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-23 22:09 [PATCH net-next 0/7 v2] net: bcmgenet: integrated GPHY power up/down Florian Fainelli
2015-03-23 22:09 ` [PATCH net-next v2 1/7] net: bcmgenet: propagate errors from bcmgenet_power_down Florian Fainelli
2015-03-23 22:09 ` [PATCH net-next v2 2/7] net: bcmgenet: update bcmgenet_ephy_power_up to clear CK25_DIS bit Florian Fainelli
2015-03-23 22:09 ` [PATCH net-next v2 3/7] net: bcmgenet: rename bcmgenet_ephy_power_up Florian Fainelli
2015-03-23 22:09 ` [PATCH net-next v2 4/7] net: bcmgenet: fix GPHY power-up sequence Florian Fainelli
2015-03-23 22:09 ` [PATCH net-next v2 5/7] net: bcmgenet: implement GPHY power down sequence Florian Fainelli
2015-03-23 22:09 ` [PATCH net-next v2 6/7] net: bcmgenet: power up and down integrated GPHY when unused Florian Fainelli
2015-03-23 22:09 ` Florian Fainelli [this message]
2015-03-24 2:11 ` [PATCH net-next 0/7 v2] net: bcmgenet: integrated GPHY power up/down David Miller
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=1427148597-28337-8-git-send-email-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=davem@davemloft.net \
--cc=jaedon.shin@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pgynther@google.com \
/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).