4.14-stable patches

added patches:
	arm64-dts-meson-gxl-add-alternate-arm-trusted-firmware-reserved-memory-zone.patch

diff --git a/queue-4.14/arm64-dts-meson-gxl-add-alternate-arm-trusted-firmware-reserved-memory-zone.patch b/queue-4.14/arm64-dts-meson-gxl-add-alternate-arm-trusted-firmware-reserved-memory-zone.patch
new file mode 100644 (file)
index 0000000..4f1e11c
--- /dev/null
+++ b/queue-4.14/arm64-dts-meson-gxl-add-alternate-arm-trusted-firmware-reserved-memory-zone.patch
@@ -0,0 +1,49 @@
+From 4ee8e51b9edfe7845a094690a365c844e5a35b4b Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <narmstrong@baylibre.com>
+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 <narmstrong@baylibre.com>
+
+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")
+Reported-by: Jerome Brunet <jbrunet@baylibre.com>
+Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
+@@ -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 {

diff --git a/queue-4.14/series b/queue-4.14/series
index ba9eab53e31387f13954a98ceeef1f8caee5d801..fc7d7bd8f5c2f6c8ec56e30933b8e7faa9bdff79 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -178,3 +178,4 @@ media-v4l2-ctrl-fix-flags-field-on-control-events.patch
 media-venus-fix-wrong-size-on-dma_free.patch
 media-venus-venc-fix-bytesused-v4l2_plane-field.patch
 media-venus-reimplement-decoder-stop-command.patch
+arm64-dts-meson-gxl-add-alternate-arm-trusted-firmware-reserved-memory-zone.patch