[PATCH 00/03] ARM: mach-shmobile: Initial SMP support

[PATCH 00/03] ARM: mach-shmobile: Initial SMP support

[Magnus Damm]

ARM: mach-shmobile: Initial SMP support

[PATCH 01/03] ARM: mach-shmobile: SMP base support 
[PATCH 02/03] ARM: mach-shmobile: Enable SMP support
[PATCH 03/03] ARM: mach-shmobile: sh73a0 SMP support

These patches add SMP framework support for R-Mobile and
SH-Mobile processors, together with hardware specific SMP
support for the sh73a0 processor.

Survives onlining and offlining of secondary processor cores
through sysfs. Should compile and boot regardless of 
CONFIG_SMP, CONFIG_HOTPLUG_CPU and CONFIG_LOCAL_TIMERS.

I suggest that patch 1 and 3 are taken through sh-2.6 and
patch 2 goes through the RMK patch tracker.

Signed-off-by: Magnus Damm <damm@opensource.se>
---
 arch/arm/Kconfig                                       |    3 
 arch/arm/mach-shmobile/Makefile                        |    7 +
 arch/arm/mach-shmobile/headsmp.S                       |   26 ++++
 arch/arm/mach-shmobile/hotplug.c                       |   41 ++++++
 arch/arm/mach-shmobile/include/mach/common.h           |    6 
 arch/arm/mach-shmobile/include/mach/entry-macro-intc.S |    6 
 arch/arm/mach-shmobile/include/mach/smp.h              |   16 ++
 arch/arm/mach-shmobile/localtimer.c                    |   25 ++++
 arch/arm/mach-shmobile/platsmp.c                       |   87 ++++++++++++++
 arch/arm/mach-shmobile/smp-sh73a0.c                    |   98 ++++++++++++++++
 10 files changed, 313 insertions(+), 2 deletions(-)

[PATCH 01/03] ARM: mach-shmobile: SMP base support

[Magnus Damm]

From: Magnus Damm <damm@opensource.se>

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: Magnus Damm <damm@opensource.se>
---

 Future patches may be required to sync up the framework
 bits with current/upcoming changes in RMKs git repository.

 arch/arm/mach-shmobile/Makefile                        |    6 +
 arch/arm/mach-shmobile/headsmp.S                       |   26 +++++
 arch/arm/mach-shmobile/hotplug.c                       |   41 ++++++++
 arch/arm/mach-shmobile/include/mach/common.h           |    1 
 arch/arm/mach-shmobile/include/mach/entry-macro-intc.S |    6 +
 arch/arm/mach-shmobile/include/mach/smp.h              |   16 +++
 arch/arm/mach-shmobile/localtimer.c                    |   25 +++++
 arch/arm/mach-shmobile/platsmp.c                       |   73 ++++++++++++++++
 8 files changed, 194 insertions(+)

--- 0006/arch/arm/mach-shmobile/Makefile
+++ work/arch/arm/mach-shmobile/Makefile	2010-12-14 13:50:20.000000000 +0900
@@ -11,6 +11,11 @@ obj-$(CONFIG_ARCH_SH7377)	+= setup-sh737
 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-ag5ev
 obj-$(CONFIG_MACH_MACKEREL)	+= board-mackerel.o
 
 # Framework support
+obj-$(CONFIG_SMP)		+= $(smp-y)
 obj-$(CONFIG_GENERIC_GPIO)	+= $(pfc-y)
--- /dev/null
+++ work/arch/arm/mach-shmobile/headsmp.S	2010-12-14 13:50:21.000000000 +0900
@@ -0,0 +1,26 @@
+/*
+ * 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
--- /dev/null
+++ work/arch/arm/mach-shmobile/hotplug.c	2010-12-14 13:50:21.000000000 +0900
@@ -0,0 +1,41 @@
+/*
+ * 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;
+}
--- 0001/arch/arm/mach-shmobile/include/mach/common.h
+++ work/arch/arm/mach-shmobile/include/mach/common.h	2010-12-14 13:50:20.000000000 +0900
@@ -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);
 
--- 0001/arch/arm/mach-shmobile/include/mach/entry-macro-intc.S
+++ work/arch/arm/mach-shmobile/include/mach/entry-macro-intc.S	2010-12-14 13:50:20.000000000 +0900
@@ -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
 
--- /dev/null
+++ work/arch/arm/mach-shmobile/include/mach/smp.h	2010-12-14 13:50:21.000000000 +0900
@@ -0,0 +1,16 @@
+#ifndef __MACH_SMP_H
+#define __MACH_SMP_H
+
+#include <asm/hardware/gic.h>
+#include <asm/smp_mpidr.h>
+
+/*
+ * We use IRQ1 as the IPI
+ */
+static inline void smp_cross_call(const struct cpumask *mask)
+{
+#if defined(CONFIG_ARM_GIC)
+	gic_raise_softirq(mask, 1);
+#endif
+}
+#endif
--- /dev/null
+++ work/arch/arm/mach-shmobile/localtimer.c	2010-12-14 14:31:51.000000000 +0900
@@ -0,0 +1,25 @@
+/*
+ * SMP support for R-Mobile / SH-Mobile - local timer portion
+ *
+ * Copyright (C) 2010  Magnus Damm
+ *
+ * Based on vexpress, 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>
+
+/*
+ * Setup the local clock events for a CPU.
+ */
+void __cpuinit local_timer_setup(struct clock_event_device *evt)
+{
+	evt->irq = 29;
+	twd_timer_setup(evt);
+}
--- /dev/null
+++ work/arch/arm/mach-shmobile/platsmp.c	2010-12-14 14:32:27.000000000 +0900
@@ -0,0 +1,73 @@
+/*
+ * SMP support for R-Mobile / SH-Mobile
+ *
+ * Copyright (C) 2010  Magnus Damm
+ *
+ * Based on vexpress, 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/errno.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/smp.h>
+#include <linux/io.h>
+#include <asm/localtimer.h>
+
+static unsigned int __init shmobile_smp_get_core_count(void)
+{
+	return 1;
+}
+
+static void __init shmobile_smp_prepare_cpus(void)
+{
+	/* do nothing for now */
+}
+
+
+void __cpuinit platform_secondary_init(unsigned int cpu)
+{
+	trace_hardirqs_off();
+}
+
+int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
+{
+	return -ENOSYS;
+}
+
+void __init smp_init_cpus(void)
+{
+	unsigned int ncores = shmobile_smp_get_core_count();
+	unsigned int i;
+
+	for (i = 0; i < ncores; i++)
+		set_cpu_possible(i, true);
+}
+
+void __init smp_prepare_cpus(unsigned int max_cpus)
+{
+	unsigned int ncores = shmobile_smp_get_core_count();
+	unsigned int cpu = smp_processor_id();
+	int i;
+
+	smp_store_cpu_info(cpu);
+
+	if (max_cpus > ncores)
+		max_cpus = ncores;
+
+	for (i = 0; i < max_cpus; i++)
+		set_cpu_present(i, true);
+
+	if (max_cpus > 1) {
+		shmobile_smp_prepare_cpus();
+
+		/*
+		 * Enable the local timer or broadcast device for the
+		 * boot CPU, but only if we have more than one CPU.
+		 */
+		percpu_timer_setup();
+	}
+}

[PATCH 02/03] ARM: mach-shmobile: Enable SMP support

[Magnus Damm]

From: Magnus Damm <damm@opensource.se>

Allow SMP to be enabled on R-Mobile / SH-Mobile.

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 May need to be reworked to fit the current state of the tree
 associated with the RMK patch tracker.

 arch/arm/Kconfig |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- 0001/arch/arm/Kconfig
+++ work/arch/arm/Kconfig	2010-12-14 13:31:02.000000000 +0900
@@ -1211,7 +1211,8 @@ config SMP
 	depends on GENERIC_CLOCKEVENTS
 	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_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
+		 ARCH_SHMOBILE
 	select USE_GENERIC_SMP_HELPERS
 	select HAVE_ARM_SCU
 	help

[PATCH 03/03] ARM: mach-shmobile: sh73a0 SMP support

[Magnus Damm]

From: Magnus Damm <damm@opensource.se>

Add SMP support for ag5evm and the sh73a0 processor.

Onlining and offlining works well, but at this point
offlined processor cores are not put into sleep mode. 

There is no spinlock for syncing the secondary core
with the first one in this implementation. The code
instead relies on the cpu_online() check in __cpu_up().

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 arch/arm/mach-shmobile/Makefile              |    1 
 arch/arm/mach-shmobile/include/mach/common.h |    5 +
 arch/arm/mach-shmobile/platsmp.c             |   14 +++
 arch/arm/mach-shmobile/smp-sh73a0.c          |   98 ++++++++++++++++++++++++++
 4 files changed, 117 insertions(+), 1 deletion(-)

--- 0007/arch/arm/mach-shmobile/Makefile
+++ work/arch/arm/mach-shmobile/Makefile	2010-12-14 14:36:41.000000000 +0900
@@ -15,6 +15,7 @@ obj-$(CONFIG_ARCH_SH73A0)	+= setup-sh73a
 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				:=
--- 0007/arch/arm/mach-shmobile/include/mach/common.h
+++ work/arch/arm/mach-shmobile/include/mach/common.h	2010-12-14 14:36:41.000000000 +0900
@@ -38,4 +38,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 */
--- 0007/arch/arm/mach-shmobile/platsmp.c
+++ work/arch/arm/mach-shmobile/platsmp.c	2010-12-14 14:36:41.000000000 +0900
@@ -16,25 +16,37 @@
 #include <linux/smp.h>
 #include <linux/io.h>
 #include <asm/localtimer.h>
+#include <asm/mach-types.h>
+#include <mach/common.h>
 
 static unsigned int __init shmobile_smp_get_core_count(void)
 {
+	if (machine_is_ag5evm())
+		return sh73a0_get_core_count();
+
 	return 1;
 }
 
 static void __init shmobile_smp_prepare_cpus(void)
 {
-	/* do nothing for now */
+	if (machine_is_ag5evm())
+		sh73a0_smp_prepare_cpus();
 }
 
 
 void __cpuinit platform_secondary_init(unsigned int cpu)
 {
 	trace_hardirqs_off();
+
+	if (machine_is_ag5evm())
+		sh73a0_secondary_init(cpu);
 }
 
 int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
+	if (machine_is_ag5evm())
+		return sh73a0_boot_secondary(cpu);
+
 	return -ENOSYS;
 }
 
--- /dev/null
+++ work/arch/arm/mach-shmobile/smp-sh73a0.c	2010-12-14 14:40:54.000000000 +0900
@@ -0,0 +1,98 @@
+/*
+ * SMP support for R-Mobile / SH-Mobile - sh73a0 portion
+ *
+ * Copyright (C) 2010  Magnus Damm
+ * Copyright (C) 2010  Takashi Yoshii
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/smp.h>
+#include <linux/spinlock.h>
+#include <linux/io.h>
+#include <mach/common.h>
+#include <asm/smp_scu.h>
+#include <asm/smp_twd.h>
+#include <asm/hardware/gic.h>
+
+#define WUPCR		0xe6151010
+#define SRESCR		0xe6151018
+#define PSTR		0xe6151040
+#define SBAR            0xe6180020
+#define APARMBAREA      0xe6f10020
+
+static void __iomem *scu_base_addr(void)
+{
+	return (void __iomem *)0xf0000000;
+}
+
+static DEFINE_SPINLOCK(scu_lock);
+static unsigned long tmp;
+
+static void modify_scu_cpu_psr(unsigned long set, unsigned long clr)
+{
+	void __iomem *scu_base = scu_base_addr();
+
+	spin_lock(&scu_lock);
+	tmp = __raw_readl(scu_base + 8);
+	tmp &= ~clr;
+	tmp |= set;
+	spin_unlock(&scu_lock);
+
+	/* disable cache coherency after releasing the lock */
+	__raw_writel(tmp, scu_base + 8);
+}
+
+unsigned int __init sh73a0_get_core_count(void)
+{
+	void __iomem *scu_base = scu_base_addr();
+
+	return scu_get_core_count(scu_base);
+}
+
+void __cpuinit sh73a0_secondary_init(unsigned int cpu)
+{
+	gic_cpu_init(0, __io(0xf0000100));
+}
+
+int __cpuinit sh73a0_boot_secondary(unsigned int cpu)
+{
+	/* enable cache coherency */
+	modify_scu_cpu_psr(0, 3 << (cpu * 8));
+
+	if (((__raw_readw(__io(PSTR)) >> (4 * cpu)) & 3) == 3)
+		__raw_writel(1 << cpu, __io(WUPCR));	/* wake up */
+	else
+		__raw_writel(1 << cpu, __io(SRESCR));	/* reset */
+
+	return 0;
+}
+
+void __init sh73a0_smp_prepare_cpus(void)
+{
+#ifdef CONFIG_HAVE_ARM_TWD
+	twd_base = (void __iomem *)0xf0000600;
+#endif
+
+	scu_enable(scu_base_addr());
+
+	/* Map the reset vector (in headsmp.S) */
+	__raw_writel(0, __io(APARMBAREA));      /* 4k */
+	__raw_writel(__pa(shmobile_secondary_vector), __io(SBAR));
+
+	/* enable cache coherency on CPU0 */
+	modify_scu_cpu_psr(0, 3 << (0 * 8));
+}
+

[PATCH 00/03] ARM: mach-shmobile: Initial SMP support

[Paul Mundt]

On Tue, Dec 14, 2010 at 04:56:47PM +0900, Magnus Damm wrote:
> ARM: mach-shmobile: Initial SMP support
> 
> [PATCH 01/03] ARM: mach-shmobile: SMP base support 
> [PATCH 02/03] ARM: mach-shmobile: Enable SMP support
> [PATCH 03/03] ARM: mach-shmobile: sh73a0 SMP support
> 
> These patches add SMP framework support for R-Mobile and
> SH-Mobile processors, together with hardware specific SMP
> support for the sh73a0 processor.
> 
> Survives onlining and offlining of secondary processor cores
> through sysfs. Should compile and boot regardless of 
> CONFIG_SMP, CONFIG_HOTPLUG_CPU and CONFIG_LOCAL_TIMERS.
> 
> I suggest that patch 1 and 3 are taken through sh-2.6 and
> patch 2 goes through the RMK patch tracker.
> 
> Signed-off-by: Magnus Damm <damm@opensource.se>

Applied to rmobile/smp, thanks.

There are integration issues with regards to the GIC changes that I'll
have to take care of during the merge window regardless, so resolving the
CONFIG_SMP thing at that point should be pretty straightforward. My plan
is to wait until after Russell merges, merge your stuff on top of that,
and then send the updated bits to Linus in one shot.

In order to avoid clashes with -next for now however I won't be merging
the topic branch in to my -latest branch. Given that the number of boards
in the wild for this at the moment are in the single digits, I'm not too
worried about the amount of time these changes spend in -next so long as
no regressions are introduced for the other boards.

[PATCH 01/03] ARM: mach-shmobile: SMP base support

[Russell King - ARM Linux]

On Tue, Dec 14, 2010 at 04:56:55PM +0900, Magnus Damm wrote:
> +/*
> + * 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

BTW, why not use - PAGE_OFFSET + PHYS_OFFSET here?  Both these macros
are available for use in assembly code - just include asm/memory.h.

[PATCH 01/03] ARM: mach-shmobile: SMP base support

[Magnus Damm]

On Fri, Dec 17, 2010 at 5:42 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Tue, Dec 14, 2010 at 04:56:55PM +0900, Magnus Damm wrote:
>> +/*
>> + * 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
>
> BTW, why not use - PAGE_OFFSET + PHYS_OFFSET here? ?Both these macros
> are available for use in assembly code - just include asm/memory.h.

Sure, good point. This was actually the only part of this series that
I wasn't 100% satisfied with.

Will send a patch on top of this series during early next week.

Thanks,

/ magnus

[PATCH 00/03] ARM: mach-shmobile: Initial SMP support

[Paul Mundt]

On Tue, Dec 14, 2010 at 06:57:03PM +0900, Paul Mundt wrote:
> On Tue, Dec 14, 2010 at 04:56:47PM +0900, Magnus Damm wrote:
> > ARM: mach-shmobile: Initial SMP support
> > 
> > [PATCH 01/03] ARM: mach-shmobile: SMP base support 
> > [PATCH 02/03] ARM: mach-shmobile: Enable SMP support
> > [PATCH 03/03] ARM: mach-shmobile: sh73a0 SMP support
> > 
> > These patches add SMP framework support for R-Mobile and
> > SH-Mobile processors, together with hardware specific SMP
> > support for the sh73a0 processor.
> > 
> > Survives onlining and offlining of secondary processor cores
> > through sysfs. Should compile and boot regardless of 
> > CONFIG_SMP, CONFIG_HOTPLUG_CPU and CONFIG_LOCAL_TIMERS.
> > 
> > I suggest that patch 1 and 3 are taken through sh-2.6 and
> > patch 2 goes through the RMK patch tracker.
> > 
> > Signed-off-by: Magnus Damm <damm@opensource.se>
> 
> Applied to rmobile/smp, thanks.
> 
> There are integration issues with regards to the GIC changes that I'll
> have to take care of during the merge window regardless, so resolving the
> CONFIG_SMP thing at that point should be pretty straightforward. My plan
> is to wait until after Russell merges, merge your stuff on top of that,
> and then send the updated bits to Linus in one shot.
> 
> In order to avoid clashes with -next for now however I won't be merging
> the topic branch in to my -latest branch. Given that the number of boards
> in the wild for this at the moment are in the single digits, I'm not too
> worried about the amount of time these changes spend in -next so long as
> no regressions are introduced for the other boards.

I've now merged the rmobile/smp branch in to rmobile-latest, which
resolves the minor clashes with Russell's merge as well as the
entry-macro rework.