mn10300/PCI: get rid of device resource fixups

Tell the PCI core about host bridge address translation so it can take
care of bus-to-resource conversion for us.

CC: David Howells <dhowells@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/arch/mn10300/include/asm/pci.h b/arch/mn10300/include/asm/pci.h
index 6095a28561ddc483e5c054912520191a265b9734..dfe1581c0c9db12ddd8dda845e125f34b34497de 100644 (file)
--- a/arch/mn10300/include/asm/pci.h
+++ b/arch/mn10300/include/asm/pci.h
@@ -85,21 +85,7 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
 /* implement the pci_ DMA API in terms of the generic device dma_ one */
 #include <asm-generic/pci-dma-compat.h>
 
-/**
- * pcibios_resource_to_bus - convert resource to PCI bus address
- * @dev: device which owns this resource
- * @region: converted bus-centric region (start,end)
- * @res: resource to convert
- *
- * Convert a resource to a PCI device bus address or bus window.
- */
-extern void pcibios_resource_to_bus(struct pci_dev *dev,
-                                   struct pci_bus_region *region,
-                                   struct resource *res);
-
-extern void pcibios_bus_to_resource(struct pci_dev *dev,
-                                   struct resource *res,
-                                   struct pci_bus_region *region);
+#define ARCH_HAS_GENERIC_PCI_OFFSETS
 
 static inline struct resource *
 pcibios_select_root(struct pci_dev *pdev, struct resource *res)

diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c
index a7c5f08ca9f5ecfb1aee4930552e89b317e9e8e5..6dce9fc2cf3c131ce6349a291775441e0a3f5c43 100644 (file)
--- a/arch/mn10300/unit-asb2305/pci.c
+++ b/arch/mn10300/unit-asb2305/pci.c
@@ -32,8 +32,7 @@ struct pci_ops *pci_root_ops;
  * insert specific PCI bus resources instead of using the platform-level bus
  * resources directly for the PCI root bus.
  *
- * These are configured and inserted by pcibios_init() and are attached to the
- * root bus by pcibios_fixup_bus().
+ * These are configured and inserted by pcibios_init().
  */
 static struct resource pci_ioport_resource = {
        .name   = "PCI IO",
@@ -77,52 +76,6 @@ static inline int __query(const struct pci_bus *bus, unsigned int devfn)
        return 1;
 }
 
-/*
- * translate Linuxcentric addresses to PCI bus addresses
- */
-void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
-                            struct resource *res)
-{
-       if (res->flags & IORESOURCE_IO) {
-               region->start = (res->start & 0x00ffffff);
-               region->end   = (res->end   & 0x00ffffff);
-       }
-
-       if (res->flags & IORESOURCE_MEM) {
-               region->start = (res->start & 0x03ffffff) | MEM_PAGING_REG;
-               region->end   = (res->end   & 0x03ffffff) | MEM_PAGING_REG;
-       }
-
-#if 0
-       printk(KERN_DEBUG "RES->BUS: %lx-%lx => %lx-%lx\n",
-              res->start, res->end, region->start, region->end);
-#endif
-}
-EXPORT_SYMBOL(pcibios_resource_to_bus);
-
-/*
- * translate PCI bus addresses to Linuxcentric addresses
- */
-void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
-                            struct pci_bus_region *region)
-{
-       if (res->flags & IORESOURCE_IO) {
-               res->start = (region->start & 0x00ffffff) | 0xbe000000;
-               res->end   = (region->end   & 0x00ffffff) | 0xbe000000;
-       }
-
-       if (res->flags & IORESOURCE_MEM) {
-               res->start = (region->start & 0x03ffffff) | 0xb8000000;
-               res->end   = (region->end   & 0x03ffffff) | 0xb8000000;
-       }
-
-#if 0
-       printk(KERN_INFO "BUS->RES: %lx-%lx => %lx-%lx\n",
-              region->start, region->end, res->start, res->end);
-#endif
-}
-EXPORT_SYMBOL(pcibios_bus_to_resource);
-
 /*
  *
  */
@@ -364,9 +317,6 @@ static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev)
                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);
        }
@@ -397,6 +347,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
  */
 static int __init pcibios_init(void)
 {
+       resource_size_t io_offset, mem_offset;
        LIST_HEAD(resources);
 
        ioport_resource.start   = 0xA0000000;
@@ -420,8 +371,13 @@ static int __init pcibios_init(void)
        printk(KERN_INFO "PCI: Probing PCI hardware [mempage %08x]\n",
               MEM_PAGING_REG);
 
-       pci_add_resource(&resources, &pci_ioport_resource);
-       pci_add_resource(&resources, &pci_iomem_resource);
+       io_offset = pci_ioport_resource.start -
+           (pci_ioport_resource.start & 0x00ffffff);
+       mem_offset = pci_iomem_resource.start -
+           ((pci_iomem_resource.start & 0x03ffffff) | MEM_PAGING_REG);
+
+       pci_add_resource_offset(&resources, &pci_ioport_resource, io_offset);
+       pci_add_resource_offset(&resources, &pci_iomem_resource, mem_offset);
        pci_root_bus = pci_scan_root_bus(NULL, 0, &pci_direct_ampci, NULL,
                                         &resources);