diff options
4 files changed, 306 insertions, 0 deletions
diff --git a/package/mac80211/patches/570-ath9k_fix_reg_bit_macros.patch b/package/mac80211/patches/570-ath9k_fix_reg_bit_macros.patch new file mode 100644 index 000000000..7d961d2c2 --- /dev/null +++ b/package/mac80211/patches/570-ath9k_fix_reg_bit_macros.patch @@ -0,0 +1,14 @@ +--- a/drivers/net/wireless/ath/ath9k/hw.h ++++ b/drivers/net/wireless/ath/ath9k/hw.h +@@ -95,9 +95,9 @@ + #define REG_READ_FIELD(_a, _r, _f) \ + (((REG_READ(_a, _r) & _f) >> _f##_S)) + #define REG_SET_BIT(_a, _r, _f) \ +- REG_WRITE(_a, _r, REG_READ(_a, _r) | _f) ++ REG_WRITE(_a, _r, REG_READ(_a, _r) | (_f)) + #define REG_CLR_BIT(_a, _r, _f) \ +- REG_WRITE(_a, _r, REG_READ(_a, _r) & ~_f) ++ REG_WRITE(_a, _r, REG_READ(_a, _r) & ~(_f)) + + #define DO_DELAY(x) do { \ + if ((++(x) % 64) == 0) \ diff --git a/package/mac80211/patches/571-ath9k_fix_dma_stop.patch b/package/mac80211/patches/571-ath9k_fix_dma_stop.patch new file mode 100644 index 000000000..698b05bb4 --- /dev/null +++ b/package/mac80211/patches/571-ath9k_fix_dma_stop.patch @@ -0,0 +1,75 @@ +--- a/drivers/net/wireless/ath/ath9k/xmit.c ++++ b/drivers/net/wireless/ath/ath9k/xmit.c +@@ -1271,16 +1271,14 @@ bool ath_drain_all_txq(struct ath_softc + if (sc->sc_flags & SC_OP_INVALID) + return true; + +- /* Stop beacon queue */ +- ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq); ++ ath9k_hw_abort_tx_dma(ah); + +- /* Stop data queues */ ++ /* Check if any queue remains active */ + for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) { +- if (ATH_TXQ_SETUP(sc, i)) { +- txq = &sc->tx.txq[i]; +- ath9k_hw_stoptxdma(ah, txq->axq_qnum); +- npend += ath9k_hw_numtxpending(ah, txq->axq_qnum); +- } ++ if (!ATH_TXQ_SETUP(sc, i)) ++ continue; ++ ++ npend += ath9k_hw_numtxpending(ah, sc->tx.txq[i].axq_qnum); + } + + if (npend) +--- a/drivers/net/wireless/ath/ath9k/mac.c ++++ b/drivers/net/wireless/ath/ath9k/mac.c +@@ -143,6 +143,37 @@ bool ath9k_hw_updatetxtriglevel(struct a + } + EXPORT_SYMBOL(ath9k_hw_updatetxtriglevel); + ++bool ath9k_hw_abort_tx_dma(struct ath_hw *ah) ++{ ++ int i, q; ++ ++ REG_WRITE(ah, AR_Q_TXD, AR_Q_TXD_M); ++ ++ REG_SET_BIT(ah, AR_PCU_MISC, AR_PCU_FORCE_QUIET_COLL | AR_PCU_CLEAR_VMF); ++ REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_FORCE_CH_IDLE_HIGH); ++ REG_SET_BIT(ah, AR_D_GBL_IFS_MISC, AR_D_GBL_IFS_MISC_IGNORE_BACKOFF); ++ ++ for (q = 0; q < AR_NUM_QCU; q++) { ++ for (i = 1000; i > 0; i--) { ++ if (!ath9k_hw_numtxpending(ah, q)) ++ break; ++ ++ udelay(5); ++ } ++ } ++ if (!i) ++ return false; ++ ++ REG_CLR_BIT(ah, AR_PCU_MISC, AR_PCU_FORCE_QUIET_COLL | AR_PCU_CLEAR_VMF); ++ REG_CLR_BIT(ah, AR_DIAG_SW, AR_DIAG_FORCE_CH_IDLE_HIGH); ++ REG_CLR_BIT(ah, AR_D_GBL_IFS_MISC, AR_D_GBL_IFS_MISC_IGNORE_BACKOFF); ++ ++ REG_WRITE(ah, AR_Q_TXD, 0); ++ ++ return true; ++} ++EXPORT_SYMBOL(ath9k_hw_abort_tx_dma); ++ + bool ath9k_hw_stoptxdma(struct ath_hw *ah, u32 q) + { + #define ATH9K_TX_STOP_DMA_TIMEOUT 4000 /* usec */ +--- a/drivers/net/wireless/ath/ath9k/mac.h ++++ b/drivers/net/wireless/ath/ath9k/mac.h +@@ -676,6 +676,7 @@ void ath9k_hw_cleartxdesc(struct ath_hw + u32 ath9k_hw_numtxpending(struct ath_hw *ah, u32 q); + bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel); + bool ath9k_hw_stoptxdma(struct ath_hw *ah, u32 q); ++bool ath9k_hw_abort_tx_dma(struct ath_hw *ah); + void ath9k_hw_gettxintrtxqs(struct ath_hw *ah, u32 *txqs); + bool ath9k_hw_set_txq_props(struct ath_hw *ah, int q, + const struct ath9k_tx_queue_info *qinfo); diff --git a/package/mac80211/patches/572-ath9k_fix_tx_flush.patch b/package/mac80211/patches/572-ath9k_fix_tx_flush.patch new file mode 100644 index 000000000..55d127edf --- /dev/null +++ b/package/mac80211/patches/572-ath9k_fix_tx_flush.patch @@ -0,0 +1,76 @@ +--- a/drivers/net/wireless/ath/ath9k/main.c ++++ b/drivers/net/wireless/ath/ath9k/main.c +@@ -2149,54 +2149,37 @@ static void ath9k_set_coverage_class(str + + static void ath9k_flush(struct ieee80211_hw *hw, bool drop) + { +-#define ATH_FLUSH_TIMEOUT 60 /* ms */ + struct ath_softc *sc = hw->priv; +- struct ath_txq *txq = NULL; +- struct ath_hw *ah = sc->sc_ah; +- struct ath_common *common = ath9k_hw_common(ah); +- int i, j, npend = 0; ++ int timeout = 60; /* ms */ ++ int i, j; + + mutex_lock(&sc->mutex); + + cancel_delayed_work_sync(&sc->tx_complete_work); + +- for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) { +- if (!ATH_TXQ_SETUP(sc, i)) +- continue; +- txq = &sc->tx.txq[i]; +- +- if (!drop) { +- for (j = 0; j < ATH_FLUSH_TIMEOUT; j++) { +- if (!ath9k_has_pending_frames(sc, txq)) +- break; +- usleep_range(1000, 2000); +- } +- } ++ if (drop) ++ timeout = 1; + +- if (drop || ath9k_has_pending_frames(sc, txq)) { +- ath_dbg(common, ATH_DBG_QUEUE, "Drop frames from hw queue:%d\n", +- txq->axq_qnum); +- spin_lock_bh(&txq->axq_lock); +- txq->txq_flush_inprogress = true; +- spin_unlock_bh(&txq->axq_lock); +- +- ath9k_ps_wakeup(sc); +- ath9k_hw_stoptxdma(ah, txq->axq_qnum); +- npend = ath9k_hw_numtxpending(ah, txq->axq_qnum); +- ath9k_ps_restore(sc); +- if (npend) +- break; ++ for (j = 0; j < timeout; j++) { ++ int npend = 0; ++ for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) { ++ if (!ATH_TXQ_SETUP(sc, i)) ++ continue; + +- ath_draintxq(sc, txq, false); +- txq->txq_flush_inprogress = false; ++ npend += ath9k_has_pending_frames(sc, &sc->tx.txq[i]); + } +- } + +- if (npend) { +- ath_reset(sc, false); +- txq->txq_flush_inprogress = false; ++ if (!npend) ++ goto out; ++ ++ usleep_range(1000, 2000); + } + ++ ath9k_ps_wakeup(sc); ++ ath_drain_all_txq(sc, false); ++ ath9k_ps_restore(sc); ++ ++out: + ieee80211_queue_delayed_work(hw, &sc->tx_complete_work, 0); + mutex_unlock(&sc->mutex); + } diff --git a/package/mac80211/patches/573-ath9k_beacon_stop.patch b/package/mac80211/patches/573-ath9k_beacon_stop.patch new file mode 100644 index 000000000..ea79ab151 --- /dev/null +++ b/package/mac80211/patches/573-ath9k_beacon_stop.patch @@ -0,0 +1,141 @@ +--- a/drivers/net/wireless/ath/ath9k/mac.c ++++ b/drivers/net/wireless/ath/ath9k/mac.c +@@ -174,84 +174,30 @@ bool ath9k_hw_abort_tx_dma(struct ath_hw + } + EXPORT_SYMBOL(ath9k_hw_abort_tx_dma); + +-bool ath9k_hw_stoptxdma(struct ath_hw *ah, u32 q) ++bool ath9k_hw_stop_dma_queue(struct ath_hw *ah, u32 q) + { +-#define ATH9K_TX_STOP_DMA_TIMEOUT 4000 /* usec */ ++#define ATH9K_TX_STOP_DMA_TIMEOUT 1000 /* usec */ + #define ATH9K_TIME_QUANTUM 100 /* usec */ +- struct ath_common *common = ath9k_hw_common(ah); +- struct ath9k_hw_capabilities *pCap = &ah->caps; +- struct ath9k_tx_queue_info *qi; +- u32 tsfLow, j, wait; +- u32 wait_time = ATH9K_TX_STOP_DMA_TIMEOUT / ATH9K_TIME_QUANTUM; +- +- if (q >= pCap->total_queues) { +- ath_dbg(common, ATH_DBG_QUEUE, +- "Stopping TX DMA, invalid queue: %u\n", q); +- return false; +- } +- +- qi = &ah->txq[q]; +- if (qi->tqi_type == ATH9K_TX_QUEUE_INACTIVE) { +- ath_dbg(common, ATH_DBG_QUEUE, +- "Stopping TX DMA, inactive queue: %u\n", q); +- return false; +- } ++ int wait_time = ATH9K_TX_STOP_DMA_TIMEOUT / ATH9K_TIME_QUANTUM; ++ int wait; + + REG_WRITE(ah, AR_Q_TXD, 1 << q); + + for (wait = wait_time; wait != 0; wait--) { + if (ath9k_hw_numtxpending(ah, q) == 0) + break; +- udelay(ATH9K_TIME_QUANTUM); +- } + +- if (ath9k_hw_numtxpending(ah, q)) { +- ath_dbg(common, ATH_DBG_QUEUE, +- "%s: Num of pending TX Frames %d on Q %d\n", +- __func__, ath9k_hw_numtxpending(ah, q), q); +- +- for (j = 0; j < 2; j++) { +- tsfLow = REG_READ(ah, AR_TSF_L32); +- REG_WRITE(ah, AR_QUIET2, +- SM(10, AR_QUIET2_QUIET_DUR)); +- REG_WRITE(ah, AR_QUIET_PERIOD, 100); +- REG_WRITE(ah, AR_NEXT_QUIET_TIMER, tsfLow >> 10); +- REG_SET_BIT(ah, AR_TIMER_MODE, +- AR_QUIET_TIMER_EN); +- +- if ((REG_READ(ah, AR_TSF_L32) >> 10) == (tsfLow >> 10)) +- break; +- +- ath_dbg(common, ATH_DBG_QUEUE, +- "TSF has moved while trying to set quiet time TSF: 0x%08x\n", +- tsfLow); +- } +- +- REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_FORCE_CH_IDLE_HIGH); +- +- udelay(200); +- REG_CLR_BIT(ah, AR_TIMER_MODE, AR_QUIET_TIMER_EN); +- +- wait = wait_time; +- while (ath9k_hw_numtxpending(ah, q)) { +- if ((--wait) == 0) { +- ath_err(common, +- "Failed to stop TX DMA in 100 msec after killing last frame\n"); +- break; +- } +- udelay(ATH9K_TIME_QUANTUM); +- } +- +- REG_CLR_BIT(ah, AR_DIAG_SW, AR_DIAG_FORCE_CH_IDLE_HIGH); ++ udelay(ATH9K_TIME_QUANTUM); + } + + REG_WRITE(ah, AR_Q_TXD, 0); ++ + return wait != 0; + + #undef ATH9K_TX_STOP_DMA_TIMEOUT + #undef ATH9K_TIME_QUANTUM + } +-EXPORT_SYMBOL(ath9k_hw_stoptxdma); ++EXPORT_SYMBOL(ath9k_hw_stop_dma_queue); + + void ath9k_hw_gettxintrtxqs(struct ath_hw *ah, u32 *txqs) + { +--- a/drivers/net/wireless/ath/ath9k/mac.h ++++ b/drivers/net/wireless/ath/ath9k/mac.h +@@ -675,7 +675,7 @@ void ath9k_hw_txstart(struct ath_hw *ah, + void ath9k_hw_cleartxdesc(struct ath_hw *ah, void *ds); + u32 ath9k_hw_numtxpending(struct ath_hw *ah, u32 q); + bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel); +-bool ath9k_hw_stoptxdma(struct ath_hw *ah, u32 q); ++bool ath9k_hw_stop_dma_queue(struct ath_hw *ah, u32 q); + bool ath9k_hw_abort_tx_dma(struct ath_hw *ah); + void ath9k_hw_gettxintrtxqs(struct ath_hw *ah, u32 *txqs); + bool ath9k_hw_set_txq_props(struct ath_hw *ah, int q, +--- a/drivers/net/wireless/ath/ath9k/beacon.c ++++ b/drivers/net/wireless/ath/ath9k/beacon.c +@@ -373,6 +373,7 @@ void ath_beacon_tasklet(unsigned long da + ath_dbg(common, ATH_DBG_BSTUCK, + "missed %u consecutive beacons\n", + sc->beacon.bmisscnt); ++ ath9k_hw_stop_dma_queue(ah, sc->beacon.beaconq); + ath9k_hw_bstuck_nfcal(ah); + } else if (sc->beacon.bmisscnt >= BSTUCK_THRESH) { + ath_dbg(common, ATH_DBG_BSTUCK, +@@ -450,16 +451,6 @@ void ath_beacon_tasklet(unsigned long da + sc->beacon.updateslot = OK; + } + if (bfaddr != 0) { +- /* +- * Stop any current dma and put the new frame(s) on the queue. +- * This should never fail since we check above that no frames +- * are still pending on the queue. +- */ +- if (!ath9k_hw_stoptxdma(ah, sc->beacon.beaconq)) { +- ath_err(common, "beacon queue %u did not stop?\n", +- sc->beacon.beaconq); +- } +- + /* NB: cabq traffic should already be queued and primed */ + ath9k_hw_puttxbuf(ah, sc->beacon.beaconq, bfaddr); + ath9k_hw_txstart(ah, sc->beacon.beaconq); +@@ -780,7 +771,7 @@ void ath9k_set_beaconing_status(struct a + ah->imask &= ~ATH9K_INT_SWBA; + ath9k_hw_set_interrupts(ah, ah->imask); + tasklet_kill(&sc->bcon_tasklet); +- ath9k_hw_stoptxdma(ah, sc->beacon.beaconq); ++ ath9k_hw_stop_dma_queue(ah, sc->beacon.beaconq); + } + ath9k_ps_restore(sc); + } |