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

Commit 189f67c4 authored by Jack Steiner's avatar Jack Steiner Committed by Ingo Molnar
Browse files

x86: UV fix for global physical addresses 



Impact: fix UV boot crash

This fixes a UV bug related to generating global memory addresses
on partitioned systems. Partition systems do not have physical memory
at address 0. Instead, a chunk of high memory is remapped by the chipset
so that it appears to be at address 0. This remapping is INVISIBLE to most
of the OS. The only OS functions that need to be aware of the remaping are
functions that directly interface to the chipset. The GRU is one example.

Also, delete a couple of unused macros related to global memory addresses.

Signed-off-by: default avatarJack Steiner <steiner@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c15cb37c

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

+2 −14
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ DECLARE_PER_CPU(struct uv_hub_info_s, __uv_hub_info); 
static inline unsigned long uv_soc_phys_ram_to_gpa(unsigned long paddr)

{

	if (paddr < uv_hub_info->lowmem_remap_top)

		paddr += uv_hub_info->lowmem_remap_base;

		paddr |= uv_hub_info->lowmem_remap_base;

	return paddr | uv_hub_info->gnode_upper;

}
@@ -218,19 +218,7 @@ static inline unsigned long uv_soc_phys_ram_to_gpa(unsigned long paddr) 
/* socket virtual --> UV global physical address */

static inline unsigned long uv_gpa(void *v)

{

	return __pa(v) | uv_hub_info->gnode_upper;

}



/* socket virtual --> UV global physical address */

static inline void *uv_vgpa(void *v)

{

	return (void *)uv_gpa(v);

}



/* UV global physical address --> socket virtual */

static inline void *uv_va(unsigned long gpa)

{

	return __va(gpa & uv_hub_info->gpa_mask);

	return uv_soc_phys_ram_to_gpa(__pa(v));

}



/* pnode, offset --> socket virtual */

arch/x86/kernel/genx2apic_uv_x.c

+1 −2
Original line number Diff line number Diff line
@@ -540,8 +540,7 @@ void __init uv_system_init(void) 
		uv_blade_info[blade].nr_possible_cpus++;



		uv_cpu_hub_info(cpu)->lowmem_remap_base = lowmem_redir_base;

		uv_cpu_hub_info(cpu)->lowmem_remap_top =

					lowmem_redir_base + lowmem_redir_size;

		uv_cpu_hub_info(cpu)->lowmem_remap_top = lowmem_redir_size;

		uv_cpu_hub_info(cpu)->m_val = m_val;

		uv_cpu_hub_info(cpu)->n_val = m_val;

		uv_cpu_hub_info(cpu)->numa_blade_id = blade;