x86/microcode/amd: Cache builtin microcode too

commit d419d28261e72e1c9ec418711b3da41df2265139 upstream

save_microcode_in_initrd_amd() fails to cache builtin microcode and only
scans initrd.

Use find_blobs_in_containers() instead which covers both.

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

diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index 05f1f6c69d02ada6c9df4a0155b293929e364840..719467c54bd9030b5e0d8178b0c7249c3bbf75ec 100644 (file)
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -533,7 +533,7 @@ int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax)
        enum ucode_state ret;
        struct cpio_data cp;
 
-       cp = find_microcode_in_initrd(ucode_path);
+       find_blobs_in_containers(cpuid_1_eax, &cp);
        if (!(cp.data && cp.size))
                return -EINVAL;