ARM: dma-mapping: use himem for DMA buffers for IOMMU-mapped devices

IOMMU can provide access to any memory page, so there is no point in
limiting the allocated pages only to lowmem, once other parts of
dma-mapping subsystem correctly supports himem pages.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 94d7359074c2..2163af4b31b8 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1095,12 +1095,17 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size,
                 return pages;
         }
 
+        /*
+         * IOMMU can map any pages, so himem can also be used here
+         */
+        gfp |= __GFP_NOWARN | __GFP_HIGHMEM;
+
         while (count) {
                 int j, order = __fls(count);
 
-                pages[i] = alloc_pages(gfp | __GFP_NOWARN, order);
+                pages[i] = alloc_pages(gfp, order);
                 while (!pages[i] && order)
-                        pages[i] = alloc_pages(gfp | __GFP_NOWARN, --order);
+                        pages[i] = alloc_pages(gfp, --order);
                 if (!pages[i])
                         goto error;