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 31976CCA473 for ; Mon, 6 Jun 2022 20:22:40 +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=sureUiA13WOdUsrYHcLBID5m3uFMH0ra6WF+47vJfCo=; b=KbL8mZ9+5b6Ue/ 2P0SF1r+5go3XyLHPQ76NIVH/JwGotdps3ShGgbcB0CtqR3qOJ7J4KBzPb3oHvUDe2xMeAb45BRg/ fTrQYokOS+huBX5pSMx3mQK9Wh8ypMomhlo82i2u7soADiPWWPBB/PeN6wrtJWFa1sRGTEis+8Tqt 6eswZWqJm603GGHuqUbdTowsHw1xwXx9kHOZBKnIzGrwjs5nV/8T+6n1M1Sa5rT0Q5vL38HS43wz+ 2jj1orFBdp0k+ao3KK+I8J1a+dZ+G7OoC6KOamY2l7zXwAI7mbHAtiPFtsf73RApMklOpIWKI/+OE +VwnhFhk8GK1+BSSLMVA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyJDu-002alw-83; Mon, 06 Jun 2022 20:21:14 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyJA4-002YqY-Js for linux-arm-kernel@lists.infradead.org; Mon, 06 Jun 2022 20:17:18 +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 EB34FB8198B; Mon, 6 Jun 2022 20:17:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83E53C3411D; Mon, 6 Jun 2022 20:17:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654546632; bh=+9jl0v9wKorMkOYySrDfd/M1mhSTm2MHMvKCQE+cQHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZysUupjtIX0axL77cjWuK3AZONFB5ix7nVpJ6uCeTIztxgqhINE/yQbiokKNzVoP9 zVtiW1ZnFAHZo6jnuNFjTnVk4WNYkUrpiEGoWqsL/CdYNZ1RVoMhDB2FcHixSpFCEh 50mg96qwEpN3weLswwJC5zqTrI4WRAPt0j5QlV3BIeXD6Tx6YeLOsH/uOdIzyhYHpb bAnYYudeKwM//xNGEjj4Ua6iFUvHBR0DzMYYyLaBp1zmBanwM5A5WT6tbDLe5tEYkt 3eeKuacvosOAfGQE7pj/fg5no9b25N+itU+GRcVxJS5nDtP7JNCfUv1JOko/W67OB8 TXruqferGqGcQ== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v1 13/17] arm64/sysreg: Generate defines for CTR_EL0 Date: Mon, 6 Jun 2022 21:12:50 +0100 Message-Id: <20220606201254.104659-14-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606201254.104659-1-broonie@kernel.org> References: <20220606201254.104659-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1986; h=from:subject; bh=+9jl0v9wKorMkOYySrDfd/M1mhSTm2MHMvKCQE+cQHU=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBinl/Bg3Nb0fhI1eifNriMMtas0HByKWmwksBeI9YZ InRMyYKJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYp5fwQAKCRAk1otyXVSH0Lx/B/ 9W8tIEuHEs2xADmAqoJAdr6C4ZrqRAH4DllIZij+kZSHzJN0Tzwo2N6ger+zisBgjN9bpnyxji4LAO L8k3GWOIG9XwIZOVSkDhyMb+z1bEyJeuc4V6IT87//nMIv78/+9kWEhv0p8HuomCsPCjNVeT/lhshl j7NTp0DcqWjWQyxuiJhaoAQrMmfbxLo0DFI+jtd3++Zo91jhru5vHCARHd5jNPONEDzlRfOzNbmzzf KawXqRSzabWCLGBsmjxH6dBfnSUsoHwXMRXSIJrW0PCdtcQesmWSILI3k+wiFeZIxiltjGa0DjkBNk fwouAhVe8Kqu7PaMoMMWOn8KVpq/VR 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-20220606_131717_008584_BA642DD9 X-CRM114-Status: GOOD ( 10.50 ) 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 | 17 ----------------- arch/arm64/tools/sysreg | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 739f55cf9cd8..03d35c1e7e43 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,22 +1081,6 @@ #define MVFR2_FPMISC_SHIFT 4 #define MVFR2_SIMDMISC_SHIFT 0 -#define CTR_EL0_L1Ip_VPIPT 0 -#define CTR_EL0_L1Ip_AIVIVT 1 -#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..3c58aa57d672 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -273,6 +273,26 @@ 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 + 0b01 AIVIVT + 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