From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from PH8PR06CU001.outbound.protection.outlook.com (mail-westus3azon11012025.outbound.protection.outlook.com [40.107.209.25]) (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 2D46E3ACF01; Wed, 20 May 2026 12:01:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.209.25 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779278507; cv=fail; b=gSavG94OPDHosJM8KoFbgSxpuvvsQfj6AyRfYORTRTKgJuGXs9auKTlW5iyh1B3StThsa9zW+1/fzp9yuoSwmKB8HXHDj5ge1E92BQSDtZLPa1/SrhfeOBBnDdbgPuXOfF2VtVgWaGEblCj57/eJEvbt8g99MnZhgRSromTbrRk= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779278507; c=relaxed/simple; bh=Fe3JQk5PmGZPoBlU86gvtvDatxfow/TrrKtDD/LQn3M=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GnwNdJ2vYLeiey4lrJRmTMiI0s5hIrywbsFq9ppitzoI2uysbYvcBMOLvN2qs3bdT7/0+eOxVRIoV6dqP71IfPW7jIE5YJcGO34o0UsJu4LYNRK/+H8tqwtWoZwZqXX2hfBSxP43769JzCRmhQzku3/TnVZbgw/CevdVOnjh6hw= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com; spf=pass smtp.mailfrom=ti.com; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=ndu80FAM; arc=fail smtp.client-ip=40.107.209.25 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ti.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="ndu80FAM" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uzodu6z/lqASEZeDyZUgfOdOcU7g03dVACeJR9kpXMNDt4AdsWIRwPuVCCDrYq0T9FSPhss7X+MDn/Oxnges3JNtD/OGDVaIkmNPv65uJi3Dkczi48/hAo5AhZv/8jazYFSVhjqf8UOyA90ZsZ6Ega8NF1B8+07cxC8K0D9ljbuvEjiCF3oSe9iQ7nPRL7W97f2OSfnf1igdSB18WLR0ql9geAYZX3VU/w9SkXx3auyjxTSEaZT3mvXBDToXFPC7njyUL46atnYcD4nXNTsRAajzUoq36jHSdivnDMu2aK6K+obhptK0lmpWN77OOyEoSUNjpOJ06RWsy7BWm0KE9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6HsiKN5aacozQMBaKwz1mykoEkP6XBwXJd1q2H2N+os=; b=AnAUlYdpu9j2M6HBJVJDwh7/Lky8CxKpznu571kdIc6gmrQvVXsoCgHPT5o5KGhBzCRoyeRQnQVN2jcP2oY+jq3I/nFROunWHbLQjt2w0bXy/czjgiDl4No/uTYvTqI7uVTGtDFIV6Oo715ZSzRARya98NA/tCL6pRiV5isvMjpMbBDltV8OxyITVXBevHLts/UpPNQXPu4a89nAVwPfCjUwsY0M777SlHqrxfjeKgLYfmBqbDGbxJMGqY4DVpozM49fmWtTZt5oKojEDh/6N+TlYQ4AR5bQnvN3AMNx2rTB64lZd5Mgqjbv3MCwxA/pImzMulBgmV7m7+hP6tQ/7w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.23.194) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=ti.com; dmarc=pass (p=quarantine sp=none pct=100) action=none header.from=ti.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6HsiKN5aacozQMBaKwz1mykoEkP6XBwXJd1q2H2N+os=; b=ndu80FAM0aYgkXu0uNz4gRz/YwHhFp/5ybh2GC6rdXzcVwfepVOLGhTQfVa+s6wr4pV/OU0L3amNlB0NxZlZAenP4fGwTQSW6y1MKxjq1PoOfNwb0k8a2DS92VOcYf2IkyJfC59Zcv2hvUY1ZgIM/CObJprNymORI9wJm1cPdWk= Received: from CH2PR19CA0011.namprd19.prod.outlook.com (2603:10b6:610:4d::21) by DM4PR10MB7476.namprd10.prod.outlook.com (2603:10b6:8:17d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.25.21; Wed, 20 May 2026 12:01:43 +0000 Received: from CH3PEPF00000010.namprd04.prod.outlook.com (2603:10b6:610:4d:cafe::ad) by CH2PR19CA0011.outlook.office365.com (2603:10b6:610:4d::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.48.16 via Frontend Transport; Wed, 20 May 2026 12:01:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 198.47.23.194) smtp.mailfrom=ti.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=ti.com; Received-SPF: Pass (protection.outlook.com: domain of ti.com designates 198.47.23.194 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.23.194; helo=lewvzet200.ext.ti.com; pr=C Received: from lewvzet200.ext.ti.com (198.47.23.194) by CH3PEPF00000010.mail.protection.outlook.com (10.167.244.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.11 via Frontend Transport; Wed, 20 May 2026 12:01:41 +0000 Received: from DLEE205.ent.ti.com (157.170.170.85) by lewvzet200.ext.ti.com (10.4.14.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Wed, 20 May 2026 07:01:34 -0500 Received: from DLEE204.ent.ti.com (157.170.170.84) by DLEE205.ent.ti.com (157.170.170.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Wed, 20 May 2026 07:01:27 -0500 Received: from lelvem-mr05.itg.ti.com (10.180.75.9) by DLEE204.ent.ti.com (157.170.170.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37 via Frontend Transport; Wed, 20 May 2026 07:01:27 -0500 Received: from ws.dhcp.ti.com (ws.dhcp.ti.com [172.24.233.149]) by lelvem-mr05.itg.ti.com (8.18.1/8.18.1) with ESMTP id 64KC0N3X1914726; Wed, 20 May 2026 07:01:20 -0500 From: Rishikesh Donadkar To: , , CC: , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v13 08/17] media: ti: j721e-csi2rx: get number of contexts from device tree Date: Wed, 20 May 2026 17:30:13 +0530 Message-ID: <20260520120022.539913-9-r-donadkar@ti.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260520120022.539913-1-r-donadkar@ti.com> References: <20260520120022.539913-1-r-donadkar@ti.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PEPF00000010:EE_|DM4PR10MB7476:EE_ X-MS-Office365-Filtering-Correlation-Id: 132a481b-13fb-49f6-99f8-08deb6678dfd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|1800799024|82310400026|7416014|376014|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: WWOMH0rH4BvbFcKAgS9C4tRpVIGt8niELJgJbdYS1wLftPgs+HmjkJjbUkipdSPDRbgnuCJF7cYbfMPsjcEalDT5ASOg/oPly6XX3MryJM0saXxhewzKkrMq9iiTQvIUOT3HUMMFRPks86otdj8TFMPMcpM1ZJUPAOxyst0382Pk7ku5ejg63lDJ7gLCktKC/fjX06LzoBkxQORAp4MULvp7QMB9Q9JYEgHXp0kP3tfREH4fyCPZuOnvwvpoSGv2nBUztMMrC7ANlFXMlBui36UmvCOpy8WerV+4poJNBWVOAzlusK8nGn0y1u9TYQaaHO1P2YIS4+CUTMb/e5HiNgzBu1BtWaigYCKG7S84wrc3SwRUyaAat47WX82FAJlDY48WuEYnzgtQJLoWE9fdaWR452ySDfeQMW3Cds9m+0Um28tEdaE1ENGVp99CFQfYQAHzzlf0C29YT9IrSMfumMDFAABOfcbX/xp48PBVnwIV6STsynySpabh7hfv1jyEqtVrd4gCL0wFMl89spII9aneUPyCGXppgsl9rTCvHyfQruZ4wwlrso3agk4y65ETb1e3THj+oz+ARFODNW5PLd5FBB/QY6NsEgDQX81/833LWhbE0vgoZyKHIeMEK0QNTgwJUNr+b6WfdOckTj6LpIbPxfuxT4jxy0mpG3vV0aqeHJ9RlYTJ7vHRnyRkEAJl14ggd02+Ia1cj7r6NaofrFyGyDlCar3mMMUcwFfy4co= X-Forefront-Antispam-Report: CIP:198.47.23.194;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:lewvzet200.ext.ti.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700016)(1800799024)(82310400026)(7416014)(376014)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NOh+FQkAB0unSq+wXMiImIe/vN1ecWmW4xGyEjVdZXmiDv97afa403avgKoHlElRLTXzrj0nMYyv/X5El92RI9iH7DL6Dr0ukchqw4BDaXEcoDhhlso1fxAaSE8c8HGyxqskuysthinl8r9ysDRk0hIU35TvS1ajSM3Pvjas6Bf54ZeCn7wsYkOP2eGaSSRxq9gdz/4JR0O76V9dECnrj92SAuFHpmjSiLd00kdogHQBKmV+/jOm+q0DcUglgn6rsgA1B3w4j9L+mGXVni4vXJk89gaAKkPjPtwgQN5+gv/IhKe5ELOM+3prJZSwHMAmP86Nn/xGT3mMW8DotxwZlAqfwBGgaSoSMbfClJv5wUYKVgTytLoJrHDAuAs0XJ3ZwgIvRRqBSuTsAZSWxl2yqPwE0rNjiV/Od6Q+LMxfZpEdQNrXtkMWm4BMz1yWVy+7 X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2026 12:01:41.2340 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 132a481b-13fb-49f6-99f8-08deb6678dfd X-MS-Exchange-CrossTenant-Id: e5b49634-450b-4709-8abb-1e2b19b982b7 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e5b49634-450b-4709-8abb-1e2b19b982b7;Ip=[198.47.23.194];Helo=[lewvzet200.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: CH3PEPF00000010.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7476 From: Pratyush Yadav Different platforms that use this driver might have different number of DMA channels allocated for CSI. So only as many DMA contexts can be used as the number of DMA channels available. Get the number of channels provided via device tree and only configure that many contexts, and hence only that many pads. Reviewed-by: Yemike Abhilash Chandra Reviewed-by: Tomi Valkeinen Signed-off-by: Pratyush Yadav Co-developed-by: Jai Luthra Signed-off-by: Jai Luthra Signed-off-by: Rishikesh Donadkar --- .../platform/ti/j721e-csi2rx/j721e-csi2rx.c | 46 +++++++++++++------ 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c b/drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c index e01d95eab19c..26a8eaa98b3d 100644 --- a/drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c +++ b/drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c @@ -43,7 +43,7 @@ #define SHIM_PSI_CFG0_DST_TAG GENMASK(31, 16) #define TI_CSI2RX_MAX_PIX_PER_CLK 4 -#define TI_CSI2RX_NUM_CTX 1 +#define TI_CSI2RX_MAX_CTX 32 /* * There are no hard limits on the width or height. The DMA engine can handle @@ -56,8 +56,8 @@ #define TI_CSI2RX_PAD_SINK 0 #define TI_CSI2RX_PAD_FIRST_SOURCE 1 -#define TI_CSI2RX_NUM_SOURCE_PADS 1 -#define TI_CSI2RX_NUM_PADS (1 + TI_CSI2RX_NUM_SOURCE_PADS) +#define TI_CSI2RX_MAX_SOURCE_PADS TI_CSI2RX_MAX_CTX +#define TI_CSI2RX_MAX_PADS (1 + TI_CSI2RX_MAX_SOURCE_PADS) #define DRAIN_TIMEOUT_MS 50 #define DRAIN_BUFFER_SIZE SZ_32K @@ -116,14 +116,15 @@ struct ti_csi2rx_dev { struct device *dev; void __iomem *shim; unsigned int enable_count; + unsigned int num_ctx; struct v4l2_device v4l2_dev; struct media_device mdev; struct media_pipeline pipe; - struct media_pad pads[TI_CSI2RX_NUM_PADS]; + struct media_pad pads[TI_CSI2RX_MAX_PADS]; struct v4l2_async_notifier notifier; struct v4l2_subdev *source; struct v4l2_subdev subdev; - struct ti_csi2rx_ctx ctx[TI_CSI2RX_NUM_CTX]; + struct ti_csi2rx_ctx ctx[TI_CSI2RX_MAX_CTX]; u8 pix_per_clk; /* Buffer to drain stale data from PSI-L endpoint */ struct { @@ -458,7 +459,7 @@ static int csi_async_notifier_complete(struct v4l2_async_notifier *notifier) return ret; /* Create and link video nodes for all DMA contexts */ - for (i = 0; i < TI_CSI2RX_NUM_CTX; i++) { + for (i = 0; i < csi->num_ctx; i++) { struct ti_csi2rx_ctx *ctx = &csi->ctx[i]; struct video_device *vdev = &ctx->vdev; @@ -1251,10 +1252,11 @@ static int ti_csi2rx_v4l2_init(struct ti_csi2rx_dev *csi) csi->pads[TI_CSI2RX_PAD_SINK].flags = MEDIA_PAD_FL_SINK; for (unsigned int i = TI_CSI2RX_PAD_FIRST_SOURCE; - i < TI_CSI2RX_NUM_PADS; i++) + i < TI_CSI2RX_PAD_FIRST_SOURCE + csi->num_ctx; i++) csi->pads[i].flags = MEDIA_PAD_FL_SOURCE; - ret = media_entity_pads_init(&sd->entity, ARRAY_SIZE(csi->pads), + ret = media_entity_pads_init(&sd->entity, + TI_CSI2RX_PAD_FIRST_SOURCE + csi->num_ctx, csi->pads); if (ret) goto unregister_media; @@ -1345,8 +1347,9 @@ static int ti_csi2rx_init_ctx(struct ti_csi2rx_ctx *ctx) static int ti_csi2rx_probe(struct platform_device *pdev) { + struct device_node *np = pdev->dev.of_node; struct ti_csi2rx_dev *csi; - int ret, i; + int ret = 0, i, count; csi = devm_kzalloc(&pdev->dev, sizeof(*csi), GFP_KERNEL); if (!csi) @@ -1368,11 +1371,28 @@ static int ti_csi2rx_probe(struct platform_device *pdev) if (!csi->drain.vaddr) return -ENOMEM; + /* Only use as many contexts as the number of DMA channels allocated. */ + count = of_property_count_strings(np, "dma-names"); + if (count < 0) { + dev_err(csi->dev, "Failed to get DMA channel count: %d\n", count); + ret = count; + goto err_dma_chan; + } + + csi->num_ctx = count; + if (csi->num_ctx > TI_CSI2RX_MAX_CTX) { + dev_err(csi->dev, + "%u DMA channels passed. Maximum is %u.\n", + csi->num_ctx, TI_CSI2RX_MAX_CTX); + ret = -EINVAL; + goto err_dma_chan; + } + ret = ti_csi2rx_v4l2_init(csi); if (ret) - goto err_v4l2; + goto err_dma_chan; - for (i = 0; i < TI_CSI2RX_NUM_CTX; i++) { + for (i = 0; i < csi->num_ctx; i++) { csi->ctx[i].idx = i; csi->ctx[i].csi = csi; ret = ti_csi2rx_init_ctx(&csi->ctx[i]); @@ -1399,7 +1419,7 @@ static int ti_csi2rx_probe(struct platform_device *pdev) for (; i >= 0; i--) ti_csi2rx_cleanup_ctx(&csi->ctx[i]); ti_csi2rx_cleanup_v4l2(csi); -err_v4l2: +err_dma_chan: dma_free_coherent(csi->dev, csi->drain.len, csi->drain.vaddr, csi->drain.paddr); return ret; @@ -1410,7 +1430,7 @@ static void ti_csi2rx_remove(struct platform_device *pdev) struct ti_csi2rx_dev *csi = platform_get_drvdata(pdev); unsigned int i; - for (i = 0; i < TI_CSI2RX_NUM_CTX; i++) + for (i = 0; i < csi->num_ctx; i++) ti_csi2rx_cleanup_ctx(&csi->ctx[i]); ti_csi2rx_cleanup_notifier(csi); -- 2.34.1