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

net: phy: vitesse: 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: Kavya Sree Kotagiri <kavyasree.kotagiri@microchip.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 97f53a08

drivers/net/phy/vitesse.c

+37 −0
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ 
#define MII_VSC8244_ISTAT_SPEED		0x4000

#define MII_VSC8244_ISTAT_LINK		0x2000

#define MII_VSC8244_ISTAT_DUPLEX	0x1000

#define MII_VSC8244_ISTAT_MASK		(MII_VSC8244_ISTAT_SPEED | \

					 MII_VSC8244_ISTAT_LINK | \

					 MII_VSC8244_ISTAT_DUPLEX)



#define MII_VSC8221_ISTAT_MASK		MII_VSC8244_ISTAT_LINK



/* Vitesse Auxiliary Control/Status Register */

#define MII_VSC8244_AUX_CONSTAT		0x1c
@@ -311,6 +316,31 @@ static int vsc82xx_config_intr(struct phy_device *phydev) 
	return err;

}



static irqreturn_t vsc82xx_handle_interrupt(struct phy_device *phydev)

{

	int irq_status, irq_mask;



	if (phydev->drv->phy_id == PHY_ID_VSC8244 ||

	    phydev->drv->phy_id == PHY_ID_VSC8572 ||

	    phydev->drv->phy_id == PHY_ID_VSC8601)

		irq_mask = MII_VSC8244_ISTAT_MASK;

	else

		irq_mask = MII_VSC8221_ISTAT_MASK;



	irq_status = phy_read(phydev, MII_VSC8244_ISTAT);

	if (irq_status < 0) {

		phy_error(phydev);

		return IRQ_NONE;

	}



	if (!(irq_status & irq_mask))

		return IRQ_NONE;



	phy_trigger_machine(phydev);



	return IRQ_HANDLED;

}



static int vsc8221_config_init(struct phy_device *phydev)

{

	int err;
@@ -392,6 +422,7 @@ static struct phy_driver vsc82xx_driver[] = { 
	.config_aneg    = &vsc82x4_config_aneg,

	.ack_interrupt  = &vsc824x_ack_interrupt,

	.config_intr    = &vsc82xx_config_intr,

	.handle_interrupt = &vsc82xx_handle_interrupt,

}, {

	.phy_id		= PHY_ID_VSC8244,

	.name		= "Vitesse VSC8244",
@@ -401,6 +432,7 @@ static struct phy_driver vsc82xx_driver[] = { 
	.config_aneg	= &vsc82x4_config_aneg,

	.ack_interrupt	= &vsc824x_ack_interrupt,

	.config_intr	= &vsc82xx_config_intr,

	.handle_interrupt = &vsc82xx_handle_interrupt,

}, {

	.phy_id         = PHY_ID_VSC8572,

	.name           = "Vitesse VSC8572",
@@ -410,6 +442,7 @@ static struct phy_driver vsc82xx_driver[] = { 
	.config_aneg    = &vsc82x4_config_aneg,

	.ack_interrupt  = &vsc824x_ack_interrupt,

	.config_intr    = &vsc82xx_config_intr,

	.handle_interrupt = &vsc82xx_handle_interrupt,

}, {

	.phy_id         = PHY_ID_VSC8601,

	.name           = "Vitesse VSC8601",
@@ -418,6 +451,7 @@ static struct phy_driver vsc82xx_driver[] = { 
	.config_init    = &vsc8601_config_init,

	.ack_interrupt  = &vsc824x_ack_interrupt,

	.config_intr    = &vsc82xx_config_intr,

	.handle_interrupt = &vsc82xx_handle_interrupt,

}, {

	.phy_id         = PHY_ID_VSC7385,

	.name           = "Vitesse VSC7385",
@@ -463,6 +497,7 @@ static struct phy_driver vsc82xx_driver[] = { 
	.config_aneg    = &vsc82x4_config_aneg,

	.ack_interrupt  = &vsc824x_ack_interrupt,

	.config_intr    = &vsc82xx_config_intr,

	.handle_interrupt = &vsc82xx_handle_interrupt,

}, {

	/* Vitesse 8221 */

	.phy_id		= PHY_ID_VSC8221,
@@ -472,6 +507,7 @@ static struct phy_driver vsc82xx_driver[] = { 
	.config_init	= &vsc8221_config_init,

	.ack_interrupt	= &vsc824x_ack_interrupt,

	.config_intr	= &vsc82xx_config_intr,

	.handle_interrupt = &vsc82xx_handle_interrupt,

}, {

	/* Vitesse 8211 */

	.phy_id		= PHY_ID_VSC8211,
@@ -481,6 +517,7 @@ static struct phy_driver vsc82xx_driver[] = { 
	.config_init	= &vsc8221_config_init,

	.ack_interrupt	= &vsc824x_ack_interrupt,

	.config_intr	= &vsc82xx_config_intr,

	.handle_interrupt = &vsc82xx_handle_interrupt,

} };



module_phy_driver(vsc82xx_driver);