ath5: Add multiple queues / QoS support
cover ath5: Add multiple queues / QoS support
The following series adds WME QoS for ath5k by using four hardware queues and adding the necessary callback function for mac80211 to configure the queue parameters.
It is based on my last series ("PATCH 0/8] ath: Move key cache functions to ath common") and Bobs reordered base.c ("ath5k: reorder base.c to remove fwd decls"). Please let me know if you have any merge issues and i'll resend the whole series.
Unfortunately, if we use multiple queues, the hardware can get stuck, and we don't know a better solution than resetting the hardware in this case. This is the same situation as in ath9k and i have copied the workaround from there.
bruno
---
Bruno Randolf (9):
ath5k: Use four hardware queues
ath5k: Fix queue debug file
ath5k: Fix TX queues stopping
ath5k: Move tx frame completion into separate function
ath5k: Add watchdog for stuck TX queues
ath5k: Count how many times a queue got stuck
ath5k: Keep last descriptor in queue
ath5k: Simplify cw_min/max and AIFS configuration
ath5k: Add tx queue configuration function
drivers/net/wireless/ath/ath5k/ath5k.h | 13 - drivers/net/wireless/ath/ath5k/attach.c | 2 drivers/net/wireless/ath/ath5k/base.c | 322 ++++++++++++++++++++++--------- drivers/net/wireless/ath/ath5k/base.h | 9 + drivers/net/wireless/ath/ath5k/debug.c | 11 + drivers/net/wireless/ath/ath5k/qcu.c | 99 +++++----- 6 files changed, 302 insertions(+), 154 deletions(-)
--
Signature
~
PATCH 1/9 ath5k: Use four hardware queues
Prepare ath5k for WME by using four hardware queues.
The way we set up our queues matches the mac80211 queue priority 1:1, so we don't have to do any mapping for queue numbers.
Every queue uses 50 of the total 200 available transmit buffers, so the DMA memory usage does not increase with this patch, but it might be good to fine-tune the number of buffers per queue later (depending on the CPU speed and load, and the speed of the medium access, it might not be big enough).
--- drivers/net/wireless/ath/ath5k/base.c | 47 +++++++++++++++++++++++++++++---- drivers/net/wireless/ath/ath5k/base.h | 5 +++- 2 files changed, 45 insertions(+), 7 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +41 -6
@@ -737,6 +737,7 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf,spin_lock_bh (&txq->lock);list_add_tail (&bf->list, &txq->q); + txq->txq_len++;if (txq->link ==NULL )/* is this first packet? */ ath5k_hw_set_txdp (ah, txq->qnum, bf->daddr);else /* no, so only link it */
@@ -893,6 +894,7 @@ ath5k_txq_setup(struct ath5k_softc *sc,INIT_LIST_HEAD (&txq->q);spin_lock_init (&txq->lock); txq->setup = true; + txq->txq_len =0 ; }return &sc->txqs[qnum]; }
@@ -987,6 +989,7 @@ ath5k_txq_drainq(struct ath5k_softc *sc, struct ath5k_txq *txq)spin_lock_bh (&sc->txbuflock);list_move_tail (&bf->list, &sc->txbuf); sc->txbuf_len++; + txq->txq_len--;spin_unlock_bh (&sc->txbuflock); } txq->link =NULL ;
@@ -1483,6 +1486,9 @@ static int ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb, goto drop_packet; } +if (txq->txq_len >=ATH5K_TXQ_LEN_MAX ) +ieee80211_stop_queue (hw, txq->qnum); +spin_lock_irqsave (&sc->txbuflock, flags);if (list_empty (&sc->txbuf)) {ATH5K_ERR (sc,"no further txbuf available, dropping packet\n" );
@@ -1605,13 +1611,14 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq)spin_lock (&sc->txbuflock);list_move_tail (&bf->list, &sc->txbuf); sc->txbuf_len++; + txq->txq_len--;spin_unlock (&sc->txbuflock); }if (likely (list_empty (&txq->q))) txq->link =NULL ;spin_unlock (&txq->lock); -if (sc->txbuf_len >ATH_TXBUF /5 ) -ieee80211_wake_queues (sc->hw); +if (txq->txq_len <ATH5K_TXQ_LEN_LOW ) +ieee80211_wake_queue (sc->hw, txq->qnum); } static void
@@ -2395,6 +2402,7 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)struct ath5k_softc *sc = hw->priv;struct ath5k_hw *ah = sc->ah;struct ath_regulatory *regulatory =ath5k_hw_regulatory (ah); +struct ath5k_txq *txq;u8 mac[ETH_ALEN ] = {};int ret;
@@ -2460,12 +2468,33 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw) goto err_bhal; } - sc->txq =ath5k_txq_setup (sc,AR5K_TX_QUEUE_DATA ,AR5K_WME_AC_BK ); -if (IS_ERR (sc->txq)) { +/* This order matches mac80211's queue priority, so we can +* directly use the mac80211 queue number without any mapping */ + txq =ath5k_txq_setup (sc,AR5K_TX_QUEUE_DATA ,AR5K_WME_AC_VO ); +if (IS_ERR (txq)) { +ATH5K_ERR (sc,"can't setup xmit queue\n" ); + ret =PTR_ERR (txq); + goto err_queues; + } + txq =ath5k_txq_setup (sc,AR5K_TX_QUEUE_DATA ,AR5K_WME_AC_VI ); +if (IS_ERR (txq)) {ATH5K_ERR (sc,"can't setup xmit queue\n" ); - ret =PTR_ERR (sc->txq); + ret =PTR_ERR (txq); goto err_queues; } + txq =ath5k_txq_setup (sc,AR5K_TX_QUEUE_DATA ,AR5K_WME_AC_BE ); +if (IS_ERR (txq)) { +ATH5K_ERR (sc,"can't setup xmit queue\n" ); + ret =PTR_ERR (txq); + goto err_queues; + } + txq =ath5k_txq_setup (sc,AR5K_TX_QUEUE_DATA ,AR5K_WME_AC_BK ); +if (IS_ERR (txq)) { +ATH5K_ERR (sc,"can't setup xmit queue\n" ); + ret =PTR_ERR (txq); + goto err_queues; + } + hw->queues =4 ;tasklet_init (&sc->rxtq, ath5k_tasklet_rx, (unsigned long )sc);tasklet_init (&sc->txtq, ath5k_tasklet_tx, (unsigned long )sc);
@@ -2558,8 +2587,14 @@ static int ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb) { struct ath5k_softc *sc = hw->priv; +u16 qnum =skb_get_queue_mapping (skb); + +if (WARN_ON (qnum >= sc->ah->ah_capabilities.cap_queues.q_tx_num)) { +dev_kfree_skb_any (skb); +return 0 ; + } -return ath5k_tx_queue (hw, skb, sc->txq); +return ath5k_tx_queue (hw, skb, &sc->txqs[qnum]); }static int ath5k_start (struct ieee80211_hw *hw)
drivers/net/wireless/ath/ath5k/base.h +4 -1
@@ -60,6 +60,9 @@#define ATH_TXBUF 200/* number of TX buffers */ #define ATH_BCBUF 1/* number of beacon buffers */ +#define ATH5K_TXQ_LEN_MAX (ATH_TXBUF / 4)/* bufs per queue */ +#define ATH5K_TXQ_LEN_LOW (ATH5K_TXQ_LEN_MAX / 2)/* low mark */ +struct ath5k_buf {struct list_head list;struct ath5k_desc *desc;/* virtual addr of desc */
@@ -83,6 +86,7 @@ struct ath5k_txq {struct list_head q;/* transmit queue */ spinlock_t lock;/* lock on q and link */ bool setup; +int txq_len;/* number of queued buffers */ };#define ATH5K_LED_MAX_NAME_LEN 31
@@ -204,7 +208,6 @@ struct ath5k_softc {spinlock_t txbuflock;unsigned int txbuf_len;/* buf count in txbuf list */ struct ath5k_txq txqs[AR5K_NUM_TX_QUEUES ];/* tx queues */ -struct ath5k_txq *txq;/* main tx queue */ struct tasklet_struct txtq;/* tx intr tasklet */ struct ath5k_led tx_led;/* tx led */
PATCH 2/9 ath5k: Fix queue debug file
In reply to Bruno RandolfTake txq lock in debug file and fix reporting of used buffers.
--- drivers/net/wireless/ath/ath5k/debug.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath5k/debug.c +7 -2
@@ -763,7 +763,7 @@ static ssize_t read_file_queue(struct file *file, char __user *user_buf,struct ath5k_txq *txq;struct ath5k_buf *bf, *bf0; -int i, n =0 ; +int i, n; len +=snprintf (buf+len,sizeof (buf)-len,"available txbuffers: %d\n" , sc->txbuf_len);
@@ -777,9 +777,14 @@ static ssize_t read_file_queue(struct file *file, char __user *user_buf,if (!txq->setup)continue ; + n =0 ; +spin_lock_bh (&txq->lock);list_for_each_entry_safe (bf, bf0, &txq->q, list) n++; - len +=snprintf (buf+len,sizeof (buf)-len," len: %d\n" , n); +spin_unlock_bh (&txq->lock); + + len +=snprintf (buf+len,sizeof (buf)-len, +" len: %d bufs: %d\n" , txq->txq_len, n); }if (len >sizeof (buf))
PATCH 3/9 ath5k: Fix TX queues stopping
In reply to Bruno RandolfIt does not make sense to stop queues for NF calibration. This will not stop transmissions from the card, if there are queued packets.
If we run out of TX buffers we need to stop all queues, not only one.
--- drivers/net/wireless/ath/ath5k/base.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +4 -5
@@ -1493,7 +1493,7 @@ static int ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb,if (list_empty (&sc->txbuf)) {ATH5K_ERR (sc,"no further txbuf available, dropping packet\n" );spin_unlock_irqrestore (&sc->txbuflock, flags); -ieee80211_stop_queue (hw,skb_get_queue_mapping (skb)); +ieee80211_stop_queues (hw); goto drop_packet; } bf = list_first_entry(&sc->txbuf, struct ath5k_buf, list);
@@ -2142,14 +2142,13 @@ ath5k_tasklet_calibrate(unsigned long data) sc->curchan->center_freq));/* Noise floor calibration interrupts rx/tx path while I/Q calibration -* doesn't. We stop the queues so that calibration doesn't interfere -* with TX and don't run it as often */ +* doesn't. +* TODO: We should stop TX here, so that it doesn't interfere. +* Note that stopping the queues is not enough to stop TX! */ if (time_is_before_eq_jiffies (ah->ah_cal_next_nf)) { ah->ah_cal_next_nf = jiffies +msecs_to_jiffies (ATH5K_TUNE_CALIBRATION_INTERVAL_NF ); -ieee80211_stop_queues (sc->hw);ath5k_hw_update_noise_floor (ah); -ieee80211_wake_queues (sc->hw); } ah->ah_cal_mask &= ~AR5K_CALIBRATION_FULL ;
PATCH 4/9 ath5k: Move tx frame completion into separate function
In reply to Bruno RandolfClearer separation between queue handling and what we do with completed frames.
--- drivers/net/wireless/ath/ath5k/base.c | 107 ++++++++++++++++++--------------- 1 files changed, 57 insertions(+), 50 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +57 -50
@@ -1520,6 +1520,61 @@ drop_packet:return NETDEV_TX_OK ; } +static void +ath5k_tx_frame_completed (struct ath5k_softc *sc,struct sk_buff *skb, +struct ath5k_tx_status *ts) +{ +struct ieee80211_tx_info *info; +int i; + + sc->stats.tx_all_count++; + info =IEEE80211_SKB_CB (skb); + +ieee80211_tx_info_clear_status (info); +for (i =0 ; i <4 ; i++) { +struct ieee80211_tx_rate *r = + &info->status.rates[i]; + +if (ts->ts_rate[i]) { + r->idx =ath5k_hw_to_driver_rix (sc, ts->ts_rate[i]); + r->count = ts->ts_retry[i]; + }else { + r->idx =-1 ; + r->count =0 ; + } + } + +/* count the successful attempt as well */ + info->status.rates[ts->ts_final_idx].count++; + +if (unlikely (ts->ts_status)) { + sc->stats.ack_fail++; +if (ts->ts_status &AR5K_TXERR_FILT ) { + info->flags |=IEEE80211_TX_STAT_TX_FILTERED ; + sc->stats.txerr_filt++; + } +if (ts->ts_status &AR5K_TXERR_XRETRY ) + sc->stats.txerr_retry++; +if (ts->ts_status &AR5K_TXERR_FIFO ) + sc->stats.txerr_fifo++; + }else { + info->flags |=IEEE80211_TX_STAT_ACK ; + info->status.ack_signal = ts->ts_rssi; + } + +/* +* Remove MAC header padding before giving the frame +* back to mac80211. +*/ +ath5k_remove_padding (skb); + +if (ts->ts_antenna >0 && ts->ts_antenna <5 ) + sc->stats.antenna_tx[ts->ts_antenna]++; +else + sc->stats.antenna_tx[0 ]++;/* invalid */ + +ieee80211_tx_status (sc->hw, skb); +}static void ath5k_tx_processq (struct ath5k_softc *sc,struct ath5k_txq *txq)
@@ -1528,8 +1583,7 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq)struct ath5k_buf *bf, *bf0;struct ath5k_desc *ds;struct sk_buff *skb; -struct ieee80211_tx_info *info; -int i, ret; +int ret;spin_lock (&txq->lock);list_for_each_entry_safe (bf, bf0, &txq->q, list) {
@@ -1545,7 +1599,6 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq)if (ath5k_hw_get_txdp (sc->ah, txq->qnum) == bf->daddr && !list_is_last (&bf->list, &txq->q))break ; - ret = sc->ah->ah_proc_tx_desc (sc->ah, ds, &ts);if (unlikely (ret == -EINPROGRESS ))break ;
@@ -1555,58 +1608,12 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq)break ; } - sc->stats.tx_all_count++; skb = bf->skb; - info =IEEE80211_SKB_CB (skb); bf->skb =NULL ; -pci_unmap_single (sc->pdev, bf->skbaddr, skb->len,PCI_DMA_TODEVICE ); -ieee80211_tx_info_clear_status (info); -for (i =0 ; i <4 ; i++) { -struct ieee80211_tx_rate *r = - &info->status.rates[i]; - -if (ts.ts_rate[i]) { - r->idx =ath5k_hw_to_driver_rix (sc, ts.ts_rate[i]); - r->count = ts.ts_retry[i]; - }else { - r->idx =-1 ; - r->count =0 ; - } - } - -/* count the successful attempt as well */ - info->status.rates[ts.ts_final_idx].count++; - -if (unlikely (ts.ts_status)) { - sc->stats.ack_fail++; -if (ts.ts_status &AR5K_TXERR_FILT ) { - info->flags |=IEEE80211_TX_STAT_TX_FILTERED ; - sc->stats.txerr_filt++; - } -if (ts.ts_status &AR5K_TXERR_XRETRY ) - sc->stats.txerr_retry++; -if (ts.ts_status &AR5K_TXERR_FIFO ) - sc->stats.txerr_fifo++; - }else { - info->flags |=IEEE80211_TX_STAT_ACK ; - info->status.ack_signal = ts.ts_rssi; - } - -/* -* Remove MAC header padding before giving the frame -* back to mac80211. -*/ -ath5k_remove_padding (skb); - -if (ts.ts_antenna >0 && ts.ts_antenna <5 ) - sc->stats.antenna_tx[ts.ts_antenna]++; -else - sc->stats.antenna_tx[0 ]++;/* invalid */ - -ieee80211_tx_status (sc->hw, skb); +ath5k_tx_frame_completed (sc, skb, &ts);spin_lock (&sc->txbuflock);list_move_tail (&bf->list, &sc->txbuf);
PATCH 5/9 ath5k: Add watchdog for stuck TX queues
In reply to Bruno RandolfSince we do not know any better solution to the problem that TX queues can get stuck, this adds a timer-based watchdog, which will check for stuck queues and reset the hardware if necessary.
Ported from ath9k commit 164ace38536849966ffa377b1b1132993a5a375d.
--- drivers/net/wireless/ath/ath5k/ath5k.h | 2 + drivers/net/wireless/ath/ath5k/base.c | 51 ++++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath5k/base.h | 3 ++ 3 files changed, 56 insertions(+), 0 deletions(-)
drivers/net/wireless/ath/ath5k/ath5k.h +2 -0
@@ -206,6 +206,8 @@#define ATH5K_TUNE_CALIBRATION_INTERVAL_ANI 1000/* 1 sec */ #define ATH5K_TUNE_CALIBRATION_INTERVAL_NF 60000/* 60 sec */ +#define ATH5K_TX_COMPLETE_POLL_INT 3000/* 3 sec */ +#define AR5K_INIT_CARR_SENSE_EN 1/*Swap RX/TX Descriptor for big endian archs*/
drivers/net/wireless/ath/ath5k/base.c +51 -0
93 lines not on this page · raw message
drivers/net/wireless/ath/ath5k/base.h +3 -0
@@ -87,6 +87,7 @@ struct ath5k_txq {spinlock_t lock;/* lock on q and link */ bool setup;int txq_len;/* number of queued buffers */ +bool txq_poll_mark; };#define ATH5K_LED_MAX_NAME_LEN 31
@@ -233,6 +234,8 @@ struct ath5k_softc {struct ath5k_ani_state ani_state;struct tasklet_struct ani_tasklet;/* ANI calibration */ + +struct delayed_work tx_complete_work; };#define ath5k_hw_hasbssidmask (_ah) \
PATCH 6/9 ath5k: Count how many times a queue got stuck
In reply to Bruno RandolfAdd a counter to show how many times a queue got stuck in the debugfs queue file.
--- drivers/net/wireless/ath/ath5k/base.c | 2 ++ drivers/net/wireless/ath/ath5k/base.h | 1 + drivers/net/wireless/ath/ath5k/debug.c | 2 ++ 3 files changed, 5 insertions(+), 0 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +2 -0
@@ -896,6 +896,7 @@ ath5k_txq_setup(struct ath5k_softc *sc, txq->setup = true; txq->txq_len =0 ; txq->txq_poll_mark = false; + txq->txq_stuck =0 ; }return &sc->txqs[qnum]; }
@@ -2197,6 +2198,7 @@ ath5k_tx_complete_poll_work(struct work_struct *work)"TX queue stuck %d\n" , txq->qnum); needreset = true; + txq->txq_stuck++;spin_unlock_bh (&txq->lock);break ; }else {
drivers/net/wireless/ath/ath5k/base.h +1 -0
@@ -88,6 +88,7 @@ struct ath5k_txq {bool setup;int txq_len;/* number of queued buffers */ bool txq_poll_mark; +unsigned int txq_stuck;/* informational counter */ };#define ATH5K_LED_MAX_NAME_LEN 31
drivers/net/wireless/ath/ath5k/debug.c +2 -0
@@ -785,6 +785,8 @@ static ssize_t read_file_queue(struct file *file, char __user *user_buf, len +=snprintf (buf+len,sizeof (buf)-len," len: %d bufs: %d\n" , txq->txq_len, n); + len +=snprintf (buf+len,sizeof (buf)-len, +" stuck: %d\n" , txq->txq_stuck); }if (len >sizeof (buf))
PATCH 7/9 ath5k: Keep last descriptor in queue
In reply to Bruno RandolfIf we return a TX descriptor to the pool of available descriptors, while a queues TXDP still points to it we could potentially run into all sorts of troube.
It has been suggested that there is hardware which can set the descriptors done bit before it reads ds_link and moves on to the next descriptor. While the documentation says this is not true for newer chipsets (the descriptor contents are copied to some internal memory), we don't know about older hardware.
To be safe, we always keep the last descriptor in the queue, and avoid dangling TXDP pointers. Unfortunately this does not fully resolve the problem - queues still get stuck!
This is similar to what ath9k does.
--- drivers/net/wireless/ath/ath5k/base.c | 64 +++++++++++++++++---------------- 1 files changed, 32 insertions(+), 32 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +32 -32
@@ -1590,44 +1590,44 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq)spin_lock (&txq->lock);list_for_each_entry_safe (bf, bf0, &txq->q, list) { - ds = bf->desc; + + txq->txq_poll_mark = false; + +/* skb might already have been processed last time. */ +if (bf->skb !=NULL ) { + ds = bf->desc; + + ret = sc->ah->ah_proc_tx_desc (sc->ah, ds, &ts); +if (unlikely (ret == -EINPROGRESS )) +break ; +else if (unlikely (ret)) { +ATH5K_ERR (sc, +"error %d while processing " +"queue %u\n" , ret, txq->qnum); +break ; + } + + skb = bf->skb; + bf->skb =NULL ; +pci_unmap_single (sc->pdev, bf->skbaddr, skb->len, +PCI_DMA_TODEVICE ); +ath5k_tx_frame_completed (sc, skb, &ts); + }/* * It's possible that the hardware can say the buffer is * completed when it hasn't yet loaded the ds_link from -* host memory and moved on. If there are more TX -* descriptors in the queue, wait for TXDP to change -* before processing this one. +* host memory and moved on. +* Always keep the last descriptor to avoid HW races... */ -if (ath5k_hw_get_txdp (sc->ah, txq->qnum) == bf->daddr && - !list_is_last (&bf->list, &txq->q)) -break ; - ret = sc->ah->ah_proc_tx_desc (sc->ah, ds, &ts); -if (unlikely (ret == -EINPROGRESS )) -break ; -else if (unlikely (ret)) { -ATH5K_ERR (sc,"error %d while processing queue %u\n" , - ret, txq->qnum); -break ; +if (ath5k_hw_get_txdp (sc->ah, txq->qnum) != bf->daddr) { +spin_lock (&sc->txbuflock); +list_move_tail (&bf->list, &sc->txbuf); + sc->txbuf_len++; + txq->txq_len--; +spin_unlock (&sc->txbuflock); } - - skb = bf->skb; - bf->skb =NULL ; -pci_unmap_single (sc->pdev, bf->skbaddr, skb->len, -PCI_DMA_TODEVICE ); - -ath5k_tx_frame_completed (sc, skb, &ts); - -spin_lock (&sc->txbuflock); -list_move_tail (&bf->list, &sc->txbuf); - sc->txbuf_len++; - txq->txq_len--; -spin_unlock (&sc->txbuflock); - - txq->txq_poll_mark = false; } -if (likely (list_empty (&txq->q))) - txq->link =NULL ;spin_unlock (&txq->lock);if (txq->txq_len <ATH5K_TXQ_LEN_LOW )ieee80211_wake_queue (sc->hw, txq->qnum);
@@ -2192,7 +2192,7 @@ ath5k_tx_complete_poll_work(struct work_struct *work)if (sc->txqs[i].setup) { txq = &sc->txqs[i];spin_lock_bh (&txq->lock); -if (txq->txq_len >0 ) { +if (txq->txq_len >1 ) {if (txq->txq_poll_mark) { ATH5K_DBG(sc, ATH5K_DEBUG_XMIT, "TX queue stuck %d\n",
PATCH 8/9 ath5k: Simplify cw_min/max and AIFS configuration
In reply to Bruno RandolfGet rid of overly complicated cw_min/max and AIFS configuration:
* Validate values in ath5k_hw_set_tx_queueprops(), so we can use them directly without further checks or computation in ath5k_hw_reset_tx_queue().
* Simplifiy by using AR5K_TUNE_AIFS|CWMIN|CWMAX variables directly since we don't support XR or B channels. That way we can also remove AR5K_TXQ_USEDEFAULT and the confusing logic around it.
* Update data types: AIFS is u8, CW's are u16.
* Remove now unneeded variables in ath5k_hw.
--- drivers/net/wireless/ath/ath5k/ath5k.h | 11 +-- drivers/net/wireless/ath/ath5k/attach.c | 2 - drivers/net/wireless/ath/ath5k/base.c | 18 +++--- drivers/net/wireless/ath/ath5k/qcu.c | 99 ++++++++++++++++--------------- 4 files changed, 65 insertions(+), 65 deletions(-)
drivers/net/wireless/ath/ath5k/ath5k.h +3 -8
@@ -258,8 +258,6 @@ (AR5K_INIT_PROG_IFS_TURBO ) \ ) -/* token to use for aifs, cwmin, cwmax in MadWiFi */ -#define AR5K_TXQ_USEDEFAULT ((u32) -1)/* GENERIC CHIPSET DEFINITIONS */
@@ -530,9 +528,9 @@ struct ath5k_txq_info {enum ath5k_tx_queue tqi_type;enum ath5k_tx_queue_subtype tqi_subtype;u16 tqi_flags;/* Tx queue flags (see above) */ -u32 tqi_aifs;/* Arbitrated Interframe Space */ -s32 tqi_cw_min;/* Minimum Contention Window */ -s32 tqi_cw_max;/* Maximum Contention Window */ +u8 tqi_aifs;/* Arbitrated Interframe Space */ +u16 tqi_cw_min;/* Minimum Contention Window */ +u16 tqi_cw_max;/* Maximum Contention Window */ u32 tqi_cbr_period;/* Constant bit rate period */ u32 tqi_cbr_overflow_limit;u32 tqi_burst_time;
@@ -1044,9 +1042,6 @@ struct ath5k_hw {#define ah_ee_version ah_capabilities.cap_eeprom.ee_versionu32 ah_atim_window; -u32 ah_aifs; -u32 ah_cw_min; -u32 ah_cw_max;u32 ah_limit_tx_retries;u8 ah_coverage_class;
drivers/net/wireless/ath/ath5k/attach.c +0 -2
@@ -119,8 +119,6 @@ int ath5k_hw_attach(struct ath5k_softc *sc) ah->ah_txpower.txp_tpc =AR5K_TUNE_TPC_TXPOWER ; ah->ah_imr =0 ; ah->ah_atim_window =0 ; - ah->ah_aifs =AR5K_TUNE_AIFS ; - ah->ah_cw_min =AR5K_TUNE_CWMIN ; ah->ah_limit_tx_retries =AR5K_INIT_TX_RETRY ; ah->ah_software_retry = false; ah->ah_ant_mode =AR5K_ANTMODE_DEFAULT ;
drivers/net/wireless/ath/ath5k/base.c +11 -7
@@ -853,9 +853,11 @@ ath5k_txq_setup(struct ath5k_softc *sc,struct ath5k_txq *txq;struct ath5k_txq_info qi = { .tqi_subtype = subtype, - .tqi_aifs =AR5K_TXQ_USEDEFAULT , - .tqi_cw_min =AR5K_TXQ_USEDEFAULT , - .tqi_cw_max =AR5K_TXQ_USEDEFAULT +/* XXX: default values not correct for B and XR channels, +* but who cares? */ + .tqi_aifs =AR5K_TUNE_AIFS , + .tqi_cw_min =AR5K_TUNE_CWMIN , + .tqi_cw_max =AR5K_TUNE_CWMAX };int qnum;
@@ -905,9 +907,11 @@ static int ath5k_beaconq_setup(struct ath5k_hw *ah) {struct ath5k_txq_info qi = { - .tqi_aifs =AR5K_TXQ_USEDEFAULT , - .tqi_cw_min =AR5K_TXQ_USEDEFAULT , - .tqi_cw_max =AR5K_TXQ_USEDEFAULT , +/* XXX: default values not correct for B and XR channels, +* but who cares? */ + .tqi_aifs =AR5K_TUNE_AIFS , + .tqi_cw_min =AR5K_TUNE_CWMIN , + .tqi_cw_max =AR5K_TUNE_CWMAX ,/* NB: for dynamic turbo, don't enable any other interrupts */ .tqi_flags =AR5K_TXQ_FLAG_TXDESCINT_ENABLE };
@@ -941,7 +945,7 @@ ath5k_beaconq_config(struct ath5k_softc *sc)*/ qi.tqi_aifs =0 ; qi.tqi_cw_min =0 ; - qi.tqi_cw_max =2 * ah->ah_cw_min; + qi.tqi_cw_max =2 *AR5K_TUNE_CWMIN ; } ATH5K_DBG(sc, ATH5K_DEBUG_BEACON,
drivers/net/wireless/ath/ath5k/qcu.c +51 -48
152 lines not on this page · raw message
PATCH 9/9 ath5k: Add tx queue configuration function
In reply to Bruno RandolfAdd the mac80211 callback function to configure the tx queue properties like cw_min, cw_max and aifs.
--- drivers/net/wireless/ath/ath5k/base.c | 40 ++++++++++++++++++++++++++++++++- 1 files changed, 39 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +39 -1
@@ -3144,6 +3144,44 @@ static void ath5k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class)mutex_unlock (&sc->lock); } +static int ath5k_conf_tx (struct ieee80211_hw *hw,u16 queue, +const struct ieee80211_tx_queue_params *params) +{ +struct ath5k_softc *sc = hw->priv; +struct ath5k_hw *ah = sc->ah; +struct ath5k_txq_info qi; +int ret =0 ; + +if (queue >= ah->ah_capabilities.cap_queues.q_tx_num) +return 0 ; + +mutex_lock (&sc->lock); + +ath5k_hw_get_tx_queueprops (ah, queue, &qi); + + qi.tqi_aifs = params->aifs; + qi.tqi_cw_min = params->cw_min; + qi.tqi_cw_max = params->cw_max; + qi.tqi_burst_time = params->txop; + +ATH5K_DBG (sc,ATH5K_DEBUG_ANY , +"Configure tx [queue %d], " +"aifs: %d, cw_min: %d, cw_max: %d, txop: %d\n" , + queue, params->aifs, params->cw_min, + params->cw_max, params->txop); + +if (ath5k_hw_set_tx_queueprops (ah, queue, &qi)) { +ATH5K_ERR (sc, +"Unable to update hardware queue %u!\n" , queue); + ret = -EIO ; + }else +ath5k_hw_reset_tx_queue (ah, queue); + +mutex_unlock (&sc->lock); + +return ret; +} +static const struct ieee80211_ops ath5k_hw_ops = { .tx = ath5k_tx, .start = ath5k_start,
@@ -3156,7 +3194,7 @@ static const struct ieee80211_ops ath5k_hw_ops = { .set_key = ath5k_set_key, .get_stats = ath5k_get_stats, .get_survey = ath5k_get_survey, - .conf_tx = NULL, + .conf_tx = ath5k_conf_tx, .get_tsf = ath5k_get_tsf, .set_tsf = ath5k_set_tsf, .reset_tsf = ath5k_reset_tsf,
Quoted 4 lines · Bruno Randolf
It is based on my last series ("PATCH 0/8] ath: Move key cache functions to ath common") and Bobs reordered
base.c("ath5k: reorderbase.cto remove fwd decls"). Please let me know if you have any merge issues and i'll resend the whole series.
You will need to resend this one -- Bob's no longer applies. I have your 8-patch series applied (with one small fixup from where Felix removed some capability flags.
John
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.