Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp1952647pxy; Mon, 2 Aug 2021 14:56:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdlRqL4jvGybL0hUdh1/5U7cw4kC1GcbZb5jK+lZn0WES4V1qH9MTvgsbfaqfNBT+Ym2HZ X-Received: by 2002:a17:906:5283:: with SMTP id c3mr18441767ejm.458.1627941364540; Mon, 02 Aug 2021 14:56:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627941364; cv=none; d=google.com; s=arc-20160816; b=Jj5W0di34OoMwzpgWmo5R8BI49pUBWT4Ilg53ZUAo7mUc2Prqh2K80/mMTS+pWZJUn ANfkDDEuH8UJlORPUFJRpyfGglTmt9GjK6opG1AwLseB8NRuICYqxrTJ0wiYvoqlSY1t tmySoHfjbKCkesC8i7BlecyH7BJ13PvMfo/UmZ2BYw1YlRVXVc5OTQ63VWvOpnhn/MXj EDNNp0El30Axf+lnfWQ54Rd0httyK36nt512YDweFPbFZIEmt9ujn6oqccaDOM4OYij9 XIwinNiNIL9l1t6ZZlR4aEhXONpnALTa07ALXS7EJ16rOJt7KBRAj1fuZmrJB9HHR6UT 0v1g== 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=gpKUHaMAwkHB+q+UElCl69jZKnxiURz6Ucy0xkR2ELY=; b=ZMgLq8dBmPcAKj+xRP6ovTEfPA9vN+WkEpKgPKOINIh5LPHaTApSJEYL2S37QjM3En yn25CJ6uJ+sBPrmtSSsolm5UekvwiY5bwPVNqnNNQL2zQGWrGlITbBP0+qC2hrY+Ngmu FaeM292NAkJcSkRFquJViW91Mm3bPh+pDFJ5Wf48dudagNmFf4eKaVvGDs7IlvNW75Ef jfwUkbBUWJp/f9N9tjjUv94ntxMaHZyLj5+LTRaj1jAdAjG8JazIa+NmQ68oA+iH4pSq 6Xd03BggW8pYhXZOa1UPY53H0MqYF/BZK+Bzs9FFJ6/e1UrEjIeIVtxZc5JHFj3fOfxK 9shw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@soleen.com header.s=google header.b=mmGBEfnF; 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 hz19si10970058ejc.69.2021.08.02.14.55.40; Mon, 02 Aug 2021 14:56:04 -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=mmGBEfnF; 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 S232695AbhHBVyZ (ORCPT + 99 others); Mon, 2 Aug 2021 17:54:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232532AbhHBVyX (ORCPT ); Mon, 2 Aug 2021 17:54:23 -0400 Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54318C06175F for ; Mon, 2 Aug 2021 14:54:13 -0700 (PDT) Received: by mail-qk1-x72c.google.com with SMTP id c18so18143137qke.2 for ; Mon, 02 Aug 2021 14:54:13 -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=gpKUHaMAwkHB+q+UElCl69jZKnxiURz6Ucy0xkR2ELY=; b=mmGBEfnF9oZBlRuZblnuO8IgGciEd2V3OTlp4jdC//Y9f0WVpenL/OBOeVgveoRMwK wGT90RC7SKYswp9xlxMNjNoEZxUXiYv1oApAYHpcxpWe8tf6N4lQTVgE2Rl8MF1Jhwak IwElBw5j6ZSZWrGaDF64dNenVk8adI9vzpmEdI1vCNgmblGrXwAif7ZQ8wWR87WigxCn MN3qDKfl2RADG4h1zeg2WiGTzf7ZyIXlFU6DWq3NQO/zuQkkRfp581JDmFTlPmXrnmFP zxFEB75mCaToQgA6HJeeqdFJTs3x8N1jTVfZxqyMvfo/U22dsK/mdxKjhxQpuWjj5f6V Sjvw== 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=gpKUHaMAwkHB+q+UElCl69jZKnxiURz6Ucy0xkR2ELY=; b=fcuHiP3Coe/pr4L636Bq3mJGNIHDDp3+D+2zSLo7nE27KWTqCFM4chAxwFWDQwUAR1 64d4PpE+tBv/Ja5tKm7t1vyuHKsuTfa+mrwLM19bDbTyhUWVied1CbLHmNZSKnDUaAY4 5Pbl2uUlvN5gNW16edHzc9rrKYBoCBo6jvKy86oFUHhsA8wf9FdE2lpIScUAOnfrUmDC 7LWqYLaVFSeKbNccWMeLqu0JNodeimiVwGwBEEReS0j2V9i+AD5J/rirqznE7ozU92fN bkv08xgS5SgHSLAzmDZihSfsPtIQEtuLFtvsNrPJJ0I4HxRYCGukbjK/JG/cXqAzSzDt 8pSw== X-Gm-Message-State: AOAM531SmRtg8/YkdLPp0Jge+ey84Cf2luxsvKg+v2EJzkO/FttOMKhu AnjlXM9qPntHH4vXuukBYR+7eA== X-Received: by 2002:a37:a058:: with SMTP id j85mr12147273qke.471.1627941252530; Mon, 02 Aug 2021 14:54:12 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 14:54:12 -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 01/15] arm64: kernel: add helper for booted at EL2 and not VHE Date: Mon, 2 Aug 2021 17:53:54 -0400 Message-Id: <20210802215408.804942-2-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 Replace places that contain logic like this: is_hyp_mode_available() && !is_kernel_in_hyp_mode() With a dedicated boolean function is_hyp_nvhe(). This will be needed later in kexec in order to sooner switch back to EL2. Suggested-by: James Morse Signed-off-by: Pavel Tatashin --- arch/arm64/include/asm/virt.h | 5 +++++ arch/arm64/kernel/cpu-reset.h | 3 +-- arch/arm64/kernel/hibernate.c | 2 +- arch/arm64/kernel/sdei.c | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h index 7379f35ae2c6..a9457e96203c 100644 --- a/arch/arm64/include/asm/virt.h +++ b/arch/arm64/include/asm/virt.h @@ -128,6 +128,11 @@ static __always_inline bool is_protected_kvm_enabled(void) return cpus_have_final_cap(ARM64_KVM_PROTECTED_MODE); } +static inline bool is_hyp_nvhe(void) +{ + return is_hyp_mode_available() && !is_kernel_in_hyp_mode(); +} + #endif /* __ASSEMBLY__ */ #endif /* ! __ASM__VIRT_H */ diff --git a/arch/arm64/kernel/cpu-reset.h b/arch/arm64/kernel/cpu-reset.h index 9a7b1262ef17..81b3d0fe7a63 100644 --- a/arch/arm64/kernel/cpu-reset.h +++ b/arch/arm64/kernel/cpu-reset.h @@ -20,8 +20,7 @@ static inline void __noreturn __nocfi cpu_soft_restart(unsigned long entry, { typeof(__cpu_soft_restart) *restart; - unsigned long el2_switch = !is_kernel_in_hyp_mode() && - is_hyp_mode_available(); + unsigned long el2_switch = is_hyp_nvhe(); restart = (void *)__pa_symbol(function_nocfi(__cpu_soft_restart)); cpu_install_idmap(); diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c index 46a0b4d6e251..4c9533f4c0c4 100644 --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -49,7 +49,7 @@ extern int in_suspend; /* Do we need to reset el2? */ -#define el2_reset_needed() (is_hyp_mode_available() && !is_kernel_in_hyp_mode()) +#define el2_reset_needed() (is_hyp_nvhe()) /* temporary el2 vectors in the __hibernate_exit_text section. */ extern char hibernate_el2_vectors[]; diff --git a/arch/arm64/kernel/sdei.c b/arch/arm64/kernel/sdei.c index 47f77d1234cb..d20620a1c51a 100644 --- a/arch/arm64/kernel/sdei.c +++ b/arch/arm64/kernel/sdei.c @@ -202,7 +202,7 @@ unsigned long sdei_arch_get_entry_point(int conduit) * dropped to EL1 because we don't support VHE, then we can't support * SDEI. */ - if (is_hyp_mode_available() && !is_kernel_in_hyp_mode()) { + if (is_hyp_nvhe()) { pr_err("Not supported on this hardware/boot configuration\n"); goto out_err; } -- 2.25.1