Revert "msm: camera: isp: Disable SMMU stall upon VFE page fault.."LA.UM.7.9.r1-08200-sm6150.0

This reverts commit e4db76b103ad1cc363e1e247d1eda523e001c899.

Change-Id: Ieee7acbaf7bc19a6e09196e60f70b621114126bd
Signed-off-by: Ashok Kundurthi <askund@codeaurora.org>
Signed-off-by: QU TAO <taoq@codeaurora.org>

4 files changed, 8 insertions, 17 deletions

diff --git a/drivers/media/platform/msm/camera/cam_cdm/cam_cdm_util.c b/drivers/media/platform/msm/camera/cam_cdm/cam_cdm_util.c
index 3054890bd84b..a97a51965ae3 100644
--- a/drivers/media/platform/msm/camera/cam_cdm/cam_cdm_util.c
+++ b/drivers/media/platform/msm/camera/cam_cdm/cam_cdm_util.c
@@ -554,7 +554,7 @@ static long cam_cdm_util_dump_dmi_cmd(uint32_t *cmd_buf_addr)
 	long ret = 0;
 
 	ret += CDMCmdHeaderSizes[CAM_CDM_CMD_DMI];
-	CAM_INFO_RATE_LIMIT(CAM_CDM, "DMI");
+	CAM_INFO(CAM_CDM, "DMI");
 	return ret;
 }
 
@@ -578,11 +578,11 @@ static long cam_cdm_util_dump_reg_cont_cmd(uint32_t *cmd_buf_addr)
 	temp_ptr += CDMCmdHeaderSizes[CAM_CDM_CMD_REG_CONT];
 	ret += CDMCmdHeaderSizes[CAM_CDM_CMD_REG_CONT];
 
-	CAM_INFO_RATE_LIMIT(CAM_CDM, "REG_CONT: COUNT: %u OFFSET: 0x%X",
+	CAM_INFO(CAM_CDM, "REG_CONT: COUNT: %u OFFSET: 0x%X",
 		p_regcont_cmd->count, p_regcont_cmd->offset);
 
 	for (i = 0; i < p_regcont_cmd->count; i++) {
-		CAM_INFO_RATE_LIMIT(CAM_CDM, "DATA_%d: 0x%X", i,
+		CAM_INFO(CAM_CDM, "DATA_%d: 0x%X", i,
 			*temp_ptr);
 		temp_ptr++;
 		ret++;
@@ -602,11 +602,11 @@ static long cam_cdm_util_dump_reg_random_cmd(uint32_t *cmd_buf_addr)
 	temp_ptr += CDMCmdHeaderSizes[CAM_CDM_CMD_REG_RANDOM];
 	ret += CDMCmdHeaderSizes[CAM_CDM_CMD_REG_RANDOM];
 
-	CAM_INFO_RATE_LIMIT(CAM_CDM, "REG_RAND: COUNT: %u",
+	CAM_INFO(CAM_CDM, "REG_RAND: COUNT: %u",
 		p_regrand_cmd->count);
 
 	for (i = 0; i < p_regrand_cmd->count; i++) {
-		CAM_INFO_RATE_LIMIT(CAM_CDM, "OFFSET_%d: 0x%X DATA_%d: 0x%X",
+		CAM_INFO(CAM_CDM, "OFFSET_%d: 0x%X DATA_%d: 0x%X",
 			i, *temp_ptr & CAM_CDM_REG_OFFSET_MASK, i,
 			*(temp_ptr + 1));
 		temp_ptr += 2;
diff --git a/drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c b/drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
index 305944234dd4..3b6d04a302ed 100644
--- a/drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
+++ b/drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
@@ -4107,7 +4107,7 @@ static void cam_ife_mgr_print_io_bufs(struct cam_packet *packet,
 			if (pf_buf_info &&
 				GET_FD_FROM_HANDLE(io_cfg[i].mem_handle[j]) ==
 				GET_FD_FROM_HANDLE(pf_buf_info)) {
-				CAM_INFO_RATE_LIMIT(CAM_ISP,
+				CAM_INFO(CAM_ISP,
 					"Found PF at port: 0x%x mem 0x%x fd: 0x%x",
 					io_cfg[i].resource_type,
 					io_cfg[i].mem_handle[j],
@@ -4116,8 +4116,7 @@ static void cam_ife_mgr_print_io_bufs(struct cam_packet *packet,
 					*mem_found = true;
 			}
 
-			CAM_INFO_RATE_LIMIT(CAM_ISP,
-				"port: 0x%x f: %u format: %d dir %d",
+			CAM_INFO(CAM_ISP, "port: 0x%x f: %u format: %d dir %d",
 				io_cfg[i].resource_type,
 				io_cfg[i].fence,
 				io_cfg[i].format,
@@ -4140,7 +4139,7 @@ static void cam_ife_mgr_print_io_bufs(struct cam_packet *packet,
 				continue;
 			}
 
-			CAM_INFO_RATE_LIMIT(CAM_ISP,
+			CAM_INFO(CAM_ISP,
 				"pln %d w %d h %d s %u size 0x%x addr 0x%x end_addr 0x%x offset %x memh %x",
 				j, io_cfg[i].planes[j].width,
 				io_cfg[i].planes[j].height,
diff --git a/drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_camif_ver2.c b/drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_camif_ver2.c
index 3ed45ee530e8..3ed45ee530e8 100755..100644
--- a/drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_camif_ver2.c
+++ b/drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_camif_ver2.c
diff --git a/drivers/media/platform/msm/camera/cam_smmu/cam_smmu_api.c b/drivers/media/platform/msm/camera/cam_smmu/cam_smmu_api.c
index a5cbd556c93b..ae0b531a9169 100644
--- a/drivers/media/platform/msm/camera/cam_smmu/cam_smmu_api.c
+++ b/drivers/media/platform/msm/camera/cam_smmu/cam_smmu_api.c
@@ -3196,7 +3196,6 @@ static int cam_smmu_setup_cb(struct cam_context_bank_info *cb,
 	struct device *dev)
 {
 	int rc = 0;
-	int32_t stall_disable = 1;
 
 	if (!cb || !dev) {
 		CAM_ERR(CAM_SMMU, "Error: invalid input params");
@@ -3263,13 +3262,6 @@ static int cam_smmu_setup_cb(struct cam_context_bank_info *cb,
 			CAM_ERR(CAM_SMMU,
 				"Error: failed to set non fatal fault attribute");
 		}
-		if (iommu_domain_set_attr(cb->mapping->domain,
-			DOMAIN_ATTR_CB_STALL_DISABLE,
-			&stall_disable) < 0) {
-			CAM_ERR(CAM_SMMU,
-				"Error: failed to set cb stall disable");
-		}
-
 
 	} else {
 		CAM_ERR(CAM_SMMU, "Context bank does not have IO region");