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

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

diff --git a/src/northbridge/via/cn400/northbridge.c b/src/northbridge/via/cn400/northbridge.c
index f8674278243d6f99b1f8aa3acce2198127fffeda..3982c9877c73c05de56adb841fc0e8e9e8c81f10 100644 (file)
--- a/src/northbridge/via/cn400/northbridge.c
+++ b/src/northbridge/via/cn400/northbridge.c
@@ -45,9 +45,9 @@ static void memctrl_init(device_t dev)
        /* vlink mirror */
        vlink_dev = dev_find_device(PCI_VENDOR_ID_VIA,
                                    PCI_DEVICE_ID_VIA_CN400_VLINK, 0);
-       
-       /* Setup Low Memory Top                                                 */
-       /* 0x47 == HA(32:25)                                                */
+
+       /* Setup Low Memory Top */
+       /* 0x47 == HA(32:25)    */
        /* 0x84/85 == HA(31:20) << 4 | DRAM Granularity */
        ranks = pci_read_config8(dev, 0x47);
        reg16 = (((u16)(ranks - 1) << 9) & 0xFFF0) | 0x01F0;
@@ -104,7 +104,7 @@ static void memctrl_init(device_t dev)
                pci_write_config8(vlink_dev, 0x63, shadowreg);
 
        /* Activate VGA Frame Buffer */
-       
+
        reg8 = pci_read_config8(dev, 0xA0);
        reg8 |= 0x01;
        pci_write_config8(dev, 0xA0, reg8);
@@ -161,20 +161,7 @@ static void cn400_domain_read_resources(device_t dev)
        printk(BIOS_SPEW, "Leaving %s.\n", __func__);
 }
 
-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;
-}
-
+#ifdef UNUSED_CODE
 static void ram_reservation(device_t dev, unsigned long index,
                         unsigned long base, unsigned long size)
 {
@@ -188,35 +175,7 @@ static void ram_reservation(device_t dev, unsigned long index,
        res->flags = IORESOURCE_MEM | 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;
-
-       printk(BIOS_SPEW, "Entering CN400 find_pci_tolm\n");
-
-       search_bus_resources(bus, IORESOURCE_MEM, IORESOURCE_MEM,
-                            tolm_test, &min);
-       tolm = 0xffffffffUL;
-       if (min && tolm > min->base)
-               tolm = min->base;
-
-       printk(BIOS_SPEW, "Leaving CN400 find_pci_tolm\n");
-
-       return tolm;
-}
+#endif
 
 #if CONFIG_WRITE_HIGH_TABLES==1
 /* maximum size of high tables in KB */
@@ -231,7 +190,7 @@ static void cn400_domain_set_resources(device_t dev)
 
        printk(BIOS_SPEW, "Entering %s.\n", __func__);
 
-       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_CN400_MEMCTRL, 0);
 
@@ -265,8 +224,8 @@ static void cn400_domain_set_resources(device_t dev)
                ram_resource(dev, idx++, 768,
                             (tolmk - 768 - CONFIG_VIDEO_MB * 1024));
        }
-       assign_resources(&dev->link[0]);
-       
+       assign_resources(dev->link_list);
+
        printk(BIOS_SPEW, "Leaving %s.\n", __func__);
 }
 
@@ -274,28 +233,28 @@ static unsigned int cn400_domain_scan_bus(device_t dev, unsigned int max)
 {
        printk(BIOS_DEBUG, "Entering %s.\n", __func__);
 
-       max = pci_scan_bus(&dev->link[0], PCI_DEVFN(0, 0), 0xff, max);
+       max = pci_scan_bus(dev->link_list, PCI_DEVFN(0, 0), 0xff, max);
        return max;
 }
 
-static const struct device_operations pci_domain_ops = {
+static struct device_operations pci_domain_ops = {
        .read_resources   = cn400_domain_read_resources,
        .set_resources    = cn400_domain_set_resources,
-       .enable_resources = enable_childrens_resources,
-       .init             = 0,
+       .enable_resources = NULL,
+       .init             = NULL,
        .scan_bus         = cn400_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,
@@ -305,7 +264,7 @@ static const struct device_operations cpu_bus_ops = {
 
 static void enable_dev(struct device *dev)
 {
-       printk(BIOS_SPEW, "In cn400 enable_dev for device %s.\n", dev_path(dev));
+       printk(BIOS_SPEW, "CN400: 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) {