commit 7d8534576383fe447a898ac10370071ed6d7d8a3
author David Brazdil <dbrazdil@google.com> Thu Sep 12 10:07:36 2019 +0100
committer David Brazdil <dbrazdil@google.com> Thu Sep 12 12:45:54 2019 +0100
tree f1f4cefd1383efb1013fb9db33fc4b759ff64826
parent 4e6bcc7743c524cf4585cf7b2a34bd84b408ea23

Panic when boot_flow_init() failed

Small oversight from CL Ieae7fe4ef5b3047174ec0ad057e487660ccd5a03.
Hafnium would continue to execute even if it could not parse the FDT.
Add a panic() in the caller to correct it.

Also fix a dlog message missing a newline.

Bug: 117551352
Change-Id: I9024800232013f92431db173315dfd379081d7f9

src/cpu.c

diff --git a/src/cpu.c b/src/cpu.c
index 43efa26..ea66af2 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -105,7 +105,7 @@
 
 	if (!found_boot_cpu) {
 		/* Boot CPU was initialized but with wrong ID. */
-		dlog("Boot CPU's ID not found in config.");
+		dlog("Boot CPU's ID not found in config.\n");
 		cpus[0].id = boot_cpu_id;
 	}
 }

src/main.c

diff --git a/src/main.c b/src/main.c
index 4b2c5b3..9b81be5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -76,7 +76,9 @@
 
 	mm_stage1_locked = mm_lock_stage1();
 
-	boot_flow_init(mm_stage1_locked, &manifest, &params, &ppool);
+	if (!boot_flow_init(mm_stage1_locked, &manifest, &params, &ppool)) {
+		panic("Could not parse data from FDT.");
+	}
 
 	cpu_module_init(params.cpu_ids, params.cpu_count);