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

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

ARM: SoC: convert OMAP4 to SMP operations 



Convert OMAP4 to use struct smp_operations to provide its SMP
and CPU hotplug operations.

Tested on both Panda and IGEPv2 (MULTI_OMAP kernel)

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Reviewed-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 3695adc2

arch/arm/mach-omap2/board-4430sdp.c

+1 −0
Original line number Diff line number Diff line
@@ -909,6 +909,7 @@ static void __init omap_4430sdp_init(void) 
MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board")

	/* Maintainer: Santosh Shilimkar - Texas Instruments Inc */

	.atag_offset	= 0x100,

	.smp		= smp_ops(omap4_smp_ops),

	.reserve	= omap_reserve,

	.map_io		= omap4_map_io,

	.init_early	= omap4430_init_early,

arch/arm/mach-omap2/board-generic.c

+2 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ static const char *omap4_boards_compat[] __initdata = { 


DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)")

	.reserve	= omap_reserve,

	.smp		= smp_ops(omap4_smp_ops),

	.map_io		= omap4_map_io,

	.init_early	= omap4430_init_early,

	.init_irq	= omap_gic_of_init,
@@ -147,6 +148,7 @@ static const char *omap5_boards_compat[] __initdata = { 


DT_MACHINE_START(OMAP5_DT, "Generic OMAP5 (Flattened Device Tree)")

	.reserve	= omap_reserve,

	.smp		= smp_ops(omap4_smp_ops),

	.map_io		= omap5_map_io,

	.init_early	= omap5_init_early,

	.init_irq	= omap_gic_of_init,

arch/arm/mach-omap2/board-omap4panda.c

+1 −0
Original line number Diff line number Diff line
@@ -518,6 +518,7 @@ static void __init omap4_panda_init(void) 
MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board")

	/* Maintainer: David Anders - Texas Instruments Inc */

	.atag_offset	= 0x100,

	.smp		= smp_ops(omap4_smp_ops),

	.reserve	= omap_reserve,

	.map_io		= omap4_map_io,

	.init_early	= omap4430_init_early,

arch/arm/mach-omap2/common.h

+5 −0
Original line number Diff line number Diff line
@@ -278,6 +278,11 @@ extern void omap_secondary_startup(void); 
extern u32 omap_modify_auxcoreboot0(u32 set_mask, u32 clear_mask);

extern void omap_auxcoreboot_addr(u32 cpu_addr);

extern u32 omap_read_auxcoreboot0(void);



extern void omap4_cpu_die(unsigned int cpu);



extern struct smp_operations omap4_smp_ops;



extern void omap5_secondary_startup(void);

#endif

arch/arm/mach-omap2/omap-hotplug.c

+1 −15
Original line number Diff line number Diff line
@@ -26,16 +26,11 @@ 


#include "powerdomain.h"



int platform_cpu_kill(unsigned int cpu)

{

	return 1;

}



/*

 * platform-specific code to shutdown a CPU

 * Called with IRQs disabled

 */

void __ref platform_cpu_die(unsigned int cpu)

void __ref omap4_cpu_die(unsigned int cpu)

{

	unsigned int boot_cpu = 0;

	void __iomem *base = omap_get_wakeupgen_base();
@@ -75,12 +70,3 @@ void __ref platform_cpu_die(unsigned int cpu) 
		pr_debug("CPU%u: spurious wakeup call\n", 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;

}