net: phy: improve phy_driver callback handle_interrupt

did_interrupt() clears the interrupt, therefore handle_interrupt() can
not check which event triggered the interrupt. To overcome this
constraint and allow more flexibility for customer interrupt handlers,
let's decouple handle_interrupt() from parts of the phylib interrupt
handling. Custom interrupt handlers now have to implement the
did_interrupt() functionality in handle_interrupt() if needed.

Fortunately we have just one custom interrupt handler so far (in the
mscc PHY driver), convert it to the changed API.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Heiner Kallweit
2020-03-16 22:32:33 +01:00
committed by David S. Miller
parent 225fc22388
commit 9010f9deb0
3 changed files with 23 additions and 17 deletions

View File

@@ -1429,11 +1429,18 @@ err:
return ret;
}
static int vsc8584_handle_interrupt(struct phy_device *phydev)
static irqreturn_t vsc8584_handle_interrupt(struct phy_device *phydev)
{
int irq_status;
irq_status = phy_read(phydev, MII_VSC85XX_INT_STATUS);
if (irq_status < 0 || !(irq_status & MII_VSC85XX_INT_MASK_MASK))
return IRQ_NONE;
vsc8584_handle_macsec_interrupt(phydev);
phy_mac_interrupt(phydev);
return 0;
return IRQ_HANDLED;
}
static int vsc85xx_config_init(struct phy_device *phydev)