net: phy: ste10Xp: implement generic .handle_interrupt() callback (80ca9ee7) · Commits · 戴 / test

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>

drivers/net/phy/ste10Xp.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,24 @@ static int ste10Xp_ack_interrupt(struct phy_device *phydev)
		return 0;
		}

		static irqreturn_t ste10Xp_handle_interrupt(struct phy_device *phydev)
		{
		int irq_status;

		irq_status = phy_read(phydev, MII_XCIIS);
		if (irq_status < 0) {
		phy_error(phydev);
		return IRQ_NONE;
		}

		if (!(irq_status & MII_XIE_DEFAULT_MASK))
		return IRQ_NONE;

		phy_trigger_machine(phydev);

		return IRQ_HANDLED;
		}

		static struct phy_driver ste10xp_pdriver[] = {
		{
		.phy_id = STE101P_PHY_ID,
		@@ -85,6 +103,7 @@ static struct phy_driver ste10xp_pdriver[] = {
		.config_init = ste10Xp_config_init,
		.ack_interrupt = ste10Xp_ack_interrupt,
		.config_intr = ste10Xp_config_intr,
		.handle_interrupt = ste10Xp_handle_interrupt,
		.suspend = genphy_suspend,
		.resume = genphy_resume,
		}, {
		@@ -95,6 +114,7 @@ static struct phy_driver ste10xp_pdriver[] = {
		.config_init = ste10Xp_config_init,
		.ack_interrupt = ste10Xp_ack_interrupt,
		.config_intr = ste10Xp_config_intr,
		.handle_interrupt = ste10Xp_handle_interrupt,
		.suspend = genphy_suspend,
		.resume = genphy_resume,
		} };

Admin message