| Message ID | 1445327907-23274-2-git-send-email-takahiro.akashi@linaro.org |
|---|---|
| State | New |
| Headers | show
Return-Path: <patchwork-forward+bncBC2PLDH7WAKRBTHJS6YQKGQE5WGACTQ@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lf0-f69.google.com (mail-lf0-f69.google.com [209.85.215.69]) by patches.linaro.org (Postfix) with ESMTPS id 022AC22EA2 for <linaro@patches.linaro.org>; Tue, 20 Oct 2015 08:01:18 +0000 (UTC) Received: by lffv3 with SMTP id v3sf1396559lff.1 for <linaro@patches.linaro.org>; Tue, 20 Oct 2015 01:01:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:cc:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=JOCds5VNCe2xwMEt+PBFrpVlZd0dUkDhy+5pUmvUbfs=; b=EET8QYqL1NUYRXOK8tl2XNaz68v2cxpWMeH6vYBnyTiBr9zYzrkuX+CdJ3WmGkOehn LQSl7qTjjaAjkU+SztSjADfaQSvs0gaAL+Yq2sR173PoKjSO5ZngizQwOHDzPd67Xegx YEo2Fx+qLCQEC4Zem8rBfIlmlgPiOpxg/lZXnF9IA3/7feqzrv0ydfH5TrfT1lys1uF2 pitoC3eepElLGX6GaywFoNfzDLbBPt8vy9pQMD0BYDVjJ01NioJ/Jvu2z+QoIPz972l7 9Ivxsf65UZmAVoJqznbbMebhya8j/7bno5D6qTMV3AleXw2JxtrJxHekPNkA8XIqrHC7 R7YQ== X-Gm-Message-State: ALoCoQnh+Vt0I4GT9cuAGQZO59TTQVQPDvRhqtupePT45oH+79fx7qhl87xYr2THU+IK886R1H3a X-Received: by 10.112.54.197 with SMTP id l5mr326262lbp.21.1445328076930; Tue, 20 Oct 2015 01:01:16 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.162.139 with SMTP id l133ls34541lfe.46.gmail; Tue, 20 Oct 2015 01:01:16 -0700 (PDT) X-Received: by 10.112.62.232 with SMTP id b8mr902417lbs.27.1445328076799; Tue, 20 Oct 2015 01:01:16 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id m62si1323270lfe.109.2015.10.20.01.01.16 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Oct 2015 01:01:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by lbcao8 with SMTP id ao8so8950805lbc.3 for <patchwork-forward@linaro.org>; Tue, 20 Oct 2015 01:01:16 -0700 (PDT) X-Received: by 10.112.135.9 with SMTP id po9mr951300lbb.56.1445328076641; Tue, 20 Oct 2015 01:01:16 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1921367lbq; Tue, 20 Oct 2015 01:01:15 -0700 (PDT) X-Received: by 10.107.151.81 with SMTP id z78mr2147180iod.63.1445328075733; Tue, 20 Oct 2015 01:01:15 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id l103si1782430iod.154.2015.10.20.01.01.15 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Oct 2015 01:01:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZoRq0-0005UX-TB; Tue, 20 Oct 2015 08:00:04 +0000 Received: from mail-pa0-f47.google.com ([209.85.220.47]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZoRpx-0005Du-QQ for linux-arm-kernel@lists.infradead.org; Tue, 20 Oct 2015 08:00:02 +0000 Received: by pacfv9 with SMTP id fv9so14411194pac.3 for <linux-arm-kernel@lists.infradead.org>; Tue, 20 Oct 2015 00:59:40 -0700 (PDT) X-Received: by 10.68.89.33 with SMTP id bl1mr2404322pbb.139.1445327980098; Tue, 20 Oct 2015 00:59:40 -0700 (PDT) Received: from localhost.localdomain (61-205-5-101m5.grp1.mineo.jp. [61.205.5.101]) by smtp.googlemail.com with ESMTPSA id mk5sm2108500pab.44.2015.10.20.00.59.35 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Oct 2015 00:59:38 -0700 (PDT) From: AKASHI Takahiro <takahiro.akashi@linaro.org> To: catalin.marinas@arm.com, will.deacon@arm.com, geoff@infradead.org, marc.zyngier@arm.com Subject: [PATCH 1/2] fixup! arm64: kdump: implement machine_crash_shutdown() Date: Tue, 20 Oct 2015 16:58:26 +0900 Message-Id: <1445327907-23274-2-git-send-email-takahiro.akashi@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445327907-23274-1-git-send-email-takahiro.akashi@linaro.org> References: <1445327907-23274-1-git-send-email-takahiro.akashi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151020_010002_025057_EA14147E X-CRM114-Status: GOOD ( 13.58 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.47 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.220.47 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: mark.rutland@arm.com, kexec@lists.infradead.org, AKASHI Takahiro <takahiro.akashi@linaro.org>, broonie@kernel.org, david.griego@linaro.org, christoffer.dall@linaro.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: takahiro.akashi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 |
diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c index 0edb7ee..d14dd05 100644 --- a/arch/arm64/kernel/machine_kexec.c +++ b/arch/arm64/kernel/machine_kexec.c @@ -271,7 +271,7 @@ static void soft_restart(unsigned long addr) { setup_mm_for_reboot(); cpu_soft_restart(virt_to_phys(cpu_reset), addr, - is_hyp_mode_available()); + (in_crash_kexec ? 0 : is_hyp_mode_available())); BUG(); /* Should never get here. */ }
Without this patch, crash dump kernel won't be able to boot if a kvm guest is running at crash. This is because we don't have any chance to reset EL2 mode at crash and so "switch to EL2" in cpu_reset fails. Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> --- arch/arm64/kernel/machine_kexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)