powerpc: move hvCall.s to powerpc/platforms/iseries

Rename it to hvcall.S and (so I can do that) rename hvcall.c
to hvlog.c - a more appropriate name.

Do some white space cleanups.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

3 files changed, 94 insertions, 1 deletions

diff --git a/arch/powerpc/platforms/iseries/Makefile b/arch/powerpc/platforms/iseries/Makefile
index a5e91c9db5c7..3a9981a35e2a 100644
--- a/arch/powerpc/platforms/iseries/Makefile
+++ b/arch/powerpc/platforms/iseries/Makefile
@@ -1 +1 @@
-obj-y += hvcall.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o
+obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o hvcall.o
diff --git a/arch/powerpc/platforms/iseries/hvcall.S b/arch/powerpc/platforms/iseries/hvcall.S
new file mode 100644
index 000000000000..9901c0ec1415
--- /dev/null
+++ b/arch/powerpc/platforms/iseries/hvcall.S
@@ -0,0 +1,93 @@
+/*
+ * This file contains the code to perform calls to the
+ * iSeries LPAR hypervisor
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <asm/ppc_asm.h>
+#include <asm/processor.h>
+
+        .text
+
+/*
+ * Hypervisor call
+ *
+ * Invoke the iSeries hypervisor via the System Call instruction
+ * Parameters are passed to this routine in registers r3 - r10
+ *
+ * r3 contains the HV function to be called
+ * r4-r10 contain the operands to the hypervisor function
+ *
+ */
+
+_GLOBAL(HvCall)
+_GLOBAL(HvCall0)
+_GLOBAL(HvCall1)
+_GLOBAL(HvCall2)
+_GLOBAL(HvCall3)
+_GLOBAL(HvCall4)
+_GLOBAL(HvCall5)
+_GLOBAL(HvCall6)
+_GLOBAL(HvCall7)
+
+
+        mfcr    r0
+        std     r0,-8(r1)
+        stdu    r1,-(STACK_FRAME_OVERHEAD+16)(r1)
+
+        /* r0 = 0xffffffffffffffff indicates a hypervisor call */
+
+        li      r0,-1
+
+        /* Invoke the hypervisor */
+
+        sc
+
+        ld      r1,0(r1)
+        ld      r0,-8(r1)
+        mtcrf   0xff,r0
+
+        /*  return to caller, return value in r3 */
+
+        blr
+
+_GLOBAL(HvCall0Ret16)
+_GLOBAL(HvCall1Ret16)
+_GLOBAL(HvCall2Ret16)
+_GLOBAL(HvCall3Ret16)
+_GLOBAL(HvCall4Ret16)
+_GLOBAL(HvCall5Ret16)
+_GLOBAL(HvCall6Ret16)
+_GLOBAL(HvCall7Ret16)
+
+        mfcr    r0
+        std     r0,-8(r1)
+        std     r31,-16(r1)
+        stdu    r1,-(STACK_FRAME_OVERHEAD+32)(r1)
+
+        mr      r31,r4
+        li      r0,-1
+        mr      r4,r5
+        mr      r5,r6
+        mr      r6,r7
+        mr      r7,r8
+        mr      r8,r9
+        mr      r9,r10
+
+        sc
+
+        std     r3,0(r31)
+        std     r4,8(r31)
+
+        mr      r3,r5
+
+        ld      r1,0(r1)
+        ld      r0,-8(r1)
+        mtcrf   0xff,r0
+        ld      r31,-16(r1)
+
+        blr
diff --git a/arch/powerpc/platforms/iseries/hvcall.c b/arch/powerpc/platforms/iseries/hvlog.c
index f61e2e9ac9ec..f61e2e9ac9ec 100644
--- a/arch/powerpc/platforms/iseries/hvcall.c
+++ b/arch/powerpc/platforms/iseries/hvlog.c