commit 9279b55037bae81848ebf61594e77469d7657505
author Daniel Boulby <daniel.boulby@arm.com> Tue Jun 28 17:04:01 2022 +0100
committer Joao Alves <joao.alves@arm.com> Thu Aug 04 17:45:01 2022 +0200
tree 62b18a477cd8783126f53cde0f7723e0a4c4fac0
parent a7e9e1827cf2260f8cfb8a68780041a65dc85b50

test(manifest): overlapped mem regions throw error

Ensure that if overlapping memory regions are given in the
partition manifest a MANIFEST_ERROR_MEM_REGION_OVERLAP error
code is returned when parsing the manifest.

Signed-off-by: Daniel Boulby <daniel.boulby@arm.com>
Change-Id: I52c33541ace10ae6be8c4e1661631a0d0f33927a

src/manifest_test.cc

diff --git a/src/manifest_test.cc b/src/manifest_test.cc
index 5b08051..a917fb4 100644
--- a/src/manifest_test.cc
+++ b/src/manifest_test.cc
@@ -931,6 +931,82 @@
 	ASSERT_EQ(ffa_manifest_from_vec(&m, dtb),
 		  MANIFEST_ERROR_PROPERTY_NOT_FOUND);
 
+	/* Overlapping memory regions */
+	/* clang-format off */
+	dtb = ManifestDtBuilder()
+		.FfaValidManifest()
+		.StartChild("memory-regions")
+			.Compatible({ "arm,ffa-manifest-memory-regions" })
+			.Label("rx")
+			.StartChild("rx")
+				.Description("rx-buffer")
+				.Property("base-address", "<0x7300000>")
+				.Property("pages-count", "<1>")
+				.Property("attributes", "<1>")
+			.EndChild()
+			.Label("tx")
+			.StartChild("tx")
+				.Description("tx-buffer")
+				.Property("base-address", "<0x7300000>")
+				.Property("pages-count", "<2>")
+				.Property("attributes", "<3>")
+			.EndChild()
+		.EndChild()
+		.Build();
+	/* clang-format on */
+	ASSERT_EQ(ffa_manifest_from_vec(&m, dtb),
+		  MANIFEST_ERROR_MEM_REGION_OVERLAP);
+
+	/* clang-format off */
+	dtb = ManifestDtBuilder()
+		.FfaValidManifest()
+		.StartChild("memory-regions")
+			.Compatible({ "arm,ffa-manifest-memory-regions" })
+			.Label("rx")
+			.StartChild("rx")
+				.Description("rx-buffer")
+				.Property("base-address", "<0x7300000>")
+				.Property("pages-count", "<2>")
+				.Property("attributes", "<1>")
+			.EndChild()
+			.Label("tx")
+			.StartChild("tx")
+				.Description("tx-buffer")
+				.Property("base-address", "<0x7301000>")
+				.Property("pages-count", "<2>")
+				.Property("attributes", "<3>")
+			.EndChild()
+		.EndChild()
+		.Build();
+	/* clang-format on */
+	ASSERT_EQ(ffa_manifest_from_vec(&m, dtb),
+		  MANIFEST_ERROR_MEM_REGION_OVERLAP);
+
+	/* clang-format off */
+	dtb = ManifestDtBuilder()
+		.FfaValidManifest()
+		.StartChild("memory-regions")
+			.Compatible({ "arm,ffa-manifest-memory-regions" })
+			.Label("rx")
+			.StartChild("rx")
+				.Description("rx-buffer")
+				.Property("base-address", "<0x7300000>")
+				.Property("pages-count", "<2>")
+				.Property("attributes", "<1>")
+			.EndChild()
+			.Label("tx")
+			.StartChild("tx")
+				.Description("tx-buffer")
+				.Property("base-address", "<0x7301FFF>")
+				.Property("pages-count", "<2>")
+				.Property("attributes", "<3>")
+			.EndChild()
+		.EndChild()
+		.Build();
+	/* clang-format on */
+	ASSERT_EQ(ffa_manifest_from_vec(&m, dtb),
+		  MANIFEST_ERROR_MEM_REGION_OVERLAP);
+
 	/* Different RXTX buffer sizes */
 	/* clang-format off */
 	dtb = ManifestDtBuilder()
@@ -1191,7 +1267,7 @@
 			.Label("tx")
 			.StartChild("tx")
 				.Description("tx-buffer")
-				.Property("base-address", "<0x7310000>")
+				.Property("base-address", "<0x7301000>")
 				.Property("pages-count", "<1>")
 				.Property("attributes", "<3>")
 			.EndChild()
@@ -1240,7 +1316,7 @@
 	ASSERT_EQ(m.vm[0].partition.rxtx.rx_buffer->base_address, 0x7300000);
 	ASSERT_EQ(m.vm[0].partition.rxtx.rx_buffer->page_count, 1);
 	ASSERT_EQ(m.vm[0].partition.rxtx.rx_buffer->attributes, 1);
-	ASSERT_EQ(m.vm[0].partition.rxtx.tx_buffer->base_address, 0x7310000);
+	ASSERT_EQ(m.vm[0].partition.rxtx.tx_buffer->base_address, 0x7301000);
 	ASSERT_EQ(m.vm[0].partition.rxtx.tx_buffer->page_count, 1);
 	ASSERT_EQ(m.vm[0].partition.rxtx.tx_buffer->attributes, 3);
 	ASSERT_EQ(m.vm[0].partition.dev_regions[0].base_address, 0x7400000);