[IA64-SGI] sn2-pci-dma-abstraction.patch

Provide an abstraction of the altix pci dma runtime layer so that multiple
pci-based bridges can be supported.

Signed-off-by: Mark Maule <maule@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

3 files changed, 91 insertions, 67 deletions

diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c
index f680824f819d..c2b92b94c563 100644
--- a/arch/ia64/sn/pci/pci_dma.c
+++ b/arch/ia64/sn/pci/pci_dma.c
@@ -14,7 +14,6 @@
 #include <asm/sn/sn_sal.h>
 #include "pci/pcibus_provider_defs.h"
 #include "pci/pcidev.h"
-#include "pci/pcibr_provider.h"
 
 #define SG_ENT_VIRT_ADDRESS(sg) (page_address((sg)->page) + (sg)->offset)
 #define SG_ENT_PHYS_ADDRESS(SG) virt_to_phys(SG_ENT_VIRT_ADDRESS(SG))
@@ -79,7 +78,8 @@ void *sn_dma_alloc_coherent(struct device *dev, size_t size,
 {
         void *cpuaddr;
         unsigned long phys_addr;
-        struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(to_pci_dev(dev));
+        struct pci_dev *pdev = to_pci_dev(dev);
+        struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
 
         BUG_ON(dev->bus != &pci_bus_type);
 
@@ -102,8 +102,7 @@ void *sn_dma_alloc_coherent(struct device *dev, size_t size,
          * resources.
          */
 
-        *dma_handle = pcibr_dma_map(pcidev_info, phys_addr, size,
-                                    SN_PCIDMA_CONSISTENT);
+        *dma_handle = provider->dma_map_consistent(pdev, phys_addr, size);
         if (!*dma_handle) {
                 printk(KERN_ERR "%s: out of ATEs\n", __FUNCTION__);
                 free_pages((unsigned long)cpuaddr, get_order(size));
@@ -127,11 +126,12 @@ EXPORT_SYMBOL(sn_dma_alloc_coherent);
 void sn_dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
                           dma_addr_t dma_handle)
 {
-        struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(to_pci_dev(dev));
+        struct pci_dev *pdev = to_pci_dev(dev);
+        struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
 
         BUG_ON(dev->bus != &pci_bus_type);
 
-        pcibr_dma_unmap(pcidev_info, dma_handle, 0);
+        provider->dma_unmap(pdev, dma_handle, 0);
         free_pages((unsigned long)cpu_addr, get_order(size));
 }
 EXPORT_SYMBOL(sn_dma_free_coherent);
@@ -159,12 +159,13 @@ dma_addr_t sn_dma_map_single(struct device *dev, void *cpu_addr, size_t size,
 {
         dma_addr_t dma_addr;
         unsigned long phys_addr;
-        struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(to_pci_dev(dev));
+        struct pci_dev *pdev = to_pci_dev(dev);
+        struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
 
         BUG_ON(dev->bus != &pci_bus_type);
 
         phys_addr = __pa(cpu_addr);
-        dma_addr = pcibr_dma_map(pcidev_info, phys_addr, size, 0);
+        dma_addr = provider->dma_map(pdev, phys_addr, size);
         if (!dma_addr) {
                 printk(KERN_ERR "%s: out of ATEs\n", __FUNCTION__);
                 return 0;
@@ -187,10 +188,12 @@ EXPORT_SYMBOL(sn_dma_map_single);
 void sn_dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
                          int direction)
 {
-        struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(to_pci_dev(dev));
+        struct pci_dev *pdev = to_pci_dev(dev);
+        struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
 
         BUG_ON(dev->bus != &pci_bus_type);
-        pcibr_dma_unmap(pcidev_info, dma_addr, direction);
+
+        provider->dma_unmap(pdev, dma_addr, direction);
 }
 EXPORT_SYMBOL(sn_dma_unmap_single);
 
@@ -207,12 +210,13 @@ void sn_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
                      int nhwentries, int direction)
 {
         int i;
-        struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(to_pci_dev(dev));
+        struct pci_dev *pdev = to_pci_dev(dev);
+        struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
 
         BUG_ON(dev->bus != &pci_bus_type);
 
         for (i = 0; i < nhwentries; i++, sg++) {
-                pcibr_dma_unmap(pcidev_info, sg->dma_address, direction);
+                provider->dma_unmap(pdev, sg->dma_address, direction);
                 sg->dma_address = (dma_addr_t) NULL;
                 sg->dma_length = 0;
         }
@@ -233,7 +237,8 @@ int sn_dma_map_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
 {
         unsigned long phys_addr;
         struct scatterlist *saved_sg = sg;
-        struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(to_pci_dev(dev));
+        struct pci_dev *pdev = to_pci_dev(dev);
+        struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
         int i;
 
         BUG_ON(dev->bus != &pci_bus_type);
@@ -243,8 +248,8 @@ int sn_dma_map_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
          */
         for (i = 0; i < nhwentries; i++, sg++) {
                 phys_addr = SG_ENT_PHYS_ADDRESS(sg);
-                sg->dma_address = pcibr_dma_map(pcidev_info, phys_addr,
-                                                sg->length, 0);
+                sg->dma_address = provider->dma_map(pdev,
+                                                    phys_addr, sg->length);
 
                 if (!sg->dma_address) {
                         printk(KERN_ERR "%s: out of ATEs\n", __FUNCTION__);
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_dma.c b/arch/ia64/sn/pci/pcibr/pcibr_dma.c
index b1d66ac065c8..3c305f46417f 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_dma.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_dma.c
@@ -40,7 +40,7 @@ extern int sn_ioif_inited;
  *      we do not have to allocate entries in the PMU.
  */
 
-static uint64_t
+static dma_addr_t
 pcibr_dmamap_ate32(struct pcidev_info *info,
                    uint64_t paddr, size_t req_size, uint64_t flags)
 {
@@ -109,7 +109,7 @@ pcibr_dmamap_ate32(struct pcidev_info *info,
         return pci_addr;
 }
 
-static uint64_t
+static dma_addr_t
 pcibr_dmatrans_direct64(struct pcidev_info * info, uint64_t paddr,
                         uint64_t dma_attributes)
 {
@@ -141,7 +141,7 @@ pcibr_dmatrans_direct64(struct pcidev_info * info, uint64_t paddr,
 
 }
 
-static uint64_t
+static dma_addr_t
 pcibr_dmatrans_direct32(struct pcidev_info * info,
                         uint64_t paddr, size_t req_size, uint64_t flags)
 {
@@ -180,11 +180,11 @@ pcibr_dmatrans_direct32(struct pcidev_info * info,
  * DMA mappings for Direct 64 and 32 do not have any DMA maps.
  */
 void
-pcibr_dma_unmap(struct pcidev_info *pcidev_info, dma_addr_t dma_handle,
-                int direction)
+pcibr_dma_unmap(struct pci_dev *hwdev, dma_addr_t dma_handle, int direction)
 {
-        struct pcibus_info *pcibus_info = (struct pcibus_info *)pcidev_info->
-            pdi_pcibus_info;
+        struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(hwdev);
+        struct pcibus_info *pcibus_info =
+            (struct pcibus_info *)pcidev_info->pdi_pcibus_info;
 
         if (IS_PCI32_MAPPED(dma_handle)) {
                 int ate_index;
@@ -316,64 +316,63 @@ void sn_dma_flush(uint64_t addr)
 }
 
 /*
- * Wrapper DMA interface.  Called from pci_dma.c routines.
+ * DMA interfaces.  Called from pci_dma.c routines.
  */
 
-uint64_t
-pcibr_dma_map(struct pcidev_info * pcidev_info, unsigned long phys_addr,
-              size_t size, unsigned int flags)
+dma_addr_t
+pcibr_dma_map(struct pci_dev * hwdev, unsigned long phys_addr, size_t size)
 {
         dma_addr_t dma_handle;
-        struct pci_dev *pcidev = pcidev_info->pdi_linux_pcidev;
-
-        if (flags & SN_PCIDMA_CONSISTENT) {
-                /* sn_pci_alloc_consistent interfaces */
-                if (pcidev->dev.coherent_dma_mask == ~0UL) {
-                        dma_handle =
-                            pcibr_dmatrans_direct64(pcidev_info, phys_addr,
-                                                    PCI64_ATTR_BAR);
-                } else {
-                        dma_handle =
-                            (dma_addr_t) pcibr_dmamap_ate32(pcidev_info,
-                                                            phys_addr, size,
-                                                            PCI32_ATE_BAR);
-                }
-        } else {
-                /* map_sg/map_single interfaces */
+        struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(hwdev);
 
-                /* SN cannot support DMA addresses smaller than 32 bits. */
-                if (pcidev->dma_mask < 0x7fffffff) {
-                        return 0;
-                }
+        /* SN cannot support DMA addresses smaller than 32 bits. */
+        if (hwdev->dma_mask < 0x7fffffff) {
+                return 0;
+        }
 
-                if (pcidev->dma_mask == ~0UL) {
+        if (hwdev->dma_mask == ~0UL) {
+                /*
+                 * Handle the most common case: 64 bit cards.  This
+                 * call should always succeed.
+                 */
+
+                dma_handle = pcibr_dmatrans_direct64(pcidev_info, phys_addr,
+                                                     PCI64_ATTR_PREF);
+        } else {
+                /* Handle 32-63 bit cards via direct mapping */
+                dma_handle = pcibr_dmatrans_direct32(pcidev_info, phys_addr,
+                                                     size, 0);
+                if (!dma_handle) {
                         /*
-                         * Handle the most common case: 64 bit cards.  This
-                         * call should always succeed.
+                         * It is a 32 bit card and we cannot do direct mapping,
+                         * so we use an ATE.
                          */
 
-                        dma_handle =
-                            pcibr_dmatrans_direct64(pcidev_info, phys_addr,
-                                                    PCI64_ATTR_PREF);
-                } else {
-                        /* Handle 32-63 bit cards via direct mapping */
-                        dma_handle =
-                            pcibr_dmatrans_direct32(pcidev_info, phys_addr,
-                                                    size, 0);
-                        if (!dma_handle) {
-                                /*
-                                 * It is a 32 bit card and we cannot do direct mapping,
-                                 * so we use an ATE.
-                                 */
-
-                                dma_handle =
-                                    pcibr_dmamap_ate32(pcidev_info, phys_addr,
-                                                       size, PCI32_ATE_PREF);
-                        }
+                        dma_handle = pcibr_dmamap_ate32(pcidev_info, phys_addr,
+                                                        size, PCI32_ATE_PREF);
                 }
         }
 
         return dma_handle;
 }
 
+dma_addr_t
+pcibr_dma_map_consistent(struct pci_dev * hwdev, unsigned long phys_addr,
+                         size_t size)
+{
+        dma_addr_t dma_handle;
+        struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(hwdev);
+
+        if (hwdev->dev.coherent_dma_mask == ~0UL) {
+                dma_handle = pcibr_dmatrans_direct64(pcidev_info, phys_addr,
+                                            PCI64_ATTR_BAR);
+        } else {
+                dma_handle = (dma_addr_t) pcibr_dmamap_ate32(pcidev_info,
+                                                    phys_addr, size,
+                                                    PCI32_ATE_BAR);
+        }
+
+        return dma_handle;
+}
+
 EXPORT_SYMBOL(sn_dma_flush);
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
index 92bd278cf7ff..539ab1fdab21 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
@@ -168,3 +168,23 @@ void pcibr_change_devices_irq(struct sn_irq_info *sn_irq_info)
                 pcibr_force_interrupt(sn_irq_info);
         }
 }
+
+/*
+ * Provider entries for PIC/CP
+ */
+
+struct sn_pcibus_provider pcibr_provider = {
+        .dma_map = pcibr_dma_map,
+        .dma_map_consistent = pcibr_dma_map_consistent,
+        .dma_unmap = pcibr_dma_unmap,
+        .bus_fixup = pcibr_bus_fixup,
+};
+
+int
+pcibr_init_provider(void)
+{
+        sn_pci_provider[PCIIO_ASIC_TYPE_PIC] = &pcibr_provider;
+        sn_pci_provider[PCIIO_ASIC_TYPE_TIOCP] = &pcibr_provider;
+
+        return 0;
+}