diff options
| author | Jerome Forissier <jerome.forissier@linaro.org> | 2016-10-01 14:28:02 -0700 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2016-10-25 17:21:47 +0100 |
| commit | a838db73fcd9b4daebcf7eb0513c952a1b06003d (patch) | |
| tree | dd078697b880c7e253c2a5b7fb26ccea957c236a | |
| parent | 34e41e50dac7f9b40a80d440079bd117e0ebc769 (diff) | |
arm64: dt: Add no-map to the reserved-memory node for OP-TEE **not for mailine**lsk-3.18-armlt-juno-dt
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>
| -rw-r--r-- | arch/arm64/boot/dts/arm/juno-base.dtsi | 1 |
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 0ad0a6b2dd5e..fd63d90446f5 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi @@ -154,6 +154,7 @@ /* Shared memory between secure and non-secure world */ optee@0xfee00000 { reg = <0x00000000 0xfee00000 0 0x00200000>; + no-map; }; }; |