From 5244e1ba63e5f3ea12066734bfb0d864a8f1f11d Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sun, 21 Nov 2010 14:41:07 +0000 Subject: Convert more boards to use mptable_write_buses. Signed-off-by: Patrick Georgi Acked-by: Uwe Hermann git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6106 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/hp/dl145_g3/get_bus_conf.c | 11 ----------- src/mainboard/hp/dl145_g3/mb_sysconf.h | 1 - src/mainboard/hp/dl145_g3/mptable.c | 26 ++++++-------------------- 3 files changed, 6 insertions(+), 32 deletions(-) (limited to 'src/mainboard/hp/dl145_g3') 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); -- cgit v1.2.3