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 613F0C433EF for ; Tue, 10 May 2022 16:15:12 +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=l0wQirApI0jgN0cCDrxh54mmtS2fmf7NPRm4Cr/hers=; b=HO0+9H2vXirT+h iVsVrzfrWsYfvVbrrwg1FH7/8Fan96NLCuXLZtWnOno+C2gAyuUp7+Q6Z9rTnnqvHd8w54dlbTij/ m0Z5CMul/krtggBT0O1fCqNkq5MCQjQGXyNtIaBfHP6249zkdZd8bvBdHh3my6O/zqXqghcJ7tSfd xZ19bTu3Gszk2QnPuR/WUzJevFv/B5qU+QC1dThWjYYSW7zNRwS17u/J21MgS/bUdfvyNOBG3SEAn segTYhPUyUSDrycg7g/9048s4z3EVySvI1Sr6ezsZWCtvngJYLoit01GRIq6D+hyp4v0FwZ8MDBhk Iz8h/BjRVQIa2+wDW73A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1noSUn-002y7G-C0; Tue, 10 May 2022 16:13:57 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1noSTY-002xa0-1r for linux-arm-kernel@lists.infradead.org; Tue, 10 May 2022 16:12:41 +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 911B0617B4; Tue, 10 May 2022 16:12:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 933D9C385CB; Tue, 10 May 2022 16:12:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652199159; bh=JjRjB/1K8ezZI3YrbSvqm+n4dFHoNywK+32hlZt65iw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YZZ/paEJYS1utnNrjlqcQ/MRK/JHDXhx6RNkS69DyddYa2vtvXjAmYHwWCjBmDg9O 7wXq5agsfDCeK58aXBfsvTgyx8q2OHuK+wWndfJ7V1JO06MBhZuAVl+GPqVcsx/gYs cLNsnk1cu2IWXCyAHqqnK7epBv9p06Fua46pqkOA2hO7hwlwJBgZGczpdO6ZXE3P9v v71cLjY8Mo7wqHEp0QnosQsgTu4X4zHENnl7YG32TfdGJH66a0m5V3UZOVCE8i2NrO 4tAGhSQDGXtWfJiDUf59q+xJBJjjY2EQjiA03aoDNnUpZ4a18a3LZW9SWTRuogVH+B wGcpu4mSyNHAw== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Marc Zyngier , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v1 07/12] arm64/sme: Automatically generate defines for SMCR Date: Tue, 10 May 2022 17:12:03 +0100 Message-Id: <20220510161208.631259-8-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220510161208.631259-1-broonie@kernel.org> References: <20220510161208.631259-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2516; h=from:subject; bh=JjRjB/1K8ezZI3YrbSvqm+n4dFHoNywK+32hlZt65iw=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBieo7SVSTcLCApkTaPDeVXz9FrFeIhEAMBxtC/V/Ky +NUXqLGJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYnqO0gAKCRAk1otyXVSH0MU4B/ 9Xvju2a5QRjQchk/b0fzInQkmFV38JvoOadeZvxN4hIZHgFwzuUXkP1ctNAoY3qNwM4S8fiAMZlnEe 4ABzyP74Vv/7GZMR2Rr3nI5O/Mc4em3DztGgEhDVNiPQeTMwa/LNmWevCSUhmv9kNPKqN5EZYs0vhq DLc6n3+bleV/IrQiXM39IhwMTOfoTtPV8h7+mLHrzQCNbJPQwK4x4AUMLA6nsJNT+7XiKfQRPX9rgA DtPqAUJJ+iaN9pbZunHg7pk9h1tjRFWBm9A8E0Hf1ASfHG2zFXpRFDOB9YqKsPD4EMJrxGg9RBDizv Yxwz+ZLyGwiAerACqouE+BRiUo32+U 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-20220510_091240_189998_3B03B645 X-CRM114-Status: GOOD ( 10.70 ) 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 Convert SMCR to use the register definition code, no functional change. Signed-off-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 10 ---------- arch/arm64/tools/sysreg | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index a2f0759f65b2..cbf03a1f316e 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -216,7 +216,6 @@ #define SYS_ZCR_EL1 sys_reg(3, 0, 1, 2, 0) #define SYS_TRFCR_EL1 sys_reg(3, 0, 1, 2, 1) #define SYS_SMPRI_EL1 sys_reg(3, 0, 1, 2, 4) -#define SYS_SMCR_EL1 sys_reg(3, 0, 1, 2, 6) #define SYS_TCR_EL1 sys_reg(3, 0, 2, 0, 2) @@ -571,7 +570,6 @@ #define SYS_TRFCR_EL2 sys_reg(3, 4, 1, 2, 1) #define SYS_HCRX_EL2 sys_reg(3, 4, 1, 2, 2) #define SYS_SMPRIMAP_EL2 sys_reg(3, 4, 1, 2, 5) -#define SYS_SMCR_EL2 sys_reg(3, 4, 1, 2, 6) #define SYS_DACR32_EL2 sys_reg(3, 4, 3, 0, 0) #define SYS_HDFGRTR_EL2 sys_reg(3, 4, 3, 1, 4) #define SYS_HDFGWTR_EL2 sys_reg(3, 4, 3, 1, 5) @@ -631,7 +629,6 @@ #define SYS_SCTLR_EL12 sys_reg(3, 5, 1, 0, 0) #define SYS_CPACR_EL12 sys_reg(3, 5, 1, 0, 2) #define SYS_ZCR_EL12 sys_reg(3, 5, 1, 2, 0) -#define SYS_SMCR_EL12 sys_reg(3, 5, 1, 2, 6) #define SYS_TTBR0_EL12 sys_reg(3, 5, 2, 0, 0) #define SYS_TTBR1_EL12 sys_reg(3, 5, 2, 0, 1) #define SYS_TCR_EL12 sys_reg(3, 5, 2, 0, 2) @@ -1117,13 +1114,6 @@ #define ZCR_ELx_LEN_WIDTH 4 #define ZCR_ELx_LEN_MASK 0xf -#define SMCR_ELx_FA64_SHIFT 31 -#define SMCR_ELx_FA64_MASK (1 << SMCR_ELx_FA64_SHIFT) - -#define SMCR_ELx_LEN_SHIFT 0 -#define SMCR_ELx_LEN_WIDTH 4 -#define SMCR_ELx_LEN_MASK 0xf - #define CPACR_EL1_FPEN_EL1EN (BIT(20)) /* enable EL1 access */ #define CPACR_EL1_FPEN_EL0EN (BIT(21)) /* enable EL0 access, if EL1EN set */ diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index c5619629bf9c..d0ac57648000 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -185,6 +185,26 @@ Field 1 A Field 0 M EndSysreg +SysregFields SMCR_ELx +Res0 63:32 +Field 31 FA64 +Res0 30:9 +Raz 8:4 +Field 3:0 LEN +EndSysregFields + +Sysreg SMCR_EL1 3 0 1 2 6 +Fields SMCR_ELx +EndSysreg + +Sysreg SMCR_EL2 3 4 1 2 6 +Fields SMCR_ELx +EndSysreg + +Sysreg SMCR_EL12 3 5 1 2 6 +Fields SMCR_ELx +EndSysreg + SysregFields TTBRx_EL1 Field 63:48 ASID Field 47:1 BADDR -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel