diff options
| author | Josh Poimboeuf <jpoimboe@kernel.org> | 2023-09-04 22:04:59 -0700 |
|---|---|---|
| committer | Borislav Petkov (AMD) <bp@alien8.de> | 2023-10-20 12:29:25 +0200 |
| commit | 351236947a45a512c517153bbe109fe868d05e6d (patch) | |
| tree | 83687bb8a9856d200e4933b7d68e80ddbbb81c31 | |
| parent | 0a0ce0da7fe66d54e497fb4e97d101b478f57e00 (diff) | |
| download | lwn-351236947a45a512c517153bbe109fe868d05e6d.tar.gz lwn-351236947a45a512c517153bbe109fe868d05e6d.zip | |
x86/srso: Move retbleed IBPB check into existing 'has_microcode' code block
Simplify the code flow a bit by moving the retbleed IBPB check into the
existing 'has_microcode' block.
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/0a22b86b1f6b07f9046a9ab763fc0e0d1b7a91d4.1693889988.git.jpoimboe@kernel.org
| -rw-r--r-- | arch/x86/kernel/cpu/bugs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 941ac94ad0d4..6b443f0fde34 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -2430,10 +2430,8 @@ static void __init srso_select_mitigation(void) setup_force_cpu_cap(X86_FEATURE_SRSO_NO); return; } - } - if (retbleed_mitigation == RETBLEED_MITIGATION_IBPB) { - if (has_microcode) { + if (retbleed_mitigation == RETBLEED_MITIGATION_IBPB) { srso_mitigation = SRSO_MITIGATION_IBPB; goto out; } |