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

Commit dd96b2c2 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Alexander Graf
Browse files

kvm: powerpc: book3s: Cleanup interrupt handling code 



With this patch if HV is included, interrupts come in to the HV version
of the kvmppc_interrupt code, which then jumps to the PR handler,
renamed to kvmppc_interrupt_pr, if the guest is a PR guest. This helps
in enabling both HV and PR, which we do in later patch

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 3a167bea

arch/powerpc/include/asm/exception-64s.h

+11 −0
Original line number Original line Diff line number Diff line
@@ -198,6 +198,17 @@ END_FTR_SECTION_NESTED(ftr,ftr,943) 
	cmpwi	r10,0;							\

	cmpwi	r10,0;							\

	bne	do_kvm_##n

	bne	do_kvm_##n





#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

/*

 * If hv is possible, interrupts come into to the hv version

 * of the kvmppc_interrupt code, which then jumps to the PR handler,

 * kvmppc_interrupt_pr, if the guest is a PR guest.

 */

#define kvmppc_interrupt kvmppc_interrupt_hv

#else

#define kvmppc_interrupt kvmppc_interrupt_pr

#endif



#define __KVM_HANDLER(area, h, n)					\

#define __KVM_HANDLER(area, h, n)					\

do_kvm_##n:								\

do_kvm_##n:								\

	BEGIN_FTR_SECTION_NESTED(947)					\

	BEGIN_FTR_SECTION_NESTED(947)					\

arch/powerpc/kvm/book3s_hv_rmhandlers.S

+7 −2
Original line number Original line Diff line number Diff line
@@ -742,8 +742,8 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR) 
/*

/*

 * We come here from the first-level interrupt handlers.

 * We come here from the first-level interrupt handlers.

 */

 */

	.globl	kvmppc_interrupt

	.globl	kvmppc_interrupt_hv

kvmppc_interrupt:

kvmppc_interrupt_hv:

	/*

	/*

	 * Register contents:

	 * Register contents:

	 * R12		= interrupt vector

	 * R12		= interrupt vector
@@ -757,6 +757,11 @@ kvmppc_interrupt: 
	lbz	r9, HSTATE_IN_GUEST(r13)

	lbz	r9, HSTATE_IN_GUEST(r13)

	cmpwi	r9, KVM_GUEST_MODE_HOST_HV

	cmpwi	r9, KVM_GUEST_MODE_HOST_HV

	beq	kvmppc_bad_host_intr

	beq	kvmppc_bad_host_intr

#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE

	cmpwi	r9, KVM_GUEST_MODE_GUEST

	ld	r9, HSTATE_HOST_R2(r13)

	beq	kvmppc_interrupt_pr

#endif

	/* We're now back in the host but in guest MMU context */

	/* We're now back in the host but in guest MMU context */

	li	r9, KVM_GUEST_MODE_HOST_HV

	li	r9, KVM_GUEST_MODE_HOST_HV

	stb	r9, HSTATE_IN_GUEST(r13)

	stb	r9, HSTATE_IN_GUEST(r13)

arch/powerpc/kvm/book3s_segment.S

+2 −2
Original line number Original line Diff line number Diff line
@@ -161,8 +161,8 @@ kvmppc_handler_trampoline_enter_end: 
.global kvmppc_handler_trampoline_exit

.global kvmppc_handler_trampoline_exit

kvmppc_handler_trampoline_exit:

kvmppc_handler_trampoline_exit:





.global kvmppc_interrupt

.global kvmppc_interrupt_pr

kvmppc_interrupt:

kvmppc_interrupt_pr:





	/* Register usage at this point:

	/* Register usage at this point:

	 *

	 *