Messages in this thread Patch in this message | | | Date | Wed, 11 Oct 2023 09:01:03 -0000 | From | "tip-bot2 for Thomas Gleixner" <> | Subject | [tip: x86/microcode] x86/microcode/amd: Use correct per CPU ucode_cpu_info |
| |
The following commit has been merged into the x86/microcode branch of tip:
Commit-ID: 8c4ac53f1d8bcb3bd4b5c2f338eb068f505d6816 Gitweb: https://git.kernel.org/tip/8c4ac53f1d8bcb3bd4b5c2f338eb068f505d6816 Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Tue, 10 Oct 2023 17:08:41 +02:00 Committer: Borislav Petkov (AMD) <bp@alien8.de> CommitterDate: Tue, 10 Oct 2023 19:39:32 +02:00
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 --- arch/x86/kernel/cpu/microcode/amd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index a2776f2..f6ed2c5 100644 --- 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;
| |