iommu/rockchip: fix rockchip_iommu_is_enabled api

Fixes: 1876202 ("iommu/rockchip: add rockchip_iommu_is_enabled api")
Change-Id: Ifdccd89e74bccc69c5e15abc835fba529287f92f
Signed-off-by: Simon Xue <[email protected]>

Author: Simon Xue

drivers/iommu/rockchip-iommu.c

@@ -144,6 +144,7 @@ struct rk_iommu {
 	struct iommu_group *group;
 	u32 version;
 	bool shootdown_entire;
+	bool iommu_enabled;
 };
 
 struct rk_iommudata {
@@ -1306,6 +1307,8 @@ static void rk_iommu_disable(struct rk_iommu *iommu)
 	}
 	rk_iommu_disable_stall(iommu);
 	clk_bulk_disable(iommu->num_clocks, iommu->clocks);
+
+	iommu->iommu_enabled = false;
 }
 
 int rockchip_iommu_disable(struct device *dev)
@@ -1367,6 +1370,10 @@ static int rk_iommu_enable(struct rk_iommu *iommu)
 	rk_iommu_disable_stall(iommu);
 out_disable_clocks:
 	clk_bulk_disable(iommu->num_clocks, iommu->clocks);
+
+	if (!ret)
+		iommu->iommu_enabled = true;
+
 	return ret;
 }
 
@@ -1390,7 +1397,7 @@ bool rockchip_iommu_is_enabled(struct device *dev)
 	if (!iommu)
 		return false;
 
-	return rk_iommu_is_paging_enabled(iommu);
+	return iommu->iommu_enabled;
 }
 EXPORT_SYMBOL(rockchip_iommu_is_enabled);