[PATCH 1/2 v2] kvm/powerpc: rename kvm_hypercall() to epapr_hypercall()

[Bharat Bhushan]

kvm_hypercall() have nothing KVM specific, so renamed to epapr_hypercall().
Also this in moved to arch/powerpc/include/asm/epapr_hcalls.h

Signed-off-by: Bharat Bhushan 
---
v1->v2
 - epapr_hypercall() is always defined and returns EV_UNIMPLEMENTED
   when CONFIG_KVM_GUEST or CONFIG_EPAPR_PARAVIRT not defined.

 arch/powerpc/include/asm/epapr_hcalls.h |   46 +++
 arch/powerpc/include/asm/kvm_para.h |   23 ---
 arch/powerpc/kernel/kvm.c   |   41 +--
 3 files changed, 54 insertions(+), 56 deletions(-)

diff --git a/arch/powerpc/include/asm/epapr_hcalls.h 
b/arch/powerpc/include/asm/epapr_hcalls.h
index d3d6342..6b8e007 100644
--- a/arch/powerpc/include/asm/epapr_hcalls.h
+++ b/arch/powerpc/include/asm/epapr_hcalls.h
@@ -454,5 +454,51 @@ static inline unsigned int ev_idle(void)
 
return r3;
 }
+
+#if defined(CONFIG_KVM_GUEST) || defined(CONFIG_EPAPR_PARAVIRT)
+static inline unsigned long epapr_hypercall(unsigned long *in,
+   unsigned long *out,
+   unsigned long nr)
+{
+   unsigned long register r0 asm("r0");
+   unsigned long register r3 asm("r3") = in[0];
+   unsigned long register r4 asm("r4") = in[1];
+   unsigned long register r5 asm("r5") = in[2];
+   unsigned long register r6 asm("r6") = in[3];
+   unsigned long register r7 asm("r7") = in[4];
+   unsigned long register r8 asm("r8") = in[5];
+   unsigned long register r9 asm("r9") = in[6];
+   unsigned long register r10 asm("r10") = in[7];
+   unsigned long register r11 asm("r11") = nr;
+   unsigned long register r12 asm("r12");
+
+   asm volatile("blepapr_hypercall_start"
+: "=r"(r0), "=r"(r3), "=r"(r4), "=r"(r5), "=r"(r6),
+  "=r"(r7), "=r"(r8), "=r"(r9), "=r"(r10), "=r"(r11),
+  "=r"(r12)
+: "r"(r3), "r"(r4), "r"(r5), "r"(r6), "r"(r7), "r"(r8),
+  "r"(r9), "r"(r10), "r"(r11)
+: "memory", "cc", "xer", "ctr", "lr");
+
+   out[0] = r4;
+   out[1] = r5;
+   out[2] = r6;
+   out[3] = r7;
+   out[4] = r8;
+   out[5] = r9;
+   out[6] = r10;
+   out[7] = r11;
+
+   return r3;
+}
+#else
+static unsigned long epapr_hypercall(unsigned long *in,
+  unsigned long *out,
+  unsigned long nr)
+{
+   return EV_UNIMPLEMENTED;
+}
+#endif
+
 #endif /* !__ASSEMBLY__ */
 #endif /* _EPAPR_HCALLS_H */
diff --git a/arch/powerpc/include/asm/kvm_para.h 
b/arch/powerpc/include/asm/kvm_para.h
index 2b11965..c18660e 100644
--- a/arch/powerpc/include/asm/kvm_para.h
+++ b/arch/powerpc/include/asm/kvm_para.h
@@ -39,10 +39,6 @@ static inline int kvm_para_available(void)
return 1;
 }
 
-extern unsigned long kvm_hypercall(unsigned long *in,
-  unsigned long *out,
-  unsigned long nr);
-
 #else
 
 static inline int kvm_para_available(void)
@@ -50,13 +46,6 @@ static inline int kvm_para_available(void)
return 0;
 }
 
-static unsigned long kvm_hypercall(unsigned long *in,
-  unsigned long *out,
-  unsigned long nr)
-{
-   return EV_UNIMPLEMENTED;
-}
-
 #endif
 
 static inline long kvm_hypercall0_1(unsigned int nr, unsigned long *r2)
@@ -65,7 +54,7 @@ static inline long kvm_hypercall0_1(unsigned int nr, unsigned 
long *r2)
unsigned long out[8];
unsigned long r;
 
-   r = kvm_hypercall(in, out, KVM_HCALL_TOKEN(nr));
+   r = epapr_hypercall(in, out, KVM_HCALL_TOKEN(nr));
*r2 = out[0];
 
return r;
@@ -76,7 +65,7 @@ static inline long kvm_hypercall0(unsigned int nr)
unsigned long in[8];
unsigned long out[8];
 
-   return kvm_hypercall(in, out, KVM_HCALL_TOKEN(nr));
+   return epapr_hypercall(in, out, KVM_HCALL_TOKEN(nr));
 }
 
 static inline long kvm_hypercall1(unsigned int nr, unsigned long p1)
@@ -85,7 +74,7 @@ static inline long kvm_hypercall1(unsigned int nr, unsigned 
long p1)
unsigned long out[8];
 
in[0] = p1;
-   return kvm_hypercall(in, out, KVM_HCALL_TOKEN(nr));
+   return epapr_hypercall(in, out, KVM_HCALL_TOKEN(nr));
 }
 
 static inline long kvm_hypercall2(unsigned int nr, unsigned long p1,
@@ -96,7 +85,7 @@ static inline long kvm_hypercall2(unsigned int nr, unsigned 
long p1,
 
in[0] = p1;
in[1] = p2;
-   return kvm_hypercall(in, out, KVM_HCALL_TOKEN(nr));
+   return epapr_hypercall(in, out, KVM_HCALL_TOKEN(nr));
 }
 
 static inline long kvm_hypercall3(unsigned int nr, unsigned long p1,
@@ -108,7 +97,7 @@ static inline long kvm_hypercall3(unsigned int nr, unsigned 
long p1,
in[0] = p1;
in[1] = p2;
in[2] = p3;
-   return kvm_hypercall(in, out, KVM_HCALL_TOKEN(nr));
+   return epapr_hyper

Re: [PATCH 1/2 v2] kvm/powerpc: rename kvm_hypercall() to epapr_hypercall()

[Scott Wood]

On Mon, 2013-10-07 at 22:23 +0530, Bharat Bhushan wrote:
> kvm_hypercall() have nothing KVM specific, so renamed to epapr_hypercall().
> Also this in moved to arch/powerpc/include/asm/epapr_hcalls.h
> 
> Signed-off-by: Bharat Bhushan 
> ---
> v1->v2
>  - epapr_hypercall() is always defined and returns EV_UNIMPLEMENTED
>when CONFIG_KVM_GUEST or CONFIG_EPAPR_PARAVIRT not defined.
> 
>  arch/powerpc/include/asm/epapr_hcalls.h |   46 
> +++
>  arch/powerpc/include/asm/kvm_para.h |   23 ---
>  arch/powerpc/kernel/kvm.c   |   41 +--
>  3 files changed, 54 insertions(+), 56 deletions(-)
> 
> diff --git a/arch/powerpc/include/asm/epapr_hcalls.h 
> b/arch/powerpc/include/asm/epapr_hcalls.h
> index d3d6342..6b8e007 100644
> --- a/arch/powerpc/include/asm/epapr_hcalls.h
> +++ b/arch/powerpc/include/asm/epapr_hcalls.h
> @@ -454,5 +454,51 @@ static inline unsigned int ev_idle(void)
>  
>   return r3;
>  }
> +
> +#if defined(CONFIG_KVM_GUEST) || defined(CONFIG_EPAPR_PARAVIRT)

CONFIG_KVM_GUEST implies CONFIG_EPAPR_PARAVIRT, so you only need to
check for the latter.

-Scott



--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html