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

Commit ffe129ec authored by Bharat Bhushan's avatar Bharat Bhushan Committed by Alexander Graf
Browse files

KVM: PPC: booke: use vcpu reference from thread_struct 



Like other places, use thread_struct to get vcpu reference.

Signed-off-by: default avatarBharat Bhushan <bharat.bhushan@freescale.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent dd92d6f2

arch/powerpc/include/asm/reg.h

+0 −2
Original line number Diff line number Diff line
@@ -919,8 +919,6 @@ 
#define SPRN_SPRG_RSCRATCH_DBG	SPRN_SPRG9

#define SPRN_SPRG_WSCRATCH_DBG	SPRN_SPRG9

#endif

#define SPRN_SPRG_RVCPU		SPRN_SPRG1

#define SPRN_SPRG_WVCPU		SPRN_SPRG1

#endif



#ifdef CONFIG_8xx

arch/powerpc/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ int main(void) 
#ifdef CONFIG_KVM_BOOK3S_32_HANDLER

	DEFINE(THREAD_KVM_SVCPU, offsetof(struct thread_struct, kvm_shadow_vcpu));

#endif

#ifdef CONFIG_KVM_BOOKE_HV

#if defined(CONFIG_KVM) && defined(CONFIG_BOOKE)

	DEFINE(THREAD_KVM_VCPU, offsetof(struct thread_struct, kvm_vcpu));

#endif

arch/powerpc/kvm/booke_interrupts.S

+2 −4
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ 
_GLOBAL(kvmppc_handler_\ivor_nr)

	/* Get pointer to vcpu and record exit number. */

	mtspr	\scratch , r4

	mfspr	r4, SPRN_SPRG_RVCPU

	mfspr   r4, SPRN_SPRG_THREAD

	lwz     r4, THREAD_KVM_VCPU(r4)

	stw	r3, VCPU_GPR(R3)(r4)

	stw	r5, VCPU_GPR(R5)(r4)

	stw	r6, VCPU_GPR(R6)(r4)
@@ -402,9 +403,6 @@ lightweight_exit: 
	lwz	r8, kvmppc_booke_handlers@l(r8)

	mtspr	SPRN_IVPR, r8



	/* Save vcpu pointer for the exception handlers. */

	mtspr	SPRN_SPRG_WVCPU, r4



	lwz	r5, VCPU_SHARED(r4)



	/* Can't switch the stack pointer until after IVPR is switched,