Re: [PATCH v6 11/16] media: qcom: Switch to generic PAS TZ APIs

[Sumit Garg <sumit.garg@kernel.org>]

Hi Vikash,

On Thu, May 21, 2026 at 12:10:41PM +0530, Vikash Garodia wrote:
> 
> On 5/18/2026 12:58 PM, Sumit Garg wrote:
> > diff --git a/drivers/media/platform/qcom/iris/iris_firmware.c b/drivers/media/platform/qcom/iris/iris_firmware.c
> > index 5f408024e967..b3c5281aea91 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, 0);
> >   }
> > diff --git a/drivers/media/platform/qcom/venus/Kconfig b/drivers/media/platform/qcom/venus/Kconfig
> > index 63ee8c78dc6d..7997b8aa427a 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
> >   	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..3a38ff985822 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, 0);
> >   		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;
> 
> 
> API "qcom_scm_mem_protect_video_var() would also need this migration, any
> reason not to consider that ?

This SCM call is very specific to the media subsystem and don't align
with the generic PAS APIs. I rather think these kind of special SMCs can
rather be treated as SiP calls supported in TF-A but we have to analyze
if we even need these SCM calls for the open boot stack or not.

However, with OP-TEE there is still work in progress to enable media upstream
as Jorge posted in earlier versions on this patch-set due to IOMMU dependency.

> 
> Could you please check, if any such usage of legacy *scm* APIs, like the one
> i pointed above, can be enforced to err out at compile time ?

It will error out at runtime automatically since TF-A doesn't support
this SCM/SMC call as of now.

-Sumit