This patch series adds channel switch support for mt76 usb interfaces.
When testing, I noticed that between 5 or 7 consecutive beacons had the
identical channel switch count set. After some debugging I found out,
that beacon copying over usb took far too long (up to 700ms for one call
of mt76x02u_pre_tbtt_work).
Therefore the first five patches speed up beacon copying and provide beaconing
fixes. The last patch enables channel switch support also for usb interfaces.
Thanks to Stanislaw and Lorenzo for their help.
v8:
* fix mbss beaconing
* fix adding vifs with idx 8
* fix memory leaks by dropping beacon buffer
* permanently enable 7 additional bss to save another usb call and make
beacon masking easier
* added beacon_prepare call again, which now also clears beacon_data_mask
v7:
* fix mbss beacon settings (incorrect try)
* fix compilation with latest upstream
v6:
* use min_t in mt76u_copy
* use round_up in mt76u_copy
* use additional copy for mmio beacon set again
v5:
* ommit empty mt76x2u_channel_switch_beacon
* copy txwi into beacon skb
v4:
* use multiple of 4 len for usb copy again
v3:
* fixed checkpatch errors
v2:
* correctly track beacon data mask
* clean-ups
* make channel switch fn static (reported by kbuild test robot)
Markus Theil (6):
mt76: mt76x02: ommit beacon slot clearing
mt76: mt76x02: split beaconing
mt76: mt76x02: add check for invalid vif idx
mt76: mt76x02: remove a copy call for usb speedup
mt76: speed up usb bulk copy
mt76: mt76x02: add channel switch support for usb interfaces
drivers/net/wireless/mediatek/mt76/mt76.h | 2 +-
drivers/net/wireless/mediatek/mt76/mt76x02.h | 1 -
.../wireless/mediatek/mt76/mt76x02_beacon.c | 83 ++++++++-----------
.../net/wireless/mediatek/mt76/mt76x02_mac.c | 2 +
.../net/wireless/mediatek/mt76/mt76x02_mac.h | 5 +-
.../net/wireless/mediatek/mt76/mt76x02_mmio.c | 4 +
.../wireless/mediatek/mt76/mt76x02_usb_core.c | 21 +++--
.../net/wireless/mediatek/mt76/mt76x02_util.c | 6 +-
drivers/net/wireless/mediatek/mt76/usb.c | 24 ++++--
9 files changed, 79 insertions(+), 69 deletions(-)
--
2.24.0
mt76 hw does not send beacons from beacon slots, if the corresponding
bitmask is set accordingly. Therefore we can ommit clearing the beacon
memory. Clearing uses many usb calls, if usb drivers are used. These
calls unnecessarily slow down the beacon tasklet. Thanks to Stanislaw
Gruzska for pointing this out.
Signed-off-by: Markus Theil <[email protected]>
---
drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c b/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c
index 4209209ac940..403866496640 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c
@@ -58,8 +58,6 @@ __mt76x02_mac_set_beacon(struct mt76x02_dev *dev, u8 bcn_idx,
dev->beacon_data_mask |= BIT(bcn_idx);
} else {
dev->beacon_data_mask &= ~BIT(bcn_idx);
- for (i = 0; i < beacon_len; i += 4)
- mt76_wr(dev, beacon_addr + i, 0);
}
mt76_wr(dev, MT_BCN_BYPASS_MASK, 0xff00 | ~dev->beacon_data_mask);
@@ -241,17 +239,11 @@ EXPORT_SYMBOL_GPL(mt76x02_enqueue_buffered_bc);
void mt76x02_init_beacon_config(struct mt76x02_dev *dev)
{
- int i;
-
mt76_clear(dev, MT_BEACON_TIME_CFG, (MT_BEACON_TIME_CFG_TIMER_EN |
MT_BEACON_TIME_CFG_TBTT_EN |
MT_BEACON_TIME_CFG_BEACON_TX));
mt76_set(dev, MT_BEACON_TIME_CFG, MT_BEACON_TIME_CFG_SYNC_MODE);
mt76_wr(dev, MT_BCN_BYPASS_MASK, 0xffff);
-
- for (i = 0; i < 8; i++)
- mt76x02_mac_set_beacon(dev, i, NULL);
-
mt76x02_set_beacon_offsets(dev);
}
EXPORT_SYMBOL_GPL(mt76x02_init_beacon_config);
--
2.24.0