mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
521efb62eb
6c256218e59e wifi: mt76: dma: use napi_build_skb 679254c50f27 mt7915: add CONFIG_MT76_LEDS to cflags 15b9dd6b1b6a wifi: mt76: mt7915: call mt7915_mcu_set_thermal_throttling() only after init_work 8e5c21fe7c5c wifi: mt76: mt7915: rework mt7915_mcu_set_thermal_throttling 87cb74fe42d9 wifi: mt76: mt7915: rework mt7915_thermal_temp_store() c6f24b83eba5 wifi: mt76: mt7915: add error message in mt7915_thermal_set_cur_throttle_state() 99e96b89ee4d wifi: mt76: mt7915: add chip id condition in mt7915_check_eeprom() 833cd420480f wifi: mt76: mt7921: fix channel switch fail in monitor mode f1f8bae6092d wifi: mt76: mt7921: add ack signal support f47087a6dd62 wifi: mt76: mt7996: fix chainmask calculation in mt7996_set_antenna() 2f3b0acc1588 wifi: mt76: mt7996: update register for CFEND_RATE 7e9540dcbd70 wifi: mt76: mt7996: do not hardcode vht beamform cap a37e427d0959 wifi: mt76: connac: fix POWER_CTRL command name typo 98aa346042bd wifi: mt76: mt7915: remove BW160 and BW80+80 support 94fed6a43541 wifi: mt76: mt7921: fix invalid remain_on_channel duration 3c162384d80a wifi: mt76: introduce mt76_queue_is_wed_rx utility routine a409a9454587 wifi: mt76: mt7915: fix memory leak in mt7915_mcu_exit 8b27ecd3a684 wifi: mt76: mt7996: fix memory leak in mt7996_mcu_exit 683760461dd0 wifi: mt76: dma: free rx_head in mt76_dma_rx_cleanup 0c750cf08f85 wifi: mt76: dma: fix memory leak running mt76_dma_tx_cleanup 5de9ae29bea2 wifi: mt76: mt7915: avoid mcu_restart function pointer dad96dd3e62d wifi: mt76: mt7603: avoid mcu_restart function pointer 19d36dd9c8ea wifi: mt76: mt7615: avoid mcu_restart function pointer 6fe2c2383d3d wifi: mt76: mt7921: avoid mcu_restart function pointer 9df89143bf71 wifi: mt76: mt7915: get rid of wed rx_buf_ring page_frag_cache 8d51d11760cb wifi: mt76: fix switch default case in mt7996_reverse_frag0_hdr_trans 0d8057dbd51c wifi: mt76: mt7921u: add support for Comfast CF-952AX ddbf4e933d54 wifi: mt76: mt7915: set sku initial value to zero 06a8904e954e wifi: mt76: mt7915: wed: enable red per-band token drop 724a337caef9 wifi: mt76: mt7915: fix WED TxS reporting 747ca943a5bb wifi: mt76: add flexible polling wait-interval support 133d7859977a wifi: mt76: mt7921: reduce polling time in pmctrl 5fe319a0550e wifi: mt76: add memory barrier to SDIO queue kick 822f060b9d19 wifi: mt76: mt7921: fix rx filter incorrect by drv/fw inconsistent c6794954a723 wifi: mt76: mt7915: fix memory leak in mt7915_mmio_wed_init_rx_buf 9686cd7cc65c wifi: mt76: switch to page_pool allocator 04da4eaa8235 wifi: mt76: enable page_pool stats 1af4a911ebcb wifi: mt76: mt7915: release rxwi in mt7915_wed_release_rx_buf e8c10835cf06 wifi: mt76: fix compile error without CONFIG_PAGE_POOL_STATS 0cf0ede7cc42 net: ethernet: mtk_wed: add reset to rx_ring_setup callback 715b3ed9708a net: ethernet: mtk_wed: add reset to tx_ring_setup callback 9107381d0ff3 wifi: mt76: mt7921: fix error code of return in mt7921_acpi_read 36d2a5bf7802 wifi: mt76: mt7996: rely on mt76_connac2_mac_tx_rate_val c67f57d2cda2 wifi: mt76: dma: add reset to mt76_dma_wed_setup signature 3dace36e2941 wifi: mt76: dma: reset wed queues in mt76_dma_rx_reset 4b229d2da562 wifi: mt76: mt7915: add mt7915 wed reset callbacks f83958376085 wifi: mt76: mt7915: complete wed reset support 321edbb414dc wifi: mt76: mt7996: rely on mt76_connac_txp_common structure bdb7dc38a6d1 wifi: mt76: mt7996: rely on mt76_connac_txp_skb_unmap 8688756305c6 wifi: mt76: mt7996: rely on mt76_connac_tx_complete_skb fbf986dbd4c0 wifi: mt76: mt7996: rely on mt76_connac2_mac_decode_he_radiotap adc556cbce37 wifi: mt76: mt7996: avoid mcu_restart function pointer 5eb4e2303be4 wifi: mt76: remove __mt76_mcu_restart macro e7a61c5f70f5 wifi: mt76: add EHT phy type b375845abc10 wifi: mt76: connac: add CMD_CBW_320MHZ 68b17a243332 wifi: mt76: connac: add helpers for EHT capability 02ec1f61b3a2 wifi: mt76: connac: add cmd id related to EHT support 9209294cd81b wifi: mt76: increase wcid size to 1088 5e85136c9b2f wifi: mt76: add EHT rate stats for ethtool a171f672fdeb wifi: mt76: mt7996: add variants support eda8fd62c105 wifi: mt76: mt7996: add helpers for wtbl and interface limit 4a5a9f4cdc3b wifi: mt76: mt7996: rework capability init 06b73c155680 wifi: mt76: mt7996: add EHT capability init ae71a1b8294f wifi: mt76: mt7996: add support for EHT rate report 65bdfae2991d wifi: mt76: mt7996: enable EHT support in firmware b2360d59747c wifi: mt76: mt7996: add EHT beamforming support Signed-off-by: Felix Fietkau <nbd@nbd.name>
104 lines
3.7 KiB
Diff
104 lines
3.7 KiB
Diff
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Thu, 1 Dec 2022 16:26:53 +0100
|
|
Subject: [PATCH] net: ethernet: mtk_wed: fix sleep while atomic in
|
|
mtk_wed_wo_queue_refill
|
|
|
|
In order to fix the following sleep while atomic bug always alloc pages
|
|
with GFP_ATOMIC in mtk_wed_wo_queue_refill since page_frag_alloc runs in
|
|
spin_lock critical section.
|
|
|
|
[ 9.049719] Hardware name: MediaTek MT7986a RFB (DT)
|
|
[ 9.054665] Call trace:
|
|
[ 9.057096] dump_backtrace+0x0/0x154
|
|
[ 9.060751] show_stack+0x14/0x1c
|
|
[ 9.064052] dump_stack_lvl+0x64/0x7c
|
|
[ 9.067702] dump_stack+0x14/0x2c
|
|
[ 9.071001] ___might_sleep+0xec/0x120
|
|
[ 9.074736] __might_sleep+0x4c/0x9c
|
|
[ 9.078296] __alloc_pages+0x184/0x2e4
|
|
[ 9.082030] page_frag_alloc_align+0x98/0x1ac
|
|
[ 9.086369] mtk_wed_wo_queue_refill+0x134/0x234
|
|
[ 9.090974] mtk_wed_wo_init+0x174/0x2c0
|
|
[ 9.094881] mtk_wed_attach+0x7c8/0x7e0
|
|
[ 9.098701] mt7915_mmio_wed_init+0x1f0/0x3a0 [mt7915e]
|
|
[ 9.103940] mt7915_pci_probe+0xec/0x3bc [mt7915e]
|
|
[ 9.108727] pci_device_probe+0xac/0x13c
|
|
[ 9.112638] really_probe.part.0+0x98/0x2f4
|
|
[ 9.116807] __driver_probe_device+0x94/0x13c
|
|
[ 9.121147] driver_probe_device+0x40/0x114
|
|
[ 9.125314] __driver_attach+0x7c/0x180
|
|
[ 9.129133] bus_for_each_dev+0x5c/0x90
|
|
[ 9.132953] driver_attach+0x20/0x2c
|
|
[ 9.136513] bus_add_driver+0x104/0x1fc
|
|
[ 9.140333] driver_register+0x74/0x120
|
|
[ 9.144153] __pci_register_driver+0x40/0x50
|
|
[ 9.148407] mt7915_init+0x5c/0x1000 [mt7915e]
|
|
[ 9.152848] do_one_initcall+0x40/0x25c
|
|
[ 9.156669] do_init_module+0x44/0x230
|
|
[ 9.160403] load_module+0x1f30/0x2750
|
|
[ 9.164135] __do_sys_init_module+0x150/0x200
|
|
[ 9.168475] __arm64_sys_init_module+0x18/0x20
|
|
[ 9.172901] invoke_syscall.constprop.0+0x4c/0xe0
|
|
[ 9.177589] do_el0_svc+0x48/0xe0
|
|
[ 9.180889] el0_svc+0x14/0x50
|
|
[ 9.183929] el0t_64_sync_handler+0x9c/0x120
|
|
[ 9.188183] el0t_64_sync+0x158/0x15c
|
|
|
|
Fixes: 799684448e3e ("net: ethernet: mtk_wed: introduce wed wo support")
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom.com>
|
|
Link: https://lore.kernel.org/r/67ca94bdd3d9eaeb86e52b3050fbca0bcf7bb02f.1669908312.git.lorenzo@kernel.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_wed_wo.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_wed_wo.c
|
|
@@ -133,17 +133,18 @@ mtk_wed_wo_dequeue(struct mtk_wed_wo *wo
|
|
|
|
static int
|
|
mtk_wed_wo_queue_refill(struct mtk_wed_wo *wo, struct mtk_wed_wo_queue *q,
|
|
- gfp_t gfp, bool rx)
|
|
+ bool rx)
|
|
{
|
|
enum dma_data_direction dir = rx ? DMA_FROM_DEVICE : DMA_TO_DEVICE;
|
|
int n_buf = 0;
|
|
|
|
spin_lock_bh(&q->lock);
|
|
while (q->queued < q->n_desc) {
|
|
- void *buf = page_frag_alloc(&q->cache, q->buf_size, gfp);
|
|
struct mtk_wed_wo_queue_entry *entry;
|
|
dma_addr_t addr;
|
|
+ void *buf;
|
|
|
|
+ buf = page_frag_alloc(&q->cache, q->buf_size, GFP_ATOMIC);
|
|
if (!buf)
|
|
break;
|
|
|
|
@@ -215,7 +216,7 @@ mtk_wed_wo_rx_run_queue(struct mtk_wed_w
|
|
mtk_wed_mcu_rx_unsolicited_event(wo, skb);
|
|
}
|
|
|
|
- if (mtk_wed_wo_queue_refill(wo, q, GFP_ATOMIC, true)) {
|
|
+ if (mtk_wed_wo_queue_refill(wo, q, true)) {
|
|
u32 index = (q->head - 1) % q->n_desc;
|
|
|
|
mtk_wed_wo_queue_kick(wo, q, index);
|
|
@@ -432,7 +433,7 @@ mtk_wed_wo_hardware_init(struct mtk_wed_
|
|
if (ret)
|
|
goto error;
|
|
|
|
- mtk_wed_wo_queue_refill(wo, &wo->q_tx, GFP_KERNEL, false);
|
|
+ mtk_wed_wo_queue_refill(wo, &wo->q_tx, false);
|
|
mtk_wed_wo_queue_reset(wo, &wo->q_tx);
|
|
|
|
regs.desc_base = MTK_WED_WO_CCIF_DUMMY5;
|
|
@@ -446,7 +447,7 @@ mtk_wed_wo_hardware_init(struct mtk_wed_
|
|
if (ret)
|
|
goto error;
|
|
|
|
- mtk_wed_wo_queue_refill(wo, &wo->q_rx, GFP_KERNEL, true);
|
|
+ mtk_wed_wo_queue_refill(wo, &wo->q_rx, true);
|
|
mtk_wed_wo_queue_reset(wo, &wo->q_rx);
|
|
|
|
/* rx queue irqmask */
|