[PATCH] net: macb: fix phy interrupt parsing

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Alexandre Belloni <alexandre.belloni@free-electrons.com>
Newsgroups	linux.kernel
Subject	[PATCH] net: macb: fix phy interrupt parsing
Date	Wed, 26 Apr 2017 12:10:01 +0200
Message-ID	<tAs3v-Rc-13@gated-at.bofh.it> (permalink)
X-Original-To	Nicolas Ferre <nicolas.ferre@microchip.com>, "David S . Miller" <davem@davemloft.net>
X-Mailer	git-send-email 2.11.0
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	42
Organization	linux.* mail to news gateway
X-Original-Cc	Bartosz Folta <bfolta@cadence.com>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alexandre Belloni <alexandre.belloni@free-electrons.com>
X-Original-Date	Wed, 26 Apr 2017 12:06:28 +0200
X-Original-Message-ID	<20170426100628.14493-1-alexandre.belloni@free-electrons.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1631338

Show key headers only | View raw

Since 83a77e9ec415, the phydev irq is explicitly set to PHY_POLL when
there is no pdata. It doesn't work on DT enabled platforms because the
phydev irq is already set by libphy before.

Fixes: 83a77e9ec415 ("net: macb: Added PCI wrapper for Platform Driver.")
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 drivers/net/ethernet/cadence/macb.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index e131ecd17ab9..004223a866fe 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -432,15 +432,17 @@ static int macb_mii_probe(struct net_device *dev)
 	}
 
 	pdata = dev_get_platdata(&bp->pdev->dev);
-	if (pdata && gpio_is_valid(pdata->phy_irq_pin)) {
-		ret = devm_gpio_request(&bp->pdev->dev, pdata->phy_irq_pin,
-					"phy int");
-		if (!ret) {
-			phy_irq = gpio_to_irq(pdata->phy_irq_pin);
-			phydev->irq = (phy_irq < 0) ? PHY_POLL : phy_irq;
+	if (pdata) {
+		if (gpio_is_valid(pdata->phy_irq_pin)) {
+			ret = devm_gpio_request(&bp->pdev->dev,
+						pdata->phy_irq_pin, "phy int");
+			if (!ret) {
+				phy_irq = gpio_to_irq(pdata->phy_irq_pin);
+				phydev->irq = (phy_irq < 0) ? PHY_POLL : phy_irq;
+			}
+		} else {
+			phydev->irq = PHY_POLL;
 		}
-	} else {
-		phydev->irq = PHY_POLL;
 	}
 
 	/* attach the mac to the phy */
-- 
2.11.0

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

Thread

[PATCH] net: macb: fix phy interrupt parsing Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2017-04-26 12:10 +0200
  Re: [PATCH] net: macb: fix phy interrupt parsing Nicolas Ferre <nicolas.ferre@microchip.com> - 2017-04-27 11:40 +0200
  Re: [PATCH] net: macb: fix phy interrupt parsing David Miller <davem@davemloft.net> - 2017-05-01 04:30 +0200

csiph-web