leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[IA64] SGI Altix : fix bug in sn_io_late_init()

Browse Source 
When initializing pci_controller->node to point to the closest node we need
to take into consideration that a PIC PCI Bridge ASIC can be connected to a
headless/memless node just like the TIOCP and TIOCE Bridge ASICs

Signed-off-by: Mike Habeck <habeck@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Mike Habeck 2007-11-26 11:19:57 -06:00 committed by Tony Luck
parent 9e004ebd2d
commit afc2cf35b4
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/ia64/sn/kernel/io_common.c
View File

@ -545,19 +545,18 @@ sn_io_late_init(void)
nasid = NASID_GET(bussoft->bs_base); nasid = NASID_GET(bussoft->bs_base);
cnode = nasid_to_cnodeid(nasid); cnode = nasid_to_cnodeid(nasid);
if ((bussoft->bs_asic_type == PCIIO_ASIC_TYPE_TIOCP) || if ((bussoft->bs_asic_type == PCIIO_ASIC_TYPE_TIOCP) ||
(bussoft->bs_asic_type == PCIIO_ASIC_TYPE_TIOCE)) { (bussoft->bs_asic_type == PCIIO_ASIC_TYPE_TIOCE) ||
/* TIO PCI Bridge: find nearest node with CPUs */ (bussoft->bs_asic_type == PCIIO_ASIC_TYPE_PIC)) {
/* PCI Bridge: find nearest node with CPUs */
int e = sn_hwperf_get_nearest_node(cnode, NULL, int e = sn_hwperf_get_nearest_node(cnode, NULL,
&near_cnode); &near_cnode);
if (e < 0) { if (e < 0) {
near_cnode = (cnodeid_t)-1; /* use any node */ near_cnode = (cnodeid_t)-1; /* use any node */
printk(KERN_WARNING "pcibr_bus_fixup: failed " printk(KERN_WARNING "sn_io_late_init: failed "
"to find near node with CPUs to TIO " "to find near node with CPUs for "
"node %d, err=%d\n", cnode, e); "node %d, err=%d\n", cnode, e);
} }
PCI_CONTROLLER(bus)->node = near_cnode; PCI_CONTROLLER(bus)->node = near_cnode;
} else if (bussoft->bs_asic_type == PCIIO_ASIC_TYPE_PIC) {
PCI_CONTROLLER(bus)->node = cnode;
} }
} }