diff options
| author | Oliver O'Halloran <oohall@gmail.com> | 2019-09-23 12:23:59 +1000 |
|---|---|---|
| committer | Oliver O'Halloran <oohall@gmail.com> | 2019-10-03 09:55:58 +1000 |
| commit | 923b5a5342a7a37bd376327e35c7fcb98138d41c (patch) | |
| tree | 95dde710d61168ec9a7627ff635f5bf4a0a4c047 | |
| parent | 7066a9c2f3173d79e1c59784d693f26c0e92ebb8 (diff) | |
| download | skiboot-923b5a5342a7a37bd376327e35c7fcb98138d41c.zip skiboot-923b5a5342a7a37bd376327e35c7fcb98138d41c.tar.gz skiboot-923b5a5342a7a37bd376327e35c7fcb98138d41c.tar.bz2 | |
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 <oohall@gmail.com>
Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
| -rw-r--r-- | core/platform.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/platform.c b/core/platform.c index 307fe67..1246f84 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(); } |