xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-23 11:39:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

target/ppc: add power-saving interrupt masking logic to p8_next_unmasked_interrupt

Browse Source 
Export p8_interrupt_powersave and use it in p8_next_unmasked_interrupt.

Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>
Reviewed-by: Fabiano Rosas <farosas@linux.ibm.com>
Message-Id: <20221011204829.1641124-19-matheus.ferst@eldorado.org.br>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Matheus Ferst 2022-10-11 17:48:18 -03:00 committed by Daniel Henrique Barboza
parent 788ff1ce44
commit 64a9b5eebe
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/ppc/cpu_init.c
View File

@ -6133,7 +6133,7 @@ static bool ppc_pvr_match_power8(PowerPCCPUClass *pcc, uint32_t pvr, bool best)
return true; return true;
} }
static int p8_interrupt_powersave(CPUPPCState *env) int p8_interrupt_powersave(CPUPPCState *env)
{ {
if ((env->pending_interrupts & PPC_INTERRUPT_EXT) && if ((env->pending_interrupts & PPC_INTERRUPT_EXT) &&
(env->spr[SPR_LPCR] & LPCR_P8_PECE2)) { (env->spr[SPR_LPCR] & LPCR_P8_PECE2)) {

24
target/ppc/excp_helper.c
View File

@ -1692,28 +1692,28 @@ void ppc_cpu_do_interrupt(CPUState *cs)
static int p8_next_unmasked_interrupt(CPUPPCState *env) static int p8_next_unmasked_interrupt(CPUPPCState *env)
{ {
bool async_deliver; PowerPCCPU *cpu = env_archcpu(env);
CPUState *cs = CPU(cpu);
/* Ignore MSR[EE] when coming out of some power management states */
bool msr_ee = FIELD_EX64(env->msr, MSR, EE) || env->resume_as_sreset;
assert((env->pending_interrupts & P8_UNUSED_INTERRUPTS) == 0); assert((env->pending_interrupts & P8_UNUSED_INTERRUPTS) == 0);
if (cs->halted) {
/* LPCR[PECE] controls which interrupts can exit power-saving mode */
return p8_interrupt_powersave(env);
}
/* Machine check exception */ /* Machine check exception */
if (env->pending_interrupts & PPC_INTERRUPT_MCK) { if (env->pending_interrupts & PPC_INTERRUPT_MCK) {
return PPC_INTERRUPT_MCK; return PPC_INTERRUPT_MCK;
} }
/*
* For interrupts that gate on MSR:EE, we need to do something a
* bit more subtle, as we need to let them through even when EE is
* clear when coming out of some power management states (in order
* for them to become a 0x100).
*/
async_deliver = FIELD_EX64(env->msr, MSR, EE) || env->resume_as_sreset;
/* Hypervisor decrementer exception */ /* Hypervisor decrementer exception */
if (env->pending_interrupts & PPC_INTERRUPT_HDECR) { if (env->pending_interrupts & PPC_INTERRUPT_HDECR) {
/* LPCR will be clear when not supported so this will work */ /* LPCR will be clear when not supported so this will work */
bool hdice = !!(env->spr[SPR_LPCR] & LPCR_HDICE); bool hdice = !!(env->spr[SPR_LPCR] & LPCR_HDICE);
if ((async_deliver || !FIELD_EX64_HV(env->msr)) && hdice) { if ((msr_ee || !FIELD_EX64_HV(env->msr)) && hdice) {
/* HDEC clears on delivery */ /* HDEC clears on delivery */
return PPC_INTERRUPT_HDECR; return PPC_INTERRUPT_HDECR;
} }
@ -1724,13 +1724,13 @@ static int p8_next_unmasked_interrupt(CPUPPCState *env)
bool lpes0 = !!(env->spr[SPR_LPCR] & LPCR_LPES0); bool lpes0 = !!(env->spr[SPR_LPCR] & LPCR_LPES0);
bool heic = !!(env->spr[SPR_LPCR] & LPCR_HEIC); bool heic = !!(env->spr[SPR_LPCR] & LPCR_HEIC);
/* HEIC blocks delivery to the hypervisor */ /* HEIC blocks delivery to the hypervisor */
if ((async_deliver && !(heic && FIELD_EX64_HV(env->msr) && if ((msr_ee && !(heic && FIELD_EX64_HV(env->msr) &&
!FIELD_EX64(env->msr, MSR, PR))) || !FIELD_EX64(env->msr, MSR, PR))) ||
(env->has_hv_mode && !FIELD_EX64_HV(env->msr) && !lpes0)) { (env->has_hv_mode && !FIELD_EX64_HV(env->msr) && !lpes0)) {
return PPC_INTERRUPT_EXT; return PPC_INTERRUPT_EXT;
} }
} }
if (async_deliver != 0) { if (msr_ee != 0) {
/* Decrementer exception */ /* Decrementer exception */
if (env->pending_interrupts & PPC_INTERRUPT_DECR) { if (env->pending_interrupts & PPC_INTERRUPT_DECR) {
return PPC_INTERRUPT_DECR; return PPC_INTERRUPT_DECR;

1
target/ppc/internal.h
View File

@ -308,6 +308,7 @@ static inline int ger_pack_masks(int pmsk, int ymsk, int xmsk)
#if defined(TARGET_PPC64) #if defined(TARGET_PPC64)
int p9_interrupt_powersave(CPUPPCState *env); int p9_interrupt_powersave(CPUPPCState *env);
int p8_interrupt_powersave(CPUPPCState *env);
#endif #endif
#endif /* PPC_INTERNAL_H */ #endif /* PPC_INTERNAL_H */