[PATCH v2 4/9] arm64/cpufeature: Simplify detect PE support for FEAT_NMI

From: Liao Chang
Date: Thu Apr 11 2024 - 02:56:15 EST


From: Jinjie Ruan <ruanjinjie@xxxxxxxxxx>

Simplify the Non-maskable Interrupts feature implementation with
ARM64_CPUID_FIELDS macro.

Signed-off-by: Jinjie Ruan <ruanjinjie@xxxxxxxxxx>
Signed-off-by: Liao Chang <liaochang1@xxxxxxxxxx>
---
arch/arm64/kernel/cpufeature.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index fb9e52c84fda..99c3bc74008d 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -2905,24 +2905,16 @@ static const struct arm64_cpu_capabilities arm64_features[] = {
.desc = "Non-maskable Interrupts present",
.capability = ARM64_HAS_NMI,
.type = ARM64_CPUCAP_BOOT_CPU_FEATURE,
- .sys_reg = SYS_ID_AA64PFR1_EL1,
- .sign = FTR_UNSIGNED,
- .field_pos = ID_AA64PFR1_EL1_NMI_SHIFT,
- .field_width = 4,
- .min_field_value = ID_AA64PFR1_EL1_NMI_IMP,
.matches = has_cpuid_feature,
+ ARM64_CPUID_FIELDS(ID_AA64PFR1_EL1, NMI, IMP)
},
{
.desc = "Non-maskable Interrupts enabled",
.capability = ARM64_USES_NMI,
.type = ARM64_CPUCAP_BOOT_CPU_FEATURE,
- .sys_reg = SYS_ID_AA64PFR1_EL1,
- .sign = FTR_UNSIGNED,
- .field_pos = ID_AA64PFR1_EL1_NMI_SHIFT,
- .field_width = 4,
- .min_field_value = ID_AA64PFR1_EL1_NMI_IMP,
.matches = use_nmi,
.cpu_enable = nmi_enable,
+ ARM64_CPUID_FIELDS(ID_AA64PFR1_EL1, NMI, IMP)
},
#endif
{},
--
2.34.1