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

Commit b92a6881 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mink: keep clocks enabled for duration of invoke call"

parents 38d32df5 f9916da0

drivers/soc/qcom/smcinvoke.c

+4 −3
Original line number Diff line number Diff line
@@ -362,15 +362,16 @@ static int prepare_send_scm_msg(const uint8_t *in_buf, size_t in_buf_len, 
	set_msm_bus_request_locked(BW_HIGH);

	mutex_unlock(&smcinvoke_lock);

	ret = scm_call2(SMCINVOKE_TZ_CMD, &desc);

	mutex_lock(&smcinvoke_lock);

	set_msm_bus_request_locked(BW_INACTIVE);

	mutex_unlock(&smcinvoke_lock);



	/* process listener request */

	if (!ret && (desc.ret[0] == QSEOS_RESULT_INCOMPLETE ||

		desc.ret[0] == QSEOS_RESULT_BLOCKED_ON_LISTENER))

		ret = qseecom_process_listener_from_smcinvoke(&desc);



	mutex_lock(&smcinvoke_lock);

	set_msm_bus_request_locked(BW_INACTIVE);

	mutex_unlock(&smcinvoke_lock);



	*smcinvoke_result = (int32_t)desc.ret[1];

	if (ret || desc.ret[1] || desc.ret[2] || desc.ret[0])

		pr_err("SCM call failed with ret val = %d %d %d %d\n",