[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v4 12/22] target/arm: Handle NMI in arm_cpu_do_interrupt_aarc
From: |
Jinjie Ruan |
Subject: |
[RFC PATCH v4 12/22] target/arm: Handle NMI in arm_cpu_do_interrupt_aarch64() |
Date: |
Wed, 28 Feb 2024 09:29:36 +0000 |
According to Arm GIC section 4.6.3 Interrupt superpriority, the interrupt
with superpriority is always IRQ, never FIQ, so the NMI exception trap entry
behave like IRQ. However, VNMI can be IRQ or FIQ, FIQ can only come from
hcrx_el2.HCRX_VFNMI bit, IRQ can be raised from the GIC or come from the
hcrx_el2.HCRX_VINMI bit.
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
v4:
- Also handle VNMI in arm_cpu_do_interrupt_aarch64().
v3:
- Remove the FIQ NMI handle.
---
target/arm/helper.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index b796dbdf21..bd34b3506a 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -11459,12 +11459,21 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *cs)
break;
case EXCP_IRQ:
case EXCP_VIRQ:
+ case EXCP_NMI:
addr += 0x80;
break;
case EXCP_FIQ:
case EXCP_VFIQ:
addr += 0x100;
break;
+ case EXCP_VNMI:
+ if (env->irq_line_state & CPU_INTERRUPT_VNMI ||
+ env->cp15.hcrx_el2 & HCRX_VINMI) {
+ addr += 0x80;
+ } else if (env->cp15.hcrx_el2 & HCRX_VFNMI) {
+ addr += 0x100;
+ }
+ break;
case EXCP_VSERR:
addr += 0x180;
/* Construct the SError syndrome from IDS and ISS fields. */
--
2.34.1
- [RFC PATCH v4 20/22] hw/intc/arm_gicv3: Report the VNMI interrupt, (continued)
- [RFC PATCH v4 20/22] hw/intc/arm_gicv3: Report the VNMI interrupt, Jinjie Ruan, 2024/02/28
- [RFC PATCH v4 16/22] hw/intc: Enable FEAT_GICv3_NMI Feature, Jinjie Ruan, 2024/02/28
- [RFC PATCH v4 19/22] hw/intc/arm_gicv3: Report the NMI interrupt in gicv3_cpuif_update(), Jinjie Ruan, 2024/02/28
- [RFC PATCH v4 09/22] target/arm: Handle PSTATE.ALLINT on taking an exception, Jinjie Ruan, 2024/02/28
- [RFC PATCH v4 13/22] hw/intc/arm_gicv3: Add irq superpriority information, Jinjie Ruan, 2024/02/28
- [RFC PATCH v4 08/22] target/arm: Handle IS/FS in ISR_EL1 for NMI, Jinjie Ruan, 2024/02/28
- [RFC PATCH v4 03/22] target/arm: Add support for FEAT_NMI, Non-maskable Interrupt, Jinjie Ruan, 2024/02/28
- [RFC PATCH v4 21/22] target/arm: Add FEAT_NMI to max, Jinjie Ruan, 2024/02/28
- [RFC PATCH v4 10/22] hw/arm/virt: Wire NMI and VNMI irq lines from GIC to CPU, Jinjie Ruan, 2024/02/28
- [RFC PATCH v4 18/22] hw/intc/arm_gicv3: Implement NMI interrupt prioirty, Jinjie Ruan, 2024/02/28
- [RFC PATCH v4 12/22] target/arm: Handle NMI in arm_cpu_do_interrupt_aarch64(),
Jinjie Ruan <=