mptable: Refactor mptable generation some more

[coreboot.git] / src / mainboard / intel / mtarvon / mptable.c

diff --git a/src/mainboard/intel/mtarvon/mptable.c b/src/mainboard/intel/mtarvon/mptable.c
index 9dccf13e0f175c29ef54e411de33cdb276b67cba..0c025f0eedd543ef42329ebc4e9552b02f43f8de 100644 (file)
--- a/src/mainboard/intel/mtarvon/mptable.c
+++ b/src/mainboard/intel/mtarvon/mptable.c
@@ -29,21 +29,17 @@
 static void *smp_write_config_table(void *v)
 {
        struct mp_config_table *mc;
-       u8 bus_isa = 7;
+       int bus_isa;
        u8 bus_pci = 6;
        u8 bus_pcie_a = 1;
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, "Mt. Arvon   ", LAPIC_ADDR);
+       mptable_init(mc, LAPIC_ADDR);
 
        smp_write_processors(mc);
 
-       /* Define bus numbers */
-       smp_write_bus(mc, 0, "PCI   ");
-       smp_write_bus(mc, bus_pci, "PCI   ");
-       smp_write_bus(mc, bus_pcie_a, "PCI   ");
-       smp_write_bus(mc, bus_isa, "ISA   ");
+       mptable_write_buses(mc, NULL, &bus_isa);
 
        /* IOAPIC handling */
        smp_write_ioapic(mc, 0x01, 0x20, IO_APIC_ADDR);
@@ -51,10 +47,7 @@ static void *smp_write_config_table(void *v)
        mptable_add_isa_interrupts(mc, bus_isa, 0x1, 0);
 
        /* Standard local interrupt assignments */
-       smp_write_lintsrc(mc, mp_ExtINT, MP_IRQ_TRIGGER_DEFAULT|MP_IRQ_POLARITY_DEFAULT,
-               bus_isa, 0x00, MP_APIC_ALL, 0x00);
-       smp_write_lintsrc(mc, mp_NMI, MP_IRQ_TRIGGER_DEFAULT|MP_IRQ_POLARITY_DEFAULT,
-               bus_isa, 0x00, MP_APIC_ALL, 0x01);
+       mptable_lintsrc(mc, bus_isa);
 
        /* Internal PCI devices */
        smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW,
@@ -107,18 +100,13 @@ static void *smp_write_config_table(void *v)
        /* There is no extension information... */
 
        /* Compute the checksums */
-       mc->mpe_checksum = smp_compute_checksum(smp_next_mpc_entry(mc), mc->mpe_length);
-
-       mc->mpc_checksum = smp_compute_checksum(mc, mc->mpc_length);
-       printk(BIOS_DEBUG, "Wrote the mp table end at: %p - %p\n",
-               mc, smp_next_mpe_entry(mc));
-       return smp_next_mpe_entry(mc);
+       return mptable_finalize(mc);
 }
 
 unsigned long write_smp_table(unsigned long addr)
 {
        void *v;
-       v = smp_write_floating_table(addr);
+       v = smp_write_floating_table(addr, 0);
        return (unsigned long)smp_write_config_table(v);
 }