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

Commit d1358f62 authored by Johannes Berg's avatar Johannes Berg Committed by Reinette Chatre
Browse files

iwlwifi: move eeprom version printout to eeprom init 



It doesn't belong into firmware loading,
it should instead be printed after loading
the EEPROM.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 22adba2a

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

+0 −6
Original line number Diff line number Diff line
@@ -1551,7 +1551,6 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) 
	u32 api_ver, build;

	u32 inst_size, data_size, init_size, init_data_size, boot_size;

	int err, hdr_size;

	u16 eeprom_ver;

	char buildstr[25];



	if (!ucode_raw) {
@@ -1654,11 +1653,6 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) 
		 IWL_UCODE_SERIAL(priv->ucode_ver),

		 buildstr);



	eeprom_ver = iwl_eeprom_query16(priv, EEPROM_VERSION);

	IWL_DEBUG_INFO(priv, "NVM Type: %s, version: 0x%x\n",

		       (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP)

		       ? "OTP" : "EEPROM", eeprom_ver);



	IWL_DEBUG_INFO(priv, "f/w package hdr ucode version raw = 0x%x\n",

		       priv->ucode_ver);

	IWL_DEBUG_INFO(priv, "f/w package hdr runtime inst size = %u\n",

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

+7 −0
Original line number Diff line number Diff line
@@ -589,9 +589,16 @@ int iwl_eeprom_init(struct iwl_priv *priv) 
			e[addr / 2] = cpu_to_le16(r >> 16);

		}

	}



	IWL_DEBUG_INFO(priv, "NVM Type: %s, version: 0x%x\n",

		       (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP)

		       ? "OTP" : "EEPROM",

		       iwl_eeprom_query16(priv, EEPROM_VERSION));



	ret = 0;

done:

	priv->cfg->ops->lib->eeprom_ops.release_semaphore(priv);



err:

	if (ret)

		iwl_eeprom_free(priv);