From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D052F3750BC for ; Wed, 10 Jun 2026 06:30:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781073020; cv=none; b=uZZKF0T7mHiAvrEgVfuz8p+ggKQBusMtUOTVyH4T1JWks9rA8WoGkGjoxMeQDtq6xNX0V/bqFATsrIYfAto01vh8HBvAEnW9Yi+HOtqQIsAMVSaPC4rjlvPK3K2x4vqANsgip+eIPBoQSom21rpny9X6qE5l4OOSR0EIPOPV3OQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781073020; c=relaxed/simple; bh=g5QnDYNLCUXkrvTnyRg/wjaqw3cIxeOy+tSozwdFA3Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SRQUIkrksBjoCVUegxDf+TKi6uymKgAPlp1tlibhsuT2KCvmZSqJ/ouJNGY4t+teakk8wPwRZicMgg3OGGlNTBhQOgXlQYyhPxkXngZoGQBcGRPI641VIvjGS2vJExAuAoB3ymgMSthHufpAre9d8W4f85gxdlYmBHpVXvghYd4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=I1ZVaHne; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=BsLzSHiO; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="I1ZVaHne"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="BsLzSHiO" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65A5Si8Y688972 for ; Wed, 10 Jun 2026 06:30:17 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= l9xkdvPWvw9OpNaumZA+ItB8MxYfFys7ZfCRfS7YrK0=; b=I1ZVaHneBmjqy8sc 4Ok5hiKYahZ/rIeGhz4/gM213hD5RrO3n2wV3IaN4a2dmLav/bW3SJOmO1RCWPpZ mjZ5yiyZC2Ha70f2aDIC3gGeWOoPwegHZm+T9Z8d6eLNbRgKZpB2pXS50Brd2b68 D9IZ/EYqxA97Fz7gtKySXJRm/v0d5WqXInVNvjVJx53J9uBlSi41wgqlkoZ2Xs1h DNBITic5gkiJEym7eQ9lZTP9jQKzrY3OvsKWCNu3okWf/cvz3NY/A36BAlqlI/N6 6ys2gVMSzzEhAtEhU4IYemT7g0xY8vsrJauoWuxaMX2FFJ99WKfFziYNQO7T2ib1 zj5efA== Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eq1tg06yv-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 10 Jun 2026 06:30:17 +0000 (GMT) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-36d8719bae6so5636601a91.3 for ; Tue, 09 Jun 2026 23:30:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1781073016; x=1781677816; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=l9xkdvPWvw9OpNaumZA+ItB8MxYfFys7ZfCRfS7YrK0=; b=BsLzSHiOgTAL0FMXWhh3Ds6VyRqjvS4Vo8J2F4dwNvCw7OX3oHLXl/2R9hcaZYJ8Kz TdiSWk34kS4EDY57R/8ha133xS3MMBaCuUs31/4xFQ+DYQSxWT/lPgjRM3LJfgUp9vY+ 60jw9rwHLXTc+WaH+Z8F4iQFBp7EHD+wxp26HqCst8a9OHmlrrQ5lUzxC3SRR+tTiMte kpvjChXFgluBqeRo4tBLRS5Z9J13d6U3/0WjlNp7U7GlTL7XmsS4FWPoiOUYWq3J0fnd cussUYL4qvP0yggmw72418fbLLN2xqD8fQd33GqrX6h1fYV3eujgT29EKT4FAdj32TpP hlNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781073016; x=1781677816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=l9xkdvPWvw9OpNaumZA+ItB8MxYfFys7ZfCRfS7YrK0=; b=GKVsrv6gysgn8Owc/DMB9uUGwSrnJt51zN5km5d5sM/eN8X/a0PWdmQWC7OYvS8kTq sChfB9vChIVScVSL+r4C1Rbiongpl9dgm+vQ50Dg3PAnblcK0OaSxodyM0jg5KuXS6Wo zQpfHNf4MWKOgpAcFbVc0r+Hm5ZhhPrLqVN1EV7M0CalLyBU8M2CRbsHI2GMJC/J0VpA 3uGOnwe5e8akM17cFq2IXwmQ3Al3I6PK3I08lynK20IqrW4paAx55XOmcn7gjXx7fNgR zbKCMAI9GjJ8e/SXa4KRNyfZOXabwxjClcqAV5b8DINrqrLts+n7ZujcLNXwAcmgHrCS cmFg== X-Gm-Message-State: AOJu0YywsFEzCdSu64U6Z6E5BIHGH+3ssN+nkB809Xm5QLzYaHvxck6Y auWJcvYJgMLWeQKKcEHog7LTl2eFBy4Cb0UDFVhHo0qoMgKKr6uVinCVmgU29Vt0ZcRcSccT2DI mqlqnfFLFZXIDHo5Rok0v95A8kQShmvZ6bxv7IclRzzhQahaGKUdweDbA+o0qyh8zHn8= X-Gm-Gg: Acq92OEj+VVo9fTgOZ01N+EvZzM3o2nOhgGTAk0qiMKo1P9S/naeHDMX2sYMe/pfeUO VDlXX/ke7eNAik0uMn0Zco7eeDjkUNFKvH2KVXobj25XfczqSAgLDq+5QnTYdNZrsTT5wkG0+L4 YGLaHgWf9puvLiLsWnw/27VfvjW9PVwvbsynq8kDPHG3lqf9B4mxTz6hSi41T3qy7KCdRBd2pY/ R+awV8ypvkKOeLkx4ig5vwWH4p5rYPd8A8NLX0sg5EDzvYxCrNrotYMzxjWikHnH6Xjdh49EvbS RM7NSEYNTtcyvVfbN+Dait7Hnzk0OsJzplgs8qHwl+bA8yxlTNEtv12PDR1zbvzfoLJKXE8SpLY bYzj2ESjuqoA2eDUEYjG1teOws98fys8WUMW1dvlbO+eX6zHsVN9vWfHS6KS25ulcng== X-Received: by 2002:a17:90b:5747:b0:36b:9798:4f67 with SMTP id 98e67ed59e1d1-370eee03facmr23696435a91.8.1781073016416; Tue, 09 Jun 2026 23:30:16 -0700 (PDT) X-Received: by 2002:a17:90b:5747:b0:36b:9798:4f67 with SMTP id 98e67ed59e1d1-370eee03facmr23696398a91.8.1781073015866; Tue, 09 Jun 2026 23:30:15 -0700 (PDT) Received: from hu-bvisredd-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-36f70a2892esm21580420a91.10.2026.06.09.23.30.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2026 23:30:15 -0700 (PDT) From: Vishnu Reddy Date: Wed, 10 Jun 2026 11:59:37 +0530 Subject: [PATCH v8 01/12] media: iris: Add iris vpu bus support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260610-glymur-v8-1-1c79b9d51fc0@oss.qualcomm.com> References: <20260610-glymur-v8-0-1c79b9d51fc0@oss.qualcomm.com> In-Reply-To: <20260610-glymur-v8-0-1c79b9d51fc0@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Dmitry Baryshkov , Mauro Carvalho Chehab , "Joerg Roedel (AMD)" , Will Deacon , Robin Murphy , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stanimir Varbanov , Bjorn Andersson , Konrad Dybcio Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, Vishnu Reddy X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1781073002; l=5465; i=busanna.reddy@oss.qualcomm.com; s=20260216; h=from:subject:message-id; bh=rdDaZJ2JpJP/hvRtkYjsfyvO0PZdU0ZWU+/yGYP+wUA=; b=YlKMKStuh+NVFiFAmn04eX0qlxviZreZXgdBWOfPpAx9Fl3ixQVxZbpnRkQ0wKZi7Oz69QHDe mtb9UcCUan/D4VE8KOzXwbdwVQpJ5HB9jmo3XWOh6gB9AS7rLotVfYu X-Developer-Key: i=busanna.reddy@oss.qualcomm.com; a=ed25519; pk=9vmy9HahBKVAa+GBFj1yHVbz0ey/ucIs1hrlfx+qtok= X-Proofpoint-GUID: O4A9rxDjwnF8vx_EHUCeJ8n7oKiGmfdM X-Authority-Analysis: v=2.4 cv=dLmWXuZb c=1 sm=1 tr=0 ts=6a290479 cx=c_pps a=UNFcQwm+pnOIJct1K4W+Mw==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=VwQbUJbxAAAA:8 a=6cGehGV22KE80QuxIsQA:9 a=QEXdDO2ut3YA:10 a=uKXjsCUrEbL0IQVhDsJ9:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjEwMDA1OSBTYWx0ZWRfX0fzFDc5CPDOz xap7mrsyIIo5hBsKZLjflHgCg8GzOoKvu/l0VByPLZS0XfYDdiSvlr1tVgn5Rq60+BrfXFfM7Mo 96aTMNROzsCvYDizZ3+DmAAg8xa6dXpuBGD1AoMQ06vN93jdEJJGaiHAaUIxCd8F8TwH77jODm5 HT88MWy8m7KLADJ9SdbnBKdJqUgOVyt7ju9TWU30u90jmN6jkwqb4qsfl04PvF1z4n1zeW2MEJY CCu9WIn7DFSgqi1vPu7WtCOa9hlEFCzYpf5jS1K2wrrc/I+pMsWtg3uOBk4KSvea1P+oC31OTyC TjW0d3DV9lu1/8K8br2HQKnzJg8a2GhjL6A1lwS/2pITRAtFYe3B4Smw/lW2oCazl9x617C1cUn o5Q6cY/UT3AhL0Gk3FtGM1ikWgj3AOSxYJSUuup3NPiwpX7kd/O+OXvFgz3LWPI+tsMbri2PlxF rCqJX3j5CWemUl/xkOA== X-Proofpoint-ORIG-GUID: O4A9rxDjwnF8vx_EHUCeJ8n7oKiGmfdM X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-10_01,2026-06-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 impostorscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 phishscore=0 adultscore=0 suspectscore=0 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606100059 From: Vikash Garodia On glymur platform, firmware loading needs a separate IOMMU mapping with its own stream ID. This stream ID is defined in the device tree with the associated firmware function ID in the iommu-map property. To create this mapping, a separate child device is needed so the firmware memory can be isolated in its own IOMMU context. Introduce a new bus called iris-vpu-bus. This creates a dynamic device, and its dma_configure() callback calls of_dma_configure_id() with the function ID provided by the client to map the corresponding stream ID. This sets up a dedicated IOMMU context for the child device. Reviewed-by: Vishnu Reddy Signed-off-by: Vikash Garodia Reviewed-by: Dmitry Baryshkov Signed-off-by: Vishnu Reddy --- MAINTAINERS | 1 + drivers/media/platform/qcom/iris/Kconfig | 4 ++ drivers/media/platform/qcom/iris/Makefile | 1 + drivers/media/platform/qcom/iris/iris_vpu_bus.c | 61 +++++++++++++++++++++++++ include/linux/iris_vpu_bus.h | 25 ++++++++++ 5 files changed, 92 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index a727d4920fae..92d26cf491b0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -22262,6 +22262,7 @@ L: linux-arm-msm@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/media/qcom,*-iris.yaml F: drivers/media/platform/qcom/iris/ +F: include/linux/iris_vpu_bus.h QUALCOMM NAND CONTROLLER DRIVER M: Manivannan Sadhasivam diff --git a/drivers/media/platform/qcom/iris/Kconfig b/drivers/media/platform/qcom/iris/Kconfig index af78a1775937..76c9fcd253df 100644 --- a/drivers/media/platform/qcom/iris/Kconfig +++ b/drivers/media/platform/qcom/iris/Kconfig @@ -1,3 +1,6 @@ +config QCOM_IRIS_VPU_BUS + bool + config VIDEO_QCOM_IRIS tristate "Qualcomm iris V4L2 decoder driver" depends on VIDEO_DEV @@ -5,6 +8,7 @@ config VIDEO_QCOM_IRIS select V4L2_MEM2MEM_DEV select QCOM_MDT_LOADER select QCOM_SCM + select QCOM_IRIS_VPU_BUS select QCOM_UBWC_CONFIG select VIDEOBUF2_DMA_CONTIG help diff --git a/drivers/media/platform/qcom/iris/Makefile b/drivers/media/platform/qcom/iris/Makefile index 48e415cbc439..6deadd531c8e 100644 --- a/drivers/media/platform/qcom/iris/Makefile +++ b/drivers/media/platform/qcom/iris/Makefile @@ -30,3 +30,4 @@ qcom-iris-objs += iris_buffer.o \ iris_vpu_common.o \ obj-$(CONFIG_VIDEO_QCOM_IRIS) += qcom-iris.o +obj-$(CONFIG_QCOM_IRIS_VPU_BUS) += iris_vpu_bus.o diff --git a/drivers/media/platform/qcom/iris/iris_vpu_bus.c b/drivers/media/platform/qcom/iris/iris_vpu_bus.c new file mode 100644 index 000000000000..e3327b227332 --- /dev/null +++ b/drivers/media/platform/qcom/iris/iris_vpu_bus.c @@ -0,0 +1,61 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include +#include +#include +#include + +static int iris_vpu_bus_dma_configure(struct device *dev) +{ + const u32 *iommu_fid = (const u32 *)dev_get_platdata(dev); + + return of_dma_configure_id(dev, dev->parent->of_node, true, iommu_fid); +} + +const struct bus_type iris_vpu_bus_type = { + .name = "iris-vpu-bus", + .dma_configure = iris_vpu_bus_dma_configure, +}; +EXPORT_SYMBOL_GPL(iris_vpu_bus_type); + +static void iris_vpu_bus_release_device(struct device *dev) +{ + kfree(dev); +} + +struct device *iris_vpu_bus_create_device(struct device *parent_device, const char *name, + u64 dma_mask, const u32 *iommu_fid) +{ + struct device *dev; + int ret; + + dev = kzalloc_obj(*dev); + if (!dev) + return ERR_PTR(-ENOMEM); + + dev->release = iris_vpu_bus_release_device; + dev->bus = &iris_vpu_bus_type; + dev->parent = parent_device; + dev->coherent_dma_mask = dma_mask; + dev->dma_mask = &dev->coherent_dma_mask; + dev->platform_data = (void *)iommu_fid; + dev_set_name(dev, "%s", name); + + ret = device_register(dev); + if (ret) { + put_device(dev); + return ERR_PTR(ret); + } + + return dev; +} +EXPORT_SYMBOL_GPL(iris_vpu_bus_create_device); + +static int __init iris_vpu_bus_init(void) +{ + return bus_register(&iris_vpu_bus_type); +} +postcore_initcall(iris_vpu_bus_init); diff --git a/include/linux/iris_vpu_bus.h b/include/linux/iris_vpu_bus.h new file mode 100644 index 000000000000..62af9ee7e288 --- /dev/null +++ b/include/linux/iris_vpu_bus.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#ifndef _LINUX_IRIS_VPU_BUS_H +#define _LINUX_IRIS_VPU_BUS_H + +#include + +#ifdef CONFIG_QCOM_IRIS_VPU_BUS +extern const struct bus_type iris_vpu_bus_type; + +struct device *iris_vpu_bus_create_device(struct device *parent_device, const char *name, + u64 dma_mask, const u32 *iommu_fid); +#else +static inline struct device *iris_vpu_bus_create_device(struct device *parent_device, + const char *name, u64 dma_mask, + const u32 *iommu_fid) +{ + return ERR_PTR(-ENODEV); +} +#endif + +#endif /* _LINUX_IRIS_VPU_BUS_H */ -- 2.34.1