ath9k: revert do-not-access-hw-on-IRQ-reset
Fix for https://dev.openwrt.org/ticket/18483
http://net.t-labs.tu-berlin.de/~thomas/999-revert_ath9k_do-not-access-hw-on-IRQ-reset.patch
Fixes b/20588723
Change-Id: Ic33f7b87daca90dc60619c5064242bce23c505cf
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 4aeddd7..38efe20 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -512,13 +512,16 @@
if (!ah || test_bit(ATH_OP_INVALID, &common->op_flags))
return IRQ_NONE;
- if (!AR_SREV_9100(ah) && test_bit(ATH_OP_HW_RESET, &common->op_flags))
- return IRQ_NONE;
-
/* shared irq, not for us */
+
if (!ath9k_hw_intrpend(ah))
return IRQ_NONE;
+ if (test_bit(ATH_OP_HW_RESET, &common->op_flags)) {
+ ath9k_hw_kill_interrupts(ah);
+ return IRQ_HANDLED;
+ }
+
/*
* Figure out the reason(s) for the interrupt. Note
* that the hal returns a pseudo-ISR that may include
@@ -529,9 +532,6 @@
ath9k_debug_sync_cause(sc, sync_cause);
status &= ah->imask; /* discard unasked-for bits */
- if (AR_SREV_9100(ah) && test_bit(ATH_OP_HW_RESET, &common->op_flags))
- return IRQ_HANDLED;
-
/*
* If there are no status bits set, then this interrupt was not
* for me (should have been caught above).
@@ -613,7 +613,6 @@
struct ath_common *common = ath9k_hw_common(sc->sc_ah);
int r;
- ath9k_hw_kill_interrupts(sc->sc_ah);
set_bit(ATH_OP_HW_RESET, &common->op_flags);
ath9k_ps_wakeup(sc);
@@ -634,7 +633,6 @@
#ifdef CPTCFG_ATH9K_DEBUGFS
RESET_STAT_INC(sc, type);
#endif
- ath9k_hw_kill_interrupts(sc->sc_ah);
set_bit(ATH_OP_HW_RESET, &common->op_flags);
ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
}
