lkml.org 
[lkml]   [2023]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[patch V5 24/39] x86/microcode: Mop up early loading leftovers
    Date
    From: Thomas Gleixner <tglx@linutronix.de>

    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>
    ---
    arch/x86/kernel/cpu/microcode/core.c | 17 +----------------
    arch/x86/kernel/cpu/microcode/internal.h | 1 -
    2 files changed, 1 insertion(+), 17 deletions(-)
    ---
    --- 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_initr
    * 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;

    --- 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_fam
    }

    extern bool dis_ucode_ldr;
    -extern bool initrd_gone;

    #ifdef CONFIG_CPU_SUP_AMD
    void load_ucode_amd_bsp(unsigned int family);
    \
     
     \ /
      Last update: 2023-10-17 23:26    [W:4.119 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site