davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Logan 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: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Logan Gunthorpe 2021-07-29 14:15:33 -06:00 committed by Christoph Hellwig
parent e02373fddb
commit ba3a0482db
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sparc/kernel/iommu.c
View File

@ -546,7 +546,6 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,
if (outcount < incount) { if (outcount < incount) {
outs = sg_next(outs); outs = sg_next(outs);
outs->dma_address = DMA_MAPPING_ERROR;
outs->dma_length = 0; outs->dma_length = 0;
} }
@ -572,7 +571,6 @@ iommu_map_failed:
iommu_tbl_range_free(&iommu->tbl, vaddr, npages, iommu_tbl_range_free(&iommu->tbl, vaddr, npages,
IOMMU_ERROR_CODE); IOMMU_ERROR_CODE);
s->dma_address = DMA_MAPPING_ERROR;
s->dma_length = 0; s->dma_length = 0;
} }
if (s == outs) if (s == outs)

2
arch/sparc/kernel/pci_sun4v.c
View File

@ -594,7 +594,6 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,
if (outcount < incount) { if (outcount < incount) {
outs = sg_next(outs); outs = sg_next(outs);
outs->dma_address = DMA_MAPPING_ERROR;
outs->dma_length = 0; outs->dma_length = 0;
} }
@ -611,7 +610,6 @@ iommu_map_failed:
iommu_tbl_range_free(tbl, vaddr, npages, iommu_tbl_range_free(tbl, vaddr, npages,
IOMMU_ERROR_CODE); IOMMU_ERROR_CODE);
/* XXX demap? XXX */ /* XXX demap? XXX */
s->dma_address = DMA_MAPPING_ERROR;
s->dma_length = 0; s->dma_length = 0;
} }
if (s == outs) if (s == outs)