From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 563E83D7D8D for ; Fri, 18 Sep 2026 04:29:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789705760; cv=none; b=d9CnN20OW42FDj/8Jcw0Ot/T57+nf3chOhUDs+o4VG10xB6oVXPMdvae04jFbOKGSsSWIK8mXqjol8rPd5peWnaCh+WTQIZ6s3ewHRox97uOO69pA31NrOoZPChMKCISSShYFY3mlF36WXZXQePFqNGCfOkmk1FpgYWvdGmRsRI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789705760; c=relaxed/simple; bh=Xlbwl6Vx4+HGBNlzMqIIKgTeAZAgMjnSyrLdOon688A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gdTee+dMJ3i5BSqRcZ67oXboAIJLX5Kin3h7bUC6L/7icZqj0UAU5GpYUTxDPRaVimWzX6tlzURbf4zWlRsvCjizl5bICsHqaK+b32n5QIZIu4tJRt/VBKIsGjnNm1Q5CU9eOUHLWhcS3MgaxEM3DgN/2woPF0AGZbdZOmPfksg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=daH1IsZ6; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=QdCxLHnO; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="daH1IsZ6"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="QdCxLHnO" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68I2UcRx2851914 for ; Fri, 18 Sep 2026 04:29:17 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= m11kiYCAwMQ7W55vXcbMY21fBGFpt1wSVq3rfYTVbAI=; b=daH1IsZ6isAEM7hW OdFa/wwhfvA9EuVOTCUDzlM2TERjNWF+LqfGUBDmCexFdXvWyfTrnV6gU8hC3WIQ Ktbr375AxTrtXqOaNAUHPzgVua9bOeEqtnwbx8BRonbgMLB7Kzv71/YwRQrqZ5te OFob6hRZb2sjTzGHAQ7Wp3GMo+568clVUIAtcdqbxiNfNTINeKXAfgxI9mG+wuDB iCvyU5Ape+JlROehQ2zpTRbXk8wbfB/WFL0BQ2Q1uSfdH8gADlbAEMC2g62zAnsN re7er5IKCs2JnqWYwBPYuqTn9wlpOecEymSc17MJ4iAiemaTMy63bm4gea+u4OwX CYFBTA== Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4grq2ksqfn-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 18 Sep 2026 04:29:17 +0000 (GMT) Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-cc4ac5feaa4so409322a12.1 for ; Thu, 17 Sep 2026 21:29:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1789705756; x=1790310556; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=m11kiYCAwMQ7W55vXcbMY21fBGFpt1wSVq3rfYTVbAI=; b=QdCxLHnO1ROaTCrXMTbLrg9b0rVXCsCfIUdxuFeoVMnjE5HxfoRJfU6ahnuHMRiuIH HRGs6Mttud31FLRaXYhZuE1uwhlksg9h9cu2z982Tb52jVBQbP/TXRX0TeJGi0UXxnI8 QE2n2QdTJYv33v5YjzC7XmXjsJkrUzlR7FwsybeqfDWk3zGQsC4TaVjGOE2hf/fCBRmP UY3NM2IB/UyY7hodT92U85sVJUmxH1EV8a06EVsrmFq8Vo2rnKUIsavA7RvwQ9haug92 /Ja4Wa9Q0djUFWnFDcpQd1eTvGZTOSpAAK+G85DzBidQbBwURf1s4ycoEGZF9EhS2oFV UfIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789705756; x=1790310556; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=m11kiYCAwMQ7W55vXcbMY21fBGFpt1wSVq3rfYTVbAI=; b=XfCNySDnR+RyWnbx0cVOYySJQknId90v9+Zhq/JAOIkqo2/5ZSZRafaTg8KRn3A/hz rrCcV7eHlRavwSbJHPCWumC6/0fSZBNxVmbnhIENhpFF15vqj0B3dy2Tpwtvmix4+8ms sVWynX1BlCvFJwEx/SASnDWKrczZynNo1izHN+ytPaTG/t4lPbygYtrOOVTF3x5wuIA2 sOiQIPwWjn1iP4Fg1YQnoTDULdrCY5Q3OTzGoi6z+nyRKPmzhPPeCuEp2eXn7jWWMdIq QL4O683LBiuRvADCTxpubmnCekPUOv8HJKK8T/cCYoICY7TQmIypDMG0/PiXaF23h/6d qnlg== X-Forwarded-Encrypted: i=1; AKwUvBwhEtMi+Q2hVnv5JHjaQSfVmtOEN5NQkszPyeq3q1IQi57Z47gEOJJLKgRQGf/rZ6mWwJ/UgNTQvk3c@vger.kernel.org X-Gm-Message-State: AFuF++neB3yF9HOO0MQnwo7Zm73VG/rHaSfyW54g6PIYhBGCKmNbEDMw kzLsCA2gLeE6b3LRTQ4rJoZNgbdbrW9bKWfcgEyniiq75JUZ+2S+2wOVn5FAIsp+acDMT85FYDV t6l00lngv/0jTj7gz/tSDDENBrbC0DCKupRH+fINPMNDkd6WxtmXfmVJHklaK+Yc1 X-Gm-Gg: AYBFou2oGcpB7HXzPmXsoP0VoQfupnaVCt0ELJm6anD8pkp6FWY7U1Sqady8+L0wZZe c2nnzvv3BCx03tmkGc8BvLC2VnF0P2y52cxhVNMIMdvn6FG4+pACWLLVQwrdetCEejnAhoFBeUJ jLNFYKUv0pVxhRWzOVTpTwfN9CCh1ih5IRrt4dOePtL2yGkZaqRuA9MGAFLiK1lBA7l/+rFrptT fbctMyQPOHIa9y08iGz84gGkHM5Yy9sqORWBCKdY4ggXKqfknBTAkhVZOb6d4VLbI3UxxyPmihr ooUGMwqXjleLtshk2oRwhhYlKbnZXsWhSgVQKO9Xj81WVDWqVKwz+8xF+e4Dc9ldR+lEkQvtyg+ 3jw9yKa/I+vYwf/fmLL+NbgKjFsKTRxs= X-Received: by 2002:a05:6a20:2d08:b0:3dd:85a8:4c61 with SMTP id adf61e73a8af0-3dd8c5c9c87mr2361469637.40.1789705756204; Thu, 17 Sep 2026 21:29:16 -0700 (PDT) X-Received: by 2002:a05:6a20:2d08:b0:3dd:85a8:4c61 with SMTP id adf61e73a8af0-3dd8c5c9c87mr2361428637.40.1789705755735; Thu, 17 Sep 2026 21:29:15 -0700 (PDT) Received: from WANGAOW-LAB01.ap.qualcomm.com ([114.94.8.21]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cc5c4dba322sm214595a12.10.2026.09.17.21.29.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 21:29:15 -0700 (PDT) From: Wangao Wang Date: Fri, 18 Sep 2026 12:28:42 +0800 Subject: [PATCH 3/6] media: iris: move shared APV PM helpers to iris_vpu_common Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260918-add_iris_for_hawi-v1-3-ac60fd15c98b@oss.qualcomm.com> References: <20260918-add_iris_for_hawi-v1-0-ac60fd15c98b@oss.qualcomm.com> In-Reply-To: <20260918-add_iris_for_hawi-v1-0-ac60fd15c98b@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Bryan O'Donoghue , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stanimir Varbanov , Abhinav Kumar , Philipp Zabel Cc: linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Wangao Wang X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1789705735; l=12865; i=wangao.wang@oss.qualcomm.com; s=20251021; h=from:subject:message-id; bh=Xlbwl6Vx4+HGBNlzMqIIKgTeAZAgMjnSyrLdOon688A=; b=xS/tl3pnaZ2o/d9+wyb7in3zm6Tx2ldq41g/h8xWGa6tc1BlX7exdtKF90UewjF2pboKoVG1a j/wuhcWjvRfDcZn/0vaRn74eQJs0N5U2MBPvQvV/icdh4tflUqsgFiJ X-Developer-Key: i=wangao.wang@oss.qualcomm.com; a=ed25519; pk=bUPgYblBUAsoPyGfssbNR7ZXUSGF8v1VF4FJzSO6/aA= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTE4MDA1NiBTYWx0ZWRfXxVqvG8NzS0Un rDTZJX645WxldZyT51VujZq0aF9XXsaCwxOnc0iALTQDBG7tV/Tl+IYgcO8jocuTeMOcnc9/MEN wsvb8ZNG9/h7SisdNNKFb5GUE9N300GzEX0Wi9znl1mHT3lyrySLVjlP1Lbn6geUEbtM3K01cFg Btka1W+28IHf5/aa6/dedY7sF7PiFEKwiYnlIWHztW884v8dQmve2CLIO3+NK5Wg9K1IumDUBf8 dViwSUc0AFGaw5TMuSS35zf2/lyj8kLiwQSOxb3nMCmn2yDGAaCaqN6ktaZSUaAwXMjHgrLnGea hL/aXV1ndWMTrSaSYH81NhJdLCcojtI3Bt1ZphMkmOydxop6ffhvsG6leXxpgyZbr6gw5GaJ/eC lbvfVPJJS5P2zx/t4WXBHO3H0nfjJ0TmHNUiGHzKsn8fhU8i3BOh6hTyZyXAXZKwpazAHFZALgY U6syTwqIFgGkT+svUmA== X-Proofpoint-GUID: u_qupw5DS_jwYlYJ7M0pjbXwPVhP-6Sw X-Authority-Analysis: v=2.4 cv=bcD+w+PB c=1 sm=1 tr=0 ts=6aacbe1d cx=c_pps a=Qgeoaf8Lrialg5Z894R3/Q==:117 a=Uz3yg00KUFJ2y2WijEJ4bw==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=jRDX25Ug_5KbIaVBG-EA:9 a=QEXdDO2ut3YA:10 a=x9snwWr2DeNwDh03kgHS:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTE4MDA1NiBTYWx0ZWRfXzcCmpUWs2eCD IRLUaZilirKhCXecIcCX8+42IbekLOjywglNgD9Wfa+xLof+MUJ/l6vSm9mX9k1HZOA0wuVBVQf EZs+KASe6naHk3eyV8kTzMfJOjNlMfc= X-Proofpoint-ORIG-GUID: u_qupw5DS_jwYlYJ7M0pjbXwPVhP-6Sw X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-18_01,2026-09-16_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 clxscore=1015 adultscore=0 suspectscore=0 priorityscore=1501 bulkscore=0 phishscore=0 impostorscore=0 lowpriorityscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609180056 The APV power on/off sequences and AHB bridge sync reset helpers are currently local to iris_vpu4x.c. VPU5x uses the same sequences, so keeping them in the VPU4x implementation would either prevent reuse or require duplicating the code. Move the helpers to iris_vpu_common.c and rename them with a vpu4x_vpu5x prefix to reflect their shared usage. Move the associated register constants, including APV_CLK_HALT, the efuse control bits, CPU_CS_APV_BRIDGE_SYNC_RESET, WRAPPER_EFUSE_MONITOR, and AON_WRAPPER_MVP_NOC_RESET_SYNCRST, to iris_vpu_register_defines.h so both implementations can use them. Signed-off-by: Wangao Wang --- drivers/media/platform/qcom/iris/iris_vpu4x.c | 105 +-------------------- drivers/media/platform/qcom/iris/iris_vpu_common.c | 91 ++++++++++++++++++ drivers/media/platform/qcom/iris/iris_vpu_common.h | 4 + .../platform/qcom/iris/iris_vpu_register_defines.h | 10 ++ 4 files changed, 109 insertions(+), 101 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_vpu4x.c b/drivers/media/platform/qcom/iris/iris_vpu4x.c index 02e100a4045fced33d7a3545b632cc5f0955233f..93acbfa0f471fdec1cb75db732f37ef6c6ef5cbf 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu4x.c +++ b/drivers/media/platform/qcom/iris/iris_vpu4x.c @@ -10,18 +10,11 @@ #include "iris_vpu_common.h" #include "iris_vpu_register_defines.h" -#define AON_WRAPPER_MVP_NOC_RESET_SYNCRST (AON_MVP_NOC_RESET + 0x08) -#define CPU_CS_APV_BRIDGE_SYNC_RESET (CPU_BASE_OFFS + 0x174) #define MVP_NOC_RESET_REQ_MASK 0x70103 #define VPU_IDLE_BITS 0x7103 -#define WRAPPER_EFUSE_MONITOR (WRAPPER_BASE_OFFS + 0x08) -#define APV_CLK_HALT BIT(1) #define CORE_CLK_HALT BIT(0) #define CORE_PWR_ON BIT(1) -#define DISABLE_VIDEO_APV_BIT BIT(27) -#define DISABLE_VIDEO_VPP1_BIT BIT(28) -#define DISABLE_VIDEO_VPP0_BIT BIT(29) static int iris_vpu4x_genpd_set_hwmode(struct iris_core *core, bool hw_mode, u32 efuse_value) { @@ -68,96 +61,6 @@ static int iris_vpu4x_genpd_set_hwmode(struct iris_core *core, bool hw_mode, u32 return ret; } -static int iris_vpu4x_power_on_apv(struct iris_core *core) -{ - int ret; - - ret = iris_enable_power_domains(core, - core->pmdomain_tbl->pd_devs[IRIS_APV_HW_POWER_DOMAIN]); - if (ret) - return ret; - - ret = iris_prepare_enable_clock(core, IRIS_APV_HW_CLK); - if (ret) - goto disable_apv_hw_power_domain; - - return 0; - -disable_apv_hw_power_domain: - iris_disable_power_domains(core, core->pmdomain_tbl->pd_devs[IRIS_APV_HW_POWER_DOMAIN]); - - return ret; -} - -static void iris_vpu4x_power_off_apv(struct iris_core *core) -{ - bool handshake_done, handshake_busy; - u32 value, count = 0; - int ret; - - value = readl(core->reg_base + WRAPPER_CORE_CLOCK_CONFIG); - - if (value & APV_CLK_HALT) - writel(0x0, core->reg_base + WRAPPER_CORE_CLOCK_CONFIG); - - do { - writel(REQ_POWER_DOWN_PREP, core->reg_base + AON_WRAPPER_MVP_NOC_LPI_CONTROL); - usleep_range(10, 20); - value = readl(core->reg_base + AON_WRAPPER_MVP_NOC_LPI_STATUS); - - handshake_done = value & NOC_LPI_STATUS_DONE; - handshake_busy = value & (NOC_LPI_STATUS_DENY | NOC_LPI_STATUS_ACTIVE); - - if (handshake_done || !handshake_busy) - break; - - writel(0x0, core->reg_base + AON_WRAPPER_MVP_NOC_LPI_CONTROL); - usleep_range(10, 20); - - } while (++count < 1000); - - if (!handshake_done && handshake_busy) - dev_err(core->dev, "LPI handshake timeout\n"); - - writel(0x080200, core->reg_base + AON_WRAPPER_MVP_NOC_RESET_REQ); - ret = readl_poll_timeout(core->reg_base + AON_WRAPPER_MVP_NOC_RESET_ACK, - value, value & 0x080200, 200, 2000); - if (ret) - goto disable_clocks_and_power; - - writel(0x0, core->reg_base + AON_WRAPPER_MVP_NOC_RESET_SYNCRST); - writel(0x0, core->reg_base + AON_WRAPPER_MVP_NOC_RESET_REQ); - ret = readl_poll_timeout(core->reg_base + AON_WRAPPER_MVP_NOC_RESET_ACK, - value, value == 0x0, 200, 2000); - if (ret) - goto disable_clocks_and_power; - - writel(CORE_BRIDGE_SW_RESET | CORE_BRIDGE_HW_RESET_DISABLE, core->reg_base + - CPU_CS_APV_BRIDGE_SYNC_RESET); - writel(CORE_BRIDGE_HW_RESET_DISABLE, core->reg_base + CPU_CS_APV_BRIDGE_SYNC_RESET); - writel(0x0, core->reg_base + CPU_CS_APV_BRIDGE_SYNC_RESET); - -disable_clocks_and_power: - iris_disable_unprepare_clock(core, IRIS_APV_HW_CLK); - iris_disable_power_domains(core, core->pmdomain_tbl->pd_devs[IRIS_APV_HW_POWER_DOMAIN]); -} - -static void iris_vpu4x_ahb_sync_reset_apv(struct iris_core *core) -{ - writel(CORE_BRIDGE_SW_RESET | CORE_BRIDGE_HW_RESET_DISABLE, core->reg_base + - CPU_CS_APV_BRIDGE_SYNC_RESET); - writel(CORE_BRIDGE_HW_RESET_DISABLE, core->reg_base + CPU_CS_APV_BRIDGE_SYNC_RESET); - writel(0x0, core->reg_base + CPU_CS_APV_BRIDGE_SYNC_RESET); -} - -static void iris_vpu4x_ahb_sync_reset_hardware(struct iris_core *core) -{ - writel(CORE_BRIDGE_SW_RESET | CORE_BRIDGE_HW_RESET_DISABLE, core->reg_base + - CPU_CS_AHB_BRIDGE_SYNC_RESET); - writel(CORE_BRIDGE_HW_RESET_DISABLE, core->reg_base + CPU_CS_AHB_BRIDGE_SYNC_RESET); - writel(0x0, core->reg_base + CPU_CS_AHB_BRIDGE_SYNC_RESET); -} - static int iris_vpu4x_enable_hardware_clocks(struct iris_core *core, u32 efuse_value) { int ret; @@ -249,7 +152,7 @@ static int iris_vpu4x_power_on_hardware(struct iris_core *core) goto disable_vpp1_power_domain; if (!(efuse_value & DISABLE_VIDEO_APV_BIT)) { - ret = iris_vpu4x_power_on_apv(core); + ret = iris_vpu4x_vpu5x_power_on_apv(core); if (ret) goto disable_hw_clocks; } @@ -282,7 +185,7 @@ static void iris_vpu4x_power_off_hardware(struct iris_core *core) iris_vpu4x_genpd_set_hwmode(core, false, efuse_value); if (!(efuse_value & DISABLE_VIDEO_APV_BIT)) - iris_vpu4x_power_off_apv(core); + iris_vpu4x_vpu5x_power_off_apv(core); value = readl(core->reg_base + WRAPPER_CORE_POWER_STATUS); @@ -353,9 +256,9 @@ static int iris_vpu4x_set_hwmode(struct iris_core *core) u32 efuse_value = readl(core->reg_base + WRAPPER_EFUSE_MONITOR); if (!(efuse_value & DISABLE_VIDEO_APV_BIT)) - iris_vpu4x_ahb_sync_reset_apv(core); + iris_vpu4x_vpu5x_ahb_sync_reset_apv(core); - iris_vpu4x_ahb_sync_reset_hardware(core); + iris_vpu4x_vpu5x_ahb_sync_reset_hardware(core); return iris_vpu4x_genpd_set_hwmode(core, true, efuse_value); } diff --git a/drivers/media/platform/qcom/iris/iris_vpu_common.c b/drivers/media/platform/qcom/iris/iris_vpu_common.c index e4847c1077097160cfc8324e807b4aabd9747812..a0129ed39cf2dfd0d56ecdc63d909f26f8acedf8 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu_common.c +++ b/drivers/media/platform/qcom/iris/iris_vpu_common.c @@ -21,6 +21,7 @@ #define CTRL_INIT_IDLE_MSG_BMSK 0x40000000 #define CTRL_ERROR_STATUS__M 0xfe #define CTRL_STATUS_PC_READY 0x100 +#define NOC_RESET_APV 0x080200 #define QTBL_INFO (CPU_CS_BASE_OFFS + 0x50) #define QTBL_ENABLE BIT(0) @@ -501,6 +502,96 @@ int iris_vpu_power_on(struct iris_core *core) return ret; } +int iris_vpu4x_vpu5x_power_on_apv(struct iris_core *core) +{ + int ret; + + ret = iris_enable_power_domains(core, + core->pmdomain_tbl->pd_devs[IRIS_APV_HW_POWER_DOMAIN]); + if (ret) + return ret; + + ret = iris_prepare_enable_clock(core, IRIS_APV_HW_CLK); + if (ret) + goto disable_apv_hw_power_domain; + + return 0; + +disable_apv_hw_power_domain: + iris_disable_power_domains(core, core->pmdomain_tbl->pd_devs[IRIS_APV_HW_POWER_DOMAIN]); + + return ret; +} + +void iris_vpu4x_vpu5x_power_off_apv(struct iris_core *core) +{ + bool handshake_done, handshake_busy; + u32 value, count = 0; + int ret; + + value = readl(core->reg_base + WRAPPER_CORE_CLOCK_CONFIG); + + if (value & APV_CLK_HALT) + writel(0x0, core->reg_base + WRAPPER_CORE_CLOCK_CONFIG); + + do { + writel(REQ_POWER_DOWN_PREP, core->reg_base + AON_WRAPPER_MVP_NOC_LPI_CONTROL); + usleep_range(10, 20); + value = readl(core->reg_base + AON_WRAPPER_MVP_NOC_LPI_STATUS); + + handshake_done = value & NOC_LPI_STATUS_DONE; + handshake_busy = value & (NOC_LPI_STATUS_DENY | NOC_LPI_STATUS_ACTIVE); + + if (handshake_done || !handshake_busy) + break; + + writel(0x0, core->reg_base + AON_WRAPPER_MVP_NOC_LPI_CONTROL); + usleep_range(10, 20); + + } while (++count < 1000); + + if (!handshake_done && handshake_busy) + dev_err(core->dev, "LPI handshake timeout\n"); + + writel(NOC_RESET_APV, core->reg_base + AON_WRAPPER_MVP_NOC_RESET_REQ); + ret = readl_poll_timeout(core->reg_base + AON_WRAPPER_MVP_NOC_RESET_ACK, + value, value & NOC_RESET_APV, 200, 2000); + if (ret) + goto disable_clocks_and_power; + + writel(0x0, core->reg_base + AON_WRAPPER_MVP_NOC_RESET_SYNCRST); + writel(0x0, core->reg_base + AON_WRAPPER_MVP_NOC_RESET_REQ); + ret = readl_poll_timeout(core->reg_base + AON_WRAPPER_MVP_NOC_RESET_ACK, + value, value == 0x0, 200, 2000); + if (ret) + goto disable_clocks_and_power; + + writel(CORE_BRIDGE_SW_RESET | CORE_BRIDGE_HW_RESET_DISABLE, core->reg_base + + CPU_CS_APV_BRIDGE_SYNC_RESET); + writel(CORE_BRIDGE_HW_RESET_DISABLE, core->reg_base + CPU_CS_APV_BRIDGE_SYNC_RESET); + writel(0x0, core->reg_base + CPU_CS_APV_BRIDGE_SYNC_RESET); + +disable_clocks_and_power: + iris_disable_unprepare_clock(core, IRIS_APV_HW_CLK); + iris_disable_power_domains(core, core->pmdomain_tbl->pd_devs[IRIS_APV_HW_POWER_DOMAIN]); +} + +void iris_vpu4x_vpu5x_ahb_sync_reset_apv(struct iris_core *core) +{ + writel(CORE_BRIDGE_SW_RESET | CORE_BRIDGE_HW_RESET_DISABLE, core->reg_base + + CPU_CS_APV_BRIDGE_SYNC_RESET); + writel(CORE_BRIDGE_HW_RESET_DISABLE, core->reg_base + CPU_CS_APV_BRIDGE_SYNC_RESET); + writel(0x0, core->reg_base + CPU_CS_APV_BRIDGE_SYNC_RESET); +} + +void iris_vpu4x_vpu5x_ahb_sync_reset_hardware(struct iris_core *core) +{ + writel(CORE_BRIDGE_SW_RESET | CORE_BRIDGE_HW_RESET_DISABLE, core->reg_base + + CPU_CS_AHB_BRIDGE_SYNC_RESET); + writel(CORE_BRIDGE_HW_RESET_DISABLE, core->reg_base + CPU_CS_AHB_BRIDGE_SYNC_RESET); + writel(0x0, core->reg_base + CPU_CS_AHB_BRIDGE_SYNC_RESET); +} + void iris_vpu_set_preset_registers(struct iris_core *core) { writel(0x0, core->reg_base + 0xb0088); diff --git a/drivers/media/platform/qcom/iris/iris_vpu_common.h b/drivers/media/platform/qcom/iris/iris_vpu_common.h index 09799a375c1426d808ab5ea4fdfcac3a203e15b3..cc22c7459c4b77fdcb95b546fb8a55eea522bfb8 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu_common.h +++ b/drivers/media/platform/qcom/iris/iris_vpu_common.h @@ -41,6 +41,10 @@ int iris_vpu35_vpu4x_power_off_controller(struct iris_core *core); int iris_vpu35_vpu4x_power_on_controller(struct iris_core *core); void iris_vpu35_vpu4x_program_bootup_registers(struct iris_core *core); u64 iris_vpu3x_vpu4x_calculate_frequency(struct iris_inst *inst, size_t data_size); +int iris_vpu4x_vpu5x_power_on_apv(struct iris_core *core); +void iris_vpu4x_vpu5x_power_off_apv(struct iris_core *core); +void iris_vpu4x_vpu5x_ahb_sync_reset_apv(struct iris_core *core); +void iris_vpu4x_vpu5x_ahb_sync_reset_hardware(struct iris_core *core); void iris_vpu_set_preset_registers(struct iris_core *core); diff --git a/drivers/media/platform/qcom/iris/iris_vpu_register_defines.h b/drivers/media/platform/qcom/iris/iris_vpu_register_defines.h index 72168b9ffa7385d53d7190265d1c0922ee04a656..33f3d01cf79d763a62a2be9eac910a462bcd479b 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu_register_defines.h +++ b/drivers/media/platform/qcom/iris/iris_vpu_register_defines.h @@ -19,6 +19,7 @@ #define VIDEO_NOC_RESET_REQ (BIT(0) | BIT(1)) #define AON_WRAPPER_MVP_NOC_RESET_ACK (AON_MVP_NOC_RESET + 0x004) +#define AON_WRAPPER_MVP_NOC_RESET_SYNCRST (AON_MVP_NOC_RESET + 0x08) #define CPU_CS_BASE_OFFS (CPU_BASE_OFFS) #define CPU_IC_BASE_OFFS (CPU_BASE_OFFS) @@ -40,6 +41,14 @@ #define MSK_SIGNAL_FROM_TENSILICA BIT(0) #define MSK_CORE_POWER_ON BIT(1) +#define CPU_CS_APV_BRIDGE_SYNC_RESET (CPU_CS_BASE_OFFS + 0x174) + +/* Efuse bits controlling optional hardware blocks */ +#define WRAPPER_EFUSE_MONITOR (WRAPPER_BASE_OFFS + 0x08) +#define DISABLE_VIDEO_APV_BIT BIT(27) +#define DISABLE_VIDEO_VPP1_BIT BIT(28) +#define DISABLE_VIDEO_VPP0_BIT BIT(29) + #define WRAPPER_INTR_STATUS (WRAPPER_BASE_OFFS + 0x0C) #define WRAPPER_INTR_STATUS_A2HWD_BMSK BIT(3) #define WRAPPER_INTR_STATUS_A2H_BMSK BIT(2) @@ -62,6 +71,7 @@ #define WRAPPER_CORE_POWER_STATUS (WRAPPER_BASE_OFFS + 0x80) #define WRAPPER_CORE_CLOCK_CONFIG (WRAPPER_BASE_OFFS + 0x88) #define CORE_CLK_RUN 0x0 +#define APV_CLK_HALT BIT(1) #define WRAPPER_TZ_CPU_STATUS (WRAPPER_TZ_BASE_OFFS + 0x10) -- 2.43.0