From patchwork Tue May 17 18:22:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 12852874 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 6BA6EC433EF for ; Tue, 17 May 2022 18:33:31 +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:References:In-Reply-To: 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: List-Owner; bh=sXPiw9Eo59RqtYJTE/RdeSlCG3Xjwd4tfL+5DNJqzVo=; b=e1XhYJ9VpGExfg nN4ot6iR65l+2eALp/MhCiouPZ2N/IfYiIZHhP2p5h3uIGiYlLU0apVW/6JSeempgKoFNXLl2e0hK CYZb41T7DEe6vrp8pXPA98BVPDdM8thi0fZQMY6EkuNqQ/C7u034xWXhjxsoUAN6PhM47kMvqSY1g /N3CoHNIzVD8dGCgyo141yBeEkJhQSFhf8Mv6BnvedKk7w5YbJIikKn4F3XOx4jqf+KuWorqRFIic cFw48QNi6Kx36gwGi6OCFy996fgdGLiOoRo49RhMetN77+5q+KbavJnqX3iPIiB0B0IEe8FA0JzH4 uTa3AViLZgP3IckbnJPw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nr1zP-00FIs8-9j; Tue, 17 May 2022 18:32:12 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nr1x0-00FHij-Hr for linux-arm-kernel@lists.infradead.org; Tue, 17 May 2022 18:29:44 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1B79D6153F; Tue, 17 May 2022 18:29:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42E94C34117; Tue, 17 May 2022 18:29:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652812181; bh=xlE54A9Kwjc5JxcoH9GI4f+0O0iF7Qu6AVyKnw46bBs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ETw9z97n/4iNd1xvICyoqGzxQDJg6QsVuN6XZ0tDf12IljeDjtZmG89LhqPTPWqJl h0B9Wvxy7XUbW534ZsYb6rLEiZU8bCZl+b/dwUg6F3+SYH8Bi4InTGyXXcCOg+ORzZ hxF6Klu2rexh7yQ4eyc5hEuEonxBAUEx4fLq/cYyarfp0K2mxiQAxQj5rOlkH66YPo 3eFHUtwShMrNiOjEyrWBfHjVVIVJy8tTcbFDgNh6LzUbYOytCr0jFQ4Y1CgMf2JCFp swJsDxnp4XEtk1lw7zwo1bOM3YLS3LvhE8hAoZyvUP2/kT37oIbNxsr7BdzIaQmRzl H/JWcEiQj3ROQ== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v1 9/9] arm64/sysreg: Generate definitions for FAR_ELx Date: Tue, 17 May 2022 19:22:19 +0100 Message-Id: <20220517182219.2171814-10-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220517182219.2171814-1-broonie@kernel.org> References: <20220517182219.2171814-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2528; h=from:subject; bh=xlE54A9Kwjc5JxcoH9GI4f+0O0iF7Qu6AVyKnw46bBs=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBig+fYpvs/COQmVZWUt78KJeRfKSMmH4LdP3FPlM72 PouO5hGJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYoPn2AAKCRAk1otyXVSH0Cj3CA CCEJ67m3ceOHKDGx5mEhlfoDb7om4AorL5DkvUBlhFqmedBlES3+Wl7X+/MQQ1cONk53iw1YbsSQkL FshsSBEM0qYM7FICkQTOlPX+rvSKC6OM85WdsIDPaLKsdcx/Zwil8f3EXoEsGLSCenEWeKme3vp7vs umDd1XO9U7YzrdVkFrX+pM20BM3zlhQQ/cz3BX21EH2jOYKxp/LXcAfMSZnMgdJ1Cwl2+W+TIFf0l2 gzAbiC0tpO2B/cAVXby/AC70kNzuasLcqXfeTiKMqc285E75qK96Nh0Vf9RnDtOqfAwSBIKNCmIDSU bEvxSGb1xICI1xi2EBsO1R0mdNGx8u X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220517_112942_841266_FC35BEF9 X-CRM114-Status: GOOD ( 12.49 ) 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 Convert FAR_ELx to automatic register generation as per DDI0487H.a. In the architecture these registers have a single field "named" as "Faulting Virtual Address for synchronous exceptions taken to ELx" occupying the entire register, in order to fit in with the requirement to describe the contents of the register I have created a single field named ADDR. No functional change. Signed-off-by: Mark Brown Reviewed-by: Mark Rutland --- arch/arm64/include/asm/sysreg.h | 3 --- arch/arm64/tools/sysreg | 12 ++++++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 09dc437030f5..8ab15c262864 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -249,7 +249,6 @@ #define SYS_TFSR_EL1 sys_reg(3, 0, 5, 6, 0) #define SYS_TFSRE0_EL1 sys_reg(3, 0, 5, 6, 1) -#define SYS_FAR_EL1 sys_reg(3, 0, 6, 0, 0) #define SYS_PAR_EL1 sys_reg(3, 0, 7, 4, 0) #define SYS_PAR_EL1_F BIT(0) @@ -560,7 +559,6 @@ #define SYS_VSESR_EL2 sys_reg(3, 4, 5, 2, 3) #define SYS_FPEXC32_EL2 sys_reg(3, 4, 5, 3, 0) #define SYS_TFSR_EL2 sys_reg(3, 4, 5, 6, 0) -#define SYS_FAR_EL2 sys_reg(3, 4, 6, 0, 0) #define SYS_VDISR_EL2 sys_reg(3, 4, 12, 1, 1) #define __SYS__AP0Rx_EL2(x) sys_reg(3, 4, 12, 8, x) @@ -615,7 +613,6 @@ #define SYS_AFSR1_EL12 sys_reg(3, 5, 5, 1, 1) #define SYS_ESR_EL12 sys_reg(3, 5, 5, 2, 0) #define SYS_TFSR_EL12 sys_reg(3, 5, 5, 6, 0) -#define SYS_FAR_EL12 sys_reg(3, 5, 6, 0, 0) #define SYS_MAIR_EL12 sys_reg(3, 5, 10, 2, 0) #define SYS_AMAIR_EL12 sys_reg(3, 5, 10, 3, 0) #define SYS_VBAR_EL12 sys_reg(3, 5, 12, 0, 0) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index 1cd1e4ea42e3..b725edc9626b 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -228,6 +228,10 @@ Sysreg SMCR_EL1 3 0 1 2 6 Fields SMCR_ELx EndSysreg +Sysreg FAR_EL1 3 0 6 0 0 +Field 63:0 ADDR +EndSysreg + SysregFields CONTEXTIDR_ELx Res0 63:32 Field 31:0 PROCID @@ -351,6 +355,10 @@ Field 3:2 D1 Field 1:0 D0 EndSysreg +Sysreg FAR_EL2 3 4 6 0 0 +Field 63:0 ADDR +EndSysreg + Sysreg CONTEXTIDR_EL2 3 4 13 0 1 Fields CONTEXTIDR_ELx EndSysreg @@ -367,6 +375,10 @@ Sysreg SMCR_EL12 3 5 1 2 6 Fields SMCR_ELx EndSysreg +Sysreg FAR_EL12 3 5 6 0 0 +Field 63:0 ADDR +EndSysreg + Sysreg CONTEXTIDR_EL12 3 5 13 0 1 Fields CONTEXTIDR_ELx EndSysreg