From patchwork Fri Apr 2 10:06:43 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: 414345 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1285238jai; Fri, 2 Apr 2021 03:08:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfYsoAmFS4WiZcr0FArjzd5zwe+4244jPRsPHRr94LPfdYHEbt67qyIjOASJnQWrC7f8da X-Received: by 2002:a05:6638:35ab:: with SMTP id v43mr12060556jal.65.1617358080116; Fri, 02 Apr 2021 03:08:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617358080; cv=none; d=google.com; s=arc-20160816; b=ZyEBmFXStVj3Dx4x7Cb/815rawuKFYfmyKdXwOi6JRVcMa+9L7KYoAcMQb0G31hFvk BHWjPWQiwKpRLQ5hFxnIStvdZgFzLIpTBj58paVWKWziKBTeutKy40Pt6ZEekHH3W15n B7o/H4dhZ4vXn8VwWJxbo7aptJ9wHOXRh1BRn0jJ3sdJVNCzNR4F5oE1r34vJWFHEJHr X+7GBeVBTebOzc5EEyiefKzzdXvrb2mBDLakbrz8wcw8rMQp2WRweMTMS04JTCdJWPhj U8TLguT9AEyN/CbdcJfUOL1dHCBQiyQ08UiGTieoEsCrkegnX9mi9CwnHhYxS7yIC3t8 vhag== 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=Z7UGuQOdemv2oMoc8naE5ESdlFA5KVU47RowvDDBw/A=; b=E5zOX/T0d1JeRaTtKqgGXYvAKt8VH6tl6cCXC0IanCT6zn2Rt+w7ybqFqD43LWd857 XvlsSruH2qhLNk8WqL9s0vaLhXcI2KP3IWpaihC2Oi7gpQgZYVBrabj7uq96I+jOAWyT DcLTfB0IzsQmEmqFLdekKl/5VUmKGEeeGb0xlNSSDPF37uhH2DF+ZB7XFsJeK3p9NgoE THrutXBvo2Y9w2SxcbX86c0D8LrjUjcEB/wuJ7O4wrqjFdeXe2csi3Ns2G0hHEFrKsPR rD33O9pufPqviiCjr2GyrmXtxhMS4oj7jma7KLZkO3EtX168gA+mlqtsCeDVXZ1p70rU wKag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RZWnwEPM; 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 g2si6942838ile.30.2021.04.02.03.07.59; Fri, 02 Apr 2021 03:08:00 -0700 (PDT) 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=RZWnwEPM; 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 S234975AbhDBKFo (ORCPT + 17 others); Fri, 2 Apr 2021 06:05:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234997AbhDBKFk (ORCPT ); Fri, 2 Apr 2021 06:05:40 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AEC7EC06178A for ; Fri, 2 Apr 2021 03:05:38 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id x7so4296609wrw.10 for ; Fri, 02 Apr 2021 03:05:38 -0700 (PDT) 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=Z7UGuQOdemv2oMoc8naE5ESdlFA5KVU47RowvDDBw/A=; b=RZWnwEPMTOD/SqfAAtj8lLmPKW1RgZzkRNMlIvQVskMyjVR9Pfuba1H64f6O8U8XAV TZd1V1WkcMxJ/pB/0iEtxQh0CDK5DCKS46sXB7hNg38Yb614O8KICbgYPg4+wKCJ/1U8 v/G7PtMBNPh1EpmOcWtTEB/HezTpcN/68HJueRGkNPImoVBxFOiAhXFW+qcF39hZJ/sj gbN/zV+bIgUAMebyDjwEFbxZ9jN8933kY4VUVHhlhul15w7ojmfgavQfeh5KqUTV69Nu yNFVWzYdxK4LMyqtMcc0q/hJmfraJUh4pSdIxcKCniWCKwG/+Xv7R+7raZuT48132TUa CeAg== 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=Z7UGuQOdemv2oMoc8naE5ESdlFA5KVU47RowvDDBw/A=; b=NqPBFPoP+1VGkGIVaE6bit5sZLoVIE6cfwCLXIJjl7hwajGv7ymm+jh52OflVs7kqm T4pQxAqaFfnBww7Eh+iZCoKYDqQHwacRlJT5FcF1sGbzYhzxObD49TFoy6sY1c0eI4Fe /hM53SwD/0ozBTfLjpwjCrEsYluM4OEKoA5z09ankYuRRDY3mxWtEv7e6XT7eSPx0biB mbjbO6IDDEgoBUsqm9NWHF7UONm39LEKujIBafA1YpqlIu3iz7fqIM2TqWtP/zXO7GlJ ydomXclrgTHkyxh7SY4FMcRYKf8OaMZg6Q++HGgBsuYNJp0LshXcrG2n+eXOlXtccHSd fJuw== X-Gm-Message-State: AOAM533waQKtZbw8wCRJLvZKIq9KPg0GSP4W6RJKCulSaSKRvIGD9HDF 2DHIG7+GzNYh/4Ms/+6915H2GrMacOTpi9Za X-Received: by 2002:a05:6000:1acd:: with SMTP id i13mr14378178wry.48.1617357937428; Fri, 02 Apr 2021 03:05:37 -0700 (PDT) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id v18sm15466618wrf.41.2021.04.02.03.05.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Apr 2021 03:05:37 -0700 (PDT) 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 v3 20/25] media: venus: firmware: Do not toggle WRAPPER_A9SS_SW_RESET on 6xx Date: Fri, 2 Apr 2021 11:06:43 +0100 Message-Id: <20210402100648.1815854-21-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210402100648.1815854-1-bryan.odonoghue@linaro.org> References: <20210402100648.1815854-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 Acked-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/firmware.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.30.1 diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c index 8c2c68114bbd..227bd3b3f84c 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; }