x86/microcode/amd: Use correct per CPU ucode_cpu_info

find_blobs_in_containers() is invoked on every CPU but overwrites
unconditionally ucode_cpu_info of CPU0.

Fix this by using the proper CPU data and move the assignment into the
call site apply_ucode_from_containers() so that the function can be
reused.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20231010150702.433454320@linutronix.de

diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index b827390a0abaf401c171bcbbb2ef9ee6ab56468a..56d8bd6b9fe9c75bdddc1d833ed76e64809dd527 100644 (file)
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -503,9 +503,6 @@ static void find_blobs_in_containers(unsigned int cpuid_1_eax, struct cpio_data
        if (!get_builtin_microcode(&cp, x86_family(cpuid_1_eax)))
                cp = find_microcode_in_initrd(ucode_path);
 
-       /* Needed in load_microcode_amd() */
-       ucode_cpu_info->cpu_sig.sig = cpuid_1_eax;
-
        *ret = cp;
 }
 
@@ -513,6 +510,9 @@ static void apply_ucode_from_containers(unsigned int cpuid_1_eax)
 {
        struct cpio_data cp = { };
 
+       /* Needed in load_microcode_amd() */
+       ucode_cpu_info[smp_processor_id()].cpu_sig.sig = cpuid_1_eax;
+
        find_blobs_in_containers(cpuid_1_eax, &cp);
        if (!(cp.data && cp.size))
                return;