net: phy: cicada: implement the generic .handle_interrupt() callback (e5d2b0b6) · 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/cicada.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,24 @@ static int cis820x_config_intr(struct phy_device *phydev)
		return err;
		}

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

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

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

		phy_trigger_machine(phydev);

		return IRQ_HANDLED;
		}

		/* Cicada 8201, a.k.a Vitesse VSC8201 */
		static struct phy_driver cis820x_driver[] = {
		{
		@@ -106,6 +124,7 @@ static struct phy_driver cis820x_driver[] = {
		.config_init = &cis820x_config_init,
		.ack_interrupt = &cis820x_ack_interrupt,
		.config_intr = &cis820x_config_intr,
		.handle_interrupt = &cis820x_handle_interrupt,
		}, {
		.phy_id = 0x000fc440,
		.name = "Cicada Cis8204",
		@@ -114,6 +133,7 @@ static struct phy_driver cis820x_driver[] = {
		.config_init = &cis820x_config_init,
		.ack_interrupt = &cis820x_ack_interrupt,
		.config_intr = &cis820x_config_intr,
		.handle_interrupt = &cis820x_handle_interrupt,
		} };

		module_phy_driver(cis820x_driver);

Admin message