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: 10519045 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 5AE146028E for ; Wed, 11 Jul 2018 07:43:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B72B28756 for ; Wed, 11 Jul 2018 07:43:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3FE3628E7C; Wed, 11 Jul 2018 07:43:38 +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 DF6CC28756 for ; Wed, 11 Jul 2018 07:43:37 +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=o/TYZ9FMVMb1pT34IeZfGuM/Kl v3dS7UgRXk3Hr6+K5vz48/WX9zfRwsNgiUa22c1xMuIY+tVeqXpDQlO0bfbMspUUg9r1STjdawUMh L7iBHbUycVQBNeMpYwX5KxP4JWTiYBe3CDEqtOdMMFnsBGLh0kQZOW/iDq32fT5RMkIv98kL8xVSH WzeC+LMEHuCCfvOr7e34fMva0LAb2hXfVXu6Bed6vCUBv1Tc86BD8wSj93BYars2NS0msNO71J7H2 Q1K3fnMEZo6KNeKcq8kV1WeH79p/T99WNTKR7cvYosVskuL9MatcXIJzH/fJ4sEA/YgXO9qED4XX7 tcKYFrbQ==; 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 1fd9mg-0006NV-Ob; Wed, 11 Jul 2018 07:43:34 +0000 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fd9mP-0005gC-K7 for linux-arm-kernel@lists.infradead.org; Wed, 11 Jul 2018 07:43:31 +0000 Received: by mail-pf0-x243.google.com with SMTP id q7-v6so16768865pff.2 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=XVX48liHLBXzgz5mRPrSiWyobPL8SNCr3rsm0EXNYMsYaw1HbIT7xpGB3t8nR//EuL +FQgVA6xiBxzalXajFJTzwF8c+IPhLoAYya0ifibjMv23+2gS01nh3FI2L44YfoUQWAC oZZV2TNUHRVlprg0AaLO7dgR7D+Fn8s3xAzawXgcyYB+Q6DA0ZwFDUIYIsT6sWp82JGB krtEvbygfe3NBoykSy80IWSwDqwmPvPPUOiQjo0LQmLATuZizOSczC8dTwnQpl2I6YHy ZJVAOrs8wBqhAJIFcMPL6fSBHVn/QFYa0eBpmRhbhjmU5we8FD6/RZZ1eQPDWVuxARvF 3FhQ== X-Gm-Message-State: APt69E1i19nY7s5jo7yAQub9looT0LEqQQU8duxELPBS3ZDCqabjX5wn uPDdV5L4I8zlNg51/7RsCHWJig== X-Google-Smtp-Source: AAOMgpdGD73tVPZBcwSYCy2Wfyq1nKTiNp+2vyE2lNOfKz72hfrBpPZy/zWXjAaSDqXuQWFt+md4Hg== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180711_004317_899627_DA7A76A1 X-CRM114-Status: GOOD ( 15.28 ) 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