Author: kib
Date: Fri Nov 15 07:26:50 2013
New Revision: 258161
URL: http://svnweb.freebsd.org/changeset/base/258161

Log:
  MFC r257856:
  Add bits for the AMD features from CPUID function 0x80000001 ECX,
  described in the rev. 3.0 of the Kabini BKDG, document 48751.pdf.

Modified:
  stable/9/sys/amd64/amd64/identcpu.c
  stable/9/sys/amd64/include/specialreg.h
  stable/9/sys/i386/i386/identcpu.c
  stable/9/sys/i386/include/specialreg.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/amd64/amd64/identcpu.c
==============================================================================
--- stable/9/sys/amd64/amd64/identcpu.c Fri Nov 15 07:14:01 2013        
(r258160)
+++ stable/9/sys/amd64/amd64/identcpu.c Fri Nov 15 07:26:50 2013        
(r258161)
@@ -366,18 +366,18 @@ printcpuinfo(void)
                                "\017<b14>"
                                "\020LWP"       /* Lightweight Profiling */
                                "\021FMA4"      /* 4-operand FMA instructions */
-                               "\022<b17>"
+                               "\022TCE"       /* Translation Cache Extension 
*/
                                "\023<b18>"
                                "\024NodeId"    /* NodeId MSR support */
                                "\025<b20>"
                                "\026TBM"       /* Trailing Bit Manipulation */
                                "\027Topology"  /* Topology Extensions */
-                               "\030<b23>"
-                               "\031<b24>"
+                               "\030PCXC"      /* Core perf count */
+                               "\031PNXC"      /* NB perf count */
                                "\032<b25>"
-                               "\033<b26>"
-                               "\034<b27>"
-                               "\035<b28>"
+                               "\033DBE"       /* Data Breakpoint extension */
+                               "\034PTSC"      /* Performance TSC */
+                               "\035PL2I"      /* L2I perf count */
                                "\036<b29>"
                                "\037<b30>"
                                "\040<b31>"

Modified: stable/9/sys/amd64/include/specialreg.h
==============================================================================
--- stable/9/sys/amd64/include/specialreg.h     Fri Nov 15 07:14:01 2013        
(r258160)
+++ stable/9/sys/amd64/include/specialreg.h     Fri Nov 15 07:26:50 2013        
(r258161)
@@ -201,9 +201,15 @@
 #define        AMDID2_WDT      0x00002000
 #define        AMDID2_LWP      0x00008000
 #define        AMDID2_FMA4     0x00010000
+#define        AMDID2_TCE      0x00020000
 #define        AMDID2_NODE_ID  0x00080000
 #define        AMDID2_TBM      0x00200000
 #define        AMDID2_TOPOLOGY 0x00400000
+#define        AMDID2_PCXC     0x00800000
+#define        AMDID2_PNXC     0x01000000
+#define        AMDID2_DBE      0x04000000
+#define        AMDID2_PTSC     0x08000000
+#define        AMDID2_PTSCEL2I 0x10000000
 
 /*
  * CPUID instruction 1 eax info

Modified: stable/9/sys/i386/i386/identcpu.c
==============================================================================
--- stable/9/sys/i386/i386/identcpu.c   Fri Nov 15 07:14:01 2013        
(r258160)
+++ stable/9/sys/i386/i386/identcpu.c   Fri Nov 15 07:26:50 2013        
(r258161)
@@ -842,18 +842,18 @@ printcpuinfo(void)
                                "\017<b14>"
                                "\020LWP"       /* Lightweight Profiling */
                                "\021FMA4"      /* 4-operand FMA instructions */
-                               "\022<b17>"
+                               "\022TCE"       /* Translation Cache Extension 
*/
                                "\023<b18>"
                                "\024NodeId"    /* NodeId MSR support */
                                "\025<b20>"
                                "\026TBM"       /* Trailing Bit Manipulation */
                                "\027Topology"  /* Topology Extensions */
-                               "\030<b23>"
-                               "\031<b24>"
+                               "\030PCXC"      /* Core perf count */
+                               "\031PNXC"      /* NB perf count */
                                "\032<b25>"
-                               "\033<b26>"
-                               "\034<b27>"
-                               "\035<b28>"
+                               "\033DBE"       /* Data Breakpoint extension */
+                               "\034PTSC"      /* Performance TSC */
+                               "\035PL2I"      /* L2I perf count */
                                "\036<b29>"
                                "\037<b30>"
                                "\040<b31>"

Modified: stable/9/sys/i386/include/specialreg.h
==============================================================================
--- stable/9/sys/i386/include/specialreg.h      Fri Nov 15 07:14:01 2013        
(r258160)
+++ stable/9/sys/i386/include/specialreg.h      Fri Nov 15 07:26:50 2013        
(r258161)
@@ -180,9 +180,15 @@
 #define        AMDID2_WDT      0x00002000
 #define        AMDID2_LWP      0x00008000
 #define        AMDID2_FMA4     0x00010000
+#define        AMDID2_TCE      0x00020000
 #define        AMDID2_NODE_ID  0x00080000
 #define        AMDID2_TBM      0x00200000
 #define        AMDID2_TOPOLOGY 0x00400000
+#define        AMDID2_PCXC     0x00800000
+#define        AMDID2_PNXC     0x01000000
+#define        AMDID2_DBE      0x04000000
+#define        AMDID2_PTSC     0x08000000
+#define        AMDID2_PTSCEL2I 0x10000000
 
 /*
  * CPUID instruction 1 eax info
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to