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

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

diff --git a/src/northbridge/via/cx700/northbridge.c b/src/northbridge/via/cx700/northbridge.c
index 11c98da2ca6476709a12782dc664fb57420086fb..df9dde6e6d08fc5449fbf036cba7dcc3d390c18f 100644 (file)
--- a/src/northbridge/via/cx700/northbridge.c
+++ b/src/northbridge/via/cx700/northbridge.c
@@ -32,62 +32,7 @@
 #include "chip.h"
 #include "northbridge.h"
 
-static void pci_domain_read_resources(device_t dev)
-{
-       struct resource *resource;
-
-       /* 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;
-}
-
-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)
-{
-       struct resource *min = NULL;
-       u32 tolm;
-
-       search_bus_resources(bus, IORESOURCE_MEM, IORESOURCE_MEM, tolm_test, &min);
-       tolm = 0xffffffffUL;
-       if (min && tolm > min->base) {
-               tolm = min->base;
-       }
-
-       return tolm;
-}
-
-#if HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 /* maximum size of high tables in KB */
 #define HIGH_TABLES_SIZE 64
 extern uint64_t high_tables_base, high_tables_size;
@@ -102,7 +47,7 @@ static void pci_domain_set_resources(device_t dev)
        unsigned char rambits;
        int idx;
 
-       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, 0x3324, 0);
 
        rambits = pci_read_config8(mc_dev, 0x88);
@@ -123,12 +68,6 @@ static void pci_domain_set_resources(device_t dev)
        else
                tomk = (((rambits << 6) - (4 << reg) - 1) * 1024);
 
-#if HAVE_HIGH_TABLES == 1
-       high_tables_base = (tomk - HIGH_TABLES_SIZE) * 1024;
-       high_tables_size = HIGH_TABLES_SIZE* 1024;
-       printk_debug("tom: %lx, high_tables_base: %llx, high_tables_size: %llx\n", tomk*1024, high_tables_base, high_tables_size);
-#endif
-
        /* Compute the top of Low memory */
        tolmk = pci_tolm >> 10;
        if (tolmk >= tomk) {
@@ -137,32 +76,32 @@ static void pci_domain_set_resources(device_t dev)
                tolmk -= 1024;  // TOP 1M SM Memory
        }
 
+#if CONFIG_WRITE_HIGH_TABLES == 1
+       high_tables_base = (tolmk - HIGH_TABLES_SIZE) * 1024;
+       high_tables_size = HIGH_TABLES_SIZE* 1024;
+       printk(BIOS_DEBUG, "tom: %lx, high_tables_base: %llx, high_tables_size: %llx\n", tomk*1024, high_tables_base, high_tables_size);
+#endif
+
        /* Report the memory regions */
        idx = 10;
 
        /* TODO: Hole needed? Should this go elsewhere? */
        ram_resource(dev, idx++, 0, 640);       /* first 640k */
        ram_resource(dev, idx++, 768, (tolmk - 768));   /* leave a hole for vga */
-       assign_resources(&dev->link[0]);
-}
-
-static unsigned int pci_domain_scan_bus(device_t dev, unsigned int max)
-{
-       max = pci_scan_bus(&dev->link[0], PCI_DEVFN(0, 0), 0xff, max);
-       return max;
+       assign_resources(dev->link_list);
 }
 
 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)