| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20260126-kaanapali-iris-v1-5-e2646246bfc1@oss.qualcomm.com>
Date: Mon, 26 Jan 2026 17:55:48 +0530
From: Vikash Garodia <vikash.garodia@....qualcomm.com>
To: Dikshita Agarwal <dikshita.agarwal@....qualcomm.com>,
Abhinav Kumar <abhinav.kumar@...ux.dev>,
Bryan O'Donoghue <bod@...nel.org>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>,
Saravana Kannan <saravanak@...nel.org>, Joerg Roedel <joro@...tes.org>,
Will Deacon <will@...nel.org>, Robin Murphy <robin.murphy@....com>,
Stefan Schmidt <stefan.schmidt@...aro.org>,
Hans Verkuil <hverkuil@...nel.org>,
Krzysztof Kozlowski <krzk@...nel.org>,
Vishnu Reddy <busanna.reddy@....qualcomm.com>,
Hans Verkuil <hverkuil+cisco@...nel.org>
Cc: linux-arm-msm@...r.kernel.org, linux-media@...r.kernel.org,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
iommu@...ts.linux.dev, Bryan O'Donoghue <bryan.odonoghue@...aro.org>,
Vikash Garodia <vikash.garodia@....qualcomm.com>
Subject: [PATCH 5/7] media: iris: add context bank devices using iommu-map
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@....qualcomm.com>
Signed-off-by: Vishnu Reddy <busanna.reddy@....qualcomm.com>
Signed-off-by: Vikash Garodia <vikash.garodia@....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
Powered by blists - more mailing lists