summaryrefslogtreecommitdiff
path: root/src/mainboard/tyan/s2875
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@coresystems.de>2010-09-24 18:42:56 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2010-09-24 18:42:56 +0000
commit20979584fe28e9e62a71aa92c5c5ad8074790de4 (patch)
tree473d4f461b50b0fa6ee26415ca8287bf224f0aec /src/mainboard/tyan/s2875
parent0a6d1aebf12b786b4c5cbb85ce14cb89f3498958 (diff)
Automatically fetch bus information for mptable from
the device tree, instead of using hardcoded values. If this changes behaviour, this is either - a bug in mptable_write_buses(), or - a bug in the old mptable or device config, that is they were inconsistent. Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5835 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/tyan/s2875')
-rw-r--r--src/mainboard/tyan/s2875/mptable.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/mainboard/tyan/s2875/mptable.c b/src/mainboard/tyan/s2875/mptable.c
index 6210706d3d..73dc051a65 100644
--- a/src/mainboard/tyan/s2875/mptable.c
+++ b/src/mainboard/tyan/s2875/mptable.c
@@ -48,8 +48,7 @@ static void *smp_write_config_table(void *v)
static const char productid[12] = "S2875 ";
struct mp_config_table *mc;
- unsigned char bus_num;
- unsigned char bus_isa;
+ int bus_isa;
unsigned char bus_chain_0;
unsigned char bus_8111_1;
unsigned char bus_8151_1;
@@ -89,15 +88,11 @@ static void *smp_write_config_table(void *v)
dev = dev_find_slot(bus_chain_0, PCI_DEVFN(0x04,0));
if (dev) {
bus_8111_1 = pci_read_config8(dev, PCI_SECONDARY_BUS);
- bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
- bus_isa++;
- printk(BIOS_DEBUG, "bus_isa=%d\n",bus_isa);
}
else {
printk(BIOS_DEBUG, "ERROR - could not find PCI 1:03.0, using defaults\n");
bus_8111_1 = 3;
- bus_isa = 4;
}
/* 8151 */
dev = dev_find_slot(bus_chain_0, PCI_DEVFN(0x02,0));
@@ -116,11 +111,7 @@ static void *smp_write_config_table(void *v)
}
/*Bus: Bus ID Type*/
- /* define bus and isa numbers */
- for(bus_num = 0; bus_num < bus_isa; bus_num++) {
- smp_write_bus(mc, bus_num, "PCI ");
- }
- smp_write_bus(mc, bus_isa, "ISA ");
+ mptable_write_buses(mc, NULL, &bus_isa);
/*I/O APICs: APIC ID Version State Address*/
#if CONFIG_LOGICAL_CPUS==1