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 20/39] x86/microcode/amd: Use correct per CPU ucode_cpu_info
    Date
    From: Thomas Gleixner <tglx@linutronix.de>

    find_blobs_in_containers() is invoked on every CPU but overwrites
    unconditionally ucode_cpu_info of CPU0.

    Fix this by using the proper CPU data and move the assignment into the
    call site apply_ucode_from_containers() so that the function can be
    reused.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    arch/x86/kernel/cpu/microcode/amd.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)
    ---
    diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
    index a2776f2af93b..f6ed2c5be932 100644
    --- a/arch/x86/kernel/cpu/microcode/amd.c
    +++ b/arch/x86/kernel/cpu/microcode/amd.c
    @@ -503,9 +503,6 @@ static void find_blobs_in_containers(unsigned int cpuid_1_eax, struct cpio_data
    if (!get_builtin_microcode(&cp, x86_family(cpuid_1_eax)))
    cp = find_microcode_in_initrd(ucode_path);

    - /* Needed in load_microcode_amd() */
    - ucode_cpu_info->cpu_sig.sig = cpuid_1_eax;
    -
    *ret = cp;
    }

    @@ -513,6 +510,9 @@ static void apply_ucode_from_containers(unsigned int cpuid_1_eax)
    {
    struct cpio_data cp = { };

    + /* Needed in load_microcode_amd() */
    + ucode_cpu_info[smp_processor_id()].cpu_sig.sig = cpuid_1_eax;
    +
    find_blobs_in_containers(cpuid_1_eax, &cp);
    if (!(cp.data && cp.size))
    return;
    \
     
     \ /
      Last update: 2023-10-17 23:25    [W:6.010 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site