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

Commit 58cc4750 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: pm-boot: Use new multicluster boot API to set warmboot addr"

parents 1d6522cd 966f6452

drivers/power/qcom/pm-boot.c

+17 −10
Original line number Diff line number Diff line
@@ -23,7 +23,13 @@ static void (*msm_pm_boot_after_pc)(unsigned int cpu); 


static int msm_pm_tz_boot_init(void)

{

	phys_addr_t warmboot_addr = virt_to_phys(msm_pm_boot_entry);



	if (scm_is_mc_boot_available()) {

		return scm_set_warm_boot_addr_mc_for_all(warmboot_addr);

	} else {

		unsigned int flag = 0;



		if (num_possible_cpus() == 1)

			flag = SCM_FLAG_WARMBOOT_CPU0;

		else if (num_possible_cpus() == 2)
@@ -36,6 +42,7 @@ static int msm_pm_tz_boot_init(void) 


		return scm_set_boot_addr(virt_to_phys(msm_pm_boot_entry), flag);

	}

}



static void msm_pm_write_boot_vector(unsigned int cpu, unsigned long address)

{