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

Commit 236de514 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: always call ath_reset from workqueue context 



This makes it much easier to add further rework to avoid race conditions
between reset and other work items.
Move other functions to make ath_reset static.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e8cfe9f8

drivers/net/wireless/ath/ath9k/ath9k.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -425,6 +425,7 @@ void ath9k_set_beaconing_status(struct ath_softc *sc, bool status); 




#define ATH_PAPRD_TIMEOUT	100 /* msecs */

#define ATH_PAPRD_TIMEOUT	100 /* msecs */





void ath_reset_work(struct work_struct *work);

void ath_hw_check(struct work_struct *work);

void ath_hw_check(struct work_struct *work);

void ath_hw_pll_work(struct work_struct *work);

void ath_hw_pll_work(struct work_struct *work);

void ath_paprd_calibrate(struct work_struct *work);

void ath_paprd_calibrate(struct work_struct *work);
@@ -604,6 +605,7 @@ struct ath_softc { 
	struct mutex mutex;

	struct mutex mutex;

	struct work_struct paprd_work;

	struct work_struct paprd_work;

	struct work_struct hw_check_work;

	struct work_struct hw_check_work;

	struct work_struct hw_reset_work;

	struct completion paprd_complete;

	struct completion paprd_complete;





	unsigned int hw_busy_count;

	unsigned int hw_busy_count;
@@ -650,7 +652,6 @@ struct ath_softc { 
};

};





void ath9k_tasklet(unsigned long data);

void ath9k_tasklet(unsigned long data);

int ath_reset(struct ath_softc *sc, bool retry_tx);

int ath_cabq_update(struct ath_softc *);

int ath_cabq_update(struct ath_softc *);





static inline void ath_read_cachesize(struct ath_common *common, int *csz)

static inline void ath_read_cachesize(struct ath_common *common, int *csz)

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -386,9 +386,7 @@ void ath_beacon_tasklet(unsigned long data) 
			ath_dbg(common, ATH_DBG_BSTUCK,

			ath_dbg(common, ATH_DBG_BSTUCK,

				"beacon is officially stuck\n");

				"beacon is officially stuck\n");

			sc->sc_flags |= SC_OP_TSF_RESET;

			sc->sc_flags |= SC_OP_TSF_RESET;

			spin_lock(&sc->sc_pcu_lock);

			ieee80211_queue_work(sc->hw, &sc->hw_reset_work);

			ath_reset(sc, true);

			spin_unlock(&sc->sc_pcu_lock);

		}

		}





		return;

		return;

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -777,6 +777,7 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, 
			goto error_world;

			goto error_world;

	}

	}





	INIT_WORK(&sc->hw_reset_work, ath_reset_work);

	INIT_WORK(&sc->hw_check_work, ath_hw_check);

	INIT_WORK(&sc->hw_check_work, ath_hw_check);

	INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);

	INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);

	INIT_DELAYED_WORK(&sc->hw_pll_work, ath_hw_pll_work);

	INIT_DELAYED_WORK(&sc->hw_pll_work, ath_hw_pll_work);

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

+13 −4
Original line number Original line Diff line number Diff line
@@ -236,6 +236,7 @@ static int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw, 
	del_timer_sync(&common->ani.timer);

	del_timer_sync(&common->ani.timer);

	cancel_work_sync(&sc->paprd_work);

	cancel_work_sync(&sc->paprd_work);

	cancel_work_sync(&sc->hw_check_work);

	cancel_work_sync(&sc->hw_check_work);

	cancel_work_sync(&sc->hw_reset_work);

	cancel_delayed_work_sync(&sc->tx_complete_work);

	cancel_delayed_work_sync(&sc->tx_complete_work);

	cancel_delayed_work_sync(&sc->hw_pll_work);

	cancel_delayed_work_sync(&sc->hw_pll_work);
@@ -608,9 +609,7 @@ void ath9k_tasklet(unsigned long data) 




	if ((status & ATH9K_INT_FATAL) ||

	if ((status & ATH9K_INT_FATAL) ||

	    (status & ATH9K_INT_BB_WATCHDOG)) {

	    (status & ATH9K_INT_BB_WATCHDOG)) {

		spin_lock(&sc->sc_pcu_lock);

		ieee80211_queue_work(sc->hw, &sc->hw_reset_work);

		ath_reset(sc, true);

		spin_unlock(&sc->sc_pcu_lock);

		return;

		return;

	}

	}
@@ -901,7 +900,7 @@ void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw) 
	ath9k_ps_restore(sc);

	ath9k_ps_restore(sc);

}

}





int ath_reset(struct ath_softc *sc, bool retry_tx)

static int ath_reset(struct ath_softc *sc, bool retry_tx)

{

{

	struct ath_hw *ah = sc->sc_ah;

	struct ath_hw *ah = sc->sc_ah;

	struct ath_common *common = ath9k_hw_common(ah);

	struct ath_common *common = ath9k_hw_common(ah);
@@ -969,6 +968,15 @@ int ath_reset(struct ath_softc *sc, bool retry_tx) 
	return r;

	return r;

}

}





void ath_reset_work(struct work_struct *work)

{

	struct ath_softc *sc = container_of(work, struct ath_softc, hw_reset_work);



	spin_lock_bh(&sc->sc_pcu_lock);

	ath_reset(sc, true);

	spin_unlock_bh(&sc->sc_pcu_lock);

}



void ath_hw_check(struct work_struct *work)

void ath_hw_check(struct work_struct *work)

{

{

	struct ath_softc *sc = container_of(work, struct ath_softc, hw_check_work);

	struct ath_softc *sc = container_of(work, struct ath_softc, hw_check_work);
@@ -1230,6 +1238,7 @@ static void ath9k_stop(struct ieee80211_hw *hw) 
	cancel_delayed_work_sync(&sc->hw_pll_work);

	cancel_delayed_work_sync(&sc->hw_pll_work);

	cancel_work_sync(&sc->paprd_work);

	cancel_work_sync(&sc->paprd_work);

	cancel_work_sync(&sc->hw_check_work);

	cancel_work_sync(&sc->hw_check_work);

	cancel_work_sync(&sc->hw_reset_work);





	if (sc->sc_flags & SC_OP_INVALID) {

	if (sc->sc_flags & SC_OP_INVALID) {

		ath_dbg(common, ATH_DBG_ANY, "Device not present\n");

		ath_dbg(common, ATH_DBG_ANY, "Device not present\n");

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

+9 −5
Original line number Original line Diff line number Diff line
@@ -582,7 +582,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, 
	rcu_read_unlock();

	rcu_read_unlock();





	if (needreset)

	if (needreset)

		ath_reset(sc, false);

		ieee80211_queue_work(sc->hw, &sc->hw_reset_work);

}

}





static bool ath_lookup_legacy(struct ath_buf *bf)

static bool ath_lookup_legacy(struct ath_buf *bf)
@@ -1333,7 +1333,7 @@ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq) 
	struct ath_atx_ac *ac, *ac_tmp, *last_ac;

	struct ath_atx_ac *ac, *ac_tmp, *last_ac;

	struct ath_atx_tid *tid, *last_tid;

	struct ath_atx_tid *tid, *last_tid;





	if (list_empty(&txq->axq_acq) ||

	if (work_pending(&sc->hw_reset_work) || list_empty(&txq->axq_acq) ||

	    txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)

	    txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)

		return;

		return;
@@ -2148,6 +2148,9 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq) 




	spin_lock_bh(&txq->axq_lock);

	spin_lock_bh(&txq->axq_lock);

	for (;;) {

	for (;;) {

		if (work_pending(&sc->hw_reset_work))

			break;



		if (list_empty(&txq->axq_q)) {

		if (list_empty(&txq->axq_q)) {

			txq->axq_link = NULL;

			txq->axq_link = NULL;

			if (sc->sc_flags & SC_OP_TXAGGR)

			if (sc->sc_flags & SC_OP_TXAGGR)
@@ -2235,9 +2238,7 @@ static void ath_tx_complete_poll_work(struct work_struct *work) 
	if (needreset) {

	if (needreset) {

		ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_RESET,

		ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_RESET,

			"tx hung, resetting the chip\n");

			"tx hung, resetting the chip\n");

		spin_lock_bh(&sc->sc_pcu_lock);

		ieee80211_queue_work(sc->hw, &sc->hw_reset_work);

		ath_reset(sc, true);

		spin_unlock_bh(&sc->sc_pcu_lock);

	}

	}





	ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work,

	ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work,
@@ -2270,6 +2271,9 @@ void ath_tx_edma_tasklet(struct ath_softc *sc) 
	int status;

	int status;





	for (;;) {

	for (;;) {

		if (work_pending(&sc->hw_reset_work))

			break;



		status = ath9k_hw_txprocdesc(ah, NULL, (void *)&ts);

		status = ath9k_hw_txprocdesc(ah, NULL, (void *)&ts);

		if (status == -EINPROGRESS)

		if (status == -EINPROGRESS)

			break;

			break;