Skip to contentSkip to conversation

ARM: rockchip: add smp functionality

PATCH Superseded Heiko Stübner 2 participants 9 messages Jun 17, 2013 – Jun 18, 2013

Subsystems (4)

v1 of 8 Superseded Latest is v8 →

lore
Share & tools
lore

Heiko Stübner

author maintainer
#0 lore raw

cover ARM: rockchip: add smp functionality

This series enables the use of the additional cores on Rockchip Cortex-A9 SoCs.

To achieve this, add the scu, the needed sram and power-management-unit.

This is again new teritory for me, so I might've messed up something, but overall I'm happy to have gained a bit of smp understanding :-)

This of course goes on top of the basic support series.

Heiko Stuebner (4):
arm: rockchip: add snoop-control-unit
arm: rockchip: add sram dt nodes and documentation
arm: rockchip: add power-management-unit dt node
arm: rockchip: add smp bringup code

 .../devicetree/bindings/arm/rockchip/pmu.txt       |   16 +++
 .../devicetree/bindings/arm/rockchip/smp-sram.txt  |   29 ++++
 arch/arm/boot/dts/rk3066a.dtsi                     |   24 ++++
 arch/arm/mach-rockchip/Kconfig                     |    1 +
 arch/arm/mach-rockchip/Makefile                    |    1 +
 arch/arm/mach-rockchip/core.h                      |   22 +++
 arch/arm/mach-rockchip/headsmp.S                   |   32 +++++
 arch/arm/mach-rockchip/platsmp.c                   |  145 ++++++++++++++++++++
 arch/arm/mach-rockchip/rockchip.c                  |    2 +
 9 files changed, 272 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/rockchip/pmu.txt
 create mode 100644 Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt
 create mode 100644 arch/arm/mach-rockchip/core.h
 create mode 100644 arch/arm/mach-rockchip/headsmp.S
 create mode 100644 arch/arm/mach-rockchip/platsmp.c
Signature · 1 line
1.7.10.4
author maintainer
#1 lore raw

PATCH 1/4 ARM: rockchip: add snoop-control-unit

This adds the device-node and config select to enable the scu in all Rockchip Cortex-A9 SoCs.

---
 arch/arm/boot/dts/rk3066a.dtsi |    5 +++++
 arch/arm/mach-rockchip/Kconfig |    1 +
 2 files changed, 6 insertions(+)
arch/arm/boot/dts/rk3066a.dtsi +5 -0
index 56bfac9..26c4311 100644
@@ -48,6 +48,11 @@
 		compatible = "simple-bus";
 		ranges;
 
+		scu at 1013c000 {
+			compatible = "arm,cortex-a9-scu";
+			reg = <0x1013c000 0x100>;
+		};
+
 		gic: interrupt-controller at 1013d000 {
 			compatible = "arm,cortex-a9-gic";
 			interrupt-controller;
arch/arm/mach-rockchip/Kconfig +1 -0
index 25ee12b..0f5484c 100644
@@ -5,6 +5,7 @@ config ARCH_ROCKCHIP
 	select ARCH_REQUIRE_GPIOLIB
 	select ARM_GIC
 	select CACHE_L2X0
+	select HAVE_ARM_SCU
 	select HAVE_ARM_TWD if LOCAL_TIMERS
 	select HAVE_SMP
 	select LOCAL_TIMERS if SMP
Signature · 1 line
1.7.10.4
author maintainer
#2 lore raw

PATCH 2/4 ARM: rockchip: add sram dt nodes and documentation

In reply to Heiko Stübner

The Rockchip SoCs need a special part of their sram for bringup of additional cores. Therefore the mapped area should be split into a special area for the smp code and a generic area that gets handled by mmio-sram.

---
 .../devicetree/bindings/arm/rockchip/smp-sram.txt  |   29 ++++++++++++++++++++
 arch/arm/boot/dts/rk3066a.dtsi                     |   14 ++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt
Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file +29 -0
new file mode 100644
index 0000000..9c81fac
@@ -0,0 +1,29 @@
+Rockchip SRAM for smp bringup:
+------------------------------
+
+Rockchip smp-capable SoCs use the first part of the sram for the bringup
+of the cores. Once the core gets powered up it executes the code that is
+residing at the very beginning of the sram.
+
+While the suspend also needs to have code in the sram that can be realized
+with the generic mmio-sram driver and only the smp specific part needs to
+be mapped specially in the smp code.
+
+Therefore split the sram mapping in a smp-specific part that gets used
+by the smp code exclusively and a bigger generic part for mmio-sram
+
+Required node properties:
+- compatible value : = "rockchip,rk3066-smp-sram";
+- reg : physical base address and the size of the registers window
+
+Example:
+
+	sram at 10080000 {
+		compatible = "rockchip,rk3066-smp-sram";
+		reg = <0x10080000 0x100>;
+	};
+
+	sram: sram at 10080100 {
+		compatible = "mmio-sram";
+		reg = <0x10080100 0x9900>;
+	};
arch/arm/boot/dts/rk3066a.dtsi +14 -0
index 26c4311..44eabd2 100644
@@ -53,6 +53,20 @@
 			reg = <0x1013c000 0x100>;
 		};
 
+		/*
+		 * the first part of the sram is needed for the smp
+		 * trampoline code during cpu bringup
+		 */
+		sram at 10080000 {
+			compatible = "rockchip,rk3066-smp-sram";
+			reg = <0x10080000 0x100>;
+		};
+
+		sram: sram at 10080100 {
+			compatible = "mmio-sram";
+			reg = <0x10080100 0x9900>;
+		};
+
 		gic: interrupt-controller at 1013d000 {
 			compatible = "arm,cortex-a9-gic";
 			interrupt-controller;
Signature · 1 line
1.7.10.4
#3 lore raw

PATCH 2/4 ARM: rockchip: add sram dt nodes and documentation

Quoted 36 lines · Heiko St?bner

The Rockchip SoCs need a special part of their sram for bringup of additional cores. Therefore the mapped area should be split into a special area for the smp code and a generic area that gets handled by mmio-sram.

---
 .../devicetree/bindings/arm/rockchip/smp-sram.txt  |   29 ++++++++++++++++++++
 arch/arm/boot/dts/rk3066a.dtsi                     |   14 ++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt
Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file +18 -0
new file mode 100644
index 0000000..9c81fac
@@ -0,0 +1,29 @@
+Rockchip SRAM for smp bringup:
+------------------------------
+
+Rockchip smp-capable SoCs use the first part of the sram for the bringup
+of the cores. Once the core gets powered up it executes the code that is
+residing at the very beginning of the sram.
+
+While the suspend also needs to have code in the sram that can be realized
+with the generic mmio-sram driver and only the smp specific part needs to
+be mapped specially in the smp code.
+
+Therefore split the sram mapping in a smp-specific part that gets used
+by the smp code exclusively and a bigger generic part for mmio-sram
+
+Required node properties:
+- compatible value : = "rockchip,rk3066-smp-sram";
+- reg : physical base address and the size of the registers window
+

Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt line 28

Quoted 10 lines
Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file +10 -0
+Example:
+
+	sram at 10080000 {
+		compatible = "rockchip,rk3066-smp-sram";
+		reg = <0x10080000 0x100>;
+	};
+
+	sram: sram at 10080100 {
+		compatible = "mmio-sram";
+		reg = <0x10080100 0x9900>;

I think a better way would be to specify some portion of the sram as reserved rather than defining the s/w use of the sram in DT. Something like this:

mmio-sram-reserved = <base size base size>;

where base values are relative to reg property base.

Rob

Quoted 27 lines
Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file +1 -0
+	};
arch/arm/boot/dts/rk3066a.dtsi +14 -0
index 26c4311..44eabd2 100644
@@ -53,6 +53,20 @@
 			reg = <0x1013c000 0x100>;
 		};
 
+		/*
+		 * the first part of the sram is needed for the smp
+		 * trampoline code during cpu bringup
+		 */
+		sram at 10080000 {
+			compatible = "rockchip,rk3066-smp-sram";
+			reg = <0x10080000 0x100>;
+		};
+
+		sram: sram at 10080100 {
+			compatible = "mmio-sram";
+			reg = <0x10080100 0x9900>;
+		};
+
 		gic: interrupt-controller at 1013d000 {
 			compatible = "arm,cortex-a9-gic";
 			interrupt-controller;
author maintainer
#4 lore raw

PATCH 2/4 ARM: rockchip: add sram dt nodes and documentation

Am Dienstag, 18. Juni 2013, 01:41:27 schrieb Rob Herring:

Quoted 55 lines · Heiko St?bner
Quoted 39 lines

The Rockchip SoCs need a special part of their sram for bringup of additional cores. Therefore the mapped area should be split into a special area for the smp code and a generic area that gets handled by mmio-sram.

---

 .../devicetree/bindings/arm/rockchip/smp-sram.txt  |   29
 ++++++++++++++++++++ arch/arm/boot/dts/rk3066a.dtsi                    
 |   14 ++++++++++ 2 files changed, 43 insertions(+)
 create mode 100644

Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt

(quoted diff) +0 -0

b/Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file mode 100644
index 0000000..9c81fac

Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file +8 -0
@@ -0,0 +1,29 @@
+Rockchip SRAM for smp bringup:
+------------------------------
+
+Rockchip smp-capable SoCs use the first part of the sram for the bringup
+of the cores. Once the core gets powered up it executes the code that is
+residing at the very beginning of the sram.
+
+While the suspend also needs to have code in the sram that can be

realized +with the generic mmio-sram driver and only the smp specific part needs to +be mapped specially in the smp code.

Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file +8 -0
+
+Therefore split the sram mapping in a smp-specific part that gets used
+by the smp code exclusively and a bigger generic part for mmio-sram
+
+Required node properties:
+- compatible value : = "rockchip,rk3066-smp-sram";
+- reg : physical base address and the size of the registers window
+

Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt line 28

Quoted 10 lines
Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file +10 -0
+Example:
+
+	sram at 10080000 {
+		compatible = "rockchip,rk3066-smp-sram";
+		reg = <0x10080000 0x100>;
+	};
+
+	sram: sram at 10080100 {
+		compatible = "mmio-sram";
+		reg = <0x10080100 0x9900>;

I think a better way would be to specify some portion of the sram as reserved rather than defining the s/w use of the sram in DT. Something like this:

Quoted 3 lines

mmio-sram-reserved = <base size base size>;

where base values are relative to reg property base.

hmm, but I don't see how to get then access to the reserved part. As can be seen in patch 4 [which I've forgotton to cc you in, sorry] the smp-trampoline gets copied into this area for the core to execute after poweron, so I need to get the mapped representation of the reserved area.

Or do you mean

- let mmio-sram only allocate the non-reserved spaces for itself
- grab mmio-sram node in the smp code and map the necessary reserved space

This might actually work.

Thanks
Heiko

Quoted 30 lines
Quoted 30 lines
Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file +1 -0
+	};
(quoted diff) +0 -0

b/arch/arm/boot/dts/rk3066a.dtsi index 26c4311..44eabd2 100644

arch/arm/boot/dts/rk3066a.dtsi +14 -0
@@ -53,6 +53,20 @@
 
 			reg = <0x1013c000 0x100>;
 
 		};
 
+		/*
+		 * the first part of the sram is needed for the smp
+		 * trampoline code during cpu bringup
+		 */
+		sram at 10080000 {
+			compatible = "rockchip,rk3066-smp-sram";
+			reg = <0x10080000 0x100>;
+		};
+
+		sram: sram at 10080100 {
+			compatible = "mmio-sram";
+			reg = <0x10080100 0x9900>;
+		};
+
 
arch/arm/boot/dts/rk3066a.dtsi +0 -0
 		gic: interrupt-controller at 1013d000 {
 
 			compatible = "arm,cortex-a9-gic";
 			interrupt-controller;
#5 lore raw

PATCH 2/4 ARM: rockchip: add sram dt nodes and documentation

Quoted 56 lines · Heiko St?bner

Am Dienstag, 18. Juni 2013, 01:41:27 schrieb Rob Herring:

Quoted 55 lines · Heiko St?bner
Quoted 39 lines

The Rockchip SoCs need a special part of their sram for bringup of additional cores. Therefore the mapped area should be split into a special area for the smp code and a generic area that gets handled by mmio-sram.

---

 .../devicetree/bindings/arm/rockchip/smp-sram.txt  |   29
 ++++++++++++++++++++ arch/arm/boot/dts/rk3066a.dtsi                    
 |   14 ++++++++++ 2 files changed, 43 insertions(+)
 create mode 100644

Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt

(quoted diff) +0 -0

b/Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file mode 100644
index 0000000..9c81fac

Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file +8 -0
@@ -0,0 +1,29 @@
+Rockchip SRAM for smp bringup:
+------------------------------
+
+Rockchip smp-capable SoCs use the first part of the sram for the bringup
+of the cores. Once the core gets powered up it executes the code that is
+residing at the very beginning of the sram.
+
+While the suspend also needs to have code in the sram that can be

realized +with the generic mmio-sram driver and only the smp specific part needs to +be mapped specially in the smp code.

Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file +8 -0
+
+Therefore split the sram mapping in a smp-specific part that gets used
+by the smp code exclusively and a bigger generic part for mmio-sram
+
+Required node properties:
+- compatible value : = "rockchip,rk3066-smp-sram";
+- reg : physical base address and the size of the registers window
+

Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt line 28

Quoted 10 lines
Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file +10 -0
+Example:
+
+	sram at 10080000 {
+		compatible = "rockchip,rk3066-smp-sram";
+		reg = <0x10080000 0x100>;
+	};
+
+	sram: sram at 10080100 {
+		compatible = "mmio-sram";
+		reg = <0x10080100 0x9900>;

I think a better way would be to specify some portion of the sram as reserved rather than defining the s/w use of the sram in DT. Something like this:

Quoted 8 lines
Quoted 3 lines

mmio-sram-reserved = <base size base size>;

where base values are relative to reg property base.

hmm, but I don't see how to get then access to the reserved part. As can be seen in patch 4 [which I've forgotton to cc you in, sorry] the smp-trampoline gets copied into this area for the core to execute after poweron, so I need to get the mapped representation of the reserved area.

That's helpful to know.

Quoted 4 lines

Or do you mean

- let mmio-sram only allocate the non-reserved spaces for itself
- grab mmio-sram node in the smp code and map the necessary reserved space

That would work. Another alternative would be having a way in the kernel to reserve a specific region of sram.

If you have to know what to put in the sram and are putting that into the kernel, then having to know where to put it is not really much more kernel data. So I don't really see the point to put a "smp boot" area into device tree.

Seems like we're getting several platforms that are putting all their secondary core boot code into the kernel. I'm not sure this is something we want in the kernel. We may need to define the boot protocol for secondary cores just like the boot core and start pushing this into bootloaders.

Rob

Quoted 39 lines

This might actually work.

Thanks
Heiko

Quoted 30 lines
Quoted 30 lines
Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file +1 -0
+	};
(quoted diff) +0 -0

b/arch/arm/boot/dts/rk3066a.dtsi index 26c4311..44eabd2 100644

arch/arm/boot/dts/rk3066a.dtsi +14 -0
@@ -53,6 +53,20 @@
 
 			reg = <0x1013c000 0x100>;
 
 		};
 
+		/*
+		 * the first part of the sram is needed for the smp
+		 * trampoline code during cpu bringup
+		 */
+		sram at 10080000 {
+			compatible = "rockchip,rk3066-smp-sram";
+			reg = <0x10080000 0x100>;
+		};
+
+		sram: sram at 10080100 {
+			compatible = "mmio-sram";
+			reg = <0x10080100 0x9900>;
+		};
+
 
arch/arm/boot/dts/rk3066a.dtsi +0 -0
 		gic: interrupt-controller at 1013d000 {
 
 			compatible = "arm,cortex-a9-gic";
 			interrupt-controller;
author maintainer
#6 lore raw

PATCH 2/4 ARM: rockchip: add sram dt nodes and documentation

Am Dienstag, 18. Juni 2013, 04:30:46 schrieb Rob Herring:

Quoted 72 lines · Heiko St?bner
Quoted 61 lines

Am Dienstag, 18. Juni 2013, 01:41:27 schrieb Rob Herring:

Quoted 60 lines · Heiko St?bner
Quoted 42 lines

The Rockchip SoCs need a special part of their sram for bringup of additional cores. Therefore the mapped area should be split into a special area for the smp code and a generic area that gets handled by mmio-sram.

---

 .../devicetree/bindings/arm/rockchip/smp-sram.txt  |   29

++++++++++++++++++++ arch/arm/boot/dts/rk3066a.dtsi

| 14 ++++++++++ 2 files changed, 43 insertions(+)

 create mode 100644

Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt

diff --git a/Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt b/Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file mode 100644
index 0000000..9c81fac

Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file +4 -0
@@ -0,0 +1,29 @@
+Rockchip SRAM for smp bringup:
+------------------------------
+
+Rockchip smp-capable SoCs use the first part of the sram for the

bringup +of the cores. Once the core gets powered up it executes the code that is +residing at the very beginning of the sram.

Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file +2 -0
+
+While the suspend also needs to have code in the sram that can be

realized +with the generic mmio-sram driver and only the smp specific part needs to +be mapped specially in the smp code.

Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file +8 -0
+
+Therefore split the sram mapping in a smp-specific part that gets used
+by the smp code exclusively and a bigger generic part for mmio-sram
+
+Required node properties:
+- compatible value : = "rockchip,rk3066-smp-sram";
+- reg : physical base address and the size of the registers window
+

Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt line 28

Quoted 10 lines
Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt new file +10 -0
+Example:
+
+	sram at 10080000 {
+		compatible = "rockchip,rk3066-smp-sram";
+		reg = <0x10080000 0x100>;
+	};
+
+	sram: sram at 10080100 {
+		compatible = "mmio-sram";
+		reg = <0x10080100 0x9900>;

I think a better way would be to specify some portion of the sram as reserved rather than defining the s/w use of the sram in DT. Something like this:

mmio-sram-reserved = <base size base size>;

Quoted 7 lines
Quoted 1 line

where base values are relative to reg property base.

hmm, but I don't see how to get then access to the reserved part. As can be seen in patch 4 [which I've forgotton to cc you in, sorry] the smp-trampoline gets copied into this area for the core to execute after poweron, so I need to get the mapped representation of the reserved area.

That's helpful to know.

Quoted 8 lines
Quoted 5 lines

Or do you mean

- let mmio-sram only allocate the non-reserved spaces for itself
- grab mmio-sram node in the smp code and map the necessary reserved space

That would work. Another alternative would be having a way in the kernel to reserve a specific region of sram.

Problem is, that the mmio-sram driver that gets to control the sram via genalloc only runs later in the boot process, so when bringing up smp cores it's not present yet.

So I'll try it with the reserve-variant above.

Quoted 10 lines

If you have to know what to put in the sram and are putting that into the kernel, then having to know where to put it is not really much more kernel data. So I don't really see the point to put a "smp boot" area into device tree.

Seems like we're getting several platforms that are putting all their secondary core boot code into the kernel. I'm not sure this is something we want in the kernel. We may need to define the boot protocol for secondary cores just like the boot core and start pushing this into bootloaders.

sorry, but you've lost me here somewhere - but smp is also very new to me :-)

What gets put into sram for the Rockchip SoCs is

	ENTRY(rockchip_secondary_trampoline)
		ldr	pc, 1f
	ENDPROC(rockchip_secondary_trampoline)
		.globl	rockchip_boot_fn
	rockchip_boot_fn:
	1:	.space	4
	ENTRY(rockchip_secondary_trampoline_end)

that then simply points the core back to the regular kernel code, that does the real bringup:

	ENTRY(rockchip_secondary_startup)
		bl	v7_invalidate_l1
		b	secondary_startup
	ENDPROC(rockchip_secondary_startup)

and I currently fail to see how this would only be done in the bootloader, especially, as it probably needs to be rerun after turning the core off and on again via cpu hotplug, so the sram content there would also need to stay untouched.

And from what I've seen, how this is done in general in different SoCs varies a lot.

Heiko

author maintainer
#7 lore raw

PATCH 3/4 ARM: rockchip: add power-management-unit dt node

In reply to Heiko Stübner

The pmu is needed to bring up the cores during smp operations. Therefore add a node and documentation for it.

---
 Documentation/devicetree/bindings/arm/rockchip/pmu.txt |   16 ++++++++++++++++
 arch/arm/boot/dts/rk3066a.dtsi                         |    5 +++++
 2 files changed, 21 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/rockchip/pmu.txt
Documentation/devicetree/bindings/arm/rockchip/pmu.txt new file +16 -0
new file mode 100644
index 0000000..3ee9b42
@@ -0,0 +1,16 @@
+Rockchip power-management-unit:
+-------------------------------
+
+The pmu is used to turn off and on different power domains of the SoCs
+This includes the power to the CPU cores.
+
+Required node properties:
+- compatible value : = "rockchip,rk3066-pmu";
+- reg : physical base address and the size of the registers window
+
+Example:
+
+	pmu at 20004000 {
+		compatible = "rockchip,rk3066-pmu";
+		reg = <0x20004000 0x100>;
+	};
arch/arm/boot/dts/rk3066a.dtsi +5 -0
index 44eabd2..7b690ab 100644
@@ -67,6 +67,11 @@
 			reg = <0x10080100 0x9900>;
 		};
 
+		pmu at 20004000 {
+			compatible = "rockchip,rk3066-pmu";
+			reg = <0x20004000 0x100>;
+		};
+
 		gic: interrupt-controller at 1013d000 {
 			compatible = "arm,cortex-a9-gic";
 			interrupt-controller;
Signature · 1 line
1.7.10.4
author maintainer
#8 lore raw

PATCH 4/4 ARM: rockchip: add smp bringup code

In reply to Heiko Stübner

This adds the necessary smp-operations and startup code to use additional cores on Rockchip SoCs.

We currently hog the power management unit in the smp code, as it is necessary to control the power to the cpu core and nothing else it is currently using it, so a generic implementation can be done later.

---
 arch/arm/mach-rockchip/Makefile   |    1 +
 arch/arm/mach-rockchip/core.h     |   22 ++++++
 arch/arm/mach-rockchip/headsmp.S  |   32 ++++++++
 arch/arm/mach-rockchip/platsmp.c  |  145 +++++++++++++++++++++++++++++++++++++
 arch/arm/mach-rockchip/rockchip.c |    2 +
 5 files changed, 202 insertions(+)
 create mode 100644 arch/arm/mach-rockchip/core.h
 create mode 100644 arch/arm/mach-rockchip/headsmp.S
 create mode 100644 arch/arm/mach-rockchip/platsmp.c
arch/arm/mach-rockchip/Makefile +1 -0
index 1547d4f..4377a14 100644
@@ -1 +1,2 @@
 obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip.o
+obj-$(CONFIG_SMP) += headsmp.o platsmp.o
arch/arm/mach-rockchip/core.h new file +22 -0
new file mode 100644
index 0000000..e2e7c9d
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2013 MundoReader S.L.
+ * Author: Heiko Stuebner <[email protected]>
+ *
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ */
+
+extern char rockchip_secondary_trampoline;
+extern char rockchip_secondary_trampoline_end;
+
+extern unsigned long rockchip_boot_fn;
+extern void rockchip_secondary_startup(void);
+
+extern struct smp_operations rockchip_smp_ops;
arch/arm/mach-rockchip/headsmp.S new file +32 -0
new file mode 100644
index 0000000..3dd72f7
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2013 MundoReader S.L.
+ * Author: Heiko Stuebner <[email protected]>
+ *
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ */
+#include <linux/linkage.h>
+#include <linux/init.h>
+
+	__CPUINIT
+
+ENTRY(rockchip_secondary_startup)
+	bl	v7_invalidate_l1
+	b	secondary_startup
+ENDPROC(rockchip_secondary_startup)
+
+ENTRY(rockchip_secondary_trampoline)
+	ldr	pc, 1f
+ENDPROC(rockchip_secondary_trampoline)
+	.globl	rockchip_boot_fn
+rockchip_boot_fn:
+1:	.space	4
+
+ENTRY(rockchip_secondary_trampoline_end)
arch/arm/mach-rockchip/platsmp.c new file +145 -0

145 lines not on this page · raw message

arch/arm/mach-rockchip/rockchip.c +2 -0
index 0933e17..fd569a1 100644
@@ -24,6 +24,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/hardware/cache-l2x0.h>
+#include "core.h"
 
 static void __init rockchip_timer_init(void)
 {
@@ -48,6 +49,7 @@ static const char * const rockchip_board_dt_compat[] = {
 };
 
 DT_MACHINE_START(ROCKCHIP_DT, "Rockchip Cortex-A9 (Device Tree)")
+	.smp		= smp_ops(rockchip_smp_ops),
 	.init_machine	= rockchip_dt_init,
 	.init_time	= rockchip_timer_init,
 	.dt_compat	= rockchip_board_dt_compat,
Signature · 1 line
1.7.10.4