From: Mark Brown <broonie@kernel.org>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>, Marc Zyngier <maz@kernel.org>
Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Sami Mujawar <Sami.Mujawar@arm.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev,
Mark Brown <broonie@kernel.org>
Subject: [PATCH v2 06/14] arm64/hyp-stub: Enable access to ALLINT
Date: Sat, 12 Nov 2022 15:17:00 +0000 [thread overview]
Message-ID: <20221112151708.175147-7-broonie@kernel.org> (raw)
In-Reply-To: <20221112151708.175147-1-broonie@kernel.org>
In order to use NMIs we need to ensure that traps are disabled for it so
update HCRX_EL2 to ensure that TALLINT is not set when we detect support
for NMIs.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
arch/arm64/kernel/hyp-stub.S | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S
index 2ee18c860f2a..4e0b06467973 100644
--- a/arch/arm64/kernel/hyp-stub.S
+++ b/arch/arm64/kernel/hyp-stub.S
@@ -151,6 +151,18 @@ SYM_CODE_START_LOCAL(__finalise_el2)
.Lskip_sme:
+ // NMIs
+ __check_override id_aa64pfr1 ID_AA64PFR1_EL1_NMI_SHIFT 4 .Linit_nmi .Lskip_nmi
+.Linit_nmi:
+ mrs x1, id_aa64mmfr1_el1 // HCRX_EL2 present?
+ ubfx x1, x1, #ID_AA64MMFR1_EL1_HCX_SHIFT, #4
+ cbz x1, .Lskip_nmi
+
+ mrs_s x1, SYS_HCRX_EL2
+ and x1, x1, #~HCRX_EL2_TALLINT_MASK // Don't trap ALLINT
+ msr_s SYS_HCRX_EL2, x1
+.Lskip_nmi:
+
// nVHE? No way! Give me the real thing!
// Sanity check: MMU *must* be off
mrs x1, sctlr_el2
--
2.30.2
next prev parent reply other threads:[~2022-11-12 15:17 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-12 15:16 [PATCH v2 00/14] arm64/nmi: Support for FEAT_NMI Mark Brown
2022-11-12 15:16 ` [PATCH v2 01/14] arm64/booting: Document boot requirements " Mark Brown
2022-11-12 15:16 ` [PATCH v2 02/14] arm64/sysreg: Add definition for ICC_NMIAR1_EL1 Mark Brown
2022-11-12 15:16 ` [PATCH v2 03/14] arm64/sysreg: Add definition of ISR_EL1 Mark Brown
2022-12-05 16:45 ` Marc Zyngier
2022-11-12 15:16 ` [PATCH v2 04/14] arm64/sysreg: Add definitions for immediate versions of MSR ALLINT Mark Brown
2022-12-05 16:38 ` Marc Zyngier
2022-12-05 17:11 ` Mark Brown
2022-12-07 19:18 ` Marc Zyngier
2022-12-07 19:42 ` Mark Brown
2022-11-12 15:16 ` [PATCH v2 05/14] arm64/asm: Introduce assembly macros for managing ALLINT Mark Brown
2022-12-05 17:29 ` Marc Zyngier
2022-12-05 18:24 ` Mark Brown
2022-12-07 19:14 ` Marc Zyngier
2022-11-12 15:17 ` Mark Brown [this message]
2022-12-05 17:50 ` [PATCH v2 06/14] arm64/hyp-stub: Enable access to ALLINT Marc Zyngier
2022-11-12 15:17 ` [PATCH v2 07/14] arm64/idreg: Add an override for FEAT_NMI Mark Brown
2022-11-12 15:17 ` [PATCH v2 08/14] arm64/cpufeature: Detect PE support " Mark Brown
2022-12-05 18:03 ` Marc Zyngier
2022-12-05 19:32 ` Mark Brown
2022-12-07 19:06 ` Marc Zyngier
2022-11-12 15:17 ` [PATCH v2 09/14] KVM: arm64: Hide FEAT_NMI from guests Mark Brown
2022-12-05 18:06 ` Marc Zyngier
2022-12-05 19:03 ` Mark Brown
2022-12-07 19:03 ` Marc Zyngier
2022-12-07 19:33 ` Mark Brown
2022-11-12 15:17 ` [PATCH v2 10/14] arm64/nmi: Manage masking for superpriority interrupts along with DAIF Mark Brown
2022-12-05 18:47 ` Marc Zyngier
2022-12-05 20:52 ` Mark Brown
2022-12-08 17:19 ` Lorenzo Pieralisi
2022-12-12 14:03 ` Mark Brown
2022-12-13 8:37 ` Lorenzo Pieralisi
2022-12-13 13:15 ` Mark Brown
2022-12-15 13:32 ` Marc Zyngier
2022-12-12 14:40 ` Mark Rutland
2022-12-15 13:21 ` Mark Brown
2022-11-12 15:17 ` [PATCH v2 11/14] arm64/irq: Document handling of FEAT_NMI in irqflags.h Mark Brown
2022-11-12 15:17 ` [PATCH v2 12/14] arm64/nmi: Add handling of superpriority interrupts as NMIs Mark Brown
2022-12-07 11:03 ` Marc Zyngier
2022-12-07 13:24 ` Mark Brown
2022-12-07 18:57 ` Marc Zyngier
2022-12-07 19:15 ` Mark Brown
2022-11-12 15:17 ` [PATCH v2 13/14] arm64/nmi: Add Kconfig for NMI Mark Brown
2022-11-12 15:17 ` [PATCH v2 14/14] irqchip/gic-v3: Implement FEAT_GICv3_NMI support Mark Brown
2022-12-07 15:20 ` Marc Zyngier
2022-12-02 18:42 ` [PATCH v2 00/14] arm64/nmi: Support for FEAT_NMI Marc Zyngier
2022-12-03 8:25 ` Lorenzo Pieralisi
2022-12-03 9:45 ` 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=20221112151708.175147-7-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=Sami.Mujawar@arm.com \
--cc=catalin.marinas@arm.com \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=lpieralisi@kernel.org \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=tglx@linutronix.de \
--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