2023-07-18 19:55:55

by Mark Brown

Subject: [PATCH] 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: Mark Brown <[email protected]>
---
arch/arm64/kernel/cpufeature.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index f9d456fe132d..bcb006390e55 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -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)
},
{},
};

---
base-commit: fdf0eaf11452d72945af31804e2a1048ee1b574c
change-id: 20230717-arm64-evt-cpuid-helper-5477a7c469f3

Best regards,
--
Mark Brown <[email protected]>

2023-07-19 15:01:27

by Zenghui Yu

Subject: Re: [PATCH] arm64/cpufeature: Use ARM64_CPUID_FIELD() to match EVT

On 2023/7/19 03:45, Mark Brown wrote:
> 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: Mark Brown <[email protected]>
> ---
> arch/arm64/kernel/cpufeature.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
> index f9d456fe132d..bcb006390e55 100644
> --- a/arch/arm64/kernel/cpufeature.c
> +++ b/arch/arm64/kernel/cpufeature.c
> @@ -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)
> },
> {},
> };

Reviewed-by: Zenghui Yu <[email protected]>

2023-07-27 12:26:46

by Will Deacon

Subject: Re: [PATCH] arm64/cpufeature: Use ARM64_CPUID_FIELD() to match EVT

On Tue, 18 Jul 2023 20:45:44 +0100, Mark Brown wrote:
> The recently added Enhanced Virtualization Traps cpufeature does not use
> the ARM64_CPUID_FIELDS() helper, convert it to do so. No functional
> change.
>
>

Applied to arm64 (for-next/cpufeature), thanks!

[1/1] arm64/cpufeature: Use ARM64_CPUID_FIELD() to match EVT
https://git.kernel.org/arm64/c/ce33cea5d833

Cheers,
--
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev