From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 89BD6CD3425 for ; Fri, 1 May 2026 13:27:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=X8s7IhI7V7UA5jLpN5Gs0P3dVxfDsU+zQLBJX3MZoOE=; b=E8t4bdfXGwCdTu/gaHIX73OUoL vUpkMT2UcqSh8qrCCvkOs1istWQdbDpv+LXrL74okpF62gcg0KN7HL99QZm/S3TqFtbdUX2ho13Tt kv0xwoABOrhTfBSmtIynSBK7GSk7TX+RcfHzT2duA+Mx0ak/qruj3nWYITNIIoNrJysP1uAhPi+2Z c/JHazjFDHzWn+IailFxc20xOdDcKIOZRQyybVvAKEcxs1qNag1FOlbmVmropFUpYreZStyd+B02V h3XpnFl93J/kYD8nMuGpyUYGQFKxMWy0V0F0dSP2IciUDsyalJyHL60BBVS9I1OnIKYw/rmMCxQSr A+SzmjHA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wIntg-00000007Ag7-0pBT; Fri, 01 May 2026 13:27:12 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1wIntd-00000007Afk-2Gys for ath12k@lists.infradead.org; Fri, 01 May 2026 13:27:10 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 307B6435AD; Fri, 1 May 2026 13:27:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A09DDC2BCB4; Fri, 1 May 2026 13:26:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777642028; bh=cecY22npZ8O09cZUaB8M0VENwxo6jF899E2WK/sGM8U=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Ks9s1mZIkV8HxwO4Mq2+M0rNhz33rtPZ+PEpQg8O0T7agTQM/ie+qo1rwFzMc+b+A VqDH4/+JcAgC//FSDTXVNeTLY3ZnVf6ao0PPeE2eDyKLB70fqAtG1BZGKK4J4NwVYM OfaQriqJVci3Be7SKDrYFRY61OXwF0wXPYEyzsVt5ayiFhEFxMW1q5daFboq3L7XMO 64Cx2hTxZcYCLazmmG5vv2hGIZnAcTrMTjhtB+7TrKmtFgXcpfm7HFnitN26O/Gx8U JOUfHUQd9G+45ryjeV+BQBCvFltUxfgmsGCNc+KFS0VD58QfpBufJUzuhvutKP50DW 4FZ/nGOcO+OnA== Date: Fri, 1 May 2026 18:56:50 +0530 From: Sumit Garg To: Mukesh Ojha Cc: andersson@kernel.org, konradybcio@kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-media@vger.kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, ath12k@lists.infradead.org, linux-remoteproc@vger.kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, robin.clark@oss.qualcomm.com, sean@poorly.run, akhilpo@oss.qualcomm.com, lumag@kernel.org, abhinav.kumar@linux.dev, jesszhan0024@gmail.com, marijn.suijten@somainline.org, airlied@gmail.com, simona@ffwll.ch, vikash.garodia@oss.qualcomm.com, dikshita.agarwal@oss.qualcomm.com, bod@kernel.org, mchehab@kernel.org, elder@kernel.org, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, jjohnson@kernel.org, mathieu.poirier@linaro.org, trilokkumar.soni@oss.qualcomm.com, pavan.kondeti@oss.qualcomm.com, jorge.ramirez@oss.qualcomm.com, tonyh@qti.qualcomm.com, vignesh.viswanathan@oss.qualcomm.com, srinivas.kandagatla@oss.qualcomm.com, amirreza.zarrabi@oss.qualcomm.com, jens.wiklander@linaro.org, op-tee@lists.trustedfirmware.org, apurupa@qti.qualcomm.com, skare@qti.qualcomm.com, linux-kernel@vger.kernel.org, Sumit Garg Subject: Re: [PATCH v4 11/15] media: qcom: Switch to generic PAS TZ APIs Message-ID: References: <20260427095603.1157963-1-sumit.garg@kernel.org> <20260427095603.1157963-12-sumit.garg@kernel.org> <20260428193714.sg5n3tntww2nuquu@hu-mojha-hyd.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260428193714.sg5n3tntww2nuquu@hu-mojha-hyd.qualcomm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260501_062709_631242_878FC3B3 X-CRM114-Status: GOOD ( 26.74 ) X-BeenThere: ath12k@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "ath12k" Errors-To: ath12k-bounces+ath12k=archiver.kernel.org@lists.infradead.org On Wed, Apr 29, 2026 at 01:07:14AM +0530, Mukesh Ojha wrote: > On Mon, Apr 27, 2026 at 03:25:59PM +0530, Sumit Garg wrote: > > From: Sumit Garg > > > > Switch qcom media client drivers over to generic PAS TZ APIs. Generic PAS > > TZ service allows to support multiple TZ implementation backends like QTEE > > based SCM PAS service, OP-TEE based PAS service and any further future TZ > > backend service. > > > > Along with that pass proper PAS ID to set_remote_state API. As per testing > > the SCM backend just ignores it while OP-TEE makes use of it to for proper > > book keeping purpose. > > When we use 'Along with' or 'while at it', patch is doing two things and > not one. Okay, I will split this into 2. > > > > > Signed-off-by: Sumit Garg > > --- > > drivers/media/platform/qcom/iris/Kconfig | 25 ++++++++++--------- > > .../media/platform/qcom/iris/iris_firmware.c | 9 ++++--- > > drivers/media/platform/qcom/venus/Kconfig | 1 + > > drivers/media/platform/qcom/venus/firmware.c | 11 ++++---- > > 4 files changed, 25 insertions(+), 21 deletions(-) > > > > diff --git a/drivers/media/platform/qcom/iris/Kconfig b/drivers/media/platform/qcom/iris/Kconfig > > index 3c803a05305a..f54b759c18aa 100644 > > --- a/drivers/media/platform/qcom/iris/Kconfig > > +++ b/drivers/media/platform/qcom/iris/Kconfig > > @@ -1,13 +1,14 @@ > > config VIDEO_QCOM_IRIS > > - tristate "Qualcomm iris V4L2 decoder driver" > > - depends on VIDEO_DEV > > - depends on ARCH_QCOM || COMPILE_TEST > > - select V4L2_MEM2MEM_DEV > > - select QCOM_MDT_LOADER if ARCH_QCOM > > - select QCOM_SCM > > - select VIDEOBUF2_DMA_CONTIG > > - help > > - This is a V4L2 driver for Qualcomm iris video accelerator > > - hardware. It accelerates decoding operations on various > > - Qualcomm SoCs. > > - To compile this driver as a module choose m here. > > + tristate "Qualcomm iris V4L2 decoder driver" > > + depends on VIDEO_DEV > > + depends on ARCH_QCOM || COMPILE_TEST > > + select V4L2_MEM2MEM_DEV > > + select QCOM_MDT_LOADER if ARCH_QCOM > > + select QCOM_SCM > > + select QCOM_PAS > > + select VIDEOBUF2_DMA_CONTIG > > + help > > + This is a V4L2 driver for Qualcomm iris video accelerator > > + hardware. It accelerates decoding operations on various > > + Qualcomm SoCs. > > + To compile this driver as a module choose m here. > > Here, Space replaced by Tabs just for one line.., should be fine. Yeah, spaces aren't meant here. > > > > diff --git a/drivers/media/platform/qcom/iris/iris_firmware.c b/drivers/media/platform/qcom/iris/iris_firmware.c > > index 5f408024e967..856fa6a79064 100644 > > --- a/drivers/media/platform/qcom/iris/iris_firmware.c > > +++ b/drivers/media/platform/qcom/iris/iris_firmware.c > > @@ -4,6 +4,7 @@ > > */ > > > > #include > > +#include > > #include > > #include > > #include > > @@ -79,7 +80,7 @@ int iris_fw_load(struct iris_core *core) > > return -ENOMEM; > > } > > > > - ret = qcom_scm_pas_auth_and_reset(core->iris_platform_data->pas_id); > > + ret = qcom_pas_auth_and_reset(core->iris_platform_data->pas_id); > > if (ret) { > > dev_err(core->dev, "auth and reset failed: %d\n", ret); > > return ret; > > @@ -93,7 +94,7 @@ int iris_fw_load(struct iris_core *core) > > cp_config->cp_nonpixel_size); > > if (ret) { > > dev_err(core->dev, "qcom_scm_mem_protect_video_var failed: %d\n", ret); > > - qcom_scm_pas_shutdown(core->iris_platform_data->pas_id); > > + qcom_pas_shutdown(core->iris_platform_data->pas_id); > > return ret; > > } > > } > > @@ -103,10 +104,10 @@ int iris_fw_load(struct iris_core *core) > > > > int iris_fw_unload(struct iris_core *core) > > { > > - return qcom_scm_pas_shutdown(core->iris_platform_data->pas_id); > > + return qcom_pas_shutdown(core->iris_platform_data->pas_id); > > } > > > > int iris_set_hw_state(struct iris_core *core, bool resume) > > { > > - return qcom_scm_set_remote_state(resume, 0); > > + return qcom_pas_set_remote_state(resume, core->irisi_platform_data->pas_id); > > > Should be a separate change for qcom_pas_set_remote_state() > > > } > > diff --git a/drivers/media/platform/qcom/venus/Kconfig b/drivers/media/platform/qcom/venus/Kconfig > > index ffb731ecd48c..574172724e8f 100644 > > --- a/drivers/media/platform/qcom/venus/Kconfig > > +++ b/drivers/media/platform/qcom/venus/Kconfig > > @@ -6,6 +6,7 @@ config VIDEO_QCOM_VENUS > > select OF_DYNAMIC if ARCH_QCOM > > select QCOM_MDT_LOADER if ARCH_QCOM > > select QCOM_SCM > > + select QCOM_PAS > > select VIDEOBUF2_DMA_CONTIG > > select V4L2_MEM2MEM_DEV > > help > > diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c > > index 1de7436713ed..3c0727ea137d 100644 > > --- a/drivers/media/platform/qcom/venus/firmware.c > > +++ b/drivers/media/platform/qcom/venus/firmware.c > > @@ -12,6 +12,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -58,7 +59,7 @@ int venus_set_hw_state(struct venus_core *core, bool resume) > > int ret; > > > > if (core->use_tz) { > > - ret = qcom_scm_set_remote_state(resume, 0); > > + ret = qcom_pas_set_remote_state(resume, VENUS_PAS_ID); > > This too.. > > > if (resume && ret == -EINVAL) > > ret = 0; > > return ret; > > @@ -218,7 +219,7 @@ int venus_boot(struct venus_core *core) > > int ret; > > > > if (!IS_ENABLED(CONFIG_QCOM_MDT_LOADER) || > > - (core->use_tz && !qcom_scm_is_available())) > > + (core->use_tz && !qcom_pas_is_available())) > > return -EPROBE_DEFER; > > > > ret = of_property_read_string_index(dev->of_node, "firmware-name", 0, > > @@ -236,7 +237,7 @@ int venus_boot(struct venus_core *core) > > core->fw.mem_phys = mem_phys; > > > > if (core->use_tz) > > - ret = qcom_scm_pas_auth_and_reset(VENUS_PAS_ID); > > + ret = qcom_pas_auth_and_reset(VENUS_PAS_ID); > > else > > ret = venus_boot_no_tz(core, mem_phys, mem_size); > > > > @@ -259,7 +260,7 @@ int venus_boot(struct venus_core *core) > > res->cp_nonpixel_start, > > res->cp_nonpixel_size); > > if (ret) { > > - qcom_scm_pas_shutdown(VENUS_PAS_ID); > > + qcom_pas_shutdown(VENUS_PAS_ID); > > dev_err(dev, "set virtual address ranges fail (%d)\n", > > ret); > > return ret; > > @@ -274,7 +275,7 @@ int venus_shutdown(struct venus_core *core) > > int ret; > > > > if (core->use_tz) > > - ret = qcom_scm_pas_shutdown(VENUS_PAS_ID); > > + ret = qcom_pas_shutdown(VENUS_PAS_ID); > > else > > ret = venus_shutdown_no_tz(core); > > > > -- > > 2.51.0 > > with above change > > Reviewed-by: Mukesh Ojha > Thanks. -Sumit