[PATCH v2 net 4/8] net: bcmgenet: power down internal phy if open or resume fails

From	Doug Berger <opendmb@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 net 4/8] net: bcmgenet: power down internal phy if open or resume fails
Date	2017-03-10 02:10 +0100
Message-ID	<tjhea-4Jd-7@gated-at.bofh.it> (permalink)
References	<tjh4t-4qP-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Thread

[PATCH v2 net 0/8] net: bcmgenet: minor bug fixes Doug Berger <opendmb@gmail.com> - 2017-03-10 02:00 +0100
  [PATCH v2 net 6/8] net: bcmgenet: Power up the internal PHY before probing the MII Doug Berger <opendmb@gmail.com> - 2017-03-10 02:00 +0100
    Re: [PATCH v2 net 6/8] net: bcmgenet: Power up the internal PHY  before probing the MII Florian Fainelli <f.fainelli@gmail.com> - 2017-03-10 02:50 +0100
  [PATCH v2 net 8/8] net: bcmgenet: decouple flow control from bcmgenet_tx_reclaim Doug Berger <opendmb@gmail.com> - 2017-03-10 02:00 +0100
    Re: [PATCH v2 net 8/8] net: bcmgenet: decouple flow control from  bcmgenet_tx_reclaim Florian Fainelli <f.fainelli@gmail.com> - 2017-03-10 02:50 +0100
  [PATCH v2 net 5/8] net: bcmgenet: synchronize irq0 status between the isr and task Doug Berger <opendmb@gmail.com> - 2017-03-10 02:00 +0100
  [PATCH v2 net 2/8] net: bcmgenet: correct MIB access of UniMAC RUNT counters Doug Berger <opendmb@gmail.com> - 2017-03-10 02:00 +0100
    Re: [PATCH v2 net 2/8] net: bcmgenet: correct MIB access of UniMAC  RUNT counters Florian Fainelli <f.fainelli@gmail.com> - 2017-03-10 02:50 +0100
  [PATCH v2 net 3/8] net: bcmgenet: reserved phy revisions must be checked first Doug Berger <opendmb@gmail.com> - 2017-03-10 02:10 +0100
  [PATCH v2 net 7/8] net: bcmgenet: add begin/complete ethtool ops Doug Berger <opendmb@gmail.com> - 2017-03-10 02:10 +0100
    Re: [PATCH v2 net 7/8] net: bcmgenet: add begin/complete ethtool ops Florian Fainelli <f.fainelli@gmail.com> - 2017-03-10 02:50 +0100
  [PATCH v2 net 4/8] net: bcmgenet: power down internal phy if open or resume fails Doug Berger <opendmb@gmail.com> - 2017-03-10 02:10 +0100
    Re: [PATCH v2 net 4/8] net: bcmgenet: power down internal phy if open  or resume fails Florian Fainelli <f.fainelli@gmail.com> - 2017-03-10 02:50 +0100
  [PATCH v2 net 1/8] net: bcmgenet: correct the RBUF_OVFL_CNT and RBUF_ERR_CNT MIB values Doug Berger <opendmb@gmail.com> - 2017-03-10 02:10 +0100
  Re: [PATCH v2 net 0/8] net: bcmgenet: minor bug fixes Florian Fainelli <f.fainelli@gmail.com> - 2017-03-10 02:50 +0100
  Re: [PATCH v2 net 0/8] net: bcmgenet: minor bug fixes David Miller <davem@davemloft.net> - 2017-03-10 03:40 +0100

csiph-web