Merge branch 'rmobile/smp' into rmobile-latest (e9d728f5) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -1258,7 +1258,7 @@ config SMP
		depends on REALVIEW_EB_ARM11MP \|\| REALVIEW_EB_A9MP \|\| \
		MACH_REALVIEW_PB11MP \|\| MACH_REALVIEW_PBX \|\| ARCH_OMAP4 \|\| \
		ARCH_S5PV310 \|\| ARCH_TEGRA \|\| ARCH_U8500 \|\| ARCH_VEXPRESS_CA9X4 \|\| \
		ARCH_MSM_SCORPIONMP
		ARCH_MSM_SCORPIONMP \|\| ARCH_SHMOBILE
		select USE_GENERIC_SMP_HELPERS
		select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
		help

+7 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,12 @@ 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 intc-sh73a0.o

		# SMP objects
		smp-y := platsmp.o headsmp.o
		smp-$(CONFIG_HOTPLUG_CPU) += hotplug.o
		smp-$(CONFIG_LOCAL_TIMERS) += localtimer.o
		smp-$(CONFIG_ARCH_SH73A0) += smp-sh73a0.o

		# Pinmux setup
		pfc-y :=
		pfc-$(CONFIG_ARCH_SH7367) += pfc-sh7367.o
		@@ -32,4 +38,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)

0 → 100644

+27 −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>
		#include <asm/memory.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 - PAGE_OFFSET + PHYS_OFFSET

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;
		}

+6 −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);
		extern void shmobile_handle_irq_intc(struct pt_regs *);
		@@ -40,4 +41,9 @@ extern void sh73a0_pinmux_init(void);
		extern struct clk sh73a0_extal1_clk;
		extern struct clk sh73a0_extal2_clk;

		extern unsigned int sh73a0_get_core_count(void);
		extern void sh73a0_secondary_init(unsigned int cpu);
		extern int sh73a0_boot_secondary(unsigned int cpu);
		extern void sh73a0_smp_prepare_cpus(void);

		#endif /* __ARCH_MACH_COMMON_H */