xnu-792.tar.gz

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

diff --git a/osfmk/i386/cpu.c b/osfmk/i386/cpu.c
index 3ef513a270e89fd9299727f637c91acd8367732c..4578329c756ad3c9e2a098e907d4d3df0c9132eb 100644 (file)
--- a/osfmk/i386/cpu.c
+++ b/osfmk/i386/cpu.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.

  * 
  * 

- * 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.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -28,19 +25,20 @@
  *     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/mp.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/pmap.h>
+#include <i386/misc_protos.h>
+#include <i386/cpu_threads.h>
+#include <vm/vm_kern.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 +47,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,0x%x,%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 +70,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,0x%x,0x%x) 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      *proc_info = current_cpu_datap();

 
 

-void
-cpu_init()
-{
-       int     my_cpu = get_cpu_number();
+       PE_cpu_machine_quiesce(proc_info->cpu_id);

 
 

-       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
-
-#if    NCPUS > 1
-       mp_desc_init(my_cpu);
-#endif /* NCPUS */
+       cpu_thread_halt();

 }
 
 }
 

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

 {
 {

-       int cpu;
-
-       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;
-       }
-
-       /* 
-        * TODO: 
-        * - Run cpu_register() in exclusion mode 
-        */
+       cpu_data_t      *cdp = current_cpu_datap();

 
 

-       *target_cpu = -1;
-       for(cpu=0; cpu < wncpu; cpu++) {
-               if(!machine_slot[cpu].is_cpu) {
-                       machine_slot[cpu].is_cpu = TRUE;

 #ifdef MACH_BSD
 #ifdef MACH_BSD

-                       /* FIXME */
-                       machine_slot[cpu].cpu_type = CPU_TYPE_I386;
-                       machine_slot[cpu].cpu_subtype = CPU_SUBTYPE_PENTPRO;
+       /* FIXME */
+       cdp->cpu_type = CPU_TYPE_I386;
+       cdp->cpu_subtype = CPU_SUBTYPE_PENTPRO;

 #else
 #else

-                       machine_slot[cpu].cpu_type = cpuid_cputype(0);
-                       machine_slot[cpu].cpu_subtype = CPU_SUBTYPE_AT386;
+       cdp->cpu_type = cpuid_cputype(0);
+       cdp->cpu_subtype = CPU_SUBTYPE_AT386;

 #endif
 #endif

-                       *target_cpu = cpu;
-                       break;
-               }
-       }
-
-       if (*target_cpu != -1) {
-               real_ncpus++;
-               return KERN_SUCCESS;
-       } else
-               return KERN_FAILURE;
+       cdp->cpu_running = TRUE;

 }
 
 kern_return_t
 }
 
 kern_return_t


@@ -154,9 +108,7 @@ 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;
        } else {
                /*
                return KERN_SUCCESS;
        } else {
                /*


@@ -168,6 +120,12 @@ cpu_start(
        }
 }
 
        }
 }
 

+void
+cpu_exit_wait(
+       __unused int cpu)
+{
+}
+

 void
 cpu_machine_init(
        void)
 void
 cpu_machine_init(
        void)


@@ -175,8 +133,89 @@ cpu_machine_init(
        int     cpu;
 
        cpu = get_cpu_number();
        int     cpu;
 
        cpu = get_cpu_number();

-       PE_cpu_machine_init(cpu_data[cpu].cpu_id, TRUE);
+       PE_cpu_machine_init(cpu_datap(cpu)->cpu_id, TRUE);
+

        ml_init_interrupt();
        ml_init_interrupt();

-       cpu_data[cpu].cpu_status = 1;

 }
 
 }
 

+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);
+}