Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

mips/jazz: remove the mapping_error dma_map_ops method

Browse Source 
The Jazz iommu code already returns (~(dma_addr_t)0x0) on mapping
failures, so we can switch over to returning DMA_MAPPING_ERROR and
let the core dma-mapping code handle the rest.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Christoph Hellwig 2018-11-21 19:18:58 +01:00
parent d11e3d3d03
commit 122da4e081
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/mips/include/asm/jazzdma.h
View File

@ -39,12 +39,6 @@ extern int vdma_get_enable(int channel);
#define VDMA_PAGE(a) ((unsigned int)(a) >> 12) #define VDMA_PAGE(a) ((unsigned int)(a) >> 12)
#define VDMA_OFFSET(a) ((unsigned int)(a) & (VDMA_PAGESIZE-1)) #define VDMA_OFFSET(a) ((unsigned int)(a) & (VDMA_PAGESIZE-1))
/*
* error code returned by vdma_alloc()
* (See also arch/mips/kernel/jazzdma.c)
*/
#define VDMA_ERROR 0xffffffff
/* /*
* VDMA pagetable entry description * VDMA pagetable entry description
*/ */

16
arch/mips/jazz/jazzdma.c
View File

@ -104,12 +104,12 @@ unsigned long vdma_alloc(unsigned long paddr, unsigned long size)
if (vdma_debug) if (vdma_debug)
printk("vdma_alloc: Invalid physical address: %08lx\n", printk("vdma_alloc: Invalid physical address: %08lx\n",
paddr); paddr);
return VDMA_ERROR; /* invalid physical address */ return DMA_MAPPING_ERROR; /* invalid physical address */
} }
if (size > 0x400000 || size == 0) { if (size > 0x400000 || size == 0) {
if (vdma_debug) if (vdma_debug)
printk("vdma_alloc: Invalid size: %08lx\n", size); printk("vdma_alloc: Invalid size: %08lx\n", size);
return VDMA_ERROR; /* invalid physical address */ return DMA_MAPPING_ERROR; /* invalid physical address */
} }
spin_lock_irqsave(&vdma_lock, flags); spin_lock_irqsave(&vdma_lock, flags);
@ -123,7 +123,7 @@ unsigned long vdma_alloc(unsigned long paddr, unsigned long size)
first < VDMA_PGTBL_ENTRIES) first++; first < VDMA_PGTBL_ENTRIES) first++;
if (first + pages > VDMA_PGTBL_ENTRIES) { /* nothing free */ if (first + pages > VDMA_PGTBL_ENTRIES) { /* nothing free */
spin_unlock_irqrestore(&vdma_lock, flags); spin_unlock_irqrestore(&vdma_lock, flags);
return VDMA_ERROR; return DMA_MAPPING_ERROR;
} }
last = first + 1; last = first + 1;
@ -569,7 +569,7 @@ static void *jazz_dma_alloc(struct device *dev, size_t size,
return NULL; return NULL;
*dma_handle = vdma_alloc(virt_to_phys(ret), size); *dma_handle = vdma_alloc(virt_to_phys(ret), size);
if (*dma_handle == VDMA_ERROR) { if (*dma_handle == DMA_MAPPING_ERROR) {
dma_direct_free_pages(dev, size, ret, *dma_handle, attrs); dma_direct_free_pages(dev, size, ret, *dma_handle, attrs);
return NULL; return NULL;
} }
@ -620,7 +620,7 @@ static int jazz_dma_map_sg(struct device *dev, struct scatterlist *sglist,
arch_sync_dma_for_device(dev, sg_phys(sg), sg->length, arch_sync_dma_for_device(dev, sg_phys(sg), sg->length,
dir); dir);
sg->dma_address = vdma_alloc(sg_phys(sg), sg->length); sg->dma_address = vdma_alloc(sg_phys(sg), sg->length);
if (sg->dma_address == VDMA_ERROR) if (sg->dma_address == DMA_MAPPING_ERROR)
return 0; return 0;
sg_dma_len(sg) = sg->length; sg_dma_len(sg) = sg->length;
} }
@ -674,11 +674,6 @@ static void jazz_dma_sync_sg_for_cpu(struct device *dev,
arch_sync_dma_for_cpu(dev, sg_phys(sg), sg->length, dir); arch_sync_dma_for_cpu(dev, sg_phys(sg), sg->length, dir);
} }
static int jazz_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
{
return dma_addr == VDMA_ERROR;
}
const struct dma_map_ops jazz_dma_ops = { const struct dma_map_ops jazz_dma_ops = {
.alloc = jazz_dma_alloc, .alloc = jazz_dma_alloc,
.free = jazz_dma_free, .free = jazz_dma_free,
@ -692,6 +687,5 @@ const struct dma_map_ops jazz_dma_ops = {
.sync_sg_for_device = jazz_dma_sync_sg_for_device, .sync_sg_for_device = jazz_dma_sync_sg_for_device,
.dma_supported = dma_direct_supported, .dma_supported = dma_direct_supported,
.cache_sync = arch_dma_cache_sync, .cache_sync = arch_dma_cache_sync,
.mapping_error = jazz_dma_mapping_error,
}; };
EXPORT_SYMBOL(jazz_dma_ops); EXPORT_SYMBOL(jazz_dma_ops);