Skip to contentSkip to conversation

ARM: shmobile: r8a7791 SoC and Koelsch update V2

PATCH New Magnus Damm 2 participants 21 messages Oct 1, 2013 – Oct 3, 2013

Subsystems (5)
lore
Share & tools
lore

Magnus Damm

author maintainer
#0 lore raw

cover ARM: shmobile: r8a7791 SoC and Koelsch update V2

ARM: shmobile: r8a7791 SoC and Koelsch update V2

[PATCH 01/10] ARM: shmobile: Introduce r8a7791_add_standard_devices() [PATCH 02/10] ARM: shmobile: Use r8a7791_add_standard_devices() on Koelsch [PATCH 03/10] ARM: shmobile: r8a7791 IRQC platform device support [PATCH 04/10] ARM: shmobile: r8a7791 IRQC device tree node [PATCH 05/10] ARM: shmobile: r8a7791 Arch timer device tree node [PATCH 06/10] ARM: shmobile: r8a7791 Arch timer workaround [PATCH 07/10] ARM: shmobile: Use arch timer on Koelsch
[PATCH 08/10] ARM: shmobile: r8a7791 SMP device tree node [PATCH 09/10] ARM: shmobile: r8a7791 SMP support
[PATCH 10/10] ARM: shmobile: Use SMP on Koelsch

This series includes updated and more broken out versions of patches implementing r8a7791 and Koelsch support for IRQC, Arch timer and SMP.

Koelsch DT reference support needs to be rebuilt on top of this in the near future. After that will PFC and GPIO be layered on top.

---

Written against renesas.git tag renesas-devel-20131001

 arch/arm/boot/dts/r8a7791.dtsi                |   33 +++++++++++++
 arch/arm/mach-shmobile/Makefile               |    3 -
 arch/arm/mach-shmobile/board-koelsch.c        |    5 +-
 arch/arm/mach-shmobile/include/mach/r8a7791.h |    2 
 arch/arm/mach-shmobile/setup-r8a7791.c        |   35 ++++++++++++++
 arch/arm/mach-shmobile/smp-r8a7791.c          |   62 +++++++++++++++++++++++++
 6 files changed, 138 insertions(+), 2 deletions(-)
author maintainer
#1 lore raw

PATCH 1/10 ARM: shmobile: Introduce r8a7791_add_standard_devices()

From: Magnus Damm <[email protected]>

Introduce the function r8a7791_add_standard_devices() that follows the same style as other mach-shmobile SoC code and allows C version of board code to add on-chip devices.

---

 arch/arm/mach-shmobile/include/mach/r8a7791.h |    1 +
 arch/arm/mach-shmobile/setup-r8a7791.c        |    5 +++++
 2 files changed, 6 insertions(+)
arch/arm/mach-shmobile/include/mach/r8a7791.h +1 -0
@@ -1,6 +1,7 @@
 #ifndef __ASM_R8A7791_H__
 #define __ASM_R8A7791_H__
 
+void r8a7791_add_standard_devices(void);
 void r8a7791_add_dt_devices(void);
 void r8a7791_clock_init(void);
 void r8a7791_init_early(void);
arch/arm/mach-shmobile/setup-r8a7791.c +5 -0
@@ -129,6 +129,11 @@ void __init r8a7791_add_dt_devices(void)
 	r8a7791_register_cmt(00);
 }
 
+void __init r8a7791_add_standard_devices(void)
+{
+	r8a7791_add_dt_devices();
+}
+
 void __init r8a7791_init_early(void)
 {
 #ifndef CONFIG_ARM_ARCH_TIMER
#2 lore raw

PATCH 1/10 ARM: shmobile: Introduce r8a7791_add_standard_devices()

Quoted 7 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Introduce the function r8a7791_add_standard_devices() that follows the same style as other mach-shmobile SoC code and allows C version of board code to add on-chip devices.

Thanks, I have queued this up in the soc3 branch.
It should make it into v3.13 but if not I'll rename the branch soc after rebasing it on v3.13-rcX which will then be targeted at v3.14.

Quoted 31 lines

---

 arch/arm/mach-shmobile/include/mach/r8a7791.h |    1 +
 arch/arm/mach-shmobile/setup-r8a7791.c        |    5 +++++
 2 files changed, 6 insertions(+)
arch/arm/mach-shmobile/include/mach/r8a7791.h +1 -0
@@ -1,6 +1,7 @@
 #ifndef __ASM_R8A7791_H__
 #define __ASM_R8A7791_H__
 
+void r8a7791_add_standard_devices(void);
 void r8a7791_add_dt_devices(void);
 void r8a7791_clock_init(void);
 void r8a7791_init_early(void);
arch/arm/mach-shmobile/setup-r8a7791.c +5 -0
@@ -129,6 +129,11 @@ void __init r8a7791_add_dt_devices(void)
 	r8a7791_register_cmt(00);
 }
 
+void __init r8a7791_add_standard_devices(void)
+{
+	r8a7791_add_dt_devices();
+}
+
 void __init r8a7791_init_early(void)
 {
 #ifndef CONFIG_ARM_ARCH_TIMER
author maintainer
#3 lore raw

PATCH 2/10 ARM: shmobile: Use r8a7791_add_standard_devices() on Koelsch

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Use r8a7791_add_standard_devices() on Koelsch to let the C version of the board code add on-chip devices.

---

 arch/arm/mach-shmobile/board-koelsch.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-shmobile/board-koelsch.c +1 -1
@@ -29,7 +29,7 @@
 static void __init koelsch_add_standard_devices(void)
 {
 	r8a7791_clock_init();
-	r8a7791_add_dt_devices();
+	r8a7791_add_standard_devices();
 }
 
 static const char * const koelsch_boards_compat_dt[] __initconst = {
#4 lore raw

PATCH 2/10 ARM: shmobile: Use r8a7791_add_standard_devices() on Koelsch

Quoted 15 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Use r8a7791_add_standard_devices() on Koelsch to let the C version of the board code add on-chip devices.

---

 arch/arm/mach-shmobile/board-koelsch.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/mach-shmobile/board-koelsch.c line 35

Quoted 8 lines
arch/arm/mach-shmobile/board-koelsch.c +1 -1
@@ -29,7 +29,7 @@
 static void __init koelsch_add_standard_devices(void)
 {
 	r8a7791_clock_init();
-	r8a7791_add_dt_devices();
+	r8a7791_add_standard_devices();
 }
 
 static const char * const koelsch_boards_compat_dt[] __initconst = {

Thanks, I have queued this up in the boards3 branch.
It should make it into v3.13 but if not I'll rename the branch soc after rebasing it on v3.13-rcX which will then be targeted at v3.14.

The boards3 branch includes boards code previously queued up for v3.13 and a merge with soc changes previously queued up for v3.13. The reason for the merge is to provide various build and run-time dependencies including the r8a7791 SoC code which this board code uses.

author maintainer
#5 lore raw

PATCH 3/10 ARM: shmobile: r8a7791 IRQC platform device support

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Add a platform device for the r8a7791 IRQC hardware driving IRQ pins IRQ0 to IRQ9. The Linux interrupt number is statically assigned to allow board code written in C to make use of static interrupt numbers.

---

 arch/arm/mach-shmobile/setup-r8a7791.c |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
arch/arm/mach-shmobile/setup-r8a7791.c +27 -0
@@ -22,6 +22,7 @@
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/of_platform.h>
+#include <linux/platform_data/irq-renesas-irqc.h>
 #include <linux/serial_sci.h>
 #include <linux/sh_timer.h>
 #include <mach/common.h>
@@ -109,6 +110,31 @@ static const struct resource cmt00_resou
 					  &cmt##idx##_platform_data,	\
 					  sizeof(struct sh_timer_config))
 
+static struct renesas_irqc_config irqc0_data = {
+	.irq_base = irq_pin(0), /* IRQ0 -> IRQ9 */
+};
+
+static struct resource irqc0_resources[] = {
+	DEFINE_RES_MEM(0xe61c0000, 0x200), /* IRQC Event Detector Block_0 */
+	DEFINE_RES_IRQ(gic_spi(0)), /* IRQ0 */
+	DEFINE_RES_IRQ(gic_spi(1)), /* IRQ1 */
+	DEFINE_RES_IRQ(gic_spi(2)), /* IRQ2 */
+	DEFINE_RES_IRQ(gic_spi(3)), /* IRQ3 */
+	DEFINE_RES_IRQ(gic_spi(12)), /* IRQ4 */
+	DEFINE_RES_IRQ(gic_spi(13)), /* IRQ5 */
+	DEFINE_RES_IRQ(gic_spi(14)), /* IRQ6 */
+	DEFINE_RES_IRQ(gic_spi(15)), /* IRQ7 */
+	DEFINE_RES_IRQ(gic_spi(16)), /* IRQ8 */
+	DEFINE_RES_IRQ(gic_spi(17)), /* IRQ9 */
+};
+
+#define r8a7791_register_irqc(idx)					\
+	platform_device_register_resndata(&platform_bus, "renesas_irqc", \
+					  idx, irqc##idx##_resources,	\
+					  ARRAY_SIZE(irqc##idx##_resources), \
+					  &irqc##idx##_data,		\
+					  sizeof(struct renesas_irqc_config))
+
 void __init r8a7791_add_dt_devices(void)
 {
 	r8a7791_register_scif(SCIFA0);
@@ -132,6 +158,7 @@ void __init r8a7791_add_dt_devices(void)
 void __init r8a7791_add_standard_devices(void)
 {
 	r8a7791_add_dt_devices();
+	r8a7791_register_irqc(0);
 }
 
 void __init r8a7791_init_early(void)
#6 lore raw

PATCH 3/10 ARM: shmobile: r8a7791 IRQC platform device support

Quoted 8 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Add a platform device for the r8a7791 IRQC hardware driving IRQ pins IRQ0 to IRQ9. The Linux interrupt number is statically assigned to allow board code written in C to make use of static interrupt numbers.

Thanks, I have queued this up in the soc3 branch.
It should make it into v3.13 but if not I'll rename the branch soc after rebasing it on v3.13-rcX which will then be targeted at v3.14.

author maintainer
#7 lore raw

PATCH 4/10 ARM: shmobile: r8a7791 IRQC device tree node

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Enable a r8a7791 IRQC block by adding a device tree node for the IRQC hardware and pins IRQ0 to IRQ9.

---

 arch/arm/boot/dts/r8a7791.dtsi |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
arch/arm/boot/dts/r8a7791.dtsi +18 -0
@@ -38,4 +38,22 @@
 			<0 0xf1006000 0 0x2000>;
 		interrupts = <1 9 0xf04>;
 	};
+
+	irqc0: interrupt-controller at e61c0000 {
+		compatible = "renesas,irqc";
+		#interrupt-cells = <2>;
+		interrupt-controller;
+		reg = <0 0xe61c0000 0 0x200>;
+		interrupt-parent = <&gic>;
+		interrupts = <0 0 4>,
+			      <0 1 4>,
+			      <0 2 4>,
+			      <0 3 4>,
+			      <0 12 4>,
+			      <0 13 4>,
+			      <0 14 4>,
+			      <0 15 4>,
+			      <0 16 4>,
+			      <0 17 4>;
+	};
 };
#8 lore raw

PATCH 4/10 ARM: shmobile: r8a7791 IRQC device tree node

Quoted 6 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Enable a r8a7791 IRQC block by adding a device tree node for the IRQC hardware and pins IRQ0 to IRQ9.

Thanks, I have queued this up in the dt3 branch.
It should make it into v3.13 but if not I'll rename the branch dt after rebasing it on v3.13-rcX which will then be targeted at v3.14.

The dt3 branch is a merge of other dt changes queued up for v3.13 with renesas-soc-for-v3.13, which I sent a pull request for a few days ago. The reason for the merge is to provide the dts for the r8a7791 SoC which is changed by this patch.

It might have been better to merge the dt for the r8a7791 SoC in a separate patch in the dt branch. But it wasn't.

author maintainer
#9 lore raw

PATCH 5/10 ARM: shmobile: r8a7791 Arch timer device tree node

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Add r8a7791 arch timer device tree information.

This needs to be used together with r8a7791 support code that ties in the R-Car Gen2 arch timer workarounds.

---

 arch/arm/boot/dts/r8a7791.dtsi |    8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/boot/dts/r8a7791.dtsi +8 -0
@@ -39,6 +39,14 @@
 		interrupts = <1 9 0xf04>;
 	};
 
+	timer {
+		compatible = "arm,armv7-timer";
+		interrupts = <1 13 0xf08>,
+				<1 14 0xf08>,
+				<1 11 0xf08>,
+				<1 10 0xf08>;
+	};
+
 	irqc0: interrupt-controller at e61c0000 {
 		compatible = "renesas,irqc";
 		#interrupt-cells = <2>;
#10 lore raw

PATCH 5/10 ARM: shmobile: r8a7791 Arch timer device tree node

Quoted 20 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Add r8a7791 arch timer device tree information.

This needs to be used together with r8a7791 support code that ties in the R-Car Gen2 arch timer workarounds.

---

 arch/arm/boot/dts/r8a7791.dtsi |    8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/boot/dts/r8a7791.dtsi +1 -0
@@ -39,6 +39,14 @@
 		interrupts = <1 9 0xf04>;
 	};
 
+	timer {

arch/arm/boot/dts/r8a7791.dtsi line 52

Quoted 10 lines
arch/arm/boot/dts/r8a7791.dtsi +7 -0
+		compatible = "arm,armv7-timer";
+		interrupts = <1 13 0xf08>,
+				<1 14 0xf08>,
+				<1 11 0xf08>,
+				<1 10 0xf08>;
+	};
+
 	irqc0: interrupt-controller at e61c0000 {
 		compatible = "renesas,irqc";
 		#interrupt-cells = <2>;

Thanks, I have queued this up in the dt3 branch.
It should make it into v3.13 but if not I'll rename the branch dt after rebasing it on v3.13-rcX which will then be targeted at v3.14.

The dt3 branch is a merge of other dt changes queued up for v3.13 with renesas-soc-for-v3.13, which I sent a pull request for a few days ago. The reason for the merge is to provide the dts for the r8a7791 SoC which is changed by this patch.

It might have been better to merge the dt for the r8a7791 SoC in a separate patch in the dt branch. But it wasn't.

author maintainer
#11 lore raw

PATCH 6/10 ARM: shmobile: r8a7791 Arch timer workaround

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Make use of the R-Car Gen2 arch timer workaround on r8a7791.

---

 arch/arm/mach-shmobile/Makefile        |    2 +-
 arch/arm/mach-shmobile/setup-r8a7791.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
arch/arm/mach-shmobile/Makefile +1 -1
@@ -16,7 +16,7 @@ obj-$(CONFIG_ARCH_R8A7778)	+= setup-r8a7
 obj-$(CONFIG_ARCH_R8A7779)	+= setup-r8a7779.o
 obj-$(CONFIG_ARCH_R8A7790)	+= setup-r8a7790.o
 obj-$(CONFIG_ARCH_R8A7790)	+= setup-r8a7790.o setup-rcar-gen2.o
-obj-$(CONFIG_ARCH_R8A7791)	+= setup-r8a7791.o
+obj-$(CONFIG_ARCH_R8A7791)	+= setup-r8a7791.o setup-rcar-gen2.o
 obj-$(CONFIG_ARCH_EMEV2)	+= setup-emev2.o
 
 # Clock objects
arch/arm/mach-shmobile/setup-r8a7791.c +2 -0
@@ -27,6 +27,7 @@
 #include <mach/common.h>
 #include <mach/irqs.h>
 #include <mach/r8a7791.h>
+#include <mach/rcar-gen2.h>
 #include <asm/mach/arch.h>
 
 #define SCIF_COMMON(scif_type, baseaddr, irq)			\
@@ -175,6 +176,7 @@ static const char *r8a7791_boards_compat
 
 DT_MACHINE_START(R8A7791_DT, "Generic R8A7791 (Flattened Device Tree)")
 	.init_early	= r8a7791_init_early,
+	.init_time	= rcar_gen2_timer_init,
 	.dt_compat	= r8a7791_boards_compat_dt,
 MACHINE_END
 #endif /* CONFIG_USE_OF */
#12 lore raw

PATCH 6/10 ARM: shmobile: r8a7791 Arch timer workaround

Quoted 5 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Make use of the R-Car Gen2 arch timer workaround on r8a7791.

Thanks, I have queued this up in the soc3 branch.
It should make it into v3.13 but if not I'll rename the branch soc after rebasing it on v3.13-rcX which will then be targeted at v3.14.

The soc3 branch includes soc code previously queued up for v3.13 and a merge with renesas-smp-for-v3.13 which I sent a pull request for a few days ago. The reason for the merge is to reduce conflicts.

author maintainer
#13 lore raw

PATCH 7/10 ARM: shmobile: Use arch timer on Koelsch

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Make use of the R-Car Gen2 arch timer workaround on Koelsch.

---

 arch/arm/mach-shmobile/board-koelsch.c |    2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-shmobile/board-koelsch.c +2 -0
@@ -23,6 +23,7 @@
 #include <linux/platform_device.h>
 #include <mach/common.h>
 #include <mach/r8a7791.h>
+#include <mach/rcar-gen2.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
@@ -40,5 +41,6 @@ static const char * const koelsch_boards
 DT_MACHINE_START(KOELSCH_DT, "koelsch")
 	.init_early	= r8a7791_init_early,
 	.init_machine	= koelsch_add_standard_devices,
+	.init_time	= rcar_gen2_timer_init,
 	.dt_compat	= koelsch_boards_compat_dt,
 MACHINE_END
#14 lore raw

PATCH 7/10 ARM: shmobile: Use arch timer on Koelsch

Quoted 21 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Make use of the R-Car Gen2 arch timer workaround on Koelsch.

---

 arch/arm/mach-shmobile/board-koelsch.c |    2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-shmobile/board-koelsch.c +1 -0
@@ -23,6 +23,7 @@
 #include <linux/platform_device.h>
 #include <mach/common.h>
 #include <mach/r8a7791.h>
+#include <mach/rcar-gen2.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 

arch/arm/mach-shmobile/board-koelsch.c static const char * const koelsch_boards · line 46

Quoted 6 lines
arch/arm/mach-shmobile/board-koelsch.c +1 -0
@@ -40,5 +41,6 @@ static const char * const koelsch_boards
 DT_MACHINE_START(KOELSCH_DT, "koelsch")
 	.init_early	= r8a7791_init_early,
 	.init_machine	= koelsch_add_standard_devices,
+	.init_time	= rcar_gen2_timer_init,
 	.dt_compat	= koelsch_boards_compat_dt,
 MACHINE_END

Thanks, I have queued this up in the boards3 branch.
It should make it into v3.13 but if not I'll rename the branch soc after rebasing it on v3.13-rcX which will then be targeted at v3.14.

The boards3 branch includes boards code previously queued up for v3.13 and a merge with soc changes previously queued up for v3.13. The reason for the merge is to provide various build and run-time dependencies including the rcar_gen2_timer_init code which this patch uses.

author maintainer
#15 lore raw

PATCH 8/10 ARM: shmobile: r8a7791 SMP device tree node

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Add a device node for the r8a7791 secondary CPU core.

---

 arch/arm/boot/dts/r8a7791.dtsi |    7 +++++++
 1 file changed, 7 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 {
#16 lore raw

PATCH 8/10 ARM: shmobile: r8a7791 SMP device tree node

Quoted 9 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Add a device node for the r8a7791 secondary CPU core.

---

 arch/arm/boot/dts/r8a7791.dtsi |    7 +++++++
 1 file changed, 7 insertions(+)

Thanks, I have queued this up in the dt3 branch.
It should make it into v3.13 but if not I'll rename the branch dt after rebasing it on v3.13-rcX which will then be targeted at v3.14.

The dt3 branch is a merge of other dt changes queued up for v3.13 with renesas-soc-for-v3.13, which I sent a pull request for a few days ago. The reason for the merge is to provide the dts for the r8a7791 SoC which is changed by patches this patch.

It might have been better to merge the dt for the r8a7791 SoC in a separate patch in the dt branch. But it wasn't.

author maintainer
#17 lore raw

PATCH 9/10 ARM: shmobile: r8a7791 SMP support

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Tie in the APMU SMP code on r8a7791. When used together with the secondary CPU device node and smp_ops in the board specific code then this will allow use of the two Cortex-A15 cores in the r8a7791 SoC.

---

 arch/arm/mach-shmobile/Makefile               |    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 +++++++++++++++++++++++++
 4 files changed, 65 insertions(+)
arch/arm/mach-shmobile/Makefile +1 -0
@@ -38,6 +38,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/include/mach/r8a7791.h +1 -0
@@ -5,5 +5,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

#18 lore raw

PATCH 9/10 ARM: shmobile: r8a7791 SMP support

Quoted 7 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Tie in the APMU SMP code on r8a7791. When used together with the secondary CPU device node and smp_ops in the board specific code then this will allow use of the two Cortex-A15 cores in the r8a7791 SoC.

Quoted 8 lines

---

 arch/arm/mach-shmobile/Makefile               |    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 +++++++++++++++++++++++++
 4 files changed, 65 insertions(+)

Thanks, I have queued this up in the soc3 branch.
It should make it into v3.13 but if not I'll rename the branch soc after rebasing it on v3.13-rcX which will then be targeted at v3.14.

The soc3 branch includes soc code previously queued up for v3.13 and a merge with renesas-smp-for-v3.13 which I sent a pull request for a few days ago. The reason for the merge is to reduce conflicts.

author maintainer
#19 lore raw

PATCH 10/10 ARM: shmobile: Use SMP on Koelsch

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Enable r8a7791 SMP support code on the Koelsch board.

---

 arch/arm/mach-shmobile/board-koelsch.c |    1 +
 1 file changed, 1 insertion(+)
arch/arm/mach-shmobile/board-koelsch.c +1 -0
@@ -39,6 +39,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_machine	= koelsch_add_standard_devices,
 	.init_time	= rcar_gen2_timer_init,
#20 lore raw

PATCH 10/10 ARM: shmobile: Use SMP on Koelsch

Quoted 13 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Enable r8a7791 SMP support code on the Koelsch board.

---

 arch/arm/mach-shmobile/board-koelsch.c |    1 +
 1 file changed, 1 insertion(+)

arch/arm/mach-shmobile/board-koelsch.c static const char * const koelsch_boards · line 45

Quoted 7 lines
arch/arm/mach-shmobile/board-koelsch.c +1 -0
@@ -39,6 +39,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_machine	= koelsch_add_standard_devices,
 	.init_time	= rcar_gen2_timer_init,

Thanks, I have queued this up in the boards3 branch.
It should make it into v3.13 but if not I'll rename the branch soc after rebasing it on v3.13-rcX which will then be targeted at v3.14.

The boards3 branch includes boards code previously queued up for v3.13 and a merge with soc changes previously queued up for v3.13. The reason for the merge is to provide various build and run-time dependencies including the r8a7791 SoC code which this patch uses.