Skip to contentSkip to conversation

arm64: dts: r8a7795: Add Cortex-A53 CPU cores

PATCH Superseded Geert Uytterhoeven 3 participants 3 messages Feb 17, 2017 – Feb 23, 2017

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Geert Uytterhoeven

author maintainer
#0 lore raw

PATCH v3 1/1 arm64: dts: r8a7795: Add Cortex-A53 CPU cores

From: Takeshi Kihara <[email protected]>

This patch adds Cortex-A53 CPU cores to r8a7795 SoC for a total of 8 cores (4 x Cortex-A57 + 4 x Cortex-A53).

[geert: Add power-domains and next-level-cache properties]

---
This patch describes the hardware; actual enabling of the CPU depends on the PSCI firmware.

With the current firmware version (v2.16.0), only the CA57 CPU cores are enabled, hence this patch does not introduce undeterministic scheduling behavior due to migration between big and LITTLE cores.

v3:
- Link recently added CPU nodes 100-103 to their L2 cache nodes,

v2:
- Rebased.

---
 arch/arm64/boot/dts/renesas/r8a7795.dtsi | 58 ++++++++++++++++++++++++++++----
 1 file changed, 51 insertions(+), 7 deletions(-)
arch/arm64/boot/dts/renesas/r8a7795.dtsi +51 -7
index 7f2434adb757498f..6148e514eb648288 100644
@@ -73,6 +73,42 @@
 			enable-method = "psci";
 		};
 
+		a53_0: cpu at 100 {
+			compatible = "arm,cortex-a53", "arm,armv8";
+			reg = <0x100>;
+			device_type = "cpu";
+			power-domains = <&sysc R8A7795_PD_CA53_CPU0>;
+			next-level-cache = <&L2_CA53>;
+			enable-method = "psci";
+		};
+
+		a53_1: cpu at 101 {
+			compatible = "arm,cortex-a53","arm,armv8";
+			reg = <0x101>;
+			device_type = "cpu";
+			power-domains = <&sysc R8A7795_PD_CA53_CPU1>;
+			next-level-cache = <&L2_CA53>;
+			enable-method = "psci";
+		};
+
+		a53_2: cpu at 102 {
+			compatible = "arm,cortex-a53","arm,armv8";
+			reg = <0x102>;
+			device_type = "cpu";
+			power-domains = <&sysc R8A7795_PD_CA53_CPU2>;
+			next-level-cache = <&L2_CA53>;
+			enable-method = "psci";
+		};
+
+		a53_3: cpu at 103 {
+			compatible = "arm,cortex-a53","arm,armv8";
+			reg = <0x103>;
+			device_type = "cpu";
+			power-domains = <&sysc R8A7795_PD_CA53_CPU3>;
+			next-level-cache = <&L2_CA53>;
+			enable-method = "psci";
+		};
+
 		L2_CA57: cache-controller at 0 {
 			compatible = "cache";
 			reg = <0>;
@@ -166,7 +202,7 @@
 			      <0x0 0xf1040000 0 0x20000>,
 			      <0x0 0xf1060000 0 0x20000>;
 			interrupts = <GIC_PPI 9
-					(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+					(GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_HIGH)>;
 			clocks = <&cpg CPG_MOD 408>;
 			clock-names = "clk";
 			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
@@ -307,23 +343,31 @@
 			interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
+				     <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-affinity = <&a57_0>,
 					     <&a57_1>,
 					     <&a57_2>,
-					     <&a57_3>;
+					     <&a57_3>,
+					     <&a53_0>,
+					     <&a53_1>,
+					     <&a53_2>,
+					     <&a53_3>;
 		};
 
 		timer {
 			compatible = "arm,armv8-timer";
 			interrupts = <GIC_PPI 13
-					(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+					(GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
 				     <GIC_PPI 14
-					(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+					(GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
 				     <GIC_PPI 11
-					(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+					(GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
 				     <GIC_PPI 10
-					(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
+					(GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
 		};
 
 		cpg: clock-controller at e6150000 {
Signature · 1 line
1.9.1
#1 lore raw

PATCH v3 1/1 arm64: dts: r8a7795: Add Cortex-A53 CPU cores

Hi,

Quoted 14 lines · Geert Uytterhoeven

From: Takeshi Kihara <[email protected]>

This patch adds Cortex-A53 CPU cores to r8a7795 SoC for a total of 8 cores (4 x Cortex-A57 + 4 x Cortex-A53).

arch/arm64/boot/dts/renesas/r8a7795.dtsi +5 -1
 			interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
+				     <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/renesas/r8a7795.dtsi line 359

Quoted 10 lines
arch/arm64/boot/dts/renesas/r8a7795.dtsi +5 -1
 			interrupt-affinity = <&a57_0>,
 					     <&a57_1>,
 					     <&a57_2>,
-					     <&a57_3>;
+					     <&a57_3>,
+					     <&a53_0>,
+					     <&a53_1>,
+					     <&a53_2>,
+					     <&a53_3>;
 		};

This isn't quite right; the A53 cores should have a separate PMU node.

The PMU hardware is different across microarchitectures, and they must be handled separately.

Thanks,
Mark.

#2 lore raw

PATCH v3 1/1 arm64: dts: r8a7795: Add Cortex-A53 CPU cores

Hi Mark,

Quoted 26 lines · Mark Rutland
Quoted 14 lines · Geert Uytterhoeven

From: Takeshi Kihara <[email protected]>

This patch adds Cortex-A53 CPU cores to r8a7795 SoC for a total of 8 cores (4 x Cortex-A57 + 4 x Cortex-A53).

                      interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
                                   <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
                                   <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
arch/arm64/boot/dts/renesas/r8a7795.dtsi +5 -1
-                                  <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
+                                  <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
+                                  <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>,
+                                  <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>,
+                                  <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>,
+                                  <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/renesas/r8a7795.dtsi line 359

Quoted 10 lines
arch/arm64/boot/dts/renesas/r8a7795.dtsi +5 -1
                      interrupt-affinity = <&a57_0>,
                                           <&a57_1>,
                                           <&a57_2>,
-                                          <&a57_3>;
+                                          <&a57_3>,
+                                          <&a53_0>,
+                                          <&a53_1>,
+                                          <&a53_2>,
+                                          <&a53_3>;
              };
Quoted 4 lines

This isn't quite right; the A53 cores should have a separate PMU node.

The PMU hardware is different across microarchitectures, and they must be handled separately.

Oops, the original patch predated the evolution of "arm,armv8-pmuv3" into separate "arm,cortex-a57-pmu" and "arm,cortex-a53-pmu".

Will fix...

Thanks!

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds