From patchwork Mon Feb 22 16:02:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 385801 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp1396717jap; Mon, 22 Feb 2021 08:05:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJzFF9PLHH2CJYKBgA/vAf6CPuH7UUY00GUPmRjYX92hAFHfzHT9WsyWRKqVlh6HBL3FRvBy X-Received: by 2002:a05:6402:1013:: with SMTP id c19mr23707539edu.86.1614009899885; Mon, 22 Feb 2021 08:04:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614009899; cv=none; d=google.com; s=arc-20160816; b=pbmUR6TbAp/Xx3YiBblbXrv/HBLFWKHpgWbT+CWhhb+1h9coJ1lW0XVF3f8uDRce2I GT80c7M2aco0pi0wx1JxbdB7l5CbKBI02ZSvlXcqUej8U4sPuWNx0R7ycs8XTEoB+75X YaUwHNi2zMrt9HKKWQSPNRj2M9tm5cywafQAO1zoYGszCbEdJ/iMP4SlUgMEmVFf6SAU nvHiJDh19sTjibcnLEwiJpXMUDJ4n2bZ4ZRtxfoh+fcekozmPaBE7oU0WcARJjZLXStv +U+FPzp1Ml6h3kmgbv8WnSV2wg0WJtAcxLI5OONY5rFSmzhfC9m3r8PnCsOCO1gmRQOf a3IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zhmZ46o1OlmHrlQ7agfIkG8JPYi4dbZzTMRJzpesQV0=; b=YUu5h/p3OgGhTKyzjZ0pEVHgnsh5PM9LdTqBnMMec0wCOCpJz4jRveGjemUYkIc/b3 3AT2nED8ta7E+0pFsSSSRLhDgs6dxEzcGwoDnvzTE/XSHzXAqTMrD8rFKlmPP58yIrXI D1J9qA7Et47S0Jxso9EnhXH84Zqg2sFt9xMRdCExyor5psB/ZBnBynlJb4cwh8tI2rqd OqFqgesTrS8ehCxRAdzB4m8ZkoXg3r/YH3/sloucsHmVVGrbJA1mO87996lYEryzZu9G n3/cGYeY7E86EjDRXzgSDwpgG3uGUMskrnRgot3t2wfgP+uSlhZkavrcSYvKXMua05F5 jVOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JIXh1zW5; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s13si12459169edj.330.2021.02.22.08.04.59; Mon, 22 Feb 2021 08:04:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JIXh1zW5; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231293AbhBVQEt (ORCPT + 16 others); Mon, 22 Feb 2021 11:04:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231384AbhBVQDo (ORCPT ); Mon, 22 Feb 2021 11:03:44 -0500 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89CF3C061BC3 for ; Mon, 22 Feb 2021 08:01:58 -0800 (PST) Received: by mail-wm1-x32d.google.com with SMTP id x16so13996108wmk.3 for ; Mon, 22 Feb 2021 08:01:58 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=zhmZ46o1OlmHrlQ7agfIkG8JPYi4dbZzTMRJzpesQV0=; b=JIXh1zW5uU25ACVRi+kJpbkqGxy2QkO3Jcg/RcV6qf3HRx9q6CMyYnS9xJA2cJ9och WIi+F/xF/z9qolVwDxYmgeZf+1VWk6eDihIN0pGsYtWyCT11QmVOGgwdNg97fTSImBt1 g63EBZDFYxygtHzLvUj/fuQZMiGLEvOflBMfZzOX79l7p2fhbwAfK+4BkuLMCq9NarqM TBO7g8CorWCR6N1CoyZN5PbSySjWwMYe6Eawv7Z8QizB6noRgjvbHi8y2nKAsu8F8Rdz 0irTykLNVEJKzoBKCEq1sH4afmiyTXixRjA7wn+b4PEI5Te6IzFA1fVS7AswwlarGh/r y5Ew== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=zhmZ46o1OlmHrlQ7agfIkG8JPYi4dbZzTMRJzpesQV0=; b=gOHC9a//TsZf4j4Z3YXrpCYJpV4pvA8H2AaqeH5i6cjowP6yBJRC/qmhWaHMZGBZyQ 1jB2eHzkTF7wfXeMq3qA8zH2FT2Vdjl2Lnlx6f7fwPapIEKDnJISY8JPc97GUwSKUgVu 0RisEqtUfQRswX73d3R93h1jKgECtg6LUTXB5cavoutFppfqfK/3t03pYnXyEwDjM8TA 0fyH2xGwj9IpbEmWMDT70tUzl2W+w4goqmsk15nAMUlSNOLTeeYL6VEOUjo6lvkEpuyY GK7YZJ5inqNy58iyMTlH9rC9YS+qsg0IaHADC2pDpbFho4wBCITWlEAkfsEsPm/JFdkB 6H2w== X-Gm-Message-State: AOAM533lb+JwyzQUirFGy0akRXyNsfw/Xd8R/fuSMioM75Fy8ufHp3NG eleYmCy6BCzuJlP6nIEyDMwvAg== X-Received: by 2002:a05:600c:4c17:: with SMTP id d23mr3430529wmp.116.1614009717314; Mon, 22 Feb 2021 08:01:57 -0800 (PST) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id c3sm7373697wrw.80.2021.02.22.08.01.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 08:01:56 -0800 (PST) From: Bryan O'Donoghue To: stanimir.varbanov@linaro.org, agross@kernel.org, bjorn.andersson@linaro.org, mchehab@kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: bryan.odonoghue@linaro.org, dikshita@codeaurora.org, jonathan@marek.ca, vgarodia@codeaurora.org Subject: [PATCH 20/25] media: venus: firmware: Do not toggle WRAPPER_A9SS_SW_RESET on 6xx Date: Mon, 22 Feb 2021 16:02:55 +0000 Message-Id: <20210222160300.1811121-21-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210222160300.1811121-1-bryan.odonoghue@linaro.org> References: <20210222160300.1811121-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Dikshita Agarwal Do not toggle the WRAPPER_A9SS_SW_RESET on 6xx. Signed-off-by: Dikshita Agarwal Signed-off-by: Bryan O'Donoghue --- drivers/media/platform/qcom/venus/firmware.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.29.2 diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c index f9170f596849..a7ebe8de2812 100644 --- a/drivers/media/platform/qcom/venus/firmware.c +++ b/drivers/media/platform/qcom/venus/firmware.c @@ -53,10 +53,12 @@ int venus_set_hw_state(struct venus_core *core, bool resume) return ret; } - if (resume) + if (resume) { venus_reset_cpu(core); - else - writel(1, core->wrapper_base + WRAPPER_A9SS_SW_RESET); + } else { + if (!IS_V6(core)) + writel(1, core->wrapper_base + WRAPPER_A9SS_SW_RESET); + } return 0; }