]> git.saurik.com Git - apple/xnu.git/blobdiff - osfmk/i386/cpuid.c
xnu-1228.5.18.tar.gz
[apple/xnu.git] / osfmk / i386 / cpuid.c
index d66f01d30ca1f55aae6e6558255f9893ec0b87e3..a23ed95dfe8c601bfdb8a6d3a20c5b4a2f752869 100644 (file)
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * 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. 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */
+#include <platforms.h>
+#include <mach_kdb.h>
+#include <vm/vm_page.h>
+#include <pexpert/pexpert.h>
 
-/*
- * Values from http://einstein.et.tudelft.nl/~offerman/chiplist.html
- * (dated 18 Oct 1995)
- */
+#include "cpuid.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>
+#endif
 
-#include <kern/misc_protos.h>
-#include <i386/cpuid.h>
+#define min(a,b) ((a) < (b) ? (a) : (b))
+#define quad(hi,lo)    (((uint64_t)(hi)) << 32 | (lo))
 
-/*
- * Generic product array (before CPUID)
- */
-unsigned int cpuid_i386_freq[] = { 12, 16, 20, 25, 33, 0 };
-unsigned int cpuid_i486_freq[] = { 20, 25, 33, 50, 0 };
-
-struct cpuid_product cpuid_generic[] = {
-    {
-       0,              CPUID_FAMILY_386,       0,
-       80,     cpuid_i386_freq,                "i386"
-    },
-    {
-       0,              CPUID_FAMILY_486,       0,
-       240,    cpuid_i486_freq,                "i486"
-    },
-};
+#define bit(n)         (1UL << (n))
+#define bitmask(h,l)   ((bit(h)|(bit(h)-1)) & ~(bit(l)-1))
+#define bitfield(x,h,l)        (((x) & bitmask(h,l)) >> l)
 
 /*
- * INTEL product array
+ * CPU identification routines.
  */
-unsigned int cpuid_i486_dx_freq[] = { 20, 25, 33, 0 };
-unsigned int cpuid_i486_dx_s_freq[] = { 50, 0 };
-unsigned int cpuid_i486_sx_freq[] = { 16, 20, 25, 33, 0 };
-unsigned int cpuid_i486_dx2_freq[] = { 32, 40, 50, 66, 0 };
-unsigned int cpuid_i486_sl_freq[] = { 25, 33, 0 };
-unsigned int cpuid_i486_sx2_freq[] = { 50, 0 };
-unsigned int cpuid_i486_dx2wb_freq[] = { 50, 66, 0 };
-unsigned int cpuid_i486_dx4_freq[] = { 90, 100, 0 };
-
-unsigned int cpuid_i486_dx2wb_od_freq[] = { 32, 40, 50, 66, 0 };
-unsigned int cpuid_i486_dx4_od_freq[] = { 75, 99, 0 };
-
-unsigned int cpuid_p5_freq[] = { 60, 66, 0 };
-unsigned int cpuid_p54_freq[] = { 60, 66, 75, 90, 100, 120, 133, 166, 200, 0 };
-
-unsigned int cpuid_p24t_freq[] = { 25, 33, 0 };
-unsigned int cpuid_p24ct_freq[] = { 63, 83, 0 };
-
-unsigned int cpuid_pii_freq[] = { 300, 0 };
-
-struct cpuid_product cpuid_intel[] = {
-    {
-       CPUID_TYPE_OEM,         CPUID_FAMILY_486,       CPUID_MODEL_I486_DX,
-       240,    cpuid_i486_dx_freq,             "Intel 486DX"
-    },
-    {
-       CPUID_TYPE_OEM,         CPUID_FAMILY_486,       CPUID_MODEL_I486_DX_S,
-       240,    cpuid_i486_dx_s_freq,           "Intel 486DX-S"
-    },
-    {
-       CPUID_TYPE_OEM,         CPUID_FAMILY_486,       CPUID_MODEL_I486_SX,
-       240,    cpuid_i486_sx_freq,             "Intel 486SX"
-    },
-    {
-       CPUID_TYPE_OEM,         CPUID_FAMILY_486,       CPUID_MODEL_I486_DX2,
-       240,    cpuid_i486_dx2_freq,            "Intel 486DX2"
-    },
-    {
-       CPUID_TYPE_OEM,         CPUID_FAMILY_486,       CPUID_MODEL_I486_SL,
-       240,    cpuid_i486_sl_freq,             "Intel 486SL"
-    },
-    {  
-       CPUID_TYPE_OEM,         CPUID_FAMILY_486,       CPUID_MODEL_I486_SX2,
-       240,    cpuid_i486_sx2_freq,            "Intel 486SX2"
-    },
-    {
-       CPUID_TYPE_OEM,         CPUID_FAMILY_486,       CPUID_MODEL_I486_DX2WB,
-       240,    cpuid_i486_dx2wb_freq,          "Intel 486DX2WB"
-    },
-    {
-       CPUID_TYPE_OEM,         CPUID_FAMILY_486,       CPUID_MODEL_I486_DX4,
-       240,    cpuid_i486_dx4_freq,            "Intel 486DX4"
-    },
-    {
-       CPUID_TYPE_OVERDRIVE,   CPUID_FAMILY_486,       CPUID_MODEL_I486_DX2,
-       240,    cpuid_i486_dx2_freq,            "Intel 486DX2 OverDrive"
-    },
-    {
-       CPUID_TYPE_OVERDRIVE,   CPUID_FAMILY_486,       CPUID_MODEL_I486_DX2WB,
-       240,    cpuid_i486_dx2wb_od_freq,       "Intel 486DX2WB OverDrive"
-    },
-    {
-       CPUID_TYPE_OVERDRIVE,   CPUID_FAMILY_486,       CPUID_MODEL_I486_DX4,
-       240,    cpuid_i486_dx4_od_freq,         "Intel 486DX4 OverDrive"
-    },
-    {
-       CPUID_TYPE_OVERDRIVE,   CPUID_FAMILY_P5,        CPUID_MODEL_P24T,
-       208,    cpuid_p24t_freq,                "Intel Pentium P24T OverDrive"
-    },
-    {
-       CPUID_TYPE_OVERDRIVE,   CPUID_FAMILY_P5,        CPUID_MODEL_P54,
-       207,    cpuid_p24ct_freq,               "Intel Pentium P24CT OverDrive"
-    },
-    {
-       CPUID_TYPE_OEM,         CPUID_FAMILY_P5,        CPUID_MODEL_P5A,
-       207,    cpuid_p5_freq,                  "Intel Pentium P5 rev A"
-    },
-    {
-       CPUID_TYPE_OEM,         CPUID_FAMILY_P5,        CPUID_MODEL_P5,
-       207,    cpuid_p5_freq,                  "Intel Pentium P5"
-    },
-    {
-       CPUID_TYPE_OEM,         CPUID_FAMILY_P5,        CPUID_MODEL_P54,
-       207,    cpuid_p54_freq,                 "Intel Pentium P54"
-    },
-    {
-       CPUID_TYPE_OEM,         CPUID_FAMILY_PPRO,      CPUID_MODEL_PII,
-       480,    cpuid_pii_freq,                 "Intel Pentium II"
-    }
-};
-unsigned int cpuid_intel_size = sizeof (cpuid_intel) / sizeof (cpuid_intel[0]);
 
-/*
- * AMD product arrays
- */
-unsigned int cpuid_am486_dx_freq[] = { 33, 40, 0 };
-unsigned int cpuid_am486_dx2_freq[] = { 50, 66, 80, 99, 0 };
-unsigned int cpuid_am486_dx4_freq[] = { 99, 120, 133, 0 };
-unsigned int cpuid_am486_dx4wb_freq[] = { 99, 120, 133, 0 };
+static i386_cpu_info_t *cpuid_cpu_infop = NULL;
+static i386_cpu_info_t cpuid_cpu_info;
 
-/*
- * UMC product array 
- */
-unsigned int cpuid_u5sd_freq[] = { 25, 33, 40, 0 };
-unsigned int cpuid_u5s_freq[] = { 25, 33, 40, 0 };
+/* this function is Intel-specific */
+static void
+cpuid_set_cache_info( i386_cpu_info_t * info_p )
+{
+       uint32_t        cpuid_result[4];
+       uint32_t        reg[4];
+       uint32_t        index;
+       uint32_t        linesizes[LCACHE_MAX];
+       unsigned int    i;
+       unsigned int    j;
+       boolean_t       cpuid_deterministic_supported = FALSE;
 
-/*
- * Vendor ID array
- */
-struct cpuid_name cpuid_name[] = {
-    {  CPUID_VID_INTEL,
-       cpuid_intel,    sizeof (cpuid_intel) / sizeof (cpuid_intel[0])
-    },
-    {  CPUID_VID_UMC,
-       (struct cpuid_product *)0,
-    },
-    {  CPUID_VID_AMD,
-       (struct cpuid_product *)0,
-    },
-    {  CPUID_VID_CYRIX,
-       (struct cpuid_product *)0,
-    },
-    {  CPUID_VID_NEXTGEN,
-       (struct cpuid_product *)0
-    },
-    {  "",
-       cpuid_generic,  sizeof (cpuid_generic) / sizeof (cpuid_generic[0])
-    },
-    {  (char *)0,
-    }
-};
+       bzero( linesizes, sizeof(linesizes) );
 
-/*
- * Feature Flag values
- */
-char *cpuid_flag[] = {
-    "FPU",     /* Floating point unit on-chip */
-    "VME",     /* Virtual Mode Extension */
-    "DE",      /* Debugging Extension */
-    "PSE",     /* Page Size Extension */
-    "TSC",     /* Time Stamp Counter */
-    "MSR",     /* Model Specific Registers */
-    "PAE",     /* Physical Address Extension */
-    "MCE",     /* Machine Check Exception */
-    "CX8",     /* CMPXCHG8 Instruction sSupported */
-    "APIC",    /* Local APIC Supported */
-    "(bit 10)",
-    "(bit 11)",
-    "MTRR",    /* Machine Type Range Register */
-    "PGE",     /* Page Global Enable */
-    "MCA",     /* Machine Check Architecture */
-    "CMOV",    /* Conditional Move Instruction Supported */
-    "(bit 16)",
-    "(bit 17)",
-    "(bit 18)",
-    "(bit 19)",
-    "(bit 20)",
-    "(bit 21)",
-    "(bit 22)",
-    "MMX",     /* Supports MMX instructions */
-    "(bit 24)",
-    "(bit 25)",
-    "(bit 26)",
-    "(bit 27)",
-    "(bit 28)",
-    "(bit 29)",
-    "(bit 30)",
-    "(bit 31)",
-};
+       /* Get processor cache descriptor info using leaf 2.  We don't use
+        * this internally, but must publish it for KEXTs.
+        */
+       do_cpuid(2, cpuid_result);
+       for (j = 0; j < 4; j++) {
+               if ((cpuid_result[j] >> 31) == 1)       /* bit31 is validity */
+                       continue;
+               ((uint32_t *) info_p->cache_info)[j] = cpuid_result[j];
+       }
+       /* first byte gives number of cpuid calls to get all descriptors */
+       for (i = 1; i < info_p->cache_info[0]; i++) {
+               if (i*16 > sizeof(info_p->cache_info))
+                       break;
+               do_cpuid(2, cpuid_result);
+               for (j = 0; j < 4; j++) {
+                       if ((cpuid_result[j] >> 31) == 1) 
+                               continue;
+                       ((uint32_t *) info_p->cache_info)[4*i+j] =
+                               cpuid_result[j];
+               }
+       }
 
-/*
- * Cache description array
- */
-struct cpuid_cache_desc cpuid_cache_desc[] = {
-    {  CPUID_CACHE_ITLB_4K,
-       "Instruction TBL, 4K, pages 4-way set associative, 64 entries"
-    },
-    {  CPUID_CACHE_ITLB_4M,
-       "Instruction TBL, 4M, pages 4-way set associative, 4 entries"
-    },
-    {  CPUID_CACHE_DTLB_4K,
-       "Data TBL, 4K pages, 4-way set associative, 64 entries"
-    },
-    {  CPUID_CACHE_DTLB_4M,
-       "Data TBL, 4M pages, 4-way set associative, 4 entries"
-    },
-    {  CPUID_CACHE_ICACHE_8K,
-       "Instruction L1 cache, 8K, 4-way set associative, 32byte line size"
-    },
-    {  CPUID_CACHE_DCACHE_8K,
-       "Data L1 cache, 8K, 2-way set associative, 32byte line size"
-    },
-    {  CPUID_CACHE_UCACHE_128K,
-       "Unified L2 cache, 128K, 4-way set associative, 32byte line size"
-    },
-    {  CPUID_CACHE_UCACHE_256K,
-       "Unified L2 cache, 256K, 4-way set associative, 32byte line size"
-    },
-    {  CPUID_CACHE_UCACHE_512K,
-       "Unified L2 cache, 512K, 4-way set associative, 32byte line size"
-    },
-    {  CPUID_CACHE_NULL,
-       (char *)0
-    }
-};
+       /*
+        * Get cache info using leaf 4, the "deterministic cache parameters."
+        * Most processors Mac OS X supports implement this flavor of CPUID.
+        * Loop over each cache on the processor.
+        */
+       do_cpuid(0, cpuid_result);
+       if (cpuid_result[eax] >= 4)
+               cpuid_deterministic_supported = TRUE;
+
+       for (index = 0; cpuid_deterministic_supported; index++) {
+               cache_type_t    type = Lnone;
+               uint32_t        cache_type;
+               uint32_t        cache_level;
+               uint32_t        cache_sharing;
+               uint32_t        cache_linesize;
+               uint32_t        cache_sets;
+               uint32_t        cache_associativity;
+               uint32_t        cache_size;
+               uint32_t        cache_partitions;
+               uint32_t        colors;
+               
+               reg[eax] = 4;           /* cpuid request 4 */
+               reg[ecx] = index;       /* index starting at 0 */
+               cpuid(reg);
+//kprintf("cpuid(4) index=%d eax=%p\n", index, reg[eax]);
+               cache_type = bitfield(reg[eax], 4, 0);
+               if (cache_type == 0)
+                       break;          /* no more caches */
+               cache_level             = bitfield(reg[eax],  7,  5);
+               cache_sharing           = bitfield(reg[eax], 25, 14) + 1;
+               info_p->cpuid_cores_per_package 
+                                       = bitfield(reg[eax], 31, 26) + 1;
+               cache_linesize          = bitfield(reg[ebx], 11,  0) + 1;
+               cache_partitions        = bitfield(reg[ebx], 21, 12) + 1;
+               cache_associativity     = bitfield(reg[ebx], 31, 22) + 1;
+               cache_sets              = bitfield(reg[ecx], 31,  0) + 1;
+                               
+               /* Map type/levels returned by CPUID into cache_type_t */
+               switch (cache_level) {
+               case 1:
+                       type = cache_type == 1 ? L1D :
+                              cache_type == 2 ? L1I :
+                                                Lnone;
+                       break;
+               case 2:
+                       type = cache_type == 3 ? L2U :
+                                                Lnone;
+                       break;
+               case 3:
+                       type = cache_type == 3 ? L3U :
+                                                Lnone;
+                       break;
+               default:
+                       type = Lnone;
+               }
+               
+               /* The total size of a cache is:
+                *      ( linesize * sets * associativity )
+                */
+               if (type != Lnone) {
+                       cache_size = cache_linesize * cache_sets * cache_associativity;
+                       info_p->cache_size[type] = cache_size;
+                       info_p->cache_sharing[type] = cache_sharing;
+                       info_p->cache_partitions[type] = cache_partitions;
+                       linesizes[type] = cache_linesize;
+                       
+                       /* Compute the number of page colors for this cache,
+                        * which is:
+                        *      ( linesize * sets ) / page_size
+                        *
+                        * To help visualize this, consider two views of a
+                        * physical address.  To the cache, it is composed
+                        * of a line offset, a set selector, and a tag.
+                        * To VM, it is composed of a page offset, a page
+                        * color, and other bits in the pageframe number:
+                        *
+                        *           +-----------------+---------+--------+
+                        *  cache:   |       tag       |   set   | offset |
+                        *           +-----------------+---------+--------+
+                        *
+                        *           +-----------------+-------+----------+
+                        *  VM:      |    don't care   | color | pg offset|
+                        *           +-----------------+-------+----------+
+                        *
+                        * The color is those bits in (set+offset) not covered
+                        * by the page offset.
+                        */
+                        colors = ( cache_linesize * cache_sets ) >> 12;
+                        
+                        if ( colors > vm_cache_geometry_colors )
+                               vm_cache_geometry_colors = colors;
+               }
+       } 
+       
+       /*
+        * If deterministic cache parameters are not available, use
+        * something else
+        */
+       if (info_p->cpuid_cores_per_package == 0) {
+               info_p->cpuid_cores_per_package = 1;
+
+               /* cpuid define in 1024 quantities */
+               info_p->cache_size[L2U] = info_p->cpuid_cache_size * 1024;
+               info_p->cache_sharing[L2U] = 1;
+               info_p->cache_partitions[L2U] = 1;
+
+               linesizes[L2U] = info_p->cpuid_cache_linesize;
+       }
+       
+       /*
+        * What linesize to publish?  We use the L2 linesize if any,
+        * else the L1D.
+        */
+       if ( linesizes[L2U] )
+               info_p->cache_linesize = linesizes[L2U];
+       else if (linesizes[L1D])
+               info_p->cache_linesize = linesizes[L1D];
+       else panic("no linesize");
+}
+
+static void
+cpuid_set_generic_info(i386_cpu_info_t *info_p)
+{
+       uint32_t        cpuid_reg[4];
+       uint32_t        max_extid;
+        char            str[128], *p;
+
+       /* do cpuid 0 to get vendor */
+       do_cpuid(0, cpuid_reg);
+       bcopy((char *)&cpuid_reg[ebx], &info_p->cpuid_vendor[0], 4); /* ug */
+       bcopy((char *)&cpuid_reg[ecx], &info_p->cpuid_vendor[8], 4);
+       bcopy((char *)&cpuid_reg[edx], &info_p->cpuid_vendor[4], 4);
+       info_p->cpuid_vendor[12] = 0;
+
+       /* get extended cpuid results */
+       do_cpuid(0x80000000, cpuid_reg);
+       max_extid = cpuid_reg[eax];
+
+       /* check to see if we can get brand string */
+       if (max_extid >= 0x80000004) {
+               /*
+                * The brand string 48 bytes (max), guaranteed to
+                * be NUL terminated.
+                */
+               do_cpuid(0x80000002, cpuid_reg);
+               bcopy((char *)cpuid_reg, &str[0], 16);
+               do_cpuid(0x80000003, cpuid_reg);
+               bcopy((char *)cpuid_reg, &str[16], 16);
+               do_cpuid(0x80000004, cpuid_reg);
+               bcopy((char *)cpuid_reg, &str[32], 16);
+               for (p = str; *p != '\0'; p++) {
+                       if (*p != ' ') break;
+               }
+               strlcpy(info_p->cpuid_brand_string,
+                       p, sizeof(info_p->cpuid_brand_string));
+
+                if (!strncmp(info_p->cpuid_brand_string, CPUID_STRING_UNKNOWN,
+                            min(sizeof(info_p->cpuid_brand_string),
+                                strlen(CPUID_STRING_UNKNOWN) + 1))) {
+                    /*
+                     * This string means we have a firmware-programmable brand string,
+                     * and the firmware couldn't figure out what sort of CPU we have.
+                     */
+                    info_p->cpuid_brand_string[0] = '\0';
+                }
+       }
     
-/*
- * CPU identification
- */
-unsigned int   cpuid_value;
-unsigned char  cpuid_type;
-unsigned char  cpuid_family;
-unsigned char  cpuid_model;
-unsigned char  cpuid_stepping;
-unsigned int   cpuid_feature;
-char           cpuid_vid[CPUID_VID_SIZE + 1];
-unsigned char  cpuid_cache[CPUID_CACHE_SIZE];
+       /* Get cache and addressing info. */
+       if (max_extid >= 0x80000006) {
+               do_cpuid(0x80000006, cpuid_reg);
+               info_p->cpuid_cache_linesize   = bitfield(cpuid_reg[ecx], 7, 0);
+               info_p->cpuid_cache_L2_associativity =
+                                                bitfield(cpuid_reg[ecx],15,12);
+               info_p->cpuid_cache_size       = bitfield(cpuid_reg[ecx],31,16);
+               do_cpuid(0x80000008, cpuid_reg);
+               info_p->cpuid_address_bits_physical =
+                                                bitfield(cpuid_reg[eax], 7, 0);
+               info_p->cpuid_address_bits_virtual =
+                                                bitfield(cpuid_reg[eax],15, 8);
+       }
 
-/*
- * Return correct CPU_TYPE
- */
-/*ARGSUSED*/
-cpu_type_t
-cpuid_cputype(
-    int my_cpu)
+       /* get processor signature and decode */
+       do_cpuid(1, cpuid_reg);
+       info_p->cpuid_signature = cpuid_reg[eax];
+       info_p->cpuid_stepping  = bitfield(cpuid_reg[eax],  3,  0);
+       info_p->cpuid_model     = bitfield(cpuid_reg[eax],  7,  4);
+       info_p->cpuid_family    = bitfield(cpuid_reg[eax], 11,  8);
+       info_p->cpuid_type      = bitfield(cpuid_reg[eax], 13, 12);
+       info_p->cpuid_extmodel  = bitfield(cpuid_reg[eax], 19, 16);
+       info_p->cpuid_extfamily = bitfield(cpuid_reg[eax], 27, 20);
+       info_p->cpuid_brand     = bitfield(cpuid_reg[ebx],  7,  0);
+       info_p->cpuid_features  = quad(cpuid_reg[ecx], cpuid_reg[edx]);
+
+       /* Fold extensions into family/model */
+       if (info_p->cpuid_family == 0x0f)
+               info_p->cpuid_family += info_p->cpuid_extfamily;
+       if (info_p->cpuid_family == 0x0f || info_p->cpuid_family== 0x06)
+               info_p->cpuid_model += (info_p->cpuid_extmodel << 4);
+
+       if (info_p->cpuid_features & CPUID_FEATURE_HTT)
+               info_p->cpuid_logical_per_package =
+                               bitfield(cpuid_reg[ebx], 23, 16);
+       else
+               info_p->cpuid_logical_per_package = 1;
+
+       if (max_extid >= 0x80000001) {
+               do_cpuid(0x80000001, cpuid_reg);
+               info_p->cpuid_extfeatures =
+                               quad(cpuid_reg[ecx], cpuid_reg[edx]);
+       }
+
+       if (info_p->cpuid_extfeatures && CPUID_FEATURE_MONITOR) {
+               /*
+                * Extract the Monitor/Mwait Leaf info:
+                */
+               do_cpuid(5, cpuid_reg);
+               info_p->cpuid_mwait_linesize_min = cpuid_reg[eax];
+               info_p->cpuid_mwait_linesize_max = cpuid_reg[ebx];
+               info_p->cpuid_mwait_extensions   = cpuid_reg[ecx];
+               info_p->cpuid_mwait_sub_Cstates  = cpuid_reg[edx];
+
+               /*
+                * And the thermal and Power Leaf while we're at it:
+                */
+               do_cpuid(6, cpuid_reg);
+               info_p->cpuid_thermal_sensor =
+                                       bitfield(cpuid_reg[eax], 0, 0);
+               info_p->cpuid_thermal_dynamic_acceleration =
+                                       bitfield(cpuid_reg[eax], 1, 1);
+               info_p->cpuid_thermal_thresholds =
+                                       bitfield(cpuid_reg[ebx], 3, 0);
+               info_p->cpuid_thermal_ACNT_MCNT =
+                                       bitfield(cpuid_reg[ecx], 0, 0);
+
+               /*
+                * And the Architectural Performance Monitoring Leaf:
+                */
+               do_cpuid(0xa, cpuid_reg);
+               info_p->cpuid_arch_perf_version =
+                                       bitfield(cpuid_reg[eax], 7, 0);
+               info_p->cpuid_arch_perf_number =
+                                       bitfield(cpuid_reg[eax],15, 8);
+               info_p->cpuid_arch_perf_width =
+                                       bitfield(cpuid_reg[eax],23,16);
+               info_p->cpuid_arch_perf_events_number =
+                                       bitfield(cpuid_reg[eax],31,24);
+               info_p->cpuid_arch_perf_events =
+                                       cpuid_reg[ebx];
+               info_p->cpuid_arch_perf_fixed_number =
+                                       bitfield(cpuid_reg[edx], 4, 0);
+               info_p->cpuid_arch_perf_fixed_width =
+                                       bitfield(cpuid_reg[edx],12, 5);
+
+       }
+
+       return;
+}
+
+void
+cpuid_set_info(void)
+{
+       bzero((void *)&cpuid_cpu_info, sizeof(cpuid_cpu_info));
+
+       cpuid_set_generic_info(&cpuid_cpu_info);
+
+       /* verify we are running on a supported CPU */
+       if ((strncmp(CPUID_VID_INTEL, cpuid_cpu_info.cpuid_vendor,
+                    min(strlen(CPUID_STRING_UNKNOWN) + 1,
+                        sizeof(cpuid_cpu_info.cpuid_vendor)))) ||
+          (cpuid_cpu_info.cpuid_family != 6) ||
+          (cpuid_cpu_info.cpuid_model < 13))
+               panic("Unsupported CPU");
+
+       cpuid_cpu_info.cpuid_cpu_type = CPU_TYPE_X86;
+       cpuid_cpu_info.cpuid_cpu_subtype = CPU_SUBTYPE_X86_ARCH1;
+
+       cpuid_set_cache_info(&cpuid_cpu_info);
+
+       cpuid_cpu_info.cpuid_model_string = ""; /* deprecated */
+}
+
+static struct {
+       uint64_t        mask;
+       const char      *name;
+} feature_map[] = {
+       {CPUID_FEATURE_FPU,   "FPU",},
+       {CPUID_FEATURE_VME,   "VME",},
+       {CPUID_FEATURE_DE,    "DE",},
+       {CPUID_FEATURE_PSE,   "PSE",},
+       {CPUID_FEATURE_TSC,   "TSC",},
+       {CPUID_FEATURE_MSR,   "MSR",},
+       {CPUID_FEATURE_PAE,   "PAE",},
+       {CPUID_FEATURE_MCE,   "MCE",},
+       {CPUID_FEATURE_CX8,   "CX8",},
+       {CPUID_FEATURE_APIC,  "APIC",},
+       {CPUID_FEATURE_SEP,   "SEP",},
+       {CPUID_FEATURE_MTRR,  "MTRR",},
+       {CPUID_FEATURE_PGE,   "PGE",},
+       {CPUID_FEATURE_MCA,   "MCA",},
+       {CPUID_FEATURE_CMOV,  "CMOV",},
+       {CPUID_FEATURE_PAT,   "PAT",},
+       {CPUID_FEATURE_PSE36, "PSE36",},
+       {CPUID_FEATURE_PSN,   "PSN",},
+       {CPUID_FEATURE_CLFSH, "CLFSH",},
+       {CPUID_FEATURE_DS,    "DS",},
+       {CPUID_FEATURE_ACPI,  "ACPI",},
+       {CPUID_FEATURE_MMX,   "MMX",},
+       {CPUID_FEATURE_FXSR,  "FXSR",},
+       {CPUID_FEATURE_SSE,   "SSE",},
+       {CPUID_FEATURE_SSE2,  "SSE2",},
+       {CPUID_FEATURE_SS,    "SS",},
+       {CPUID_FEATURE_HTT,   "HTT",},
+       {CPUID_FEATURE_TM,    "TM",},
+       {CPUID_FEATURE_SSE3,    "SSE3"},
+       {CPUID_FEATURE_MONITOR, "MON"},
+       {CPUID_FEATURE_DSCPL,   "DSCPL"},
+       {CPUID_FEATURE_VMX,     "VMX"},
+       {CPUID_FEATURE_SMX,     "SMX"},
+       {CPUID_FEATURE_EST,     "EST"},
+       {CPUID_FEATURE_TM2,     "TM2"},
+       {CPUID_FEATURE_SSSE3,   "SSSE3"},
+       {CPUID_FEATURE_CID,     "CID"},
+       {CPUID_FEATURE_CX16,    "CX16"},
+       {CPUID_FEATURE_xTPR,    "TPR"},
+       {CPUID_FEATURE_PDCM,    "PDCM"},
+       {CPUID_FEATURE_SSE4_1,  "SSE4.1"},
+       {CPUID_FEATURE_SSE4_2,  "SSE4.2"},
+       {CPUID_FEATURE_POPCNT,  "POPCNT"},
+       {0, 0}
+},
+extfeature_map[] = {
+       {CPUID_EXTFEATURE_SYSCALL, "SYSCALL"},
+       {CPUID_EXTFEATURE_XD,      "XD"},
+       {CPUID_EXTFEATURE_EM64T,   "EM64T"},
+       {CPUID_EXTFEATURE_LAHF,    "LAHF"},
+       {0, 0}
+};
+
+i386_cpu_info_t        *
+cpuid_info(void)
+{
+       /* Set-up the cpuid_indo stucture lazily */
+       if (cpuid_cpu_infop == NULL) {
+               cpuid_set_info();
+               cpuid_cpu_infop = &cpuid_cpu_info;
+       }
+       return cpuid_cpu_infop;
+}
+
+char *
+cpuid_get_feature_names(uint64_t features, char *buf, unsigned buf_len)
+{
+       int     len = -1;
+       char    *p = buf;
+       int     i;
+
+       for (i = 0; feature_map[i].mask != 0; i++) {
+               if ((features & feature_map[i].mask) == 0)
+                       continue;
+               if (len > 0)
+                       *p++ = ' ';
+               len = min(strlen(feature_map[i].name), (buf_len-1) - (p-buf));
+               if (len == 0)
+                       break;
+               bcopy(feature_map[i].name, p, len);
+               p += len;
+       }
+       *p = '\0';
+       return buf;
+}
+
+char *
+cpuid_get_extfeature_names(uint64_t extfeatures, char *buf, unsigned buf_len)
+{
+       int     len = -1;
+       char    *p = buf;
+       int     i;
+
+       for (i = 0; extfeature_map[i].mask != 0; i++) {
+               if ((extfeatures & extfeature_map[i].mask) == 0)
+                       continue;
+               if (len > 0)
+                       *p++ = ' ';
+               len = min(strlen(extfeature_map[i].name), (buf_len-1)-(p-buf));
+               if (len == 0)
+                       break;
+               bcopy(extfeature_map[i].name, p, len);
+               p += len;
+       }
+       *p = '\0';
+       return buf;
+}
+
+
+#if CONFIG_NO_KPRINTF_STRINGS
+void
+cpuid_feature_display(
+       __unused const char     *header)
+{
+}
+
+void
+cpuid_extfeature_display(
+       __unused const char     *header)
 {
-#ifndef MACH_BSD       /* FIXME  - add more family/chip types */
-    switch (cpuid_family) {
-    case CPUID_FAMILY_PPRO:
-       return (CPU_TYPE_PENTIUMPRO);
-    case CPUID_FAMILY_P5:
-       return (CPU_TYPE_PENTIUM);
-    case CPUID_FAMILY_486:
-       return (CPU_TYPE_I486);
-    default:
-       break;
-    }
-#endif
-    return (CPU_TYPE_I386);
 }
 
-/*
- * Display processor signature
- */
-/*ARGSUSED*/
 void
 cpuid_cpu_display(
-    char *header,
-    int my_cpu)
+       __unused const char     *header)
 {
-    struct cpuid_name *name;
-    unsigned int i;
-    unsigned int *freq;
-    unsigned int mhz;
-    unsigned int feature;
-    char **flag;
-    extern unsigned int delaycount;
-
-    /*
-     * Identify vendor ID
-     */
-    for (name = cpuid_name; name->name != (char *)0; name++) {
-       char *p = name->name;
-       char *q = cpuid_vid;
-       while (*p == *q && *p != 0) {
-           p++;
-           q++;
+}
+#else /* CONFIG_NO_KPRINTF_STRINGS */
+void
+cpuid_feature_display(
+       const char      *header)
+{
+       char    buf[256];
+
+       kprintf("%s: %s\n", header,
+                 cpuid_get_feature_names(cpuid_features(),
+                                               buf, sizeof(buf)));
+       if (cpuid_features() & CPUID_FEATURE_HTT) {
+#define s_if_plural(n) ((n > 1) ? "s" : "")
+               kprintf("  HTT: %d core%s per package;"
+                            " %d logical cpu%s per package\n",
+                       cpuid_cpu_info.cpuid_cores_per_package,
+                       s_if_plural(cpuid_cpu_info.cpuid_cores_per_package),
+                       cpuid_cpu_info.cpuid_logical_per_package,
+                       s_if_plural(cpuid_cpu_info.cpuid_logical_per_package));
        }
-       if (*p == '\0' && *q == '\0')
-           break;
-    }
-    if (name->name == (char *)0) {
-       printf("Unrecognized processor vendor id = '%s'\n", cpuid_vid);
-       return;
-    }
+}
 
-    /*
-     * Identify Product ID
-     */
-    for (i = 0; i < name->size; i++)
-       if (name->product[i].type == cpuid_type &&
-           name->product[i].family == cpuid_family &&
-           name->product[i].model == cpuid_model)
-           break;
-    if (i == name->size) {
-       printf("%s processor (type = 0x%x, family = 0x%x, model = 0x%x)\n",
-              "Unrecognized", cpuid_type, cpuid_family, cpuid_model);
-       return;
+void
+cpuid_extfeature_display(
+       const char      *header)
+{
+       char    buf[256];
+
+       kprintf("%s: %s\n", header,
+                 cpuid_get_extfeature_names(cpuid_extfeatures(),
+                                               buf, sizeof(buf)));
+}
+
+void
+cpuid_cpu_display(
+       const char      *header)
+{
+    if (cpuid_cpu_info.cpuid_brand_string[0] != '\0') {
+       kprintf("%s: %s\n", header, cpuid_cpu_info.cpuid_brand_string);
     }
+}
+#endif /* !CONFIG_NO_KPRINTF_STRINGS */
+
+unsigned int
+cpuid_family(void)
+{
+       return cpuid_info()->cpuid_family;
+}
+
+cpu_type_t
+cpuid_cputype(void)
+{
+       return cpuid_info()->cpuid_cpu_type;
+}
+
+cpu_subtype_t
+cpuid_cpusubtype(void)
+{
+       return cpuid_info()->cpuid_cpu_subtype;
+}
+
+uint64_t
+cpuid_features(void)
+{
+       static int checked = 0;
+       char    fpu_arg[16] = { 0 };
 
-    /*
-     * Look for frequency and adjust it to known values
-     */
-    mhz = (1000 * delaycount) / name->product[i].delay;
-    for (freq = name->product[i].frequency; *freq != 0; freq++)
-       if (*freq >= mhz)
-           break;
-    if (*freq == 0)
-       mhz = *(freq - 1);
-    else if (freq == name->product[i].frequency)
-       mhz = *freq;
-    else if (*freq - mhz > mhz - *(freq - 1))
-       mhz = *(freq - 1);
-    else if (*freq != mhz)
-       mhz = *freq;
-
-    /*
-     * Display product and frequency
-     */
-    printf("%s: %s at %d MHz (signature = %d/%d/%d/%d)\n",
-          header, name->product[i].name, mhz, cpuid_type,
-          cpuid_family, cpuid_model, cpuid_stepping);
-
-    /*
-     * Display feature (if any)
-     */
-    if (cpuid_feature) {
-       i = 0;
-       flag = cpuid_flag;
-       for (feature = cpuid_feature; feature != 0; feature >>= 1) {
-           if (feature & 1)
-               if (i == 0) {
-                   printf("%s: %s", header, *flag);
-                   i = 1;
-               } else 
-                   printf(", %s", *flag);
-           flag++;
+       (void) cpuid_info();
+       if (!checked) {
+                   /* check for boot-time fpu limitations */
+                       if (PE_parse_boot_arg("_fpu", &fpu_arg[0])) {
+                               printf("limiting fpu features to: %s\n", fpu_arg);
+                               if (!strncmp("387", fpu_arg, sizeof("387")) || !strncmp("mmx", fpu_arg, sizeof("mmx"))) {
+                                       printf("no sse or sse2\n");
+                                       cpuid_cpu_info.cpuid_features &= ~(CPUID_FEATURE_SSE | CPUID_FEATURE_SSE2 | CPUID_FEATURE_FXSR);
+                               } else if (!strncmp("sse", fpu_arg, sizeof("sse"))) {
+                                       printf("no sse2\n");
+                                       cpuid_cpu_info.cpuid_features &= ~(CPUID_FEATURE_SSE2);
+                               }
+                       }
+                       checked = 1;
        }
-       printf("\n");
-    }
+       return cpuid_cpu_info.cpuid_features;
 }
 
+uint64_t
+cpuid_extfeatures(void)
+{
+       return cpuid_info()->cpuid_extfeatures;
+}
+
+#if MACH_KDB
+
 /*
- * Display processor configuration information
+ *     Display the cpuid
+ * *           
+ *     cp
  */
-/*ARGSUSED*/
-void
-cpuid_cache_display(
-    char *header,
-    int my_cpu)
+void 
+db_cpuid(__unused db_expr_t addr,
+        __unused int have_addr,
+        __unused db_expr_t count,
+        __unused char *modif)
 {
-    struct cpuid_cache_desc *desc;
-    unsigned int i;
-
-    if (cpuid_cache[CPUID_CACHE_VALID] == 1)
-       for (i = 0; i < CPUID_CACHE_SIZE; i++) {
-           if (i != CPUID_CACHE_VALID || cpuid_cache[i] == CPUID_CACHE_NULL)
-               continue;
-           for (desc = cpuid_cache_desc;
-                desc->description != (char *)0; desc++)
-               if (desc->value == cpuid_cache[i])
-                   break;
-           if (desc->description != (char *)0)
-               printf("%s: %s\n", header, desc->description);
+
+       uint32_t        i, mid;
+       uint32_t        cpid[4];
+
+       do_cpuid(0, cpid);      /* Get the first cpuid which is the number of
+                                * basic ids */
+       db_printf("%08X - %08X %08X %08X %08X\n",
+               0, cpid[eax], cpid[ebx], cpid[ecx], cpid[edx]);
+
+       mid = cpid[eax];        /* Set the number */
+       for (i = 1; i <= mid; i++) {    /* Dump 'em out */
+               do_cpuid(i, cpid);      /* Get the next */
+               db_printf("%08X - %08X %08X %08X %08X\n",
+                       i, cpid[eax], cpid[ebx], cpid[ecx], cpid[edx]);
+       }
+       db_printf("\n");
+
+       do_cpuid(0x80000000, cpid);     /* Get the first extended cpuid which
+                                        * is the number of extended ids */
+       db_printf("%08X - %08X %08X %08X %08X\n",
+               0x80000000, cpid[eax], cpid[ebx], cpid[ecx], cpid[edx]);
+
+       mid = cpid[eax];        /* Set the number */
+       for (i = 0x80000001; i <= mid; i++) {   /* Dump 'em out */
+               do_cpuid(i, cpid);      /* Get the next */
+               db_printf("%08X - %08X %08X %08X %08X\n",
+                       i, cpid[eax], cpid[ebx], cpid[ecx], cpid[edx]);
        }
 }
+
+#endif