net: phy: add callback for custom interrupt handler to struct phy_driver

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.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Suggested-by: Russell King - ARM Linux admin <linux@armlinux.org.uk>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 4ba71dc3aee7ccba373e29019036dd55379a1e27..c6b0010a6d201c9836bf42fc4f286ea49aeb5a73 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -772,8 +772,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 72e1196f97998cb52686d8bb9ccd174dd444e926..16cd33915496d32f534f4d9ad0279fe6a90a134b 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -537,6 +537,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);