xnu-1699.32.7.tar.gz

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

diff --git a/osfmk/i386/cpu.c b/osfmk/i386/cpu.c
index 3ef513a270e89fd9299727f637c91acd8367732c..4cdeed647742736794cfc1ba549d394084be3a86 100644 (file)
--- a/osfmk/i386/cpu.c
+++ b/osfmk/i386/cpu.c
@@ -1,16 +1,19 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2009 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 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
  * 
  * 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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.
+ * 
+ * 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
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * 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
  */
 /*
  *     File:   i386/cpu.c


@@ -28,19 +31,25 @@
  *     cpu specific routines
  */
 
  *     cpu specific routines
  */
 

-#include <kern/machine.h>
+#include <kern/kalloc.h>

 #include <kern/misc_protos.h>
 #include <kern/misc_protos.h>

-#include <kern/cpu_data.h>
-#include <kern/cpu_number.h>
-#include <kern/processor.h>
+#include <kern/machine.h>

 #include <mach/processor_info.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/mp_desc.h>
+#include <i386/misc_protos.h>
+#include <i386/cpu_threads.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 <kern/etimer.h>
+#include <kern/timer_call.h>

 
 

-cpu_data_t     cpu_data[NCPUS];
-int            real_ncpus = 0;
-int            wncpu = NCPUS;
+struct processor       processor_master;

 
 /*ARGSUSED*/
 kern_return_t
 
 /*ARGSUSED*/
 kern_return_t


@@ -49,15 +58,16 @@ cpu_control(
        processor_info_t        info,
        unsigned int            count)
 {
        processor_info_t        info,
        unsigned int            count)
 {

-       printf("cpu_control not implemented\n");
+       printf("cpu_control(%d,%p,%d) not implemented\n",
+               slot_num, info, count);

        return (KERN_FAILURE);
 }
 
 /*ARGSUSED*/
 kern_return_t
 cpu_info_count(
        return (KERN_FAILURE);
 }
 
 /*ARGSUSED*/
 kern_return_t
 cpu_info_count(

-        processor_flavor_t      flavor,
-       unsigned int            *count)
+        __unused processor_flavor_t      flavor,
+       unsigned int                    *count)

 {
        *count = 0;
        return (KERN_FAILURE);
 {
        *count = 0;
        return (KERN_FAILURE);


@@ -71,80 +81,35 @@ cpu_info(
        processor_info_t        info,
        unsigned int            *count)
 {
        processor_info_t        info,
        unsigned int            *count)
 {

-       printf("cpu_info not implemented\n");
+       printf("cpu_info(%d,%d,%p,%p) not implemented\n",
+               flavor, slot_num, info, count);

        return (KERN_FAILURE);
 }
 
 void
        return (KERN_FAILURE);
 }
 
 void

-cpu_sleep()
+cpu_sleep(void)

 {
 {

-       printf("cpu_sleep not implemented\n");
-}
+       cpu_data_t      *cdp = current_cpu_datap();

 
 

-void
-cpu_init()
-{
-       int     my_cpu = get_cpu_number();
-
-       machine_slot[my_cpu].is_cpu = TRUE;
-       machine_slot[my_cpu].running = TRUE;
-#ifdef MACH_BSD
-       /* FIXME */
-       machine_slot[my_cpu].cpu_type = CPU_TYPE_I386;
-       machine_slot[my_cpu].cpu_subtype = CPU_SUBTYPE_PENTPRO;
-#else
-       machine_slot[my_cpu].cpu_type = cpuid_cputype(0);
-       machine_slot[my_cpu].cpu_subtype = CPU_SUBTYPE_AT386;
-#endif
+       i386_deactivate_cpu();

 
 

-#if    NCPUS > 1
-       mp_desc_init(my_cpu);
-#endif /* NCPUS */
+       PE_cpu_machine_quiesce(cdp->cpu_id);
+
+       cpu_thread_halt();

 }
 
 }
 

-kern_return_t
-cpu_register(
-       int *target_cpu)
+void
+cpu_init(void)

 {
 {

-       int cpu;
+       cpu_data_t      *cdp = current_cpu_datap();

 
 

-       if (real_ncpus == 0) {
-               /*
-                * Special case for the boot processor,
-                * it has been pre-registered by cpu_init(); 
-                */
-               *target_cpu = 0;
-               real_ncpus++;
-               return KERN_SUCCESS;
-       }
+       timer_call_initialize_queue(&cdp->rtclock_timer.queue);
+       cdp->rtclock_timer.deadline = EndOfAllTime;

 
 

-       /* 
-        * TODO: 
-        * - Run cpu_register() in exclusion mode 
-        */
+       cdp->cpu_type = cpuid_cputype();
+       cdp->cpu_subtype = cpuid_cpusubtype();

 
 

-       *target_cpu = -1;
-       for(cpu=0; cpu < wncpu; cpu++) {
-               if(!machine_slot[cpu].is_cpu) {
-                       machine_slot[cpu].is_cpu = TRUE;
-#ifdef MACH_BSD
-                       /* FIXME */
-                       machine_slot[cpu].cpu_type = CPU_TYPE_I386;
-                       machine_slot[cpu].cpu_subtype = CPU_SUBTYPE_PENTPRO;
-#else
-                       machine_slot[cpu].cpu_type = cpuid_cputype(0);
-                       machine_slot[cpu].cpu_subtype = CPU_SUBTYPE_AT386;
-#endif
-                       *target_cpu = cpu;
-                       break;
-               }
-       }
-
-       if (*target_cpu != -1) {
-               real_ncpus++;
-               return KERN_SUCCESS;
-       } else
-               return KERN_FAILURE;
+       i386_activate_cpu();

 }
 
 kern_return_t
 }
 
 kern_return_t


@@ -154,29 +119,145 @@ cpu_start(
        kern_return_t           ret;
 
        if (cpu == cpu_number()) {
        kern_return_t           ret;
 
        if (cpu == cpu_number()) {

-               PE_cpu_machine_init(cpu_data[cpu].cpu_id, TRUE);
-               ml_init_interrupt();
-               cpu_data[cpu].cpu_status = 1;
+               cpu_machine_init();

                return KERN_SUCCESS;
                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);
                /*
                 * 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(
+       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)
 {
 }
 
 void
 cpu_machine_init(
        void)
 {

-       int     cpu;
+       cpu_data_t      *cdp = current_cpu_datap();

 
 

-       cpu = get_cpu_number();
-       PE_cpu_machine_init(cpu_data[cpu].cpu_id, TRUE);
+       PE_cpu_machine_init(cdp->cpu_id, !cdp->cpu_boot_complete);
+       cdp->cpu_boot_complete = TRUE;
+       cdp->cpu_running = TRUE;

        ml_init_interrupt();
        ml_init_interrupt();

-       cpu_data[cpu].cpu_status = 1;
+
+#if CONFIG_VMX
+       /* for every CPU, get the VT specs */
+       vmx_get_specs();
+#endif

 }
 
 }
 

+processor_t
+cpu_processor_alloc(boolean_t is_boot_cpu)
+{
+       int             ret;
+       processor_t     proc;
+
+       if (is_boot_cpu)
+               return &processor_master;
+
+       ret = kmem_alloc(kernel_map, (vm_offset_t *) &proc, sizeof(*proc));
+       if (ret != KERN_SUCCESS)
+               return NULL;
+
+       bzero((void *) proc, sizeof(*proc));
+       return proc;
+}
+
+void
+cpu_processor_free(processor_t proc)
+{
+       if (proc != NULL && proc != &processor_master)
+               kfree((void *) proc, sizeof(*proc));
+}
+
+processor_t
+current_processor(void)
+{
+       return current_cpu_datap()->cpu_processor;
+}
+
+processor_t
+cpu_to_processor(
+       int                     cpu)
+{
+       return cpu_datap(cpu)->cpu_processor;
+}
+
+ast_t *
+ast_pending(void)
+{
+       return (&current_cpu_datap()->cpu_pending_ast);
+}
+
+cpu_type_t
+slot_type(
+       int             slot_num)
+{
+       return (cpu_datap(slot_num)->cpu_type);
+}
+
+cpu_subtype_t
+slot_subtype(
+       int             slot_num)
+{
+       return (cpu_datap(slot_num)->cpu_subtype);
+}
+
+cpu_threadtype_t
+slot_threadtype(
+       int             slot_num)
+{
+       return (cpu_datap(slot_num)->cpu_threadtype);
+}
+
+cpu_type_t
+cpu_type(void)
+{
+       return (current_cpu_datap()->cpu_type);
+}
+
+cpu_subtype_t
+cpu_subtype(void)
+{
+       return (current_cpu_datap()->cpu_subtype);
+}
+
+cpu_threadtype_t
+cpu_threadtype(void)
+{
+       return (current_cpu_datap()->cpu_threadtype);
+}