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

Commit 68212893 authored by Robin Holt's avatar Robin Holt Committed by Linus Torvalds
Browse files

x86: uv: xpc needs to provide an abstraction for uv_gpa 



Provide an SGI SN2/UV agnositic method for converting a global physical
address into a socket physical address.

Signed-off-by: default avatarRobin Holt <holt@sgi.com>
Cc: Jack Steiner <steiner@sgi.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 729d69e6

drivers/misc/sgi-xp/xp.h

+1 −0
Original line number Diff line number Diff line
@@ -339,6 +339,7 @@ extern short xp_partition_id; 
extern u8 xp_region_size;



extern unsigned long (*xp_pa) (void *);

extern unsigned long (*xp_socket_pa) (unsigned long);

extern enum xp_retval (*xp_remote_memcpy) (unsigned long, const unsigned long,

		       size_t);

extern int (*xp_cpu_to_nasid) (int);

drivers/misc/sgi-xp/xp_main.c

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ EXPORT_SYMBOL_GPL(xp_region_size); 
unsigned long (*xp_pa) (void *addr);

EXPORT_SYMBOL_GPL(xp_pa);



unsigned long (*xp_socket_pa) (unsigned long gpa);

EXPORT_SYMBOL_GPL(xp_socket_pa);



enum xp_retval (*xp_remote_memcpy) (unsigned long dst_gpa,

				    const unsigned long src_gpa, size_t len);

EXPORT_SYMBOL_GPL(xp_remote_memcpy);

drivers/misc/sgi-xp/xp_sn2.c

+10 −0
Original line number Diff line number Diff line
@@ -83,6 +83,15 @@ xp_pa_sn2(void *addr) 
	return __pa(addr);

}



/*

 * Convert a global physical to a socket physical address.

 */

static unsigned long

xp_socket_pa_sn2(unsigned long gpa)

{

	return gpa;

}



/*

 * Wrapper for bte_copy().

 *
@@ -162,6 +171,7 @@ xp_init_sn2(void) 
	xp_region_size = sn_region_size;



	xp_pa = xp_pa_sn2;

	xp_socket_pa = xp_socket_pa_sn2;

	xp_remote_memcpy = xp_remote_memcpy_sn2;

	xp_cpu_to_nasid = xp_cpu_to_nasid_sn2;

	xp_expand_memprotect = xp_expand_memprotect_sn2;

drivers/misc/sgi-xp/xp_uv.c

+10 −0
Original line number Diff line number Diff line
@@ -32,6 +32,15 @@ xp_pa_uv(void *addr) 
	return uv_gpa(addr);

}



/*

 * Convert a global physical to socket physical address.

 */

static unsigned long

xp_socket_pa_uv(unsigned long gpa)

{

	return uv_gpa_to_soc_phys_ram(gpa);

}



static enum xp_retval

xp_remote_memcpy_uv(unsigned long dst_gpa, const unsigned long src_gpa,

		    size_t len)
@@ -123,6 +132,7 @@ xp_init_uv(void) 
	xp_region_size = sn_region_size;



	xp_pa = xp_pa_uv;

	xp_socket_pa = xp_socket_pa_uv;

	xp_remote_memcpy = xp_remote_memcpy_uv;

	xp_cpu_to_nasid = xp_cpu_to_nasid_uv;

	xp_expand_memprotect = xp_expand_memprotect_uv;