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

Commit d72be892 authored by Michael Neuling's avatar Michael Neuling Committed by Benjamin Herrenschmidt
Browse files

powerpc: Merge VCPU_GPR 



Merge the defines of VCPU_GPR from different places.

Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 44ce6a5e

arch/powerpc/include/asm/ppc_asm.h

+7 −0
Original line number Diff line number Diff line
@@ -178,6 +178,13 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR) 
#define HMT_HIGH	or	3,3,3

#define HMT_EXTRA_HIGH	or	7,7,7		# power7 only



#ifdef CONFIG_PPC64

#define ULONG_SIZE 	8

#else

#define ULONG_SIZE	4

#endif

#define VCPU_GPR(n)	(VCPU_GPRS + (n * ULONG_SIZE))



#ifdef __KERNEL__

#ifdef CONFIG_PPC64

arch/powerpc/kvm/book3s_hv_rmhandlers.S

+0 −3
Original line number Diff line number Diff line
@@ -72,9 +72,6 @@ _GLOBAL(kvmppc_hv_entry_trampoline) 
	mtsrr1	r6

	RFI



#define ULONG_SIZE 		8

#define VCPU_GPR(n)		(VCPU_GPRS + (n * ULONG_SIZE))



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

 *                                                                            *

 *                               Entry code                                   *

arch/powerpc/kvm/book3s_interrupts.S

+0 −8
Original line number Diff line number Diff line
@@ -25,19 +25,11 @@ 
#include <asm/exception-64s.h>



#if defined(CONFIG_PPC_BOOK3S_64)



#define ULONG_SIZE 		8

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



#elif defined(CONFIG_PPC_BOOK3S_32)



#define ULONG_SIZE              4

#define FUNC(name)		name



#endif /* CONFIG_PPC_BOOK3S_XX */





#define VCPU_GPR(n)		(VCPU_GPRS + (n * ULONG_SIZE))

#define VCPU_LOAD_NVGPRS(vcpu) \

	PPC_LL	r14, VCPU_GPR(R14)(vcpu); \

	PPC_LL	r15, VCPU_GPR(R15)(vcpu); \

arch/powerpc/kvm/booke_interrupts.S

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
#include <asm/page.h>

#include <asm/asm-offsets.h>



#define VCPU_GPR(n)     (VCPU_GPRS + (n * 4))



/* The host stack layout: */

#define HOST_R1         0 /* Implied by stwu. */

#define HOST_CALLEE_LR  4

arch/powerpc/kvm/bookehv_interrupts.S

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 


#define LONGBYTES		(BITS_PER_LONG / 8)



#define VCPU_GPR(n)     	(VCPU_GPRS + (n * LONGBYTES))

#define VCPU_GUEST_SPRG(n)	(VCPU_GUEST_SPRGS + (n * LONGBYTES))



/* The host stack layout: */