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 2B873C433EF for ; Wed, 22 Jun 2022 17:59:57 +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=6jO34dNAMWgVDwuT6m9AOBOgOajHcEuKxZQW0omZVnY=; b=iI70Iwb8JN+Y5j r3yI6XE4j0LHy3awvXbGwFNqyl7Iyc92pdPFwjO2u84iupU8Z90Ag3S2IxmG7ZHwAl3b3a0Rbzzm7 gmeWKZ2cLDftDlRtfabYG4KF4dXXSSPi98Cne+qjszQd1z9/m6REBdBsUywbb8ZEvD3wUyzk2Op+I ZiREVNM1Gb1tzdmnvG8qzzXe+mCzAg4fCJ32aTDM9W7fytZIkn8fKtoE9P11/6+KAqkra7I2IhxW/ W9e/VeHLrHW014ipQFgOR9S3qWyRzut7UluZwfdy26A3evR2MN/QFMaEtzy2ysZnKKQs4D21d9oE5 euKemS3mXo6noxWsVAMA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o44cp-00Bo2u-Id; Wed, 22 Jun 2022 17:58:47 +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 1o44XV-00BlcM-Kl for linux-arm-kernel@lists.infradead.org; Wed, 22 Jun 2022 17:53:19 +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 3F1DB61CBC; Wed, 22 Jun 2022 17:53:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4424AC385A5; Wed, 22 Jun 2022 17:53:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655920396; bh=eB7sItwzCNuCbO/9ma0P7bvtr9Z/HqU4nERsoJIiGTI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LmD8qKLOKALx2/M0X01zPxReWyjFTOkIVPWDnTHDJfEBG5vgYfFRZgBsJGqnqJGhk v26omCxkshzWaBk4JYPZ2c5rEyOUFC6OQAZfqeCDOyLEzo/z2LIGb8LF2Oi7+JMmfr y6QvFfNb3YnFOkkuUuGfmHCIwDBJC23Q5ueWM2vjBIL88VhO3WfNZ7sFChTkLJdEmp m0O3pdPhMRLIeRw+TvgZTwvG4jmnAJ3mpO3pC8bbhHWPWqldqCuDq+NRIsx+TS8izz GAsJ397N5FEbITyr95+A6/k0aDHLFjflv7UeUQru/cIpHZiIemrZTrrqTvwji3zvE0 +zkNYFZ8GwPSw== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Joey Gouly , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v5 16/27] arm64/sysreg: Convert CTR_EL0 to automatic generation Date: Wed, 22 Jun 2022 18:44:05 +0100 Message-Id: <20220622174416.1406282-17-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220622174416.1406282-1-broonie@kernel.org> References: <20220622174416.1406282-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2022; h=from:subject; bh=eB7sItwzCNuCbO/9ma0P7bvtr9Z/HqU4nERsoJIiGTI=; b=owGbwMvMwMWocq27KDak/QLjabUkhqTNIc8ulRtpit9/NmXDkQV3wiU6rt1jszuyyp+LxWOy+iX2 BrvjnYzGLAyMXAyyYoosa59lrEoPl9g6/9H8VzCDWJlApjBwcQrAjbZj/2dtFH5HPsWguKk5r8K54O 52Tb/fufNEpzX9NJJeN6chMLpzSUy5TM9kk3qeqNqKZct5Ba/cWZjhMkn9Zq7x8YxKDpcrX6Z6Cp+6 7OBqNV29xXMrQ6O/WNhCXtFHXbLfD1pc/8bMdHv5B5ZdSdcOibRYloVPFy+I4SqPnrplWSej+J4oqx f1SrOjtLiSC9/O8/S+mPUw4SZ7l87q9AXbpufuZjvi5122cE3Un4qevPzzP4wPnNpkUyS3YoYg0yMm abY5j672+Gnav889sLdc/53Rmc8C/9insG7b9cDEVLNf6ftrxZp3dzbm1efeMWzauVqryvaBQ72iu8 gmsWkuOdx8xwRM/q6XmXygQp4XAA== 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-20220622_105317_840064_FE9E3FEC X-CRM114-Status: GOOD ( 11.71 ) 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 CTR_EL0 to automatic register generation as per DDI0487H.a, no functional change. Signed-off-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 16 ---------------- arch/arm64/tools/sysreg | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 7f083a2ed7dc..a57b4a79a8e9 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -461,7 +461,6 @@ #define SMIDR_EL1_SMPS_SHIFT 15 #define SMIDR_EL1_AFFINITY_SHIFT 0 -#define SYS_CTR_EL0 sys_reg(3, 3, 0, 0, 1) #define SYS_DCZID_EL0 sys_reg(3, 3, 0, 0, 7) #define SYS_RNDR_EL0 sys_reg(3, 3, 2, 4, 0) @@ -1082,21 +1081,6 @@ #define MVFR2_FPMISC_SHIFT 4 #define MVFR2_SIMDMISC_SHIFT 0 -#define CTR_EL0_L1Ip_VPIPT 0 -#define CTR_EL0_L1Ip_VIPT 2 -#define CTR_EL0_L1Ip_PIPT 3 - -#define CTR_EL0_L1Ip_SHIFT 14 -#define CTR_EL0_L1Ip_MASK 3 -#define CTR_EL0_DminLine_SHIFT 16 -#define CTR_EL0_IminLine_SHIFT 0 -#define CTR_EL0_IminLine_MASK 0xf -#define CTR_EL0_ERG_SHIFT 20 -#define CTR_EL0_CWG_SHIFT 24 -#define CTR_EL0_CWG_MASK 15 -#define CTR_EL0_IDC_SHIFT 28 -#define CTR_EL0_DIC_SHIFT 29 - #define DCZID_EL0_DZP_SHIFT 4 #define DCZID_EL0_BS_SHIFT 0 diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index ff5e552f7420..a9f4c157c4be 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -273,6 +273,27 @@ Field 3:1 Level Field 0 InD EndSysreg +Sysreg CTR_EL0 3 3 0 0 1 +Res0 63:38 +Field 37:32 TminLine +Res1 31 +Res0 30 +Field 29 DIC +Field 28 IDC +Field 27:24 CWG +Field 23:20 ERG +Field 19:16 DminLine +Enum 15:14 L1Ip + 0b00 VPIPT + # This is named as AIVIVT in the ARM but documented as reserved + 0b01 RESERVED + 0b10 VIPT + 0b11 PIPT +EndEnum +Res0 13:4 +Field 3:0 IminLine +EndSysreg + Sysreg SVCR 3 3 4 2 2 Res0 63:2 Field 1 ZA -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel