[Skiboot-stable] [PATCH] core/platform: Actually disable fast-reboot on P8

[Oliver O'Halloran]

On Mon, Sep 23, 2019 at 12:24 PM Oliver O'Halloran <oohall at gmail.com> wrote:
>
> There was an attempt. It was not successful.

merged as of 923b5a5342a7

>
> Fixes: 14f709b8eeda ("Disable fast-reset for POWER8")
> Cc: skiboot-stable at lists.ozlabs.org
> Signed-off-by: Oliver O'Halloran <oohall at gmail.com>
> ---
>  core/platform.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/core/platform.c b/core/platform.c
> index afa00adf7157..157d8f0229cd 100644
> --- a/core/platform.c
> +++ b/core/platform.c
> @@ -59,13 +59,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();
>         }
> --
> 2.21.0
>