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

net: phy: micrel: 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: Divya Koppera <Divya.Koppera@microchip.com>
Cc: Oleksij Rempel <o.rempel@pengutronix.de>
Cc: Philippe Schenker <philippe.schenker@toradex.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Antoine Tenart <atenart@kernel.org>
Signed-off-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 84c8f773

drivers/net/phy/micrel.c

+34 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ 
#define	KSZPHY_INTCS_LINK_UP			BIT(8)

#define	KSZPHY_INTCS_ALL			(KSZPHY_INTCS_LINK_UP |\

						KSZPHY_INTCS_LINK_DOWN)

#define	KSZPHY_INTCS_LINK_DOWN_STATUS		BIT(2)

#define	KSZPHY_INTCS_LINK_UP_STATUS		BIT(0)

#define	KSZPHY_INTCS_STATUS			(KSZPHY_INTCS_LINK_DOWN_STATUS |\

						 KSZPHY_INTCS_LINK_UP_STATUS)



/* PHY Control 1 */

#define	MII_KSZPHY_CTRL_1			0x1e
@@ -182,6 +186,24 @@ static int kszphy_config_intr(struct phy_device *phydev) 
	return phy_write(phydev, MII_KSZPHY_INTCS, temp);

}



static irqreturn_t kszphy_handle_interrupt(struct phy_device *phydev)

{

	int irq_status;



	irq_status = phy_read(phydev, MII_KSZPHY_INTCS);

	if (irq_status < 0) {

		phy_error(phydev);

		return IRQ_NONE;

	}



	if ((irq_status & KSZPHY_INTCS_STATUS))

		return IRQ_NONE;



	phy_trigger_machine(phydev);



	return IRQ_HANDLED;

}



static int kszphy_rmii_clk_sel(struct phy_device *phydev, bool val)

{

	int ctrl;
@@ -1162,6 +1184,7 @@ static struct phy_driver ksphy_driver[] = { 
	.config_init	= kszphy_config_init,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.handle_interrupt = kszphy_handle_interrupt,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

}, {
@@ -1174,6 +1197,7 @@ static struct phy_driver ksphy_driver[] = { 
	.config_init	= kszphy_config_init,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.handle_interrupt = kszphy_handle_interrupt,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,
@@ -1189,6 +1213,7 @@ static struct phy_driver ksphy_driver[] = { 
	.config_init	= kszphy_config_init,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.handle_interrupt = kszphy_handle_interrupt,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,
@@ -1205,6 +1230,7 @@ static struct phy_driver ksphy_driver[] = { 
	.config_aneg	= ksz8041_config_aneg,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.handle_interrupt = kszphy_handle_interrupt,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,
@@ -1220,6 +1246,7 @@ static struct phy_driver ksphy_driver[] = { 
	.config_init	= kszphy_config_init,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.handle_interrupt = kszphy_handle_interrupt,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,
@@ -1233,6 +1260,7 @@ static struct phy_driver ksphy_driver[] = { 
	.config_init	= kszphy_config_init,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.handle_interrupt = kszphy_handle_interrupt,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,
@@ -1249,6 +1277,7 @@ static struct phy_driver ksphy_driver[] = { 
	.config_init	= kszphy_config_init,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.handle_interrupt = kszphy_handle_interrupt,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,
@@ -1264,6 +1293,7 @@ static struct phy_driver ksphy_driver[] = { 
	.config_init	= ksz8081_config_init,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.handle_interrupt = kszphy_handle_interrupt,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,
@@ -1277,6 +1307,7 @@ static struct phy_driver ksphy_driver[] = { 
	.config_init	= ksz8061_config_init,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.handle_interrupt = kszphy_handle_interrupt,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

}, {
@@ -1290,6 +1321,7 @@ static struct phy_driver ksphy_driver[] = { 
	.config_init	= ksz9021_config_init,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.handle_interrupt = kszphy_handle_interrupt,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,
@@ -1309,6 +1341,7 @@ static struct phy_driver ksphy_driver[] = { 
	.read_status	= ksz9031_read_status,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.handle_interrupt = kszphy_handle_interrupt,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,
@@ -1338,6 +1371,7 @@ static struct phy_driver ksphy_driver[] = { 
	.read_status	= genphy_read_status,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.handle_interrupt = kszphy_handle_interrupt,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

CRA Git | Maintained and supported by SUSTech CRA and CCSE