From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B36BE1D5AA0; Thu, 20 Feb 2025 15:34:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740065692; cv=none; b=W4V2/FHUg7NLikYlJ/fLdRFS/ap0+g/Tgh4S9FibXDBwKqFF+JSqcCBLoI3Z7HEWiC4HamaqGFBUFJWZQntP4Rbk6tstSezi2oAATU7EYhfYlx3LPltz6px05NnXFqnJHioKf6N8V8vAZanZeWAWx16+qTlOwUecwrieYa4Icr4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740065692; c=relaxed/simple; bh=ccXvnfX2hSpdEAMuKnx2TrENdrP/yxjQUKZq2MkVuk0=; h=Date:Message-ID:From:To:Cc:Subject:In-Reply-To:References: MIME-Version:Content-Type; b=gX7pIPLi1sUjk4PJE4sa+ixBliTYUTSYSAK/ADGaO1OOAGOU0NxzymUeue4bGcOPxB35yXjEpK+xDSQEy1bf+pCkSJDHt5+TZ5LJKesZls0cD52FNpMUW0buMYplLNqxs5gOVI2zm4If81B47oQtRUEtA7CbWimsARk2HZVB4V0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aq+W4kP5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="aq+W4kP5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A9D1C4CED1; Thu, 20 Feb 2025 15:34:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740065692; bh=ccXvnfX2hSpdEAMuKnx2TrENdrP/yxjQUKZq2MkVuk0=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=aq+W4kP5gkC4VW/u1lU879F/SMxPkvamxTxTnd/v5SmR5ZqI9QZ8PjlR0+u4UQL5Y d7BONj6pRzBp5ZhHSK58xrsFR4/I93BHK0TrMkjNYu6X6rW0B5zyb+HmbIk6YkLp/S quBd00eBz6tHFiIQ8M1fAw49RF4STvKt/HK/5HysB/2xMwU7OUJqocidIfTqJselq7 DX8XTpbgKMeBRm3tPV6HC855YfFcWQmIg6DEd3ataUXV4yqlnjXFmMFc/b3fNhEihj QO4NI/lfBoMxt1aQ1vxWn8OKNGIxnRh4lM2PQtoNAkHD8jXsF6J31xMH69NWuyT8AB mhEps+KRF4q+Q== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1tl8Zd-006G4V-Ps; Thu, 20 Feb 2025 15:34:50 +0000 Date: Thu, 20 Feb 2025 15:34:49 +0000 Message-ID: <86seo8r5nq.wl-maz@kernel.org> From: Marc Zyngier To: Joey Gouly Cc: kvm@vger.kernel.org, alexandru.elisei@arm.com, drjones@redhat.com, kvmarm@lists.linux.dev, Oliver Upton Subject: Re: [kvm-unit-tests PATCH v1 7/7] arm64: run at EL2 if supported In-Reply-To: <20250220141354.2565567-8-joey.gouly@arm.com> References: <20250220141354.2565567-1-joey.gouly@arm.com> <20250220141354.2565567-8-joey.gouly@arm.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/29.4 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: joey.gouly@arm.com, kvm@vger.kernel.org, alexandru.elisei@arm.com, drjones@redhat.com, kvmarm@lists.linux.dev, oliver.upton@linux.dev X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false On Thu, 20 Feb 2025 14:13:54 +0000, Joey Gouly wrote: > > If VHE is supported, continue booting at EL2, otherwise continue booting at > EL1. > > Signed-off-by: Joey Gouly > --- > arm/cstart64.S | 28 ++++++++++++++++++++++++++++ > lib/arm64/asm/sysreg.h | 5 +++++ > 2 files changed, 33 insertions(+) > > diff --git a/arm/cstart64.S b/arm/cstart64.S > index 3a305ad0..2a15c03d 100644 > --- a/arm/cstart64.S > +++ b/arm/cstart64.S > @@ -68,6 +68,20 @@ reloc_done: > mrs x4, CurrentEL > cmp x4, CurrentEL_EL2 > b.ne 1f > + /* EL2 setup */ > + mrs x4, mpidr_el1 > + msr vmpidr_el2, x4 > + mrs x4, midr_el1 > + msr vpidr_el2, x4 > + /* check VHE is supported */ > + mrs x4, ID_AA64MMFR1_EL1 > + ubfx x4, x4, ID_AA64MMFR1_EL1_VH_SHIFT, #4 > + cmp x4, #0 > + b.eq drop_to_el1 nit: you can replace these cmp/b.eq with a cbz. Thanks, M. -- Without deviation from the norm, progress is not possible.