qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: phy: amd: 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-13 18:52:19 +02:00 committed by Jakub Kicinski
parent 45f52f1238
commit d995a36b7e
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/phy/amd.c
View File

@ -20,6 +20,10 @@
#define MII_AM79C_IR_EN_ANEG 0x0100 /* IR enable Aneg Complete */ #define MII_AM79C_IR_EN_ANEG 0x0100 /* IR enable Aneg Complete */
#define MII_AM79C_IR_IMASK_INIT (MII_AM79C_IR_EN_LINK | MII_AM79C_IR_EN_ANEG) #define MII_AM79C_IR_IMASK_INIT (MII_AM79C_IR_EN_LINK | MII_AM79C_IR_EN_ANEG)
#define MII_AM79C_IR_LINK_DOWN BIT(2)
#define MII_AM79C_IR_ANEG_DONE BIT(0)
#define MII_AM79C_IR_IMASK_STAT (MII_AM79C_IR_LINK_DOWN | MII_AM79C_IR_ANEG_DONE)
MODULE_DESCRIPTION("AMD PHY driver"); MODULE_DESCRIPTION("AMD PHY driver");
MODULE_AUTHOR("Heiko Schocher <hs@denx.de>"); MODULE_AUTHOR("Heiko Schocher <hs@denx.de>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
@ -56,6 +60,24 @@ static int am79c_config_intr(struct phy_device *phydev)
return err; return err;
} }
static irqreturn_t am79c_handle_interrupt(struct phy_device *phydev)
{
int irq_status;
irq_status = phy_read(phydev, MII_AM79C_IR);
if (irq_status < 0) {
phy_error(phydev);
return IRQ_NONE;
}
if (!(irq_status & MII_AM79C_IR_IMASK_STAT))
return IRQ_NONE;
phy_trigger_machine(phydev);
return IRQ_HANDLED;
}
static struct phy_driver am79c_driver[] = { { static struct phy_driver am79c_driver[] = { {
.phy_id = PHY_ID_AM79C874, .phy_id = PHY_ID_AM79C874,
.name = "AM79C874", .name = "AM79C874",
@ -64,6 +86,7 @@ static struct phy_driver am79c_driver[] = { {
.config_init = am79c_config_init, .config_init = am79c_config_init,
.ack_interrupt = am79c_ack_interrupt, .ack_interrupt = am79c_ack_interrupt,
.config_intr = am79c_config_intr, .config_intr = am79c_config_intr,
.handle_interrupt = am79c_handle_interrupt,
} }; } };
module_phy_driver(am79c_driver); module_phy_driver(am79c_driver);