Unify Local APIC address definitions

[coreboot.git] / src / mainboard / amd / dbm690t / mptable.c

diff --git a/src/mainboard/amd/dbm690t/mptable.c b/src/mainboard/amd/dbm690t/mptable.c
index cec39e2c799f2e394dcf1d1dc7f58c8adf69811a..cf98ae30d9809631c0894ed5f0b844198d48d6f5 100644 (file)
--- a/src/mainboard/amd/dbm690t/mptable.c
+++ b/src/mainboard/amd/dbm690t/mptable.c
@@ -17,62 +17,36 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-
 #include <console/console.h>
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <arch/io.h>
 #include <string.h>
 #include <stdint.h>
-
 #include <cpu/amd/amdk8_sysconf.h>
 
-extern u8 bus_isa;
 extern u8 bus_rs690[8];
 extern u8 bus_sb600[2];
 
-extern unsigned long apicid_sb600;
-
-extern unsigned long bus_type[256];
-extern unsigned long sbdn_rs690;
-extern unsigned long sbdn_sb600;
+extern u32 apicid_sb600;
 
-extern void get_bus_conf(void);
+extern u32 sbdn_rs690;
+extern u32 sbdn_sb600;
 
-void *smp_write_config_table(void *v)
+static void *smp_write_config_table(void *v)
 {
-       static const char sig[4] = "PCMP";
-       static const char oem[8] = "ATI     ";
-       static const char productid[12] = "DBM690T     ";
        struct mp_config_table *mc;
+       int bus_isa;
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
-       memset(mc, 0, sizeof(*mc));
-
-       memcpy(mc->mpc_signature, sig, sizeof(sig));
-       mc->mpc_length = sizeof(*mc);   /* initially just the header */
-       mc->mpc_spec = 0x04;
-       mc->mpc_checksum = 0;   /* not yet computed */
-       memcpy(mc->mpc_oem, oem, sizeof(oem));
-       memcpy(mc->mpc_productid, productid, sizeof(productid));
-       mc->mpc_oemptr = 0;
-       mc->mpc_oemsize = 0;
-       mc->mpc_entry_count = 0;        /* No entries yet... */
-       mc->mpc_lapic = LAPIC_ADDR;
-       mc->mpe_length = 0;
-       mc->mpe_checksum = 0;
-       mc->reserved = 0;
+
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 
        get_bus_conf();
 
-       /* Bus:         Bus ID  Type */
-       /* define bus and isa numbers */
-       for (j = 0; j < bus_isa; j++) {
-               smp_write_bus(mc, j, (char *)"PCI   ");
-       }
-       smp_write_bus(mc, bus_isa, (char *)"ISA   ");
+       mptable_write_buses(mc, NULL, &bus_isa);
 
        /* I/O APICs:   APIC ID Version State   Address */
        {
@@ -101,7 +75,7 @@ void *smp_write_config_table(void *v)
                        /* dword |= 1<<22; PIC and APIC co exists */
                        pci_write_config32(dev, 0xac, dword);
 
-                       /* 
+                       /*
                         * 00:12.0: PROG SATA : INT F
                         * 00:13.0: INTA USB_0
                         * 00:13.1: INTB USB_1
@@ -119,31 +93,19 @@ void *smp_write_config_table(void *v)
 
        /* I/O Ints:    Type    Polarity    Trigger     Bus ID   IRQ    APIC ID PIN# */
 #define IO_LOCAL_INT(type, intr, apicid, pin) \
-       smp_write_intsrc(mc, (type), MP_IRQ_TRIGGER_EDGE | MP_IRQ_POLARITY_HIGH, bus_isa, (intr), (apicid), (pin));
-       
-       IO_LOCAL_INT(mp_ExtINT, 0x0, apicid_sb600, 0x0);
+       smp_write_lintsrc(mc, (type), MP_IRQ_TRIGGER_EDGE | MP_IRQ_POLARITY_HIGH, bus_isa, (intr), (apicid), (pin));
 
-       /* ISA ints are edge-triggered, and usually originate from the ISA bus,
-        * or its remainings.
-        */
-#define ISA_INT(intr, pin) \
-       smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,  bus_isa, (intr), apicid_sb600, (pin))
-
-       ISA_INT(0x1, 0x1);
-       ISA_INT(0x0, 0x2);
-       ISA_INT(0x3, 0x3);
-       ISA_INT(0x4, 0x4);
-       ISA_INT(0x6, 0x6);
-       ISA_INT(0x7, 0x7);
-       ISA_INT(0xc, 0xc);
-       ISA_INT(0xd, 0xd);
-       ISA_INT(0xe, 0xe);
+       mptable_add_isa_interrupts(mc, bus_isa, apicid_sb600, 0);
 
        /* PCI interrupts are level triggered, and are
         * associated with a specific bus/device/function tuple.
         */
+#if CONFIG_GENERATE_ACPI_TABLES == 0
 #define PCI_INT(bus, dev, fn, pin) \
         smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, (bus), (((dev)<<2)|(fn)), apicid_sb600, (pin))
+#else
+#define PCI_INT(bus, dev, fn, pin)
+#endif
 
        /* usb */
        PCI_INT(0x0, 0x13, 0x0, 0x10);
@@ -192,17 +154,12 @@ 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_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);
 }