Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp441827rwd; Thu, 1 Jun 2023 02:22:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5WKRaxs9wfZBknCZ36BPAEPuRqAPvuKHlHe1gmFGJYIyu05hBRHMeRPDt8Tgz2aiLe1xxm X-Received: by 2002:a17:902:cec1:b0:1ac:6ef0:a96e with SMTP id d1-20020a170902cec100b001ac6ef0a96emr6038936plg.31.1685611331920; Thu, 01 Jun 2023 02:22:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685611331; cv=none; d=google.com; s=arc-20160816; b=RO5v3eS78CRsFwx2GTRqRFBC/9EUXkEDiNTr/rWIT9iJWKOSB/8BJGGuNR3zHSp6Iw VztXO3xwY+dcHvZhCJF04Rrso7MEDT0k9D6EvPFGUtHg70R0N80TArdoxMLIFI6sJmU+ kCP0BwcObp+Dc9uv5ESQ/zzik+XFPiE/GaZQUBQYe++QU4PgPxM2FDrYD+aiWcsBjgyB 0j3xLM+UjZTLNsyer5bNTSXGz94ye6oRFzVmNQCVHAudBYbJQj98UHF+W0U62nEXZj5J i+VdmTh/gT/lGjwxxB5gt4/DxXnkhZSpgzW4GiM83j/vk6sgyrV07S+/cQwAZAhT1CST 4EEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=OGkF/bNPKpR3TE+kTvOySpdm/xuSX68k2XgfZZBWuSs=; b=pULqmZYM3yqpf8n5Vy3V8GxV1YqVdXrADQISfTSgk0lGiq4HkfPdEBhXwmrzagQnmC yrdGhyG+9YFtKLTBiNCiH4AbA+4H6H4XislhKxegX3sorJLFhVW6/M2zV47u2xq2M93o WFWfaRfLluwdwPg4+LCd3zna2/rwZ+6WtaZHDcJavMm1zuMOk3PznPDtJ3MLOGAtaV2S w/WNTYXui+JjZnGLgBIaw0Mw9+/nOUsHG/NuAYT0NN0FhI/yaope8IeSzeR8NNfPUPno JcJfM6iRI5qn/QCYta5R4gUMNKpujL9lYylyDU8JZPOvbGvmqAnUmTYbRrvfFK4t6T1t NNUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=PX670NEk; 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=quicinc.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id km3-20020a17090327c300b001aaf1734d1dsi2331088plb.241.2023.06.01.02.21.57; Thu, 01 Jun 2023 02:22:11 -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=@quicinc.com header.s=qcppdkim1 header.b=PX670NEk; 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=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232300AbjFAJQZ (ORCPT + 99 others); Thu, 1 Jun 2023 05:16:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231365AbjFAJQX (ORCPT ); Thu, 1 Jun 2023 05:16:23 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05219E7; Thu, 1 Jun 2023 02:16:22 -0700 (PDT) Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3518e27s011457; Thu, 1 Jun 2023 09:15:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=qcppdkim1; bh=OGkF/bNPKpR3TE+kTvOySpdm/xuSX68k2XgfZZBWuSs=; b=PX670NEkjcgj7mYDgypnFUIgK9qvPZPu0MeswdBQpRSAPEl4Zj1aY+7kcEPruB3NhnM5 wbrPqGYBNjQHJdWi25IgahjfHKYmYChdJuL86vyKPZGrhKtTiTIInPAzmbfA7CY+tZ43 EzxjxvvtS0VAeNJ0QHSGBF5CoJt8gyKOuAUZqfaut02KwmKZk2RhIjUMePH3CctW5Tsa Mw2tbMISX/9/UBupOiZkHjywGpdVPaU09Mh8ArZwmL5LybtsN6W1t0Q5GHgH/MoF5+xP nUqvUm8qPhA5n+BLcJIvYkVmmJ+DKpo5ty8671jY0Ggr6N+hQX5OHVA82qj6rfFpCYmn lA== Received: from nasanppmta05.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3qxqne84br-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 01 Jun 2023 09:15:51 +0000 Received: from nasanex01a.na.qualcomm.com (nasanex01a.na.qualcomm.com [10.52.223.231]) by NASANPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 3519FpDi031908 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 1 Jun 2023 09:15:51 GMT Received: from [10.216.48.115] (10.80.80.8) by nasanex01a.na.qualcomm.com (10.52.223.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42; Thu, 1 Jun 2023 02:15:46 -0700 Message-ID: Date: Thu, 1 Jun 2023 14:45:43 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH v4 11/17] media: venus: hfi_venus: Sanitize venus_cpu_idle_and_pc_ready() per-VPU-version Content-Language: en-US To: Konrad Dybcio , Stanimir Varbanov , Andy Gross , "Bjorn Andersson" , Mauro Carvalho Chehab , Dikshita Agarwal , Bryan O'Donoghue , Mansur Alisha Shaik , Jonathan Marek , Hans Verkuil , Dikshita Agarwal CC: Mauro Carvalho Chehab , Stanimir Varbanov , , , , "Marijn Suijten" References: <20230228-topic-venus-v4-0-feebb2f6e9b8@linaro.org> <20230228-topic-venus-v4-11-feebb2f6e9b8@linaro.org> From: Vikash Garodia In-Reply-To: <20230228-topic-venus-v4-11-feebb2f6e9b8@linaro.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01a.na.qualcomm.com (10.52.223.231) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: QUJCZa5xsrycknu-8vaNGTFv4yHIcnL5 X-Proofpoint-GUID: QUJCZa5xsrycknu-8vaNGTFv4yHIcnL5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-01_06,2023-05-31_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 clxscore=1015 impostorscore=0 suspectscore=0 bulkscore=0 mlxscore=0 lowpriorityscore=0 priorityscore=1501 malwarescore=0 spamscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2306010082 X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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: X-Mailing-List: linux-kernel@vger.kernel.org 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 Reviewed-by: Vikash Garodia > --- > 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); >