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

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

kvm/powerpc: move kvm_hypercall0() and friends to epapr_hypercall0() 



kvm_hypercall0() and friends have nothing KVM specific so moved to
epapr_hypercall0() and friends. Also they are moved from
arch/powerpc/include/asm/kvm_para.h to arch/powerpc/include/asm/epapr_hcalls.h

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

arch/powerpc/include/asm/epapr_hcalls.h

+65 −0
Original line number Diff line number Diff line
@@ -506,5 +506,70 @@ static unsigned long epapr_hypercall(unsigned long *in, 
}

#endif



static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2)

{

	unsigned long in[8];

	unsigned long out[8];

	unsigned long r;



	r = epapr_hypercall(in, out, nr);

	*r2 = out[0];



	return r;

}



static inline long epapr_hypercall0(unsigned int nr)

{

	unsigned long in[8];

	unsigned long out[8];



	return epapr_hypercall(in, out, nr);

}



static inline long epapr_hypercall1(unsigned int nr, unsigned long p1)

{

	unsigned long in[8];

	unsigned long out[8];



	in[0] = p1;

	return epapr_hypercall(in, out, nr);

}



static inline long epapr_hypercall2(unsigned int nr, unsigned long p1,

				    unsigned long p2)

{

	unsigned long in[8];

	unsigned long out[8];



	in[0] = p1;

	in[1] = p2;

	return epapr_hypercall(in, out, nr);

}



static inline long epapr_hypercall3(unsigned int nr, unsigned long p1,

				    unsigned long p2, unsigned long p3)

{

	unsigned long in[8];

	unsigned long out[8];



	in[0] = p1;

	in[1] = p2;

	in[2] = p3;

	return epapr_hypercall(in, out, nr);

}



static inline long epapr_hypercall4(unsigned int nr, unsigned long p1,

				    unsigned long p2, unsigned long p3,

				    unsigned long p4)

{

	unsigned long in[8];

	unsigned long out[8];



	in[0] = p1;

	in[1] = p2;

	in[2] = p3;

	in[3] = p4;

	return epapr_hypercall(in, out, nr);

}

#endif /* !__ASSEMBLY__ */

#endif /* _EPAPR_HCALLS_H */

arch/powerpc/include/asm/kvm_para.h

+1 −68
Original line number Diff line number Diff line
@@ -48,73 +48,6 @@ static inline int kvm_para_available(void) 


#endif



static inline long kvm_hypercall0_1(unsigned int nr, unsigned long *r2)

{

	unsigned long in[8];

	unsigned long out[8];

	unsigned long r;



	r = epapr_hypercall(in, out, KVM_HCALL_TOKEN(nr));

	*r2 = out[0];



	return r;

}



static inline long kvm_hypercall0(unsigned int nr)

{

	unsigned long in[8];

	unsigned long out[8];



	return epapr_hypercall(in, out, KVM_HCALL_TOKEN(nr));

}



static inline long kvm_hypercall1(unsigned int nr, unsigned long p1)

{

	unsigned long in[8];

	unsigned long out[8];



	in[0] = p1;

	return epapr_hypercall(in, out, KVM_HCALL_TOKEN(nr));

}



static inline long kvm_hypercall2(unsigned int nr, unsigned long p1,

				  unsigned long p2)

{

	unsigned long in[8];

	unsigned long out[8];



	in[0] = p1;

	in[1] = p2;

	return epapr_hypercall(in, out, KVM_HCALL_TOKEN(nr));

}



static inline long kvm_hypercall3(unsigned int nr, unsigned long p1,

				  unsigned long p2, unsigned long p3)

{

	unsigned long in[8];

	unsigned long out[8];



	in[0] = p1;

	in[1] = p2;

	in[2] = p3;

	return epapr_hypercall(in, out, KVM_HCALL_TOKEN(nr));

}



static inline long kvm_hypercall4(unsigned int nr, unsigned long p1,

				  unsigned long p2, unsigned long p3,

				  unsigned long p4)

{

	unsigned long in[8];

	unsigned long out[8];



	in[0] = p1;

	in[1] = p2;

	in[2] = p3;

	in[3] = p4;

	return epapr_hypercall(in, out, KVM_HCALL_TOKEN(nr));

}





static inline unsigned int kvm_arch_para_features(void)

{

	unsigned long r;
@@ -122,7 +55,7 @@ static inline unsigned int kvm_arch_para_features(void) 
	if (!kvm_para_available())

		return 0;



	if(kvm_hypercall0_1(KVM_HC_FEATURES, &r))

	if(epapr_hypercall0_1(KVM_HCALL_TOKEN(KVM_HC_FEATURES), &r))

		return 0;



	return r;