From: Mark Brown <broonie@kernel.org>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Shuah Khan <skhan@linuxfoundation.org>,
Shuah Khan <shuah@kernel.org>
Cc: Alan Hayward <alan.hayward@arm.com>,
Luis Machado <luis.machado@arm.com>,
Szabolcs Nagy <szabolcs.nagy@arm.com>,
linux-arm-kernel@lists.infradead.org,
linux-kselftest@vger.kernel.org, Mark Brown <broonie@kernel.org>
Subject: [PATCH v2 08/21] arm64/sme: Add basic enumeration for SME2
Date: Tue, 1 Nov 2022 14:33:23 +0000 [thread overview]
Message-ID: <20221101143336.254445-9-broonie@kernel.org> (raw)
In-Reply-To: <20221101143336.254445-1-broonie@kernel.org>
Add basic feature detection for SME2, detecting that the feature is present
and disabling traps for ZT0.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
arch/arm64/include/asm/cpufeature.h | 6 ++++++
arch/arm64/include/asm/fpsimd.h | 1 +
arch/arm64/kernel/cpufeature.c | 14 ++++++++++++++
arch/arm64/kernel/fpsimd.c | 11 +++++++++++
arch/arm64/tools/cpucaps | 1 +
5 files changed, 33 insertions(+)
diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h
index f73f11b55042..3ad41c26c9e7 100644
--- a/arch/arm64/include/asm/cpufeature.h
+++ b/arch/arm64/include/asm/cpufeature.h
@@ -769,6 +769,12 @@ static __always_inline bool system_supports_sme(void)
cpus_have_const_cap(ARM64_SME);
}
+static __always_inline bool system_supports_sme2(void)
+{
+ return IS_ENABLED(CONFIG_ARM64_SME) &&
+ cpus_have_const_cap(ARM64_SME2);
+}
+
static __always_inline bool system_supports_fa64(void)
{
return IS_ENABLED(CONFIG_ARM64_SME) &&
diff --git a/arch/arm64/include/asm/fpsimd.h b/arch/arm64/include/asm/fpsimd.h
index a18a86ccfd82..f2bda963cfe5 100644
--- a/arch/arm64/include/asm/fpsimd.h
+++ b/arch/arm64/include/asm/fpsimd.h
@@ -109,6 +109,7 @@ extern void za_load_state(void const *state);
struct arm64_cpu_capabilities;
extern void sve_kernel_enable(const struct arm64_cpu_capabilities *__unused);
extern void sme_kernel_enable(const struct arm64_cpu_capabilities *__unused);
+extern void sme2_kernel_enable(const struct arm64_cpu_capabilities *__unused);
extern void fa64_kernel_enable(const struct arm64_cpu_capabilities *__unused);
extern u64 read_zcr_features(void);
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index bb1ef8cf7d04..416785eeb512 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -282,6 +282,8 @@ static const struct arm64_ftr_bits ftr_id_aa64zfr0[] = {
static const struct arm64_ftr_bits ftr_id_aa64smfr0[] = {
ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SME),
FTR_STRICT, FTR_EXACT, ID_AA64SMFR0_EL1_FA64_SHIFT, 1, 0),
+ ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SME),
+ FTR_STRICT, FTR_EXACT, ID_AA64SMFR0_EL1_SMEver_SHIFT, 4, 0),
ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SME),
FTR_STRICT, FTR_EXACT, ID_AA64SMFR0_EL1_I16I64_SHIFT, 4, 0),
ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SME),
@@ -2618,6 +2620,18 @@ static const struct arm64_cpu_capabilities arm64_features[] = {
.matches = has_cpuid_feature,
.cpu_enable = fa64_kernel_enable,
},
+ {
+ .desc = "SME2",
+ .type = ARM64_CPUCAP_SYSTEM_FEATURE,
+ .capability = ARM64_SME2,
+ .sys_reg = SYS_ID_AA64SMFR0_EL1,
+ .sign = FTR_UNSIGNED,
+ .field_pos = ID_AA64SMFR0_EL1_SMEver_SHIFT,
+ .field_width = ID_AA64SMFR0_EL1_SMEver_WIDTH,
+ .min_field_value = ID_AA64SMFR0_EL1_SMEver_SME2,
+ .matches = has_cpuid_feature,
+ .cpu_enable = sme2_kernel_enable,
+ },
#endif /* CONFIG_ARM64_SME */
{
.desc = "WFx with timeout",
diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
index b677b5a3e0f6..73ec8850a402 100644
--- a/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
@@ -1254,6 +1254,17 @@ void sme_kernel_enable(const struct arm64_cpu_capabilities *__always_unused p)
isb();
}
+/*
+ * This must be called after sme_kernel_enable(), we rely on the
+ * feature table being sorted to ensure this.
+ */
+void sme2_kernel_enable(const struct arm64_cpu_capabilities *__always_unused p)
+{
+ /* Allow use of ZT0 */
+ write_sysreg_s(read_sysreg_s(SYS_SMCR_EL1) | SMCR_ELx_EZT0_MASK,
+ SYS_SMCR_EL1);
+}
+
/*
* This must be called after sme_kernel_enable(), we rely on the
* feature table being sorted to ensure this.
diff --git a/arch/arm64/tools/cpucaps b/arch/arm64/tools/cpucaps
index f1c0347ec31a..79f511ef3195 100644
--- a/arch/arm64/tools/cpucaps
+++ b/arch/arm64/tools/cpucaps
@@ -49,6 +49,7 @@ MTE
MTE_ASYMM
SME
SME_FA64
+SME2
SPECTRE_V2
SPECTRE_V3A
SPECTRE_V4
--
2.30.2
next prev parent reply other threads:[~2022-11-01 14:39 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-01 14:33 [PATCH v2 00/21] arm64/sme: Support SME 2 and SME 2.1 Mark Brown
2022-11-01 14:33 ` [PATCH v2 01/21] arm64/sme: Rename za_state to sme_state Mark Brown
2022-11-01 14:33 ` [PATCH v2 02/21] arm64: Document boot requirements for SME 2 Mark Brown
2022-11-01 14:33 ` [PATCH v2 03/21] arm64/sysreg: Update system registers for SME 2 and 2.1 Mark Brown
2022-11-01 14:33 ` [PATCH v2 04/21] arm64/sme: Document SME 2 and SME 2.1 ABI Mark Brown
2022-11-11 10:17 ` Luis Machado
2022-11-11 10:38 ` Luis Machado
2022-11-11 11:20 ` Mark Brown
2022-11-01 14:33 ` [PATCH v2 05/21] arm64/esr: Document ISS for ZT0 being disabled Mark Brown
2022-11-01 14:33 ` [PATCH v2 06/21] arm64/sme: Manually encode ZT0 load and store instructions Mark Brown
2022-11-01 14:33 ` [PATCH v2 07/21] arm64/sme: Enable host kernel to access ZT0 Mark Brown
2022-11-01 14:33 ` Mark Brown [this message]
2022-11-01 14:33 ` [PATCH v2 09/21] arm64/sme: Provide storage for ZT0 Mark Brown
2022-11-01 14:33 ` [PATCH v2 10/21] arm64/sme: Implement context switching " Mark Brown
2022-11-01 14:33 ` [PATCH v2 11/21] arm64/sme: Implement signal handling for ZT Mark Brown
2022-11-01 14:33 ` [PATCH v2 12/21] arm64/sme: Implement ZT0 ptrace support Mark Brown
2022-11-11 10:31 ` Luis Machado
2022-11-11 11:25 ` Mark Brown
2022-11-01 14:33 ` [PATCH v2 13/21] arm64/sme: Add hwcaps for SME 2 and 2.1 features Mark Brown
2022-11-01 14:33 ` [PATCH v2 14/21] kselftest/arm64: Add a stress test program for ZT0 Mark Brown
2022-11-01 14:33 ` [PATCH v2 15/21] kselftest/arm64: Cover ZT in the FP stress test Mark Brown
2022-11-01 14:33 ` [PATCH v2 16/21] kselftest/arm64: Enumerate SME2 in the signal test utility code Mark Brown
2022-11-01 14:33 ` [PATCH v2 17/21] kselftest/arm64: Teach the generic signal context validation about ZT Mark Brown
2022-11-01 14:33 ` [PATCH v2 18/21] kselftest/arm64: Add test coverage for ZT register signal frames Mark Brown
2022-11-01 14:33 ` [PATCH v2 19/21] kselftest/arm64: Add SME2 coverage to syscall-abi Mark Brown
2022-11-01 14:33 ` [PATCH v2 20/21] kselftest/arm64: Add coverage of the ZT ptrace regset Mark Brown
2022-11-01 14:33 ` [PATCH v2 21/21] kselftest/arm64: Add coverage of SME 2 and 2.1 hwcaps Mark Brown
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=20221101143336.254445-9-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=alan.hayward@arm.com \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=luis.machado@arm.com \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=szabolcs.nagy@arm.com \
--cc=will@kernel.org \
/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