]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: ath12k: handle ath12k_core_restart() with hardware grouping
authorAditya Kumar Singh <aditya.kumar.singh@oss.qualcomm.com>
Tue, 8 Apr 2025 06:06:35 +0000 (11:36 +0530)
committerJeff Johnson <jeff.johnson@oss.qualcomm.com>
Sat, 12 Apr 2025 04:19:30 +0000 (21:19 -0700)
Currently, when ath12k_core_restart() is called and the ab->is_reset flag
is set, it invokes ieee80211_restart_hw() for all hardware in the same
group. However, other hardware might still be in the recovery process,
making this call inappropriate with grouping into picture.

To address this, add a condition to check if the group is ready. If the
group is not ready, do not call ieee80211_restart_hw().

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3

Signed-off-by: Aditya Kumar Singh <aditya.kumar.singh@oss.qualcomm.com>
Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Link: https://patch.msgid.link/20250408-fix_reboot_issues_with_hw_grouping-v4-7-95e7bf048595@oss.qualcomm.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
drivers/net/wireless/ath/ath12k/core.c

index 0fb3e57cd254ede767528e47e1d9d183257e5b71..a1c9b8771e9c4c84548da2cb4054b0403aa8c759 100644 (file)
@@ -1560,12 +1560,22 @@ static void ath12k_core_restart(struct work_struct *work)
                        ath12k_dbg(ab, ATH12K_DBG_BOOT, "reset success\n");
                }
 
+               mutex_lock(&ag->mutex);
+
+               if (!ath12k_core_hw_group_start_ready(ag)) {
+                       mutex_unlock(&ag->mutex);
+                       goto exit_restart;
+               }
+
                for (i = 0; i < ag->num_hw; i++) {
-                       ah = ath12k_ag_to_ah(ab->ag, i);
+                       ah = ath12k_ag_to_ah(ag, i);
                        ieee80211_restart_hw(ah->hw);
                }
+
+               mutex_unlock(&ag->mutex);
        }
 
+exit_restart:
        complete(&ab->restart_completed);
 }