From: Konstantin Porotchkin <kostap@xxxxxxxxxxx> Add reserved memory and ARM firmware definitions for optee memory region in Marvell Armada SoCs to avoid protected memory access. Signed-off-by: Konstantin Porotchkin <kostap@xxxxxxxxxxx> Cc: Andrew Lunn <andrew@xxxxxxx> Cc: Gregory Clement <gregory.clement@xxxxxxxxxxx> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@xxxxxxxxx> --- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 11 +++++++++++ arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 13 +++++++++++++ 2 files changed, 24 insertions(+) diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi index df152c72276b..c7a5a25826ea 100644 --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi @@ -35,6 +35,11 @@ psci-area@4000000 { reg = <0 0x4000000 0 0x200000>; no-map; }; + + tee@4400000 { + reg = <0 0x4400000 0 0x1000000>; + no-map; + }; }; cpus { @@ -531,5 +536,11 @@ armada-3700-rwtm { mboxes = <&rwtm 0>; status = "okay"; }; + + optee { + compatible = "linaro,optee-tz"; + method = "smc"; + status = "okay"; + }; }; }; diff --git a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi index a06a0a889c43..abf373b39463 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi @@ -41,6 +41,11 @@ psci-area@4000000 { reg = <0x0 0x4000000 0x0 0x200000>; no-map; }; + + tee@4400000 { + reg = <0 0x4400000 0 0x1000000>; + no-map; + }; }; AP_NAME { @@ -461,4 +466,12 @@ map3_emerg: map3-emerg { }; }; }; + + firmware { + optee { + compatible = "linaro,optee-tz"; + method = "smc"; + status = "okay"; + }; + }; }; -- 2.25.1