MIPS: Pass struct device to plat_dma_addr_to_phys()
authorKevin Cernekee <cernekee@gmail.com>
Fri, 24 Apr 2009 00:25:12 +0000 (17:25 -0700)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 17 Jun 2009 10:06:24 +0000 (11:06 +0100)
Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
arch/mips/include/asm/mach-generic/dma-coherence.h
arch/mips/include/asm/mach-ip27/dma-coherence.h
arch/mips/include/asm/mach-ip32/dma-coherence.h
arch/mips/include/asm/mach-jazz/dma-coherence.h
arch/mips/include/asm/mach-lemote/dma-coherence.h
arch/mips/mm/dma-default.c

index 7289e670e884b1537ace45fa157abfc2f94661dd..17d579471ec408fc2ab302e89a15953eac22f21f 100644 (file)
@@ -30,7 +30,8 @@ static inline dma_addr_t plat_map_dma_mem_page(struct device *dev,
        return octeon_map_dma_mem(dev, page_address(page), PAGE_SIZE);
 }
 
-static inline unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)
+static inline unsigned long plat_dma_addr_to_phys(struct device *dev,
+       dma_addr_t dma_addr)
 {
        return dma_addr;
 }
index 804c2def7182faad7778273eb369f4d9c7211536..8da98073e952154cf0e1107fff4060b9ad780ec6 100644 (file)
@@ -23,7 +23,8 @@ static inline dma_addr_t plat_map_dma_mem_page(struct device *dev,
        return page_to_phys(page);
 }
 
-static inline unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)
+static inline unsigned long plat_dma_addr_to_phys(struct device *dev,
+       dma_addr_t dma_addr)
 {
        return dma_addr;
 }
index 86766738d860c038cb12136f443ecd7ac62e2e84..d3d04018a8586945eead0fcc2da6a2e9e50ed1a6 100644 (file)
@@ -33,7 +33,8 @@ static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)
        return pa;
 }
 
-static unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)
+static unsigned long plat_dma_addr_to_phys(struct device *dev,
+       dma_addr_t dma_addr)
 {
        return dma_addr & ~(0xffUL << 56);
 }
index d41805e371674a1d90f3d55b6277b7359bdbec6a..37855955b313310a3cdc4ef531b989d54388ff6b 100644 (file)
@@ -50,7 +50,8 @@ static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)
 }
 
 /* This is almost certainly wrong but it's what dma-ip32.c used to use  */
-static unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)
+static unsigned long plat_dma_addr_to_phys(struct device *dev,
+       dma_addr_t dma_addr)
 {
        unsigned long addr = dma_addr & RAM_OFFSET_MASK;
 
index 5f3d7eaf280be9b3c5837ac0d41d054287c58c7b..f93aee59454a041416ef5054a3efe9e647211037 100644 (file)
@@ -22,7 +22,8 @@ static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)
        return vdma_alloc(page_to_phys(page), PAGE_SIZE);
 }
 
-static unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)
+static unsigned long plat_dma_addr_to_phys(struct device *dev,
+       dma_addr_t dma_addr)
 {
        return vdma_log2phys(dma_addr);
 }
index c78f1d8059a9ca2846055c568562f867e67f2bfa..c8de5e750777e9d0a4b309a73247e9f103688199 100644 (file)
@@ -25,7 +25,8 @@ static inline dma_addr_t plat_map_dma_mem_page(struct device *dev,
        return page_to_phys(page) | 0x80000000;
 }
 
-static inline unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)
+static inline unsigned long plat_dma_addr_to_phys(struct device *dev,
+       dma_addr_t dma_addr)
 {
        return dma_addr & 0x7fffffff;
 }
index 30b108c5782b9b7f5845a41c25ed11e0c66d93bc..7e48e76148aa73aea2de549fb3e9439d16fb6f82 100644 (file)
 
 #include <dma-coherence.h>
 
-static inline unsigned long dma_addr_to_virt(dma_addr_t dma_addr)
+static inline unsigned long dma_addr_to_virt(struct device *dev,
+       dma_addr_t dma_addr)
 {
-       unsigned long addr = plat_dma_addr_to_phys(dma_addr);
+       unsigned long addr = plat_dma_addr_to_phys(dev, dma_addr);
 
        return (unsigned long)phys_to_virt(addr);
 }
@@ -170,7 +171,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(dma_addr_to_virt(dma_addr), size,
+               __dma_sync(dma_addr_to_virt(dev, dma_addr), size,
                           direction);
 
        plat_unmap_dma_mem(dev, dma_addr, size, direction);
@@ -246,7 +247,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 = dma_addr_to_virt(dma_handle);
+               addr = dma_addr_to_virt(dev, dma_handle);
                __dma_sync(addr, size, direction);
        }
 }
@@ -262,7 +263,7 @@ void dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,
        if (!plat_device_is_coherent(dev)) {
                unsigned long addr;
 
-               addr = dma_addr_to_virt(dma_handle);
+               addr = dma_addr_to_virt(dev, dma_handle);
                __dma_sync(addr, size, direction);
        }
 }
@@ -277,7 +278,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 = dma_addr_to_virt(dma_handle);
+               addr = dma_addr_to_virt(dev, dma_handle);
                __dma_sync(addr + offset, size, direction);
        }
 }
@@ -293,7 +294,7 @@ void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,
        if (!plat_device_is_coherent(dev)) {
                unsigned long addr;
 
-               addr = dma_addr_to_virt(dma_handle);
+               addr = dma_addr_to_virt(dev, dma_handle);
                __dma_sync(addr + offset, size, direction);
        }
 }