Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1596532

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

Path csiph.com!aioe.org!bofh.it!news.nic.it!robomod
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 Fri, 10 Mar 2017 02:10:02 +0100
Message-ID <tjhea-4Jd-7@gated-at.bofh.it> (permalink)
References <tjh4t-4qP-3@gated-at.bofh.it>
X-Original-To f.fainelli@gmail.com
Dkim-Signature v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QRk0KzHH9qDCSKaKvzMqPpJ0+qoObgJgLTMVmiMzjjA=; b=ByWYstLlK5If2Z3ChaEnw820McdF6smwmtCYKkcRVBZu59iEPsdGuXGSzJRi7YAu+H WRxxFDRwYbd1H5RKlSeneK7Z31nGJUpiO9GcVeS84vnxSvO7VU7TXVxS/ed7z4vXvEfp hEwNOVu8RiUvx1cjoNA1vQ+24tBRTycAGxFuqxvmTx4MU9qvYuOl91oPTtbdbF2vclRO k0z2z2YJq5jqaElT7EmnifoSMHIAOxPACxpqzN4vWsgTq+ATWp0o5VERcXGJUDia5Psd A8YR/ZoJ1StAI4bWPJGmLoIt5f8S4wVTzz8jAk8g/legjY5A1hzAuAlNS2s01n1Hxdux qV5A==
X-Google-Dkim-Signature v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QRk0KzHH9qDCSKaKvzMqPpJ0+qoObgJgLTMVmiMzjjA=; b=Z61k8XJTMB+XL/BvNO9UIgEFMf+bVp6nEBzIynO1N6i5BxSBpw6TMBxur0tWvnYSBY Bxcd9hqR4AOhFNxaPCB9P+VVvv0/2wcLmP7ou5BrWXl9t5rEpA7VYcKVIc3afwStJZ1y qRULF321+6n69hu9rWpajB3aL7ODYn8kAxvTVkkIFCdjnjn8DPCARhlh/R4kTTa1Asak rH0C3uV/g+779p3W3oho6CqrcZe60S19cn+MNWtazgaQh0PjvFfFFhxUw9mZ29AlfrT7 LPi+CCp99/RzB0oANmemWhQSDKZh1f8jwgS/b4EMQmrH/mTtXsybcmgOBi4ND8CYxQbg ehdA==
X-Gm-Message-State AFeK/H0MJ2u6g7D1x8tiwbyAUF8ZtZOxmbFKxjJXAtdG70WEOH4uvnJ8cy8rUphK6bXawg==
X-Received by 10.55.164.207 with SMTP id n198mr17235851qke.95.1489107546845; Thu, 09 Mar 2017 16:59:06 -0800 (PST)
X-Mailer git-send-email 2.11.1
Sender robomod@news.nic.it
List-ID <linux-kernel.vger.kernel.org>
X-Mailing-List linux-kernel@vger.kernel.org
Approved robomod@news.nic.it
Lines 33
Organization linux.* mail to news gateway
X-Original-Cc pgynther@google.com, jaedon.shin@gmail.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Doug Berger <opendmb@gmail.com>
X-Original-Date Thu, 9 Mar 2017 16:58:46 -0800
X-Original-Message-ID <20170310005850.10808-5-opendmb@gmail.com>
X-Original-References <20170310005850.10808-1-opendmb@gmail.com>
X-Original-Sender linux-kernel-owner@vger.kernel.org
Xref csiph.com linux.kernel:1596532

Show key headers only | 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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

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