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

Commit 02e7b067 authored by Gregory CLEMENT's avatar Gregory CLEMENT Committed by Jason Cooper
Browse files

ARM: mvebu: use a separate function to set the boot address of CPUs 



Setting the start (or boot) address of a CPU is no more used only
during SMP bring up on Armada 370/XP, but it will also be used by the
CPU idle function of Armada XP, and by the Armada 38x SMP support.

Therefore this commit creates a separate PMSU function to set the boot
address of a CPU with the PMSU.

Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1397483433-25836-7-git-send-email-thomas.petazzoni@free-electrons.com


Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1397483433-25836-7-git-send-email-thomas.petazzoni@free-electrons.com


Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 0c3acc74

arch/arm/mach-mvebu/pmsu.c

+7 −2
Original line number Diff line number Diff line
@@ -41,6 +41,12 @@ static struct of_device_id of_pmsu_table[] = { 
	{ /* end of list */ },

};



static void mvebu_pmsu_set_cpu_boot_addr(int hw_cpu, void *boot_addr)

{

	writel(virt_to_phys(boot_addr), pmsu_mp_base +

		PMSU_BOOT_ADDR_REDIRECT_OFFSET(hw_cpu));

}



#ifdef CONFIG_SMP

int armada_xp_boot_cpu(unsigned int cpu_id, void *boot_addr)

{
@@ -53,8 +59,7 @@ int armada_xp_boot_cpu(unsigned int cpu_id, void *boot_addr) 


	hw_cpu = cpu_logical_map(cpu_id);



	writel(virt_to_phys(boot_addr), pmsu_mp_base +

			PMSU_BOOT_ADDR_REDIRECT_OFFSET(hw_cpu));

	mvebu_pmsu_set_cpu_boot_addr(hw_cpu, boot_addr);



	ret = mvebu_cpu_reset_deassert(hw_cpu);

	if (ret) {