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

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

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

wlwifi patches for v5.17 v2

* Support for Time-Aware-SAR (TAS) as read from the BIOS;
* Fix scan timeout issue when 6GHz is enabled;
* Work continues for new HW family Bz;
* Support for Optimized Connectivity Experience (OCE) scan;
* A bunch of FW debugging improvements and fixes;
* Fix one 32-bit compilation issue;
* Some RX changes for new HW family
* Some fixes for 6 GHz scan;
* Fix SAR table fixes with newer platforms;
* Fix early restart crash;
* Small fix in the debugging code;
* Add new Killer device IDs;
* Datapath updates for Bz family continues;
* A couple of important fixes in iwlmei;
* Some other small fixes, clean-ups and improvements.
parents 8b144ded bcbddc4f

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

+56 −2
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	68

#define IWL_22000_UCODE_API_MAX	69



/* Lowest firmware API version supported */

#define IWL_22000_UCODE_API_MIN	39
@@ -56,6 +56,11 @@ 
#define IWL_BZ_A_FM_A_FW_PRE		"iwlwifi-bz-a0-fm-a0-"

#define IWL_GL_A_FM_A_FW_PRE		"iwlwifi-gl-a0-fm-a0-"

#define IWL_BZ_Z_GF_A_FW_PRE		"iwlwifi-bz-z0-gf-a0-"

#define IWL_BNJ_A_FM_A_FW_PRE		"iwlwifi-BzBnj-a0-fm-a0-"

#define IWL_BNJ_A_FM4_A_FW_PRE		"iwlwifi-BzBnj-a0-fm4-a0-"

#define IWL_BNJ_A_GF_A_FW_PRE		"iwlwifi-BzBnj-a0-gf-a0-"

#define IWL_BNJ_A_GF4_A_FW_PRE		"iwlwifi-BzBnj-a0-gf4-a0-"

#define IWL_BNJ_A_HR_B_FW_PRE		"iwlwifi-BzBnj-a0-hr-b0-"





#define IWL_QU_B_HR_B_MODULE_FIRMWARE(api) \
@@ -116,6 +121,16 @@ 
		IWL_GL_A_FM_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_Z_GF_A_MODULE_FIRMWARE(api) \

	IWL_BZ_Z_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_FM_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_A_FM_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_FM4_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_A_FM4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_GF_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_A_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_GF4_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_A_GF4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_BNJ_A_HR_B_FW_PRE __stringify(api) ".ucode"



static const struct iwl_base_params iwl_22000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
@@ -237,7 +252,7 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.dccm2_len = IWL_22000_DCCM2_LEN,				\

	.smem_offset = IWL_22000_SMEM_OFFSET,				\

	.smem_len = IWL_22000_SMEM_LEN,					\

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,		\

	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,	\

	.apmg_not_supported = true,					\

	.trans.mq_rx_supported = true,					\

	.vht_mu_mimo_supported = true,					\
@@ -882,6 +897,40 @@ const struct iwl_cfg iwl_cfg_bz_z0_gf_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bnj_a0_fm_a0 = {

	.fw_name_pre = IWL_BNJ_A_FM_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bnj_a0_fm4_a0 = {

	.fw_name_pre = IWL_BNJ_A_FM4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bnj_a0_gf_a0 = {

	.fw_name_pre = IWL_BNJ_A_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bnj_a0_gf4_a0 = {

	.fw_name_pre = IWL_BNJ_A_GF4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bnj_a0_hr_b0 = {

	.fw_name_pre = IWL_BNJ_A_HR_B_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.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));
@@ -910,3 +959,8 @@ 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));

MODULE_FIRMWARE(IWL_BZ_A_FM_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_GL_A_FM_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_FM_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_FM4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_GF4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

+30 −17
Original line number Diff line number Diff line
@@ -242,17 +242,16 @@ union acpi_object *iwl_acpi_get_wifi_pkg_range(struct device *dev, 
IWL_EXPORT_SYMBOL(iwl_acpi_get_wifi_pkg_range);



int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt,

		     __le32 *block_list_array,

		     int *block_list_size)

		     struct iwl_tas_config_cmd_v3 *cmd)

{

	union acpi_object *wifi_pkg, *data;

	int ret, tbl_rev, i;

	bool enabled;

	int ret, tbl_rev, i, block_list_size, enabled;



	data = iwl_acpi_get_object(fwrt->dev, ACPI_WTAS_METHOD);

	if (IS_ERR(data))

		return PTR_ERR(data);



	/* try to read wtas table revision 1 or revision 0*/

	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt->dev, data,

					 ACPI_WTAS_WIFI_DATA_SIZE,

					 &tbl_rev);
@@ -261,40 +260,54 @@ int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, 
		goto out_free;

	}



	if (wifi_pkg->package.elements[0].type != ACPI_TYPE_INTEGER ||

	    tbl_rev != 0) {

	if (tbl_rev == 1 && wifi_pkg->package.elements[1].type ==

		ACPI_TYPE_INTEGER) {

		u32 tas_selection =

			(u32)wifi_pkg->package.elements[1].integer.value;

		u16 override_iec =

			(tas_selection & ACPI_WTAS_OVERRIDE_IEC_MSK) >> ACPI_WTAS_OVERRIDE_IEC_POS;

		u16 enabled_iec = (tas_selection & ACPI_WTAS_ENABLE_IEC_MSK) >>

			ACPI_WTAS_ENABLE_IEC_POS;



		enabled = tas_selection & ACPI_WTAS_ENABLED_MSK;

		cmd->override_tas_iec = cpu_to_le16(override_iec);

		cmd->enable_tas_iec = cpu_to_le16(enabled_iec);



	} else if (tbl_rev == 0 &&

		wifi_pkg->package.elements[1].type == ACPI_TYPE_INTEGER) {

		enabled = !!wifi_pkg->package.elements[1].integer.value;

	} else {

		ret = -EINVAL;

		goto out_free;

	}



	enabled = !!wifi_pkg->package.elements[1].integer.value;



	if (!enabled) {

		*block_list_size = -1;

		IWL_DEBUG_RADIO(fwrt, "TAS not enabled\n");

		ret = 0;

		goto out_free;

	}



	IWL_DEBUG_RADIO(fwrt, "Reading TAS table revision %d\n", tbl_rev);

	if (wifi_pkg->package.elements[2].type != ACPI_TYPE_INTEGER ||

	    wifi_pkg->package.elements[2].integer.value >

	    APCI_WTAS_BLACK_LIST_MAX) {

		IWL_DEBUG_RADIO(fwrt, "TAS invalid array size %llu\n",

				wifi_pkg->package.elements[1].integer.value);

				wifi_pkg->package.elements[2].integer.value);

		ret = -EINVAL;

		goto out_free;

	}

	*block_list_size = wifi_pkg->package.elements[2].integer.value;

	block_list_size = wifi_pkg->package.elements[2].integer.value;

	cmd->block_list_size = cpu_to_le32(block_list_size);



	IWL_DEBUG_RADIO(fwrt, "TAS array size %d\n", *block_list_size);

	if (*block_list_size > APCI_WTAS_BLACK_LIST_MAX) {

	IWL_DEBUG_RADIO(fwrt, "TAS array size %u\n", block_list_size);

	if (block_list_size > APCI_WTAS_BLACK_LIST_MAX) {

		IWL_DEBUG_RADIO(fwrt, "TAS invalid array size value %u\n",

				*block_list_size);

				block_list_size);

		ret = -EINVAL;

		goto out_free;

	}



	for (i = 0; i < *block_list_size; i++) {

	for (i = 0; i < block_list_size; i++) {

		u32 country;



		if (wifi_pkg->package.elements[3 + i].type !=
@@ -306,11 +319,11 @@ int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, 
		}



		country = wifi_pkg->package.elements[3 + i].integer.value;

		block_list_array[i] = cpu_to_le32(country);

		cmd->block_list_array[i] = cpu_to_le32(country);

		IWL_DEBUG_RADIO(fwrt, "TAS block list country %d\n", country);

	}



	ret = 0;

	ret = 1;

out_free:

	kfree(data);

	return ret;

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

+18 −5
Original line number Diff line number Diff line
@@ -65,10 +65,19 @@ 
#define ACPI_ECKV_WIFI_DATA_SIZE	2



/*

 * 1 type, 1 enabled, 1 block list size, 16 block list array

 * TAS size: 1 elelment for type,

 *	     1 element for enabled field,

 *	     1 element for block list size,

 *	     16 elements for block list array

 */

#define APCI_WTAS_BLACK_LIST_MAX	16

#define ACPI_WTAS_WIFI_DATA_SIZE	(3 + APCI_WTAS_BLACK_LIST_MAX)

#define ACPI_WTAS_ENABLED_MSK		0x1

#define ACPI_WTAS_OVERRIDE_IEC_MSK	0x2

#define ACPI_WTAS_ENABLE_IEC_MSK	0x4

#define ACPI_WTAS_OVERRIDE_IEC_POS	0x1

#define ACPI_WTAS_ENABLE_IEC_POS	0x2





#define ACPI_PPAG_WIFI_DATA_SIZE_V1	((IWL_NUM_CHAIN_LIMITS * \

					  IWL_NUM_SUB_BANDS_V1) + 2)
@@ -105,6 +114,11 @@ struct iwl_geo_profile { 
	struct iwl_geo_profile_band bands[ACPI_GEO_NUM_BANDS_REV2];

};



/* Same thing as with SAR, all revisions fit in revision 2 */

struct iwl_ppag_chain {

	s8 subbands[ACPI_SAR_NUM_SUB_BANDS_REV2];

};



enum iwl_dsm_funcs_rev_0 {

	DSM_FUNC_QUERY = 0,

	DSM_FUNC_DISABLE_SRD = 1,
@@ -198,8 +212,8 @@ int iwl_sar_geo_init(struct iwl_fw_runtime *fwrt, 
		     struct iwl_per_chain_offset *table,

		     u32 n_bands, u32 n_profiles);



int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, __le32 *block_list_array,

		     int *block_list_size);

int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt,

		     struct iwl_tas_config_cmd_v3 *cmd);



__le32 iwl_acpi_get_lari_config_bitmap(struct iwl_fw_runtime *fwrt);
@@ -280,8 +294,7 @@ static inline bool iwl_sar_geo_support(struct iwl_fw_runtime *fwrt) 
}



static inline int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt,

				   __le32 *block_list_array,

				   int *block_list_size)

				   struct iwl_tas_config_cmd_v3 *cmd)

{

	return -ENOENT;

}

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

+0 −9
Original line number Diff line number Diff line
@@ -157,15 +157,6 @@ enum iwl_card_state_flags { 
	CARD_IS_RX_ON		= 0x10,

};



/**

 * struct iwl_radio_version_notif - information on the card state

 * ( CARD_STATE_NOTIFICATION = 0xa1 )

 * @flags: &enum iwl_card_state_flags

 */

struct iwl_card_state_notif {

	__le32 flags;

} __packed; /* CARD_STATE_NTFY_API_S_VER_1 */



/**

 * enum iwl_error_recovery_flags - flags for error recovery cmd

 * @ERROR_RECOVERY_UPDATE_DB: update db from blob sent

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

+2 −8
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ enum iwl_legacy_cmds { 


	/**

	 * @SCAN_CFG_CMD:

	 * uses &struct iwl_scan_config_v1 or &struct iwl_scan_config

	 * uses &struct iwl_scan_config_v1, &struct iwl_scan_config_v2

	 * or &struct iwl_scan_config

	 */

	SCAN_CFG_CMD = 0xc,
@@ -384,13 +385,6 @@ enum iwl_legacy_cmds { 
	 */

	REDUCE_TX_POWER_CMD = 0x9f,



	/**

	 * @CARD_STATE_NOTIFICATION:

	 * Card state (RF/CT kill) notification,

	 * uses &struct iwl_card_state_notif

	 */

	CARD_STATE_NOTIFICATION = 0xa1,



	/**

	 * @MISSED_BEACONS_NOTIFICATION: &struct iwl_missed_beacons_notif

	 */