Commit 2632e7b6 authored Mar 04, 2020 by Stanimir Varbanov Committed by Mauro Carvalho Chehab Mar 30, 2020

media: venus: firmware: Ignore secure call error on first resume



With the latest cleanup in qcom scm driver the secure monitor
call for setting the remote processor state returns EINVAL when
it is called for the first time and after another scm call
auth_and_reset. The error returned from scm call could be ignored
because the state transition is already done in auth_and_reset.

Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Cc: stable@vger.kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

parent ad71693f

drivers/media/platform/qcom/venus/firmware.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -44,8 +44,14 @@ static void venus_reset_cpu(struct venus_core *core)

		int venus_set_hw_state(struct venus_core *core, bool resume)
		{
		if (core->use_tz)
		return qcom_scm_set_remote_state(resume, 0);
		int ret;

		if (core->use_tz) {
		ret = qcom_scm_set_remote_state(resume, 0);
		if (resume && ret == -EINVAL)
		ret = 0;
		return ret;
		}

		if (resume)
		venus_reset_cpu(core);

Admin message