OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] move cnodeid_to_nasid_table out of pda 

Another step in the effort to eliminate the SN pda structure.
This patch moves the cnodeid_to_nasid_table field out of the pda,
making it a standalone per-cpu data item, and exports it so it can
be accessed by kernel modules.

Signed-off-by: Dean Nelson <dcn@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Dean Nelson 2005-03-21 19:41:00 -07:00 committed by Tony Luck
parent ce0a3956b3
commit 2e34f07ff0
4 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
arch/ia64/sn/kernel/setup.c
View File

@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive * License. See the file "COPYING" in the main directory of this archive
* for more details. * for more details.
* *
* Copyright (C) 1999,2001-2004 Silicon Graphics, Inc. All rights reserved. * Copyright (C) 1999,2001-2005 Silicon Graphics, Inc. All rights reserved.
*/ */
#include <linux/config.h> #include <linux/config.h>
@ -73,6 +73,9 @@ EXPORT_SYMBOL(sn_rtc_cycles_per_second);
DEFINE_PER_CPU(struct sn_hub_info_s, __sn_hub_info); DEFINE_PER_CPU(struct sn_hub_info_s, __sn_hub_info);
EXPORT_PER_CPU_SYMBOL(__sn_hub_info); EXPORT_PER_CPU_SYMBOL(__sn_hub_info);
DEFINE_PER_CPU(short, __sn_cnodeid_to_nasid[MAX_NUMNODES]);
EXPORT_PER_CPU_SYMBOL(__sn_cnodeid_to_nasid);
partid_t sn_partid = -1; partid_t sn_partid = -1;
EXPORT_SYMBOL(sn_partid); EXPORT_SYMBOL(sn_partid);
char sn_system_serial_number_string[128]; char sn_system_serial_number_string[128];
@ -373,10 +376,10 @@ static void __init sn_init_pdas(char **cmdline_p)
{ {
cnodeid_t cnode; cnodeid_t cnode;
memset(pda->cnodeid_to_nasid_table, -1, memset(sn_cnodeid_to_nasid, -1,
sizeof(pda->cnodeid_to_nasid_table)); sizeof(__ia64_per_cpu_var(__sn_cnodeid_to_nasid)));
for_each_online_node(cnode) for_each_online_node(cnode)
pda->cnodeid_to_nasid_table[cnode] = sn_cnodeid_to_nasid[cnode] =
pxm_to_nasid(nid_to_pxm_map[cnode]); pxm_to_nasid(nid_to_pxm_map[cnode]);
numionodes = num_online_nodes(); numionodes = num_online_nodes();
@ -486,15 +489,18 @@ void __init sn_cpu_init(void)
pda->idle_flag = 0; pda->idle_flag = 0;
if (cpuid != 0) { if (cpuid != 0) {
memcpy(pda->cnodeid_to_nasid_table, /* copy cpu 0's sn_cnodeid_to_nasid table to this cpu's */
pdacpu(0)->cnodeid_to_nasid_table, memcpy(sn_cnodeid_to_nasid,
sizeof(pda->cnodeid_to_nasid_table)); (&per_cpu(__sn_cnodeid_to_nasid, 0)),
sizeof(__ia64_per_cpu_var(__sn_cnodeid_to_nasid)));
} }
/* /*
* Check for WARs. * Check for WARs.
* Only needs to be done once, on BSP. * Only needs to be done once, on BSP.
* Has to be done after loop above, because it uses pda.cnodeid_to_nasid_table[i]. * Has to be done after loop above, because it uses this cpu's
* sn_cnodeid_to_nasid table which was just initialized if this
* isn't cpu 0.
* Has to be done before assignment below. * Has to be done before assignment below.
*/ */
if (!wars_have_been_checked) { if (!wars_have_been_checked) {
@ -580,8 +586,7 @@ static void __init scan_for_ionodes(void)
brd = find_lboard_any(brd, KLTYPE_SNIA); brd = find_lboard_any(brd, KLTYPE_SNIA);
while (brd) { while (brd) {
pda->cnodeid_to_nasid_table[numionodes] = sn_cnodeid_to_nasid[numionodes] = brd->brd_nasid;
brd->brd_nasid;
physical_node_map[brd->brd_nasid] = numionodes; physical_node_map[brd->brd_nasid] = numionodes;
root_lboard[numionodes] = brd; root_lboard[numionodes] = brd;
numionodes++; numionodes++;
@ -602,8 +607,7 @@ static void __init scan_for_ionodes(void)
root_lboard[nasid_to_cnodeid(nasid)], root_lboard[nasid_to_cnodeid(nasid)],
KLTYPE_TIO); KLTYPE_TIO);
while (brd) { while (brd) {
pda->cnodeid_to_nasid_table[numionodes] = sn_cnodeid_to_nasid[numionodes] = brd->brd_nasid;
brd->brd_nasid;
physical_node_map[brd->brd_nasid] = numionodes; physical_node_map[brd->brd_nasid] = numionodes;
root_lboard[numionodes] = brd; root_lboard[numionodes] = brd;
numionodes++; numionodes++;
@ -614,7 +618,6 @@ static void __init scan_for_ionodes(void)
brd = find_lboard_any(brd, KLTYPE_TIO); brd = find_lboard_any(brd, KLTYPE_TIO);
} }
} }
} }
int int

11
include/asm-ia64/sn/arch.h
View File

@ -5,7 +5,7 @@
* *
* SGI specific setup. * SGI specific setup.
* *
* Copyright (C) 1995-1997,1999,2001-2004 Silicon Graphics, Inc. All rights reserved. * Copyright (C) 1995-1997,1999,2001-2005 Silicon Graphics, Inc. All rights reserved.
* Copyright (C) 1999 Ralf Baechle (ralf@gnu.org) * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org)
*/ */
#ifndef _ASM_IA64_SN_ARCH_H #ifndef _ASM_IA64_SN_ARCH_H
@ -47,6 +47,15 @@ DECLARE_PER_CPU(struct sn_hub_info_s, __sn_hub_info);
#define MAX_COMPACT_NODES 2048 #define MAX_COMPACT_NODES 2048
#define CPUS_PER_NODE 4 #define CPUS_PER_NODE 4
/*
* Compact node ID to nasid mappings kept in the per-cpu data areas of each
* cpu.
*/
DECLARE_PER_CPU(short, __sn_cnodeid_to_nasid[MAX_NUMNODES]);
#define sn_cnodeid_to_nasid (&__get_cpu_var(__sn_cnodeid_to_nasid[0]))
extern void sn_flush_all_caches(long addr, long bytes); extern void sn_flush_all_caches(long addr, long bytes);
#endif /* _ASM_IA64_SN_ARCH_H */ #endif /* _ASM_IA64_SN_ARCH_H */

1
include/asm-ia64/sn/pda.h
View File

@ -49,7 +49,6 @@ typedef struct pda_s {
unsigned long sn_soft_irr[4]; unsigned long sn_soft_irr[4];
unsigned long sn_in_service_ivecs[4]; unsigned long sn_in_service_ivecs[4];
short cnodeid_to_nasid_table[MAX_NUMNODES];
int sn_lb_int_war_ticks; int sn_lb_int_war_ticks;
int sn_last_irq; int sn_last_irq;
int sn_first_irq; int sn_first_irq;

7
include/asm-ia64/sn/sn_cpuid.h
View File

@ -4,7 +4,7 @@
* License. See the file "COPYING" in the main directory of this archive * License. See the file "COPYING" in the main directory of this archive
* for more details. * for more details.
* *
* Copyright (C) 2000-2004 Silicon Graphics, Inc. All rights reserved. * Copyright (C) 2000-2005 Silicon Graphics, Inc. All rights reserved.
*/ */
@ -123,11 +123,8 @@ extern int nasid_slice_to_cpuid(int, int);
/* /*
* cnodeid_to_nasid - convert a cnodeid to a NASID * cnodeid_to_nasid - convert a cnodeid to a NASID
* Macro relies on pg_data for a node being on the node itself.
* Just extract the NASID from the pointer.
*
*/ */
#define cnodeid_to_nasid(cnodeid) pda->cnodeid_to_nasid_table[cnodeid] #define cnodeid_to_nasid(cnodeid) (sn_cnodeid_to_nasid[cnodeid])
/* /*
* nasid_to_cnodeid - convert a NASID to a cnodeid * nasid_to_cnodeid - convert a NASID to a cnodeid