Commit e01a3feb authored by Ioana Ciornei's avatar Ioana Ciornei Committed by Jakub Kicinski
Browse files

net: phy: microchip: 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.

Cc: Nisar Sayed <Nisar.Sayed@microchip.com>
Cc: Yuiko Oshino <yuiko.oshino@microchip.com>
Signed-off-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e96a0d97

drivers/net/phy/microchip.c

+19 −0
Original line number Diff line number Diff line
@@ -56,6 +56,24 @@ static int lan88xx_phy_ack_interrupt(struct phy_device *phydev) 
	return rc < 0 ? rc : 0;

}



static irqreturn_t lan88xx_handle_interrupt(struct phy_device *phydev)

{

	int irq_status;



	irq_status = phy_read(phydev, LAN88XX_INT_STS);

	if (irq_status < 0) {

		phy_error(phydev);

		return IRQ_NONE;

	}



	if (!(irq_status & LAN88XX_INT_STS_LINK_CHANGE_))

		return IRQ_NONE;



	phy_trigger_machine(phydev);



	return IRQ_HANDLED;

}



static int lan88xx_suspend(struct phy_device *phydev)

{

	struct lan88xx_priv *priv = phydev->priv;
@@ -342,6 +360,7 @@ static struct phy_driver microchip_phy_driver[] = { 


	.ack_interrupt	= lan88xx_phy_ack_interrupt,

	.config_intr	= lan88xx_phy_config_intr,

	.handle_interrupt = lan88xx_handle_interrupt,



	.suspend	= lan88xx_suspend,

	.resume		= genphy_resume,

drivers/net/phy/microchip_t1.c

+19 −0
Original line number Diff line number Diff line
@@ -203,6 +203,24 @@ static int lan87xx_phy_ack_interrupt(struct phy_device *phydev) 
	return rc < 0 ? rc : 0;

}



static irqreturn_t lan87xx_handle_interrupt(struct phy_device *phydev)

{

	int irq_status;



	irq_status = phy_read(phydev, LAN87XX_INTERRUPT_SOURCE);

	if (irq_status < 0) {

		phy_error(phydev);

		return IRQ_NONE;

	}



	if (irq_status == 0)

		return IRQ_NONE;



	phy_trigger_machine(phydev);



	return IRQ_HANDLED;

}



static int lan87xx_config_init(struct phy_device *phydev)

{

	int rc = lan87xx_phy_init(phydev);
@@ -222,6 +240,7 @@ static struct phy_driver microchip_t1_phy_driver[] = { 


		.ack_interrupt  = lan87xx_phy_ack_interrupt,

		.config_intr    = lan87xx_phy_config_intr,

		.handle_interrupt = lan87xx_handle_interrupt,



		.suspend        = genphy_suspend,

		.resume         = genphy_resume,