Skip to contentSkip to conversation

ARM: shmobile: r8a7791 SMP support

PATCH New Magnus Damm 2 participants 2 messages Sep 12, 2013 – Sep 25, 2013

Subsystems (5)
lore
Share & tools
lore

Magnus Damm

author maintainer
#0 lore raw

PATCH 1/1 ARM: shmobile: r8a7791 SMP support

From: Magnus Damm <[email protected]>

Add r8a7791 SMP support using the shared APMU code. This patch also includes DTS modifications to enable the secondary CA15 CPU core to fully support the single cluster dual core r8a7791.

SMP boot and CPU Hotplug are known to be working.

---

Written against renesas-devel-20130906, depends on
[PATCH v2 01/03] ARM: shmobile: Shared APMU SMP support code without DT

 arch/arm/boot/dts/r8a7791.dtsi                |    7 ++
 arch/arm/mach-shmobile/Makefile               |    1 
 arch/arm/mach-shmobile/board-koelsch.c        |    1 
 arch/arm/mach-shmobile/include/mach/r8a7791.h |    1 
 arch/arm/mach-shmobile/setup-r8a7791.c        |    1 
 arch/arm/mach-shmobile/smp-r8a7791.c          |   62 +++++++++++++++++++++++++
 6 files changed, 73 insertions(+)
arch/arm/boot/dts/r8a7791.dtsi +7 -0
@@ -25,6 +25,13 @@
 			reg = <0>;
 			clock-frequency = <1300000000>;
 		};
+
+		cpu1: cpu at 1 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a15";
+			reg = <1>;
+			clock-frequency = <1300000000>;
+		};
 	};
 
 	gic: interrupt-controller at f1001000 {
arch/arm/mach-shmobile/Makefile +1 -0
@@ -37,6 +37,7 @@ smp-y				:= platsmp.o headsmp.o
 smp-$(CONFIG_ARCH_SH73A0)	+= smp-sh73a0.o headsmp-scu.o platsmp-scu.o
 smp-$(CONFIG_ARCH_R8A7779)	+= smp-r8a7779.o headsmp-scu.o platsmp-scu.o
 smp-$(CONFIG_ARCH_R8A7790)	+= smp-r8a7790.o platsmp-apmu.o
+smp-$(CONFIG_ARCH_R8A7791)	+= smp-r8a7791.o platsmp-apmu.o
 smp-$(CONFIG_ARCH_EMEV2)	+= smp-emev2.o headsmp-scu.o platsmp-scu.o
 
 # IRQ objects
arch/arm/mach-shmobile/board-koelsch.c +1 -0
@@ -38,6 +38,7 @@ static const char * const koelsch_boards
 };
 
 DT_MACHINE_START(KOELSCH_DT, "koelsch")
+	.smp		= smp_ops(r8a7791_smp_ops),
 	.init_early	= r8a7791_init_early,
 	.init_time	= rcar_gen2_timer_init,
 	.init_machine	= koelsch_add_standard_devices,
arch/arm/mach-shmobile/include/mach/r8a7791.h +1 -0
@@ -7,5 +7,6 @@ void r8a7791_add_standard_devices(void);
 void r8a7791_add_dt_devices(void);
 void r8a7791_clock_init(void);
 void r8a7791_init_early(void);
+extern struct smp_operations r8a7791_smp_ops;
 
 #endif /* __ASM_R8A7791_H__ */
arch/arm/mach-shmobile/setup-r8a7791.c +1 -0
@@ -175,6 +175,7 @@ static const char *r8a7791_boards_compat
 };
 
 DT_MACHINE_START(R8A7791_DT, "Generic R8A7791 (Flattened Device Tree)")
+	.smp		= smp_ops(r8a7791_smp_ops),
 	.init_early	= r8a7791_init_early,
 	.init_time	= rcar_gen2_timer_init,
 	.dt_compat	= r8a7791_boards_compat_dt,
arch/arm/mach-shmobile/smp-r8a7791.c new file +62 -0

62 lines not on this page · raw message

#1 lore raw

PATCH 1/1 ARM: shmobile: r8a7791 SMP support

Quoted 14 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Add r8a7791 SMP support using the shared APMU code. This patch also includes DTS modifications to enable the secondary CA15 CPU core to fully support the single cluster dual core r8a7791.

SMP boot and CPU Hotplug are known to be working.

---

Written against renesas-devel-20130906, depends on
[PATCH v2 01/03] ARM: shmobile: Shared APMU SMP support code without DT

Quoted 7 lines
 arch/arm/boot/dts/r8a7791.dtsi                |    7 ++
 arch/arm/mach-shmobile/Makefile               |    1 
 arch/arm/mach-shmobile/board-koelsch.c        |    1 
 arch/arm/mach-shmobile/include/mach/r8a7791.h |    1 
 arch/arm/mach-shmobile/setup-r8a7791.c        |    1 
 arch/arm/mach-shmobile/smp-r8a7791.c          |   62 +++++++++++++++++++++++++
 6 files changed, 73 insertions(+)

Hi Magnus,

please split this into three patches.

1. An SoC patch: The *r8a7791.[ch] and Makefile changes
2. A board patch: The board-koelsh.c change
3. A dt patch: The .dtsi change