diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2019-02-15 17:16:43 +0100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2019-02-26 09:21:24 +1100 |
| commit | 1e7fd61d97fd4b25c7c8f70eed6a3ffd50893b74 (patch) | |
| tree | fbd707eb07dc2e36c25076334c3dadac7799e9c3 | |
| parent | dead760b00789d738f946f01849a2fdc57c5e765 (diff) | |
| download | qemu-1e7fd61d97fd4b25c7c8f70eed6a3ffd50893b74.zip qemu-1e7fd61d97fd4b25c7c8f70eed6a3ffd50893b74.tar.gz qemu-1e7fd61d97fd4b25c7c8f70eed6a3ffd50893b74.tar.bz2 | |
target/ppc: Rename "in_pm_state" to "resume_as_sreset"
To better reflect what this does, as it's specific to some of the
P7/P8/P9 PM states, not generic.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <20190215161648.9600-6-clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
| -rw-r--r-- | hw/ppc/ppc.c | 2 | ||||
| -rw-r--r-- | target/ppc/cpu.h | 6 | ||||
| -rw-r--r-- | target/ppc/excp_helper.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index cffdc39..12439db 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -776,7 +776,7 @@ static inline void cpu_ppc_hdecr_excp(PowerPCCPU *cpu) * interrupts in a PM state. Not only they don't cause a * wakeup but they also get effectively discarded. */ - if (!env->in_pm_state) { + if (!env->resume_as_sreset) { ppc_set_irq(cpu, PPC_INTERRUPT_HDECR, 1); } } diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 5b1899b..d236456 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1117,10 +1117,10 @@ struct CPUPPCState { /* * On P7/P8/P9, set when in PM state, we need to handle resume in - * a special way (such as routing some resume causes to 0x100), so - * flag this here. + * a special way (such as routing some resume causes to 0x100, ie, + * sreset), so flag this here. */ - bool in_pm_state; + bool resume_as_sreset; #endif /* Those resources are used only during code translation */ diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 489a54f..7536620 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -69,7 +69,7 @@ static int powerpc_reset_wakeup(CPUState *cs, CPUPPCState *env, int excp, target_ulong *msr) { /* We no longer are in a PM state */ - env->in_pm_state = false; + env->resume_as_sreset = false; /* Pretend to be returning from doze always as we don't lose state */ *msr |= (0x1ull << (63 - 47)); @@ -141,7 +141,7 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) * check for special resume at 0x100 from doze/nap/sleep/winkle on * P7/P8/P9 */ - if (env->in_pm_state) { + if (env->resume_as_sreset) { excp = powerpc_reset_wakeup(cs, env, excp, &msr); } @@ -787,7 +787,7 @@ static void ppc_hw_interrupt(CPUPPCState *env) * clear when coming out of some power management states (in order * for them to become a 0x100). */ - async_deliver = (msr_ee != 0) || env->in_pm_state; + async_deliver = (msr_ee != 0) || env->resume_as_sreset; /* Hypervisor decrementer exception */ if (env->pending_interrupts & (1 << PPC_INTERRUPT_HDECR)) { @@ -970,7 +970,7 @@ void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn) env->pending_interrupts &= ~(1 << PPC_INTERRUPT_HDECR); /* Condition for waking up at 0x100 */ - env->in_pm_state = (insn != PPC_PM_STOP) || + env->resume_as_sreset = (insn != PPC_PM_STOP) || (env->spr[SPR_PSSCR] & PSSCR_EC); } #endif /* defined(TARGET_PPC64) */ |