Commit e5d78fd9 authored by Sean Wang's avatar Sean Wang Committed by Felix Fietkau

wifi: mt76: sdio: fix the deadlock caused by sdio->stat_work

Because wake_work and sdio->stat_work share the same workqueue mt76->wq,
if sdio->stat_work cannot acquire the mutex lock such as that was possibly
held up by [mt7615, mt7921]_mutex_acquire. Additionally, if
[mt7615, mt7921]_mutex_acquire was called by sdio->stat_work self, the wake
would be blocked by itself. Thus, we move the stat_work into
ieee80211_workqueue instead to break the deadlock.

Fixes: d39b52e3 ("mt76: introduce mt76_sdio module")
Co-developed-by: default avatarYN Chen <YN.Chen@mediatek.com>
Signed-off-by: default avatarYN Chen <YN.Chen@mediatek.com>
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 0af1ad95
...@@ -481,7 +481,7 @@ static void mt76s_status_worker(struct mt76_worker *w) ...@@ -481,7 +481,7 @@ static void mt76s_status_worker(struct mt76_worker *w)
if (dev->drv->tx_status_data && if (dev->drv->tx_status_data &&
!test_and_set_bit(MT76_READING_STATS, &dev->phy.state) && !test_and_set_bit(MT76_READING_STATS, &dev->phy.state) &&
!test_bit(MT76_STATE_SUSPEND, &dev->phy.state)) !test_bit(MT76_STATE_SUSPEND, &dev->phy.state))
queue_work(dev->wq, &dev->sdio.stat_work); ieee80211_queue_work(dev->hw, &dev->sdio.stat_work);
} while (nframes > 0); } while (nframes > 0);
if (resched) if (resched)
...@@ -508,7 +508,7 @@ static void mt76s_tx_status_data(struct work_struct *work) ...@@ -508,7 +508,7 @@ static void mt76s_tx_status_data(struct work_struct *work)
} }
if (count && test_bit(MT76_STATE_RUNNING, &dev->phy.state)) if (count && test_bit(MT76_STATE_RUNNING, &dev->phy.state))
queue_work(dev->wq, &sdio->stat_work); ieee80211_queue_work(dev->hw, &sdio->stat_work);
else else
clear_bit(MT76_READING_STATS, &dev->phy.state); clear_bit(MT76_READING_STATS, &dev->phy.state);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment