X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/21362eb3e66fd2c787aee132bce100a44d71a99c..7ddcb079202367355dddccdfa4318e57d50318be:/osfmk/i386/cpu.c?ds=inline diff --git a/osfmk/i386/cpu.c b/osfmk/i386/cpu.c index 52460c149..4cdeed647 100644 --- a/osfmk/i386/cpu.c +++ b/osfmk/i386/cpu.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2009 Apple Inc. All rights reserved. * * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * @@ -35,14 +35,19 @@ #include #include #include -#include +#include #include #include -#include #include #include +#include +#include +#if CONFIG_VMX +#include +#endif #include - +#include +#include struct processor processor_master; @@ -53,7 +58,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); } @@ -76,7 +81,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); } @@ -84,9 +89,11 @@ cpu_info( void cpu_sleep(void) { - cpu_data_t *proc_info = current_cpu_datap(); + cpu_data_t *cdp = current_cpu_datap(); + + i386_deactivate_cpu(); - PE_cpu_machine_quiesce(proc_info->cpu_id); + PE_cpu_machine_quiesce(cdp->cpu_id); cpu_thread_halt(); } @@ -96,15 +103,13 @@ 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; + timer_call_initialize_queue(&cdp->rtclock_timer.queue); + cdp->rtclock_timer.deadline = EndOfAllTime; + + cdp->cpu_type = cpuid_cputype(); + cdp->cpu_subtype = cpuid_cpusubtype(); + + i386_activate_cpu(); } kern_return_t @@ -116,38 +121,63 @@ 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); -#if 0 - if (cpu_datap(cpu)->hibernate) - { - cpu_datap(cpu)->hibernate = 0; - hibernate_machine_init(); - } -#endif + PE_cpu_machine_init(cdp->cpu_id, !cdp->cpu_boot_complete); + cdp->cpu_boot_complete = TRUE; + cdp->cpu_running = TRUE; ml_init_interrupt(); + +#if CONFIG_VMX + /* for every CPU, get the VT specs */ + vmx_get_specs(); +#endif } processor_t