Commit 003322be authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge tag 'iwlwifi-next-2025-07-15' of... 

Merge tag 'iwlwifi-next-2025-07-15' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next



Miri Korenblit says:
====================
iwlwifi features, notably

- cleanup of unsupported APIs
- add a API range per RF
- transport layer cleanups
- a few small fixes
====================

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 9a44b5e3 24bc49d1

drivers/net/wireless/intel/iwlwifi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ iwlwifi-$(CONFIG_IWLMVM) += cfg/7000.o cfg/8000.o 
# MAC configurations

iwlwifi-$(CONFIG_IWLMVM) += cfg/9000.o cfg/22000.o

iwlwifi-$(CONFIG_IWLMVM) += cfg/ax210.o

iwlwifi-$(CONFIG_IWLMVM) += cfg/bz.o cfg/sc.o

iwlwifi-$(CONFIG_IWLMLD) += cfg/bz.o cfg/sc.o cfg/dr.o

# RF configurations

iwlwifi-$(CONFIG_IWLMVM) += cfg/rf-jf.o cfg/rf-hr.o cfg/rf-gf.o

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

+0 −24
Original line number Diff line number Diff line
@@ -19,26 +19,8 @@ 
#define IWL_22000_SMEM_OFFSET		0x400000

#define IWL_22000_SMEM_LEN		0xD0000



#define IWL_QU_B_HR_B_FW_PRE		"iwlwifi-Qu-b0-hr-b0"

#define IWL_QU_C_HR_B_FW_PRE		"iwlwifi-Qu-c0-hr-b0"

#define IWL_QU_B_JF_B_FW_PRE		"iwlwifi-Qu-b0-jf-b0"

#define IWL_QU_C_JF_B_FW_PRE		"iwlwifi-Qu-c0-jf-b0"

#define IWL_QUZ_A_HR_B_FW_PRE		"iwlwifi-QuZ-a0-hr-b0"

#define IWL_QUZ_A_JF_B_FW_PRE		"iwlwifi-QuZ-a0-jf-b0"

#define IWL_CC_A_FW_PRE			"iwlwifi-cc-a0"



#define IWL_QU_B_HR_B_MODULE_FIRMWARE(api) \

	IWL_QU_B_HR_B_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_QUZ_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_QUZ_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_QUZ_A_JF_B_MODULE_FIRMWARE(api) \

	IWL_QUZ_A_JF_B_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_QU_C_HR_B_MODULE_FIRMWARE(api) \

	IWL_QU_C_HR_B_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \

	IWL_QU_B_JF_B_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_QU_C_JF_B_MODULE_FIRMWARE(api) \

	IWL_QU_C_JF_B_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_CC_A_MODULE_FIRMWARE(api)			\

	IWL_CC_A_FW_PRE "-" __stringify(api) ".ucode"
@@ -132,10 +114,4 @@ const char iwl_ax201_killer_1650s_name[] = 
const char iwl_ax201_killer_1650i_name[] =

	"Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)";



MODULE_FIRMWARE(IWL_QU_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_C_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QUZ_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_CC_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

+1 −33
Original line number Diff line number Diff line
@@ -13,33 +13,12 @@ 
#define IWL_AX210_UCODE_API_MAX	89



/* Lowest firmware API version supported */

#define IWL_AX210_UCODE_API_MIN	77

#define IWL_AX210_UCODE_API_MIN	89



/* Memory offsets and lengths */

#define IWL_AX210_SMEM_OFFSET		0x400000

#define IWL_AX210_SMEM_LEN		0xD0000



#define IWL_SO_A_JF_B_FW_PRE		"iwlwifi-so-a0-jf-b0"

#define IWL_SO_A_HR_B_FW_PRE		"iwlwifi-so-a0-hr-b0"

#define IWL_SO_A_GF_A_FW_PRE		"iwlwifi-so-a0-gf-a0"

#define IWL_TY_A_GF_A_FW_PRE		"iwlwifi-ty-a0-gf-a0"

#define IWL_SO_A_GF4_A_FW_PRE		"iwlwifi-so-a0-gf4-a0"

#define IWL_MA_A_HR_B_FW_PRE		"iwlwifi-ma-a0-hr-b0"

#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_B_HR_B_FW_PRE		"iwlwifi-ma-b0-hr-b0"

#define IWL_MA_B_GF_A_FW_PRE		"iwlwifi-ma-b0-gf-a0"

#define IWL_MA_B_GF4_A_FW_PRE		"iwlwifi-ma-b0-gf4-a0"



#define IWL_SO_A_JF_B_MODULE_FIRMWARE(api) \

	IWL_SO_A_JF_B_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_SO_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_SO_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_MA_A_HR_B_FW_MODULE_FIRMWARE(api)		\

	IWL_MA_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_MA_B_HR_B_FW_MODULE_FIRMWARE(api)		\

	IWL_MA_B_HR_B_FW_PRE "-" __stringify(api) ".ucode"



static const struct iwl_family_base_params iwl_ax210_base = {

	.num_of_queues = 512,

	.max_tfd_queue_size = 65536,
@@ -143,14 +122,3 @@ const struct iwl_mac_cfg iwl_ma_mac_cfg = { 
	.integrated = true,

	.umac_prph_offset = 0x300000

};
 


MODULE_FIRMWARE(IWL_SO_A_JF_B_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SO_A_HR_B_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

IWL_FW_AND_PNVM(IWL_SO_A_GF_A_FW_PRE, IWL_AX210_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_TY_A_GF_A_FW_PRE, IWL_AX210_UCODE_API_MAX);

MODULE_FIRMWARE(IWL_MA_A_HR_B_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

IWL_FW_AND_PNVM(IWL_MA_A_GF_A_FW_PRE, IWL_AX210_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_MA_A_GF4_A_FW_PRE, IWL_AX210_UCODE_API_MAX);

MODULE_FIRMWARE(IWL_MA_B_HR_B_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

IWL_FW_AND_PNVM(IWL_MA_B_GF_A_FW_PRE, IWL_AX210_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_MA_B_GF4_A_FW_PRE, IWL_AX210_UCODE_API_MAX);

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

+0 −9
Original line number Diff line number Diff line
@@ -19,18 +19,12 @@ 
#define IWL_BZ_SMEM_OFFSET		0x400000

#define IWL_BZ_SMEM_LEN			0xD0000



#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"

#define IWL_BZ_A_GF4_A_FW_PRE		"iwlwifi-bz-a0-gf4-a0"

#define IWL_BZ_A_FM_B_FW_PRE		"iwlwifi-bz-a0-fm-b0"

#define IWL_BZ_A_FM_C_FW_PRE		"iwlwifi-bz-a0-fm-c0"

#define IWL_BZ_A_FM4_B_FW_PRE		"iwlwifi-bz-a0-fm4-b0"

#define IWL_GL_B_FM_B_FW_PRE		"iwlwifi-gl-b0-fm-b0"

#define IWL_GL_C_FM_C_FW_PRE		"iwlwifi-gl-c0-fm-c0"



#define IWL_BZ_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_BZ_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"



static const struct iwl_family_base_params iwl_bz_base = {

	.num_of_queues = 512,

	.max_tfd_queue_size = 65536,
@@ -107,9 +101,6 @@ const struct iwl_mac_cfg iwl_gl_mac_cfg = { 
	.low_latency_xtal = true,

};



MODULE_FIRMWARE(IWL_BZ_A_HR_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

IWL_FW_AND_PNVM(IWL_BZ_A_GF_A_FW_PRE, IWL_BZ_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_BZ_A_GF4_A_FW_PRE, IWL_BZ_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_BZ_A_FM_B_FW_PRE, IWL_BZ_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_BZ_A_FM_C_FW_PRE, IWL_BZ_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_BZ_A_FM4_B_FW_PRE, IWL_BZ_UCODE_API_MAX);

drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c

+31 −0
Original line number Diff line number Diff line
@@ -5,6 +5,24 @@ 
 */

#include "iwl-config.h"



/* Highest firmware API version supported */

#define IWL_GF_UCODE_API_MAX	100



/* Lowest firmware API version supported */

#define IWL_GF_UCODE_API_MIN	98



#define IWL_SO_A_GF_A_FW_PRE		"iwlwifi-so-a0-gf-a0"

#define IWL_TY_A_GF_A_FW_PRE		"iwlwifi-ty-a0-gf-a0"

#define IWL_MA_A_GF_A_FW_PRE		"iwlwifi-ma-a0-gf-a0"

#define IWL_MA_B_GF_A_FW_PRE		"iwlwifi-ma-b0-gf-a0"

#define IWL_SO_A_GF4_A_FW_PRE		"iwlwifi-so-a0-gf4-a0"

#define IWL_MA_A_GF4_A_FW_PRE		"iwlwifi-ma-a0-gf4-a0"

#define IWL_MA_B_GF4_A_FW_PRE		"iwlwifi-ma-b0-gf4-a0"

#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_SC_A_GF_A_FW_PRE		"iwlwifi-sc-a0-gf-a0"

#define IWL_SC_A_GF4_A_FW_PRE		"iwlwifi-sc-a0-gf4-a0"



/* NVM versions */

#define IWL_GF_NVM_VERSION		0x0a1d
@@ -22,6 +40,8 @@ const struct iwl_rf_cfg iwl_rf_gf = { 
	.nvm_ver = IWL_GF_NVM_VERSION,

	.nvm_type = IWL_NVM_EXT,

	.num_rbds = IWL_NUM_RBDS_HE,

	.ucode_api_min = IWL_GF_UCODE_API_MIN,

	.ucode_api_max = IWL_GF_UCODE_API_MAX,

};



const char iwl_ax210_killer_1675w_name[] =
@@ -40,3 +60,14 @@ const char iwl_ax411_killer_1690i_name[] = 
const char iwl_ax210_name[] = "Intel(R) Wi-Fi 6E AX210 160MHz";

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

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



IWL_FW_AND_PNVM(IWL_SO_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_TY_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_MA_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_MA_B_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_MA_A_GF4_A_FW_PRE, IWL_GF_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_MA_B_GF4_A_FW_PRE, IWL_GF_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_BZ_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_BZ_A_GF4_A_FW_PRE, IWL_GF_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_SC_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_SC_A_GF4_A_FW_PRE, IWL_GF_UCODE_API_MAX);