[v4,11/17] media: venus: hfi_venus: Sanitize venus_cpu_idle_and_pc_ready() per-VPU-version
| Message ID | 20230228-topic-venus-v4-11-feebb2f6e9b8@linaro.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2150233vqr;
Tue, 30 May 2023 05:42:47 -0700 (PDT)
X-Google-Smtp-Source:
ACHHUZ6JmeX2n/9ahNnLaPfm7P0/AmSXAYIuCziAMN8sgkoYryfgkahSINZqyI3qFES5nVp3ptqi
X-Received: by 2002:a05:6a00:13a7:b0:644:ad29:fd5a with SMTP id
t39-20020a056a0013a700b00644ad29fd5amr2895158pfg.21.1685450567054;
Tue, 30 May 2023 05:42:47 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1685450567; cv=none;
d=google.com; s=arc-20160816;
b=TD/sZaOS30j+psvDrKmMae4oHUOW1SKp96Q77dgOYFolERNXLlZJghklZBNCrYHXnd
vVislYv8JBmiVwp+IEjwDSsBkyAzJpQOwALHnLYvZL26qf6dZI5g9mVJ+JmF55V2VxNQ
Rbuau/WxwuPVj/oEpwGcdzg+VEgwULrVu053EStokEs8bpHR9Dg8jzKTQ2NdGa+Mv1yM
M24dNnGiTLIeB9lfXlrk0GfrW9WV+RMJCe1Y86eeRB+7v7eZrEl5zbJ7mkNS7xNbLFgz
VIwvyrZRMYd1uCbB7ybQhXfO4Slez2lFwAo6J2w18+KgxgV6bSZAHVkV5aXLgon/ByGq
OHTA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:cc:to:in-reply-to:references:message-id
:content-transfer-encoding:mime-version:subject:date:from
:dkim-signature;
bh=sFh246SoG2jAhae1NbkulRcn/T0bmO2nXKY2ZVK5ddw=;
b=Viub1RnRU9hah6xcSUvQRAuXdi7v9DWL3Zg+UqwAdCuqj/k/0s3NK987pXszB98g2E
0gq3MgHOyzf2+08ODwBiPUaeAN+H/ZhoRiGnurHnwH3DusvJuz8B2XsN8p0zLy+9FWDB
ttp7HfAYF0fDGQ8u0e00c7tlgCqXY/ih4s1Vo7V4FMxcKXCrhpwS4ZLGJXBsTP4L8lyE
zQtGeDyghdS4oG5KnOhXvTRIp7FHN3xxxZDVaJrW56cRFpI5UcPcaTy4JV+r+eFonFhr
vpsRnrwgLOeeMsWGtfnGFs4K30rBO0XT1hyHIhPutSixI2q+P6pBLpowMyx0EtTp+G3w
tgcA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linaro.org header.s=google header.b=kzsdELY8;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
m67-20020a633f46000000b005303a7ca051si10995061pga.284.2023.05.30.05.42.33;
Tue, 30 May 2023 05:42:47 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@linaro.org header.s=google header.b=kzsdELY8;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-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 S231993AbjE3Mcc (ORCPT <rfc822;andrewvogler123@gmail.com>
+ 99 others); Tue, 30 May 2023 08:32:32 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58986 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S231920AbjE3Mb6 (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 30 May 2023 08:31:58 -0400
Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com
[IPv6:2a00:1450:4864:20::12f])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22C7C19B
for <linux-kernel@vger.kernel.org>;
Tue, 30 May 2023 05:31:37 -0700 (PDT)
Received: by mail-lf1-x12f.google.com with SMTP id
2adb3069b0e04-4effb818c37so4739194e87.3
for <linux-kernel@vger.kernel.org>;
Tue, 30 May 2023 05:31:37 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1685449855; x=1688041855;
h=cc:to:in-reply-to:references:message-id:content-transfer-encoding
:mime-version:subject:date:from:from:to:cc:subject:date:message-id
:reply-to;
bh=sFh246SoG2jAhae1NbkulRcn/T0bmO2nXKY2ZVK5ddw=;
b=kzsdELY83WMHUr3TgkmSvPNGp5L7NnLmYAy70Y9nga0RiFlkzkUvLCvQkDD1VLFwGT
jX8Gk/l9fDOkKAuG98Kk27xM3S0QrgxI+cYP4Hl63IEhoKLrbrCMPrnhHsWEW2pwKfnF
m2tW12N+fqxGkCnUWSQ1qBQdopPew7WBCvWpf3Z5GYic05Y864iIBSzBct05tBlaQ8uD
uTMEb9LjpxdVmjHQEeFrCbmBSqrR52plkHAaqDaXN9UqOf8ETaFl9o7UVA2GWF3j5w2T
g0tJWvXM4eRU4slDIHLOpdJ/wrzzUseWg51dddjydoisxqEF9ju0+ZErkdQLMB3YUXrU
Eeqw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1685449855; x=1688041855;
h=cc:to:in-reply-to:references:message-id:content-transfer-encoding
:mime-version:subject:date:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=sFh246SoG2jAhae1NbkulRcn/T0bmO2nXKY2ZVK5ddw=;
b=aJ6YkIlKQSVDzsxL4lDqaAhUkGiL38Hh3s8o6djcjaMsSH8JnF1Kmn7j9gKgB/j8ZO
uPuTlysRHfNFcEvDgWKqOAzlBLg+pwif6eW8jDQL4U2XtRTJ2Fm6xTklvzdbpONUkTh5
ODSSzMKfXbQmrgVGyHfFE7gX7zS/L3AnD8ovVi5ivA1+CofO+Z4wkoC383A+t0Dx4LHy
KGs/ueBPvx2L/fz2QoJ7Gljw6sOXiUKWGSJ/nBfthVeQIEXIhWGHuLYleDOhI/1jeN/e
6kATY4ExrxrtqzW9YRzcFof/pOTgQ26ZboxBZVQ3Ljw9+bz347gIgyqZHeFucSASgCF9
JGww==
X-Gm-Message-State: AC+VfDwDtACsSgZoBDHezwex4nLMOGKes4wi9eXuQDr+jHFGK9PYX/04
PDt7asyCgZkqQk+C0LACGAF/ng==
X-Received: by 2002:a2e:3a04:0:b0:2b0:790e:95ab with SMTP id
h4-20020a2e3a04000000b002b0790e95abmr679359lja.31.1685449855058;
Tue, 30 May 2023 05:30:55 -0700 (PDT)
Received: from [192.168.1.101] (abyj77.neoplus.adsl.tpnet.pl. [83.9.29.77])
by smtp.gmail.com with ESMTPSA id
u18-20020a2e91d2000000b002a8b8baf542sm2854814ljg.126.2023.05.30.05.30.53
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 30 May 2023 05:30:54 -0700 (PDT)
From: Konrad Dybcio <konrad.dybcio@linaro.org>
Date: Tue, 30 May 2023 14:30:45 +0200
Subject: [PATCH v4 11/17] media: venus: hfi_venus: Sanitize
venus_cpu_idle_and_pc_ready() per-VPU-version
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20230228-topic-venus-v4-11-feebb2f6e9b8@linaro.org>
References: <20230228-topic-venus-v4-0-feebb2f6e9b8@linaro.org>
In-Reply-To: <20230228-topic-venus-v4-0-feebb2f6e9b8@linaro.org>
To: Stanimir Varbanov <stanimir.k.varbanov@gmail.com>,
Vikash Garodia <quic_vgarodia@quicinc.com>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Dikshita Agarwal <dikshita@qti.qualcomm.com>,
Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
Mansur Alisha Shaik <mansur@codeaurora.org>,
Jonathan Marek <jonathan@marek.ca>,
Hans Verkuil <hans.verkuil@cisco.com>,
Dikshita Agarwal <quic_dikshita@quicinc.com>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Stanimir Varbanov <stanimir.varbanov@linaro.org>,
linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org,
Marijn Suijten <marijn.suijten@somainline.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Vikash Garodia <quic_vgarodia@quicinc.com>
X-Mailer: b4 0.12.2
X-Developer-Signature: v=1; a=ed25519-sha256; t=1685449837; l=913;
i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id;
bh=dir0ijhcjSzkrYz9ZlGYapAdRHdLVbJO06zeci6np7c=;
b=wmAExUeiOkcUBkOn2uQmzgB+NkMlejP+e/YYR69HkfqIy+ssD9bcow7EML253GozmhgB2BqGf
f8sqybGMqZHC61+jX+8T9TL0s7i5+cweIwY77aIPQjuGHbOHaNtEMAr
X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519;
pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms=
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED
autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1767323013560005803?=
X-GMAIL-MSGID: =?utf-8?q?1767323013560005803?=
|
| Series |
Venus QoL / maintainability fixes
|
|
Commit Message
Konrad Dybcio
May 30, 2023, 12:30 p.m. UTC
Replace the general IS_V6 checks with more specific VPU version checks.
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
drivers/media/platform/qcom/venus/hfi_venus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 5/30/2023 6:00 PM, Konrad Dybcio wrote: > Replace the general IS_V6 checks with more specific VPU version checks. > > Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> Reviewed-by: Vikash Garodia <quic_vgarodia@quicinc.com> > --- > drivers/media/platform/qcom/venus/hfi_venus.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c > index b5d7aab03bca..82854553f99e 100644 > --- a/drivers/media/platform/qcom/venus/hfi_venus.c > +++ b/drivers/media/platform/qcom/venus/hfi_venus.c > @@ -1536,7 +1536,7 @@ static bool venus_cpu_idle_and_pc_ready(struct venus_hfi_device *hdev) > void __iomem *cpu_cs_base = hdev->core->cpu_cs_base; > u32 ctrl_status, cpu_status; > > - if (IS_V6(hdev->core)) > + if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core)) > cpu_status = readl(wrapper_tz_base + WRAPPER_TZ_CPU_STATUS_V6); > else > cpu_status = readl(wrapper_base + WRAPPER_CPU_STATUS); >
diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c index b5d7aab03bca..82854553f99e 100644 --- a/drivers/media/platform/qcom/venus/hfi_venus.c +++ b/drivers/media/platform/qcom/venus/hfi_venus.c @@ -1536,7 +1536,7 @@ static bool venus_cpu_idle_and_pc_ready(struct venus_hfi_device *hdev) void __iomem *cpu_cs_base = hdev->core->cpu_cs_base; u32 ctrl_status, cpu_status; - if (IS_V6(hdev->core)) + if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core)) cpu_status = readl(wrapper_tz_base + WRAPPER_TZ_CPU_STATUS_V6); else cpu_status = readl(wrapper_base + WRAPPER_CPU_STATUS);