Commit 55adc08d authored by Mark Brown's avatar Mark Brown Committed by Catalin Marinas
Browse files

arm64/sysreg: Add _EL1 into ID_AA64PFR0_EL1 definition names 



Normally we include the full register name in the defines for fields within
registers but this has not been followed for ID registers. In preparation
for automatic generation of defines add the _EL1s into the defines for
ID_AA64PFR0_EL1 to follow the convention. No functional changes.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarKristina Martsenko <kristina.martsenko@arm.com>
Link: https://lore.kernel.org/r/20220905225425.1871461-7-broonie@kernel.org


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent a957c6be

arch/arm64/include/asm/assembler.h

+1 −1
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ alternative_endif 
 */

	.macro	reset_amuserenr_el0, tmpreg

	mrs	\tmpreg, id_aa64pfr0_el1	// Check ID_AA64PFR0_EL1

	ubfx	\tmpreg, \tmpreg, #ID_AA64PFR0_AMU_SHIFT, #4

	ubfx	\tmpreg, \tmpreg, #ID_AA64PFR0_EL1_AMU_SHIFT, #4

	cbz	\tmpreg, .Lskip_\@		// Skip if no AMU present

	msr_s	SYS_AMUSERENR_EL0, xzr		// Disable AMU access from EL0

.Lskip_\@:

arch/arm64/include/asm/cpufeature.h

+6 −6
Original line number Diff line number Diff line
@@ -603,21 +603,21 @@ static inline bool id_aa64mmfr0_mixed_endian_el0(u64 mmfr0) 


static inline bool id_aa64pfr0_32bit_el1(u64 pfr0)

{

	u32 val = cpuid_feature_extract_unsigned_field(pfr0, ID_AA64PFR0_EL1_SHIFT);

	u32 val = cpuid_feature_extract_unsigned_field(pfr0, ID_AA64PFR0_EL1_EL1_SHIFT);



	return val == ID_AA64PFR0_ELx_32BIT_64BIT;

	return val == ID_AA64PFR0_EL1_ELx_32BIT_64BIT;

}



static inline bool id_aa64pfr0_32bit_el0(u64 pfr0)

{

	u32 val = cpuid_feature_extract_unsigned_field(pfr0, ID_AA64PFR0_EL0_SHIFT);

	u32 val = cpuid_feature_extract_unsigned_field(pfr0, ID_AA64PFR0_EL1_EL0_SHIFT);



	return val == ID_AA64PFR0_ELx_32BIT_64BIT;

	return val == ID_AA64PFR0_EL1_ELx_32BIT_64BIT;

}



static inline bool id_aa64pfr0_sve(u64 pfr0)

{

	u32 val = cpuid_feature_extract_unsigned_field(pfr0, ID_AA64PFR0_SVE_SHIFT);

	u32 val = cpuid_feature_extract_unsigned_field(pfr0, ID_AA64PFR0_EL1_SVE_SHIFT);



	return val > 0;

}
@@ -659,7 +659,7 @@ static inline bool supports_csv2p3(int scope) 
		pfr0 = read_sanitised_ftr_reg(SYS_ID_AA64PFR0_EL1);



	csv2_val = cpuid_feature_extract_unsigned_field(pfr0,

							ID_AA64PFR0_CSV2_SHIFT);

							ID_AA64PFR0_EL1_CSV2_SHIFT);

	return csv2_val == 3;

}

arch/arm64/include/asm/el2_setup.h

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
/* GICv3 system register access */

.macro __init_el2_gicv3

	mrs	x0, id_aa64pfr0_el1

	ubfx	x0, x0, #ID_AA64PFR0_GIC_SHIFT, #4

	ubfx	x0, x0, #ID_AA64PFR0_EL1_GIC_SHIFT, #4

	cbz	x0, .Lskip_gicv3_\@



	mrs_s	x0, SYS_ICC_SRE_EL2
@@ -162,7 +162,7 @@ 
	msr_s	SYS_HFGITR_EL2, xzr



	mrs	x1, id_aa64pfr0_el1		// AMU traps UNDEF without AMU

	ubfx	x1, x1, #ID_AA64PFR0_AMU_SHIFT, #4

	ubfx	x1, x1, #ID_AA64PFR0_EL1_AMU_SHIFT, #4

	cbz	x1, .Lskip_fgt_\@



	msr_s	SYS_HAFGRTR_EL2, xzr

arch/arm64/include/asm/sysreg.h

+26 −26
Original line number Diff line number Diff line
@@ -686,32 +686,32 @@ 
#define MAIR_ATTRIDX(attr, idx)		((attr) << ((idx) * 8))



/* id_aa64pfr0 */

#define ID_AA64PFR0_CSV3_SHIFT		60

#define ID_AA64PFR0_CSV2_SHIFT		56

#define ID_AA64PFR0_DIT_SHIFT		48

#define ID_AA64PFR0_AMU_SHIFT		44

#define ID_AA64PFR0_MPAM_SHIFT		40

#define ID_AA64PFR0_SEL2_SHIFT		36

#define ID_AA64PFR0_SVE_SHIFT		32

#define ID_AA64PFR0_RAS_SHIFT		28

#define ID_AA64PFR0_GIC_SHIFT		24

#define ID_AA64PFR0_ASIMD_SHIFT		20

#define ID_AA64PFR0_FP_SHIFT		16

#define ID_AA64PFR0_EL3_SHIFT		12

#define ID_AA64PFR0_EL2_SHIFT		8

#define ID_AA64PFR0_EL1_SHIFT		4

#define ID_AA64PFR0_EL0_SHIFT		0



#define ID_AA64PFR0_AMU			0x1

#define ID_AA64PFR0_SVE			0x1

#define ID_AA64PFR0_RAS_V1		0x1

#define ID_AA64PFR0_RAS_V1P1		0x2

#define ID_AA64PFR0_FP_NI		0xf

#define ID_AA64PFR0_FP_SUPPORTED	0x0

#define ID_AA64PFR0_ASIMD_NI		0xf

#define ID_AA64PFR0_ASIMD_SUPPORTED	0x0

#define ID_AA64PFR0_ELx_64BIT_ONLY	0x1

#define ID_AA64PFR0_ELx_32BIT_64BIT	0x2

#define ID_AA64PFR0_EL1_CSV3_SHIFT		60

#define ID_AA64PFR0_EL1_CSV2_SHIFT		56

#define ID_AA64PFR0_EL1_DIT_SHIFT		48

#define ID_AA64PFR0_EL1_AMU_SHIFT		44

#define ID_AA64PFR0_EL1_MPAM_SHIFT		40

#define ID_AA64PFR0_EL1_SEL2_SHIFT		36

#define ID_AA64PFR0_EL1_SVE_SHIFT		32

#define ID_AA64PFR0_EL1_RAS_SHIFT		28

#define ID_AA64PFR0_EL1_GIC_SHIFT		24

#define ID_AA64PFR0_EL1_ASIMD_SHIFT		20

#define ID_AA64PFR0_EL1_FP_SHIFT		16

#define ID_AA64PFR0_EL1_EL3_SHIFT		12

#define ID_AA64PFR0_EL1_EL2_SHIFT		8

#define ID_AA64PFR0_EL1_EL1_SHIFT		4

#define ID_AA64PFR0_EL1_EL0_SHIFT		0



#define ID_AA64PFR0_EL1_AMU			0x1

#define ID_AA64PFR0_EL1_SVE			0x1

#define ID_AA64PFR0_EL1_RAS_V1			0x1

#define ID_AA64PFR0_EL1_RAS_V1P1		0x2

#define ID_AA64PFR0_EL1_FP_NI			0xf

#define ID_AA64PFR0_EL1_FP_SUPPORTED		0x0

#define ID_AA64PFR0_EL1_ASIMD_NI		0xf

#define ID_AA64PFR0_EL1_ASIMD_SUPPORTED		0x0

#define ID_AA64PFR0_EL1_ELx_64BIT_ONLY		0x1

#define ID_AA64PFR0_EL1_ELx_32BIT_64BIT		0x2



/* id_aa64pfr1 */

#define ID_AA64PFR1_SME_SHIFT		24

arch/arm64/kernel/cpufeature.c

+35 −35
Original line number Diff line number Diff line
@@ -243,22 +243,22 @@ static const struct arm64_ftr_bits ftr_id_aa64isar2[] = { 
};



static const struct arm64_ftr_bits ftr_id_aa64pfr0[] = {

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_CSV3_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_CSV2_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_DIT_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_AMU_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_MPAM_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_SEL2_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL1_CSV3_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL1_CSV2_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL1_DIT_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL1_AMU_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL1_MPAM_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL1_SEL2_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SVE),

				   FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_SVE_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_RAS_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_GIC_SHIFT, 4, 0),

	S_ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_ASIMD_SHIFT, 4, ID_AA64PFR0_ASIMD_NI),

	S_ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_FP_SHIFT, 4, ID_AA64PFR0_FP_NI),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL3_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL2_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL1_SHIFT, 4, ID_AA64PFR0_ELx_64BIT_ONLY),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL0_SHIFT, 4, ID_AA64PFR0_ELx_64BIT_ONLY),

				   FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL1_SVE_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL1_RAS_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL1_GIC_SHIFT, 4, 0),

	S_ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL1_ASIMD_SHIFT, 4, ID_AA64PFR0_EL1_ASIMD_NI),

	S_ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL1_FP_SHIFT, 4, ID_AA64PFR0_EL1_FP_NI),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL1_EL3_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL1_EL2_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL1_EL1_SHIFT, 4, ID_AA64PFR0_EL1_ELx_64BIT_ONLY),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL1_EL0_SHIFT, 4, ID_AA64PFR0_EL1_ELx_64BIT_ONLY),

	ARM64_FTR_END,

};
@@ -1492,7 +1492,7 @@ static bool has_no_fpsimd(const struct arm64_cpu_capabilities *entry, int __unus 
	u64 pfr0 = read_sanitised_ftr_reg(SYS_ID_AA64PFR0_EL1);



	return cpuid_feature_extract_signed_field(pfr0,

					ID_AA64PFR0_FP_SHIFT) < 0;

					ID_AA64PFR0_EL1_FP_SHIFT) < 0;

}



static bool has_cache_idc(const struct arm64_cpu_capabilities *entry,
@@ -2093,7 +2093,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = { 
		.type = ARM64_CPUCAP_STRICT_BOOT_CPU_FEATURE,

		.matches = has_useable_gicv3_cpuif,

		.sys_reg = SYS_ID_AA64PFR0_EL1,

		.field_pos = ID_AA64PFR0_GIC_SHIFT,

		.field_pos = ID_AA64PFR0_EL1_GIC_SHIFT,

		.field_width = 4,

		.sign = FTR_UNSIGNED,

		.min_field_value = 1,
@@ -2168,9 +2168,9 @@ static const struct arm64_cpu_capabilities arm64_features[] = { 
		.matches = has_32bit_el0,

		.sys_reg = SYS_ID_AA64PFR0_EL1,

		.sign = FTR_UNSIGNED,

		.field_pos = ID_AA64PFR0_EL0_SHIFT,

		.field_pos = ID_AA64PFR0_EL1_EL0_SHIFT,

		.field_width = 4,

		.min_field_value = ID_AA64PFR0_ELx_32BIT_64BIT,

		.min_field_value = ID_AA64PFR0_EL1_ELx_32BIT_64BIT,

	},

#ifdef CONFIG_KVM

	{
@@ -2180,9 +2180,9 @@ static const struct arm64_cpu_capabilities arm64_features[] = { 
		.matches = has_cpuid_feature,

		.sys_reg = SYS_ID_AA64PFR0_EL1,

		.sign = FTR_UNSIGNED,

		.field_pos = ID_AA64PFR0_EL1_SHIFT,

		.field_pos = ID_AA64PFR0_EL1_EL1_SHIFT,

		.field_width = 4,

		.min_field_value = ID_AA64PFR0_ELx_32BIT_64BIT,

		.min_field_value = ID_AA64PFR0_EL1_ELx_32BIT_64BIT,

	},

	{

		.desc = "Protected KVM",
@@ -2201,7 +2201,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = { 
		 * more details.

		 */

		.sys_reg = SYS_ID_AA64PFR0_EL1,

		.field_pos = ID_AA64PFR0_CSV3_SHIFT,

		.field_pos = ID_AA64PFR0_EL1_CSV3_SHIFT,

		.field_width = 4,

		.min_field_value = 1,

		.matches = unmap_kernel_at_el0,
@@ -2244,9 +2244,9 @@ static const struct arm64_cpu_capabilities arm64_features[] = { 
		.capability = ARM64_SVE,

		.sys_reg = SYS_ID_AA64PFR0_EL1,

		.sign = FTR_UNSIGNED,

		.field_pos = ID_AA64PFR0_SVE_SHIFT,

		.field_pos = ID_AA64PFR0_EL1_SVE_SHIFT,

		.field_width = 4,

		.min_field_value = ID_AA64PFR0_SVE,

		.min_field_value = ID_AA64PFR0_EL1_SVE,

		.matches = has_cpuid_feature,

		.cpu_enable = sve_kernel_enable,

	},
@@ -2259,9 +2259,9 @@ static const struct arm64_cpu_capabilities arm64_features[] = { 
		.matches = has_cpuid_feature,

		.sys_reg = SYS_ID_AA64PFR0_EL1,

		.sign = FTR_UNSIGNED,

		.field_pos = ID_AA64PFR0_RAS_SHIFT,

		.field_pos = ID_AA64PFR0_EL1_RAS_SHIFT,

		.field_width = 4,

		.min_field_value = ID_AA64PFR0_RAS_V1,

		.min_field_value = ID_AA64PFR0_EL1_RAS_V1,

		.cpu_enable = cpu_clear_disr,

	},

#endif /* CONFIG_ARM64_RAS_EXTN */
@@ -2278,9 +2278,9 @@ static const struct arm64_cpu_capabilities arm64_features[] = { 
		.matches = has_amu,

		.sys_reg = SYS_ID_AA64PFR0_EL1,

		.sign = FTR_UNSIGNED,

		.field_pos = ID_AA64PFR0_AMU_SHIFT,

		.field_pos = ID_AA64PFR0_EL1_AMU_SHIFT,

		.field_width = 4,

		.min_field_value = ID_AA64PFR0_AMU,

		.min_field_value = ID_AA64PFR0_EL1_AMU,

		.cpu_enable = cpu_amu_enable,

	},

#endif /* CONFIG_ARM64_AMU_EXTN */
@@ -2485,7 +2485,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = { 
		.type = ARM64_CPUCAP_STRICT_BOOT_CPU_FEATURE,

		.matches = can_use_gic_priorities,

		.sys_reg = SYS_ID_AA64PFR0_EL1,

		.field_pos = ID_AA64PFR0_GIC_SHIFT,

		.field_pos = ID_AA64PFR0_EL1_GIC_SHIFT,

		.field_width = 4,

		.sign = FTR_UNSIGNED,

		.min_field_value = 1,
@@ -2708,11 +2708,11 @@ static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = { 
	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_EL1_TS_SHIFT, 4, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_FLAGM),

	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_EL1_TS_SHIFT, 4, FTR_UNSIGNED, 2, CAP_HWCAP, KERNEL_HWCAP_FLAGM2),

	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_EL1_RNDR_SHIFT, 4, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_RNG),

	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_FP_SHIFT, 4, FTR_SIGNED, 0, CAP_HWCAP, KERNEL_HWCAP_FP),

	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_FP_SHIFT, 4, FTR_SIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_FPHP),

	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_ASIMD_SHIFT, 4, FTR_SIGNED, 0, CAP_HWCAP, KERNEL_HWCAP_ASIMD),

	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_ASIMD_SHIFT, 4, FTR_SIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_ASIMDHP),

	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_DIT_SHIFT, 4, FTR_SIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_DIT),

	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_EL1_FP_SHIFT, 4, FTR_SIGNED, 0, CAP_HWCAP, KERNEL_HWCAP_FP),

	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_EL1_FP_SHIFT, 4, FTR_SIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_FPHP),

	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_EL1_ASIMD_SHIFT, 4, FTR_SIGNED, 0, CAP_HWCAP, KERNEL_HWCAP_ASIMD),

	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_EL1_ASIMD_SHIFT, 4, FTR_SIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_ASIMDHP),

	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_EL1_DIT_SHIFT, 4, FTR_SIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_DIT),

	HWCAP_CAP(SYS_ID_AA64ISAR1_EL1, ID_AA64ISAR1_EL1_DPB_SHIFT, 4, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_DCPOP),

	HWCAP_CAP(SYS_ID_AA64ISAR1_EL1, ID_AA64ISAR1_EL1_DPB_SHIFT, 4, FTR_UNSIGNED, 2, CAP_HWCAP, KERNEL_HWCAP_DCPODP),

	HWCAP_CAP(SYS_ID_AA64ISAR1_EL1, ID_AA64ISAR1_EL1_JSCVT_SHIFT, 4, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_JSCVT),
@@ -2727,7 +2727,7 @@ static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = { 
	HWCAP_CAP(SYS_ID_AA64ISAR1_EL1, ID_AA64ISAR1_EL1_I8MM_SHIFT, 4, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_I8MM),

	HWCAP_CAP(SYS_ID_AA64MMFR2_EL1, ID_AA64MMFR2_EL1_AT_SHIFT, 4, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_USCAT),

#ifdef CONFIG_ARM64_SVE

	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_SVE_SHIFT, 4, FTR_UNSIGNED, ID_AA64PFR0_SVE, CAP_HWCAP, KERNEL_HWCAP_SVE),

	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_EL1_SVE_SHIFT, 4, FTR_UNSIGNED, ID_AA64PFR0_EL1_SVE, CAP_HWCAP, KERNEL_HWCAP_SVE),

	HWCAP_CAP(SYS_ID_AA64ZFR0_EL1, ID_AA64ZFR0_EL1_SVEver_SHIFT, 4, FTR_UNSIGNED, ID_AA64ZFR0_EL1_SVEver_SVE2, CAP_HWCAP, KERNEL_HWCAP_SVE2),

	HWCAP_CAP(SYS_ID_AA64ZFR0_EL1, ID_AA64ZFR0_EL1_AES_SHIFT, 4, FTR_UNSIGNED, ID_AA64ZFR0_EL1_AES_IMP, CAP_HWCAP, KERNEL_HWCAP_SVEAES),

	HWCAP_CAP(SYS_ID_AA64ZFR0_EL1, ID_AA64ZFR0_EL1_AES_SHIFT, 4, FTR_UNSIGNED, ID_AA64ZFR0_EL1_AES_PMULL128, CAP_HWCAP, KERNEL_HWCAP_SVEPMULL),