From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5EAEFC4707F for ; Thu, 27 May 2021 15:06:11 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0D9976128D for ; Thu, 27 May 2021 15:06:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D9976128D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=soleen.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 89C616B0089; Thu, 27 May 2021 11:05:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 81AE46B008A; Thu, 27 May 2021 11:05:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0A2636B008C; Thu, 27 May 2021 11:05:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0178.hostedemail.com [216.40.44.178]) by kanga.kvack.org (Postfix) with ESMTP id A915D6B0089 for ; Thu, 27 May 2021 11:05:57 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 4443D181AEF1F for ; Thu, 27 May 2021 15:05:57 +0000 (UTC) X-FDA: 78187335954.14.9AF9F73 Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) by imf19.hostedemail.com (Postfix) with ESMTP id 775AD90009EB for ; Thu, 27 May 2021 15:05:46 +0000 (UTC) Received: by mail-qt1-f179.google.com with SMTP id t20so415764qtx.8 for ; Thu, 27 May 2021 08:05:55 -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=2lq6+MakGPQuirNtQQTDFwD5XrRoYT+d3t/Oh58mP4Q=; b=U1ehG/zeOWYwlR4hoxP5YnaQEmhc2GgjVwIbKmIULFiONY3PaoltZVzgCzAjQs6Cse rHgAqKTLHeMqW/YgTshpwJSBqtCRvtJiKN0ClUGwPUGhbkCYVJeGepTiTy/8wkMlvlb5 O6FMOwriPuaVqJqkKKAdoH5VSffTa2u3TOMeLapsQiGhEsbWdbrLh+ouQplarW+mf/5B gwKH5PslhIVaCy6gjfF3xuACoxFc3zACPGM4DjE44jMUaun/550UV6jajDZvbOkwpxWC Bn+T9v45T5vbIL39tsfl//beVDi5b2Jx/5wSUfXuved3P8Fn99uz79nTcDWD/wj8e3d6 WAxA== 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=2lq6+MakGPQuirNtQQTDFwD5XrRoYT+d3t/Oh58mP4Q=; b=NwFJYkU7rgPBLoHDm+TWDGSHMrggy6smr17boyvyl1/eL9RN9TD+6PuxDmQh0aGskD VcxuNLrRra05ZbL6kOAruHOHosw4b7YIX6lduwUsCT9PL/KY0TTjeE6fS1V/ICTi1KHU /K7jDllBZ9jTtrG/5rneRP+qhJ13PbP6SAKvBF4yVKshPeAq+RWsNVtPEtaIoXDCa31Z BmCSe7FqVmKKEoTyWWCnpmcvCY9Nsf0b78JgK8poJv+AGttZTr+lhVz49sLrfxxZRVCm CpiFkDuH/wvfefuS2AoF9+byxAjmzrUt60egEctTSQp3WRVz/AEtmqyrOUrNOSpEyF/e Gxrw== X-Gm-Message-State: AOAM532EPXp7D95jytf4POirtcU5+oemEym2a6SnFIKdVg4r3TIYhIr+ no9zprqj11SmgtwV4EVS3ovnlg== X-Google-Smtp-Source: ABdhPJw0pPua175hZLYTT6CqVpGguaKlKVb56ZVRDoJK9z9ajvuvB1dR7EF+lT603pTxYBhMr1txXQ== X-Received: by 2002:ac8:5e0e:: with SMTP id h14mr3514930qtx.117.1622127954155; Thu, 27 May 2021 08:05:54 -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 x10sm1447468qkh.124.2021.05.27.08.05.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 08:05:53 -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 17/18] arm64: kexec: Remove cpu-reset.h Date: Thu, 27 May 2021 11:05:25 -0400 Message-Id: <20210527150526.271941-18-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210527150526.271941-1-pasha.tatashin@soleen.com> References: <20210527150526.271941-1-pasha.tatashin@soleen.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 775AD90009EB Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=soleen.com header.s=google header.b="U1ehG/ze"; spf=pass (imf19.hostedemail.com: domain of pasha.tatashin@soleen.com designates 209.85.160.179 as permitted sender) smtp.mailfrom=pasha.tatashin@soleen.com; dmarc=none X-Rspamd-Server: rspam04 X-Stat-Signature: oe31zoakqho3f1d6j1d7hf6pt9kqxiyd X-HE-Tag: 1622127946-799760 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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/kexe= c.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 =20 +#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 =20 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" =20 /* - * __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 th= e * 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) =20 .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 ent= ry, - unsigned long arg0, - unsigned long arg1, - unsigned long arg2) -{ - typeof(__cpu_soft_restart) *restart; - - restart =3D (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/machin= e_kexec.c index afbde4bb1829..16996b568fd3 100644 --- a/arch/arm64/kernel/machine_kexec.c +++ b/arch/arm64/kernel/machine_kexec.c @@ -23,8 +23,6 @@ #include #include =20 -#include "cpu-reset.h" - /** * kexec_image_info - For debugging output. */ @@ -197,10 +195,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; =20 cpu_install_idmap(); - restart =3D (void *)__pa_symbol(function_nocfi(__cpu_soft_restart)); + restart =3D (void *)__pa_symbol(function_nocfi(cpu_soft_restart)); restart(is_hyp_callable(), kimage->start, kimage->arch.dtb_mem, 0, 0); } else { --=20 2.25.1