Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp1954272pxy; Mon, 2 Aug 2021 15:00:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBedstbqsz4K+bgDIiTCEKUtZIO6OYCDB6m7S9is5aI7ScAmUlWfk0NLkOmk2URXBaW6VF X-Received: by 2002:a17:907:3345:: with SMTP id yr5mr17342670ejb.542.1627941602730; Mon, 02 Aug 2021 15:00:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627941602; cv=none; d=google.com; s=arc-20160816; b=KYMdOzgcvY/hFMavEyzCCr56wfxVU8UWaob74ZsmWbF3uJ0b/ZCznW3NH1wcd9XNEF LtU85k57waGEGDNODZoWZeQ05SXjvznYjYXiQF6Z4F7je/hxZjt9nDuGPcBtKxQm88W3 VpqDxnHXpYBPmh72VxF2jPn9lSMxT7lIdOZOcwKlySuUKMp2a8cTrXLVVgSEfx+XrwGL SclwBh4/pQEG22ORQa+D+zBQsR/hAwmlAPv0ySe0tSaoV6C3GIvqiQdyHkMnIdRREp3O A+mtwM7CkAhzX5IubYupRWSkBIMQMwUiXxgKp2S/4aOBkUvfjKDh80vBgFGf4QX2yxVz qHxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=O89Po0drPUY9w7yyZAa+dEG9G9+uNuq122i+2KNLn6I=; b=l/lfF5QgNwVk5TBPbOwiIAppCc3bSZhJyWWTvzX32YSVj2cAulIUM4bCyIXiZkuyZU NURV1Btdnqw/ESemfHtDID/v91gxBAciCthHlCTRd8D0HC+/rWqj5pV5dC6QEOOy4llx JubDseb4YY1bdSggfbweWaH/0Ee+N+yUvbSLm4KtDqqJo1NBWB9oTmZRDy5Vx/Rtxt0b LS1Vo0oCvpJcuKihHIKZZitNUt93YzmgcGePFG4Cij7f+Ik+XKGIwDu4dT88u/elyfm7 0x6mSrKTa1yQE3Qd32q+L2tnzKuXkG4jgaykg/pEvvLb42RDD4AO5U0vC4N2oonEqsYD QISg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@soleen.com header.s=google header.b=AhhJGOFC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t15si12063971ejx.715.2021.08.02.14.59.39; Mon, 02 Aug 2021 15:00:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@soleen.com header.s=google header.b=AhhJGOFC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233625AbhHBVzU (ORCPT + 99 others); Mon, 2 Aug 2021 17:55:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233018AbhHBVyq (ORCPT ); Mon, 2 Aug 2021 17:54:46 -0400 Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EEF3C06179C for ; Mon, 2 Aug 2021 14:54:31 -0700 (PDT) Received: by mail-qk1-x733.google.com with SMTP id e14so579743qkg.3 for ; Mon, 02 Aug 2021 14:54:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=O89Po0drPUY9w7yyZAa+dEG9G9+uNuq122i+2KNLn6I=; b=AhhJGOFC0mCf92dgLqLR23/WMp6qpg0D29roEbUTuAhmrsZjB5M8IFHXczuIzmBDPJ 4wg/JT6123cHq8KXyq2mjDiNfi2Ny+l/PrX8tweyH0P2p/n+aTS4EC20NW1zZbTSMkGK d4h4MQU6Ne6Fsr4v0Eu4aq6eoljx1Dj8OdSJ/KVrTrpg0YA7vuDLNygKeFexVNckt6nc uJrDQ7/q9xlRiESlJ0p/8YMYgzvW4jX1ks60Nj29fUiXCdqS+2O+bvuMRkE+E4nlMmGH a5roi/phQ5pvHqDJ2bMyGuM5g8qvx+SxTm7GCeBy/by+vwGuk+itmOn8SwqJBdV1RcTZ 8l+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O89Po0drPUY9w7yyZAa+dEG9G9+uNuq122i+2KNLn6I=; b=DmWQdhEvUT1gOd+dnnhjz5/KHhRSbZHL0j2QKV6tYYnF7zTfPZqzoc2YnOkGc2/iwL tzG2eb4kTLqcdyxkX9+SCj0BCpzuDkay60qI/Nup41/MCqZulK6853ynnDU9zbx6dJ0d l3URMIg8be4q0ywZ6nJRpapsuKG/ffv2LxldYUAlWsUuAaW1K+srJlQ4eu1JR02Nf0Q9 1wKfE5YIpjwgmHdjJr2EbqXn/W++pwBbSGIk39Ql0eoB60aVw2QPOiYQ/yGCgplpXIea LYB9XOL9USMWjz4WJ6kvwbw56wvB8VaoR4fovNRGrVe8TYtx0YDRmBNHckogyeWzX8cD UpeA== X-Gm-Message-State: AOAM531qdg9ozkx12RzQrV9DQ9wlHJnciZLZ9pMZwVxWG6Ml2/Wyh6+P yyTAQIbwZZjmbopZrUJBa6k+mQ== X-Received: by 2002:a37:a5c4:: with SMTP id o187mr17607427qke.179.1627941270295; Mon, 02 Aug 2021 14:54:30 -0700 (PDT) Received: from localhost.localdomain (c-73-69-118-222.hsd1.nh.comcast.net. [73.69.118.222]) by smtp.gmail.com with ESMTPSA id v11sm5479216qtc.0.2021.08.02.14.54.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 14:54:29 -0700 (PDT) From: Pavel Tatashin To: pasha.tatashin@soleen.com, jmorris@namei.org, sashal@kernel.org, ebiederm@xmission.com, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, corbet@lwn.net, catalin.marinas@arm.com, will@kernel.org, linux-arm-kernel@lists.infradead.org, maz@kernel.org, james.morse@arm.com, vladimir.murzin@arm.com, matthias.bgg@gmail.com, linux-mm@kvack.org, mark.rutland@arm.com, steve.capper@arm.com, rfontana@redhat.com, tglx@linutronix.de, selindag@gmail.com, tyhicks@linux.microsoft.com, kernelfans@gmail.com, akpm@linux-foundation.org, madvenka@linux.microsoft.com Subject: [PATCH v16 14/15] arm64: kexec: remove cpu-reset.h Date: Mon, 2 Aug 2021 17:54:07 -0400 Message-Id: <20210802215408.804942-15-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210802215408.804942-1-pasha.tatashin@soleen.com> References: <20210802215408.804942-1-pasha.tatashin@soleen.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This header contains only cpu_soft_restart() which is never used directly anymore. So, remove this header, and rename the helper to be cpu_soft_restart(). Suggested-by: James Morse Signed-off-by: Pavel Tatashin --- arch/arm64/include/asm/kexec.h | 6 ++++++ arch/arm64/kernel/cpu-reset.S | 7 +++---- arch/arm64/kernel/cpu-reset.h | 30 ------------------------------ arch/arm64/kernel/machine_kexec.c | 6 ++---- 4 files changed, 11 insertions(+), 38 deletions(-) delete mode 100644 arch/arm64/kernel/cpu-reset.h diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h index dca6dedc3b25..9839bfc163d7 100644 --- a/arch/arm64/include/asm/kexec.h +++ b/arch/arm64/include/asm/kexec.h @@ -90,6 +90,12 @@ static inline void crash_prepare_suspend(void) {} static inline void crash_post_resume(void) {} #endif +#if defined(CONFIG_KEXEC_CORE) +void cpu_soft_restart(unsigned long el2_switch, unsigned long entry, + unsigned long arg0, unsigned long arg1, + unsigned long arg2); +#endif + #define ARCH_HAS_KIMAGE_ARCH struct kimage_arch { diff --git a/arch/arm64/kernel/cpu-reset.S b/arch/arm64/kernel/cpu-reset.S index d47ff63a5b66..48a8af97faa9 100644 --- a/arch/arm64/kernel/cpu-reset.S +++ b/arch/arm64/kernel/cpu-reset.S @@ -16,8 +16,7 @@ .pushsection .idmap.text, "awx" /* - * __cpu_soft_restart(el2_switch, entry, arg0, arg1, arg2) - Helper for - * cpu_soft_restart. + * cpu_soft_restart(el2_switch, entry, arg0, arg1, arg2) * * @el2_switch: Flag to indicate a switch to EL2 is needed. * @entry: Location to jump to for soft reset. @@ -29,7 +28,7 @@ * branch to what would be the reset vector. It must be executed with the * flat identity mapping. */ -SYM_CODE_START(__cpu_soft_restart) +SYM_CODE_START(cpu_soft_restart) mov_q x12, INIT_SCTLR_EL1_MMU_OFF pre_disable_mmu_workaround /* @@ -48,6 +47,6 @@ SYM_CODE_START(__cpu_soft_restart) mov x1, x3 // arg1 mov x2, x4 // arg2 br x8 -SYM_CODE_END(__cpu_soft_restart) +SYM_CODE_END(cpu_soft_restart) .popsection diff --git a/arch/arm64/kernel/cpu-reset.h b/arch/arm64/kernel/cpu-reset.h deleted file mode 100644 index 296abbac7192..000000000000 --- a/arch/arm64/kernel/cpu-reset.h +++ /dev/null @@ -1,30 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * CPU reset routines - * - * Copyright (C) 2015 Huawei Futurewei Technologies. - */ - -#ifndef _ARM64_CPU_RESET_H -#define _ARM64_CPU_RESET_H - -#include - -void __cpu_soft_restart(unsigned long el2_switch, unsigned long entry, - unsigned long arg0, unsigned long arg1, unsigned long arg2); - -static inline void __noreturn __nocfi cpu_soft_restart(unsigned long entry, - unsigned long arg0, - unsigned long arg1, - unsigned long arg2) -{ - typeof(__cpu_soft_restart) *restart; - - restart = (void *)__pa_symbol(function_nocfi(__cpu_soft_restart)); - - cpu_install_idmap(); - restart(0, entry, arg0, arg1, arg2); - unreachable(); -} - -#endif diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c index b1856f34cc51..6f1da3fd5320 100644 --- a/arch/arm64/kernel/machine_kexec.c +++ b/arch/arm64/kernel/machine_kexec.c @@ -24,8 +24,6 @@ #include #include -#include "cpu-reset.h" - /** * kexec_image_info - For debugging output. */ @@ -201,10 +199,10 @@ void machine_kexec(struct kimage *kimage) * In kexec_file case, the kernel starts directly without purgatory. */ if (kimage->head & IND_DONE) { - typeof(__cpu_soft_restart) *restart; + typeof(cpu_soft_restart) *restart; cpu_install_idmap(); - restart = (void *)__pa_symbol(function_nocfi(__cpu_soft_restart)); + restart = (void *)__pa_symbol(function_nocfi(cpu_soft_restart)); restart(is_hyp_nvhe(), kimage->start, kimage->arch.dtb_mem, 0, 0); } else { -- 2.25.1