printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / southbridge / nvidia / mcp55 / mcp55_lpc.c

diff --git a/src/southbridge/nvidia/mcp55/mcp55_lpc.c b/src/southbridge/nvidia/mcp55/mcp55_lpc.c
index a9e6c36991bf913c7723d7d1de69714916ece21b..869e8392e2cc630faa4726cdd5dfef5563111ffe 100644 (file)
--- a/src/southbridge/nvidia/mcp55/mcp55_lpc.c
+++ b/src/southbridge/nvidia/mcp55/mcp55_lpc.c
@@ -33,97 +33,13 @@
 #include <pc80/isa-dma.h>
 #include <bitops.h>
 #include <arch/io.h>
+#include <arch/ioapic.h>
 #include <cpu/x86/lapic.h>
 #include <stdlib.h>
 #include "mcp55.h"
 
 #define NMI_OFF        0
 
-struct ioapicreg {
-       unsigned int reg;
-       unsigned int value_low, value_high;
-};
-
-static struct ioapicreg ioapicregvalues[] = {
-#define ALL            (0xff << 24)
-#define NONE           (0)
-#define DISABLED       (1 << 16)
-#define ENABLED                (0 << 16)
-#define TRIGGER_EDGE   (0 << 15)
-#define TRIGGER_LEVEL  (1 << 15)
-#define POLARITY_HIGH  (0 << 13)
-#define POLARITY_LOW   (1 << 13)
-#define PHYSICAL_DEST  (0 << 11)
-#define LOGICAL_DEST   (1 << 11)
-#define ExtINT         (7 << 8)
-#define NMI            (4 << 8)
-#define SMI            (2 << 8)
-#define INT            (1 << 8)
-       /* IO-APIC virtual wire mode configuration */
-       /* mask, trigger, polarity, destination, delivery, vector */
-       {   0, ENABLED | TRIGGER_EDGE | POLARITY_HIGH | PHYSICAL_DEST | ExtINT, NONE},
-       {   1, DISABLED, NONE},
-       {   2, DISABLED, NONE},
-       {   3, DISABLED, NONE},
-       {   4, DISABLED, NONE},
-       {   5, DISABLED, NONE},
-       {   6, DISABLED, NONE},
-       {   7, DISABLED, NONE},
-       {   8, DISABLED, NONE},
-       {   9, DISABLED, NONE},
-       {  10, DISABLED, NONE},
-       {  11, DISABLED, NONE},
-       {  12, DISABLED, NONE},
-       {  13, DISABLED, NONE},
-       {  14, DISABLED, NONE},
-       {  15, DISABLED, NONE},
-       {  16, DISABLED, NONE},
-       {  17, DISABLED, NONE},
-       {  18, DISABLED, NONE},
-       {  19, DISABLED, NONE},
-       {  20, DISABLED, NONE},
-       {  21, DISABLED, NONE},
-       {  22, DISABLED, NONE},
-       {  23, DISABLED, NONE},
-       /* Be careful and don't write past the end... */
-};
-
-static void setup_ioapic(unsigned long ioapic_base, int master)
-{
-       int i;
-       unsigned long value_low, value_high;
-//     unsigned long ioapic_base = 0xfec00000;
-       volatile unsigned long *l;
-       struct ioapicreg *a = ioapicregvalues;
-
-       if (master) {
-               ioapicregvalues[0].value_high = lapicid()<<(56-32);
-               ioapicregvalues[0].value_low = ENABLED | TRIGGER_EDGE | POLARITY_HIGH | PHYSICAL_DEST | ExtINT;
-       }
-       else {
-               ioapicregvalues[0].value_high = NONE;
-               ioapicregvalues[0].value_low = DISABLED;
-       }
-
-       l = (unsigned long *) ioapic_base;
-
-       for (i = 0; i < ARRAY_SIZE(ioapicregvalues);
-            i++, a++) {
-               l[0] = (a->reg * 2) + 0x10;
-               l[4] = a->value_low;
-               value_low = l[4];
-               l[0] = (a->reg *2) + 0x11;
-               l[4] = a->value_high;
-               value_high = l[4];
-               if ((i==0) && (value_low == 0xffffffff)) {
-                       printk_warning("IO APIC not responding.\n");
-                       return;
-               }
-               printk_spew("for IRQ, reg 0x%08x value 0x%08x 0x%08x\n",
-                           a->reg, a->value_low, a->value_high);
-       }
-}
-
 // 0x7a or e3
 #define PREVIOUS_POWER_STATE   0x7A
 
@@ -139,15 +55,18 @@ static void setup_ioapic(unsigned long ioapic_base, int master)
 static void lpc_common_init(device_t dev, int master)
 {
        uint8_t byte;
-       uint32_t dword;
+       uint32_t ioapic_base;
 
        /* IO APIC initialization */
        byte = pci_read_config8(dev, 0x74);
        byte |= (1<<0); // enable APIC
        pci_write_config8(dev, 0x74, byte);
-       dword = pci_read_config32(dev, PCI_BASE_ADDRESS_1); // 0x14
+       ioapic_base = pci_read_config32(dev, PCI_BASE_ADDRESS_1); // 0x14
 
-       setup_ioapic(dword, master);
+       if (master)
+               setup_ioapic(ioapic_base, 0);
+       else 
+               clear_ioapic(ioapic_base);
 }
 
 static void lpc_slave_init(device_t dev)
@@ -161,7 +80,7 @@ static void enable_hpet(struct device *dev)
 
        pci_write_config32(dev,0x44, 0xfed00001);
        hpet_address=pci_read_config32(dev,0x44)& 0xfffffffe;
-       printk_debug("enabling HPET @0x%x\n", hpet_address);
+       printk(BIOS_DEBUG, "enabling HPET @0x%x\n", hpet_address);
 }
 
 static void lpc_init(device_t dev)
@@ -189,7 +108,7 @@ static void lpc_init(device_t dev)
                byte |= 0x40;
        }
        pci_write_config8(dev, PREVIOUS_POWER_STATE, byte);
-       printk_info("set power %s after power fail\n", on?"on":"off");
+       printk(BIOS_INFO, "set power %s after power fail\n", on?"on":"off");
 #endif
        /* Throttle the CPU speed down for testing */
        on = SLOW_CPU_OFF;
@@ -201,7 +120,7 @@ static void lpc_init(device_t dev)
                outl(((on<<1)+0x10)  ,(pm10_bar + 0x10));
                dword = inl(pm10_bar + 0x10);
                on = 8-on;
-               printk_debug("Throttling CPU %2d.%1.1d percent.\n",
+               printk(BIOS_DEBUG, "Throttling CPU %2d.%1.1d percent.\n",
                             (on*12)+(on>>1),(on&1)*5);
        }
 
@@ -305,7 +224,7 @@ static void mcp55_lpc_enable_childrens_resources(device_t dev)
                                        if(!(res->flags & IORESOURCE_IO)) continue;
                                        base = res->base;
                                        end = resource_end(res);
-                                       printk_debug("mcp55 lpc decode:%s, base=0x%08x, end=0x%08x\n",dev_path(child),base, end);
+                                       printk(BIOS_DEBUG, "mcp55 lpc decode:%s, base=0x%08x, end=0x%08x\n",dev_path(child),base, end);
                                        switch(base) {
                                        case 0x3f8: // COM1
                                                reg |= (1<<0);  break;