net: phy: qsemi: implement generic .handle_interrupt() callback

In an attempt to actually support shared IRQs in phylib, we now move the
responsibility of triggering the phylib state machine or just returning
IRQ_NONE, based on the IRQ status register, to the PHY driver. Having
3 different IRQ handling callbacks (.handle_interrupt(),
.did_interrupt() and .ack_interrupt() ) is confusing so let the PHY
driver implement directly an IRQ handler like any other device driver.
Make this driver follow the new convention.

Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Ioana Ciornei 2020-11-23 17:38:15 +02:00 committed by Jakub Kicinski
parent aa2d603ac8
commit efc3d9de7f
1 changed files with 22 additions and 0 deletions

View File

@ -106,6 +106,27 @@ static int qs6612_config_intr(struct phy_device *phydev)
} }
static irqreturn_t qs6612_handle_interrupt(struct phy_device *phydev)
{
int irq_status;
irq_status = phy_read(phydev, MII_QS6612_ISR);
if (irq_status < 0) {
phy_error(phydev);
return IRQ_NONE;
}
if (!(irq_status & MII_QS6612_IMR_INIT))
return IRQ_NONE;
/* the interrupt source register is not self-clearing */
qs6612_ack_interrupt(phydev);
phy_trigger_machine(phydev);
return IRQ_HANDLED;
}
static struct phy_driver qs6612_driver[] = { { static struct phy_driver qs6612_driver[] = { {
.phy_id = 0x00181440, .phy_id = 0x00181440,
.name = "QS6612", .name = "QS6612",
@ -114,6 +135,7 @@ static struct phy_driver qs6612_driver[] = { {
.config_init = qs6612_config_init, .config_init = qs6612_config_init,
.ack_interrupt = qs6612_ack_interrupt, .ack_interrupt = qs6612_ack_interrupt,
.config_intr = qs6612_config_intr, .config_intr = qs6612_config_intr,
.handle_interrupt = qs6612_handle_interrupt,
} }; } };
module_phy_driver(qs6612_driver); module_phy_driver(qs6612_driver);