Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8650b9fe authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-core-for-4.17' of...

Merge tag 'sunxi-core-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/soc

Pull "Allwinner core changes for 4.17" from Maxime Ripard:

Here is our bunch of changes for mach-sunxi for this release cycle. This is
basically only about bringing the SMP support to the A80, which has a bug
in hardware and cannot use PSCI like the other SoCs we have.

* tag 'sunxi-core-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: sunxi: mc-smp: Split out SoC-specific device node lookup sequence
  ARM: sunxi: mc-smp: Use DT enable-method for sun9i A80 SMP
  ARM: sunxi: mc-smp: Fix "lookback" typo
  ARM: sun9i: smp: Support cpu0 hotplug
  dt-bindings: ARM: sunxi: Document A80 SoC secure SRAM usage by SMP hotplug
  ARM: sun9i: smp: Support CPU/cluster power down and hotplugging for cpu1~7
  ARM: sun9i: Support SMP bring-up on A80
parents 63fdfbf5 99e3a1e6
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ described below.
			    "actions,s500-smp"
			    "allwinner,sun6i-a31"
			    "allwinner,sun8i-a23"
			    "allwinner,sun9i-a80-smp"
			    "amlogic,meson8-smp"
			    "amlogic,meson8b-smp"
			    "arm,realview-smp"
+44 −0
Original line number Diff line number Diff line
Allwinner SRAM for smp bringup:
------------------------------------------------

Allwinner's A80 SoC uses part of the secure sram for hotplugging of the
primary core (cpu0). Once the core gets powered up it checks if a magic
value is set at a specific location. If it is then the BROM will jump
to the software entry address, instead of executing a standard boot.

Therefore a reserved section sub-node has to be added to the mmio-sram
declaration.

Note that this is separate from the Allwinner SRAM controller found in
../../sram/sunxi-sram.txt. This SRAM is secure only and not mappable to
any device.

Also there are no "secure-only" properties. The implementation should
check if this SRAM is usable first.

Required sub-node properties:
- compatible : depending on the SoC this should be one of:
		"allwinner,sun9i-a80-smp-sram"

The rest of the properties should follow the generic mmio-sram discription
found in ../../misc/sram.txt

Example:

	sram_b: sram@20000 {
		/* 256 KiB secure SRAM at 0x20000 */
		compatible = "mmio-sram";
		reg = <0x00020000 0x40000>;
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0 0x00020000 0x40000>;

		smp-sram@1000 {
			/*
			 * This is checked by BROM to determine if
			 * cpu0 should jump to SMP entry vector
			 */
			compatible = "allwinner,sun9i-a80-smp-sram";
			reg = <0x1000 0x8>;
		};
	};
+7 −0
Original line number Diff line number Diff line
@@ -48,4 +48,11 @@ config MACH_SUN9I
	default ARCH_SUNXI
	select ARM_GIC

config ARCH_SUNXI_MC_SMP
	bool
	depends on SMP
	default MACH_SUN9I
	select ARM_CCI400_PORT_CTRL
	select ARM_CPU_SUSPEND

endif
+3 −0
Original line number Diff line number Diff line
CFLAGS_mc_smp.o	+= -march=armv7-a

obj-$(CONFIG_ARCH_SUNXI) += sunxi.o
obj-$(CONFIG_ARCH_SUNXI_MC_SMP) += mc_smp.o
obj-$(CONFIG_SMP) += platsmp.o
+856 −0

File added.

Preview size limit exceeded, changes collapsed.