summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Vrabel <david.vrabel@citrix.com>2014-12-10 14:48:43 +0000
committerDavid Vrabel <david.vrabel@citrix.com>2014-12-10 14:58:35 +0000
commit4ef8e3f3504808621e594f01852476a1d4e7ef93 (patch)
tree8dde627fa2a6beb0ac7c338a9473bd6b6a11134f
parent14520c92cbd7619ae097a3087b140c992b5c270b (diff)
downloadlinux-4ef8e3f3504808621e594f01852476a1d4e7ef93.tar.gz
linux-4ef8e3f3504808621e594f01852476a1d4e7ef93.tar.bz2
linux-4ef8e3f3504808621e594f01852476a1d4e7ef93.zip
Revert "swiotlb-xen: pass dev_addr to swiotlb_tbl_unmap_single"
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>
-rw-r--r--drivers/xen/swiotlb-xen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 5ea1e3c10907..810ad419e34c 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -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;
}