Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a51467b authored by Russ Anderson's avatar Russ Anderson Committed by Ingo Molnar
Browse files

x86/uv: Fix uv_gpa_to_soc_phys_ram() shift 



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

Signed-off-by: default avatarRuss Anderson <rja@sgi.com>
Cc: <stable@kernel.org>
Link: http://lkml.kernel.org/r/20120119020753.GA7228@sgi.com


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 87f71ae2

arch/x86/include/asm/uv/uv_hub.h

+2 −2
Original line number Diff line number Diff line
@@ -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;