Commit 1d21e6e3 authored by Robin Holt's avatar Robin Holt Committed by Ingo Molnar
Browse files

x86, UV: Fix and clean up bau code to use uv_gpa_to_pnode() 



Create an inline function to extract the pnode from a global
physical address and then convert the broadcast assist unit to
use the newly created uv_gpa_to_pnode function.

The open-coded code was wrong as well - it might explain a
few of our unexplained bau hangs.

Signed-off-by: default avatarRobin Holt <holt@sgi.com>
Acked-by: default avatarCliff Whickman <cpw@sgi.com>
Cc: linux-mm@kvack.org
Cc: Jack Steiner <steiner@sgi.com>
LKML-Reference: <20091016112920.GZ8903@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 93ae5012

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

+15 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ 
/*

 * The largest possible NASID of a C or M brick (+ 2)

 */

#define UV_MAX_NASID_VALUE	(UV_MAX_NUMALINK_NODES * 2)

#define UV_MAX_NASID_VALUE	(UV_MAX_NUMALINK_BLADES * 2)



struct uv_scir_s {

	struct timer_list timer;
@@ -230,6 +230,20 @@ static inline unsigned long uv_gpa(void *v) 
	return uv_soc_phys_ram_to_gpa(__pa(v));

}



/* gnode -> pnode */

static inline unsigned long uv_gpa_to_gnode(unsigned long gpa)

{

	return gpa >> uv_hub_info->m_val;

}



/* gpa -> pnode */

static inline int uv_gpa_to_pnode(unsigned long gpa)

{

	unsigned long n_mask = (1UL << uv_hub_info->n_val) - 1;



	return uv_gpa_to_gnode(gpa) & n_mask;

}



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

static inline void *uv_pnode_offset_to_vaddr(int pnode, unsigned long offset)

{

arch/x86/kernel/tlb_uv.c

+2 −5
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
static struct bau_control	**uv_bau_table_bases __read_mostly;

static int			uv_bau_retry_limit __read_mostly;



/* position of pnode (which is nasid>>1): */

static int			uv_nshift __read_mostly;

/* base pnode in this partition */

static int			uv_partition_base_pnode __read_mostly;
@@ -723,7 +721,7 @@ uv_activation_descriptor_init(int node, int pnode) 
	BUG_ON(!adp);



	pa = uv_gpa(adp); /* need the real nasid*/

	n = pa >> uv_nshift;

	n = uv_gpa_to_pnode(pa);

	m = pa & uv_mmask;



	uv_write_global_mmr64(pnode, UVH_LB_BAU_SB_DESCRIPTOR_BASE,
@@ -778,7 +776,7 @@ uv_payload_queue_init(int node, int pnode, struct bau_control *bau_tablesp) 
	 * need the pnode of where the memory was really allocated

	 */

	pa = uv_gpa(pqp);

	pn = pa >> uv_nshift;

	pn = uv_gpa_to_pnode(pa);

	uv_write_global_mmr64(pnode,

			      UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST,

			      ((unsigned long)pn << UV_PAYLOADQ_PNODE_SHIFT) |
@@ -843,7 +841,6 @@ static int __init uv_bau_init(void) 
				       GFP_KERNEL, cpu_to_node(cur_cpu));



	uv_bau_retry_limit = 1;

	uv_nshift = uv_hub_info->m_val;

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

	nblades = uv_num_possible_blades();

CRA Git | Maintained and supported by SUSTech CRA and CCSE