| Message ID | 20190314134945.17300-1-jbrunet@baylibre.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] net: phy: meson-gxl: fix interrupt support | expand |
From: Jerome Brunet <jbrunet@baylibre.com> Date: Thu, 14 Mar 2019 14:49:45 +0100 > If an interrupt is already pending when the interrupt is enabled on the > GXL phy, no IRQ will ever be triggered. > > The fix is simply to make sure pending IRQs are cleared before setting > up the irq mask. > > Fixes: cf127ff20af1 ("net: phy: meson-gxl: add interrupt support") > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Looks good, applied and queued up for -stable.
diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c index a238388eb1a5..0eec2913c289 100644 --- a/drivers/net/phy/meson-gxl.c +++ b/drivers/net/phy/meson-gxl.c @@ -201,6 +201,7 @@ static int meson_gxl_ack_interrupt(struct phy_device *phydev) static int meson_gxl_config_intr(struct phy_device *phydev) { u16 val; + int ret; if (phydev->interrupts == PHY_INTERRUPT_ENABLED) { val = INTSRC_ANEG_PR @@ -213,6 +214,11 @@ static int meson_gxl_config_intr(struct phy_device *phydev) val = 0; } + /* Ack any pending IRQ */ + ret = meson_gxl_ack_interrupt(phydev); + if (ret) + return ret; + return phy_write(phydev, INTSRC_MASK, val); }
If an interrupt is already pending when the interrupt is enabled on the GXL phy, no IRQ will ever be triggered. The fix is simply to make sure pending IRQs are cleared before setting up the irq mask. Fixes: cf127ff20af1 ("net: phy: meson-gxl: add interrupt support") Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> --- drivers/net/phy/meson-gxl.c | 6 ++++++ 1 file changed, 6 insertions(+)