diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2020-03-01 21:36:09 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-03-01 19:04:19 -0800 |
| commit | 249bc9744e165abe74ae326f43e9d70bad54c3b7 (patch) | |
| tree | a26daf322f9ba04fe8052c00fca022b1cdf1a650 /drivers | |
| parent | net: dsa: sja1105: Don't destroy not-yet-created xmit_worker (diff) | |
| download | linux-dev-249bc9744e165abe74ae326f43e9d70bad54c3b7.tar.xz linux-dev-249bc9744e165abe74ae326f43e9d70bad54c3b7.zip | |
net: phy: avoid clearing PHY interrupts twice in irq handler
On all PHY drivers that implement did_interrupt() reading the interrupt
status bits clears them. This means we may loose an interrupt that
is triggered between calling did_interrupt() and phy_clear_interrupt().
As part of the fix make it a requirement that did_interrupt() clears
the interrupt.
The Fixes tag refers to the first commit where the patch applies
cleanly.
Fixes: 49644e68f472 ("net: phy: add callback for custom interrupt handler to struct phy_driver")
Reported-by: Michael Walle <michael@walle.cc>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/phy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index d76e038cf2cb..355bfdef48d2 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -727,7 +727,8 @@ static irqreturn_t phy_interrupt(int irq, void *phy_dat) phy_trigger_machine(phydev); } - if (phy_clear_interrupt(phydev)) + /* did_interrupt() may have cleared the interrupt already */ + if (!phydev->drv->did_interrupt && phy_clear_interrupt(phydev)) goto phy_err; return IRQ_HANDLED; |