hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ath9k: fix some ar913x irq handling issues 

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43342 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Felix Fietkau 2014-11-23 12:53:35 +00:00
parent 37c5bb66ff
commit 84d30cba20
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package/kernel/mac80211/patches/311-ath9k-do-not-access-hardware-on-IRQs-during-reset.patch
View File

@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
return IRQ_NONE; return IRQ_NONE;
- /* shared irq, not for us */ - /* 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; + return IRQ_NONE;
+ /* shared irq, not for us */ + /* 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 * Figure out the reason(s) for the interrupt. Note
* that the hal returns a pseudo-ISR that may include * 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); struct ath_common *common = ath9k_hw_common(sc->sc_ah);
int r; int r;
@ -41,7 +51,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
set_bit(ATH_OP_HW_RESET, &common->op_flags); set_bit(ATH_OP_HW_RESET, &common->op_flags);
ath9k_ps_wakeup(sc); 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 #ifdef CPTCFG_ATH9K_DEBUGFS
RESET_STAT_INC(sc, type); RESET_STAT_INC(sc, type);
#endif #endif

2
package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
View File

@ -87,7 +87,7 @@
CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd) CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd)
--- a/net/mac80211/ieee80211_i.h --- a/net/mac80211/ieee80211_i.h
+++ b/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 dynamic_ps_forced_timeout;
int user_power_level; /* in dBm, for all interfaces */ int user_power_level; /* in dBm, for all interfaces */

6
package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
View File

@ -125,9 +125,9 @@
REG_SET_BIT(ah, AR_BTCOEX_WL_LNADIV, AR_BTCOEX_WL_LNADIV_FORCE_ON); REG_SET_BIT(ah, AR_BTCOEX_WL_LNADIV, AR_BTCOEX_WL_LNADIV_FORCE_ON);
--- a/drivers/net/wireless/ath/ath9k/main.c --- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/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) @@ -532,6 +532,11 @@ irqreturn_t ath_isr(int irq, void *dev)
ath9k_debug_sync_cause(sc, sync_cause); if (AR_SREV_9100(ah) && test_bit(ATH_OP_HW_RESET, &common->op_flags))
status &= ah->imask; /* discard unasked-for bits */ return IRQ_HANDLED;
+ if (test_bit(ATH_DIAG_TRIGGER_ERROR, &ah->diag)) { + if (test_bit(ATH_DIAG_TRIGGER_ERROR, &ah->diag)) {
+ status |= ATH9K_INT_FATAL; + status |= ATH9K_INT_FATAL;