diff options
| author | Alexander Graf | 2012-05-10 03:54:58 +0200 |
|---|---|---|
| committer | Alexander Graf | 2012-05-16 15:02:10 +0200 |
| commit | 7ef4e985d54bad2773f260da38530f858a9a8491 (patch) | |
| tree | f3dfb2ae54bd024dbe00da864b8e791fac94210d | |
| parent | mn10300/CPU hotplug: Add missing call to notify_cpu_starting() (diff) | |
| download | kernel-qcow2-linux-7ef4e985d54bad2773f260da38530f858a9a8491.tar.gz kernel-qcow2-linux-7ef4e985d54bad2773f260da38530f858a9a8491.tar.xz kernel-qcow2-linux-7ef4e985d54bad2773f260da38530f858a9a8491.zip | |
KVM: PPC: Book3S: PR: Handle EMUL_ASSIST
In addition to normal "priviledged instruction" traps, we can also receive
"emulation assist" traps on newer hardware that has the HV bit set.
Handle that one the same way as a privileged instruction, including the
instruction fetching. That way we don't execute old instructions that we
happen to still leave in that field when an emul assist trap comes.
This fixes -M mac99 / -M g3beige on p7 bare metal for me.
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | arch/powerpc/kvm/book3s_segment.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/book3s_segment.S b/arch/powerpc/kvm/book3s_segment.S index 0676ae249b9f..012fc9281213 100644 --- a/arch/powerpc/kvm/book3s_segment.S +++ b/arch/powerpc/kvm/book3s_segment.S @@ -250,6 +250,12 @@ END_FTR_SECTION_IFSET(CPU_FTR_HVMODE) beq ld_last_prev_inst cmpwi r12, BOOK3S_INTERRUPT_ALIGNMENT beq- ld_last_inst +#ifdef CONFIG_PPC64 +BEGIN_FTR_SECTION + cmpwi r12, BOOK3S_INTERRUPT_H_EMUL_ASSIST + beq- ld_last_inst +END_FTR_SECTION_IFSET(CPU_FTR_HVMODE) +#endif b no_ld_last_inst |