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

[coreboot.git] / src / northbridge / intel / i945 / northbridge.c

diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index 0812460cfef348de22b460d3f88f32b972e48b15..9963bed5ce3354880af78de22c09855f17e9d17d 100644 (file)
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -70,57 +70,26 @@ static int get_pcie_bar(u32 *base, u32 *len)
 /* IDG memory */
 uint64_t uma_memory_base=0, uma_memory_size=0;
 
-int add_northbridge_resources(struct lb_memory *mem)
+static void add_fixed_resources(struct device *dev, int index)
 {
+       struct resource *resource;
        u32 pcie_config_base, pcie_config_size;
 
        printk(BIOS_DEBUG, "Adding UMA memory area\n");
-       lb_add_memory_range(mem, LB_MEM_RESERVED,
-               uma_memory_base, uma_memory_size);
-
-       printk(BIOS_DEBUG, "Adding PCIe config bar\n");
-       get_pcie_bar(&pcie_config_base, &pcie_config_size);
-       lb_add_memory_range(mem, LB_MEM_RESERVED,
-               pcie_config_base, pcie_config_size);
-
-       return 0;
-}
-
-static void ram_resource(device_t dev, unsigned long index, unsigned long basek,
-                        unsigned long sizek)
-{
-       struct resource *resource;
-
        resource = new_resource(dev, index);
-       resource->base = ((resource_t) basek) << 10;
-       resource->size = ((resource_t) sizek) << 10;
-       resource->flags = IORESOURCE_MEM | IORESOURCE_CACHEABLE |
+       resource->base = (resource_t) uma_memory_base;
+       resource->size = (resource_t) uma_memory_size;
+       resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE |
            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 uint32_t find_pci_tolm(struct bus *bus)
-{
-       struct resource *min;
-       uint32_t tolm;
-       min = 0;
-       search_bus_resources(bus, IORESOURCE_MEM, IORESOURCE_MEM, tolm_test,
-                            &min);
-       tolm = 0xffffffffUL;
-       if (min && tolm > min->base) {
-               tolm = min->base;
+       if (get_pcie_bar(&pcie_config_base, &pcie_config_size)) {
+               printk(BIOS_DEBUG, "Adding PCIe config bar\n");
+               resource = new_resource(dev, index+1);
+               resource->base = (resource_t) pcie_config_base;
+               resource->size = (resource_t) pcie_config_size;
+               resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE |
+                   IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED;
        }
-       return tolm;
 }
 
 #if CONFIG_WRITE_HIGH_TABLES==1
@@ -138,7 +107,7 @@ static void pci_domain_set_resources(device_t dev)
        /* Can we find out how much memory we can use at most
         * this way?
         */
-       pci_tolm = find_pci_tolm(&dev->link[0]);
+       pci_tolm = find_pci_tolm(dev->link_list);
        printk(BIOS_DEBUG, "pci_tolm: 0x%x\n", pci_tolm);
 
        printk(BIOS_SPEW, "Base of stolen memory: 0x%08x\n",
@@ -208,7 +177,9 @@ static void pci_domain_set_resources(device_t dev)
                ram_resource(dev, 5, 4096 * 1024, tomk - 4 * 1024 * 1024);
        }
 
-       assign_resources(&dev->link[0]);
+       add_fixed_resources(dev, 6);
+
+       assign_resources(dev->link_list);
 
 #if CONFIG_WRITE_HIGH_TABLES==1
        /* Leave some space for ACPI, PIRQ and MP tables */
@@ -224,8 +195,8 @@ static void pci_domain_set_resources(device_t dev)
 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,
 #if CONFIG_MMCONF_SUPPORT_DEFAULT
        .ops_pci_bus      = &pci_ops_mmconf,
@@ -326,7 +297,7 @@ static const struct pci_driver mc_driver __pci_driver = {
 
 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)