Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1726406pxj; Wed, 19 May 2021 12:25:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLY2Ng6HEVaGQC0V3rOva6XP57aNzpOWp3xN5ogsbJbd4sWH/pIFf3lmzFGROMYmKOU805 X-Received: by 2002:a05:6638:124b:: with SMTP id o11mr752868jas.4.1621452340055; Wed, 19 May 2021 12:25:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621452340; cv=none; d=google.com; s=arc-20160816; b=h9Z5U8V9jmqJSRgwkDjQEFxtYbXJZcWok4xVCD1jCOT9gPfAOE+Qxngs//rBjWcu3X 2VtNmAOdF/dOwmHxyZGvSCOPWL1MHWpRuhj4EBfrTYjibRAwloe7cCJEHAt4jTf8gb/G m+/sNAKqMsqofzL3t6bP1UoNcQwgZ/npaqilUyJVH1yJDTFSx1hDyw7ce80nsIufMzVS CGasPF3W9Z+9IMOHsThbYz3C3vJdGD67S+2ZBc7gxd3dSEqKml6lgTiyB2pYo18tBaeS JNjDs1lnlgkV+4UKWG1jh7yldRNxH0vXro0QMnmGVnLQAJf0p4Zn/aFTt+tZTU97GKVj 32NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=od8TYVByFX5nkKOyH4YEnnZozaXbZbYPs8joaNSuOls=; b=mxTLPsnBCHDdNquNgO6VFylHniLy/EUjpSyeybKCcWBNQ56SZUqdAqLsYPmeDS0Rqf vXCXI5FTxecUmj26gVBmZKYuReF3TwSD/v7VTHGURAEJJt4x7pbvrWRcfTtjtUePHof+ l/0vI76iZ8pww9cJyLphJbP12FiiSyAmJHD/BPBD5XCWzMQUF17eIWjfOsr/qXvt9kDG laG5o5Ueyl0EpDaME73I+tLXmx4y16/zgni5nTm5AJNq+ifBfBA7xNL+YQVdRYYif5et NoqYJluwCJ8mp6GjB0AnhAvsoKyPNGVftxuDhCVjvQxKKLbI+7jUhAcSLA/3ERV3Vk+k oemQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u9si220627jat.83.2021.05.19.12.25.27; Wed, 19 May 2021 12:25:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345806AbhESJjE (ORCPT + 99 others); Wed, 19 May 2021 05:39:04 -0400 Received: from alexa-out.qualcomm.com ([129.46.98.28]:42311 "EHLO alexa-out.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345835AbhESJjC (ORCPT ); Wed, 19 May 2021 05:39:02 -0400 Received: from ironmsg-lv-alpha.qualcomm.com ([10.47.202.13]) by alexa-out.qualcomm.com with ESMTP; 19 May 2021 02:37:42 -0700 X-QCInternal: smtphost Received: from ironmsg02-blr.qualcomm.com ([10.86.208.131]) by ironmsg-lv-alpha.qualcomm.com with ESMTP/TLS/AES256-SHA; 19 May 2021 02:37:41 -0700 X-QCInternal: smtphost Received: from dikshita-linux.qualcomm.com ([10.204.65.237]) by ironmsg02-blr.qualcomm.com with ESMTP; 19 May 2021 15:07:39 +0530 Received: by dikshita-linux.qualcomm.com (Postfix, from userid 347544) id 2BFAA219DC; Wed, 19 May 2021 15:07:38 +0530 (IST) From: Dikshita Agarwal To: linux-media@vger.kernel.org, stanimir.varbanov@linaro.org Cc: linux-kernel@vger.kernel.org, vgarodia@codeaurora.org, Dikshita Agarwal Subject: [PATCH 4/7] media: venus: hfi: Skip AON register programming for V6 1pipe Date: Wed, 19 May 2021 15:06:45 +0530 Message-Id: <1621417008-6117-5-git-send-email-dikshita@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1621417008-6117-1-git-send-email-dikshita@codeaurora.org> References: <1621417008-6117-1-git-send-email-dikshita@codeaurora.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org AON register programming is used to set NOC to low power mode during V6 power off sequence. However AON register memory map is not applicable to 1pipe, hence skipping AON register programming. Co-developed-by: Mansur Alisha Shaik Co-developed-by: Vikash Garodia Signed-off-by: Dikshita Agarwal --- drivers/media/platform/qcom/venus/hfi_venus.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c index ce98c52..3a75a27 100644 --- a/drivers/media/platform/qcom/venus/hfi_venus.c +++ b/drivers/media/platform/qcom/venus/hfi_venus.c @@ -551,6 +551,9 @@ static int venus_halt_axi(struct venus_hfi_device *hdev) if (IS_V6(hdev->core)) { writel(0x3, cpu_cs_base + CPU_CS_X2RPMH_V6); + if (hdev->core->res->num_vpp_pipes == 1) + goto skip_aon_mvp_noc; + writel(0x1, aon_base + AON_WRAPPER_MVP_NOC_LPI_CONTROL); ret = readl_poll_timeout(aon_base + AON_WRAPPER_MVP_NOC_LPI_STATUS, val, @@ -560,6 +563,7 @@ static int venus_halt_axi(struct venus_hfi_device *hdev) if (ret) return -ETIMEDOUT; +skip_aon_mvp_noc: mask_val = (BIT(2) | BIT(1) | BIT(0)); writel(mask_val, wrapper_base + WRAPPER_DEBUG_BRIDGE_LPI_CONTROL_V6); -- 2.7.4