Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56bdbe0d authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

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: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9e4982f6

drivers/net/wireless/ath/ath9k/init.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -532,10 +532,14 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, 
	ah->reg_ops.read = ath9k_ioread32;

	ah->reg_ops.read = ath9k_ioread32;

	ah->reg_ops.write = ath9k_iowrite32;

	ah->reg_ops.write = ath9k_iowrite32;

	ah->reg_ops.rmw = ath9k_reg_rmw;

	ah->reg_ops.rmw = ath9k_reg_rmw;

	sc->sc_ah = ah;

	pCap = &ah->caps;

	pCap = &ah->caps;





	common = ath9k_hw_common(ah);

	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->dfs_detector = dfs_pattern_detector_init(common, NL80211_DFS_UNSET);

	sc->tx99_power = MAX_RATE_POWER + 1;

	sc->tx99_power = MAX_RATE_POWER + 1;

	init_waitqueue_head(&sc->tx_wait);

	init_waitqueue_head(&sc->tx_wait);
@@ -896,9 +900,6 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, 
	common = ath9k_hw_common(ah);

	common = ath9k_hw_common(ah);

	ath9k_set_hw_capab(sc, hw);

	ath9k_set_hw_capab(sc, hw);





	/* Will be cleared in ath9k_start() */

	set_bit(ATH_OP_INVALID, &common->op_flags);



	/* Initialize regulatory */

	/* Initialize regulatory */

	error = ath_regd_init(&common->regulatory, sc->hw->wiphy,

	error = ath_regd_init(&common->regulatory, sc->hw->wiphy,

			      ath9k_reg_notifier);

			      ath9k_reg_notifier);