xnu-1486.2.11.tar.gz

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

diff --git a/osfmk/i386/tsc.c b/osfmk/i386/tsc.c
index 669bc401f1ae7a7dc7fec6127f974d70d4ec6546..0a7f882a3ec4f58330a9ba14d9c6ad429de68d02 100644 (file)
--- a/osfmk/i386/tsc.c
+++ b/osfmk/i386/tsc.c
@@ -53,19 +53,18 @@
 #include <vm/vm_kern.h>                /* for kernel_map */
 #include <i386/ipl.h>
 #include <architecture/i386/pio.h>
-#include <i386/misc_protos.h>
-#include <i386/proc_reg.h>
 #include <i386/machine_cpu.h>
-#include <i386/mp.h>
-#include <i386/cpu_data.h>
 #include <i386/cpuid.h>
+#include <i386/mp.h>
 #include <i386/machine_routines.h>
+#include <i386/proc_reg.h>
+#include <i386/tsc.h>
+#include <i386/misc_protos.h>
 #include <pexpert/pexpert.h>
 #include <machine/limits.h>
 #include <machine/commpage.h>
 #include <sys/kdebug.h>
 #include <pexpert/device_tree.h>
-#include <i386/tsc.h>
 
 uint64_t       busFCvtt2n = 0;
 uint64_t       busFCvtn2t = 0;
@@ -143,13 +142,8 @@ tsc_init(void)
         */
        busFreq = EFI_FSB_frequency();
 
-       if (cpuid_info()->cpuid_family != CPU_FAMILY_PENTIUM_M) {
-               panic("tsc_init: unknown CPU family: 0x%X\n",
-                       cpuid_info()->cpuid_family);
-       }
-
-       switch (cpuid_info()->cpuid_model) {
-       case CPUID_MODEL_NEHALEM: {
+       switch (cpuid_cpufamily()) {
+       case CPUFAMILY_INTEL_NEHALEM: {
                uint64_t cpu_mhz;
                uint64_t msr_flex_ratio;
                uint64_t msr_platform_info;
@@ -172,14 +166,10 @@ tsc_init(void)
                 * value. See 6036811.
                 */
                if (busFreq == 0)
-                       busFreq = BASE_NHM_CLOCK_SOURCE;
+                   busFreq = BASE_NHM_CLOCK_SOURCE;
 
                cpu_mhz = tscGranularity * BASE_NHM_CLOCK_SOURCE;
 
-               kprintf("[NHM] Maximum Non-Turbo Ratio = [%d]\n",
-                       (uint32_t)tscGranularity);
-               kprintf("[NHM] CPU: Frequency          = %6d.%04dMhz\n", 
-                       (uint32_t)(cpu_mhz / Mega), (uint32_t)(cpu_mhz % Mega));
                break;
             }
        default: {