vserver 2.0 rc7

[linux-2.6.git] / arch / ppc64 / kernel / dma.c

diff --git a/arch/ppc64/kernel/dma.c b/arch/ppc64/kernel/dma.c
index c087251..ce714c9 100644 (file)
--- a/arch/ppc64/kernel/dma.c
+++ b/arch/ppc64/kernel/dma.c
@@ -13,14 +13,23 @@
 #include <asm/scatterlist.h>
 #include <asm/bug.h>
 
-int dma_supported(struct device *dev, u64 mask)
+static struct dma_mapping_ops *get_dma_ops(struct device *dev)
 {
        if (dev->bus == &pci_bus_type)
-               return pci_dma_supported(to_pci_dev(dev), mask);
+               return &pci_dma_ops;
 #ifdef CONFIG_IBMVIO
        if (dev->bus == &vio_bus_type)
-               return vio_dma_supported(to_vio_dev(dev), mask);
-#endif /* CONFIG_IBMVIO */
+               return &vio_dma_ops;
+#endif
+       return NULL;
+}
+
+int dma_supported(struct device *dev, u64 mask)
+{
+       struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
+
+       if (dma_ops)
+               return dma_ops->dma_supported(dev, mask);
        BUG();
        return 0;
 }
@@ -32,7 +41,7 @@ int dma_set_mask(struct device *dev, u64 dma_mask)
                return pci_set_dma_mask(to_pci_dev(dev), dma_mask);
 #ifdef CONFIG_IBMVIO
        if (dev->bus == &vio_bus_type)
-               return vio_set_dma_mask(to_vio_dev(dev), dma_mask);
+               return -EIO;
 #endif /* CONFIG_IBMVIO */
        BUG();
        return 0;
@@ -40,14 +49,12 @@ int dma_set_mask(struct device *dev, u64 dma_mask)
 EXPORT_SYMBOL(dma_set_mask);
 
 void *dma_alloc_coherent(struct device *dev, size_t size,
-               dma_addr_t *dma_handle, int flag)
+               dma_addr_t *dma_handle, unsigned int __nocast flag)
 {
-       if (dev->bus == &pci_bus_type)
-               return pci_alloc_consistent(to_pci_dev(dev), size, dma_handle);
-#ifdef CONFIG_IBMVIO
-       if (dev->bus == &vio_bus_type)
-               return vio_alloc_consistent(to_vio_dev(dev), size, dma_handle);
-#endif /* CONFIG_IBMVIO */
+       struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
+
+       if (dma_ops)
+               return dma_ops->alloc_coherent(dev, size, dma_handle, flag);
        BUG();
        return NULL;
 }
@@ -56,12 +63,10 @@ EXPORT_SYMBOL(dma_alloc_coherent);
 void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
                dma_addr_t dma_handle)
 {
-       if (dev->bus == &pci_bus_type)
-               pci_free_consistent(to_pci_dev(dev), size, cpu_addr, dma_handle);
-#ifdef CONFIG_IBMVIO
-       else if (dev->bus == &vio_bus_type)
-               vio_free_consistent(to_vio_dev(dev), size, cpu_addr, dma_handle);
-#endif /* CONFIG_IBMVIO */
+       struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
+
+       if (dma_ops)
+               dma_ops->free_coherent(dev, size, cpu_addr, dma_handle);
        else
                BUG();
 }
@@ -70,12 +75,10 @@ EXPORT_SYMBOL(dma_free_coherent);
 dma_addr_t dma_map_single(struct device *dev, void *cpu_addr, size_t size,
                enum dma_data_direction direction)
 {
-       if (dev->bus == &pci_bus_type)
-               return pci_map_single(to_pci_dev(dev), cpu_addr, size, (int)direction);
-#ifdef CONFIG_IBMVIO
-       if (dev->bus == &vio_bus_type)
-               return vio_map_single(to_vio_dev(dev), cpu_addr, size, direction);
-#endif /* CONFIG_IBMVIO */
+       struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
+
+       if (dma_ops)
+               return dma_ops->map_single(dev, cpu_addr, size, direction);
        BUG();
        return (dma_addr_t)0;
 }
@@ -84,12 +87,10 @@ EXPORT_SYMBOL(dma_map_single);
 void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
                enum dma_data_direction direction)
 {
-       if (dev->bus == &pci_bus_type)
-               pci_unmap_single(to_pci_dev(dev), dma_addr, size, (int)direction);
-#ifdef CONFIG_IBMVIO
-       else if (dev->bus == &vio_bus_type)
-               vio_unmap_single(to_vio_dev(dev), dma_addr, size, direction);
-#endif /* CONFIG_IBMVIO */
+       struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
+
+       if (dma_ops)
+               dma_ops->unmap_single(dev, dma_addr, size, direction);
        else
                BUG();
 }
@@ -99,12 +100,11 @@ dma_addr_t dma_map_page(struct device *dev, struct page *page,
                unsigned long offset, size_t size,
                enum dma_data_direction direction)
 {
-       if (dev->bus == &pci_bus_type)
-               return pci_map_page(to_pci_dev(dev), page, offset, size, (int)direction);
-#ifdef CONFIG_IBMVIO
-       if (dev->bus == &vio_bus_type)
-               return vio_map_page(to_vio_dev(dev), page, offset, size, direction);
-#endif /* CONFIG_IBMVIO */
+       struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
+
+       if (dma_ops)
+               return dma_ops->map_single(dev,
+                               (page_address(page) + offset), size, direction);
        BUG();
        return (dma_addr_t)0;
 }
@@ -113,12 +113,10 @@ EXPORT_SYMBOL(dma_map_page);
 void dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
                enum dma_data_direction direction)
 {
-       if (dev->bus == &pci_bus_type)
-               pci_unmap_page(to_pci_dev(dev), dma_address, size, (int)direction);
-#ifdef CONFIG_IBMVIO
-       else if (dev->bus == &vio_bus_type)
-               vio_unmap_page(to_vio_dev(dev), dma_address, size, direction);
-#endif /* CONFIG_IBMVIO */
+       struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
+
+       if (dma_ops)
+               dma_ops->unmap_single(dev, dma_address, size, direction);
        else
                BUG();
 }
@@ -127,12 +125,10 @@ EXPORT_SYMBOL(dma_unmap_page);
 int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
                enum dma_data_direction direction)
 {
-       if (dev->bus == &pci_bus_type)
-               return pci_map_sg(to_pci_dev(dev), sg, nents, (int)direction);
-#ifdef CONFIG_IBMVIO
-       if (dev->bus == &vio_bus_type)
-               return vio_map_sg(to_vio_dev(dev), sg, nents, direction);
-#endif /* CONFIG_IBMVIO */
+       struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
+
+       if (dma_ops)
+               return dma_ops->map_sg(dev, sg, nents, direction);
        BUG();
        return 0;
 }
@@ -141,12 +137,10 @@ EXPORT_SYMBOL(dma_map_sg);
 void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
                enum dma_data_direction direction)
 {
-       if (dev->bus == &pci_bus_type)
-               pci_unmap_sg(to_pci_dev(dev), sg, nhwentries, (int)direction);
-#ifdef CONFIG_IBMVIO
-       else if (dev->bus == &vio_bus_type)
-               vio_unmap_sg(to_vio_dev(dev), sg, nhwentries, direction);
-#endif /* CONFIG_IBMVIO */
+       struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
+
+       if (dma_ops)
+               dma_ops->unmap_sg(dev, sg, nhwentries, direction);
        else
                BUG();
 }