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

Commit 59ac59f6 authored by Russell King's avatar Russell King
Browse files

ARM: Add Versatile Express SMP support 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent fef88f10

arch/arm/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -1121,10 +1121,11 @@ source "kernel/time/Kconfig" 
config SMP

	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || ARCH_U8500)

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\

		 ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

	depends on GENERIC_CLOCKEVENTS

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500)

	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

	help

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, like most personal computers, say N. If

arch/arm/mach-vexpress/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -4,3 +4,5 @@ 


obj-y					:= v2m.o

obj-$(CONFIG_ARCH_VEXPRESS_CA9X4)	+= ct-ca9x4.o

obj-$(CONFIG_SMP)			+= platsmp.o headsmp.o

obj-$(CONFIG_LOCAL_TIMERS)		+= localtimer.o

arch/arm/mach-vexpress/headsmp.S

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

 *  linux/arch/arm/mach-vexpress/headsmp.S

 *

 *  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



/*

 * Versatile Express specific entry point for secondary CPUs.  This

 * provides a "holding pen" into which all secondary cores are held

 * until we're ready for them to initialise.

 */

ENTRY(vexpress_secondary_startup)

	mrc	p15, 0, r0, c0, c0, 5

	and	r0, r0, #15

	adr	r4, 1f

	ldmia	r4, {r5, r6}

	sub	r4, r4, r5

	add	r6, r6, r4

pen:	ldr	r7, [r6]

	cmp	r7, r0

	bne	pen



	/*

	 * we've been released from the holding pen: secondary_stack

	 * should now contain the SVC stack for this core

	 */

	b	secondary_startup



1:	.long	.

	.long	pen_release

arch/arm/mach-vexpress/include/mach/smp.h

0 → 100644
+21 −0
Original line number Diff line number Diff line 
#ifndef __MACH_SMP_H

#define __MACH_SMP_H



#include <asm/hardware/gic.h>



#define hard_smp_processor_id()				\

	({						\

		unsigned int cpunum;			\

		__asm__("mrc p15, 0, %0, c0, c0, 5"	\

			: "=r" (cpunum));		\

		cpunum &= 0x0F;				\

	})



/*

 * We use IRQ1 as the IPI

 */

static inline void smp_cross_call(const struct cpumask *mask)

{

	gic_raise_softirq(mask, 1);

}

#endif

arch/arm/mach-vexpress/localtimer.c

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

 *  linux/arch/arm/mach-vexpress/localtimer.c

 *

 *  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/init.h>

#include <linux/smp.h>

#include <linux/clockchips.h>



#include <asm/smp_twd.h>

#include <asm/localtimer.h>

#include <mach/irqs.h>



/*

 * Setup the local clock events for a CPU.

 */

void __cpuinit local_timer_setup(struct clock_event_device *evt)

{

	evt->irq = IRQ_LOCALTIMER;

	twd_timer_setup(evt);

}