[PATCH v5 11/14] ARM: mvebu: Set the start address of a CPU in a separate function
From: Gregory CLEMENT <hidden>
Date: 2014-03-25 22:50:35
Also in:
linux-pm, lkml
Subsystem:
arm port, arm/marvell kirkwood and armada 370, 375, 38x, 39x, xp, 3700, 7k/8k, cn9130 soc support, the rest · Maintainers:
Russell King, Andrew Lunn, Gregory Clement, Sebastian Hesselbarth, Linus Torvalds
Setting the start (or boot) address of a CPU is no more used only during SMP bring up, but it will also be used by the CPU idle functions or later by the CPU hot plug ones. This commit moves it in a separate function. Signed-off-by: Gregory CLEMENT <redacted> --- arch/arm/mach-mvebu/pmsu.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-mvebu/pmsu.c b/arch/arm/mach-mvebu/pmsu.c
index c45029f0c0b4..3fc25d94e893 100644
--- a/arch/arm/mach-mvebu/pmsu.c
+++ b/arch/arm/mach-mvebu/pmsu.c@@ -76,6 +76,12 @@ static struct of_device_id of_pmsu_table[] = { { /* end of list */ }, }; +static void armada_370_xp_pmsu_set_start_addr(void *start_addr, int hw_cpu) +{ + writel(virt_to_phys(start_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) {
@@ -88,8 +94,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)); + armada_370_xp_pmsu_set_start_addr(boot_addr, hw_cpu); /* Release CPU from reset by clearing reset bit*/ reg = readl(pmsu_reset_base + PMSU_RESET_CTL_OFFSET(hw_cpu));
--
1.8.1.2