dma-direct check for highmem pages in dma_direct_alloc_pages

[linux-2.6-microblaze.git] / kernel / dma / direct.c

diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index bf9f776..f5ecadd 100644 (file)
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -309,6 +309,17 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size,
        page = __dma_direct_alloc_pages(dev, size, gfp);
        if (!page)
                return NULL;
+       if (PageHighMem(page)) {
+               /*
+                * Depending on the cma= arguments and per-arch setup
+                * dma_alloc_contiguous could return highmem pages.
+                * Without remapping there is no way to return them here,
+                * so log an error and fail.
+                */
+               dev_info(dev, "Rejecting highmem page from CMA.\n");
+               goto out_free_pages;
+       }
+
        ret = page_address(page);
        if (force_dma_unencrypted(dev)) {
                if (set_memory_decrypted((unsigned long)ret,