diff options
author | Andrew Cooper <andrew.cooper3@citrix.com> | 2024-08-22 00:39:05 -0700 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2024-08-25 19:23:00 +0200 |
commit | efe508816d2caf83536ff2f308e09043380fb2b7 (patch) | |
tree | 23bddf21cd6629fdb537875fa348a32454dd0dce /arch/x86/kernel | |
parent | 0dfac6f267fa091aa348c6a6742b463c9e7c98e3 (diff) | |
download | linux-stable-efe508816d2caf83536ff2f308e09043380fb2b7.tar.gz linux-stable-efe508816d2caf83536ff2f308e09043380fb2b7.tar.bz2 linux-stable-efe508816d2caf83536ff2f308e09043380fb2b7.zip |
x86/msr: Switch between WRMSRNS and WRMSR with the alternatives mechanism
Per the discussion about FRED MSR writes with WRMSRNS instruction [1],
use the alternatives mechanism to choose WRMSRNS when it's available,
otherwise fallback to WRMSR.
Remove the dependency on X86_FEATURE_WRMSRNS as WRMSRNS is no longer
dependent on FRED.
[1] https://lore.kernel.org/lkml/15f56e6a-6edd-43d0-8e83-bb6430096514@citrix.com/
Use DS prefix to pad WRMSR instead of a NOP. The prefix is ignored. At
least that's the current information from the hardware folks.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Xin Li (Intel) <xin@zytor.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20240822073906.2176342-3-xin@zytor.com
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/cpu/cpuid-deps.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/cpuid-deps.c b/arch/x86/kernel/cpu/cpuid-deps.c index b7d9f530ae16..8bd84114c2d9 100644 --- a/arch/x86/kernel/cpu/cpuid-deps.c +++ b/arch/x86/kernel/cpu/cpuid-deps.c @@ -83,7 +83,6 @@ static const struct cpuid_dep cpuid_deps[] = { { X86_FEATURE_AMX_TILE, X86_FEATURE_XFD }, { X86_FEATURE_SHSTK, X86_FEATURE_XSAVES }, { X86_FEATURE_FRED, X86_FEATURE_LKGS }, - { X86_FEATURE_FRED, X86_FEATURE_WRMSRNS }, {} }; |