Changeset 7715994 in mainline for kernel/arch/sparc64/include/sun4v/hypercall.h

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/sparc64/include/sun4v/hypercall.h (modified) (2 diffs)

kernel/arch/sparc64/include/sun4v/hypercall.h

@@ -75 +75 @@
 
 /* return codes */
-#define EOK             0       /**< Successful return */
-#define ENOCPU          1       /**< Invalid CPU id */
-#define ENORADDR        2       /**< Invalid real address */
-#define ENOINTR         3       /**< Invalid interrupt id */
-#define EBADPGSZ        4       /**< Invalid pagesize encoding */
-#define EBADTSB         5       /**< Invalid TSB description */
-#define HV_EINVAL       6       /**< Invalid argument */
-#define EBADTRAP        7       /**< Invalid function number */
-#define EBADALIGN       8       /**< Invalid address alignment */
-#define EWOULDBLOCK     9       /**< Cannot complete operation without blocking */
-#define ENOACCESS       10      /**< No access to specified resource */
-#define EIO             11      /**< I/O Error */
-#define ECPUERROR       12      /**< CPU is in error state */
-#define ENOTSUPPORTED   13      /**< Function not supported */
-#define ENOMAP          14      /**< No mapping found */
-#define ETOOMANY        15      /**< Too many items specified / limit reached */
-#define ECHANNEL        16      /**< Invalid LDC channel */
-#define HV_EBUSY        17      /**< Operation failed as resource is otherwise busy */
+#define HV_EOK                  0       /**< Successful return */
+#define HV_ENOCPU               1       /**< Invalid CPU id */
+#define HV_ENORADDR             2       /**< Invalid real address */
+#define HV_ENOINTR              3       /**< Invalid interrupt id */
+#define HV_EBADPGSZ             4       /**< Invalid pagesize encoding */
+#define HV_EBADTSB              5       /**< Invalid TSB description */
+#define HV_EINVAL               6       /**< Invalid argument */
+#define HV_EBADTRAP             7       /**< Invalid function number */
+#define HV_EBADALIGN            8       /**< Invalid address alignment */
+#define HV_EWOULDBLOCK          9       /**< Cannot complete operation without blocking */
+#define HV_ENOACCESS            10      /**< No access to specified resource */
+#define HV_EIO                  11      /**< I/O Error */
+#define HV_ECPUERROR            12      /**< CPU is in error state */
+#define HV_ENOTSUPPORTED        13      /**< Function not supported */
+#define HV_ENOMAP               14      /**< No mapping found */
+#define HV_ETOOMANY             15      /**< Too many items specified / limit reached */
+#define HV_ECHANNEL             16      /**< Invalid LDC channel */
+#define HV_EBUSY                17      /**< Operation failed as resource is otherwise busy */
 
 
@@ -190 +190 @@
 __hypercall_fast_ret1(const uint64_t p1, const uint64_t p2, const uint64_t p3,
     const uint64_t p4, const uint64_t p5, const uint64_t function_number,
-    uint64_t * const ret1)
+    uint64_t *ret1)
 {
-        uint64_t errno = __hypercall_fast(p1, p2, p3, p4, p5, function_number);
-        if (ret1 != NULL) {
-                asm volatile ("mov %%o1, %0\n" : "=r" (*ret1));
-        }
-        return errno;
+        register uint64_t a6 asm("o5") = function_number;
+        register uint64_t a1 asm("o0") = p1;
+        register uint64_t a2 asm("o1") = p2;
+        register uint64_t a3 asm("o2") = p3;
+        register uint64_t a4 asm("o3") = p4;
+        register uint64_t a5 asm("o4") = p5;
+        
+        asm volatile (
+                "ta %8\n"
+                : "=r" (a1), "=r" (a2)
+                : "r" (a1), "r" (a2), "r" (a3), "r" (a4), "r" (a5), "r" (a6),
+                  "i" (FAST_TRAP)
+                : "memory"
+        );
+
+        if (ret1)
+                *ret1 = a2;
+
+        return a1;
 }