Message ID | 20180316101517.5588-2-npiggin@gmail.com |
---|---|
State | Accepted |
Headers | show
Return-Path: <skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org> 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 402hHJ0NnJz9s82 for <incoming@patchwork.ozlabs.org>; Fri, 16 Mar 2018 21:18:04 +1100 (AEDT) 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="sixWrg0F"; 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 402hHH5MvzzDqkF for <incoming@patchwork.ozlabs.org>; Fri, 16 Mar 2018 21:18:03 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com 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="sixWrg0F"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c01::244; helo=mail-pl0-x244.google.com; envelope-from=npiggin@gmail.com; receiver=<UNKNOWN>) 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="sixWrg0F"; dkim-atps=neutral Received: from mail-pl0-x244.google.com (mail-pl0-x244.google.com [IPv6:2607:f8b0:400e:c01::244]) (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 402hDP1kV9zDrHv for <skiboot@lists.ozlabs.org>; Fri, 16 Mar 2018 21:15:33 +1100 (AEDT) Received: by mail-pl0-x244.google.com with SMTP id f23-v6so5614320plr.10 for <skiboot@lists.ozlabs.org>; Fri, 16 Mar 2018 03:15:33 -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:in-reply-to:references; bh=seVEmh/JTxjLvvy93Wz7HiLZjh7ndx34jruYIjkM1fM=; b=sixWrg0Fg94QzB0eNksG44gHqBrHG896FT3temqqT9exF+HnYN4rB9vp4T/jmlQnKU qGebos3o0ti4am4+0iAI4BDh82cfl3s1iZxO193v/kBCNRurm86mYMEQA/mctrbnBHP+ Qm2bB6I8xRlKKu5QXOoUhZ+/TMn04tHGQyiOGjxzQm+OYinZab1wKCLjnAZWmLfuPDlN 25Gg4WCnhWl3v8IBSwcoYE1h5h1BRF1DqsHZLfQj75KjnFO11bZLA+gg4GzpP0+Mthvy SoRLNDFLZoCHGZaKFNYiZXhut9acBn/XSh9ooQIRRg1zpjw26MrPZweHFXwPKoBXjIbi 7MEA== 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=seVEmh/JTxjLvvy93Wz7HiLZjh7ndx34jruYIjkM1fM=; b=UqmGRjl15Sg9+bdY3bC8QeNdY5Q+fxm2ZiYvRJlH+2u/bwQvzlFGVzkaWoE9HlqsFW S0PMUMf/LPpjWlWMLFZt+zAzR226vO/Fx1O5sxzuxZ1W4kg6Eqg3yvmIfVQ7OjtFZi12 PofHfFC5T4I6yhhrxMnrtSy9UiN03wwU+5qktPDM8AtxZ9OBjBKcY2jB2ADerEZETeuH ltyAxbatvWMx40Thp5A3evgtid0+RVcWtEwIh69x0TyTXwMwfH2PSpE9ulNWHJ3L4I9U ba4jZ9AeFA4gJYAUUuUcemf3hCEziJJRbUZYA/GyFV5+QWRlHZTOJ74kdpn/Cq5PXnKT odMQ== X-Gm-Message-State: AElRT7EevjpnGRR++0izVYifHbhd4AWSFZrDVVBsEOAo03ttoGAJ9Gad 3AttRvSwRXvzXPEGK8UeZLY0zA== X-Google-Smtp-Source: AG47ELtyNlK0j9DPhk3g4hk0Qg3OQH+N9YN8TL3EiUpuI32psTD5709APOD77Iskg2TVVR1bT1jhmQ== X-Received: by 2002:a17:902:22a:: with SMTP id 39-v6mr1539079plc.128.1521195330813; Fri, 16 Mar 2018 03:15:30 -0700 (PDT) Received: from roar.au.ibm.com (115-64-218-172.tpgi.com.au. [115.64.218.172]) by smtp.gmail.com with ESMTPSA id r18sm12667574pgd.46.2018.03.16.03.15.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Mar 2018 03:15:29 -0700 (PDT) From: Nicholas Piggin <npiggin@gmail.com> To: skiboot@lists.ozlabs.org Date: Fri, 16 Mar 2018 20:15:15 +1000 Message-Id: <20180316101517.5588-2-npiggin@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180316101517.5588-1-npiggin@gmail.com> References: <20180316101517.5588-1-npiggin@gmail.com> Subject: [Skiboot] [PATCH 1/3] core/opal: abort in case of re-entrant OPAL call X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Mailing list for skiboot development <skiboot.lists.ozlabs.org> List-Unsubscribe: <https://lists.ozlabs.org/options/skiboot>, <mailto:skiboot-request@lists.ozlabs.org?subject=unsubscribe> List-Archive: <http://lists.ozlabs.org/pipermail/skiboot/> List-Post: <mailto:skiboot@lists.ozlabs.org> List-Help: <mailto:skiboot-request@lists.ozlabs.org?subject=help> List-Subscribe: <https://lists.ozlabs.org/listinfo/skiboot>, <mailto:skiboot-request@lists.ozlabs.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" <skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org> |
Series |
improve ability for OPAL to cope with re-entry due
|
expand
|
diff --git a/core/opal.c b/core/opal.c index 9bf2ad84..e7940e7a 100644 --- a/core/opal.c +++ b/core/opal.c @@ -145,7 +145,7 @@ int64_t opal_entry_check(struct stack_frame *eframe) if (!opal_quiesce_state && cpu->in_opal_call) { printf("CPU ATTEMPT TO RE-ENTER FIRMWARE! PIR=%04lx cpu @%p -> pir=%04x token=%llu\n", mfspr(SPR_PIR), cpu, cpu->pir, token); - return OPAL_BUSY; + abort(); } again:
The stack is already destroyed by the time we get here, so there is not much point continuing. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- core/opal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)