diff options
Diffstat (limited to 'src/arch/arm/isa/insts/misc.isa')
| -rw-r--r-- | src/arch/arm/isa/insts/misc.isa | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/arch/arm/isa/insts/misc.isa b/src/arch/arm/isa/insts/misc.isa index 7333faef0..a9a375213 100644 --- a/src/arch/arm/isa/insts/misc.isa +++ b/src/arch/arm/isa/insts/misc.isa @@ -483,11 +483,10 @@ let {{ wfeCode = ''' #if FULL_SYSTEM - if (SevMailbox) { + if (SevMailbox == 1) { SevMailbox = 0; PseudoInst::quiesceSkip(xc->tcBase()); - } - else { + } else { PseudoInst::quiesce(xc->tcBase()); } #endif @@ -501,7 +500,12 @@ let {{ wfiCode = ''' #if FULL_SYSTEM - PseudoInst::quiesce(xc->tcBase()); + // WFI doesn't sleep if interrupts are pending (masked or not) + if (xc->tcBase()->getCpuPtr()->getInterruptController()->checkRaw()) { + PseudoInst::quiesceSkip(xc->tcBase()); + } else { + PseudoInst::quiesce(xc->tcBase()); + } #endif ''' wfiIop = InstObjParams("wfi", "WfiInst", "PredOp", \ @@ -517,8 +521,12 @@ let {{ System *sys = xc->tcBase()->getSystemPtr(); for (int x = 0; x < sys->numContexts(); x++) { ThreadContext *oc = sys->getThreadContext(x); - if (oc != xc->tcBase()) { + if (oc == xc->tcBase()) + continue; + // Only wake if they were sleeping + if (oc->readMiscReg(MISCREG_SEV_MAILBOX) == 0) { oc->setMiscReg(MISCREG_SEV_MAILBOX, 1); + PseudoInst::wakeCPU(xc->tcBase(), x); } } ''' |