From patchwork Sun Nov 19 09:15:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 839294 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.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yfmVS6FLWz9ryk for ; Sun, 19 Nov 2017 20:18:24 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EY2rFJr+"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3yfmVS4FH1zDrTZ for ; Sun, 19 Nov 2017 20:18:24 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EY2rFJr+"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c00::241; helo=mail-pf0-x241.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EY2rFJr+"; dkim-atps=neutral Received: from mail-pf0-x241.google.com (mail-pf0-x241.google.com [IPv6:2607:f8b0:400e:c00::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3yfmRf6KDzzDrSb for ; Sun, 19 Nov 2017 20:15:58 +1100 (AEDT) Received: by mail-pf0-x241.google.com with SMTP id a84so5112566pfl.0 for ; Sun, 19 Nov 2017 01:15:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IzO1Xo5GY+CbxaivYVGxO4ScVlHC4sfGx7JHIj77wqw=; b=EY2rFJr+iJjbRAstDeVKhXJXcJP6egMEDj1EGBfMZHPTSy7Ah3D1PJQKrJpBt/VFAy S815AJUI+B6GtJ8sxGK/hzj4UY2QE3cbqE9OiwzSXBpZ8c3vOnXWCxLxzTm5Qb0w7GE2 9kwQ+WASj0AVDyfvBznrjR7p0VL4mlBriB1riz6TOYsp4cgchr3tXwIN7565fpLLl6n3 g3J74z9lHRWgjA4jPHM0Cj9oxnxDAC8eyvlFdHbFLINotsa+QnLh2H8IlQjoYz6G+s7y Ug8eykznfZrvfxSPtTAo8eWXXNTif6td4UVl6xexlyYv/k1MU5i7gppWAirB8Jt8ReO3 y+ig== 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:in-reply-to :references; bh=IzO1Xo5GY+CbxaivYVGxO4ScVlHC4sfGx7JHIj77wqw=; b=kRkgFWCG7D1aFTP9Fs6meFJwudJHuXQbp92zUuc3jJ0o36djEPdKFv8dJ+0BUZXjtI aonA15X+hwWKqK0goOz80iyDWjLoijGQJRYcGpB0Hvgf9hbWwSFxCo9gUArBTHa5TmBG REeiBT5VUNompoMY9ScMbTpmn8fjY46jMVT7Faf8pv0fTehv/+LKfqGnU8S9diwNbgA2 UpfPVhgz4j5OFGlqNFCUSN4ZphxcljzvARwj5wMl+8CKmjPWiOvYTAdu1CInArR01mhW ZVco8HRniXKZmChZlAUjXmxBrJlu1OhIH9KSRizi3D4XOMipCgwxXt1OeD7p83sU1yKf FGAg== X-Gm-Message-State: AJaThX4QdF0NVU89uPD8ReB//EjKx/u9ehFQ5NnRW0kHHKt6b+2KgHGp 2UOjx3b+4kYjlF5fgczDbLxrxg== X-Google-Smtp-Source: AGs4zMYN/dmAp0nz4zq16irehrI7t33Tg7xmaMoT1YvOcnkjBjomXbkyxukHfqaRxoG3NZGKYlAV+g== X-Received: by 10.84.247.137 with SMTP id o9mr10609854pll.148.1511082956796; Sun, 19 Nov 2017 01:15:56 -0800 (PST) Received: from roar.au.ibm.com (27-33-241-2.tpgi.com.au. [27.33.241.2]) by smtp.gmail.com with ESMTPSA id k12sm12709621pgo.5.2017.11.19.01.15.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Nov 2017 01:15:55 -0800 (PST) From: Nicholas Piggin To: skiboot@lists.ozlabs.org Date: Sun, 19 Nov 2017 19:15:02 +1000 Message-Id: <20171119091508.28372-13-npiggin@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171119091508.28372-1-npiggin@gmail.com> References: <20171119091508.28372-1-npiggin@gmail.com> Subject: [Skiboot] [PATCH 12/18] fast-reboot: allow mambo fast reboot independent of CPU type X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Don't tie mambo fast reboot to POWER8 CPU type. Signed-off-by: Nicholas Piggin --- core/fast-reboot.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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);