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: 139740 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1548082lji; Fri, 22 Jun 2018 19:21:46 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI+Gmh5L+Fb4Wxi/Qfv3AMqZybkYbq0gyqKSb5wQmpmDR/ttKfMItvGNg6WDhEMjUn0jMCv X-Received: by 2002:a62:df9a:: with SMTP id d26-v6mr529762pfl.69.1529720506307; Fri, 22 Jun 2018 19:21:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529720506; cv=none; d=google.com; s=arc-20160816; b=yaH9t+QehmU3ojQDbi+M/GoVjK15xX6I6/k6MHsCaJ2k2B1W/WX3mzubTrlg5HEZVj kV8mqi3c0hSIP+vkIabuIqqjs2ohhL5cbZ2mctOBvkLOALUHhBz+JJeXh1zKuWhfgN6J 8Esr8p/h4XSUpyOB0UHScACvFCkJ1zi4pjHThqVjavPydUwVPx5xRtnbRV3v4Gp4UcxB VVYIXHdLyeuL9Zt1BmdNtLXzaSj4A0o/2Buo7H/IAChSM+Dvo1/JJ5SpxJxxepggtI75 RShI+CYcUYVMeiDGmLJkU5tQNdo8srHdJGqNBHUlUtgGUdPTnPIxV+oM2zLPTNFDuxfd Mt+Q== 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=nJ340mqmxoXf/PJLSX3cFS7nh7PM1wn42s3glgj/kfgyk+f0lvnZ3pwb01TbmC9V6C 4REg7a9Yte4Jg0IpXce8+0UfU07/KWLd+WmwbQAbl2savpV7eS7pMc4sDEsz3Sn+T0ya c4of/NcfxUT2F0hk1moGimYN9e91l9W/3ruhOZ6CsDl4H4xtMHKA+ZLc8OoZR9wueqBW LereGP3eOEAZOxpRI4IXNcS+fZdGAJAdSGzj4LKouBQ5a8IxzAQveXSfH8uUtoRudzno raezwk2Wo4wautaUezKAo6ksjCVyqxQcXrSBBP6ql6FvYefO99hZxPavbRM9of0KBhqQ 1z6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=X8ps66OQ; 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 m11-v6si7374029pgr.104.2018.06.22.19.21.46; Fri, 22 Jun 2018 19:21:46 -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=X8ps66OQ; 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 S934873AbeFWCVn (ORCPT + 31 others); Fri, 22 Jun 2018 22:21:43 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:39176 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934856AbeFWCVk (ORCPT ); Fri, 22 Jun 2018 22:21:40 -0400 Received: by mail-pg0-f66.google.com with SMTP id n2-v6so278872pgq.6 for ; Fri, 22 Jun 2018 19:21:40 -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=HAY3B0IvEIhIBDVNLkbHngXeEmTBIstUZQaP6k/boDXZQCEiGS0e+LnBqQKsM1B37o MWjM97RcZKsMhs31hz/chRsUOIMe3U02Zdy9ivfIQWoaE5u6y+hmKKNIahbeMaZs4oAd bJNPNt23w0yPKOTRgmtqWeviRC8Zn3qCFjGiXcrEyL/IBlAZzYQ5vn06Te4Tn3xY91ru aljs2zNi9L6+gFEGWPjx0jg5Zhaib+VLsawoVaIPtAAiL1GU3+FQ67qpTF9gDF1vLU1u 6qvrJXUXqZJ0pzvor0JdOT842N0PjpAHbtk3or8KlwUVuA+TMhSJe9R7Fkz+zI7TkGBp hMag== X-Gm-Message-State: APt69E0kM5ToYgEq1ZtubWkJGFC3zfGkKmrcgxlbMEChYphjIsu0WzfO p1PyHTpEaZTUuaGGLiPruq1aaeIU6qg= 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 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 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> 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