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[24/89] x86/uv: Fix uv_gpa_to_soc_phys_ram() shift
    3.2-stable review patch.  If anyone has any objections, please let me know.

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

    From: Russ Anderson <rja@sgi.com>

    commit 5a51467b146ab7948d2f6812892eac120a30529c upstream.

    uv_gpa_to_soc_phys_ram() was inadvertently ignoring the
    shift values. This fix takes the shift into account.

    Signed-off-by: Russ Anderson <rja@sgi.com>
    Link: http://lkml.kernel.org/r/20120119020753.GA7228@sgi.com
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/include/asm/uv/uv_hub.h | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/arch/x86/include/asm/uv/uv_hub.h
    +++ b/arch/x86/include/asm/uv/uv_hub.h
    @@ -318,13 +318,13 @@ uv_gpa_in_mmr_space(unsigned long gpa)
    /* UV global physical address --> socket phys RAM */
    static inline unsigned long uv_gpa_to_soc_phys_ram(unsigned long gpa)
    {
    - unsigned long paddr = gpa & uv_hub_info->gpa_mask;
    + unsigned long paddr;
    unsigned long remap_base = uv_hub_info->lowmem_remap_base;
    unsigned long remap_top = uv_hub_info->lowmem_remap_top;

    gpa = ((gpa << uv_hub_info->m_shift) >> uv_hub_info->m_shift) |
    ((gpa >> uv_hub_info->n_lshift) << uv_hub_info->m_val);
    - gpa = gpa & uv_hub_info->gpa_mask;
    + paddr = gpa & uv_hub_info->gpa_mask;
    if (paddr >= remap_base && paddr < remap_base + remap_top)
    paddr -= remap_base;
    return paddr;



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