summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorZhen Kong <zkong@codeaurora.org>2017-10-19 12:32:07 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-12-15 15:26:57 -0800
commitf20c33ce06540f018a45c04156c38f1eaca23e7f (patch)
tree16e34c4af7713e9c3c83e3f0a9ca0f47a9d3927f /drivers
parentdf0c65ec104c8a0c5ccdc02fda56f31ac7fe5bdc (diff)
qseecom: support listener request from smcinvoke without reentrancy
Add support to process listener request from smcinvoke when reentrancy is disabled. Change-Id: I2ce030cf6d5104ca2dec1402634a05d425e6d474 Signed-off-by: Zhen Kong <zkong@codeaurora.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/misc/qseecom.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c
index 0c7cbfb862b9..313506143d98 100644
--- a/drivers/misc/qseecom.c
+++ b/drivers/misc/qseecom.c
@@ -4787,8 +4787,12 @@ int qseecom_process_listener_from_smcinvoke(struct scm_desc *desc)
resp.data = desc->ret[2]; /*listener_id*/
mutex_lock(&app_access_lock);
- ret = __qseecom_process_reentrancy(&resp, &dummy_app_entry,
+ if (qseecom.qsee_reentrancy_support)
+ ret = __qseecom_process_reentrancy(&resp, &dummy_app_entry,
&dummy_private_data);
+ else
+ ret = __qseecom_process_incomplete_cmd(&dummy_private_data,
+ &resp);
mutex_unlock(&app_access_lock);
if (ret)
pr_err("Failed on cmd %d for lsnr %d session %d, ret = %d\n",