xen/arm: use as to calculate the HVC word

Use as to calculate the HVC word plus the argument, rather than
manually encoding the number for each hypercall.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/arch/arm/include/asm/xen/hypercall.h b/arch/arm/include/asm/xen/hypercall.h
index 7cf1d614f829e329a3ee5450dee8679a019140dd..e2366972d9d054be4509682c775c064d689d4c8f 100644 (file)
--- a/arch/arm/include/asm/xen/hypercall.h
+++ b/arch/arm/include/asm/xen/hypercall.h
@@ -33,6 +33,10 @@
 #ifndef _ASM_ARM_XEN_HYPERCALL_H
 #define _ASM_ARM_XEN_HYPERCALL_H
 
+#define TOSTRING(x) #x
+#define __HYPERCALL(num) ".word 0xe1400070 + ("TOSTRING(num)" & 0xf) + ((" \
+       TOSTRING(num)" << 4) & 0xff00)"
+
 #define __HYPERCALL_RETREG     "r0"
 #define __HYPERCALL_ARG1REG    "r0"
 #define __HYPERCALL_ARG2REG    "r1"
@@ -78,7 +82,7 @@
 ({                                                                     \
        __HYPERCALL_DECLS;                                              \
        __HYPERCALL_0ARG();                                             \
-       asm volatile (__HYPERCALL                                       \
+       asm volatile (__HYPERCALL(number)                                       \
                      : __HYPERCALL_0PARAM                              \
                      :                                 \
                      : __HYPERCALL_CLOBBER0);                          \
@@ -89,7 +93,7 @@
 ({                                                                     \
        __HYPERCALL_DECLS;                                              \
        __HYPERCALL_1ARG(a1);                                           \
-       asm volatile (__HYPERCALL                                       \
+       asm volatile (__HYPERCALL(number)                                       \
                      : __HYPERCALL_1PARAM                              \
                      :                                 \
                      : __HYPERCALL_CLOBBER1);                          \
@@ -100,7 +104,7 @@
 ({                                                                     \
        __HYPERCALL_DECLS;                                              \
        __HYPERCALL_2ARG(a1, a2);                                       \
-       asm volatile (__HYPERCALL                                       \
+       asm volatile (__HYPERCALL(number)                                       \
                      : __HYPERCALL_2PARAM                              \
                      :                                 \
                      : __HYPERCALL_CLOBBER2);                          \
@@ -111,7 +115,7 @@
 ({                                                                     \
        __HYPERCALL_DECLS;                                              \
        __HYPERCALL_3ARG(a1, a2, a3);                                   \
-       asm volatile (__HYPERCALL                                       \
+       asm volatile (__HYPERCALL(number)                                       \
                      : __HYPERCALL_3PARAM                              \
                      :                                 \
                      : __HYPERCALL_CLOBBER3);                          \
@@ -122,7 +126,7 @@
 ({                                                                     \
        __HYPERCALL_DECLS;                                              \
        __HYPERCALL_4ARG(a1, a2, a3, a4);                               \
-       asm volatile (__HYPERCALL                                       \
+       asm volatile (__HYPERCALL(number)                                       \
                      : __HYPERCALL_4PARAM                              \
                      :                                 \
                      : __HYPERCALL_CLOBBER4);                          \
@@ -133,7 +137,7 @@
 ({                                                                     \
        __HYPERCALL_DECLS;                                              \
        __HYPERCALL_5ARG(a1, a2, a3, a4, a5);                           \
-       asm volatile (__HYPERCALL                                       \
+       asm volatile (__HYPERCALL(number)                                       \
                      : __HYPERCALL_5PARAM                              \
                      :                                 \
                      : __HYPERCALL_CLOBBER5);                          \
@@ -144,52 +148,42 @@
 
 /* -- Hypercall definitions go below -- */
 
-#define __HYPERCALL ".word 0xe1400171"  /* hypercall number 0x11 */
 static inline int
 HYPERVISOR_xen_version(int cmd, void *arg)
 {
-       return _hypercall2(int, xen_version, cmd, arg);
+       return _hypercall2(int, __HYPERVISOR_xen_version, cmd, arg);
 }
-#undef __HYPERCALL
 
-#define __HYPERCALL ".word 0xe1400172"  /* hypercall number 0x12 */
 static inline int
 HYPERVISOR_console_io(int cmd, int count, char *str)
 {
        return _hypercall3(int, __HYPERVISOR_console_io, cmd, count, str);
 }
-#undef __HYPERCALL
 
-#define __HYPERCALL ".word 0xe1400174"  /* hypercall number 0x14 */
 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, __HYPERVISOR_grant_table_op, cmd, uop, count);
 }
-#undef __HYPERCALL
 
-#define __HYPERCALL ".word 0xe140017d"  /* hypercall number 0x1d */
 static inline int
 HYPERVISOR_sched_op(int cmd, void *arg)
 {
-       return _hypercall2(int, sched_op, cmd, arg);
+       return _hypercall2(int, __HYPERVISOR_sched_op, cmd, arg);
 }
-#undef __HYPERCALL
 
-#define __HYPERCALL ".word 0xe1400270"  /* hypercall number 0x20 */
 static inline int
 HYPERVISOR_event_channel_op(int cmd, void *arg)
 {
-       int rc = _hypercall2(int, event_channel_op, cmd, arg);
+       int rc = _hypercall2(int, __HYPERVISOR_event_channel_op, cmd, arg);
        if (unlikely(rc == -ENOSYS)) {
                struct evtchn_op op;
                op.cmd = cmd;
                memcpy(&op.u, arg, sizeof(op.u));
-               rc = _hypercall1(int, event_channel_op_compat, &op);
+               rc = _hypercall1(int, __HYPERVISOR_event_channel_op_compat, &op);
                memcpy(arg, &op.u, sizeof(op.u));
        }
        return rc;
 }
-#undef __HYPERCALL
 
 #endif /* _ASM_ARM_XEN_HYPERCALL_H */