[tip: x86/microcode] x86/microcode/amd: Cache builtin microcode too

tip-bot2 for Thomas Gleixner
2023-10-11T09:01:21Z

Commit-ID: a983f3245ac2178cb697996e19d1fadee9648bfb
Gitweb: https://git.kernel.org/tip/a983f3245ac2178cb697996e19d1fadee9648bfb
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Tue, 10 Oct 2023 17:08:43 +02:00
Committer: Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Tue, 10 Oct 2023 19:44:59 +02:00

x86/microcode/amd: Cache builtin microcode too

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
---
arch/x86/kernel/cpu/microcode/amd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index f6ed2c5..046b3a6 100644
--- 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;