Commit 7ef4e985 authored May 10, 2012 by Alexander Graf

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>

parent 568b4455

arch/powerpc/kvm/book3s_segment.S

+6 −0

Original line number	Diff line number	Diff line
		@@ -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