printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / southbridge / intel / esb6300 / esb6300_lpc.c

diff --git a/src/southbridge/intel/esb6300/esb6300_lpc.c b/src/southbridge/intel/esb6300/esb6300_lpc.c
index a704b756c1b9703c1219b98033842046af71f757..c25771aa0a942e558a5f6e6dc708886111962ecf 100644 (file)
--- a/src/southbridge/intel/esb6300/esb6300_lpc.c
+++ b/src/southbridge/intel/esb6300/esb6300_lpc.c
@@ -9,6 +9,7 @@
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
 #include <arch/io.h>
+#include <arch/ioapic.h>
 #include "esb6300.h"
 
 #define ACPI_BAR 0x40
@@ -18,56 +19,10 @@
 #define MAINBOARD_POWER_OFF 0
 #define MAINBOARD_POWER_ON  1
 
-#ifndef MAINBOARD_POWER_ON_AFTER_FAIL
-#define MAINBOARD_POWER_ON_AFTER_FAIL MAINBOARD_POWER_ON
+#ifndef CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL
+#define CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL MAINBOARD_POWER_ON
 #endif
 
-#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)
-
-static void setup_ioapic(device_t dev)
-{
-       int i;
-       unsigned long value_low, value_high;
-       unsigned long ioapic_base = 0xfec00000;
-       volatile unsigned long *l;
-       unsigned interrupts;
-
-       l = (unsigned long *) ioapic_base;
-
-       l[0] = 0x01;
-       interrupts = (l[04] >> 16) & 0xff;
-       for (i = 0; i < interrupts; i++) {
-               l[0] = (i * 2) + 0x10;
-               l[4] = DISABLED;
-               value_low = l[4];
-               l[0] = (i * 2) + 0x11;
-               l[4] = NONE; /* Should this be an address? */
-               value_high = l[4];
-               if (value_low == 0xffffffff) {
-                       printk_warning("%d IO APIC not responding.\n",
-                               dev_path(dev));
-                       return;
-               }
-       }
-
-       /* Put the ioapic in virtual wire mode */
-       l[0] = 0 + 0x10;
-       l[4] = ENABLED | TRIGGER_EDGE | POLARITY_HIGH | PHYSICAL_DEST | ExtINT;
-}
-
 #define SERIRQ_CNTL 0x64
 static void esb6300_enable_serial_irqs(device_t dev)
 {
@@ -277,7 +232,7 @@ static void lpc_init(struct device *dev)
 {
        uint8_t byte;
        uint32_t value;
-       int pwr_on=MAINBOARD_POWER_ON_AFTER_FAIL;
+       int pwr_on=CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL;
 
        /* sata settings */
        pci_write_config32(dev, 0x58, 0x00001181);
@@ -287,7 +242,7 @@ static void lpc_init(struct device *dev)
        value |= (1 << 8)|(1<<7);
        value |= (6 << 0)|(1<<13)|(1<<11);
        pci_write_config32(dev, 0xd0, value);
-       setup_ioapic(dev);
+       setup_ioapic(0xfec00000, 0); // don't rename IO APIC ID
 
        /* disable reset timer */
        pci_write_config8(dev, 0xd4, 0x02);
@@ -333,7 +288,7 @@ static void lpc_init(struct device *dev)
                byte |= 1;
        }
        pci_write_config8(dev, 0xa4, byte);
-       printk_info("set power %s after power fail\n", pwr_on?"on":"off");
+       printk(BIOS_INFO, "set power %s after power fail\n", pwr_on?"on":"off");
 
        /* Set up the PIRQ */
        esb6300_pirq_init(dev);
@@ -361,12 +316,23 @@ static void esb6300_lpc_read_resources(device_t dev)
        /* Add the GPIO BAR */
        res = pci_get_resource(dev, GPIO_BAR);
 
-       /* Add an extra subtractive resource for both memory and I/O */
+       /* Add an extra subtractive resource for both memory and I/O. */
        res = new_resource(dev, IOINDEX_SUBTRACTIVE(0, 0));
-       res->flags = IORESOURCE_IO | IORESOURCE_SUBTRACTIVE | IORESOURCE_ASSIGNED;
+       res->base = 0;
+       res->size = 0x1000;
+       res->flags = IORESOURCE_IO | IORESOURCE_SUBTRACTIVE |
+                    IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
 
        res = new_resource(dev, IOINDEX_SUBTRACTIVE(1, 0));
-       res->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE | IORESOURCE_ASSIGNED;
+       res->base = 0xff800000;
+       res->size = 0x00800000; /* 8 MB for flash */
+       res->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE |
+                    IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
+
+       res = new_resource(dev, 3); /* IOAPIC */
+       res->base = 0xfec00000;
+       res->size = 0x00001000;
+       res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
 }
 
 static void esb6300_lpc_enable_resources(device_t dev)
@@ -406,5 +372,5 @@ static struct device_operations lpc_ops  = {
 static const struct pci_driver lpc_driver __pci_driver = {
        .ops    = &lpc_ops,
        .vendor = PCI_VENDOR_ID_INTEL,
-       .device = PCI_DEVICE_ID_INTEL_6300ESB_ISA,
+       .device = PCI_DEVICE_ID_INTEL_6300ESB_LPC,
 };