Changes in / [68acf21:153fbf9] in mainline

Location:

kernel/arch/sparc64

Files:

• include/sun4v/hypercall.h (modified) (2 diffs)
• src/drivers/niagara.c (modified) (2 diffs)
• src/mm/sun4v/tlb.c (modified) (1 diff)
• src/sun4v/md.c (modified) (7 diffs)
• src/trap/sun4v/interrupt.c (modified) (1 diff)

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;
 }
 

kernel/arch/sparc64/src/drivers/niagara.c

@@ -104 +104 @@
 static inline void do_putchar(const char c) {
         /* repeat until the buffer is non-full */
-        while (__hypercall_fast1(CONS_PUTCHAR, c) == EWOULDBLOCK)
+        while (__hypercall_fast1(CONS_PUTCHAR, c) == HV_EWOULDBLOCK)
                 ;
 }
@@ -139 +139 @@
 
         /* read character from keyboard, send it to upper layers of HelenOS */
-        if (__hypercall_fast_ret1(0, 0, 0, 0, 0, CONS_GETCHAR, &c) == EOK) {
+        if (__hypercall_fast_ret1(0, 0, 0, 0, 0, CONS_GETCHAR, &c) == HV_EOK) {
                 if (!silent) {
                         /* kconsole active, send the character to kernel */

kernel/arch/sparc64/src/mm/sun4v/tlb.c

@@ -406 +406 @@
         uint64_t errno =  __hypercall_fast3(MMU_DEMAP_ALL, 0, 0,
                 MMU_FLAG_DTLB | MMU_FLAG_ITLB);
-        if (errno != EOK) {
+        if (errno != HV_EOK) {
                 panic("Error code = %d.\n", errno);
         }

kernel/arch/sparc64/src/sun4v/md.c

@@ -104 +104 @@
 static md_element_t *get_element(element_idx_t idx)
 {
-        return (md_element_t *) (
-                mach_desc + sizeof(md_header_t) + idx * sizeof(md_element_t));
+        return (md_element_t *) (mach_desc +
+            sizeof(md_header_t) + idx * sizeof(md_element_t));
 }
 
@@ -114 +114 @@
         uintptr_t name_offset = get_element(idx)->name_offset;
         return (char *) mach_desc + sizeof(md_header_t) +
-                md_header->node_blk_sz + name_offset;
+            md_header->node_blk_sz + name_offset;
 }
 
@@ -137 +137 @@
                 md_element_t *element = get_element(idx);
                 if (element->tag == PROP_VAL &&
-                                str_cmp(key, get_element_name(idx)) == 0) {
+                    str_cmp(key, get_element_name(idx)) == 0) {
                         *result = element->d.val;
                         return true;
@@ -161 +161 @@
                 md_element_t *element = get_element(idx);
                 if (element->tag == PROP_DATA &&
-                                str_cmp(key, get_element_name(idx)) == 0) {
+                    str_cmp(key, get_element_name(idx)) == 0) {
                         *result = (char *) mach_desc + sizeof(md_header_t) +
-                                md_header->node_blk_sz + md_header->name_blk_sz +
-                                element->d.y.data_offset;
+                            md_header->node_blk_sz + md_header->name_blk_sz +
+                            element->d.y.data_offset;
                         return true;
                 }
@@ -186 +186 @@
                 md_element_t *element = get_element(*it);
                 if (element->tag == PROP_ARC &&
-                                str_cmp("fwd", get_element_name(*it)) == 0) {
+                    str_cmp("fwd", get_element_name(*it)) == 0) {
                         return true;
                 }
@@ -289 +289 @@
 
                 if (element->tag == NODE &&
-                                str_cmp(name, get_element_name(*node)) == 0) {
+                    str_cmp(name, get_element_name(*node)) == 0) {
                         return true;
                 }
@@ -306 +306 @@
 {
         uint64_t retval = __hypercall_fast2(MACH_DESC, KA2PA(mach_desc),
-                MD_MAX_SIZE);
+            MD_MAX_SIZE);
 
         retval = retval;
-        if (retval != EOK) {
+        if (retval != HV_EOK) {
                 printf("Could not retrieve machine description, error = %d.\n",
-                        retval);
+                    retval);
         }
 }

kernel/arch/sparc64/src/trap/sun4v/interrupt.c

@@ -86 +86 @@
                 CPU_MONDO_QUEUE_ID,
                 KA2PA(cpu_mondo_queues[CPU->id]),
-                CPU_MONDO_NENTRIES) != EOK)
+                CPU_MONDO_NENTRIES) != HV_EOK)
                         panic("Initializing mondo queue failed on CPU %d.\n",
                             CPU->arch.id);