UBUNTU: SAUCE: Revert "x86/msr: Add the IA32_TSX_CTRL MSR"

BugLink: https://bugs.launchpad.net/bugs/1852338
This reverts commit 25dc1784b258a1d948cafcdaebc3f619002ec537 in favor of
the version from an upstream stable update.

Signed-off-by: Connor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index 45b6705d9f712ddc0785670ba7cdac46aed7fcc9..271d837d69a8868118d811dabaa5739d482c2c0c 100644 (file)
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -93,7 +93,6 @@
                                                  * Microarchitectural Data
                                                  * Sampling (MDS) vulnerabilities.
                                                  */
-#define ARCH_CAP_TSX_CTRL_MSR          BIT(7)  /* MSR for TSX control is available. */
 
 #define MSR_IA32_FLUSH_CMD             0x0000010b
 #define L1D_FLUSH                      BIT(0)  /*
@@ -104,10 +103,6 @@
 #define MSR_IA32_BBL_CR_CTL            0x00000119
 #define MSR_IA32_BBL_CR_CTL3           0x0000011e
 
-#define MSR_IA32_TSX_CTRL              0x00000122
-#define TSX_CTRL_RTM_DISABLE           BIT(0)  /* Disable RTM feature */
-#define TSX_CTRL_CPUID_CLEAR           BIT(1)  /* Disable TSX enumeration */
-
 #define MSR_IA32_SYSENTER_CS           0x00000174
 #define MSR_IA32_SYSENTER_ESP          0x00000175
 #define MSR_IA32_SYSENTER_EIP          0x00000176