From: Liao Chang <liaochang1@huawei.com>
To: <catalin.marinas@arm.com>, <will@kernel.org>, <maz@kernel.org>,
<oliver.upton@linux.dev>, <james.morse@arm.com>,
<suzuki.poulose@arm.com>, <yuzenghui@huawei.com>,
<tglx@linutronix.de>, <mark.rutland@arm.com>, <ardb@kernel.org>,
<broonie@kernel.org>, <liaochang1@huawei.com>,
<anshuman.khandual@arm.com>, <miguel.luis@oracle.com>,
<joey.gouly@arm.com>, <ryan.roberts@arm.com>,
<jeremy.linton@arm.com>, <liwei391@huawei.com>,
<daniel.thompson@linaro.org>, <sumit.garg@linaro.org>,
<kristina.martsenko@arm.com>, <jpoimboe@kernel.org>,
<ericchancf@google.com>, <robh@kernel.org>,
<scott@os.amperecomputing.com>, <songshuaishuai@tinylab.org>,
<shijie@os.amperecomputing.com>, <bhe@redhat.com>,
<akpm@linux-foundation.org>, <thunder.leizhen@huawei.com>,
<horms@kernel.org>, <rmk+kernel@armlinux.org.uk>,
<takakura@valinux.co.jp>, <dianders@chromium.org>,
<swboyd@chromium.org>, <frederic@kernel.org>, <reijiw@google.com>,
<akihiko.odaki@daynix.com>, <ruanjinjie@huawei.com>
Cc: <linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <kvmarm@lists.linux.dev>
Subject: [PATCH 4/9] arm64/cpufeature: Simplify detect PE support for FEAT_NMI
Date: Tue, 9 Apr 2024 01:23:39 +0000 [thread overview]
Message-ID: <20240409012344.3194724-5-liaochang1@huawei.com> (raw)
In-Reply-To: <20240409012344.3194724-1-liaochang1@huawei.com>
From: Jinjie Ruan <ruanjinjie@huawei.com>
Simplify the Non-maskable Interrupts feature implementation with
ARM64_CPUID_FIELDS macro.
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2024-04-09 1:30 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-09 1:23 [PATCH 0/9] Rework the DAIF mask, unmask and track API Liao Chang
2024-04-09 1:23 ` [PATCH 1/9] arm64/sysreg: Add definitions for immediate versions of MSR ALLINT Liao Chang
2024-04-09 12:28 ` Mark Brown
2024-04-10 2:06 ` Liao, Chang
2024-04-09 1:23 ` [PATCH 2/9] arm64/cpufeature: Detect PE support for FEAT_NMI Liao Chang
2024-04-09 1:23 ` [PATCH 3/9] arm64/nmi: Add Kconfig for NMI Liao Chang
2024-04-09 1:23 ` Liao Chang [this message]
2024-04-09 1:23 ` [PATCH 5/9] arm64/cpufeature: Use alternatives to check enabled ARM64_HAS_NMI feature Liao Chang
2024-04-09 1:23 ` [PATCH 6/9] arm64: daifflags: Add logical exception masks covering DAIF + PMR + ALLINT Liao Chang
2024-04-09 1:23 ` [PATCH 7/9] arm64: Unify exception masking at entry and exit of exception Liao Chang
2024-04-09 1:23 ` [PATCH 8/9] arm64: Deprecate old local_daif_{mask,save,restore} Liao Chang
2024-04-09 1:23 ` [PATCH 9/9] irqchip/gic-v3: Improve the maintainability of NMI masking in GIC driver Liao Chang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240409012344.3194724-5-liaochang1@huawei.com \
--to=liaochang1@huawei.com \
--cc=akihiko.odaki@daynix.com \
--cc=akpm@linux-foundation.org \
--cc=anshuman.khandual@arm.com \
--cc=ardb@kernel.org \
--cc=bhe@redhat.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=daniel.thompson@linaro.org \
--cc=dianders@chromium.org \
--cc=ericchancf@google.com \
--cc=frederic@kernel.org \
--cc=horms@kernel.org \
--cc=james.morse@arm.com \
--cc=jeremy.linton@arm.com \
--cc=joey.gouly@arm.com \
--cc=jpoimboe@kernel.org \
--cc=kristina.martsenko@arm.com \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liwei391@huawei.com \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=miguel.luis@oracle.com \
--cc=oliver.upton@linux.dev \
--cc=reijiw@google.com \
--cc=rmk+kernel@armlinux.org.uk \
--cc=robh@kernel.org \
--cc=ruanjinjie@huawei.com \
--cc=ryan.roberts@arm.com \
--cc=scott@os.amperecomputing.com \
--cc=shijie@os.amperecomputing.com \
--cc=songshuaishuai@tinylab.org \
--cc=sumit.garg@linaro.org \
--cc=suzuki.poulose@arm.com \
--cc=swboyd@chromium.org \
--cc=takakura@valinux.co.jp \
--cc=tglx@linutronix.de \
--cc=thunder.leizhen@huawei.com \
--cc=will@kernel.org \
--cc=yuzenghui@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox