X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/6d2010ae8f7a6078e10b361c6962983bab233e0f..39236c6e673c41db228275375ab7fdb0f837b292:/osfmk/i386/cpu.c

diff --git a/osfmk/i386/cpu.c b/osfmk/i386/cpu.c
index 4cdeed647..fc9fcc43e 100644
--- a/osfmk/i386/cpu.c
+++ b/osfmk/i386/cpu.c
@@ -46,7 +46,6 @@
 #include <i386/vmx/vmx_cpu.h>
 #endif
 #include <vm/vm_kern.h>
-#include <kern/etimer.h>
 #include <kern/timer_call.h>
 
 struct processor	processor_master;
@@ -91,8 +90,6 @@ cpu_sleep(void)
 {
 	cpu_data_t	*cdp = current_cpu_datap();
 
-	i386_deactivate_cpu();
-
 	PE_cpu_machine_quiesce(cdp->cpu_id);
 
 	cpu_thread_halt();
@@ -103,7 +100,7 @@ cpu_init(void)
 {
 	cpu_data_t	*cdp = current_cpu_datap();
 
-	timer_call_initialize_queue(&cdp->rtclock_timer.queue);
+	timer_call_queue_init(&cdp->rtclock_timer.queue);
 	cdp->rtclock_timer.deadline = EndOfAllTime;
 
 	cdp->cpu_type = cpuid_cputype();
@@ -148,19 +145,32 @@ cpu_exit_wait(
 	int cpu)
 {
     	cpu_data_t	*cdp = cpu_datap(cpu);
+	boolean_t	intrs_enabled;
+	uint64_t	tsc_timeout;
 
 	/*
 	 * Wait until the CPU indicates that it has stopped.
+	 * Disable interrupts while the topo lock is held -- arguably
+	 * this should always be done but in this instance it can lead to
+	 * a timeout if long-running interrupt were to occur here.
 	 */
+	intrs_enabled = ml_set_interrupts_enabled(FALSE);
 	simple_lock(&x86_topo_lock);
+	/* Set a generous timeout of several seconds (in TSC ticks) */
+	tsc_timeout = rdtsc64() + (10ULL * 1000 * 1000 * 1000);
 	while ((cdp->lcpu.state != LCPU_HALT)
 	       && (cdp->lcpu.state != LCPU_OFF)
 	       && !cdp->lcpu.stopped) {
 	    simple_unlock(&x86_topo_lock);
+	    ml_set_interrupts_enabled(intrs_enabled);
 	    cpu_pause();
+	    if (rdtsc64() > tsc_timeout)
+		panic("cpu_exit_wait(%d) timeout", cpu);
+	    ml_set_interrupts_enabled(FALSE);
 	    simple_lock(&x86_topo_lock);
 	}
 	simple_unlock(&x86_topo_lock);
+	ml_set_interrupts_enabled(intrs_enabled);
 }
 
 void