Commit 036ed8ba authored by Robin Holt's avatar Robin Holt Committed by Ingo Molnar
Browse files

x86, UV: Fix information in __uv_hub_info structure 



A few parts of the uv_hub_info structure are initialized
incorrectly.

 - n_val is being loaded with m_val.
 - gpa_mask is initialized with a bytes instead of an unsigned long.
 - Handle the case where none of the alias registers are used.

Lastly I converted the bau over to using the uv_hub_info->m_val
which is the correct value.

Without this patch, booting a large configuration hits a
problem where the upper bits of the gnode affect the pnode
and the bau will not operate.

Signed-off-by: default avatarRobin Holt <holt@sgi.com>
Acked-by: default avatarJack Steiner <steiner@sgi.com>
Cc: Cliff Whickman <cpw@sgi.com>
Cc: stable@kernel.org
LKML-Reference: <20091015224946.396355000@alcatraz.americas.sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a5912f6b

arch/x86/kernel/apic/x2apic_uv_x.c

+4 −4
Original line number Diff line number Diff line
@@ -352,14 +352,14 @@ static __init void get_lowmem_redirect(unsigned long *base, unsigned long *size) 


	for (i = 0; i < ARRAY_SIZE(redir_addrs); i++) {

		alias.v = uv_read_local_mmr(redir_addrs[i].alias);

		if (alias.s.base == 0) {

		if (alias.s.enable && alias.s.base == 0) {

			*size = (1UL << alias.s.m_alias);

			redirect.v = uv_read_local_mmr(redir_addrs[i].redirect);

			*base = (unsigned long)redirect.s.dest_base << DEST_SHIFT;

			return;

		}

	}

	BUG();

	*base = *size = 0;

}



enum map_type {map_wb, map_uc};
@@ -619,12 +619,12 @@ void __init uv_system_init(void) 
		uv_cpu_hub_info(cpu)->lowmem_remap_base = lowmem_redir_base;

		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)->n_val = n_val;

		uv_cpu_hub_info(cpu)->numa_blade_id = blade;

		uv_cpu_hub_info(cpu)->blade_processor_id = lcpu;

		uv_cpu_hub_info(cpu)->pnode = pnode;

		uv_cpu_hub_info(cpu)->pnode_mask = pnode_mask;

		uv_cpu_hub_info(cpu)->gpa_mask = (1 << (m_val + n_val)) - 1;

		uv_cpu_hub_info(cpu)->gpa_mask = (1UL << (m_val + n_val)) - 1;

		uv_cpu_hub_info(cpu)->gnode_upper = gnode_upper;

		uv_cpu_hub_info(cpu)->gnode_extra = gnode_extra;

		uv_cpu_hub_info(cpu)->global_mmr_base = mmr_base;

arch/x86/kernel/tlb_uv.c

+2 −2
Original line number Diff line number Diff line
@@ -843,8 +843,8 @@ static int __init uv_bau_init(void) 
				       GFP_KERNEL, cpu_to_node(cur_cpu));



	uv_bau_retry_limit = 1;

	uv_nshift = uv_hub_info->n_val;

	uv_mmask = (1UL << uv_hub_info->n_val) - 1;

	uv_nshift = uv_hub_info->m_val;

	uv_mmask = (1UL << uv_hub_info->m_val) - 1;

	nblades = uv_num_possible_blades();



	uv_bau_table_bases = (struct bau_control **)

CRA Git | Maintained and supported by SUSTech CRA and CCSE