iommu/exynos: Unify code for fldp cache invalidation

This patch simplifies the code for handling of flpdcache invalidation.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 15787a177a16044d51ba3a0566bbdc538fd9ead1..e42a76cc9674fe041860bec31678fe38e276b82e 100644 (file)
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -440,13 +440,6 @@ static int __sysmmu_enable(struct sysmmu_drvdata *data, phys_addr_t pgtable,
        return ret;
 }
 
-static void __sysmmu_tlb_invalidate_flpdcache(struct sysmmu_drvdata *data,
-                                             sysmmu_iova_t iova)
-{
-       if (data->version == MAKE_MMU_VER(3, 3))
-               __raw_writel(iova | 0x1, data->sfrbase + REG_MMU_FLUSH_ENTRY);
-}
-
 static void sysmmu_tlb_invalidate_flpdcache(struct sysmmu_drvdata *data,
                                            sysmmu_iova_t iova)
 {
@@ -455,8 +448,10 @@ static void sysmmu_tlb_invalidate_flpdcache(struct sysmmu_drvdata *data,
        clk_enable(data->clk_master);
 
        spin_lock_irqsave(&data->lock, flags);
-       if (is_sysmmu_active(data))
-               __sysmmu_tlb_invalidate_flpdcache(data, iova);
+       if (is_sysmmu_active(data)) {
+               if (data->version >= MAKE_MMU_VER(3, 3))
+                       __sysmmu_tlb_invalidate_entry(data, iova, 1);
+       }
        spin_unlock_irqrestore(&data->lock, flags);
 
        clk_disable(data->clk_master);