Commit ce33cea5 authored by Mark Brown's avatar Mark Brown Committed by Will Deacon
Browse files

arm64/cpufeature: Use ARM64_CPUID_FIELD() to match EVT 



The recently added Enhanced Virtualization Traps cpufeature does not use
the ARM64_CPUID_FIELDS() helper, convert it to do so. No functional
change.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarZenghui Yu <zenghui.yu@linux.dev>
Link: https://lore.kernel.org/r/20230718-arm64-evt-cpuid-helper-v1-1-68375d1e6b92@kernel.org


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 6eaae198

arch/arm64/kernel/cpufeature.c

+1 −5
Original line number Diff line number Diff line
@@ -2708,12 +2708,8 @@ static const struct arm64_cpu_capabilities arm64_features[] = { 
		.desc = "Enhanced Virtualization Traps",

		.capability = ARM64_HAS_EVT,

		.type = ARM64_CPUCAP_SYSTEM_FEATURE,

		.sys_reg = SYS_ID_AA64MMFR2_EL1,

		.sign = FTR_UNSIGNED,

		.field_pos = ID_AA64MMFR2_EL1_EVT_SHIFT,

		.field_width = 4,

		.min_field_value = ID_AA64MMFR2_EL1_EVT_IMP,

		.matches = has_cpuid_feature,

		ARM64_CPUID_FIELDS(ID_AA64MMFR2_EL1, EVT, IMP)

	},

	{},

};