svn commit: r343848 - in stable/12/sys/x86: include x86

[Konstantin Belousov]

Author: kib
Date: Thu Feb  7 01:54:34 2019
New Revision: 343848
URL: https://svnweb.freebsd.org/changeset/base/343848

Log:
  MFC r343757:
  Update CPUID bits definitions and CPU identification based on changes
  in SDM rev. 069.

Modified:
  stable/12/sys/x86/include/specialreg.h
  stable/12/sys/x86/x86/identcpu.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/x86/include/specialreg.h
==============================================================================
--- stable/12/sys/x86/include/specialreg.h	Thu Feb  7 01:51:52 2019	(r343847)
+++ stable/12/sys/x86/include/specialreg.h	Thu Feb  7 01:54:34 2019	(r343848)
@@ -419,7 +419,12 @@
 #define	CPUID_STDEXT2_UMIP	0x00000004
 #define	CPUID_STDEXT2_PKU	0x00000008
 #define	CPUID_STDEXT2_OSPKE	0x00000010
+#define	CPUID_STDEXT2_WAITPKG	0x00000020
+#define	CPUID_STDEXT2_GFNI	0x00000100
 #define	CPUID_STDEXT2_RDPID	0x00400000
+#define	CPUID_STDEXT2_CLDEMOTE	0x02000000
+#define	CPUID_STDEXT2_MOVDIRI	0x08000000
+#define	CPUID_STDEXT2_MOVDIRI64B	0x10000000
 #define	CPUID_STDEXT2_SGXLC	0x40000000
 
 /*
@@ -429,6 +434,7 @@
 #define	CPUID_STDEXT3_STIBP	0x08000000
 #define	CPUID_STDEXT3_L1D_FLUSH	0x10000000
 #define	CPUID_STDEXT3_ARCH_CAP	0x20000000
+#define	CPUID_STDEXT3_CORE_CAP	0x40000000
 #define	CPUID_STDEXT3_SSBD	0x80000000
 
 /* MSR IA32_ARCH_CAP(ABILITIES) bits */

Modified: stable/12/sys/x86/x86/identcpu.c
==============================================================================
--- stable/12/sys/x86/x86/identcpu.c	Thu Feb  7 01:51:52 2019	(r343847)
+++ stable/12/sys/x86/x86/identcpu.c	Thu Feb  7 01:54:34 2019	(r343848)
@@ -978,7 +978,12 @@ printcpuinfo(void)
 				       "\003UMIP"
 				       "\004PKU"
 				       "\005OSPKE"
+				       "\006WAITPKG"
+				       "\011GFNI"
 				       "\027RDPID"
+				       "\032CLDEMOTE"
+				       "\034MOVDIRI"
+				       "\035MOVDIRI64B"
 				       "\037SGXLC"
 				       );
 			}
@@ -991,6 +996,7 @@ printcpuinfo(void)
 				       "\034STIBP"
 				       "\035L1DFL"
 				       "\036ARCH_CAP"
+				       "\037CORE_CAP"
 				       "\040SSBD"
 				       );
 			}