Commit 559c6647 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2021-06-22' of... 

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

iwlwifi patches for v5.14

* Some robustness improvements in the PCI code;
* Remove some duplicate and unused declarations;
* Improve PNVM load robustness by increasing the timeout a bit;
* Support for a new HW;
* Suport for BIOS control of 11ax enablement in Russia;
* Support UNII4 enablement from BIOS;
* Support LMR feedback;
* Fix in TWT;
* Some fixes in IML (image loader) DMA handling;
* Fixes in WoWLAN;
* Updates in the WoWLAN FW commands;
* Add one new device to the PCI ID lists;
* Support reading PNVM from a UEFI variable;
* Bump the supported FW API version;
* Some other small fixes, clean-ups and improvements.

# gpg: Signature made Tue 22 Jun 2021 05:19:19 PM EEST
# gpg:                using RSA key 1772CD7E06F604F5A6EBCB26A1479CA21A3CC5FA
# gpg: Good signature from "Luciano Roth Coelho (Luca) <luca@coelho.fi>" [full]
# gpg:                 aka "Luciano Roth Coelho (Intel) <luciano.coelho@intel.com>" [full]
parents 78f0a64f 4c59eac6

drivers/net/wireless/intel/iwlwifi/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ iwlwifi-objs += iwl-trans.o 
iwlwifi-objs		+= queue/tx.o



iwlwifi-objs		+= fw/img.o fw/notif-wait.o

iwlwifi-objs		+= fw/dbg.o fw/pnvm.o

iwlwifi-objs		+= fw/dbg.o fw/pnvm.o fw/dump.o

iwlwifi-$(CONFIG_IWLMVM) += fw/paging.o fw/smem.o fw/init.o

iwlwifi-$(CONFIG_ACPI) += fw/acpi.o

iwlwifi-$(CONFIG_EFI)	+= fw/uefi.o

iwlwifi-$(CONFIG_IWLWIFI_DEBUGFS) += fw/debugfs.o



iwlwifi-objs += $(iwlwifi-m)

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

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

/*

 * Copyright (C) 2015-2017 Intel Deutschland GmbH

 * Copyright (C) 2018-2020 Intel Corporation

 * Copyright (C) 2018-2021 Intel Corporation

 */

#include <linux/module.h>

#include <linux/stringify.h>
@@ -9,7 +9,7 @@ 
#include "iwl-prph.h"



/* Highest firmware API version supported */

#define IWL_22000_UCODE_API_MAX	63

#define IWL_22000_UCODE_API_MAX	64



/* Lowest firmware API version supported */

#define IWL_22000_UCODE_API_MIN	39
@@ -47,6 +47,7 @@ 
#define IWL_MA_A_GF_A_FW_PRE		"iwlwifi-ma-a0-gf-a0-"

#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_MA_A_FM_A_FW_PRE		"iwlwifi-ma-a0-fm-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-"
@@ -93,6 +94,8 @@ 
	IWL_MA_A_GF4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_MA_A_MR_A_FW_MODULE_FIRMWARE(api) \

	IWL_MA_A_MR_A_FW_PRE __stringify(api) ".ucode"

#define IWL_MA_A_FM_A_FW_MODULE_FIRMWARE(api)		\

	IWL_MA_A_FM_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) \
@@ -389,6 +392,7 @@ 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 6E AX211 160MHz";

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

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

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



const char iwl_ax200_killer_1650w_name[] =
@@ -724,6 +728,13 @@ const struct iwl_cfg iwl_cfg_ma_a0_mr_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_ma_a0_fm_a0 = {

	.fw_name_pre = IWL_MA_A_FM_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_snj_a0_mr_a0 = {

	.fw_name_pre = IWL_SNJ_A_MR_A_FW_PRE,

	.uhb_supported = true,
@@ -797,6 +808,7 @@ MODULE_FIRMWARE(IWL_MA_A_HR_B_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); 
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_MA_A_FM_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));

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

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

/*

 * Copyright (C) 2015-2017 Intel Deutschland GmbH

 * Copyright (C) 2018-2020 Intel Corporation

 * Copyright (C) 2018-2021 Intel Corporation

 */

#include <linux/module.h>

#include <linux/stringify.h>
@@ -171,8 +171,12 @@ const char iwl9260_killer_1550_name[] = 
	"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_1550i_160_name[] =

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

const char iwl9560_killer_1550s_name[] =

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

const char iwl9560_killer_1550s_160_name[] =

	"Killer(R) Wireless-AC 1550s Wireless Network Adapter (9560D2W) 160MHz";



const struct iwl_cfg iwl9260_2ac_cfg = {

	.fw_name_pre = IWL9260_FW_PRE,

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

+38 −12
Original line number Diff line number Diff line
@@ -163,6 +163,27 @@ int iwl_acpi_get_dsm_u8(struct device *dev, int rev, int func, 
}

IWL_EXPORT_SYMBOL(iwl_acpi_get_dsm_u8);



/*

 * Evaluate a DSM with no arguments and a u32 return value,

 */

int iwl_acpi_get_dsm_u32(struct device *dev, int rev, int func,

			 const guid_t *guid, u32 *value)

{

	int ret;

	u64 val;



	ret = iwl_acpi_get_dsm_integer(dev, rev, func,

				       guid, &val, sizeof(u32));



	if (ret < 0)

		return ret;



	/* cast val (u64) to be u32 */

	*value = (u32)val;

	return 0;

}

IWL_EXPORT_SYMBOL(iwl_acpi_get_dsm_u32);



union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,

					 union acpi_object *data,

					 int data_size, int *tbl_rev)
@@ -734,30 +755,35 @@ static u32 iwl_acpi_eval_dsm_func(struct device *dev, enum iwl_dsm_funcs_rev_0 e 


__le32 iwl_acpi_get_lari_config_bitmap(struct iwl_fw_runtime *fwrt)

{

	u32 ret;

	int ret;

	u8 value;

	__le32 config_bitmap = 0;



	/*

	 ** Evaluate func 'DSM_FUNC_ENABLE_INDONESIA_5G2'

	 */

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

	ret = iwl_acpi_get_dsm_u8(fwrt->dev, 0,

				  DSM_FUNC_ENABLE_INDONESIA_5G2,

				  &iwl_guid, &value);



	if (ret == DSM_VALUE_INDONESIA_ENABLE)

	if (!ret && value == 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)

	ret = iwl_acpi_get_dsm_u8(fwrt->dev, 0,

				  DSM_FUNC_DISABLE_SRD,

				  &iwl_guid, &value);

	if (!ret) {

		if (value == DSM_VALUE_SRD_PASSIVE)

			config_bitmap |=

				cpu_to_le32(LARI_CONFIG_CHANGE_ETSI_TO_PASSIVE_MSK);



	else if (ret == DSM_VALUE_SRD_DISABLE)

		else if (value == DSM_VALUE_SRD_DISABLE)

			config_bitmap |=

				cpu_to_le32(LARI_CONFIG_CHANGE_ETSI_TO_DISABLED_MSK);

	}



	return config_bitmap;

}

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

+10 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ enum iwl_dsm_funcs_rev_0 { 
	DSM_FUNC_DISABLE_SRD = 1,

	DSM_FUNC_ENABLE_INDONESIA_5G2 = 2,

	DSM_FUNC_11AX_ENABLEMENT = 6,

	DSM_FUNC_ENABLE_UNII4_CHAN = 7

};



enum iwl_dsm_values_srd {
@@ -116,6 +117,9 @@ void *iwl_acpi_get_object(struct device *dev, acpi_string method); 
int iwl_acpi_get_dsm_u8(struct device *dev, int rev, int func,

			const guid_t *guid, u8 *value);



int iwl_acpi_get_dsm_u32(struct device *dev, int rev, int func,

			 const guid_t *guid, u32 *value);



union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,

					 union acpi_object *data,

					 int data_size, int *tbl_rev);
@@ -182,6 +186,12 @@ static inline int iwl_acpi_get_dsm_u8(struct device *dev, int rev, int func, 
	return -ENOENT;

}



static inline int iwl_acpi_get_dsm_u32(struct device *dev, int rev, int func,

				       const guid_t *guid, u32 *value)

{

	return -ENOENT;

}



static inline union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,

						       union acpi_object *data,

						       int data_size,