From 923b5a5342a7a37bd376327e35c7fcb98138d41c Mon Sep 17 00:00:00 2001 From: Oliver O'Halloran Date: Mon, 23 Sep 2019 12:23:59 +1000 Subject: [PATCH] core/platform: Actually disable fast-reboot on P8 There was an attempt. It was not successful. Fixes: 14f709b8eeda ("Disable fast-reset for POWER8") Cc: skiboot-stable@lists.ozlabs.org Signed-off-by: Oliver O'Halloran Reviewed-by: Vasant Hegde Signed-off-by: Oliver O'Halloran --- core/platform.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/platform.c b/core/platform.c index 307fe671acc0..1246f84619b4 100644 --- a/core/platform.c +++ b/core/platform.c @@ -54,13 +54,15 @@ static int64_t opal_cec_reboot(void) opal_quiesce(QUIESCE_HOLD, -1); - if (proc_gen == proc_gen_p8 && nvram_query_eq_safe("fast-reset","1")) { + if (proc_gen == proc_gen_p8) { /* * Bugs in P8 mean fast reboot isn't 100% reliable when cores * are busy, so only attempt if explicitly *enabled*. */ - fast_reboot(); - } else if (!nvram_query_eq_safe("fast-reset","0")) { + if (nvram_query_eq_safe("fast-reset", "1")) + fast_reboot(); + + } else if (!nvram_query_eq_safe("fast-reset", "0")) { /* Try fast-reset unless explicitly disabled */ fast_reboot(); }