commit 5fc8be1cf04309c2b86764c238f7b23907ee8f88
author Madhukar Pappireddy <madhukar.pappireddy@arm.com> Tue Aug 03 11:42:53 2021 -0500
committer Madhukar Pappireddy <madhukar.pappireddy@arm.com> Wed Oct 20 11:58:45 2021 -0500
tree 244c7f6a0f754c01e09603010651eae3304a359a
parent 464f24629dfe098a646d7c30a14f999ee8a13336

feat(interrupts): support for parsing interrupt ..

properties node from manifest and populating the interrupt descriptor
structure per VM.

Change-Id: I17f6dcd5d4af6eb37f1bb64770052fd6e8f23542
Signed-off-by: Madhukar Pappireddy <madhukar.pappireddy@arm.com>

src/manifest.c

diff --git a/src/manifest.c b/src/manifest.c
index bd8c016..1d2d37a 100644
--- a/src/manifest.c
+++ b/src/manifest.c
@@ -430,7 +430,7 @@
 {
 	struct uint32list_iter list;
 	uint8_t i = 0;
-	uint8_t j = 0;
+	uint32_t j = 0;
 
 	dlog_verbose("  Partition Device Regions\n");
 
@@ -495,6 +495,8 @@
 				     dev_regions[i].interrupts[j].attributes);
 			j++;
 		}
+
+		dev_regions[i].interrupt_count = j;
 		if (j == 0) {
 			dlog_verbose("        Empty\n");
 		}
@@ -659,6 +661,7 @@
 	uint16_t ffa_version_minor;
 	enum manifest_return_code ret_code = MANIFEST_SUCCESS;
 	const char *error_string = "specified in manifest is unsupported";
+	uint32_t k = 0;
 
 	/* ensure that the SPM version is compatible */
 	ffa_version_major = (vm->partition.ffa_version & 0xffff0000) >>
@@ -710,6 +713,31 @@
 		ret_code = MANIFEST_ERROR_NOT_COMPATIBLE;
 	}
 
+	for (uint8_t i = 0; i < vm->partition.dev_region_count; i++) {
+		struct device_region dev_region;
+
+		dev_region = vm->partition.dev_regions[i];
+
+		if (dev_region.interrupt_count > SP_MAX_INTERRUPTS_PER_DEVICE) {
+			dlog_error(
+				"Interrupt count for device region exceeds "
+				"limit.\n");
+			ret_code = MANIFEST_ERROR_NOT_COMPATIBLE;
+			continue;
+		}
+
+		for (uint8_t j = 0; j < dev_region.interrupt_count; j++) {
+			k++;
+			if (k > VM_MANIFEST_MAX_INTERRUPTS) {
+				dlog_error(
+					"Interrupt count for VM exceeds "
+					"limit.\n");
+				ret_code = MANIFEST_ERROR_NOT_COMPATIBLE;
+				continue;
+			}
+		}
+	}
+
 	return ret_code;
 }