UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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:11 +02:00 committed by Jakub Kicinski
parent c0c99d0cd1
commit 6571b4555d
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/phy/national.c
View File

@ -89,6 +89,27 @@ static int ns_ack_interrupt(struct phy_device *phydev)
return ret;
}
static irqreturn_t ns_handle_interrupt(struct phy_device *phydev)
{
int irq_status;
irq_status = phy_read(phydev, DP83865_INT_STATUS);
if (irq_status < 0) {
phy_error(phydev);
return IRQ_NONE;
}
if (!(irq_status & DP83865_INT_MASK_DEFAULT))
return IRQ_NONE;
/* clear the interrupt */
phy_write(phydev, DP83865_INT_CLEAR, irq_status & ~0x7);
phy_trigger_machine(phydev);
return IRQ_HANDLED;
}
static void ns_giga_speed_fallback(struct phy_device *phydev, int mode)
{
int bmcr = phy_read(phydev, MII_BMCR);
@ -135,6 +156,7 @@ static struct phy_driver dp83865_driver[] = { {
.config_init = ns_config_init,
.ack_interrupt = ns_ack_interrupt,
.config_intr = ns_config_intr,
.handle_interrupt = ns_handle_interrupt,
} };
module_phy_driver(dp83865_driver);