Commit dfb5b098 authored by Lior David's avatar Lior David Committed by Kalle Valo

wil6210: fix deadlock when using fw_no_recovery option

When FW crashes with no_fw_recovery option, driver
waits for manual recovery with wil->mutex held, this
can easily create deadlocks.
Fix the problem by moving the wait outside the lock.
Signed-off-by: default avatarLior David <qca_liord@qca.qualcomm.com>
Signed-off-by: default avatarMaya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 2c207eb8
...@@ -388,18 +388,19 @@ static void wil_fw_error_worker(struct work_struct *work) ...@@ -388,18 +388,19 @@ static void wil_fw_error_worker(struct work_struct *work)
wil->last_fw_recovery = jiffies; wil->last_fw_recovery = jiffies;
mutex_lock(&wil->mutex);
switch (wdev->iftype) {
case NL80211_IFTYPE_STATION:
case NL80211_IFTYPE_P2P_CLIENT:
case NL80211_IFTYPE_MONITOR:
wil_info(wil, "fw error recovery requested (try %d)...\n", wil_info(wil, "fw error recovery requested (try %d)...\n",
wil->recovery_count); wil->recovery_count);
if (!no_fw_recovery) if (!no_fw_recovery)
wil->recovery_state = fw_recovery_running; wil->recovery_state = fw_recovery_running;
if (0 != wil_wait_for_recovery(wil)) if (wil_wait_for_recovery(wil) != 0)
break; return;
mutex_lock(&wil->mutex);
switch (wdev->iftype) {
case NL80211_IFTYPE_STATION:
case NL80211_IFTYPE_P2P_CLIENT:
case NL80211_IFTYPE_MONITOR:
/* silent recovery, upper layers will see disconnect */
__wil_down(wil); __wil_down(wil);
__wil_up(wil); __wil_up(wil);
break; break;
......
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