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

Commit 4f6c11db authored by Paul Mackerras's avatar Paul Mackerras Committed by Alexander Graf
Browse files

KVM: PPC: Book3S: Move skip-interrupt handlers to common code 



Both PR and HV KVM have separate, identical copies of the
kvmppc_skip_interrupt and kvmppc_skip_Hinterrupt handlers that are
used for the situation where an interrupt happens when loading the
instruction that caused an exit from the guest.  To eliminate this
duplication and make it easier to compile in both PR and HV KVM,
this moves this code to arch/powerpc/kernel/exceptions-64s.S along
with other kernel interrupt handler code.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 3ff95502

arch/powerpc/kernel/exceptions-64s.S

+26 −0
Original line number Diff line number Diff line
@@ -650,6 +650,32 @@ slb_miss_user_pseries: 
	b	.				/* prevent spec. execution */

#endif /* __DISABLED__ */



#ifdef CONFIG_KVM_BOOK3S_64_HANDLER

kvmppc_skip_interrupt:

	/*

	 * Here all GPRs are unchanged from when the interrupt happened

	 * except for r13, which is saved in SPRG_SCRATCH0.

	 */

	mfspr	r13, SPRN_SRR0

	addi	r13, r13, 4

	mtspr	SPRN_SRR0, r13

	GET_SCRATCH0(r13)

	rfid

	b	.



kvmppc_skip_Hinterrupt:

	/*

	 * Here all GPRs are unchanged from when the interrupt happened

	 * except for r13, which is saved in SPRG_SCRATCH0.

	 */

	mfspr	r13, SPRN_HSRR0

	addi	r13, r13, 4

	mtspr	SPRN_HSRR0, r13

	GET_SCRATCH0(r13)

	hrfid

	b	.

#endif



/*

 * Code from here down to __end_handlers is invoked from the

 * exception prologs above.  Because the prologs assemble the

arch/powerpc/kvm/book3s_hv_rmhandlers.S

+0 −24
Original line number Diff line number Diff line
@@ -33,30 +33,6 @@ 
#error Need to fix lppaca and SLB shadow accesses in little endian mode

#endif



/*****************************************************************************

 *                                                                           *

 *        Real Mode handlers that need to be in the linear mapping           *

 *                                                                           *

 ****************************************************************************/



	.globl	kvmppc_skip_interrupt

kvmppc_skip_interrupt:

	mfspr	r13,SPRN_SRR0

	addi	r13,r13,4

	mtspr	SPRN_SRR0,r13

	GET_SCRATCH0(r13)

	rfid

	b	.



	.globl	kvmppc_skip_Hinterrupt

kvmppc_skip_Hinterrupt:

	mfspr	r13,SPRN_HSRR0

	addi	r13,r13,4

	mtspr	SPRN_HSRR0,r13

	GET_SCRATCH0(r13)

	hrfid

	b	.



/*

 * Call kvmppc_hv_entry in real mode.

 * Must be called with interrupts hard-disabled.

arch/powerpc/kvm/book3s_rmhandlers.S

+0 −26
Original line number Diff line number Diff line
@@ -38,32 +38,6 @@ 


#define FUNC(name) 		GLUE(.,name)



	.globl	kvmppc_skip_interrupt

kvmppc_skip_interrupt:

	/*

	 * Here all GPRs are unchanged from when the interrupt happened

	 * except for r13, which is saved in SPRG_SCRATCH0.

	 */

	mfspr	r13, SPRN_SRR0

	addi	r13, r13, 4

	mtspr	SPRN_SRR0, r13

	GET_SCRATCH0(r13)

	rfid

	b	.



	.globl	kvmppc_skip_Hinterrupt

kvmppc_skip_Hinterrupt:

	/*

	 * Here all GPRs are unchanged from when the interrupt happened

	 * except for r13, which is saved in SPRG_SCRATCH0.

	 */

	mfspr	r13, SPRN_HSRR0

	addi	r13, r13, 4

	mtspr	SPRN_HSRR0, r13

	GET_SCRATCH0(r13)

	hrfid

	b	.



#elif defined(CONFIG_PPC_BOOK3S_32)



#define FUNC(name)		name