Commit 5988b8ec authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2020-03-27' of... 

Merge tag 'iwlwifi-next-for-kalle-2020-03-27' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

Second set of iwlwifi patches intended for v5.7

* Refactoring of the device selection algorithms continues;
* Improvement in the initialization fo SoC-based devices;
* Support for FW scan API;
* Some additions to our FW debuggging capabilities;
* More refactoring of the device selection algorithms;
* Support new FW API version;
* Support for EDCA measurements;
* New scan API features;
* Enable new debugging code;
* Some other small fixes and clean-ups;
parents 3af4da16 84acc85a

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+74 −226
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
#include "iwl-prph.h"



/* Highest firmware API version supported */

#define IWL_22000_UCODE_API_MAX	52

#define IWL_22000_UCODE_API_MAX	53



/* Lowest firmware API version supported */

#define IWL_22000_UCODE_API_MIN	39
@@ -76,10 +76,8 @@ 
#define IWL_22000_JF_FW_PRE		"iwlwifi-Qu-a0-jf-b0-"

#define IWL_22000_HR_FW_PRE		"iwlwifi-Qu-a0-hr-a0-"

#define IWL_22000_HR_CDB_FW_PRE		"iwlwifi-QuIcp-z0-hrcdb-a0-"

#define IWL_22000_HR_A_F0_FW_PRE	"iwlwifi-QuQnj-f0-hr-a0-"

#define IWL_22000_QU_B_HR_B_FW_PRE	"iwlwifi-Qu-b0-hr-b0-"

#define IWL_22000_HR_B_FW_PRE		"iwlwifi-QuQnj-b0-hr-b0-"

#define IWL_22000_HR_A0_FW_PRE		"iwlwifi-QuQnj-a0-hr-a0-"

#define IWL_QU_C_HR_B_FW_PRE		"iwlwifi-Qu-c0-hr-b0-"

#define IWL_QU_B_JF_B_FW_PRE		"iwlwifi-Qu-b0-jf-b0-"

#define IWL_QU_C_JF_B_FW_PRE		"iwlwifi-Qu-c0-jf-b0-"
@@ -98,14 +96,10 @@ 
	IWL_22000_HR_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_JF_MODULE_FIRMWARE(api) \

	IWL_22000_JF_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(api) \

	IWL_22000_HR_A_F0_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_QU_B_HR_B_MODULE_FIRMWARE(api) \

	IWL_22000_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(api)	\

	IWL_22000_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(api) \

	IWL_22000_HR_A0_FW_PRE __stringify(api) ".ucode"

#define IWL_QUZ_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_QUZ_A_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_QUZ_A_JF_B_MODULE_FIRMWARE(api) \
@@ -235,6 +229,38 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
		},							\

	}



const struct iwl_cfg_trans_params iwl_qu_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,

	.gen2 = true,

	.device_family = IWL_DEVICE_FAMILY_22000,

	.base_params = &iwl_22000_base_params,

	.integrated = true,

	.xtal_latency = 5000,

};



const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,

	.gen2 = true,

	.device_family = IWL_DEVICE_FAMILY_22000,

	.base_params = &iwl_22000_base_params,

	.integrated = true,

	.xtal_latency = 12000,

	.low_latency_xtal = true,

};



const struct iwl_cfg_trans_params iwl_qnj_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,

	.gen2 = true,

	.device_family = IWL_DEVICE_FAMILY_22000,

	.base_params = &iwl_22000_base_params,

};



/*

 * If the device doesn't support HE, no need to have that many buffers.

 * 22000 devices can split multiple frames into a single RB, so fewer are
@@ -246,6 +272,47 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
#define IWL_NUM_RBDS_22000_HE		2048

#define IWL_NUM_RBDS_AX210_HE		4096



/*

 * All JF radio modules are part of the 9000 series, but the MAC part

 * looks more like 22000.  That's why this device is here, but called

 * 9560 nevertheless.

 */

const struct iwl_cfg iwl9560_qu_b0_jf_b0_cfg = {

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_qu_c0_jf_b0_cfg = {

	.fw_name_pre = IWL_QU_C_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_quz_a0_jf_b0_cfg = {

	.fw_name_pre = IWL_QUZ_A_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_qnj_b0_jf_b0_cfg = {

	.fw_name_pre = IWL_QNJ_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg_trans_params iwl_ax200_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_22000,

	.base_params = &iwl_22000_base_params,
@@ -380,184 +447,6 @@ const struct iwl_cfg iwl_ax200_cfg_cc = { 
	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



/*

 * All JF radio modules are part of the 9000 series, but the MAC part

 * looks more like 22000.  That's why this device is here, but called

 * 9560 nevertheless.

 */

const struct iwl_cfg iwl9461_2ac_cfg_qu_b0_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9461",

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9462_2ac_cfg_qu_b0_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9462",

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_2ac_cfg_qu_b0_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9560",

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_2ac_160_cfg_qu_b0_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9461_2ac_cfg_qu_c0_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9461",

	.fw_name_pre = IWL_QU_C_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9462_2ac_cfg_qu_c0_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9462",

	.fw_name_pre = IWL_QU_C_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_2ac_cfg_qu_c0_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9560",

	.fw_name_pre = IWL_QU_C_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_2ac_160_cfg_qu_c0_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL_QU_C_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL_QNJ_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL_QUZ_A_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.integrated = true,

	.soc_latency = 5000,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL_QUZ_A_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.integrated = true,

	.soc_latency = 5000,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9461_2ac_cfg_quz_a0_jf_b0_soc = {

	.name = "Intel(R) Dual Band Wireless AC 9461",

	.fw_name_pre = IWL_QUZ_A_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.integrated = true,

	.soc_latency = 5000,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9462_2ac_cfg_quz_a0_jf_b0_soc = {

	.name = "Intel(R) Dual Band Wireless AC 9462",

	.fw_name_pre = IWL_QUZ_A_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.integrated = true,

	.soc_latency = 5000,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_killer_s_2ac_cfg_quz_a0_jf_b0_soc = {

	.name = "Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)",

	.fw_name_pre = IWL_QUZ_A_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.integrated = true,

	.soc_latency = 5000,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_killer_i_2ac_cfg_quz_a0_jf_b0_soc = {

	.name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",

	.fw_name_pre = IWL_QUZ_A_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.integrated = true,

	.soc_latency = 5000,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg killer1550i_2ac_cfg_qu_b0_jf_b0 = {

	.name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg killer1550s_2ac_cfg_qu_b0_jf_b0 = {

	.name = "Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)",

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0 = {

	.name = "Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)",

	.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,
@@ -610,32 +499,6 @@ const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0 = { 
	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl22000_2ax_cfg_jf = {

	.name = "Intel(R) Dual Band Wireless AX 22000",

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0_f0 = {

	.name = "Intel(R) Dual Band Wireless AX 22000",

	.fw_name_pre = IWL_22000_HR_A_F0_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0 = {

	.name = "Intel(R) Dual Band Wireless AX 22000",

	.fw_name_pre = IWL_22000_HR_B_FW_PRE,
@@ -649,19 +512,6 @@ const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0 = { 
	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0 = {

	.name = "Intel(R) Dual Band Wireless AX 22000",

	.fw_name_pre = IWL_22000_HR_A0_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0 = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL_22000_SO_A_JF_B_FW_PRE,
@@ -710,9 +560,7 @@ const struct iwl_cfg iwlax411_2ax_cfg_sosnj_gf4_a0 = { 


MODULE_FIRMWARE(IWL_22000_HR_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_JF_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

drivers/net/wireless/intel/iwlwifi/cfg/9000.c

+18 −14
Original line number Diff line number Diff line
@@ -174,9 +174,23 @@ const struct iwl_cfg_trans_params iwl9000_trans_cfg = { 
	.rf_id = true,

};



const struct iwl_cfg iwl9260_2ac_cfg = {

	.fw_name_pre = IWL9260_FW_PRE,

	IWL_DEVICE_9000,

const struct iwl_cfg_trans_params iwl9560_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_9000,

	.base_params = &iwl9000_base_params,

	.mq_rx_supported = true,

	.rf_id = true,

	.integrated = true,

	.xtal_latency = 5000,

};



const struct iwl_cfg_trans_params iwl9560_shared_clk_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_9000,

	.base_params = &iwl9000_base_params,

	.mq_rx_supported = true,

	.rf_id = true,

	.integrated = true,

	.xtal_latency = 5000,

	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

};



const char iwl9162_name[] = "Intel(R) Wireless-AC 9162";
@@ -200,7 +214,7 @@ const char iwl9560_killer_1550i_name[] = 
const char iwl9560_killer_1550s_name[] =

	"Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)";



const struct iwl_cfg iwl9560_2ac_cfg = {

const struct iwl_cfg iwl9260_2ac_cfg = {

	.fw_name_pre = IWL9260_FW_PRE,

	IWL_DEVICE_9000,

};
@@ -208,16 +222,6 @@ const struct iwl_cfg iwl9560_2ac_cfg = { 
const struct iwl_cfg iwl9560_2ac_cfg_soc = {

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

};



const struct iwl_cfg iwl9560_2ac_cfg_shared_clk = {

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

};



MODULE_FIRMWARE(IWL9000_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));

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

+7 −2
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2012 - 2014, 2020 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -27,9 +27,9 @@ 
 *

 * BSD LICENSE

 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2012 - 2014, 2020 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -646,6 +646,11 @@ enum iwl_system_subcmd_ids { 
	 */

	SHARED_MEM_CFG_CMD = 0x0,



	/**

	 * @SOC_CONFIGURATION_CMD: &struct iwl_soc_configuration_cmd

	 */

	SOC_CONFIGURATION_CMD = 0x01,



	/**

	 * @INIT_EXTENDED_CFG_CMD: &struct iwl_init_extended_cfg_cmd

	 */

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

+6 −0
Original line number Diff line number Diff line
@@ -427,6 +427,9 @@ struct iwl_tof_range_req_ap_entry_v2 { 
 *	Default algo type is ML.

 * @IWL_INITIATOR_AP_FLAGS_MCSI_REPORT: Send the MCSI for each FTM frame to the

 *	driver.

 * @IWL_INITIATOR_AP_FLAGS_NON_TB: Use non trigger based flow

 * @IWL_INITIATOR_AP_FLAGS_TB: Use trigger based flow

 * @IWL_INITIATOR_AP_FLAGS_SECURED: request secured measurement

 */

enum iwl_initiator_ap_flags {

	IWL_INITIATOR_AP_FLAGS_ASAP = BIT(1),
@@ -436,6 +439,9 @@ enum iwl_initiator_ap_flags { 
	IWL_INITIATOR_AP_FLAGS_ALGO_LR = BIT(5),

	IWL_INITIATOR_AP_FLAGS_ALGO_FFT = BIT(6),

	IWL_INITIATOR_AP_FLAGS_MCSI_REPORT = BIT(8),

	IWL_INITIATOR_AP_FLAGS_NON_TB = BIT(9),

	IWL_INITIATOR_AP_FLAGS_TB = BIT(10),

	IWL_INITIATOR_AP_FLAGS_SECURED = BIT(11),

};



/**

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

+75 −8
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ struct iwl_ssid_ie { 
#define IWL_SCAN_MAX_BLACKLIST_LEN	64

#define IWL_SCAN_SHORT_BLACKLIST_LEN	16

#define IWL_SCAN_MAX_PROFILES		11

#define IWL_SCAN_MAX_PROFILES_V2	8

#define SCAN_OFFLOAD_PROBE_REQ_SIZE	512

#define SCAN_NUM_BAND_PROBE_DATA_V_1	2

#define SCAN_NUM_BAND_PROBE_DATA_V_2	3
@@ -160,8 +161,7 @@ struct iwl_scan_offload_profile { 
} __packed;



/**

 * struct iwl_scan_offload_profile_cfg - SCAN_OFFLOAD_PROFILES_CFG_API_S_VER_1

 * @profiles:		profiles to search for match

 * struct iwl_scan_offload_profile_cfg_data

 * @blacklist_len:	length of blacklist

 * @num_profiles:	num of profiles in the list

 * @match_notify:	clients waiting for match found notification
@@ -170,8 +170,7 @@ struct iwl_scan_offload_profile { 
 * @any_beacon_notify:	clients waiting for match notification without match

 * @reserved:		reserved

 */

struct iwl_scan_offload_profile_cfg {

	struct iwl_scan_offload_profile profiles[IWL_SCAN_MAX_PROFILES];

struct iwl_scan_offload_profile_cfg_data {

	u8 blacklist_len;

	u8 num_profiles;

	u8 match_notify;
@@ -181,6 +180,26 @@ struct iwl_scan_offload_profile_cfg { 
	u8 reserved[2];

} __packed;



/**

 * struct iwl_scan_offload_profile_cfg

 * @profiles:	profiles to search for match

 * @data:	the rest of the data for profile_cfg

 */

struct iwl_scan_offload_profile_cfg_v1 {

	struct iwl_scan_offload_profile profiles[IWL_SCAN_MAX_PROFILES];

	struct iwl_scan_offload_profile_cfg_data data;

} __packed; /* SCAN_OFFLOAD_PROFILES_CFG_API_S_VER_1-2*/



/**

 * struct iwl_scan_offload_profile_cfg

 * @profiles:	profiles to search for match

 * @data:	the rest of the data for profile_cfg

 */

struct iwl_scan_offload_profile_cfg {

	struct iwl_scan_offload_profile profiles[IWL_SCAN_MAX_PROFILES_V2];

	struct iwl_scan_offload_profile_cfg_data data;

} __packed; /* SCAN_OFFLOAD_PROFILES_CFG_API_S_VER_3*/



/**

 * struct iwl_scan_schedule_lmac - schedule of scan offload

 * @delay:		delay between iterations, in seconds.
@@ -702,13 +721,16 @@ struct iwl_scan_channel_cfg_umac { 
			u8 channel_num;

			u8 iter_count;

			__le16 iter_interval;

		} v1;  /* SCAN_CHANNEL_CFG_S_VER1 */

		} v1;  /* SCAN_CHANNEL_CONFIG_API_S_VER_1 */

		struct {

			u8 channel_num;

			u8 band;

			u8 iter_count;

			u8 iter_interval;

		 } v2; /* SCAN_CHANNEL_CFG_S_VER2 */

		 } v2; /* SCAN_CHANNEL_CONFIG_API_S_VER_2

			* SCAN_CHANNEL_CONFIG_API_S_VER_3

			* SCAN_CHANNEL_CONFIG_API_S_VER_4

			*/

	};

} __packed;
@@ -943,6 +965,25 @@ struct iwl_scan_channel_params_v4 { 
	u8 adwell_ch_override_bitmap[16];

} __packed; /* SCAN_CHANNEL_PARAMS_API_S_VER_4 also

	       SCAN_CHANNEL_PARAMS_API_S_VER_5 */



/**

 * struct iwl_scan_channel_params_v6

 * @flags: channel flags &enum iwl_scan_channel_flags

 * @count: num of channels in scan request

 * @n_aps_override: override the number of APs the FW uses to calculate dwell

 *	time when adaptive dwell is used.

 *	Channel k will use n_aps_override[i] when BIT(20 + i) is set in

 *	channel_config[k].flags

 * @channel_config: array of explicit channel configurations

 *                  for 2.4Ghz and 5.2Ghz bands

 */

struct iwl_scan_channel_params_v6 {

	u8 flags;

	u8 count;

	u8 n_aps_override[2];

	struct iwl_scan_channel_cfg_umac channel_config[SCAN_MAX_NUM_CHANS_V3];

} __packed; /* SCAN_CHANNEL_PARAMS_API_S_VER_6 */



/**

 * struct iwl_scan_general_params_v10

 * @flags: &enum iwl_umac_scan_flags
@@ -1023,6 +1064,20 @@ struct iwl_scan_req_params_v13 { 
	struct iwl_scan_probe_params_v4 probe_params;

} __packed; /* SCAN_REQUEST_PARAMS_API_S_VER_13 */



/**

 * struct iwl_scan_req_params_v14

 * @general_params: &struct iwl_scan_general_params_v10

 * @channel_params: &struct iwl_scan_channel_params_v6

 * @periodic_params: &struct iwl_scan_periodic_parms_v1

 * @probe_params: &struct iwl_scan_probe_params_v4

 */

struct iwl_scan_req_params_v14 {

	struct iwl_scan_general_params_v10 general_params;

	struct iwl_scan_channel_params_v6 channel_params;

	struct iwl_scan_periodic_parms_v1 periodic_params;

	struct iwl_scan_probe_params_v4 probe_params;

} __packed; /* SCAN_REQUEST_PARAMS_API_S_VER_14 */



/**

 * struct iwl_scan_req_umac_v12

 * @uid: scan id, &enum iwl_umac_scan_uid_offsets
@@ -1047,6 +1102,18 @@ struct iwl_scan_req_umac_v13 { 
	struct iwl_scan_req_params_v13 scan_params;

} __packed; /* SCAN_REQUEST_CMD_UMAC_API_S_VER_13 */



/**

 * struct iwl_scan_req_umac_v14

 * @uid: scan id, &enum iwl_umac_scan_uid_offsets

 * @ooc_priority: out of channel priority - &enum iwl_scan_priority

 * @scan_params: scan parameters

 */

struct iwl_scan_req_umac_v14 {

	__le32 uid;

	__le32 ooc_priority;

	struct iwl_scan_req_params_v14 scan_params;

} __packed; /* SCAN_REQUEST_CMD_UMAC_API_S_VER_14 */



/**

 * struct iwl_umac_scan_abort

 * @uid: scan id, &enum iwl_umac_scan_uid_offsets
@@ -1121,7 +1188,7 @@ struct iwl_scan_offload_profiles_query_v1 { 
	u8 resume_while_scanning;

	u8 self_recovery;

	__le16 reserved;

	struct iwl_scan_offload_profile_match_v1 matches[IWL_SCAN_MAX_PROFILES];

	struct iwl_scan_offload_profile_match_v1 matches[0];

} __packed; /* SCAN_OFFLOAD_PROFILES_QUERY_RSP_S_VER_2 */



/**
@@ -1165,7 +1232,7 @@ struct iwl_scan_offload_profiles_query { 
	u8 resume_while_scanning;

	u8 self_recovery;

	__le16 reserved;

	struct iwl_scan_offload_profile_match matches[IWL_SCAN_MAX_PROFILES];

	struct iwl_scan_offload_profile_match matches[0];

} __packed; /* SCAN_OFFLOAD_PROFILES_QUERY_RSP_S_VER_3 */



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE