Re: [PATCH v3 02/17] arm64: sysreg: Migrate MDCR_EL2 definition to table

[Marc Zyngier <maz@kernel.org>]

On Mon, 07 Oct 2024 18:45:44 +0100,
Oliver Upton <oliver.upton@linux.dev> wrote:
> 
> We're about to add some more MDCR_EL2 definitions, may as well migrate
> to the new way of the world at this point.
> 
> Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
> ---
>  arch/arm64/include/asm/kvm_arm.h | 29 ----------------------------
>  arch/arm64/tools/sysreg          | 33 ++++++++++++++++++++++++++++++++
>  2 files changed, 33 insertions(+), 29 deletions(-)
> 
> diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h
> index 109a85ee6910..fb8d15f299a4 100644
> --- a/arch/arm64/include/asm/kvm_arm.h
> +++ b/arch/arm64/include/asm/kvm_arm.h
> @@ -311,35 +311,6 @@
>  				 GENMASK(19, 18) |	\
>  				 GENMASK(15, 0))
>  
> -/* Hyp Debug Configuration Register bits */
> -#define MDCR_EL2_E2TB_MASK	(UL(0x3))
> -#define MDCR_EL2_E2TB_SHIFT	(UL(24))
> -#define MDCR_EL2_HPMFZS		(UL(1) << 36)
> -#define MDCR_EL2_HPMFZO		(UL(1) << 29)
> -#define MDCR_EL2_MTPME		(UL(1) << 28)
> -#define MDCR_EL2_TDCC		(UL(1) << 27)
> -#define MDCR_EL2_HLP		(UL(1) << 26)
> -#define MDCR_EL2_HCCD		(UL(1) << 23)
> -#define MDCR_EL2_TTRF		(UL(1) << 19)
> -#define MDCR_EL2_HPMD		(UL(1) << 17)
> -#define MDCR_EL2_TPMS		(UL(1) << 14)
> -#define MDCR_EL2_E2PB_MASK	(UL(0x3))
> -#define MDCR_EL2_E2PB_SHIFT	(UL(12))
> -#define MDCR_EL2_TDRA		(UL(1) << 11)
> -#define MDCR_EL2_TDOSA		(UL(1) << 10)
> -#define MDCR_EL2_TDA		(UL(1) << 9)
> -#define MDCR_EL2_TDE		(UL(1) << 8)
> -#define MDCR_EL2_HPME		(UL(1) << 7)
> -#define MDCR_EL2_TPM		(UL(1) << 6)
> -#define MDCR_EL2_TPMCR		(UL(1) << 5)
> -#define MDCR_EL2_HPMN_MASK	(UL(0x1F))
> -#define MDCR_EL2_RES0		(GENMASK(63, 37) |	\
> -				 GENMASK(35, 30) |	\
> -				 GENMASK(25, 24) |	\
> -				 GENMASK(22, 20) |	\
> -				 BIT(18) |		\
> -				 GENMASK(16, 15))
> -
>  /*
>   * FGT register definitions
>   *
> diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
> index 8d637ac4b7c6..0cb381c7e582 100644
> --- a/arch/arm64/tools/sysreg
> +++ b/arch/arm64/tools/sysreg
> @@ -2388,6 +2388,39 @@ Field	1	AFSR1_EL1
>  Field	0	AFSR0_EL1
>  EndSysregFields
>  
> +Sysreg MDCR_EL2		3	4	1	1	1
> +Res0	63:44
> +Field	43	EBWE
> +Res0	42
> +Field	41:40	PMEE
> +Res0	39:37
> +Field	36	HPMFZS
> +Res0	35:32
> +Field	31:30	PMSSE
> +Field	29	HPMFZO
> +Field	28	MTPME
> +Field	27	TDCC
> +Field	26	HLP
> +Field	25:24	E2TB
> +Field	23	HCCD
> +Res0	22:20
> +Field	19	TTRF
> +Res0	18
> +Field	17	HPMD
> +Res0	16
> +Field	15	EnSPM
> +Field	14	TPMS
> +Field	13:12	E2PB
> +Field	11	TDRA
> +Field	10	TDOSA
> +Field	9	TDA
> +Field	8	TDE
> +Field	7	HPME
> +Field	6	TPM
> +Field	5	TPMCR
> +Field	4:0	HPMN
> +EndSysreg
> +
>  Sysreg HFGRTR_EL2	3	4	1	1	4
>  Fields	HFGxTR_EL2
>  EndSysreg

Since you are already adding fields compared to the original version,
how about upgrading directly to the 2024-09 XML drop? It at least
contains the instruction stuffing control (EnSTEPOP, bit 50).

Thanks,

	M.

-- 
Without deviation from the norm, progress is not possible.