Author: scottl
Date: Tue Nov 12 19:29:32 2019
New Revision: 354657
URL: https://svnweb.freebsd.org/changeset/base/354657
Log:
MFC: Add new bit definitions for TSX, related to the TAA issue. The actual
mitigation will follow in a future commit.
Sponsored by: Intel
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 Tue Nov 12 19:19:27 2019
(r354656)
+++ stable/12/sys/x86/include/specialreg.h Tue Nov 12 19:29:32 2019
(r354657)
@@ -448,7 +448,13 @@
#define IA32_ARCH_CAP_SSB_NO 0x00000010
#define IA32_ARCH_CAP_MDS_NO 0x00000020
#define IA32_ARCH_CAP_IF_PSCHANGE_MC_NO 0x00000040
+#define IA32_ARCH_CAP_TSX_CTRL 0x00000080
+#define IA32_ARCH_CAP_TAA_NO 0x00000100
+/* MSR IA32_TSX_CTRL bits */
+#define IA32_TSX_CTRL_RTM_DISABLE 0x00000001
+#define IA32_TSX_CTRL_TSX_CPUID_CLEAR 0x00000002
+
/*
* CPUID manufacturers identifiers
*/
@@ -500,6 +506,7 @@
#define MSR_BBL_CR_TRIG 0x11a
#define MSR_BBL_CR_BUSY 0x11b
#define MSR_BBL_CR_CTL3 0x11e
+#define MSR_IA32_TSX_CTRL 0x122
#define MSR_SYSENTER_CS_MSR 0x174
#define MSR_SYSENTER_ESP_MSR 0x175
#define MSR_SYSENTER_EIP_MSR 0x176
Modified: stable/12/sys/x86/x86/identcpu.c
==============================================================================
--- stable/12/sys/x86/x86/identcpu.c Tue Nov 12 19:19:27 2019
(r354656)
+++ stable/12/sys/x86/x86/identcpu.c Tue Nov 12 19:29:32 2019
(r354657)
@@ -1025,6 +1025,9 @@ printcpuinfo(void)
"\003RSBA"
"\004SKIP_L1DFL_VME"
"\005SSB_NO"
+ "\005MDS_NO"
+ "\010TSX_CTRL"
+ "\011TAA_NO"
);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
