[patch 1/5] x86/microcode/amd: Use correct per CPU ucode_cpu_info

Thomas Gleixner
2023-10-10T15:09:02Z

find_blobs_in_containers() is invoked on every CPU but overwrites
uncoditionally 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>
---
arch/x86/kernel/cpu/microcode/amd.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

--- 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(uns
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(
{
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;