xnu-1228.15.4.tar.gz

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

diff --git a/osfmk/i386/cpu.c b/osfmk/i386/cpu.c
index 67d5a1c556fdd341a9ab9cf6f4f978a007e9d428..194a6576bc3a0589e5818285b85f6dd575910977 100644 (file)
--- a/osfmk/i386/cpu.c
+++ b/osfmk/i386/cpu.c
@@ -1,14 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  *     File:   i386/cpu.c
@@ -30,14 +35,14 @@
 #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>
 #include <i386/misc_protos.h>
 #include <i386/cpu_threads.h>
+#include <i386/rtclock.h>
 #include <vm/vm_kern.h>
-
+#include "cpuid.h"
 
 struct processor       processor_master;
 
@@ -48,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);
 }
@@ -71,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);
 }
@@ -79,9 +84,11 @@ cpu_info(
 void
 cpu_sleep(void)
 {
-       cpu_data_t      *proc_info = current_cpu_datap();
+       cpu_data_t      *cdp = current_cpu_datap();
 
-       PE_cpu_machine_quiesce(proc_info->cpu_id);
+       i386_deactivate_cpu();
+
+       PE_cpu_machine_quiesce(cdp->cpu_id);
 
        cpu_thread_halt();
 }
@@ -91,15 +98,10 @@ cpu_init(void)
 {
        cpu_data_t      *cdp = current_cpu_datap();
 
-#ifdef MACH_BSD
-       /* FIXME */
-       cdp->cpu_type = CPU_TYPE_I386;
-       cdp->cpu_subtype = CPU_SUBTYPE_PENTPRO;
-#else
-       cdp->cpu_type = cpuid_cputype(0);
-       cdp->cpu_subtype = CPU_SUBTYPE_AT386;
-#endif
-       cdp->cpu_running = TRUE;
+       cdp->cpu_type = cpuid_cputype();
+       cdp->cpu_subtype = cpuid_cpusubtype();
+
+       i386_activate_cpu();
 }
 
 kern_return_t
@@ -111,30 +113,57 @@ 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);
+
+       /*
+        * Wait until the CPU indicates that it has stopped.
+        */
+       simple_lock(&x86_topo_lock);
+       while ((cdp->lcpu.state != LCPU_HALT)
+              && (cdp->lcpu.state != LCPU_OFF)
+              && !cdp->lcpu.stopped) {
+           simple_unlock(&x86_topo_lock);
+           cpu_pause();
+           simple_lock(&x86_topo_lock);
+       }
+       simple_unlock(&x86_topo_lock);
 }
 
 void
 cpu_machine_init(
        void)
 {
-       int     cpu;
+       cpu_data_t      *cdp = current_cpu_datap();
 
-       cpu = get_cpu_number();
-       PE_cpu_machine_init(cpu_datap(cpu)->cpu_id, TRUE);
+       PE_cpu_machine_init(cdp->cpu_id, !cdp->cpu_boot_complete);
+       cdp->cpu_boot_complete = TRUE;
+       cdp->cpu_running = TRUE;
 #if 0
        if (cpu_datap(cpu)->hibernate)
        {
@@ -143,6 +172,9 @@ cpu_machine_init(
        }
 #endif
        ml_init_interrupt();
+
+       /* for every CPU, get the VT specs */
+       vmx_get_specs();
 }
 
 processor_t