Revert "swiotlb-xen: pass dev_addr to swiotlb_tbl_unmap_single"
authorDavid Vrabel <david.vrabel@citrix.com>
Wed, 10 Dec 2014 14:48:43 +0000 (14:48 +0000)
committerDavid Vrabel <david.vrabel@citrix.com>
Wed, 10 Dec 2014 14:58:35 +0000 (14:58 +0000)
This reverts commit 2c3fc8d26dd09b9d7069687eead849ee81c78e46.

This commit broke on x86 PV because entries in the generic SWIOTLB are
indexed using (pseudo-)physical address not DMA address and these are
not the same in a x86 PV guest.

Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
drivers/xen/swiotlb-xen.c

index 5ea1e3c1090710da53181997cad17480c02b4e50..810ad419e34ca76ef3f2d0444e789d579dea1b9e 100644 (file)
@@ -451,7 +451,7 @@ static void xen_unmap_single(struct device *hwdev, dma_addr_t dev_addr,
 
        /* NOTE: We use dev_addr here, not paddr! */
        if (is_xen_swiotlb_buffer(dev_addr)) {
-               swiotlb_tbl_unmap_single(hwdev, dev_addr, size, dir);
+               swiotlb_tbl_unmap_single(hwdev, paddr, size, dir);
                return;
        }