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 253D3C83F22 for ; Tue, 15 Jul 2025 15:17:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=qk7AVYhwhHfG5KfnFnz8YAC6WOLKsuNRt03QTVEuM3I=; b=fRzaqSdZ5zb3lsupS60Bxkz8Lv qPNOQGbv/EYdNvtWyNu469Gye+FybVz3jiGh9YCSGPFkDsfmRMMlsLNfdSf6MtCtTN/aBaxt1UMUw Ic25w+p6gWfnVGxclM8pGN/j0a+g+2O9EAHnZKmVS+eyADunC4ucIG7UCddy6RjwSYORsRFirjBzP B27cJRpBhX4mS78Dd8jB/MtuKRVj5c2deStk2MkoHetF2l7sFDOaDDAkGVBk8lwsXNDj3HsVwBvl4 AkC9xmvCycC68GdgRgjstguKRPJxP3rGYgTGNntF9CLb27wjoMOhuxmGJKst60TLdsfJlsfNpTX/u Ax2JfKgw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1ubhPj-00000005ZHa-3vH2; Tue, 15 Jul 2025 15:17:51 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1ubftB-00000005F2k-3eem for linux-arm-kernel@lists.infradead.org; Tue, 15 Jul 2025 13:40:11 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 4B10B43890; Tue, 15 Jul 2025 13:40:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D007EC4CEE3; Tue, 15 Jul 2025 13:40:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1752586809; bh=aplGWxuyWnpriI8/kKa7PVnD8iQ34TgUjxhgXLJ3L0s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gxLnXjexsxSApLAZy4Zyb+60/q8Ml3bUzyCVlASpY4I8pvgxgkE3yWCRCW0G0CdXT FFjOeYeYbgVuDIwj4fErrdAKGHKEo1q0jQLafqE5DJ6/hUQ1YfVldx1Nj/jWqYVjBY VFLePFkLHCYdxkSQsnsKtXWWcF9Gl6nDymSZu6Gc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Catalin Marinas , Will Deacon , Ryan Roberts , Marc Zyngier , Mark Rutland , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Anshuman Khandual , Sasha Levin Subject: [PATCH 6.15 025/192] arm64/mm: Drop wrong writes into TCR2_EL1 Date: Tue, 15 Jul 2025 15:12:00 +0200 Message-ID: <20250715130815.874397237@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250715130814.854109770@linuxfoundation.org> References: <20250715130814.854109770@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250715_064009_933843_D8466539 X-CRM114-Status: GOOD ( 12.61 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Anshuman Khandual [ Upstream commit 9dd1757493416310a5e71146a08bc228869f8dae ] Register X0 contains PIE_E1_ASM and should not be written into REG_TCR2_EL1 which could have an adverse impact otherwise. This has remained undetected till now probably because current value for PIE_E1_ASM (0xcc880e0ac0800000) clears TCR2_EL1 which again gets set subsequently with 'tcr2' after testing for FEAT_TCR2. Drop this unwarranted 'msr' which is a stray change from an earlier commit. This line got re-introduced when rebasing on top of the commit 926b66e2ebc8 ("arm64: setup: name 'tcr2' register"). Cc: Catalin Marinas Cc: Will Deacon Cc: Ryan Roberts Cc: Marc Zyngier Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Fixes: 7052e808c446 ("arm64/sysreg: Get rid of the TCR2_EL1x SysregFields") Acked-by: Marc Zyngier Signed-off-by: Anshuman Khandual Link: https://lore.kernel.org/r/20250704063812.298914-1-anshuman.khandual@arm.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/mm/proc.S | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index fb30c8804f87b..46a18af52980d 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -533,7 +533,6 @@ alternative_else_nop_endif #undef PTE_MAYBE_SHARED orr tcr2, tcr2, TCR2_EL1_PIE - msr REG_TCR2_EL1, x0 .Lskip_indirection: -- 2.39.5