swiotlb-xen: pass dev_addr to xen_dma_unmap_page and xen_dma_sync_single_for_cpu
commit d6883e6f32
upstream.
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: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
349dec7ebe
commit
56da366338
|
@ -447,7 +447,7 @@ static void xen_unmap_single(struct device *hwdev, dma_addr_t dev_addr,
|
||||||
|
|
||||||
BUG_ON(dir == DMA_NONE);
|
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! */
|
/* NOTE: We use dev_addr here, not paddr! */
|
||||||
if (is_xen_swiotlb_buffer(dev_addr)) {
|
if (is_xen_swiotlb_buffer(dev_addr)) {
|
||||||
|
@ -495,14 +495,14 @@ xen_swiotlb_sync_single(struct device *hwdev, dma_addr_t dev_addr,
|
||||||
BUG_ON(dir == DMA_NONE);
|
BUG_ON(dir == DMA_NONE);
|
||||||
|
|
||||||
if (target == SYNC_FOR_CPU)
|
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! */
|
/* NOTE: We use dev_addr here, not paddr! */
|
||||||
if (is_xen_swiotlb_buffer(dev_addr))
|
if (is_xen_swiotlb_buffer(dev_addr))
|
||||||
swiotlb_tbl_sync_single(hwdev, paddr, size, dir, target);
|
swiotlb_tbl_sync_single(hwdev, paddr, size, dir, target);
|
||||||
|
|
||||||
if (target == SYNC_FOR_DEVICE)
|
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)
|
if (dir != DMA_FROM_DEVICE)
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue