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

net: phy: davicom: implement generic .handle_interrupt() calback 

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-01 14:51:10 +02:00 committed by Jakub Kicinski
parent a758087f47
commit e954631cd2
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/phy/davicom.c
View File

@ -47,6 +47,10 @@
#define MII_DM9161_INTR_STOP \
(MII_DM9161_INTR_DPLX_MASK | MII_DM9161_INTR_SPD_MASK \
| MII_DM9161_INTR_LINK_MASK | MII_DM9161_INTR_MASK)
#define MII_DM9161_INTR_CHANGE \
(MII_DM9161_INTR_DPLX_CHANGE | \
MII_DM9161_INTR_SPD_CHANGE | \
MII_DM9161_INTR_LINK_CHANGE)
/* DM9161 10BT Configuration/Status */
#define MII_DM9161_10BTCSR 0x12
@ -77,6 +81,24 @@ static int dm9161_config_intr(struct phy_device *phydev)
return temp;
}
static irqreturn_t dm9161_handle_interrupt(struct phy_device *phydev)
{
int irq_status;
irq_status = phy_read(phydev, MII_DM9161_INTR);
if (irq_status < 0) {
phy_error(phydev);
return IRQ_NONE;
}
if (!(irq_status & MII_DM9161_INTR_CHANGE))
return IRQ_NONE;
phy_trigger_machine(phydev);
return IRQ_HANDLED;
}
static int dm9161_config_aneg(struct phy_device *phydev)
{
int err;
@ -149,6 +171,7 @@ static struct phy_driver dm91xx_driver[] = {
.config_aneg = dm9161_config_aneg,
.ack_interrupt = dm9161_ack_interrupt,
.config_intr = dm9161_config_intr,
.handle_interrupt = dm9161_handle_interrupt,
}, {
.phy_id = 0x0181b8b0,
.name = "Davicom DM9161B/C",
@ -158,6 +181,7 @@ static struct phy_driver dm91xx_driver[] = {
.config_aneg = dm9161_config_aneg,
.ack_interrupt = dm9161_ack_interrupt,
.config_intr = dm9161_config_intr,
.handle_interrupt = dm9161_handle_interrupt,
}, {
.phy_id = 0x0181b8a0,
.name = "Davicom DM9161A",
@ -167,6 +191,7 @@ static struct phy_driver dm91xx_driver[] = {
.config_aneg = dm9161_config_aneg,
.ack_interrupt = dm9161_ack_interrupt,
.config_intr = dm9161_config_intr,
.handle_interrupt = dm9161_handle_interrupt,
}, {
.phy_id = 0x00181b80,
.name = "Davicom DM9131",
@ -174,6 +199,7 @@ static struct phy_driver dm91xx_driver[] = {
/* PHY_BASIC_FEATURES */
.ack_interrupt = dm9161_ack_interrupt,
.config_intr = dm9161_config_intr,
.handle_interrupt = dm9161_handle_interrupt,
} };
module_phy_driver(dm91xx_driver);