aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Deprez <olivier.deprez@arm.com>2020-10-08 08:38:58 +0200
committerOlivier Deprez <olivier.deprez@arm.com>2020-10-22 00:12:00 +0200
commitd0d63afeb440c4ccc8a5685130f1b8de1536eec2 (patch)
treef8fed7d868dfffa436e8c163cc7e84f86e69d14d
parentbd260fcbfea1be22599687174270bad96fafb22e (diff)
downloadtrusted-firmware-a-d0d63afeb440c4ccc8a5685130f1b8de1536eec2.tar.gz
SPMC: adjust device region for first secure partition
For the first partition, mark first 2GB as device memory excluding the Trusted DRAM region reserved for the SPMC. Signed-off-by: Olivier Deprez <olivier.deprez@arm.com> Change-Id: I3ff110b3facf5b6d41ac2519ff6ca5e30a0a502b
-rw-r--r--plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts20
-rw-r--r--plat/arm/board/fvp/fdts/fvp_spmc_optee_sp_manifest.dts9
2 files changed, 21 insertions, 8 deletions
diff --git a/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts b/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts
index 934a01afc7..8b9c281e2c 100644
--- a/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts
+++ b/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts
@@ -5,13 +5,12 @@
*/
/dts-v1/;
-#define AFF 00
+#define AFF 00
#include "fvp-defs.dtsi"
#undef POST
-#define POST \
- enable-method = "psci"; \
- };
+#define POST \
+ };
/ {
compatible = "arm,ffa-core-manifest-1.0";
@@ -61,7 +60,11 @@
#size-cells = <0x0>;
CPU_0
- /* SPM(Hafnium) requires secondary cpu nodes are declared in descending order */
+
+ /*
+ * SPMC (Hafnium) requires secondary core nodes are declared
+ * in descending order.
+ */
CPU_7
CPU_6
CPU_5
@@ -71,7 +74,12 @@
CPU_1
};
- memory@60000000 {
+ device-memory@0 {
+ device_type = "device-memory";
+ reg = <0x0 0x0 0x6000000 0x0 0x8000000 0x78000000>;
+ };
+
+ memory@6000000 {
device_type = "memory";
reg = <0x0 0x6000000 0x2000000>; /* Trusted DRAM */
};
diff --git a/plat/arm/board/fvp/fdts/fvp_spmc_optee_sp_manifest.dts b/plat/arm/board/fvp/fdts/fvp_spmc_optee_sp_manifest.dts
index f5b31b43c2..266adfc2bb 100644
--- a/plat/arm/board/fvp/fdts/fvp_spmc_optee_sp_manifest.dts
+++ b/plat/arm/board/fvp/fdts/fvp_spmc_optee_sp_manifest.dts
@@ -49,7 +49,7 @@
CPU_0
/*
- * SPMC(Hafnium) requires secondary core nodes are declared
+ * SPMC (Hafnium) requires secondary core nodes are declared
* in descending order.
*/
CPU_7
@@ -61,7 +61,12 @@
CPU_1
};
- memory@60000000 {
+ device-memory@0 {
+ device_type = "device-memory";
+ reg = <0x0 0x0 0x6000000 0x0 0x8000000 0x78000000>;
+ };
+
+ memory@6000000 {
device_type = "memory";
reg = <0x0 0x6000000 0x2000000>; /* Trusted DRAM */
};