Messages in this thread Patch in this message | | | Date | Fri, 20 Oct 2023 11:37:53 -0000 | From | "tip-bot2 for Thomas Gleixner" <> | Subject | [tip: x86/microcode] x86/microcode: Mop up early loading leftovers |
| |
The following commit has been merged into the x86/microcode branch of tip:
Commit-ID: 7800dda414725c9c8c266ae9b0be811563714e14 Gitweb: https://git.kernel.org/tip/7800dda414725c9c8c266ae9b0be811563714e14 Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Tue, 17 Oct 2023 23:23:56 +02:00 Committer: Borislav Petkov (AMD) <bp@alien8.de> CommitterDate: Thu, 19 Oct 2023 15:49:50 +02:00
x86/microcode: Mop up early loading leftovers
Get rid of the initrd_gone hack which was required to keep find_microcode_in_initrd() functional after init.
As find_microcode_in_initrd() is now only used during init, mark it accordingly.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/20231017211723.298854846@linutronix.de --- arch/x86/kernel/cpu/microcode/core.c | 17 +---------------- arch/x86/kernel/cpu/microcode/internal.h | 1 - 2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index 15c5042..37145cf 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -44,8 +44,6 @@ static struct microcode_ops *microcode_ops; bool dis_ucode_ldr = true; -bool initrd_gone; - /* * Synchronization. * @@ -180,15 +178,7 @@ void load_ucode_ap(void) } } -/* Temporary workaround until find_microcode_in_initrd() is __init */ -static int __init mark_initrd_gone(void) -{ - initrd_gone = true; - return 0; -} -fs_initcall(mark_initrd_gone); - -struct cpio_data find_microcode_in_initrd(const char *path) +struct cpio_data __init find_microcode_in_initrd(const char *path) { #ifdef CONFIG_BLK_DEV_INITRD unsigned long start = 0; @@ -216,12 +206,7 @@ struct cpio_data find_microcode_in_initrd(const char *path) * has the virtual address of the beginning of the initrd. It also * possibly relocates the ramdisk. In either case, initrd_start contains * the updated address so use that instead. - * - * initrd_gone is for the hotplug case where we've thrown out initrd - * already. */ - if (initrd_gone) - return (struct cpio_data){ NULL, 0, "" }; if (initrd_start) start = initrd_start; diff --git a/arch/x86/kernel/cpu/microcode/internal.h b/arch/x86/kernel/cpu/microcode/internal.h index 89fbf74..4bef216 100644 --- a/arch/x86/kernel/cpu/microcode/internal.h +++ b/arch/x86/kernel/cpu/microcode/internal.h @@ -86,7 +86,6 @@ static inline unsigned int x86_cpuid_family(void) } extern bool dis_ucode_ldr; -extern bool initrd_gone; #ifdef CONFIG_CPU_SUP_AMD void load_ucode_amd_bsp(unsigned int family);
| |