Author: kib
Date: Wed May 12 09:34:10 2010
New Revision: 207955
URL: http://svn.freebsd.org/changeset/base/207955

Log:
  MFC r207676:
  Add definitions for Intel AESNI CPUID bits and print the capabilities
  on boot.

Modified:
  stable/8/sys/amd64/amd64/identcpu.c
  stable/8/sys/amd64/include/specialreg.h
  stable/8/sys/i386/i386/identcpu.c
  stable/8/sys/i386/include/specialreg.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/amd64/amd64/identcpu.c
==============================================================================
--- stable/8/sys/amd64/amd64/identcpu.c Wed May 12 05:50:56 2010        
(r207954)
+++ stable/8/sys/amd64/amd64/identcpu.c Wed May 12 09:34:10 2010        
(r207955)
@@ -240,7 +240,7 @@ printcpuinfo(void)
                                printf("\n  Features2=0x%b", cpu_feature2,
                                "\020"
                                "\001SSE3"      /* SSE3 */
-                               "\002<b1>"
+                               "\002PCLMULQDQ" /* Carry-Less Mul Quadword */
                                "\003DTES64"    /* 64-bit Debug Trace */
                                "\004MON"       /* MONITOR/MWAIT Instructions */
                                "\005DS_CPL"    /* CPL Qualified Debug Store */
@@ -264,7 +264,7 @@ printcpuinfo(void)
                                "\027MOVBE"
                                "\030POPCNT"
                                "\031<b24>"
-                               "\032<b25>"
+                               "\032AESNI"     /* AES Crypto*/
                                "\033XSAVE"
                                "\034OSXSAVE"
                                "\035<b28>"

Modified: stable/8/sys/amd64/include/specialreg.h
==============================================================================
--- stable/8/sys/amd64/include/specialreg.h     Wed May 12 05:50:56 2010        
(r207954)
+++ stable/8/sys/amd64/include/specialreg.h     Wed May 12 09:34:10 2010        
(r207955)
@@ -113,6 +113,7 @@
 #define        CPUID_PBE       0x80000000
 
 #define        CPUID2_SSE3     0x00000001
+#define        CPUID2_PCLMULQDQ 0x00000002
 #define        CPUID2_DTES64   0x00000004
 #define        CPUID2_MON      0x00000008
 #define        CPUID2_DS_CPL   0x00000010
@@ -131,6 +132,7 @@
 #define        CPUID2_X2APIC   0x00200000
 #define        CPUID2_MOVBE    0x00400000
 #define        CPUID2_POPCNT   0x00800000
+#define        CPUID2_AESNI    0x02000000
 
 /*
  * Important bits in the AMD extended cpuid flags

Modified: stable/8/sys/i386/i386/identcpu.c
==============================================================================
--- stable/8/sys/i386/i386/identcpu.c   Wed May 12 05:50:56 2010        
(r207954)
+++ stable/8/sys/i386/i386/identcpu.c   Wed May 12 09:34:10 2010        
(r207955)
@@ -727,7 +727,7 @@ printcpuinfo(void)
                                printf("\n  Features2=0x%b", cpu_feature2,
                                "\020"
                                "\001SSE3"      /* SSE3 */
-                               "\002<b1>"
+                               "\002PCLMULQDQ" /* Carry-Less Mul Quadword */
                                "\003DTES64"    /* 64-bit Debug Trace */
                                "\004MON"       /* MONITOR/MWAIT Instructions */
                                "\005DS_CPL"    /* CPL Qualified Debug Store */
@@ -751,7 +751,7 @@ printcpuinfo(void)
                                "\027MOVBE"
                                "\030POPCNT"
                                "\031<b24>"
-                               "\032<b25>"
+                               "\032AESNI"     /* AES Crypto*/
                                "\033XSAVE"
                                "\034OSXSAVE"
                                "\035<b28>"

Modified: stable/8/sys/i386/include/specialreg.h
==============================================================================
--- stable/8/sys/i386/include/specialreg.h      Wed May 12 05:50:56 2010        
(r207954)
+++ stable/8/sys/i386/include/specialreg.h      Wed May 12 09:34:10 2010        
(r207955)
@@ -110,6 +110,7 @@
 #define        CPUID_PBE       0x80000000
 
 #define        CPUID2_SSE3     0x00000001
+#define        CPUID2_PCLMULQDQ 0x00000002
 #define        CPUID2_DTES64   0x00000004
 #define        CPUID2_MON      0x00000008
 #define        CPUID2_DS_CPL   0x00000010
@@ -128,6 +129,7 @@
 #define        CPUID2_X2APIC   0x00200000
 #define        CPUID2_MOVBE    0x00400000
 #define        CPUID2_POPCNT   0x00800000
+#define        CPUID2_AESNI    0x02000000
 
 /*
  * Important bits in the AMD extended cpuid flags
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to