xnu-2422.1.72.tar.gz

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

diff --git a/osfmk/i386/machine_routines.c b/osfmk/i386/machine_routines.c
index 825df3b0d9cd75b7a0c7eefff71df426872652a6..06c57561c6401af357db22da96236f2a68d89799 100644 (file)
--- a/osfmk/i386/machine_routines.c
+++ b/osfmk/i386/machine_routines.c
@@ -1,5 +1,5 @@
 /*
 /*

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

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -25,53 +25,61 @@
  * 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */

+

 #include <i386/machine_routines.h>
 #include <i386/io_map_entries.h>
 #include <i386/cpuid.h>
 #include <i386/fpu.h>
 #include <i386/machine_routines.h>
 #include <i386/io_map_entries.h>
 #include <i386/cpuid.h>
 #include <i386/fpu.h>

+#include <mach/processor.h>

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

-#include <i386/cpu_data.h>
+#include <kern/thread_call.h>

 #include <i386/machine_cpu.h>
 #include <i386/machine_cpu.h>

-#include <i386/mp.h>
+#include <i386/lapic.h>
+#include <i386/lock.h>

 #include <i386/mp_events.h>
 #include <i386/mp_events.h>

-#include <i386/cpu_threads.h>
-#include <i386/pmap.h>
-#include <i386/misc_protos.h>

 #include <i386/pmCPU.h>
 #include <i386/pmCPU.h>

+#include <i386/trap.h>
+#include <i386/tsc.h>
+#include <i386/cpu_threads.h>

 #include <i386/proc_reg.h>
 #include <mach/vm_param.h>
 #include <i386/proc_reg.h>
 #include <mach/vm_param.h>

-#if MACH_KDB
-#include <i386/db_machdep.h>
-#include <ddb/db_aout.h>
-#include <ddb/db_access.h>
-#include <ddb/db_sym.h>
-#include <ddb/db_variables.h>
-#include <ddb/db_command.h>
-#include <ddb/db_output.h>
-#include <ddb/db_expr.h>
+#include <i386/pmap.h>
+#include <i386/pmap_internal.h>
+#include <i386/misc_protos.h>
+#include <kern/timer_queue.h>
+#if KPC
+#include <kern/kpc.h>

 #endif
 
 #endif
 

-#define MIN(a,b) ((a)<(b)? (a) : (b))
-

 #if DEBUG
 #define DBG(x...)      kprintf("DBG: " x)
 #else
 #define DBG(x...)
 #endif
 
 #if DEBUG
 #define DBG(x...)      kprintf("DBG: " x)
 #else
 #define DBG(x...)
 #endif
 

-extern void    initialize_screen(Boot_Video *, unsigned int);
-extern thread_t        Shutdown_context(thread_t thread, void (*doshutdown)(processor_t),processor_t  processor);

 extern void    wakeup(void *);
 extern void    wakeup(void *);

-extern unsigned KernelRelocOffset;

 
 static int max_cpus_initialized = 0;
 
 
 static int max_cpus_initialized = 0;
 

-unsigned int   LockTimeOut = 12500000;
-unsigned int   MutexSpin = 0;
+unsigned int   LockTimeOut;
+unsigned int   LockTimeOutTSC;
+unsigned int   MutexSpin;
+uint64_t       LastDebuggerEntryAllowance;
+uint64_t       delay_spin_threshold;
+
+extern uint64_t panic_restart_timeout;
+
+boolean_t virtualized = FALSE;
+
+decl_simple_lock_data(static,  ml_timer_evaluation_slock);
+uint32_t ml_timer_eager_evaluations;
+uint64_t ml_timer_eager_evaluation_max;
+static boolean_t ml_timer_evaluation_in_progress = FALSE;
+

 
 #define MAX_CPUS_SET    0x1
 #define MAX_CPUS_WAIT   0x2
 
 #define MAX_CPUS_SET    0x1
 #define MAX_CPUS_WAIT   0x2


@@ -96,23 +104,20 @@ vm_offset_t ml_static_malloc(
 
 void ml_get_bouncepool_info(vm_offset_t *phys_addr, vm_size_t *size)
 {
 
 void ml_get_bouncepool_info(vm_offset_t *phys_addr, vm_size_t *size)
 {

-        *phys_addr = bounce_pool_base;
-       *size      = bounce_pool_size;
+        *phys_addr = 0;
+       *size      = 0;

 }
 
 
 }
 
 

-vm_offset_t
-ml_boot_ptovirt(
-       vm_offset_t paddr)
-{
-       return (vm_offset_t)((paddr-KernelRelocOffset) | LINEAR_KERNEL_ADDRESS);
-} 
-

 vm_offset_t
 ml_static_ptovirt(
        vm_offset_t paddr)
 {
 vm_offset_t
 ml_static_ptovirt(
        vm_offset_t paddr)
 {

-    return (vm_offset_t)((unsigned) paddr | LINEAR_KERNEL_ADDRESS);
+#if defined(__x86_64__)
+       return (vm_offset_t)(((unsigned long) paddr) | VM_MIN_KERNEL_ADDRESS);
+#else
+       return (vm_offset_t)((paddr) | LINEAR_KERNEL_ADDRESS);
+#endif

 } 
 
 
 } 
 
 


@@ -125,23 +130,37 @@ ml_static_mfree(
        vm_offset_t vaddr,
        vm_size_t size)
 {
        vm_offset_t vaddr,
        vm_size_t size)
 {

-       vm_offset_t vaddr_cur;
+       addr64_t vaddr_cur;

        ppnum_t ppn;
        ppnum_t ppn;

-
-//     if (vaddr < VM_MIN_KERNEL_ADDRESS) return;
+       uint32_t freed_pages = 0;
+       assert(vaddr >= VM_MIN_KERNEL_ADDRESS);

 
        assert((vaddr & (PAGE_SIZE-1)) == 0); /* must be page aligned */
 
        for (vaddr_cur = vaddr;
 
        assert((vaddr & (PAGE_SIZE-1)) == 0); /* must be page aligned */
 
        for (vaddr_cur = vaddr;

-            vaddr_cur < round_page_32(vaddr+size);
+            vaddr_cur < round_page_64(vaddr+size);

             vaddr_cur += PAGE_SIZE) {
             vaddr_cur += PAGE_SIZE) {

-               ppn = pmap_find_phys(kernel_pmap, (addr64_t)vaddr_cur);
+               ppn = pmap_find_phys(kernel_pmap, vaddr_cur);

                if (ppn != (vm_offset_t)NULL) {
                if (ppn != (vm_offset_t)NULL) {

-                       pmap_remove(kernel_pmap, (addr64_t)vaddr_cur, (addr64_t)(vaddr_cur+PAGE_SIZE));
-                       vm_page_create(ppn,(ppn+1));
-                       vm_page_wire_count--;
+                       kernel_pmap->stats.resident_count++;
+                       if (kernel_pmap->stats.resident_count >
+                           kernel_pmap->stats.resident_max) {
+                               kernel_pmap->stats.resident_max =
+                                       kernel_pmap->stats.resident_count;
+                       }
+                       pmap_remove(kernel_pmap, vaddr_cur, vaddr_cur+PAGE_SIZE);
+                       assert(pmap_valid_page(ppn));
+
+                       if (IS_MANAGED_PAGE(ppn)) {
+                               vm_page_create(ppn,(ppn+1));
+                               vm_page_wire_count--;
+                               freed_pages++;
+                       }

                }
        }
                }
        }

+#if    DEBUG   
+       kprintf("ml_static_mfree: Released 0x%x pages at VA %p, size:0x%llx, last ppn: 0x%x\n", freed_pages, (void *)vaddr, (uint64_t)size, ppn);
+#endif

 }
 
 
 }
 
 


@@ -149,7 +168,79 @@ ml_static_mfree(
 vm_offset_t ml_vtophys(
        vm_offset_t vaddr)
 {
 vm_offset_t ml_vtophys(
        vm_offset_t vaddr)
 {

-       return  kvtophys(vaddr);
+       return  (vm_offset_t)kvtophys(vaddr);
+}
+
+/*
+ *     Routine:        ml_nofault_copy
+ *     Function:       Perform a physical mode copy if the source and
+ *                     destination have valid translations in the kernel pmap.
+ *                     If translations are present, they are assumed to
+ *                     be wired; i.e. no attempt is made to guarantee that the
+ *                     translations obtained remained valid for
+ *                     the duration of the copy process.
+ */
+
+vm_size_t ml_nofault_copy(
+       vm_offset_t virtsrc, vm_offset_t virtdst, vm_size_t size)
+{
+       addr64_t cur_phys_dst, cur_phys_src;
+       uint32_t count, nbytes = 0;
+
+       while (size > 0) {
+               if (!(cur_phys_src = kvtophys(virtsrc)))
+                       break;
+               if (!(cur_phys_dst = kvtophys(virtdst)))
+                       break;
+               if (!pmap_valid_page(i386_btop(cur_phys_dst)) || !pmap_valid_page(i386_btop(cur_phys_src)))
+                       break;
+               count = (uint32_t)(PAGE_SIZE - (cur_phys_src & PAGE_MASK));
+               if (count > (PAGE_SIZE - (cur_phys_dst & PAGE_MASK)))
+                       count = (uint32_t)(PAGE_SIZE - (cur_phys_dst & PAGE_MASK));
+               if (count > size)
+                       count = (uint32_t)size;
+
+               bcopy_phys(cur_phys_src, cur_phys_dst, count);
+
+               nbytes += count;
+               virtsrc += count;
+               virtdst += count;
+               size -= count;
+       }
+
+       return nbytes;
+}
+
+/*
+ *     Routine:        ml_validate_nofault
+ *     Function: Validate that ths address range has a valid translations
+ *                     in the kernel pmap.  If translations are present, they are
+ *                     assumed to be wired; i.e. no attempt is made to guarantee
+ *                     that the translation persist after the check.
+ *  Returns: TRUE if the range is mapped and will not cause a fault,
+ *                     FALSE otherwise.
+ */
+
+boolean_t ml_validate_nofault(
+       vm_offset_t virtsrc, vm_size_t size)
+{
+       addr64_t cur_phys_src;
+       uint32_t count;
+
+       while (size > 0) {
+               if (!(cur_phys_src = kvtophys(virtsrc)))
+                       return FALSE;
+               if (!pmap_valid_page(i386_btop(cur_phys_src)))
+                       return FALSE;
+               count = (uint32_t)(PAGE_SIZE - (cur_phys_src & PAGE_MASK));
+               if (count > size)
+                       count = (uint32_t)size;
+
+               virtsrc += count;
+               size -= count;
+       }
+
+       return TRUE;

 }
 
 /* Interrupt handling */
 }
 
 /* Interrupt handling */


@@ -160,39 +251,40 @@ void ml_init_interrupt(void)
        (void) ml_set_interrupts_enabled(TRUE);
 }
 
        (void) ml_set_interrupts_enabled(TRUE);
 }
 

+

 /* Get Interrupts Enabled */
 boolean_t ml_get_interrupts_enabled(void)
 {
   unsigned long flags;
 
 /* Get Interrupts Enabled */
 boolean_t ml_get_interrupts_enabled(void)
 {
   unsigned long flags;
 

-  __asm__ volatile("pushf; popl        %0" :  "=r" (flags));
+  __asm__ volatile("pushf; pop %0" :  "=r" (flags));

   return (flags & EFL_IF) != 0;
 }
 
 /* Set Interrupts Enabled */
 boolean_t ml_set_interrupts_enabled(boolean_t enable)
 {
   return (flags & EFL_IF) != 0;
 }
 
 /* Set Interrupts Enabled */
 boolean_t ml_set_interrupts_enabled(boolean_t enable)
 {

-  unsigned long flags;
+       unsigned long flags;
+       boolean_t istate;
+       
+       __asm__ volatile("pushf; pop    %0" :  "=r" (flags));

 
 

-  __asm__ volatile("pushf; popl        %0" :  "=r" (flags));
+       assert(get_interrupt_level() ? (enable == FALSE) : TRUE);

 
 

-  if (enable) {
-       ast_t           *myast;
+       istate = ((flags & EFL_IF) != 0);

 
 

-       myast = ast_pending();
+       if (enable) {
+               __asm__ volatile("sti;nop");

 
 

-       if ( (get_preemption_level() == 0) &&  (*myast & AST_URGENT) ) {
-       __asm__ volatile("sti");
-          __asm__ volatile ("int $0xff");
-        } else {
-         __asm__ volatile ("sti");
+               if ((get_preemption_level() == 0) && (*ast_pending() & AST_URGENT))
+                       __asm__ volatile ("int $0xff");
+       }
+       else {
+               if (istate)
+                       __asm__ volatile("cli");

        }
        }

-  }
-  else {
-       __asm__ volatile("cli");
-  }

 
 

-  return (flags & EFL_IF) != 0;
+       return istate;

 }
 
 /* Check if running at interrupt context */
 }
 
 /* Check if running at interrupt context */


@@ -201,6 +293,15 @@ boolean_t ml_at_interrupt_context(void)
        return get_interrupt_level() != 0;
 }
 
        return get_interrupt_level() != 0;
 }
 

+void ml_get_power_state(boolean_t *icp, boolean_t *pidlep) {
+       *icp = (get_interrupt_level() != 0);
+       /* These will be technically inaccurate for interrupts that occur
+        * successively within a single "idle exit" event, but shouldn't
+        * matter statistically.
+        */
+       *pidlep = (current_cpu_datap()->lcpu.package->num_idle == topoParms.nLThreadsPerPackage);
+}
+

 /* Generate a fake interrupt */
 void ml_cause_interrupt(void)
 {
 /* Generate a fake interrupt */
 void ml_cause_interrupt(void)
 {


@@ -209,12 +310,9 @@ void ml_cause_interrupt(void)
 
 void ml_thread_policy(
        thread_t thread,
 
 void ml_thread_policy(
        thread_t thread,

-       unsigned policy_id,
+__unused       unsigned policy_id,

        unsigned policy_info)
 {
        unsigned policy_info)
 {

-       if (policy_id == MACHINE_GROUP)
-               thread_bind(thread, master_processor);
-

        if (policy_info & MACHINE_NETWORK_WORKLOOP) {
                spl_t           s = splsched();
 
        if (policy_info & MACHINE_NETWORK_WORKLOOP) {
                spl_t           s = splsched();
 


@@ -244,61 +342,22 @@ void ml_install_interrupt_handler(
 
        (void) ml_set_interrupts_enabled(current_state);
 
 
        (void) ml_set_interrupts_enabled(current_state);
 

-       initialize_screen(0, kPEAcquireScreen);
+       initialize_screen(NULL, kPEAcquireScreen);

 }
 
 
 }
 
 

-void
-machine_idle(void)
-{
-       cpu_core_t      *my_core = cpu_core();
-       int             others_active;
-
-       /*
-        * We halt this cpu thread
-        * unless kernel param idlehalt is false and no other thread
-        * in the same core is active - if so, don't halt so that this
-        * core doesn't go into a low-power mode.
-        * For 4/4, we set a null "active cr3" while idle.
-        */
-       others_active = !atomic_decl_and_test(
-                               (long *) &my_core->active_threads, 1);
-       if (idlehalt || others_active) {
-               DBGLOG(cpu_handle, cpu_number(), MP_IDLE);
-               MARK_CPU_IDLE(cpu_number());
-               machine_idle_cstate();
-               MARK_CPU_ACTIVE(cpu_number());
-               DBGLOG(cpu_handle, cpu_number(), MP_UNIDLE);
-       } else {
-               __asm__ volatile("sti");
-       }
-       atomic_incl((long *) &my_core->active_threads, 1);
-}
-

 void
 machine_signal_idle(
         processor_t processor)
 {
 void
 machine_signal_idle(
         processor_t processor)
 {

-       cpu_interrupt(PROCESSOR_DATA(processor, slot_num));
+       cpu_interrupt(processor->cpu_id);

 }
 
 }
 

-thread_t        
-machine_processor_shutdown(
-       thread_t               thread,
-       void                   (*doshutdown)(processor_t),
-       processor_t    processor)
-{
-        fpu_save_context(thread);
-       return(Shutdown_context(thread, doshutdown, processor));
-}
-
-kern_return_t
-ml_processor_register(
-       cpu_id_t        cpu_id,
-       uint32_t        lapic_id,
-       processor_t     *processor_out,
-       ipi_handler_t   *ipi_handler,
-       boolean_t       boot_cpu)
+static kern_return_t
+register_cpu(
+        uint32_t        lapic_id,
+       processor_t     *processor_out,
+       boolean_t       boot_cpu )

 {
        int             target_cpu;
        cpu_data_t      *this_cpu_datap;
 {
        int             target_cpu;
        cpu_data_t      *this_cpu_datap;


@@ -313,7 +372,9 @@ ml_processor_register(
 
        lapic_cpu_map(lapic_id, target_cpu);
 
 
        lapic_cpu_map(lapic_id, target_cpu);
 

-       this_cpu_datap->cpu_id = cpu_id;
+       /* The cpu_id is not known at registration phase. Just do
+        * lapic_id for now 
+        */

        this_cpu_datap->cpu_phys_number = lapic_id;
 
        this_cpu_datap->cpu_console_buf = console_cpu_alloc(boot_cpu);
        this_cpu_datap->cpu_phys_number = lapic_id;
 
        this_cpu_datap->cpu_console_buf = console_cpu_alloc(boot_cpu);


@@ -324,32 +385,119 @@ ml_processor_register(
        if (this_cpu_datap->cpu_chud == NULL)
                goto failed;
 
        if (this_cpu_datap->cpu_chud == NULL)
                goto failed;
 

+#if KPC
+       this_cpu_datap->cpu_kpc_buf[0] = kpc_counterbuf_alloc();
+       if(this_cpu_datap->cpu_kpc_buf[0] == NULL )
+               goto failed;
+       this_cpu_datap->cpu_kpc_buf[1] = kpc_counterbuf_alloc();
+       if(this_cpu_datap->cpu_kpc_buf[1] == NULL )
+               goto failed;
+
+       this_cpu_datap->cpu_kpc_shadow = kpc_counterbuf_alloc();
+       if(this_cpu_datap->cpu_kpc_shadow == NULL )
+               goto failed;
+
+       this_cpu_datap->cpu_kpc_reload = kpc_counterbuf_alloc();
+       if(this_cpu_datap->cpu_kpc_reload == NULL )
+               goto failed;
+#endif
+

        if (!boot_cpu) {
        if (!boot_cpu) {

-               this_cpu_datap->cpu_core = cpu_thread_alloc(target_cpu);
+               cpu_thread_alloc(this_cpu_datap->cpu_number);
+               if (this_cpu_datap->lcpu.core == NULL)
+                       goto failed;

 
 

+#if NCOPY_WINDOWS > 0

                this_cpu_datap->cpu_pmap = pmap_cpu_alloc(boot_cpu);
                if (this_cpu_datap->cpu_pmap == NULL)
                        goto failed;
                this_cpu_datap->cpu_pmap = pmap_cpu_alloc(boot_cpu);
                if (this_cpu_datap->cpu_pmap == NULL)
                        goto failed;

+#endif

 
                this_cpu_datap->cpu_processor = cpu_processor_alloc(boot_cpu);
                if (this_cpu_datap->cpu_processor == NULL)
                        goto failed;
 
                this_cpu_datap->cpu_processor = cpu_processor_alloc(boot_cpu);
                if (this_cpu_datap->cpu_processor == NULL)
                        goto failed;

-               processor_init(this_cpu_datap->cpu_processor, target_cpu);
+               /*
+                * processor_init() deferred to topology start
+                * because "slot numbers" a.k.a. logical processor numbers
+                * are not yet finalized.
+                */

        }
 
        *processor_out = this_cpu_datap->cpu_processor;
        }
 
        *processor_out = this_cpu_datap->cpu_processor;

-       *ipi_handler = NULL;

 
        return KERN_SUCCESS;
 
 failed:
        cpu_processor_free(this_cpu_datap->cpu_processor);
 
        return KERN_SUCCESS;
 
 failed:
        cpu_processor_free(this_cpu_datap->cpu_processor);

+#if NCOPY_WINDOWS > 0

        pmap_cpu_free(this_cpu_datap->cpu_pmap);
        pmap_cpu_free(this_cpu_datap->cpu_pmap);

+#endif

        chudxnu_cpu_free(this_cpu_datap->cpu_chud);
        console_cpu_free(this_cpu_datap->cpu_console_buf);
        chudxnu_cpu_free(this_cpu_datap->cpu_chud);
        console_cpu_free(this_cpu_datap->cpu_console_buf);

+#if KPC
+       kpc_counterbuf_free(this_cpu_datap->cpu_kpc_buf[0]);
+       kpc_counterbuf_free(this_cpu_datap->cpu_kpc_buf[1]);
+       kpc_counterbuf_free(this_cpu_datap->cpu_kpc_shadow);
+       kpc_counterbuf_free(this_cpu_datap->cpu_kpc_reload);
+#endif
+

        return KERN_FAILURE;
 }
 
        return KERN_FAILURE;
 }
 

+
+kern_return_t
+ml_processor_register(
+        cpu_id_t        cpu_id,
+        uint32_t        lapic_id,
+        processor_t     *processor_out,
+        boolean_t       boot_cpu,
+       boolean_t       start )
+{
+    static boolean_t done_topo_sort = FALSE;
+    static uint32_t num_registered = 0;
+
+    /* Register all CPUs first, and track max */
+    if( start == FALSE )
+    {
+       num_registered++;
+
+       DBG( "registering CPU lapic id %d\n", lapic_id );
+
+       return register_cpu( lapic_id, processor_out, boot_cpu );
+    }
+
+    /* Sort by topology before we start anything */
+    if( !done_topo_sort )
+    {
+       DBG( "about to start CPUs. %d registered\n", num_registered );
+
+       cpu_topology_sort( num_registered );
+       done_topo_sort = TRUE;
+    }
+
+    /* Assign the cpu ID */
+    uint32_t cpunum = -1;
+    cpu_data_t *this_cpu_datap = NULL;
+
+    /* find cpu num and pointer */
+    cpunum = ml_get_cpuid( lapic_id );
+
+    if( cpunum == 0xFFFFFFFF ) /* never heard of it? */
+       panic( "trying to start invalid/unregistered CPU %d\n", lapic_id );
+
+    this_cpu_datap = cpu_datap(cpunum);
+
+    /* fix the CPU id */
+    this_cpu_datap->cpu_id = cpu_id;
+
+    /* output arg */
+    *processor_out = this_cpu_datap->cpu_processor;
+
+    /* OK, try and start this CPU */
+    return cpu_topology_start_cpu( cpunum );
+}
+
+

 void
 ml_cpu_get_info(ml_cpu_info_t *cpu_infop)
 {
 void
 ml_cpu_get_info(ml_cpu_info_t *cpu_infop)
 {


@@ -363,8 +511,15 @@ ml_cpu_get_info(ml_cpu_info_t *cpu_infop)
         * Are we supporting MMX/SSE/SSE2/SSE3?
         * As distinct from whether the cpu has these capabilities.
         */
         * Are we supporting MMX/SSE/SSE2/SSE3?
         * As distinct from whether the cpu has these capabilities.
         */

-       os_supports_sse = get_cr4() & CR4_XMM;
-       if ((cpuid_features() & CPUID_FEATURE_MNI) && os_supports_sse)
+       os_supports_sse = !!(get_cr4() & CR4_OSXMM);
+
+       if (ml_fpu_avx_enabled())
+               cpu_infop->vector_unit = 9;
+       else if ((cpuid_features() & CPUID_FEATURE_SSE4_2) && os_supports_sse)
+               cpu_infop->vector_unit = 8;
+       else if ((cpuid_features() & CPUID_FEATURE_SSE4_1) && os_supports_sse)
+               cpu_infop->vector_unit = 7;
+       else if ((cpuid_features() & CPUID_FEATURE_SSSE3) && os_supports_sse)

                cpu_infop->vector_unit = 6;
        else if ((cpuid_features() & CPUID_FEATURE_SSE3) && os_supports_sse)
                cpu_infop->vector_unit = 5;
                cpu_infop->vector_unit = 6;
        else if ((cpuid_features() & CPUID_FEATURE_SSE3) && os_supports_sse)
                cpu_infop->vector_unit = 5;


@@ -410,12 +565,12 @@ ml_init_max_cpus(unsigned long max_cpus)
         if (max_cpus_initialized != MAX_CPUS_SET) {
                 if (max_cpus > 0 && max_cpus <= MAX_CPUS) {
                        /*
         if (max_cpus_initialized != MAX_CPUS_SET) {
                 if (max_cpus > 0 && max_cpus <= MAX_CPUS) {
                        /*

-                        * Note: max_cpus is the number of enable processors
+                        * Note: max_cpus is the number of enabled processors

                         * that ACPI found; max_ncpus is the maximum number
                         * that the kernel supports or that the "cpus="
                         * boot-arg has set. Here we take int minimum.
                         */
                         * that ACPI found; max_ncpus is the maximum number
                         * that the kernel supports or that the "cpus="
                         * boot-arg has set. Here we take int minimum.
                         */

-                        machine_info.max_cpus = MIN(max_cpus, max_ncpus);
+                        machine_info.max_cpus = (integer_t)MIN(max_cpus, max_ncpus);

                }
                 if (max_cpus_initialized == MAX_CPUS_WAIT)
                         wakeup((event_t)&max_cpus_initialized);
                }
                 if (max_cpus_initialized == MAX_CPUS_WAIT)
                         wakeup((event_t)&max_cpus_initialized);


@@ -447,17 +602,20 @@ void
 ml_init_lock_timeout(void)
 {
        uint64_t        abstime;
 ml_init_lock_timeout(void)
 {
        uint64_t        abstime;

-       uint32_t        mtxspin; 
+       uint32_t        mtxspin;
+       uint64_t        default_timeout_ns = NSEC_PER_SEC>>2;
+       uint32_t        slto;
+       uint32_t        prt;

 
 

-       /*
-        * XXX As currently implemented for x86, LockTimeOut should be a
-        * cycle (tsc) count not an absolute time (nanoseconds) -
-        * but it's of the right order.
-        */
-       nanoseconds_to_absolutetime(NSEC_PER_SEC>>2, &abstime);
-       LockTimeOut = (unsigned int)abstime;
+       if (PE_parse_boot_argn("slto_us", &slto, sizeof (slto)))
+               default_timeout_ns = slto * NSEC_PER_USEC;
+
+       /* LockTimeOut is absolutetime, LockTimeOutTSC is in TSC ticks */
+       nanoseconds_to_absolutetime(default_timeout_ns, &abstime);
+       LockTimeOut = (uint32_t) abstime;
+       LockTimeOutTSC = (uint32_t) tmrCvt(abstime, tscFCvtn2t);

 
 

-       if (PE_parse_boot_arg("mtxspin", &mtxspin)) {
+       if (PE_parse_boot_argn("mtxspin", &mtxspin, sizeof (mtxspin))) {

                if (mtxspin > USEC_PER_SEC>>4)
                        mtxspin =  USEC_PER_SEC>>4;
                nanoseconds_to_absolutetime(mtxspin*NSEC_PER_USEC, &abstime);
                if (mtxspin > USEC_PER_SEC>>4)
                        mtxspin =  USEC_PER_SEC>>4;
                nanoseconds_to_absolutetime(mtxspin*NSEC_PER_USEC, &abstime);


@@ -465,10 +623,34 @@ ml_init_lock_timeout(void)
                nanoseconds_to_absolutetime(10*NSEC_PER_USEC, &abstime);
        }
        MutexSpin = (unsigned int)abstime;
                nanoseconds_to_absolutetime(10*NSEC_PER_USEC, &abstime);
        }
        MutexSpin = (unsigned int)abstime;

+
+       nanoseconds_to_absolutetime(4ULL * NSEC_PER_SEC, &LastDebuggerEntryAllowance);
+       if (PE_parse_boot_argn("panic_restart_timeout", &prt, sizeof (prt)))
+               nanoseconds_to_absolutetime(prt * NSEC_PER_SEC, &panic_restart_timeout);
+       virtualized = ((cpuid_features() & CPUID_FEATURE_VMM) != 0);
+       interrupt_latency_tracker_setup();
+       simple_lock_init(&ml_timer_evaluation_slock, 0);

 }
 
 /*
 }
 
 /*

- * This is called from the machine-independent routine cpu_up()
+ * Threshold above which we should attempt to block
+ * instead of spinning for clock_delay_until().
+ */
+
+void
+ml_init_delay_spin_threshold(int threshold_us)
+{
+       nanoseconds_to_absolutetime(threshold_us * NSEC_PER_USEC, &delay_spin_threshold);
+}
+
+boolean_t
+ml_delay_should_spin(uint64_t interval)
+{
+       return (interval < delay_spin_threshold) ? TRUE : FALSE;
+}
+
+/*
+ * This is called from the machine-independent layer

  * to perform machine-dependent info updates. Defer to cpu_thread_init().
  */
 void
  * to perform machine-dependent info updates. Defer to cpu_thread_init().
  */
 void


@@ -478,36 +660,15 @@ ml_cpu_up(void)
 }
 
 /*
 }
 
 /*

- * This is called from the machine-independent routine cpu_down()
+ * This is called from the machine-independent layer

  * to perform machine-dependent info updates.
  */
 void
 ml_cpu_down(void)
 {
  * to perform machine-dependent info updates.
  */
 void
 ml_cpu_down(void)
 {

-       return;
-}
-
-/* Stubs for pc tracing mechanism */
-
-int *pc_trace_buf;
-int pc_trace_cnt = 0;
+       i386_deactivate_cpu();

 
 

-int
-set_be_bit(void)
-{
-  return(0);
-}
-
-int
-clr_be_bit(void)
-{
-  return(0);
-}
-
-int
-be_tracing(void)
-{
-  return(0);
+       return;

 }
 
 /*
 }
 
 /*


@@ -529,52 +690,6 @@ current_thread(void)
   return(current_thread_fast());
 }
 
   return(current_thread_fast());
 }
 

-/*
- * Set the worst-case time for the C4 to C2 transition.
- * The maxdelay parameter is in nanoseconds. 
- */
- 
-void
-ml_set_maxsnoop(uint32_t maxdelay)
-{
-       C4C2SnoopDelay = maxdelay;      /* Set the transition time */ 
-       machine_nap_policy();           /* Adjust the current nap state */
-}
-
-
-/*
- * Get the worst-case time for the C4 to C2 transition.  Returns nanoseconds.
- */
-
-unsigned
-ml_get_maxsnoop(void)
-{
-       return C4C2SnoopDelay;          /* Set the transition time */
-}
-
-
-uint32_t
-ml_get_maxbusdelay(void)
-{
-    return maxBusDelay;
-}
-
-/*
- * Set the maximum delay time allowed for snoop on the bus.
- *
- * Note that this value will be compared to the amount of time that it takes
- * to transition from a non-snooping power state (C4) to a snooping state (C2).
- * If maxBusDelay is less than C4C2SnoopDelay,
- * we will not enter the lowest power state.
- */
- 
-void
-ml_set_maxbusdelay(uint32_t mdelay)
-{
-       maxBusDelay = mdelay;           /* Set the delay */
-       machine_nap_policy();           /* Adjust the current nap state */
-}
-

 
 boolean_t ml_is64bit(void) {
 
 
 boolean_t ml_is64bit(void) {
 


@@ -603,14 +718,8 @@ void ml_cpu_set_ldt(int selector)
            current_cpu_datap()->cpu_ldt == KERNEL_LDT)
                return;
 
            current_cpu_datap()->cpu_ldt == KERNEL_LDT)
                return;
 

-       /*
-        * If 64bit this requires a mode switch (and back). 
-        */
-       if (cpu_mode_is64bit())
-               ml_64bit_lldt(selector);
-       else
-               lldt(selector);
-       current_cpu_datap()->cpu_ldt = selector;        
+       lldt(selector);
+       current_cpu_datap()->cpu_ldt = selector;

 }
 
 void ml_fp_setvalid(boolean_t value)
 }
 
 void ml_fp_setvalid(boolean_t value)


@@ -618,44 +727,71 @@ void ml_fp_setvalid(boolean_t value)
         fp_setvalid(value);
 }
 
         fp_setvalid(value);
 }
 

-#if MACH_KDB
-
-/*
- *     Display the global msrs
- * *           
- *     ms
- */
-void 
-db_msr(__unused db_expr_t addr,
-       __unused int have_addr,
-       __unused db_expr_t count,
-       __unused char *modif)
+uint64_t ml_cpu_int_event_time(void)

 {
 {

+       return current_cpu_datap()->cpu_int_event_time;
+}

 
 

-       uint32_t        i, msrlow, msrhigh;
+vm_offset_t ml_stack_remaining(void)
+{
+       uintptr_t local = (uintptr_t) &local;

 
 

-       /* Try all of the first 4096 msrs */
-       for (i = 0; i < 4096; i++) {
-               if (!rdmsr_carefully(i, &msrlow, &msrhigh)) {
-                       db_printf("%08X - %08X.%08X\n", i, msrhigh, msrlow);
-               }
+       if (ml_at_interrupt_context() != 0) {
+           return (local - (current_cpu_datap()->cpu_int_stack_top - INTSTACK_SIZE));
+       } else {
+           return (local - current_thread()->kernel_stack);

        }
        }

+}

 
 

-       /* Try all of the 4096 msrs at 0x0C000000 */
-       for (i = 0; i < 4096; i++) {
-               if (!rdmsr_carefully(0x0C000000 | i, &msrlow, &msrhigh)) {
-                       db_printf("%08X - %08X.%08X\n",
-                               0x0C000000 | i, msrhigh, msrlow);
-               }
-       }
+void
+kernel_preempt_check(void)
+{
+       boolean_t       intr;
+       unsigned long flags;

 
 

-       /* Try all of the 4096 msrs at 0xC0000000 */
-       for (i = 0; i < 4096; i++) {
-               if (!rdmsr_carefully(0xC0000000 | i, &msrlow, &msrhigh)) {
-                       db_printf("%08X - %08X.%08X\n",
-                               0xC0000000 | i, msrhigh, msrlow);
-               }
+       assert(get_preemption_level() == 0);
+
+       __asm__ volatile("pushf; pop    %0" :  "=r" (flags));
+
+       intr = ((flags & EFL_IF) != 0);
+
+       if ((*ast_pending() & AST_URGENT) && intr == TRUE) {
+               /*
+                * can handle interrupts and preemptions 
+                * at this point
+                */
+
+               /*
+                * now cause the PRE-EMPTION trap
+                */
+               __asm__ volatile ("int %0" :: "N" (T_PREEMPT));

        }
 }
 
        }
 }
 

-#endif
+boolean_t machine_timeout_suspended(void) {
+       return (virtualized || pmap_tlb_flush_timeout || spinlock_timed_out || panic_active() || mp_recent_debugger_activity());
+}
+
+/* Eagerly evaluate all pending timer and thread callouts
+ */
+void ml_timer_evaluate(void) {
+       KERNEL_DEBUG_CONSTANT(DECR_TIMER_RESCAN|DBG_FUNC_START, 0, 0, 0, 0, 0);
+
+       uint64_t te_end, te_start = mach_absolute_time();
+       simple_lock(&ml_timer_evaluation_slock);
+       ml_timer_evaluation_in_progress = TRUE;
+       thread_call_delayed_timer_rescan_all();
+       mp_cpus_call(CPUMASK_ALL, ASYNC, timer_queue_expire_rescan, NULL);
+       ml_timer_evaluation_in_progress = FALSE;
+       ml_timer_eager_evaluations++;
+       te_end = mach_absolute_time();
+       ml_timer_eager_evaluation_max = MAX(ml_timer_eager_evaluation_max, (te_end - te_start));
+       simple_unlock(&ml_timer_evaluation_slock);
+
+       KERNEL_DEBUG_CONSTANT(DECR_TIMER_RESCAN|DBG_FUNC_END, 0, 0, 0, 0, 0);
+}
+
+boolean_t
+ml_timer_forced_evaluation(void) {
+       return ml_timer_evaluation_in_progress;
+}