On Mon, May 27, 2019 at 08:28:48PM +0200, Heiner Kallweit wrote: > The phylib interrupt handler handles link change events only currently. > However PHY drivers may want to use other interrupt sources too, > e.g. to report temperature monitoring events. Therefore add a callback > to struct phy_driver allowing PHY drivers to implement a custom > interrupt handler.
Looks fine to me. > Signed-off-by: Heiner Kallweit <hkallwe...@gmail.com> > Suggested-by: Russell King - ARM Linux admin <li...@armlinux.org.uk> Suggested-by: Russell King <rmk+ker...@armlinux.org.uk> Acked-by: Russell King <rmk+ker...@armlinux.org.uk> Thanks. > --- > drivers/net/phy/phy.c | 9 +++++++-- > include/linux/phy.h | 3 +++ > 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c > index 20955836c..8030d0a97 100644 > --- a/drivers/net/phy/phy.c > +++ b/drivers/net/phy/phy.c > @@ -774,8 +774,13 @@ static irqreturn_t phy_interrupt(int irq, void *phy_dat) > if (phydev->drv->did_interrupt && !phydev->drv->did_interrupt(phydev)) > return IRQ_NONE; > > - /* reschedule state queue work to run as soon as possible */ > - phy_trigger_machine(phydev); > + 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); > + } > > if (phy_clear_interrupt(phydev)) > goto phy_err; > diff --git a/include/linux/phy.h b/include/linux/phy.h > index b133d59f3..f90158c67 100644 > --- a/include/linux/phy.h > +++ b/include/linux/phy.h > @@ -536,6 +536,9 @@ struct phy_driver { > */ > int (*did_interrupt)(struct phy_device *phydev); > > + /* Override default interrupt handling */ > + int (*handle_interrupt)(struct phy_device *phydev); > + > /* Clears up any memory if needed */ > void (*remove)(struct phy_device *phydev); > > -- > 2.21.0 > > > -- RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up According to speedtest.net: 11.9Mbps down 500kbps up