From: Doug Berger <opendmb@gmail.com>
To: f.fainelli@gmail.com
Cc: pgynther@google.com, jaedon.shin@gmail.com,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Doug Berger <opendmb@gmail.com>
Subject: [PATCH v2 net 4/8] net: bcmgenet: power down internal phy if open or resume fails
Date: Thu, 9 Mar 2017 16:58:46 -0800 [thread overview]
Message-ID: <20170310005850.10808-5-opendmb@gmail.com> (raw)
In-Reply-To: <20170310005850.10808-1-opendmb@gmail.com>
Since the internal PHY is powered up during the open and resume
functions it should be powered back down if the functions fail.
Fixes: 1c1008c793fa ("net: bcmgenet: add main driver file")
Signed-off-by: Doug Berger <opendmb@gmail.com>
---
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 99f8d9024633..475dc14931af 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -2850,6 +2850,8 @@ static int bcmgenet_open(struct net_device *dev)
err_fini_dma:
bcmgenet_fini_dma(priv);
err_clk_disable:
+ if (priv->internal_phy)
+ bcmgenet_power_down(priv, GENET_POWER_PASSIVE);
clk_disable_unprepare(priv->clk);
return ret;
}
@@ -3551,6 +3553,8 @@ static int bcmgenet_resume(struct device *d)
return 0;
out_clk_disable:
+ if (priv->internal_phy)
+ bcmgenet_power_down(priv, GENET_POWER_PASSIVE);
clk_disable_unprepare(priv->clk);
return ret;
}
--
2.11.1
next prev parent reply other threads:[~2017-03-10 0:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-10 0:58 [PATCH v2 net 0/8] net: bcmgenet: minor bug fixes Doug Berger
2017-03-10 0:58 ` [PATCH v2 net 1/8] net: bcmgenet: correct the RBUF_OVFL_CNT and RBUF_ERR_CNT MIB values Doug Berger
2017-03-10 1:42 ` Florian Fainelli
2017-03-10 0:58 ` [PATCH v2 net 2/8] net: bcmgenet: correct MIB access of UniMAC RUNT counters Doug Berger
2017-03-10 1:43 ` Florian Fainelli
2017-03-10 0:58 ` [PATCH v2 net 3/8] net: bcmgenet: reserved phy revisions must be checked first Doug Berger
2017-03-10 1:43 ` Florian Fainelli
2017-03-10 0:58 ` Doug Berger [this message]
2017-03-10 1:43 ` [PATCH v2 net 4/8] net: bcmgenet: power down internal phy if open or resume fails Florian Fainelli
2017-03-10 0:58 ` [PATCH v2 net 5/8] net: bcmgenet: synchronize irq0 status between the isr and task Doug Berger
2017-03-10 1:44 ` Florian Fainelli
2017-03-10 0:58 ` [PATCH v2 net 6/8] net: bcmgenet: Power up the internal PHY before probing the MII Doug Berger
2017-03-10 1:44 ` Florian Fainelli
2017-03-10 0:58 ` [PATCH v2 net 7/8] net: bcmgenet: add begin/complete ethtool ops Doug Berger
2017-03-10 1:44 ` Florian Fainelli
2017-03-10 0:58 ` [PATCH v2 net 8/8] net: bcmgenet: decouple flow control from bcmgenet_tx_reclaim Doug Berger
2017-03-10 1:45 ` Florian Fainelli
2017-03-10 1:45 ` [PATCH v2 net 0/8] net: bcmgenet: minor bug fixes Florian Fainelli
2017-03-10 2:39 ` 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=20170310005850.10808-5-opendmb@gmail.com \
--to=opendmb@gmail.com \
--cc=f.fainelli@gmail.com \
--cc=jaedon.shin@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--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).