From 6aeb3528a86fa2b4bf5ad3a34a1c15fb3e369414 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 23 Nov 2014 12:53:35 +0000 Subject: ath9k: fix some ar913x irq handling issues Signed-off-by: Felix Fietkau SVN-Revision: 43342 --- ...h9k-do-not-access-hardware-on-IRQs-during-reset.patch | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'package/kernel/mac80211/patches/311-ath9k-do-not-access-hardware-on-IRQs-during-reset.patch') diff --git a/package/kernel/mac80211/patches/311-ath9k-do-not-access-hardware-on-IRQs-during-reset.patch b/package/kernel/mac80211/patches/311-ath9k-do-not-access-hardware-on-IRQs-during-reset.patch index 7996725025..2994632b8d 100644 --- a/package/kernel/mac80211/patches/311-ath9k-do-not-access-hardware-on-IRQs-during-reset.patch +++ b/package/kernel/mac80211/patches/311-ath9k-do-not-access-hardware-on-IRQs-during-reset.patch @@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau return IRQ_NONE; - /* shared irq, not for us */ -+ if (test_bit(ATH_OP_HW_RESET, &common->op_flags)) ++ if (!AR_SREV_9100(ah) && test_bit(ATH_OP_HW_RESET, &common->op_flags)) + return IRQ_NONE; + /* shared irq, not for us */ @@ -33,7 +33,17 @@ Signed-off-by: Felix Fietkau /* * Figure out the reason(s) for the interrupt. Note * that the hal returns a pseudo-ISR that may include -@@ -613,6 +610,7 @@ int ath_reset(struct ath_softc *sc, stru +@@ -532,6 +529,9 @@ irqreturn_t ath_isr(int irq, void *dev) + 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,6 +613,7 @@ int ath_reset(struct ath_softc *sc, stru struct ath_common *common = ath9k_hw_common(sc->sc_ah); int r; @@ -41,7 +51,7 @@ Signed-off-by: Felix Fietkau set_bit(ATH_OP_HW_RESET, &common->op_flags); ath9k_ps_wakeup(sc); -@@ -633,6 +631,7 @@ void ath9k_queue_reset(struct ath_softc +@@ -633,6 +634,7 @@ void ath9k_queue_reset(struct ath_softc #ifdef CPTCFG_ATH9K_DEBUGFS RESET_STAT_INC(sc, type); #endif -- cgit v1.2.3