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

Commit d6883e6f authored by Stefano Stabellini's avatar Stefano Stabellini Committed by David Vrabel
Browse files

swiotlb-xen: pass dev_addr to xen_dma_unmap_page and xen_dma_sync_single_for_cpu 



xen_dma_unmap_page and xen_dma_sync_single_for_cpu take a dma_addr_t
handle as argument, not a physical address.

Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
CC: stable@vger.kernel.org
parent da095a99

drivers/xen/swiotlb-xen.c

+3 −3
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static void xen_unmap_single(struct device *hwdev, dma_addr_t dev_addr, 


	BUG_ON(dir == DMA_NONE);



	xen_dma_unmap_page(hwdev, paddr, size, dir, attrs);

	xen_dma_unmap_page(hwdev, dev_addr, size, dir, attrs);



	/* NOTE: We use dev_addr here, not paddr! */

	if (is_xen_swiotlb_buffer(dev_addr)) {
@@ -497,14 +497,14 @@ xen_swiotlb_sync_single(struct device *hwdev, dma_addr_t dev_addr, 
	BUG_ON(dir == DMA_NONE);



	if (target == SYNC_FOR_CPU)

		xen_dma_sync_single_for_cpu(hwdev, paddr, size, dir);

		xen_dma_sync_single_for_cpu(hwdev, dev_addr, size, dir);



	/* NOTE: We use dev_addr here, not paddr! */

	if (is_xen_swiotlb_buffer(dev_addr))

		swiotlb_tbl_sync_single(hwdev, paddr, size, dir, target);



	if (target == SYNC_FOR_DEVICE)

		xen_dma_sync_single_for_cpu(hwdev, paddr, size, dir);

		xen_dma_sync_single_for_cpu(hwdev, dev_addr, size, dir);



	if (dir != DMA_FROM_DEVICE)

		return;