Since some people disapprove of white space cleanups mixed in regular commits

[coreboot.git] / src / mainboard / supermicro / x6dhe_g / mptable.c

diff --git a/src/mainboard/supermicro/x6dhe_g/mptable.c b/src/mainboard/supermicro/x6dhe_g/mptable.c
index 6a284981b01f43797d22e620f2e56eb034119893..81ccf854586a112dba87559321611f4802df785f 100644 (file)
--- a/src/mainboard/supermicro/x6dhe_g/mptable.c
+++ b/src/mainboard/supermicro/x6dhe_g/mptable.c
@@ -4,10 +4,10 @@
 #include <string.h>
 #include <stdint.h>
 
-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] = "LNXI    ";
+       static const char oem[8] = "COREBOOT";
        static const char productid[12] = "X6DHE       ";
        struct mp_config_table *mc;
        unsigned char bus_num;
@@ -35,7 +35,7 @@ void *smp_write_config_table(void *v)
        mc->reserved = 0;
 
        smp_write_processors(mc);
-       
+
        {
                device_t dev;
 
@@ -43,11 +43,9 @@ void *smp_write_config_table(void *v)
                dev = dev_find_slot(0, PCI_DEVFN(0x1c,0));
                if (dev) {
                        bus_esb6300_1 = pci_read_config8(dev, PCI_SECONDARY_BUS);
-               }
-               else {
-                       printk_debug("ERROR - could not find PCI 0:1c.0, using defaults\n");
-
-                       bus_esb6300_2 = 6;
+               } else {
+                       printk(BIOS_DEBUG, "ERROR - could not find PCI 0:1c.0, using defaults\n");
+                       bus_esb6300_1 = 6;
                }
                /* esb6300_1 */
                dev = dev_find_slot(0, PCI_DEVFN(0x1e,0));
@@ -55,37 +53,29 @@ void *smp_write_config_table(void *v)
                        bus_esb6300_2 = pci_read_config8(dev, PCI_SECONDARY_BUS);
                        bus_isa    = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
                        bus_isa++;
-               }
-               else {
-                       printk_debug("ERROR - could not find PCI 0:1e.0, using defaults\n");
-
-                       bus_esb6300_1 = 7;
+               } else {
+                       printk(BIOS_DEBUG, "ERROR - could not find PCI 0:1e.0, using defaults\n");
+                       bus_esb6300_2 = 7;
                        bus_isa = 8;
                }
                /* pxhd-1 */
                dev = dev_find_slot(1, PCI_DEVFN(0x0,0));
                if (dev) {
                        bus_pxhd_1 = pci_read_config8(dev, PCI_SECONDARY_BUS);
-
-               }
-               else {
-                       printk_debug("ERROR - could not find PCI 1:00.1, using defaults\n");
-
+               } else {
+                       printk(BIOS_DEBUG, "ERROR - could not find PCI 1:00.1, using defaults\n");
                        bus_pxhd_1 = 2;
                }
                /* pxhd-2 */
                dev = dev_find_slot(1, PCI_DEVFN(0x00,2));
                if (dev) {
                        bus_pxhd_2 = pci_read_config8(dev, PCI_SECONDARY_BUS);
-
-               }
-               else {
-                       printk_debug("ERROR - could not find PCI 1:02.0, using defaults\n");
-
+               } else {
+                       printk(BIOS_DEBUG, "ERROR - could not find PCI 1:02.0, using defaults\n");
                        bus_pxhd_2 = 3;
                }
        }
-       
+
        /* define bus and isa numbers */
        for(bus_num = 0; bus_num < bus_isa; bus_num++) {
                smp_write_bus(mc, bus_num, "PCI   ");
@@ -106,10 +96,9 @@ void *smp_write_config_table(void *v)
                        if (res) {
                                smp_write_ioapic(mc, 0x04, 0x20, res->base);
                        }
-               }
-               else {
-                       printk_debug("ERROR - could not find IOAPIC PCI 1:00.1\n");
-                       printk_debug("DEBUG: Dev= %p\n", dev);
+               } else {
+                       printk(BIOS_DEBUG, "ERROR - could not find IOAPIC PCI 1:00.1\n");
+                       printk(BIOS_DEBUG, "CONFIG_DEBUG: Dev= %p\n", dev);
                }
                /* PXHd apic 5 */
                dev = dev_find_slot(1, PCI_DEVFN(0x00,3));
@@ -118,14 +107,12 @@ void *smp_write_config_table(void *v)
                        if (res) {
                                smp_write_ioapic(mc, 0x05, 0x20, res->base);
                        }
-               }
-               else {
-                       printk_debug("ERROR - could not find IOAPIC PCI 1:00.3\n");
-                       printk_debug("DEBUG: Dev= %p\n", dev);
+               } else {
+                       printk(BIOS_DEBUG, "ERROR - could not find IOAPIC PCI 1:00.3\n");
+                       printk(BIOS_DEBUG, "CONFIG_DEBUG: Dev= %p\n", dev);
                }
        }
 
-       
        /* ISA backward compatibility interrupts  */
        smp_write_intsrc(mc, mp_ExtINT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,
                bus_isa, 0x00, 0x02, 0x00);
@@ -175,20 +162,20 @@ void *smp_write_config_table(void *v)
                bus_esb6300_2, 0x04, 0x02, 0x10);
        smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, // -- added
                bus_esb6300_2, 0x08, 0x02, 0x14);
-       
+
        /* Standard local interrupt assignments */
        smp_write_lintsrc(mc, mp_ExtINT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,
                bus_isa, 0x00, MP_APIC_ALL, 0x00);
        smp_write_lintsrc(mc, mp_NMI, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,
                bus_isa, 0x00, MP_APIC_ALL, 0x01);
 
-#warning "FIXME verify I have the irqs handled for all of the risers"
+       /* FIXME verify I have the irqs handled for all of the risers */
 
        /* 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",
+       printk(BIOS_DEBUG, "Wrote the mp table end at: %p - %p\n",
                mc, smp_next_mpe_entry(mc));
        return smp_next_mpe_entry(mc);
 }