Received-SPF: Pass (protection.outlook.com: domain of arm.com designates
 63.35.35.123 as permitted sender) receiver=protection.outlook.com;
 client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com;
 pr=C
Received-SPF: Pass (protection.outlook.com: domain of arm.com designates
 40.67.248.234 as permitted sender) receiver=protection.outlook.com;
 client-ip=40.67.248.234; helo=nebula.arm.com; pr=C
Date:   Thu, 9 Mar 2023 10:12:24 +0000
From:   Joey Gouly <joey.gouly@arm.com>
To:     Mark Brown <broonie@kernel.org>
CC:     Catalin Marinas <catalin.marinas@arm.com>,
        Will Deacon <will@kernel.org>,
        <linux-arm-kernel@lists.infradead.org>,
        <linux-kernel@vger.kernel.org>, <nd@arm.com>
Subject: Re: [PATCH v2] arm64/sysreg: Convert HFG[RW]TR_EL2 to automatic
 generation
Message-ID: <20230309101224.GA54799@e124191.cambridge.arm.com>
References: <20230306-arm64-fgt-reg-gen-v2-1-7e166c5b3b42@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20230306-arm64-fgt-reg-gen-v2-1-7e166c5b3b42@kernel.org>
User-Agent: Mutt/1.9.4 (2018-02-28)
NoDisclaimer: true
X-Microsoft-Antispam-Message-Info-Original: l61anGm4rqmPnAeE66GBGVl2GDdlFj+ojiJ7JTIxRBkkCCGlZtGcbKCvIQNT+ZSuuB9vF1K68xACxMkS7QZsAfIz6ZXbEfsnmcl/WvqS4EPHad53sM4sGawxoRnWMPrph6NMb2FrY8n6U3LbEd0gK+JqgiG3V+NWhWlYNxfCjXegGGQluIEvh/scXDxWptevWnuJ1tqPmubS6EuxIu8yBPxPr4VCHb9IYouUtOcKI2Yx/8aueITRL5MjN3XSZIQw5JX3kaZaflyIRvNf66iBaHgjqdxr61os7EUARC2O9IpxPMc2Lug/PgJQJ+XDPX2KkROlLALLzelXD/auPwxcOSNlWRc/2FiwwYNY/JTk3I6ZMvrGe5lFoUTa0CWgN1h9M2jULv4YqJdMnMeBuIWZZ50uOQm2t5NzHv7CmSVxqbfWTsLp/1gtNNRMqzuRkHX+EldDKmSvUtVog673ZowcBqd/20dVHFWTZwwlvLHXKE0GHAUsqSuPSkFD+hXiQtY6UjRpRoRgniRO0Cc59fDNSBPUEXFNYy/xJ+i20IYxXIL85+mmTTGOzmUKG5UdhM07OiGUiUEfizUEIb3DCePGiQ/khRf1khlBPgMGz5RIS+EK3oCzvgsA7Vvp2QlQb3g7fU5uSwOS8Ck0ng82dkF/g9XefJblmqyPmnxdLupP31UhQBjNHVJVgNbK5TYPaC9T
X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(39860400002)(396003)(346002)(136003)(376002)(451199018)(36840700001)(46966006)(33656002)(54906003)(478600001)(966005)(7696005)(316002)(5660300002)(41300700001)(19627235002)(2906002)(8936002)(8676002)(70206006)(44832011)(70586007)(6916009)(4326008)(82740400003)(81166007)(36860700001)(55016003)(356005)(40480700001)(86362001)(1076003)(186003)(26005)(83380400001)(82310400005)(336012)(426003)(47076005)(36900700001);DIR:OUT;SFP:1101;
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR08MB8031
X-MS-Exchange-Transport-CrossTenantHeadersStripped: VI1EUR03FT046.eop-EUR03.prod.protection.outlook.com
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id-Prvs: 7e0a0f14-e88d-4070-7069-08db2086c8a8
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: HN2gsypxSz2PmQiwWf0xXVfLyS9pEz6WhXnOJVYn4VFyKhz5Z7kL2PRFJo6iAybji3sMXs+06xOzLvcnE3Lsi3NnJKA1HDJyo8G4WMVDTwSNWwdtQxKFnpppkqak8aEbAmKfWCGRQL1RygivTZqzcVgrhcKdF13cz1afGOx6UdSoX3xRifwnUbWEJKyufkUr+JlLHlotO+03Q4NXtGVnuFIBjbSLl3GaTNdw35KL7G+lmobl4FsK4r9JyqP2afalO0xEuFh2XgXZwkQR7msWI4G/5N1tN9VwiwLmyYzZTPIwh0glmfTZQmfuIqf3HCqx+UOKq7dAsSP6c0Dz2nJ2DqmOq1aBvYt5gA4V1PERyXUvIiwBIDweiF4mcb8PnK0naeJc9IClC1tQkl2ERqfX7DxKmM064JbJonIe4EpwuUCAjxFIcJoJ8p4GONb5a7T+FQVnOMgjlJoj3sUy80sjoijUpB3Mvv2mOYSskW0lIIx/bpCoKEFPzz1SDDj0OCvO7abUQ2BPsHgSi3WqmXnN7MXwi+p693JaVCQNvIkRr6teyxYldNFO5R/CkLQEOHucn534Q7wSSU0LzJvc5woM9b6wtFik8+iXegXL3NfsLWM6nQkRLqbtYY2m951xIPhSRzNA1nijWHcXuPEsFVcAOlQ08IJ1vog3CJ6RR0hYgDHF5gPg5Bngpq50712GVf9S
X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230025)(4636009)(136003)(376002)(396003)(346002)(39860400002)(451199018)(40470700004)(36840700001)(46966006)(40460700003)(33656002)(54906003)(7696005)(966005)(5660300002)(316002)(8936002)(70586007)(2906002)(19627235002)(8676002)(6862004)(70206006)(4326008)(41300700001)(44832011)(82740400003)(186003)(36860700001)(86362001)(81166007)(478600001)(55016003)(40480700001)(26005)(1076003)(83380400001)(82310400005)(336012)(47076005)(426003);DIR:OUT;SFP:1101;
X-OriginatorOrg: arm.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2023 10:12:37.2438
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: c5123a7c-03c1-4003-3e3a-08db2086cefe
X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com]
X-MS-Exchange-CrossTenant-AuthSource: VI1EUR03FT046.eop-EUR03.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB8737
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Mark,

On Tue, Mar 07, 2023 at 07:11:09PM +0000, Mark Brown wrote:
> Convert the fine grained traps read and write control registers to
> automatic generation as per DDI0601 2022-12. No functional changes.
> 
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
> Changes in v2:
> - Correct naming of nPIRE0_EL1.
> - Link to v1: https://lore.kernel.org/r/20230306-arm64-fgt-reg-gen-v1-1-95bc0c97cfed@kernel.org
> ---
>  arch/arm64/include/asm/sysreg.h |  8 -----
>  arch/arm64/tools/sysreg         | 75 +++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 75 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
> index 9e3ecba3c4e6..e5ca9ece1606 100644
> --- a/arch/arm64/include/asm/sysreg.h
> +++ b/arch/arm64/include/asm/sysreg.h
> @@ -419,8 +419,6 @@
>  #define SYS_MDCR_EL2			sys_reg(3, 4, 1, 1, 1)
>  #define SYS_CPTR_EL2			sys_reg(3, 4, 1, 1, 2)
>  #define SYS_HSTR_EL2			sys_reg(3, 4, 1, 1, 3)
> -#define SYS_HFGRTR_EL2			sys_reg(3, 4, 1, 1, 4)
> -#define SYS_HFGWTR_EL2			sys_reg(3, 4, 1, 1, 5)
>  #define SYS_HFGITR_EL2			sys_reg(3, 4, 1, 1, 6)
>  #define SYS_HACR_EL2			sys_reg(3, 4, 1, 1, 7)
>  
> @@ -758,12 +756,6 @@
>  #define ICH_VTR_TDS_SHIFT	19
>  #define ICH_VTR_TDS_MASK	(1 << ICH_VTR_TDS_SHIFT)
>  
> -/* HFG[WR]TR_EL2 bit definitions */
> -#define HFGxTR_EL2_nTPIDR2_EL0_SHIFT	55
> -#define HFGxTR_EL2_nTPIDR2_EL0_MASK	BIT_MASK(HFGxTR_EL2_nTPIDR2_EL0_SHIFT)
> -#define HFGxTR_EL2_nSMPRI_EL1_SHIFT	54
> -#define HFGxTR_EL2_nSMPRI_EL1_MASK	BIT_MASK(HFGxTR_EL2_nSMPRI_EL1_SHIFT)
> -
>  #define ARM64_FEATURE_FIELD_BITS	4
>  
>  /* Defined for compatibility only, do not add new users. */
> diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
> index dd5a9c7e310f..60829a9409f0 100644
> --- a/arch/arm64/tools/sysreg
> +++ b/arch/arm64/tools/sysreg
> @@ -1866,6 +1866,81 @@ Field	1	ZA
>  Field	0	SM
>  EndSysreg
>  
> +SysregFields	HFGxTR_EL2
> +Field	63	nAMIAIR2_EL1
> +Field	62	nMAIR2_EL1
> +Field	61	nS2POR_EL1
> +Field	60	nPOR_EL1
> +Field	59	nPOR_EL0
> +Field	58	nPIR_EL1
> +Field	57	nPIRE0_EL1
> +Field	56	nRCWMASK_EL1
> +Field	55	nTPIDR2_EL0
> +Field	54	nSMPRI_EL1
> +Field	53	nGCS_EL1
> +Field	52	nGCS_EL0
> +Res0	51
> +Field	50	nACCDATA_EL1
> +Field	49	ERXADDR_EL1
> +Field	48	EXRPFGCDN_EL1
> +Field	47	EXPFGCTL_EL1
> +Field	46	EXPFGF_EL1
> +Field	45	ERXMISCn_EL1
> +Field	44	ERXSTATUS_EL1
> +Field	43	ERXCTLR_EL1
> +Field	42	ERXFR_EL1
> +Field	41	ERRSELR_EL1
> +Field	40	ERRIDR_EL1
> +Field	39	ICC_IGRPENn_EL1
> +Field	38	VBAR_EL1
> +Field	37	TTBR1_EL1
> +Field	36	TTBR0_EL1
> +Field	35	TPIDR_EL0
> +Field	34	TPIDRRO_EL0
> +Field	33	TPIDR_EL1
> +Field	32	TCR_EL1
> +Field	31	SCTXNUM_EL0
> +Field	30	SCTXNUM_EL1
> +Field	29	SCTLR_EL1
> +Field	28	REVIDR_EL1
> +Field	27	PAR_EL1
> +Field	26	MPIDR_EL1
> +Field	25	MIDR_EL1
> +Field	24	MAIR_EL1
> +Field	23	LORSA_EL1
> +Field	22	LORN_EL1
> +Field	21	LORID_EL1
> +Field	20	LOREA_EL1
> +Field	19	LORC_EL1
> +Field	18	ISR_EL1
> +Field	17	FAR_EL1
> +Field	16	ESR_EL1
> +Field	15	DCZID_EL0
> +Field	14	CTR_EL0
> +Field	13	CSSELR_EL1
> +Field	12	CPACR_EL1
> +Field	11	CONTEXTIDR_EL1
> +Field	10	CLIDR_EL1
> +Field	9	CCSIDR_EL1
> +Field	8	APIBKey
> +Field	7	APIAKey
> +Field	6	APGAKey
> +Field	5	APDBKey
> +Field	4	APDAKey
> +Field	3	AMAIR_EL1
> +Field	2	AIDR_EL1
> +Field	1	AFSR1_EL1
> +Field	0	AFSR0_EL1
> +EndSysregFields
> +
> +Sysreg HFGRTR_EL2	3	4	1	1	4
> +Fields	HFGxTR_EL2
> +EndSysreg
> +
> +Sysreg HFGWTR_EL2	3	4	1	1	5
> +Fields	HFGxTR_EL2
> +EndSysreg
> +
>  Sysreg	ZCR_EL2	3	4	1	2	0
>  Fields	ZCR_ELx
>  EndSysreg
> 

Reviewed-by: Joey Gouly <joey.gouly@arm.com>