diff options
| author | Jack Steiner <steiner@sgi.com> | 2009-04-20 08:25:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-20 18:09:18 +0200 |
| commit | fc61e6636d13eb3a23eb29b4327eeee9de0ef3bc (patch) | |
| tree | f029a11ae3e98775302455a57bcbe45bd1062dea /arch/x86 | |
| parent | 62d170290979e0bb805d969cca4ea852bdd45260 (diff) | |
| download | linux-stable-fc61e6636d13eb3a23eb29b4327eeee9de0ef3bc.tar.gz linux-stable-fc61e6636d13eb3a23eb29b4327eeee9de0ef3bc.tar.bz2 linux-stable-fc61e6636d13eb3a23eb29b4327eeee9de0ef3bc.zip | |
x86/uv: fix for no memory at paddr 0
Fix endcase where the memory at physical address 0 does not really
exist AND one of the sockets on blade 0 has no active cpus.
The memory that _appears_ to be at physical address 0 is actually
memory that located at a different address but has been remapped by
the chipset so that it appears to be at physical address 0.
When determining the UV pnode, the algorithm for determining the pnode
incorrectly used the relocated physical address instead of the actual
(global) address.
[ Impact: boot failure on partitioned systems ]
Signed-off-by: Jack Steiner <steiner@sgi.com>
LKML-Reference: <20090420132530.GA23156@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/apic/x2apic_uv_x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index d6712334ce4b..2bda69352976 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -652,6 +652,7 @@ void __init uv_system_init(void) if (uv_node_to_blade[nid] >= 0) continue; paddr = node_start_pfn(nid) << PAGE_SHIFT; + paddr = uv_soc_phys_ram_to_gpa(paddr); pnode = (paddr >> m_val) & pnode_mask; blade = boot_pnode_to_blade(pnode); uv_node_to_blade[nid] = blade; |