ath9k: fix crashes when using shared IRQs
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43239v19.07.3_mercusys_ac12_duma
Felix Fietkau
10 years ago
parent
bfcdc8711c
commit
5a05cb40ce
@ -0,0 +1,38 @@
|
||||
From: Felix Fietkau <nbd@openwrt.org>
|
||||
Date: Thu, 13 Nov 2014 18:27:47 +0100
|
||||
Subject: [PATCH] ath9k: prevent early IRQs from accessing hardware
|
||||
|
||||
IRQs are suppressed if ah == NULL and ATH_OP_INVALID being set in
|
||||
common->op_flags. Close a short time window between those two.
|
||||
|
||||
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
||||
---
|
||||
|
||||
--- a/drivers/net/wireless/ath/ath9k/init.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/init.c
|
||||
@@ -513,10 +513,14 @@ static int ath9k_init_softc(u16 devid, s
|
||||
ah->reg_ops.read = ath9k_ioread32;
|
||||
ah->reg_ops.write = ath9k_iowrite32;
|
||||
ah->reg_ops.rmw = ath9k_reg_rmw;
|
||||
- sc->sc_ah = ah;
|
||||
pCap = &ah->caps;
|
||||
|
||||
common = ath9k_hw_common(ah);
|
||||
+
|
||||
+ /* Will be cleared in ath9k_start() */
|
||||
+ set_bit(ATH_OP_INVALID, &common->op_flags);
|
||||
+
|
||||
+ sc->sc_ah = ah;
|
||||
sc->dfs_detector = dfs_pattern_detector_init(common, NL80211_DFS_UNSET);
|
||||
sc->tx99_power = MAX_RATE_POWER + 1;
|
||||
init_waitqueue_head(&sc->tx_wait);
|
||||
@@ -876,9 +880,6 @@ int ath9k_init_device(u16 devid, struct
|
||||
common = ath9k_hw_common(ah);
|
||||
ath9k_set_hw_capab(sc, hw);
|
||||
|
||||
- /* Will be cleared in ath9k_start() */
|
||||
- set_bit(ATH_OP_INVALID, &common->op_flags);
|
||||
-
|
||||
/* Initialize regulatory */
|
||||
error = ath_regd_init(&common->regulatory, sc->hw->wiphy,
|
||||
ath9k_reg_notifier);
|
||||
@ -0,0 +1,29 @@
|
||||
From: Felix Fietkau <nbd@openwrt.org>
|
||||
Date: Thu, 13 Nov 2014 18:29:00 +0100
|
||||
Subject: [PATCH] ath9k: set ATH_OP_INVALID before disabling hardware
|
||||
|
||||
Closes another small IRQ handler race
|
||||
|
||||
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
||||
---
|
||||
|
||||
--- a/drivers/net/wireless/ath/ath9k/main.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
||||
@@ -885,6 +885,9 @@ static void ath9k_stop(struct ieee80211_
|
||||
&sc->cur_chan->chandef);
|
||||
|
||||
ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
|
||||
+
|
||||
+ set_bit(ATH_OP_INVALID, &common->op_flags);
|
||||
+
|
||||
ath9k_hw_phy_disable(ah);
|
||||
|
||||
ath9k_hw_configpcipowersave(ah, true);
|
||||
@@ -893,7 +896,6 @@ static void ath9k_stop(struct ieee80211_
|
||||
|
||||
ath9k_ps_restore(sc);
|
||||
|
||||
- set_bit(ATH_OP_INVALID, &common->op_flags);
|
||||
sc->ps_idle = prev_idle;
|
||||
|
||||
mutex_unlock(&sc->mutex);
|
||||
@ -0,0 +1,51 @@
|
||||
From: Felix Fietkau <nbd@openwrt.org>
|
||||
Date: Thu, 13 Nov 2014 18:29:26 +0100
|
||||
Subject: [PATCH] ath9k: do not access hardware on IRQs during reset
|
||||
|
||||
Instead of killing interrupts during reset when the first one happens,
|
||||
kill them before issuing the reset.
|
||||
This fixes an easy to reproduce crash with multiple cards sharing the
|
||||
same IRQ.
|
||||
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
||||
---
|
||||
|
||||
--- a/drivers/net/wireless/ath/ath9k/main.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
||||
@@ -512,16 +512,13 @@ irqreturn_t ath_isr(int irq, void *dev)
|
||||
if (!ah || test_bit(ATH_OP_INVALID, &common->op_flags))
|
||||
return IRQ_NONE;
|
||||
|
||||
- /* shared irq, not for us */
|
||||
+ if (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
|
||||
@@ -613,6 +610,7 @@ int ath_reset(struct ath_softc *sc, stru
|
||||
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);
|
||||
@@ -633,6 +631,7 @@ void ath9k_queue_reset(struct ath_softc
|
||||
#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);
|
||||
}
|
||||
Loading…
Reference in New Issue