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

Commit 2d8b21d9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: SoC: convert spear13xx to SMP operations 



Convert the spear13xx platform to use struct smp_operations to provide
its SMP and CPU hotplug operations.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Cc: Shiraz Hashim <shiraz.hashim@st.com>
Cc: spear-devel@list.st.com
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent e4f2d979

arch/arm/mach-spear13xx/hotplug.c

+3 −17
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static inline void cpu_leave_lowpower(void) 
	: "cc");

}



static inline void platform_do_lowpower(unsigned int cpu, int *spurious)

static inline void spear13xx_do_lowpower(unsigned int cpu, int *spurious)

{

	for (;;) {

		wfi();
@@ -79,17 +79,12 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious) 
	}

}



int platform_cpu_kill(unsigned int cpu)

{

	return 1;

}



/*

 * platform-specific code to shutdown a CPU

 *

 * Called with IRQs disabled

 */

void __cpuinit platform_cpu_die(unsigned int cpu)

void __ref spear13xx_cpu_die(unsigned int cpu)

{

	int spurious = 0;
@@ -97,7 +92,7 @@ void __cpuinit platform_cpu_die(unsigned int cpu) 
	 * we're ready for shutdown now, so do it

	 */

	cpu_enter_lowpower();

	platform_do_lowpower(cpu, &spurious);

	spear13xx_do_lowpower(cpu, &spurious);



	/*

	 * bring this CPU back into the world of cache
@@ -108,12 +103,3 @@ void __cpuinit platform_cpu_die(unsigned int cpu) 
	if (spurious)

		pr_warn("CPU%u: %u spurious wakeup calls\n", cpu, spurious);

}
 


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-spear13xx/include/mach/generic.h

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ void __init spear13xx_l2x0_init(void); 
bool dw_dma_filter(struct dma_chan *chan, void *slave);

void spear_restart(char, const char *);

void spear13xx_secondary_startup(void);

void __cpuinit spear13xx_cpu_die(unsigned int cpu);



extern struct smp_operations spear13xx_smp_ops;



#ifdef CONFIG_MACH_SPEAR1310

void __init spear1310_clk_init(void);

arch/arm/mach-spear13xx/platsmp.c

+15 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <asm/hardware/gic.h>

#include <asm/smp_scu.h>

#include <mach/spear.h>

#include <mach/generic.h>



/*

 * control for which core is the next to come out of the secondary
@@ -28,9 +29,8 @@ volatile int __cpuinitdata pen_release = -1; 
static DEFINE_SPINLOCK(boot_lock);



static void __iomem *scu_base = IOMEM(VA_SCU_BASE);

extern void spear13xx_secondary_startup(void);



void __cpuinit platform_secondary_init(unsigned int cpu)

static void __cpuinit spear13xx_secondary_init(unsigned int cpu)

{

	/*

	 * if any interrupts are already enabled for the primary
@@ -53,7 +53,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 spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)

{

	unsigned long timeout;
@@ -97,7 +97,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) 
 * 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 spear13xx_smp_init_cpus(void)

{

	unsigned int i, ncores = scu_get_core_count(scu_base);
@@ -113,7 +113,7 @@ 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 spear13xx_smp_prepare_cpus(unsigned int max_cpus)

{



	scu_enable(scu_base);
@@ -125,3 +125,13 @@ void __init platform_smp_prepare_cpus(unsigned int max_cpus) 
	 */

	__raw_writel(virt_to_phys(spear13xx_secondary_startup), SYS_LOCATION);

}



struct smp_operations spear13xx_smp_ops __initdata = {

       .smp_init_cpus		= spear13xx_smp_init_cpus,

       .smp_prepare_cpus	= spear13xx_smp_prepare_cpus,

       .smp_secondary_init	= spear13xx_secondary_init,

       .smp_boot_secondary	= spear13xx_boot_secondary,

#ifdef CONFIG_HOTPLUG_CPU

       .cpu_die			= spear13xx_cpu_die,

#endif

};

arch/arm/mach-spear13xx/spear1310.c

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ static void __init spear1310_map_io(void) 
}



DT_MACHINE_START(SPEAR1310_DT, "ST SPEAr1310 SoC with Flattened Device Tree")

	.smp		=	smp_ops(spear13xx_smp_ops),

	.map_io		=	spear1310_map_io,

	.init_irq	=	spear13xx_dt_init_irq,

	.handle_irq	=	gic_handle_irq,

arch/arm/mach-spear13xx/spear1340.c

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ static const char * const spear1340_dt_board_compat[] = { 
};



DT_MACHINE_START(SPEAR1340_DT, "ST SPEAr1340 SoC with Flattened Device Tree")

	.smp		=	smp_ops(spear13xx_smp_ops),

	.map_io		=	spear13xx_map_io,

	.init_irq	=	spear13xx_dt_init_irq,

	.handle_irq	=	gic_handle_irq,