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

Commit 44fd09da authored by Chaya Rachel Ivgi's avatar Chaya Rachel Ivgi Committed by Luca Coelho
Browse files

iwlwifi: nvm: set the correct offsets to 3168 series 



The driver currently handles two NVM formats,
one for 7000 family and below, and one for 8000 family and above.
The 3168 series uses something in between,
so currently the driver uses incorrect offsets for it.
Fix the incorrect offsets.

Fixes: c4836b05 ("iwlwifi: Add PCI IDs for the new 3168 series")
Signed-off-by: default avatarChaya Rachel Ivgi <chaya.rachel.ivgi@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent d8c73e45

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

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ const struct iwl_cfg iwl3168_2ac_cfg = { 
	.nvm_calib_ver = IWL3168_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

	.dccm_len = IWL7265_DCCM_LEN,

	.nvm_type = IWL_NVM_SDP,

};



const struct iwl_cfg iwl7265_2ac_cfg = {

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

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static const struct iwl_tt_params iwl8000_tt_params = { 
	.default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C,	\

	.thermal_params = &iwl8000_tt_params,				\

	.apmg_not_supported = true,					\

	.ext_nvm = true,						\

	.nvm_type = IWL_NVM_EXT,					\

	.dbgc_supported = true



#define IWL_DEVICE_8000							\

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

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static const struct iwl_tt_params iwl9000_tt_params = { 
	.vht_mu_mimo_supported = true,					\

	.mac_addr_from_csr = true,					\

	.rf_id = true,							\

	.ext_nvm = true,						\

	.nvm_type = IWL_NVM_EXT,					\

	.dbgc_supported = true



const struct iwl_cfg iwl9160_2ac_cfg = {

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

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static const struct iwl_ht_params iwl_a000_ht_params = { 
	.use_tfh = true,						\

	.rf_id = true,							\

	.gen2 = true,							\

	.ext_nvm = true,						\

	.nvm_type = IWL_NVM_EXT,					\

	.dbgc_supported = true



const struct iwl_cfg iwla000_2ac_cfg_hr = {

drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ enum iwl_nvm_access_target { 
 * @NVM_SECTION_TYPE_REGULATORY: regulatory section

 * @NVM_SECTION_TYPE_CALIBRATION: calibration section

 * @NVM_SECTION_TYPE_PRODUCTION: production section

 * @NVM_SECTION_TYPE_REGULATORY_SDP: regulatory section used by 3168 series

 * @NVM_SECTION_TYPE_MAC_OVERRIDE: MAC override section

 * @NVM_SECTION_TYPE_PHY_SKU: PHY SKU section

 * @NVM_MAX_NUM_SECTIONS: number of sections
@@ -117,6 +118,7 @@ enum iwl_nvm_section_type { 
	NVM_SECTION_TYPE_REGULATORY = 3,

	NVM_SECTION_TYPE_CALIBRATION = 4,

	NVM_SECTION_TYPE_PRODUCTION = 5,

	NVM_SECTION_TYPE_REGULATORY_SDP = 8,

	NVM_SECTION_TYPE_MAC_OVERRIDE = 11,

	NVM_SECTION_TYPE_PHY_SKU = 12,

	NVM_MAX_NUM_SECTIONS = 13,