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 3FB3A1FDA62; Thu, 20 Feb 2025 15:23:55 +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=1740065036; cv=none; b=NxUnYH/wkZ85ivspiLJsMh37znmRl1G9vnSD7vID3JEBseAiZAXFriqwQFbsooTUPlUaez4Mu9iZBDdq8BA+wZ1jQo2Xxp8g2oAi78Vu9tC4EQ8LcRsIOHM8Y0SN6L5VN/mZ/esWEsMkMxeVbEJHGCt2sMOyJcZnh/8NWARP04E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740065036; c=relaxed/simple; bh=4S3rXkPwX/qQwDVbpYloUGGWNrnrxI6LSqRoTIH2e+U=; h=Date:Message-ID:From:To:Cc:Subject:In-Reply-To:References: MIME-Version:Content-Type; b=OSBfLljft7LW7ry+LcfeT2aUnX4OXWe+xbr76LKZBqpPGI5kV1+yp8iOINN/93T7eaZ3frhZ20XbyfYMbAwpn19QXxkQ6gipDnj3D9ipsJWtrYudHRYis8KM34fQ6TzxrEyXgwhCfgvWHFY6NQKiPo1zPIrI+hwgUyFjofxkkFs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DQ2c/Vss; 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="DQ2c/Vss" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD21CC4CED1; Thu, 20 Feb 2025 15:23:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740065035; bh=4S3rXkPwX/qQwDVbpYloUGGWNrnrxI6LSqRoTIH2e+U=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=DQ2c/VssDF/nS3hlaanCheULrRx/xW+iE5Js80EY01XxDTcsZvZGjKreORfzqRGaI 5F/rl8+K9R3wnhDxxabpB382VGDUrPLzMJ331d9JaoBwmFAOwM4u4aY5AAdrM4u1VX 9lpZiBywWYVNcH02pQqgI4dG/bSWM29xfPMlG1C9nyQESH4Sn5UUIL3op7EhU2h1p7 gWm8BC/S1qsj/TGIrqZsUY+G6+PbJdxV22bUs+W1x0sgvloKsGHcaVDYGIlV8nlapB elEbFUa7VIODJvPeof24hsPSuFmhe2fRSP6QKCevLL8Rg3E8K5Fe1qQwO/2cEcIlB9 l/chTU3WS0pfw== 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 1tl8P3-006Fq6-Qz; Thu, 20 Feb 2025 15:23:53 +0000 Date: Thu, 20 Feb 2025 15:23:53 +0000 Message-ID: <86tt8or65y.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 1/7] arm64: drop to EL1 if booted at EL2 In-Reply-To: <20250220141354.2565567-2-joey.gouly@arm.com> References: <20250220141354.2565567-1-joey.gouly@arm.com> <20250220141354.2565567-2-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:48 +0000, Joey Gouly wrote: > > EL2 is not currently supported, drop to EL1 to conitnue booting. > > Signed-off-by: Joey Gouly > --- > arm/cstart64.S | 27 +++++++++++++++++++++++++-- > 1 file changed, 25 insertions(+), 2 deletions(-) > > diff --git a/arm/cstart64.S b/arm/cstart64.S > index b480a552..3a305ad0 100644 > --- a/arm/cstart64.S > +++ b/arm/cstart64.S > @@ -57,14 +57,25 @@ start: > add x6, x6, :lo12:reloc_end > 1: > cmp x5, x6 > - b.hs 1f > + b.hs reloc_done > ldr x7, [x5] // r_offset > ldr x8, [x5, #16] // r_addend > add x8, x8, x4 // val = base + r_addend > str x8, [x4, x7] // base[r_offset] = val > add x5, x5, #24 > b 1b > - > +reloc_done: > + mrs x4, CurrentEL > + cmp x4, CurrentEL_EL2 > + b.ne 1f > +drop_to_el1: > + mov x4, 4 It'd be nice to have a symbolic constant denoting EL1t. > + msr spsr_el2, x4 > + adrp x4, 1f > + add x4, x4, :lo12:1f > + msr elr_el2, x4 > + isb You can drop this ISB, as the following ERET has the same context synchronisation properties. > + eret > 1: > /* zero BSS */ > adrp x4, bss > @@ -186,6 +197,18 @@ get_mmu_off: > > .globl secondary_entry > secondary_entry: > + mrs x0, CurrentEL > + cmp x0, CurrentEL_EL2 > + b.ne 1f > +drop_to_el1_secondary: > + mov x0, 4 > + msr spsr_el2, x0 > + adrp x0, 1f > + add x0, x0, :lo12:1f > + msr elr_el2, x0 > + isb > + eret Maybe move this into a macro and use it in the two instances of EL2->EL1 drop. > +1: > /* enable FP/ASIMD and SVE */ > mov x0, #(3 << 20) > orr x0, x0, #(3 << 16) Thanks, M. -- Without deviation from the norm, progress is not possible.