Date: Tue, 12 Nov 2019 19:35:46 +0000 (UTC) From: Scott Long <scottl@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r354658 - in stable/11/sys/x86: include x86 Message-ID: <201911121935.xACJZkfE040948@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: scottl Date: Tue Nov 12 19:35:46 2019 New Revision: 354658 URL: https://svnweb.freebsd.org/changeset/base/354658 Log: MFC: Add new bit definitions for TSX, related to the TAA issue. The actual mitigation will follow in a future commit. Obtained from: Intel Modified: stable/11/sys/x86/include/specialreg.h stable/11/sys/x86/x86/identcpu.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/x86/include/specialreg.h ============================================================================== --- stable/11/sys/x86/include/specialreg.h Tue Nov 12 19:29:32 2019 (r354657) +++ stable/11/sys/x86/include/specialreg.h Tue Nov 12 19:35:46 2019 (r354658) @@ -407,7 +407,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 */ @@ -459,6 +465,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/11/sys/x86/x86/identcpu.c ============================================================================== --- stable/11/sys/x86/x86/identcpu.c Tue Nov 12 19:29:32 2019 (r354657) +++ stable/11/sys/x86/x86/identcpu.c Tue Nov 12 19:35:46 2019 (r354658) @@ -1024,6 +1024,9 @@ printcpuinfo(void) "\003RSBA" "\004SKIP_L1DFL_VME" "\005SSB_NO" + "\006MDS_NO" + "\010TSX_CTRL" + "\011TAA_NO" ); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911121935.xACJZkfE040948>