| Message ID | 20201101125114.1316879-5-ciorneiioana@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [net-next,v2,01/19] net: phy: export phy_error and phy_trigger_machine | expand |
On Sun, Nov 01, 2020 at 02:50:59PM +0200, Ioana Ciornei wrote: > From: Ioana Ciornei <ioana.ciornei@nxp.com> > > 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: Oleksij Rempel <o.rempel@pengutronix.de> > Cc: Michael Walle <michael@walle.cc> > Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com> Tested-by: Oleksij Rempel <o.rempel@pengutronix.de> > --- > Changes in v2: > - adjust .handle_interrupt() so that we only take into account the > enabled IRQs. > > drivers/net/phy/at803x.c | 31 +++++++++++++++++++++++++++++++ > 1 file changed, 31 insertions(+) > > diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c > index ed601a7e46a0..c7f91934cf82 100644 > --- a/drivers/net/phy/at803x.c > +++ b/drivers/net/phy/at803x.c > @@ -628,6 +628,32 @@ static int at803x_config_intr(struct phy_device *phydev) > return err; > } > > +static irqreturn_t at803x_handle_interrupt(struct phy_device *phydev) > +{ > + int irq_status, int_enabled; > + > + irq_status = phy_read(phydev, AT803X_INTR_STATUS); > + if (irq_status < 0) { > + phy_error(phydev); > + return IRQ_NONE; > + } > + > + /* Read the current enabled interrupts */ > + int_enabled = phy_read(phydev, AT803X_INTR_ENABLE); > + if (int_enabled < 0) { > + phy_error(phydev); > + return IRQ_NONE; > + } > + > + /* See if this was one of our enabled interrupts */ > + if (!(irq_status & int_enabled)) > + return IRQ_NONE; > + > + phy_trigger_machine(phydev); > + > + return IRQ_HANDLED; > +} > + > static void at803x_link_change_notify(struct phy_device *phydev) > { > /* > @@ -1064,6 +1090,7 @@ static struct phy_driver at803x_driver[] = { > .read_status = at803x_read_status, > .ack_interrupt = at803x_ack_interrupt, > .config_intr = at803x_config_intr, > + .handle_interrupt = at803x_handle_interrupt, > .get_tunable = at803x_get_tunable, > .set_tunable = at803x_set_tunable, > .cable_test_start = at803x_cable_test_start, > @@ -1084,6 +1111,7 @@ static struct phy_driver at803x_driver[] = { > /* PHY_BASIC_FEATURES */ > .ack_interrupt = at803x_ack_interrupt, > .config_intr = at803x_config_intr, > + .handle_interrupt = at803x_handle_interrupt, > }, { > /* Qualcomm Atheros AR8031/AR8033 */ > PHY_ID_MATCH_EXACT(ATH8031_PHY_ID), > @@ -1102,6 +1130,7 @@ static struct phy_driver at803x_driver[] = { > .aneg_done = at803x_aneg_done, > .ack_interrupt = &at803x_ack_interrupt, > .config_intr = &at803x_config_intr, > + .handle_interrupt = at803x_handle_interrupt, > .get_tunable = at803x_get_tunable, > .set_tunable = at803x_set_tunable, > .cable_test_start = at803x_cable_test_start, > @@ -1122,6 +1151,7 @@ static struct phy_driver at803x_driver[] = { > /* PHY_BASIC_FEATURES */ > .ack_interrupt = at803x_ack_interrupt, > .config_intr = at803x_config_intr, > + .handle_interrupt = at803x_handle_interrupt, > .cable_test_start = at803x_cable_test_start, > .cable_test_get_status = at803x_cable_test_get_status, > }, { > @@ -1134,6 +1164,7 @@ static struct phy_driver at803x_driver[] = { > /* PHY_BASIC_FEATURES */ > .ack_interrupt = &at803x_ack_interrupt, > .config_intr = &at803x_config_intr, > + .handle_interrupt = at803x_handle_interrupt, > .cable_test_start = at803x_cable_test_start, > .cable_test_get_status = at803x_cable_test_get_status, > .read_status = at803x_read_status, > -- > 2.28.0 > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index ed601a7e46a0..c7f91934cf82 100644 --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c @@ -628,6 +628,32 @@ static int at803x_config_intr(struct phy_device *phydev) return err; } +static irqreturn_t at803x_handle_interrupt(struct phy_device *phydev) +{ + int irq_status, int_enabled; + + irq_status = phy_read(phydev, AT803X_INTR_STATUS); + if (irq_status < 0) { + phy_error(phydev); + return IRQ_NONE; + } + + /* Read the current enabled interrupts */ + int_enabled = phy_read(phydev, AT803X_INTR_ENABLE); + if (int_enabled < 0) { + phy_error(phydev); + return IRQ_NONE; + } + + /* See if this was one of our enabled interrupts */ + if (!(irq_status & int_enabled)) + return IRQ_NONE; + + phy_trigger_machine(phydev); + + return IRQ_HANDLED; +} + static void at803x_link_change_notify(struct phy_device *phydev) { /* @@ -1064,6 +1090,7 @@ static struct phy_driver at803x_driver[] = { .read_status = at803x_read_status, .ack_interrupt = at803x_ack_interrupt, .config_intr = at803x_config_intr, + .handle_interrupt = at803x_handle_interrupt, .get_tunable = at803x_get_tunable, .set_tunable = at803x_set_tunable, .cable_test_start = at803x_cable_test_start, @@ -1084,6 +1111,7 @@ static struct phy_driver at803x_driver[] = { /* PHY_BASIC_FEATURES */ .ack_interrupt = at803x_ack_interrupt, .config_intr = at803x_config_intr, + .handle_interrupt = at803x_handle_interrupt, }, { /* Qualcomm Atheros AR8031/AR8033 */ PHY_ID_MATCH_EXACT(ATH8031_PHY_ID), @@ -1102,6 +1130,7 @@ static struct phy_driver at803x_driver[] = { .aneg_done = at803x_aneg_done, .ack_interrupt = &at803x_ack_interrupt, .config_intr = &at803x_config_intr, + .handle_interrupt = at803x_handle_interrupt, .get_tunable = at803x_get_tunable, .set_tunable = at803x_set_tunable, .cable_test_start = at803x_cable_test_start, @@ -1122,6 +1151,7 @@ static struct phy_driver at803x_driver[] = { /* PHY_BASIC_FEATURES */ .ack_interrupt = at803x_ack_interrupt, .config_intr = at803x_config_intr, + .handle_interrupt = at803x_handle_interrupt, .cable_test_start = at803x_cable_test_start, .cable_test_get_status = at803x_cable_test_get_status, }, { @@ -1134,6 +1164,7 @@ static struct phy_driver at803x_driver[] = { /* PHY_BASIC_FEATURES */ .ack_interrupt = &at803x_ack_interrupt, .config_intr = &at803x_config_intr, + .handle_interrupt = at803x_handle_interrupt, .cable_test_start = at803x_cable_test_start, .cable_test_get_status = at803x_cable_test_get_status, .read_status = at803x_read_status,