Commit 6e9a5549 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] sn: SAL interface clean up

From: Pat Gefre <pfg@sgi.com>

SAL interface clean up
parent b41a3eec
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#endif /* DEBUG_KLGRAPH */ #endif /* DEBUG_KLGRAPH */
lboard_t *root_lboard[MAX_COMPACT_NODES]; lboard_t *root_lboard[MAX_COMPACT_NODES];
u64 klgraph_addr[MAX_COMPACT_NODES];
static int hasmetarouter; static int hasmetarouter;
......
...@@ -65,6 +65,8 @@ struct nodepda_s { ...@@ -65,6 +65,8 @@ struct nodepda_s {
nodepda_router_info_t **npda_rip_last; nodepda_router_info_t **npda_rip_last;
spinlock_t bist_lock;
/* /*
* The BTEs on this node are shared by the local cpus * The BTEs on this node are shared by the local cpus
*/ */
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
#include <asm/sal.h> #include <asm/sal.h>
#include <asm/sn/sn_cpuid.h> #include <asm/sn/sn_cpuid.h>
#include <asm/sn/arch.h> #include <asm/sn/arch.h>
#include <asm/sn/nodepda.h>
#include <asm/sn/klconfig.h>
// SGI Specific Calls // SGI Specific Calls
...@@ -167,11 +169,9 @@ static inline u64 ...@@ -167,11 +169,9 @@ static inline u64
ia64_sn_get_klconfig_addr(nasid_t nasid) ia64_sn_get_klconfig_addr(nasid_t nasid)
{ {
struct ia64_sal_retval ret_stuff; struct ia64_sal_retval ret_stuff;
extern u64 klgraph_addr[];
int cnodeid; int cnodeid;
cnodeid = nasid_to_cnodeid(nasid); cnodeid = nasid_to_cnodeid(nasid);
if (klgraph_addr[cnodeid] == 0) {
ret_stuff.status = 0; ret_stuff.status = 0;
ret_stuff.v0 = 0; ret_stuff.v0 = 0;
ret_stuff.v1 = 0; ret_stuff.v1 = 0;
...@@ -185,10 +185,7 @@ ia64_sn_get_klconfig_addr(nasid_t nasid) ...@@ -185,10 +185,7 @@ ia64_sn_get_klconfig_addr(nasid_t nasid)
if (ret_stuff.status != 0) { if (ret_stuff.status != 0) {
panic("ia64_sn_get_klconfig_addr: Returned error %lx\n", ret_stuff.status); panic("ia64_sn_get_klconfig_addr: Returned error %lx\n", ret_stuff.status);
} }
return(ret_stuff.v0);
klgraph_addr[cnodeid] = ret_stuff.v0;
}
return(klgraph_addr[cnodeid]);
} }
/* /*
...@@ -597,8 +594,16 @@ static inline int ...@@ -597,8 +594,16 @@ static inline int
sn_change_memprotect(u64 paddr, u64 len, u64 perms, u64 *nasid_array) sn_change_memprotect(u64 paddr, u64 len, u64 perms, u64 *nasid_array)
{ {
struct ia64_sal_retval ret_stuff; struct ia64_sal_retval ret_stuff;
SAL_CALL(ret_stuff, SN_SAL_MEMPROTECT, paddr, len, nasid_array, int cnodeid;
unsigned long irq_flags;
cnodeid = nasid_to_cnodeid(get_node_number(paddr));
spin_lock(&NODEPDA(cnodeid)->bist_lock);
local_irq_save(irq_flags);
SAL_CALL_NOLOCK(ret_stuff, SN_SAL_MEMPROTECT, paddr, len, nasid_array,
perms, 0, 0, 0); perms, 0, 0, 0);
local_irq_restore(irq_flags);
spin_unlock(&NODEPDA(cnodeid)->bist_lock);
return ret_stuff.status; return ret_stuff.status;
} }
#define SN_MEMPROT_ACCESS_CLASS_0 0x14a080 #define SN_MEMPROT_ACCESS_CLASS_0 0x14a080
......
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