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

Commit d6be9c1d authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: mvm: read new secure boot registers 



Addresses were changed for a000 devices.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 26ecfe01

drivers/net/wireless/intel/iwlwifi/iwl-prph.h

+2 −0
Original line number Diff line number Diff line
@@ -400,6 +400,8 @@ enum aux_misc_master1_en { 
#define PREG_AUX_BUS_WPROT_0		0xA04CC0

#define SB_CPU_1_STATUS			0xA01E30

#define SB_CPU_2_STATUS			0xA01E34

#define UMAG_SB_CPU_1_STATUS		0xA038C0

#define UMAG_SB_CPU_2_STATUS		0xA038C4



/* FW chicken bits */

#define LMPM_CHICK			0xA01FF8

drivers/net/wireless/intel/iwlwifi/mvm/fw.c

+10 −3
Original line number Diff line number Diff line
@@ -639,11 +639,18 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm, 
	ret = iwl_wait_notification(&mvm->notif_wait, &alive_wait,

				    MVM_UCODE_ALIVE_TIMEOUT);

	if (ret) {

		if (mvm->trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)

		struct iwl_trans *trans = mvm->trans;



		if (trans->cfg->gen2)

			IWL_ERR(mvm,

				"SecBoot CPU1 Status: 0x%x, CPU2 Status: 0x%x\n",

				iwl_read_prph(trans, UMAG_SB_CPU_1_STATUS),

				iwl_read_prph(trans, UMAG_SB_CPU_2_STATUS));

		else if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)

			IWL_ERR(mvm,

				"SecBoot CPU1 Status: 0x%x, CPU2 Status: 0x%x\n",

				iwl_read_prph(mvm->trans, SB_CPU_1_STATUS),

				iwl_read_prph(mvm->trans, SB_CPU_2_STATUS));

				iwl_read_prph(trans, SB_CPU_1_STATUS),

				iwl_read_prph(trans, SB_CPU_2_STATUS));

		mvm->cur_ucode = old_type;

		return ret;

	}