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: 386447 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49ABCC433E9 for ; Mon, 22 Feb 2021 16:05:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 18DB364D73 for ; Mon, 22 Feb 2021 16:05:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231253AbhBVQFF (ORCPT ); Mon, 22 Feb 2021 11:05:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230270AbhBVQDn (ORCPT ); Mon, 22 Feb 2021 11:03:43 -0500 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 898CDC061B3F for ; Mon, 22 Feb 2021 08:01:58 -0800 (PST) Received: by mail-wm1-x32b.google.com with SMTP id a132so14073451wmc.0 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=qpUk0BhDI8wMzcl7YEGSwXtAyHLGBQ26MF6QAYtpncheMSOnCw1HNy+EbsAxmWNcp8 JWAC4B6VweND13J3gwUxJEGT8bH8ezXGPbaNb+6ukAw8Ei5QN60eaTwwYM4+tvSHam1L zTJc50KRCyoYIR3JohQ5y/iQl14K4iq8dg22lY7RO8ANESnnMuQSUx/cYv7nj54jvDP+ nNTt2Z6fIWfQ26L1RlVbDWIjsTBj3QX+wie0VnMwK+fFyEv2uFtHS2a2SFwSmgHZbdxE O9jR8FYYkV/L/kM8pQ7ntxF9lo3W/x4TkVuMvBZFB9oeoI7WSSr8ey20X7rD23UODUaY lF2Q== X-Gm-Message-State: AOAM533NjQxOnn0bUcQ5hS514Ar/IqdU76T4o2pZLRSrpAQos/euZ45p CEJIbiIA57gNt4McM9eqhHXTIg== X-Google-Smtp-Source: ABdhPJzgzFllYad+7viwuWTaM5BYaOwHodDARgseCUh2aeGpFCT7TENdzmUxdUpTX+l4DJ/OmgqxFg== 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-media@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(-) 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; }