Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 lib/swiotlb.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -465,13 +465,9 @@
 dma_addr_t dev_addr;
 void *ret;
 int order = get_order(size);
- u64 dma_mask = DMA_32BIT_MASK;
-
- if (hwdev && hwdev->coherent_dma_mask)
- dma_mask = hwdev->coherent_dma_mask;
 
 ret = (void *)__get_free_pages(flags, order);
- if (ret && !is_buffer_dma_capable(dma_mask, virt_to_bus(ret), size)) {
+ if (ret && !address_needs_mapping(hwdev, virt_to_bus(ret), size)) {
 /*
 * The allocated memory isn't reachable by the device.
 * Fall back on swiotlb_map_single().
@@ -495,9 +491,9 @@
 dev_addr = virt_to_bus(ret);
 
 /* Confirm address can be DMA'd by device */
- if (!is_buffer_dma_capable(dma_mask, dev_addr, size)) {
+ if (!address_needs_mapping(hwdev, dev_addr, size)) {
 printk("hwdev DMA mask = 0x%016Lx, dev_addr = 0x%016Lx\n",
- (unsigned long long)dma_mask,
+ (unsigned long long)dma_get_mask(hwdev),
 (unsigned long long)dev_addr);
 
 /* DMA_TO_DEVICE to avoid memcpy in unmap_single */
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel