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 E2457C04FF9 for ; Mon, 15 Apr 2024 08:30:28 +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=WN4T1r5tn9Evckc5t86K5xr0aOqHzJySCcJ44lE8Odk=; b=uzTitSKONbgDUx AWshqzQRA64cTJQyWMSTYQO/Va4v1N/VtxrOyW6uR3SLopH2GgRsgeK4xhWQGDDPiit+NcqVTRCR+ J/a+yoXBuet5daMjJJ7d9EQsdW2/uv/r27tGlUA+fQWA580yVPSNQD8mlDD4KQfivImG2EXPxo5CD 94sQuhsUn/7cklARLeEkAxapbe4RyJoW+HatBM3dwaIreghqD9QEgY8k7RhKJx8ejTwo22MhdgQWZ fw5KUcr6m+QIYcJp7oK9Khv7MGBNRQwEdH7sYtRL1jdTM5+koQ+YOyjYOyUO9o1zgO6whZD5aRNZk f2dohnS2kd6lZQui65EQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rwHjC-00000007XuY-1H0x; Mon, 15 Apr 2024 08:30:14 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rwHj9-00000007XsG-1pjc for linux-arm-kernel@lists.infradead.org; Mon, 15 Apr 2024 08:30:12 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2F3652F; Mon, 15 Apr 2024 01:30:35 -0700 (PDT) Received: from FVFF77S0Q05N (unknown [10.57.20.152]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9ED613F64C; Mon, 15 Apr 2024 01:30:05 -0700 (PDT) Date: Mon, 15 Apr 2024 09:29:56 +0100 From: Mark Rutland To: Ard Biesheuvel Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Catalin Marinas , Will Deacon , Marc Zyngier Subject: Re: [PATCH 1/2] arm64/head: Drop unnecessary pre-disable-MMU workaround Message-ID: References: <20240415075412.2347624-4-ardb+git@google.com> <20240415075412.2347624-5-ardb+git@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240415075412.2347624-5-ardb+git@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240415_013011_548290_70C3DF51 X-CRM114-Status: GOOD ( 15.76 ) 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 Mon, Apr 15, 2024 at 09:54:14AM +0200, Ard Biesheuvel wrote: > From: Ard Biesheuvel > > The Falkor erratum that results in the need for an ISB before clearing > the M bit in SCTLR_ELx only applies to execution at exception level x, > and so the workaround is not needed when disabling the EL1 MMU while > running at EL2. > > Signed-off-by: Ard Biesheuvel Acked-by: Mark Rutland Mark. > --- > arch/arm64/kernel/head.S | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S > index 06234c3a15f3..b8bbd72cb194 100644 > --- a/arch/arm64/kernel/head.S > +++ b/arch/arm64/kernel/head.S > @@ -323,13 +323,11 @@ SYM_INNER_LABEL(init_el2, SYM_L_LOCAL) > cbz x0, 2f > > /* Set a sane SCTLR_EL1, the VHE way */ > - pre_disable_mmu_workaround > msr_s SYS_SCTLR_EL12, x1 > mov x2, #BOOT_CPU_FLAG_E2H > b 3f > > 2: > - pre_disable_mmu_workaround > msr sctlr_el1, x1 > mov x2, xzr > 3: > -- > 2.44.0.683.g7961c838ac-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel