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 AA21EC433F5 for ; Fri, 20 May 2022 15:02:34 +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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7s5ChhbX8VStJZ9/LKe25MpxpGinMjrIeQaRwPN9I1w=; b=hr9U5K0j26Ws/A VUKCZru7VCVRuPOL+0/eO/60W39gW+Cx9a6lct0FNLv+0huvQy3FuD9vaXliYngN5CgNK7D+sU8sE bGoPKdmUpOUnZS11vxYW2wk3LoTRGRhsQdD/GB31CGiUzeVs3HhNOizzejedlN9JuRubeKDja3ukj I0m/Za9qRIrhX36/djzsjwoC7EORR9Y9CS/RTLW3NhV7MirKWg91rPikHkrp6xoaKFqGcLHM7WmN3 OT1kvll6rJ3L2SyLtgCgvJxMzYUJp6mmCI0lxh7k8RIW1r1Wk1PuMt5QeADPZuxW/aEoOJeptAk/6 jZoYq5sDIIuhmza8WqHA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ns47x-00D2ov-Uk; Fri, 20 May 2022 15:01:18 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ns47u-00D2ng-GK for linux-arm-kernel@lists.infradead.org; Fri, 20 May 2022 15:01:16 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 235251477; Fri, 20 May 2022 08:01:13 -0700 (PDT) Received: from FVFF77S0Q05N (unknown [10.57.7.188]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 49FBE3F73D; Fri, 20 May 2022 08:01:12 -0700 (PDT) Date: Fri, 20 May 2022 16:01:06 +0100 From: Mark Rutland To: Mark Brown Cc: Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v1 3/9] arm64/sysreg: Generate definitions for CONTEXTIDR_ELx Message-ID: References: <20220517182219.2171814-1-broonie@kernel.org> <20220517182219.2171814-4-broonie@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220517182219.2171814-4-broonie@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220520_080114_627118_19E4C799 X-CRM114-Status: GOOD ( 13.18 ) 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 On Tue, May 17, 2022 at 07:22:13PM +0100, Mark Brown wrote: > 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 Accidental addition? > + > 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 All the CONTEXTIDR_ELx bits look correct, per ARM DDI 0487H.a. With the CPACR_EL12 definition removed: Reviewed-by: Mark Rutland Mark. > + > 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