Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e70af8e0 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: don't load on 7265D with old NVM 



7265D are new devices that should always have a new NVM
(at least 0x0c11). The firmware has issues with older
versions of the NVM which are not and will not be available
to the common mortals.

Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent a4e5df28

drivers/net/wireless/iwlwifi/iwl-7000.c

+5 −3
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ 
#define IWL3165_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL7265_NVM_VERSION		0x0a1d

#define IWL7265_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL7265D_NVM_VERSION		0x0c11

#define IWL7265_TX_POWER_VERSION	0xffff /* meaningless */



#define IWL7260_FW_PRE "iwlwifi-7260-"

#define IWL7260_MODULE_FIRMWARE(api) IWL7260_FW_PRE __stringify(api) ".ucode"
@@ -275,7 +277,7 @@ const struct iwl_cfg iwl7265d_2ac_cfg = { 
	.fw_name_pre = IWL7265D_FW_PRE,

	IWL_DEVICE_7000,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_ver = IWL7265D_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

};
@@ -285,7 +287,7 @@ const struct iwl_cfg iwl7265d_2n_cfg = { 
	.fw_name_pre = IWL7265D_FW_PRE,

	IWL_DEVICE_7000,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_ver = IWL7265D_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

};
@@ -295,7 +297,7 @@ const struct iwl_cfg iwl7265d_n_cfg = { 
	.fw_name_pre = IWL7265D_FW_PRE,

	IWL_DEVICE_7000,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_ver = IWL7265D_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

};