lkml.org 
[lkml]   [2012]   [Feb]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[18/65] x86/microcode_amd: Add support for CPU family specific container files
    3.0-stable review patch.  If anyone has any objections, please let me know.

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

    From: Andreas Herrmann <andreas.herrmann3@amd.com>

    commit 5b68edc91cdc972c46f76f85eded7ffddc3ff5c2 upstream.

    We've decided to provide CPU family specific container files
    (starting with CPU family 15h). E.g. for family 15h we have to
    load microcode_amd_fam15h.bin instead of microcode_amd.bin

    Rationale is that starting with family 15h patch size is larger
    than 2KB which was hard coded as maximum patch size in various
    microcode loaders (not just Linux).

    Container files which include patches larger than 2KB cause
    different kinds of trouble with such old patch loaders. Thus we
    have to ensure that the default container file provides only
    patches with size less than 2KB.

    Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
    Cc: Borislav Petkov <borislav.petkov@amd.com>
    Cc: <stable@kernel.org>
    Link: http://lkml.kernel.org/r/20120120164412.GD24508@alberich.amd.com
    [ documented the naming convention and tidied the code a bit. ]
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/kernel/microcode_amd.c | 24 ++++++++++++++++++++++--
    1 file changed, 22 insertions(+), 2 deletions(-)

    --- a/arch/x86/kernel/microcode_amd.c
    +++ b/arch/x86/kernel/microcode_amd.c
    @@ -298,13 +298,33 @@ free_table:
    return state;
    }

    +/*
    + * AMD microcode firmware naming convention, up to family 15h they are in
    + * the legacy file:
    + *
    + * amd-ucode/microcode_amd.bin
    + *
    + * This legacy file is always smaller than 2K in size.
    + *
    + * Starting at family 15h they are in family specific firmware files:
    + *
    + * amd-ucode/microcode_amd_fam15h.bin
    + * amd-ucode/microcode_amd_fam16h.bin
    + * ...
    + *
    + * These might be larger than 2K.
    + */
    static enum ucode_state request_microcode_amd(int cpu, struct device *device)
    {
    - const char *fw_name = "amd-ucode/microcode_amd.bin";
    + char fw_name[36] = "amd-ucode/microcode_amd.bin";
    const struct firmware *fw;
    enum ucode_state ret = UCODE_NFOUND;
    + struct cpuinfo_x86 *c = &cpu_data(cpu);

    - if (request_firmware(&fw, fw_name, device)) {
    + if (c->x86 >= 0x15)
    + snprintf(fw_name, sizeof(fw_name), "amd-ucode/microcode_amd_fam%.2xh.bin", c->x86);
    +
    + if (request_firmware(&fw, (const char *)fw_name, device)) {
    pr_err("failed to load file %s\n", fw_name);
    goto out;
    }



    \
     
     \ /
      Last update: 2012-02-01 22:55    [W:0.029 / U:59.100 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site