mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-27 19:29:37 +00:00
Code Issues Releases Wiki Activity

Merge branch 'net-phy-improve-phy_driver-callback-handle_interrupt'

Browse source 
Heiner Kallweit says:

====================
net: phy: improve phy_driver callback handle_interrupt

did_interrupt() clears the interrupt, therefore handle_interrupt() can
not check which event triggered the interrupt. To overcome this
constraint and allow more flexibility for customer interrupt handlers,
let's decouple handle_interrupt() from parts of the phylib interrupt
handling. Custom interrupt handlers now have to implement the
did_interrupt() functionality in handle_interrupt() if needed.

Fortunately we have just one custom interrupt handler so far (in the
mscc PHY driver), convert it to the changed API and make use of the
benefits.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2020-03-17 20:58:22 -07:00
commit 362d3d8880
3 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/net/phy/mscc/mscc_main.c
View file

@ -1429,11 +1429,21 @@ static int vsc8584_config_init(struct phy_device *phydev)
return ret;
}
static int vsc8584_handle_interrupt(struct phy_device *phydev)
static irqreturn_t vsc8584_handle_interrupt(struct phy_device *phydev)
{
vsc8584_handle_macsec_interrupt(phydev);
phy_mac_interrupt(phydev);
return 0;
int irq_status;
irq_status = phy_read(phydev, MII_VSC85XX_INT_STATUS);
if (irq_status < 0 || !(irq_status & MII_VSC85XX_INT_MASK_MASK))
return IRQ_NONE;
if (irq_status & MII_VSC85XX_INT_MASK_EXT)
vsc8584_handle_macsec_interrupt(phydev);
if (irq_status & MII_VSC85XX_INT_MASK_LINK_CHG)
phy_mac_interrupt(phydev);
return IRQ_HANDLED;
}
static int vsc85xx_config_init(struct phy_device *phydev)

26
drivers/net/phy/phy.c
View file

@ -715,26 +715,24 @@ static int phy_disable_interrupts(struct phy_device *phydev)
static irqreturn_t phy_interrupt(int irq, void *phy_dat)
{
struct phy_device *phydev = phy_dat;
struct phy_driver *drv = phydev->drv;
if (phydev->drv->did_interrupt && !phydev->drv->did_interrupt(phydev))
if (drv->handle_interrupt)
return drv->handle_interrupt(phydev);
if (drv->did_interrupt && !drv->did_interrupt(phydev))
return IRQ_NONE;
if (phydev->drv->handle_interrupt) {
if (phydev->drv->handle_interrupt(phydev))
goto phy_err;
} else {
/* reschedule state queue work to run as soon as possible */
phy_trigger_machine(phydev);
}
/* reschedule state queue work to run as soon as possible */
phy_trigger_machine(phydev);
/* did_interrupt() may have cleared the interrupt already */
if (!phydev->drv->did_interrupt && phy_clear_interrupt(phydev))
goto phy_err;
return IRQ_HANDLED;
if (!drv->did_interrupt && phy_clear_interrupt(phydev)) {
phy_error(phydev);
return IRQ_NONE;
}
phy_err:
phy_error(phydev);
return IRQ_NONE;
return IRQ_HANDLED;
}
/**

3
include/linux/phy.h
View file

@ -23,6 +23,7 @@
#include <linux/workqueue.h>
#include <linux/mod_devicetable.h>
#include <linux/u64_stats_sync.h>
#include <linux/irqreturn.h>
#include <linux/atomic.h>
@ -568,7 +569,7 @@ struct phy_driver {
int (*did_interrupt)(struct phy_device *phydev);
/* Override default interrupt handling */
int (*handle_interrupt)(struct phy_device *phydev);
irqreturn_t (*handle_interrupt)(struct phy_device *phydev);
/* Clears up any memory if needed */
void (*remove)(struct phy_device *phydev);