Commit 249bc974 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller

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: 49644e68 ("net: phy: add callback for custom interrupt handler to struct phy_driver")
Reported-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 52c0d4e3
...@@ -727,7 +727,8 @@ static irqreturn_t phy_interrupt(int irq, void *phy_dat) ...@@ -727,7 +727,8 @@ static irqreturn_t phy_interrupt(int irq, void *phy_dat)
phy_trigger_machine(phydev); 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; goto phy_err;
return IRQ_HANDLED; return IRQ_HANDLED;
......
...@@ -557,6 +557,7 @@ struct phy_driver { ...@@ -557,6 +557,7 @@ struct phy_driver {
/* /*
* Checks if the PHY generated an interrupt. * Checks if the PHY generated an interrupt.
* For multi-PHY devices with shared PHY interrupt pin * For multi-PHY devices with shared PHY interrupt pin
* Set interrupt bits have to be cleared.
*/ */
int (*did_interrupt)(struct phy_device *phydev); int (*did_interrupt)(struct phy_device *phydev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment