mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
MIPS: Pass struct device to plat_dma_addr_to_phys()
Signed-off-by: Kevin Cernekee <cernekee@gmail.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
d3f634b96a
commit
3807ef3f61
7 changed files with 20 additions and 13 deletions
|
@ -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);
|
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;
|
return dma_addr;
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,8 @@ static inline dma_addr_t plat_map_dma_mem_page(struct device *dev,
|
||||||
return page_to_phys(page);
|
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;
|
return dma_addr;
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,8 @@ static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)
|
||||||
return pa;
|
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);
|
return dma_addr & ~(0xffUL << 56);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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 */
|
/* 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;
|
unsigned long addr = dma_addr & RAM_OFFSET_MASK;
|
||||||
|
|
||||||
|
|
|
@ -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);
|
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);
|
return vdma_log2phys(dma_addr);
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,8 @@ static inline dma_addr_t plat_map_dma_mem_page(struct device *dev,
|
||||||
return page_to_phys(page) | 0x80000000;
|
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;
|
return dma_addr & 0x7fffffff;
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,9 +20,10 @@
|
||||||
|
|
||||||
#include <dma-coherence.h>
|
#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);
|
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)
|
enum dma_data_direction direction)
|
||||||
{
|
{
|
||||||
if (cpu_is_noncoherent_r10000(dev))
|
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);
|
direction);
|
||||||
|
|
||||||
plat_unmap_dma_mem(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)) {
|
if (cpu_is_noncoherent_r10000(dev)) {
|
||||||
unsigned long addr;
|
unsigned long addr;
|
||||||
|
|
||||||
addr = dma_addr_to_virt(dma_handle);
|
addr = dma_addr_to_virt(dev, dma_handle);
|
||||||
__dma_sync(addr, size, direction);
|
__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)) {
|
if (!plat_device_is_coherent(dev)) {
|
||||||
unsigned long addr;
|
unsigned long addr;
|
||||||
|
|
||||||
addr = dma_addr_to_virt(dma_handle);
|
addr = dma_addr_to_virt(dev, dma_handle);
|
||||||
__dma_sync(addr, size, direction);
|
__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)) {
|
if (cpu_is_noncoherent_r10000(dev)) {
|
||||||
unsigned long addr;
|
unsigned long addr;
|
||||||
|
|
||||||
addr = dma_addr_to_virt(dma_handle);
|
addr = dma_addr_to_virt(dev, dma_handle);
|
||||||
__dma_sync(addr + offset, size, direction);
|
__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)) {
|
if (!plat_device_is_coherent(dev)) {
|
||||||
unsigned long addr;
|
unsigned long addr;
|
||||||
|
|
||||||
addr = dma_addr_to_virt(dma_handle);
|
addr = dma_addr_to_virt(dev, dma_handle);
|
||||||
__dma_sync(addr + offset, size, direction);
|
__dma_sync(addr + offset, size, direction);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue