Commit e8fe3b41 authored by Ilan Peer's avatar Ilan Peer Committed by Luca Coelho
Browse files

iwlwifi: mvm: Add support for 6GHz passive scan 



When doing scan while 6GHz channels are not enabled, the 6GHz band
is not scanned. Thus, if there are no APs on the 2GHz and 5GHz bands
(that will allow discovery of geographic location etc. that would
allow enabling the 6GHz channels) but there are non collocated APs
on 6GHz PSC channels these would never be discovered.

To overcome this, FW added support for performing passive UHB scan
in case no APs were discovered during scan on the 2GHz and 5GHz
channels.

Add support for enabling such scan when the following conditions are
met:

- 6GHz channels are supported but not enabled by regulatory.
- Station interface is not associated or less than a defined time
  interval passed from the last resume or HW reset flows.
- At least 4 channels are included in the scan request
- The scan request includes the widlcard SSID.
- At least 50 minutes passed from the last 6GHz passive scan.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210331121101.7c7bd00e0aeb.Ib226ad57e416b43a710c36a78a617d4243458b99@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 85b5fd94

drivers/net/wireless/intel/iwlwifi/fw/api/scan.h

+8 −0
Original line number Diff line number Diff line
@@ -634,6 +634,12 @@ enum iwl_umac_scan_general_flags2 { 
 * @IWL_UMAC_SCAN_GEN_FLAGS_V2_TRIGGER_UHB_SCAN: at the end of 2.4GHz and

 *		5.2Ghz bands scan, trigger scan on 6GHz band to discover

 *		the reported collocated APs

 * @IWL_UMAC_SCAN_GEN_FLAGS_V2_6GHZ_PASSIVE_SCAN: at the end of 2.4GHz and 5GHz

 *      bands scan, if not APs were discovered, allow scan to conitnue and scan

 *      6GHz PSC channels in order to discover country information.

 * @IWL_UMAC_SCAN_GEN_FLAGS_V2_6GHZ_PASSIVE_SCAN_FILTER_IN: in case

 *      &IWL_UMAC_SCAN_GEN_FLAGS_V2_6GHZ_PASSIVE_SCAN is enabled and scan is

 *      activated over 6GHz PSC channels, filter in beacons and probe responses.

 */

enum iwl_umac_scan_general_flags_v2 {

	IWL_UMAC_SCAN_GEN_FLAGS_V2_PERIODIC             = BIT(0),
@@ -649,6 +655,8 @@ enum iwl_umac_scan_general_flags_v2 { 
	IWL_UMAC_SCAN_GEN_FLAGS_V2_MULTI_SSID           = BIT(10),

	IWL_UMAC_SCAN_GEN_FLAGS_V2_FORCE_PASSIVE        = BIT(11),

	IWL_UMAC_SCAN_GEN_FLAGS_V2_TRIGGER_UHB_SCAN     = BIT(12),

	IWL_UMAC_SCAN_GEN_FLAGS_V2_6GHZ_PASSIVE_SCAN    = BIT(13),

	IWL_UMAC_SCAN_GEN_FLAGS_V2_6GHZ_PASSIVE_SCAN_FILTER_IN = BIT(14),

};



/**

drivers/net/wireless/intel/iwlwifi/fw/file.h

+3 −0
Original line number Diff line number Diff line
@@ -362,6 +362,8 @@ typedef unsigned int __bitwise iwl_ucode_tlv_capa_t; 
 * @IWL_UCODE_TLV_CAPA_PROTECTED_TWT: Supports protection of TWT action frames

 * @IWL_UCODE_TLV_CAPA_FW_RESET_HANDSHAKE: Supports the firmware handshake in

 *	reset flow

 * @IWL_UCODE_TLV_CAPA_PASSIVE_6GHZ_SCAN: Support for passive scan on 6GHz PSC

 *      channels even when these are not enabled.

 *

 * @NUM_IWL_UCODE_TLV_CAPA: number of bits used

 */
@@ -408,6 +410,7 @@ enum iwl_ucode_tlv_capa { 
	IWL_UCODE_TLV_CAPA_SESSION_PROT_CMD		= (__force iwl_ucode_tlv_capa_t)54,

	IWL_UCODE_TLV_CAPA_PROTECTED_TWT		= (__force iwl_ucode_tlv_capa_t)56,

	IWL_UCODE_TLV_CAPA_FW_RESET_HANDSHAKE		= (__force iwl_ucode_tlv_capa_t)57,

	IWL_UCODE_TLV_CAPA_PASSIVE_6GHZ_SCAN		= (__force iwl_ucode_tlv_capa_t)58,



	/* set 2 */

	IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE		= (__force iwl_ucode_tlv_capa_t)64,

drivers/net/wireless/intel/iwlwifi/mvm/constants.h

+2 −0
Original line number Diff line number Diff line
@@ -117,5 +117,7 @@ 
#define IWL_MVM_FTM_INITIATOR_SMOOTH_OVERSHOOT  20016

#define IWL_MVM_FTM_INITIATOR_SMOOTH_AGE_SEC    2

#define IWL_MVM_DISABLE_AP_FILS			false

#define IWL_MVM_6GHZ_PASSIVE_SCAN_TIMEOUT       3000 /* in seconds */

#define IWL_MVM_6GHZ_PASSIVE_SCAN_ASSOC_TIMEOUT 60   /* in seconds */



#endif /* __MVM_CONSTANTS_H */

drivers/net/wireless/intel/iwlwifi/mvm/d3.c

+2 −0
Original line number Diff line number Diff line
@@ -2028,6 +2028,8 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test) 


	mutex_lock(&mvm->mutex);



	mvm->last_reset_or_resume_time_jiffies = jiffies;



	/* get the BSS vif pointer again */

	vif = iwl_mvm_get_bss_vif(mvm);

	if (IS_ERR_OR_NULL(vif))

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+2 −0
Original line number Diff line number Diff line
@@ -1099,6 +1099,8 @@ int __iwl_mvm_mac_start(struct iwl_mvm *mvm) 
	iwl_dbg_tlv_time_point(&mvm->fwrt, IWL_FW_INI_TIME_POINT_PERIODIC,

			       NULL);



	mvm->last_reset_or_resume_time_jiffies = jiffies;



	if (ret && test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) {

		/* Something went wrong - we need to finish some cleanup

		 * that normally iwl_mvm_mac_restart_complete() below