Re: [PATCH 11/14] media: qcom: Switch to generic PAS TZ APIs
Jorge Ramirez via OP-TEE <[email protected]>
| Newsgroups | org.trustedfirmware.lists.op-tee,org.freedesktop.lists.dri-devel,org.infradead.lists.ath12k,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-media,org.kernel.vger.linux-remoteproc,org.kernel.vger.linux-wireless,org.kernel.vger.netdev |
|---|---|
| Message-ID | <aa6O5tir4kVIe0eZ@trex> |
On 06/03/26 16:20:24, Sumit Garg wrote: > From: Sumit Garg <[email protected]> > > 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. > > Signed-off-by: Sumit Garg <[email protected]> > --- > drivers/media/platform/qcom/iris/iris_firmware.c | 9 +++++---- > drivers/media/platform/qcom/venus/firmware.c | 11 ++++++----- > 2 files changed, 11 insertions(+), 9 deletions(-) > > 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); > } > are the calls to set_remote_state required? 0 is not the IRIS/VENUS remote processor. If it is legacy, maybe they can be phased out? > 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/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;