瀏覽代碼

msm: eva: Avoid NoC access during SMMU fault

Noc logger doesn't work when handling SMMU fault in driver.

Change-Id: I4ac6bca6e015b7f5424be4cb9e6d535877baa410
Signed-off-by: George Shen <[email protected]>
George Shen 3 年之前
父節點
當前提交
1a6c0d1a39
共有 3 個文件被更改,包括 2 次插入5 次删除
  1. 1 3
      msm/eva/msm_cvp_common.c
  2. 1 1
      msm/eva/msm_cvp_platform.c
  3. 0 1
      msm/eva/msm_cvp_res_parse.c

+ 1 - 3
msm/eva/msm_cvp_common.c

@@ -1338,15 +1338,13 @@ int msm_cvp_noc_error_info(struct msm_cvp_core *core)
 		return -EINVAL;
 	}
 
-	if (!core->resources.non_fatal_pagefaults)
-		return 0;
-
 	if (!core->smmu_fault_handled)
 		return 0;
 
 	hdev = core->device;
 	call_hfi_op(hdev, noc_error_info, hdev->hfi_device_data);
 
+	BUG_ON(!core->resources.non_fatal_pagefaults);
 	return 0;
 }
 

+ 1 - 1
msm/eva/msm_cvp_platform.c

@@ -56,7 +56,7 @@ static struct msm_cvp_common_data sm8450_common_data[] = {
 	},
 	{
 		.key = "qcom,domain-attr-non-fatal-faults",
-		.value = 1,
+		.value = 0,
 	},
 	{
 		.key = "qcom,max-secure-instances",

+ 0 - 1
msm/eva/msm_cvp_res_parse.c

@@ -976,7 +976,6 @@ int msm_cvp_smmu_fault_handler(struct iommu_domain *domain,
 		msm_cvp_print_inst_bufs(inst);
 	}
 	core->smmu_fault_handled = true;
-	msm_cvp_noc_error_info(core);
 	mutex_unlock(&core->lock);
 	/*
 	 * Return -EINVAL to elicit the default behaviour of smmu driver.