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

Commit bd3048b8 authored by Michael Ellerman's avatar Michael Ellerman Committed by Alexander Graf
Browse files

KVM: PPC: Book3S HV: Add handler for HV facility unavailable 



At present this should never happen, since the host kernel sets
HFSCR to allow access to all facilities.  It's better to be prepared
to handle it cleanly if it does ever happen, though.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent ca252055

arch/powerpc/include/asm/kvm_asm.h

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ 
#define BOOK3S_INTERRUPT_PERFMON	0xf00

#define BOOK3S_INTERRUPT_ALTIVEC	0xf20

#define BOOK3S_INTERRUPT_VSX		0xf40

#define BOOK3S_INTERRUPT_H_FAC_UNAVAIL	0xf80



#define BOOK3S_IRQPRIO_SYSTEM_RESET		0

#define BOOK3S_IRQPRIO_DATA_SEGMENT		1

arch/powerpc/kvm/book3s_hv.c

+10 −1
Original line number Diff line number Diff line
@@ -706,7 +706,16 @@ static int kvmppc_handle_exit_hv(struct kvm_run *run, struct kvm_vcpu *vcpu, 
	 * we don't emulate any guest instructions at this stage.

	 */

	case BOOK3S_INTERRUPT_H_EMUL_ASSIST:

		kvmppc_core_queue_program(vcpu, 0x80000);

		kvmppc_core_queue_program(vcpu, SRR1_PROGILL);

		r = RESUME_GUEST;

		break;

	/*

	 * This occurs if the guest (kernel or userspace), does something that

	 * is prohibited by HFSCR.  We just generate a program interrupt to

	 * the guest.

	 */

	case BOOK3S_INTERRUPT_H_FAC_UNAVAIL:

		kvmppc_core_queue_program(vcpu, SRR1_PROGILL);

		r = RESUME_GUEST;

		break;

	default: