Merge tag 'iommu-updates-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / iommu / io-pgtable-arm.c

diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index f7828a7aad410d4406de3d85a97cd419bc29bd0e..3d23b924cec1696954c4743e502f6866d795087d 100644 (file)
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -21,6 +21,7 @@
 #include <asm/barrier.h>
 
 #include "io-pgtable-arm.h"
+#include "iommu-pages.h"
 
 #define ARM_LPAE_MAX_ADDR_BITS         52
 #define ARM_LPAE_S2_MAX_CONCAT_PAGES   16
@@ -198,14 +199,10 @@ static void *__arm_lpae_alloc_pages(size_t size, gfp_t gfp,
 
        VM_BUG_ON((gfp & __GFP_HIGHMEM));
 
-       if (cfg->alloc) {
+       if (cfg->alloc)
                pages = cfg->alloc(cookie, size, gfp);
-       } else {
-               struct page *p;
-
-               p = alloc_pages_node(dev_to_node(dev), gfp | __GFP_ZERO, order);
-               pages = p ? page_address(p) : NULL;
-       }
+       else
+               pages = iommu_alloc_pages_node(dev_to_node(dev), gfp, order);
 
        if (!pages)
                return NULL;
@@ -233,7 +230,7 @@ out_free:
        if (cfg->free)
                cfg->free(cookie, pages, size);
        else
-               free_pages((unsigned long)pages, order);
+               iommu_free_pages(pages, order);
 
        return NULL;
 }
@@ -249,7 +246,7 @@ static void __arm_lpae_free_pages(void *pages, size_t size,
        if (cfg->free)
                cfg->free(cookie, pages, size);
        else
-               free_pages((unsigned long)pages, get_order(size));
+               iommu_free_pages(pages, get_order(size));
 }
 
 static void __arm_lpae_sync_pte(arm_lpae_iopte *ptep, int num_entries,