From patchwork Mon Sep 23 02:23:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1165783 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46c7S95nnXz9s4Y for ; Mon, 23 Sep 2019 12:24:25 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kMFlCu64"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 46c7S94hWszDqMW for ; Mon, 23 Sep 2019 12:24:25 +1000 (AEST) X-Original-To: skiboot-stable@lists.ozlabs.org Delivered-To: skiboot-stable@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::544; helo=mail-pg1-x544.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kMFlCu64"; dkim-atps=neutral Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 46c7S56DkNzDqMH; Mon, 23 Sep 2019 12:24:21 +1000 (AEST) Received: by mail-pg1-x544.google.com with SMTP id w10so7111696pgj.7; Sun, 22 Sep 2019 19:24:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wB6620P5+4GfLiyZHBPpIi5qKvcGc/NTJ0hzhSyjIQw=; b=kMFlCu64geDal0nDsXavP+95Lzr0p7E2sy7ORGBPLIfvdQAnpmC7rbw2ApAQNUQCb0 ksIaFDd5l+3wM9lHkkcdCMx6nAqaOj0v9Wxf55RtsSyxkCerMcVE0KAOqFdrerqtIkFw BZFt+zdI1ccB5/W+ROSHk7+gKoj+ja3xmNWMjh2ckvdMpzIK/Nanne3ugvoCUc1LiV5M auX9oks6pP7zPZ3ObZhauUcI9JM7fWse4IaaOvC6DgknyeeAFE9FX7N/yA2yPnXyd4ex cxVZQRgOC4heObL5f9yHdMlQFTOW2tZ+DLnAjp/TucDb3rSSnDSPI+pvClZmCNbbQkE9 8RmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wB6620P5+4GfLiyZHBPpIi5qKvcGc/NTJ0hzhSyjIQw=; b=Gyn33eHMYEoxu/79F21pKeuo5TcWzdQ3h/dTQrXcmwqTZyGJm0AodqPj/LdXHxCtKi sJ72IfFTiA/lOAfeuQ4q2S1fLd4z7dNiqSCetElVNSA0CsB0Oi3NYacNe68aRmyy5R5E 0Zc7gwnNgg9bXOECloAvaGdIOJsQyEzFAatYRLTeqiNguUQtq7J2uPTaTKWz+ikf+u1w wfhYmDKa7BXq18ecIbsEEIVB9u371fNlLS3X7LA9wzbjbT9zEFws63zE7nznJ5+pbtPC OOkwgil3n5y4cC+4a+O0Wxe1FVcqQV1hJ2WWoLZCr8wHCCzHCXO+3G0w4B2Le4Wt829f bzeQ== X-Gm-Message-State: APjAAAXQ8dlviiB0VzRDiesTA1o4zK/9vPmVPdD7rOwJ5MeOEguMw4if kwOAK4vP3s0TttemdOFzNqmqzFLu X-Google-Smtp-Source: APXvYqys7mIdcF8INQpp2r98wZM6NVoe3mlJ5uw91MWOaNJbo0QIdfQLMu2hCJkyjzbP917DY9DoDQ== X-Received: by 2002:a17:90a:5aa1:: with SMTP id n30mr17934711pji.82.1569205457986; Sun, 22 Sep 2019 19:24:17 -0700 (PDT) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id x20sm11451927pfp.120.2019.09.22.19.24.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Sep 2019 19:24:17 -0700 (PDT) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Mon, 23 Sep 2019 12:23:59 +1000 Message-Id: <20190923022359.17108-1-oohall@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [Skiboot-stable] [PATCH] core/platform: Actually disable fast-reboot on P8 X-BeenThere: skiboot-stable@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Patches, review, and discussion for stable releases of skiboot" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: skiboot-stable@lists.ozlabs.org Errors-To: skiboot-stable-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot-stable" 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 --- 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(); }