From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 23 Nov 2014 12:53:35 +0000 (+0000)
Subject: ath9k: fix some ar913x irq handling issues
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6aeb3528a86fa2b4bf5ad3a34a1c15fb3e369414;p=openwrt%2Fstaging%2Fynezz.git

ath9k: fix some ar913x irq handling issues

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 43342
---

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 <nbd@openwrt.org>
  		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 <nbd@openwrt.org>
  	/*
  	 * 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 <nbd@openwrt.org>
  	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
diff --git a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
index 32fde8fc1b..36e51c82fd 100644
--- a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
+++ b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
@@ -87,7 +87,7 @@
  	CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd)
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
-@@ -1330,6 +1330,7 @@ struct ieee80211_local {
+@@ -1339,6 +1339,7 @@ struct ieee80211_local {
  	int dynamic_ps_forced_timeout;
  
  	int user_power_level; /* in dBm, for all interfaces */
diff --git a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
index e135970451..34d698ba65 100644
--- a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
+++ b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
@@ -125,9 +125,9 @@
  		REG_SET_BIT(ah, AR_BTCOEX_WL_LNADIV, AR_BTCOEX_WL_LNADIV_FORCE_ON);
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -529,6 +529,11 @@ irqreturn_t ath_isr(int irq, void *dev)
- 	ath9k_debug_sync_cause(sc, sync_cause);
- 	status &= ah->imask;	/* discard unasked-for bits */
+@@ -532,6 +532,11 @@ irqreturn_t ath_isr(int irq, void *dev)
+ 	if (AR_SREV_9100(ah) && test_bit(ATH_OP_HW_RESET, &common->op_flags))
+ 		return IRQ_HANDLED;
  
 +	if (test_bit(ATH_DIAG_TRIGGER_ERROR, &ah->diag)) {
 +		status |= ATH9K_INT_FATAL;