aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJerome Forissier <jerome.forissier@linaro.org>2016-10-01 14:28:02 -0700
committerArvind Chauhan <arvind.chauhan@arm.com>2017-09-26 14:38:44 +0530
commitd88363e5244b66c904e4446f4ae7e12600e4330d (patch)
treeaf11040cdbbbae7c745a6da53659c3da269e7dbe /arch
parent00b15dede05e72b1b6c80830c067c629e2ef0569 (diff)
arm64: dt: Add no-map to the reserved-memory node for OP-TEE **not for mailine**
All the platforms that reserve memory for OP-TEE statically via the DT (i.e., not those that reserve it via UEFI or that patch the DT dynamically thanks to OP-TEE's CFG_DT option) have to mark it 'no-map' so that only the TEE driver may map it. Fixes: https://github.com/OP-TEE/optee_os/issues/1034 Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> Reviewed-by: Joakim Bech <joakim.bech@linaro.org> Cherry-picked from SWG's kernel tree: https://github.com/linaro-swg/linux/commit/a11f5a881d7f891ac4c12c45b76895d4d48f93e8 Then edited to only keep change to juno-base.dtsi Signed-off-by: Jon Medhurst <tixy@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/boot/dts/arm/juno-base.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index e144f34ddbdb..d1df5e360d74 100644
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -634,6 +634,7 @@
/* Shared memory between secure and non-secure world */
optee@0xfee00000 {
reg = <0x00000000 0xfee00000 0 0x00200000>;
+ no-map;
};
};