mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
To: 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>,
	Rob Herring <robh@kernel.org>,
	Krzysztof Kozlowski <krzk+dt@kernel.org>,
	Conor Dooley <conor+dt@kernel.org>,
	Saravana Kannan <saravanak@kernel.org>,
	Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
	Robin Murphy <robin.murphy@arm.com>,
	Stefan Schmidt <stefan.schmidt@linaro.org>,
	Hans Verkuil <hverkuil@kernel.org>,
	Krzysztof Kozlowski <krzk@kernel.org>,
	Vishnu Reddy <busanna.reddy@oss.qualcomm.com>,
	Hans Verkuil <hverkuil+cisco@kernel.org>
Cc: linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	iommu@lists.linux.dev,
	Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
	Vikash Garodia <vikash.garodia@oss.qualcomm.com>
Subject: [PATCH 5/7] media: iris: add context bank devices using iommu-map
Date: Mon, 26 Jan 2026 17:55:48 +0530	[thread overview]
Message-ID: <20260126-kaanapali-iris-v1-5-e2646246bfc1@oss.qualcomm.com> (raw)
In-Reply-To: <20260126-kaanapali-iris-v1-0-e2646246bfc1@oss.qualcomm.com>

Introduce different context banks(CB) and the associated buffer region.
Different stream IDs from VPU would be associated to one of these CB.
The patch ensures to handle CBs which are described as iommu-map in DT.
Multiple CBs are needed to increase the IOVA for the video usecases like
higher concurrent sessions.

Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
---
 .../platform/qcom/iris/iris_platform_common.h      | 29 ++++++++++++
 drivers/media/platform/qcom/iris/iris_probe.c      | 55 ++++++++++++++++++++--
 drivers/media/platform/qcom/iris/iris_resources.c  | 35 ++++++++++++++
 drivers/media/platform/qcom/iris/iris_resources.h  |  1 +
 4 files changed, 116 insertions(+), 4 deletions(-)

diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
index 5a489917580eb10022fdcb52f7321a915e8b239d..d2d7c898fc8ef0de1b16aebd72681ea3c5b736ae 100644
--- a/drivers/media/platform/qcom/iris/iris_platform_common.h
+++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
@@ -204,6 +204,33 @@ struct icc_vote_data {
 	u32 fps;
 };
 
+enum iris_iommu_map_function_id {
+	IRIS_CB_NON_SECURE_NON_PIXEL	= 0x100,
+	IRIS_CB_NON_SECURE_PIXEL	= 0x101,
+	IRIS_CB_NON_SECURE_BITSTREAM	= 0x102,
+	IRIS_CB_SECURE_NON_PIXEL	= 0x200,
+	IRIS_CB_SECURE_PIXEL		= 0x201,
+	IRIS_CB_SECURE_BITSTREAM	= 0x202,
+	IRIS_CB_FIRMWARE		= 0x300,
+};
+
+enum iris_buffer_region {
+	IRIS_NON_SECURE_NON_PIXEL	= BIT(0),
+	IRIS_NON_SECURE_PIXEL		= BIT(1),
+	IRIS_NON_SECURE_BITSTREAM	= BIT(2),
+	IRIS_SECURE_NON_PIXEL		= BIT(3),
+	IRIS_SECURE_PIXEL		= BIT(4),
+	IRIS_SECURE_BITSTREAM		= BIT(5),
+};
+
+struct iris_context_bank {
+	struct device *dev;
+	const char *name;
+	const enum iris_iommu_map_function_id f_id;
+	const enum iris_buffer_region region;
+	const u64 dma_mask;
+};
+
 enum platform_pm_domain_type {
 	IRIS_CTRL_POWER_DOMAIN,
 	IRIS_HW_POWER_DOMAIN,
@@ -246,6 +273,8 @@ struct iris_platform_data {
 	u32 inst_fw_caps_enc_size;
 	const struct tz_cp_config *tz_cp_config_data;
 	u32 tz_cp_config_data_size;
+	struct iris_context_bank *cb_data;
+	u32 cb_data_size;
 	u32 core_arch;
 	u32 hw_response_timeout;
 	struct ubwc_config_data *ubwc_config;
diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c
index ddaacda523ecb9990af0dd0640196223fbcc2cab..c1a6aac5a3d65d980c5a34ba5fa1c1dbcf790ec5 100644
--- a/drivers/media/platform/qcom/iris/iris_probe.c
+++ b/drivers/media/platform/qcom/iris/iris_probe.c
@@ -123,6 +123,37 @@ static int iris_init_resets(struct iris_core *core)
 				     core->iris_platform_data->controller_rst_tbl_size);
 }
 
+static int iris_init_context_bank_devices(struct iris_core *core)
+{
+	struct iris_context_bank *cb;
+	const __be32 *map_data;
+	int tupple_size = 5;
+	int i, j, ret, len;
+	u32 fid;
+
+	map_data = of_get_property(core->dev->of_node, "iommu-map", &len);
+	if (!map_data)
+		return 0;
+
+	len /= sizeof(__be32);
+
+	for (i = 0; i < len; i += tupple_size) {
+		fid = be32_to_cpu(map_data[i]);
+
+		for (j = 0; j < core->iris_platform_data->cb_data_size; j++) {
+			cb = &core->iris_platform_data->cb_data[j];
+
+			if (fid == cb->f_id && !cb->dev) {
+				ret = iris_create_child_device_and_map(core, cb);
+				if (ret)
+					return ret;
+			}
+		}
+	}
+
+	return 0;
+}
+
 static int iris_init_resources(struct iris_core *core)
 {
 	int ret;
@@ -139,7 +170,11 @@ static int iris_init_resources(struct iris_core *core)
 	if (ret)
 		return ret;
 
-	return iris_init_resets(core);
+	ret = iris_init_resets(core);
+	if (ret)
+		return ret;
+
+	return iris_init_context_bank_devices(core);
 }
 
 static int iris_register_video_device(struct iris_core *core, enum domain_type type)
@@ -187,6 +222,8 @@ static int iris_register_video_device(struct iris_core *core, enum domain_type t
 static void iris_remove(struct platform_device *pdev)
 {
 	struct iris_core *core;
+	struct device *dev;
+	int i;
 
 	core = platform_get_drvdata(pdev);
 	if (!core)
@@ -194,6 +231,14 @@ static void iris_remove(struct platform_device *pdev)
 
 	iris_core_deinit(core);
 
+	for (i = 0; i < core->iris_platform_data->cb_data_size; i++) {
+		dev = core->iris_platform_data->cb_data[i].dev;
+		if (dev) {
+			platform_device_unregister(to_platform_device(dev));
+			core->iris_platform_data->cb_data[i].dev = NULL;
+		}
+	}
+
 	video_unregister_device(core->vdev_dec);
 	video_unregister_device(core->vdev_enc);
 
@@ -277,9 +322,11 @@ static int iris_probe(struct platform_device *pdev)
 
 	dma_mask = core->iris_platform_data->dma_mask;
 
-	ret = dma_set_mask_and_coherent(dev, dma_mask);
-	if (ret)
-		goto err_vdev_unreg_enc;
+	if (device_iommu_mapped(core->dev)) {
+		ret = dma_set_mask_and_coherent(core->dev, dma_mask);
+		if (ret)
+			goto err_vdev_unreg_enc;
+	}
 
 	dma_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));
 	dma_set_seg_boundary(&pdev->dev, DMA_BIT_MASK(32));
diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c
index 773f6548370a257b8ae7332242544266cbbd61a9..647f6760f2b7a6bab8a585a13eb03cf60a9c047e 100644
--- a/drivers/media/platform/qcom/iris/iris_resources.c
+++ b/drivers/media/platform/qcom/iris/iris_resources.c
@@ -6,6 +6,7 @@
 #include <linux/clk.h>
 #include <linux/devfreq.h>
 #include <linux/interconnect.h>
+#include <linux/of_device.h>
 #include <linux/pm_domain.h>
 #include <linux/pm_opp.h>
 #include <linux/pm_runtime.h>
@@ -141,3 +142,37 @@ int iris_disable_unprepare_clock(struct iris_core *core, enum platform_clk_type
 
 	return 0;
 }
+
+int iris_create_child_device_and_map(struct iris_core *core, struct iris_context_bank *cb)
+{
+	struct platform_device *pdev;
+	int ret;
+
+	pdev = platform_device_alloc(cb->name, 0);
+	if (!pdev)
+		return -ENOMEM;
+
+	ret = platform_device_add(pdev);
+	if (ret) {
+		platform_device_put(pdev);
+		return ret;
+	}
+
+	ret = of_dma_configure_id(&pdev->dev, core->dev->of_node, true,
+				  (const u32 *)&cb->f_id);
+	if (ret)
+		goto error_unregister;
+
+	ret = dma_set_mask_and_coherent(&pdev->dev, cb->dma_mask);
+	if (ret)
+		goto error_unregister;
+
+	cb->dev = &pdev->dev;
+
+	return 0;
+
+error_unregister:
+	platform_device_unregister(to_platform_device(&pdev->dev));
+
+	return ret;
+}
diff --git a/drivers/media/platform/qcom/iris/iris_resources.h b/drivers/media/platform/qcom/iris/iris_resources.h
index 6bfbd2dc6db095ec05e53c894e048285f82446c6..b7efe15facb203eea9ae13d5f0abdcc2ea718b4d 100644
--- a/drivers/media/platform/qcom/iris/iris_resources.h
+++ b/drivers/media/platform/qcom/iris/iris_resources.h
@@ -15,5 +15,6 @@ int iris_unset_icc_bw(struct iris_core *core);
 int iris_set_icc_bw(struct iris_core *core, unsigned long icc_bw);
 int iris_disable_unprepare_clock(struct iris_core *core, enum platform_clk_type clk_type);
 int iris_prepare_enable_clock(struct iris_core *core, enum platform_clk_type clk_type);
+int iris_create_child_device_and_map(struct iris_core *core, struct iris_context_bank *cb);
 
 #endif

-- 
2.34.1


  parent reply	other threads:[~2026-01-26 12:27 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-26 12:25 [PATCH 0/7] media: iris: add support for kaanapali platform Vikash Garodia
2026-01-26 12:25 ` [PATCH 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding Vikash Garodia
2026-01-26 13:46   ` Rob Herring (Arm)
2026-01-27 15:09   ` Dmitry Baryshkov
2026-02-17 13:43     ` Vikash Garodia
2026-02-17 14:36       ` Dmitry Baryshkov
2026-02-17 15:34         ` Vikash Garodia
2026-02-17 16:15           ` Dmitry Baryshkov
2026-02-17 18:09             ` Vikash Garodia
2026-02-17 18:35               ` Dmitry Baryshkov
2026-02-17 17:05           ` Krzysztof Kozlowski
2026-01-26 12:25 ` [PATCH 2/7] of: factor out of_map_id() code Vikash Garodia
2026-02-02 14:52   ` Bryan O'Donoghue
2026-02-03 10:13     ` Vijayanand Jitta
2026-02-04  1:11       ` Dmitry Baryshkov
2026-02-05  8:09         ` Vijayanand Jitta
2026-02-05 14:53           ` Dmitry Baryshkov
2026-01-26 12:25 ` [PATCH 3/7] of/iommu: add multi-map support Vikash Garodia
2026-01-27 11:45   ` Dmitry Baryshkov
2026-01-27 13:51     ` Nicolas Dufresne
2026-01-27 14:20     ` Robin Murphy
2026-02-02 10:56       ` Vijayanand Jitta
2026-02-17 13:08       ` Vikash Garodia
2026-03-03 18:50         ` Vikash Garodia
2026-02-02 14:57   ` Bryan O'Donoghue
2026-02-03 10:52     ` Vijayanand Jitta
2026-01-26 12:25 ` [PATCH 4/7] media: iris: Switch to hardware mode after firmware boot Vikash Garodia
2026-02-02 15:09   ` Bryan O'Donoghue
2026-02-17 14:11     ` Vikash Garodia
2026-01-26 12:25 ` Vikash Garodia [this message]
2026-01-27 14:49   ` [PATCH 5/7] media: iris: add context bank devices using iommu-map Robin Murphy
2026-02-02 12:00     ` Vikash Garodia
2026-02-17 13:15     ` Vikash Garodia
2026-01-26 12:25 ` [PATCH 6/7] media: iris: add helper to select context bank device Vikash Garodia
2026-01-26 12:25 ` [PATCH 7/7] media: iris: Add platform data for kaanapali Vikash Garodia
2026-01-26 13:38 ` [PATCH 0/7] media: iris: add support for kaanapali platform Dmitry Baryshkov
2026-01-27 11:26   ` Vikash Garodia
2026-01-27 11:52     ` Dmitry Baryshkov
2026-01-27 15:10       ` Nicolas Dufresne
2026-01-27 15:59         ` Vikash Garodia
2026-01-27 16:58           ` Nicolas Dufresne
2026-01-27 16:11       ` Vikash Garodia
2026-01-27 16:49         ` Dmitry Baryshkov

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=20260126-kaanapali-iris-v1-5-e2646246bfc1@oss.qualcomm.com \
    --to=vikash.garodia@oss.qualcomm.com \
    --cc=abhinav.kumar@linux.dev \
    --cc=bod@kernel.org \
    --cc=bryan.odonoghue@linaro.org \
    --cc=busanna.reddy@oss.qualcomm.com \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=dikshita.agarwal@oss.qualcomm.com \
    --cc=hverkuil+cisco@kernel.org \
    --cc=hverkuil@kernel.org \
    --cc=iommu@lists.linux.dev \
    --cc=joro@8bytes.org \
    --cc=krzk+dt@kernel.org \
    --cc=krzk@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=robh@kernel.org \
    --cc=robin.murphy@arm.com \
    --cc=saravanak@kernel.org \
    --cc=stefan.schmidt@linaro.org \
    --cc=will@kernel.org \
    /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®