mt76: usb: fix use of q->head and q->tail
Subsystems (3)
Felix Fietkau
maintainerPATCH 1/9 mt76: usb: fix use of q->head and q->tail
Their use is reversed compared to DMA. The order for DMA makes more sense, so let's use that
--- drivers/net/wireless/mediatek/mt76/usb.c | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/net/wireless/mediatek/mt76/usb.c +15 -15
@@ -497,8 +497,8 @@ mt76u_get_next_rx_entry(struct mt76_queue *q)spin_lock_irqsave (&q->lock, flags);if (q->queued >0 ) { - urb = q->entry[q->head].urb; - q->head = (q->head +1 ) % q->ndesc; + urb = q->entry[q->tail].urb; + q->tail = (q->tail +1 ) % q->ndesc; q->queued--; }spin_unlock_irqrestore (&q->lock, flags);
@@ -622,10 +622,10 @@ static void mt76u_complete_rx(struct urb *urb) }spin_lock_irqsave (&q->lock, flags); -if (WARN_ONCE (q->entry[q->tail].urb != urb,"rx urb mismatch" )) +if (WARN_ONCE (q->entry[q->head].urb != urb,"rx urb mismatch" )) goto out; - q->tail = (q->tail +1 ) % q->ndesc; + q->head = (q->head +1 ) % q->ndesc; q->queued++;tasklet_schedule (&dev->usb.rx_tasklet); out:
@@ -808,17 +808,17 @@ static void mt76u_tx_tasklet(unsigned long data) q = sq->q;while (q->queued > n_dequeued) { -if (!q->entry[q->head].done) +if (!q->entry[q->tail].done)break ; -if (q->entry[q->head].schedule) { - q->entry[q->head].schedule = false; +if (q->entry[q->tail].schedule) { + q->entry[q->tail].schedule = false; n_sw_dequeued++; } - entry = q->entry[q->head]; - q->entry[q->head].done = false; - q->head = (q->head +1 ) % q->ndesc; + entry = q->entry[q->tail]; + q->entry[q->tail].done = false; + q->tail = (q->tail +1 ) % q->ndesc; n_dequeued++; dev->drv->tx_complete_skb (dev, i, &entry);
@@ -913,7 +913,7 @@ mt76u_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,struct mt76_tx_info tx_info = { .skb = skb, }; -u16 idx = q->tail; +u16 idx = q->head;int err;if (q->queued == q->ndesc)
@@ -932,7 +932,7 @@ mt76u_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid, q->entry[idx].urb, mt76u_complete_tx, &q->entry[idx]); - q->tail = (q->tail +1 ) % q->ndesc; + q->head = (q->head +1 ) % q->ndesc; q->entry[idx].skb = tx_info.skb; q->queued++;
@@ -944,7 +944,7 @@ static void mt76u_tx_kick(struct mt76_dev *dev, struct mt76_queue *q)struct urb *urb;int err; -while (q->first != q->tail) { +while (q->first != q->head) { urb = q->entry[q->first].urb;trace_submit_urb (dev, urb);
@@ -1071,8 +1071,8 @@ void mt76u_stop_tx(struct mt76_dev *dev)/* Assure we are in sync with killed tasklet. */ spin_lock_bh (&q->lock);while (q->queued) { - entry = q->entry[q->head]; - q->head = (q->head +1 ) % q->ndesc; + entry = q->entry[q->tail]; + q->tail = (q->tail +1 ) % q->ndesc; q->queued--; dev->drv->tx_complete_skb (dev, i, &entry);
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 2/9 mt76: sdio: fix use of q->head and q->tail
Their use is reversed compared to DMA. The order for DMA makes more sense, so let's use that
--- .../wireless/mediatek/mt76/mt7615/sdio_txrx.c | 6 ++-- drivers/net/wireless/mediatek/mt76/sdio.c | 30 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c +3 -3
@@ -97,7 +97,7 @@ static int mt7663s_rx_run_queue(struct mt76_dev *dev, enum mt76_rxq_id qid, }for (i =0 ; i < intr->rx.num[qid]; i++) { -int index = (q->tail + i) % q->ndesc; +int index = (q->head + i) % q->ndesc;struct mt76_queue_entry *e = &q->entry[index]; len = intr->rx.len[qid][i];
@@ -112,7 +112,7 @@ static int mt7663s_rx_run_queue(struct mt76_dev *dev, enum mt76_rxq_id qid,__free_pages (page, order);spin_lock_bh (&q->lock); - q->tail = (q->tail + i) % q->ndesc; + q->head = (q->head + i) % q->ndesc; q->queued += i;spin_unlock_bh (&q->lock);
@@ -166,7 +166,7 @@ static int mt7663s_tx_run_queue(struct mt76_dev *dev, struct mt76_queue *q)struct mt76_sdio *sdio = &dev->sdio;int nframes =0 ; -while (q->first != q->tail) { +while (q->first != q->head) {struct mt76_queue_entry *e = &q->entry[q->first];int err, len = e->skb->len;
drivers/net/wireless/mediatek/mt76/sdio.c +15 -15
@@ -98,8 +98,8 @@ mt76s_get_next_rx_entry(struct mt76_queue *q)spin_lock_bh (&q->lock);if (q->queued >0 ) { - e = &q->entry[q->head]; - q->head = (q->head +1 ) % q->ndesc; + e = &q->entry[q->tail]; + q->tail = (q->tail +1 ) % q->ndesc; q->queued--; }spin_unlock_bh (&q->lock);
@@ -142,17 +142,17 @@ static int mt76s_process_tx_queue(struct mt76_dev *dev, enum mt76_txq_id qid)bool wake;while (q->queued > n_dequeued) { -if (!q->entry[q->head].done) +if (!q->entry[q->tail].done)break ; -if (q->entry[q->head].schedule) { - q->entry[q->head].schedule = false; +if (q->entry[q->tail].schedule) { + q->entry[q->tail].schedule = false; n_sw_dequeued++; } - entry = q->entry[q->head]; - q->entry[q->head].done = false; - q->head = (q->head +1 ) % q->ndesc; + entry = q->entry[q->tail]; + q->entry[q->tail].done = false; + q->tail = (q->tail +1 ) % q->ndesc; n_dequeued++;if (qid ==MT_TXQ_MCU )
@@ -222,7 +222,7 @@ mt76s_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid, .skb = skb, };int err, len = skb->len; -u16 idx = q->tail; +u16 idx = q->head;if (q->queued == q->ndesc)return -ENOSPC ;
@@ -232,9 +232,9 @@ mt76s_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,if (err <0 )return err; - q->entry[q->tail].skb = tx_info.skb; - q->entry[q->tail].buf_sz = len; - q->tail = (q->tail +1 ) % q->ndesc; + q->entry[q->head].skb = tx_info.skb; + q->entry[q->head].buf_sz = len; + q->head = (q->head +1 ) % q->ndesc; q->queued++;return idx;
@@ -256,9 +256,9 @@ mt76s_tx_queue_skb_raw(struct mt76_dev *dev, enum mt76_txq_id qid,spin_lock_bh (&q->lock); - q->entry[q->tail].buf_sz = len; - q->entry[q->tail].skb = skb; - q->tail = (q->tail +1 ) % q->ndesc; + q->entry[q->head].buf_sz = len; + q->entry[q->head].skb = skb; + q->head = (q->head +1 ) % q->ndesc; q->queued++;spin_unlock_bh (&q->lock);
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 3/9 mt76: unify queue tx cleanup code
In reply to Felix FietkauCleanup and preparation for changing tx scheduling behavior
--- drivers/net/wireless/mediatek/mt76/dma.c | 17 +----------- drivers/net/wireless/mediatek/mt76/mt76.h | 2 ++ drivers/net/wireless/mediatek/mt76/sdio.c | 33 ++++++---------------- drivers/net/wireless/mediatek/mt76/tx.c | 22 +++++++++++++++ drivers/net/wireless/mediatek/mt76/usb.c | 34 +++++------------------ 5 files changed, 41 insertions(+), 67 deletions(-)
drivers/net/wireless/mediatek/mt76/dma.c +1 -16
@@ -165,16 +165,8 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, enum mt76_txq_id qid, bool flush) last =readl (&q->regs->dma_idx);while (q->queued >0 && q->tail != last) { -int swq_qid =-1 ; -mt76_dma_tx_cleanup_idx (dev, q, q->tail, &entry); -if (entry.schedule) - swq_qid = entry.qid; - - q->tail = (q->tail +1 ) % q->ndesc; - -if (entry.skb) - dev->drv->tx_complete_skb (dev, qid, &entry); +mt76_queue_tx_complete (dev, q, &entry);if (entry.txwi) {if (!(dev->drv->drv_flags &MT_DRV_TXWI_NO_FREE ))
@@ -185,13 +177,6 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, enum mt76_txq_id qid, bool flush)if (!flush && q->tail == last) last =readl (&q->regs->dma_idx); -spin_lock_bh (&q->lock); -if (swq_qid >=4 ) - dev->q_tx[__MT_TXQ_MAX + swq_qid -4 ].swq_queued--; -else if (swq_qid >=0 ) - dev->q_tx[swq_qid].swq_queued--; - q->queued--; -spin_unlock_bh (&q->lock); }if (flush) {
drivers/net/wireless/mediatek/mt76/mt76.h +2 -0
@@ -1017,6 +1017,8 @@ void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q, struct napi_struct *napi);void mt76_rx_aggr_reorder (struct sk_buff *skb,struct sk_buff_head *frames);void mt76_testmode_tx_pending (struct mt76_dev *dev); +void mt76_queue_tx_complete (struct mt76_dev *dev,struct mt76_queue *q, +struct mt76_queue_entry *e);/* usb */ static inline bool mt76u_urb_error (struct urb *urb)
drivers/net/wireless/mediatek/mt76/sdio.c +9 -24
@@ -133,38 +133,28 @@ mt76s_process_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)return nframes; } -static int mt76s_process_tx_queue (struct mt76_dev *dev,enum mt76_txq_id qid) +static void mt76s_process_tx_queue (struct mt76_dev *dev,enum mt76_txq_id qid) {struct mt76_sw_queue *sq = &dev->q_tx[qid]; -u32 n_dequeued =0 , n_sw_dequeued =0 ;struct mt76_queue_entry entry;struct mt76_queue *q = sq->q;bool wake; -while (q->queued > n_dequeued) { +while (q->queued >0 ) {if (!q->entry[q->tail].done)break ; -if (q->entry[q->tail].schedule) { - q->entry[q->tail].schedule = false; - n_sw_dequeued++; - } - entry = q->entry[q->tail]; q->entry[q->tail].done = false; - q->tail = (q->tail +1 ) % q->ndesc; - n_dequeued++; + q->entry[q->tail].schedule = false; -if (qid ==MT_TXQ_MCU ) +if (qid ==MT_TXQ_MCU ) {dev_kfree_skb (entry.skb); -else - dev->drv->tx_complete_skb (dev, qid, &entry); - } - -spin_lock_bh (&q->lock); + entry.skb =NULL ; + } - sq->swq_queued -= n_sw_dequeued; - q->queued -= n_dequeued; +mt76_queue_tx_complete (dev, q, &entry); + } wake = q->stopped && q->queued < q->ndesc -8 ;if (wake)
@@ -173,18 +163,13 @@ static int mt76s_process_tx_queue(struct mt76_dev *dev, enum mt76_txq_id qid)if (!q->queued)wake_up (&dev->tx_wait); -spin_unlock_bh (&q->lock); -if (qid ==MT_TXQ_MCU ) - goto out; +return ;mt76_txq_schedule (&dev->phy, qid);if (wake)ieee80211_wake_queue (dev->hw, qid); - -out: -return n_dequeued; }static void mt76s_tx_status_data (struct work_struct *work)
drivers/net/wireless/mediatek/mt76/tx.c +22 -0
@@ -696,3 +696,25 @@ int mt76_skb_adjust_pad(struct sk_buff *skb)return 0 ; }EXPORT_SYMBOL_GPL (mt76_skb_adjust_pad); + +void mt76_queue_tx_complete (struct mt76_dev *dev,struct mt76_queue *q, +struct mt76_queue_entry *e) +{ +enum mt76_txq_id qid = e->qid %4 ; +bool ext_phy = e->qid >=4 ; + +if (e->skb) + dev->drv->tx_complete_skb (dev, qid, e); + +spin_lock_bh (&q->lock); + q->tail = (q->tail +1 ) % q->ndesc; + q->queued--; + +if (ext_phy) + qid += __MT_TXQ_MAX; + +if (e->schedule) + dev->q_tx[qid].swq_queued--; +spin_unlock_bh (&q->lock); +} +EXPORT_SYMBOL_GPL (mt76_queue_tx_complete);
drivers/net/wireless/mediatek/mt76/usb.c +7 -27
@@ -802,33 +802,20 @@ static void mt76u_tx_tasklet(unsigned long data)int i;for (i =0 ; i <IEEE80211_NUM_ACS ; i++) { -u32 n_dequeued =0 , n_sw_dequeued =0 ; - sq = &dev->q_tx[i]; q = sq->q; -while (q->queued > n_dequeued) { +while (q->queued >0 ) {if (!q->entry[q->tail].done)break ; -if (q->entry[q->tail].schedule) { - q->entry[q->tail].schedule = false; - n_sw_dequeued++; - } - entry = q->entry[q->tail]; q->entry[q->tail].done = false; - q->tail = (q->tail +1 ) % q->ndesc; - n_dequeued++; + q->entry[q->tail].schedule = false; - dev->drv->tx_complete_skb (dev, i, &entry); +mt76_queue_tx_complete (dev, q, &entry); } -spin_lock_bh (&q->lock); - - sq->swq_queued -= n_sw_dequeued; - q->queued -= n_dequeued; - wake = q->stopped && q->queued < q->ndesc -8 ;if (wake) q->stopped = false;
@@ -836,8 +823,6 @@ static void mt76u_tx_tasklet(unsigned long data)if (!q->queued)wake_up (&dev->tx_wait); -spin_unlock_bh (&q->lock); -mt76_txq_schedule (&dev->phy, i); if (dev->drv->tx_status_data &&
@@ -1068,16 +1053,11 @@ void mt76u_stop_tx(struct mt76_dev *dev)if (!q)continue ; -/* Assure we are in sync with killed tasklet. */ -spin_lock_bh (&q->lock); -while (q->queued) { - entry = q->entry[q->tail]; - q->tail = (q->tail +1 ) % q->ndesc; - q->queued--; + entry = q->entry[q->tail]; + q->entry[q->tail].done = false; + q->entry[q->tail].schedule = false; - dev->drv->tx_complete_skb (dev, i, &entry); - } -spin_unlock_bh (&q->lock); +mt76_queue_tx_complete (dev, q, &entry); } }
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 4/9 mt76: remove qid argument to drv->tx_complete_skb
In reply to Felix FietkauIt is not needed
--- drivers/net/wireless/mediatek/mt76/dma.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76.h | 2 +- drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 7 ++----- drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 3 +-- drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 4 +--- drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c | 3 +-- drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c | 1 - drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 3 +-- drivers/net/wireless/mediatek/mt76/mt76x02_mac.h | 3 +-- drivers/net/wireless/mediatek/mt76/mt76x02_usb.h | 3 +-- drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c | 3 +-- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 3 +-- drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 3 +-- drivers/net/wireless/mediatek/mt76/tx.c | 2 +- 14 files changed, 14 insertions(+), 28 deletions(-)
drivers/net/wireless/mediatek/mt76/dma.c +1 -1
@@ -359,7 +359,7 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid, e.skb = tx_info.skb; e.txwi = t; - dev->drv->tx_complete_skb (dev, qid, &e); + dev->drv->tx_complete_skb (dev, &e);mt76_put_txwi (dev, t);return ret; }
drivers/net/wireless/mediatek/mt76/mt76.h +1 -1
@@ -326,7 +326,7 @@ struct mt76_driver_ops {struct ieee80211_sta *sta, struct mt76_tx_info *tx_info); -void (*tx_complete_skb)(struct mt76_dev *dev,enum mt76_txq_id qid, +void (*tx_complete_skb)(struct mt76_dev *dev,struct mt76_queue_entry *e);bool (*tx_status_data)(struct mt76_dev *dev,u8 *update);
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +2 -5
@@ -1271,8 +1271,7 @@ void mt7603_mac_add_txs(struct mt7603_dev *dev, void *data)rcu_read_unlock (); } -void mt7603_tx_complete_skb (struct mt76_dev *mdev,enum mt76_txq_id qid, -struct mt76_queue_entry *e) +void mt7603_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue_entry *e) { struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);struct sk_buff *skb = e->skb;
@@ -1282,9 +1281,7 @@ void mt7603_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,return ; } -if (qid <4 ) - dev->tx_hang_check =0 ; - + dev->tx_hang_check =0 ;mt76_tx_complete_skb (mdev, skb); }
drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h +1 -2
@@ -241,8 +241,7 @@ int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,struct ieee80211_sta *sta, struct mt76_tx_info *tx_info); -void mt7603_tx_complete_skb (struct mt76_dev *mdev,enum mt76_txq_id qid, -struct mt76_queue_entry *e); +void mt7603_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue_entry *e);void mt7603_queue_rx_skb (struct mt76_dev *mdev,enum mt76_rxq_id q,struct sk_buff *skb);
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +1 -3
@@ -618,8 +618,7 @@ int mt7615_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,struct ieee80211_sta *sta, struct mt76_tx_info *tx_info); -void mt7615_tx_complete_skb (struct mt76_dev *mdev,enum mt76_txq_id qid, -struct mt76_queue_entry *e); +void mt7615_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue_entry *e);void mt7615_queue_rx_skb (struct mt76_dev *mdev,enum mt76_rxq_id q,struct sk_buff *skb);
@@ -674,7 +673,6 @@ int mt7663_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, struct mt76_tx_info *tx_info);bool mt7663_usb_sdio_tx_status_data (struct mt76_dev *mdev,u8 *update);void mt7663_usb_sdio_tx_complete_skb (struct mt76_dev *mdev, -enum mt76_txq_id qid,struct mt76_queue_entry *e);void mt7663_usb_sdio_wtbl_work (struct work_struct *work);int mt7663_usb_sdio_register_device (struct mt7615_dev *dev);
drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c +1 -2
@@ -14,8 +14,7 @@#include "../dma.h" #include "mac.h" -void mt7615_tx_complete_skb (struct mt76_dev *mdev,enum mt76_txq_id qid, -struct mt76_queue_entry *e) +void mt7615_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue_entry *e) {if (!e->txwi) {dev_kfree_skb_any (e->skb);
drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c +0 -1
@@ -226,7 +226,6 @@ bool mt7663_usb_sdio_tx_status_data(struct mt76_dev *mdev, u8 *update)EXPORT_SYMBOL_GPL (mt7663_usb_sdio_tx_status_data);void mt7663_usb_sdio_tx_complete_skb (struct mt76_dev *mdev, -enum mt76_txq_id qid,struct mt76_queue_entry *e) {unsigned int headroom =MT_USB_TXD_SIZE ;
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +1 -2
@@ -900,8 +900,7 @@ void mt76x02_mac_poll_tx_status(struct mt76x02_dev *dev, bool irq) } } -void mt76x02_tx_complete_skb (struct mt76_dev *mdev,enum mt76_txq_id qid, -struct mt76_queue_entry *e) +void mt76x02_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue_entry *e) { struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);struct mt76x02_txwi *txwi;
drivers/net/wireless/mediatek/mt76/mt76x02_mac.h +1 -2
@@ -194,8 +194,7 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi, struct sk_buff *skb, struct mt76_wcid *wcid, struct ieee80211_sta *sta, int len);void mt76x02_mac_poll_tx_status (struct mt76x02_dev *dev,bool irq); -void mt76x02_tx_complete_skb (struct mt76_dev *mdev,enum mt76_txq_id qid, -struct mt76_queue_entry *e); +void mt76x02_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue_entry *e);void mt76x02_update_channel (struct mt76_dev *mdev);void mt76x02_mac_work (struct work_struct *work);
drivers/net/wireless/mediatek/mt76/mt76x02_usb.h +1 -2
@@ -19,8 +19,7 @@ int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data, enum mt76_txq_id qid, struct mt76_wcid *wcid, struct ieee80211_sta *sta, struct mt76_tx_info *tx_info); -void mt76x02u_tx_complete_skb (struct mt76_dev *mdev,enum mt76_txq_id qid, -struct mt76_queue_entry *e); +void mt76x02u_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue_entry *e);void mt76x02u_init_beacon_config (struct mt76x02_dev *dev);void mt76x02u_exit_beacon_config (struct mt76x02_dev *dev);#endif /* __MT76x02_USB_H */
drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c +1 -2
@@ -15,8 +15,7 @@ static void mt76x02u_remove_dma_hdr(struct sk_buff *skb)mt76x02_remove_hdr_pad (skb,2 ); } -void mt76x02u_tx_complete_skb (struct mt76_dev *mdev,enum mt76_txq_id qid, -struct mt76_queue_entry *e) +void mt76x02u_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue_entry *e) {mt76x02u_remove_dma_hdr (e->skb);mt76_tx_complete_skb (mdev, e->skb);
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +1 -2
@@ -943,8 +943,7 @@ void mt7915_mac_tx_free(struct mt7915_dev *dev, struct sk_buff *skb)tasklet_schedule (&dev->mt76.tx_tasklet); } -void mt7915_tx_complete_skb (struct mt76_dev *mdev,enum mt76_txq_id qid, -struct mt76_queue_entry *e) +void mt7915_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue_entry *e) {struct mt7915_dev *dev;
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +1 -2
@@ -454,8 +454,7 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, enum mt76_txq_id qid, struct mt76_wcid *wcid, struct ieee80211_sta *sta, struct mt76_tx_info *tx_info); -void mt7915_tx_complete_skb (struct mt76_dev *mdev,enum mt76_txq_id qid, -struct mt76_queue_entry *e); +void mt7915_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue_entry *e);void mt7915_queue_rx_skb (struct mt76_dev *mdev,enum mt76_rxq_id q,struct sk_buff *skb);void mt7915_sta_ps (struct mt76_dev *mdev,struct ieee80211_sta *sta,bool ps);
drivers/net/wireless/mediatek/mt76/tx.c +1 -1
@@ -704,7 +704,7 @@ void mt76_queue_tx_complete(struct mt76_dev *dev, struct mt76_queue *q,bool ext_phy = e->qid >=4 ;if (e->skb) - dev->drv->tx_complete_skb (dev, qid, e); + dev->drv->tx_complete_skb (dev, e);spin_lock_bh (&q->lock); q->tail = (q->tail +1 ) % q->ndesc;
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 5/9 mt76: remove swq from struct mt76_sw_queue
In reply to Felix FietkauSince txq selection was moved to mac80211, it is no longer used
--- drivers/net/wireless/mediatek/mt76/mt76.h | 1 - drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 1 - drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 2 -- drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 1 - drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 2 -- drivers/net/wireless/mediatek/mt76/sdio.c | 2 -- drivers/net/wireless/mediatek/mt76/usb.c | 2 -- 7 files changed, 11 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +0 -1
@@ -140,7 +140,6 @@ struct mt76_queue {struct mt76_sw_queue {struct mt76_queue *q; -struct list_head swq;int swq_queued; };
drivers/net/wireless/mediatek/mt76/mt7603/dma.c +0 -1
@@ -19,7 +19,6 @@ mt7603_init_tx_queue(struct mt7603_dev *dev, struct mt76_sw_queue *q,if (err <0 )return err; -INIT_LIST_HEAD (&q->swq); q->q = hwq;mt7603_irq_enable (dev,MT_INT_TX_DONE (idx));
drivers/net/wireless/mediatek/mt76/mt7615/dma.c +0 -2
@@ -26,7 +26,6 @@ mt7615_init_tx_queue(struct mt7615_dev *dev, struct mt76_sw_queue *q,if (err <0 )return err; -INIT_LIST_HEAD (&q->swq); q->q = hwq;return 0 ;
@@ -84,7 +83,6 @@ mt7615_init_tx_queues(struct mt7615_dev *dev)for (i =1 ; i <MT_TXQ_MCU ; i++) { q = &dev->mt76.q_tx[i]; -INIT_LIST_HEAD (&q->swq); q->q = dev->mt76.q_tx[0 ].q; }
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +0 -1
@@ -118,7 +118,6 @@ mt76x02_init_tx_queue(struct mt76x02_dev *dev, struct mt76_sw_queue *q,if (err <0 )return err; -INIT_LIST_HEAD (&q->swq); q->q = hwq;mt76x02_irq_enable (dev,MT_INT_TX_DONE (idx));
drivers/net/wireless/mediatek/mt76/mt7915/dma.c +0 -2
@@ -23,7 +23,6 @@ mt7915_init_tx_queues(struct mt7915_dev *dev, int n_desc)for (i =0 ; i <MT_TXQ_MCU ; i++) { q = &dev->mt76.q_tx[i]; -INIT_LIST_HEAD (&q->swq); q->q = hwq; }
@@ -45,7 +44,6 @@ mt7915_init_mcu_queue(struct mt7915_dev *dev, struct mt76_sw_queue *q,if (err <0 )return err; -INIT_LIST_HEAD (&q->swq); q->q = hwq;return 0 ;
drivers/net/wireless/mediatek/mt76/sdio.c +0 -2
@@ -42,8 +42,6 @@ static int mt76s_alloc_tx(struct mt76_dev *dev)int i;for (i =0 ; i <MT_TXQ_MCU_WA ; i++) { -INIT_LIST_HEAD (&dev->q_tx[i].swq); - q =devm_kzalloc (dev->dev,sizeof (*q),GFP_KERNEL );if (!q)return -ENOMEM ;
drivers/net/wireless/mediatek/mt76/usb.c +0 -2
@@ -972,8 +972,6 @@ static int mt76u_alloc_tx(struct mt76_dev *dev)int i, j, err;for (i =0 ; i <=MT_TXQ_PSD ; i++) { -INIT_LIST_HEAD (&dev->q_tx[i].swq); -if (i >=IEEE80211_NUM_ACS ) { dev->q_tx[i].q = dev->q_tx[0 ].q;continue ;
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 6/9 mt76: rely on AQL for burst size limits on tx queueing
In reply to Felix FietkauNow that AQL works well on all mt76 drivers, completely replace the arbitrary burst sizing and number of bursts logic for tx scheduling.
For the short period of time in which AQL does not work well yet, limit each stations to 16 in-flight packets that have no estimated tx time. This should avoid filling the queue if a station connects and queues up a large number of packets before rate control information is available, especially with hardware rate control
--- drivers/net/wireless/mediatek/mt76/debugfs.c | 9 +- drivers/net/wireless/mediatek/mt76/mt76.h | 11 +- .../net/wireless/mediatek/mt76/mt7603/mac.c | 2 +- .../net/wireless/mediatek/mt76/mt7615/mac.c | 9 +- .../wireless/mediatek/mt76/mt7615/pci_mac.c | 2 +- .../wireless/mediatek/mt76/mt7615/usb_sdio.c | 2 +- .../net/wireless/mediatek/mt76/mt76x02_mac.c | 2 +- .../wireless/mediatek/mt76/mt76x02_usb_core.c | 2 +- .../net/wireless/mediatek/mt76/mt7915/mac.c | 11 ++ drivers/net/wireless/mediatek/mt76/sdio.c | 1 - drivers/net/wireless/mediatek/mt76/tx.c | 131 ++++++++++-------- drivers/net/wireless/mediatek/mt76/usb.c | 2 - 12 files changed, 109 insertions(+), 75 deletions(-)
drivers/net/wireless/mediatek/mt76/debugfs.c +4 -5
@@ -31,15 +31,14 @@ int mt76_queues_read(struct seq_file *s, void *data)int i;for (i =0 ; i <ARRAY_SIZE (dev->q_tx); i++) { -struct mt76_sw_queue *q = &dev->q_tx[i]; +struct mt76_queue *q = dev->q_tx[i].q; -if (!q->q) +if (!q)continue ;seq_printf (s, -"%d: queued=%d head=%d tail=%d swq_queued=%d\n" , - i, q->q->queued, q->q->head, q->q->tail, - q->swq_queued); +"%d: queued=%d head=%d tail=%d\n" , + i, q->queued, q->head, q->tail); }return 0 ;
drivers/net/wireless/mediatek/mt76/mt76.h +6 -5
@@ -22,6 +22,9 @@#define MT_RX_BUF_SIZE 2048#define MT_SKB_HEAD_LEN 128 +#define MT_MAX_NON_AQL_PKT 16 +#define MT_TXQ_FREE_THR 32 +struct mt76_dev ;struct mt76_phy ;struct mt76_wcid ;
@@ -100,10 +103,9 @@ struct mt76_queue_entry {struct urb *urb;int buf_sz; }; -enum mt76_txq_id qid; +u16 wcid; bool skip_buf0:1; bool skip_buf1:1; - bool schedule:1; bool done:1; };
@@ -139,8 +141,6 @@ struct mt76_queue {struct mt76_sw_queue {struct mt76_queue *q; - -int swq_queued; };struct mt76_mcu_ops {
@@ -205,6 +205,7 @@ DECLARE_EWMA(signal, 10, 8);struct mt76_wcid {struct mt76_rx_tid __rcu *aggr[IEEE80211_NUM_TIDS ]; +atomic_t non_aql_packets;unsigned long flags;struct ewma_signal rssi;
@@ -943,7 +944,7 @@ struct sk_buff *mt76_tx_status_skb_get(struct mt76_dev *dev, struct sk_buff_head *list);void mt76_tx_status_skb_done (struct mt76_dev *dev,struct sk_buff *skb,struct sk_buff_head *list); -void mt76_tx_complete_skb (struct mt76_dev *dev,struct sk_buff *skb); +void mt76_tx_complete_skb (struct mt76_dev *dev,u16 wcid,struct sk_buff *skb);void mt76_tx_status_check (struct mt76_dev *dev,struct mt76_wcid *wcid,bool flush); int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +1 -1
@@ -1282,7 +1282,7 @@ void mt7603_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e) } dev->tx_hang_check =0 ; -mt76_tx_complete_skb (mdev, skb); +mt76_tx_complete_skb (mdev, e->wcid, skb); } static bool
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +8 -1
@@ -1400,6 +1400,9 @@ mt7615_mac_tx_free_token(struct mt7615_dev *dev, u16 token) {struct mt76_dev *mdev = &dev->mt76;struct mt76_txwi_cache *txwi; +__le32 *txwi_data; +u32 val; +u8 wcid;trace_mac_tx_free (dev, token);
@@ -1410,9 +1413,13 @@ mt7615_mac_tx_free_token(struct mt7615_dev *dev, u16 token)if (!txwi)return ; + txwi_data = (__le32 *)mt76_get_txwi_ptr (mdev, txwi); + val =le32_to_cpu (txwi_data[1 ]); + wcid =FIELD_GET (MT_TXD1_WLAN_IDX , val); +mt7615_txp_skb_unmap (mdev, txwi);if (txwi->skb) { -mt76_tx_complete_skb (mdev, txwi->skb); +mt76_tx_complete_skb (mdev, wcid, txwi->skb); txwi->skb =NULL ; }
drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c +1 -1
@@ -44,7 +44,7 @@ void mt7615_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e) }if (e->skb) -mt76_tx_complete_skb (mdev, e->skb); +mt76_tx_complete_skb (mdev, e->wcid, e->skb); } static void
drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c +1 -1
@@ -234,7 +234,7 @@ void mt7663_usb_sdio_tx_complete_skb(struct mt76_dev *mdev, headroom +=MT_USB_HDR_SIZE ;skb_pull (e->skb, headroom); -mt76_tx_complete_skb (mdev, e->skb); +mt76_tx_complete_skb (mdev, e->wcid, e->skb); }EXPORT_SYMBOL_GPL (mt7663_usb_sdio_tx_complete_skb);
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +1 -1
@@ -917,7 +917,7 @@ void mt76x02_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e) txwi = (struct mt76x02_txwi *)txwi_ptr;trace_mac_txdone (mdev, txwi->wcid, txwi->pktid); -mt76_tx_complete_skb (mdev, e->skb); +mt76_tx_complete_skb (mdev, e->wcid, e->skb); }EXPORT_SYMBOL_GPL (mt76x02_tx_complete_skb);
drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c +1 -1
@@ -18,7 +18,7 @@ static void mt76x02u_remove_dma_hdr(struct sk_buff *skb)void mt76x02u_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue_entry *e) {mt76x02u_remove_dma_hdr (e->skb); -mt76_tx_complete_skb (mdev, e->skb); +mt76_tx_complete_skb (mdev, e->wcid, e->skb); }EXPORT_SYMBOL_GPL (mt76x02u_tx_complete_skb);
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +11 -0
@@ -927,10 +927,21 @@ void mt7915_mac_tx_free(struct mt7915_dev *dev, struct sk_buff *skb)mt7915_txp_skb_unmap (mdev, txwi);if (txwi->skb) { +struct ieee80211_tx_info *info =IEEE80211_SKB_CB (txwi->skb);void *txwi_ptr =mt76_get_txwi_ptr (mdev, txwi);if (likely (txwi->skb->protocol !=cpu_to_be16 (ETH_P_PAE )))mt7915_tx_check_aggr (sta, txwi_ptr); + +if (sta && !info->tx_time_est) { +struct mt76_wcid *wcid = (struct mt76_wcid *)sta->drv_priv; +int pending; + + pending =atomic_dec_return (&wcid->non_aql_packets); +if (pending <0 ) +atomic_cmpxchg (&wcid->non_aql_packets, pending,0 ); + } +mt7915_tx_complete_status (mdev, txwi->skb, sta, stat); txwi->skb =NULL ; }
drivers/net/wireless/mediatek/mt76/sdio.c +0 -1
@@ -144,7 +144,6 @@ static void mt76s_process_tx_queue(struct mt76_dev *dev, enum mt76_txq_id qid) entry = q->entry[q->tail]; q->entry[q->tail].done = false; - q->entry[q->tail].schedule = false;if (qid ==MT_TXQ_MCU ) {dev_kfree_skb (entry.skb);
drivers/net/wireless/mediatek/mt76/tx.c +75 -56
230 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/usb.c +0 -2
@@ -811,7 +811,6 @@ static void mt76u_tx_tasklet(unsigned long data) entry = q->entry[q->tail]; q->entry[q->tail].done = false; - q->entry[q->tail].schedule = false;mt76_queue_tx_complete (dev, q, &entry); }
@@ -1053,7 +1052,6 @@ void mt76u_stop_tx(struct mt76_dev *dev) entry = q->entry[q->tail]; q->entry[q->tail].done = false; - q->entry[q->tail].schedule = false;mt76_queue_tx_complete (dev, q, &entry); }
Signature · 1 line
2.28.0
Re: [PATCH 6/9] mt76: rely on AQL for burst size limits on tx queueing
Quoted 1 line · Felix Fietkau
Now that AQL works well on all mt76 drivers,
Yay, great to hear! :)
Quoted 7 lines
completely replace the arbitrary
burst sizing and number of bursts logic for tx scheduling.
For the short period of time in which AQL does not work well yet, limit each stations to 16 in-flight packets that have no estimated tx time. This should avoid filling the queue if a station connects and queues up a large number of packets before rate control information is available, especially with hardware rate control
I guess we could do accounting like this in the AQL mechanism itself? Presumably this issue is not unique to mt76?
-Toke
Felix Fietkau
maintainerPATCH 7/9 mt76: remove struct mt76_sw_queue
In reply to Felix FietkauAll members except for the struct mt76_queue pointer have been removed
--- drivers/net/wireless/mediatek/mt76/debugfs.c | 2 +- drivers/net/wireless/mediatek/mt76/dma.c | 7 ++--- drivers/net/wireless/mediatek/mt76/mac80211.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76.h | 8 ++---- .../wireless/mediatek/mt76/mt7603/beacon.c | 8 +++--- .../net/wireless/mediatek/mt76/mt7603/dma.c | 16 +++++------ .../net/wireless/mediatek/mt76/mt7603/mac.c | 6 ++-- .../net/wireless/mediatek/mt76/mt7603/main.c | 2 +- .../wireless/mediatek/mt76/mt7615/debugfs.c | 8 +++--- .../net/wireless/mediatek/mt76/mt7615/dma.c | 27 +++++++----------- .../wireless/mediatek/mt76/mt7615/mt7615.h | 2 +- .../wireless/mediatek/mt76/mt7615/sdio_mcu.c | 2 +- .../wireless/mediatek/mt76/mt7615/sdio_txrx.c | 4 +-- .../net/wireless/mediatek/mt76/mt76x02_mmio.c | 18 ++++++------ .../wireless/mediatek/mt76/mt76x02_usb_core.c | 2 +- .../net/wireless/mediatek/mt76/mt76x02_util.c | 2 +- .../wireless/mediatek/mt76/mt7915/debugfs.c | 8 +++--- .../net/wireless/mediatek/mt76/mt7915/dma.c | 21 +++++--------- drivers/net/wireless/mediatek/mt76/sdio.c | 9 +++--- drivers/net/wireless/mediatek/mt76/testmode.c | 2 +- drivers/net/wireless/mediatek/mt76/tx.c | 28 +++++++++---------- drivers/net/wireless/mediatek/mt76/usb.c | 16 +++++------ 22 files changed, 86 insertions(+), 114 deletions(-)
drivers/net/wireless/mediatek/mt76/debugfs.c +1 -1
@@ -31,7 +31,7 @@ int mt76_queues_read(struct seq_file *s, void *data)int i;for (i =0 ; i <ARRAY_SIZE (dev->q_tx); i++) { -struct mt76_queue *q = dev->q_tx[i].q; +struct mt76_queue *q = dev->q_tx[i];if (!q)continue ;
drivers/net/wireless/mediatek/mt76/dma.c +3 -4
@@ -150,8 +150,7 @@ mt76_dma_kick_queue(struct mt76_dev *dev, struct mt76_queue *q)static void mt76_dma_tx_cleanup (struct mt76_dev *dev,enum mt76_txq_id qid,bool flush) { -struct mt76_sw_queue *sq = &dev->q_tx[qid]; -struct mt76_queue *q = sq->q; +struct mt76_queue *q = dev->q_tx[qid];struct mt76_queue_entry entry;bool wake = false;int last;
@@ -249,7 +248,7 @@ static int mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, enum mt76_txq_id qid, struct sk_buff *skb, u32 tx_info) { - struct mt76_queue *q = dev->q_tx[qid].q; + struct mt76_queue *q = dev->q_tx[qid];struct mt76_queue_buf buf;dma_addr_t addr;
@@ -281,7 +280,7 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid, struct sk_buff *skb, struct mt76_wcid *wcid, struct ieee80211_sta *sta) { - struct mt76_queue *q = dev->q_tx[qid].q; + struct mt76_queue *q = dev->q_tx[qid];struct mt76_tx_info tx_info = { .skb = skb, };
drivers/net/wireless/mediatek/mt76/mac80211.c +1 -1
@@ -543,7 +543,7 @@ bool mt76_has_tx_pending(struct mt76_phy *phy) offset = __MT_TXQ_MAX * (phy != &dev->phy);for (i =0 ; i < __MT_TXQ_MAX; i++) { - q = dev->q_tx[offset + i].q; + q = dev->q_tx[offset + i];if (q && q->queued)return true; }
drivers/net/wireless/mediatek/mt76/mt76.h +2 -6
@@ -139,10 +139,6 @@ struct mt76_queue {struct page_frag_cache rx_page; }; -struct mt76_sw_queue { -struct mt76_queue *q; -}; -struct mt76_mcu_ops {u32 headroom;u32 tailroom;
@@ -229,7 +225,7 @@ struct mt76_wcid { };struct mt76_txq { -struct mt76_sw_queue *swq; +struct mt76_queue *q;struct mt76_wcid *wcid;struct sk_buff_head retry_q;
@@ -604,7 +600,7 @@ struct mt76_dev {struct sk_buff_head rx_skb[__MT_RXQ_MAX];struct list_head txwi_cache; -struct mt76_sw_queue q_tx[2 * __MT_TXQ_MAX]; +struct mt76_queue *q_tx[2 * __MT_TXQ_MAX];struct mt76_queue q_rx[__MT_RXQ_MAX];const struct mt76_queue_ops *queue_ops;int tx_dma_idx[4 ];
drivers/net/wireless/mediatek/mt76/mt7603/beacon.c +4 -4
@@ -29,7 +29,7 @@ mt7603_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)mt76_wr (dev,MT_DMA_FQCR0 ,MT_DMA_FQCR0_BUSY |FIELD_PREP (MT_DMA_FQCR0_TARGET_WCID , mvif->sta.wcid.idx) |FIELD_PREP (MT_DMA_FQCR0_TARGET_QID , - dev->mt76.q_tx[MT_TXQ_CAB ].q->hw_idx) | + dev->mt76.q_tx[MT_TXQ_CAB ]->hw_idx) |FIELD_PREP (MT_DMA_FQCR0_DEST_PORT_ID ,3 ) |FIELD_PREP (MT_DMA_FQCR0_DEST_QUEUE_ID ,8 ));
@@ -78,7 +78,7 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg) data.dev = dev;__skb_queue_head_init (&data.q); - q = dev->mt76.q_tx[MT_TXQ_BEACON ].q; + q = dev->mt76.q_tx[MT_TXQ_BEACON ];spin_lock_bh (&q->lock); ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev), IEEE80211_IFACE_ITER_RESUME_ALL,
@@ -95,7 +95,7 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg)if (dev->mt76.csa_complete) goto out; - q = dev->mt76.q_tx[MT_TXQ_CAB ].q; + q = dev->mt76.q_tx[MT_TXQ_CAB ]; do { nframes = skb_queue_len(&data.q); ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),
@@ -136,7 +136,7 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg) out:mt76_queue_tx_cleanup (dev,MT_TXQ_BEACON , false); -if (dev->mt76.q_tx[MT_TXQ_BEACON ].q->queued > +if (dev->mt76.q_tx[MT_TXQ_BEACON ]->queued >hweight8 (dev->mt76.beacon_mask)) dev->beacon_check++; }
drivers/net/wireless/mediatek/mt76/mt7603/dma.c +7 -9
@@ -5,8 +5,7 @@#include "../dma.h" static int -mt7603_init_tx_queue (struct mt7603_dev *dev,struct mt76_sw_queue *q, -int idx,int n_desc) +mt7603_init_tx_queue (struct mt7603_dev *dev,int qid,int idx,int n_desc) {struct mt76_queue *hwq;int err;
@@ -19,7 +18,7 @@ mt7603_init_tx_queue(struct mt7603_dev *dev, struct mt76_sw_queue *q,if (err <0 )return err; - q->q = hwq; + dev->mt76.q_tx[qid] = hwq;mt7603_irq_enable (dev,MT_INT_TX_DONE (idx));
@@ -192,29 +191,28 @@ int mt7603_dma_init(struct mt7603_dev *dev)mt7603_pse_client_reset (dev);for (i =0 ; i <ARRAY_SIZE (wmm_queue_map); i++) { - ret =mt7603_init_tx_queue (dev, &dev->mt76.q_tx[i], - wmm_queue_map[i], + ret =mt7603_init_tx_queue (dev, i, wmm_queue_map[i],MT_TX_RING_SIZE );if (ret)return ret; } - ret =mt7603_init_tx_queue (dev, &dev->mt76.q_tx[MT_TXQ_PSD ], + ret =mt7603_init_tx_queue (dev,MT_TXQ_PSD ,MT_TX_HW_QUEUE_MGMT ,MT_TX_RING_SIZE );if (ret)return ret; - ret =mt7603_init_tx_queue (dev, &dev->mt76.q_tx[MT_TXQ_MCU ], + ret =mt7603_init_tx_queue (dev,MT_TXQ_MCU ,MT_TX_HW_QUEUE_MCU ,MT_MCU_RING_SIZE );if (ret)return ret; - ret =mt7603_init_tx_queue (dev, &dev->mt76.q_tx[MT_TXQ_BEACON ], + ret =mt7603_init_tx_queue (dev,MT_TXQ_BEACON ,MT_TX_HW_QUEUE_BCN ,MT_MCU_RING_SIZE );if (ret)return ret; - ret =mt7603_init_tx_queue (dev, &dev->mt76.q_tx[MT_TXQ_CAB ], + ret =mt7603_init_tx_queue (dev,MT_TXQ_CAB ,MT_TX_HW_QUEUE_BMC ,MT_MCU_RING_SIZE );if (ret)return ret;
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +3 -3
@@ -445,7 +445,7 @@ void mt7603_mac_sta_poll(struct mt7603_dev *dev) sta = container_of((void *)msta, struct ieee80211_sta, drv_priv);for (i =0 ; i <4 ; i++) { -struct mt76_queue *q = dev->mt76.q_tx[i].q; +struct mt76_queue *q = dev->mt76.q_tx[i];u8 qidx = q->hw_idx;u8 tid = ac_to_tid[i];u32 txtime = airtime[qidx];
@@ -896,7 +896,7 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi,struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;struct ieee80211_bar *bar = (struct ieee80211_bar *)skb->data;struct ieee80211_vif *vif = info->control.vif; -struct mt76_queue *q = dev->mt76.q_tx[qid].q; +struct mt76_queue *q = dev->mt76.q_tx[qid];struct mt7603_vif *mvif;int wlan_idx;int hdr_len =ieee80211_get_hdrlen_from_skb (skb);
@@ -1514,7 +1514,7 @@ static bool mt7603_tx_hang(struct mt7603_dev *dev)int i;for (i =0 ; i <4 ; i++) { - q = dev->mt76.q_tx[i].q; + q = dev->mt76.q_tx[i];if (!q->queued)continue ;
drivers/net/wireless/mediatek/mt76/mt7603/main.c +1 -1
@@ -514,7 +514,7 @@ mt7603_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,u16 cw_max = (1 <<10 ) -1 ;u32 val; - queue = dev->mt76.q_tx[queue].q->hw_idx; + queue = dev->mt76.q_tx[queue]->hw_idx;if (params->cw_min) cw_min = params->cw_min;
drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c +4 -4
@@ -339,15 +339,15 @@ mt7615_queues_read(struct seq_file *s, void *data)int i;for (i =0 ; i <ARRAY_SIZE (queue_map); i++) { -struct mt76_sw_queue *q = &dev->mt76.q_tx[queue_map[i].id]; +struct mt76_queue *q = dev->mt76.q_tx[queue_map[i].id]; -if (!q->q) +if (!q)continue ;seq_printf (s,"%s: queued=%d head=%d tail=%d\n" , - queue_map[i].queue, q->q->queued, q->q->head, - q->q->tail); + queue_map[i].queue, q->queued, q->head, + q->tail); }return 0 ;
drivers/net/wireless/mediatek/mt76/mt7615/dma.c +10 -17
@@ -12,8 +12,7 @@#include "mac.h" static int -mt7615_init_tx_queue (struct mt7615_dev *dev,struct mt76_sw_queue *q, -int idx,int n_desc) +mt7615_init_tx_queue (struct mt7615_dev *dev,int qid,int idx,int n_desc) {struct mt76_queue *hwq;int err;
@@ -26,7 +25,7 @@ mt7615_init_tx_queue(struct mt7615_dev *dev, struct mt76_sw_queue *q,if (err <0 )return err; - q->q = hwq; + dev->mt76.q_tx[qid] = hwq;return 0 ; }
@@ -44,19 +43,18 @@ mt7622_init_tx_queues_multi(struct mt7615_dev *dev)int i;for (i =0 ; i <ARRAY_SIZE (wmm_queue_map); i++) { - ret =mt7615_init_tx_queue (dev, &dev->mt76.q_tx[i], - wmm_queue_map[i], + ret =mt7615_init_tx_queue (dev, i, wmm_queue_map[i],MT7615_TX_RING_SIZE /2 );if (ret)return ret; } - ret =mt7615_init_tx_queue (dev, &dev->mt76.q_tx[MT_TXQ_PSD ], + ret =mt7615_init_tx_queue (dev,MT_TXQ_PSD ,MT7622_TXQ_MGMT ,MT7615_TX_MGMT_RING_SIZE );if (ret)return ret; - ret =mt7615_init_tx_queue (dev, &dev->mt76.q_tx[MT_TXQ_MCU ], + ret =mt7615_init_tx_queue (dev,MT_TXQ_MCU ,MT7622_TXQ_MCU ,MT7615_TX_MCU_RING_SIZE );return ret; }
@@ -64,10 +62,9 @@ mt7622_init_tx_queues_multi(struct mt7615_dev *dev)static int mt7615_init_tx_queues (struct mt7615_dev *dev) { -struct mt76_sw_queue *q;int ret, i; - ret =mt7615_init_tx_queue (dev, &dev->mt76.q_tx[MT_TXQ_FWDL ], + ret =mt7615_init_tx_queue (dev,MT_TXQ_FWDL ,MT7615_TXQ_FWDL ,MT7615_TX_FWDL_RING_SIZE );if (ret)
@@ -76,18 +73,14 @@ mt7615_init_tx_queues(struct mt7615_dev *dev)if (!is_mt7615 (&dev->mt76))return mt7622_init_tx_queues_multi (dev); - ret =mt7615_init_tx_queue (dev, &dev->mt76.q_tx[0 ],0 , -MT7615_TX_RING_SIZE ); + ret =mt7615_init_tx_queue (dev,0 ,0 ,MT7615_TX_RING_SIZE );if (ret)return ret; -for (i =1 ; i <MT_TXQ_MCU ; i++) { - q = &dev->mt76.q_tx[i]; - q->q = dev->mt76.q_tx[0 ].q; - } +for (i =1 ; i <MT_TXQ_MCU ; i++) + dev->mt76.q_tx[i] = dev->mt76.q_tx[0 ]; - ret =mt7615_init_tx_queue (dev, &dev->mt76.q_tx[MT_TXQ_MCU ], -MT7615_TXQ_MCU , + ret =mt7615_init_tx_queue (dev,MT_TXQ_MCU ,MT7615_TXQ_MCU ,MT7615_TX_MCU_RING_SIZE );return 0 ; }
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +1 -1
@@ -542,7 +542,7 @@ static inline u8 mt7615_lmac_mapping(struct mt7615_dev *dev, u8 ac)static inline u32 mt7615_tx_mcu_int_mask (struct mt7615_dev *dev) { -return MT_INT_TX_DONE (dev->mt76.q_tx[MT_TXQ_MCU ].q->hw_idx); +return MT_INT_TX_DONE (dev->mt76.q_tx[MT_TXQ_MCU ]->hw_idx); }void mt7615_dma_reset (struct mt7615_dev *dev);
drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c +1 -1
@@ -53,7 +53,7 @@ mt7663s_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,if (ret) goto out; -mt76_queue_kick (dev, mdev->q_tx[MT_TXQ_MCU ].q); +mt76_queue_kick (dev, mdev->q_tx[MT_TXQ_MCU ]);if (wait_resp) ret =mt7615_mcu_wait_response (dev, cmd, seq);
drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c +2 -2
@@ -162,7 +162,7 @@ static int mt7663s_tx_update_sched(struct mt76_dev *dev,static int mt7663s_tx_run_queue (struct mt76_dev *dev,struct mt76_queue *q) { -bool mcu = q == dev->q_tx[MT_TXQ_MCU ].q; +bool mcu = q == dev->q_tx[MT_TXQ_MCU ];struct mt76_sdio *sdio = &dev->sdio;int nframes =0 ;
@@ -204,7 +204,7 @@ void mt7663s_tx_work(struct work_struct *work)for (i =0 ; i <MT_TXQ_MCU_WA ; i++) {int ret; - ret =mt7663s_tx_run_queue (dev, dev->q_tx[i].q); + ret =mt7663s_tx_run_queue (dev, dev->q_tx[i]);if (ret <0 )break ;
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +8 -10
@@ -14,7 +14,7 @@static void mt76x02_pre_tbtt_tasklet (unsigned long arg) {struct mt76x02_dev *dev = (struct mt76x02_dev *)arg; -struct mt76_queue *q = dev->mt76.q_tx[MT_TXQ_PSD ].q; +struct mt76_queue *q = dev->mt76.q_tx[MT_TXQ_PSD ];struct beacon_bc_data data = {};struct sk_buff *skb;int i;
@@ -104,8 +104,7 @@ void mt76x02e_init_beacon_config(struct mt76x02_dev *dev)EXPORT_SYMBOL_GPL (mt76x02e_init_beacon_config);static int -mt76x02_init_tx_queue (struct mt76x02_dev *dev,struct mt76_sw_queue *q, -int idx,int n_desc) +mt76x02_init_tx_queue (struct mt76x02_dev *dev,int qid,int idx,int n_desc) {struct mt76_queue *hwq;int err;
@@ -118,7 +117,7 @@ mt76x02_init_tx_queue(struct mt76x02_dev *dev, struct mt76_sw_queue *q,if (err <0 )return err; - q->q = hwq; + dev->mt76.q_tx[qid] = hwq;mt76x02_irq_enable (dev,MT_INT_TX_DONE (idx));
@@ -209,19 +208,18 @@ int mt76x02_dma_init(struct mt76x02_dev *dev)mt76_wr (dev,MT_WPDMA_RST_IDX , ~0 );for (i =0 ; i <IEEE80211_NUM_ACS ; i++) { - ret =mt76x02_init_tx_queue (dev, &dev->mt76.q_tx[i], -mt76_ac_to_hwq (i), + ret =mt76x02_init_tx_queue (dev, i,mt76_ac_to_hwq (i),MT_TX_RING_SIZE );if (ret)return ret; } - ret =mt76x02_init_tx_queue (dev, &dev->mt76.q_tx[MT_TXQ_PSD ], + ret =mt76x02_init_tx_queue (dev,MT_TXQ_PSD ,MT_TX_HW_QUEUE_MGMT ,MT_TX_RING_SIZE );if (ret)return ret; - ret =mt76x02_init_tx_queue (dev, &dev->mt76.q_tx[MT_TXQ_MCU ], + ret =mt76x02_init_tx_queue (dev,MT_TXQ_MCU ,MT_TX_HW_QUEUE_MCU ,MT_MCU_RING_SIZE );if (ret)return ret;
@@ -293,7 +291,7 @@ irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance)if (dev->mt76.csa_complete)mt76_csa_finish (&dev->mt76);else -mt76_queue_kick (dev, dev->mt76.q_tx[MT_TXQ_PSD ].q); +mt76_queue_kick (dev, dev->mt76.q_tx[MT_TXQ_PSD ]); }if (intr &MT_INT_TX_STAT )
@@ -365,7 +363,7 @@ static bool mt76x02_tx_hang(struct mt76x02_dev *dev)int i;for (i =0 ; i <4 ; i++) { - q = dev->mt76.q_tx[i].q; + q = dev->mt76.q_tx[i];if (!q->queued)continue ;
drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c +1 -1
@@ -66,7 +66,7 @@ int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data, struct mt76_tx_info *tx_info) { struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76); -int pid, len = tx_info->skb->len, ep =q2ep (mdev->q_tx[qid].q->hw_idx); +int pid, len = tx_info->skb->len, ep =q2ep (mdev->q_tx[qid]->hw_idx);struct mt76x02_txwi *txwi;bool ampdu =IEEE80211_SKB_CB (tx_info->skb)->flags &IEEE80211_TX_CTL_AMPDU ;enum mt76_qsel qsel;
drivers/net/wireless/mediatek/mt76/mt76x02_util.c +1 -1
@@ -490,7 +490,7 @@ int mt76x02_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,u8 cw_min =5 , cw_max =10 , qid;u32 val; - qid = dev->mt76.q_tx[queue].q->hw_idx; + qid = dev->mt76.q_tx[queue]->hw_idx;if (params->cw_min) cw_min =fls (params->cw_min);
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c +4 -4
@@ -292,15 +292,15 @@ mt7915_queues_read(struct seq_file *s, void *data)int i;for (i =0 ; i <ARRAY_SIZE (queue_map); i++) { -struct mt76_sw_queue *q = &dev->mt76.q_tx[queue_map[i].id]; +struct mt76_queue *q = dev->mt76.q_tx[queue_map[i].id]; -if (!q->q) +if (!q)continue ;seq_printf (s,"%s: queued=%d head=%d tail=%d\n" , - queue_map[i].queue, q->q->queued, q->q->head, - q->q->tail); + queue_map[i].queue, q->queued, q->head, + q->tail); }return 0 ;
drivers/net/wireless/mediatek/mt76/mt7915/dma.c +7 -14
@@ -8,7 +8,6 @@static int mt7915_init_tx_queues (struct mt7915_dev *dev,int n_desc) { -struct mt76_sw_queue *q;struct mt76_queue *hwq;int err, i;
@@ -21,17 +20,14 @@ mt7915_init_tx_queues(struct mt7915_dev *dev, int n_desc)if (err <0 )return err; -for (i =0 ; i <MT_TXQ_MCU ; i++) { - q = &dev->mt76.q_tx[i]; - q->q = hwq; - } +for (i =0 ; i <MT_TXQ_MCU ; i++) + dev->mt76.q_tx[i] = hwq;return 0 ; }static int -mt7915_init_mcu_queue (struct mt7915_dev *dev,struct mt76_sw_queue *q, -int idx,int n_desc) +mt7915_init_mcu_queue (struct mt7915_dev *dev,int qid,int idx,int n_desc) {struct mt76_queue *hwq;int err;
@@ -44,7 +40,7 @@ mt7915_init_mcu_queue(struct mt7915_dev *dev, struct mt76_sw_queue *q,if (err <0 )return err; - q->q = hwq; + dev->mt76.q_tx[qid] = hwq;return 0 ; }
@@ -266,22 +262,19 @@ int mt7915_dma_init(struct mt7915_dev *dev)return ret;/* command to WM */ - ret =mt7915_init_mcu_queue (dev, &dev->mt76.q_tx[MT_TXQ_MCU ], -MT7915_TXQ_MCU_WM , + ret =mt7915_init_mcu_queue (dev,MT_TXQ_MCU ,MT7915_TXQ_MCU_WM ,MT7915_TX_MCU_RING_SIZE );if (ret)return ret;/* command to WA */ - ret =mt7915_init_mcu_queue (dev, &dev->mt76.q_tx[MT_TXQ_MCU_WA ], -MT7915_TXQ_MCU_WA , + ret =mt7915_init_mcu_queue (dev,MT_TXQ_MCU_WA ,MT7915_TXQ_MCU_WA ,MT7915_TX_MCU_RING_SIZE );if (ret)return ret;/* firmware download */ - ret =mt7915_init_mcu_queue (dev, &dev->mt76.q_tx[MT_TXQ_FWDL ], -MT7915_TXQ_FWDL , + ret =mt7915_init_mcu_queue (dev,MT_TXQ_FWDL ,MT7915_TXQ_FWDL ,MT7915_TX_FWDL_RING_SIZE );if (ret)return ret;
drivers/net/wireless/mediatek/mt76/sdio.c +4 -5
@@ -48,7 +48,7 @@ static int mt76s_alloc_tx(struct mt76_dev *dev)spin_lock_init (&q->lock); q->hw_idx = i; - dev->q_tx[i].q = q; + dev->q_tx[i] = q; q->entry = devm_kcalloc(dev->dev, MT_NUM_TX_ENTRIES, sizeof(*q->entry),
@@ -133,9 +133,8 @@ mt76s_process_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)static void mt76s_process_tx_queue (struct mt76_dev *dev,enum mt76_txq_id qid) { -struct mt76_sw_queue *sq = &dev->q_tx[qid]; +struct mt76_queue *q = dev->q_tx[qid];struct mt76_queue_entry entry; -struct mt76_queue *q = sq->q;bool wake;while (q->queued >0 ) {
@@ -199,7 +198,7 @@ mt76s_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid, struct sk_buff *skb, struct mt76_wcid *wcid, struct ieee80211_sta *sta) { - struct mt76_queue *q = dev->q_tx[qid].q; + struct mt76_queue *q = dev->q_tx[qid];struct mt76_tx_info tx_info = { .skb = skb, };
@@ -226,7 +225,7 @@ static int mt76s_tx_queue_skb_raw(struct mt76_dev *dev, enum mt76_txq_id qid, struct sk_buff *skb, u32 tx_info) { - struct mt76_queue *q = dev->q_tx[qid].q; + struct mt76_queue *q = dev->q_tx[qid];int ret = -ENOSPC , len = skb->len;if (q->queued == q->ndesc)
drivers/net/wireless/mediatek/mt76/testmode.c +1 -1
@@ -29,7 +29,7 @@ void mt76_testmode_tx_pending(struct mt76_dev *dev)return ; qid =skb_get_queue_mapping (skb); - q = dev->q_tx[qid].q; + q = dev->q_tx[qid];spin_lock_bh (&q->lock);
drivers/net/wireless/mediatek/mt76/tx.c +13 -15
@@ -310,7 +310,7 @@ __mt76_tx_queue_skb(struct mt76_dev *dev, int qid, struct sk_buff *skb,return idx; wcid = (struct mt76_wcid *)sta->drv_priv; - q = dev->q_tx[qid].q; + q = dev->q_tx[qid]; q->entry[idx].wcid = wcid->idx; pending =atomic_inc_return (&wcid->non_aql_packets);if (stop && pending >=MT_MAX_NON_AQL_PKT )
@@ -354,7 +354,7 @@ mt76_tx(struct mt76_phy *phy, struct ieee80211_sta *sta,if (ext_phy) info->hw_queue |=MT_TX_HW_QUEUE_EXT_PHY ; - q = dev->q_tx[qid].q; + q = dev->q_tx[qid];spin_lock_bh (&q->lock);__mt76_tx_queue_skb (dev, qid, skb, wcid, sta,NULL );
@@ -423,7 +423,7 @@ mt76_release_buffered_frames(struct ieee80211_hw *hw, struct ieee80211_sta *sta,struct mt76_phy *phy = hw->priv;struct mt76_dev *dev = phy->dev;struct sk_buff *last_skb =NULL ; -struct mt76_queue *hwq = dev->q_tx[MT_TXQ_PSD ].q; +struct mt76_queue *hwq = dev->q_tx[MT_TXQ_PSD ];int i;spin_lock_bh (&hwq->lock);
@@ -460,14 +460,13 @@ mt76_release_buffered_frames(struct ieee80211_hw *hw, struct ieee80211_sta *sta,EXPORT_SYMBOL_GPL (mt76_release_buffered_frames);static int -mt76_txq_send_burst (struct mt76_phy *phy,struct mt76_sw_queue *sq, +mt76_txq_send_burst (struct mt76_phy *phy,struct mt76_queue *q,struct mt76_txq *mtxq) {struct mt76_dev *dev = phy->dev;struct ieee80211_txq *txq =mtxq_to_txq (mtxq);enum mt76_txq_id qid =mt76_txq_get_qid (txq);struct mt76_wcid *wcid = mtxq->wcid; -struct mt76_queue *hwq = sq->q;struct ieee80211_tx_info *info;struct sk_buff *skb;int n_frames =1 ;
@@ -517,7 +516,7 @@ mt76_txq_send_burst(struct mt76_phy *phy, struct mt76_sw_queue *sq, n_frames++; }while (1 ); - dev->queue_ops->kick (dev, hwq); + dev->queue_ops->kick (dev, q);return n_frames; }
@@ -526,14 +525,13 @@ static int mt76_txq_schedule_list(struct mt76_phy *phy, enum mt76_txq_id qid) {struct mt76_dev *dev = phy->dev; -struct mt76_sw_queue *sq = &dev->q_tx[qid]; -struct mt76_queue *hwq = sq->q; +struct mt76_queue *q = dev->q_tx[qid];struct ieee80211_txq *txq;struct mt76_txq *mtxq;struct mt76_wcid *wcid;int ret =0 ; -spin_lock_bh (&hwq->lock); +spin_lock_bh (&q->lock);while (1 ) {if (test_bit (MT76_STATE_PM , &phy->state) ||test_bit (MT76_RESET , &phy->state)) {
@@ -561,16 +559,16 @@ mt76_txq_schedule_list(struct mt76_phy *phy, enum mt76_txq_id qid)u8 tid = txq->tid; mtxq->send_bar = false; -spin_unlock_bh (&hwq->lock); +spin_unlock_bh (&q->lock);ieee80211_send_bar (vif, sta->addr, tid, agg_ssn); -spin_lock_bh (&hwq->lock); +spin_lock_bh (&q->lock); } - ret +=mt76_txq_send_burst (phy, sq, mtxq); + ret +=mt76_txq_send_burst (phy, q, mtxq);ieee80211_return_txq (phy->hw, txq, !skb_queue_empty (&mtxq->retry_q)); } -spin_unlock_bh (&hwq->lock); +spin_unlock_bh (&q->lock);return ret; }
@@ -631,7 +629,7 @@ void mt76_stop_tx_queues(struct mt76_dev *dev, struct ieee80211_sta *sta,continue ; mtxq = (struct mt76_txq *)txq->drv_priv; - hwq = mtxq->swq->q; + hwq = mtxq->q;spin_lock_bh (&hwq->lock); mtxq->send_bar = mtxq->aggr && send_bar;
@@ -676,7 +674,7 @@ void mt76_txq_init(struct mt76_dev *dev, struct ieee80211_txq *txq)skb_queue_head_init (&mtxq->retry_q); - mtxq->swq = &dev->q_tx[mt76_txq_get_qid (txq)]; + mtxq->q = dev->q_tx[mt76_txq_get_qid (txq)]; }EXPORT_SYMBOL_GPL (mt76_txq_init);
drivers/net/wireless/mediatek/mt76/usb.c +7 -9
@@ -796,14 +796,12 @@ static void mt76u_tx_tasklet(unsigned long data) {struct mt76_dev *dev = (struct mt76_dev *)data;struct mt76_queue_entry entry; -struct mt76_sw_queue *sq;struct mt76_queue *q;bool wake;int i;for (i =0 ; i <IEEE80211_NUM_ACS ; i++) { - sq = &dev->q_tx[i]; - q = sq->q; + q = dev->q_tx[i];while (q->queued >0 ) {if (!q->entry[q->tail].done)
@@ -893,7 +891,7 @@ mt76u_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid, struct sk_buff *skb, struct mt76_wcid *wcid, struct ieee80211_sta *sta) { - struct mt76_queue *q = dev->q_tx[qid].q; + struct mt76_queue *q = dev->q_tx[qid];struct mt76_tx_info tx_info = { .skb = skb, };
@@ -972,7 +970,7 @@ static int mt76u_alloc_tx(struct mt76_dev *dev)for (i =0 ; i <=MT_TXQ_PSD ; i++) {if (i >=IEEE80211_NUM_ACS ) { - dev->q_tx[i].q = dev->q_tx[0 ].q; + dev->q_tx[i] = dev->q_tx[0 ];continue ; }
@@ -982,7 +980,7 @@ static int mt76u_alloc_tx(struct mt76_dev *dev)spin_lock_init (&q->lock); q->hw_idx =mt76u_ac_to_hwq (dev, i); - dev->q_tx[i].q = q; + dev->q_tx[i] = q; q->entry = devm_kcalloc(dev->dev, MT_NUM_TX_ENTRIES, sizeof(*q->entry),
@@ -1009,7 +1007,7 @@ static void mt76u_free_tx(struct mt76_dev *dev)struct mt76_queue *q;int j; - q = dev->q_tx[i].q; + q = dev->q_tx[i];if (!q)continue ;
@@ -1032,7 +1030,7 @@ void mt76u_stop_tx(struct mt76_dev *dev)dev_err (dev->dev,"timed out waiting for pending tx\n" );for (i =0 ; i <IEEE80211_NUM_ACS ; i++) { - q = dev->q_tx[i].q; + q = dev->q_tx[i];if (!q)continue ;
@@ -1046,7 +1044,7 @@ void mt76u_stop_tx(struct mt76_dev *dev)* will fail to submit urb, cleanup those skb's manually. */ for (i =0 ; i <IEEE80211_NUM_ACS ; i++) { - q = dev->q_tx[i].q; + q = dev->q_tx[i];if (!q)continue ;
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 8/9 mt76: mt7603: tune tx ring size
In reply to Felix FietkauStop relying on global tx ring size, reduce size for PS/mgmt queue
--- drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7603/dma.c +2 -2
@@ -192,13 +192,13 @@ int mt7603_dma_init(struct mt7603_dev *dev)for (i =0 ; i <ARRAY_SIZE (wmm_queue_map); i++) { ret =mt7603_init_tx_queue (dev, i, wmm_queue_map[i], -MT_TX_RING_SIZE ); +MT7603_TX_RING_SIZE );if (ret)return ret; } ret =mt7603_init_tx_queue (dev,MT_TXQ_PSD , -MT_TX_HW_QUEUE_MGMT ,MT_TX_RING_SIZE ); +MT_TX_HW_QUEUE_MGMT ,MT7603_PSD_RING_SIZE );if (ret)return ret;
drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h +2 -0
@@ -17,6 +17,8 @@#define MT7603_MCU_RX_RING_SIZE 64#define MT7603_RX_RING_SIZE 128 +#define MT7603_TX_RING_SIZE 256 +#define MT7603_PSD_RING_SIZE 128#define MT7603_FIRMWARE_E1 "mt7603_e1.bin"#define MT7603_FIRMWARE_E2 "mt7603_e2.bin"
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 9/9 mt76: mt76x02: tune tx ring size
In reply to Felix FietkauIncrease data queue size to improve performance.
Reduce PS/mgmt queue size
--- drivers/net/wireless/mediatek/mt76/mt76.h | 1 - drivers/net/wireless/mediatek/mt76/mt76x02.h | 2 ++ drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +0 -1
@@ -17,7 +17,6 @@#include "util.h" #include "testmode.h" -#define MT_TX_RING_SIZE 256#define MT_MCU_RING_SIZE 32#define MT_RX_BUF_SIZE 2048#define MT_SKB_HEAD_LEN 128
drivers/net/wireless/mediatek/mt76/mt76x02.h +2 -0
@@ -15,6 +15,8 @@#include "mt76x02_dfs.h" #include "mt76x02_dma.h" +#define MT76x02_TX_RING_SIZE 512 +#define MT76x02_PSD_RING_SIZE 128#define MT76x02_N_WCIDS 128#define MT_CALIBRATE_INTERVAL HZ#define MT_MAC_WORK_INTERVAL (HZ / 10)
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +2 -2
@@ -209,13 +209,13 @@ int mt76x02_dma_init(struct mt76x02_dev *dev)for (i =0 ; i <IEEE80211_NUM_ACS ; i++) { ret =mt76x02_init_tx_queue (dev, i,mt76_ac_to_hwq (i), -MT_TX_RING_SIZE ); + MT76x02_TX_RING_SIZE);if (ret)return ret; } ret =mt76x02_init_tx_queue (dev,MT_TXQ_PSD , -MT_TX_HW_QUEUE_MGMT ,MT_TX_RING_SIZE ); +MT_TX_HW_QUEUE_MGMT , MT76x02_PSD_RING_SIZE);if (ret)return ret;
Signature · 1 line
2.28.0