UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mt76: mt7921: reduce the mutex lock scope during reset 

Reduce the mutex lock scope for reset to get rid of possible task hung
e.g wpa_supplicant and to allow the user-space process to keep running
during we need more retries to complete the reset.

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Suggested-by: YN Chen <YN.Chen@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Sean Wang 2022-06-27 07:27:06 +08:00 committed by Felix Fietkau
parent af1c9bb282
commit 5163150a47
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/wireless/mediatek/mt76/mt7921/mac.c
View File

@ -738,7 +738,7 @@ void mt7921_mac_reset_work(struct work_struct *work)
reset_work); reset_work);
struct ieee80211_hw *hw = mt76_hw(dev); struct ieee80211_hw *hw = mt76_hw(dev);
struct mt76_connac_pm *pm = &dev->pm; struct mt76_connac_pm *pm = &dev->pm;
int i; int i, ret;
dev_dbg(dev->mt76.dev, "chip reset\n"); dev_dbg(dev->mt76.dev, "chip reset\n");
dev->hw_full_reset = true; dev->hw_full_reset = true;
@ -748,11 +748,14 @@ void mt7921_mac_reset_work(struct work_struct *work)
cancel_delayed_work_sync(&pm->ps_work); cancel_delayed_work_sync(&pm->ps_work);
cancel_work_sync(&pm->wake_work); cancel_work_sync(&pm->wake_work);
mutex_lock(&dev->mt76.mutex); for (i = 0; i < 10; i++) {
for (i = 0; i < 10; i++) mutex_lock(&dev->mt76.mutex);
if (!mt7921_dev_reset(dev)) ret = mt7921_dev_reset(dev);
mutex_unlock(&dev->mt76.mutex);
if (!ret)
break; break;
mutex_unlock(&dev->mt76.mutex); }
if (i == 10) if (i == 10)
dev_err(dev->mt76.dev, "chip reset failed\n"); dev_err(dev->mt76.dev, "chip reset failed\n");