lkml.org 
[lkml]   [2015]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH 10/13] x86/microcode/intel: Move mc arg last in get_matching_{microcode|sig}
    On Tue, Feb 24, 2015 at 05:24:07PM +0100, Quentin Casasnovas wrote:
    > Why not rename the function to is_microcode_matching() while at it? :)

    Even better, see below. :-)

    ---
    From: Borislav Petkov <bp@suse.de>
    Date: Tue, 5 May 2015 11:10:44 +0200
    Subject: [PATCH] x86/microcode/intel: Rename get_matching_microcode

    ... to has_newer_microcode() as it does exactly that: checks whether
    binary data @mc has newer microcode patch than the applied one. Move @mc
    to be the first function arg too.

    Signed-off-by: Borislav Petkov <bp@suse.de>
    ---
    arch/x86/include/asm/microcode_intel.h | 2 +-
    arch/x86/kernel/cpu/microcode/intel.c | 4 ++--
    arch/x86/kernel/cpu/microcode/intel_early.c | 8 ++++----
    arch/x86/kernel/cpu/microcode/intel_lib.c | 4 ++--
    4 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/arch/x86/include/asm/microcode_intel.h b/arch/x86/include/asm/microcode_intel.h
    index 3564299863f0..8e87e6fe98b5 100644
    --- a/arch/x86/include/asm/microcode_intel.h
    +++ b/arch/x86/include/asm/microcode_intel.h
    @@ -56,7 +56,7 @@ struct extended_sigtable {

    #define exttable_size(et) ((et)->count * EXT_SIGNATURE_SIZE + EXT_HEADER_SIZE)

    -extern int get_matching_microcode(unsigned int csig, int cpf, int rev, void *mc);
    +extern int has_newer_microcode(void *mc, unsigned int csig, int cpf, int rev);
    extern int microcode_sanity_check(void *mc, int print_err);
    extern int get_matching_sig(unsigned int csig, int cpf, void *mc);

    diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
    index a41beadb3db9..c82fd1d57bca 100644
    --- a/arch/x86/kernel/cpu/microcode/intel.c
    +++ b/arch/x86/kernel/cpu/microcode/intel.c
    @@ -124,7 +124,7 @@ static int get_matching_mc(struct microcode_intel *mc_intel, int cpu)
    cpf = cpu_sig.pf;
    crev = cpu_sig.rev;

    - return get_matching_microcode(csig, cpf, crev, mc_intel);
    + return has_newer_microcode(mc_intel, csig, cpf, crev);
    }

    static int apply_microcode_intel(int cpu)
    @@ -226,7 +226,7 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,

    csig = uci->cpu_sig.sig;
    cpf = uci->cpu_sig.pf;
    - if (get_matching_microcode(csig, cpf, new_rev, mc)) {
    + if (has_newer_microcode(mc, csig, cpf, new_rev)) {
    vfree(new_mc);
    new_rev = mc_header.rev;
    new_mc = mc;
    diff --git a/arch/x86/kernel/cpu/microcode/intel_early.c b/arch/x86/kernel/cpu/microcode/intel_early.c
    index ccd474a7a59e..5f828268357d 100644
    --- a/arch/x86/kernel/cpu/microcode/intel_early.c
    +++ b/arch/x86/kernel/cpu/microcode/intel_early.c
    @@ -59,10 +59,10 @@ load_microcode_early(struct microcode_intel **saved,
    ucode_ptr = saved[i];
    mc_hdr = (struct microcode_header_intel *)ucode_ptr;

    - ret = get_matching_microcode(uci->cpu_sig.sig,
    - uci->cpu_sig.pf,
    - new_rev,
    - ucode_ptr);
    + ret = has_newer_microcode(ucode_ptr,
    + uci->cpu_sig.sig,
    + uci->cpu_sig.pf,
    + new_rev);
    if (!ret)
    continue;

    diff --git a/arch/x86/kernel/cpu/microcode/intel_lib.c b/arch/x86/kernel/cpu/microcode/intel_lib.c
    index 7de293726923..425f8e29b795 100644
    --- a/arch/x86/kernel/cpu/microcode/intel_lib.c
    +++ b/arch/x86/kernel/cpu/microcode/intel_lib.c
    @@ -154,7 +154,7 @@ int get_matching_sig(unsigned int csig, int cpf, void *mc)
    /*
    * Returns 1 if update has been found, 0 otherwise.
    */
    -int get_matching_microcode(unsigned int csig, int cpf, int new_rev, void *mc)
    +int has_newer_microcode(void *mc, unsigned int csig, int cpf, int new_rev)
    {
    struct microcode_header_intel *mc_hdr = mc;

    @@ -163,4 +163,4 @@ int get_matching_microcode(unsigned int csig, int cpf, int new_rev, void *mc)

    return get_matching_sig(csig, cpf, mc);
    }
    -EXPORT_SYMBOL_GPL(get_matching_microcode);
    +EXPORT_SYMBOL_GPL(has_newer_microcode);
    --
    2.3.5
    --
    Regards/Gruss,
    Boris.

    ECO tip #101: Trim your mails when you reply.
    --


    \
     
     \ /
      Last update: 2015-05-05 11:41    [W:7.711 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site