leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: phy: meson-gxl: implement generic .handle_interrupt() callback

Browse Source 
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: Jerome Brunet <jbrunet@baylibre.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Ioana Ciornei
2020-11-23 17:38:07 +02:00
committed by Jakub Kicinski
parent 12ae7ba3c1
commit 6719e2be0f
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/phy/meson-gxl.c
View File

@@ -222,6 +222,24 @@ static int meson_gxl_config_intr(struct phy_device *phydev)
return phy_write(phydev, INTSRC_MASK, val); return phy_write(phydev, INTSRC_MASK, val);
} }
static irqreturn_t meson_gxl_handle_interrupt(struct phy_device *phydev)
{
int irq_status;
irq_status = phy_read(phydev, INTSRC_FLAG);
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 struct phy_driver meson_gxl_phy[] = { static struct phy_driver meson_gxl_phy[] = {
{ {
PHY_ID_MATCH_EXACT(0x01814400), PHY_ID_MATCH_EXACT(0x01814400),
@@ -233,6 +251,7 @@ static struct phy_driver meson_gxl_phy[] = {
.read_status = meson_gxl_read_status, .read_status = meson_gxl_read_status,
.ack_interrupt = meson_gxl_ack_interrupt, .ack_interrupt = meson_gxl_ack_interrupt,
.config_intr = meson_gxl_config_intr, .config_intr = meson_gxl_config_intr,
.handle_interrupt = meson_gxl_handle_interrupt,
.suspend = genphy_suspend, .suspend = genphy_suspend,
.resume = genphy_resume, .resume = genphy_resume,
}, { }, {
@@ -243,6 +262,7 @@ static struct phy_driver meson_gxl_phy[] = {
.soft_reset = genphy_soft_reset, .soft_reset = genphy_soft_reset,
.ack_interrupt = meson_gxl_ack_interrupt, .ack_interrupt = meson_gxl_ack_interrupt,
.config_intr = meson_gxl_config_intr, .config_intr = meson_gxl_config_intr,
.handle_interrupt = meson_gxl_handle_interrupt,
.suspend = genphy_suspend, .suspend = genphy_suspend,
.resume = genphy_resume, .resume = genphy_resume,
}, },