wifi: rtw89: correct 6 GHz scan behavior

Change active scan behavior to fit 6GHz requirements. There are many
different rules on active scan between 6GHz and 2GHz/5GHz, so if the
SSID is not specified, do fast passive scanning and limit number of
probe requests we send for now until new firmware can support all
rules.

Signed-off-by: Po-Hao Huang <phhuang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20221007045900.10823-1-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index d57e3610fb88ec8735fa4cb97805ee59aff4b95b..bdcc7af737ea2ba3a0e8614b7b4528a4b355ccd5 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -2565,6 +2565,9 @@ static void rtw89_hw_scan_add_chan(struct rtw89_dev *rtwdev, int chan_type,
                                   struct rtw89_mac_chinfo *ch_info)
 {
        struct rtw89_hw_scan_info *scan_info = &rtwdev->scan_info;
+       struct ieee80211_vif *vif = rtwdev->scan_info.scanning_vif;
+       struct rtw89_vif *rtwvif = (struct rtw89_vif *)vif->drv_priv;
+       struct cfg80211_scan_request *req = rtwvif->scan_req;
        struct rtw89_pktofld_info *info;
        u8 band, probe_count = 0;
 
@@ -2576,13 +2579,13 @@ static void rtw89_hw_scan_add_chan(struct rtw89_dev *rtwdev, int chan_type,
        ch_info->tx_pwr_idx = 0;
        ch_info->tx_null = false;
        ch_info->pause_data = false;
+       ch_info->probe_id = RTW89_SCANOFLD_PKT_NONE;
 
        if (ssid_num) {
                ch_info->num_pkt = ssid_num;
                band = rtw89_hw_to_nl80211_band(ch_info->ch_band);
 
                list_for_each_entry(info, &scan_info->pkt_list[band], list) {
-                       ch_info->probe_id = info->id;
                        ch_info->pkt_id[probe_count] = info->id;
                        if (++probe_count >= ssid_num)
                                break;
@@ -2591,9 +2594,16 @@ static void rtw89_hw_scan_add_chan(struct rtw89_dev *rtwdev, int chan_type,
                        rtw89_err(rtwdev, "SSID num differs from list len\n");
        }
 
+       if (ch_info->ch_band == RTW89_BAND_6G) {
+               if (ssid_num == 1 && req->ssids[0].ssid_len == 0) {
+                       ch_info->tx_pkt = false;
+                       if (!req->duration_mandatory)
+                               ch_info->period -= RTW89_DWELL_TIME;
+               }
+       }
+
        switch (chan_type) {
        case RTW89_CHAN_OPERATE:
-               ch_info->probe_id = RTW89_SCANOFLD_PKT_NONE;
                ch_info->central_ch = scan_info->op_chan;
                ch_info->pri_ch = scan_info->op_pri_ch;
                ch_info->ch_band = scan_info->op_band;
@@ -2602,8 +2612,9 @@ static void rtw89_hw_scan_add_chan(struct rtw89_dev *rtwdev, int chan_type,
                ch_info->num_pkt = 0;
                break;
        case RTW89_CHAN_DFS:
-               ch_info->period = max_t(u8, ch_info->period,
-                                       RTW89_DFS_CHAN_TIME);
+               if (ch_info->ch_band != RTW89_BAND_6G)
+                       ch_info->period = max_t(u8, ch_info->period,
+                                               RTW89_DFS_CHAN_TIME);
                ch_info->dwell_time = RTW89_DWELL_TIME;
                break;
        case RTW89_CHAN_ACTIVE:
@@ -2637,8 +2648,13 @@ static int rtw89_hw_scan_add_chan_list(struct rtw89_dev *rtwdev,
                        goto out;
                }
 
-               ch_info->period = req->duration_mandatory ?
-                                 req->duration : RTW89_CHANNEL_TIME;
+               if (req->duration_mandatory)
+                       ch_info->period = req->duration;
+               else if (channel->band == NL80211_BAND_6GHZ)
+                       ch_info->period = RTW89_CHANNEL_TIME_6G + RTW89_DWELL_TIME;
+               else
+                       ch_info->period = RTW89_CHANNEL_TIME;
+
                ch_info->ch_band = rtw89_nl80211_to_hw_band(channel->band);
                ch_info->central_ch = channel->hw_value;
                ch_info->pri_ch = channel->hw_value;

diff --git a/drivers/net/wireless/realtek/rtw89/fw.h b/drivers/net/wireless/realtek/rtw89/fw.h
index 0047d5d0e9b193a90ddd727dc532cdb005799be0..6ef392ef9c6fb636d24b02aa2b71f1132091be47 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.h
+++ b/drivers/net/wireless/realtek/rtw89/fw.h
@@ -197,6 +197,7 @@ struct rtw89_h2creg_sch_tx_en {
 
 #define RTW89_H2C_MAX_SIZE 2048
 #define RTW89_CHANNEL_TIME 45
+#define RTW89_CHANNEL_TIME_6G 20
 #define RTW89_DFS_CHAN_TIME 105
 #define RTW89_OFF_CHAN_TIME 100
 #define RTW89_DWELL_TIME 20