Patched in Tegra support.

2 files changed, 114 insertions, 39 deletions

diff --git a/arch/ia64/pci/fixup.c b/arch/ia64/pci/fixup.c
index 5dc969dd4ac..f5959c0c181 100644
--- a/arch/ia64/pci/fixup.c
+++ b/arch/ia64/pci/fixup.c
@@ -24,14 +24,14 @@
  * video device at this point.
  */
 
-static void pci_fixup_video(struct pci_dev *pdev)
+static void __devinit pci_fixup_video(struct pci_dev *pdev)
 {
         struct pci_dev *bridge;
         struct pci_bus *bus;
         u16 config;
 
-        if ((strcmp(ia64_platform_name, "dig") != 0)
-            && (strcmp(ia64_platform_name, "hpzx1")  != 0))
+        if ((strcmp(platform_name, "dig") != 0)
+            && (strcmp(platform_name, "hpzx1")  != 0))
                 return;
         /* Maybe, this machine supports legacy memory map. */
 
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 55b72ad5732..aa2533ae7e9 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -20,10 +20,10 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/bootmem.h>
-#include <linux/export.h>
 
 #include <asm/machvec.h>
 #include <asm/page.h>
+#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/sal.h>
 #include <asm/smp.h>
@@ -116,7 +116,8 @@ struct pci_ops pci_root_ops = {
 
 /* Called by ACPI when it finds a new root bus.  */
 
-static struct pci_controller *alloc_pci_controller(int seg)
+static struct pci_controller * __devinit
+alloc_pci_controller (int seg)
 {
         struct pci_controller *controller;
 
@@ -132,7 +133,6 @@ static struct pci_controller *alloc_pci_controller(int seg)
 struct pci_root_info {
         struct acpi_device *bridge;
         struct pci_controller *controller;
-        struct list_head resources;
         char *name;
 };
 
@@ -164,8 +164,8 @@ new_space (u64 phys_base, int sparse)
         return i;
 }
 
-static u64 add_io_space(struct pci_root_info *info,
-                        struct acpi_resource_address64 *addr)
+static u64 __devinit
+add_io_space (struct pci_root_info *info, struct acpi_resource_address64 *addr)
 {
         struct resource *resource;
         char *name;
@@ -225,8 +225,8 @@ out:
         return ~0;
 }
 
-static acpi_status resource_to_window(struct acpi_resource *resource,
-                                      struct acpi_resource_address64 *addr)
+static acpi_status __devinit resource_to_window(struct acpi_resource *resource,
+        struct acpi_resource_address64 *addr)
 {
         acpi_status status;
 
@@ -248,7 +248,8 @@ static acpi_status resource_to_window(struct acpi_resource *resource,
         return AE_ERROR;
 }
 
-static acpi_status count_window(struct acpi_resource *resource, void *data)
+static acpi_status __devinit
+count_window (struct acpi_resource *resource, void *data)
 {
         unsigned int *windows = (unsigned int *) data;
         struct acpi_resource_address64 addr;
@@ -261,7 +262,7 @@ static acpi_status count_window(struct acpi_resource *resource, void *data)
         return AE_OK;
 }
 
-static acpi_status add_window(struct acpi_resource *res, void *data)
+static __devinit acpi_status add_window(struct acpi_resource *res, void *data)
 {
         struct pci_root_info *info = data;
         struct pci_window *window;
@@ -293,6 +294,7 @@ static acpi_status add_window(struct acpi_resource *res, void *data)
         window->resource.flags = flags;
         window->resource.start = addr.minimum + offset;
         window->resource.end = window->resource.start + addr.address_length - 1;
+        window->resource.child = NULL;
         window->offset = offset;
 
         if (insert_resource(root, &window->resource)) {
@@ -312,24 +314,34 @@ static acpi_status add_window(struct acpi_resource *res, void *data)
                                  &window->resource);
         }
 
-        /* HP's firmware has a hack to work around a Windows bug.
-         * Ignore these tiny memory ranges */
-        if (!((window->resource.flags & IORESOURCE_MEM) &&
-              (window->resource.end - window->resource.start < 16)))
-                pci_add_resource_offset(&info->resources, &window->resource,
-                                        window->offset);
-
         return AE_OK;
 }
 
-struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
+static void __devinit
+pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl)
+{
+        int i;
+
+        pci_bus_remove_resources(bus);
+        for (i = 0; i < ctrl->windows; i++) {
+                struct resource *res = &ctrl->window[i].resource;
+                /* HP's firmware has a hack to work around a Windows bug.
+                 * Ignore these tiny memory ranges */
+                if ((res->flags & IORESOURCE_MEM) &&
+                    (res->end - res->start < 16))
+                        continue;
+                pci_bus_add_resource(bus, res, 0);
+        }
+}
+
+struct pci_bus * __devinit
+pci_acpi_scan_root(struct acpi_pci_root *root)
 {
         struct acpi_device *device = root->device;
         int domain = root->segment;
         int bus = root->secondary.start;
         struct pci_controller *controller;
         unsigned int windows = 0;
-        struct pci_root_info info;
         struct pci_bus *pbus;
         char *name;
         int pxm;
@@ -346,14 +358,13 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
                 controller->node = pxm_to_node(pxm);
 #endif
 
-        INIT_LIST_HEAD(&info.resources);
-        /* insert busn resource at first */
-        pci_add_resource(&info.resources, &root->secondary);
         acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window,
                         &windows);
         if (windows) {
+                struct pci_root_info info;
+
                 controller->window =
-                        kzalloc_node(sizeof(*controller->window) * windows,
+                        kmalloc_node(sizeof(*controller->window) * windows,
                                      GFP_KERNEL, controller->node);
                 if (!controller->window)
                         goto out2;
@@ -375,14 +386,8 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
          * should handle the case here, but it appears that IA64 hasn't
          * such quirk. So we just ignore the case now.
          */
-        pbus = pci_create_root_bus(NULL, bus, &pci_root_ops, controller,
-                                   &info.resources);
-        if (!pbus) {
-                pci_free_resource_list(&info.resources);
-                return NULL;
-        }
+        pbus = pci_scan_bus_parented(NULL, bus, &pci_root_ops, controller);
 
-        pci_scan_child_bus(pbus);
         return pbus;
 
 out3:
@@ -393,7 +398,55 @@ out1:
         return NULL;
 }
 
-static int is_valid_resource(struct pci_dev *dev, int idx)
+void pcibios_resource_to_bus(struct pci_dev *dev,
+                struct pci_bus_region *region, struct resource *res)
+{
+        struct pci_controller *controller = PCI_CONTROLLER(dev);
+        unsigned long offset = 0;
+        int i;
+
+        for (i = 0; i < controller->windows; i++) {
+                struct pci_window *window = &controller->window[i];
+                if (!(window->resource.flags & res->flags))
+                        continue;
+                if (window->resource.start > res->start)
+                        continue;
+                if (window->resource.end < res->end)
+                        continue;
+                offset = window->offset;
+                break;
+        }
+
+        region->start = res->start - offset;
+        region->end = res->end - offset;
+}
+EXPORT_SYMBOL(pcibios_resource_to_bus);
+
+void pcibios_bus_to_resource(struct pci_dev *dev,
+                struct resource *res, struct pci_bus_region *region)
+{
+        struct pci_controller *controller = PCI_CONTROLLER(dev);
+        unsigned long offset = 0;
+        int i;
+
+        for (i = 0; i < controller->windows; i++) {
+                struct pci_window *window = &controller->window[i];
+                if (!(window->resource.flags & res->flags))
+                        continue;
+                if (window->resource.start - window->offset > region->start)
+                        continue;
+                if (window->resource.end - window->offset < region->end)
+                        continue;
+                offset = window->offset;
+                break;
+        }
+
+        res->start = region->start + offset;
+        res->end = region->end + offset;
+}
+EXPORT_SYMBOL(pcibios_bus_to_resource);
+
+static int __devinit is_valid_resource(struct pci_dev *dev, int idx)
 {
         unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM;
         struct resource *devr = &dev->resource[idx], *busr;
@@ -411,25 +464,30 @@ static int is_valid_resource(struct pci_dev *dev, int idx)
         return 0;
 }
 
-static void pcibios_fixup_resources(struct pci_dev *dev, int start, int limit)
+static void __devinit
+pcibios_fixup_resources(struct pci_dev *dev, int start, int limit)
 {
+        struct pci_bus_region region;
         int i;
 
         for (i = start; i < limit; i++) {
                 if (!dev->resource[i].flags)
                         continue;
+                region.start = dev->resource[i].start;
+                region.end = dev->resource[i].end;
+                pcibios_bus_to_resource(dev, &dev->resource[i], &region);
                 if ((is_valid_resource(dev, i)))
                         pci_claim_resource(dev, i);
         }
 }
 
-void pcibios_fixup_device_resources(struct pci_dev *dev)
+void __devinit pcibios_fixup_device_resources(struct pci_dev *dev)
 {
         pcibios_fixup_resources(dev, 0, PCI_BRIDGE_RESOURCES);
 }
 EXPORT_SYMBOL_GPL(pcibios_fixup_device_resources);
 
-static void pcibios_fixup_bridge_resources(struct pci_dev *dev)
+static void __devinit pcibios_fixup_bridge_resources(struct pci_dev *dev)
 {
         pcibios_fixup_resources(dev, PCI_BRIDGE_RESOURCES, PCI_NUM_RESOURCES);
 }
@@ -437,22 +495,30 @@ static void pcibios_fixup_bridge_resources(struct pci_dev *dev)
 /*
  *  Called after each bus is probed, but before its children are examined.
  */
-void pcibios_fixup_bus(struct pci_bus *b)
+void __devinit
+pcibios_fixup_bus (struct pci_bus *b)
 {
         struct pci_dev *dev;
 
         if (b->self) {
                 pci_read_bridge_bases(b);
                 pcibios_fixup_bridge_resources(b->self);
+        } else {
+                pcibios_setup_root_windows(b, b->sysdata);
         }
         list_for_each_entry(dev, &b->devices, bus_list)
                 pcibios_fixup_device_resources(dev);
         platform_pci_fixup_bus(b);
+
+        return;
 }
 
-void pcibios_set_master (struct pci_dev *dev)
+void __devinit
+pcibios_update_irq (struct pci_dev *dev, int irq)
 {
-        /* No special bus mastering setup handling */
+        pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
+
+        /* ??? FIXME -- record old value for shutdown.  */
 }
 
 int
@@ -484,6 +550,15 @@ pcibios_align_resource (void *data, const struct resource *res,
         return res->start;
 }
 
+/*
+ * PCI BIOS setup, always defaults to SAL interface
+ */
+char * __init
+pcibios_setup (char *str)
+{
+        return str;
+}
+
 int
 pci_mmap_page_range (struct pci_dev *dev, struct vm_area_struct *vma,
                      enum pci_mmap_state mmap_state, int write_combine)