Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a9a6bfe authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Benjamin Herrenschmidt
Browse files

powerpc: Handle SWIOTLB mapping error properly 



Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 46bab4e4

arch/powerpc/include/asm/dma-mapping.h

+5 −0
Original line number Diff line number Diff line
@@ -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

arch/powerpc/kernel/dma-swiotlb.c

+2 −1
Original line number Diff line number Diff line
@@ -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)