X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..7ddcb079202367355dddccdfa4318e57d50318be:/osfmk/i386/cpu.c

diff --git a/osfmk/i386/cpu.c b/osfmk/i386/cpu.c
index b0f87d7da..4cdeed647 100644
--- a/osfmk/i386/cpu.c
+++ b/osfmk/i386/cpu.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -35,14 +35,19 @@
 #include <kern/misc_protos.h>
 #include <kern/machine.h>
 #include <mach/processor_info.h>
+#include <i386/pmap.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 <i386/rtclock_protos.h>
+#include <i386/cpuid.h>
+#if CONFIG_VMX
+#include <i386/vmx/vmx_cpu.h>
+#endif
 #include <vm/vm_kern.h>
-#include "cpuid.h"
+#include <kern/etimer.h>
+#include <kern/timer_call.h>
 
 struct processor	processor_master;
 
@@ -98,6 +103,9 @@ cpu_init(void)
 {
 	cpu_data_t	*cdp = current_cpu_datap();
 
+	timer_call_initialize_queue(&cdp->rtclock_timer.queue);
+	cdp->rtclock_timer.deadline = EndOfAllTime;
+
 	cdp->cpu_type = cpuid_cputype();
 	cdp->cpu_subtype = cpuid_cpusubtype();
 
@@ -113,14 +121,26 @@ 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
@@ -129,8 +149,13 @@ cpu_exit_wait(
 {
     	cpu_data_t	*cdp = cpu_datap(cpu);
 
+	/*
+	 * Wait until the CPU indicates that it has stopped.
+	 */
 	simple_lock(&x86_topo_lock);
-	while (!cdp->lcpu.halted) {
+	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);
@@ -147,17 +172,12 @@ cpu_machine_init(
 	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)
-	{
-	    cpu_datap(cpu)->hibernate = 0;
-	    hibernate_machine_init();
-	}
-#endif
 	ml_init_interrupt();
 
+#if CONFIG_VMX
 	/* for every CPU, get the VT specs */
 	vmx_get_specs();
+#endif
 }
 
 processor_t