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

Commit 5ac21a94 authored by Marc Zyngier's avatar Marc Zyngier Committed by Arnd Bergmann
Browse files

ARM: SoC: convert ux500 to SMP operations 



Convert ux500 platforms to use struct smp_operations to provide
their SMP and CPU hotplug operations.

Cc: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Acked-by: default avatarsrinidhi kasagar <srinidhi.kasagar@stericsson.com>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 44ea349f

arch/arm/mach-ux500/board-mop500.c

+4 −0
Original line number Diff line number Diff line
@@ -694,6 +694,7 @@ static void __init hrefv60_init_machine(void) 
MACHINE_START(U8500, "ST-Ericsson MOP500 platform")

	/* Maintainer: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> */

	.atag_offset	= 0x100,

	.smp		= smp_ops(ux500_smp_ops),

	.map_io		= u8500_map_io,

	.init_irq	= ux500_init_irq,

	/* we re-use nomadik timer here */
@@ -705,6 +706,7 @@ MACHINE_END 


MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")

	.atag_offset	= 0x100,

	.smp		= smp_ops(ux500_smp_ops),

	.map_io		= u8500_map_io,

	.init_irq	= ux500_init_irq,

	.timer		= &ux500_timer,
@@ -715,6 +717,7 @@ MACHINE_END 


MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")

	.atag_offset	= 0x100,

	.smp		= smp_ops(ux500_smp_ops),

	.map_io		= u8500_map_io,

	.init_irq	= ux500_init_irq,

	/* we re-use nomadik timer here */
@@ -844,6 +847,7 @@ static const char * u8500_dt_board_compat[] = { 




DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)")

	.smp		= smp_ops(ux500_smp_ops),

	.map_io		= u8500_map_io,

	.init_irq	= ux500_init_irq,

	/* we re-use nomadik timer here */

arch/arm/mach-ux500/hotplug.c

+9 −27
Original line number Diff line number Diff line
@@ -15,13 +15,20 @@ 
#include <asm/cacheflush.h>

#include <asm/smp_plat.h>



#include <mach/setup.h>



extern volatile int pen_release;



static inline void platform_do_lowpower(unsigned int cpu)

/*

 * platform-specific code to shutdown a CPU

 *

 * Called with IRQs disabled

 */

void __ref ux500_cpu_die(unsigned int cpu)

{

	flush_cache_all();



	/* we put the platform to just WFI */

	/* directly enter low power state, skipping secure registers */

	for (;;) {

		__asm__ __volatile__("dsb\n\t" "wfi\n\t"

				: : : "memory");
@@ -33,28 +40,3 @@ static inline void platform_do_lowpower(unsigned int cpu) 
		}

	}

}
 


int platform_cpu_kill(unsigned int cpu)

{

	return 1;

}



/*

 * platform-specific code to shutdown a CPU

 *

 * Called with IRQs disabled

 */

void platform_cpu_die(unsigned int cpu)

{

	/* directly enter low power state, skipping secure registers */

	platform_do_lowpower(cpu);

}



int platform_cpu_disable(unsigned int cpu)

{

	/*

	 * we don't allow CPU 0 to be shutdown (it is still too special

	 * e.g. clock tick interrupts)

	 */

	return cpu == 0 ? -EPERM : 0;

}

arch/arm/mach-ux500/include/mach/setup.h

+3 −0
Original line number Diff line number Diff line
@@ -45,4 +45,7 @@ extern struct sys_timer ux500_timer; 
	.type		= MT_MEMORY,		\

}



extern struct smp_operations ux500_smp_ops;

extern void ux500_cpu_die(unsigned int cpu);



#endif /*  __ASM_ARCH_SETUP_H */

arch/arm/mach-ux500/platsmp.c

+14 −4
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static void __iomem *scu_base_addr(void) 


static DEFINE_SPINLOCK(boot_lock);



void __cpuinit platform_secondary_init(unsigned int cpu)

static void __cpuinit ux500_secondary_init(unsigned int cpu)

{

	/*

	 * if any interrupts are already enabled for the primary
@@ -80,7 +80,7 @@ void __cpuinit platform_secondary_init(unsigned int cpu) 
	spin_unlock(&boot_lock);

}



int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)

static int __cpuinit ux500_boot_secondary(unsigned int cpu, struct task_struct *idle)

{

	unsigned long timeout;
@@ -145,7 +145,7 @@ static void __init wakeup_secondary(void) 
 * Initialise the CPU possible map early - this describes the CPUs

 * which may be present or become present in the system.

 */

void __init smp_init_cpus(void)

static void __init ux500_smp_init_cpus(void)

{

	void __iomem *scu_base = scu_base_addr();

	unsigned int i, ncores;
@@ -165,9 +165,19 @@ void __init smp_init_cpus(void) 
	set_smp_cross_call(gic_raise_softirq);

}



void __init platform_smp_prepare_cpus(unsigned int max_cpus)

static void __init ux500_smp_prepare_cpus(unsigned int max_cpus)

{



	scu_enable(scu_base_addr());

	wakeup_secondary();

}



struct smp_operations ux500_smp_ops __initdata = {

	.smp_init_cpus		= ux500_smp_init_cpus,

	.smp_prepare_cpus	= ux500_smp_prepare_cpus,

	.smp_secondary_init	= ux500_secondary_init,

	.smp_boot_secondary	= ux500_boot_secondary,

#ifdef CONFIG_HOTPLUG_CPU

	.cpu_die		= ux500_cpu_die,

#endif

};