diff options
| author |   Xander Huff <xander.huff@ni.com> | 2016-08-24 16:47:53 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-08-25 16:53:47 -0700 |
| commit | c3e70edd7c2eed6acd234627a6007627f5c76e8e (patch) | |
| tree | eaa60a6cae55a35550230aa84861ca407e6330ea /drivers/net/phy | |
| parent | net: dsa: bcm_sf2: Fix race condition while unmasking interrupts (diff) | |
| download | linux-dev-c3e70edd7c2eed6acd234627a6007627f5c76e8e.tar.xz linux-dev-c3e70edd7c2eed6acd234627a6007627f5c76e8e.zip | |
Revert "phy: IRQ cannot be shared"
This reverts:
commit 33c133cc7598 ("phy: IRQ cannot be shared")
On hardware with multiple PHY devices hooked up to the same IRQ line, allow
them to share it.
Sergei Shtylyov says:
"I'm not sure now what was the reason I concluded that the IRQ sharing
was impossible... most probably I thought that the kernel IRQ handling
code exited the loop over the IRQ actions once IRQ_HANDLED was returned
-- which is obviously not so in reality..."
Signed-off-by: Xander Huff <xander.huff@ni.com>
Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/phy.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index c5dc2c363f96..c6f66832a1a6 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -722,8 +722,10 @@ phy_err: int phy_start_interrupts(struct phy_device *phydev) { atomic_set(&phydev->irq_disable, 0); - if (request_irq(phydev->irq, phy_interrupt, 0, "phy_interrupt", - phydev) < 0) { + if (request_irq(phydev->irq, phy_interrupt, + IRQF_SHARED, + "phy_interrupt", + phydev) < 0) { pr_warn("%s: Can't get IRQ %d (PHY)\n", phydev->mdio.bus->name, phydev->irq); phydev->irq = PHY_POLL; |