github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-21 21:37:25 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

x86/microcode: Mop up early loading leftovers

Browse Source 
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
This commit is contained in:
Thomas Gleixner 2023-10-17 23:23:56 +02:00 committed by Borislav Petkov (AMD)
parent 5af05b8d51
commit 8529e8ab6c
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/x86/kernel/cpu/microcode/core.c
View File

@ -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;

1
arch/x86/kernel/cpu/microcode/internal.h
View File

@ -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);