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 sumit.garg@oss.qualcomm.com
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 sumit.garg@oss.qualcomm.com
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_DEVdepends on ARCH_QCOM || COMPILE_TESTselect V4L2_MEM2MEM_DEVselect QCOM_MDT_LOADER if ARCH_QCOMselect QCOM_SCMselect VIDEOBUF2_DMA_CONTIGhelpThis is a V4L2 driver for Qualcomm iris video acceleratorhardware. It accelerates decoding operations on variousQualcomm 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 acceleratorhardware. It accelerates decoding operations on variousQualcomm 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 <linux/firmware.h> +#include <linux/firmware/qcom/qcom_pas.h> #include <linux/firmware/qcom/qcom_scm.h> #include <linux/of_address.h> #include <linux/of_reserved_mem.h> @@ -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 <linux/of_reserved_mem.h> #include <linux/platform_device.h> #include <linux/of_device.h> +#include <linux/firmware/qcom/qcom_pas.h> #include <linux/firmware/qcom/qcom_scm.h> #include <linux/sizes.h> #include <linux/soc/qcom/mdt_loader.h> @@ -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()))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);@@ -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);2.51.0
with above change
Reviewed-by: Mukesh Ojha mukesh.ojha@oss.qualcomm.com
Thanks.
-Sumit