Commit 669b6922 authored by Po-Hao Huang's avatar Po-Hao Huang Committed by Ping-Ke Shih
Browse files

wifi: rtw89: fix HW scan not aborting properly 



There is a length limit on the commands we send to firmware, so
dividing to two commands is sometimes required when scanning.
When aborting scan, we should not send second scan command to
firmware after the first one is finished. This could cause some
unexpected errors when we cannot receive firmware events
(e.g. in suspend).

Another case is scan happens before suspending, ieee80211_do_stop() is
called to abort scan and driver indicate scan completion by
ieee80211_scan_completed(), which queues event to scan work. But scan work
might be late to execute after ieee80211_do_stop(). To correct this, driver
indicates ieee80211_scan_completed() before returning, so that
ieee80211_do_stop() can flush scan work properly.

Fixes: bcbefbd0 ("wifi: rtw89: add wait/completion for abort scan")
Cc: stable@vger.kernel.org
Co-developed-by: default avatarChih-Kang Chang <gary.chang@realtek.com>
Signed-off-by: default avatarChih-Kang Chang <gary.chang@realtek.com>
Signed-off-by: default avatarPo-Hao Huang <phhuang@realtek.com>
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Link: https://msgid.link/20240517013350.11278-1-pkshih@realtek.com
parent 578bdd98

drivers/net/wireless/realtek/rtw89/fw.c

+8 −1
Original line number Diff line number Diff line
@@ -6245,6 +6245,13 @@ void rtw89_hw_scan_abort(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif) 


	ret = rtw89_hw_scan_offload(rtwdev, vif, false);

	if (ret)

		rtw89_warn(rtwdev, "rtw89_hw_scan_offload failed ret %d\n", ret);



	/* Indicate ieee80211_scan_completed() before returning, which is safe

	 * because scan abort command always waits for completion of

	 * RTW89_SCAN_END_SCAN_NOTIFY, so that ieee80211_stop() can flush scan

	 * work properly.

	 */

	rtw89_hw_scan_complete(rtwdev, vif, true);

}

drivers/net/wireless/realtek/rtw89/mac.c

+4 −1
Original line number Diff line number Diff line
@@ -4756,6 +4756,9 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *skb, 
		}

		return;

	case RTW89_SCAN_END_SCAN_NOTIFY:

		if (rtwdev->scan_info.abort)

			return;



		if (rtwvif && rtwvif->scan_req &&

		    last_chan < rtwvif->scan_req->n_channels) {

			ret = rtw89_hw_scan_offload(rtwdev, vif, true);
@@ -4764,7 +4767,7 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *skb, 
				rtw89_warn(rtwdev, "HW scan failed: %d\n", ret);

			}

		} else {

			rtw89_hw_scan_complete(rtwdev, vif, rtwdev->scan_info.abort);

			rtw89_hw_scan_complete(rtwdev, vif, false);

		}

		break;

	case RTW89_SCAN_ENTER_OP_NOTIFY: