developer | e3d0147 | 2022-05-09 14:01:49 +0800 | [diff] [blame] | 1 | From a56d23330b0ac01929a54c427bd338b02a7e727e Mon Sep 17 00:00:00 2001 |
| 2 | From: Bo Jiao <Bo.Jiao@mediatek.com> |
| 3 | Date: Fri, 6 May 2022 21:06:55 +0800 |
| 4 | Subject: [PATCH 03/10] mt76: mt7615/mt7915: do reset_work with mt76's work |
| 5 | queue |
| 6 | |
| 7 | reset_work may be blocked when mcu message timeout occurs |
| 8 | |
| 9 | Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com> |
| 10 | --- |
| 11 | mt7615/mmio.c | 2 +- |
| 12 | mt7915/mmio.c | 2 +- |
| 13 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 14 | |
| 15 | diff --git a/mt7615/mmio.c b/mt7615/mmio.c |
| 16 | index ce45c3bf..a208035e 100644 |
| 17 | --- a/mt7615/mmio.c |
| 18 | +++ b/mt7615/mmio.c |
| 19 | @@ -145,7 +145,7 @@ static void mt7615_irq_tasklet(struct tasklet_struct *t) |
| 20 | return; |
| 21 | |
| 22 | dev->reset_state = mcu_int; |
| 23 | - ieee80211_queue_work(mt76_hw(dev), &dev->reset_work); |
| 24 | + queue_work(dev->mt76.wq, &dev->reset_work); |
| 25 | wake_up(&dev->reset_wait); |
| 26 | } |
| 27 | |
| 28 | diff --git a/mt7915/mmio.c b/mt7915/mmio.c |
| 29 | index 2d733d32..4d4537cd 100644 |
| 30 | --- a/mt7915/mmio.c |
| 31 | +++ b/mt7915/mmio.c |
| 32 | @@ -612,7 +612,7 @@ static void mt7915_irq_tasklet(struct tasklet_struct *t) |
| 33 | mt76_wr(dev, MT_MCU_CMD, val); |
| 34 | if (val & MT_MCU_CMD_ERROR_MASK) { |
| 35 | dev->reset_state = val; |
| 36 | - ieee80211_queue_work(mt76_hw(dev), &dev->reset_work); |
| 37 | + queue_work(dev->mt76.wq, &dev->reset_work); |
| 38 | wake_up(&dev->reset_wait); |
| 39 | } |
| 40 | } |
| 41 | -- |
| 42 | 2.18.0 |
| 43 | |