All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marc Zyngier <maz@kernel.org>
To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu
Cc: kernel-team@android.com,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>, Ard Biesheuvel <ardb@kernel.org>
Subject: [PATCH v2 06/17] arm64: Move VHE-specific SPE setup to mutate_to_vhe()
Date: Mon,  4 Jan 2021 13:50:00 +0000	[thread overview]
Message-ID: <20210104135011.2063104-7-maz@kernel.org> (raw)
In-Reply-To: <20210104135011.2063104-1-maz@kernel.org>

There isn't much that a VHE kernel needs on top of whatever has
been done for nVHE, so let's move the little we need to the
VHE stub (the SPE setup), and drop the init_el2_state macro.

No expected functional change.

Signed-off-by: Marc Zyngier <maz@kernel.org>
---
 arch/arm64/kernel/hyp-stub.S | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S
index b727848bd0ec..232aab84b3cd 100644
--- a/arch/arm64/kernel/hyp-stub.S
+++ b/arch/arm64/kernel/hyp-stub.S
@@ -92,9 +92,6 @@ SYM_CODE_START_LOCAL(mutate_to_vhe)
 	msr	hcr_el2, x0
 	isb
 
-	// Doesn't do much on VHE, but still, worth a shot
-	init_el2_state vhe
-
 	// Use the EL1 allocated stack, per-cpu offset
 	mrs	x0, sp_el1
 	mov	sp, x0
@@ -107,6 +104,31 @@ SYM_CODE_START_LOCAL(mutate_to_vhe)
 	mrs_s	x0, SYS_VBAR_EL12
 	msr	vbar_el1, x0
 
+	// Fixup SPE configuration, if supported...
+	mrs	x1, id_aa64dfr0_el1
+	ubfx	x1, x1, #ID_AA64DFR0_PMSVER_SHIFT, #4
+	mov	x2, xzr
+	cbz	x1, skip_spe
+
+	// ... and not owned by EL3
+	mrs_s	x0, SYS_PMBIDR_EL1
+	and	x0, x0, #(1 << SYS_PMBIDR_EL1_P_SHIFT)
+	cbnz	x0, skip_spe
+
+	// Let the SPE driver in control of the sampling
+	mrs_s	x0, SYS_PMSCR_EL1
+	bic	x0, x0, #(1 << SYS_PMSCR_EL2_PCT_SHIFT)
+	bic	x0, x0, #(1 << SYS_PMSCR_EL2_PA_SHIFT)
+	msr_s	SYS_PMSCR_EL1, x0
+	mov	x2, #MDCR_EL2_TPMS
+
+skip_spe:
+	// For VHE, use EL2 translation and disable access from EL1
+	mrs	x0, mdcr_el2
+	bic	x0, x0, #(MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT)
+	orr	x0, x0, x2
+	msr	mdcr_el2, x0
+
 	// Transfert the MM state from EL1 to EL2
 	mrs_s	x0, SYS_TCR_EL12
 	msr	tcr_el1, x0
-- 
2.29.2

_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

WARNING: multiple messages have this Message-ID (diff)
From: Marc Zyngier <maz@kernel.org>
To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu
Cc: Mark Rutland <mark.rutland@arm.com>,
	kernel-team@android.com,
	Suzuki K Poulose <suzuki.poulose@arm.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Alexandru Elisei <alexandru.elisei@arm.com>,
	James Morse <james.morse@arm.com>,
	David Brazdil <dbrazdil@google.com>,
	Will Deacon <will@kernel.org>, Ard Biesheuvel <ardb@kernel.org>,
	Julien Thierry <julien.thierry.kdev@gmail.com>
Subject: [PATCH v2 06/17] arm64: Move VHE-specific SPE setup to mutate_to_vhe()
Date: Mon,  4 Jan 2021 13:50:00 +0000	[thread overview]
Message-ID: <20210104135011.2063104-7-maz@kernel.org> (raw)
In-Reply-To: <20210104135011.2063104-1-maz@kernel.org>

There isn't much that a VHE kernel needs on top of whatever has
been done for nVHE, so let's move the little we need to the
VHE stub (the SPE setup), and drop the init_el2_state macro.

No expected functional change.

Signed-off-by: Marc Zyngier <maz@kernel.org>
---
 arch/arm64/kernel/hyp-stub.S | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S
index b727848bd0ec..232aab84b3cd 100644
--- a/arch/arm64/kernel/hyp-stub.S
+++ b/arch/arm64/kernel/hyp-stub.S
@@ -92,9 +92,6 @@ SYM_CODE_START_LOCAL(mutate_to_vhe)
 	msr	hcr_el2, x0
 	isb
 
-	// Doesn't do much on VHE, but still, worth a shot
-	init_el2_state vhe
-
 	// Use the EL1 allocated stack, per-cpu offset
 	mrs	x0, sp_el1
 	mov	sp, x0
@@ -107,6 +104,31 @@ SYM_CODE_START_LOCAL(mutate_to_vhe)
 	mrs_s	x0, SYS_VBAR_EL12
 	msr	vbar_el1, x0
 
+	// Fixup SPE configuration, if supported...
+	mrs	x1, id_aa64dfr0_el1
+	ubfx	x1, x1, #ID_AA64DFR0_PMSVER_SHIFT, #4
+	mov	x2, xzr
+	cbz	x1, skip_spe
+
+	// ... and not owned by EL3
+	mrs_s	x0, SYS_PMBIDR_EL1
+	and	x0, x0, #(1 << SYS_PMBIDR_EL1_P_SHIFT)
+	cbnz	x0, skip_spe
+
+	// Let the SPE driver in control of the sampling
+	mrs_s	x0, SYS_PMSCR_EL1
+	bic	x0, x0, #(1 << SYS_PMSCR_EL2_PCT_SHIFT)
+	bic	x0, x0, #(1 << SYS_PMSCR_EL2_PA_SHIFT)
+	msr_s	SYS_PMSCR_EL1, x0
+	mov	x2, #MDCR_EL2_TPMS
+
+skip_spe:
+	// For VHE, use EL2 translation and disable access from EL1
+	mrs	x0, mdcr_el2
+	bic	x0, x0, #(MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT)
+	orr	x0, x0, x2
+	msr	mdcr_el2, x0
+
 	// Transfert the MM state from EL1 to EL2
 	mrs_s	x0, SYS_TCR_EL12
 	msr	tcr_el1, x0
-- 
2.29.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2021-01-04 13:50 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-04 13:49 [PATCH v2 00/17] arm64: Early CPU feature override, and an application to VHE Marc Zyngier
2021-01-04 13:49 ` Marc Zyngier
2021-01-04 13:49 ` [PATCH v2 01/17] arm64: Fix labels in el2_setup macros Marc Zyngier
2021-01-04 13:49   ` Marc Zyngier
2021-01-04 13:49 ` [PATCH v2 02/17] arm64: Fix outdated TCR setup comment Marc Zyngier
2021-01-04 13:49   ` Marc Zyngier
2021-01-04 13:49 ` [PATCH v2 03/17] arm64: Turn the MMU-on sequence into a macro Marc Zyngier
2021-01-04 13:49   ` Marc Zyngier
2021-01-04 13:49 ` [PATCH v2 04/17] arm64: Provide an 'upgrade to VHE' stub hypercall Marc Zyngier
2021-01-04 13:49   ` Marc Zyngier
2021-01-05 20:35   ` Jing Zhang
2021-01-05 20:35     ` Jing Zhang
2021-01-05 21:03     ` Marc Zyngier
2021-01-05 21:03       ` Marc Zyngier
2021-01-04 13:49 ` [PATCH v2 05/17] arm64: Initialise as nVHE before switching to VHE Marc Zyngier
2021-01-04 13:49   ` Marc Zyngier
2021-01-04 13:50 ` Marc Zyngier [this message]
2021-01-04 13:50   ` [PATCH v2 06/17] arm64: Move VHE-specific SPE setup to mutate_to_vhe() Marc Zyngier
2021-01-04 13:50 ` [PATCH v2 07/17] arm64: Simplify init_el2_state to be non-VHE only Marc Zyngier
2021-01-04 13:50   ` Marc Zyngier
2021-01-04 13:50 ` [PATCH v2 08/17] arm64: Move SCTLR_EL1 initialisation to EL-agnostic code Marc Zyngier
2021-01-04 13:50   ` Marc Zyngier
2021-01-04 13:50 ` [PATCH v2 09/17] arm64: cpufeature: Add global feature override facility Marc Zyngier
2021-01-04 13:50   ` Marc Zyngier
2021-01-04 13:50 ` [PATCH v2 10/17] arm64: Extract early FDT mapping from kaslr_early_init() Marc Zyngier
2021-01-04 13:50   ` Marc Zyngier
2021-01-04 13:50 ` [PATCH v2 11/17] arm64: cpufeature: Add an early command-line cpufeature override facility Marc Zyngier
2021-01-04 13:50   ` Marc Zyngier
2021-01-06  2:16   ` Jing Zhang
2021-01-06  2:16     ` Jing Zhang
2021-01-06  9:03     ` Marc Zyngier
2021-01-06  9:03       ` Marc Zyngier
2021-01-04 13:50 ` [PATCH v2 12/17] arm64: Allow ID_AA64MMFR1_EL1.VH to be overridden from the command line Marc Zyngier
2021-01-04 13:50   ` Marc Zyngier
2021-01-05 22:42   ` Jing Zhang
2021-01-05 22:42     ` Jing Zhang
2021-01-04 13:50 ` [PATCH v2 13/17] arm64: Honor VHE being disabled from the command-line Marc Zyngier
2021-01-04 13:50   ` Marc Zyngier
2021-01-04 13:50 ` [PATCH v2 14/17] arm64: Add an aliasing facility for the idreg override Marc Zyngier
2021-01-04 13:50   ` Marc Zyngier
2021-01-04 13:50 ` [PATCH v2 15/17] arm64: Make kvm-arm.mode={nvhe, protected} an alias of id_aa64mmfr1.vh=0 Marc Zyngier
2021-01-04 13:50   ` Marc Zyngier
2021-01-04 13:50 ` [PATCH v2 16/17] KVM: arm64: Document HVC_VHE_RESTART stub hypercall Marc Zyngier
2021-01-04 13:50   ` Marc Zyngier
2021-01-05 22:58   ` Jing Zhang
2021-01-05 22:58     ` Jing Zhang
2021-01-04 13:50 ` [PATCH v2 17/17] arm64: Move "nokaslr" over to the early cpufeature infrastructure Marc Zyngier
2021-01-04 13:50   ` Marc Zyngier

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=20210104135011.2063104-7-maz@kernel.org \
    --to=maz@kernel.org \
    --cc=ardb@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=kernel-team@android.com \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-arm-kernel@lists.infradead.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.