fix: memory region not page aligned
In [1] Hafnium mandates that every memory region allocated in the
manifest must be page aligned.
If the base address is not present, hafnium would allocate the
memory region. In the manifest structure, the value of the field
would be MANIFEST_INVALID_ADDRESS(all 0xfs), which would cause the
alignment validation to fail.
Hafnium allocation of memory region is dropped in [2].
The patch removes instances of such type of memory regions from
cactus partition manifest.
[1] https://review.trustedfirmware.org/c/hafnium/hafnium/+/17304
[2] https://review.trustedfirmware.org/c/hafnium/hafnium/+/19939
Signed-off-by: J-Alves <joao.alves@arm.com>
Change-Id: I443e30b18531072cd108c58eb0762f3bffbaf65a
diff --git a/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts b/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts
index 92580e7..a8fd83d 100644
--- a/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts
+++ b/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts
@@ -61,12 +61,5 @@
base-address = <0x00000000 0x7501000>;
attributes = <0x3>; /* read-write */
};
-
- /* Without optional base-address */
- test-memory {
- description = "test-memory";
- pages-count = <4>;
- attributes = <0x3>; /* read-write */
- };
};
};
diff --git a/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts b/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts
index b7632da..a5b0062 100644
--- a/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts
+++ b/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts
@@ -35,13 +35,6 @@
memory-regions {
compatible = "arm,ffa-manifest-memory-regions";
- /* Without optional base-address */
- test-memory {
- description = "test-memory";
- pages-count = <4>;
- attributes = <0x3>; /* read-write */
- };
-
/* Memory to be shared in memory sharing tests. */
share-memory {
description = "share-memory";
diff --git a/spm/cactus/plat/arm/fvp/fdts/cactus.dts b/spm/cactus/plat/arm/fvp/fdts/cactus.dts
index 04f88d6..4d27c9c 100644
--- a/spm/cactus/plat/arm/fvp/fdts/cactus.dts
+++ b/spm/cactus/plat/arm/fvp/fdts/cactus.dts
@@ -71,13 +71,6 @@
attributes = <0x3>; /* read-write */
};
- /* Without optional base-address */
- test-memory {
- description = "test-memory";
- pages-count = <4>;
- attributes = <0x3>; /* read-write */
- };
-
/*
* Scratch memory used for the purpose of testing SMMUv3 driver
* through Cactus SP
diff --git a/spm/cactus/plat/arm/tc0/fdts/cactus-tertiary.dts b/spm/cactus/plat/arm/tc0/fdts/cactus-tertiary.dts
index 807d1dd..79ccb64 100644
--- a/spm/cactus/plat/arm/tc0/fdts/cactus-tertiary.dts
+++ b/spm/cactus/plat/arm/tc0/fdts/cactus-tertiary.dts
@@ -32,13 +32,6 @@
memory-regions {
compatible = "arm,ffa-manifest-memory-regions";
- /* Without optional base-address */
- test-memory {
- description = "test-memory";
- pages-count = <4>;
- attributes = <0x3>; /* read-write */
- };
-
/* Memory to be shared in memory sharing tests. */
share-memory {
description = "share-memory";