From: Sumit Garg <sumit.garg@kernel.org>
To: Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konradybcio@kernel.org>,
Vikash Garodia <vikash.garodia@oss.qualcomm.com>,
Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>,
Abhinav Kumar <abhinav.kumar@linux.dev>,
Bryan O'Donoghue <bod@kernel.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-media@vger.kernel.org,
Sumit Garg <sumit.garg@oss.qualcomm.com>,
Jorge Ramirez-Ortiz <jorge.ramirez@oss.qualcomm.com>,
Jorge Ramirez-Ortiz <jorge.ramirez.ortiz@gmail.com>
Subject: [PATCH 2/3] media: iris: Skip SCM call for non-SCM PAS backend
Date: Fri, 11 Sep 2026 18:08:56 +0530 [thread overview]
Message-ID: <20260911-video-optee-pas-v1-v1-2-7bbddaaac5ba@kernel.org> (raw)
In-Reply-To: <20260911-video-optee-pas-v1-v1-0-7bbddaaac5ba@kernel.org>
From: Jorge Ramirez-Ortiz <jorge.ramirez@oss.qualcomm.com>
qcom_scm_mem_protect_video_var() is only serviced by the SCM backend;
with OP-TEE the TEE owns secure memory protection. Use
qcom_pas_get_backend() to issue the SCM call only for the SCM backend.
Assisted-by: Copilot:claude-opus-4.8
Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez.ortiz@gmail.com>
Co-developed-by: Sumit Garg <sumit.garg@oss.qualcomm.com>
Signed-off-by: Sumit Garg <sumit.garg@oss.qualcomm.com>
---
drivers/media/platform/qcom/iris/iris_firmware.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/media/platform/qcom/iris/iris_firmware.c b/drivers/media/platform/qcom/iris/iris_firmware.c
index 21cdf1c39835..7fbe71e21bcb 100644
--- a/drivers/media/platform/qcom/iris/iris_firmware.c
+++ b/drivers/media/platform/qcom/iris/iris_firmware.c
@@ -9,6 +9,7 @@
#include <linux/of_address.h>
#include <linux/of_reserved_mem.h>
#include <linux/soc/qcom/mdt_loader.h>
+#include <linux/string.h>
#include "iris_core.h"
#include "iris_firmware.h"
@@ -158,6 +159,7 @@ static int iris_load_fw_to_memory(struct iris_core *core)
int iris_fw_load(struct iris_core *core)
{
const struct tz_cp_config *cp_config;
+ const char *pas_backend;
int i, ret;
ret = iris_load_fw_to_memory(core);
@@ -172,6 +174,15 @@ int iris_fw_load(struct iris_core *core)
return ret;
}
+ /*
+ * qcom_scm_mem_protect_video_var() only applies to the SCM backend;
+ * other backends (e.g. OP-TEE) own secure memory protection and do
+ * not service this call.
+ */
+ pas_backend = qcom_pas_get_backend();
+ if (!pas_backend || strcmp(pas_backend, QCOM_PAS_BACKEND_SCM))
+ return 0;
+
for (i = 0; i < core->iris_platform_data->tz_cp_config_data_size; i++) {
cp_config = &core->iris_platform_data->tz_cp_config_data[i];
ret = qcom_scm_mem_protect_video_var(cp_config->cp_start,
--
2.53.0
next prev parent reply other threads:[~2026-09-11 12:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-11 12:38 [PATCH 0/3] media: qcom: Skip SCM secure memory protection with OP-TEE " Sumit Garg
2026-09-11 12:38 ` [PATCH 1/3] firmware: qcom: pas: Expose the active PAS backend name Sumit Garg
2026-09-11 12:38 ` Sumit Garg [this message]
2026-09-11 14:24 ` [PATCH 2/3] media: iris: Skip SCM call for non-SCM PAS backend Konrad Dybcio
2026-09-14 6:14 ` Sumit Garg
2026-09-17 11:41 ` Vikash Garodia
2026-09-18 11:10 ` Sumit Garg
2026-09-11 12:38 ` [PATCH 3/3] media: venus: " Sumit Garg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260911-video-optee-pas-v1-v1-2-7bbddaaac5ba@kernel.org \
--to=sumit.garg@kernel.org \
--cc=abhinav.kumar@linux.dev \
--cc=andersson@kernel.org \
--cc=bod@kernel.org \
--cc=dikshita.agarwal@oss.qualcomm.com \
--cc=jorge.ramirez.ortiz@gmail.com \
--cc=jorge.ramirez@oss.qualcomm.com \
--cc=konradybcio@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=sumit.garg@oss.qualcomm.com \
--cc=vikash.garodia@oss.qualcomm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®