Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6b52172 authored by Anmolpreet Kaur's avatar Anmolpreet Kaur Committed by Gerrit - the friendly Code Review server
Browse files

qseecom: Update correct parameters before sending to smcinvoke 



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: default avatarAnmolpreet Kaur <anmolpre@codeaurora.org>
parent 46ce72b8

drivers/misc/qseecom.c

+2 −8
Original line number Diff line number Diff line
@@ -2623,12 +2623,6 @@ static int __qseecom_reentrancy_process_incomplete_cmd( 
		case QSEOS_RESULT_CBACK_REQUEST:

			pr_warn("get cback req app_id = %d, resp->data = %d\n",

				data->client.app_id, resp->data);

			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;

		default:

			pr_err("fail:resp res= %d,app_id = %d,lstr = %d\n",
@@ -5372,8 +5366,8 @@ int qseecom_process_listener_from_smcinvoke(struct scm_desc *desc) 
		pr_err("Failed on cmd %d for lsnr %d session %d, ret = %d\n",

			(int)desc->ret[0], (int)desc->ret[2],

			(int)desc->ret[1], ret);

	desc->ret[0] = resp.resp_type;

	desc->ret[1] = resp.result;

	desc->ret[0] = resp.result;

	desc->ret[1] = resp.resp_type;

	desc->ret[2] = resp.data;

	return ret;

}