diff mbox series

[12/18] fast-reboot: allow mambo fast reboot independent of CPU type

Message ID 20171119091508.28372-13-npiggin@gmail.com
State Superseded
Headers show
Series move direct controls out of fast-reboot, | expand

Commit Message

Nicholas Piggin Nov. 19, 2017, 9:15 a.m. UTC 
Don't tie mambo fast reboot to POWER8 CPU type.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 core/fast-reboot.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/core/fast-reboot.c b/core/fast-reboot.c
index 72a4973a..62635e17 100644
--- a/core/fast-reboot.c
+++ b/core/fast-reboot.c
@@ -324,7 +324,7 @@  static int sreset_all_others(void)
 	return OPAL_UNSUPPORTED;
 }
 
-static bool fast_reset_p8(void)
+static bool fast_reset(void)
 {
 	struct cpu_thread *cpu;
 	bool ret;
@@ -400,7 +400,8 @@  void fast_reboot(void)
 	static int fast_reboot_count = 0;
 	bool success;
 
-	if (proc_gen != proc_gen_p8) {
+	if (chip_quirk(QUIRK_MAMBO_CALLOUTS) ||
+			proc_gen != proc_gen_p8) {
 		prlog(PR_DEBUG,
 		      "RESET: Fast reboot not available on this CPU\n");
 		return;
@@ -439,7 +440,7 @@  void fast_reboot(void)
 	fast_boot_release = false;
 	sync();
 
-	success = fast_reset_p8();
+	success = fast_reset();
 
 	/* Unlock, at this point we go away */
 	unlock(&reset_lock);