qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 00:56:14 +02:00
Code

ath9k: improve tx dma fixes based on review feedback

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26005 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2011-03-10 13:37:26 +00:00
parent c11c8f1d20
commit bc3a5f824f
3 changed files with 79 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/mac80211/patches/571-ath9k_fix_dma_stop.patch
View File

@ -25,11 +25,11 @@
if (npend) if (npend)
--- a/drivers/net/wireless/ath/ath9k/mac.c --- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/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 @@ -143,6 +143,33 @@ bool ath9k_hw_updatetxtriglevel(struct a
} }
EXPORT_SYMBOL(ath9k_hw_updatetxtriglevel); EXPORT_SYMBOL(ath9k_hw_updatetxtriglevel);
+bool ath9k_hw_abort_tx_dma(struct ath_hw *ah) +void ath9k_hw_abort_tx_dma(struct ath_hw *ah)
+{ +{
+ int i, q; + int i, q;
+ +
@ -47,16 +47,12 @@
+ udelay(5); + 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_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_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_CLR_BIT(ah, AR_D_GBL_IFS_MISC, AR_D_GBL_IFS_MISC_IGNORE_BACKOFF);
+ +
+ REG_WRITE(ah, AR_Q_TXD, 0); + REG_WRITE(ah, AR_Q_TXD, 0);
+
+ return true;
+} +}
+EXPORT_SYMBOL(ath9k_hw_abort_tx_dma); +EXPORT_SYMBOL(ath9k_hw_abort_tx_dma);
+ +
@ -69,7 +65,7 @@
u32 ath9k_hw_numtxpending(struct ath_hw *ah, u32 q); u32 ath9k_hw_numtxpending(struct ath_hw *ah, u32 q);
bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel); bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel);
bool ath9k_hw_stoptxdma(struct ath_hw *ah, u32 q); bool ath9k_hw_stoptxdma(struct ath_hw *ah, u32 q);
+bool ath9k_hw_abort_tx_dma(struct ath_hw *ah); +void ath9k_hw_abort_tx_dma(struct ath_hw *ah);
void ath9k_hw_gettxintrtxqs(struct ath_hw *ah, u32 *txqs); void ath9k_hw_gettxintrtxqs(struct ath_hw *ah, u32 *txqs);
bool ath9k_hw_set_txq_props(struct ath_hw *ah, int q, bool ath9k_hw_set_txq_props(struct ath_hw *ah, int q,
const struct ath9k_tx_queue_info *qinfo); const struct ath9k_tx_queue_info *qinfo);

85
package/mac80211/patches/572-ath9k_fix_tx_flush.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/main.c --- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/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 @@ -2149,56 +2149,40 @@ static void ath9k_set_coverage_class(str
static void ath9k_flush(struct ieee80211_hw *hw, bool drop) static void ath9k_flush(struct ieee80211_hw *hw, bool drop)
{ {
@ -10,9 +10,10 @@
- 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);
- int i, j, npend = 0; - int i, j, npend = 0;
+ int timeout = 60; /* ms */ + int timeout = 200; /* ms */
+ int i, j; + int i, j;
+ ath9k_ps_wakeup(sc);
mutex_lock(&sc->mutex); mutex_lock(&sc->mutex);
cancel_delayed_work_sync(&sc->tx_complete_work); cancel_delayed_work_sync(&sc->tx_complete_work);
@ -55,22 +56,84 @@
- txq->txq_flush_inprogress = false; - txq->txq_flush_inprogress = false;
+ npend += ath9k_has_pending_frames(sc, &sc->tx.txq[i]); + npend += ath9k_has_pending_frames(sc, &sc->tx.txq[i]);
} }
- } +
- if (npend) {
- ath_reset(sc, false);
- txq->txq_flush_inprogress = false;
+ if (!npend) + if (!npend)
+ goto out; + goto out;
+ +
+ usleep_range(1000, 2000); + usleep_range(1000, 2000);
} }
+ ath9k_ps_wakeup(sc); - if (npend) {
+ ath_drain_all_txq(sc, false); + if (!ath_drain_all_txq(sc, false))
+ ath9k_ps_restore(sc); ath_reset(sc, false);
+ - txq->txq_flush_inprogress = false;
- }
+out: +out:
ieee80211_queue_delayed_work(hw, &sc->tx_complete_work, 0); ieee80211_queue_delayed_work(hw, &sc->tx_complete_work, 0);
mutex_unlock(&sc->mutex); mutex_unlock(&sc->mutex);
+ ath9k_ps_restore(sc);
}
struct ieee80211_ops ath9k_ops = {
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -189,7 +189,6 @@ struct ath_txq {
u32 axq_ampdu_depth;
bool stopped;
bool axq_tx_inprogress;
- bool txq_flush_inprogress;
struct list_head axq_acq;
struct list_head txq_fifo[ATH_TXFIFO_DEPTH];
struct list_head txq_fifo_pending;
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -2091,8 +2091,7 @@ static void ath_tx_processq(struct ath_s
spin_lock_bh(&txq->axq_lock);
if (list_empty(&txq->axq_q)) {
txq->axq_link = NULL;
- if (sc->sc_flags & SC_OP_TXAGGR &&
- !txq->txq_flush_inprogress)
+ if (sc->sc_flags & SC_OP_TXAGGR)
ath_txq_schedule(sc, txq);
spin_unlock_bh(&txq->axq_lock);
break;
@@ -2173,7 +2172,7 @@ static void ath_tx_processq(struct ath_s
spin_lock_bh(&txq->axq_lock);
- if (sc->sc_flags & SC_OP_TXAGGR && !txq->txq_flush_inprogress)
+ if (sc->sc_flags & SC_OP_TXAGGR)
ath_txq_schedule(sc, txq);
spin_unlock_bh(&txq->axq_lock);
}
@@ -2317,18 +2316,17 @@ void ath_tx_edma_tasklet(struct ath_soft
spin_lock_bh(&txq->axq_lock);
- if (!txq->txq_flush_inprogress) {
- if (!list_empty(&txq->txq_fifo_pending)) {
- INIT_LIST_HEAD(&bf_head);
- bf = list_first_entry(&txq->txq_fifo_pending,
- struct ath_buf, list);
- list_cut_position(&bf_head,
- &txq->txq_fifo_pending,
- &bf->bf_lastbf->list);
- ath_tx_txqaddbuf(sc, txq, &bf_head);
- } else if (sc->sc_flags & SC_OP_TXAGGR)
- ath_txq_schedule(sc, txq);
- }
+ if (!list_empty(&txq->txq_fifo_pending)) {
+ INIT_LIST_HEAD(&bf_head);
+ bf = list_first_entry(&txq->txq_fifo_pending,
+ struct ath_buf, list);
+ list_cut_position(&bf_head,
+ &txq->txq_fifo_pending,
+ &bf->bf_lastbf->list);
+ ath_tx_txqaddbuf(sc, txq, &bf_head);
+ } else if (sc->sc_flags & SC_OP_TXAGGR)
+ ath_txq_schedule(sc, txq);
+
spin_unlock_bh(&txq->axq_lock);
}
} }

4
package/mac80211/patches/573-ath9k_beacon_stop.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/mac.c --- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/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 @@ -170,84 +170,30 @@ void ath9k_hw_abort_tx_dma(struct ath_hw
} }
EXPORT_SYMBOL(ath9k_hw_abort_tx_dma); EXPORT_SYMBOL(ath9k_hw_abort_tx_dma);
@ -100,7 +100,7 @@
bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel); bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel);
-bool ath9k_hw_stoptxdma(struct ath_hw *ah, u32 q); -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_stop_dma_queue(struct ath_hw *ah, u32 q);
bool ath9k_hw_abort_tx_dma(struct ath_hw *ah); void ath9k_hw_abort_tx_dma(struct ath_hw *ah);
void ath9k_hw_gettxintrtxqs(struct ath_hw *ah, u32 *txqs); void ath9k_hw_gettxintrtxqs(struct ath_hw *ah, u32 *txqs);
bool ath9k_hw_set_txq_props(struct ath_hw *ah, int q, bool ath9k_hw_set_txq_props(struct ath_hw *ah, int q,
--- a/drivers/net/wireless/ath/ath9k/beacon.c --- a/drivers/net/wireless/ath/ath9k/beacon.c