fix: rename load address relative offset node name
Replace "relative-address" with "load-address-relative-offset" as the
node name in the memory region node of secure partition manifest.
Change-Id: I34d423ef0ae7e86a5517a2f7e4293eff97aeabf7
Signed-off-by: Davidson K <davidson.kumaresan@arm.com>
diff --git a/src/manifest.c b/src/manifest.c
index 28aff31..bda513a 100644
--- a/src/manifest.c
+++ b/src/manifest.c
@@ -655,9 +655,9 @@
dlog_verbose(" Base address: %#lx\n",
mem_regions[i].base_address);
- TRY(read_optional_uint64(mem_node, "relative-address",
- MANIFEST_INVALID_ADDRESS,
- &relative_address));
+ TRY(read_optional_uint64(
+ mem_node, "load-address-relative-offset",
+ MANIFEST_INVALID_ADDRESS, &relative_address));
if (relative_address != MANIFEST_INVALID_ADDRESS) {
dlog_verbose(" Relative address: %#lx\n",
relative_address);
diff --git a/src/manifest_test.cc b/src/manifest_test.cc
index c281174..a64d3ab 100644
--- a/src/manifest_test.cc
+++ b/src/manifest_test.cc
@@ -1248,7 +1248,8 @@
MANIFEST_ERROR_MEM_REGION_EMPTY);
manifest_dealloc();
- /* Mutually exclusive base-address and relative-address properties */
+ /* Mutually exclusive base-address and load-address-relative-offset
+ * properties */
/* clang-format off */
dtb = ManifestDtBuilder()
.FfaValidManifest()
@@ -1258,7 +1259,7 @@
.StartChild("rx")
.Description("rx-buffer")
.Property("base-address", "<0x7300000>")
- .Property("relative-address", "<0x7300000>")
+ .Property("load-address-relative-offset", "<0x7300000>")
.Property("pages-count", "<1>")
.Property("attributes", "<1>")
.EndChild()
@@ -1278,7 +1279,7 @@
.Label("rx")
.StartChild("rx")
.Description("rx-buffer")
- .Property("relative-address", "<0xffffff00 0xffffff00>")
+ .Property("load-address-relative-offset", "<0xffffff00 0xffffff00>")
.Property("pages-count", "<1>")
.Property("attributes", "<1>")
.EndChild()
@@ -1712,7 +1713,7 @@
.Compatible({ "arm,ffa-manifest-memory-regions" })
.StartChild("test-memory")
.Description("test-memory")
- .Property("relative-address", "<0x7100000>")
+ .Property("load-address-relative-offset", "<0x7100000>")
.Property("pages-count", "<4>")
.Property("attributes", "<3>")
.Property("smmu-id", "<1>")
diff --git a/test/hftest/service_common.c b/test/hftest/service_common.c
index f16068b..2ec6e16 100644
--- a/test/hftest/service_common.c
+++ b/test/hftest/service_common.c
@@ -170,9 +170,10 @@
if (!fdt_read_number(&ffa_node, "base-address",
&cur_region->base_address)) {
- EXPECT_TRUE(fdt_read_number(&ffa_node,
- "relative-address",
- &number));
+ EXPECT_TRUE(fdt_read_number(
+ &ffa_node,
+ "load-address-relative-offset",
+ &number));
cur_region->base_address =
ctx->partition_manifest.load_addr +
number;
@@ -206,9 +207,10 @@
if (!fdt_read_number(&ffa_node, "base-address",
&cur_region->base_address)) {
- EXPECT_TRUE(fdt_read_number(&ffa_node,
- "relative-address",
- &number));
+ EXPECT_TRUE(fdt_read_number(
+ &ffa_node,
+ "load-address-relative-offset",
+ &number));
cur_region->base_address =
ctx->partition_manifest.load_addr +
number;
diff --git a/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/partition_manifest_service_sp1.dts b/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/partition_manifest_service_sp1.dts
index 586e507..1e09280 100644
--- a/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/partition_manifest_service_sp1.dts
+++ b/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/partition_manifest_service_sp1.dts
@@ -37,7 +37,7 @@
compatible = "arm,ffa-manifest-memory-regions";
test-memory {
- relative-address = <0x300000>; /* effective address = 0x6780000 */
+ load-address-relative-offset = <0x300000>; /* effective address = 0x6780000 */
pages-count = <1>;
attributes = <0x3>;
};