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

Commit aa385712 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

arm64: dts: uniphier: add reserved-memory for secure memory 



The memory regions specified by /memreserve/ are passed to
early_init_dt_reserve_memory_arch() with nomap=false, so it is
not suitable for reserving memory for Trusted Firmware-A etc.

Use the more robust /reserved-memory node with the no-map property
to prevent the kernel from mapping it.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 53c580c1

arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi

+11 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/gpio/uniphier-gpio.h>



/memreserve/ 0x80000000 0x02000000;



/ {

	compatible = "socionext,uniphier-ld11";

	#address-cells = <2>;
@@ -110,6 +108,17 @@ 
			     <1 10 4>;

	};



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		secure-memory@81000000 {

			reg = <0x0 0x81000000 0x0 0x01000000>;

			no-map;

		};

	};



	soc@0 {

		compatible = "simple-bus";

		#address-cells = <1>;

arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi

+11 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ 
#include <dt-bindings/gpio/uniphier-gpio.h>

#include <dt-bindings/thermal/thermal.h>



/memreserve/ 0x80000000 0x02000000;



/ {

	compatible = "socionext,uniphier-ld20";

	#address-cells = <2>;
@@ -215,6 +213,17 @@ 
		};

	};



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		secure-memory@81000000 {

			reg = <0x0 0x81000000 0x0 0x01000000>;

			no-map;

		};

	};



	soc@0 {

		compatible = "simple-bus";

		#address-cells = <1>;

arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi

+11 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/gpio/uniphier-gpio.h>



/memreserve/ 0x80000000 0x02000000;



/ {

	compatible = "socionext,uniphier-pxs3";

	#address-cells = <2>;
@@ -138,6 +136,17 @@ 
			     <1 10 4>;

	};



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		secure-memory@81000000 {

			reg = <0x0 0x81000000 0x0 0x01000000>;

			no-map;

		};

	};



	soc@0 {

		compatible = "simple-bus";

		#address-cells = <1>;