UPSTREAM: iommu/rockchip: Prepare to support generic DMA mapping

Set geometry for allocated domains and fix .domain_alloc() callback to
work with IOMMU_DOMAIN_DMA domain type, which is used for implicit
domains on ARM64.

Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
(cherry picked from commit a93db2f22b6b48369acb72f66a0ae47ec17a0b05)

Change-Id: Ib04827afadbfb32ca52c6842cd056952269cbe93
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>

diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 616d8481a7778c27bb7c51caafda1b67fa5017c9..d980e86589185c7184d0ea878190788bf5660acc 100644 (file)
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -892,7 +892,7 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type)
        struct platform_device *pdev;
        struct device *iommu_dev;
 
-       if (type != IOMMU_DOMAIN_UNMANAGED)
+       if (type != IOMMU_DOMAIN_UNMANAGED && type != IOMMU_DOMAIN_DMA)
                return NULL;
 
        /* Register a pdev per domain, so DMA API can base on this *dev
@@ -909,8 +909,8 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type)
 
        rk_domain->pdev = pdev;
 
-       /* To init the iovad which is required by iommu_dma_init_domain() */
-       if (iommu_get_dma_cookie(&rk_domain->domain))
+       if (type == IOMMU_DOMAIN_DMA &&
+           iommu_get_dma_cookie(&rk_domain->domain))
                goto err_unreg_pdev;
 
        /*
@@ -936,12 +936,17 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type)
        spin_lock_init(&rk_domain->dt_lock);
        INIT_LIST_HEAD(&rk_domain->iommus);
 
+       rk_domain->domain.geometry.aperture_start = 0;
+       rk_domain->domain.geometry.aperture_end   = DMA_BIT_MASK(32);
+       rk_domain->domain.geometry.force_aperture = true;
+
        return &rk_domain->domain;
 
 err_free_dt:
        free_page((unsigned long)rk_domain->dt);
 err_put_cookie:
-       iommu_put_dma_cookie(&rk_domain->domain);
+       if (type == IOMMU_DOMAIN_DMA)
+               iommu_put_dma_cookie(&rk_domain->domain);
 err_unreg_pdev:
        platform_device_unregister(pdev);
 
@@ -970,7 +975,8 @@ static void rk_iommu_domain_free(struct iommu_domain *domain)
                         SPAGE_SIZE, DMA_TO_DEVICE);
        free_page((unsigned long)rk_domain->dt);
 
-       iommu_put_dma_cookie(&rk_domain->domain);
+       if (domain->type == IOMMU_DOMAIN_DMA)
+               iommu_put_dma_cookie(&rk_domain->domain);
 
        platform_device_unregister(rk_domain->pdev);
 }