I had to revert this patch in my 5.17+ kernel (with 5.18-ish iwlwifi patches backported)
to get the station to properly scan and connect to a vendor's AP.
I got zero response to my earlier email about that regression.
I think this is not something that should be added to stable builds at this time.
Thanks,
Ben
On 4/1/22 7:24 AM, Sasha Levin wrote:
> From: Ilan Peer <[email protected]>
>
> [ Upstream commit 9966904e9472703a05861f343157cd78f47514fd ]
>
> Non PSC channels should generally be scanned based on information about
> collocated APs obtained during scan on legacy bands, and otherwise
> should not be scanned unless specifically requested so (as there are
> relatively many non PSC channels, scanning them passively is time consuming
> and interferes with regular data traffic).
>
> Thus, modify the scan logic to avoid passively scanning PSC channels
> if there is no information about collocated APs and the scan is not
> a passive scan.
>
> Signed-off-by: Ilan Peer <[email protected]>
> Signed-off-by: Luca Coelho <[email protected]>
> Link: https://lore.kernel.org/r/iwlwifi.20220204122220.457da4cc95eb.Ic98472bab5f5475f1e102547644caaae89ce4c4a@changeid
> Signed-off-by: Luca Coelho <[email protected]>
> Signed-off-by: Sasha Levin <[email protected]>
> ---
> drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 42 ++++++++++++++-----
> 1 file changed, 32 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
> index 4cd507cb412d..630cfb64c6b1 100644
> --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
> +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
> @@ -1735,27 +1735,37 @@ iwl_mvm_umac_scan_fill_6g_chan_list(struct iwl_mvm *mvm,
> }
>
> /* TODO: this function can be merged with iwl_mvm_scan_umac_fill_ch_p_v6 */
> -static void
> -iwl_mvm_umac_scan_cfg_channels_v6_6g(struct iwl_mvm_scan_params *params,
> +static u32
> +iwl_mvm_umac_scan_cfg_channels_v6_6g(struct iwl_mvm *mvm,
> + struct iwl_mvm_scan_params *params,
> u32 n_channels,
> struct iwl_scan_probe_params_v4 *pp,
> struct iwl_scan_channel_params_v6 *cp,
> enum nl80211_iftype vif_type)
> {
> - struct iwl_scan_channel_cfg_umac *channel_cfg = cp->channel_config;
> int i;
> struct cfg80211_scan_6ghz_params *scan_6ghz_params =
> params->scan_6ghz_params;
> + u32 ch_cnt;
>
> - for (i = 0; i < params->n_channels; i++) {
> + for (i = 0, ch_cnt = 0; i < params->n_channels; i++) {
> struct iwl_scan_channel_cfg_umac *cfg =
> - &cp->channel_config[i];
> + &cp->channel_config[ch_cnt];
>
> u32 s_ssid_bitmap = 0, bssid_bitmap = 0, flags = 0;
> u8 j, k, s_max = 0, b_max = 0, n_used_bssid_entries;
> bool force_passive, found = false, allow_passive = true,
> unsolicited_probe_on_chan = false, psc_no_listen = false;
>
> + /*
> + * Avoid performing passive scan on non PSC channels unless the
> + * scan is specifically a passive scan, i.e., no SSIDs
> + * configured in the scan command.
> + */
> + if (!cfg80211_channel_is_psc(params->channels[i]) &&
> + !params->n_6ghz_params && params->n_ssids)
> + continue;
> +
> cfg->v1.channel_num = params->channels[i]->hw_value;
> cfg->v2.band = 2;
> cfg->v2.iter_count = 1;
> @@ -1875,8 +1885,16 @@ iwl_mvm_umac_scan_cfg_channels_v6_6g(struct iwl_mvm_scan_params *params,
> else
> flags |= bssid_bitmap | (s_ssid_bitmap << 16);
>
> - channel_cfg[i].flags |= cpu_to_le32(flags);
> + cfg->flags |= cpu_to_le32(flags);
> + ch_cnt++;
> }
> +
> + if (params->n_channels > ch_cnt)
> + IWL_DEBUG_SCAN(mvm,
> + "6GHz: reducing number channels: (%u->%u)\n",
> + params->n_channels, ch_cnt);
> +
> + return ch_cnt;
> }
>
> static u8 iwl_mvm_scan_umac_chan_flags_v2(struct iwl_mvm *mvm,
> @@ -2424,10 +2442,14 @@ static int iwl_mvm_scan_umac_v14_and_above(struct iwl_mvm *mvm,
> if (ret)
> return ret;
>
> - iwl_mvm_umac_scan_cfg_channels_v6_6g(params,
> - params->n_channels,
> - pb, cp, vif->type);
> - cp->count = params->n_channels;
> + cp->count = iwl_mvm_umac_scan_cfg_channels_v6_6g(mvm, params,
> + params->n_channels,
> + pb, cp, vif->type);
> + if (!cp->count) {
> + mvm->scan_uid_status[uid] = 0;
> + return -EINVAL;
> + }
> +
> if (!params->n_ssids ||
> (params->n_ssids == 1 && !params->ssids[0].ssid_len))
> cp->flags |= IWL_SCAN_CHANNEL_FLAG_6G_PSC_NO_FILTER;
>
--
Ben Greear <[email protected]>
Candela Technologies Inc http://www.candelatech.com