From e292a02f1654f19fba8a884713a7babb4b917ec3 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Tue, 4 Aug 2009 19:08:27 +0000 Subject: [PATCH] --- yaml --- r: 161780 b: refs/heads/master c: 4a9a6bfe707cfe5bcb0a20eabe240293a095cd10 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/dma-mapping.h | 5 +++++ trunk/arch/powerpc/kernel/dma-swiotlb.c | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c67631be87bf..fd5a6d638276 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46bab4e4b45ec522ecd5fa4a0e2b4a6e6d1f153a +refs/heads/master: 4a9a6bfe707cfe5bcb0a20eabe240293a095cd10 diff --git a/trunk/arch/powerpc/include/asm/dma-mapping.h b/trunk/arch/powerpc/include/asm/dma-mapping.h index 91217e4a0bfc..4bd41b4051e3 100644 --- a/trunk/arch/powerpc/include/asm/dma-mapping.h +++ b/trunk/arch/powerpc/include/asm/dma-mapping.h @@ -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) { + 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 return (dma_addr == DMA_ERROR_CODE); #else diff --git a/trunk/arch/powerpc/kernel/dma-swiotlb.c b/trunk/arch/powerpc/kernel/dma-swiotlb.c index d1143a68d82a..e96cbbd9b449 100644 --- a/trunk/arch/powerpc/kernel/dma-swiotlb.c +++ b/trunk/arch/powerpc/kernel/dma-swiotlb.c @@ -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_device = swiotlb_sync_single_range_for_device, .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)