[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v2 20/29] target/ppc: remove unused interrupts from p7_pendin
From: |
Matheus Ferst |
Subject: |
[RFC PATCH v2 20/29] target/ppc: remove unused interrupts from p7_pending_interrupt |
Date: |
Tue, 27 Sep 2022 17:15:35 -0300 |
Remove the following unused interrupts from the POWER7 interrupt masking
method:
- PPC_INTERRUPT_RESET: only raised for 6xx, 7xx, 970, and POWER5p;
- Hypervisor Virtualization: introduced in Power ISA v3.0;
- Hypervisor Doorbell and Event-Based Branch: introduced in
Power ISA v2.07;
- Critical Input, Watchdog Timer, and Fixed Interval Timer: only defined
for embedded CPUs;
- Doorbell and Critical Doorbell Interrupt: processor does not implement
the "Embedded.Processor Control" category;
- Programmable Interval Timer: 40x-only;
- PPC_INTERRUPT_THERM: only raised for 970 and POWER5p;
Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>
---
v2:
- Remove CDOORBELL and THERM interrupts (farosas);
- Also remove RESET, DOORBELL, and HDOORBELL interrupts;
- Assert for the removed interrupts.
---
target/ppc/excp_helper.c | 63 +++++-----------------------------------
1 file changed, 8 insertions(+), 55 deletions(-)
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index 8e1e18317d..d8522d0b17 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -1679,14 +1679,18 @@ void ppc_cpu_do_interrupt(CPUState *cs)
}
#if defined(TARGET_PPC64)
+#define P7_UNUSED_INTERRUPTS \
+ (PPC_INTERRUPT_RESET | PPC_INTERRUPT_HVIRT | PPC_INTERRUPT_CEXT | \
+ PPC_INTERRUPT_WDT | PPC_INTERRUPT_CDOORBELL | PPC_INTERRUPT_FIT | \
+ PPC_INTERRUPT_PIT | PPC_INTERRUPT_DOORBELL | PPC_INTERRUPT_HDOORBELL | \
+ PPC_INTERRUPT_THERM | PPC_INTERRUPT_EBB)
+
static int p7_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 & P7_UNUSED_INTERRUPTS) == 0);
+
/* Machine check exception */
if (env->pending_interrupts & PPC_INTERRUPT_MCK) {
return PPC_INTERRUPT_MCK;
@@ -1716,15 +1720,6 @@ static int p7_next_unmasked_interrupt(CPUPPCState *env)
}
}
- /* Hypervisor virtualization interrupt */
- if (env->pending_interrupts & PPC_INTERRUPT_HVIRT) {
- /* LPCR will be clear when not supported so this will work */
- bool hvice = !!(env->spr[SPR_LPCR] & LPCR_HVICE);
- if ((async_deliver || !FIELD_EX64_HV(env->msr)) && hvice) {
- return PPC_INTERRUPT_HVIRT;
- }
- }
-
/* External interrupt can ignore MSR:EE under some circumstances */
if (env->pending_interrupts & PPC_INTERRUPT_EXT) {
bool lpes0 = !!(env->spr[SPR_LPCR] & LPCR_LPES0);
@@ -1736,56 +1731,14 @@ static int p7_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;
}
- if (env->pending_interrupts & PPC_INTERRUPT_DOORBELL) {
- return PPC_INTERRUPT_DOORBELL;
- }
- if (env->pending_interrupts & PPC_INTERRUPT_HDOORBELL) {
- return PPC_INTERRUPT_HDOORBELL;
- }
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) {
- /*
- * EBB exception must be taken in problem state and
- * with BESCR_GE set.
- */
- if (FIELD_EX64(env->msr, MSR, PR) &&
- (env->spr[SPR_BESCR] & BESCR_GE)) {
- return PPC_INTERRUPT_EBB;
- }
- }
}
return 0;
--
2.25.1
- [RFC PATCH v2 11/29] target/ppc: add power-saving interrupt masking logic to p9_next_unmasked_interrupt, (continued)
- [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
- [RFC PATCH v2 14/29] target/ppc: create an interrupt delivery method for POWER8, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 17/29] target/ppc: move power-saving interrupt masking out of cpu_has_work_POWER8, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 18/29] target/ppc: add power-saving interrupt masking logic to p8_next_unmasked_interrupt, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 16/29] target/ppc: remove generic architecture checks from p8_deliver_interrupt, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 15/29] target/ppc: remove unused interrupts from p8_deliver_interrupt, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 19/29] target/ppc: create an interrupt masking method for POWER7, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 20/29] target/ppc: remove unused interrupts from p7_pending_interrupt,
Matheus Ferst <=
- [RFC PATCH v2 21/29] target/ppc: create an interrupt delivery method for POWER7, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 22/29] target/ppc: remove unused interrupts from p7_deliver_interrupt, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 23/29] target/ppc: remove generic architecture checks from p7_deliver_interrupt, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 24/29] target/ppc: move power-saving interrupt masking out of cpu_has_work_POWER7, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 25/29] target/ppc: add power-saving interrupt masking logic to p7_next_unmasked_interrupt, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 26/29] target/ppc: remove ppc_store_lpcr from CONFIG_USER_ONLY builds, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 27/29] target/ppc: introduce ppc_maybe_interrupt, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 28/29] target/ppc: unify cpu->has_work based on cs->interrupt_request, Matheus Ferst, 2022/09/27
- [RFC PATCH v2 29/29] target/ppc: move the p*_interrupt_powersave methods to excp_helper.c, Matheus Ferst, 2022/09/27
- Re: [RFC PATCH v2 00/29] PowerPC interrupt rework, Cédric Le Goater, 2022/09/28