refactor: sanity check of ff-a manifest
Function "sanity_check_ffa_manifest" is now called at the end of
function "parse_ffa_manifest" to ease further refactoring of how the
sp pkg is handled within Hafnium.
Change-Id: Ia37eb11c812953a9b44cb44709366b4be3c248ae
Signed-off-by: J-Alves <joao.alves@arm.com>
diff --git a/src/manifest.c b/src/manifest.c
index ceb4782..b514472 100644
--- a/src/manifest.c
+++ b/src/manifest.c
@@ -662,7 +662,7 @@
dlog_verbose(" Total %u device regions found\n",
vm->partition.dev_region_count);
- return MANIFEST_SUCCESS;
+ return sanity_check_ffa_manifest(vm);
}
enum manifest_return_code sanity_check_ffa_manifest(struct manifest_vm *vm)
@@ -832,6 +832,8 @@
ret = parse_ffa_manifest(&sp_fdt, vm);
if (ret != MANIFEST_SUCCESS) {
+ dlog_error("Error parsing partition manifest: %s.\n",
+ manifest_strerror(ret));
goto exit_unmap;
}
@@ -842,8 +844,6 @@
vm->partition.load_addr = sp_pkg_addr;
}
- ret = sanity_check_ffa_manifest(vm);
-
exit_unmap:
CHECK(mm_unmap(stage1_locked, sp_pkg_start, sp_pkg_end, ppool));