Changeset 8b655705 in mainline for kernel/arch/sparc64

Timestamp:

2011-04-15T19:38:07Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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.

Location:

kernel/arch/sparc64

Files:

• _link.ld.in (modified) (1 diff)
• include/memstr.h (deleted)
• src/asm.S (modified) (2 diffs)
• src/drivers/niagara.c (modified) (2 diffs)
• src/mm/sun4u/as.c (modified) (1 diff)
• src/mm/sun4v/as.c (modified) (1 diff)
• src/smp/sun4v/smp.c (modified) (2 diffs)
• src/sun4v/asm.S (modified) (1 diff)
• src/sun4v/start.S (modified) (1 diff)
• src/trap/sun4v/interrupt.c (modified) (1 diff)

kernel/arch/sparc64/_link.ld.in

@@ -15 +15 @@
                 ktext_start = .;
                 *(K_TEXT_START)
-                *(.text);
+                *(.text .text.*);
                 ktext_end = .;
                 
                 kdata_start = .;
                 *(K_DATA_START)
-                *(.rodata);
-                *(.rodata.*);
+                *(.rodata .rodata.*);
                 *(.data);                   /* initialized data */
                 *(.sdata);

kernel/arch/sparc64/src/asm.S

@@ -34 +34 @@
 .register %g2, #scratch
 .register %g3, #scratch
-
-/*
- * This is the assembly language version of our _memcpy() generated by gcc.
- */
-.global memcpy
-memcpy:
-        mov %o0, %o3  /* save dst */
-        add %o1, 7, %g1
-        and %g1, -8, %g1
-        cmp %o1, %g1
-        be,pn %xcc, 3f
-        add %o0, 7, %g1
-        mov 0, %g3
-        
-        0:
-        
-                brz,pn %o2, 2f
-                mov 0, %g2
-        
-        1:
-        
-                ldub [%g3 + %o1], %g1
-                add %g2, 1, %g2
-                cmp %o2, %g2
-                stb %g1, [%g3 + %o0]
-                bne,pt %xcc, 1b
-                mov %g2, %g3
-        
-        2:
-        
-                jmp %o7 + 8  /* exit point */
-                mov %o3, %o0
-        
-        3:
-        
-                and %g1, -8, %g1
-                cmp %o0, %g1
-                bne,pt %xcc, 0b
-                mov 0, %g3
-                srlx %o2, 3, %g4
-                brz,pn %g4, 5f
-                mov 0, %g5
-        
-        4:
-        
-                sllx %g3, 3, %g2
-                add %g5, 1, %g3
-                ldx [%o1 + %g2], %g1
-                mov %g3, %g5
-                cmp %g4, %g3
-                bne,pt %xcc, 4b
-                stx %g1, [%o0 + %g2]
-        
-        5:
-        
-                and %o2, 7, %o2
-                brz,pn %o2, 2b
-                sllx %g4, 3, %g1
-                mov 0, %g2
-                add %g1, %o0, %o0
-                add %g1, %o1, %g4
-                mov 0, %g3
-        
-        6:
-        
-                ldub [%g2 + %g4], %g1
-                stb %g1, [%g2 + %o0]
-                add %g3, 1, %g2
-                cmp %o2, %g2
-                bne,pt %xcc, 6b
-                mov %g2, %g3
-                
-                jmp %o7 + 8  /* exit point */
-                mov %o3, %o0
 
 /*
@@ -264 +190 @@
         mov %g0, %o0  /* return 0 on failure */
 
-.global memsetb
-memsetb:
-        ba %xcc, _memsetb
-        nop
-
-.global memsetw
-memsetw:
-        ba %xcc, _memsetw
-        nop
-
 .global early_putchar
 early_putchar:

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

@@ -216 +216 @@
         outbuf_parea.pbase = (uintptr_t) (KA2PA(&output_buffer));
         outbuf_parea.frames = 1;
+        outbuf_parea.unpriv = false;
         ddi_parea_register(&outbuf_parea);
 
@@ -221 +222 @@
         inbuf_parea.pbase = (uintptr_t) (KA2PA(&input_buffer));
         inbuf_parea.frames = 1;
+        inbuf_parea.unpriv = false;
         ddi_parea_register(&inbuf_parea);
 

kernel/arch/sparc64/src/mm/sun4u/as.c

@@ -43 +43 @@
 
 #include <arch/mm/tsb.h>
-#include <arch/memstr.h>
 #include <arch/asm.h>
 #include <mm/frame.h>

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

@@ -46 +46 @@
 
 #include <arch/mm/tsb.h>
-#include <arch/memstr.h>
 #include <arch/asm.h>
 #include <mm/frame.h>

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Jakub Jermar
- * Copyright (c) 2009 Pavel Rimsky 
+ * Copyright (c) 2009 Pavel Rimsky
  * All rights reserved.
  *
@@ -439 +439 @@
         if (waitq_sleep_timeout(&ap_completion_wq, 10000000, SYNCH_FLAGS_NONE) ==
             ESYNCH_TIMEOUT)
-                printf("%s: waiting for processor (cpuid = %" PRIu32 ") timed out\n",
+                printf("%s: waiting for processor (cpuid = %" PRIu64 ") timed out\n",
                     __func__, cpuid);
         

kernel/arch/sparc64/src/sun4v/asm.S

@@ -41 +41 @@
 .global switch_to_userspace
 switch_to_userspace:
-        wrpr PSTATE_PRIV_BIT, %pstate
-        save %o1, -STACK_WINDOW_SAVE_AREA_SIZE, %sp
+        save %o1, -(STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
         flushw
         wrpr %g0, 0, %cleanwin          ! avoid information leak

kernel/arch/sparc64/src/sun4v/start.S

@@ -296 +296 @@
          * Create the first stack frame.
          */
-        save %sp, -(STACK_WINDWO_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
+        save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
         flushw
         add %g0, -STACK_BIAS, %fp

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

@@ -111 +111 @@
                         ((void (*)(void)) data1)();
                 } else {
-                        printf("Spurious interrupt on %d, data = %" PRIx64 ".\n",
+                        printf("Spurious interrupt on %" PRIu64 ", data = %" PRIx64 ".\n",
                             CPU->arch.id, data1);
                 }