diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-08-08 16:25:03 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-08-10 14:50:24 -0400 |
commit | f41a9b3b15e0f74656f69e6da403d870c53ea4e6 (patch) | |
tree | 1cbdc5bae0a58e546c16b7bf3ec448bbaf53aab8 /drivers/net/wireless/ath/ath9k/main.c | |
parent | bbf2e65258302c42d74fd53b3d92d6d8f03aaeff (diff) | |
download | op-kernel-dev-f41a9b3b15e0f74656f69e6da403d870c53ea4e6.zip op-kernel-dev-f41a9b3b15e0f74656f69e6da403d870c53ea4e6.tar.gz |
ath9k: fix interrupt storms on queued hardware reset
commit b74713d04effbacd3d126ce94cec18742187b6ce
"ath9k: Handle fatal interrupts properly" introduced a race condition, where
IRQs are being left enabled, however the irq handler returns IRQ_HANDLED
while the reset is still queued without addressing the IRQ cause.
This leads to an IRQ storm that prevents the system from even getting to
the reset code.
Fix this by disabling IRQs in the handler without touching intr_ref_cnt.
Cc: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Cc: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 6049d8b..a22df74 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -462,8 +462,10 @@ irqreturn_t ath_isr(int irq, void *dev) if (!ath9k_hw_intrpend(ah)) return IRQ_NONE; - if(test_bit(SC_OP_HW_RESET, &sc->sc_flags)) + if (test_bit(SC_OP_HW_RESET, &sc->sc_flags)) { + ath9k_hw_kill_interrupts(ah); return IRQ_HANDLED; + } /* * Figure out the reason(s) for the interrupt. Note |