iommu/mediatek: Move geometry.aperture updating into domain_finalise

Move the domain geometry.aperture updating into domain_finalise.
This is a preparing patch for updating the domain region. We know the
detailed iova region in the attach_device.

Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Link: https://lore.kernel.org/r/20210111111914.22211-26-yong.wu@mediatek.com
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index d321d09..309b06d 100644 (file)
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -353,6 +353,10 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom,
 
        /* Update our support page sizes bitmap */
        dom->domain.pgsize_bitmap = dom->cfg.pgsize_bitmap;
+
+       dom->domain.geometry.aperture_start = 0;
+       dom->domain.geometry.aperture_end = DMA_BIT_MASK(32);
+       dom->domain.geometry.force_aperture = true;
        return 0;
 }
 
@@ -372,9 +376,6 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type)
                return NULL;
        }
 
-       dom->domain.geometry.aperture_start = 0;
-       dom->domain.geometry.aperture_end = DMA_BIT_MASK(32);
-       dom->domain.geometry.force_aperture = true;
        return &dom->domain;
 }