diff options
| author | Jerome Brunet <jbrunet@baylibre.com> | 2019-03-14 14:49:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-03 06:27:24 +0200 |
| commit | baa14468e57d26cf23c058af3c89edf59b3cabec (patch) | |
| tree | e1594666dfb2c829cdf203cbb35dcdbd1677a206 /drivers/net | |
| parent | 3ca86ad4e57a84262f2386e5b06302ebc4c8b5d4 (diff) | |
| download | blackbird-obmc-linux-baa14468e57d26cf23c058af3c89edf59b3cabec.tar.gz blackbird-obmc-linux-baa14468e57d26cf23c058af3c89edf59b3cabec.zip | |
net: phy: meson-gxl: fix interrupt support
[ Upstream commit daa5c4d0167a308306525fd5ab9a5e18e21f4f74 ]
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/phy/meson-gxl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c index 3ddaf9595697..68af4c75ffb3 100644 --- a/drivers/net/phy/meson-gxl.c +++ b/drivers/net/phy/meson-gxl.c @@ -211,6 +211,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 @@ -223,6 +224,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); } |
