Author: nbd Date: 2014-11-23 13:53:35 +0100 (Sun, 23 Nov 2014) New Revision: 43342
Modified: trunk/package/kernel/mac80211/patches/311-ath9k-do-not-access-hardware-on-IRQs-during-reset.patch trunk/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch trunk/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch Log: ath9k: fix some ar913x irq handling issues Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/package/kernel/mac80211/patches/311-ath9k-do-not-access-hardware-on-IRQs-during-reset.patch =================================================================== --- trunk/package/kernel/mac80211/patches/311-ath9k-do-not-access-hardware-on-IRQs-during-reset.patch 2014-11-22 12:25:52 UTC (rev 43341) +++ trunk/package/kernel/mac80211/patches/311-ath9k-do-not-access-hardware-on-IRQs-during-reset.patch 2014-11-23 12:53:35 UTC (rev 43342) @@ -18,7 +18,7 @@ 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 @@ /* * 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 @@ 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 Modified: trunk/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch =================================================================== --- trunk/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch 2014-11-22 12:25:52 UTC (rev 43341) +++ trunk/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch 2014-11-23 12:53:35 UTC (rev 43342) @@ -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 */ Modified: trunk/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch =================================================================== --- trunk/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch 2014-11-22 12:25:52 UTC (rev 43341) +++ trunk/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch 2014-11-23 12:53:35 UTC (rev 43342) @@ -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; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
