xnu-1228.tar.gz

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

diff --git a/osfmk/i386/cpu.c b/osfmk/i386/cpu.c
index 588377b1f5610ddf88a90490b27c5402bafee6c6..b0f87d7dadefae91d204cc0d205e3a59c09babf2 100644 (file)
--- a/osfmk/i386/cpu.c
+++ b/osfmk/i386/cpu.c
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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. 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * 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
@@ -29,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>
@@ -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,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();
 }
@@ -96,7 +101,7 @@ cpu_init(void)
        cdp->cpu_type = cpuid_cputype();
        cdp->cpu_subtype = cpuid_cpusubtype();
 
-       cdp->cpu_running = TRUE;
+       i386_activate_cpu();
 }
 
 kern_return_t
@@ -120,8 +125,17 @@ cpu_start(
 
 void
 cpu_exit_wait(
-       __unused int cpu)
+       int cpu)
 {
+       cpu_data_t      *cdp = cpu_datap(cpu);
+
+       simple_lock(&x86_topo_lock);
+       while (!cdp->lcpu.halted) {
+           simple_unlock(&x86_topo_lock);
+           cpu_pause();
+           simple_lock(&x86_topo_lock);
+       }
+       simple_unlock(&x86_topo_lock);
 }
 
 void
@@ -141,6 +155,9 @@ cpu_machine_init(
        }
 #endif
        ml_init_interrupt();
+
+       /* for every CPU, get the VT specs */
+       vmx_get_specs();
 }
 
 processor_t