android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qseecom: Update correct parameters before sending to smcinvoke

Browse Source 
smcinvoke expects result in scm call resp.ret[1] and type in ret[0],
while qseecom expects result in ret[0] and type in ret[1]. To simplify
API interface and code changes in smcinvoke, here internally switch
result and resp_type.

Change-Id: I925ff08e370ed9b7935b81c97a3aa20c783a5c45
Signed-off-by: Anmolpreet Kaur <anmolpre@codeaurora.org>
This commit is contained in:
Anmolpreet Kaur 2021-03-30 14:03:23 +05:30
parent be348e49aa
commit 0bdeb7c66d
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/misc/qseecom.c
View File

@ -2657,11 +2657,6 @@ static int __qseecom_reentrancy_process_incomplete_cmd(
pr_warn("get cback req app_id = %d, resp->data = %d\n", pr_warn("get cback req app_id = %d, resp->data = %d\n",
data->client.app_id, resp->data); data->client.app_id, resp->data);
resp->resp_type = SMCINVOKE_RESULT_INBOUND_REQ_NEEDED; resp->resp_type = SMCINVOKE_RESULT_INBOUND_REQ_NEEDED;
/* We are here because scm call sent to TZ has requested
* for another callback request. This call has been a
* success and hence setting result = 0
*/
resp->result = 0;
break; break;
default: default:
pr_err("fail:resp res= %d,app_id = %d,lstr = %d\n", pr_err("fail:resp res= %d,app_id = %d,lstr = %d\n",
@ -5401,8 +5396,8 @@ int qseecom_process_listener_from_smcinvoke(uint32_t *result,
if (ret) if (ret)
pr_err("Failed on cmd %d for lsnr %d session %d, ret = %d\n", pr_err("Failed on cmd %d for lsnr %d session %d, ret = %d\n",
resp.result, resp.data, resp.resp_type, ret); resp.result, resp.data, resp.resp_type, ret);
*result = resp.result; *result = resp.resp_type;
*response_type = resp.resp_type; *response_type = resp.result;
*data = resp.data; *data = resp.data;
return ret; return ret;
} }