Changeset 25a76ab8 in mainline for kernel/arch/sparc64/src/smp/sun4v/smp.c

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (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/src/smp/sun4v/smp.c (modified) (2 diffs)

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

@@ -417 +417 @@
 static bool wake_cpu(uint64_t cpuid)
 {
-
 #ifdef CONFIG_SIMICS_SMP_HACK
         ipi_unicast_to((void (*)(void)) 1234, cpuid);
@@ -424 +423 @@
         if (__hypercall_fast1(CPU_STOP, cpuid) != EOK)
                 return false;
-
+        
         /* wait for the CPU to stop */
         uint64_t state;
-        __hypercall_fast_ret1(cpuid, 0, 0, 0, 0,
-                CPU_STATE, &state);
-        while (state == CPU_STATE_RUNNING) {
-                __hypercall_fast_ret1(cpuid, 0, 0, 0, 0,
-                        CPU_STATE, &state);
-        }
-
+        __hypercall_fast_ret1(cpuid, 0, 0, 0, 0, CPU_STATE, &state);
+        while (state == CPU_STATE_RUNNING)
+                __hypercall_fast_ret1(cpuid, 0, 0, 0, 0, CPU_STATE, &state);
+        
         /* make the CPU run again and execute HelenOS code */
-        if (__hypercall_fast4(
-                CPU_START, cpuid,
-                (uint64_t) KA2PA(kernel_image_start),
-                KA2PA(trap_table), bootinfo.physmem_start                       
-                ) != EOK)
-                        return false;
+        if (__hypercall_fast4(CPU_START, cpuid,
+            (uint64_t) KA2PA(kernel_image_start), KA2PA(trap_table),
+            physmem_start) != EOK)
+                return false;
 #endif
-
+        
         if (waitq_sleep_timeout(&ap_completion_wq, 10000000, SYNCH_FLAGS_NONE) ==
-                        ESYNCH_TIMEOUT)
-                printf("%s: waiting for processor (cpuid = %" PRIu32
-                ") timed out\n", __func__, cpuid);
-
+            ESYNCH_TIMEOUT)
+                printf("%s: waiting for processor (cpuid = %" PRIu32 ") timed out\n",
+                    __func__, cpuid);
+        
         return true;
 }