x86/srso: Move retbleed IBPB check into existing 'has_microcode' code block

commit 351236947a45a512c517153bbe109fe868d05e6d upstream.

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
Cc: Caleb Jorden <cjorden@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index a55a3864df1c92adf2edc3dd1cc987a63c9be483..0bc55472f303a2c79616e055d5ac3c6a77dcb884 100644 (file)
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -2422,10 +2422,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;
                }