xnu-2422.1.72.tar.gz

[apple/xnu.git] / osfmk / x86_64 / loose_ends.c

diff --git a/osfmk/x86_64/loose_ends.c b/osfmk/x86_64/loose_ends.c
index b912c6d9b98277be64a22de20103c7d7559468b6..cd61326f3b54893ab1f886977004e85ba1bc3ec1 100644 (file)
--- a/osfmk/x86_64/loose_ends.c
+++ b/osfmk/x86_64/loose_ends.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2011 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2013 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -78,6 +78,10 @@
 #include <libkern/OSAtomic.h>
 #include <sys/kdebug.h>
 
+#if !MACH_KDP
+#include <kdp/kdp_callout.h>
+#endif /* !MACH_KDP */
+
 #if 0
 
 #undef KERNEL_DEBUG
@@ -98,7 +102,7 @@ extern void          mapping_set_ref(ppnum_t pn);
 extern void            ovbcopy(const char      *from,
                                char            *to,
                                vm_size_t       nbytes);
-void machine_callstack(natural_t *buf, vm_size_t callstack_max);
+void machine_callstack(uintptr_t *buf, vm_size_t callstack_max);
 
 
 #define value_64bit(value)  ((value) & 0xFFFFFFFF00000000ULL)
@@ -246,7 +250,7 @@ ovbcopy(
 static inline unsigned int
 ml_phys_read_data(pmap_paddr_t paddr, int size)
 {
-       unsigned int result;
+       unsigned int result = 0;
 
        if (!physmap_enclosed(paddr))
                panic("%s: 0x%llx out of bounds\n", __FUNCTION__, paddr);
@@ -519,7 +523,7 @@ hw_compare_and_store(uint32_t oldval, uint32_t newval, volatile uint32_t *dest)
  * levels of return pc information.
  */
 void machine_callstack(
-       __unused natural_t      *buf,
+       __unused uintptr_t      *buf,
        __unused vm_size_t      callstack_max)
 {
 }
@@ -538,18 +542,6 @@ void fillPage(ppnum_t pa, unsigned int fill)
                *addr++ = fill;
 }
 
-static inline void __sfence(void)
-{
-    __asm__ volatile("sfence");
-}
-static inline void __mfence(void)
-{
-    __asm__ volatile("mfence");
-}
-static inline void __wbinvd(void)
-{
-    __asm__ volatile("wbinvd");
-}
 static inline void __clflush(void *ptr)
 {
        __asm__ volatile("clflush (%0)" : : "r" (ptr));
@@ -560,14 +552,14 @@ void dcache_incoherent_io_store64(addr64_t pa, unsigned int count)
        addr64_t  linesize = cpuid_info()->cache_linesize;
        addr64_t  bound = (pa + count + linesize - 1) & ~(linesize - 1);
 
-       __mfence();
+       mfence();
 
        while (pa < bound) {
                __clflush(PHYSMAP_PTOV(pa));
                pa += linesize;
        }
 
-       __mfence();
+       mfence();
 }
 
 void dcache_incoherent_io_flush64(addr64_t pa, unsigned int count)
@@ -584,12 +576,12 @@ flush_dcache64(addr64_t addr, unsigned count, int phys)
        else {
                uint64_t  linesize = cpuid_info()->cache_linesize;
                addr64_t  bound = (addr + count + linesize -1) & ~(linesize - 1);
-               __mfence();
+               mfence();
                while (addr < bound) {
                        __clflush((void *) (uintptr_t) addr);
                        addr += linesize;
                }
-               __mfence();
+               mfence();
        }
 }
 
@@ -615,15 +607,22 @@ mapping_set_ref(ppnum_t pn)
   pmap_set_reference(pn);
 }
 
+extern i386_cpu_info_t cpuid_cpu_info;
 void
 cache_flush_page_phys(ppnum_t pa)
 {
        boolean_t       istate;
        unsigned char   *cacheline_addr;
-       int             cacheline_size = cpuid_info()->cache_linesize;
-       int             cachelines_to_flush = PAGE_SIZE/cacheline_size;
+       i386_cpu_info_t *cpuid_infop = cpuid_info();
+       int             cacheline_size;
+       int             cachelines_to_flush;
+
+       cacheline_size = cpuid_infop->cache_linesize;
+       if (cacheline_size == 0)
+               panic("cacheline_size=0 cpuid_infop=%p\n", cpuid_infop);
+       cachelines_to_flush = PAGE_SIZE/cacheline_size;
 
-       __mfence();
+       mfence();
 
        istate = ml_set_interrupts_enabled(FALSE);
 
@@ -635,14 +634,15 @@ cache_flush_page_phys(ppnum_t pa)
 
        (void) ml_set_interrupts_enabled(istate);
 
-       __mfence();
+       mfence();
 }
 
 
 #if !MACH_KDP
 void
-kdp_register_callout(void)
+kdp_register_callout(kdp_callout_fn_t fn, void *arg)
 {
+#pragma unused(fn,arg)
 }
 #endif