Commit 5163150a authored by Sean Wang's avatar Sean Wang Committed by Felix Fietkau
Browse files

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: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Suggested-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 af1c9bb2

drivers/net/wireless/mediatek/mt76/mt7921/mac.c

+8 −5
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ void mt7921_mac_reset_work(struct work_struct *work) 
					      reset_work);

	struct ieee80211_hw *hw = mt76_hw(dev);

	struct mt76_connac_pm *pm = &dev->pm;

	int i;

	int i, ret;



	dev_dbg(dev->mt76.dev, "chip reset\n");

	dev->hw_full_reset = true;
@@ -748,12 +748,15 @@ void mt7921_mac_reset_work(struct work_struct *work) 
	cancel_delayed_work_sync(&pm->ps_work);

	cancel_work_sync(&pm->wake_work);



	for (i = 0; i < 10; i++) {

		mutex_lock(&dev->mt76.mutex);

	for (i = 0; i < 10; i++)

		if (!mt7921_dev_reset(dev))

			break;

		ret = mt7921_dev_reset(dev);

		mutex_unlock(&dev->mt76.mutex);



		if (!ret)

			break;

	}



	if (i == 10)

		dev_err(dev->mt76.dev, "chip reset failed\n");