]> git.saurik.com Git - apple/xnu.git/blobdiff - osfmk/i386/cpuid.c
xnu-1486.2.11.tar.gz
[apple/xnu.git] / osfmk / i386 / cpuid.c
index a23ed95dfe8c601bfdb8a6d3a20c5b4a2f752869..c247a157df5b7f6459589a9dd4a53d2b29e51bc4 100644 (file)
@@ -33,9 +33,9 @@
 #include <vm/vm_page.h>
 #include <pexpert/pexpert.h>
 
-#include "cpuid.h"
+#include <i386/cpuid.h>
 #if MACH_KDB
-#include <i386/db_machdep.h>
+#include <machine/db_machdep.h>
 #include <ddb/db_aout.h>
 #include <ddb/db_access.h>
 #include <ddb/db_sym.h>
 #define min(a,b) ((a) < (b) ? (a) : (b))
 #define quad(hi,lo)    (((uint64_t)(hi)) << 32 | (lo))
 
-#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)
+/* Only for 32bit values */
+#define bit32(n)               (1U << (n))
+#define bitmask32(h,l)         ((bit32(h)|(bit32(h)-1)) & ~(bit32(l)-1))
+#define bitfield32(x,h,l)      ((((x) & bitmask32(h,l)) >> l))
+
+/*
+ * Leaf 2 cache descriptor encodings.
+ */
+typedef enum {
+       _NULL_,         /* NULL (empty) descriptor */
+       CACHE,          /* Cache */
+       TLB,            /* TLB */
+       STLB,           /* Shared second-level unified TLB */
+       PREFETCH        /* Prefetch size */
+} cpuid_leaf2_desc_type_t;
+
+typedef enum {
+       NA,             /* Not Applicable */
+       FULLY,          /* Fully-associative */ 
+       TRACE,          /* Trace Cache (P4 only) */
+       INST,           /* Instruction TLB */
+       DATA,           /* Data TLB */
+       DATA0,          /* Data TLB, 1st level */
+       DATA1,          /* Data TLB, 2nd level */
+       L1,             /* L1 (unified) cache */
+       L1_INST,        /* L1 Instruction cache */
+       L1_DATA,        /* L1 Data cache */
+       L2,             /* L2 (unified) cache */
+       L3,             /* L3 (unified) cache */
+       L2_2LINESECTOR, /* L2 (unified) cache with 2 lines per sector */
+       L3_2LINESECTOR, /* L3(unified) cache with 2 lines per sector */
+       SMALL,          /* Small page TLB */
+       LARGE,          /* Large page TLB */
+       BOTH            /* Small and Large page TLB */
+} cpuid_leaf2_qualifier_t;
+
+typedef struct cpuid_cache_descriptor {
+       uint8_t         value;          /* descriptor code */
+       uint8_t         type;           /* cpuid_leaf2_desc_type_t */
+       uint8_t         level;          /* level of cache/TLB hierachy */
+       uint8_t         ways;           /* wayness of cache */
+       uint16_t        size;           /* cachesize or TLB pagesize */ 
+       uint16_t        entries;        /* number of TLB entries or linesize */
+} cpuid_cache_descriptor_t;
+
+/*
+ * These multipliers are used to encode 1*K .. 64*M in a 16 bit size field 
+ */
+#define        K       (1)
+#define        M       (1024)
+
+/*
+ * Intel cache descriptor table:
+ */
+static cpuid_cache_descriptor_t intel_cpuid_leaf2_descriptor_table[] = {
+//     -------------------------------------------------------
+//     value   type    level           ways    size    entries
+//     -------------------------------------------------------
+       { 0x00, _NULL_, NA,             NA,     NA,     NA  },
+       { 0x01, TLB,    INST,           4,      SMALL,  32  },  
+       { 0x02, TLB,    INST,           FULLY,  LARGE,  2   },  
+       { 0x03, TLB,    DATA,           4,      SMALL,  64  },  
+       { 0x04, TLB,    DATA,           4,      LARGE,  8   },  
+       { 0x05, TLB,    DATA1,          4,      LARGE,  32  },  
+       { 0x06, CACHE,  L1_INST,        4,      8*K,    32  },
+       { 0x08, CACHE,  L1_INST,        4,      16*K,   32  },
+       { 0x09, CACHE,  L1_INST,        4,      32*K,   64  },
+       { 0x0A, CACHE,  L1_DATA,        2,      8*K,    32  },
+       { 0x0B, TLB,    INST,           4,      LARGE,  4   },  
+       { 0x0C, CACHE,  L1_DATA,        4,      16*K,   32  },
+       { 0x0D, CACHE,  L1_DATA,        4,      16*K,   64  },
+       { 0x0E, CACHE,  L1_DATA,        6,      24*K,   64  },
+       { 0x21, CACHE,  L2,             8,      256*K,  64  },
+       { 0x22, CACHE,  L3_2LINESECTOR, 4,      512*K,  64  },
+       { 0x23, CACHE,  L3_2LINESECTOR, 8,      1*M,    64  },
+       { 0x25, CACHE,  L3_2LINESECTOR, 8,      2*M,    64  },
+       { 0x29, CACHE,  L3_2LINESECTOR, 8,      4*M,    64  },
+       { 0x2C, CACHE,  L1_DATA,        8,      32*K,   64  },
+       { 0x30, CACHE,  L1_INST,        8,      32*K,   64  },
+       { 0x40, CACHE,  L2,             NA,     0,      NA  },
+       { 0x41, CACHE,  L2,             4,      128*K,  32  },
+       { 0x42, CACHE,  L2,             4,      256*K,  32  },
+       { 0x43, CACHE,  L2,             4,      512*K,  32  },
+       { 0x44, CACHE,  L2,             4,      1*M,    32  },
+       { 0x45, CACHE,  L2,             4,      2*M,    32  },
+       { 0x46, CACHE,  L3,             4,      4*M,    64  },
+       { 0x47, CACHE,  L3,             8,      8*M,    64  },
+       { 0x48, CACHE,  L2,             12,     3*M,    64  },
+       { 0x49, CACHE,  L2,             16,     4*M,    64  },
+       { 0x4A, CACHE,  L3,             12,     6*M,    64  },
+       { 0x4B, CACHE,  L3,             16,     8*M,    64  },
+       { 0x4C, CACHE,  L3,             12,     12*M,   64  },
+       { 0x4D, CACHE,  L3,             16,     16*M,   64  },
+       { 0x4E, CACHE,  L2,             24,     6*M,    64  },
+       { 0x4F, TLB,    INST,           NA,     SMALL,  32  },  
+       { 0x50, TLB,    INST,           NA,     BOTH,   64  },  
+       { 0x51, TLB,    INST,           NA,     BOTH,   128 },  
+       { 0x52, TLB,    INST,           NA,     BOTH,   256 },  
+       { 0x55, TLB,    INST,           FULLY,  BOTH,   7   },  
+       { 0x56, TLB,    DATA0,          4,      LARGE,  16  },  
+       { 0x57, TLB,    DATA0,          4,      SMALL,  16  },  
+       { 0x59, TLB,    DATA0,          FULLY,  SMALL,  16  },  
+       { 0x5A, TLB,    DATA0,          4,      LARGE,  32  },  
+       { 0x5B, TLB,    DATA,           NA,     BOTH,   64  },  
+       { 0x5C, TLB,    DATA,           NA,     BOTH,   128 },  
+       { 0x5D, TLB,    DATA,           NA,     BOTH,   256 },  
+       { 0x60, CACHE,  L1,             16*K,   8,      64  },
+       { 0x61, CACHE,  L1,             4,      8*K,    64  },
+       { 0x62, CACHE,  L1,             4,      16*K,   64  },
+       { 0x63, CACHE,  L1,             4,      32*K,   64  },
+       { 0x70, CACHE,  TRACE,          8,      12*K,   NA  },
+       { 0x71, CACHE,  TRACE,          8,      16*K,   NA  },
+       { 0x72, CACHE,  TRACE,          8,      32*K,   NA  },
+       { 0x78, CACHE,  L2,             4,      1*M,    64  },
+       { 0x79, CACHE,  L2_2LINESECTOR, 8,      128*K,  64  },
+       { 0x7A, CACHE,  L2_2LINESECTOR, 8,      256*K,  64  },
+       { 0x7B, CACHE,  L2_2LINESECTOR, 8,      512*K,  64  },
+       { 0x7C, CACHE,  L2_2LINESECTOR, 8,      1*M,    64  },
+       { 0x7D, CACHE,  L2,             8,      2*M,    64  },
+       { 0x7F, CACHE,  L2,             2,      512*K,  64  },
+       { 0x80, CACHE,  L2,             8,      512*K,  64  },
+       { 0x82, CACHE,  L2,             8,      256*K,  32  },
+       { 0x83, CACHE,  L2,             8,      512*K,  32  },
+       { 0x84, CACHE,  L2,             8,      1*M,    32  },
+       { 0x85, CACHE,  L2,             8,      2*M,    32  },
+       { 0x86, CACHE,  L2,             4,      512*K,  64  },
+       { 0x87, CACHE,  L2,             8,      1*M,    64  },
+       { 0xB0, TLB,    INST,           4,      SMALL,  128 },  
+       { 0xB1, TLB,    INST,           4,      LARGE,  8   },  
+       { 0xB2, TLB,    INST,           4,      SMALL,  64  },  
+       { 0xB3, TLB,    DATA,           4,      SMALL,  128 },  
+       { 0xB4, TLB,    DATA1,          4,      SMALL,  256 },  
+       { 0xBA, TLB,    DATA1,          4,      BOTH,   64  },  
+       { 0xCA, STLB,   DATA1,          4,      BOTH,   512 },  
+       { 0xD0, CACHE,  L3,             4,      512*K,  64  },  
+       { 0xD1, CACHE,  L3,             4,      1*M,    64  },  
+       { 0xD2, CACHE,  L3,             4,      2*M,    64  },  
+       { 0xD3, CACHE,  L3,             4,      4*M,    64  },  
+       { 0xD4, CACHE,  L3,             4,      8*M,    64  },  
+       { 0xD6, CACHE,  L3,             8,      1*M,    64  },  
+       { 0xD7, CACHE,  L3,             8,      2*M,    64  },  
+       { 0xD8, CACHE,  L3,             8,      4*M,    64  },  
+       { 0xD9, CACHE,  L3,             8,      8*M,    64  },  
+       { 0xDA, CACHE,  L3,             8,      12*M,   64  },  
+       { 0xDC, CACHE,  L3,             12,     1536*K, 64  },  
+       { 0xDD, CACHE,  L3,             12,     3*M,    64  },  
+       { 0xDE, CACHE,  L3,             12,     6*M,    64  },  
+       { 0xDF, CACHE,  L3,             12,     12*M,   64  },  
+       { 0xE0, CACHE,  L3,             12,     18*M,   64  },  
+       { 0xE2, CACHE,  L3,             16,     2*M,    64  },  
+       { 0xE3, CACHE,  L3,             16,     4*M,    64  },  
+       { 0xE4, CACHE,  L3,             16,     8*M,    64  },  
+       { 0xE5, CACHE,  L3,             16,     16*M,   64  },  
+       { 0xE6, CACHE,  L3,             16,     24*M,   64  },  
+       { 0xF0, PREFETCH, NA,           NA,     64,     NA  },  
+       { 0xF1, PREFETCH, NA,           NA,     128,    NA  }   
+};
+#define        INTEL_LEAF2_DESC_NUM (sizeof(intel_cpuid_leaf2_descriptor_table) / \
+                               sizeof(cpuid_cache_descriptor_t))
+
+static inline cpuid_cache_descriptor_t *
+cpuid_leaf2_find(uint8_t value)
+{
+       unsigned int    i;
+
+       for (i = 0; i < INTEL_LEAF2_DESC_NUM; i++)
+               if (intel_cpuid_leaf2_descriptor_table[i].value == value)
+                       return &intel_cpuid_leaf2_descriptor_table[i];
+       return NULL;
+}
 
 /*
  * CPU identification routines.
 static i386_cpu_info_t *cpuid_cpu_infop = NULL;
 static i386_cpu_info_t cpuid_cpu_info;
 
+#if defined(__x86_64__)
+static void cpuid_fn(uint32_t selector, uint32_t *result)
+{
+       do_cpuid(selector, result);
+}
+#else
+static void cpuid_fn(uint32_t selector, uint32_t *result)
+{
+       if (cpu_mode_is64bit()) {
+              asm("call _cpuid64"
+                       : "=a" (result[0]),
+                         "=b" (result[1]),
+                         "=c" (result[2]),
+                         "=d" (result[3])
+                       : "a"(selector));
+       } else {
+               do_cpuid(selector, result);
+       }
+}
+#endif
+
 /* this function is Intel-specific */
 static void
 cpuid_set_cache_info( i386_cpu_info_t * info_p )
@@ -76,7 +264,7 @@ cpuid_set_cache_info( i386_cpu_info_t * info_p )
        /* 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);
+       cpuid_fn(2, cpuid_result);
        for (j = 0; j < 4; j++) {
                if ((cpuid_result[j] >> 31) == 1)       /* bit31 is validity */
                        continue;
@@ -86,7 +274,7 @@ cpuid_set_cache_info( i386_cpu_info_t * info_p )
        for (i = 1; i < info_p->cache_info[0]; i++) {
                if (i*16 > sizeof(info_p->cache_info))
                        break;
-               do_cpuid(2, cpuid_result);
+               cpuid_fn(2, cpuid_result);
                for (j = 0; j < 4; j++) {
                        if ((cpuid_result[j] >> 31) == 1) 
                                continue;
@@ -100,7 +288,7 @@ cpuid_set_cache_info( i386_cpu_info_t * info_p )
         * Most processors Mac OS X supports implement this flavor of CPUID.
         * Loop over each cache on the processor.
         */
-       do_cpuid(0, cpuid_result);
+       cpuid_fn(0, cpuid_result);
        if (cpuid_result[eax] >= 4)
                cpuid_deterministic_supported = TRUE;
 
@@ -120,17 +308,17 @@ cpuid_set_cache_info( i386_cpu_info_t * info_p )
                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);
+               cache_type = bitfield32(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;
+               cache_level             = bitfield32(reg[eax],  7,  5);
+               cache_sharing           = bitfield32(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;
+                                       = bitfield32(reg[eax], 31, 26) + 1;
+               cache_linesize          = bitfield32(reg[ebx], 11,  0) + 1;
+               cache_partitions        = bitfield32(reg[ebx], 21, 12) + 1;
+               cache_associativity     = bitfield32(reg[ebx], 31, 22) + 1;
+               cache_sets              = bitfield32(reg[ecx], 31,  0) + 1;
                                
                /* Map type/levels returned by CPUID into cache_type_t */
                switch (cache_level) {
@@ -152,10 +340,11 @@ cpuid_set_cache_info( i386_cpu_info_t * info_p )
                }
                
                /* The total size of a cache is:
-                *      ( linesize * sets * associativity )
+                *      ( linesize * sets * associativity * partitions )
                 */
                if (type != Lnone) {
-                       cache_size = cache_linesize * cache_sets * cache_associativity;
+                       cache_size = cache_linesize * cache_sets *
+                                    cache_associativity * cache_partitions;
                        info_p->cache_size[type] = cache_size;
                        info_p->cache_sharing[type] = cache_sharing;
                        info_p->cache_partitions[type] = cache_partitions;
@@ -213,38 +402,82 @@ cpuid_set_cache_info( i386_cpu_info_t * info_p )
        else if (linesizes[L1D])
                info_p->cache_linesize = linesizes[L1D];
        else panic("no linesize");
+
+       /*
+        * Extract and publish TLB information from Leaf 2 descriptors.
+        */
+       for (i = 1; i < sizeof(info_p->cache_info); i++) {
+               cpuid_cache_descriptor_t        *descp;
+               int                             id;
+               int                             level;
+               int                             page;
+
+               descp = cpuid_leaf2_find(info_p->cache_info[i]);
+               if (descp == NULL)
+                       continue;
+
+               switch (descp->type) {
+               case TLB:
+                       page = (descp->size == SMALL) ? TLB_SMALL : TLB_LARGE;
+                       /* determine I or D: */
+                       switch (descp->level) {
+                       case INST:
+                               id = TLB_INST;
+                               break;
+                       case DATA:
+                       case DATA0:
+                       case DATA1:
+                               id = TLB_DATA;
+                               break;
+                       default:
+                               continue;
+                       }
+                       /* determine level: */
+                       switch (descp->level) {
+                       case DATA1:
+                               level = 1;
+                               break;
+                       default:
+                               level = 0;
+                       }
+                       info_p->cpuid_tlb[id][page][level] = descp->entries;
+                       break;
+               case STLB:
+                       info_p->cpuid_stlb = descp->entries;
+               }
+       }
 }
 
 static void
 cpuid_set_generic_info(i386_cpu_info_t *info_p)
 {
-       uint32_t        cpuid_reg[4];
-       uint32_t        max_extid;
+       uint32_t        reg[4];
         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);
+       cpuid_fn(0, reg);
+       info_p->cpuid_max_basic = reg[eax];
+       bcopy((char *)&reg[ebx], &info_p->cpuid_vendor[0], 4); /* ug */
+       bcopy((char *)&reg[ecx], &info_p->cpuid_vendor[8], 4);
+       bcopy((char *)&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];
+       cpuid_fn(0x80000000, reg);
+       info_p->cpuid_max_ext = reg[eax];
 
        /* check to see if we can get brand string */
-       if (max_extid >= 0x80000004) {
+       if (info_p->cpuid_max_ext >= 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);
+               cpuid_fn(0x80000002, reg);
+               bcopy((char *)reg, &str[0], 16);
+               cpuid_fn(0x80000003, reg);
+               bcopy((char *)reg, &str[16], 16);
+               cpuid_fn(0x80000004, reg);
+               bcopy((char *)reg, &str[32], 16);
                for (p = str; *p != '\0'; p++) {
                        if (*p != ' ') break;
                }
@@ -263,116 +496,180 @@ cpuid_set_generic_info(i386_cpu_info_t *info_p)
        }
     
        /* 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);
+       if (info_p->cpuid_max_ext >= 0x80000006) {
+               cpuid_fn(0x80000006, reg);
+               info_p->cpuid_cache_linesize   = bitfield32(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);
+                                                bitfield32(reg[ecx],15,12);
+               info_p->cpuid_cache_size       = bitfield32(reg[ecx],31,16);
+               cpuid_fn(0x80000008, reg);
                info_p->cpuid_address_bits_physical =
-                                                bitfield(cpuid_reg[eax], 7, 0);
+                                                bitfield32(reg[eax], 7, 0);
                info_p->cpuid_address_bits_virtual =
-                                                bitfield(cpuid_reg[eax],15, 8);
+                                                bitfield32(reg[eax],15, 8);
        }
 
        /* 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]);
+       cpuid_fn(1, reg);
+       info_p->cpuid_signature = reg[eax];
+       info_p->cpuid_stepping  = bitfield32(reg[eax],  3,  0);
+       info_p->cpuid_model     = bitfield32(reg[eax],  7,  4);
+       info_p->cpuid_family    = bitfield32(reg[eax], 11,  8);
+       info_p->cpuid_type      = bitfield32(reg[eax], 13, 12);
+       info_p->cpuid_extmodel  = bitfield32(reg[eax], 19, 16);
+       info_p->cpuid_extfamily = bitfield32(reg[eax], 27, 20);
+       info_p->cpuid_brand     = bitfield32(reg[ebx],  7,  0);
+       info_p->cpuid_features  = quad(reg[ecx], 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)
+       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);
+                               bitfield32(reg[ebx], 23, 16);
        else
                info_p->cpuid_logical_per_package = 1;
 
-       if (max_extid >= 0x80000001) {
-               do_cpuid(0x80000001, cpuid_reg);
+       if (info_p->cpuid_max_ext >= 0x80000001) {
+               cpuid_fn(0x80000001, reg);
                info_p->cpuid_extfeatures =
-                               quad(cpuid_reg[ecx], cpuid_reg[edx]);
+                               quad(reg[ecx], reg[edx]);
+       }
+
+       /* Fold in the Invariant TSC feature bit, if present */
+       if (info_p->cpuid_max_ext >= 0x80000007) {
+               cpuid_fn(0x80000007, reg);  
+               info_p->cpuid_extfeatures |=
+                               reg[edx] & (uint32_t)CPUID_EXTFEATURE_TSCI;
        }
 
-       if (info_p->cpuid_extfeatures && CPUID_FEATURE_MONITOR) {
+       /* Find the microcode version number a.k.a. signature a.k.a. BIOS ID */
+        info_p->cpuid_microcode_version =
+                (uint32_t) (rdmsr64(MSR_IA32_BIOS_SIGN_ID) >> 32);
+
+       if (info_p->cpuid_max_basic >= 0x5) {
+               cpuid_mwait_leaf_t      *cmp = &info_p->cpuid_mwait_leaf;
+
                /*
                 * 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];
+               cpuid_fn(5, reg);
+               cmp->linesize_min = reg[eax];
+               cmp->linesize_max = reg[ebx];
+               cmp->extensions   = reg[ecx];
+               cmp->sub_Cstates  = reg[edx];
+               info_p->cpuid_mwait_leafp = cmp;
+       }
+
+       if (info_p->cpuid_max_basic >= 0x6) {
+               cpuid_thermal_leaf_t    *ctp = &info_p->cpuid_thermal_leaf;
 
                /*
-                * And the thermal and Power Leaf while we're at it:
+                * The thermal and Power Leaf:
                 */
-               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);
+               cpuid_fn(6, reg);
+               ctp->sensor               = bitfield32(reg[eax], 0, 0);
+               ctp->dynamic_acceleration = bitfield32(reg[eax], 1, 1);
+               ctp->thresholds           = bitfield32(reg[ebx], 3, 0);
+               ctp->ACNT_MCNT            = bitfield32(reg[ecx], 0, 0);
+               info_p->cpuid_thermal_leafp = ctp;
+       }
+
+       if (info_p->cpuid_max_basic >= 0xa) {
+               cpuid_arch_perf_leaf_t  *capp = &info_p->cpuid_arch_perf_leaf;
 
                /*
-                * And the Architectural Performance Monitoring Leaf:
+                * 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);
-
+               cpuid_fn(0xa, reg);
+               capp->version       = bitfield32(reg[eax],  7,  0);
+               capp->number        = bitfield32(reg[eax], 15,  8);
+               capp->width         = bitfield32(reg[eax], 23, 16);
+               capp->events_number = bitfield32(reg[eax], 31, 24);
+               capp->events        = reg[ebx];
+               capp->fixed_number  = bitfield32(reg[edx],  4,  0);
+               capp->fixed_width   = bitfield32(reg[edx], 12,  5);
+               info_p->cpuid_arch_perf_leafp = capp;
        }
 
        return;
 }
 
+static uint32_t
+cpuid_set_cpufamily(i386_cpu_info_t *info_p)
+{
+       uint32_t cpufamily = CPUFAMILY_UNKNOWN;
+
+       switch (info_p->cpuid_family) {
+       case 6:
+               switch (info_p->cpuid_model) {
+               case 13:
+                       cpufamily = CPUFAMILY_INTEL_6_13;
+                       break;
+               case 14:
+                       cpufamily = CPUFAMILY_INTEL_YONAH;
+                       break;
+               case 15:
+                       cpufamily = CPUFAMILY_INTEL_MEROM;
+                       break;
+               case 23:
+                       cpufamily = CPUFAMILY_INTEL_PENRYN;
+                       break;
+               case CPUID_MODEL_NEHALEM:
+               case CPUID_MODEL_FIELDS:
+               case CPUID_MODEL_DALES:
+               case CPUID_MODEL_NEHALEM_EX:
+                       cpufamily = CPUFAMILY_INTEL_NEHALEM;
+                       break;
+               }
+               break;
+       }
+
+       info_p->cpuid_cpufamily = cpufamily;
+       return cpufamily;
+}
+
 void
 cpuid_set_info(void)
 {
-       bzero((void *)&cpuid_cpu_info, sizeof(cpuid_cpu_info));
+       i386_cpu_info_t         *info_p = &cpuid_cpu_info;
+       
+       bzero((void *)info_p, sizeof(cpuid_cpu_info));
 
-       cpuid_set_generic_info(&cpuid_cpu_info);
+       cpuid_set_generic_info(info_p);
 
        /* verify we are running on a supported CPU */
-       if ((strncmp(CPUID_VID_INTEL, cpuid_cpu_info.cpuid_vendor,
+       if ((strncmp(CPUID_VID_INTEL, info_p->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))
+                        sizeof(info_p->cpuid_vendor)))) ||
+          (cpuid_set_cpufamily(info_p) == CPUFAMILY_UNKNOWN))
                panic("Unsupported CPU");
 
-       cpuid_cpu_info.cpuid_cpu_type = CPU_TYPE_X86;
-       cpuid_cpu_info.cpuid_cpu_subtype = CPU_SUBTYPE_X86_ARCH1;
+       info_p->cpuid_cpu_type = CPU_TYPE_X86;
+       info_p->cpuid_cpu_subtype = CPU_SUBTYPE_X86_ARCH1;
 
        cpuid_set_cache_info(&cpuid_cpu_info);
 
+       /*
+        * Find the number of enabled cores and threads
+        * (which determines whether SMT/Hyperthreading is active).
+        */
+       switch (info_p->cpuid_cpufamily) {
+       case CPUFAMILY_INTEL_NEHALEM: {
+               uint64_t msr = rdmsr64(MSR_CORE_THREAD_COUNT);
+               info_p->core_count   = bitfield32((uint32_t)msr, 31, 16);
+               info_p->thread_count = bitfield32((uint32_t)msr, 15,  0);
+               break;
+               }
+       }
+       if (info_p->core_count == 0) {
+               info_p->core_count   = info_p->cpuid_cores_per_package;
+               info_p->thread_count = info_p->cpuid_logical_per_package;
+       }
+
        cpuid_cpu_info.cpuid_model_string = ""; /* deprecated */
 }
 
@@ -422,7 +719,9 @@ static struct {
        {CPUID_FEATURE_PDCM,    "PDCM"},
        {CPUID_FEATURE_SSE4_1,  "SSE4.1"},
        {CPUID_FEATURE_SSE4_2,  "SSE4.2"},
+       {CPUID_FEATURE_xAPIC,   "xAPIC"},
        {CPUID_FEATURE_POPCNT,  "POPCNT"},
+       {CPUID_FEATURE_VMM,     "VMM"},
        {0, 0}
 },
 extfeature_map[] = {
@@ -430,13 +729,15 @@ extfeature_map[] = {
        {CPUID_EXTFEATURE_XD,      "XD"},
        {CPUID_EXTFEATURE_EM64T,   "EM64T"},
        {CPUID_EXTFEATURE_LAHF,    "LAHF"},
+       {CPUID_EXTFEATURE_RDTSCP,  "RDTSCP"},
+       {CPUID_EXTFEATURE_TSCI,    "TSCI"},
        {0, 0}
 };
 
 i386_cpu_info_t        *
 cpuid_info(void)
 {
-       /* Set-up the cpuid_indo stucture lazily */
+       /* Set-up the cpuid_info stucture lazily */
        if (cpuid_cpu_infop == NULL) {
                cpuid_set_info();
                cpuid_cpu_infop = &cpuid_cpu_info;
@@ -447,7 +748,7 @@ cpuid_info(void)
 char *
 cpuid_get_feature_names(uint64_t features, char *buf, unsigned buf_len)
 {
-       int     len = -1;
+       size_t  len = -1;
        char    *p = buf;
        int     i;
 
@@ -456,7 +757,7 @@ cpuid_get_feature_names(uint64_t features, char *buf, unsigned buf_len)
                        continue;
                if (len > 0)
                        *p++ = ' ';
-               len = min(strlen(feature_map[i].name), (buf_len-1) - (p-buf));
+               len = min(strlen(feature_map[i].name), (size_t) ((buf_len-1) - (p-buf)));
                if (len == 0)
                        break;
                bcopy(feature_map[i].name, p, len);
@@ -469,7 +770,7 @@ cpuid_get_feature_names(uint64_t features, char *buf, unsigned buf_len)
 char *
 cpuid_get_extfeature_names(uint64_t extfeatures, char *buf, unsigned buf_len)
 {
-       int     len = -1;
+       size_t  len = -1;
        char    *p = buf;
        int     i;
 
@@ -478,7 +779,7 @@ cpuid_get_extfeature_names(uint64_t extfeatures, char *buf, unsigned buf_len)
                        continue;
                if (len > 0)
                        *p++ = ' ';
-               len = min(strlen(extfeature_map[i].name), (buf_len-1)-(p-buf));
+               len = min(strlen(extfeature_map[i].name), (size_t) ((buf_len-1)-(p-buf)));
                if (len == 0)
                        break;
                bcopy(extfeature_map[i].name, p, len);
@@ -489,25 +790,6 @@ cpuid_get_extfeature_names(uint64_t extfeatures, char *buf, unsigned buf_len)
 }
 
 
-#if CONFIG_NO_KPRINTF_STRINGS
-void
-cpuid_feature_display(
-       __unused const char     *header)
-{
-}
-
-void
-cpuid_extfeature_display(
-       __unused const char     *header)
-{
-}
-
-void
-cpuid_cpu_display(
-       __unused const char     *header)
-{
-}
-#else /* CONFIG_NO_KPRINTF_STRINGS */
 void
 cpuid_feature_display(
        const char      *header)
@@ -547,7 +829,6 @@ cpuid_cpu_display(
        kprintf("%s: %s\n", header, cpuid_cpu_info.cpuid_brand_string);
     }
 }
-#endif /* !CONFIG_NO_KPRINTF_STRINGS */
 
 unsigned int
 cpuid_family(void)
@@ -555,6 +836,12 @@ cpuid_family(void)
        return cpuid_info()->cpuid_family;
 }
 
+uint32_t
+cpuid_cpufamily(void)
+{
+       return cpuid_info()->cpuid_cpufamily;
+}
+
 cpu_type_t
 cpuid_cputype(void)
 {
@@ -571,12 +858,12 @@ uint64_t
 cpuid_features(void)
 {
        static int checked = 0;
-       char    fpu_arg[16] = { 0 };
+       char    fpu_arg[20] = { 0 };
 
        (void) cpuid_info();
        if (!checked) {
                    /* check for boot-time fpu limitations */
-                       if (PE_parse_boot_arg("_fpu", &fpu_arg[0])) {
+                       if (PE_parse_boot_argn("_fpu", &fpu_arg[0], sizeof (fpu_arg))) {
                                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");