Factor out a few commonly duplicated functions from northbridge.c.

[coreboot.git] / src / northbridge / via / vx800 / northbridge.c

diff --git a/src/northbridge/via/vx800/northbridge.c b/src/northbridge/via/vx800/northbridge.c
index 3d855ec4b5e00d41b29563e96b10d010b85d24f4..f3cfa418aa56642e305df56073b3cff06294cdf1 100644 (file)
--- a/src/northbridge/via/vx800/northbridge.c
+++ b/src/northbridge/via/vx800/northbridge.c
@@ -35,10 +35,15 @@
 #include "northbridge.h"
 #include "vx800.h"
 
+/* !!FIXME!!  This was meant to be a CONFIG option */
+#define VIACONFIG_TOP_SM_SIZE_MB 32    // Set frame buffer 32M for default
+/* !!FIXME!!  I declared this to fix the build. */
+u8 acpi_sleep_type = 0;
+
 static void memctrl_init(device_t dev)
 {
 /*
-  set VGA in UMARamSetting.c, not in this function.
+  set VGA in uma_ram_setting.c, not in this function.
 */
 #if 0
        pci_write_config8(dev, 0x85, 0x20);
@@ -69,72 +74,9 @@ static const struct pci_driver memctrl_driver __pci_driver = {
        .device = PCI_DEVICE_ID_VIA_VX855_MEMCTRL,
 };
 
-static void pci_domain_read_resources(device_t dev)
-{
-       struct resource *resource;
-
-       printk_spew("Entering vx800 pci_domain_read_resources.\n");
-
-       /* Initialize the system wide io space constraints */
-       resource = new_resource(dev, IOINDEX_SUBTRACTIVE(0, 0));
-       resource->limit = 0xffffUL;
-       resource->flags = IORESOURCE_IO | IORESOURCE_SUBTRACTIVE |
-           IORESOURCE_ASSIGNED;
-
-       /* Initialize the system wide memory resources constraints */
-       resource = new_resource(dev, IOINDEX_SUBTRACTIVE(1, 0));
-       resource->limit = 0xffffffffULL;
-       resource->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE |
-           IORESOURCE_ASSIGNED;
-
-       printk_spew("Leaving vx800 pci_domain_read_resources.\n");
-}
-
-static void ram_resource(device_t dev, unsigned long index,
-                        unsigned long basek, unsigned long sizek)
-{
-       struct resource *resource;
-
-       if (!sizek) {
-               return;
-       }
-       resource = new_resource(dev, index);
-       resource->base = ((resource_t) basek) << 10;
-       resource->size = ((resource_t) sizek) << 10;
-       resource->flags = IORESOURCE_MEM | IORESOURCE_CACHEABLE |
-           IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED;
-}
-
-static void tolm_test(void *gp, struct device *dev, struct resource *new)
-{
-       struct resource **best_p = gp;
-       struct resource *best;
-       best = *best_p;
-       if (!best || (best->base > new->base)) {
-               best = new;
-       }
-       *best_p = best;
-}
-
-static u32 find_pci_tolm(struct bus *bus)
-{
-       print_debug("Entering find_pci_tolm\n");
-       struct resource *min;
-       u32 tolm;
-       min = 0;
-       search_bus_resources(bus, IORESOURCE_MEM, IORESOURCE_MEM,
-                            tolm_test, &min);
-       tolm = 0xffffffffUL;
-       if (min && tolm > min->base) {
-               tolm = min->base;
-       }
-       print_debug("Leaving find_pci_tolm\n");
-       return tolm;
-}
-
 static void pci_domain_set_resources(device_t dev)
 {
-       /* 
+       /*
         * the order is important to find the correct ram size.
         */
        u8 ramregs[] = { 0x43, 0x42, 0x41, 0x40 };
@@ -142,9 +84,9 @@ static void pci_domain_set_resources(device_t dev)
        u32 pci_tolm;
        u8 reg;
 
-       printk_spew("Entering vx800 pci_domain_set_resources.\n");
+       printk(BIOS_SPEW, "Entering vx800 pci_domain_set_resources.\n");
 
-       pci_tolm = find_pci_tolm(&dev->link[0]);
+       pci_tolm = find_pci_tolm(dev->link_list);
        mc_dev = dev_find_device(PCI_VENDOR_ID_VIA,
                                 PCI_DEVICE_ID_VIA_VX855_MEMCTRL, 0);
 
@@ -158,7 +100,6 @@ static void pci_domain_set_resources(device_t dev)
                 * this register's value multiply 64 * 1024 * 1024
                 */
                for (rambits = 0, i = 0; i < ARRAY_SIZE(ramregs); i++) {
-                       unsigned char reg;
                        rambits = pci_read_config8(mc_dev, ramregs[i]);
                        if (rambits != 0)
                                break;
@@ -178,7 +119,7 @@ if register with invalid value we set frame buffer size to 32M for default, but
                            (((rambits << 6) - (4 << reg) -
                              VIACONFIG_TOP_SM_SIZE_MB) * 1024);
 
-               printk_spew("tomk is 0x%x\n", tomk);
+               printk(BIOS_SPEW, "tomk is 0x%lx\n", tomk);
                /* Compute the Top Of Low Memory, in Kb */
                tolmk = pci_tolm >> 10;
                if (tolmk >= tomk) {
@@ -192,35 +133,27 @@ if register with invalid value we set frame buffer size to 32M for default, but
                /* Leave a hole for vga, 0xa0000 - 0xc0000 */
                ram_resource(dev, idx++, 768, (tolmk - 768));
        }
-       assign_resources(&dev->link[0]);
-}
-
-static unsigned int pci_domain_scan_bus(device_t dev, unsigned int max)
-{
-       printk_debug("Entering vx800 pci_domain_scan_bus.\n");
-
-       max = pci_scan_bus(&dev->link[0], PCI_DEVFN(0, 0), 0xff, max);
-       return max;
+       assign_resources(dev->link_list);
 }
 
-static const struct device_operations pci_domain_ops = {
+static struct device_operations pci_domain_ops = {
        .read_resources = pci_domain_read_resources,
        .set_resources = pci_domain_set_resources,
-       .enable_resources = enable_childrens_resources,
-       .init = 0,
+       .enable_resources = NULL,
+       .init = NULL,
        .scan_bus = pci_domain_scan_bus,
 };
 
 static void cpu_bus_init(device_t dev)
 {
-       initialize_cpus(&dev->link[0]);
+       initialize_cpus(dev->link_list);
 }
 
 static void cpu_bus_noop(device_t dev)
 {
 }
 
-static const struct device_operations cpu_bus_ops = {
+static struct device_operations cpu_bus_ops = {
        .read_resources = cpu_bus_noop,
        .set_resources = cpu_bus_noop,
        .enable_resources = cpu_bus_noop,
@@ -230,7 +163,7 @@ static const struct device_operations cpu_bus_ops = {
 
 static void enable_dev(struct device *dev)
 {
-       printk_spew("In VX800 enable_dev for device %s.\n", dev_path(dev));
+       printk(BIOS_SPEW, "In VX800 enable_dev for device %s.\n", dev_path(dev));
 
        /* Set the operations if it is a special bus type */
        if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {