lkml.org 
[lkml]   [2008]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 41/60] x86: amd opteron TOM2 mask val fix
    2.6.26-stable review patch.  If anyone has any objections, please let us know.

    ------------------
    From: Yinghai Lu <yhlu.kernel@gmail.com>

    commit 8004dd965b13b01a96def054d420f6df7ff22d53 upstream.

    there is a typo in the mask value, need to remove that extra 0,
    to avoid 4bit clearing.

    Signed-off-by: Yinghal Lu <yhlu.kernel@gmail.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Cc: maximilian attems <max@stro.at>
    Cc: Peter Palfrader <weasel@debian.org>
    Cc: dann frazier <dannf@debian.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>


    ---
    arch/x86/kernel/cpu/mtrr/generic.c | 2 +-
    arch/x86/pci/k8-bus_64.c | 4 ++--
    2 files changed, 3 insertions(+), 3 deletions(-)

    --- a/arch/x86/kernel/cpu/mtrr/generic.c
    +++ b/arch/x86/kernel/cpu/mtrr/generic.c
    @@ -219,7 +219,7 @@ void __init get_mtrr_state(void)
    tom2 = hi;
    tom2 <<= 32;
    tom2 |= lo;
    - tom2 &= 0xffffff8000000ULL;
    + tom2 &= 0xffffff800000ULL;
    }
    if (mtrr_show) {
    int high_width;
    --- a/arch/x86/pci/k8-bus_64.c
    +++ b/arch/x86/pci/k8-bus_64.c
    @@ -384,7 +384,7 @@ static int __init early_fill_mp_bus_info
    /* need to take out [0, TOM) for RAM*/
    address = MSR_K8_TOP_MEM1;
    rdmsrl(address, val);
    - end = (val & 0xffffff8000000ULL);
    + end = (val & 0xffffff800000ULL);
    printk(KERN_INFO "TOM: %016lx aka %ldM\n", end, end>>20);
    if (end < (1ULL<<32))
    update_range(range, 0, end - 1);
    @@ -478,7 +478,7 @@ static int __init early_fill_mp_bus_info
    /* TOP_MEM2 */
    address = MSR_K8_TOP_MEM2;
    rdmsrl(address, val);
    - end = (val & 0xffffff8000000ULL);
    + end = (val & 0xffffff800000ULL);
    printk(KERN_INFO "TOM2: %016lx aka %ldM\n", end, end>>20);
    update_range(range, 1ULL<<32, end - 1);
    }
    --


    \
     
     \ /
      Last update: 2008-08-18 21:09    [W:4.643 / U:0.856 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site