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 phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1D051C433EF for ; Mon, 6 Jun 2022 21:00:20 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E5C2483C61; Mon, 6 Jun 2022 23:00:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xs4all.nl Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id B2FB384280; Mon, 6 Jun 2022 23:00:12 +0200 (CEST) Received: from sibelius.xs4all.nl (80-61-163-207.fixed.kpn.net [80.61.163.207]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 99057811A6 for ; Mon, 6 Jun 2022 23:00:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xs4all.nl Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=mark.kettenis@xs4all.nl Received: from localhost (bloch.sibelius.xs4all.nl [local]) by bloch.sibelius.xs4all.nl (OpenSMTPD) with ESMTPA id b128d1bd; Mon, 6 Jun 2022 23:00:08 +0200 (CEST) Date: Mon, 6 Jun 2022 23:00:08 +0200 (CEST) From: Mark Kettenis To: Andre Przywara Cc: trini@konsulko.com, sjg@chromium.org, u-boot@lists.denx.de, Balaji.Anandapadmanaban@arm.com, peng.fan@nxp.com, andy.yan@rock-chips.com In-Reply-To: <20220509160849.246793-1-andre.przywara@arm.com> (message from Andre Przywara on Mon, 9 May 2022 17:08:49 +0100) Subject: Re: [PATCH] armv8: Fix TCR 64-bit writes References: <20220509160849.246793-1-andre.przywara@arm.com> Message-ID: X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean > From: Andre Przywara > Date: Mon, 9 May 2022 17:08:49 +0100 > > The AArch64 TCR_ELx register is a 64-bit register, and many newer > architecture features use bits in the upper half. So far U-Boot was > igorant of those bits, trying to leave them alone. > However, in an effort to set bit 31 to 1, it failed doing so, because > the compiler sign-extended "1 << 31", so that all bits[63:31] got set. > > Older ARMv8.0 cores don't define anything dangerous up there, but newer > architecture revisions do, and setting all those bits will end badly: > ================= > $ qemu-system-aarch64 -cpu max .... > U-Boot 2022.07-rc1 (May 09 2022 - 15:21:00 +0100) > > DRAM: 1.5 GiB > ================= (hangs here) > > Defining TCR_ELx_RSVD to "1U << 31" avoids the sign-extension, so all > upper bits stay at a safe 0 value. This means no more surprises when > U-Boot runs on a more capable CPU core. Hi Andre, This change breaks U-Boot on Apple M1 systems. Th reason is "interesting". The Apple Icestorm and Firestorm cores implement FEAT_VHE, but do so in an unusual (non-compiant?) way. the HCR_EL2.E2H bit is hardwired to 1, which means that EL2 Host is always enabled. As a consequence, TCR_EL2 has a different layout (the same as TCR_EL1). This means that the get_tcr() function in arch/arm/cpu/armv8/cache_v8.c returns the wrong value. Apparently the sign-extension that happened before accidentally set the "right" bits so I didn't notice this issue before. Below is a possible fix. This uses #ifdef CONFIG_ARCH_APPLE to avoid growing the code. A more generic way of fixing this would involve checking the value of HCR_EL2.E2H, probably in mmu_setup() and pass el=1 instead of el=2 to get_tcr() instead. Thoughts? diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c index 3de18c7675..ea3a60b2cd 100644 --- a/arch/arm/cpu/armv8/cache_v8.c +++ b/arch/arm/cpu/armv8/cache_v8.c @@ -74,7 +74,11 @@ u64 get_tcr(int el, u64 *pips, u64 *pva_bits) if (el == 1) { tcr = TCR_EL1_RSVD | (ips << 32) | TCR_EPD1_DISABLE; } else if (el == 2) { +#ifdef CONFIG_ARCH_APPLE + tcr = TCR_EL1_RSVD | (ips << 32) | TCR_EPD1_DISABLE; +#else tcr = TCR_EL2_RSVD | (ips << 16); +#endif } else { tcr = TCR_EL3_RSVD | (ips << 16); }