Skip to content

Commit 67a1023

Browse files
sean-jcgregkh
authored andcommitted
x86/CPU/AMD: WARN when setting EFER.AUTOIBRS if and only if the WRMSR fails
[ Upstream commit 4920776 ] When ensuring EFER.AUTOIBRS is set, WARN only on a negative return code from msr_set_bit(), as '1' is used to indicate the WRMSR was successful ('0' indicates the MSR bit was already set). Fixes: 8cc68c9 ("x86/CPU/AMD: Make sure EFER[AIBRSE] is set") Reported-by: Nathan Chancellor <[email protected]> Signed-off-by: Sean Christopherson <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected] Closes: https://lore.kernel.org/all/20241205220604.GA2054199@thelio-3990X Signed-off-by: Sasha Levin <[email protected]>
1 parent 68570b5 commit 67a1023

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/kernel/cpu/amd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,7 @@ static void init_amd(struct cpuinfo_x86 *c)
12051205
*/
12061206
if (spectre_v2_in_eibrs_mode(spectre_v2_enabled) &&
12071207
cpu_has(c, X86_FEATURE_AUTOIBRS))
1208-
WARN_ON_ONCE(msr_set_bit(MSR_EFER, _EFER_AUTOIBRS));
1208+
WARN_ON_ONCE(msr_set_bit(MSR_EFER, _EFER_AUTOIBRS) < 0);
12091209

12101210
if (!cpu_has(c, X86_FEATURE_HYPERVISOR) &&
12111211
cpu_has_amd_erratum(c, amd_erratum_1485))

0 commit comments

Comments
 (0)