Commit c8182f00 authored by Russ Anderson's avatar Russ Anderson Committed by Ingo Molnar

sgi-xp: xpc needs to pass the physical address, not virtual

Impact: fix crash

xpc needs to pass the physical address, not virtual.

Testing uncovered this problem.  The virtual address happens to work
most of the time due to the way bios was masking off the node bits.
Passing the physical address makes it work all of the time.
Signed-off-by: default avatarRuss Anderson <rja@sgi.com>
Acked-by: default avatarDean Nelson <dcn@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 189f67c4
...@@ -100,7 +100,7 @@ extern s64 uv_bios_call_reentrant(enum uv_bios_cmd, u64, u64, u64, u64, u64); ...@@ -100,7 +100,7 @@ extern s64 uv_bios_call_reentrant(enum uv_bios_cmd, u64, u64, u64, u64, u64);
extern s64 uv_bios_get_sn_info(int, int *, long *, long *, long *); extern s64 uv_bios_get_sn_info(int, int *, long *, long *, long *);
extern s64 uv_bios_freq_base(u64, u64 *); extern s64 uv_bios_freq_base(u64, u64 *);
extern int uv_bios_mq_watchlist_alloc(int, void *, unsigned int, extern int uv_bios_mq_watchlist_alloc(int, unsigned long, unsigned int,
unsigned long *); unsigned long *);
extern int uv_bios_mq_watchlist_free(int, int); extern int uv_bios_mq_watchlist_free(int, int);
extern s64 uv_bios_change_memprotect(u64, u64, enum uv_memprotect); extern s64 uv_bios_change_memprotect(u64, u64, enum uv_memprotect);
......
...@@ -101,15 +101,13 @@ s64 uv_bios_get_sn_info(int fc, int *uvtype, long *partid, long *coher, ...@@ -101,15 +101,13 @@ s64 uv_bios_get_sn_info(int fc, int *uvtype, long *partid, long *coher,
} }
int int
uv_bios_mq_watchlist_alloc(int blade, void *mq, unsigned int mq_size, uv_bios_mq_watchlist_alloc(int blade, unsigned long addr, unsigned int mq_size,
unsigned long *intr_mmr_offset) unsigned long *intr_mmr_offset)
{ {
union uv_watchlist_u size_blade; union uv_watchlist_u size_blade;
unsigned long addr;
u64 watchlist; u64 watchlist;
s64 ret; s64 ret;
addr = (unsigned long)mq;
size_blade.size = mq_size; size_blade.size = mq_size;
size_blade.blade = blade; size_blade.blade = blade;
......
...@@ -119,16 +119,16 @@ xpc_gru_mq_watchlist_alloc_uv(struct xpc_gru_mq_uv *mq) ...@@ -119,16 +119,16 @@ xpc_gru_mq_watchlist_alloc_uv(struct xpc_gru_mq_uv *mq)
int ret; int ret;
#if defined CONFIG_X86_64 #if defined CONFIG_X86_64
ret = uv_bios_mq_watchlist_alloc(mq->mmr_blade, mq->address, mq->order, ret = uv_bios_mq_watchlist_alloc(mq->mmr_blade, uv_gpa(mq->address),
&mq->mmr_offset); mq->order, &mq->mmr_offset);
if (ret < 0) { if (ret < 0) {
dev_err(xpc_part, "uv_bios_mq_watchlist_alloc() failed, " dev_err(xpc_part, "uv_bios_mq_watchlist_alloc() failed, "
"ret=%d\n", ret); "ret=%d\n", ret);
return ret; return ret;
} }
#elif defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV #elif defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV
ret = sn_mq_watchlist_alloc(mq->mmr_blade, mq->address, mq->order, ret = sn_mq_watchlist_alloc(mq->mmr_blade, uv_gpa(mq->address),
&mq->mmr_offset); mq->order, &mq->mmr_offset);
if (ret < 0) { if (ret < 0) {
dev_err(xpc_part, "sn_mq_watchlist_alloc() failed, ret=%d\n", dev_err(xpc_part, "sn_mq_watchlist_alloc() failed, ret=%d\n",
ret); ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment