Changeset b4ca0a9c in mainline for kernel/arch/sparc64

Timestamp:

2012-07-10T11:53:50Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1e01a35

Parents:

a33706e (diff), 33fc3ae (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:

• Makefile.inc (modified) (1 diff)
• src/drivers/niagara.c (modified) (1 diff)
• src/proc/sun4u/scheduler.c (modified) (2 diffs)
• src/proc/sun4v/scheduler.c (modified) (2 diffs)
• src/proc/thread.c (modified) (1 diff)
• src/smp/sun4u/ipi.c (modified) (1 diff)
• src/sun4u/sparc64.c (modified) (1 diff)
• src/sun4v/sparc64.c (modified) (1 diff)

kernel/arch/sparc64/Makefile.inc

@@ -32 +32 @@
 
 GCC_CFLAGS += -m64 -mcpu=ultrasparc -mcmodel=medlow -mno-fpu
-SUNCC_CFLAGS += -m64 -xarch=sparc -xregs=appl,no%float
 
 LFLAGS += -no-check-sections

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

@@ -184 +184 @@
         
         instance = malloc(sizeof(niagara_instance_t), FRAME_ATOMIC);
-        instance->thread = thread_create(kniagarapoll, NULL, TASK, 0,
-            "kniagarapoll", true);
+        instance->thread = thread_create(kniagarapoll, NULL, TASK,
+            THREAD_FLAG_UNCOUNTED, "kniagarapoll");
         
         if (!instance->thread) {

kernel/arch/sparc64/src/proc/sun4u/scheduler.c

@@ -51 +51 @@
 void before_thread_runs_arch(void)
 {
-        if ((THREAD->flags & THREAD_FLAG_USPACE)) {
+        if (THREAD->uspace) {
                 /*
                  * Write kernel stack address to %g6 of the alternate and
@@ -74 +74 @@
 void after_thread_ran_arch(void)
 {
-        if ((THREAD->flags & THREAD_FLAG_USPACE)) {
-                /* sample the state of the userspace window buffer */   
+        if (THREAD->uspace) {
+                /* sample the state of the userspace window buffer */
                 THREAD->arch.uspace_window_buffer = (uint8_t *) read_from_ag_g7();
         }

kernel/arch/sparc64/src/proc/sun4v/scheduler.c

@@ -54 +54 @@
 void before_thread_runs_arch(void)
 {
-        if ((THREAD->flags & THREAD_FLAG_USPACE)) {
+        if (THREAD->uspace) {
                 uint64_t sp = (uintptr_t) THREAD->kstack + STACK_SIZE -
                     (STACK_BIAS + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT));
@@ -66 +66 @@
 void after_thread_ran_arch(void)
 {
-        if ((THREAD->flags & THREAD_FLAG_USPACE)) {
-                /* sample the state of the userspace window buffer */   
+        if (THREAD->uspace) {
+                /* sample the state of the userspace window buffer */
                 THREAD->arch.uspace_window_buffer =
                     (uint8_t *) asi_u64_read(ASI_SCRATCHPAD, SCRATCHPAD_WBUF);

kernel/arch/sparc64/src/proc/thread.c

@@ -61 +61 @@
 void thread_create_arch(thread_t *t)
 {
-        if ((t->flags & THREAD_FLAG_USPACE) && (!t->arch.uspace_window_buffer))
+        if ((t->uspace) && (!t->arch.uspace_window_buffer))
                 {
                 /*

kernel/arch/sparc64/src/smp/sun4u/ipi.c

@@ -124 +124 @@
                         (void) interrupts_disable();
                 }
-        } while (done);
+        } while (!done);
         
         preemption_enable();

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

@@ -156 +156 @@
         (void) interrupts_disable();
         switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-            ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE
-            - (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS),
+            ((uintptr_t) kernel_uarg->uspace_stack) +
+            kernel_uarg->uspace_stack_size -
+            (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS),
             (uintptr_t) kernel_uarg->uspace_uarg);
-
-        for (;;)
-                ;
-        /* not reached */
+        
+        /* Not reached */
+        while (1);
 }
 

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

@@ -154 +154 @@
         (void) interrupts_disable();
         switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-            ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE
-            - (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS),
+            ((uintptr_t) kernel_uarg->uspace_stack) +
+            kernel_uarg->uspace_stack_size -
+            (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS),
             (uintptr_t) kernel_uarg->uspace_uarg);
-
-        for (;;)
-                ;
-        /* not reached */
+        
+        /* Not reached */
+        while (1);
 }