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

sparc/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: "David S. Miller" <davem@davemloft.net>
Cc: Niklas Schnelle <schnelle@linux.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent e02373fd

arch/sparc/kernel/iommu.c

+0 −2
Original line number Diff line number Diff line
@@ -546,7 +546,6 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist, 


	if (outcount < incount) {

		outs = sg_next(outs);

		outs->dma_address = DMA_MAPPING_ERROR;

		outs->dma_length = 0;

	}
@@ -572,7 +571,6 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist, 
			iommu_tbl_range_free(&iommu->tbl, vaddr, npages,

					     IOMMU_ERROR_CODE);



			s->dma_address = DMA_MAPPING_ERROR;

			s->dma_length = 0;

		}

		if (s == outs)

arch/sparc/kernel/pci_sun4v.c

+0 −2
Original line number Diff line number Diff line
@@ -594,7 +594,6 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist, 


	if (outcount < incount) {

		outs = sg_next(outs);

		outs->dma_address = DMA_MAPPING_ERROR;

		outs->dma_length = 0;

	}
@@ -611,7 +610,6 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist, 
			iommu_tbl_range_free(tbl, vaddr, npages,

					     IOMMU_ERROR_CODE);

			/* XXX demap? XXX */

			s->dma_address = DMA_MAPPING_ERROR;

			s->dma_length = 0;

		}

		if (s == outs)