Commit 75f059d3 authored by Golan Ben Ami's avatar Golan Ben Ami Committed by Johannes Berg
Browse files

wifi: iwlwifi: cfg: freeze 22500 devices FW API 



FW version is now frozen for 22500 devices. Don't
allow newer versions in the driver.

Signed-off-by: default avatarGolan Ben Ami <golan.ben.ami@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230524203151.8a25ebf9134c.I3f1454498322ce28cb687d28c091c7ee092cefca@changeid


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

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

+11 −9
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


/* Highest firmware API version supported */

#define IWL_22000_UCODE_API_MAX	78

#define IWL_22500_UCODE_API_MAX	77



/* Lowest firmware API version supported */

#define IWL_22000_UCODE_API_MIN	39
@@ -222,7 +223,6 @@ static const struct iwl_ht_params iwl_gl_a_ht_params = { 
};



#define IWL_DEVICE_22000_COMMON						\

	.ucode_api_max = IWL_22000_UCODE_API_MAX,			\

	.ucode_api_min = IWL_22000_UCODE_API_MIN,			\

	.led_mode = IWL_LED_RF_STATE,					\

	.nvm_hw_section_num = 10,					\
@@ -261,6 +261,7 @@ static const struct iwl_ht_params iwl_gl_a_ht_params = { 


#define IWL_DEVICE_22500						\

	IWL_DEVICE_22000_COMMON,					\

	.ucode_api_max = IWL_22500_UCODE_API_MAX,			\

	.trans.device_family = IWL_DEVICE_FAMILY_22000,			\

	.trans.base_params = &iwl_22000_base_params,			\

	.gp2_reg_addr = 0xa02c68,					\
@@ -277,6 +278,7 @@ static const struct iwl_ht_params iwl_gl_a_ht_params = { 


#define IWL_DEVICE_AX210						\

	IWL_DEVICE_22000_COMMON,					\

	.ucode_api_max = IWL_22000_UCODE_API_MAX,			\

	.trans.umac_prph_offset = 0x300000,				\

	.trans.device_family = IWL_DEVICE_FAMILY_AX210,			\

	.trans.base_params = &iwl_ax210_base_params,			\
@@ -1178,14 +1180,14 @@ const struct iwl_cfg iwl_cfg_bnj_b0_fm_b0 = { 
	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,

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

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

MODULE_FIRMWARE(IWL_QU_B_HR_B_MODULE_FIRMWARE(IWL_22500_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QNJ_B_HR_B_MODULE_FIRMWARE(IWL_22500_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22500_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22500_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_22500_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QUZ_A_JF_B_MODULE_FIRMWARE(IWL_22500_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QNJ_B_JF_B_MODULE_FIRMWARE(IWL_22500_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_CC_A_MODULE_FIRMWARE(IWL_22500_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SO_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SO_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SO_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));