Commit 197b9c15 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2021-04-12-v2' of... 

Merge tag 'iwlwifi-next-for-kalle-2021-04-12-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

iwlwifi patches for v5.13

* Add support for new FTM FW APIs;
* Some CSA fixes;
* Support for new HW family and other HW detection fixes;
* Robustness improvement in the HW detection code;
* One fix in PMF;
* Some new regulatory features;
* Support for passive scan in 6GHz;
* Some improvements in the sync queue implementation;
* Support for new devices;
* Support for a new FW API command version;
* Some locking fixes;
* Bump the FW API version support for AX devices;
* Some other small fixes, clean-ups and improvements.

# gpg: Signature made Wed 14 Apr 2021 12:33:29 PM EEST using RSA key ID 1A3CC5FA
# gpg: Good signature from "Luciano Roth Coelho (Luca) <luca@coelho.fi>"
# gpg:                 aka "Luciano Roth Coelho (Intel) <luciano.coelho@intel.com>"
parents 961b27ff 7c81a025

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

+67 −5
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include "iwl-prph.h"



/* Highest firmware API version supported */

#define IWL_22000_UCODE_API_MAX	62

#define IWL_22000_UCODE_API_MAX	63



/* Lowest firmware API version supported */

#define IWL_22000_UCODE_API_MIN	39
@@ -48,6 +48,10 @@ 
#define IWL_MA_A_GF4_A_FW_PRE		"iwlwifi-ma-a0-gf4-a0-"

#define IWL_MA_A_MR_A_FW_PRE		"iwlwifi-ma-a0-mr-a0-"

#define IWL_SNJ_A_MR_A_FW_PRE		"iwlwifi-SoSnj-a0-mr-a0-"

#define IWL_BZ_A_HR_B_FW_PRE		"iwlwifi-bz-a0-hr-b0-"

#define IWL_BZ_A_GF_A_FW_PRE		"iwlwifi-bz-a0-gf-a0-"

#define IWL_BZ_A_GF4_A_FW_PRE		"iwlwifi-bz-a0-gf4-a0-"

#define IWL_BZ_A_MR_A_FW_PRE		"iwlwifi-bz-a0-mr-a0-"



#define IWL_QU_B_HR_B_MODULE_FIRMWARE(api) \

	IWL_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"
@@ -91,6 +95,14 @@ 
	IWL_MA_A_MR_A_FW_PRE __stringify(api) ".ucode"

#define IWL_SNJ_A_MR_A_MODULE_FIRMWARE(api) \

	IWL_SNJ_A_MR_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_BZ_A_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_A_GF_A_MODULE_FIRMWARE(api) \

	IWL_BZ_A_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_A_GF4_A_MODULE_FIRMWARE(api) \

	IWL_BZ_A_GF4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_A_MR_A_MODULE_FIRMWARE(api) \

	IWL_BZ_A_MR_A_FW_PRE __stringify(api) ".ucode"



static const struct iwl_base_params iwl_22000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
@@ -357,13 +369,27 @@ const struct iwl_cfg_trans_params iwl_ma_trans_cfg = { 
	.umac_prph_offset = 0x300000

};



const struct iwl_cfg_trans_params iwl_bz_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_AX210,

	.base_params = &iwl_ax210_base_params,

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,

	.gen2 = true,

	.integrated = true,

	.umac_prph_offset = 0x300000,

	.xtal_latency = 12000,

	.low_latency_xtal = true,

	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,

};



const char iwl_ax101_name[] = "Intel(R) Wi-Fi 6 AX101";

const char iwl_ax200_name[] = "Intel(R) Wi-Fi 6 AX200 160MHz";

const char iwl_ax201_name[] = "Intel(R) Wi-Fi 6 AX201 160MHz";

const char iwl_ax203_name[] = "Intel(R) Wi-Fi 6 AX203";

const char iwl_ax211_name[] = "Intel(R) Wi-Fi 6 AX211 160MHz";

const char iwl_ax411_name[] = "Intel(R) Wi-Fi 6 AX411 160MHz";

const char iwl_ma_name[] = "Intel(R) Wi-Fi 6";

const char iwl_ax211_name[] = "Intel(R) Wi-Fi 6E AX211 160MHz";

const char iwl_ax221_name[] = "Intel(R) Wi-Fi 6E AX221 160MHz";

const char iwl_ax411_name[] = "Intel(R) Wi-Fi 6E AX411 160MHz";



const char iwl_ax200_killer_1650w_name[] =

	"Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W)";
@@ -373,6 +399,10 @@ const char iwl_ax201_killer_1650s_name[] = 
	"Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W)";

const char iwl_ax201_killer_1650i_name[] =

	"Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)";

const char iwl_ax210_killer_1675w_name[] =

	"Killer(R) Wi-Fi 6E AX1675w 160MHz Wireless Network Adapter (210D2W)";

const char iwl_ax210_killer_1675x_name[] =

	"Killer(R) Wi-Fi 6E AX1675x 160MHz Wireless Network Adapter (210NGW)";



const struct iwl_cfg iwl_qu_b0_hr1_b0 = {

	.fw_name_pre = IWL_QU_B_HR_B_FW_PRE,
@@ -578,7 +608,7 @@ const struct iwl_cfg iwl_qnj_b0_hr_b0_cfg = { 
	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0 = {

const struct iwl_cfg iwlax210_2ax_cfg_so_jf_b0 = {

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

	.fw_name_pre = IWL_SO_A_JF_B_FW_PRE,

	IWL_DEVICE_AX210,
@@ -719,6 +749,34 @@ const struct iwl_cfg iwl_cfg_quz_a0_hr_b0 = { 
	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl_cfg_bz_a0_hr_b0 = {

	.fw_name_pre = IWL_BZ_A_HR_B_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_a0_gf_a0 = {

	.fw_name_pre = IWL_BZ_A_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_a0_gf4_a0 = {

	.fw_name_pre = IWL_BZ_A_GF4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_a0_mr_a0 = {

	.fw_name_pre = IWL_BZ_A_MR_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



MODULE_FIRMWARE(IWL_QU_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QNJ_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
@@ -740,3 +798,7 @@ MODULE_FIRMWARE(IWL_MA_A_GF_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); 
MODULE_FIRMWARE(IWL_MA_A_GF4_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_MA_A_MR_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SNJ_A_MR_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_GF4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_MR_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ const char iwl9462_160_name[] = "Intel(R) Wireless-AC 9462 160MHz"; 
const char iwl9560_160_name[] = "Intel(R) Wireless-AC 9560 160MHz";



const char iwl9260_killer_1550_name[] =

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

	"Killer (R) Wireless-AC 1550 Wireless Network Adapter (9260NGW) 160MHz";

const char iwl9560_killer_1550i_name[] =

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

const char iwl9560_killer_1550s_name[] =

drivers/net/wireless/intel/iwlwifi/fw/acpi.c

+72 −6
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/*

 * Copyright (C) 2017 Intel Deutschland GmbH

 * Copyright (C) 2019-2020 Intel Corporation

 * Copyright (C) 2019-2021 Intel Corporation

 */

#include <linux/uuid.h>

#include "iwl-drv.h"
@@ -181,14 +181,13 @@ union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev, 
	/*

	 * We need at least two packages, one for the revision and one

	 * for the data itself.  Also check that the revision is valid

	 * (i.e. it is an integer smaller than 2, as we currently support only

	 * 2 revisions).

	 * (i.e. it is an integer (each caller has to check by itself

	 * if the returned revision is supported)).

	 */

	if (data->type != ACPI_TYPE_PACKAGE ||

	    data->package.count < 2 ||

	    data->package.elements[0].type != ACPI_TYPE_INTEGER ||

	    data->package.elements[0].integer.value > 1) {

		IWL_DEBUG_DEV_RADIO(dev, "Unsupported packages structure\n");

	    data->package.elements[0].type != ACPI_TYPE_INTEGER) {

		IWL_DEBUG_DEV_RADIO(dev, "Invalid packages structure\n");

		return ERR_PTR(-EINVAL);

	}
@@ -696,3 +695,70 @@ int iwl_sar_geo_init(struct iwl_fw_runtime *fwrt, 
	return 0;

}

IWL_EXPORT_SYMBOL(iwl_sar_geo_init);



static u32 iwl_acpi_eval_dsm_func(struct device *dev, enum iwl_dsm_funcs_rev_0 eval_func)

{

	union acpi_object *obj;

	u32 ret;



	obj = iwl_acpi_get_dsm_object(dev, 0,

				      eval_func, NULL,

				      &iwl_guid);



	if (IS_ERR(obj)) {

		IWL_DEBUG_DEV_RADIO(dev,

				    "ACPI: DSM func '%d': Got Error in obj = %ld\n",

				    eval_func,

				    PTR_ERR(obj));

		return 0;

	}



	if (obj->type != ACPI_TYPE_INTEGER) {

		IWL_DEBUG_DEV_RADIO(dev,

				    "ACPI: DSM func '%d' did not return a valid object, type=%d\n",

				    eval_func,

				    obj->type);

		ret = 0;

		goto out;

	}



	ret = obj->integer.value;

	IWL_DEBUG_DEV_RADIO(dev,

			    "ACPI: DSM method evaluated: func='%d', ret=%d\n",

			    eval_func,

			    ret);

out:

	ACPI_FREE(obj);

	return ret;

}



__le32 iwl_acpi_get_lari_config_bitmap(struct iwl_fw_runtime *fwrt)

{

	u32 ret;

	__le32 config_bitmap = 0;



	/*

	 ** Evaluate func 'DSM_FUNC_ENABLE_INDONESIA_5G2'

	 */

	ret = iwl_acpi_eval_dsm_func(fwrt->dev, DSM_FUNC_ENABLE_INDONESIA_5G2);



	if (ret == DSM_VALUE_INDONESIA_ENABLE)

		config_bitmap |=

			cpu_to_le32(LARI_CONFIG_ENABLE_5G2_IN_INDONESIA_MSK);



	/*

	 ** Evaluate func 'DSM_FUNC_DISABLE_SRD'

	 */

	ret = iwl_acpi_eval_dsm_func(fwrt->dev, DSM_FUNC_DISABLE_SRD);



	if (ret == DSM_VALUE_SRD_PASSIVE)

		config_bitmap |=

			cpu_to_le32(LARI_CONFIG_CHANGE_ETSI_TO_PASSIVE_MSK);



	else if (ret == DSM_VALUE_SRD_DISABLE)

		config_bitmap |=

			cpu_to_le32(LARI_CONFIG_CHANGE_ETSI_TO_DISABLED_MSK);



	return config_bitmap;

}

IWL_EXPORT_SYMBOL(iwl_acpi_get_lari_config_bitmap);

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

+11 −2
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ 


#define ACPI_WGDS_TABLE_SIZE		3



#define ACPI_PPAG_WIFI_DATA_SIZE	((IWL_NUM_CHAIN_LIMITS * \

					  IWL_NUM_SUB_BANDS) + 2)

#define ACPI_PPAG_WIFI_DATA_SIZE_V1	((IWL_NUM_CHAIN_LIMITS * \

					  IWL_NUM_SUB_BANDS_V1) + 2)

#define ACPI_PPAG_WIFI_DATA_SIZE_V2	((IWL_NUM_CHAIN_LIMITS * \

					  IWL_NUM_SUB_BANDS_V2) + 2)
@@ -77,6 +77,7 @@ enum iwl_dsm_funcs_rev_0 { 
	DSM_FUNC_QUERY = 0,

	DSM_FUNC_DISABLE_SRD = 1,

	DSM_FUNC_ENABLE_INDONESIA_5G2 = 2,

	DSM_FUNC_11AX_ENABLEMENT = 6,

};



enum iwl_dsm_values_srd {
@@ -160,6 +161,8 @@ int iwl_sar_geo_init(struct iwl_fw_runtime *fwrt, 
int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, __le32 *block_list_array,

		     int *block_list_size);



__le32 iwl_acpi_get_lari_config_bitmap(struct iwl_fw_runtime *fwrt);



#else /* CONFIG_ACPI */



static inline void *iwl_acpi_get_object(struct device *dev, acpi_string method)
@@ -235,5 +238,11 @@ static inline int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, 
{

	return -ENOENT;

}



static inline __le32 iwl_acpi_get_lari_config_bitmap(struct iwl_fw_runtime *fwrt)

{

	return 0;

}



#endif /* CONFIG_ACPI */

#endif /* __iwl_fw_acpi__ */

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

+169 −4
Original line number Diff line number Diff line
@@ -147,6 +147,10 @@ enum iwl_tof_mcsi_enable { 
 * @IWL_TOF_RESPONDER_CMD_VALID_RETRY_ON_ALGO_FAIL: retry on algorithm failure

 *	is valid

 * @IWL_TOF_RESPONDER_CMD_VALID_STA_ID: station ID is valid

 * @IWL_TOF_RESPONDER_CMD_VALID_NDP_SUPPORT: enable/disable NDP ranging support

 *	is valid

 * @IWL_TOF_RESPONDER_CMD_VALID_NDP_PARAMS: NDP parameters are valid

 * @IWL_TOF_RESPONDER_CMD_VALID_LMR_FEEDBACK: LMR feedback support is valid

 */

enum iwl_tof_responder_cmd_valid_field {

	IWL_TOF_RESPONDER_CMD_VALID_CHAN_INFO = BIT(0),
@@ -162,6 +166,9 @@ enum iwl_tof_responder_cmd_valid_field { 
	IWL_TOF_RESPONDER_CMD_VALID_FAST_ALGO_SUPPORT = BIT(10),

	IWL_TOF_RESPONDER_CMD_VALID_RETRY_ON_ALGO_FAIL = BIT(11),

	IWL_TOF_RESPONDER_CMD_VALID_STA_ID = BIT(12),

	IWL_TOF_RESPONDER_CMD_VALID_NDP_SUPPORT = BIT(22),

	IWL_TOF_RESPONDER_CMD_VALID_NDP_PARAMS = BIT(23),

	IWL_TOF_RESPONDER_CMD_VALID_LMR_FEEDBACK = BIT(24),

};



/**
@@ -176,6 +183,9 @@ enum iwl_tof_responder_cmd_valid_field { 
 * @IWL_TOF_RESPONDER_FLAGS_FAST_ALGO_SUPPORT: fast algorithm support

 * @IWL_TOF_RESPONDER_FLAGS_RETRY_ON_ALGO_FAIL: retry on algorithm fail

 * @IWL_TOF_RESPONDER_FLAGS_FTM_TX_ANT: TX antenna mask

 * @IWL_TOF_RESPONDER_FLAGS_NDP_SUPPORT: support NDP ranging

 * @IWL_TOF_RESPONDER_FLAGS_LMR_FEEDBACK: request for LMR feedback if the

 *	initiator supports it

 */

enum iwl_tof_responder_cfg_flags {

	IWL_TOF_RESPONDER_FLAGS_NON_ASAP_SUPPORT = BIT(0),
@@ -188,6 +198,8 @@ enum iwl_tof_responder_cfg_flags { 
	IWL_TOF_RESPONDER_FLAGS_FAST_ALGO_SUPPORT = BIT(9),

	IWL_TOF_RESPONDER_FLAGS_RETRY_ON_ALGO_FAIL = BIT(10),

	IWL_TOF_RESPONDER_FLAGS_FTM_TX_ANT = RATE_MCS_ANT_ABC_MSK,

	IWL_TOF_RESPONDER_FLAGS_NDP_SUPPORT = BIT(24),

	IWL_TOF_RESPONDER_FLAGS_LMR_FEEDBACK = BIT(25),

};



/**
@@ -226,7 +238,7 @@ struct iwl_tof_responder_config_cmd_v6 { 
} __packed; /* TOF_RESPONDER_CONFIG_CMD_API_S_VER_6 */



/**

 * struct iwl_tof_responder_config_cmd - ToF AP mode (for debug)

 * struct iwl_tof_responder_config_cmd_v7 - ToF AP mode (for debug)

 * @cmd_valid_fields: &iwl_tof_responder_cmd_valid_field

 * @responder_cfg_flags: &iwl_tof_responder_cfg_flags

 * @format_bw: bits 0 - 3: &enum iwl_location_frame_format.
@@ -245,7 +257,7 @@ struct iwl_tof_responder_config_cmd_v6 { 
 * @bssid: Current AP BSSID

 * @reserved2: reserved

 */

struct iwl_tof_responder_config_cmd {

struct iwl_tof_responder_config_cmd_v7 {

	__le32 cmd_valid_fields;

	__le32 responder_cfg_flags;

	u8 format_bw;
@@ -259,7 +271,56 @@ struct iwl_tof_responder_config_cmd { 
	__le16 specific_calib;

	u8 bssid[ETH_ALEN];

	__le16 reserved2;

} __packed; /* TOF_RESPONDER_CONFIG_CMD_API_S_VER_6 */

} __packed; /* TOF_RESPONDER_CONFIG_CMD_API_S_VER_7 */



#define IWL_RESPONDER_STS_POS	3

#define IWL_RESPONDER_TOTAL_LTF_POS	6



/**

 * struct iwl_tof_responder_config_cmd_v8 - ToF AP mode (for debug)

 * @cmd_valid_fields: &iwl_tof_responder_cmd_valid_field

 * @responder_cfg_flags: &iwl_tof_responder_cfg_flags

 * @format_bw: bits 0 - 3: &enum iwl_location_frame_format.

 *             bits 4 - 7: &enum iwl_location_bw.

 * @rate: current AP rate

 * @channel_num: current AP Channel

 * @ctrl_ch_position: coding of the control channel position relative to

 *	the center frequency, see iwl_mvm_get_ctrl_pos()

 * @sta_id: index of the AP STA when in AP mode

 * @reserved1: reserved

 * @toa_offset: Artificial addition [pSec] for the ToA - to be used for debug

 *	purposes, simulating station movement by adding various values

 *	to this field

 * @common_calib: XVT: common calibration value

 * @specific_calib: XVT: specific calibration value

 * @bssid: Current AP BSSID

 * @r2i_ndp_params: parameters for R2I NDP.

 *	bits 0 - 2: max number of LTF repetitions

 *	bits 3 - 5: max number of spatial streams (supported values are < 2)

 *	bits 6 - 7: max number of total LTFs

 *		    (&enum ieee80211_range_params_max_total_ltf)

 * @i2r_ndp_params: parameters for I2R NDP.

 *	bits 0 - 2: max number of LTF repetitions

 *	bits 3 - 5: max number of spatial streams

 *	bits 6 - 7: max number of total LTFs

 *		    (&enum ieee80211_range_params_max_total_ltf)

 */

struct iwl_tof_responder_config_cmd_v8 {

	__le32 cmd_valid_fields;

	__le32 responder_cfg_flags;

	u8 format_bw;

	u8 rate;

	u8 channel_num;

	u8 ctrl_ch_position;

	u8 sta_id;

	u8 reserved1;

	__le16 toa_offset;

	__le16 common_calib;

	__le16 specific_calib;

	u8 bssid[ETH_ALEN];

	u8 r2i_ndp_params;

	u8 i2r_ndp_params;

} __packed; /* TOF_RESPONDER_CONFIG_CMD_API_S_VER_8 */



#define IWL_LCI_CIVIC_IE_MAX_SIZE	400
@@ -422,10 +483,12 @@ struct iwl_tof_range_req_ap_entry_v2 { 
 *	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

 * @IWL_INITIATOR_AP_FLAGS_SECURED: request secure LTF measurement

 * @IWL_INITIATOR_AP_FLAGS_LMR_FEEDBACK: Send LMR feedback

 * @IWL_INITIATOR_AP_FLAGS_USE_CALIB: Use calibration values from the request

 *      instead of fw internal values.

 * @IWL_INITIATOR_AP_FLAGS_PMF: request to protect the negotiation and LMR

 *      frames with protected management frames.

 */

enum iwl_initiator_ap_flags {

	IWL_INITIATOR_AP_FLAGS_ASAP = BIT(1),
@@ -440,6 +503,7 @@ enum iwl_initiator_ap_flags { 
	IWL_INITIATOR_AP_FLAGS_SECURED = BIT(11),

	IWL_INITIATOR_AP_FLAGS_LMR_FEEDBACK = BIT(12),

	IWL_INITIATOR_AP_FLAGS_USE_CALIB = BIT(13),

	IWL_INITIATOR_AP_FLAGS_PMF = BIT(14),

};



/**
@@ -657,6 +721,79 @@ struct iwl_tof_range_req_ap_entry_v7 { 
	u8 tx_pn[IEEE80211_CCMP_PN_LEN];

} __packed; /* LOCATION_RANGE_REQ_AP_ENTRY_CMD_API_S_VER_7 */



#define IWL_LOCATION_MAX_STS_POS	3



/**

 * struct iwl_tof_range_req_ap_entry_v8 - AP configuration parameters

 * @initiator_ap_flags: see &enum iwl_initiator_ap_flags.

 * @channel_num: AP Channel number

 * @format_bw: bits 0 - 3: &enum iwl_location_frame_format.

 *             bits 4 - 7: &enum iwl_location_bw.

 * @ctrl_ch_position: Coding of the control channel position relative to the

 *	center frequency, see iwl_mvm_get_ctrl_pos().

 * @ftmr_max_retries: Max number of retries to send the FTMR in case of no

 *	reply from the AP.

 * @bssid: AP's BSSID

 * @burst_period: Recommended value to be sent to the AP. Measurement

 *	periodicity In units of 100ms. ignored if num_of_bursts_exp = 0

 * @samples_per_burst: the number of FTMs pairs in single Burst (1-31);

 * @num_of_bursts: Recommended value to be sent to the AP. 2s Exponent of

 *	the number of measurement iterations (min 2^0 = 1, max 2^14)

 * @sta_id: the station id of the AP. Only relevant when associated to the AP,

 *	otherwise should be set to &IWL_MVM_INVALID_STA.

 * @cipher: pairwise cipher suite for secured measurement.

 *          &enum iwl_location_cipher.

 * @hltk: HLTK to be used for secured 11az measurement

 * @tk: TK to be used for secured 11az measurement

 * @calib: An array of calibration values per FTM rx bandwidth.

 *         If &IWL_INITIATOR_AP_FLAGS_USE_CALIB is set, the fw will use the

 *         calibration value that corresponds to the rx bandwidth of the FTM

 *         frame.

 * @beacon_interval: beacon interval of the AP in TUs. Only required if

 *	&IWL_INITIATOR_AP_FLAGS_TB is set.

 * @rx_pn: the next expected PN for protected management frames Rx. LE byte

 *	order. Only valid if &IWL_INITIATOR_AP_FLAGS_SECURED is set and sta_id

 *	is set to &IWL_MVM_INVALID_STA.

 * @tx_pn: the next PN to use for protected management frames Tx. LE byte

 *	order. Only valid if &IWL_INITIATOR_AP_FLAGS_SECURED is set and sta_id

 *	is set to &IWL_MVM_INVALID_STA.

 * @r2i_ndp_params: parameters for R2I NDP ranging negotiation.

 *      bits 0 - 2: max LTF repetitions

 *      bits 3 - 5: max number of spatial streams

 *      bits 6 - 7: reserved

 * @i2r_ndp_params: parameters for I2R NDP ranging negotiation.

 *      bits 0 - 2: max LTF repetitions

 *      bits 3 - 5: max number of spatial streams (supported values are < 2)

 *      bits 6 - 7: reserved

 * @r2i_max_total_ltf: R2I Max Total LTFs for NDP ranging negotiation.

 *      One of &enum ieee80211_range_params_max_total_ltf.

 * @i2r_max_total_ltf: I2R Max Total LTFs for NDP ranging negotiation.

 *      One of &enum ieee80211_range_params_max_total_ltf.

 */

struct iwl_tof_range_req_ap_entry_v8 {

	__le32 initiator_ap_flags;

	u8 channel_num;

	u8 format_bw;

	u8 ctrl_ch_position;

	u8 ftmr_max_retries;

	u8 bssid[ETH_ALEN];

	__le16 burst_period;

	u8 samples_per_burst;

	u8 num_of_bursts;

	u8 sta_id;

	u8 cipher;

	u8 hltk[HLTK_11AZ_LEN];

	u8 tk[TK_11AZ_LEN];

	__le16 calib[IWL_TOF_BW_NUM];

	__le16 beacon_interval;

	u8 rx_pn[IEEE80211_CCMP_PN_LEN];

	u8 tx_pn[IEEE80211_CCMP_PN_LEN];

	u8 r2i_ndp_params;

	u8 i2r_ndp_params;

	u8 r2i_max_total_ltf;

	u8 i2r_max_total_ltf;

} __packed; /* LOCATION_RANGE_REQ_AP_ENTRY_CMD_API_S_VER_8 */



/**

 * enum iwl_tof_response_mode

 * @IWL_MVM_TOF_RESPONSE_ASAP: report each AP measurement separately as soon as
@@ -878,6 +1015,34 @@ struct iwl_tof_range_req_cmd_v11 { 
	struct iwl_tof_range_req_ap_entry_v7 ap[IWL_MVM_TOF_MAX_APS];

} __packed; /* LOCATION_RANGE_REQ_CMD_API_S_VER_11 */



/**

 * struct iwl_tof_range_req_cmd_v12 - start measurement cmd

 * @initiator_flags: see flags @ iwl_tof_initiator_flags

 * @request_id: A Token incremented per request. The same Token will be

 *		sent back in the range response

 * @num_of_ap: Number of APs to measure (error if > IWL_MVM_TOF_MAX_APS)

 * @range_req_bssid: ranging request BSSID

 * @macaddr_mask: Bits set to 0 shall be copied from the MAC address template.

 *		  Bits set to 1 shall be randomized by the UMAC

 * @macaddr_template: MAC address template to use for non-randomized bits

 * @req_timeout_ms: Requested timeout of the response in units of milliseconds.

 *	This is the session time for completing the measurement.

 * @tsf_mac_id: report the measurement start time for each ap in terms of the

 *	TSF of this mac id. 0xff to disable TSF reporting.

 * @ap: per-AP request data, see &struct iwl_tof_range_req_ap_entry_v2.

 */

struct iwl_tof_range_req_cmd_v12 {

	__le32 initiator_flags;

	u8 request_id;

	u8 num_of_ap;

	u8 range_req_bssid[ETH_ALEN];

	u8 macaddr_mask[ETH_ALEN];

	u8 macaddr_template[ETH_ALEN];

	__le32 req_timeout_ms;

	__le32 tsf_mac_id;

	struct iwl_tof_range_req_ap_entry_v8 ap[IWL_MVM_TOF_MAX_APS];

} __packed; /* LOCATION_RANGE_REQ_CMD_API_S_VER_12 */



/*

 * enum iwl_tof_range_request_status - status of the sent request

 * @IWL_TOF_RANGE_REQUEST_STATUS_SUCCESSFUL - FW successfully received the