From patchwork Tue May 17 18:22:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 12852860 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 0BCEDC433EF for ; Tue, 17 May 2022 18:31:11 +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=8d63xk+QhoSwhYNLRQ5WJ40SY/W5ZBQguJnSAN55K3M=; b=kjAV2YWrSS4Xk7 2bbS4iZJ/frbaJFLFtbHnJEFJFt5zA+AIBk/WxgSbpPi53NlbltonvqnAINbt+WVWyjcjLTsZwbKu ZRT+ibIvPQldkZ6VhewTe5uZFjn+P1zepvE+0Awnl9AkmzZXL6tD3Tc2U1NbvqpxO2MqKDwykKMtf H0qUJoLwskR6fe7ZFycw1biupl+avyhqPAAgpmovmVfXF5U9IQudJHYHYU4ZdzPpMH8zzLYKxQzCZ ljlOjsR4VPjJOADkMg6vfB7ZWpXV7mXMpQsrrHkah68sm/CH2h2cpNhIUN8mTwBcTcxMvQoAG2Tl+ Z3WsRdfDxkCl4ife6ZkQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nr1xL-00FHrF-Ao; Tue, 17 May 2022 18:30:03 +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 1nr1ws-00FHdy-3I for linux-arm-kernel@lists.infradead.org; Tue, 17 May 2022 18:29:35 +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 C1F5CB81B94; Tue, 17 May 2022 18:29:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EC23C385B8; Tue, 17 May 2022 18:29:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652812171; bh=weLOsOTtCndBfRTlLXJV5/j9jm5/lNY1fp7zPN2b/Lg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gEA0V651wJyKxImrhG4rkl4fIQCM/R7XKLJ9sE5t3opU86Hyp08dCZb7y9BDZ4FIR cFjFua1+j/WPeIP0QrECwfoI1Ha9fMiteRdw62aWftXHOisky1rHAeIwCqnb0U+zbB OZuJXvRrEGqMAaxts/EJIPU0HV700CrR0TSFfD3g4/VSlKnkSflQ4s32ufsEOVMPDa P5U3Blcw2OhZRmAz10XiQ1WM0Ot2YF9zKsAVAbZMEs2PIAl7/v2pCwpn736nLuyZXr txegQJ2D7SqpcDyVWjIzP/Cqccd3xMPvPSEi0USmTTyXxBBx6k+z/WMsCV8mLPB50T cPC6Vt6/ONcbA== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v1 3/9] arm64/sysreg: Generate definitions for CONTEXTIDR_ELx Date: Tue, 17 May 2022 19:22:13 +0100 Message-Id: <20220517182219.2171814-4-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=2223; h=from:subject; bh=weLOsOTtCndBfRTlLXJV5/j9jm5/lNY1fp7zPN2b/Lg=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBig+fTJ3LdDZRSTvEGQkVEcknC1Z6c3sNGKGeea9KM 47KNvQCJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYoPn0wAKCRAk1otyXVSH0Ax2B/ 9Sp1ViKc1i/faCtRAQa6RJPBEenDnI38sT/R7XGb2kS6E2iTlKyx52VhYZ22A+4OFMkG40TRHNHjRZ m03Eh8uTzy3mqt32H9M1ikeBJ7LYaPP7KZBmQQPNdH6xaJExtdwxMysQ+zc6za/gmDMaA5x5iey790 KWltv9gdtBMggIWI+eRUbWA3m5LRPdVILZrxIW8a0DONVQOkLCmECgIBC8JaAYqlhf11+et/uEvFi2 Fv5Tf5k5HkgavETPgYlHilIiQfGfKxMfuWSZc3DpFtCR3XXAIMTqiypyeqZSWEF9lamhgifwpqRIbU ck1p0GkMimc0uqSlnQb4IPtpGO3mak 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_112934_488751_340C57DC X-CRM114-Status: GOOD ( 11.52 ) 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 the various CONTEXTIDR_ELx register definitions to be automatically generated following the definitions in DDI0487H.a. No functional change. Signed-off-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 2 -- arch/arm64/tools/sysreg | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index d7a98dc62029..5a5d6bdaa806 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -449,7 +449,6 @@ #define SYS_ICC_IGRPEN0_EL1 sys_reg(3, 0, 12, 12, 6) #define SYS_ICC_IGRPEN1_EL1 sys_reg(3, 0, 12, 12, 7) -#define SYS_CONTEXTIDR_EL1 sys_reg(3, 0, 13, 0, 1) #define SYS_TPIDR_EL1 sys_reg(3, 0, 13, 0, 4) #define SYS_SCXTNUM_EL1 sys_reg(3, 0, 13, 0, 7) @@ -628,7 +627,6 @@ #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) -#define SYS_CONTEXTIDR_EL12 sys_reg(3, 5, 13, 0, 1) #define SYS_CNTKCTL_EL12 sys_reg(3, 5, 14, 1, 0) #define SYS_CNTP_TVAL_EL02 sys_reg(3, 5, 14, 2, 0) #define SYS_CNTP_CTL_EL02 sys_reg(3, 5, 14, 2, 1) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index 8b5788cbf099..e938d1117d36 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -212,6 +212,15 @@ Sysreg SMCR_EL1 3 0 1 2 6 Fields SMCR_ELx EndSysreg +SysregFields CONTEXTIDR_ELx +Res0 63:32 +Field 31:0 PROCID +EndSysregFields + +Sysreg CONTEXTIDR_EL1 3 0 13 0 1 +Fields CONTEXTIDR_ELx +EndSysreg + Sysreg CCSIDR_EL1 3 1 0 0 0 Res0 63:56 Field 55:32 NumSets @@ -278,6 +287,14 @@ Sysreg SMCR_EL2 3 4 1 2 6 Fields SMCR_ELx EndSysreg +Sysreg CONTEXTIDR_EL2 3 4 13 0 1 +Fields CONTEXTIDR_ELx +EndSysreg + +Sysreg CPACR_EL12 3 5 1 0 2 +Fields CPACR_ELx +EndSysreg + Sysreg ZCR_EL12 3 5 1 2 0 Fields ZCR_ELx EndSysreg @@ -286,6 +303,10 @@ Sysreg SMCR_EL12 3 5 1 2 6 Fields SMCR_ELx EndSysreg +Sysreg CONTEXTIDR_EL12 3 5 13 0 1 +Fields CONTEXTIDR_ELx +EndSysreg + SysregFields TTBRx_EL1 Field 63:48 ASID Field 47:1 BADDR