Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6df79df5 authored by Alexander Graf's avatar Alexander Graf Committed by Avi Kivity
Browse files

KVM: PPC: Emulate tw and td instructions 



There are 4 conditional trapping instructions: tw, twi, td, tdi. The
ones with an i take an immediate comparison, the others compare two
registers. All of them arrive in the emulator when the condition to
trap was successfully fulfilled.

Unfortunately, we were only implementing the i versions so far, so
let's also add support for the other two.

This fixes kernel booting with recents book3s_32 guest kernels.

Reported-by: default avatarJörg Sommer <joerg@alea.gnuu.de>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 6020c0f6

arch/powerpc/kvm/emulate.c

+14 −0
Original line number Diff line number Diff line
@@ -35,7 +35,9 @@ 
#define OP_TRAP 3

#define OP_TRAP_64 2



#define OP_31_XOP_TRAP      4

#define OP_31_XOP_LWZX      23

#define OP_31_XOP_TRAP_64   68

#define OP_31_XOP_LBZX      87

#define OP_31_XOP_STWX      151

#define OP_31_XOP_STBX      215
@@ -169,6 +171,18 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) 
	case 31:

		switch (get_xop(inst)) {



		case OP_31_XOP_TRAP:

#ifdef CONFIG_64BIT

		case OP_31_XOP_TRAP_64:

#endif

#ifdef CONFIG_PPC_BOOK3S

			kvmppc_core_queue_program(vcpu, SRR1_PROGTRAP);

#else

			kvmppc_core_queue_program(vcpu,

					vcpu->arch.shared->esr | ESR_PTR);

#endif

			advance = 0;

			break;

		case OP_31_XOP_LWZX:

			rt = get_rt(inst);

			emulated = kvmppc_handle_load(run, vcpu, rt, 4, 1);