Commit ecfd4108 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Borislav Petkov (AMD)
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20231010150702.433454320@linutronix.de
parent b48b26f9

arch/x86/kernel/cpu/microcode/amd.c

+3 −3
Original line number Diff line number Diff line
@@ -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;