From: "Borislav Petkov (AMD)" <bp@xxxxxxxxx>
commit 9c21ea53e6bd1104c637b80a0688040f184cc761 upstream
This was meant to be done only when early microcode got updated
successfully. Move it into the if-branch.
Also, make sure the current revision is read unconditionally and only
once.
Fixes: 080990aa3344 ("x86/microcode: Rework early revisions reporting")
Reported-by: Ashok Raj <ashok.raj@xxxxxxxxx>
Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx>
Tested-by: Ashok Raj <ashok.raj@xxxxxxxxx>
Link: https://lore.kernel.org/r/ZWjVt5dNRjbcvlzR@xxxxxxxxxxxxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/x86/kernel/cpu/microcode/intel.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -370,14 +370,14 @@ static __init struct microcode_intel *ge
{
struct cpio_data cp;
+ intel_collect_cpu_info(&uci->cpu_sig);
+
if (!load_builtin_intel_microcode(&cp))
cp = find_microcode_in_initrd(ucode_path);
if (!(cp.data && cp.size))
return NULL;
- intel_collect_cpu_info(&uci->cpu_sig);
-
return scan_microcode(cp.data, cp.size, uci, save);
}
@@ -410,13 +410,13 @@ void __init load_ucode_intel_bsp(struct
{
struct ucode_cpu_info uci;
- ed->old_rev = intel_get_microcode_revision();
-
uci.mc = get_microcode_blob(&uci, false);
- if (uci.mc && apply_microcode_early(&uci) == UCODE_UPDATED)
- ucode_patch_va = UCODE_BSP_LOADED;
+ ed->old_rev = uci.cpu_sig.rev;
- ed->new_rev = uci.cpu_sig.rev;
+ if (uci.mc && apply_microcode_early(&uci) == UCODE_UPDATED) {
+ ucode_patch_va = UCODE_BSP_LOADED;
+ ed->new_rev = uci.cpu_sig.rev;
+ }
}
void load_ucode_intel_ap(void)
Patches currently in stable-queue which might be from bp@xxxxxxxxx are
queue-6.6/x86-microcode-intel-cleanup-code-further.patch
queue-6.6/x86-microcode-intel-simplify-scan_microcode.patch
queue-6.6/x86-microcode-mop-up-early-loading-leftovers.patch
queue-6.6/x86-microcode-provide-new-control-functions.patch
queue-6.6/x86-microcode-intel-save-the-microcode-only-after-a-successful-late-load.patch
queue-6.6/x86-microcode-32-move-early-loading-after-paging-enable.patch
queue-6.6/x86-microcode-amd-flush-patch-buffer-mapping-after-application.patch
queue-6.6/x86-microcode-intel-remove-unnecessary-cache-writeback-and-invalidation.patch
queue-6.6/x86-microcode-intel-simplify-early-loading.patch
queue-6.6/x86-microcode-add-per-cpu-control-field.patch
queue-6.6/x86-microcode-amd-use-the-family-model-stepping-encoded-in-the-patch-id.patch
queue-6.6/x86-microcode-amd-split-load_microcode_amd.patch
queue-6.6/x86-microcode-add-per-cpu-result-state.patch
queue-6.6/x86-microcode-prepare-for-minimal-revision-check.patch
queue-6.6/x86-microcode-intel-simplify-and-rename-generic_load_microcode.patch
queue-6.6/x86-microcode-amd-pay-attention-to-the-stepping-dynamically.patch
queue-6.6/x86-microcode-amd-get-rid-of-the-_load_microcode_amd-forward-declaration.patch
queue-6.6/x86-microcode-handle-offline-cpus-correctly.patch
queue-6.6/x86-microcode-get-rid-of-the-schedule-work-indirection.patch
queue-6.6/x86-microcode-intel-rework-intel_cpu_collect_info.patch
queue-6.6/x86-microcode-amd-use-cached-microcode-for-ap-load.patch
queue-6.6/x86-microcode-replace-the-all-in-one-rendevous-handler.patch
queue-6.6/x86-microcode-amd-add-get_patch_level.patch
queue-6.6/x86-apic-provide-apic_force_nmi_on_cpu.patch
queue-6.6/x86-microcode-intel-rework-intel_find_matching_signature.patch
queue-6.6/x86-microcode-remove-pointless-apply-invocation.patch
queue-6.6/x86-microcode-intel-reuse-intel_cpu_collect_info.patch
queue-6.6/x86-microcode-amd-use-correct-per-cpu-ucode_cpu_info.patch
queue-6.6/x86-microcode-amd-cache-builtin-initrd-microcode-early.patch
queue-6.6/x86-microcode-protect-against-instrumentation.patch
queue-6.6/x86-microcode-amd-load-only-sha256-checksummed-patches.patch
queue-6.6/x86-microcode-clean-up-mc_cpu_down_prep.patch
queue-6.6/x86-microcode-amd-cache-builtin-microcode-too.patch
queue-6.6/x86-microcode-amd-merge-early_apply_microcode-into-its-single-callsite.patch
queue-6.6/x86-microcode-rendezvous-and-load-in-nmi.patch
queue-6.6/x86-microcode-amd-make-__verify_patch_size-return-bool.patch
queue-6.6/x86-microcode-intel-rip-out-mixed-stepping-support-for-intel-cpus.patch
queue-6.6/x86-microcode-intel-unify-microcode-apply-functions.patch
queue-6.6/x86-microcode-amd-have-__apply_microcode_amd-return-bool.patch
queue-6.6/x86-microcode-intel-switch-to-kvmalloc.patch
queue-6.6/x86-microcode-clarify-the-late-load-logic.patch
queue-6.6/x86-microcode-sanitize-__wait_for_cpus.patch
queue-6.6/x86-microcode-intel-set-new-revision-only-after-a-successful-update.patch
queue-6.6/x86-microcode-rework-early-revisions-reporting.patch
queue-6.6/x86-microcode-handle-nosmt-correctly.patch
queue-6.6/x86-microcode-amd-return-bool-from-find_blobs_in_containers.patch
