Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...

[linux-drm-fsl-dcu.git] / arch / mips / mm / dma-default.c

diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index 4a32e939698f6206fd29a8e454309c8b02687236..f0eb29917d9aa3443a44c404f7ca3b5762eb0a99 100644 (file)
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -19,6 +19,13 @@
 
 #include <dma-coherence.h>
 
+static inline unsigned long dma_addr_to_virt(dma_addr_t dma_addr)
+{
+       unsigned long addr = plat_dma_addr_to_phys(dma_addr);
+
+       return (unsigned long)phys_to_virt(addr);
+}
+
 /*
  * Warning on the terminology - Linux calls an uncached area coherent;
  * MIPS terminology calls memory areas with hardware maintained coherency
@@ -140,7 +147,7 @@ void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
        enum dma_data_direction direction)
 {
        if (cpu_is_noncoherent_r10000(dev))
-               __dma_sync(plat_dma_addr_to_phys(dma_addr) + PAGE_OFFSET, size,
+               __dma_sync(dma_addr_to_virt(dma_addr), size,
                           direction);
 
        plat_unmap_dma_mem(dma_addr);
@@ -234,7 +241,7 @@ void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
        if (cpu_is_noncoherent_r10000(dev)) {
                unsigned long addr;
 
-               addr = PAGE_OFFSET + plat_dma_addr_to_phys(dma_handle);
+               addr = dma_addr_to_virt(dma_handle);
                __dma_sync(addr, size, direction);
        }
 }
@@ -246,10 +253,10 @@ void dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,
 {
        BUG_ON(direction == DMA_NONE);
 
-       if (cpu_is_noncoherent_r10000(dev)) {
+       if (!plat_device_is_coherent(dev)) {
                unsigned long addr;
 
-               addr = plat_dma_addr_to_phys(dma_handle);
+               addr = dma_addr_to_virt(dma_handle);
                __dma_sync(addr, size, direction);
        }
 }
@@ -264,7 +271,7 @@ void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle,
        if (cpu_is_noncoherent_r10000(dev)) {
                unsigned long addr;
 
-               addr = PAGE_OFFSET + plat_dma_addr_to_phys(dma_handle);
+               addr = dma_addr_to_virt(dma_handle);
                __dma_sync(addr + offset, size, direction);
        }
 }
@@ -276,10 +283,10 @@ void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,
 {
        BUG_ON(direction == DMA_NONE);
 
-       if (cpu_is_noncoherent_r10000(dev)) {
+       if (!plat_device_is_coherent(dev)) {
                unsigned long addr;
 
-               addr = PAGE_OFFSET + plat_dma_addr_to_phys(dma_handle);
+               addr = dma_addr_to_virt(dma_handle);
                __dma_sync(addr + offset, size, direction);
        }
 }
@@ -295,7 +302,7 @@ void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
 
        /* Make sure that gcc doesn't leave the empty loop body.  */
        for (i = 0; i < nelems; i++, sg++) {
-               if (!plat_device_is_coherent(dev))
+               if (cpu_is_noncoherent_r10000(dev))
                        __dma_sync((unsigned long)page_address(sg->page),
                                   sg->length, direction);
                plat_unmap_dma_mem(sg->dma_address);