sizeram removal/conversion.
[coreboot.git] / src / northbridge / via / vt8601 / northbridge.c
index bd3018625e121d3a2482d941790b6b377cb7592b..fd6b6eb9162224f42c6d1246bc4820f04c776bcb 100644 (file)
@@ -1,8 +1,6 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <stdint.h>
-#include <mem.h>
-#include <part/sizeram.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/hypertransport.h>
 #include "chip.h"
 #include "northbridge.h"
 
+/*
+ * This fixup is based on capturing values from an Award bios.  Without
+ * this fixup the DMA write performance is awful (i.e. hdparm -t /dev/hda is 20x
+ * slower than normal, ethernet drops packets).
+ * Apparently these registers govern some sort of bus master behavior.
+ */
+static void northbridge_init(device_t dev) 
+{
+       printk_spew("VT8601 random fixup ...\n");
+       pci_write_config8(dev, 0x70, 0xc0);
+       pci_write_config8(dev, 0x71, 0x88);
+       pci_write_config8(dev, 0x72, 0xec);
+       pci_write_config8(dev, 0x73, 0x0c);
+       pci_write_config8(dev, 0x74, 0x0e);
+       pci_write_config8(dev, 0x75, 0x81);
+       pci_write_config8(dev, 0x76, 0x52);
+}
+
+
+
+static struct device_operations northbridge_operations = {
+       .read_resources   = pci_dev_read_resources,
+       .set_resources    = pci_dev_set_resources,
+       .enable_resources = pci_dev_enable_resources,
+       .init             = northbridge_init,
+       .enable           = 0,
+       .ops_pci          = 0,
+};
+
+static struct pci_driver northbridge_driver __pci_driver = {
+       .ops = &northbridge_operations,
+       .vendor = PCI_VENDOR_ID_VIA,
+       .device = 0x0601, /* 0x8601 is the AGP bridge? */
+};
+
+
+
+#define BRIDGE_IO_MASK (IORESOURCE_IO | IORESOURCE_MEM)
+
+static void pci_domain_read_resources(device_t dev)
+{
+        struct resource *resource;
+        unsigned reg;
+
+        /* Initialize the system wide io space constraints */
+        resource = new_resource(dev, 0);
+        resource->base  = 0x400;
+        resource->limit = 0xffffUL;
+        resource->flags = IORESOURCE_IO;
+        compute_allocate_resource(&dev->link[0], resource,
+                IORESOURCE_IO, IORESOURCE_IO);
+
+        /* Initialize the system wide memory resources constraints */
+        resource = new_resource(dev, 1);
+        resource->limit = 0xffffffffULL;
+        resource->flags = IORESOURCE_MEM;
+        compute_allocate_resource(&dev->link[0], resource,
+                IORESOURCE_MEM, IORESOURCE_MEM);
+}
+
+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 const uint8_t ramregs[] = {0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 
                                        0x56, 0x57};
 
-struct mem_range *sizeram(void)
+static void pci_domain_set_resources(device_t dev)
 {
-       unsigned long mmio_basek;
-       static struct mem_range mem[10];
-       device_t dev;
-       int i, idx;
-       unsigned char rambits;
-
-       dev = dev_find_slot(0, 0);
-       if (!dev) {
-               printk_err("Cannot find PCI: 0:0\n");
-               return 0;
-       }
-       mem[0].basek = 0;
-       mem[0].sizek = 65536;
-       idx = 1;
-       while(idx < sizeof(mem)/sizeof(mem[0])) {
-               mem[idx].basek = 0;
-               mem[idx].sizek = 0;
-               idx++;
-       }
-       for(rambits = 0, i = 0; i < sizeof(ramregs)/sizeof(ramregs[0]); i++) {
-               unsigned char reg;
-               reg = pci_read_config8(dev, ramregs[i]);
-               /* these are ENDING addresses, not sizes. 
-                * if there is memory in this slot, then reg will be > rambits.
-                * So we just take the max, that gives us total. 
-                * We take the highest one to cover for once and future linuxbios
-                * bugs. We warn about bugs.
-                */
-               if (reg > rambits)
-                       rambits = reg;
-               if (reg < rambits)
-                       printk_err("ERROR! register 0x%x is not set!\n", 
-                               ramregs[i]);
-       }
-       
-       printk_debug("I would set ram size to 0x%x Kbytes\n", (rambits)*8*1024);
-       mem[0].sizek = rambits*8*1024;
-#if 1
-       for(i = 0; i < idx; i++) {
-               printk_debug("mem[%d].basek = %08x mem[%d].sizek = %08x\n",
-                       i, mem[i].basek, i, mem[i].sizek);
+        struct resource *resource, *last;
+       device_t mc_dev;
+        uint32_t pci_tolm;
+
+        pci_tolm = 0xffffffffUL;
+        last = &dev->resource[dev->resources];
+        for(resource = &dev->resource[0]; resource < last; resource++)
+        {
+                compute_allocate_resource(&dev->link[0], resource,
+                        BRIDGE_IO_MASK, resource->flags & BRIDGE_IO_MASK);
+
+                resource->flags |= IORESOURCE_STORED;
+                report_resource_stored(dev, resource, "");
+
+                if ((resource->flags & IORESOURCE_MEM) &&
+                        (pci_tolm > resource->base))
+                {
+                        pci_tolm = resource->base;
+                }
+        }
+
+       mc_dev = dev->link[0].children;
+       if (mc_dev) {
+               unsigned long tomk, tolmk;
+               unsigned char rambits;
+               int i, idx;
+
+               for(rambits = 0, i = 0; i < sizeof(ramregs)/sizeof(ramregs[0]); i++) {
+                       unsigned char reg;
+                       reg = pci_read_config8(mc_dev, ramregs[i]);
+                       /* these are ENDING addresses, not sizes. 
+                        * if there is memory in this slot, then reg will be > rambits.
+                        * So we just take the max, that gives us total. 
+                        * We take the highest one to cover for once and future linuxbios
+                        * bugs. We warn about bugs.
+                        */
+                       if (reg > rambits)
+                               rambits = reg;
+                       if (reg < rambits)
+                               printk_err("ERROR! register 0x%x is not set!\n", 
+                                       ramregs[i]);
+               }
+               printk_debug("I would set ram size to 0x%x Kbytes\n", (rambits)*8*1024);
+               tomk = ramreg*8*1024;
+               /* Compute the top of Low memory */
+               tolmk = pci_tolm >> 10;
+               if (tolmk >= tomk) {
+                       /* The PCI hole does does not overlap the memory.
+                        */
+                       tolmk = tomk;
+               }
+               /* Report the memory regions */
+               idx = 10;
+               ram_resource(dev, idx++, 0, tolmk);
        }
-#endif
+       assign_resources(&dev->link[0]);
+}
 
-       return mem;
+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;
 }
 
-/*
- * This fixup is based on capturing values from an Award bios.  Without
- * this fixup the DMA write performance is awful (i.e. hdparm -t /dev/hda is 20x
- * slower than normal, ethernet drops packets).
- * Apparently these registers govern some sort of bus master behavior.
- */
-static void random_fixup() {
-       device_t pcidev = dev_find_slot(0, 0);
+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,
+        .scan_bus         = pci_domain_scan_bus,
+};  
 
-       printk_spew("VT8601 random fixup ...\n");
-       if (pcidev) {
-               pci_write_config8(pcidev, 0x70, 0xc0);
-               pci_write_config8(pcidev, 0x71, 0x88);
-               pci_write_config8(pcidev, 0x72, 0xec);
-               pci_write_config8(pcidev, 0x73, 0x0c);
-               pci_write_config8(pcidev, 0x74, 0x0e);
-               pci_write_config8(pcidev, 0x75, 0x81);
-               pci_write_config8(pcidev, 0x76, 0x52);
-       }
+static void cpu_bus_init(device_t dev)
+{
+        initialize_cpus(&dev->link[0]);
 }
 
-static void northbridge_init(struct chip *chip, enum chip_pass pass)
+static void cpu_bus_noop(device_t dev)
 {
+}
 
-       struct northbridge_via_vt8601_config *conf = 
-               (struct northbridge_via_vt8601_config *)chip->chip_info;
-
-       switch (pass) {
-       case CONF_PASS_PRE_PCI:
-               break;
-               
-       case CONF_PASS_POST_PCI:
-               break;
-               
-       case CONF_PASS_PRE_BOOT:
-               random_fixup();
-               break;
-               
-       default:
-               /* nothing yet */
-               break;
-       }
+static struct device_operations cpu_bus_ops = {
+        .read_resources   = cpu_bus_noop,
+        .set_resources    = cpu_bus_noop,
+        .enable_resources = cpu_bus_noop,
+        .init             = cpu_bus_init,
+        .scan_bus         = 0,
+};
+
+static void enable_dev(struct device *dev)
+{
+        struct device_path path;
+
+        /* Set the operations if it is a special bus type */
+        if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+                dev->ops = &pci_domain_ops;
+        }
+        else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
+                dev->ops = &cpu_bus_ops;
+        }
 }
 
 struct chip_operations northbridge_via_vt8601_control = {
-       .enable    = northbridge_init,
+       .enable_dev = enable_dev, 
        .name      = "VIA vt8601 Northbridge",
 };