From: Herman Semenoff Date: Tue, 17 Nov 2026 16:30:00 +0300 Subject: [PATCH wireless-next] wifi: mt7601u: optimize throughput and reduce latency Optimize connection throughput and ping latency on MT7601U adapters: 1. Enable TXOP Burst for Best Effort (AC_BE) traffic: mt7601u_conf_tx() mapped queues with hw_q = q2hwq(queue) and only assigned TXOP 0x60 (~3ms) if !hw_q. Because hw_q 0 corresponds to Background (AC_BK), Best Effort traffic (AC_BE) was left with txop = 0. This forced contention and backoff after every single frame. Grant txop 0x60 for AC_BE when txop is not explicitly set, and program it into both MT_EDCA_CFG_AC and MT_WMM_TXOP. 2. Avoid periodic USB register sweeps during normal operation: mt7601u_mac_work() read 24 registers over the USB control pipe every 10 seconds solely to populate debugfs counters. Each synchronous USB read loop took ~5-10ms holding vendor_req_mutex, causing recurrent latency spikes and packet loss (ping jitter up to 100+ ms). Separate mt7601u_mac_read_stats() and invoke it on-demand from debugfs show, leaving mac_work to perform only lightweight hardware error checks. 3. Eliminate artificial delay in TX status processing: In mt7601u_tx_tasklet() and mt7601u_tx_stat(), stat_work was queued with 10-20ms delay. Under moderate TX load, the 16-entry hardware TX status FIFO overflowed, dropping frame status and causing minstrel_ht to erroneously throttle transmit rates to MCS0. Reschedule stat_work with zero delay when status entries are pending or cleaned. 4. Optimize A-MPDU density and USB RX aggregation timeout: Set ampdu_density to IEEE80211_HT_MPDU_DENSITY_NONE to eliminate the 2us inter-frame padding between aggregated MPDUs. Lower MT_USB_AGGR_TIMEOUT from 0x80 (~4.2us) to 0x40 (~2.1us) to deliver incoming bulk packets to the kernel networking stack faster. 5. Rate-limit TSSI saturation error prints: Use dev_err_ratelimited() in mt7601u_tssi_cal() to avoid console flooding and latency hit during calibration. Benchmarks measured with iperf3 connected to an 802.11n OpenWrt AP: - TX Rate (Minstrel HT): Before: 7.2 MBit/s (MCS 0) After: 43.3 MBit/s (MCS 4 Short GI) - UDP Throughput & Jitter (iperf3 -u -b 30M): Before: 15.3 Mbits/s, Jitter 0.893 ms, 10-15% packet loss After: 28.5 Mbits/s, Jitter 0.125 ms, 0.0% packet loss - TCP Throughput (iperf3): Before: 14.6 Mbits/s After: 16.5 Mbits/s (peaks up to 18.9 Mbits/s) - Ping Latency (100 packets to AP): Before: min/avg/max = 0.736 / 5.184 / 103.984 ms, 3.3-10% loss After: min/avg/max = 0.690 / 1.861 / 10.598 ms, 0.0% loss Signed-off-by: Herman Semenoff Signed-off-by: Herman Semenoff --- drivers/net/wireless/mediatek/mt7601u/debugfs.c | 2 ++ drivers/net/wireless/mediatek/mt7601u/dma.c | 3 +-- drivers/net/wireless/mediatek/mt7601u/init.c | 2 +- drivers/net/wireless/mediatek/mt7601u/mac.c | 10 ++++++++-- drivers/net/wireless/mediatek/mt7601u/mt7601u.h | 4 ++-- drivers/net/wireless/mediatek/mt7601u/phy.c | 4 ++-- drivers/net/wireless/mediatek/mt7601u/tx.c | 17 ++++++----------- 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt7601u/debugfs.c b/drivers/net/wireless/mediatek/mt7601u/debugfs.c index dbddf256921b..ccf23df77ea5 100644 --- a/drivers/net/wireless/mediatek/mt7601u/debugfs.c +++ b/drivers/net/wireless/mediatek/mt7601u/debugfs.c @@ -35,6 +35,8 @@ mt7601u_ampdu_stat_show(struct seq_file *file, void *data) struct mt7601u_dev *dev = file->private; int i, j; + mt7601u_mac_read_stats(dev); + #define stat_printf(grp, off, name) \ seq_printf(file, #name ":\t%llu\n", dev->stats.grp[off]) diff --git a/drivers/net/wireless/mediatek/mt7601u/dma.c b/drivers/net/wireless/mediatek/mt7601u/dma.c index 773a1cc2f852..f1d8573c2888 100644 --- a/drivers/net/wireless/mediatek/mt7601u/dma.c +++ b/drivers/net/wireless/mediatek/mt7601u/dma.c @@ -289,8 +289,7 @@ static void mt7601u_tx_tasklet(struct tasklet_struct *t) set_bit(MT7601U_STATE_MORE_STATS, &dev->state); if (!test_and_set_bit(MT7601U_STATE_READING_STATS, &dev->state)) - queue_delayed_work(dev->stat_wq, &dev->stat_work, - msecs_to_jiffies(10)); + queue_delayed_work(dev->stat_wq, &dev->stat_work, 0); skb_queue_splice_init(&dev->tx_skb_done, &skbs); diff --git a/drivers/net/wireless/mediatek/mt7601u/init.c b/drivers/net/wireless/mediatek/mt7601u/init.c index c01bb3fc4a7f..f67232ecfe6a 100644 --- a/drivers/net/wireless/mediatek/mt7601u/init.c +++ b/drivers/net/wireless/mediatek/mt7601u/init.c @@ -549,7 +549,7 @@ mt76_init_sband(struct mt7601u_dev *dev, struct ieee80211_supported_band *sband ht_cap->mcs.rx_mask[4] = 0x1; ht_cap->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED; ht_cap->ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K; - ht_cap->ampdu_density = IEEE80211_HT_MPDU_DENSITY_2; + ht_cap->ampdu_density = IEEE80211_HT_MPDU_DENSITY_NONE; dev->chandef.chan = &sband->channels[0]; diff --git a/drivers/net/wireless/mediatek/mt7601u/mac.c b/drivers/net/wireless/mediatek/mt7601u/mac.c index ca9cf628eb10..fff799ea5a99 100644 --- a/drivers/net/wireless/mediatek/mt7601u/mac.c +++ b/drivers/net/wireless/mediatek/mt7601u/mac.c @@ -298,10 +298,8 @@ static void mt7601u_check_mac_err(struct mt7601u_dev *dev) mt76_clear(dev, MT_MAC_SYS_CTRL, MT_MAC_SYS_CTRL_RESET_CSR); } -void mt7601u_mac_work(struct work_struct *work) +void mt7601u_mac_read_stats(struct mt7601u_dev *dev) { - struct mt7601u_dev *dev = container_of(work, struct mt7601u_dev, - mac_work.work); struct { u32 addr_base; u32 span; @@ -345,6 +343,12 @@ void mt7601u_mac_work(struct work_struct *work) } atomic_set(&dev->avg_ampdu_len, n ? DIV_ROUND_CLOSEST(sum, n) : 1); +} + +void mt7601u_mac_work(struct work_struct *work) +{ + struct mt7601u_dev *dev = container_of(work, struct mt7601u_dev, + mac_work.work); mt7601u_check_mac_err(dev); diff --git a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h index 118d43707853..584007890b1f 100644 --- a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h +++ b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h @@ -28,7 +28,7 @@ #define MT_BBP_REG_VERSION 0x00 #define MT_USB_AGGR_SIZE_LIMIT 28 /* * 1024B */ -#define MT_USB_AGGR_TIMEOUT 0x80 /* * 33ns */ +#define MT_USB_AGGR_TIMEOUT 0x40 /* * 33ns */ #define MT_RX_ORDER 3 #define MT_RX_URB_SIZE (PAGE_SIZE << MT_RX_ORDER) @@ -354,7 +354,7 @@ int mt7601u_phy_get_rssi(struct mt7601u_dev *dev, void mt7601u_phy_con_cal_onoff(struct mt7601u_dev *dev, struct ieee80211_bss_conf *info); -/* MAC */ +void mt7601u_mac_read_stats(struct mt7601u_dev *dev); void mt7601u_mac_work(struct work_struct *work); void mt7601u_mac_set_protection(struct mt7601u_dev *dev, bool legacy_prot, int ht_mode); diff --git a/drivers/net/wireless/mediatek/mt7601u/phy.c b/drivers/net/wireless/mediatek/mt7601u/phy.c index d4cd2215aba9..d8f1dac455ba 100644 --- a/drivers/net/wireless/mediatek/mt7601u/phy.c +++ b/drivers/net/wireless/mediatek/mt7601u/phy.c @@ -916,11 +916,11 @@ static int mt7601u_tssi_cal(struct mt7601u_dev *dev) dev_dbg(dev->dev, "Power curr:%08x diff:%08x\n", curr_pwr, diff_pwr); if (params.tssi0 > 126 && diff_pwr > 0) { - dev_err(dev->dev, "Error: TSSI upper saturation\n"); + dev_err_ratelimited(dev->dev, "Error: TSSI upper saturation\n"); diff_pwr = 0; } if (params.tssi0 - tssi_init < 1 && diff_pwr < 0) { - dev_err(dev->dev, "Error: TSSI lower saturation\n"); + dev_err_ratelimited(dev->dev, "Error: TSSI lower saturation\n"); diff_pwr = 0; } diff --git a/drivers/net/wireless/mediatek/mt7601u/tx.c b/drivers/net/wireless/mediatek/mt7601u/tx.c index d3328181f961..d88d3fbcb0d9 100644 --- a/drivers/net/wireless/mediatek/mt7601u/tx.c +++ b/drivers/net/wireless/mediatek/mt7601u/tx.c @@ -247,11 +247,10 @@ void mt7601u_tx_stat(struct work_struct *work) spin_lock_irqsave(&dev->tx_lock, flags); if (cleaned) - queue_delayed_work(dev->stat_wq, &dev->stat_work, - msecs_to_jiffies(10)); + queue_delayed_work(dev->stat_wq, &dev->stat_work, 0); else if (test_and_clear_bit(MT7601U_STATE_MORE_STATS, &dev->state)) queue_delayed_work(dev->stat_wq, &dev->stat_work, - msecs_to_jiffies(20)); + msecs_to_jiffies(2)); else clear_bit(MT7601U_STATE_READING_STATS, &dev->state); spin_unlock_irqrestore(&dev->tx_lock, flags); @@ -263,12 +262,9 @@ int mt7601u_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, { struct mt7601u_dev *dev = hw->priv; u8 cw_min = 5, cw_max = 10, hw_q = q2hwq(queue); + u8 txop = params->txop; u32 val; - /* TODO: should we do funny things with the parameters? - * See what mt7601u_set_default_edca() used to do in init.c. - */ - if (params->cw_min) cw_min = fls(params->cw_min); if (params->cw_max) @@ -279,22 +275,18 @@ int mt7601u_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, WARN_ON(cw_min > 0xf); WARN_ON(cw_max > 0xf); + if (queue == IEEE80211_AC_BE && !txop) + txop = 0x60; val = FIELD_PREP(MT_EDCA_CFG_AIFSN, params->aifs) | FIELD_PREP(MT_EDCA_CFG_CWMIN, cw_min) | - FIELD_PREP(MT_EDCA_CFG_CWMAX, cw_max); - /* TODO: based on user-controlled EnableTxBurst var vendor drv sets - * a really long txop on AC0 (see connect.c:2009) but only on - * connect? When not connected should be 0. - */ - if (!hw_q) - val |= 0x60; - else - val |= FIELD_PREP(MT_EDCA_CFG_TXOP, params->txop); + FIELD_PREP(MT_EDCA_CFG_CWMAX, cw_max) | + FIELD_PREP(MT_EDCA_CFG_TXOP, txop); mt76_wr(dev, MT_EDCA_CFG_AC(hw_q), val); val = mt76_rr(dev, MT_WMM_TXOP(hw_q)); val &= ~(MT_WMM_TXOP_MASK << MT_WMM_TXOP_SHIFT(hw_q)); - val |= params->txop << MT_WMM_TXOP_SHIFT(hw_q); + val |= txop << MT_WMM_TXOP_SHIFT(hw_q); mt76_wr(dev, MT_WMM_TXOP(hw_q), val); val = mt76_rr(dev, MT_WMM_AIFSN); -- 2.55.0