From patchwork Wed Jul 11 07:42:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 141678 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4800860ljj; Wed, 11 Jul 2018 00:43:10 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd6Lg0+O/v+/cy4IZIqZriqL4J6AFo2cfhkmLNihzGVTchss3+Vz4yLJX6NhS6erC/LBYFP X-Received: by 2002:a17:902:b944:: with SMTP id h4-v6mr13180304pls.157.1531294989940; Wed, 11 Jul 2018 00:43:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531294989; cv=none; d=google.com; s=arc-20160816; b=yfLv3W3V1E5m1DJX+uTmm/idSfOwem+36V1ylMjrkIyGv1Eo1bosbRMv+02jAWto8y 0roA/9NWBexMT2d4NS5dzmD/f2MAazyMLjqOqRkJ4vvCnVXI1VoVURXPYD1ExPnZAYVh QcfCgVzmGGstey7mkoGgNV95TDgHNvd3FozaTRMZh5HRpfIdR1VrRDH0vAE9a6nSQOyh FOvIEX4LJOC4Y9U+0PxAuKLGawtF/DadcOxb5vA2e2Q3XVfD9G6aTjFluLICgU2ziq0u YOi7y55HopL7+q9G8PL5sVCjVXm/1cYD2zfis1NgRYqwD4hSZ43iyxCi+Jq38yD+UfG6 G4OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=5YjLW+YGwW426KMJWPBoWS6VSrqQYG7x4tImD9v9oZk=; b=btKeV90CBOgF3wR4EE/j88LtGX7o1kIwn6v75Bpyn/ptJeAVFFOKwwCzU0qANcsNw9 ZI5uLkWESB+3ZylKAE/5OzyU9MioabABsLNxTfiZo2SzxWnTl70QoLAmM3FFE0dJTQF/ a3SYFwNf1yhDbmCs+jmh3yNYx/66chgXON1aBZwmfXHQmdfWuuQnEzO1ASg1Mo5x4Dd9 wTs3woVx6rAgRoEdKE+13aTaoZU++qXAcp6UwuBf8KNf0U2lqSDMaUXEnxWj8gufAFzw cH+k5WG3mk+GHwwOV3Rs8Tz6aAAGXeh/uAASwAUqnpLgsWfGbcfZRdBdP138RZ42yojt oSLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bOZexhkd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i13-v6si5439190pgh.642.2018.07.11.00.43.09; Wed, 11 Jul 2018 00:43:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bOZexhkd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732398AbeGKHqE (ORCPT + 22 others); Wed, 11 Jul 2018 03:46:04 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:43774 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726280AbeGKHqD (ORCPT ); Wed, 11 Jul 2018 03:46:03 -0400 Received: by mail-pf0-f196.google.com with SMTP id y8-v6so17865356pfm.10 for ; Wed, 11 Jul 2018 00:43:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5YjLW+YGwW426KMJWPBoWS6VSrqQYG7x4tImD9v9oZk=; b=bOZexhkdcZ5Jx8wKJM/Vsenfu7c8macbqO3b5wEOx3DecVIaCnLDtNFLnpU2JjDI1i /1hnYZYWqAbqQbnE5KnpJkJweTr/OgmAJNjfSNHqwqallzdDWxml/XMKsA0+W1Mej7w2 ujJ3x+L/uNdOJdgvlaNMGmd0XKks2XxtYVOKk= 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=5YjLW+YGwW426KMJWPBoWS6VSrqQYG7x4tImD9v9oZk=; b=KQZKqmmtoJgi1eNVKH93rwucE6PqykcN5/wfRYpKftED+7lCVLg7LVIGcnslZFCnl6 S8PQJJXGj1fuyxP0g6Drj7KCfKtaV3mXnsX6XyIx7Irs5T7dN1Dmo3jrYNcQjG4ENJ8W OdNMrgf+vLOnhdMz2reqpPeUddQ1F0JJpvV3XKgfNAyx3IbnZ5rZUq7fjNHTKlm/UV9R il3QlIKtKkD8rmzCdfJlLrXDcbkSwMncb2JYOZbxS1J1iser2iEXB4A7HKvw2dV5wXlN f57k1FppJ9bvDz2hz1HwQjipZRzwYyrqGwCJe6vvBCmIDJWlmv/czmbOLaTobfTvZV3g ULnw== X-Gm-Message-State: APt69E3KODbZ2ZGZ9QA8IBuvbVyTsLgyn1yj54no2UKpHoNlr6sOHqrW dqWUoeFvnJdXbO+CinFOgJK7Pw== X-Received: by 2002:a63:4763:: with SMTP id w35-v6mr25331001pgk.140.1531294987181; Wed, 11 Jul 2018 00:43:07 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id m134-v6sm29576212pga.20.2018.07.11.00.43.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jul 2018 00:43:06 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, dhowells@redhat.com, vgoyal@redhat.com, herbert@gondor.apana.org.au, davem@davemloft.net, dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de Cc: ard.biesheuvel@linaro.org, james.morse@arm.com, bhsharma@redhat.com, kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH v11 12/15] arm64: kexec_file: invoke the kernel without purgatory Date: Wed, 11 Jul 2018 16:42:00 +0900 Message-Id: <20180711074203.3019-13-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180711074203.3019-1-takahiro.akashi@linaro.org> References: <20180711074203.3019-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On arm64, purgatory would do almost nothing. So just invoke secondary kernel directly by jumping into its entry code. While, in this case, cpu_soft_restart() must be called with dtb address in the fifth argument, the behavior still stays compatible with kexec_load case as long as the argument is null. Signed-off-by: AKASHI Takahiro Reviewed-by: James Morse Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/kernel/cpu-reset.S | 8 ++++---- arch/arm64/kernel/machine_kexec.c | 12 ++++++++++-- arch/arm64/kernel/relocate_kernel.S | 3 ++- 3 files changed, 16 insertions(+), 7 deletions(-) -- 2.17.0 diff --git a/arch/arm64/kernel/cpu-reset.S b/arch/arm64/kernel/cpu-reset.S index 8021b46c9743..a2be30275a73 100644 --- a/arch/arm64/kernel/cpu-reset.S +++ b/arch/arm64/kernel/cpu-reset.S @@ -22,11 +22,11 @@ * __cpu_soft_restart(el2_switch, entry, arg0, arg1, arg2) - Helper for * cpu_soft_restart. * - * @el2_switch: Flag to indicate a swich to EL2 is needed. + * @el2_switch: Flag to indicate a switch to EL2 is needed. * @entry: Location to jump to for soft reset. - * arg0: First argument passed to @entry. - * arg1: Second argument passed to @entry. - * arg2: Third argument passed to @entry. + * arg0: First argument passed to @entry. (relocation list) + * arg1: Second argument passed to @entry.(physical kernel entry) + * arg2: Third argument passed to @entry. (physical dtb address) * * Put the CPU into the same state as it would be if it had been reset, and * branch to what would be the reset vector. It must be executed with the diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c index f76ea92dff91..830a5063e09d 100644 --- a/arch/arm64/kernel/machine_kexec.c +++ b/arch/arm64/kernel/machine_kexec.c @@ -205,10 +205,18 @@ void machine_kexec(struct kimage *kimage) * uses physical addressing to relocate the new image to its final * position and transfers control to the image entry point when the * relocation is complete. + * In kexec case, kimage->start points to purgatory assuming that + * kernel entry and dtb address are embedded in purgatory by + * userspace (kexec-tools). + * In kexec_file case, the kernel starts directly without purgatory. */ - cpu_soft_restart(kimage != kexec_crash_image, - reboot_code_buffer_phys, kimage->head, kimage->start, 0); + reboot_code_buffer_phys, kimage->head, kimage->start, +#ifdef CONFIG_KEXEC_FILE + kimage->arch.dtb_mem); +#else + 0); +#endif BUG(); /* Should never get here. */ } diff --git a/arch/arm64/kernel/relocate_kernel.S b/arch/arm64/kernel/relocate_kernel.S index f407e422a720..95fd94209aae 100644 --- a/arch/arm64/kernel/relocate_kernel.S +++ b/arch/arm64/kernel/relocate_kernel.S @@ -32,6 +32,7 @@ ENTRY(arm64_relocate_new_kernel) /* Setup the list loop variables. */ + mov x18, x2 /* x18 = dtb address */ mov x17, x1 /* x17 = kimage_start */ mov x16, x0 /* x16 = kimage_head */ raw_dcache_line_size x15, x0 /* x15 = dcache line size */ @@ -107,7 +108,7 @@ ENTRY(arm64_relocate_new_kernel) isb /* Start new image. */ - mov x0, xzr + mov x0, x18 mov x1, xzr mov x2, xzr mov x3, xzr