iommu/tegra-smmu: use page allocation function provided by iommu-pages.h

Convert iommu/tegra-smmu.c to use the new page allocation functions
provided in iommu-pages.h.

Signed-off-by: Pasha Tatashin <pasha.tatashin@soleen.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Tested-by: Bagas Sanjaya <bagasdotme@gmail.com>
Link: https://lore.kernel.org/r/20240413002522.1101315-10-pasha.tatashin@soleen.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index 14e525bd0d9bb01de32ef28a2497721e879c1db4..f86c7ae91814ff697c8f8b63c9fc183d0e74fd08 100644 (file)
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -19,6 +19,8 @@
 #include <soc/tegra/ahb.h>
 #include <soc/tegra/mc.h>
 
+#include "iommu-pages.h"
+
 struct tegra_smmu_group {
        struct list_head list;
        struct tegra_smmu *smmu;
@@ -282,7 +284,7 @@ static struct iommu_domain *tegra_smmu_domain_alloc_paging(struct device *dev)
 
        as->attr = SMMU_PD_READABLE | SMMU_PD_WRITABLE | SMMU_PD_NONSECURE;
 
-       as->pd = alloc_page(GFP_KERNEL | __GFP_DMA | __GFP_ZERO);
+       as->pd = __iommu_alloc_pages(GFP_KERNEL | __GFP_DMA, 0);
        if (!as->pd) {
                kfree(as);
                return NULL;
@@ -290,7 +292,7 @@ static struct iommu_domain *tegra_smmu_domain_alloc_paging(struct device *dev)
 
        as->count = kcalloc(SMMU_NUM_PDE, sizeof(u32), GFP_KERNEL);
        if (!as->count) {
-               __free_page(as->pd);
+               __iommu_free_pages(as->pd, 0);
                kfree(as);
                return NULL;
        }
@@ -298,7 +300,7 @@ static struct iommu_domain *tegra_smmu_domain_alloc_paging(struct device *dev)
        as->pts = kcalloc(SMMU_NUM_PDE, sizeof(*as->pts), GFP_KERNEL);
        if (!as->pts) {
                kfree(as->count);
-               __free_page(as->pd);
+               __iommu_free_pages(as->pd, 0);
                kfree(as);
                return NULL;
        }
@@ -599,14 +601,14 @@ static u32 *as_get_pte(struct tegra_smmu_as *as, dma_addr_t iova,
                dma = dma_map_page(smmu->dev, page, 0, SMMU_SIZE_PT,
                                   DMA_TO_DEVICE);
                if (dma_mapping_error(smmu->dev, dma)) {
-                       __free_page(page);
+                       __iommu_free_pages(page, 0);
                        return NULL;
                }
 
                if (!smmu_dma_addr_valid(smmu, dma)) {
                        dma_unmap_page(smmu->dev, dma, SMMU_SIZE_PT,
                                       DMA_TO_DEVICE);
-                       __free_page(page);
+                       __iommu_free_pages(page, 0);
                        return NULL;
                }
 
@@ -649,7 +651,7 @@ static void tegra_smmu_pte_put_use(struct tegra_smmu_as *as, unsigned long iova)
                tegra_smmu_set_pde(as, iova, 0);
 
                dma_unmap_page(smmu->dev, pte_dma, SMMU_SIZE_PT, DMA_TO_DEVICE);
-               __free_page(page);
+               __iommu_free_pages(page, 0);
                as->pts[pde] = NULL;
        }
 }
@@ -688,7 +690,7 @@ static struct page *as_get_pde_page(struct tegra_smmu_as *as,
        if (gfpflags_allow_blocking(gfp))
                spin_unlock_irqrestore(&as->lock, *flags);
 
-       page = alloc_page(gfp | __GFP_DMA | __GFP_ZERO);
+       page = __iommu_alloc_pages(gfp | __GFP_DMA, 0);
 
        if (gfpflags_allow_blocking(gfp))
                spin_lock_irqsave(&as->lock, *flags);
@@ -700,7 +702,7 @@ static struct page *as_get_pde_page(struct tegra_smmu_as *as,
         */
        if (as->pts[pde]) {
                if (page)
-                       __free_page(page);
+                       __iommu_free_pages(page, 0);
 
                page = as->pts[pde];
        }