linux-kselftest.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>, Marc Zyngier <maz@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>,
	Salil Akerkar <Salil.Akerkar@arm.com>,
	Basant Kumar Dwivedi <Basant.KumarDwivedi@arm.com>,
	Szabolcs Nagy <szabolcs.nagy@arm.com>,
	James Morse <james.morse@arm.com>,
	Alexandru Elisei <alexandru.elisei@arm.com>,
	Suzuki K Poulose <suzuki.poulose@arm.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kselftest@vger.kernel.org, kvmarm@lists.cs.columbia.edu,
	Mark Brown <broonie@kernel.org>
Subject: [PATCH v12 09/40] arm64/sme: Early CPU setup for SME
Date: Fri, 25 Feb 2022 16:58:52 +0000	[thread overview]
Message-ID: <20220225165923.1474372-10-broonie@kernel.org> (raw)
In-Reply-To: <20220225165923.1474372-1-broonie@kernel.org>

SME requires similar setup to that for SVE: disable traps to EL2 and
make sure that the maximum vector length is available to EL1, for SME we
have two traps - one for SME itself and one for TPIDR2.

In addition since we currently make no active use of priority control
for SCMUs we map all SME priorities lower ELs may configure to 0, the
architecture specified minimum priority, to ensure that nothing we
manage is able to configure itself to consume excessive resources.  This
will need to be revisited should there be a need to manage SME
priorities at runtime.

Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
---
 arch/arm64/include/asm/el2_setup.h | 64 ++++++++++++++++++++++++++++--
 1 file changed, 60 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el2_setup.h
index 3198acb2aad8..31f1a69c9dd2 100644
--- a/arch/arm64/include/asm/el2_setup.h
+++ b/arch/arm64/include/asm/el2_setup.h
@@ -143,6 +143,50 @@
 .Lskip_sve_\@:
 .endm
 
+/* SME register access and priority mapping */
+.macro __init_el2_nvhe_sme
+	mrs	x1, id_aa64pfr1_el1
+	ubfx	x1, x1, #ID_AA64PFR1_SME_SHIFT, #4
+	cbz	x1, .Lskip_sme_\@
+
+	bic	x0, x0, #CPTR_EL2_TSM		// Also disable SME traps
+	msr	cptr_el2, x0			// Disable copro. traps to EL2
+	isb
+
+	mrs	x1, sctlr_el2
+	orr	x1, x1, #SCTLR_ELx_ENTP2	// Disable TPIDR2 traps
+	msr	sctlr_el2, x1
+	isb
+
+	mov	x1, #0				// SMCR controls
+
+	mrs_s	x2, SYS_ID_AA64SMFR0_EL1
+	ubfx	x2, x2, #ID_AA64SMFR0_FA64_SHIFT, #1 // Full FP in SM?
+	cbz	x2, .Lskip_sme_fa64_\@
+
+	orr	x1, x1, SMCR_ELx_FA64_MASK
+.Lskip_sme_fa64_\@:
+
+	orr	x1, x1, #SMCR_ELx_LEN_MASK	// Enable full SME vector
+	msr_s	SYS_SMCR_EL2, x1		// length for EL1.
+
+	mrs_s	x1, SYS_SMIDR_EL1		// Priority mapping supported?
+	ubfx    x1, x1, #SYS_SMIDR_EL1_SMPS_SHIFT, #1
+	cbz     x1, .Lskip_sme_\@
+
+	msr_s	SYS_SMPRIMAP_EL2, xzr		// Make all priorities equal
+
+	mrs	x1, id_aa64mmfr1_el1		// HCRX_EL2 present?
+	ubfx	x1, x1, #ID_AA64MMFR1_HCX_SHIFT, #4
+	cbz	x1, .Lskip_sme_\@
+
+	mrs_s	x1, SYS_HCRX_EL2
+	orr	x1, x1, #HCRX_EL2_SMPME_MASK	// Enable priority mapping
+	msr_s	SYS_HCRX_EL2, x1
+
+.Lskip_sme_\@:
+.endm
+
 /* Disable any fine grained traps */
 .macro __init_el2_fgt
 	mrs	x1, id_aa64mmfr0_el1
@@ -153,15 +197,26 @@
 	mrs	x1, id_aa64dfr0_el1
 	ubfx	x1, x1, #ID_AA64DFR0_PMSVER_SHIFT, #4
 	cmp	x1, #3
-	b.lt	.Lset_fgt_\@
+	b.lt	.Lset_debug_fgt_\@
 	/* Disable PMSNEVFR_EL1 read and write traps */
 	orr	x0, x0, #(1 << 62)
 
-.Lset_fgt_\@:
+.Lset_debug_fgt_\@:
 	msr_s	SYS_HDFGRTR_EL2, x0
 	msr_s	SYS_HDFGWTR_EL2, x0
-	msr_s	SYS_HFGRTR_EL2, xzr
-	msr_s	SYS_HFGWTR_EL2, xzr
+
+	mov	x0, xzr
+	mrs	x1, id_aa64pfr1_el1
+	ubfx	x1, x1, #ID_AA64PFR1_SME_SHIFT, #4
+	cbz	x1, .Lset_fgt_\@
+
+	/* Disable nVHE traps of TPIDR2 and SMPRI */
+	orr	x0, x0, #HFGxTR_EL2_nSMPRI_EL1_MASK
+	orr	x0, x0, #HFGxTR_EL2_nTPIDR2_EL0_MASK
+
+.Lset_fgt_\@:
+	msr_s	SYS_HFGRTR_EL2, x0
+	msr_s	SYS_HFGWTR_EL2, x0
 	msr_s	SYS_HFGITR_EL2, xzr
 
 	mrs	x1, id_aa64pfr0_el1		// AMU traps UNDEF without AMU
@@ -196,6 +251,7 @@
 	__init_el2_nvhe_idregs
 	__init_el2_nvhe_cptr
 	__init_el2_nvhe_sve
+	__init_el2_nvhe_sme
 	__init_el2_fgt
 	__init_el2_nvhe_prepare_eret
 .endm
-- 
2.30.2


  parent reply	other threads:[~2022-02-25 17:35 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-25 16:58 [PATCH v12 00/40] arm64/sme: Initial support for the Scalable Matrix Extension Mark Brown
2022-02-25 16:58 ` [PATCH v12 01/40] arm64: Define CPACR_EL1_FPEN similarly to other floating point controls Mark Brown
2022-02-25 16:58 ` [PATCH v12 02/40] arm64: Always use individual bits in CPACR floating point enables Mark Brown
2022-02-25 16:58 ` [PATCH v12 03/40] arm64: cpufeature: Always specify and use a field width for capabilities Mark Brown
2022-02-25 16:58 ` [PATCH v12 04/40] kselftest/arm64: Remove local ARRAY_SIZE() definitions Mark Brown
2022-02-25 16:58 ` [PATCH v12 05/40] kselftest/arm64: signal: Allow tests to be incompatible with features Mark Brown
2022-02-25 16:58 ` [PATCH v12 06/40] arm64/sme: Provide ABI documentation for SME Mark Brown
2022-03-02 17:23   ` Catalin Marinas
2022-03-11 17:21   ` Szabolcs Nagy
2022-03-11 18:42     ` Mark Brown
2022-03-31 16:05       ` Szabolcs Nagy
2022-04-06 18:50         ` Mark Brown
2022-04-07 15:26           ` Szabolcs Nagy
2022-06-06 10:35   ` Luis Machado
2022-02-25 16:58 ` [PATCH v12 07/40] arm64/sme: System register and exception syndrome definitions Mark Brown
2022-02-25 16:58 ` [PATCH v12 08/40] arm64/sme: Manually encode SME instructions Mark Brown
2022-03-02 14:35   ` Catalin Marinas
2022-02-25 16:58 ` Mark Brown [this message]
2022-02-25 16:58 ` [PATCH v12 10/40] arm64/sme: Basic enumeration support Mark Brown
2022-03-02 16:29   ` Catalin Marinas
2022-02-25 16:58 ` [PATCH v12 11/40] arm64/sme: Identify supported SME vector lengths at boot Mark Brown
2022-03-02 16:41   ` Catalin Marinas
2022-03-16 21:32   ` Thiago Jung Bauermann
2022-02-25 16:58 ` [PATCH v12 12/40] arm64/sme: Implement sysctl to set the default vector length Mark Brown
2022-02-25 16:58 ` [PATCH v12 13/40] arm64/sme: Implement vector length configuration prctl()s Mark Brown
2022-02-25 16:58 ` [PATCH v12 14/40] arm64/sme: Implement support for TPIDR2 Mark Brown
2022-02-25 16:58 ` [PATCH v12 15/40] arm64/sme: Implement SVCR context switching Mark Brown
2022-02-25 16:58 ` [PATCH v12 16/40] arm64/sme: Implement streaming SVE " Mark Brown
2022-02-25 16:59 ` [PATCH v12 17/40] arm64/sme: Implement ZA " Mark Brown
2022-02-25 16:59 ` [PATCH v12 18/40] arm64/sme: Implement traps and syscall handling for SME Mark Brown
2022-03-02 17:07   ` Catalin Marinas
2022-02-25 16:59 ` [PATCH v12 19/40] arm64/sme: Disable ZA and streaming mode when handling signals Mark Brown
2022-02-25 16:59 ` [PATCH v12 20/40] arm64/sme: Implement streaming SVE signal handling Mark Brown
2022-03-02 17:09   ` Catalin Marinas
2022-03-16 22:38   ` Thiago Jung Bauermann
2022-02-25 16:59 ` [PATCH v12 21/40] arm64/sme: Implement ZA " Mark Brown
2022-02-25 16:59 ` [PATCH v12 22/40] arm64/sme: Implement ptrace support for streaming mode SVE registers Mark Brown
2022-03-02 17:11   ` Catalin Marinas
2022-02-25 16:59 ` [PATCH v12 23/40] arm64/sme: Add ptrace support for ZA Mark Brown
2022-03-15 21:51   ` Thiago Jung Bauermann
2022-02-25 16:59 ` [PATCH v12 24/40] arm64/sme: Disable streaming mode and ZA when flushing CPU state Mark Brown
2022-02-25 16:59 ` [PATCH v12 25/40] arm64/sme: Save and restore streaming mode over EFI runtime calls Mark Brown
2022-02-25 16:59 ` [PATCH v12 26/40] KVM: arm64: Hide SME system registers from guests Mark Brown
2022-02-25 16:59 ` [PATCH v12 27/40] KVM: arm64: Trap SME usage in guest Mark Brown
2022-02-25 16:59 ` [PATCH v12 28/40] KVM: arm64: Handle SME host state when running guests Mark Brown
2022-02-25 16:59 ` [PATCH v12 29/40] arm64/sme: Provide Kconfig for SME Mark Brown
2022-02-25 16:59 ` [PATCH v12 30/40] kselftest/arm64: Add manual encodings for SME instructions Mark Brown
2022-02-25 16:59 ` [PATCH v12 31/40] kselftest/arm64: sme: Add SME support to vlset Mark Brown
2022-02-25 16:59 ` [PATCH v12 32/40] kselftest/arm64: Add tests for TPIDR2 Mark Brown
2022-02-25 16:59 ` [PATCH v12 33/40] kselftest/arm64: Extend vector configuration API tests to cover SME Mark Brown
2022-02-25 16:59 ` [PATCH v12 34/40] kselftest/arm64: sme: Provide streaming mode SVE stress test Mark Brown
2022-02-25 16:59 ` [PATCH v12 35/40] kselftest/arm64: signal: Handle ZA signal context in core code Mark Brown
2022-02-25 16:59 ` [PATCH v12 36/40] kselftest/arm64: Add stress test for SME ZA context switching Mark Brown
2022-02-25 16:59 ` [PATCH v12 37/40] kselftest/arm64: signal: Add SME signal handling tests Mark Brown
2022-02-25 16:59 ` [PATCH v12 38/40] kselftest/arm64: Add streaming SVE to SVE ptrace tests Mark Brown
2022-02-25 16:59 ` [PATCH v12 39/40] kselftest/arm64: Add coverage for the ZA ptrace interface Mark Brown
2022-02-25 16:59 ` [PATCH v12 40/40] kselftest/arm64: Add SME support to syscall ABI test 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=20220225165923.1474372-10-broonie@kernel.org \
    --to=broonie@kernel.org \
    --cc=Basant.KumarDwivedi@arm.com \
    --cc=Salil.Akerkar@arm.com \
    --cc=alan.hayward@arm.com \
    --cc=alexandru.elisei@arm.com \
    --cc=catalin.marinas@arm.com \
    --cc=james.morse@arm.com \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=luis.machado@arm.com \
    --cc=maz@kernel.org \
    --cc=shuah@kernel.org \
    --cc=skhan@linuxfoundation.org \
    --cc=suzuki.poulose@arm.com \
    --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;
as well as URLs for NNTP newsgroup(s).