aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/sn/kernel/tiocx.c
diff options
context:
space:
mode:
authorJack Steiner <steiner@sgi.com>2005-09-12 13:15:43 -0400
committerTony Luck <tony.luck@intel.com>2005-09-15 19:31:12 -0400
commit24ee0a6d7b0a52b140c880aae24c255de3b4a9a1 (patch)
treeb57e06db620c9de7143baa58fc24a36ac24d5a79 /arch/ia64/sn/kernel/tiocx.c
parent1619cca2921f6927f4240e03f413d4165c7002fc (diff)
[IA64] Cleanup use of various #defines related to nodes
Some of the SN code & #defines related to compact nodes & IO discovery have gotten stale over the years. This patch attempts to clean them up. Some of the various SN MAX_xxx #defines were also unclear & misused. The primary changes are: - use MAX_NUMNODES. This is the generic linux #define for the number of nodes that are known to the generic kernel. Arrays & loops for constructs that are 1:1 with linux-defined nodes should use the linux #define - not an SN equivalent. - use MAX_COMPACT_NODES for MAX_NUMNODES + NUM_TIOS. This is the number of nodes in the SSI system. Compact nodes are a hack to get around the IA64 architectural limit of 256 nodes. Large SGI systems have more than 256 nodes. When we upgrade to ACPI3.0, I _hope_ that all nodes will be real nodes that are known to the generic kernel. That will allow us to delete the notion of "compact nodes". - add MAX_NUMALINK_NODES for the total number of nodes that are in the numalink domain - all partitions. - simplified (understandable) scan_for_ionodes() - small amount of cleanup related to cnodes Signed-off-by: Jack Steiner <steiner@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/sn/kernel/tiocx.c')
-rw-r--r--arch/ia64/sn/kernel/tiocx.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c
index b45db5133f5..7e9764a69dc 100644
--- a/arch/ia64/sn/kernel/tiocx.c
+++ b/arch/ia64/sn/kernel/tiocx.c
@@ -486,11 +486,10 @@ static int __init tiocx_init(void)
486 486
487 bus_register(&tiocx_bus_type); 487 bus_register(&tiocx_bus_type);
488 488
489 for (cnodeid = 0; cnodeid < MAX_COMPACT_NODES; cnodeid++) { 489 for (cnodeid = 0; cnodeid < num_cnodes; cnodeid++) {
490 nasid_t nasid; 490 nasid_t nasid;
491 491
492 if ((nasid = cnodeid_to_nasid(cnodeid)) < 0) 492 nasid = cnodeid_to_nasid(cnodeid);
493 break; /* No more nasids .. bail out of loop */
494 493
495 if ((nasid & 0x1) && is_fpga_brick(nasid)) { 494 if ((nasid & 0x1) && is_fpga_brick(nasid)) {
496 struct hubdev_info *hubdev; 495 struct hubdev_info *hubdev;