Allow setting of serial port speed in EPIA-M config file.
[coreboot.git] / src / devices / pci_device.c
index 25c39f8f9ae2db3c99f63881635ff16f4c646b4d..9451ea35aa2535263d047f3299267f2054c63435 100644 (file)
 #include <stdint.h>
 #include <bitops.h>
 #include <string.h>
+#include <arch/io.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
+#include <part/hard_reset.h>
+#include <part/fallback_boot.h>
+#include <delay.h>
+#if CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT == 1
+#include <device/hypertransport.h>
+#endif
+#if CONFIG_PCIX_PLUGIN_SUPPORT == 1
+#include <device/pcix.h>
+#endif
+#if CONFIG_PCIEXP_PLUGIN_SUPPORT == 1
+#include <device/pciexp.h>
+#endif
+#if CONFGI_AGP_PLUGIN_SUPPORT == 1
+#include <device/agp.h>
+#endif
+#if CONFIG_CARDBUS_PLUGIN_SUPPORT == 1
+#include <device/cardbus.h>
+#endif
+
+uint8_t pci_moving_config8(struct device *dev, unsigned reg)
+{
+       uint8_t value, ones, zeroes;
+       value = pci_read_config8(dev, reg);
+       
+       pci_write_config8(dev, reg, 0xff);
+       ones = pci_read_config8(dev, reg);
+
+       pci_write_config8(dev, reg, 0x00);
+       zeroes = pci_read_config8(dev, reg);
+
+       pci_write_config8(dev, reg, value);
+
+       return ones ^ zeroes;
+}
+
+uint16_t pci_moving_config16(struct device *dev, unsigned reg)
+{
+       uint16_t value, ones, zeroes;
+       value = pci_read_config16(dev, reg);
+       
+       pci_write_config16(dev, reg, 0xffff);
+       ones = pci_read_config16(dev, reg);
+
+       pci_write_config16(dev, reg, 0x0000);
+       zeroes = pci_read_config16(dev, reg);
+
+       pci_write_config16(dev, reg, value);
+
+       return ones ^ zeroes;
+}
+
+uint32_t pci_moving_config32(struct device *dev, unsigned reg)
+{
+       uint32_t value, ones, zeroes;
+       value = pci_read_config32(dev, reg);
+       
+       pci_write_config32(dev, reg, 0xffffffff);
+       ones = pci_read_config32(dev, reg);
+
+       pci_write_config32(dev, reg, 0x00000000);
+       zeroes = pci_read_config32(dev, reg);
+
+       pci_write_config32(dev, reg, value);
+
+       return ones ^ zeroes;
+}
+
+unsigned pci_find_next_capability(device_t dev, unsigned cap, unsigned last)
+{
+       unsigned pos;
+       unsigned status;
+       unsigned reps = 48;
+       pos = 0;
+       status = pci_read_config16(dev, PCI_STATUS);
+       if (!(status & PCI_STATUS_CAP_LIST)) {
+               return 0;
+       }
+       switch(dev->hdr_type & 0x7f) {
+       case PCI_HEADER_TYPE_NORMAL:
+       case PCI_HEADER_TYPE_BRIDGE:
+               pos = PCI_CAPABILITY_LIST;
+               break;
+       case PCI_HEADER_TYPE_CARDBUS:
+               pos = PCI_CB_CAPABILITY_LIST;
+               break;
+       default:
+               return 0;
+       }
+       pos = pci_read_config8(dev, pos);
+       while(reps-- && (pos >= 0x40)) {   /* loop through the linked list */
+               int this_cap;
+               pos &= ~3;
+               this_cap = pci_read_config8(dev, pos + PCI_CAP_LIST_ID);
+               printk_spew("Capability: 0x%02x @ 0x%02x\n", cap, pos);
+               if (this_cap == 0xff) {
+                       break;
+               }
+               if (!last && (this_cap == cap)) {
+                       return pos;
+               }
+               if (last == pos) {
+                       last = 0;
+               }
+               pos = pci_read_config8(dev, pos + PCI_CAP_LIST_NEXT);
+       }
+       return 0;
+}
+
+unsigned pci_find_capability(device_t dev, unsigned cap)
+{
+       return pci_find_next_capability(dev, cap, 0);
+
+}
 
 /** Given a device and register, read the size of the BAR for that register. 
  * @param dev       Pointer to the device structure
  * @param resource  Pointer to the resource structure
  * @param index     Address of the pci configuration register
  */
-static void pci_get_resource(struct device *dev, struct resource *resource, unsigned long index)
+struct resource *pci_get_resource(struct device *dev, unsigned long index)
 {
-       uint32_t addr, size, base;
-       unsigned long type;
+       struct resource *resource;
+       unsigned long value, attr;
+       resource_t  moving, limit;
 
        /* Initialize the resources to nothing */
-       resource->base = 0;
-       resource->size = 0;
-       resource->align = 0;
-       resource->gran = 0;
-       resource->limit = 0;
-       resource->flags = 0;
-       resource->index = index;
-
-       addr = pci_read_config32(dev, index);
-       if (addr == 0xffffffffUL)
-               return;
+       resource = new_resource(dev, index);
 
-       /* FIXME: more consideration for 64-bit PCI devices,
-        * we currently detect their size but otherwise
-        * treat them as 32-bit resources
-        */
-       /* get the size */
-       pci_write_config32(dev, index, ~0);
-       size = pci_read_config32(dev,  index);
+       /* Get the initial value */
+       value = pci_read_config32(dev, index);
 
-       /* get the minimum value the bar can be set to */
-       pci_write_config32(dev, index, 0);
-       base = pci_read_config32(dev, index);
+       /* See which bits move */
+       moving = pci_moving_config32(dev, index);
 
-       /* restore addr */
-       pci_write_config32(dev, index, addr);
+       /* Initialize attr to the bits that do not move */
+       attr = value & ~moving;
 
+       /* If it is a 64bit resource look at the high half as well */
+       if (((attr & PCI_BASE_ADDRESS_SPACE_IO) == 0) &&
+               ((attr & PCI_BASE_ADDRESS_MEM_LIMIT_MASK) == PCI_BASE_ADDRESS_MEM_LIMIT_64))
+       {
+               /* Find the high bits that move */
+               moving |= ((resource_t)pci_moving_config32(dev, index + 4)) << 32;
+       }
+       /* Find the resource constraints. 
+        *
+        * Start by finding the bits that move. From there:
+        * - Size is the least significant bit of the bits that move.
+        * - Limit is all of the bits that move plus all of the lower bits.
+        * See PCI Spec 6.2.5.1 ...
+        */
+       limit = 0;
+       if (moving) {
+               resource->size = 1;
+               resource->align = resource->gran = 0;
+               while(!(moving & resource->size)) {
+                       resource->size <<= 1;
+                       resource->align += 1;
+                       resource->gran  += 1;
+               }
+               resource->limit = limit = moving | (resource->size - 1);
+       }
        /*
         * some broken hardware has read-only registers that do not 
-        * really size correctly. You can tell this if addr == size
+        * really size correctly.
         * Example: the acer m7229 has BARs 1-4 normally read-only. 
         * so BAR1 at offset 0x10 reads 0x1f1. If you size that register
         * by writing 0xffffffff to it, it will read back as 0x1f1 -- a 
         * violation of the spec. 
-        * We catch this case and ignore it by settting size and type to 0.
-        * This incidentally catches the common case where registers 
-        * read back as 0 for both address and size. 
+        * We catch this case and ignore it by observing which bits move,
+        * This also catches the common case unimplemented registers
+        * that always read back as 0.
         */
-       if ((addr == size) && (addr == base)) {
-               if (size != 0) {
+       if (moving == 0) {
+               if (value != 0) {
                        printk_debug(
-                               "PCI: %02x:%02x.%01x register %02x(%08x), read-only ignoring it\n",
-                               dev->bus->secondary,
-                               PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn), 
-                               index, addr);
+                               "%s register %02x(%08x), read-only ignoring it\n",
+                               dev_path(dev), index, value);
                }
                resource->flags = 0;
        }
-       /* Now compute the actual size, See PCI Spec 6.2.5.1 ...  */
-       else if (size & PCI_BASE_ADDRESS_SPACE_IO) {
-               type = size & (~PCI_BASE_ADDRESS_IO_MASK);
-               /* BUG! Top 16 bits can be zero (or not) 
-                * So set them to 0xffff so they go away ...
-                */
-               resource->size = (~((size | 0xffff0000) & PCI_BASE_ADDRESS_IO_MASK)) +1;
-               resource->align = log2(resource->size);
-               resource->gran = resource->align;
-               resource->flags = IORESOURCE_IO;
+       else if (attr & PCI_BASE_ADDRESS_SPACE_IO) {
+               /* An I/O mapped base address */
+               attr &= PCI_BASE_ADDRESS_IO_ATTR_MASK;
+               resource->flags |= IORESOURCE_IO;
+               /* I don't want to deal with 32bit I/O resources */
                resource->limit = 0xffff;
        } 
        else {
                /* A Memory mapped base address */
-               type = size & (~PCI_BASE_ADDRESS_MEM_MASK);
-               resource->size = (~(size &PCI_BASE_ADDRESS_MEM_MASK)) +1;
-               resource->align = log2(resource->size);
-               resource->gran = resource->align;
-               resource->flags = IORESOURCE_MEM;
-               if (type & PCI_BASE_ADDRESS_MEM_PREFETCH) {
+               attr &= PCI_BASE_ADDRESS_MEM_ATTR_MASK;
+               resource->flags |= IORESOURCE_MEM;
+               if (attr & PCI_BASE_ADDRESS_MEM_PREFETCH) {
                        resource->flags |= IORESOURCE_PREFETCH;
                }
-               type &= PCI_BASE_ADDRESS_MEM_TYPE_MASK;
-               if (type == PCI_BASE_ADDRESS_MEM_TYPE_32) {
+               attr &= PCI_BASE_ADDRESS_MEM_LIMIT_MASK;
+               if (attr == PCI_BASE_ADDRESS_MEM_LIMIT_32) {
                        /* 32bit limit */
                        resource->limit = 0xffffffffUL;
                }
-               else if (type == PCI_BASE_ADDRESS_MEM_TYPE_1M) {
+               else if (attr == PCI_BASE_ADDRESS_MEM_LIMIT_1M) {
                        /* 1MB limit */
                        resource->limit = 0x000fffffUL;
                }
-               else if (type == PCI_BASE_ADDRESS_MEM_TYPE_64) {
-                       unsigned long index_hi;
-                       /* 64bit limit 
-                        * For now just treat this as a 32bit limit
-                        */
-                       index_hi = index + 4;
-                       resource->limit = 0xffffffffUL;
+               else if (attr == PCI_BASE_ADDRESS_MEM_LIMIT_64) {
+                       /* 64bit limit */
+                       resource->limit = 0xffffffffffffffffULL;
                        resource->flags |= IORESOURCE_PCI64;
-                       addr = pci_read_config32( dev, index_hi);
-                       /* get the extended size */
-                       pci_write_config32(dev, index_hi, 0xffffffffUL);
-                       size = pci_read_config32( dev, index_hi);
-
-                       /* get the minimum value the bar can be set to */
-                       pci_write_config32(dev, index_hi, 0);
-                       base = pci_read_config32(dev,  index_hi);
-
-                       /* restore addr */
-                       pci_write_config32(dev, index_hi, addr);
-                       
-                       if ((size == 0xffffffff) && (base == 0)) {
-                               /* Clear the top half of the bar */
-                               pci_write_config32(dev, index_hi, 0);
-                       }
-                       else {
-                               printk_err("PCI: %02x:%02x.%01x Unable to handle 64-bit address\n",
-                                       dev->bus->secondary, 
-                                       PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
-                               resource->flags = IORESOURCE_PCI64;
-                       }
-               } 
+               }
                else {
                        /* Invalid value */
                        resource->flags = 0;
                }
        }
-       /* dev->size holds the flags... */
-       return;
+       /* Don't let the limit exceed which bits can move */
+       if (resource->limit > limit) {
+               resource->limit = limit;
+       }
+#if 0
+       if (resource->flags) {
+               printk_debug("%s %02x ->",
+                       dev_path(dev), resource->index);
+               printk_debug(" value: 0x%08Lx zeroes: 0x%08Lx ones: 0x%08Lx attr: %08lx\n",
+                       value, zeroes, ones, attr);
+               printk_debug(
+                       "%s %02x -> size: 0x%08Lx max: 0x%08Lx %s\n ",
+                       dev_path(dev),
+                       resource->index,
+                       resource->size, resource->limit,
+                       resource_type(resource));
+       }
+#endif
+
+       return resource;
+}
+
+static void pci_get_rom_resource(struct device *dev, unsigned long index)
+{
+       struct resource *resource;
+       unsigned long value;
+       resource_t  moving, limit;
+
+        if ((dev->on_mainboard) && (dev->rom_address == 0)) {
+               //skip it if rom_address is not set in MB Config.lb
+                return;
+        }
+
+       /* Initialize the resources to nothing */
+       resource = new_resource(dev, index);
+
+       /* Get the initial value */
+       value = pci_read_config32(dev, index);
+
+       /* See which bits move */
+       moving = pci_moving_config32(dev, index);
+       /* clear the Enable bit */
+       moving = moving & ~PCI_ROM_ADDRESS_ENABLE;
+
+       /* Find the resource constraints. 
+        *
+        * Start by finding the bits that move. From there:
+        * - Size is the least significant bit of the bits that move.
+        * - Limit is all of the bits that move plus all of the lower bits.
+        * See PCI Spec 6.2.5.1 ...
+        */
+       limit = 0;
+
+       if (moving) {
+               resource->size = 1;
+               resource->align = resource->gran = 0;
+               while (!(moving & resource->size)) {
+                       resource->size <<= 1;
+                       resource->align += 1;
+                       resource->gran  += 1;
+               }
+               resource->limit = limit = moving | (resource->size - 1);
+       }
+
+       if (moving == 0) {
+               if (value != 0) {
+                       printk_debug("%s register %02x(%08x), read-only ignoring it\n",
+                                    dev_path(dev), index, value);
+               }
+               resource->flags = 0;
+       } else {
+               resource->flags |= IORESOURCE_MEM | IORESOURCE_READONLY;
+       }
+
+       /* for on board device with embedded ROM image, the ROM image is at
+        * fixed address specified in the Config.lb, the dev->rom_address is
+        * inited by driver_pci_onboard_ops::enable_dev() */
+       if ((dev->on_mainboard) && (dev->rom_address != 0)) {
+               resource->base   = dev->rom_address;
+               resource->flags |= IORESOURCE_MEM | IORESOURCE_READONLY |
+                       IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
+       }  
+
+       compact_resources(dev);
 }
 
 /** Read the base address registers for a given device. 
@@ -154,203 +324,222 @@ static void pci_get_resource(struct device *dev, struct resource *resource, unsi
  */
 static void pci_read_bases(struct device *dev, unsigned int howmany)
 {
-       unsigned int reg;
        unsigned long index;
 
-       reg = dev->resources;
-       for(index = PCI_BASE_ADDRESS_0; 
-           (reg < MAX_RESOURCES) && (index < PCI_BASE_ADDRESS_0 + (howmany << 2)); ) {
+       for(index = PCI_BASE_ADDRESS_0; (index < PCI_BASE_ADDRESS_0 + (howmany << 2)); ) {
                struct resource *resource;
-               resource = &dev->resource[reg];
-               pci_get_resource(dev, resource, index);
-               reg += (resource->flags & (IORESOURCE_IO | IORESOURCE_MEM))? 1:0;
+               resource = pci_get_resource(dev, index);
                index += (resource->flags & IORESOURCE_PCI64)?8:4;
        }
-       dev->resources = reg;
+
+       compact_resources(dev);
 }
 
+static void pci_set_resource(struct device *dev, struct resource *resource);
+
+static void pci_record_bridge_resource(
+       struct device *dev, resource_t moving,
+       unsigned index, unsigned long mask, unsigned long type)
+{
+       /* Initiliaze the constraints on the current bus */
+       struct resource *resource;
+       resource = 0;
+       if (moving) {
+               unsigned long gran;
+               resource_t step;
+               resource = new_resource(dev, index);
+               resource->size = 0;
+               gran = 0;
+               step = 1;
+               while((moving & step) == 0) {
+                       gran += 1;
+                       step <<= 1;
+               }
+               resource->gran = gran;
+               resource->align = gran;
+               resource->limit = moving | (step - 1);
+               resource->flags = type | IORESOURCE_PCI_BRIDGE;
+               compute_allocate_resource(&dev->link[0], resource, mask, type);
+               /* If there is nothing behind the resource,
+                * clear it and forget it.
+                */
+               if (resource->size == 0) {
+                       resource->base = moving;
+                       resource->flags |= IORESOURCE_ASSIGNED;
+                       resource->flags &= ~IORESOURCE_STORED;
+                       pci_set_resource(dev, resource);
+                       resource->flags = 0;
+               }
+       }
+       return;
+}
 
 static void pci_bridge_read_bases(struct device *dev)
 {
-       unsigned int reg = dev->resources;
+       resource_t moving_base, moving_limit, moving;
+
+       /* See if the bridge I/O resources are implemented */
+       moving_base = ((uint32_t)pci_moving_config8(dev, PCI_IO_BASE)) << 8;
+       moving_base |= ((uint32_t)pci_moving_config16(dev, PCI_IO_BASE_UPPER16)) << 16;
+
+       moving_limit = ((uint32_t)pci_moving_config8(dev, PCI_IO_LIMIT)) << 8;
+       moving_limit |= ((uint32_t)pci_moving_config16(dev, PCI_IO_LIMIT_UPPER16)) << 16;
 
-       /* FIXME handle bridges without some of the optional resources */
+       moving = moving_base & moving_limit;
 
        /* Initialize the io space constraints on the current bus */
-       dev->resource[reg].base  = 0;
-       dev->resource[reg].size  = 0;
-       dev->resource[reg].align = log2(PCI_IO_BRIDGE_ALIGN);
-       dev->resource[reg].gran  = log2(PCI_IO_BRIDGE_ALIGN);
-       dev->resource[reg].limit = 0xffffUL;
-       dev->resource[reg].flags = IORESOURCE_IO | IORESOURCE_PCI_BRIDGE;
-       dev->resource[reg].index = PCI_IO_BASE;
-       compute_allocate_resource(dev, &dev->resource[reg],
+       pci_record_bridge_resource(
+               dev, moving, PCI_IO_BASE, 
                IORESOURCE_IO, IORESOURCE_IO);
-       reg++;
 
+
+       /* See if the bridge prefmem resources are implemented */
+       moving_base =  ((resource_t)pci_moving_config16(dev, PCI_PREF_MEMORY_BASE)) << 16;
+       moving_base |= ((resource_t)pci_moving_config32(dev, PCI_PREF_BASE_UPPER32)) << 32;
+
+       moving_limit =  ((resource_t)pci_moving_config16(dev, PCI_PREF_MEMORY_LIMIT)) << 16;
+       moving_limit |= ((resource_t)pci_moving_config32(dev, PCI_PREF_LIMIT_UPPER32)) << 32;
+       
+       moving = moving_base & moving_limit;
        /* Initiliaze the prefetchable memory constraints on the current bus */
-       dev->resource[reg].base = 0;
-       dev->resource[reg].size = 0;
-       dev->resource[reg].align = log2(PCI_MEM_BRIDGE_ALIGN);
-       dev->resource[reg].gran  = log2(PCI_MEM_BRIDGE_ALIGN);
-       dev->resource[reg].limit = 0xffffffffUL;
-       dev->resource[reg].flags = IORESOURCE_MEM | IORESOURCE_PREFETCH | IORESOURCE_PCI_BRIDGE;
-       dev->resource[reg].index = PCI_PREF_MEMORY_BASE;
-       compute_allocate_resource(dev, &dev->resource[reg],
-               IORESOURCE_MEM | IORESOURCE_PREFETCH, 
+       pci_record_bridge_resource(
+               dev, moving, PCI_PREF_MEMORY_BASE, 
+               IORESOURCE_MEM | IORESOURCE_PREFETCH,
                IORESOURCE_MEM | IORESOURCE_PREFETCH);
-       reg++;
+       
+
+       /* See if the bridge mem resources are implemented */
+       moving_base = ((uint32_t)pci_moving_config16(dev, PCI_MEMORY_BASE)) << 16;
+       moving_limit = ((uint32_t)pci_moving_config16(dev, PCI_MEMORY_LIMIT)) << 16;
+
+       moving = moving_base & moving_limit;
 
        /* Initialize the memory resources on the current bus */
-       dev->resource[reg].base = 0;
-       dev->resource[reg].size = 0;
-       dev->resource[reg].align = log2(PCI_MEM_BRIDGE_ALIGN);
-       dev->resource[reg].gran  = log2(PCI_MEM_BRIDGE_ALIGN);
-       dev->resource[reg].limit = 0xffffffffUL;
-       dev->resource[reg].flags = IORESOURCE_MEM | IORESOURCE_PCI_BRIDGE;
-       dev->resource[reg].index = PCI_MEMORY_BASE;
-       compute_allocate_resource(dev, &dev->resource[reg],
-               IORESOURCE_MEM | IORESOURCE_PREFETCH, 
+       pci_record_bridge_resource(
+               dev, moving, PCI_MEMORY_BASE, 
+               IORESOURCE_MEM | IORESOURCE_PREFETCH,
                IORESOURCE_MEM);
-       reg++;
 
-       dev->resources = reg;
+       compact_resources(dev);
 }
 
-
 void pci_dev_read_resources(struct device *dev)
 {
-       uint32_t addr;
-       dev->resources = 0;
-       memset(&dev->resource[0], 0, sizeof(dev->resource));
        pci_read_bases(dev, 6);
-       addr = pci_read_config32(dev, PCI_ROM_ADDRESS);
-       dev->rom_address = (addr == 0xffffffff)? 0 : addr;
+       pci_get_rom_resource(dev, PCI_ROM_ADDRESS);
 }
 
 void pci_bus_read_resources(struct device *dev)
 {
-       uint32_t addr;
-       dev->resources = 0;
-       memset(&dev->resource[0], 0, sizeof(dev->resource));
        pci_bridge_read_bases(dev);
        pci_read_bases(dev, 2);
-       
-       addr = pci_read_config32(dev, PCI_ROM_ADDRESS1);
-       dev->rom_address = (addr == 0xffffffff)? 0 : addr;
-
+       pci_get_rom_resource(dev, PCI_ROM_ADDRESS1);
 }
 
-
 static void pci_set_resource(struct device *dev, struct resource *resource)
 {
-       unsigned long base, limit;
-       unsigned long bridge_align = PCI_MEM_BRIDGE_ALIGN;
-       unsigned char buf[10];
-       
+       resource_t base, end;
+
        /* Make certain the resource has actually been set */
-       if (!(resource->flags & IORESOURCE_SET)) {
-#if 1
-               printk_err("ERROR: %02x:%02x.%01x %02x not allocated\n",
-                       dev->bus->secondary,
-                       PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn), 
-                       resource->index);
-#endif
+       if (!(resource->flags & IORESOURCE_ASSIGNED)) {
+               printk_err("ERROR: %s %02x %s size: 0x%010Lx not assigned\n",
+                       dev_path(dev), resource->index,
+                       resource_type(resource),
+                       resource->size);
                return;
        }
 
-       /* Only handle PCI memory and IO resources for now */
-       if (!(resource->flags & (IORESOURCE_MEM |IORESOURCE_IO)))
+       /* If I have already stored this resource don't worry about it */
+       if (resource->flags & IORESOURCE_STORED) {
                return;
-       
-       if (resource->flags & IORESOURCE_MEM) {
-               dev->command |= PCI_COMMAND_MEMORY;
-               bridge_align = PCI_MEM_BRIDGE_ALIGN;
        }
-       if (resource->flags & IORESOURCE_IO) {
-               dev->command |= PCI_COMMAND_IO;
-               bridge_align = PCI_IO_BRIDGE_ALIGN;
+
+       /* If the resources is substractive don't worry about it */
+       if (resource->flags & IORESOURCE_SUBTRACTIVE) {
+               return;
        }
-       if (resource->flags & IORESOURCE_PCI_BRIDGE) {
-               dev->command |= PCI_COMMAND_MASTER;
+
+       /* Only handle PCI memory and IO resources for now */
+       if (!(resource->flags & (IORESOURCE_MEM |IORESOURCE_IO)))
+               return;
+
+       /* Enable the resources in the command register */
+       if (resource->size) {
+               if (resource->flags & IORESOURCE_MEM) {
+                       dev->command |= PCI_COMMAND_MEMORY;
+               }
+               if (resource->flags & IORESOURCE_IO) {
+                       dev->command |= PCI_COMMAND_IO;
+               }
+               if (resource->flags & IORESOURCE_PCI_BRIDGE) {
+                       dev->command |= PCI_COMMAND_MASTER;
+               }
        }
        /* Get the base address */
        base = resource->base;
+
+       /* Get the end */
+       end = resource_end(resource);
        
-       /* Get the limit (rounded up) */
-       limit = base + ((resource->size + bridge_align - 1UL) & ~(bridge_align -1)) -1UL;
-       
+       /* Now store the resource */
+       resource->flags |= IORESOURCE_STORED;
        if (!(resource->flags & IORESOURCE_PCI_BRIDGE)) {
+               unsigned long base_lo, base_hi;
                /*
                 * some chipsets allow us to set/clear the IO bit. 
                 * (e.g. VIA 82c686a.) So set it to be safe)
                 */
-               limit = base + resource->size -1;
+               base_lo = base & 0xffffffff;
+               base_hi = (base >> 32) & 0xffffffff;
                if (resource->flags & IORESOURCE_IO) {
-                       base |= PCI_BASE_ADDRESS_SPACE_IO;
+                       base_lo |= PCI_BASE_ADDRESS_SPACE_IO;
                }
-               pci_write_config32(dev, resource->index, base & 0xffffffff);
+               pci_write_config32(dev, resource->index, base_lo);
                if (resource->flags & IORESOURCE_PCI64) {
-                       /* FIXME handle real 64bit base addresses */
-                       pci_write_config32(dev, resource->index + 4, 0);
+                       pci_write_config32(dev, resource->index + 4, base_hi);
                }
        }
        else if (resource->index == PCI_IO_BASE) {
-               /* set the IO ranges
-                * WARNING: we don't really do 32-bit addressing for IO yet! 
-                */
-               compute_allocate_resource(dev, resource, 
+               /* set the IO ranges */
+               compute_allocate_resource(&dev->link[0], resource, 
                        IORESOURCE_IO, IORESOURCE_IO);
-               pci_write_config8(dev, PCI_IO_BASE,  base >> 8);
-               pci_write_config8(dev, PCI_IO_LIMIT, limit >> 8);
-               pci_write_config16(dev, PCI_IO_BASE_UPPER16, 0);
-               pci_write_config16(dev, PCI_IO_LIMIT_UPPER16, 0);
+               pci_write_config8(dev,  PCI_IO_BASE, base >> 8);
+               pci_write_config16(dev, PCI_IO_BASE_UPPER16, base >> 16);
+               pci_write_config8(dev,  PCI_IO_LIMIT, end >> 8);
+               pci_write_config16(dev, PCI_IO_LIMIT_UPPER16, end >> 16);
        }
        else if (resource->index == PCI_MEMORY_BASE) {
-               /* set the memory range
-                */
-               compute_allocate_resource(dev, resource,
+               /* set the memory range  */
+               compute_allocate_resource(&dev->link[0], resource,
                        IORESOURCE_MEM | IORESOURCE_PREFETCH, 
                        IORESOURCE_MEM);
                pci_write_config16(dev, PCI_MEMORY_BASE, base >> 16);
-               pci_write_config16(dev, PCI_MEMORY_LIMIT, limit >> 16);
+               pci_write_config16(dev, PCI_MEMORY_LIMIT, end >> 16);
        }
        else if (resource->index == PCI_PREF_MEMORY_BASE) {
-               /* set the prefetchable memory range
-                * WARNING: we don't really do 64-bit addressing for prefetchable memory yet!
-                */
-               compute_allocate_resource(dev, resource,
+               /* set the prefetchable memory range */
+               compute_allocate_resource(&dev->link[0], resource,
                        IORESOURCE_MEM | IORESOURCE_PREFETCH, 
                        IORESOURCE_MEM | IORESOURCE_PREFETCH);
-               pci_write_config16(dev, PCI_PREF_MEMORY_BASE,  base >> 16);
-               pci_write_config16(dev, PCI_PREF_MEMORY_LIMIT, limit >> 16);
-               pci_write_config32(dev, PCI_PREF_BASE_UPPER32, 0);
-               pci_write_config32(dev, PCI_PREF_LIMIT_UPPER32, 0);
+               pci_write_config16(dev, PCI_PREF_MEMORY_BASE, base >> 16);
+               pci_write_config32(dev, PCI_PREF_BASE_UPPER32, base >> 32);
+               pci_write_config16(dev, PCI_PREF_MEMORY_LIMIT, end >> 16);
+               pci_write_config32(dev, PCI_PREF_LIMIT_UPPER32, end >> 32);
        }
        else {
+               /* Don't let me think I stored the resource */
+               resource->flags &= ~IORESOURCE_STORED;
                printk_err("ERROR: invalid resource->index %x\n",
                        resource->index);
        }
-       buf[0] = '\0';
-       if (resource->flags & IORESOURCE_PCI_BRIDGE) {
-               sprintf(buf, "bus %d ", dev->secondary);
-       }
-       
-       printk_debug(
-               "PCI: %02x:%02x.%01x %02x <- [0x%08lx - 0x%08lx] %s%s\n",
-               dev->bus->secondary, 
-               PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn), 
-               resource->index, 
-               resource->base, limit,
-               buf,
-               (resource->flags & IORESOURCE_IO)? "io":
-               (resource->flags & IORESOURCE_PREFETCH)? "prefmem": "mem");
+       report_resource_stored(dev, resource, "");
        return;
 }
 
 void pci_dev_set_resources(struct device *dev)
 {
        struct resource *resource, *last;
+       unsigned link;
        uint8_t line;
 
        last = &dev->resource[dev->resources];
@@ -358,8 +547,12 @@ void pci_dev_set_resources(struct device *dev)
        for(resource = &dev->resource[0]; resource < last; resource++) {
                pci_set_resource(dev, resource);
        }
-       if (dev->children) {
-               assign_resources(dev);
+       for(link = 0; link < dev->links; link++) {
+               struct bus *bus;
+               bus = &dev->link[link];
+               if (bus->children) {
+                       assign_resources(bus);
+               }
        }
 
        /* set a default latency timer */
@@ -379,41 +572,211 @@ void pci_dev_set_resources(struct device *dev)
        pci_write_config8(dev, PCI_CACHE_LINE_SIZE, 64 >> 2);
 }
 
+void pci_dev_enable_resources(struct device *dev)
+{
+       const struct pci_operations *ops;
+       uint16_t command;
+
+       /* Set the subsystem vendor and device id for mainboard devices */
+       ops = ops_pci(dev);
+       if (dev->on_mainboard && ops && ops->set_subsystem) {
+               printk_debug("%s subsystem <- %02x/%02x\n",
+                       dev_path(dev), 
+                       MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID,
+                       MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID);
+               ops->set_subsystem(dev, 
+                       MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID,
+                       MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID);
+       }
+       command = pci_read_config16(dev, PCI_COMMAND);
+       command |= dev->command;
+       command |= (PCI_COMMAND_PARITY + PCI_COMMAND_SERR); /* error check */
+       printk_debug("%s cmd <- %02x\n", dev_path(dev), command);
+       pci_write_config16(dev, PCI_COMMAND, command);
+}
+
+void pci_bus_enable_resources(struct device *dev)
+{
+       uint16_t ctrl;
+       /* enable IO in command register if there is VGA card
+        * connected with (even it does not claim IO resource) */
+       if (dev->link[0].bridge_ctrl & PCI_BRIDGE_CTL_VGA)
+               dev->command |= PCI_COMMAND_IO;
+       ctrl = pci_read_config16(dev, PCI_BRIDGE_CONTROL);
+       ctrl |= dev->link[0].bridge_ctrl;
+       ctrl |= (PCI_BRIDGE_CTL_PARITY + PCI_BRIDGE_CTL_SERR); /* error check */
+       printk_debug("%s bridge ctrl <- %04x\n", dev_path(dev), ctrl);
+       pci_write_config16(dev, PCI_BRIDGE_CONTROL, ctrl);
+
+       pci_dev_enable_resources(dev);
+
+       enable_childrens_resources(dev);
+}
+
+void pci_bus_reset(struct bus *bus)
+{
+       unsigned ctl;
+       ctl = pci_read_config16(bus->dev, PCI_BRIDGE_CONTROL);
+       ctl |= PCI_BRIDGE_CTL_BUS_RESET;
+       pci_write_config16(bus->dev, PCI_BRIDGE_CONTROL, ctl);
+       mdelay(10);
+       ctl &= ~PCI_BRIDGE_CTL_BUS_RESET;
+       pci_write_config16(bus->dev, PCI_BRIDGE_CONTROL, ctl);
+       delay(1);
+}
+
+void pci_dev_set_subsystem(device_t dev, unsigned vendor, unsigned device)
+{
+       pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID, 
+               ((device & 0xffff) << 16) | (vendor & 0xffff));
+}
+
+void pci_dev_init(struct device *dev)
+{
+#if CONFIG_PCI_ROM_RUN == 1
+       struct rom_header *rom, *ram;
+
+       rom = pci_rom_probe(dev);
+       if (rom == NULL)
+               return;
+       ram = pci_rom_load(dev, rom);
+       if (ram == NULL)
+               return;
+
+       run_bios(dev, ram);
+#endif
+}
+
+/** Default device operation for PCI devices */
+static struct pci_operations pci_dev_ops_pci = {
+       .set_subsystem = pci_dev_set_subsystem,
+};
+
 struct device_operations default_pci_ops_dev = {
-       .read_resources = pci_dev_read_resources,
-       .set_resources = pci_dev_set_resources,
-       .init = 0,
-       .scan_bus = 0,
+       .read_resources   = pci_dev_read_resources,
+       .set_resources    = pci_dev_set_resources,
+       .enable_resources = pci_dev_enable_resources,
+       .init             = pci_dev_init,
+       .scan_bus         = 0,
+       .enable           = 0,
+       .ops_pci          = &pci_dev_ops_pci,
+};
+
+/** Default device operations for PCI bridges */
+static struct pci_operations pci_bus_ops_pci = {
+       .set_subsystem = 0,
 };
+
 struct device_operations default_pci_ops_bus = {
-       .read_resources = pci_bus_read_resources,
-       .set_resources = pci_dev_set_resources,
-       .init = 0,
-       .scan_bus = pci_scan_bridge,
+       .read_resources   = pci_bus_read_resources,
+       .set_resources    = pci_dev_set_resources,
+       .enable_resources = pci_bus_enable_resources,
+       .init             = 0,
+       .scan_bus         = pci_scan_bridge,
+       .enable           = 0,
+       .reset_bus        = pci_bus_reset,
+       .ops_pci          = &pci_bus_ops_pci,
 };
+
+/**
+ * @brief Detect the type of downstream bridge
+ *
+ * This function is a heuristic to detect which type
+ * of bus is downstream of a pci to pci bridge.  This
+ * functions by looking for various capability blocks
+ * to figure out the type of downstream bridge.  PCI-X
+ * PCI-E, and Hypertransport all seem to have appropriate
+ * capabilities.
+ * 
+ * When only a PCI-Express capability is found the type
+ * is examined to see which type of bridge we have.
+ *
+ * @param dev
+ * 
+ * @return appropriate bridge operations
+ */
+static struct device_operations *get_pci_bridge_ops(device_t dev)
+{
+       unsigned pos;
+
+#if CONFIG_PCIX_PLUGIN_SUPPORT == 1
+       pos = pci_find_capability(dev, PCI_CAP_ID_PCIX);
+       if (pos) {
+               printk_debug("%s subbordinate bus PCI-X\n", dev_path(dev));
+               return &default_pcix_ops_bus;
+       }
+#endif
+#if CONFIG_AGP_PLUGIN_SUPPORT == 1
+       /* How do I detect an PCI to AGP bridge? */
+#endif
+#if CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT == 1
+       pos = 0;
+       while((pos = pci_find_next_capability(dev, PCI_CAP_ID_HT, pos))) {
+               unsigned flags;
+               flags = pci_read_config16(dev, pos + PCI_CAP_FLAGS);
+               if ((flags >> 13) == 1) {
+                       /* Host or Secondary Interface */
+                       printk_debug("%s subbordinate bus Hypertransport\n", 
+                               dev_path(dev));
+                       return &default_ht_ops_bus;
+               }
+       }
+#endif
+#if CONFIG_PCIEXP_PLUGIN_SUPPORT == 1
+       pos = pci_find_capability(dev, PCI_CAP_ID_PCIE);
+       if (pos) {
+               unsigned flags;
+               flags = pci_read_config16(dev, pos + PCI_EXP_FLAGS);
+               switch((flags & PCI_EXP_FLAGS_TYPE) >> 4) {
+               case PCI_EXP_TYPE_ROOT_PORT:
+               case PCI_EXP_TYPE_UPSTREAM:
+               case PCI_EXP_TYPE_DOWNSTREAM:
+                       printk_debug("%s subbordinate bus PCI Express\n", 
+                               dev_path(dev));
+                       return &default_pciexp_ops_bus;
+               case PCI_EXP_TYPE_PCI_BRIDGE:
+                       printk_debug("%s subbordinate PCI\n", 
+                               dev_path(dev));
+                       return &default_pci_ops_bus;
+               default:
+                       break;
+               }
+       }
+#endif
+       return &default_pci_ops_bus;
+}
+
+/**
+ * @brief Set up PCI device operation
+ *
+ *
+ * @param dev 
+ *
+ * @see pci_drivers
+ */
 static void set_pci_ops(struct device *dev)
 {
        struct pci_driver *driver;
        if (dev->ops) {
                return;
        }
+
        /* Look through the list of setup drivers and find one for
         * this pci device 
         */
        for(driver = &pci_drivers[0]; driver != &epci_drivers[0]; driver++) {
                if ((driver->vendor == dev->vendor) &&
-                       (driver->device == dev->device)) {
+                       (driver->device == dev->device)) 
+               {
                        dev->ops = driver->ops;
-#if 1
-                       printk_debug("PCI: %02x:%02x.%01x [%04x/%04x] ops\n",
-                               dev->bus->secondary,
-                               PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn),
-                               driver->vendor, driver->device
-                               );
-#endif
+                       printk_spew("%s [%04x/%04x] %sops\n", 
+                               dev_path(dev),
+                               driver->vendor, driver->device,
+                               (driver->ops->scan_bus?"bus ":""));
                        return;
                }
        }
+
        /* If I don't have a specific driver use the default operations */
        switch(dev->hdr_type & 0x7f) {  /* header type */
        case PCI_HEADER_TYPE_NORMAL:    /* standard header */
@@ -424,31 +787,52 @@ static void set_pci_ops(struct device *dev)
        case PCI_HEADER_TYPE_BRIDGE:
                if ((dev->class >> 8) != PCI_CLASS_BRIDGE_PCI)
                        goto bad;
-               dev->ops = &default_pci_ops_bus;
+               dev->ops = get_pci_bridge_ops(dev);
+               break;
+#if CONFIG_CARDBUS_PLUGIN_SUPPORT == 1
+       case PCI_HEADER_TYPE_CARDBUS:
+               dev->ops = &default_cardbus_ops_bus;
                break;
+#endif
        default:
        bad:
-               printk_err("PCI: %02x:%02x.%01x [%04x/%04x/%06x] has unknown header "
-                       "type %02x, ignoring.\n",
-                       dev->bus->secondary, 
-                       PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn), 
-                       dev->vendor, dev->device, 
-                       dev->class >> 8, dev->hdr_type);
+               if (dev->enabled) {
+                       printk_err("%s [%04x/%04x/%06x] has unknown header "
+                               "type %02x, ignoring.\n",
+                               dev_path(dev),
+                               dev->vendor, dev->device, 
+                               dev->class >> 8, dev->hdr_type);
+               }
        }
        return;
 }
 
+
+
 /**
- * Given a bus and a devfn number, find the device structure
- * @param bus The bus structure
+ * @brief See if we have already allocated a device structure for a given devfn.
+ *
+ * Given a linked list of PCI device structures and a devfn number, find the
+ * device structure correspond to the devfn, if present. This function also
+ * removes the device structure from the linked list.
+ *
+ * @param list the device structure list
  * @param devfn a device/function number
- * @return pointer to the device structure
+ *
+ * @return pointer to the device structure found or null of we have not
+ *        allocated a device for this devfn yet.
  */
 static struct device *pci_scan_get_dev(struct device **list, unsigned int devfn)
 {
-       struct device *dev = 0;
+       struct device *dev;
+       dev = 0;
        for(; *list; list = &(*list)->sibling) {
-               if ((*list)->devfn == devfn) {
+               if ((*list)->path.type != DEVICE_PATH_PCI) {
+                       printk_err("child %s not a pci device\n",
+                               dev_path(*list));
+                       continue;
+               }
+               if ((*list)->path.u.pci.devfn == devfn) {
                        /* Unlink from the list */
                        dev = *list;
                        *list = (*list)->sibling;
@@ -456,175 +840,219 @@ static struct device *pci_scan_get_dev(struct device **list, unsigned int devfn)
                        break;
                }
        }
+       /* Just like alloc_dev add the device to the  list of device on the bus.  
+        * When the list of devices was formed we removed all of the parents 
+        * children, and now we are interleaving static and dynamic devices in 
+        * order on the bus.
+        */
+       if (dev) {
+               device_t child;
+               /* Find the last child of our parent */
+               for(child = dev->bus->children; child && child->sibling; ) {
+                       child = child->sibling;
+               }
+               /* Place the device on the list of children of it's parent. */
+               if (child) {
+                       child->sibling = dev;
+               } else {
+                       dev->bus->children = dev;
+               }
+       }
+
        return dev;
 }
 
-
-#define HYPERTRANSPORT_SUPPORT 1
-/** Scan the pci bus devices and bridges.
- * @param pci_bus pointer to the bus structure
- * @param max current bus number
- * @return The maximum bus number found, after scanning all subordinate busses
+/** 
+ * @brief Scan a PCI bus.
+ *
+ * Determine the existence of a given PCI device.
+ *
+ * @param bus pointer to the bus structure
+ * @param devfn to look at
+ *
+ * @return The device structure for hte device (if found)
+ *         or the NULL if no device is found.
  */
-unsigned int pci_scan_bus(struct device *bus, unsigned int max)
+device_t pci_probe_dev(device_t dev, struct bus *bus, unsigned devfn)
 {
-       unsigned int devfn;
-       struct device *dev, **bus_last;
-       struct device *old_devices;
-       struct device *child;
-#if HYPERTRANSPORT_SUPPORT
-       unsigned next_unitid, last_unitid;
-#endif
-
-       printk_debug("PCI: pci_scan_bus for bus %d\n", bus->secondary);
-
-       old_devices = bus->children;
-       bus->children = 0;
-       bus_last = &bus->children;
-
-       post_code(0x24);
-       
+       uint32_t id, class;
+       uint8_t hdr_type;
 
-#if HYPERTRANSPORT_SUPPORT
-       /* If present assign unitid to a hypertransport chain */
-       next_unitid = 1;
-       do {
+       /* Detect if a device is present */
+       if (!dev) {
                struct device dummy;
-               uint32_t id;
-               uint8_t hdr_type, pos;
-               last_unitid = next_unitid;
-
-               dummy.bus   = bus;
-               dummy.devfn = 0;
+               dummy.bus              = bus;
+               dummy.path.type        = DEVICE_PATH_PCI;
+               dummy.path.u.pci.devfn = devfn;
                id = pci_read_config32(&dummy, PCI_VENDOR_ID);
-               if (id == 0xffffffff || id == 0x00000000 ||
-                       id == 0x0000ffff || id == 0xffff0000) {
-                       break;
+               /* Have we found somthing?
+                * Some broken boards return 0 if a slot is empty.
+                */
+               if (    (id == 0xffffffff) || (id == 0x00000000) ||
+                       (id == 0x0000ffff) || (id == 0xffff0000))
+               {
+                       printk_spew("PCI: devfn 0x%x, bad id 0x%x\n", devfn, id);
+                       return NULL;
                }
-               hdr_type = pci_read_config8(&dummy, PCI_HEADER_TYPE);
-               pos = 0;
-               switch(hdr_type & 0x7f) {
-               case PCI_HEADER_TYPE_NORMAL:
-               case PCI_HEADER_TYPE_BRIDGE:
-                       pos = PCI_CAPABILITY_LIST;
-                       break;
+               dev = alloc_dev(bus, &dummy.path);
+       }
+       else {
+               /* Enable/disable the device.  Once we have
+                * found the device specific operations this
+                * operations we will disable the device with
+                * those as well.
+                * 
+                * This is geared toward devices that have subfunctions
+                * that do not show up by default.
+                * 
+                * If a device is a stuff option on the motherboard
+                * it may be absent and enable_dev must cope.
+                * 
+                */
+               /* Run the magice enable sequence for the device */
+               if (dev->chip_ops && dev->chip_ops->enable_dev) {
+                       dev->chip_ops->enable_dev(dev);
                }
-               if (pos > PCI_CAP_LIST_NEXT) {
-                       pos = pci_read_config8(&dummy, pos);
-               }
-               while(pos != 0) {
-                       uint8_t cap;
-                       cap = pci_read_config8(&dummy, pos + PCI_CAP_LIST_ID);
-                       printk_debug("Capability: 0x%02x @ 0x%02x\n", cap, pos);
-                       if (cap == PCI_CAP_ID_HT) {
-                               uint16_t flags;
-                               flags = pci_read_config16(&dummy, pos + PCI_CAP_FLAGS);
-                               printk_debug("flags: 0x%04x\n", (unsigned)flags);
-                               if ((flags >> 13) == 0) {
-                                       unsigned count;
-                                       flags &= ~0x1f;
-                                       flags |= next_unitid & 0x1f;
-                                       count = (flags >> 5) & 0x1f;
-                                       printk_debug("unitid: 0x%02x, count: 0x%02x\n",
-                                               next_unitid, count);
-                                       pci_write_config16(&dummy, pos + PCI_CAP_FLAGS, flags);
-                                       next_unitid += count;
-                                       break;
-                               }
+               /* Now read the vendor and device id */
+               id = pci_read_config32(dev, PCI_VENDOR_ID);
+               
+               
+               /* If the device does not have a pci id disable it.
+                * Possibly this is because we have already disabled
+                * the device.  But this also handles optional devices
+                * that may not always show up.
+                */
+               /* If the chain is fully enumerated quit */
+               if (    (id == 0xffffffff) || (id == 0x00000000) ||
+                       (id == 0x0000ffff) || (id == 0xffff0000)) 
+               {
+                       if (dev->enabled) {
+                               printk_info("Disabling static device: %s\n",
+                                       dev_path(dev));
+                               dev->enabled = 0;
                        }
-                       pos = pci_read_config8(&dummy, pos + PCI_CAP_LIST_NEXT);
+                       return dev;
                }
-       } while((last_unitid != next_unitid) && (next_unitid <= 0x1f));
-#endif /* HYPERTRANSPORT_SUPPORT */
+       }
+       /* Read the rest of the pci configuration information */
+       hdr_type = pci_read_config8(dev, PCI_HEADER_TYPE);
+       class = pci_read_config32(dev, PCI_CLASS_REVISION);
+       
+       /* Store the interesting information in the device structure */
+       dev->vendor = id & 0xffff;
+       dev->device = (id >> 16) & 0xffff;
+       dev->hdr_type = hdr_type;
+       /* class code, the upper 3 bytes of PCI_CLASS_REVISION */
+       dev->class = class >> 8;
+       
 
-       /* probe all devices on this bus with some optimization for non-existance and 
-          single funcion devices */
-       for (devfn = 0; devfn <= 0xff; devfn++) {
-               struct device dummy;
-               uint32_t id, class;
-               uint8_t cmd, tmp, hdr_type;
+       /* Architectural/System devices always need to
+        * be bus masters.
+        */
+       if ((dev->class >> 16) == PCI_BASE_CLASS_SYSTEM) {
+               dev->command |= PCI_COMMAND_MASTER;
+       }
+       /* Look at the vendor and device id, or at least the 
+        * header type and class and figure out which set of
+        * configuration methods to use.  Unless we already
+        * have some pci ops.
+        */
+       set_pci_ops(dev);
 
-               /* First thing setup the device structure */
-               dev = pci_scan_get_dev(&old_devices, devfn);
+       /* Now run the magic enable/disable sequence for the device */
+       if (dev->ops && dev->ops->enable) {
+               dev->ops->enable(dev);
+       }
        
-               dummy.bus = bus;
-               dummy.devfn = devfn;
-               id = pci_read_config32(&dummy, PCI_VENDOR_ID);
-               /* some broken boards return 0 if a slot is empty: */
-               if (!dev &&
-                       (id == 0xffffffff || id == 0x00000000 || 
-                        id == 0x0000ffff || id == 0xffff0000)) {
-                       printk_spew("PCI: devfn 0x%x, bad id 0x%x\n", devfn, id);
-                       if (PCI_FUNC(devfn) == 0x00) {
-                               /* if this is a function 0 device and it is not present,
-                                  skip to next device */
-                               devfn += 0x07;
-                       }
-                       /* multi function device, skip to next function */
-                       continue;
-               }
-               hdr_type = pci_read_config8(&dummy, PCI_HEADER_TYPE);
-               class = pci_read_config32(&dummy, PCI_CLASS_REVISION);
 
-               if (!dev) {
-                       if ((dev = malloc(sizeof(*dev))) == 0) {
-                               printk_err("PCI: out of memory.\n");
-                               continue;
-                       }
-                       memset(dev, 0, sizeof(*dev));
-               }
+       /* Display the device and error if we don't have some pci operations
+        * for it.
+        */
+       printk_debug("%s [%04x/%04x] %s%s\n",
+               dev_path(dev),
+               dev->vendor, dev->device, 
+               dev->enabled?"enabled": "disabled",
+               dev->ops?"" : " No operations"
+               );
 
-               dev->bus = bus;
-               dev->devfn = devfn;
-               dev->vendor = id & 0xffff;
-               dev->device = (id >> 16) & 0xffff;
-               dev->hdr_type = hdr_type;
-               /* class code, the upper 3 bytes of PCI_CLASS_REVISION */
-               dev->class = class >> 8;
+       return dev;
+}
 
-               /* non-destructively determine if device can be a master: */
-               cmd = pci_read_config8(dev, PCI_COMMAND);
-               pci_write_config8(dev, PCI_COMMAND, cmd | PCI_COMMAND_MASTER);
-               tmp = pci_read_config8(dev, PCI_COMMAND);
+/** 
+ * @brief Scan a PCI bus.
+ *
+ * Determine the existence of devices and bridges on a PCI bus. If there are
+ * bridges on the bus, recursively scan the buses behind the bridges.
+ *
+ * This function is the default scan_bus() method for the root device
+ * 'dev_root'.
+ *
+ * @param bus pointer to the bus structure
+ * @param min_devfn minimum devfn to look at in the scan usually 0x00
+ * @param max_devfn maximum devfn to look at in the scan usually 0xff
+ * @param max current bus number
+ *
+ * @return The maximum bus number found, after scanning all subordinate busses
+ */
+unsigned int pci_scan_bus(struct bus *bus,
+       unsigned min_devfn, unsigned max_devfn,
+       unsigned int max)
+{
+       unsigned int devfn;
+       device_t old_devices;
+       device_t child;
 
-               dev->master = ((tmp & PCI_COMMAND_MASTER) != 0);
-               pci_write_config8(dev, PCI_COMMAND, cmd);
+       printk_debug("PCI: pci_scan_bus for bus %d\n", bus->secondary);
 
-               /* Look at the vendor and device id, or at least the 
-                * header type and class and figure out which set of configuration
-                * methods to use.
-                */
-               set_pci_ops(dev);
-               /* Kill the device if we don't have some pci operations for it */
-               if (!dev->ops) {
-                       free(dev);
-                       continue;
-               }
-               printk_debug("PCI: %02x:%02x.%01x [%04x/%04x]\n", 
-                       bus->secondary, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn), 
-                       dev->vendor, dev->device);
+       old_devices = bus->children;
+       bus->children = 0;
 
-               /* Put it into the global device chain. */
-               append_device(dev);
+       post_code(0x24);
+       /* probe all devices/functions on this bus with some optimization for
+        * non-existence and single funcion devices
+        */
+       for (devfn = min_devfn; devfn <= max_devfn; devfn++) {
+               device_t dev;
+
+               /* First thing setup the device structure */
+               dev = pci_scan_get_dev(&old_devices, devfn);
 
-               /* Now insert it into the list of devices held by the parent bus. */
-               *bus_last = dev;
-               bus_last = &dev->sibling;
+               /* See if a device is present and setup the device
+                * structure.
+                */
+               dev = pci_probe_dev(dev, bus, devfn); 
 
-               if (PCI_FUNC(devfn) == 0x00 && (hdr_type & 0x80) != 0x80) {
-                       /* if this is not a multi function device, don't waste time probe
-                          another function. Skip to next device. */
+               /* if this is not a multi function device, 
+                * or the device is not present don't waste
+                * time probing another function. 
+                * Skip to next device. 
+                */
+               if ((PCI_FUNC(devfn) == 0x00) && 
+                       (!dev || (dev->enabled && ((dev->hdr_type & 0x80) != 0x80))))
+               {
                        devfn += 0x07;
                }
        }
        post_code(0x25);
 
+       /* Die if any leftover Static devices are are found.  
+        * There's probably a problem in the Config.lb.
+       */
+       if(old_devices) {
+               device_t left;
+               for(left = old_devices; left; left = left->sibling) {
+                       printk_err("%s\n", dev_path(left));
+               }
+               die("PCI: Left over static devices.  Check your Config.lb\n");
+       }
+
+       /* For all children that implement scan_bus (i.e. bridges)
+        * scan the bus behind that child.
+        */
        for(child = bus->children; child; child = child->sibling) {
-               if (!child->ops->scan_bus)
-                       continue;
-               max = child->ops->scan_bus(child, max);
-               
+               max = scan_bus(child, max);
        }
+
        /*
         * We've scanned the bus and so we know all about what's on
         * the other side of any bridges that may be on this bus plus
@@ -637,100 +1065,174 @@ unsigned int pci_scan_bus(struct device *bus, unsigned int max)
        return max;
 }
 
-/** Scan the bus, first for bridges and next for devices. 
- * @param pci_bus pointer to the bus structure
+
+/**
+ * @brief Scan a PCI bridge and the buses behind the bridge.
+ *
+ * Determine the existence of buses behind the bridge. Set up the bridge
+ * according to the result of the scan.
+ *
+ * This function is the default scan_bus() method for PCI bridge devices.
+ *
+ * @param dev pointer to the bridge device
+ * @param max the highest bus number assgined up to now
+ *
  * @return The maximum bus number found, after scanning all subordinate busses
  */
-unsigned int pci_scan_bridge(struct device *bus, unsigned int max)
+unsigned int do_pci_scan_bridge(struct device *dev, unsigned int max, 
+       unsigned int (*do_scan_bus)(struct bus *bus, 
+               unsigned min_devfn, unsigned max_devfn, unsigned int max))
 {
+       struct bus *bus;
        uint32_t buses;
        uint16_t cr;
+
+       printk_spew("%s for %s\n", __func__, dev_path(dev));
+
+       bus = &dev->link[0];
+       bus->dev = dev;
+       dev->links = 1;
+
        /* Set up the primary, secondary and subordinate bus numbers. We have
         * no idea how many buses are behind this bridge yet, so we set the
-        * subordinate bus number to 0xff for the moment 
+        * subordinate bus number to 0xff for the moment. 
         */
        bus->secondary = ++max;
        bus->subordinate = 0xff;
-       
+
        /* Clear all status bits and turn off memory, I/O and master enables. */
-       cr = pci_read_config16(bus, PCI_COMMAND);
-       pci_write_config16(bus, PCI_COMMAND, 0x0000);
-       pci_write_config16(bus, PCI_STATUS, 0xffff);
+       cr = pci_read_config16(dev, PCI_COMMAND);
+       pci_write_config16(dev, PCI_COMMAND, 0x0000);
+       pci_write_config16(dev, PCI_STATUS, 0xffff);
 
        /*
         * Read the existing primary/secondary/subordinate bus
         * number configuration.
         */
-       buses = pci_read_config32(bus, PCI_PRIMARY_BUS);
+       buses = pci_read_config32(dev, PCI_PRIMARY_BUS);
 
        /* Configure the bus numbers for this bridge: the configuration
         * transactions will not be propagated by the bridge if it is not
-        * correctly configured 
+        * correctly configured.
         */
        buses &= 0xff000000;
-       buses |= (((unsigned int) (bus->bus->secondary) << 0) |
+       buses |= (((unsigned int) (dev->bus->secondary) << 0) |
                ((unsigned int) (bus->secondary) << 8) |
                ((unsigned int) (bus->subordinate) << 16));
-       pci_write_config32(bus, PCI_PRIMARY_BUS, buses);
-       
-       /* Now we can scan all subordinate buses i.e. the bus hehind the bridge */
-       max = pci_scan_bus(bus, max);
-       
+       pci_write_config32(dev, PCI_PRIMARY_BUS, buses);
+
+       /* Now we can scan all subordinate buses 
+        * i.e. the bus behind the bridge.
+        */
+       max = do_scan_bus(bus, 0x00, 0xff, max);
+
        /* We know the number of buses behind this bridge. Set the subordinate
-        *  bus number to its real value 
+        * bus number to its real value.
         */
        bus->subordinate = max;
        buses = (buses & 0xff00ffff) |
                ((unsigned int) (bus->subordinate) << 16);
-       pci_write_config32(bus, PCI_PRIMARY_BUS, buses);
-       pci_write_config16(bus, PCI_COMMAND, cr);
-               
+       pci_write_config32(dev, PCI_PRIMARY_BUS, buses);
+       pci_write_config16(dev, PCI_COMMAND, cr);
+       
+       printk_spew("%s returns max %d\n", __func__, max);
        return max;
 }
 
-
-static void pci_root_read_resources(struct device *bus)
+/**
+ * @brief Scan a PCI bridge and the buses behind the bridge.
+ *
+ * Determine the existence of buses behind the bridge. Set up the bridge
+ * according to the result of the scan.
+ *
+ * This function is the default scan_bus() method for PCI bridge devices.
+ *
+ * @param dev pointer to the bridge device
+ * @param max the highest bus number assgined up to now
+ *
+ * @return The maximum bus number found, after scanning all subordinate busses
+ */
+unsigned int pci_scan_bridge(struct device *dev, unsigned int max)
 {
-       int res = 0;
-       /* Initialize the system wide io space constraints */
-       bus->resource[res].base  = 0x400;
-       bus->resource[res].size  = 0;
-       bus->resource[res].align = 0;
-       bus->resource[res].gran  = 0;
-       bus->resource[res].limit = 0xffffUL;
-       bus->resource[res].flags = IORESOURCE_IO;
-       bus->resource[res].index = PCI_IO_BASE;
-       compute_allocate_resource(bus, &bus->resource[res], 
-               IORESOURCE_IO, IORESOURCE_IO);
-       res++;
-
-       /* Initialize the system wide memory resources constraints */
-       bus->resource[res].base  = 0;
-       bus->resource[res].size  = 0;
-       bus->resource[res].align = 0;
-       bus->resource[res].gran  = 0;
-       bus->resource[res].limit = 0xffffffffUL;
-       bus->resource[res].flags = IORESOURCE_MEM;
-       bus->resource[res].index = PCI_MEMORY_BASE;
-       compute_allocate_resource(bus, &bus->resource[res], 
-               IORESOURCE_MEM, IORESOURCE_MEM);
-       res++;
-
-       bus->resources = res;
+       return do_pci_scan_bridge(dev, max, pci_scan_bus);
 }
-static void pci_root_set_resources(struct device *bus)
+
+/*
+    Tell the EISA int controller this int must be level triggered
+    THIS IS A KLUDGE -- sorry, this needs to get cleaned up.
+*/
+void pci_level_irq(unsigned char intNum)
 {
-       compute_allocate_resource(bus,
-               &bus->resource[0], IORESOURCE_IO, IORESOURCE_IO);
-       compute_allocate_resource(bus, 
-               &bus->resource[1], IORESOURCE_MEM, IORESOURCE_MEM);
-       assign_resources(bus);
+       unsigned short intBits = inb(0x4d0) | (((unsigned) inb(0x4d1)) << 8);
+
+       printk_spew("%s: current ints are 0x%x\n", __func__, intBits);
+       intBits |= (1 << intNum);
+
+       printk_spew("%s: try to set ints 0x%x\n", __func__, intBits);
+
+       // Write new values
+       outb((unsigned char) intBits, 0x4d0);
+       outb((unsigned char) (intBits >> 8), 0x4d1);
+
+       /* this seems like an error but is not ... */
+#if 1
+       if (inb(0x4d0) != (intBits & 0xf)) {
+         printk_err("%s: lower order bits are wrong: want 0x%x, got 0x%x\n",
+                    __func__, intBits &0xf, inb(0x4d0));
+       }
+       if (inb(0x4d1) != ((intBits >> 8) & 0xf)) {
+         printk_err("%s: lower order bits are wrong: want 0x%x, got 0x%x\n",
+                    __func__, (intBits>>8) &0xf, inb(0x4d1));
+       }
+#endif
 }
 
-struct device_operations default_pci_ops_root = {
-       .read_resources = pci_root_read_resources,
-       .set_resources = pci_root_set_resources,
-       .init = 0,
-       .scan_bus = pci_scan_bus,
-};
+/*
+    This function assigns IRQs for all functions contained within
+    the indicated device address.  If the device does not exist or does
+    not require interrupts then this function has no effect.
+
+    This function should be called for each PCI slot in your system.  
+
+    pIntAtoD is an array of IRQ #s that are assigned to PINTA through PINTD of
+    this slot.  
+    The particular irq #s that are passed in depend on the routing inside
+    your southbridge and on your motherboard.
+
+    -kevinh@ispiri.com
+*/
+void pci_assign_irqs(unsigned bus, unsigned slot,
+       const unsigned char pIntAtoD[4])
+{
+       unsigned functNum;
+       device_t pdev;
+       unsigned char line;
+       unsigned char irq;
+       unsigned char readback;
 
+       /* Each slot may contain up to eight functions */
+       for (functNum = 0; functNum < 8; functNum++) {
+               pdev = dev_find_slot(bus, (slot << 3) + functNum);
+
+               if (pdev) {
+                 line = pci_read_config8(pdev, PCI_INTERRUPT_PIN);
+
+                       // PCI spec says all other values are reserved 
+                       if ((line >= 1) && (line <= 4)) {
+                               irq = pIntAtoD[line - 1];
+
+                               printk_debug("Assigning IRQ %d to %d:%x.%d\n", \
+                                       irq, bus, slot, functNum);
+
+                               pci_write_config8(pdev, PCI_INTERRUPT_LINE,\
+                                       pIntAtoD[line - 1]);
+
+                               readback = pci_read_config8(pdev, PCI_INTERRUPT_LINE);
+                               printk_debug("  Readback = %d\n", readback);
+
+                               // Change to level triggered
+                               pci_level_irq(pIntAtoD[line - 1]);
+                       }
+               }
+       }
+}