Commit eb86ef3b authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Christoph Hellwig
Browse files

powerpc/iommu: don't set failed sg dma_address to DMA_MAPPING_ERROR 

Setting the ->dma_address to DMA_MAPPING_ERROR is not part of
the ->map_sg calling convention, so remove it.

Link: https://lore.kernel.org/linux-mips/20210716063241.GC13345@lst.de/


Suggested-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Geoff Levand <geoff@infradead.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent c4e0e892

arch/powerpc/kernel/iommu.c

+0 −2
Original line number Diff line number Diff line
@@ -575,7 +575,6 @@ int ppc_iommu_map_sg(struct device *dev, struct iommu_table *tbl, 
	 */

	if (outcount < incount) {

		outs = sg_next(outs);

		outs->dma_address = DMA_MAPPING_ERROR;

		outs->dma_length = 0;

	}
@@ -593,7 +592,6 @@ int ppc_iommu_map_sg(struct device *dev, struct iommu_table *tbl, 
			npages = iommu_num_pages(s->dma_address, s->dma_length,

						 IOMMU_PAGE_SIZE(tbl));

			__iommu_free(tbl, vaddr, npages);

			s->dma_address = DMA_MAPPING_ERROR;

			s->dma_length = 0;

		}

		if (s == outs)