Commit 0f21d7d5 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: iwlwifi: remove support for *nJ devices 



These are test chips that will never reach anyone
outside of Intel, so remove support for them.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230621130443.d9f4e0356ae4.If9eccc22eb500dfff8973a70a649d94af7a60841@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent c648e926

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

+0 −41
Original line number Diff line number Diff line
@@ -27,19 +27,15 @@ 
#define IWL_22000_SMEM_LEN		0xD0000



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

#define IWL_QNJ_B_HR_B_FW_PRE		"iwlwifi-QuQnj-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_QNJ_B_JF_B_FW_PRE		"iwlwifi-QuQnj-b0-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_QNJ_B_HR_B_MODULE_FIRMWARE(api)	\

	IWL_QNJ_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) \
@@ -48,8 +44,6 @@ 
	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_QNJ_B_JF_B_MODULE_FIRMWARE(api)		\

	IWL_QNJ_B_JF_B_FW_PRE __stringify(api) ".ucode"

#define IWL_CC_A_MODULE_FIRMWARE(api)			\

	IWL_CC_A_FW_PRE __stringify(api) ".ucode"
@@ -126,15 +120,6 @@ const struct iwl_ht_params iwl_22000_ht_params = { 
		},							\

	}



const struct iwl_cfg_trans_params iwl_qnj_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,

	.gen2 = true,

	.device_family = IWL_DEVICE_FAMILY_22000,

	.base_params = &iwl_22000_base_params,

};



const struct iwl_cfg_trans_params iwl_qu_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,
@@ -211,18 +196,6 @@ const struct iwl_cfg iwl9560_quz_a0_jf_b0_cfg = { 
	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwl9560_qnj_b0_jf_b0_cfg = {

	.fw_name_pre = IWL_QNJ_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg_trans_params iwl_ax200_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_22000,

	.base_params = &iwl_22000_base_params,
@@ -440,18 +413,6 @@ const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0 = { 
	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl_qnj_b0_hr_b0_cfg = {

	.fw_name_pre = IWL_QNJ_B_HR_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl_cfg_quz_a0_hr_b0 = {

	.fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE,

	IWL_DEVICE_22500,
@@ -465,10 +426,8 @@ const struct iwl_cfg iwl_cfg_quz_a0_hr_b0 = { 
};



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

MODULE_FIRMWARE(IWL_QU_B_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_QNJ_B_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

+0 −73
Original line number Diff line number Diff line
@@ -32,10 +32,6 @@ 
#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_SO_A_MR_A_FW_PRE		"iwlwifi-so-a0-mr-a0-"

#define IWL_SNJ_A_GF4_A_FW_PRE		"iwlwifi-SoSnj-a0-gf4-a0-"

#define IWL_SNJ_A_GF_A_FW_PRE		"iwlwifi-SoSnj-a0-gf-a0-"

#define IWL_SNJ_A_HR_B_FW_PRE		"iwlwifi-SoSnj-a0-hr-b0-"

#define IWL_SNJ_A_JF_B_FW_PRE		"iwlwifi-SoSnj-a0-jf-b0-"

#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-"
@@ -46,7 +42,6 @@ 
#define IWL_MA_B_GF4_A_FW_PRE		"iwlwifi-ma-b0-gf4-a0-"

#define IWL_MA_B_MR_A_FW_PRE		"iwlwifi-ma-b0-mr-a0-"

#define IWL_MA_B_FM_A_FW_PRE		"iwlwifi-ma-b0-fm-a0-"

#define IWL_SNJ_A_MR_A_FW_PRE		"iwlwifi-SoSnj-a0-mr-a0-"



#define IWL_SO_A_JF_B_MODULE_FIRMWARE(api) \

	IWL_SO_A_JF_B_FW_PRE __stringify(api) ".ucode"
@@ -56,14 +51,6 @@ 
	IWL_SO_A_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_TY_A_GF_A_MODULE_FIRMWARE(api) \

	IWL_TY_A_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_SNJ_A_GF4_A_MODULE_FIRMWARE(api) \

	IWL_SNJ_A_GF4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_SNJ_A_GF_A_MODULE_FIRMWARE(api) \

	IWL_SNJ_A_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_SNJ_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_SNJ_A_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_SNJ_A_JF_B_MODULE_FIRMWARE(api) \

	IWL_SNJ_A_JF_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_A_GF_A_FW_MODULE_FIRMWARE(api)		\
@@ -84,8 +71,6 @@ 
	IWL_MA_B_MR_A_FW_PRE __stringify(api) ".ucode"

#define IWL_MA_B_FM_A_FW_MODULE_FIRMWARE(api)		\

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



static const struct iwl_base_params iwl_ax210_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
@@ -159,15 +144,6 @@ static const struct iwl_base_params iwl_ax210_base_params = { 
		},							\

	}



const struct iwl_cfg_trans_params iwl_snj_trans_cfg = {

	.mq_rx_supported = true,

	.rf_id = true,

	.gen2 = true,

	.device_family = IWL_DEVICE_FAMILY_AX210,

	.base_params = &iwl_ax210_base_params,

	.umac_prph_offset = 0x300000,

};



const struct iwl_cfg_trans_params iwl_so_trans_cfg = {

	.mq_rx_supported = true,

	.rf_id = true,
@@ -297,36 +273,6 @@ const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0_long = { 
	.trans.low_latency_xtal = true,

};



const struct iwl_cfg iwlax411_2ax_cfg_sosnj_gf4_a0 = {

	.name = iwl_ax411_name,

	.fw_name_pre = IWL_SNJ_A_GF4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwlax211_cfg_snj_gf_a0 = {

	.name = iwl_ax211_name,

	.fw_name_pre = IWL_SNJ_A_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_snj_hr_b0 = {

	.fw_name_pre = IWL_SNJ_A_HR_B_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_snj_a0_jf_b0 = {

	.fw_name_pre = IWL_SNJ_A_JF_B_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_ma_a0_hr_b0 = {

	.fw_name_pre = IWL_MA_A_HR_B_FW_PRE,

	.uhb_supported = true,
@@ -411,20 +357,6 @@ const struct iwl_cfg iwl_cfg_ma_a0_fm_a0 = { 
	.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,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_snj_a0_ms_a0 = {

	.fw_name_pre = IWL_SNJ_A_MR_A_FW_PRE,

	.uhb_supported = false,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_so_a0_hr_a0 = {

	.fw_name_pre = IWL_SO_A_HR_B_FW_PRE,

	IWL_DEVICE_AX210,
@@ -435,10 +367,6 @@ 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));

MODULE_FIRMWARE(IWL_SO_A_GF_A_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_TY_A_GF_A_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SNJ_A_GF4_A_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SNJ_A_GF_A_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SNJ_A_HR_B_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SNJ_A_JF_B_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_MA_A_HR_B_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_MA_A_GF_A_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_MA_A_GF4_A_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));
@@ -449,4 +377,3 @@ MODULE_FIRMWARE(IWL_MA_B_GF_A_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX)); 
MODULE_FIRMWARE(IWL_MA_B_GF4_A_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_MA_B_MR_A_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_MA_B_FM_A_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));
 
MODULE_FIRMWARE(IWL_SNJ_A_MR_A_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

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

+0 −172
Original line number Diff line number Diff line
@@ -44,25 +44,6 @@ 
#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_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_B_FM4_B_FW_PRE		"iwlwifi-BzBnj-b0-fm4-b0-"

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

#define IWL_BNJ_B_GF_A_FW_PRE		"iwlwifi-BzBnj-b0-gf-a0-"

#define IWL_BNJ_C_GF_A_FW_PRE		"iwlwifi-BzBnj-c0-gf-a0-"

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

#define IWL_BNJ_B_GF4_A_FW_PRE		"iwlwifi-BzBnj-b0-gf4-a0-"

#define IWL_BNJ_C_GF4_A_FW_PRE		"iwlwifi-BzBnj-c0-gf4-a0-"

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

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

#define IWL_BNJ_B_HR_A_FW_PRE		"iwlwifi-BzBnj-b0-hr-b0-"

#define IWL_BNJ_B_HR_B_FW_PRE		"iwlwifi-BzBnj-b0-hr-b0-"

#define IWL_BNJ_C_HR_B_FW_PRE		"iwlwifi-BzBnj-c0-hr-b0-"

#define IWL_BNJ_B_FM_B_FW_PRE		"iwlwifi-BzBnj-b0-fm-b0-"

#define IWL_BNJ_C_FM_C_FW_PRE		"iwlwifi-BzBnj-c0-fm-c0-"

#define IWL_BNJ_A_WH_A_FW_PRE		"iwlwifi-BzBnj-a0-wh-a0-"

#define IWL_BNJ_B_WH_A_FW_PRE		"iwlwifi-BzBnj-b0-wh-a0-"

#define IWL_BNJ_C_WH_A_FW_PRE		"iwlwifi-BzBnj-c0-wh-a0-"



#define IWL_BZ_A_HR_A_MODULE_FIRMWARE(api) \

	IWL_BZ_A_HR_A_FW_PRE __stringify(api) ".ucode"
@@ -98,45 +79,6 @@ 
	IWL_GL_B_FM_B_FW_PRE __stringify(api) ".ucode"

#define IWL_GL_C_FM_C_MODULE_FIRMWARE(api) \

	IWL_GL_C_FM_C_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_B_FM4_B_MODULE_FIRMWARE(api) \

	IWL_BNJ_B_FM4_B_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_B_GF_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_B_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_C_GF_A_MODULE_FIRMWARE(api) \

		IWL_BNJ_C_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_B_GF4_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_B_GF4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_C_GF4_A_MODULE_FIRMWARE(api) \

		IWL_BNJ_C_GF4_A_FW_PRE __stringify(api) ".ucode"



#define IWL_BNJ_A_HR_A_MODULE_FIRMWARE(api) \

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

#define IWL_BNJ_B_HR_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_B_HR_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_B_HR_B_MODULE_FIRMWARE(api) \

	IWL_BNJ_B_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_C_HR_B_MODULE_FIRMWARE(api) \

	IWL_BNJ_B_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_B_FM_B_MODULE_FIRMWARE(api) \

	IWL_BNJ_B_FM_B_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_C_FM_C_MODULE_FIRMWARE(api) \

	IWL_BNJ_C_FM_C_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_WH_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_A_WH_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_B_WH_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_B_WH_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_C_WH_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_C_WH_A_FW_PRE __stringify(api) ".ucode"



static const struct iwl_base_params iwl_bz_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
@@ -393,102 +335,6 @@ const struct iwl_cfg iwl_cfg_bz_z0_gf_a0 = { 
	.num_rbds = IWL_NUM_RBDS_BZ_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,

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_BZ_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,

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_BZ_HE,

};



const struct iwl_cfg iwl_cfg_bnj_b0_fm4_b0 = {

	.fw_name_pre = IWL_BNJ_B_FM4_B_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_BZ_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,

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_BZ_HE,

};



const struct iwl_cfg iwl_cfg_bnj_b0_gf_a0 = {

	.fw_name_pre = IWL_BNJ_B_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_BZ_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,

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_BZ_HE,

};



const struct iwl_cfg iwl_cfg_bnj_b0_gf4_a0 = {

	.fw_name_pre = IWL_BNJ_B_GF4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_BZ_HE,

};



const struct iwl_cfg iwl_cfg_bnj_a0_hr_a0 = {

	.fw_name_pre = IWL_BNJ_A_HR_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_BZ_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,

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_BZ_HE,

};



const struct iwl_cfg iwl_cfg_bnj_b0_hr_a0 = {

	.fw_name_pre = IWL_BNJ_B_HR_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_BZ_HE,

};



const struct iwl_cfg iwl_cfg_bnj_b0_hr_b0 = {

	.fw_name_pre = IWL_BNJ_B_HR_B_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_BZ_HE,

};



const struct iwl_cfg iwl_cfg_bnj_b0_fm_b0 = {

	.fw_name_pre = IWL_BNJ_B_FM_B_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_BZ_HE,

};





MODULE_FIRMWARE(IWL_BZ_A_HR_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_HR_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));
@@ -499,25 +345,7 @@ MODULE_FIRMWARE(IWL_BZ_A_FM_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX)); 
MODULE_FIRMWARE(IWL_BZ_A_FM_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_FM_C_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_GL_A_FM_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_FM_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_FM4_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_B_FM4_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_GF_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_B_GF_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_C_GF_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_GF4_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_B_GF4_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_C_GF4_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_HR_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_B_HR_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_B_HR_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_C_HR_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_FM4_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_FM4_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_GL_B_FM_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_GL_C_FM_C_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));
 
MODULE_FIRMWARE(IWL_BNJ_B_FM_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_C_FM_C_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_WH_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_B_WH_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_C_WH_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+0 −25
Original line number Diff line number Diff line
@@ -417,13 +417,10 @@ struct iwl_cfg { 
#define IWL_CFG_ANY (~0)



#define IWL_CFG_MAC_TYPE_PU		0x31

#define IWL_CFG_MAC_TYPE_PNJ		0x32

#define IWL_CFG_MAC_TYPE_TH		0x32

#define IWL_CFG_MAC_TYPE_QU		0x33

#define IWL_CFG_MAC_TYPE_QUZ		0x35

#define IWL_CFG_MAC_TYPE_QNJ		0x36

#define IWL_CFG_MAC_TYPE_SO		0x37

#define IWL_CFG_MAC_TYPE_SNJ		0x42

#define IWL_CFG_MAC_TYPE_SOF		0x43

#define IWL_CFG_MAC_TYPE_MA		0x44

#define IWL_CFG_MAC_TYPE_BZ		0x46
@@ -489,12 +486,10 @@ extern const struct iwl_cfg_trans_params iwl9000_trans_cfg; 
extern const struct iwl_cfg_trans_params iwl9560_trans_cfg;

extern const struct iwl_cfg_trans_params iwl9560_long_latency_trans_cfg;

extern const struct iwl_cfg_trans_params iwl9560_shared_clk_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_qnj_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_qu_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_qu_medium_latency_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_ax200_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_snj_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_so_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_so_long_latency_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_so_long_latency_imr_trans_cfg;
@@ -610,7 +605,6 @@ extern const struct iwl_cfg iwl9260_2ac_cfg; 
extern const struct iwl_cfg iwl9560_qu_b0_jf_b0_cfg;

extern const struct iwl_cfg iwl9560_qu_c0_jf_b0_cfg;

extern const struct iwl_cfg iwl9560_quz_a0_jf_b0_cfg;

extern const struct iwl_cfg iwl9560_qnj_b0_jf_b0_cfg;

extern const struct iwl_cfg iwl9560_2ac_cfg_soc;

extern const struct iwl_cfg iwl_qu_b0_hr1_b0;

extern const struct iwl_cfg iwl_qu_c0_hr1_b0;
@@ -629,17 +623,12 @@ extern const struct iwl_cfg killer1650s_2ax_cfg_qu_c0_hr_b0; 
extern const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0;

extern const struct iwl_cfg killer1650x_2ax_cfg;

extern const struct iwl_cfg killer1650w_2ax_cfg;

extern const struct iwl_cfg iwl_qnj_b0_hr_b0_cfg;

extern const struct iwl_cfg iwlax210_2ax_cfg_so_jf_b0;

extern const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0;

extern const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0_long;

extern const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0;

extern const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0;

extern const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0_long;

extern const struct iwl_cfg iwlax411_2ax_cfg_sosnj_gf4_a0;

extern const struct iwl_cfg iwlax211_cfg_snj_gf_a0;

extern const struct iwl_cfg iwl_cfg_snj_hr_b0;

extern const struct iwl_cfg iwl_cfg_snj_a0_jf_b0;

extern const struct iwl_cfg iwl_cfg_ma_a0_hr_b0;

extern const struct iwl_cfg iwl_cfg_ma_a0_gf_a0;

extern const struct iwl_cfg iwl_cfg_ma_a0_gf4_a0;
@@ -651,8 +640,6 @@ extern const struct iwl_cfg iwl_cfg_ma_b0_gf_a0; 
extern const struct iwl_cfg iwl_cfg_ma_b0_gf4_a0;

extern const struct iwl_cfg iwl_cfg_ma_b0_mr_a0;

extern const struct iwl_cfg iwl_cfg_ma_b0_fm_a0;

extern const struct iwl_cfg iwl_cfg_snj_a0_mr_a0;

extern const struct iwl_cfg iwl_cfg_snj_a0_ms_a0;

extern const struct iwl_cfg iwl_cfg_so_a0_hr_a0;

extern const struct iwl_cfg iwl_cfg_so_a0_ms_a0;

extern const struct iwl_cfg iwl_cfg_quz_a0_hr_b0;
@@ -674,18 +661,6 @@ extern const struct iwl_cfg iwl_cfg_gl_a0_fm_a0; 
extern const struct iwl_cfg iwl_cfg_gl_b0_fm_b0;

extern const struct iwl_cfg iwl_cfg_gl_c0_fm_c0;

extern const struct iwl_cfg iwl_cfg_bz_z0_gf_a0;

extern const struct iwl_cfg iwl_cfg_bnj_a0_fm_a0;

extern const struct iwl_cfg iwl_cfg_bnj_a0_fm4_a0;

extern const struct iwl_cfg iwl_cfg_bnj_a0_gf_a0;

extern const struct iwl_cfg iwl_cfg_bnj_b0_gf_a0;

extern const struct iwl_cfg iwl_cfg_bnj_a0_gf4_a0;

extern const struct iwl_cfg iwl_cfg_bnj_b0_gf4_a0;

extern const struct iwl_cfg iwl_cfg_bnj_a0_hr_a0;

extern const struct iwl_cfg iwl_cfg_bnj_a0_hr_b0;

extern const struct iwl_cfg iwl_cfg_bnj_b0_hr_a0;

extern const struct iwl_cfg iwl_cfg_bnj_b0_hr_b0;

extern const struct iwl_cfg iwl_cfg_bnj_b0_fm_b0;

extern const struct iwl_cfg iwl_cfg_bnj_b0_fm4_b0;

extern const struct iwl_cfg iwl_cfg_sc_a0_fm_b0;

extern const struct iwl_cfg iwl_cfg_sc_a0_fm_c0;

extern const struct iwl_cfg iwl_cfg_sc_a0_hr_a0;

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

+0 −218

File changed.

Preview size limit exceeded, changes collapsed.