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

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

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

iwlwifi patches for v5.16

* Support for 160MHz in ranging measurements;
* Some fixes in HE capabilities;
* Fixes in vendor specific capabilities;
* Add the PC of both processors in error dumps;
* Small fix in TDLS;
* Code to sanitize firmware dumps;
* Updates for new FW rate and flags format;
* Continue implementation of new rate and flags format in the FW APIs;
* Some fixes for BZ family initialization;
* Fix session protection in some scenarios;
* Some debugging improvements;
* Fix BT-coex priority;
* Improve PS-poll timeout detection;
* Some other small fixes, clean-ups and improvements.

# gpg: Signature made Fri 22 Oct 2021 11:28:43 AM 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 06338cef 2c5769e3

drivers/net/wireless/intel/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ iwlwifi-objs += iwl-dbg-tlv.o 
iwlwifi-objs		+= iwl-trans.o

iwlwifi-objs		+= queue/tx.o



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

iwlwifi-objs		+= fw/img.o fw/notif-wait.o fw/rs.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

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

+0 −5
Original line number Diff line number Diff line
@@ -3,11 +3,6 @@ 
 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 - 2020 Intel Corporation

 *

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *

 *****************************************************************************/



#include <linux/module.h>

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

+0 −5
Original line number Diff line number Diff line
@@ -3,11 +3,6 @@ 
 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 - 2020 Intel Corporation

 *

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *

 *****************************************************************************/



#include <linux/module.h>

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

+31 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ 
#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_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_QU_B_HR_B_MODULE_FIRMWARE(api) \

	IWL_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"
@@ -106,6 +109,10 @@ 
	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"

#define IWL_BZ_A_FM_A_MODULE_FIRMWARE(api) \

		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"



static const struct iwl_base_params iwl_22000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
@@ -469,6 +476,14 @@ 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 char iwl_ax211_killer_1675s_name[] =

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

const char iwl_ax211_killer_1675i_name[] =

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

const char iwl_ax411_killer_1690s_name[] =

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

const char iwl_ax411_killer_1690i_name[] =

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



const struct iwl_cfg iwl_qu_b0_hr1_b0 = {

	.fw_name_pre = IWL_QU_B_HR_B_FW_PRE,
@@ -850,6 +865,20 @@ const struct iwl_cfg iwl_cfg_bz_a0_mr_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_a0_fm_a0 = {

	.fw_name_pre = IWL_BZ_A_FM_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_gl_a0_fm_a0 = {

	.fw_name_pre = IWL_GL_A_FM_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));
@@ -876,3 +905,5 @@ 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));

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));

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

+0 −5
Original line number Diff line number Diff line
@@ -3,11 +3,6 @@ 
 *

 * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 - 2020 Intel Corporation

 *

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *

 *****************************************************************************/



#include <linux/module.h>