Convert more boards to use mptable_write_buses.

Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6106 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

8 files changed, 8 insertions, 65 deletions

diff --git a/src/mainboard/hp/dl145_g1/get_bus_conf.c b/src/mainboard/hp/dl145_g1/get_bus_conf.c
index 562ba935d8..e4721ce42e 100644
--- a/src/mainboard/hp/dl145_g1/get_bus_conf.c
+++ b/src/mainboard/hp/dl145_g1/get_bus_conf.c
@@ -13,7 +13,6 @@
 
 // Global variables for MB layouts and these will be shared by irqtable mptable and acpi_tables
 //busnum is default
-unsigned char bus_isa = 5 ;
 unsigned char bus_8131_0 = 1;
 unsigned char bus_8131_1 = 2;
 unsigned char bus_8131_2 = 3;
@@ -82,11 +81,6 @@ void get_bus_conf(void)
         dev = dev_find_slot(bus_8111_0, PCI_DEVFN(sysconf.sbdn,0));
         if (dev) {
                 bus_8111_1 = pci_read_config8(dev, PCI_SECONDARY_BUS);
-#if CONFIG_HT_CHAIN_END_UNITID_BASE >= CONFIG_HT_CHAIN_UNITID_BASE
-                bus_isa    = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
-                bus_isa++;
-//		printk(BIOS_DEBUG, "bus_isa=%d\n",bus_isa);
-#endif
         }
 	else {
                 printk(BIOS_DEBUG, "ERROR - could not find PCI %02x:03.0, using defaults\n", bus_8111_0);
@@ -105,11 +99,6 @@ void get_bus_conf(void)
         dev = dev_find_slot(bus_8131_0, PCI_DEVFN(sbdn3+1,0));
         if (dev) {
                 bus_8131_2 = pci_read_config8(dev, PCI_SECONDARY_BUS);
-#if CONFIG_HT_CHAIN_END_UNITID_BASE < CONFIG_HT_CHAIN_UNITID_BASE
-                bus_isa    = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
-                bus_isa++;
-//              printk(BIOS_DEBUG, "bus_isa=%d\n",bus_isa);
-#endif
         }
         else {
                 printk(BIOS_DEBUG, "ERROR - could not find PCI %02x:02.0, using defaults\n", bus_8131_0);
diff --git a/src/mainboard/hp/dl145_g1/mptable.c b/src/mainboard/hp/dl145_g1/mptable.c
index 6e10a8fa2c..ba4ecf9d85 100644
--- a/src/mainboard/hp/dl145_g1/mptable.c
+++ b/src/mainboard/hp/dl145_g1/mptable.c
@@ -6,7 +6,6 @@
 #include <stdint.h>
 #include <cpu/amd/amdk8_sysconf.h>
 
-extern  unsigned char bus_isa;
 extern  unsigned char bus_8131_0;
 extern  unsigned char bus_8131_1;
 extern  unsigned char bus_8131_2;
@@ -21,7 +20,7 @@ extern  unsigned sbdn3;
 static void *smp_write_config_table(void *v)
 {
         struct mp_config_table *mc;
-        unsigned char bus_num;
+	int bus_isa;
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
@@ -31,13 +30,7 @@ static void *smp_write_config_table(void *v)
 
 	get_bus_conf();
 
-/*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*/
 	smp_write_ioapic(mc, apicid_8111, 0x20, IO_APIC_ADDR);
diff --git a/src/mainboard/hp/dl145_g3/get_bus_conf.c b/src/mainboard/hp/dl145_g3/get_bus_conf.c
index 6bb587b6a7..36852f1301 100644
--- a/src/mainboard/hp/dl145_g3/get_bus_conf.c
+++ b/src/mainboard/hp/dl145_g3/get_bus_conf.c
@@ -108,11 +108,6 @@ void get_bus_conf(void)
 		printk(BIOS_DEBUG, "now found %s...\n",dev_path(dev));
 		if(dev) {
 			m->bus_bcm5785_1_1 = pci_read_config8(dev, PCI_SECONDARY_BUS);
-#if CONFIG_HT_CHAIN_END_UNITID_BASE >= CONFIG_HT_CHAIN_UNITID_BASE
-			m->bus_isa    = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
-			m->bus_isa++;
-			printk(BIOS_DEBUG, "bus_isa 1=%d\n",m->bus_isa);
-#endif
 		}
 	}
 	else {
@@ -124,12 +119,6 @@ void get_bus_conf(void)
 		dev = dev_find_slot(m->bus_bcm5780[0], PCI_DEVFN(m->sbdn2 + i - 1,0));
 		if(dev) {
 			m->bus_bcm5780[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
-#if CONFIG_HT_CHAIN_END_UNITID_BASE < CONFIG_HT_CHAIN_UNITID_BASE
-			m->bus_isa    = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
-			m->bus_isa++;
-			printk(BIOS_DEBUG, "bus_isa 2=%d\n",m->bus_isa);
-#endif
-
 		}
 		else {
 			printk(BIOS_DEBUG, "ERROR - could not find PCI %02x:%02x.0, using defaults\n", m->bus_bcm5780[0], m->sbdn2+i-1);
diff --git a/src/mainboard/hp/dl145_g3/mb_sysconf.h b/src/mainboard/hp/dl145_g3/mb_sysconf.h
index fa713897b6..a75b421bfc 100644
--- a/src/mainboard/hp/dl145_g3/mb_sysconf.h
+++ b/src/mainboard/hp/dl145_g3/mb_sysconf.h
@@ -29,7 +29,6 @@
 #define MB_SYSCONF_H
 
 struct mb_sysconf_t {
-	unsigned char bus_isa;
 	unsigned char bus_bcm5780[7];
 	unsigned char bus_bcm5785_0;
 	unsigned char bus_bcm5785_1;
diff --git a/src/mainboard/hp/dl145_g3/mptable.c b/src/mainboard/hp/dl145_g3/mptable.c
index c971d51e7e..96cdc87938 100644
--- a/src/mainboard/hp/dl145_g3/mptable.c
+++ b/src/mainboard/hp/dl145_g3/mptable.c
@@ -43,6 +43,7 @@ static void *smp_write_config_table(void *v)
 {
 	struct mp_config_table *mc;
 	struct mb_sysconf_t *m;
+	int bus_isa;
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
@@ -53,22 +54,7 @@ static void *smp_write_config_table(void *v)
 	get_bus_conf();
 	m = sysconf.mb;
 
-	/*Bus:         Bus ID  Type*/
-	/* define bus and isa numbers */
-#if 0
-	unsigned char bus_num;
-	for(bus_num = 0; bus_num < m->bus_isa; bus_num++) {
-		smp_write_bus(mc, bus_num, "PCI   ");
-		printk(BIOS_DEBUG, "writing bus %d as PCI...\n",bus_num);
-	}
-#endif
-	smp_write_bus(mc, 0, "PCI   ");
-	smp_write_bus(mc, 1, "PCI   ");
-	smp_write_bus(mc, 7, "PCI   ");
-	smp_write_bus(mc, 8, "PCI   ");
-
-	smp_write_bus(mc,m->bus_isa, "ISA   ");
-	printk(BIOS_DEBUG, "writing %d as ISA...\n",m->bus_isa);
+	mptable_write_buses(mc, NULL, &bus_isa);
 
 	/*I/O APICs:   APIC ID Version State           Address*/
 	{
@@ -130,7 +116,7 @@ static void *smp_write_config_table(void *v)
 		}
 	}
 
-	mptable_add_isa_interrupts(mc, m->bus_isa, m->apicid_bcm5785[0], 0);
+	mptable_add_isa_interrupts(mc, bus_isa, m->apicid_bcm5785[0], 0);
 
 	//SATA
 /* 	printk(BIOS_DEBUG, "MPTABLE_SATA: bus_id:%d irq:%d apic_id:%d pin:%d\n",m->bus_bcm5785_1, (0x0e<<2)|0, m->apicid_bcm5785[0], 0x7); */
@@ -177,9 +163,9 @@ static void *smp_write_config_table(void *v)
 	}
 
 /*Local Ints:  Type    Polarity    Trigger     Bus ID   IRQ    APIC ID PIN#*/
-	printk(BIOS_DEBUG, "m->bus_isa is: %x\n",m->bus_isa);
-	smp_write_lintsrc(mc, mp_ExtINT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH, m->bus_isa, 0x0, MP_APIC_ALL, 0x0);
-	smp_write_lintsrc(mc, mp_NMI, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH, m->bus_isa , 0x0, MP_APIC_ALL, 0x1);
+	printk(BIOS_DEBUG, "bus_isa is: %x\n", bus_isa);
+	smp_write_lintsrc(mc, mp_ExtINT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH, bus_isa, 0x0, MP_APIC_ALL, 0x0);
+	smp_write_lintsrc(mc, mp_NMI, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH, bus_isa , 0x0, MP_APIC_ALL, 0x1);
 
 	//extended table entries
 	smp_write_address_space(mc,0 , ADDRESS_TYPE_IO, 0x0, 0x0, 0x0, 0x0001);
diff --git a/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c b/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
index f275841e70..7f4112b542 100644
--- a/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
+++ b/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
@@ -110,11 +110,6 @@ void get_bus_conf(void)
 		printk(BIOS_DEBUG, "now found %s...\n",dev_path(dev));
 		if(dev) {
 			m->bus_bcm5785_1_1 = pci_read_config8(dev, PCI_SECONDARY_BUS);
-#if CONFIG_HT_CHAIN_END_UNITID_BASE >= CONFIG_HT_CHAIN_UNITID_BASE
-			m->bus_isa    = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
-			m->bus_isa++;
-			printk(BIOS_DEBUG, "bus_isa 1=%d\n",m->bus_isa);
-#endif
 		}
 	}
 	else {
@@ -126,11 +121,6 @@ void get_bus_conf(void)
 		dev = dev_find_slot(m->bus_bcm5780[0], PCI_DEVFN(m->sbdn2 + i - 1,0));
 		if(dev) {
 			m->bus_bcm5780[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
-#if CONFIG_HT_CHAIN_END_UNITID_BASE < CONFIG_HT_CHAIN_UNITID_BASE
-			m->bus_isa    = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
-			m->bus_isa++;
-			printk(BIOS_DEBUG, "bus_isa 2=%d\n",m->bus_isa);
-#endif
 
 		}
 		else {
diff --git a/src/mainboard/hp/dl165_g6_fam10/mb_sysconf.h b/src/mainboard/hp/dl165_g6_fam10/mb_sysconf.h
index de965c7004..a75b421bfc 100644
--- a/src/mainboard/hp/dl165_g6_fam10/mb_sysconf.h
+++ b/src/mainboard/hp/dl165_g6_fam10/mb_sysconf.h
@@ -29,7 +29,6 @@
 #define MB_SYSCONF_H
 
 struct mb_sysconf_t {
-	unsigned char bus_isa;
 	unsigned char bus_bcm5780[7];
 	unsigned char bus_bcm5785_0;
 	unsigned char bus_bcm5785_1;
@@ -37,7 +36,6 @@ struct mb_sysconf_t {
 	unsigned apicid_bcm5785[3];
 
 	unsigned sbdn2;
-	unsigned bus_type[256]; 
 };
 
 #endif
diff --git a/src/mainboard/hp/dl165_g6_fam10/mptable.c b/src/mainboard/hp/dl165_g6_fam10/mptable.c
index e379630410..2243c72294 100644
--- a/src/mainboard/hp/dl165_g6_fam10/mptable.c
+++ b/src/mainboard/hp/dl165_g6_fam10/mptable.c
@@ -56,7 +56,6 @@ static void *smp_write_config_table(void *v)
 	m = sysconf.mb;
 
 	mptable_write_buses(mc, NULL, &isa_bus);
-	printk(BIOS_DEBUG, "writing %d as ISA to mptable (%d for real)...\n", isa_bus, m->bus_isa);
 
 	/*I/O APICs:   APIC ID Version State           Address*/
 	{