Merge "msm: camera: Support HW with different secure and non-secure SIDs" (68065b28) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c

+11 −8

Original line number	Diff line number	Diff line
		@@ -1225,6 +1225,9 @@ int cam_smmu_ops(int handle, enum cam_smmu_ops_param ops)
		int ret = 0, idx;

		CDBG("E: ops = %d\n", ops);
		if (iommu_cb_set.camera_secure_sid)
		return ret;

		idx = GET_SMMU_TABLE_IDX(handle);
		if (handle == HANDLE_INIT \|\| idx < 0 \|\| idx >= iommu_cb_set.cb_num) {
		pr_err("Error: handle or index invalid. idx = %d hdl = %x\n",
		@@ -1258,17 +1261,11 @@ int cam_smmu_ops(int handle, enum cam_smmu_ops_param ops)
		break;
		}
		case CAM_SMMU_ATTACH_SEC_CPP: {
		if (iommu_cb_set.camera_secure_sid == false)
		ret = cam_smmu_attach_sec_cpp(idx);
		else
		iommu_cb_set.cb_info[idx].state = CAM_SMMU_ATTACH;
		break;
		}
		case CAM_SMMU_DETACH_SEC_CPP: {
		if (iommu_cb_set.camera_secure_sid == false)
		ret = cam_smmu_detach_sec_cpp(idx);
		else
		iommu_cb_set.cb_info[idx].state = CAM_SMMU_DETACH;
		break;
		}
		case CAM_SMMU_VOTE:
		@@ -2209,6 +2206,12 @@ static int cam_populate_smmu_context_banks(struct device *dev,
		cam_smmu_iommu_fault_handler,
		(void *)cb->name);

		if (iommu_cb_set.camera_secure_sid) {
		rc = cam_smmu_attach(iommu_cb_set.cb_init_count);
		if (rc)
		pr_err("Error: SMMU attach failed for %s\n", cb->name);
		}

		/* increment count to next bank */
		iommu_cb_set.cb_init_count++;