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

Commit 1c51ed4f authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

ARM: mach-shmobile: SMP base support 



Add SMP base support for R-Mobile / SH-Mobile processors.

This patch contains all base code to support CONFIG_SMP
regardless of ARCH_SHMOBILE processor type. Both local timer
and CPU hotplug are supported, but no processor specific
code is included.

At this point only the default behavior is in place, so
a single core will always be used even though CONFIG_SMP
is enabled on multicore systems.

The SMP Kconfig entry for arch/arm/Kconfig is excluded from
this patch to simplify merging.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 09dd7ded

arch/arm/mach-shmobile/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -11,6 +11,11 @@ obj-$(CONFIG_ARCH_SH7377) += setup-sh7377.o clock-sh7377.o intc-sh7377.o 
obj-$(CONFIG_ARCH_SH7372)	+= setup-sh7372.o clock-sh7372.o intc-sh7372.o

obj-$(CONFIG_ARCH_SH73A0)	+= setup-sh73a0.o clock-sh73a0.o



# SMP objects

smp-y				:= platsmp.o headsmp.o

smp-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o

smp-$(CONFIG_LOCAL_TIMERS)	+= localtimer.o



# Pinmux setup

pfc-y				:=

pfc-$(CONFIG_ARCH_SH7367)	+= pfc-sh7367.o
@@ -26,4 +31,5 @@ obj-$(CONFIG_MACH_AG5EVM) += board-ag5evm.o 
obj-$(CONFIG_MACH_MACKEREL)	+= board-mackerel.o



# Framework support

obj-$(CONFIG_SMP)		+= $(smp-y)

obj-$(CONFIG_GENERIC_GPIO)	+= $(pfc-y)

arch/arm/mach-shmobile/headsmp.S

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * SMP support for R-Mobile / SH-Mobile

 *

 * Copyright (C) 2010  Magnus Damm

 * Copyright (C) 2010  Takashi Yoshii

 *

 * Based on vexpress, Copyright (c) 2003 ARM Limited, All Rights Reserved

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/linkage.h>

#include <linux/init.h>



	__INIT



/*

 * Reset vector for secondary CPUs.

 * This will be mapped at address 0 by SBAR register.

 * We need _long_ jump to the physical address.

 */

	.align  12

ENTRY(shmobile_secondary_vector)

	ldr     pc, 1f

1:	.long   secondary_startup - CONFIG_PAGE_OFFSET + CONFIG_MEMORY_START

arch/arm/mach-shmobile/hotplug.c

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/*

 * SMP support for R-Mobile / SH-Mobile

 *

 * Copyright (C) 2010  Magnus Damm

 *

 * Based on realview, Copyright (C) 2002 ARM Ltd, All Rights Reserved

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/kernel.h>

#include <linux/errno.h>

#include <linux/smp.h>



int platform_cpu_kill(unsigned int cpu)

{

	return 1;

}



void platform_cpu_die(unsigned int cpu)

{

	while (1) {

		/*

		 * here's the WFI

		 */

		asm(".word	0xe320f003\n"

		    :

		    :

		    : "memory", "cc");

	}

}



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-shmobile/include/mach/common.h

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


extern struct sys_timer shmobile_timer;

extern void shmobile_setup_console(void);

extern void shmobile_secondary_vector(void);

struct clk;

extern int clk_init(void);

arch/arm/mach-shmobile/include/mach/entry-macro-intc.S

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,12 @@ 
#include <mach/hardware.h>

#include <mach/irqs.h>



	.macro	test_for_ipi, irqnr, irqstat, base, tmp

	.endm



	.macro	test_for_ltirq, irqnr, irqstat, base, tmp

	.endm



	.macro  disable_fiq

	.endm