lkml.org 
[lkml]   [2010]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/5] x86, cacheinfo: Unify AMD L3 cache index disable checking
    Date
    From: Borislav Petkov <borislav.petkov@amd.com>

    All F10h CPUs starting with model 8 resp. 9, stepping 1, support L3
    cache index disable. Concentrate the family, model, stepping checking at
    one place and enable the feature implicitly on upcoming Fam10h models.

    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    ---
    arch/x86/kernel/cpu/intel_cacheinfo.c | 17 ++++++++++-------
    1 files changed, 10 insertions(+), 7 deletions(-)

    diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
    index b3eeb66..acfb083 100644
    --- a/arch/x86/kernel/cpu/intel_cacheinfo.c
    +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
    @@ -328,18 +328,22 @@ static unsigned int __cpuinit amd_calc_l3_indices(void)
    static void __cpuinit
    amd_check_l3_disable(int index, struct _cpuid4_info_regs *this_leaf)
    {
    - if (index < 3)
    + if (boot_cpu_data.x86 != 0x10)
    return;

    - if (boot_cpu_data.x86 == 0x11)
    + if (index < 3)
    return;

    /* see errata #382 and #388 */
    - if ((boot_cpu_data.x86 == 0x10) &&
    - ((boot_cpu_data.x86_model < 0x8) ||
    - (boot_cpu_data.x86_mask < 0x1)))
    + if (boot_cpu_data.x86_model < 0x8)
    return;

    + if ((boot_cpu_data.x86_model == 0x8 ||
    + boot_cpu_data.x86_model == 0x9)
    + &&
    + boot_cpu_data.x86_mask < 0x1)
    + return;
    +
    this_leaf->can_disable = true;
    this_leaf->l3_indices = amd_calc_l3_indices();
    }
    @@ -443,8 +447,7 @@ __cpuinit cpuid4_cache_lookup_regs(int index,

    if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) {
    amd_cpuid4(index, &eax, &ebx, &ecx);
    - if (boot_cpu_data.x86 >= 0x10)
    - amd_check_l3_disable(index, this_leaf);
    + amd_check_l3_disable(index, this_leaf);
    } else {
    cpuid_count(4, index, &eax.full, &ebx.full, &ecx.full, &edx);
    }
    --
    1.7.1.rc1


    \
     
     \ /
      Last update: 2010-04-22 16:09    [W:0.025 / U:89.048 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site