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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DC016C7EE2E for ; Mon, 12 Jun 2023 19:12:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6SZBYCKHEslDwgCjlQdBhDY876ctEY/oAa9UxEBFh1k=; b=ELqlV4jJ33T+xy p1Z0HbpAZ+6NmfxEc1R5V/5qCIx0rj7HS+E22EjYwjiAWNUYWf3VUQXwTxDsY6RoBIlLat2V81qZf 1pRh9DfYr1kJRRlalVGqGtbWx0yX1/rreqN48qF6ukuHr5ppnzOHkit+UIAwM9aMbRpBKlEkqXCqt 9qIC6W6uyR9DbxTINTcpXOSuaM3O6pdXX1GHewdZsDGaSDyVp8wPfUX/H3SbMLXEyhmk7nGSZ+5A9 ZvH2mFek1bdsFcnFN5rqEbr8SiqlP5w+a9aXiVqHQkcg57jRWqRlD7/tPV3vJELYnBIZHFe9EwRGZ 7miRmkE37QxwC8t7+lZQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q8mxp-0054Fk-0r; Mon, 12 Jun 2023 19:12:29 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q8mxm-0054FI-2o for linux-arm-kernel@lists.infradead.org; Mon, 12 Jun 2023 19:12:28 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5DD4961774; Mon, 12 Jun 2023 19:12:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3F31C433EF; Mon, 12 Jun 2023 19:12:23 +0000 (UTC) Date: Mon, 12 Jun 2023 20:12:21 +0100 From: Catalin Marinas To: Marc Zyngier Cc: kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Quentin Perret , Will Deacon , Fuad Tabba Subject: Re: [PATCH v3 05/17] arm64: Don't enable VHE for the kernel if OVERRIDE_HVHE is set Message-ID: References: <20230609162200.2024064-1-maz@kernel.org> <20230609162200.2024064-6-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230609162200.2024064-6-maz@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230612_121226_974607_E5C2D0BC X-CRM114-Status: GOOD ( 20.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Jun 09, 2023 at 05:21:48PM +0100, Marc Zyngier wrote: > If the OVERRIDE_HVHE SW override is set (as a precursor of > the KVM_HVHE capability), do not enable VHE for the kernel > and drop to EL1 as if VHE was either disabled or unavailable. > > Further changes will enable VHE at EL2 only, with the kernel > still running at EL1. > > Signed-off-by: Marc Zyngier > --- > arch/arm64/kernel/hyp-stub.S | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S > index 9439240c3fcf..5c71e1019545 100644 > --- a/arch/arm64/kernel/hyp-stub.S > +++ b/arch/arm64/kernel/hyp-stub.S > @@ -82,7 +82,15 @@ SYM_CODE_START_LOCAL(__finalise_el2) > tbnz x1, #0, 1f > > // Needs to be VHE capable, obviously > - check_override id_aa64mmfr1 ID_AA64MMFR1_EL1_VH_SHIFT 2f 1f x1 x2 > + check_override id_aa64mmfr1 ID_AA64MMFR1_EL1_VH_SHIFT 0f 1f x1 x2 > + > +0: // Check whether we only want the hypervisor to run VHE, not the kernel > + adr_l x1, arm64_sw_feature_override > + ldr x2, [x1, FTR_OVR_VAL_OFFSET] > + ldr x1, [x1, FTR_OVR_MASK_OFFSET] > + and x2, x2, x1 > + ubfx x2, x2, #ARM64_SW_FEATURE_OVERRIDE_HVHE, #4 > + cbz x2, 2f Reviewed-by: Catalin Marinas (I think we are trying too hard to make this look like a hardware features when a tbz would do ;)). -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel