Commit b187c70b authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2023-01-30' of... 

Merge tag 'iwlwifi-next-for-kalle-2023-01-30' of http://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

iwlwifi updates towards v6.3, this patch-set contains:

* EHT rate reporting
* Sniffer support for EHT and a few fixes in the related code
* A few general cleanups and small bugfixes
* Bump FW API to 74 for AX devices
* Fix a compilation error in mei (it still depends on BROKEN)
* STEP equalizer support - transfer some Phy related parameters from
  the BIOS to the firmware
parents 75da437a 9cbd5a8a

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include "fw/api/txq.h"



/* Highest firmware API version supported */

#define IWL_22000_UCODE_API_MAX	72

#define IWL_22000_UCODE_API_MAX	74



/* Lowest firmware API version supported */

#define IWL_22000_UCODE_API_MIN	39

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

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ enum iwl_legacy_cmds { 


	/**

	 * @TXPATH_FLUSH: &struct iwl_tx_path_flush_cmd

	 *	response in &struct iwl_tx_path_flush_cmd_rsp

	 */

	TXPATH_FLUSH = 0x1e,

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

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ enum iwl_data_path_subcmd_ids { 
	MONITOR_NOTIF = 0xF4,



	/**

	 * @RX_NO_DATA_NOTIF: &struct iwl_rx_no_data

	 * @RX_NO_DATA_NOTIF: &struct iwl_rx_no_data or &struct iwl_rx_no_data_ver_3

	 */

	RX_NO_DATA_NOTIF = 0xF5,

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

+135 −10
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ enum iwl_rx_mpdu_mac_info { 
};



/* TSF overload low dword */

enum iwl_rx_phy_data0 {

enum iwl_rx_phy_he_data0 {

	/* info type: HE any */

	IWL_RX_PHY_DATA0_HE_BEAM_CHNG				= 0x00000001,

	IWL_RX_PHY_DATA0_HE_UPLINK				= 0x00000002,
@@ -289,6 +289,25 @@ enum iwl_rx_phy_data0 { 
	IWL_RX_PHY_DATA0_HE_DELIM_EOF				= 0x80000000,

};



/* TSF overload low dword */

enum iwl_rx_phy_eht_data0 {

	/* info type: EHT any */

	/* 1 bits reserved */

	IWL_RX_PHY_DATA0_EHT_UPLINK				= BIT(1),

	IWL_RX_PHY_DATA0_EHT_BSS_COLOR_MASK			= 0x000000fc,

	IWL_RX_PHY_DATA0_ETH_SPATIAL_REUSE_MASK			= 0x00000f00,

	IWL_RX_PHY_DATA0_EHT_PS160				= BIT(12),

	IWL_RX_PHY_DATA0_EHT_TXOP_DUR_MASK			= 0x000fe000,

	IWL_RX_PHY_DATA0_EHT_LDPC_EXT_SYM			= BIT(20),

	IWL_RX_PHY_DATA0_EHT_PRE_FEC_PAD_MASK			= 0x00600000,

	IWL_RX_PHY_DATA0_EHT_PE_DISAMBIG			= BIT(23),

	IWL_RX_PHY_DATA0_EHT_BW320_SLOT				= BIT(24),

	IWL_RX_PHY_DATA0_EHT_SIGA_CRC_OK			= BIT(25),

	IWL_RX_PHY_DATA0_EHT_PHY_VER				= 0x1c000000,

	/* 2 bits reserved */

	IWL_RX_PHY_DATA0_EHT_DELIM_EOF				= BIT(31),

};



enum iwl_rx_phy_info_type {

	IWL_RX_PHY_INFO_TYPE_NONE				= 0,

	IWL_RX_PHY_INFO_TYPE_CCK				= 1,
@@ -301,19 +320,26 @@ enum iwl_rx_phy_info_type { 
	IWL_RX_PHY_INFO_TYPE_HE_TB				= 8,

	IWL_RX_PHY_INFO_TYPE_HE_MU_EXT				= 9,

	IWL_RX_PHY_INFO_TYPE_HE_TB_EXT				= 10,

	IWL_RX_PHY_INFO_TYPE_EHT_MU				= 11,

	IWL_RX_PHY_INFO_TYPE_EHT_TB				= 12,

	IWL_RX_PHY_INFO_TYPE_EHT_MU_EXT				= 13,

	IWL_RX_PHY_INFO_TYPE_EHT_TB_EXT				= 14,

};



/* TSF overload high dword */

enum iwl_rx_phy_data1 {

enum iwl_rx_phy_common_data1 {

	/*

	 * check this first - if TSF overload is set,

	 * see &enum iwl_rx_phy_info_type

	 */

	IWL_RX_PHY_DATA1_INFO_TYPE_MASK				= 0xf0000000,



	/* info type: HT/VHT/HE any */

	/* info type: HT/VHT/HE/EHT any */

	IWL_RX_PHY_DATA1_LSIG_LEN_MASK				= 0x0fff0000,

};



/* TSF overload high dword For HE rates*/

enum iwl_rx_phy_he_data1 {

	/* info type: HE MU/MU-EXT */

	IWL_RX_PHY_DATA1_HE_MU_SIGB_COMPRESSION			= 0x00000001,

	IWL_RX_PHY_DATA1_HE_MU_SIBG_SYM_OR_USER_NUM_MASK	= 0x0000001e,
@@ -329,8 +355,23 @@ enum iwl_rx_phy_data1 { 
	IWL_RX_PHY_DATA1_HE_TB_LOW_SS_MASK			= 0x0000000e,

};



/* TSF overload high dword For EHT-MU/TB rates*/

enum iwl_rx_phy_eht_data1 {

	/* info type: EHT-MU */

	IWL_RX_PHY_DATA1_EHT_MU_NUM_SIG_SYM_USIGA2	= 0x0000001f,

	/* info type: EHT-TB */

	IWL_RX_PHY_DATA1_EHT_TB_PILOT_TYPE		= BIT(0),

	IWL_RX_PHY_DATA1_EHT_TB_LOW_SS			= 0x0000001e,



	/* info type: EHT any */

	/* number of EHT-LTF symbols 0 - 1 EHT-LTF, 1 - 2 EHT-LTFs, 2 - 4 EHT-LTFs,

	 * 3 - 6 EHT-LTFs, 4 - 8 EHT-LTFs */

	IWL_RX_PHY_DATA1_EHT_SIG_LTF_NUM		= 0x000000e0,

	IWL_RX_PHY_DATA1_EHT_RU_ALLOC			= 0x0000ff00,

};



/* goes into Metadata DW 7 */

enum iwl_rx_phy_data2 {

enum iwl_rx_phy_he_data2 {

	/* info type: HE MU-EXT */

	/* the a1/a2/... is what the PHY/firmware calls the values */

	IWL_RX_PHY_DATA2_HE_MU_EXT_CH1_RU0		= 0x000000ff, /* a1 */
@@ -346,7 +387,7 @@ enum iwl_rx_phy_data2 { 
};



/* goes into Metadata DW 8 */

enum iwl_rx_phy_data3 {

enum iwl_rx_phy_he_data3 {

	/* info type: HE MU-EXT */

	IWL_RX_PHY_DATA3_HE_MU_EXT_CH1_RU1		= 0x000000ff, /* c1 */

	IWL_RX_PHY_DATA3_HE_MU_EXT_CH1_RU3		= 0x0000ff00, /* c2 */
@@ -355,7 +396,7 @@ enum iwl_rx_phy_data3 { 
};



/* goes into Metadata DW 4 high 16 bits */

enum iwl_rx_phy_data4 {

enum iwl_rx_phy_he_he_data4 {

	/* info type: HE MU-EXT */

	IWL_RX_PHY_DATA4_HE_MU_EXT_CH1_CTR_RU			= 0x0001,

	IWL_RX_PHY_DATA4_HE_MU_EXT_CH2_CTR_RU			= 0x0002,
@@ -366,6 +407,51 @@ enum iwl_rx_phy_data4 { 
	IWL_RX_PHY_DATA4_HE_MU_EXT_PREAMBLE_PUNC_TYPE_MASK	= 0x0600,

};



/* goes into Metadata DW 7 */

enum iwl_rx_phy_eht_data2 {

	/* info type: EHT-MU-EXT */

	/* OFDM_RX_VECTOR_COMMON_RU_ALLOC_0_OUT */

	IWL_RX_PHY_DATA2_EHT_MU_EXT_RU_ALLOC_A1	= 0x000001ff,

	IWL_RX_PHY_DATA2_EHT_MU_EXT_RU_ALLOC_A2	= 0x0003fe00,

	IWL_RX_PHY_DATA2_EHT_MU_EXT_RU_ALLOC_A3	= 0x01fc0000,



	/* info type: EHT-TB-EXT */

	IWL_RX_PHY_DATA2_EHT_TB_EXT_TRIG_SIGA1	= 0xffffffff,

};



/* goes into Metadata DW 8 */

enum iwl_rx_phy_eht_data3 {

	/* info type: EHT-MU-EXT */

	/* OFDM_RX_VECTOR_COMMON_RU_ALLOC_1_OUT */

	IWL_RX_PHY_DATA3_EHT_MU_EXT_RU_ALLOC_B1	= 0x000001ff,

	IWL_RX_PHY_DATA3_EHT_MU_EXT_RU_ALLOC_B2	= 0x0003fe00,

	IWL_RX_PHY_DATA3_EHT_MU_EXT_RU_ALLOC_B3	= 0x01fc0000,

};



/* goes into Metadata DW 4 */

enum iwl_rx_phy_eht_data4 {

	/* info type: EHT-MU-EXT */

	/* OFDM_RX_VECTOR_COMMON_RU_ALLOC_2_OUT */

	IWL_RX_PHY_DATA4_EHT_MU_EXT_RU_ALLOC_C1	= 0x000001ff,

	IWL_RX_PHY_DATA4_EHT_MU_EXT_RU_ALLOC_C2	= 0x0003fe00,

	IWL_RX_PHY_DATA4_EHT_MU_EXT_RU_ALLOC_C3	= 0x01fc0000,

	IWL_RX_PHY_DATA4_EHT_MU_EXT_SIGB_MCS	= 0x18000000,

};



/* goes into Metadata DW 16 */

enum iwl_rx_phy_data5 {

	/* info type: EHT any */

	IWL_RX_PHY_DATA5_EHT_TYPE_AND_COMP		= 0x00000003,

	/* info type: EHT-TB */

	IWL_RX_PHY_DATA5_EHT_TB_SPATIAL_REUSE1		= 0x0000003c,

	IWL_RX_PHY_DATA5_EHT_TB_SPATIAL_REUSE2		= 0x000003c0,

	/* info type: EHT-MU */

	IWL_RX_PHY_DATA5_EHT_MU_PUNC_CH_CODE		= 0x0000007c,

	IWL_RX_PHY_DATA5_EHT_MU_STA_ID_USR		= 0x0003ff80,

	IWL_RX_PHY_DATA5_EHT_MU_NUM_USR_NON_OFDMA	= 0x001c0000,

	IWL_RX_PHY_DATA5_EHT_MU_SPATIAL_CONF_USR_FIELD	= 0x0fe00000,

};



/**

 * struct iwl_rx_mpdu_desc_v1 - RX MPDU descriptor

 */
@@ -440,7 +526,9 @@ struct iwl_rx_mpdu_desc_v1 { 
			/**

			 * @phy_data1: valid only if

			 * %IWL_RX_MPDU_PHY_TSF_OVERLOAD is set,

			 * see &enum iwl_rx_phy_data1.

			 * see &enum iwl_rx_phy_common_data1 or

			 *     &enum iwl_rx_phy_he_data1 or

			 *     &enum iwl_rx_phy_eht_data1.

			 */

			__le32 phy_data1;

		};
@@ -540,11 +628,18 @@ struct iwl_rx_mpdu_desc_v3 { 
			__le32 phy_data1;

		};

	};

	/* DW16 & DW17 */

	/* DW16 */

	/**

	 * @phy_data5: valid only if

	 * %IWL_RX_MPDU_PHY_TSF_OVERLOAD is set,

	 * see &enum iwl_rx_phy_data5.

	 */

	__le32 phy_data5;

	/* DW17 */

	/**

	 * @reserved: reserved

	 */

	__le32 reserved[2];

	__le32 reserved[1];

} __packed; /* RX_MPDU_RES_START_API_S_VER_3,

	       RX_MPDU_RES_START_API_S_VER_5 */
@@ -639,12 +734,14 @@ struct iwl_rx_mpdu_desc { 
#define RX_NO_DATA_INFO_ERR_UNSUPPORTED_RATE	2

#define RX_NO_DATA_INFO_ERR_NO_DELIM		3

#define RX_NO_DATA_INFO_ERR_BAD_MAC_HDR	4

#define RX_NO_DATA_INFO_LOW_ENERGY		5



#define RX_NO_DATA_FRAME_TIME_POS	0

#define RX_NO_DATA_FRAME_TIME_MSK	(0xfffff << RX_NO_DATA_FRAME_TIME_POS)



#define RX_NO_DATA_RX_VEC0_HE_NSTS_MSK	0x03800000

#define RX_NO_DATA_RX_VEC0_VHT_NSTS_MSK	0x38000000

#define RX_NO_DATA_RX_VEC2_EHT_NSTS_MSK	0x00f00000



/**

 * struct iwl_rx_no_data - RX no data descriptor
@@ -654,7 +751,8 @@ struct iwl_rx_mpdu_desc { 
 * @on_air_rise_time: GP2 during on air rise

 * @fr_time: frame time

 * @rate: rate/mcs of frame

 * @phy_info: &enum iwl_rx_phy_data0 and &enum iwl_rx_phy_info_type

 * @phy_info: &enum iwl_rx_phy_he_data0 or &enum iwl_rx_phy_eht_data0

 *	      based on &enum iwl_rx_phy_info_type

 * @rx_vec: DW-12:9 raw RX vectors from DSP according to modulation type.

 *	for VHT: OFDM_RX_VECTOR_SIGA1_OUT, OFDM_RX_VECTOR_SIGA2_OUT

 *	for HE: OFDM_RX_VECTOR_HE_SIGA1_OUT, OFDM_RX_VECTOR_HE_SIGA2_OUT
@@ -670,6 +768,33 @@ struct iwl_rx_no_data { 
} __packed; /* RX_NO_DATA_NTFY_API_S_VER_1,

	       RX_NO_DATA_NTFY_API_S_VER_2 */



/**

 * struct iwl_rx_no_data_ver_3 - RX no data descriptor

 * @info: 7:0 frame type, 15:8 RX error type

 * @rssi: 7:0 energy chain-A,

 *	15:8 chain-B, measured at FINA time (FINA_ENERGY), 16:23 channel

 * @on_air_rise_time: GP2 during on air rise

 * @fr_time: frame time

 * @rate: rate/mcs of frame

 * @phy_info: &enum iwl_rx_phy_eht_data0 and &enum iwl_rx_phy_info_type

 * @rx_vec: DW-12:9 raw RX vectors from DSP according to modulation type.

 *	for VHT: OFDM_RX_VECTOR_SIGA1_OUT, OFDM_RX_VECTOR_SIGA2_OUT

 *	for HE: OFDM_RX_VECTOR_HE_SIGA1_OUT, OFDM_RX_VECTOR_HE_SIGA2_OUT

 *	for EHT: OFDM_RX_VECTOR_USIG_A1_OUT, OFDM_RX_VECTOR_USIG_A2_OUT,

 *	OFDM_RX_VECTOR_EHT_OUT, OFDM_RX_VECTOR_EHT_USER_FIELD_OUT

 */

struct iwl_rx_no_data_ver_3 {

	__le32 info;

	__le32 rssi;

	__le32 on_air_rise_time;

	__le32 fr_time;

	__le32 rate;

	__le32 phy_info[2];

	__le32 rx_vec[4];

} __packed; /* RX_NO_DATA_NTFY_API_S_VER_1,

	       RX_NO_DATA_NTFY_API_S_VER_2

	       RX_NO_DATA_NTFY_API_S_VER_3 */



struct iwl_frame_release {

	u8 baid;

	u8 reserved;

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

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

/*

 * Copyright(c) 2021 Intel Corporation

 * Copyright(c) 2021-2022 Intel Corporation

 */



#include "iwl-drv.h"
@@ -246,6 +246,63 @@ void *iwl_uefi_get_reduced_power(struct iwl_trans *trans, size_t *len) 
	return data;

}



static int iwl_uefi_step_parse(struct uefi_cnv_common_step_data *common_step_data,

			       struct iwl_trans *trans)

{

	if (common_step_data->revision != 1)

		return -EINVAL;



	trans->mbx_addr_0_step = (u32)common_step_data->revision |

		(u32)common_step_data->cnvi_eq_channel << 8 |

		(u32)common_step_data->cnvr_eq_channel << 16 |

		(u32)common_step_data->radio1 << 24;

	trans->mbx_addr_1_step = (u32)common_step_data->radio2;

	return 0;

}



void iwl_uefi_get_step_table(struct iwl_trans *trans)

{

	struct uefi_cnv_common_step_data *data;

	unsigned long package_size;

	efi_status_t status;

	int ret;



	if (trans->trans_cfg->device_family < IWL_DEVICE_FAMILY_AX210)

		return;



	if (!efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE))

		return;



	/* TODO: we hardcode a maximum length here, because reading

	 * from the UEFI is not working.  To implement this properly,

	 * we have to call efivar_entry_size().

	 */

	package_size = IWL_HARDCODED_STEP_SIZE;



	data = kmalloc(package_size, GFP_KERNEL);

	if (!data)

		return;



	status = efi.get_variable(IWL_UEFI_STEP_NAME, &IWL_EFI_VAR_GUID,

				  NULL, &package_size, data);

	if (status != EFI_SUCCESS) {

		IWL_DEBUG_FW(trans,

			     "STEP UEFI variable not found 0x%lx\n", status);

		goto out_free;

	}



	IWL_DEBUG_FW(trans, "Read STEP from UEFI with size %lu\n",

		     package_size);



	ret = iwl_uefi_step_parse(data, trans);

	if (ret < 0)

		IWL_DEBUG_FW(trans, "Cannot read STEP tables. rev is invalid\n");



out_free:

	kfree(data);

}

IWL_EXPORT_SYMBOL(iwl_uefi_get_step_table);



#ifdef CONFIG_ACPI

static int iwl_uefi_sgom_parse(struct uefi_cnv_wlan_sgom_data *sgom_data,

			       struct iwl_fw_runtime *fwrt)