Wen Gong <quic_wgong@xxxxxxxxxxx> writes: > For 11d scan, commit 9dcf6808b253 ("ath11k: add 11d scan offload support") > increased the timeout from one second to max 10 seconds when 11d scan > offload enabled and 6 GHz enabled, it is reasonable for the commit, it > is because the first 11d scan request is sent to firmware before the > first hw scan request after wlan load, then the hw scan started event > will reported from firmware after the 11d scan finished, it needs about > 6 seconds when 6 GHz enabled, so increased it from one second to 10 > seconds in the commit to avoid timed out for hw scan started. Then > another commit 1f682dc9fb37 ("ath11k: reduce the wait time of 11d scan > and hw scan while add interface") change the sequence of the first 11d > scan and hw scan, then ath11k will receive the hw scan started event > from firmware immediately for the first hw scan, thus ath11k does not > need set the timeout value to max 10 seconds again, and this is to set > the timeout value back from 10 seconds to 1 second. > > After the 1st hw scan finished, firmware will start 11d scan immediately, > and firmware need use some seconds to finish 11d scan, if the 2nd hw > scan is sent from ath11k to firmware before 11d scan finished, the 2nd > hw scan will started after 11d scan finished, this will lead timeout to > wait scan started in ath11k. Treat the timeout as a normal situation if > 11d scan is running and skip report scan fail for this situation. > > Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3 > > Signed-off-by: Wen Gong <quic_wgong@xxxxxxxxxxx> [...] > @@ -3682,7 +3677,12 @@ static int ath11k_mac_op_hw_scan(struct ieee80211_hw *hw, > > ret = ath11k_start_scan(ar, &arg); > if (ret) { > - ath11k_warn(ar->ab, "failed to start hw scan: %d\n", ret); > + if (ret == -EBUSY) > + ath11k_dbg(ar->ab, ATH11K_DBG_MAC, > + "scan engine is busy 11d state %d\n", ar->state_11d); > + else > + ath11k_warn(ar->ab, "failed to start hw scan: %d\n", ret); > + > spin_lock_bh(&ar->data_lock); > ar->scan.state = ATH11K_SCAN_IDLE; > spin_unlock_bh(&ar->data_lock); This feels like a hack to me, for example will these failed scans now cause delays is connection establishment? IMHO it's crucial from user's point of view that we don't delay that in any way. I would rather fix the root cause, do we know what's causing this? -- https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches