xen/arm: use r12 to pass the hypercall number to the hypervisor

We need a register to pass the hypercall number because we might not
know it at compile time and HVC only takes an immediate argument.

Among the available registers r12 seems to be the best choice because it
is defined as "intra-procedure call scratch register".

Use the ISS to pass an hypervisor specific tag.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
CC: catalin.marinas@arm.com
CC: kvm@vger.kernel.org

diff --git a/arch/arm/include/asm/xen/hypercall.h b/arch/arm/include/asm/xen/hypercall.h
index 404e63f0ebd289ee79cca35c554ff3df67c9867b..04eba1cf67d3d32b6c6498bb37ec3ecda59ff1e2 100644 (file)
--- a/arch/arm/include/asm/xen/hypercall.h
+++ b/arch/arm/include/asm/xen/hypercall.h
@@ -33,13 +33,17 @@
 #ifndef _ASM_ARM_XEN_HYPERCALL_H
 #define _ASM_ARM_XEN_HYPERCALL_H
 
-#define __HVC_IMM(name)        "( " #name " & 0xf) + "   \
-                           "((" #name " << 4) & 0xfff00)"
+#include <xen/interface/xen.h>
+#include <asm/errno.h>
 
-#define ____HYPERCALL(name) ".word 0xe1400070 + " __HVC_IMM(name)
-#define __HYPERCALL(name) ____HYPERCALL(__HYPERVISOR_##name)
+#define XEN_HYPERCALL_TAG  "0XEA1"
+
+#define __HVC_IMM(tag) "( " tag " & 0xf) + "     \
+                           "((" tag " << 4) & 0xfff00)"
+#define __HYPERCALL ".word 0xe1400070 + " __HVC_IMM(XEN_HYPERCALL_TAG)
 
 #define __HYPERCALL_RETREG     "r0"
+#define __HYPERCALL_NUMBER     "r12"
 #define __HYPERCALL_ARG1REG    "r0"
 #define __HYPERCALL_ARG2REG    "r1"
 #define __HYPERCALL_ARG3REG    "r2"
@@ -48,30 +52,32 @@
 
 #define __HYPERCALL_DECLS                                              \
        register unsigned long __res  asm(__HYPERCALL_RETREG);          \
+       register unsigned long __num  asm(__HYPERCALL_NUMBER) = __num; \
        register unsigned long __arg1 asm(__HYPERCALL_ARG1REG) = __arg1; \
        register unsigned long __arg2 asm(__HYPERCALL_ARG2REG) = __arg2; \
        register unsigned long __arg3 asm(__HYPERCALL_ARG3REG) = __arg3; \
        register unsigned long __arg4 asm(__HYPERCALL_ARG4REG) = __arg4; \
        register unsigned long __arg5 asm(__HYPERCALL_ARG5REG) = __arg5;
 
-#define __HYPERCALL_0PARAM     "=r" (__res)
+#define __HYPERCALL_0PARAM     "=r" (__res), "+r" (__num)
 #define __HYPERCALL_1PARAM     __HYPERCALL_0PARAM, "+r" (__arg1)
 #define __HYPERCALL_2PARAM     __HYPERCALL_1PARAM, "+r" (__arg2)
 #define __HYPERCALL_3PARAM     __HYPERCALL_2PARAM, "+r" (__arg3)
 #define __HYPERCALL_4PARAM     __HYPERCALL_3PARAM, "+r" (__arg4)
 #define __HYPERCALL_5PARAM     __HYPERCALL_4PARAM, "+r" (__arg5)
 
-#define __HYPERCALL_0ARG()
-#define __HYPERCALL_1ARG(a1)                                           \
-       __HYPERCALL_0ARG()              __arg1 = (unsigned long)(a1);
-#define __HYPERCALL_2ARG(a1,a2)                                                \
-       __HYPERCALL_1ARG(a1)            __arg2 = (unsigned long)(a2);
-#define __HYPERCALL_3ARG(a1,a2,a3)                                     \
-       __HYPERCALL_2ARG(a1,a2)         __arg3 = (unsigned long)(a3);
-#define __HYPERCALL_4ARG(a1,a2,a3,a4)                                  \
-       __HYPERCALL_3ARG(a1,a2,a3)      __arg4 = (unsigned long)(a4);
-#define __HYPERCALL_5ARG(a1,a2,a3,a4,a5)                               \
-       __HYPERCALL_4ARG(a1,a2,a3,a4)   __arg5 = (unsigned long)(a5);
+#define __HYPERCALL_0ARG(hypercall)                                            \
+       __num = (unsigned long)hypercall;
+#define __HYPERCALL_1ARG(hypercall,a1)                                         \
+       __HYPERCALL_0ARG(hypercall)             __arg1 = (unsigned long)(a1);
+#define __HYPERCALL_2ARG(hypercall,a1,a2)                                              \
+       __HYPERCALL_1ARG(hypercall,a1)          __arg2 = (unsigned long)(a2);
+#define __HYPERCALL_3ARG(hypercall,a1,a2,a3)                                   \
+       __HYPERCALL_2ARG(hypercall,a1,a2)               __arg3 = (unsigned long)(a3);
+#define __HYPERCALL_4ARG(hypercall,a1,a2,a3,a4)                                        \
+       __HYPERCALL_3ARG(hypercall,a1,a2,a3)    __arg4 = (unsigned long)(a4);
+#define __HYPERCALL_5ARG(hypercall,a1,a2,a3,a4,a5)                             \
+       __HYPERCALL_4ARG(hypercall,a1,a2,a3,a4) __arg5 = (unsigned long)(a5);
 
 #define __HYPERCALL_CLOBBER5   "memory"
 #define __HYPERCALL_CLOBBER4   __HYPERCALL_CLOBBER5, __HYPERCALL_ARG5REG
@@ -80,102 +86,105 @@
 #define __HYPERCALL_CLOBBER1   __HYPERCALL_CLOBBER2, __HYPERCALL_ARG2REG
 #define __HYPERCALL_CLOBBER0   __HYPERCALL_CLOBBER1, __HYPERCALL_ARG1REG
 
-#define _hypercall0(type, name)                                                \
+#define _hypercall0(type, hypercall)                                           \
 ({                                                                     \
        __HYPERCALL_DECLS;                                              \
-       __HYPERCALL_0ARG();                                             \
-       asm volatile (__HYPERCALL(name)                                 \
+       __HYPERCALL_0ARG(hypercall);                                            \
+       asm volatile (__HYPERCALL                                       \
                      : __HYPERCALL_0PARAM                              \
                      :                                                 \
                      : __HYPERCALL_CLOBBER0);                          \
        (type)__res;                                                    \
 })
 
-#define _hypercall1(type, name, a1)                                    \
+#define _hypercall1(type, hypercall, a1)                                       \
 ({                                                                     \
        __HYPERCALL_DECLS;                                              \
-       __HYPERCALL_1ARG(a1);                                           \
-       asm volatile (__HYPERCALL(name)                                 \
+       __HYPERCALL_1ARG(hypercall, a1);                                                \
+       asm volatile (__HYPERCALL                                       \
                      : __HYPERCALL_1PARAM                              \
                      :                                                 \
                      : __HYPERCALL_CLOBBER1);                          \
        (type)__res;                                                    \
 })
 
-#define _hypercall2(type, name, a1, a2)                                        \
+#define _hypercall2(type, hypercall, a1, a2)                                   \
 ({                                                                     \
        __HYPERCALL_DECLS;                                              \
-       __HYPERCALL_2ARG(a1, a2);                                       \
-       asm volatile (__HYPERCALL(name)                                 \
+       __HYPERCALL_2ARG(hypercall, a1, a2);                                    \
+       asm volatile (__HYPERCALL                                       \
                      : __HYPERCALL_2PARAM                              \
                      :                                                 \
                      : __HYPERCALL_CLOBBER2);                          \
        (type)__res;                                                    \
 })
 
-#define _hypercall3(type, name, a1, a2, a3)                            \
+#define _hypercall3(type, hypercall, a1, a2, a3)                               \
 ({                                                                     \
        __HYPERCALL_DECLS;                                              \
-       __HYPERCALL_3ARG(a1, a2, a3);                                   \
-       asm volatile (__HYPERCALL(name)                                 \
+       __HYPERCALL_3ARG(hypercall, a1, a2, a3);                                        \
+       asm volatile (__HYPERCALL                                       \
                      : __HYPERCALL_3PARAM                              \
                      :                                                 \
                      : __HYPERCALL_CLOBBER3);                          \
        (type)__res;                                                    \
 })
 
-#define _hypercall4(type, name, a1, a2, a3, a4)                                \
+#define _hypercall4(type, hypercall, a1, a2, a3, a4)                           \
 ({                                                                     \
        __HYPERCALL_DECLS;                                              \
-       __HYPERCALL_4ARG(a1, a2, a3, a4);                               \
-       asm volatile (__HYPERCALL(name)                                 \
+       __HYPERCALL_4ARG(hypercall, a1, a2, a3, a4);                            \
+       asm volatile (__HYPERCALL                                       \
                      : __HYPERCALL_4PARAM                              \
                      :                                                 \
                      : __HYPERCALL_CLOBBER4);                          \
        (type)__res;                                                    \
 })
 
-#define _hypercall5(type, name, a1, a2, a3, a4, a5)                    \
+#define _hypercall5(type, hypercall, a1, a2, a3, a4, a5)                       \
 ({                                                                     \
        __HYPERCALL_DECLS;                                              \
-       __HYPERCALL_5ARG(a1, a2, a3, a4, a5);                           \
-       asm volatile (__HYPERCALL(name)                                 \
+       __HYPERCALL_5ARG(hypercall, a1, a2, a3, a4, a5);                                \
+       asm volatile (__HYPERCALL                                       \
                      : __HYPERCALL_5PARAM                              \
                      :                                                 \
                      : __HYPERCALL_CLOBBER5);                          \
        (type)__res;                                                    \
 })
 
+#define HYPERCALL(name) \
+       (__HYPERVISOR_##name)
+
 /* -- Hypercall definitions go below -- */
 
 static inline int
 HYPERVISOR_xen_version(int cmd, void *arg)
 {
-       return _hypercall2(int, xen_version, cmd, arg);
+       return _hypercall2(int, HYPERCALL(xen_version), cmd, arg);
 }
 
 static inline int
 HYPERVISOR_console_io(int cmd, int count, char *str)
 {
-       return _hypercall3(int, console_io, cmd, count, str);
+       return _hypercall3(int, HYPERCALL(console_io), cmd, count, str);
 }
 
 static inline int
 HYPERVISOR_grant_table_op(unsigned int cmd, void *uop, unsigned int count)
 {
-       return _hypercall3(int, grant_table_op, cmd, uop, count);
+       return _hypercall3(int, HYPERCALL(grant_table_op), cmd, uop, count);
 }
 
 static inline int
 HYPERVISOR_sched_op(int cmd, void *arg)
 {
-       return _hypercall2(int, sched_op, cmd, arg);
+       return _hypercall2(int, HYPERCALL(sched_op), cmd, arg);
 }
 
 static inline int
 HYPERVISOR_event_channel_op(int cmd, void *arg)
 {
-       return _hypercall2(int, event_channel_op, cmd, arg);
+       return _hypercall2(int, HYPERCALL(event_channel_op), cmd, arg);
 }
 
 #endif /* _ASM_ARM_XEN_HYPERCALL_H */