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

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

iwlwifi: mvm: Prioritize external nvm values on top of the OTP values 



Read first the nvm sections from the OTP, then read the nvm
sections from the external file and override the OTP values
(if there were any values in the OTP).

Signed-off-by: default avatarEran Harary <eran.harary@intel.com>
Reviewed-by: default avatarDor Shaish <dor.shaish@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 14b485f0

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

+10 −8
Original line number Diff line number Diff line
@@ -437,14 +437,7 @@ int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic) 
	if (WARN_ON_ONCE(mvm->cfg->nvm_hw_section_num >= NVM_MAX_NUM_SECTIONS))

		return -EINVAL;



	/* load external NVM if configured */

	if (iwlwifi_mod_params.nvm_file) {

		/* move to External NVM flow */

		ret = iwl_mvm_read_external_nvm(mvm);

		if (ret)

			return ret;

	}



	/* load NVM values from nic */

	if (read_nvm_from_nic) {

		/* list of NVM sections we are allowed/need to read */

		if (mvm->trans->cfg->device_family != IWL_DEVICE_FAMILY_8000) {
@@ -512,6 +505,15 @@ int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic) 
			return ret;

	}



	/* load external NVM if configured */

	if (iwlwifi_mod_params.nvm_file) {

		/* move to External NVM flow */

		ret = iwl_mvm_read_external_nvm(mvm);

		if (ret)

			return ret;

	}



	/* parse the relevant nvm sections */

	mvm->nvm_data = iwl_parse_nvm_sections(mvm);

	if (!mvm->nvm_data)

		return -ENODATA;