From 20979584fe28e9e62a71aa92c5c5ad8074790de4 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Fri, 24 Sep 2010 18:42:56 +0000 Subject: 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 Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5835 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/via/epia-n/mptable.c | 9 +++------ src/mainboard/via/pc2500e/mptable.c | 17 +++-------------- src/mainboard/via/vt8454c/mptable.c | 11 +++-------- 3 files changed, 9 insertions(+), 28 deletions(-) (limited to 'src/mainboard/via') diff --git a/src/mainboard/via/epia-n/mptable.c b/src/mainboard/via/epia-n/mptable.c index c2e6ccc1d0..ddd96bed5c 100644 --- a/src/mainboard/via/epia-n/mptable.c +++ b/src/mainboard/via/epia-n/mptable.c @@ -12,6 +12,7 @@ static void *smp_write_config_table(void *v) static const char oem[8] = "COREBOOT"; static const char productid[12] = "P4DPE "; struct mp_config_table *mc; + int isa_bus; mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN); memset(mc, 0, sizeof(*mc)); @@ -31,12 +32,8 @@ static void *smp_write_config_table(void *v) mc->reserved = 0; smp_write_processors(mc); + mptable_write_buses(mc, NULL, &isa_bus); - -/*Bus: Bus ID Type*/ - smp_write_bus(mc, 0, "PCI "); - smp_write_bus(mc, 1, "PCI "); - smp_write_bus(mc, 2, "ISA "); /*I/O APICs: APIC ID Version State Address*/ smp_write_ioapic(mc, 2, 0x20, 0xfec00000); { @@ -71,7 +68,7 @@ static void *smp_write_config_table(void *v) } } } - mptable_add_isa_interrupts(mc, 0x2, 0x2, 0); + mptable_add_isa_interrupts(mc, isa_bus, 0x2, 0); /*I/O Ints: Type Polarity Trigger Bus ID IRQ APIC ID PIN# */ smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0x0, 0x40, 0x2, 0x15); diff --git a/src/mainboard/via/pc2500e/mptable.c b/src/mainboard/via/pc2500e/mptable.c index c64b8d5360..caaf7843c2 100644 --- a/src/mainboard/via/pc2500e/mptable.c +++ b/src/mainboard/via/pc2500e/mptable.c @@ -29,9 +29,6 @@ #include #include "../../../southbridge/via/vt8237r/vt8237r.h" - -#define bus_isa 2 - static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; @@ -39,7 +36,7 @@ static void *smp_write_config_table(void *v) static const char productid[12] = "PC2500 "; struct mp_config_table *mc; - int bus_num; + int isa_bus; mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN); memset(mc, 0, sizeof(*mc)); @@ -59,21 +56,13 @@ static void *smp_write_config_table(void *v) mc->reserved = 0; smp_write_processors(mc); - - -/* Bus: Bus ID Type*/ - /* define numbers for pci and isa bus */ - 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, &isa_bus); /* I/O APICs: APIC ID Version State Address*/ smp_write_ioapic(mc, VT8237R_APIC_ID, 0x20, VT8237R_APIC_BASE); /* Now, assemble the table. */ - mptable_add_isa_interrupts(mc, bus_isa, VT8237R_APIC_ID, 0); + mptable_add_isa_interrupts(mc, isa_bus, VT8237R_APIC_ID, 0); #define PCI_INT(bus, dev, fn, pin) \ smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, \ diff --git a/src/mainboard/via/vt8454c/mptable.c b/src/mainboard/via/vt8454c/mptable.c index 329b3a44f0..588694f6b3 100644 --- a/src/mainboard/via/vt8454c/mptable.c +++ b/src/mainboard/via/vt8454c/mptable.c @@ -33,6 +33,7 @@ static void *smp_write_config_table(void *v) static const char oem[8] = "COREBOOT"; static const char productid[12] = "VIA VT8454C "; struct mp_config_table *mc; + int isa_bus; mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN); memset(mc, 0, sizeof(*mc)); @@ -52,18 +53,12 @@ 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, 128, "PCI "); - smp_write_bus(mc, 129, "ISA "); + mptable_write_buses(mc, NULL, &isa_bus); /* I/O APICs: APIC ID Version State Address */ smp_write_ioapic(mc, 2, 17, 0xfec00000); - mptable_add_isa_interrupts(mc, 0x81, 0x2, 0); + mptable_add_isa_interrupts(mc, isa_bus, 0x2, 0); /* I/O Ints: Type Polarity Trigger Bus ID IRQ APIC ID PIN# */ smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_LOW, 0x0, 0x40, 0x2, 0x14); -- cgit v1.2.3