Factor out a few commonly duplicated functions from northbridge.c.
[coreboot.git] / src / northbridge / via / vt8623 / northbridge.c
index 77c03d0bc815bd26745814472bea5d4d9d5cc20d..f67d13c0213426b62a27397f7471a863d47559cb 100644 (file)
@@ -8,23 +8,26 @@
 #include <stdlib.h>
 #include <string.h>
 #include <bitops.h>
-#include <cpu/p6/mtrr.h>
+#include <cpu/cpu.h>
+#include <cpu/x86/mtrr.h>
+#include <cpu/x86/msr.h>
 #include "chip.h"
 #include "northbridge.h"
 
 /*
- * This fixup is based on capturing values from an Award bios.  Without
+ * 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 norhbrige_init(device_t dev) 
+
+static void northbridge_init(device_t dev)
 {
        device_t fb_dev;
        unsigned long fb;
        unsigned char c;
 
-       printk_debug("VT8623 random fixup ...\n");
+       printk(BIOS_DEBUG, "VT8623 random fixup ...\n");
        pci_write_config8(dev,  0x0d, 0x08);
        pci_write_config8(dev,  0x70, 0x82);
        pci_write_config8(dev,  0x71, 0xc8);
@@ -37,43 +40,47 @@ static void norhbrige_init(device_t dev)
        pci_write_config8(dev,  0x84, 0x80);
        pci_write_config16(dev, 0x80, 0x610f);
        pci_write_config32(dev, 0x88, 0x00000002);
-       
+
        fb_dev = dev_find_device(PCI_VENDOR_ID_VIA, 0x3122, 0);
        if (fb_dev) {
                /* Fixup GART and framebuffer addresses properly.
                 * First setup frame buffer properly.
                 */
-               fb = pci_read_config32(dev, 0x10);       /* Base addres of framebuffer */
-               printk_debug("Frame buffer at %8x\n",fb);
+               //fb = pci_read_config32(dev, 0x10);       /* Base addres of framebuffer */
+               fb = 0xd0000000;
+               printk(BIOS_DEBUG, "Frame buffer at %8lx\n",fb);
 
                c = pci_read_config8(dev, 0xe1) & 0xf0;  /* size of vga */
                c |= fb>>28;  /* upper nibble of frame buffer address */
+               c = 0xdd;
                pci_write_config8(dev, 0xe1, c);
-               c = (fb>>20) | 1;                        /* enable framebuffer */
+               c = 0x81;                                /* enable framebuffer */
                pci_write_config8(dev, 0xe0, c);
                pci_write_config8(dev, 0xe2, 0x42);      /* 'cos award does */
        }
 }
 
+static void nullfunc(device_t dev)
+{
+       /* Nothing to do */
+}
 
 static struct device_operations northbridge_operations = {
-       .read_resources   = pci_dev_read_resources,
+       .read_resources   = nullfunc,
        .set_resources    = pci_dev_set_resources,
        .enable_resources = pci_dev_enable_resources,
-       .init             = northbridge_init,
-       .scan_bus         = pci_scan_bridge,
-       .ops_pci          = 0,
+       .init             = northbridge_init
 };
 
-static struct pci_driver northbridge_driver __pci_driver = {
-       .ops = &northbridge_ops,
+static const struct pci_driver northbridge_driver __pci_driver = {
+       .ops = &northbridge_operations,
        .vendor = PCI_VENDOR_ID_VIA,
-       .device = 0x3123,
+       .device = PCI_DEVICE_ID_VIA_8623,
 };
 
 static void agp_init(device_t dev)
 {
-       printk_debug("VT8623 AGP random fixup ...\n");
+       printk(BIOS_DEBUG, "VT8623 AGP random fixup ...\n");
 
        pci_write_config8(dev, 0x3e, 0x0c);
        pci_write_config8(dev, 0x40, 0x83);
@@ -84,7 +91,7 @@ static void agp_init(device_t dev)
 }
 
 static struct device_operations agp_operations = {
-       .read_resources   = pci_bus_read_resources,
+       .read_resources   = nullfunc,
        .set_resources    = pci_dev_set_resources,
        .enable_resources = pci_bus_enable_resources,
        .init             = agp_init,
@@ -92,129 +99,50 @@ static struct device_operations agp_operations = {
        .ops_pci          = 0,
 };
 
-static struct pci_driver agp_driver __pci_driver = {
-       .ops = &agp_ops,
+static const struct pci_driver agp_driver __pci_driver = {
+       .ops = &agp_operations,
        .vendor = PCI_VENDOR_ID_VIA,
-       .device = 0xb091,
+       .device = PCI_DEVICE_ID_VIA_8633_1,
 };
 
-static void vga_init(device_t dev)
-{
-       unsigned long fb;
-
-       printk_debug("VGA random fixup ...\n");
-       pci_write_config8(dev, 0x04, 0x07);
-       pci_write_config8(dev, 0x0d, 0x20);
-       
-       /* Set the vga mtrrs */
-       add_var_mtrr( 0xd0000000 >> 10, 0x08000000>>10, MTRR_TYPE_WRCOMB);
-       fb = pci_read_config32(dev,0x10); // get the fb address
-       add_var_mtrr( fb>>10, 8192, MTRR_TYPE_WRCOMB);
-}
-
-static struct device_operations vga_operations = {
-       .read_resources   = pci_dev_read_resources,
-       .set_resources    = pci_dev_set_resources,
-       .enable_resources = pci_dev_enable_resources,
-       .init             = vga_init,
-       .ops_pci          = 0,
-};
-
-static struct pci_driver vga_driver __pci_driver = {
-       .ops = &vga_ops,
-       .vendor = PCI_VENDOR_ID_VIA,
-       .device = 0x3122,
-};
-
-
-#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, 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 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;
-       }
-       return tolm;
-}
+#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;
+#endif
 
 static void pci_domain_set_resources(device_t dev)
 {
        static const uint8_t ramregs[] = {0x5a, 0x5b, 0x5c, 0x5d };
-        struct resource *resource, *last;
        device_t mc_dev;
         uint32_t pci_tolm;
 
-        pci_tolm = find_pci_tolm(&dev->link[0]);
-       mc_dev = dev->link[0].children;
+       printk(BIOS_SPEW, "Entering vt8623 pci_domain_set_resources.\n");
+
+        pci_tolm = find_pci_tolm(dev->link_list);
+       mc_dev = dev->link_list->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++) {
+               for(rambits = 0, i = 0; i < ARRAY_SIZE(ramregs); i++) {
                        unsigned char reg;
                        reg = pci_read_config8(mc_dev, ramregs[i]);
-                       /* these are ENDING addresses, not sizes. 
+                       /* 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
+                        * So we just take the max, that gives us total.
+                        * We take the highest one to cover for once and future coreboot
                         * bugs. We warn about bugs.
                         */
                        if (reg > rambits)
                                rambits = reg;
                        if (reg < rambits)
-                               printk_err("ERROR! register 0x%x is not set!\n", 
+                               printk(BIOS_ERR, "ERROR! register 0x%x is not set!\n",
                                        ramregs[i]);
                }
-               printk_debug("I would set ram size to 0x%x Kbytes\n", (rambits)*16*1024);
-               tomk = ramreg*16*1024 - 32768;
+               printk(BIOS_DEBUG, "I would set ram size to 0x%x Kbytes\n", (rambits)*16*1024);
+               tomk = rambits*16*1024 - 32768;
                /* Compute the top of Low memory */
                tolmk = pci_tolm >> 10;
                if (tolmk >= tomk) {
@@ -222,31 +150,32 @@ static void pci_domain_set_resources(device_t dev)
                         */
                        tolmk = tomk;
                }
+
+#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;
                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)
@@ -263,7 +192,7 @@ static struct device_operations cpu_bus_ops = {
 
 static void enable_dev(struct device *dev)
 {
-        struct device_path path;
+       printk(BIOS_SPEW, "In vt8623 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) {
@@ -275,7 +204,7 @@ static void enable_dev(struct device *dev)
         }
 }
 
-struct chip_operations northbridge_via_vt8623_control = {
-       CHIP_NAME("VIA vt8623 Northbridge")
+struct chip_operations northbridge_via_vt8623_ops = {
+       CHIP_NAME("VIA VT8623 Northbridge")
        .enable_dev = enable_dev,
 };