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

Commit 30085544 authored by Eran Harary's avatar Eran Harary Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: fix bug with OTP memory size 



OTP size changed in family 7000 and in family 8000.

Signed-off-by: default avatarEran Harary <eran.harary@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 7a531741

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

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ 
#define NVM_HW_SECTION_NUM_FAMILY_7000		0



static const struct iwl_base_params iwl7000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_7000,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.pll_cfg_val = 0,

	.shadow_ram_support = true,

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

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
#define NVM_HW_SECTION_NUM_FAMILY_8000		10



static const struct iwl_base_params iwl8000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_8000,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.pll_cfg_val = 0,

	.shadow_ram_support = true,

drivers/net/wireless/iwlwifi/iwl-agn-hw.h

+1 −3
Original line number Diff line number Diff line
@@ -102,9 +102,7 @@ 


/* EEPROM */

#define IWLAGN_EEPROM_IMG_SIZE		2048

/* OTP */

/* lower blocks contain EEPROM image and calibration data */

#define OTP_LOW_IMAGE_SIZE		(2 * 512 * sizeof(u16)) /* 2 KB */



/* high blocks contain PAPD data */

#define OTP_HIGH_IMAGE_SIZE_6x00        (6 * 512 * sizeof(u16)) /* 6 KB */

#define OTP_HIGH_IMAGE_SIZE_1000        (0x200 * sizeof(u16)) /* 1024 bytes */

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

+5 −0
Original line number Diff line number Diff line
@@ -193,6 +193,11 @@ struct iwl_ht_params { 
#define EEPROM_6000_REG_BAND_24_HT40_CHANNELS	0x80

#define EEPROM_REGULATORY_BAND_NO_HT40		0



/* lower blocks contain EEPROM image and calibration data */

#define OTP_LOW_IMAGE_SIZE		(2 * 512 * sizeof(u16)) /* 2 KB */

#define OTP_LOW_IMAGE_SIZE_FAMILY_7000	(4 * 512 * sizeof(u16)) /* 4 KB */

#define OTP_LOW_IMAGE_SIZE_FAMILY_8000	(32 * 512 * sizeof(u16)) /* 32 KB */



struct iwl_eeprom_params {

	const u8 regulatory_bands[7];

	bool enhanced_txpower;

drivers/net/wireless/iwlwifi/mvm/nvm.c

+0 −1
Original line number Diff line number Diff line
@@ -463,7 +463,6 @@ int iwl_nvm_init(struct iwl_mvm *mvm) 
		/* Read From FW NVM */

		IWL_DEBUG_EEPROM(mvm->trans->dev, "Read from NVM\n");



		/* TODO: find correct NVM max size for a section */

		nvm_buffer = kmalloc(mvm->cfg->base_params->eeprom_size,

				     GFP_KERNEL);

		if (!nvm_buffer)