xnu-1228.9.59.tar.gz

[apple/xnu.git] / osfmk / i386 / cpu.c

diff --git a/osfmk/i386/cpu.c b/osfmk/i386/cpu.c
index e1a94199b2f353bb5169a95822b6c8a4476902c2..1760eabf5962ea3d1787c7485d12491b50662a56 100644 (file)
--- a/osfmk/i386/cpu.c
+++ b/osfmk/i386/cpu.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -35,7 +35,6 @@
 #include <kern/misc_protos.h>
 #include <kern/machine.h>
 #include <mach/processor_info.h>
-#include <i386/mp.h>
 #include <i386/machine_cpu.h>
 #include <i386/machine_routines.h>
 #include <i386/pmap.h>
@@ -54,7 +53,7 @@ cpu_control(
        processor_info_t        info,
        unsigned int            count)
 {
-       printf("cpu_control(%d,0x%x,%d) not implemented\n",
+       printf("cpu_control(%d,%p,%d) not implemented\n",
                slot_num, info, count);
        return (KERN_FAILURE);
 }
@@ -77,7 +76,7 @@ cpu_info(
        processor_info_t        info,
        unsigned int            *count)
 {
-       printf("cpu_info(%d,%d,0x%x,0x%x) not implemented\n",
+       printf("cpu_info(%d,%d,%p,%p) not implemented\n",
                flavor, slot_num, info, count);
        return (KERN_FAILURE);
 }
@@ -85,11 +84,11 @@ cpu_info(
 void
 cpu_sleep(void)
 {
-       cpu_data_t      *proc_info = current_cpu_datap();
+       cpu_data_t      *cdp = current_cpu_datap();
 
-       proc_info->cpu_running = FALSE;
+       i386_deactivate_cpu();
 
-       PE_cpu_machine_quiesce(proc_info->cpu_id);
+       PE_cpu_machine_quiesce(cdp->cpu_id);
 
        cpu_thread_halt();
 }
@@ -99,14 +98,10 @@ cpu_init(void)
 {
        cpu_data_t      *cdp = current_cpu_datap();
 
-       /* be sure cpuid is initialized */
-       cpuid_set_info();
-
-       /* and allow it to be authoritative */
        cdp->cpu_type = cpuid_cputype();
        cdp->cpu_subtype = cpuid_cpusubtype();
 
-       cdp->cpu_running = TRUE;
+       i386_activate_cpu();
 }
 
 kern_return_t
@@ -118,20 +113,42 @@ cpu_start(
        if (cpu == cpu_number()) {
                cpu_machine_init();
                return KERN_SUCCESS;
-       } else {
+       }
+
+       /*
+        * Try to bring the CPU back online without a reset.
+        * If the fast restart doesn't succeed, fall back to
+        * the slow way.
+        */
+       ret = intel_startCPU_fast(cpu);
+       if (ret != KERN_SUCCESS) {
                /*
                 * Should call out through PE.
                 * But take the shortcut here.
                 */
                ret = intel_startCPU(cpu);
-               return(ret);
        }
+
+       if (ret != KERN_SUCCESS)
+               kprintf("cpu: cpu_start(%d) returning failure!\n", cpu);
+
+       return(ret);
 }
 
 void
 cpu_exit_wait(
-       __unused int cpu)
+       int cpu)
 {
+       cpu_data_t      *cdp = cpu_datap(cpu);
+
+       simple_lock(&x86_topo_lock);
+       while ((cdp->lcpu.state != LCPU_HALT)
+              && (cdp->lcpu.state != LCPU_OFF)) {
+           simple_unlock(&x86_topo_lock);
+           cpu_pause();
+           simple_lock(&x86_topo_lock);
+       }
+       simple_unlock(&x86_topo_lock);
 }
 
 void
@@ -151,6 +168,9 @@ cpu_machine_init(
        }
 #endif
        ml_init_interrupt();
+
+       /* for every CPU, get the VT specs */
+       vmx_get_specs();
 }
 
 processor_t