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

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

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

first set of iwlwifi patches for v5.17

* A few mei fixes;
* Some improvements in D3;
* Support for new FW API commands;
* Fixes and cleanups in device configurations;
* Support some new FW API command versions;
* Fix WGDS revision 3 reading bug;
* Some firmware debugging improvements;
* Fixes for in device configuration structures;
* Improvements in the session protection code;
* Support SAR GEO Offset Mapping (SGOM) via BIOS;
* Continued work on the new Bz device family;
* Some more firmware debugging improvements;
* Support new FW API version 68;
* Add some new device IDs;
* Some other small fixes, clean-ups and improvements.
parents 4d375c2e 977df8bd

drivers/net/wireless/intel/iwlwifi/Kconfig

+26 −26
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
config IWLWIFI

	tristate "Intel Wireless WiFi Next Gen AGN - Wireless-N/Advanced-N/Ultimate-N (iwlwifi) "

	depends on PCI && HAS_IOMEM && CFG80211

	depends on IWLMEI || !IWLMEI

	select FW_LOADER

	help

	  Select to build the driver supporting the:
@@ -92,32 +93,6 @@ config IWLWIFI_BCAST_FILTERING 
	  If unsure, don't enable this option, as some programs might

	  expect incoming broadcasts for their normal operations.



config IWLMEI

	tristate "Intel Management Engine communication over WLAN"

	depends on INTEL_MEI

	depends on PM

	depends on IWLMVM

	help

	  Enables the iwlmei kernel module.



	  CSME stands for Converged Security and Management Engine. It is a CPU

	  on the chipset and runs a dedicated firmware. AMT (Active Management

	  Technology) is one of the applications that run on that CPU. AMT

	  allows to control the platform remotely.



	  This kernel module allows to communicate with the Intel Management

	  Engine over Wifi. This is supported starting from Tiger Lake

	  platforms and has been tested on 9260 devices only.

	  If AMT is configured not to use the wireless device, this module is

	  harmless (and useless).

	  Enabling this option on a platform that has a different device and

	  has Wireless enabled on AMT can prevent WiFi from working correctly.



	  For more information see

	  <https://software.intel.com/en-us/manageability/>



	  If unsure, say N.



menu "Debugging Options"



config IWLWIFI_DEBUG
@@ -172,3 +147,28 @@ config IWLWIFI_DEVICE_TRACING 
endmenu



endif



config IWLMEI

	tristate "Intel Management Engine communication over WLAN"

	depends on INTEL_MEI

	depends on PM

	help

	  Enables the iwlmei kernel module.



	  CSME stands for Converged Security and Management Engine. It is a CPU

	  on the chipset and runs a dedicated firmware. AMT (Active Management

	  Technology) is one of the applications that run on that CPU. AMT

	  allows to control the platform remotely.



	  This kernel module allows to communicate with the Intel Management

	  Engine over Wifi. This is supported starting from Tiger Lake

	  platforms and has been tested on 9260 devices only.

	  If AMT is configured not to use the wireless device, this module is

	  harmless (and useless).

	  Enabling this option on a platform that has a different device and

	  has Wireless enabled on AMT can prevent WiFi from working correctly.



	  For more information see

	  <https://software.intel.com/en-us/manageability/>



	  If unsure, say N.

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

+16 −13
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	67

#define IWL_22000_UCODE_API_MAX	68



/* Lowest firmware API version supported */

#define IWL_22000_UCODE_API_MIN	39
@@ -54,7 +54,8 @@ 
#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_BZ_A_FM_A_FW_PRE		"iwlwifi-bz-a0-fm-a0-"

#define IWL_GL_A_FM_A_FW_PRE		"iwlwifi-gl-a0-fm7-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_QU_B_HR_B_MODULE_FIRMWARE(api) \
@@ -113,6 +114,8 @@ 
		IWL_BZ_A_FM_A_FW_PRE __stringify(api) ".ucode"

#define IWL_GL_A_FM_A_MODULE_FIRMWARE(api) \

		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"



static const struct iwl_base_params iwl_22000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
@@ -626,7 +629,7 @@ const struct iwl_cfg iwl_ax200_cfg_cc = { 
};



const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0 = {

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

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

	.fw_name_pre = IWL_QU_B_HR_B_FW_PRE,

	IWL_DEVICE_22500,

	/*
@@ -639,7 +642,7 @@ const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0 = { 
};



const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0 = {

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

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

	.fw_name_pre = IWL_QU_B_HR_B_FW_PRE,

	IWL_DEVICE_22500,

	/*
@@ -652,7 +655,7 @@ const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0 = { 
};



const struct iwl_cfg killer1650s_2ax_cfg_qu_c0_hr_b0 = {

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

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

	.fw_name_pre = IWL_QU_C_HR_B_FW_PRE,

	IWL_DEVICE_22500,

	/*
@@ -665,7 +668,7 @@ const struct iwl_cfg killer1650s_2ax_cfg_qu_c0_hr_b0 = { 
};



const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0 = {

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

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

	.fw_name_pre = IWL_QU_C_HR_B_FW_PRE,

	IWL_DEVICE_22500,

	/*
@@ -696,13 +699,6 @@ const struct iwl_cfg iwlax210_2ax_cfg_so_jf_b0 = { 
	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0 = {

	.name = "Intel(R) Wi-Fi 6 AX210 160MHz",

	.fw_name_pre = IWL_SO_A_HR_B_FW_PRE,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0 = {

	.name = iwl_ax211_name,

	.fw_name_pre = IWL_SO_A_GF_A_FW_PRE,
@@ -879,6 +875,13 @@ const struct iwl_cfg iwl_cfg_gl_a0_fm_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_z0_gf_a0 = {

	.fw_name_pre = IWL_BZ_Z_GF_A_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));

drivers/net/wireless/intel/iwlwifi/dvm/main.c

+2 −6
Original line number Diff line number Diff line
@@ -1974,12 +1974,8 @@ static void iwl_nic_config(struct iwl_op_mode *op_mode) 


	/* SKU Control */

	iwl_trans_set_bits_mask(priv->trans, CSR_HW_IF_CONFIG_REG,

				CSR_HW_IF_CONFIG_REG_MSK_MAC_DASH |

				CSR_HW_IF_CONFIG_REG_MSK_MAC_STEP,

				(CSR_HW_REV_STEP(priv->trans->hw_rev) <<

					CSR_HW_IF_CONFIG_REG_POS_MAC_STEP) |

				(CSR_HW_REV_DASH(priv->trans->hw_rev) <<

					CSR_HW_IF_CONFIG_REG_POS_MAC_DASH));

				CSR_HW_IF_CONFIG_REG_MSK_MAC_STEP_DASH,

				CSR_HW_REV_STEP_DASH(priv->trans->hw_rev));



	/* write radio config values to register */

	if (priv->nvm_data->radio_cfg_type <= EEPROM_RF_CONFIG_TYPE_MAX) {

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

+3 −1
Original line number Diff line number Diff line
@@ -789,7 +789,7 @@ int iwl_sar_get_wgds_table(struct iwl_fw_runtime *fwrt) 
				 * looking up in ACPI

				 */

				if (wifi_pkg->package.count !=

				    min_size + profile_size * num_profiles) {

				    hdr_size + profile_size * num_profiles) {

					ret = -EINVAL;

					goto out_free;

				}
@@ -852,6 +852,8 @@ int iwl_sar_get_wgds_table(struct iwl_fw_runtime *fwrt) 
		}

	}



	fwrt->geo_num_profiles = num_profiles;

	fwrt->geo_enabled = true;

	ret = 0;

out_free:

	kfree(data);

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

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

/*

 * Copyright (C) 2012-2014, 2018, 2020 Intel Corporation

 * Copyright (C) 2012-2014, 2018, 2020-2021 Intel Corporation

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

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 */
@@ -97,6 +97,21 @@ struct iwl_alive_ntf_v5 { 
	struct iwl_sku_id sku_id;

} __packed; /* UCODE_ALIVE_NTFY_API_S_VER_5 */



struct iwl_imr_alive_info {

	__le64 base_addr;

	__le32 size;

	__le32 enabled;

} __packed; /* IMR_ALIVE_INFO_API_S_VER_1 */



struct iwl_alive_ntf_v6 {

	__le16 status;

	__le16 flags;

	struct iwl_lmac_alive lmac_data[2];

	struct iwl_umac_alive umac_data;

	struct iwl_sku_id sku_id;

	struct iwl_imr_alive_info imr;

} __packed; /* UCODE_ALIVE_NTFY_API_S_VER_6 */



/**

 * enum iwl_extended_cfg_flag - commands driver may send before

 *	finishing init flow