From patchwork Sat Jun 23 02:20:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 10483441 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2158460388 for ; Sat, 23 Jun 2018 02:38:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03CB7285DB for ; Sat, 23 Jun 2018 02:38:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA637285FD; Sat, 23 Jun 2018 02:38:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 906F9285DB for ; Sat, 23 Jun 2018 02:38:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=q/3rWrW0ev4sLGsnHDmqPdIsI9VRn7EsgIlrp+c7MjM=; b=opP/GyRzqzsD4hzhtyLVEtRhRc 2/KPQop94F3Bs//nF3gqb1Mmu91+Y41Z2aYxLP2IQYKjm2yooCOVlUbzrqU8MnBq1a+3SHrxdnb01 jQYiNhtLwfTPNxe124SD7h+K8UkDTXkRWhVyq+hRmmVXyJzi17e0FRIXKSGJoats6kFhpxLD0czbS uouEGczaat6FO7tdypLEir8GTJPuqJAj2KA8/gBSoMllgrQXqRFeI+qZWHYyM1cW0wJbXtpNIWHnY KRoXNHley6OHA38Y6tHZbsPH9jNywobhwPya+PlvnHQxe1IxmGU9ca0MK75a/GAan34GnYfW4mH+1 BADISd8g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fWYRg-0004zf-IZ; Sat, 23 Jun 2018 02:38:36 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fWYRS-0004lx-Qm for linux-arm-kernel@bombadil.infradead.org; Sat, 23 Jun 2018 02:38:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=5YjLW+YGwW426KMJWPBoWS6VSrqQYG7x4tImD9v9oZk=; b=Ca69xo0lv/qLsPV+St3dtUMYr GlZsB8dyPTazUkCSfu4/m07nI6Ew7TmBwYSy+UDQBHW5LjTvOKRjdSNhb21TquBpSk+bgbW6PC9nf wJUfvu4jDG4R5myWJNt+XZ73yj4R2J46Nk0Sl8lxnp4tbKASS0+A00kJzkjb103KR3Gc4qLMCbtiX hktGObDvhkZQ4AZq2qNvXh6HS1IOYw8U3yxEUEG7DzYGofQxTuknzzoIfbLpX8IPzrdQT9POX/AsG PSXILmDJmRfV1wuJU8hRZnFO3hMCjhHdXwf6n213eco7C/QoePsGYgACLKgu24gVwIQxmEHZBYxe4 aFuNJC0lw==; Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fWYBU-0003O5-4a for linux-arm-kernel@lists.infradead.org; Sat, 23 Jun 2018 02:21:54 +0000 Received: by mail-pg0-x242.google.com with SMTP id q4-v6so3715496pgr.1 for ; Fri, 22 Jun 2018 19:21:41 -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=X8ps66OQ92wfWwEusxSxxTiW98ETbwMxbxihZATmUlEFeKYiDGhTLmC2k5qtGd3M16 t3OMGEH5d33QW57sywRqwNneKS3oUZaoj4PmU78wakcDrnuUOAJOgfHnn8D0DxaNaJIj /7IXCXBxiDfWkIIyE4+Z682ivx3SdnQ/Iz240= 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=FDYobO7sip7rRUtViJK2P9zVgW0lBVv7JkUrPe+tXe1mCUnqaL9X0bV7dvi5lt/h4n X2gg8v7ES0kyIhuf0wLapaDJhVNWUT2IlfsnKcjeqTJQ/mhlsJ0ma/1UPNJ0nYN78lxL EQ4tnXamvTaT3bNib5zACTWnzUEahe1Xc6wWud4RdBi9ETaX+O5zk2tAwA/jzmer+f8z VdMsVFNbPP5+c6aHukeEsinBYZjj9RB6ENZ4pTK/Frd8RxIMSO75HOVlyC44O4EBm5LK Z3fHlsz8VhZYY7zrwWEmFDPV22dUQXP/BKjjlx5zyifeCvjnQ+hTgu3PwTztVUs+oGgf 3gcA== X-Gm-Message-State: APt69E2nYSWfHBenXX9JEWh3QJCJIDlqvIevOFZ1Gw16JvrrKiae0Wrq VYz2B8PMrLIIsKf2nnQgf7h8OA== X-Google-Smtp-Source: ADUXVKIjuZBC7dukPLPvIOfjfx1m70zMHqGimh4cuKAlVzyUQAMPepCIxkUI3qvrti0elGH71xUJGA== X-Received: by 2002:a63:2ac4:: with SMTP id q187-v6mr3458864pgq.333.1529720500379; Fri, 22 Jun 2018 19:21:40 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id 63-v6sm20691478pfo.1.2018.06.22.19.21.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jun 2018 19:21:39 -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 Subject: [PATCH v10 11/14] arm64: kexec_file: invoke the kernel without purgatory Date: Sat, 23 Jun 2018 11:20:55 +0900 Message-Id: <20180623022058.10935-12-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180623022058.10935-1-takahiro.akashi@linaro.org> References: <20180623022058.10935-1-takahiro.akashi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180623_032152_312884_9B772C33 X-CRM114-Status: GOOD ( 18.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ard.biesheuvel@linaro.org, bhsharma@redhat.com, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro , james.morse@arm.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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