1 files changed, 12 insertions, 18 deletions

diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 977edbdbc1de..b5f5d1133042 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -283,6 +283,11 @@ address_needs_mapping(struct device *hwdev, dma_addr_t addr)
         return (addr & ~mask) != 0;
 }
 
+static int is_swiotlb_buffer(char *addr)
+{
+        return addr >= io_tlb_start && addr < io_tlb_end;
+}
+
 /*
  * Allocates bounce buffer and returns its kernel virtual address.
  */
@@ -467,13 +472,6 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
         void *ret;
         int order = get_order(size);
 
-        /*
-         * XXX fix me: the DMA API should pass us an explicit DMA mask
-         * instead, or use ZONE_DMA32 (ia64 overloads ZONE_DMA to be a ~32
-         * bit range instead of a 16MB one).
-         */
-        flags |= GFP_DMA;
-
         ret = (void *)__get_free_pages(flags, order);
         if (ret && address_needs_mapping(hwdev, virt_to_bus(ret))) {
                 /*
@@ -490,12 +488,9 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
                  * swiotlb_map_single(), which will grab memory from
                  * the lowest available address range.
                  */
-                dma_addr_t handle;
-                handle = swiotlb_map_single(NULL, NULL, size, DMA_FROM_DEVICE);
-                if (swiotlb_dma_mapping_error(hwdev, handle))
+                ret = map_single(hwdev, NULL, size, DMA_FROM_DEVICE);
+                if (!ret)
                         return NULL;
-
-                ret = bus_to_virt(handle);
         }
 
         memset(ret, 0, size);
@@ -518,12 +513,11 @@ swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
                       dma_addr_t dma_handle)
 {
         WARN_ON(irqs_disabled());
-        if (!(vaddr >= (void *)io_tlb_start
-                    && vaddr < (void *)io_tlb_end))
+        if (!is_swiotlb_buffer(vaddr))
                 free_pages((unsigned long) vaddr, get_order(size));
         else
                 /* DMA_TO_DEVICE to avoid memcpy in unmap_single */
-                swiotlb_unmap_single (hwdev, dma_handle, size, DMA_TO_DEVICE);
+                unmap_single(hwdev, vaddr, size, DMA_TO_DEVICE);
 }
 
 static void
@@ -612,7 +606,7 @@ swiotlb_unmap_single_attrs(struct device *hwdev, dma_addr_t dev_addr,
         char *dma_addr = bus_to_virt(dev_addr);
 
         BUG_ON(dir == DMA_NONE);
-        if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end)
+        if (is_swiotlb_buffer(dma_addr))
                 unmap_single(hwdev, dma_addr, size, dir);
         else if (dir == DMA_FROM_DEVICE)
                 dma_mark_clean(dma_addr, size);
@@ -642,7 +636,7 @@ swiotlb_sync_single(struct device *hwdev, dma_addr_t dev_addr,
         char *dma_addr = bus_to_virt(dev_addr);
 
         BUG_ON(dir == DMA_NONE);
-        if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end)
+        if (is_swiotlb_buffer(dma_addr))
                 sync_single(hwdev, dma_addr, size, dir, target);
         else if (dir == DMA_FROM_DEVICE)
                 dma_mark_clean(dma_addr, size);
@@ -673,7 +667,7 @@ swiotlb_sync_single_range(struct device *hwdev, dma_addr_t dev_addr,
         char *dma_addr = bus_to_virt(dev_addr) + offset;
 
         BUG_ON(dir == DMA_NONE);
-        if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end)
+        if (is_swiotlb_buffer(dma_addr))
                 sync_single(hwdev, dma_addr, size, dir, target);
         else if (dir == DMA_FROM_DEVICE)
                 dma_mark_clean(dma_addr, size);