[Skiboot] [PATCH] fast-reboot: Fix fast reboot

[Vasant Hegde]

Call verify_romem() after patching trap area. Otherwise our
verification fails and hence fast-reboot fails.

Fixes: 9ddc1a6b (core/util: trap based assertions)
Cc: Nicholas Piggin <npiggin at gmail.com>
Signed-off-by: Vasant Hegde <hegdevasant at linux.vnet.ibm.com>
---
 core/fast-reboot.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/fast-reboot.c b/core/fast-reboot.c
index a6c903f3c..6b68525c8 100644
--- a/core/fast-reboot.c
+++ b/core/fast-reboot.c
@@ -147,11 +147,6 @@ void fast_reboot(void)
 		return;
 	}
 
-	if (!fast_reboot_sanity_check()) {
-		opal_quiesce(QUIESCE_RESUME, -1);
-		return;
-	}
-
 	cpu_set_sreset_enable(false);
 	cpu_set_ipi_enable(false);
 
@@ -185,6 +180,12 @@ void fast_reboot(void)
 	copy_exception_vectors();
 	patch_traps(true);
 
+	/* Call sanity check after patch_traps() */
+	if (!fast_reboot_sanity_check()) {
+		opal_quiesce(QUIESCE_RESUME, -1);
+		return;
+	}
+
 	/*
 	 * Secondaries may still have an issue with machine checks if they have
 	 * HILE set because the machine check exception does not FIXUP_ENDIAN.
-- 
2.21.0