Skip to contentSkip to conversation

Patch "ARM64: dts: meson-gxl: Add alternate ARM Trusted Firmware reserved memory zone" has been added to the 4.14-stable tree

PATCH [email protected] 1 participant 1 message Nov 28, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ARM64: dts: meson-gxl: Add alternate ARM Trusted Firmware reserved memory zone

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm64-dts-meson-gxl-add-alternate-arm-trusted-firmware-reserved-memory-zone.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 4ee8e51b9edfe7845a094690a365c844e5a35b4b Mon Sep 17 00:00:00 2001

From: Neil Armstrong <[email protected]>
Date: Wed, 11 Oct 2017 17:23:12 +0200
Subject: ARM64: dts: meson-gxl: Add alternate ARM Trusted Firmware reserved memory zone

From: Neil Armstrong <[email protected]>

commit 4ee8e51b9edfe7845a094690a365c844e5a35b4b upstream.

This year, Amlogic updated the ARM Trusted Firmware reserved memory mapping for Meson GXL SoCs and products sold since May 2017 uses this alternate reserved memory mapping.
But products had been sold using the previous mapping.

This issue has been explained in [1] and a dynamic solution is yet to be found to avoid loosing another 3Mbytes of reservable memory.

In the meantime, this patch adds this alternate memory zone only for the GXL and GXM SoCs since GXBB based new products stopped earlier.

[1] http://lists.infradead.org/pipermail/linux-amlogic/2017-October/004860.html

Fixes bba8e3f42736 ("ARM64: dts: meson-gx: Add firmware reserved memory zones")
---
 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi |    8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +8 -0
@@ -49,6 +49,14 @@
 
 / {
 	compatible = "amlogic,meson-gxl";
+
+	reserved-memory {
+		/* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */
+		secmon_reserved_alt: secmon@05000000 {
+			reg = <0x0 0x05000000 0x0 0x300000>;
+			no-map;
+		};
+	};
 };
 
 &ethmac {

Patches currently in stable-queue which might be from [email protected] are

queue-4.14/arm64-dts-meson-gxl-add-alternate-arm-trusted-firmware-reserved-memory-zone.patch