From patchwork Mon Jul 4 17:02:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 12905708 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 1FBFEC433EF for ; Mon, 4 Jul 2022 17:15:46 +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=mm8ALVmm8k3GCZxWrVzSvZ+zphgrbEjEzwgF4EXpCl0=; b=TtUaebT+cxMbZ5 EkxnerH5mPGbWew5WGs46l9C2rJ8qKgkDKtX8i9Ra9X3ak1F32rw/jZJyoMHo7XR1NfIcIj3gLDQ7 vXCnCMv63DJ+J5EYH+O2ES+4JiF0qHgfGi0SZJGjSiQ3gf7YkgJNHeAMoWcq6vfuIt11YLrhLwmI1 0lH4apiJzptAc/lq8HYF1V1r0ihlDCiUZnh+jIbrayZmRM35yjvb9vdmWcClwPafMJ4QJUOIkpSy7 qsX9ntfpkiKCJUSHcWUZcIjw5dfpdLy7n0tgBN7W8gyWA5y5Prma1/YUlMMg1TD2dhWe8O5wi4ERT zIndhlau3ozLWgM1dAXQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o8PeU-00ADso-0m; Mon, 04 Jul 2022 17:14:26 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o8PUV-00A9VZ-ED for linux-arm-kernel@lists.infradead.org; Mon, 04 Jul 2022 17:04:09 +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 ams.source.kernel.org (Postfix) with ESMTPS id 25413B81178; Mon, 4 Jul 2022 17:04:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 566C2C341CB; Mon, 4 Jul 2022 17:04:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656954244; bh=SYhxV8Xv3mc8918rY24Af16Lj77Z2AMIIax1BuqJkrk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tp2L8jgG9p4qGkD4AKFHYl8XiGgCKIJKwQZztYp/pnet+Yw7oqHcRQpWXXbBQvE9X /8p+LLaF3RmxCdiK5yqJgklVy5CSQRe/jFwbF9BFtcL4/2FJ6ec60CV3UwJ3vcDvVM Mxzl4pdGsz5Zw9Mh5CI5/6msIgKMI1tOQH0r/mUOjoRJH8w+bjM9CuypbXocoVvq3V xKUhThyP6+ecieftEm+OHGV8i8xwNCsSu/WvSJQ4EI2nI73H2vIen7DcIHOT8rCxuG eZS6Co0K0HzW0GEhtvDlcLTOSsEowyhqXrXtEhOtoVf/z+RJstYZQeOE3Xh0JW+iCg jwZyKUP5Qjm2Q== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Joey Gouly , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v7 21/28] arm64/sysreg: Convert ID_AA64ISAR2_EL1 to automatic generation Date: Mon, 4 Jul 2022 18:02:55 +0100 Message-Id: <20220704170302.2609529-22-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220704170302.2609529-1-broonie@kernel.org> References: <20220704170302.2609529-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2775; h=from:subject; bh=SYhxV8Xv3mc8918rY24Af16Lj77Z2AMIIax1BuqJkrk=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiwx0+zxV2B1VxLDKgrFoOvTsQ8/H0IRl6iZndVal+ 7aoMa4iJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYsMdPgAKCRAk1otyXVSH0PHEB/ 9ALh+YpQX8pBgRZCUAXUcwL2qUalIOAdTalpIo/hkJwMqyYIe1bViqHbEUGEPZZO35SCwVfYFImomK AZ3y3aShbwiPMhqj8dc0gb/2pjl6+Th3l4dfYFNPJyQlQlAybyBqzasoQr60/vKqUwRWGdn7sjj43F sg4TJauQqyfXT1L/BjESbG8BPWqVz7VglTaXuF91cVzhYNv6oXH4kBi2gaHnI6omd2fyAvlBStVzZG 82Toz7xhCt1BoR8KcVCxqkMZRf2yJVnA+zDxJ8qV7RfZ1z7Dvk0/ILF108qjkSBXKMSkK6YPH0v6Xe pEdAKk49vyzepO5DhjioibvbAz55B1 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-20220704_100407_823090_609CED4E X-CRM114-Status: GOOD ( 14.25 ) 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 Automatically generate defines for ID_AA64ISAR2_EL1, using the definitions in DDI0487H.a. No functional changes. Signed-off-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 27 --------------------------- arch/arm64/tools/sysreg | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 27 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 7f87690e74b3..cd6820f6e819 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -201,8 +201,6 @@ #define SYS_ID_AA64AFR0_EL1 sys_reg(3, 0, 0, 5, 4) #define SYS_ID_AA64AFR1_EL1 sys_reg(3, 0, 0, 5, 5) -#define SYS_ID_AA64ISAR2_EL1 sys_reg(3, 0, 0, 6, 2) - #define SYS_ID_AA64MMFR0_EL1 sys_reg(3, 0, 0, 7, 0) #define SYS_ID_AA64MMFR1_EL1 sys_reg(3, 0, 0, 7, 1) #define SYS_ID_AA64MMFR2_EL1 sys_reg(3, 0, 0, 7, 2) @@ -699,31 +697,6 @@ /* Position the attr at the correct index */ #define MAIR_ATTRIDX(attr, idx) ((attr) << ((idx) * 8)) -/* id_aa64isar2 */ -#define ID_AA64ISAR2_EL1_BC_SHIFT 28 -#define ID_AA64ISAR2_EL1_APA3_SHIFT 12 -#define ID_AA64ISAR2_EL1_GPA3_SHIFT 8 -#define ID_AA64ISAR2_EL1_RPRES_SHIFT 4 -#define ID_AA64ISAR2_EL1_WFxT_SHIFT 0 - -/* - * Value 0x1 has been removed from the architecture, and is - * reserved, but has not yet been removed from the ARM ARM - * as of ARM DDI 0487G.b. - */ -#define ID_AA64ISAR2_EL1_WFxT_NI 0x0 -#define ID_AA64ISAR2_EL1_WFxT_IMP 0x2 - -#define ID_AA64ISAR2_EL1_APA3_NI 0x0 -#define ID_AA64ISAR2_EL1_APA3_PAuth 0x1 -#define ID_AA64ISAR2_EL1_APA3_EPAC 0x2 -#define ID_AA64ISAR2_EL1_APA3_PAuth2 0x3 -#define ID_AA64ISAR2_EL1_APA3_FPAC 0x4 -#define ID_AA64ISAR2_EL1_APA3_FPACCOMBINE 0x5 - -#define ID_AA64ISAR2_EL1_GPA3_NI 0x0 -#define ID_AA64ISAR2_EL1_GPA3_IMP 0x1 - /* id_aa64pfr0 */ #define ID_AA64PFR0_CSV3_SHIFT 60 #define ID_AA64PFR0_CSV2_SHIFT 56 diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index 164221177079..da5e925bf624 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -193,8 +193,41 @@ Enum 3:0 DPB 0b0010 DPB2 EndEnum EndSysreg + +Sysreg ID_AA64ISAR2_EL1 3 0 0 6 2 +Res0 63:28 +Enum 27:24 PAC_frac + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 23:20 BC + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 19:16 MOPS + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 15:12 APA3 + 0b0000 NI + 0b0001 PAuth + 0b0010 EPAC + 0b0011 PAuth2 + 0b0100 FPAC + 0b0101 FPACCOMBINE +EndEnum +Enum 11:8 GPA3 + 0b0000 NI 0b0001 IMP EndEnum +Enum 7:4 RPRES + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 3:0 WFxT + 0b0000 NI + 0b0010 IMP +EndEnum EndSysreg Sysreg SCTLR_EL1 3 0 1 0 0