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

6 files changed, 13 insertions, 65 deletions

diff --git a/src/mainboard/tyan/s2735/mptable.c b/src/mainboard/tyan/s2735/mptable.c
index 828226fd4d..7cfa5ef5ff 100644
--- a/src/mainboard/tyan/s2735/mptable.c
+++ b/src/mainboard/tyan/s2735/mptable.c
@@ -10,6 +10,7 @@ static void *smp_write_config_table(void *v)
         static const char oem[8] = "COREBOOT";
         static const char productid[12] = "S2735       ";
         struct mp_config_table *mc;
+        int isa_bus;
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
         memset(mc, 0, sizeof(*mc));
@@ -29,15 +30,7 @@ static void *smp_write_config_table(void *v)
         mc->reserved = 0;
 
         smp_write_processors(mc);
-
-
-/*Bus:		Bus ID	Type*/
-	smp_write_bus(mc, 0, "PCI   ");
-	smp_write_bus(mc, 1, "PCI   ");
-	smp_write_bus(mc, 2, "PCI   ");
-	smp_write_bus(mc, 3, "PCI   ");
-	smp_write_bus(mc, 4, "PCI   ");
-	smp_write_bus(mc, 5, "ISA   ");
+	mptable_write_buses(mc, NULL, &isa_bus);
 /*I/O APICs:	APIC ID	Version	State		Address*/
 	smp_write_ioapic(mc, 8, 0x20, 0xfec00000);
 	{
@@ -58,7 +51,7 @@ static void *smp_write_config_table(void *v)
                         }
 		}
 	}
-	mptable_add_isa_interrupts(mc, 0x5, 0x8, 0);
+	mptable_add_isa_interrupts(mc, isa_bus, 0x8, 0);
 
 /*I/O Ints:	Type	Polarity    Trigger	Bus ID	 IRQ	APIC ID	PIN#
 */
diff --git a/src/mainboard/tyan/s2850/mptable.c b/src/mainboard/tyan/s2850/mptable.c
index 02e1fce906..a2fdd32986 100644
--- a/src/mainboard/tyan/s2850/mptable.c
+++ b/src/mainboard/tyan/s2850/mptable.c
@@ -50,8 +50,7 @@ static void *smp_write_config_table(void *v)
         static const char productid[12] = "S2850       ";
         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 apicid_base;
@@ -88,23 +87,15 @@ static void *smp_write_config_table(void *v)
                 dev = dev_find_slot(bus_chain_0, PCI_DEVFN(0x01,0));
                 if (dev) {
                         bus_8111_1 = pci_read_config8(dev, PCI_SECONDARY_BUS);
-                        bus_isa    = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
-                        bus_isa++;
                 }
                 else {
                         printk(BIOS_DEBUG, "ERROR - could not find PCI 1:01.0, using defaults\n");
 
                         bus_8111_1 = 2;
-                        bus_isa = 3;
                 }
         }
 /*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
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
diff --git a/src/mainboard/tyan/s2880/mptable.c b/src/mainboard/tyan/s2880/mptable.c
index 2341e64302..0a979679d8 100644
--- a/src/mainboard/tyan/s2880/mptable.c
+++ b/src/mainboard/tyan/s2880/mptable.c
@@ -50,8 +50,7 @@ static void *smp_write_config_table(void *v)
         static const char productid[12] = "S2880       ";
         struct mp_config_table *mc;
 
-        unsigned char bus_num;
-        unsigned char bus_isa;
+        int bus_isa;
 	unsigned char bus_chain_0;
         unsigned char bus_8131_1;
         unsigned char bus_8131_2;
@@ -94,14 +93,11 @@ static void *smp_write_config_table(void *v)
                 dev = dev_find_slot(bus_chain_0, PCI_DEVFN(0x03,0));
                 if (dev) {
                         bus_8111_1 = pci_read_config8(dev, PCI_SECONDARY_BUS);
-                        bus_isa    = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
-                        bus_isa++;
                 }
                 else {
                         printk(BIOS_DEBUG, "ERROR - could not find PCI 1:03.0, using defaults\n");
 
                         bus_8111_1 = 4;
-                        bus_isa = 5;
                 }
                 /* 8131-1 */
                 dev = dev_find_slot(bus_chain_0, PCI_DEVFN(0x01,0));
@@ -128,12 +124,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
diff --git a/src/mainboard/tyan/s4880/mptable.c b/src/mainboard/tyan/s4880/mptable.c
index 649bc396d2..a9746b34df 100644
--- a/src/mainboard/tyan/s4880/mptable.c
+++ b/src/mainboard/tyan/s4880/mptable.c
@@ -48,8 +48,7 @@ static void *smp_write_config_table(void *v)
         static const char productid[12] = "S4880       ";
         struct mp_config_table *mc;
 
-        unsigned char bus_num;
-        unsigned char bus_isa;
+        int bus_isa;
 	unsigned char bus_chain_0;
         unsigned char bus_8131_1;
         unsigned char bus_8131_2;
@@ -93,14 +92,11 @@ static void *smp_write_config_table(void *v)
                 dev = dev_find_slot(bus_chain_0, PCI_DEVFN(0x03,0));
                 if (dev) {
                         bus_8111_1 = pci_read_config8(dev, PCI_SECONDARY_BUS);
-                        bus_isa    = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
-                        bus_isa++;
                 }
                 else {
                         printk(BIOS_DEBUG, "ERROR - could not find PCI 1:03.0, using defaults\n");
 
                         bus_8111_1 = 4;
-                        bus_isa = 5;
                 }
                 /* 8131-1 */
                 dev = dev_find_slot(bus_chain_0, PCI_DEVFN(0x01,0));
@@ -127,12 +123,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
diff --git a/src/mainboard/tyan/s4882/mptable.c b/src/mainboard/tyan/s4882/mptable.c
index a7d11be22f..73dbcfc08f 100644
--- a/src/mainboard/tyan/s4882/mptable.c
+++ b/src/mainboard/tyan/s4882/mptable.c
@@ -49,8 +49,7 @@ static void *smp_write_config_table(void *v)
         static const char productid[12] = "S4882       ";
         struct mp_config_table *mc;
 
-        unsigned char bus_num;
-        unsigned char bus_isa;
+        int bus_isa;
 	unsigned char bus_chain_0;
         unsigned char bus_8131_1;
         unsigned char bus_8131_2;
@@ -94,14 +93,11 @@ static void *smp_write_config_table(void *v)
                 dev = dev_find_slot(bus_chain_0, PCI_DEVFN(0x03,0));
                 if (dev) {
                         bus_8111_1 = pci_read_config8(dev, PCI_SECONDARY_BUS);
-                        bus_isa    = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
-                        bus_isa++;
                 }
                 else {
                         printk(BIOS_DEBUG, "ERROR - could not find PCI 1:03.0, using defaults\n");
 
                         bus_8111_1 = 4;
-                        bus_isa = 5;
                 }
                 /* 8131-1 */
                 dev = dev_find_slot(bus_chain_0, PCI_DEVFN(0x01,0));
@@ -128,12 +124,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