OSDN Git Service

PPC: Only enter MSR_POW when no interrupts pending
authorAlexander Graf <agraf@suse.de>
Sun, 6 Apr 2014 20:40:47 +0000 (22:40 +0200)
committerAlexander Graf <agraf@suse.de>
Tue, 8 Apr 2014 09:20:05 +0000 (11:20 +0200)
We were entering the power saving state even when interrupts (like an
external interrupt or a decrementer interrupt) were still in flight.

In case we find a pending interrupt, don't enter power saving state.

Signed-off-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Tom Musta <tmusta@gmail.com>
target-ppc/helper_regs.h

index f7ec9c2..271fddf 100644 (file)
@@ -101,7 +101,7 @@ static inline int hreg_store_msr(CPUPPCState *env, target_ulong value,
     hreg_compute_hflags(env);
 #if !defined(CONFIG_USER_ONLY)
     if (unlikely(msr_pow == 1)) {
-        if ((*env->check_pow)(env)) {
+        if (!env->pending_interrupts && (*env->check_pow)(env)) {
             cs->halted = 1;
             excp = EXCP_HALTED;
         }