[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v2 06/29] target/ppc: remove unused interrupts from p9_pendin
From: |
Matheus Ferst |
Subject: |
[RFC PATCH v2 06/29] target/ppc: remove unused interrupts from p9_pending_interrupt |
Date: |
Tue, 27 Sep 2022 17:15:21 -0300 |
Remove the following unused interrupts from the POWER9 interrupt masking
method:
- PPC_INTERRUPT_RESET: only raised for 6xx, 7xx, 970, and POWER5p;
- Debug Interrupt: removed in Power ISA v2.07;
- Critical Input, Watchdog Timer, and Fixed Interval Timer: only defined
for embedded CPUs;
- Critical Doorbell Interrupt: removed in Power ISA v3.0;
- Programmable Interval Timer: 40x-only.
Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>
---
v2:
- Remove CDOORBELL and THERM (farosas);
- Also remove RESET and DEBUG, interrupts;
- Assert for the removed interrupts.
---
target/ppc/excp_helper.c | 42 +++++++---------------------------------
1 file changed, 7 insertions(+), 35 deletions(-)
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index f2b0845735..af2cab01a7 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -1679,24 +1679,21 @@ void ppc_cpu_do_interrupt(CPUState *cs)
}
#if defined(TARGET_PPC64)
+#define P9_UNUSED_INTERRUPTS \
+ (PPC_INTERRUPT_RESET | PPC_INTERRUPT_DEBUG | PPC_INTERRUPT_CEXT | \
+ PPC_INTERRUPT_WDT | PPC_INTERRUPT_CDOORBELL | PPC_INTERRUPT_FIT | \
+ PPC_INTERRUPT_PIT | PPC_INTERRUPT_THERM)
+
static int p9_next_unmasked_interrupt(CPUPPCState *env)
{
bool async_deliver;
- /* External reset */
- if (env->pending_interrupts & PPC_INTERRUPT_RESET) {
- return PPC_INTERRUPT_RESET;
- }
+ assert((env->pending_interrupts & P9_UNUSED_INTERRUPTS) == 0);
+
/* Machine check exception */
if (env->pending_interrupts & PPC_INTERRUPT_MCK) {
return PPC_INTERRUPT_MCK;
}
-#if 0 /* TODO */
- /* External debug exception */
- if (env->pending_interrupts & PPC_INTERRUPT_DEBUG) {
- return PPC_INTERRUPT_DEBUG;
- }
-#endif
/*
* For interrupts that gate on MSR:EE, we need to do something a
@@ -1736,28 +1733,7 @@ static int p9_next_unmasked_interrupt(CPUPPCState *env)
return PPC_INTERRUPT_EXT;
}
}
- if (FIELD_EX64(env->msr, MSR, CE)) {
- /* External critical interrupt */
- if (env->pending_interrupts & PPC_INTERRUPT_CEXT) {
- return PPC_INTERRUPT_CEXT;
- }
- }
if (async_deliver != 0) {
- /* Watchdog timer on embedded PowerPC */
- if (env->pending_interrupts & PPC_INTERRUPT_WDT) {
- return PPC_INTERRUPT_WDT;
- }
- if (env->pending_interrupts & PPC_INTERRUPT_CDOORBELL) {
- return PPC_INTERRUPT_CDOORBELL;
- }
- /* Fixed interval timer on embedded PowerPC */
- if (env->pending_interrupts & PPC_INTERRUPT_FIT) {
- return PPC_INTERRUPT_FIT;
- }
- /* Programmable interval timer on embedded PowerPC */
- if (env->pending_interrupts & PPC_INTERRUPT_PIT) {
- return PPC_INTERRUPT_PIT;
- }
/* Decrementer exception */
if (env->pending_interrupts & PPC_INTERRUPT_DECR) {
return PPC_INTERRUPT_DECR;
@@ -1771,10 +1747,6 @@ static int p9_next_unmasked_interrupt(CPUPPCState *env)
if (env->pending_interrupts & PPC_INTERRUPT_PERFM) {
return PPC_INTERRUPT_PERFM;
}
- /* Thermal interrupt */
- if (env->pending_interrupts & PPC_INTERRUPT_THERM) {
- return PPC_INTERRUPT_THERM;
- }
/* EBB exception */
if (env->pending_interrupts & PPC_INTERRUPT_EBB) {
/*
--
2.25.1
- [RFC PATCH v2 00/29] PowerPC interrupt rework, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 01/29] target/ppc: define PPC_INTERRUPT_* values directly, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 02/29] target/ppc: always use ppc_set_irq to set env->pending_interrupts, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 03/29] target/ppc: split interrupt masking and delivery from ppc_hw_interrupt, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 05/29] target/ppc: create an interrupt masking method for POWER9/POWER10, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 04/29] target/ppc: prepare to split interrupt masking and delivery by excp_model, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 06/29] target/ppc: remove unused interrupts from p9_pending_interrupt,
Matheus Ferst <=
- [RFC PATCH v2 08/29] target/ppc: remove unused interrupts from p9_deliver_interrupt, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 07/29] target/ppc: create an interrupt delivery method for POWER9/POWER10, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 09/29] target/ppc: remove generic architecture checks from p9_deliver_interrupt, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 10/29] target/ppc: move power-saving interrupt masking out of cpu_has_work_POWER9, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 11/29] target/ppc: add power-saving interrupt masking logic to p9_next_unmasked_interrupt, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 12/29] target/ppc: create an interrupt masking method for POWER8, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 13/29] target/ppc: remove unused interrupts from p8_pending_interrupt, Matheus Ferst, 2022/09/27