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

diff --git a/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts b/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts
index 934a01afc7615bcb08aa927014126f7150d3e10f..8b9c281e2c1e76247275fa5c2f41a919c38a2faf 100644 (file)
--- 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 f5b31b43c2e5da824aadcd5be5c6ad00e58b5a42..266adfc2bbd3878b93a8c0b8b94e20e0be44de33 100644 (file)
--- 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 */
        };