projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2351c03
)
x86/srso: Fix SBPB enablement for (possible) future fixed HW
author
Josh Poimboeuf
<jpoimboe@kernel.org>
Tue, 5 Sep 2023 05:04:49 +0000
(22:04 -0700)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 20 Nov 2023 10:51:50 +0000
(11:51 +0100)
[ Upstream commit
1d1142ac51307145dbb256ac3535a1d43a1c9800
]
Make the SBPB check more robust against the (possible) case where future
HW has SRSO fixed but doesn't have the SRSO_NO bit set.
Fixes:
1b5277c0ea0b
("x86/srso: Add SRSO_NO support")
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Acked-by: Borislav Petkov (AMD) <bp@alien8.de>
Link:
https://lore.kernel.org/r/cee5050db750b391c9f35f5334f8ff40e66c01b9.1693889988.git.jpoimboe@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/kernel/cpu/bugs.c
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/cpu/bugs.c
b/arch/x86/kernel/cpu/bugs.c
index
263df73
..
13dffc4
100644
(file)
--- a/
arch/x86/kernel/cpu/bugs.c
+++ b/
arch/x86/kernel/cpu/bugs.c
@@
-2477,7
+2477,7
@@
static void __init srso_select_mitigation(void)
pr_info("%s%s\n", srso_strings[srso_mitigation], (has_microcode ? "" : ", no microcode"));
pred_cmd:
- if ((
boot_cpu_has(X86_FEATURE_SRSO_N
O) || srso_cmd == SRSO_CMD_OFF) &&
+ if ((
!boot_cpu_has_bug(X86_BUG_SRS
O) || srso_cmd == SRSO_CMD_OFF) &&
boot_cpu_has(X86_FEATURE_SBPB))
x86_pred_cmd = PRED_CMD_SBPB;
}