Merge "qseecom: Invalidate the buffer after listener operation" (cd960499) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/misc/qseecom.c

+9 −16

Original line number	Diff line number	Diff line
		@@ -2273,10 +2273,6 @@ static int __qseecom_process_incomplete_cmd(struct qseecom_dev_handle *data,
		goto exit;
		}

		ret = qseecom_dmabuf_cache_operations(ptr_svc->dmabuf,
		QSEECOM_CACHE_INVALIDATE);
		if (ret)
		goto exit;
		} else {
		ret = qseecom_scm_call(SCM_SVC_TZSCHEDULER, 1,
		cmd_buf, cmd_len, resp, sizeof(*resp));
		@@ -2608,10 +2604,6 @@ static int __qseecom_reentrancy_process_incomplete_cmd(
		ret, data->client.app_id);
		goto exit;
		}
		ret = qseecom_dmabuf_cache_operations(ptr_svc->dmabuf,
		QSEECOM_CACHE_INVALIDATE);
		if (ret)
		goto exit;
		} else {
		ret = qseecom_scm_call(SCM_SVC_TZSCHEDULER, 1,
		cmd_buf, cmd_len, resp, sizeof(*resp));
		@@ -3772,14 +3764,6 @@ static int __qseecom_send_cmd(struct qseecom_dev_handle *data,
		ret, data->client.app_id);
		goto exit;
		}
		if (data->client.dmabuf) {
		ret = qseecom_dmabuf_cache_operations(data->client.dmabuf,
		QSEECOM_CACHE_INVALIDATE);
		if (ret) {
		pr_err("cache operation failed %d\n", ret);
		goto exit;
		}
		}

		if (qseecom.qsee_reentrancy_support) {
		ret = __qseecom_process_reentrancy(&resp, ptr_app, data);
		@@ -3802,6 +3786,15 @@ static int __qseecom_send_cmd(struct qseecom_dev_handle *data,
		}
		}
		}

		if (data->client.dmabuf) {
		ret = qseecom_dmabuf_cache_operations(data->client.dmabuf,
		QSEECOM_CACHE_INVALIDATE);
		if (ret) {
		pr_err("cache operation failed %d\n", ret);
		goto exit;
		}
		}
		exit:
		return ret;
		}