projects
/
apple
/
xnu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xnu-1699.26.8.tar.gz
[apple/xnu.git]
/
osfmk
/
i386
/
cpu.c
diff --git
a/osfmk/i386/cpu.c
b/osfmk/i386/cpu.c
index 1760eabf5962ea3d1787c7485d12491b50662a56..4cdeed647742736794cfc1ba549d394084be3a86 100644
(file)
--- a/
osfmk/i386/cpu.c
+++ b/
osfmk/i386/cpu.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2000-200
8
Apple Inc. All rights reserved.
+ * Copyright (c) 2000-200
9
Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
@@
-35,14
+35,19
@@
#include <kern/misc_protos.h>
#include <kern/machine.h>
#include <mach/processor_info.h>
#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/machine_cpu.h>
#include <i386/machine_routines.h>
-#include <i386/pmap.h>
#include <i386/misc_protos.h>
#include <i386/cpu_threads.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 <vm/vm_kern.h>
-#include "cpuid.h"
+#include <kern/etimer.h>
+#include <kern/timer_call.h>
struct processor processor_master;
struct processor processor_master;
@@
-98,6
+103,9
@@
cpu_init(void)
{
cpu_data_t *cdp = current_cpu_datap();
{
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();
cdp->cpu_type = cpuid_cputype();
cdp->cpu_subtype = cpuid_cpusubtype();
@@
-141,9
+149,13
@@
cpu_exit_wait(
{
cpu_data_t *cdp = cpu_datap(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)
simple_lock(&x86_topo_lock);
while ((cdp->lcpu.state != LCPU_HALT)
- && (cdp->lcpu.state != LCPU_OFF)) {
+ && (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);
cpu_pause();
simple_lock(&x86_topo_lock);
@@
-160,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;
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();
ml_init_interrupt();
+#if CONFIG_VMX
/* for every CPU, get the VT specs */
vmx_get_specs();
/* for every CPU, get the VT specs */
vmx_get_specs();
+#endif
}
processor_t
}
processor_t