fix(spm): add device-regions used in tf-a-tests
Device memory region specified in an SP manifest are now validated
against the device memory defined in the SPMC manifest. Therefore
we need to add the device memory used in the tf-a-tests to the SPMC
manifests.
Signed-off-by: Daniel Boulby <daniel.boulby@arm.com>
Change-Id: I47376e67c700705d12338d7078292618a15d5546
diff --git a/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts b/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts
index ee6c260..30f1760 100644
--- a/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts
+++ b/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020-2023, Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2024, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -96,6 +96,15 @@
<0x0 0x88000000 0x0 0x10000000>;
};
+ memory@2 {
+ device_type = "device-memory";
+ reg = <0x0 0x1c090000 0x0 0x40000>, /* UART */
+ <0x0 0x2bfe0000 0x0 0x20000>, /* SMMUv3TestEngine */
+ <0x0 0x2a490000 0x0 0x20000>, /* SP805 Trusted Watchdog */
+ <0x0 0x1c130000 0x0 0x10000>; /* Virtio block device */
+ };
+
+
#if MEASURED_BOOT
#include "event_log.dtsi"
#endif
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 f29ea45..d90544b 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
@@ -68,4 +68,9 @@
reg = <0x00008800 0x80000000 0x0 0x7f000000>,
<0x0 0x88000000 0x0 0x10000000>;
};
+
+ memory@0 {
+ device_type = "device-memory";
+ reg = <0x0 0x1c090000 0x0 0x40000>; /* UART */
+ };
};
diff --git a/plat/arm/board/tc/fdts/tc_spmc_manifest.dtsi b/plat/arm/board/tc/fdts/tc_spmc_manifest.dtsi
index 3bc0cbb..e26e9b5 100644
--- a/plat/arm/board/tc/fdts/tc_spmc_manifest.dtsi
+++ b/plat/arm/board/tc/fdts/tc_spmc_manifest.dtsi
@@ -107,4 +107,9 @@
<HI(PLAT_ARM_DRAM2_BASE) LO(PLAT_ARM_DRAM2_BASE)
HI(TC_NS_DRAM2_SIZE) LO(TC_NS_DRAM2_SIZE)>;
};
+
+ memory@2 {
+ device_type = "device-memory";
+ reg = <0x0 0x1c130000 0x0 0x10000>; /* Virtio block device */
+ };
};