remove trailing whitespace

[coreboot.git] / src / mainboard / siemens / sitemp_g1p1 / mptable.c

diff --git a/src/mainboard/siemens/sitemp_g1p1/mptable.c b/src/mainboard/siemens/sitemp_g1p1/mptable.c
index df2f77b97d4c7524d3550bb1a1c6dfef27b6959f..ba2c1e4c1c3d4ae39ac031a50676b22b7aced494 100644 (file)
--- a/src/mainboard/siemens/sitemp_g1p1/mptable.c
+++ b/src/mainboard/siemens/sitemp_g1p1/mptable.c
@@ -26,13 +26,11 @@
 
 #include <cpu/amd/amdk8_sysconf.h>
 
-extern u8 bus_isa;
 extern u8 bus_rs690[8];
 extern u8 bus_sb600[2];
 
 extern u32 apicid_sb600;
 
-extern u32 bus_type[256];
 extern u32 sbdn_rs690;
 extern u32 sbdn_sb600;
 
@@ -40,18 +38,15 @@ static void *smp_write_config_table(void *v)
 {
        struct mp_config_table *mc;
        int isa_bus;
-       
+
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
        mptable_init(mc, LAPIC_ADDR);
        smp_write_processors(mc);
 
        get_bus_conf();
-       printk(BIOS_DEBUG, "%s: bus_isa=%d, apic_id=0x%x\n", __func__, bus_isa, apicid_sb600);
+       printk(BIOS_DEBUG, "%s: apic_id=0x%x\n", __func__, apicid_sb600);
 
        mptable_write_buses(mc, NULL, &isa_bus);
-       if (isa_bus != bus_isa) {
-               printk(BIOS_ERR, "ISA bus numbering schemes differ! Please fix mptable.c\n");
-       }
        /* I/O APICs:   APIC ID Version State   Address */
        {
                device_t dev;
@@ -63,33 +58,73 @@ static void *smp_write_config_table(void *v)
                        smp_write_ioapic(mc, apicid_sb600, 0x20, res->base);
                }
        }
-       mptable_add_isa_interrupts(mc, bus_isa, apicid_sb600, 0);
-       /* I/O Ints:    Type    Polarity    Trigger     Bus ID   IRQ    APIC ID PIN# */
-       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);
+       mptable_add_isa_interrupts(mc, isa_bus, apicid_sb600, 0);
 
-       /* 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);
-}
+#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))
 
-static void fixup_virtual_wire(void *v)
-{
-        struct intel_mp_floating *mf = v;
+       /* usb */
+       PCI_INT(0x0, 0x13, 0x0, 0x10);
+       PCI_INT(0x0, 0x13, 0x1, 0x11);
+       PCI_INT(0x0, 0x13, 0x2, 0x12);
+       PCI_INT(0x0, 0x13, 0x3, 0x13);
+
+       /* sata */
+       PCI_INT(0x0, 0x12, 0x1, 0x16);
+
+       /* SMBus/ACPI */
+       PCI_INT(0x0, 0x14, 0x0, 0x10);
+       /* IDE */
+       PCI_INT(0x0, 0x14, 0x1, 0x11);
+       /* HDA */
+       PCI_INT(0x0, 0x14, 0x2, 0x12);
+       /* LPC */
+       PCI_INT(0x0, 0x14, 0x3, 0x13);
+
+       /* GFX ? */
+       PCI_INT(bus_rs690[1], 0x5, 0x0, 0x12);
+       PCI_INT(bus_rs690[1], 0x5, 0x1, 0x13);
 
-        mf->mpf_checksum = 0;
-        mf->mpf_feature2 = MP_FEATURE_VIRTUALWIRE;
-        mf->mpf_checksum = smp_compute_checksum(mf, mf->mpf_length*16);
+       /* PCIe slots */
+       PCI_INT(0x2, 0x00, 0x00, 0x10);
+       PCI_INT(0x2, 0x00, 0x01, 0x11);
+       PCI_INT(0x2, 0x00, 0x02, 0x12);
+       PCI_INT(0x2, 0x00, 0x03, 0x13);
+
+       /* PCIe slots */
+       PCI_INT(0x3, 0x00, 0x00, 0x11);
+       PCI_INT(0x3, 0x00, 0x01, 0x12);
+       PCI_INT(0x3, 0x00, 0x02, 0x13);
+       PCI_INT(0x3, 0x00, 0x03, 0x10);
+
+       /* PCIe slots */
+       PCI_INT(0x4, 0x00, 0x00, 0x12);
+       PCI_INT(0x4, 0x00, 0x01, 0x13);
+       PCI_INT(0x4, 0x00, 0x02, 0x10);
+       PCI_INT(0x4, 0x00, 0x03, 0x11);
+
+       /* PCIe slots */
+       PCI_INT(0x5, 0x00, 0x00, 0x13);
+       PCI_INT(0x5, 0x00, 0x01, 0x10);
+       PCI_INT(0x5, 0x00, 0x02, 0x11);
+       PCI_INT(0x5, 0x00, 0x03, 0x12);
+
+       /* onboard NIC ? */
+       PCI_INT(bus_sb600[1], 0x7, 0x0, 0x13);
+       PCI_INT(bus_sb600[1], 0x7, 0x1, 0x10);
+       PCI_INT(bus_sb600[1], 0x7, 0x2, 0x11);
+       PCI_INT(bus_sb600[1], 0x7, 0x3, 0x12);
+
+       /* I/O Ints:    Type    Polarity    Trigger     Bus ID   IRQ    APIC ID PIN# */
+       mptable_lintsrc(mc, isa_bus);
+
+       /* Compute the checksums */
+       return mptable_finalize(mc);
 }
 
 unsigned long write_smp_table(unsigned long addr)
 {
        void *v;
-       v = smp_write_floating_table(addr);
-       fixup_virtual_wire(v);
+       v = smp_write_floating_table(addr, 0);
        return (unsigned long)smp_write_config_table(v);
 }