lkml.org 
[lkml]   [2018]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 92/92] x86/microcode: Do the family check first
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Borislav Petkov <bp@suse.de>

    commit 1f161f67a272cc4f29f27934dd3f74cb657eb5c4 upstream with adjustments.

    On CPUs like AMD's Geode, for example, we shouldn't even try to load
    microcode because they do not support the modern microcode loading
    interface.

    However, we do the family check *after* the other checks whether the
    loader has been disabled on the command line or whether we're running in
    a guest.

    So move the family checks first in order to exit early if we're being
    loaded on an unsupported family.

    Reported-and-tested-by: Sven Glodowski <glodi1@arcor.de>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Cc: <stable@vger.kernel.org> # 4.11..
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Link: http://bugzilla.suse.com/show_bug.cgi?id=1061396
    Link: http://lkml.kernel.org/r/20171012112316.977-1-bp@alien8.de
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/kernel/cpu/microcode/core.c | 27 ++++++++++++++++++---------
    1 file changed, 18 insertions(+), 9 deletions(-)

    --- a/arch/x86/kernel/cpu/microcode/core.c
    +++ b/arch/x86/kernel/cpu/microcode/core.c
    @@ -86,9 +86,6 @@ static bool __init check_loader_disabled
    bool *res = &dis_ucode_ldr;
    #endif

    - if (!have_cpuid_p())
    - return *res;
    -
    a = 1;
    c = 0;
    native_cpuid(&a, &b, &c, &d);
    @@ -130,8 +127,9 @@ void __init load_ucode_bsp(void)
    {
    int vendor;
    unsigned int family;
    + bool intel = true;

    - if (check_loader_disabled_bsp())
    + if (!have_cpuid_p())
    return;

    vendor = x86_cpuid_vendor();
    @@ -139,16 +137,27 @@ void __init load_ucode_bsp(void)

    switch (vendor) {
    case X86_VENDOR_INTEL:
    - if (family >= 6)
    - load_ucode_intel_bsp();
    + if (family < 6)
    + return;
    break;
    +
    case X86_VENDOR_AMD:
    - if (family >= 0x10)
    - load_ucode_amd_bsp(family);
    + if (family < 0x10)
    + return;
    + intel = false;
    break;
    +
    default:
    - break;
    + return;
    }
    +
    + if (check_loader_disabled_bsp())
    + return;
    +
    + if (intel)
    + load_ucode_intel_bsp();
    + else
    + load_ucode_amd_bsp(family);
    }

    static bool check_loader_disabled_ap(void)

    \
     
     \ /
      Last update: 2018-02-09 14:58    [W:4.379 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site