lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: Handle SWIOTLB mapping error properly

Browse Source 
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
FUJITA Tomonori
2009-08-04 19:08:27 +00:00
committed by Benjamin Herrenschmidt
parent 46bab4e4b4
commit 4a9a6bfe70
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/include/asm/dma-mapping.h
View File

@@ -143,6 +143,11 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
{ {
struct dma_map_ops *dma_ops = get_dma_ops(dev);
if (dma_ops->mapping_error)
return dma_ops->mapping_error(dev, dma_addr);
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
return (dma_addr == DMA_ERROR_CODE); return (dma_addr == DMA_ERROR_CODE);
#else #else

3
arch/powerpc/kernel/dma-swiotlb.c
View File

@@ -42,7 +42,8 @@ struct dma_map_ops swiotlb_dma_ops = {
.sync_single_range_for_cpu = swiotlb_sync_single_range_for_cpu, .sync_single_range_for_cpu = swiotlb_sync_single_range_for_cpu,
.sync_single_range_for_device = swiotlb_sync_single_range_for_device, .sync_single_range_for_device = swiotlb_sync_single_range_for_device,
.sync_sg_for_cpu = swiotlb_sync_sg_for_cpu, .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
.sync_sg_for_device = swiotlb_sync_sg_for_device .sync_sg_for_device = swiotlb_sync_sg_for_device,
.mapping_error = swiotlb_dma_mapping_error,
}; };
void pci_dma_dev_setup_swiotlb(struct pci_dev *pdev) void pci_dma_dev_setup_swiotlb(struct pci_dev *pdev)