From: Simon <xxm@rock-chips.com>
Date: Tue, 13 Jan 2015 06:25:24 +0000 (+0800)
Subject: rockchip: iommu: only disable rk312x iommu stall mode
X-Git-Tag: firefly_0821_release~4307
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=9bbc54a4c026624f26f21c851e6fc0851e541702;p=firefly-linux-kernel-4.4.55.git

rockchip: iommu: only disable rk312x iommu stall mode

Signed-off-by: Simon <xxm@rock-chips.com>
---

diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 51fe7e0e5d8c..75eb620464b6 100755
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -393,16 +393,14 @@ static void rockchip_iommu_page_fault_done(void __iomem *base, const char *dbgna
 	__raw_writel(IOMMU_COMMAND_PAGE_FAULT_DONE,
 		     base + IOMMU_REGISTER_COMMAND);
 }
-#if 1
+
 static int rockchip_iommu_zap_tlb_without_stall (void __iomem *base)
 {
 	__raw_writel(IOMMU_COMMAND_ZAP_CACHE, base + IOMMU_REGISTER_COMMAND);
 
 	return 0;
 }
-#endif
 
-#if 0
 static int rockchip_iommu_zap_tlb(void __iomem *base)
 {
 	if (!rockchip_iommu_enable_stall(base)) {
@@ -416,7 +414,6 @@ static int rockchip_iommu_zap_tlb(void __iomem *base)
 
 	return 0;
 }
-#endif
 
 static inline bool rockchip_iommu_raw_reset(void __iomem *base)
 {
@@ -760,7 +757,7 @@ int rockchip_iommu_tlb_invalidate(struct device *dev)
 		int ret;
 
 		for (i = 0; i < data->num_res_mem; i++) {
-			ret = rockchip_iommu_zap_tlb_without_stall(data->res_bases[i]);
+			ret = rockchip_iommu_zap_tlb(data->res_bases[i]);
 			if (ret) {
 				dev_err(dev->archdata.iommu, "(%s) %s failed\n",
 					data->dbgname, __func__);