wifi: ath10k: indicate to mac80211 scan complete with aborted flag for ATH10K_SCAN_ST...

Scan failure can not be recovered from when running a loop of the
following steps:
1. run scan: "iw wlan scan".
2. run command: echo soft > /sys/kernel/debug/ieee80211/phy0/ath10k/simulate_fw_crash
   immediately after step 1.

result:
scan failed and can not recover even when wlan recovery succeeds:
command failed: Device or resource busy (-16)

reason:
When scan arrives, WMI_START_SCAN_CMDID is sent to the firmware and
function ath10k_hw_scan() returns, then simulate_fw_crash arrives
and the scan started event does not arrive, and then it starts to do
recovery of wlan. __ath10k_scan_finish() which is called from
ath10k_halt() is one step of recovery, it will not call
ieee80211_scan_completed() by logic currently because the scan state is
ATH10K_SCAN_STARTING. Thus it leads the scan not being completed in
mac80211, and leads all consecutive scans failing with -EBUSY in
nl80211_trigger_scan even after wlan recovery success.

Indicate scan complete with aborted flag to mac80211 for
ATH10K_SCAN_STARTING to allow recovery from scan failed with "Device or
resource busy (-16)" after wlan recovery.

Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00174

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

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 03e7bc5b6c0bd0ec05ea398305ce476c29e6bcbd..b33f87b9ad0b8e0142b92415b5c67fa37e4769ff 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -4503,18 +4503,21 @@ void __ath10k_scan_finish(struct ath10k *ar)
                break;
        case ATH10K_SCAN_RUNNING:
        case ATH10K_SCAN_ABORTING:
+               if (ar->scan.is_roc && ar->scan.roc_notify)
+                       ieee80211_remain_on_channel_expired(ar->hw);
+               fallthrough;
+       case ATH10K_SCAN_STARTING:
                if (!ar->scan.is_roc) {
                        struct cfg80211_scan_info info = {
-                               .aborted = (ar->scan.state ==
-                                           ATH10K_SCAN_ABORTING),
+                               .aborted = ((ar->scan.state ==
+                                           ATH10K_SCAN_ABORTING) ||
+                                           (ar->scan.state ==
+                                           ATH10K_SCAN_STARTING)),
                        };
 
                        ieee80211_scan_completed(ar->hw, &info);
-               } else if (ar->scan.roc_notify) {
-                       ieee80211_remain_on_channel_expired(ar->hw);
                }
-               fallthrough;
-       case ATH10K_SCAN_STARTING:
+
                ar->scan.state = ATH10K_SCAN_IDLE;
                ar->scan_channel = NULL;
                ar->scan.roc_freq = 0;