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 52F59EB64DC for ; Mon, 3 Jul 2023 13:05:02 +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:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=1fFBNGcGQc+LHk+hAYbg5Qotm6bdoDqo1dqW8T6YzgM=; b=LbLLyQUsDnDYwo TMLZszEFApSBY7nkNryyzuz/uVN4tJGFwibym96urEVC75EX3JQRZd2oXbttQAsdIm5D+cjQ9M9TR uEgqzNtdMDC2Egk70kaxXGqiZ8lTb/2sjHjhrwVsg9jobQ3kslwUxIbCQZomKCMhnuwpyFqt7U2bB UnY15RgsrdUq81J7NCxeHpockbC284dMsnV7R0G/txTNQtmnPxHQBAEgn5Nw91D6gVOOyaEA6UU+n ldH+zJ4iSqzX1Ohta9yK4cqTGGwcgXosuySnBp4X7YO/VIfJOd7nhyJ4SAPAKTGNFw9VWryehH4YF crhMUJXP0P/910Iau4vw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qGJEH-00AZzG-2W; Mon, 03 Jul 2023 13:04:33 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qGJEE-00AZxA-0e for linux-arm-kernel@lists.infradead.org; Mon, 03 Jul 2023 13:04:31 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8AC2960DC6; Mon, 3 Jul 2023 13:04:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE167C433C7; Mon, 3 Jul 2023 13:04:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688389469; bh=6zxhcWEO27I5GDAw7OAYBXvk8GbEh5bi6NWcSe65Jyg=; h=From:To:Cc:Subject:Date:From; b=TL143NC8Bh1p7M/Zby7N6CG2PoNNZLpw6yzgR2HM97SbfYIzEByqKzVqBwslq2elc HuOyXrrwXQKX6DPrjd9+Gv5W0DOZ+EOZAf0hBho6iEsm0AvjvN0ChLWwkRRYCyCCvU OkHcLSpY64cOC1Xobq9rta0OCqeEN+uZoch61HU4m0yHFqholRZ5X/sZ/wIh+JQgY/ pWxZFt9d6jOeEfLNeyNCCVq6hqVFnsl1RGsU9D1SGeykOlRiNp51y/lHGMTV5E2oqJ aGPU96dZmsDPY5ziI7JUOqwu3GGsYfMCut2fRpUp0kRODPobAjDbRq7iV3k62gzmpT FyHy9LLeKPbRg== Received: from sofa.misterjones.org ([185.219.108.64] helo=valley-girl.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qGJEA-00AAJq-NB; Mon, 03 Jul 2023 14:04:26 +0100 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org Cc: Mark Brown , Will Deacon , Catalin Marinas , Mark Rutland Subject: [PATCH] arm64: Fix HFGxTR_EL2 field naming Date: Mon, 3 Jul 2023 14:04:16 +0100 Message-Id: <20230703130416.1495307-1-maz@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: linux-arm-kernel@lists.infradead.org, broonie@kernel.org, will@kernel.org, catalin.marinas@arm.org, mark.rutland@arm.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230703_060430_282105_967D19F0 X-CRM114-Status: GOOD ( 12.32 ) 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 The HFGxTR_EL2 fields do not always follow the naming described in the spec, nor do they match the name of the register they trap in the rest of the kernel. It is a bit sad that they were written by hand despite the availability of a machine readable version... Fixes: cc077e7facbe ("arm64/sysreg: Convert HFG[RW]TR_EL2 to automatic generation") Signed-off-by: Marc Zyngier Cc: Mark Brown Cc: Will Deacon Cc: Catalin Marinas Cc: Mark Rutland --- arch/arm64/tools/sysreg | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index c9a0d1fa3209..930c8cc0812f 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -1890,7 +1890,7 @@ Field 0 SM EndSysreg SysregFields HFGxTR_EL2 -Field 63 nAMIAIR2_EL1 +Field 63 nAMAIR2_EL1 Field 62 nMAIR2_EL1 Field 61 nS2POR_EL1 Field 60 nPOR_EL1 @@ -1905,9 +1905,9 @@ Field 52 nGCS_EL0 Res0 51 Field 50 nACCDATA_EL1 Field 49 ERXADDR_EL1 -Field 48 EXRPFGCDN_EL1 -Field 47 EXPFGCTL_EL1 -Field 46 EXPFGF_EL1 +Field 48 ERXPFGCDN_EL1 +Field 47 ERXPFGCTL_EL1 +Field 46 ERXPFGF_EL1 Field 45 ERXMISCn_EL1 Field 44 ERXSTATUS_EL1 Field 43 ERXCTLR_EL1 @@ -1922,8 +1922,8 @@ Field 35 TPIDR_EL0 Field 34 TPIDRRO_EL0 Field 33 TPIDR_EL1 Field 32 TCR_EL1 -Field 31 SCTXNUM_EL0 -Field 30 SCTXNUM_EL1 +Field 31 SCXTNUM_EL0 +Field 30 SCXTNUM_EL1 Field 29 SCTLR_EL1 Field 28 REVIDR_EL1 Field 27 PAR_EL1 -- 2.34.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel