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

Commit d29fa0cb authored by Alexander Duyck's avatar Alexander Duyck Committed by Konrad Rzeszutek Wilk
Browse files

swiotlb: Minor fix-ups for DMA_ATTR_SKIP_CPU_SYNC support 



I am updating the paths so that instead of trying to pass
"attr | DMA_ATTR_SKIP_CPU_SYNC" we instead just OR the value into attr and
then pass it since attr will not be used after we make the unmap call.

I realized there was one spot I had missed when I was applying the DMA
attribute to the DMA mapping exception handling.  This change corrects that.

Finally it looks like there is a stray blank line at the end of the
swiotlb_unmap_sg_attrs function that can be dropped.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad@kernel.org>
parent 0443fa00

drivers/xen/swiotlb-xen.c

+2 −2
Original line number Diff line number Diff line
@@ -420,8 +420,8 @@ dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page, 
	if (dma_capable(dev, dev_addr, size))

		return dev_addr;



	swiotlb_tbl_unmap_single(dev, map, size, dir,

				 attrs | DMA_ATTR_SKIP_CPU_SYNC);

	attrs |= DMA_ATTR_SKIP_CPU_SYNC;

	swiotlb_tbl_unmap_single(dev, map, size, dir, attrs);



	return DMA_ERROR_CODE;

}

lib/swiotlb.c

+3 −3
Original line number Diff line number Diff line
@@ -781,8 +781,8 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, 
	if (dma_capable(dev, dev_addr, size))

		return dev_addr;



	swiotlb_tbl_unmap_single(dev, map, size, dir,

				 attrs | DMA_ATTR_SKIP_CPU_SYNC);

	attrs |= DMA_ATTR_SKIP_CPU_SYNC;

	swiotlb_tbl_unmap_single(dev, map, size, dir, attrs);



	return phys_to_dma(dev, io_tlb_overflow_buffer);

}
@@ -912,6 +912,7 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems, 
				/* Don't panic here, we expect map_sg users

				   to do proper error handling. */

				swiotlb_full(hwdev, sg->length, dir, 0);

				attrs |= DMA_ATTR_SKIP_CPU_SYNC;

				swiotlb_unmap_sg_attrs(hwdev, sgl, i, dir,

						       attrs);

				sg_dma_len(sgl) = 0;
@@ -943,7 +944,6 @@ swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl, 
	for_each_sg(sgl, sg, nelems, i)

		unmap_single(hwdev, sg->dma_address, sg_dma_len(sg), dir,

			     attrs);



}

EXPORT_SYMBOL(swiotlb_unmap_sg_attrs);