From patchwork Wed Mar 4 15:58:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 11420339 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AEFA2924 for ; Wed, 4 Mar 2020 15:58:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8FFE5217F4 for ; Wed, 4 Mar 2020 15:58:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="qzK0hDhW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388109AbgCDP6X (ORCPT ); Wed, 4 Mar 2020 10:58:23 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:35195 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726650AbgCDP6X (ORCPT ); Wed, 4 Mar 2020 10:58:23 -0500 Received: by mail-lj1-f195.google.com with SMTP id a12so2611004ljj.2 for ; Wed, 04 Mar 2020 07:58:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=U2afUUo7gcqKGsZXm1132Z2DinxFoznPEB9ahOfUs5k=; b=qzK0hDhWmDi+wb9g1tsq8Vo5sOBJTKo4poMC642is7FDaHHY4CS4jN9R0281x/wl09 +fj8oA2vifprD7EudIOKS9bTNeGAUeZp4pIN1hkCunkV7mCBMdlg/TNgSWY6pqCzY39D CJJ+ocA4d6uPBooiF1JT6sz/DrFIUXLdp3WheLBY5l1eS5BMyxKyjJgn+Di9PyQ+Hwku 6w4h7gei5ClbyOut1K4C1Ngo9l2UL//7RE3FUveNqXPM6UnOS/PdWjGQXp+30ToOWM2a Po2HUBnz+l9fDhn9/KvP+KwUTwZj/o/Lhw4Sq6DWcsCteEVceLZh4fIZuILnhaPyRZ+g j1IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=U2afUUo7gcqKGsZXm1132Z2DinxFoznPEB9ahOfUs5k=; b=TXglIeQKMNoeNHHMObEQTnPNnO6J0kTcm/EWHP6eJ0eZvwEzgiu7uFhh/VBJZLpFl0 YEN5UVuhTRfuzz0RVgfzhoQMa15BY+0+fuO5+UUJ3sVrxl2UddUnWNcHQ4SvUPaH8rk3 WBRBk7h0RmYWdX3veF8/21wSUjfWEurhIuy6x/3GHB3GpP2Dl+rGNXEvEj/3nsKvoBxq 2VTq6IR+ZWDTMLvDBqMlhXx6fGmjEUS9EvjlHD6Lt79ELM13po1/TJHn4SbOhQlpNo4M 6Q03OCoWD6g7cec8+OHXFdN8n2sxYo1PEGA1vFIjo8T70iwwOD8PqQ8XkghBXIpn6eNs 26bA== X-Gm-Message-State: ANhLgQ38AiaeX0ugflS0dVTjdiUAZQJydMxt3U9PR2JEAjQ7VbK8aPAL ViNHa7KG1WHr08ETd410jl3phg== X-Google-Smtp-Source: ADFU+vsVg5RJIaMPwnWAYk62YemrpgFiO40xq3WzGuOXCGINg04alWqT3DGb5/ui1ePPvjmIW5XPjg== X-Received: by 2002:a2e:a486:: with SMTP id h6mr2300591lji.202.1583337501273; Wed, 04 Mar 2020 07:58:21 -0800 (PST) Received: from localhost.localdomain ([94.155.124.210]) by smtp.gmail.com with ESMTPSA id 67sm10531217ljj.31.2020.03.04.07.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 07:58:20 -0800 (PST) From: Stanimir Varbanov To: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org Cc: Bjorn Andersson , Andy Gross , Elliot Berman , Stanimir Varbanov Subject: [PATCH] venus: firmware: Ignore secure call error on first resume Date: Wed, 4 Mar 2020 17:58:09 +0200 Message-Id: <20200304155809.19637-1-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.17.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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. Signed-off-by: Stanimir Varbanov Acked-by: Bjorn Andersson --- drivers/media/platform/qcom/venus/firmware.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c index de6812fb55f4..8801a6a7543d 100644 --- a/drivers/media/platform/qcom/venus/firmware.c +++ b/drivers/media/platform/qcom/venus/firmware.c @@ -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);