Commit 8529e8ab authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Borislav Petkov (AMD)

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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20231017211723.298854846@linutronix.de
parent 5af05b8d
...@@ -44,8 +44,6 @@ ...@@ -44,8 +44,6 @@
static struct microcode_ops *microcode_ops; static struct microcode_ops *microcode_ops;
bool dis_ucode_ldr = true; bool dis_ucode_ldr = true;
bool initrd_gone;
/* /*
* Synchronization. * Synchronization.
* *
...@@ -180,15 +178,7 @@ void load_ucode_ap(void) ...@@ -180,15 +178,7 @@ void load_ucode_ap(void)
} }
} }
/* Temporary workaround until find_microcode_in_initrd() is __init */ struct cpio_data __init find_microcode_in_initrd(const char *path)
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)
{ {
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
unsigned long start = 0; unsigned long start = 0;
...@@ -216,12 +206,7 @@ struct cpio_data find_microcode_in_initrd(const char *path) ...@@ -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 * has the virtual address of the beginning of the initrd. It also
* possibly relocates the ramdisk. In either case, initrd_start contains * possibly relocates the ramdisk. In either case, initrd_start contains
* the updated address so use that instead. * 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) if (initrd_start)
start = initrd_start; start = initrd_start;
......
...@@ -86,7 +86,6 @@ static inline unsigned int x86_cpuid_family(void) ...@@ -86,7 +86,6 @@ static inline unsigned int x86_cpuid_family(void)
} }
extern bool dis_ucode_ldr; extern bool dis_ucode_ldr;
extern bool initrd_gone;
#ifdef CONFIG_CPU_SUP_AMD #ifdef CONFIG_CPU_SUP_AMD
void load_ucode_amd_bsp(unsigned int family); void load_ucode_amd_bsp(unsigned int family);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment