wifi: ath12k: change to initialize recovery variables earlier in ath12k_core_reset()

Sometimes device recovery fail with this operation.
Run test command for many times:
echo assert > /sys/kernel/debug/ath12k/wcn7850\ hw2.0_0000\:03\:00.0/simulate_fw_crash

While recovery start, ath12k_core_post_reconfigure_recovery() will
call ieee80211_restart_hw(), and the restart_work which queued by
ieee80211_restart_hw() is running in another thread, it will call
into ath12k_mac_op_start() and ath12k_mac_wait_reconfigure(), and
the variables ab->recovery_start_count and ab->recovery_start is used
in ath12k_mac_wait_reconfigure(), so ath12k need to initialize the
variables before queue the restart_work, otherwise ath12k_mac_wait_reconfigure()
maybe use the un-initialized variables. Change to initialize the 2
variables earlier and then recovery process become correct.

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4

Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20230830060850.18881-1-quic_wgong@quicinc.com

diff --git a/drivers/net/wireless/ath/ath12k/core.c b/drivers/net/wireless/ath/ath12k/core.c
index 3df8059d55129b13e10b3898b7b5b52b533e9379..39f938fafa8107d23aa7c682475a57b4ff12b06b 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/core.c
+++ b/drivers/net/wireless/ath/ath12k/core.c
@@ -823,6 +823,8 @@ static void ath12k_core_reset(struct work_struct *work)
        ath12k_dbg(ab, ATH12K_DBG_BOOT, "reset starting\n");
 
        ab->is_reset = true;
+       atomic_set(&ab->recovery_start_count, 0);
+       reinit_completion(&ab->recovery_start);
        atomic_set(&ab->recovery_count, 0);
 
        ath12k_core_pre_reconfigure_recovery(ab);
@@ -830,9 +832,6 @@ static void ath12k_core_reset(struct work_struct *work)
        reinit_completion(&ab->reconfigure_complete);
        ath12k_core_post_reconfigure_recovery(ab);
 
-       reinit_completion(&ab->recovery_start);
-       atomic_set(&ab->recovery_start_count, 0);
-
        ath12k_dbg(ab, ATH12K_DBG_BOOT, "waiting recovery start...\n");
 
        time_left = wait_for_completion_timeout(&ab->recovery_start,