From nobody Thu Sep 24 17:02:17 2026 Received: from mx0a-0002e601.pphosted.com (mx0a-0002e601.pphosted.com [148.163.150.75]) (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 F18A243E072; Tue, 22 Sep 2026 06:50:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.150.75 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059816; cv=fail; b=sBOZ+F8DDtkQLxqwmbBlf+GxPkLUVPqPWucbtSpWLFqpzyP7ZvM2MfpdoIGGF4SnDY0OKi3tdFt/89jnwYQJ+8iFzjPzR8BxVmFWBcsi01vYzp2mtqZXe64gTLyJu1A3py8D7xfk4n2wsp2vL0E2ITd0ovfZ1QwqnnWGKhrIOWo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059816; c=relaxed/simple; bh=Yb68ywnxktAOqzC7HH9iP2aGbIV1+15VbDByTdOE3mE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dIL1wFVYF9qTmHJOfBK6p15p8E+bOXNloAJ4Sllv76xot8uuhmGMGzQhqPYdjj9tfE5zHBoMZMCawi2cmgn5RlJuu//dsTlsjNpRIQdpxq8MSgdU0sFggd02CUyZw/wFZxuMMWT8Y77G+EccjcKERbM2sUd9kDIhRHz+/NnQxbk= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=GHIMFx2y; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=rv8cRl8L; arc=fail smtp.client-ip=148.163.150.75 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="GHIMFx2y"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="rv8cRl8L" Received: from pps.filterd (m0380145.ppops.net [127.0.0.1]) by m0380145.ppops.net (8.18.1.11/8.18.1.11) with ESMTP id 68M647cs935711; Tue, 22 Sep 2026 01:49:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=MQ7P50QmbBfwGmZaR3Z/gNisrqNUd3IhQuygJr1B3 UY=; b=GHIMFx2ykIGK4zScZle6ZbY9begaG8CjbAc2zxMe60llDMb4gVpmz/Dhz kUObVuyzJU9avvLIdLvYVASsQIzqgj6PCUdTKqEefX5Pmi7Aebg5zzox7QR9CIQP l6zrgwC8K2DP3npJYgnAZ35jzyrbdwLIOIryiZwz7PuYLWJ02YwkiV320RSm93/C LrQg48tG1GF2mQe391NPX5MQAWvizB593mTgdVUaBY8cuezbGZVMflCT2UTDp568 GCDl3V4/IzjCMZqklI1lzjixIf1UHs3BkaavaAv0/m0CD9rwC/CKJ6q/BSHJZnah eL/AdNg+wzGD6dEa+mVSEZpIwjvSQ== Received: from ch1pr05cu001.outbound.protection.outlook.com (mail-northcentralusazon11010012.outbound.protection.outlook.com [52.101.193.12]) by m0380145.ppops.net (PPS) with ESMTPS id 4guf4x1v0v-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:49:57 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YmOeZmyjtjEfTeaJ+wq/PNRpcyZulmLcI+pN6ArNw7rw3fNDZqnD8V/aDIGr/8Bgps1uZeAt6X20gbH54RR94Rd3ha2uhGgwu7vZm/dEiaAW6fXHkGo9wTE5RZ7j3tkKP3tp4Orv7GbI8ZjPZjF5rDIjaFlWv/a877Ilu4AvX2qNJL9PysQ7x75tp/BN5DeVQdVLjN4kDD1Rg9ilfS79TuCzVTqbKGwazrP2NvytY7Xc3vtO/d9i0lJ6D3VJOUUDWyjFWZYhVZPhnZ8TPBAU1N9RjC+Q00KQ2JZcd1H6XT+Q2bJz+u6D9HMuZRzKntvI31a/SynM9Rx3whUj7ZqHpg== 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=MQ7P50QmbBfwGmZaR3Z/gNisrqNUd3IhQuygJr1B3UY=; b=ML/+Z/Gr0G0Og3/UDIC8MKf+06WgIG3mPht5FcsM5GY4DMASAIWgdxIbDSnB3yQkEO8kgc/qDYjBP2LI4qeddQfAsjbY+4e2wHmWV1jK0nAnLrd+GhsGwMOCj1a/IB65nFHBezh9mJhWD+YHdSbRVzFgb3FHTJIYL+CZD8PVjfcNKb8GYKISSjxjMY6LiBNCG2ae9hV6YQifjENr2d2ZPwMDwbwKEdZxsuqoQF4WEF0FdYtrpirZBgdYc16pCe0KY6JHE1nDlY95BYLPxSWlWjnbQ0LHkbqHxpoV605Ht7UGC9y8X2vb1j6wnpOlACZrYzGprlqYQhz61Se/jp8GWQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.23.194) smtp.rcpttodomain=nxp.com 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=MQ7P50QmbBfwGmZaR3Z/gNisrqNUd3IhQuygJr1B3UY=; b=rv8cRl8Ll+vTx/nPoOexK8wSNCOKtwTA1kKLNupLk25b7jQDoqMLariTlC5OKSDMrlUu/YtB2qt/vLFZUHIB0jCjWlU9qQ9KRP0qHy8Z+H+bhJwI71KU3VWCUaLotliQvrlesVxNlBo1BiVWxOio0w5VELMeeqplfgT9HkGg1UI= Received: from SJ0PR05CA0102.namprd05.prod.outlook.com (2603:10b6:a03:334::17) by SA3PR10MB6952.namprd10.prod.outlook.com (2603:10b6:806:31b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.9; Tue, 22 Sep 2026 06:49:47 +0000 Received: from SJ5PEPF00000203.namprd05.prod.outlook.com (2603:10b6:a03:334:cafe::3a) by SJ0PR05CA0102.outlook.office365.com (2603:10b6:a03:334::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.14 via Frontend Transport; Tue, 22 Sep 2026 06:49:46 +0000 X-MS-Exchange-Authentication-Results: mx.microsoft.com 1; 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 SJ5PEPF00000203.mail.protection.outlook.com (10.167.244.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:49:46 +0000 Received: from DLEE215.ent.ti.com (157.170.170.118) 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.45; Tue, 22 Sep 2026 01:49:28 -0500 Received: from DLEE215.ent.ti.com (157.170.170.118) by DLEE215.ent.ti.com (157.170.170.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:49:28 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DLEE215.ent.ti.com (157.170.170.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:49:28 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI3r3626771; Tue, 22 Sep 2026 01:49:24 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 01/19] dmaengine: ti: k3-udma: Fix sporadic crash on AM62x Date: Tue, 22 Sep 2026 12:17:25 +0530 Message-ID: <20260922064902.2719979-2-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF00000203:EE_|SA3PR10MB6952:EE_ X-MS-Office365-Filtering-Correlation-Id: aac6ea30-425e-424e-4798-08df1875b100 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|23010399003|7416014|1800799024|36860700016|82310400026|56012099006|10067099003|921020|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: SHAWD/rhxO8J7xEtWLJyseVXfVdvLlhpitJDA9pq5H2YxUDlvZLUxSMH8xpXXLVI5Om8gQxAAuypTqKkhPlccuYbQRtiDuWr1rqzEieNXzFrVFc8SB9JqMBK1Zr4qYCXGiw09VGe88cgdmpEveQNJ0DVRVBMWT1DjBE+iY10fNusg45+XZ5YNsUKyfAuzoLWArZazoNMNlAZKn1LEthNPPdJHyAPltpBV3bby/Ubt9642ZneQXNrJ0hcgjY3WgWfReYD9GYu6ravcvKtzBhndy6K3WTg0VlxqYUte07BjK/4rETS2swG/0IEsUz2k8BcwT8fkw1Z9IUL6sliS1k0pHoFJuoZNQ8zZ5JkmKyJLzD/svJp4Le+jUi+6hxlytMtkgKc6hcM9Zmzkj4oLjkzfBt47OUGFf/jVCJr1r13Y8bDHfNEnxYPOvZlddP/Z+FqlGjjUcEqwrcp4I0NiIYyZ8HimXq1lNa9aLUNQcM4omiQj/DvmswzO5TmqDlAqPQUe8y6DXa6r9AT8LntXJESKJs64Fd6ar6+LdRPN6CfIFnGeBqcvSksa9Kf+Z4pKlikINR8yxERCNPAgIsoG6xenVL9Rzwhlr+p9eyWGvtbfH+cnibgWOIIGzzs6Hshqmqmzrx6iiQlV9/An9+l1zR4u1EQ/WGGuyv1//0GJDHiHajYUdMAD0e3yUUWmrdOAWWBnvueFvtU3rPQpDD5lgV/1QeKdxNJS0YYE1PzaPLf1F3KO3za/SFoBk2Pa/A4itws 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)(376014)(23010399003)(7416014)(1800799024)(36860700016)(82310400026)(56012099006)(10067099003)(921020)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KTpnyjxfdVFI6df7gX7UYFiav9QIvEDrUdW2MP2FQ+9wuru7O9fiyHZ+qtyBnv5Mlt6+xl6LSdweJ4xDJemOTlURbbKUKMSF/aJ6Z4kwig5j2Y4jzS5hn28fEtQ3qvKIGoRtfriwRtwJB9Z9rriPP4JZRvLInV1oOZsV8EJ2gf3iIrvtqx1PSQ58qlc1z/VXX7GXa39ckt+SYappKy9XIrZ/kXXreNKe9fJy7A795pfwyV042nZGf+vN4fYZsHJyrCnihG6+uZ8oGhXUBOxMw4ejho+WND0QapO7eXS243vBuPxBhneHUWTF4xFKjMpiCx677WqSQgryGjcu34m7HyiDVJTgfczmSb3uzkw0YyLkG/ksdont30n4YQ1F8AT5LFhhzDG6dBU9nWSRpxMuJJ3ij2woqpFYdsN+9FAOLfB5TprbLzbnzWOT3Lg/k0Qn X-Exchange-RoutingPolicyChecked: HMVMAq/PJlHDzDRB091jgy/wogOeN4H0x4MjWHCQ+NsMb/cgNqIUxrxfKBuVEPRXrylt/DHRgBN918r2xA8MelB6Y2TxjFRkXaM0jL6cQuH3mAaXHUARvNiGZLbkQbeKW3KCxEaHK6UkvOTkThzkwroj1BXVO80aTwwh4cqzaTKiw0l1G5RZVzcruIQlNDmvUT4iIs297zztdwxX8+tJ3LsG1WFLOzp6r0Kv+BTXuiBpRbrXSjzyp6FkVAK0pXyG8n93E3Fs+EuNFbc6fDvcqvFdmfLn8V13fxSZWdGM9hAhgc8V4KnXRfkzuBn6Y54AEPN0F2cPR5D6mqGZujSC2g== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:49:46.8316 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aac6ea30-425e-424e-4798-08df1875b100 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: SJ5PEPF00000203.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR10MB6952 X-Proofpoint-ORIG-GUID: dXhv4t_Fz_oKgs8f4myPbFJKao4wRC9a X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NiBTYWx0ZWRfX6a6JU2A97Oa3 AQsMo4ecm0BLNVUP4sygD9CLZPK4oHExXnTqQEvcblJZt/6R67s1x7JZKqqQceCY3z/2dRm+OMQ Xx9/T8MyhPFyh0dNzTgsNPTemIlfzSXb7U7hU9dZPMP1eNhh0Sl/FKbIyF7aT29WxQ0NAaHxFX2 q6rhSiV7AqDUPSJcunZ0j7QUWtwAgO5quWmYQ/qaXu4ytog0+RfOCRAfIAtDDbDOxslm9QCUfZm bsuBdiKUffVWWRwSYb2hsVVpXlnh7PtukLivrAhVOtN+MtoYyQzyFddT4v3HeK55LtAbKgFClHd 6EdkKUj5HGi8HJ/zaI36L0KeLKekuhxlOyTMQLKs+mzIZorPLiIkXW7Uws7gOahQEiHxMP1QVa9 cn+8SWxwl0bNaoV7O4ELTvhoxD8VPzJdg8Y7EdqcHzHnkaDxWuZ9DMIVBg/KaSu9Dx5V+NFOmoH PY1H4r6+yZMrSHq+InQ== X-Proofpoint-GUID: dXhv4t_Fz_oKgs8f4myPbFJKao4wRC9a X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NiBTYWx0ZWRfX3qgqIXQcSFeM nmB+bFHTeTTym63f1SKh1hDsPDC4RpykfR19faXYRBziI3m4IwBDFx4XcPk0WFTU/A+xtg6rW9Z 7pI495jCELc/I3WopS51IQ43YA/W+1A= X-Authority-Analysis: v=2.4 cv=XYYcX455 c=1 sm=1 tr=0 ts=6ab22515 cx=c_pps a=G0fLBfPV4gnnEhzimi2a/Q==:117 a=WotqVVQAdb04rnGuttW3Kw==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=s63m1ICgrNkA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=gO1vWkAQAl3rybz1DQOp:22 a=sozttTNsAAAA:8 a=YS4YLeW4SzYDQNh2yKMA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 clxscore=1015 bulkscore=0 phishscore=0 adultscore=0 malwarescore=0 suspectscore=0 priorityscore=1501 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220096 Content-Type: text/plain; charset="utf-8" From: Vignesh Raghavendra ring_init_data is declared on stack and thus can contain garbage which can lead to k3_ringacc_dmarings use junk address for ringrt base leading to below crash during ring pop [ 1.998239] cadence-qspi fc40000.spi: couldn't determine phase-detect-se= lector [ 2.532106] Unable to handle kernel paging request at virtual address ff= ff800081a84b98 [ 2.540051] Mem abort info: [...] [ 2.629987] Workqueue: events_unbound deferred_probe_work_func [ 2.635832] pstate: 800000c5 (Nzcv daIF -PAN -UAO -TCO -DIT -SSBS BTYPE= =3D--) [ 2.642787] pc : k3_ringacc_ring_pop+0x48/0x94 [ 2.647234] lr : udma_pop_from_ring+0x7c/0xb4 [...] [ 2.726250] Call trace: [ 2.728691] k3_ringacc_ring_pop+0x48/0x94 [ 2.732786] udma_ring_irq_handler+0x34/0x218 [ 2.737141] __handle_irq_event_percpu+0x60/0x14c [ 2.741846] handle_irq_event+0x4c/0xa8 Fix this by explicitly initializing the variable to 0. Fixes: 017794739702 ("dmaengine: ti: k3-udma: Initial support for K3 BCDMA") Signed-off-by: Vignesh Raghavendra --- drivers/dma/ti/k3-udma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 78a67cb9d6e00..8457644cb9132 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -5484,7 +5484,7 @@ static int udma_probe(struct platform_device *pdev) if (ud->match_data->type =3D=3D DMA_TYPE_UDMA) { ud->ringacc =3D of_k3_ringacc_get_by_phandle(dev->of_node, "ti,ringacc"); } else { - struct k3_ringacc_init_data ring_init_data; + struct k3_ringacc_init_data ring_init_data =3D { 0 }; =20 ring_init_data.tisci =3D ud->tisci_rm.tisci; ring_init_data.tisci_dev_id =3D ud->tisci_rm.tisci_dev_id; --=20 2.54.0 From nobody Thu Sep 24 17:02:17 2026 Received: from mx0a-0002e601.pphosted.com (mx0a-0002e601.pphosted.com [148.163.150.75]) (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 6401B43E072; Tue, 22 Sep 2026 06:50:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.150.75 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059827; cv=fail; b=h5mSH2tpvxdAkFM2sDtu/OSzt8E6oM53jIp+nkPtH1zMc/duz1u8Zarbfn0ckuYSU7wiqaQ85i/7FWO50dskskPeJVUvu5qr75cQNMQQBj17n4/d5dpZBfYq/TzsqEz2ME+uAYQwB/U4H5UTg6FxqB1aFtsS/KYE9kJ5I4k1u94= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059827; c=relaxed/simple; bh=ShSg+QoaLIO4hbZSZgkMejppZjWjSKbs1QKIYiTDSh8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tEMSURRULdzDlieNjCrBt+/IbbfTx0cjJPTlXelbRnlWcdoiNgghkwojzBfIjt67vMklxXcPRbwVr7LuhXwhuepE3N1vFkJFsd/UrI74/TQ2PbNqynIa3bmKvMqKEOAnFz0rDpTJSJW5X6V6kki6nMy0kyAJvZ/Zpq5CinfXu+c= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=MhsnKwB6; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=fO6FteRd; arc=fail smtp.client-ip=148.163.150.75 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="MhsnKwB6"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="fO6FteRd" Received: from pps.filterd (m0380145.ppops.net [127.0.0.1]) by m0380145.ppops.net (8.18.1.11/8.18.1.11) with ESMTP id 68M5sffx932416; Tue, 22 Sep 2026 01:50:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=rCQNGoXps1QncXA4n5E9I2k+f6PXY4YgK3IBMNZjt Ug=; b=MhsnKwB66qSVbL0kVYdKAIjdD6xQQN8HslXQF1CKLq+NuRLYRUME+flny noqN4BnaXq0yo3Q3ua3KmHyTsMwDzN5d83RiH9TIGk5nkNtbGvyqFYsmNJMGkSF/ YlVQ8lKJAv0ixYDR+vyqNP+qIRSOLWaczpcD0XCXLr3phIs2U3viZw1qw7hnMDX4 z5HxUj14qdkieo5evxBbSfZyhrh3gp/kmeoUPsWtI84ILTw7JD020qJt0fSSIiAZ yIcny6Tu8D9xkEzNbsa129LkYoO+UdYSY75w+t4tCwUXCGrVkn45EWZ24/1mAMps ZwDlREZEQmSQGKnLes1xzqDTWdnzg== Received: from byapr05cu005.outbound.protection.outlook.com (mail-westusazon11010026.outbound.protection.outlook.com [52.101.85.26]) by m0380145.ppops.net (PPS) with ESMTPS id 4guf4x1v2h-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:50:14 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ffRRPykQCkbixkLO5CDpye1wpf4BYrLpGm3CeMja6rcCsxeBSudBZIFujBI3u02B3NFx5xi+CqeYTrL6WGlZcfpQ2Rs1VYedfvSMvOplf/VxlB/WHAzUWGUZVXWRzZpkoCa+uvl1qVrwI7tlYlCmrUZD4NKRtWPATdzjrlGc8pEHHsVULGmjqgIZEBwerxv8VI/Ob+5dQxVsBvVy0bvN3q0+twZoZgV9vc4NMSHnzoG6u3aW4NeCl5Bu3vhImI7ixAc/p36f40Yb/APE2qzgBrAfei0ZykCT0Fs4Hw/4dxB+jzFmGjKZwdkcD2T/eH+G0kxzcdOfbk8QnoO5hqxHoA== 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=rCQNGoXps1QncXA4n5E9I2k+f6PXY4YgK3IBMNZjtUg=; b=q8cLg6l5dHaKELgK/lOyC0nzu7ecWaC7rkhGBJeIrDrFrfk/XN6idMmvhMB8buw4lS7eJbyOb/8drkUerpFFJJLOZHDRrwgciZotY/UE4uIH8mw7g+4053kz0bI5c2vajit5/gwpf7gxJI2RsL8zkljQw9+JtQZHNleZz5ckwHBxq6asoS/yvo5QQKTG2IaSbUEaCE2jaW0pFRa8QWLNGZzwsVqVvt57n/668ayY4Mf3K+8ad/u/LKro1sRnzXxnTE8T59kxV6aBigEY9Rox0dt7WaiBa1mjIQmKTpFln+cxlzxe/I8IGrjn3qg4tOMKhLbE5d9eaLxRtYzm3jQ0Nw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.21.194) smtp.rcpttodomain=nxp.com 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=rCQNGoXps1QncXA4n5E9I2k+f6PXY4YgK3IBMNZjtUg=; b=fO6FteRdtA7eYzjajDzd4MmWiIB+AvYz0bzqLuPQE82JugGldlGq8YF6+lYwdagAkwQzHNYwQas8wrRVL3bCtpVKvcCzWFtrvoInYKRHeGsI0tMfX8TIXC3vr42haQZL1UnF+vwzTVKtr9MM/VWr8UcXKY7F0ypbv7HI4sboZs8= Received: from BN9PR03CA0514.namprd03.prod.outlook.com (2603:10b6:408:131::9) by PH3PPF54E75B76D.namprd10.prod.outlook.com (2603:10b6:518:1::7a0) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.13; Tue, 22 Sep 2026 06:50:10 +0000 Received: from BN1PEPF0001806E.namprd04.prod.outlook.com (2603:10b6:408:131:cafe::9c) by BN9PR03CA0514.outlook.office365.com (2603:10b6:408:131::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.14 via Frontend Transport; Tue, 22 Sep 2026 06:50:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 198.47.21.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.21.194 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.21.194; helo=flwvzet200.ext.ti.com; pr=C Received: from flwvzet200.ext.ti.com (198.47.21.194) by BN1PEPF0001806E.mail.protection.outlook.com (10.167.245.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:50:08 +0000 Received: from DFLE212.ent.ti.com (10.64.6.70) by flwvzet200.ext.ti.com (10.248.192.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:49:33 -0500 Received: from DFLE205.ent.ti.com (10.64.6.63) by DFLE212.ent.ti.com (10.64.6.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:49:33 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DFLE205.ent.ti.com (10.64.6.63) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:49:33 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI3s3626771; Tue, 22 Sep 2026 01:49:28 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 02/19] dmaengine: ti: k3-udma: move macros to header file Date: Tue, 22 Sep 2026 12:17:26 +0530 Message-ID: <20260922064902.2719979-3-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF0001806E:EE_|PH3PPF54E75B76D:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d275f78-cd01-440f-dbda-08df1875be1c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|82310400026|23010399003|36860700016|1800799024|921020|22082099003|18002099003|56012099006|10067099003; X-Microsoft-Antispam-Message-Info: l5j/veIUZ2EPA+KPLBoCMOL66XRf+fUeHj1rVvgZfgI3EFEsTSFxEf1A4IBcZg/lX4PdjJ5SAqOrbPVgI+J53s+kIYqRPoDiKCF5EQ8Djp5JC9Ho9w0hRPOB4u/Ehj6pnPJIkTt3NxjtcOaeAuCmpTZF1iQnk2ZNNIfUZWTjUccAAOj9b598TJ18FybMjxUgY6pMJS/Egt9nXN78/9uxyp0N4EfEtEa47E8SahHxwdsm4XW4IsYqXKtNn4EYe7sjHLC6GSQx48n/P0J3P7pr1dm0TjLC2nMeg835Ax7zX3WEKBzWsq897ZsYmPJvqFfj1NAPsason9sjSUI/U60Hamzm4GnoXUQWqIZPZBLlr9GHHhbTMEfAh8fRsT0mEqYdiFtZzx17qjLKl2Aym8qSlowNnVxv6kcI6BXjy0Zr0LYIPh14NzmkylkCCxdeHy6w8Zs0Rx1ftbjfBW5PMAyfDhpQLM/dpE926gbUWUSrcRVDrUz553teEkj+99JaQm6atyFKFvkIESDKDF0+J3C7rJncos5X9mNf/s1tiJXpKm2l7SpxIN07qINsYm5SVvHcP8pZN5l4thrVFuyswVUQ+bZf+93czf3vMFqWDiL1zuaX3mPskj9F6CtbS8JdlHPNX97GlCO9A8cu6lQ3jSi2o6FpCao9hvGJwkRQNHiddyon0BAuiRObdahhb9NJtvyI17/IoT1++2PjhkvdTUYFF+Hz1fNDbiYQEKda3GV9p0xaqYcm/j4SYdKzAsRUuQGE X-Forefront-Antispam-Report: CIP:198.47.21.194;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:flwvzet200.ext.ti.com;PTR:ErrorRetry;CAT:NONE;SFS:(13230040)(376014)(7416014)(82310400026)(23010399003)(36860700016)(1800799024)(921020)(22082099003)(18002099003)(56012099006)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5B77SQuVVq93JT9kSWg2T3jhBdpOZokni/V2R1xTFAQq1YUONS3BXopthEk09Hv/H+3AU8o8QMBiJfutpcFh9BNBA2PiJ4SwNsz8FSqfEOaTKD+y11m+PvXOXimPvjOlsQyQ7dUXFlP83BduyrXOdIHq/80ZH1XVe5dHoSyeMgmlVdyRc6rut30+Ns/+W5Hwmywz+/5lG9nutkXF1YfLpsxqGhso7FcimS8CRHyW4Uhtk0EE14cIyT/oybQ/riwCSrk9r1tGrPPNTYxpFu8RocaKVLcHwgpmVMns6nQoKNj6jR5YMtPJnO4/5zIvPTXEEUf3duIAisnxgCBAaesijzRPiY3obldsWj9V1U0jNV5tFnVaYnOsB9oDg1lqTpOXmBVj+rzp3wobkCe036JRmM2JZUQhpMfScucV6aQw5i4U5ZXtfnmH87xbusiFajgw X-Exchange-RoutingPolicyChecked: AWOBh2WcOdgBcwLOPoK6+qNphzNvGiXUnay6sSwR4yyexrRUzQbXdm9MGtObR8SAJjshiZuZRvvSD/SISDvsa+qb6Pgo65hn9BVyISy03ncUMfndgOHyx0YfsMqFO9mUTag7WvtIxB5iQAceu5ZGM21lU54MrQOKcZmdLjIvAMansbGpxh8jGkCCFy6Vts/hz9NrkxsPYeElpk+FwzuQFeAfxdNPTIgIHZQDS44sHLc8w2/JGI8Cm5xUPGispb0HQzBD915oug0OU8iT281iKjTIL2hGQw+adtPkxYvkktgxtqMWmZXW/ZJk5gMvWQziaDlQSU/cXIJRmEKLaTHbrA== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:50:08.8534 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2d275f78-cd01-440f-dbda-08df1875be1c X-MS-Exchange-CrossTenant-Id: e5b49634-450b-4709-8abb-1e2b19b982b7 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e5b49634-450b-4709-8abb-1e2b19b982b7;Ip=[198.47.21.194];Helo=[flwvzet200.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF0001806E.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH3PPF54E75B76D X-Proofpoint-ORIG-GUID: NEr3JppW5uznGiMMnVMDiDkEx63607KV X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX7n1511fkv0hY AKN4UYnP2xLJIYx+UX5zIipqZU9JHJS3bGphZ04TP8OklU8yXY/DXdGBUXp3lsjWreLzxqrXFv/ e1ngZ6gz5mibIfle6xrvHXpUIx4wpGLFUWrY7vP8bO0+VsBvoRN8etOYpEemFXCKuUfgVwtIgBE +LBbFVnpncRd14Udh2frI6xv3iI9P1Nb+Nj6YmRv6gNp0Grwyc+IcGUN6PK7165i30Z6RsEBDFx +xNyx/HKMvi4aeLboruy2yRNf7G/OgG9UtigI96OtTPvuqe6Ft67tf7MyeuwtEYSTqUKTpmnz+6 eHfOv6vGZwVZ2COti1/s2GEkA7tIVUl7DxmPbjAUS2IcQwvXgXZ6RW2y6KKnb72V0lA+lC3ZORb PY9JZczsFT/fUHvAexhL1/gYHDSN6IKYzD705rgPDowkW3zM3juLbKAPrqrfiv4lnVsshSbtwXY khaKhci8cnAJFdZPJuw== X-Proofpoint-GUID: NEr3JppW5uznGiMMnVMDiDkEx63607KV X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfXwIHAabgqbb0Z 5JAn1huEN9IRGcu3BMpG7arp781p/LmyAFW+iUZj61r8TnrcnN+vO61WnT23dY6bFdLhBCWVt8y t2QNMni0eocVnlUVLLH3NkWvKcORdMg= X-Authority-Analysis: v=2.4 cv=XYYcX455 c=1 sm=1 tr=0 ts=6ab22526 cx=c_pps a=j8kfsx1CyBm2fJFf+vs0Eg==:117 a=iwqwCZQqcuTv3JOpYdM7/Q==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=gO1vWkAQAl3rybz1DQOp:22 a=8AirrxEcAAAA:8 a=sozttTNsAAAA:8 a=u0Ry9gnqgf_Ls9jc7UwA:9 a=ST-jHhOKWsTCqRlWije3:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 clxscore=1015 bulkscore=0 phishscore=0 adultscore=0 malwarescore=0 suspectscore=0 priorityscore=1501 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220097 Content-Type: text/plain; charset="utf-8" Move macros defined in k3-udma.c to k3-udma.h for better separation and reuse. Reviewed-by: Frank Li Signed-off-by: Sai Sree Kartheek Adivi --- drivers/dma/ti/k3-udma.c | 62 --------------------------------------- drivers/dma/ti/k3-udma.h | 63 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 62 deletions(-) diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 8457644cb9132..a1b99097a94ad 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -39,21 +39,6 @@ struct udma_static_tr { u16 bstcnt; /* RPSTR1 */ }; =20 -#define K3_UDMA_MAX_RFLOWS 1024 -#define K3_UDMA_DEFAULT_RING_SIZE 16 - -/* How SRC/DST tag should be updated by UDMA in the descriptor's Word 3 */ -#define UDMA_RFLOW_SRCTAG_NONE 0 -#define UDMA_RFLOW_SRCTAG_CFG_TAG 1 -#define UDMA_RFLOW_SRCTAG_FLOW_ID 2 -#define UDMA_RFLOW_SRCTAG_SRC_TAG 4 - -#define UDMA_RFLOW_DSTTAG_NONE 0 -#define UDMA_RFLOW_DSTTAG_CFG_TAG 1 -#define UDMA_RFLOW_DSTTAG_FLOW_ID 2 -#define UDMA_RFLOW_DSTTAG_DST_TAG_LO 4 -#define UDMA_RFLOW_DSTTAG_DST_TAG_HI 5 - struct udma_chan; =20 enum k3_dma_type { @@ -118,15 +103,6 @@ struct udma_oes_offsets { u32 pktdma_rchan_flow; }; =20 -#define UDMA_FLAG_PDMA_ACC32 BIT(0) -#define UDMA_FLAG_PDMA_BURST BIT(1) -#define UDMA_FLAG_TDTYPE BIT(2) -#define UDMA_FLAG_BURST_SIZE BIT(3) -#define UDMA_FLAGS_J7_CLASS (UDMA_FLAG_PDMA_ACC32 | \ - UDMA_FLAG_PDMA_BURST | \ - UDMA_FLAG_TDTYPE | \ - UDMA_FLAG_BURST_SIZE) - struct udma_match_data { enum k3_dma_type type; u32 psil_base; @@ -1837,38 +1813,6 @@ static int udma_alloc_rx_resources(struct udma_chan = *uc) return ret; } =20 -#define TISCI_BCDMA_BCHAN_VALID_PARAMS ( \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID | \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_EXTENDED_CH_TYPE_VALID) - -#define TISCI_BCDMA_TCHAN_VALID_PARAMS ( \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID | \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_TX_SUPR_TDPKT_VALID) - -#define TISCI_BCDMA_RCHAN_VALID_PARAMS ( \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID) - -#define TISCI_UDMA_TCHAN_VALID_PARAMS ( \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID | \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_TX_FILT_EINFO_VALID | \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_TX_FILT_PSWORDS_VALID | \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_CHAN_TYPE_VALID | \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_TX_SUPR_TDPKT_VALID | \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_FETCH_SIZE_VALID | \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_CQ_QNUM_VALID | \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_ATYPE_VALID) - -#define TISCI_UDMA_RCHAN_VALID_PARAMS ( \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID | \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_FETCH_SIZE_VALID | \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_CQ_QNUM_VALID | \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_CHAN_TYPE_VALID | \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_IGNORE_SHORT_VALID | \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_IGNORE_LONG_VALID | \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_FLOWID_START_VALID | \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_FLOWID_CNT_VALID | \ - TI_SCI_MSG_VALUE_RM_UDMAP_CH_ATYPE_VALID) - static int udma_tisci_m2m_channel_config(struct udma_chan *uc) { struct udma_dev *ud =3D uc->ud; @@ -5398,12 +5342,6 @@ static enum dmaengine_alignment udma_get_copy_align(= struct udma_dev *ud) } } =20 -#define TI_UDMAC_BUSWIDTHS (BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \ - BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \ - BIT(DMA_SLAVE_BUSWIDTH_3_BYTES) | \ - BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | \ - BIT(DMA_SLAVE_BUSWIDTH_8_BYTES)) - static int udma_probe(struct platform_device *pdev) { struct device_node *navss_node =3D pdev->dev.parent->of_node; diff --git a/drivers/dma/ti/k3-udma.h b/drivers/dma/ti/k3-udma.h index 9062a237cd167..750720cd06911 100644 --- a/drivers/dma/ti/k3-udma.h +++ b/drivers/dma/ti/k3-udma.h @@ -97,6 +97,69 @@ /* Address Space Select */ #define K3_ADDRESS_ASEL_SHIFT 48 =20 +#define K3_UDMA_MAX_RFLOWS 1024 +#define K3_UDMA_DEFAULT_RING_SIZE 16 + +/* How SRC/DST tag should be updated by UDMA in the descriptor's Word 3 */ +#define UDMA_RFLOW_SRCTAG_NONE 0 +#define UDMA_RFLOW_SRCTAG_CFG_TAG 1 +#define UDMA_RFLOW_SRCTAG_FLOW_ID 2 +#define UDMA_RFLOW_SRCTAG_SRC_TAG 4 + +#define UDMA_RFLOW_DSTTAG_NONE 0 +#define UDMA_RFLOW_DSTTAG_CFG_TAG 1 +#define UDMA_RFLOW_DSTTAG_FLOW_ID 2 +#define UDMA_RFLOW_DSTTAG_DST_TAG_LO 4 +#define UDMA_RFLOW_DSTTAG_DST_TAG_HI 5 + +#define UDMA_FLAG_PDMA_ACC32 BIT(0) +#define UDMA_FLAG_PDMA_BURST BIT(1) +#define UDMA_FLAG_TDTYPE BIT(2) +#define UDMA_FLAG_BURST_SIZE BIT(3) +#define UDMA_FLAGS_J7_CLASS (UDMA_FLAG_PDMA_ACC32 | \ + UDMA_FLAG_PDMA_BURST | \ + UDMA_FLAG_TDTYPE | \ + UDMA_FLAG_BURST_SIZE) + +#define TI_UDMAC_BUSWIDTHS (BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \ + BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \ + BIT(DMA_SLAVE_BUSWIDTH_3_BYTES) | \ + BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | \ + BIT(DMA_SLAVE_BUSWIDTH_8_BYTES)) + +/* TI_SCI Params */ +#define TISCI_BCDMA_BCHAN_VALID_PARAMS ( \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID | \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_EXTENDED_CH_TYPE_VALID) + +#define TISCI_BCDMA_TCHAN_VALID_PARAMS ( \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID | \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_TX_SUPR_TDPKT_VALID) + +#define TISCI_BCDMA_RCHAN_VALID_PARAMS ( \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID) + +#define TISCI_UDMA_TCHAN_VALID_PARAMS ( \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID | \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_TX_FILT_EINFO_VALID | \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_TX_FILT_PSWORDS_VALID | \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_CHAN_TYPE_VALID | \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_TX_SUPR_TDPKT_VALID | \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_FETCH_SIZE_VALID | \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_CQ_QNUM_VALID | \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_ATYPE_VALID) + +#define TISCI_UDMA_RCHAN_VALID_PARAMS ( \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID | \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_FETCH_SIZE_VALID | \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_CQ_QNUM_VALID | \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_CHAN_TYPE_VALID | \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_IGNORE_SHORT_VALID | \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_IGNORE_LONG_VALID | \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_FLOWID_START_VALID | \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_FLOWID_CNT_VALID | \ + TI_SCI_MSG_VALUE_RM_UDMAP_CH_ATYPE_VALID) + struct udma_dev; struct udma_tchan; struct udma_rchan; --=20 2.54.0 From nobody Thu Sep 24 17:02:17 2026 Received: from mx0b-0002e601.pphosted.com (mx0b-0002e601.pphosted.com [148.163.154.28]) (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 DA76F4F55C2; Tue, 22 Sep 2026 06:50:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.154.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059840; cv=fail; b=kYAEfbUF2dtP7zyG/ozZun3oHA3QclBgH+AW+20Eaf40DkLXdusjFgbMbh8R9e6U/Mp9bcmh0ptNrguRCvzrgAEB59NlqoUk6k41DLUsPXGEsmfDljMbv/zwAXw07PURyrjoCqThung79nwZU6g1kuRYOfcbpmGdZB0sCFkfbmw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059840; c=relaxed/simple; bh=esamlki0UYmjV9wiiAEwdi6WfqFJ5zWWdkJtfFlvfMQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=o/TX/oIGEAGy6DNyNS922mUw1YeN5cs1JOHNzIOmPneVvStMkh+bp5qozMry1dDddJusVn1A2bJiqXO05Dl0gvpis7MQ2+Yg0A4xyDlFDiRu8aVws5/2d6hd2Hsx55z7caIIF5sa2iph5H87ihKAVozSOZ/SCDP4QSthytCy/FE= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=j4TE2BB9; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=HWqfAhZK; arc=fail smtp.client-ip=148.163.154.28 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="j4TE2BB9"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="HWqfAhZK" Received: from pps.filterd (m0374955.ppops.net [127.0.0.1]) by mx0b-0002e601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68M1qVKS1436737; Tue, 22 Sep 2026 01:50:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=Do6VpRERv3DJbrCpEoWH/pWMVQkTxe4yStDn/yrac /M=; b=j4TE2BB9IQu4wrYYEj5nGStCVT79qp8EeXQIAUT/07Xq9mgnmEH/p4G/s l9j5Y1qZAek414WomBUNju8A7CC/GFqXcS5hQdPVC6m4EGI/RKk570mcez4ElXyq ScWXZIY1EnjVrBGCkz6uabCVXi1C29sxzHP3iBnR31mFRlUKiRDeKBDOS3owsM0o Up+ztaAQ7tcWVx21Sas58pp5h+qf/9M3hBq8pA20Eyf2GWzQxAkQI4X/b/Pb1ubh i8SJEyCK0/7h6i4VUwCFgcKIdYTMiGogFEL4ASEbcgWTz4qSWrw/IICKGYei+eBK PV0HIMZsSqZlHTeGdYn0aLxCEBPRw== Received: from bl2pr02cu003.outbound.protection.outlook.com (mail-eastusazon11011065.outbound.protection.outlook.com [52.101.52.65]) by mx0b-0002e601.pphosted.com (PPS) with ESMTPS id 4gugcsscgv-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:50:18 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DNRZC43GYjzfx1QYCMXi179Z4Yo/Xogc2uFzpCKyYT41636lTux4ToMelh1U35tQDii4YzCxT4OaRB23rrzcK0GQcUDSZNpPN9crb2KkCUR9lPyVSCkUVMZaneOVLCWPKiPwXWASVs6YVbCzkBjCr2qQqJXYTkTD52+agGccdyB67NIS3Btkhqfhl93UnYtVNg8Uvqnly87ID0XyB6riOo3pxm1Hh754OttIGHXleVX6K0cqvV3dRekxmXnkQ9UdYeu+dvx3ccjoe+wJbGVgaEv2JICcvLqxyGRkOnFg2DqvTAPOH5JYDJ852IVfa0t5nOiG9YxGeFRwIHz8BPS+lg== 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=Do6VpRERv3DJbrCpEoWH/pWMVQkTxe4yStDn/yrac/M=; b=UbdWV34vZog/xvGS50uk3ffixUbLSNPNimm3mYR2bvpEbQBtY8QHmD4XDAk3YBK9GgMyYJ+loUyIRZmrllJmrQBHTnujYw2xiMCDgokzSQa8L2cmBxVexaHqib9IJB/BXAJf6LXafmrbyg4/IONc1FieE/2l2nfGR8HUSDVY52wgiH22yDhk4Enkjs+nlDV19bs78r7AEV2nirGz5pv/rDZMEQV/VvoZ614UHqSjdsuN8SKalSshzVqk5tgvN36eA8kj2FFU8oVok4F3RgO+PSBQLGMWi59gqDQ84jMbtfkvKxcKfGBy61UjW5Co/SNhIfhRld9jTlxPG3qqRbBBpA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.21.194) smtp.rcpttodomain=nxp.com 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=Do6VpRERv3DJbrCpEoWH/pWMVQkTxe4yStDn/yrac/M=; b=HWqfAhZKGYSs2oV1vmDPKoyR75U7wPDOrUmcQJO/pkyPhySv6cpvQYgbaQ4rnFHDhVldikPoGfmNHcD5pFgeRAhZ+JcvLouUykwzikx/RDjieL22FPTF9gAOThWsDGAliBvT+rMyVJOLlCvqUH3HKEq3G6vrFggRWP7DwC1OmWA= Received: from BL1PR13CA0092.namprd13.prod.outlook.com (2603:10b6:208:2b9::7) by DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.13; Tue, 22 Sep 2026 06:50:14 +0000 Received: from BN1PEPF00018070.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::52) by BL1PR13CA0092.outlook.office365.com (2603:10b6:208:2b9::7) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.12 via Frontend Transport; Tue, 22 Sep 2026 06:50:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 198.47.21.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.21.194 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.21.194; helo=flwvzet200.ext.ti.com; pr=C Received: from flwvzet200.ext.ti.com (198.47.21.194) by BN1PEPF00018070.mail.protection.outlook.com (10.167.245.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:50:12 +0000 Received: from DFLE205.ent.ti.com (10.64.6.63) by flwvzet200.ext.ti.com (10.248.192.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:49:38 -0500 Received: from DFLE203.ent.ti.com (10.64.6.61) by DFLE205.ent.ti.com (10.64.6.63) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:49:38 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DFLE203.ent.ti.com (10.64.6.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:49:38 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI3t3626771; Tue, 22 Sep 2026 01:49:33 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 03/19] dmaengine: ti: k3-udma: move structs and enums to header file Date: Tue, 22 Sep 2026 12:17:27 +0530 Message-ID: <20260922064902.2719979-4-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00018070:EE_|DS0PR10MB7933:EE_ X-MS-Office365-Filtering-Correlation-Id: ce24fce8-4d53-4c09-c4ed-08df1875c06d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|23010399003|7416014|36860700016|1800799024|376014|6133799003|921020|18002099003|22082099003|56012099006|10067099003|3023799007; X-Microsoft-Antispam-Message-Info: krWodOigIzSGbUhTZEvHgI3nY6GZXEb1fq+1pxV22JKTfzOaMs4q7ylTA8apH3ZdeWyQdABfXbiQrSoRG+inUtmfdhYjm9qxw+bO4GXIkTHx0baQN3WEHwyshJHq11ccaZa521HqV4GwnfF16Na9/XJSxDU6wpZqwGihPGOHCqMnKE98NWG40o82eevJ8gyqQflznZGjpQb3VdzkeKV9rthpBsT28q6vZ6pZa8R7mzwpTnO+sWZpVw1+PfvYLyfcYDcVWz4iu447aU4oK1Rz9Gu0Ml4niaPwHDD5S9GeBgRFtFPuqUeeH/gdmyD6/2kDdrltHQ0cxqR6UQ9wciD+9Fu7oYux1+05epz5nXWKpoYEVuvbWZj6dHmkje9MApxUJv7hvg+mn2zKPlpI9jze0Q7JIAusp9xLFPuzS2kBc/+81oqnmxiXAipyXm8qQmV+A/PAf7A3jMZkQFj9vz8qe7iBCnszHXtnQBSny6L+hVqBv7CSqat4ddWjBgky+UOYTfePMBW8mV7FnhI55vGNEKAxqTm8zG+gyMlIcedeT/pNIKWDG3aAl1A69X71Ni5mo5g9R7YPCXr+hvkhz6aex/vxoAA0y8b/FJyze+2TiotjcE3Hc1TaSFN20lwbY5deZcO/cLymLPTx2SQXO/l/7rzZGpq3qLxUC3VNSLH2DU/Phvc2z9UbBtiMK9uVPuejjIO7y1Q648mHKlK2j7rqrwQk/JHUUwGqpQRx3QmVme/63gqdhoZqIskvwuyS1EAp X-Forefront-Antispam-Report: CIP:198.47.21.194;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:flwvzet200.ext.ti.com;PTR:ErrorRetry;CAT:NONE;SFS:(13230040)(82310400026)(23010399003)(7416014)(36860700016)(1800799024)(376014)(6133799003)(921020)(18002099003)(22082099003)(56012099006)(10067099003)(3023799007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OiI++yAtrQTgunoxdK/f8Ctq7Sc0YtcvQKsvDM70CGLOjem8zjwMmWpUSprXQM7qccEndqA47PsH9bZa6yvZpD653o4/0S/r5/4zeZjgdTWhlJg8m8EE5FaSz49evk4Mh4S0qsTsMVnk+lIE7Tp6zIS7yid2tNB5TdTfoLmqzfBJ9Mypgb2Rb+gFp8/76X8KVk8KNNJ5057E0hmFgxQfFJI9he0W8JWBKWAYkgFsHNwtjtl9HS+bABcLQVfV2C4WsQ6poYsJkEJIeLnT0nAxT3LVZZNZ34oRuTiuGcQBgjyQsluwnhKmycioE9Aw/DZkIVHEdFtNX47eIJt700/MKxCTIhoS8lNkQzTwDX7C9fykJObSrYzKgU5h9XPWyvKZ5c9FvkXWxBSFkdapHJ6l39rZobrMScsKqqNhQTnAIPM8BPZil9sUySS1RFh/QpuQ X-Exchange-RoutingPolicyChecked: tSZFJKrb0NcHwHb61Jiogt4Ycn1cAtYGJz+7XNljOQku1Ba009yAFbZD6BRlKcUlXh2bPiMLwuLa5BBYWqDlimwqTAyqzBZX+4fU+q/8nr8pFULHmb/cMZaNQ675rVZdTndxW7rw98VJ1PfwAT2nTXYrhwrE0H6nSu0kY9QEuwy0LvQ81oV8+dkuOTOMSVXLXufWNZsZYVswWBX/YN5MDzhXP7+y8eWczOkMPwzwKXTsU1h/urBQTZtvm1VfJnQ20w8s9KGSlVM9u2/5I1ZuQnRKIGt/PjYSczaOu8rC7C05WkOdO8AzhHlIe60jowYMC8/m3bfewTgdRyKBuDsVeg== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:50:12.7360 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ce24fce8-4d53-4c09-c4ed-08df1875c06d X-MS-Exchange-CrossTenant-Id: e5b49634-450b-4709-8abb-1e2b19b982b7 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e5b49634-450b-4709-8abb-1e2b19b982b7;Ip=[198.47.21.194];Helo=[flwvzet200.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF00018070.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB7933 X-Proofpoint-GUID: 27reAkxFg1BvPoXlASQbfHb4zF8DHdc2 X-Authority-Analysis: v=2.4 cv=GI+dgeNK c=1 sm=1 tr=0 ts=6ab2252a cx=c_pps a=os0lWWs/UWv4pnmIIs5naA==:117 a=iwqwCZQqcuTv3JOpYdM7/Q==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=fPAWb5peG099m5CrUpKH:22 a=sozttTNsAAAA:8 a=8AirrxEcAAAA:8 a=1JpllqVW-1LRWXCuGuAA:9 a=ST-jHhOKWsTCqRlWije3:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfXzCy6AafUFjaK pg7kBoZu62MmS4dRLv8T/DQg+24CxVS8d6JdsNuZ3ZBnpgyKqa6Mj7n+ZDKMGSathpuC1LeWgkF OeFC9zQlKnYAhNz/67m/MoMXS5KRZQM= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX2p/tyeTfFiBb JfAAtuoGEC42YmlB4YMnsXypjQw8hUTp8sX4EMeL9jCxcNcfjKzHSw/omPTpYjrqnuYbB3EmDRE 6iOjqLT7aCodgDUmLsO6FYM1Nfvn3g/sthzfimKSP2uDRgLURZGo2LGrFKo2yJ0g02gEMA3345p d0UcWIerRwlCQ2zuVPLC2RI8HAxxfpVpGw2tLxYx2UiuPrzFezh749gEvTU/UN1cXEbduyiTTiu OOV9PEbE6Kx5MInRHBJxv8tv5m6RVfnNPQbqgyvQsF/FmkdjRkeQhzKR923pp41ZqjlDuyj/l4M 2MaeEb/cReLIKjNYk7lTpbe6fYOh0VB920/b2dyCDdbqvb0W7mLHwwHMkO2xhcHiQom8Nb+wHV+ plN3a5ddhlJPNv7KvVPrMmWE17Ww6H2T1ycUQ/ciAQENi79UjyriukaOlTr9Nw9SZsQ4ayC+ley IBFlZppJ6/SwlUTn0Sg== X-Proofpoint-ORIG-GUID: 27reAkxFg1BvPoXlASQbfHb4zF8DHdc2 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 adultscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 clxscore=1015 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220097 Content-Type: text/plain; charset="utf-8" Move struct and enum definitions in k3-udma.c to k3-udma.h header file for better separation and reuse. Signed-off-by: Sai Sree Kartheek Adivi Reviewed-by: Frank Li --- drivers/dma/ti/k3-udma.c | 259 +------------------------------------- drivers/dma/ti/k3-udma.h | 265 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 266 insertions(+), 258 deletions(-) diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index a1b99097a94ad..d7c153c5321ea 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -24,8 +24,8 @@ #include #include #include -#include #include +#include #include #include =20 @@ -33,28 +33,6 @@ #include "k3-udma.h" #include "k3-psil-priv.h" =20 -struct udma_static_tr { - u8 elsize; /* RPSTR0 */ - u16 elcnt; /* RPSTR0 */ - u16 bstcnt; /* RPSTR1 */ -}; - -struct udma_chan; - -enum k3_dma_type { - DMA_TYPE_UDMA =3D 0, - DMA_TYPE_BCDMA, - DMA_TYPE_PKTDMA, -}; - -enum udma_mmr { - MMR_GCFG =3D 0, - MMR_BCHANRT, - MMR_RCHANRT, - MMR_TCHANRT, - MMR_LAST, -}; - static const char * const mmr_names[] =3D { [MMR_GCFG] =3D "gcfg", [MMR_BCHANRT] =3D "bchanrt", @@ -62,234 +40,6 @@ static const char * const mmr_names[] =3D { [MMR_TCHANRT] =3D "tchanrt", }; =20 -struct udma_tchan { - void __iomem *reg_rt; - - int id; - struct k3_ring *t_ring; /* Transmit ring */ - struct k3_ring *tc_ring; /* Transmit Completion ring */ - int tflow_id; /* applicable only for PKTDMA */ - -}; - -#define udma_bchan udma_tchan - -struct udma_rflow { - int id; - struct k3_ring *fd_ring; /* Free Descriptor ring */ - struct k3_ring *r_ring; /* Receive ring */ -}; - -struct udma_rchan { - void __iomem *reg_rt; - - int id; -}; - -struct udma_oes_offsets { - /* K3 UDMA Output Event Offset */ - u32 udma_rchan; - - /* BCDMA Output Event Offsets */ - u32 bcdma_bchan_data; - u32 bcdma_bchan_ring; - u32 bcdma_tchan_data; - u32 bcdma_tchan_ring; - u32 bcdma_rchan_data; - u32 bcdma_rchan_ring; - - /* PKTDMA Output Event Offsets */ - u32 pktdma_tchan_flow; - u32 pktdma_rchan_flow; -}; - -struct udma_match_data { - enum k3_dma_type type; - u32 psil_base; - bool enable_memcpy_support; - u32 flags; - u32 statictr_z_mask; - u8 burst_size[3]; - struct udma_soc_data *soc_data; -}; - -struct udma_soc_data { - struct udma_oes_offsets oes; - u32 bcdma_trigger_event_offset; -}; - -struct udma_hwdesc { - size_t cppi5_desc_size; - void *cppi5_desc_vaddr; - dma_addr_t cppi5_desc_paddr; - - /* TR descriptor internal pointers */ - void *tr_req_base; - struct cppi5_tr_resp_t *tr_resp_base; -}; - -struct udma_rx_flush { - struct udma_hwdesc hwdescs[2]; - - size_t buffer_size; - void *buffer_vaddr; - dma_addr_t buffer_paddr; -}; - -struct udma_tpl { - u8 levels; - u32 start_idx[3]; -}; - -struct udma_dev { - struct dma_device ddev; - struct device *dev; - void __iomem *mmrs[MMR_LAST]; - const struct udma_match_data *match_data; - const struct udma_soc_data *soc_data; - - struct udma_tpl bchan_tpl; - struct udma_tpl tchan_tpl; - struct udma_tpl rchan_tpl; - - size_t desc_align; /* alignment to use for descriptors */ - - struct udma_tisci_rm tisci_rm; - - struct k3_ringacc *ringacc; - - struct work_struct purge_work; - struct list_head desc_to_purge; - spinlock_t lock; - - struct udma_rx_flush rx_flush; - - int bchan_cnt; - int tchan_cnt; - int echan_cnt; - int rchan_cnt; - int rflow_cnt; - int tflow_cnt; - unsigned long *bchan_map; - unsigned long *tchan_map; - unsigned long *rchan_map; - unsigned long *rflow_gp_map; - unsigned long *rflow_gp_map_allocated; - unsigned long *rflow_in_use; - unsigned long *tflow_map; - - struct udma_bchan *bchans; - struct udma_tchan *tchans; - struct udma_rchan *rchans; - struct udma_rflow *rflows; - - struct udma_chan *channels; - u32 psil_base; - u32 atype; - u32 asel; -}; - -struct udma_desc { - struct virt_dma_desc vd; - - bool terminated; - - enum dma_transfer_direction dir; - - struct udma_static_tr static_tr; - u32 residue; - - unsigned int sglen; - unsigned int desc_idx; /* Only used for cyclic in packet mode */ - unsigned int tr_idx; - - u32 metadata_size; - void *metadata; /* pointer to provided metadata buffer (EPIP, PSdata) */ - - unsigned int hwdesc_count; - struct udma_hwdesc hwdesc[]; -}; - -enum udma_chan_state { - UDMA_CHAN_IS_IDLE =3D 0, /* not active, no teardown is in progress */ - UDMA_CHAN_IS_ACTIVE, /* Normal operation */ - UDMA_CHAN_IS_TERMINATING, /* channel is being terminated */ -}; - -struct udma_tx_drain { - struct delayed_work work; - ktime_t tstamp; - u32 residue; -}; - -struct udma_chan_config { - bool pkt_mode; /* TR or packet */ - bool needs_epib; /* EPIB is needed for the communication or not */ - u32 psd_size; /* size of Protocol Specific Data */ - u32 metadata_size; /* (needs_epib ? 16:0) + psd_size */ - u32 hdesc_size; /* Size of a packet descriptor in packet mode */ - bool notdpkt; /* Suppress sending TDC packet */ - int remote_thread_id; - u32 atype; - u32 asel; - u32 src_thread; - u32 dst_thread; - enum psil_endpoint_type ep_type; - bool enable_acc32; - bool enable_burst; - enum udma_tp_level channel_tpl; /* Channel Throughput Level */ - - u32 tr_trigger_type; - unsigned long tx_flags; - - /* PKDMA mapped channel */ - int mapped_channel_id; - /* PKTDMA default tflow or rflow for mapped channel */ - int default_flow_id; - - enum dma_transfer_direction dir; -}; - -struct udma_chan { - struct virt_dma_chan vc; - struct dma_slave_config cfg; - struct udma_dev *ud; - struct device *dma_dev; - struct udma_desc *desc; - struct udma_desc *terminated_desc; - struct udma_static_tr static_tr; - char *name; - - struct udma_bchan *bchan; - struct udma_tchan *tchan; - struct udma_rchan *rchan; - struct udma_rflow *rflow; - - bool psil_paired; - - int irq_num_ring; - int irq_num_udma; - - bool cyclic; - bool paused; - - enum udma_chan_state state; - struct completion teardown_completed; - - struct udma_tx_drain tx_drain; - - /* Channel configuration parameters */ - struct udma_chan_config config; - /* Channel configuration parameters (backup) */ - struct udma_chan_config backup_config; - - /* dmapool for packet mode descriptors */ - bool use_dma_pool; - struct dma_pool *hdesc_pool; - - u32 id; -}; - static inline struct udma_dev *to_udma_dev(struct dma_device *d) { return container_of(d, struct udma_dev, ddev); @@ -4073,13 +3823,6 @@ static struct platform_driver udma_driver; static struct platform_driver bcdma_driver; static struct platform_driver pktdma_driver; =20 -struct udma_filter_param { - int remote_thread_id; - u32 atype; - u32 asel; - u32 tr_trigger_type; -}; - static bool udma_dma_filter_fn(struct dma_chan *chan, void *param) { struct udma_chan_config *ucc; diff --git a/drivers/dma/ti/k3-udma.h b/drivers/dma/ti/k3-udma.h index 750720cd06911..11d08adb0d69f 100644 --- a/drivers/dma/ti/k3-udma.h +++ b/drivers/dma/ti/k3-udma.h @@ -6,7 +6,16 @@ #ifndef K3_UDMA_H_ #define K3_UDMA_H_ =20 +#include #include +#include +#include +#include +#include +#include + +#include "../virt-dma.h" +#include "k3-psil-priv.h" =20 /* Global registers */ #define UDMA_REV_REG 0x0 @@ -164,6 +173,7 @@ struct udma_dev; struct udma_tchan; struct udma_rchan; struct udma_rflow; +struct udma_chan; =20 enum udma_rm_range { RM_RANGE_BCHAN =3D 0, @@ -186,6 +196,261 @@ struct udma_tisci_rm { struct ti_sci_resource *rm_ranges[RM_RANGE_LAST]; }; =20 +struct udma_static_tr { + u8 elsize; /* RPSTR0 */ + u16 elcnt; /* RPSTR0 */ + u16 bstcnt; /* RPSTR1 */ +}; + +enum k3_dma_type { + DMA_TYPE_UDMA =3D 0, + DMA_TYPE_BCDMA, + DMA_TYPE_PKTDMA, +}; + +enum udma_mmr { + MMR_GCFG =3D 0, + MMR_BCHANRT, + MMR_RCHANRT, + MMR_TCHANRT, + MMR_LAST, +}; + +struct udma_filter_param { + int remote_thread_id; + u32 atype; + u32 asel; + u32 tr_trigger_type; +}; + +struct udma_tchan { + void __iomem *reg_rt; + + int id; + struct k3_ring *t_ring; /* Transmit ring */ + struct k3_ring *tc_ring; /* Transmit Completion ring */ + int tflow_id; /* applicable only for PKTDMA */ + +}; + +#define udma_bchan udma_tchan + +struct udma_rflow { + int id; + struct k3_ring *fd_ring; /* Free Descriptor ring */ + struct k3_ring *r_ring; /* Receive ring */ +}; + +struct udma_rchan { + void __iomem *reg_rt; + + int id; +}; + +struct udma_oes_offsets { + /* K3 UDMA Output Event Offset */ + u32 udma_rchan; + + /* BCDMA Output Event Offsets */ + u32 bcdma_bchan_data; + u32 bcdma_bchan_ring; + u32 bcdma_tchan_data; + u32 bcdma_tchan_ring; + u32 bcdma_rchan_data; + u32 bcdma_rchan_ring; + + /* PKTDMA Output Event Offsets */ + u32 pktdma_tchan_flow; + u32 pktdma_rchan_flow; +}; + +struct udma_match_data { + enum k3_dma_type type; + u32 psil_base; + bool enable_memcpy_support; + u32 flags; + u32 statictr_z_mask; + u8 burst_size[3]; + struct udma_soc_data *soc_data; +}; + +struct udma_soc_data { + struct udma_oes_offsets oes; + u32 bcdma_trigger_event_offset; +}; + +struct udma_hwdesc { + size_t cppi5_desc_size; + void *cppi5_desc_vaddr; + dma_addr_t cppi5_desc_paddr; + + /* TR descriptor internal pointers */ + void *tr_req_base; + struct cppi5_tr_resp_t *tr_resp_base; +}; + +struct udma_rx_flush { + struct udma_hwdesc hwdescs[2]; + + size_t buffer_size; + void *buffer_vaddr; + dma_addr_t buffer_paddr; +}; + +struct udma_tpl { + u8 levels; + u32 start_idx[3]; +}; + +struct udma_dev { + struct dma_device ddev; + struct device *dev; + void __iomem *mmrs[MMR_LAST]; + const struct udma_match_data *match_data; + const struct udma_soc_data *soc_data; + + struct udma_tpl bchan_tpl; + struct udma_tpl tchan_tpl; + struct udma_tpl rchan_tpl; + + size_t desc_align; /* alignment to use for descriptors */ + + struct udma_tisci_rm tisci_rm; + + struct k3_ringacc *ringacc; + + struct work_struct purge_work; + struct list_head desc_to_purge; + spinlock_t lock; + + struct udma_rx_flush rx_flush; + + int bchan_cnt; + int tchan_cnt; + int echan_cnt; + int rchan_cnt; + int rflow_cnt; + int tflow_cnt; + unsigned long *bchan_map; + unsigned long *tchan_map; + unsigned long *rchan_map; + unsigned long *rflow_gp_map; + unsigned long *rflow_gp_map_allocated; + unsigned long *rflow_in_use; + unsigned long *tflow_map; + + struct udma_bchan *bchans; + struct udma_tchan *tchans; + struct udma_rchan *rchans; + struct udma_rflow *rflows; + + struct udma_chan *channels; + u32 psil_base; + u32 atype; + u32 asel; +}; + +struct udma_desc { + struct virt_dma_desc vd; + + bool terminated; + + enum dma_transfer_direction dir; + + struct udma_static_tr static_tr; + u32 residue; + + unsigned int sglen; + unsigned int desc_idx; /* Only used for cyclic in packet mode */ + unsigned int tr_idx; + + u32 metadata_size; + void *metadata; /* pointer to provided metadata buffer (EPIP, PSdata) */ + + unsigned int hwdesc_count; + struct udma_hwdesc hwdesc[]; +}; + +enum udma_chan_state { + UDMA_CHAN_IS_IDLE =3D 0, /* not active, no teardown is in progress */ + UDMA_CHAN_IS_ACTIVE, /* Normal operation */ + UDMA_CHAN_IS_TERMINATING, /* channel is being terminated */ +}; + +struct udma_tx_drain { + struct delayed_work work; + ktime_t tstamp; + u32 residue; +}; + +struct udma_chan_config { + bool pkt_mode; /* TR or packet */ + bool needs_epib; /* EPIB is needed for the communication or not */ + u32 psd_size; /* size of Protocol Specific Data */ + u32 metadata_size; /* (needs_epib ? 16:0) + psd_size */ + u32 hdesc_size; /* Size of a packet descriptor in packet mode */ + bool notdpkt; /* Suppress sending TDC packet */ + int remote_thread_id; + u32 atype; + u32 asel; + u32 src_thread; + u32 dst_thread; + enum psil_endpoint_type ep_type; + bool enable_acc32; + bool enable_burst; + enum udma_tp_level channel_tpl; /* Channel Throughput Level */ + + u32 tr_trigger_type; + unsigned long tx_flags; + + /* PKDMA mapped channel */ + int mapped_channel_id; + /* PKTDMA default tflow or rflow for mapped channel */ + int default_flow_id; + + enum dma_transfer_direction dir; +}; + +struct udma_chan { + struct virt_dma_chan vc; + struct dma_slave_config cfg; + struct udma_dev *ud; + struct device *dma_dev; + struct udma_desc *desc; + struct udma_desc *terminated_desc; + struct udma_static_tr static_tr; + char *name; + + struct udma_bchan *bchan; + struct udma_tchan *tchan; + struct udma_rchan *rchan; + struct udma_rflow *rflow; + + bool psil_paired; + + int irq_num_ring; + int irq_num_udma; + + bool cyclic; + bool paused; + + enum udma_chan_state state; + struct completion teardown_completed; + + struct udma_tx_drain tx_drain; + + /* Channel configuration parameters */ + struct udma_chan_config config; + /* Channel configuration parameters (backup) */ + struct udma_chan_config backup_config; + + /* dmapool for packet mode descriptors */ + bool use_dma_pool; + struct dma_pool *hdesc_pool; + + u32 id; +}; + /* Direct access to UDMA low lever resources for the glue layer */ int xudma_navss_psil_pair(struct udma_dev *ud, u32 src_thread, u32 dst_thr= ead); int xudma_navss_psil_unpair(struct udma_dev *ud, u32 src_thread, --=20 2.54.0 From nobody Thu Sep 24 17:02:17 2026 Received: from mx0b-0002e601.pphosted.com (mx0b-0002e601.pphosted.com [148.163.154.28]) (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 BDCF54F3EC8; Tue, 22 Sep 2026 06:50:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.154.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059840; cv=fail; b=kMVyDhpPi8kG3WD1lZFmeUefXcCPcIuCmx15pyV09mzf7WKB+QxSxOF3mSpGHIaiTb1O5DhR6EPZhQzjs+up6mHs2LnM5vXbBZD3o5LCP/CIryHK9R7wuLH19RPoyeq3akMuTGubeoFTJBqflu/ah5mh25jFxhan03fftF4U0to= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059840; c=relaxed/simple; bh=Eme2xSy2VfiQ7P4WARJMbEdhgm1AaojTY0SLTbQoBzw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Idi+aF7FxjgO1DRIn3uaGCS3zvOar6/smo3zP4k5intd/wA+IQ2FmhKy3cUPGb6KZre3OgtrIP1/yoPWDGmkB6Nd9O+UfSNyR/kKj+9hWKuDVR5mjVDQDcUH9jDm2brCfkh5quGncs9YGRYvepCFtqals/rPtgSXszjWAmVtPd8= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=LaYgngf7; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=aBJ+0/Vd; arc=fail smtp.client-ip=148.163.154.28 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="LaYgngf7"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="aBJ+0/Vd" Received: from pps.filterd (m0374956.ppops.net [127.0.0.1]) by mx0b-0002e601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68M2UInJ1034837; Tue, 22 Sep 2026 01:50:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=ufS10IuV4rNPlv4A6/SND55bzkb9Kt7l4TDzuRCVL A4=; b=LaYgngf7CIaZ/ZoIW7+VQWHwgjLutwpHaY2e3ZhdJNaYj/lyTZs7hNQKu o+28G0dVyUbThSrnuvQKtysXpL38eYTfX77aZwsfUEqr9a+Jpn5d/lLfoDtoujY3 HZlRhQPkd3Sf3SfP68WSIasUVHq1QzJczF0e1pVIxjgMCSb5xWcPtU4Pk58IlFRt HCXJENy4O0OaJUkM4G7YxU6CfPOSnwKMz/j9XdxR4tQJiQeQxVThpL9olcTYm9oO NgelZQ+Ui2Qw3CYjLcf71UUV6CgwpTk5oExjQ/CYpjb/3gnh1o3f1F4l+jX2e5wY /rKqTBmYP5DDcXKLucxgi6Yg0aZMA== Received: from dm5pr21cu001.outbound.protection.outlook.com (mail-centralusazon11011003.outbound.protection.outlook.com [52.101.62.3]) by mx0b-0002e601.pphosted.com (PPS) with ESMTPS id 4gugxm16hq-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:50:09 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tClHLkXKduszjRfz8H8VpQ4LXCjjRa3KFiGR2O49quIiLQ24RNnVtQ4MW/FvTJ0msJ43QaT5nRTBoLlatml7bWb6MMzNAd3jls5wVXAfks/ufv1/7yTA0GMGMes5VFhAw/lVK/Vy8QtRygZHSwLUJqAMRHD0q3isM0VuiaAlZ5gbpBVoSkbmSRcBORh72paGeBSIGT3y/SbHHjdj7a5Z/8ccHMudDTI0EpXSYfhl15Q5eq+NpcdL8E3ZNirimNo4SP+jb11oP6Bdl/5y0vCmsWM0gIrqxM8glQpcHLdGhG6n7/QAKY44d7Nl1OXHSJtDn0gD95n29Rzgkeo6RYxSeA== 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=ufS10IuV4rNPlv4A6/SND55bzkb9Kt7l4TDzuRCVLA4=; b=scQFI4bIlN31k3LbWeleaHYKt8Gm8M1sN2N5k9wlcInkXwKeLe6yitWcMs68XCFluK1lgZaXWBZ7WdHKboLuwqK4TdcuwT0mBo54zTw1jztvUcjOpS8tMxHPI3A7sGOASnpDHz4/WPwCuTW1BSyn6CXCd2/f3+1IAX4U3YomlQuWmCfWmrBdbZkH8cZibm8hGss/YhnBs1/GVOxJ58FC+3bWx7t1HBQqgLQP6gp1vOxXAoWJ7ocpUkLhtyBDJX3qr1vOk05c2UBpOmxnOJE9eKPYYSzbb1KpincPIKodc3bH9BAUqjq3T5PjU/dIexz5tkGqrY+4oTb/Ni3FnbpbUQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.23.194) smtp.rcpttodomain=nxp.com 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=ufS10IuV4rNPlv4A6/SND55bzkb9Kt7l4TDzuRCVLA4=; b=aBJ+0/VdUY+HMr9OSQtu6Op6xvInj02O3P/9K0bXpVCq9SvsTDBXn3q/lUBa0BkSe9qfbHTslhho+wXuUt1YjXI/XwHhpY1iseV9ZfdyLqCDr9VSiWANoGP9fNQcmPKFl1y/CShNqLZkVURFTsHDLjIQurwaqGw8oIf/9gDrWKE= Received: from SJ0PR13CA0051.namprd13.prod.outlook.com (2603:10b6:a03:2c2::26) by PH0PR10MB4584.namprd10.prod.outlook.com (2603:10b6:510:37::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.13; Tue, 22 Sep 2026 06:50:00 +0000 Received: from SJ5PEPF00000205.namprd05.prod.outlook.com (2603:10b6:a03:2c2:cafe::8f) by SJ0PR13CA0051.outlook.office365.com (2603:10b6:a03:2c2::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.13 via Frontend Transport; Tue, 22 Sep 2026 06:50:00 +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 SJ5PEPF00000205.mail.protection.outlook.com (10.167.244.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:49:59 +0000 Received: from DLEE204.ent.ti.com (157.170.170.84) 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.45; Tue, 22 Sep 2026 01:49:43 -0500 Received: from DLEE208.ent.ti.com (157.170.170.97) 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.45; Tue, 22 Sep 2026 01:49:43 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DLEE208.ent.ti.com (157.170.170.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:49:43 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI3u3626771; Tue, 22 Sep 2026 01:49:38 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 04/19] dmaengine: ti: k3-udma: move static inline helper functions to header file Date: Tue, 22 Sep 2026 12:17:28 +0530 Message-ID: <20260922064902.2719979-5-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF00000205:EE_|PH0PR10MB4584:EE_ X-MS-Office365-Filtering-Correlation-Id: fdefe529-f819-4408-a1bb-08df1875b8d9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|82310400026|1800799024|36860700016|376014|7416014|10067099003|6133799003|18002099003|22082099003|921020|56012099006; X-Microsoft-Antispam-Message-Info: mxjypzUT8SRyu3sVYZ8ZgpAySVCs3V8fA7u222NZzZ8J5x/rq/JPiBxAC7Vf6V1w2eR7fwoVl2uTLM+hwyI2rKoWe/N/lAsEWNDlB6rwdu5SENlHPgl2BCHRrJaON6l+J6bA2/99J203PGQemG/1ZXkJBBxiro3mfbDftUQN+vEJHVvCveYm1Ur53Y97kmPPSVvhySwOMdCfOcrqMbaIPgzGJyWKta/mecNO2judaNrxzga2Qpkej2N/JZX10u3PSqN075sEZJdoUWOiNyknOc5uY07GaVKyBS0rJuSFI/F88EkLo8KQQgCdpSvKsM/lnY+S2cFlt0sHXIiPzEgLLfZyMExaTulgidTc6qPtTtUymGuN3FghU5LPMa9hKZ27HDFGvqjBzD6sh6TphDk1TTDS2ydT+dR4drS5OhUSiHsZVyrn9XPLP/cyeKQAYmb69ZUniUD6nXrLaNZkDmYthzCK5MFSRpulBqWyMGpJEgZbzzwrwPdBYDvju4kw595xysG+M/cFk32Bm9YilzRFEoeIrskRfbp/dfs3ocDSQjSNHc3AvoDPOO2oYP57FulCPB5t5zTwnruV+8hAIuoRFE4IrFKdIreeUBFZiElNClUdPXAhOwNBnQNzvLAeZBIoh8Hdz5nsLifYwvFAtUpmsP3qin2bGd0ToNGlUNPwR0BHuauYckQ9oSaDwrMn7xIx5eJ6Pz9p8rlEZnbGvp2wduLvRlGxeAkUhfLyJNZrW8GNbWKRaCzHe+7vM/Itz6ye 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)(23010399003)(82310400026)(1800799024)(36860700016)(376014)(7416014)(10067099003)(6133799003)(18002099003)(22082099003)(921020)(56012099006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1sfnBqyBGc15sbtCs5KX8ljdQtQPUS0BiIzv1CpRtqdWapajbQHA1uG0A9THJo9RrvNOccmC6qZ/4rdKcKVPkI8stqTqdMTSK9ue6B0fKHAL6BOFpH8sPPZR4IKl9hJakzUwqsAL+55HLLNDFhuYNgd6LWy7/L6NtdQwNfGc0d7HHk2PwdGEbbDwRVYdBXcaLBKBmVd24YduFv/EFxKbOMKqLh87hfv3TAs3fnpTvvcFzMqnps5gsYWAmNfHJ3ypN4K8oSnaRc27cheoAlyJkwCOLT+pMOePynnK2aKAr2wNpq6Dc+rwNWMwcq54cF+RW2OeqxsQ5O+OCvpaTxEVsvbffvk3Tw+PzwRBnVKqaa9tSWqaqR7Z2efXsgvlqdCkBDXMEuNu4wwkCFGV/SdkiA9ETCiYdB/UEnICi1iJymlcrEmQz4RtOoOgEtRpb0U0 X-Exchange-RoutingPolicyChecked: whdHVL+irXKgT5v59llryblTac6AKo6d1EBO36rPQbn1hTFC955EtyUaiAJB90ZTvlbd4fmCrrhrr1gJzoghFzfUsyfjlpwqdwgQXegUlTRNtH+TAhLxmoC2Pu+L6Ju2dRbnWyzoaSZrZVxIwx0sC+86PnPoGQ4fowSQ/iVmqnPN9/MBOZKb+l1IfW1VmL1GgbeiHrEXqi+FFssLPdz9mnIlHGwl10rWhEGjOztropbyrEC4tGF7Ez+GB9kr1rmQ67629J3/io5Ih2rxQTWr/ER+pXWO9KGcJDlUaoFSUNuxVLn+YBZGh3zZbkWtNGBKnjRQxVH267t3eOndWTgBwg== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:49:59.9989 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fdefe529-f819-4408-a1bb-08df1875b8d9 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: SJ5PEPF00000205.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4584 X-Proofpoint-ORIG-GUID: 9flkEWxK2dCe6wylLY3cRe5G84mvq7CX X-Proofpoint-GUID: 9flkEWxK2dCe6wylLY3cRe5G84mvq7CX X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfXx8Wb3VAUdh0N yUh2htiuabL9Tn5E5Sx8PiY5nh3g03/uUwglmQHO0TfPO+nKsOSh0Kcv9YynuDXcalD3sg4iXm0 siHBCpUEh91lkhCfJ4xwSaDHssFGB8f4ywrRCirmrlGz1k3YM5ZqzSiwlsHNolIOuSw34M5G63p Xeiww04bk6EFJtmm7PloQNBuGhUZvNzdAtqRiPsdPSrYYDIvn3MX+nP3c8cqee31uErqQbusDWC LPOSfuAnI8HQeMT1zNMon7rBSV1MIfdoDr+KDzGOL3hmVBxtFGNMmLyhcAwNeOt/wXhMYupxNeC uVCDc997o/QRc7tuPbNIWj50Ir2lOzgEDr/KBnRJGdna4Vview7E7QH0usIr47+GULwl0jgYNRu zwVnISdCOeNmgKpoWn3MMKICP3i6CKoYlD5aYHw+nWXqH4vGg9g/fuTybYg3XwCmjMl5LMveqVG ylIbkO/rQHwzG2l9QGw== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX7fzjh6pQmcNX F1R8qDLrvPPkqXHwpB1Q+934IIpU0d/r3Ougcyjgr28WxioaeJKEIIY6/LB0sQ9xYwhYnwxEYf6 CzkNJSU62hMsPkAAc946hy+8LXeStOM= X-Authority-Analysis: v=2.4 cv=INeXmQvG c=1 sm=1 tr=0 ts=6ab22521 cx=c_pps a=G+edI3GLQse3gACT8XNfSw==:117 a=WotqVVQAdb04rnGuttW3Kw==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=s63m1ICgrNkA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=jwouBfj2j3NM8CExmVVE:22 a=8AirrxEcAAAA:8 a=sozttTNsAAAA:8 a=grpEhN_aSmkWsCgVS3MA:9 a=ST-jHhOKWsTCqRlWije3:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 malwarescore=0 phishscore=0 spamscore=0 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220097 Content-Type: text/plain; charset="utf-8" Move static inline helper functions in k3-udma.c to k3-udma.h header file for better separation and reuse. Reviewed-by: Frank Li Signed-off-by: Sai Sree Kartheek Adivi --- drivers/dma/ti/k3-udma.c | 108 -------------------------------------- drivers/dma/ti/k3-udma.h | 109 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 108 deletions(-) diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index d7c153c5321ea..5336ec9fe79ce 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -40,91 +40,6 @@ static const char * const mmr_names[] =3D { [MMR_TCHANRT] =3D "tchanrt", }; =20 -static inline struct udma_dev *to_udma_dev(struct dma_device *d) -{ - return container_of(d, struct udma_dev, ddev); -} - -static inline struct udma_chan *to_udma_chan(struct dma_chan *c) -{ - return container_of(c, struct udma_chan, vc.chan); -} - -static inline struct udma_desc *to_udma_desc(struct dma_async_tx_descripto= r *t) -{ - return container_of(t, struct udma_desc, vd.tx); -} - -/* Generic register access functions */ -static inline u32 udma_read(void __iomem *base, int reg) -{ - return readl(base + reg); -} - -static inline void udma_write(void __iomem *base, int reg, u32 val) -{ - writel(val, base + reg); -} - -static inline void udma_update_bits(void __iomem *base, int reg, - u32 mask, u32 val) -{ - u32 tmp, orig; - - orig =3D readl(base + reg); - tmp =3D orig & ~mask; - tmp |=3D (val & mask); - - if (tmp !=3D orig) - writel(tmp, base + reg); -} - -/* TCHANRT */ -static inline u32 udma_tchanrt_read(struct udma_chan *uc, int reg) -{ - if (!uc->tchan) - return 0; - return udma_read(uc->tchan->reg_rt, reg); -} - -static inline void udma_tchanrt_write(struct udma_chan *uc, int reg, u32 v= al) -{ - if (!uc->tchan) - return; - udma_write(uc->tchan->reg_rt, reg, val); -} - -static inline void udma_tchanrt_update_bits(struct udma_chan *uc, int reg, - u32 mask, u32 val) -{ - if (!uc->tchan) - return; - udma_update_bits(uc->tchan->reg_rt, reg, mask, val); -} - -/* RCHANRT */ -static inline u32 udma_rchanrt_read(struct udma_chan *uc, int reg) -{ - if (!uc->rchan) - return 0; - return udma_read(uc->rchan->reg_rt, reg); -} - -static inline void udma_rchanrt_write(struct udma_chan *uc, int reg, u32 v= al) -{ - if (!uc->rchan) - return; - udma_write(uc->rchan->reg_rt, reg, val); -} - -static inline void udma_rchanrt_update_bits(struct udma_chan *uc, int reg, - u32 mask, u32 val) -{ - if (!uc->rchan) - return; - udma_update_bits(uc->rchan->reg_rt, reg, mask, val); -} - static int navss_psil_pair(struct udma_dev *ud, u32 src_thread, u32 dst_th= read) { struct udma_tisci_rm *tisci_rm =3D &ud->tisci_rm; @@ -216,17 +131,6 @@ static void udma_dump_chan_stdata(struct udma_chan *uc) } } =20 -static inline dma_addr_t udma_curr_cppi5_desc_paddr(struct udma_desc *d, - int idx) -{ - return d->hwdesc[idx].cppi5_desc_paddr; -} - -static inline void *udma_curr_cppi5_desc_vaddr(struct udma_desc *d, int id= x) -{ - return d->hwdesc[idx].cppi5_desc_vaddr; -} - static struct udma_desc *udma_udma_desc_from_paddr(struct udma_chan *uc, dma_addr_t paddr) { @@ -369,11 +273,6 @@ static bool udma_is_chan_paused(struct udma_chan *uc) return false; } =20 -static inline dma_addr_t udma_get_rx_flush_hwdesc_paddr(struct udma_chan *= uc) -{ - return uc->ud->rx_flush.hwdescs[uc->config.pkt_mode].cppi5_desc_paddr; -} - static int udma_push_to_ring(struct udma_chan *uc, int idx) { struct udma_desc *d =3D uc->desc; @@ -775,13 +674,6 @@ static void udma_cyclic_packet_elapsed(struct udma_cha= n *uc) d->desc_idx =3D (d->desc_idx + 1) % d->sglen; } =20 -static inline void udma_fetch_epib(struct udma_chan *uc, struct udma_desc = *d) -{ - struct cppi5_host_desc_t *h_desc =3D d->hwdesc[0].cppi5_desc_vaddr; - - memcpy(d->metadata, h_desc->epib, d->metadata_size); -} - static bool udma_is_desc_really_done(struct udma_chan *uc, struct udma_des= c *d) { u32 peer_bcnt, bcnt; diff --git a/drivers/dma/ti/k3-udma.h b/drivers/dma/ti/k3-udma.h index 11d08adb0d69f..54e1757c3de38 100644 --- a/drivers/dma/ti/k3-udma.h +++ b/drivers/dma/ti/k3-udma.h @@ -451,6 +451,115 @@ struct udma_chan { u32 id; }; =20 +/* K3 UDMA helper functions */ +static inline struct udma_dev *to_udma_dev(struct dma_device *d) +{ + return container_of(d, struct udma_dev, ddev); +} + +static inline struct udma_chan *to_udma_chan(struct dma_chan *c) +{ + return container_of(c, struct udma_chan, vc.chan); +} + +static inline struct udma_desc *to_udma_desc(struct dma_async_tx_descripto= r *t) +{ + return container_of(t, struct udma_desc, vd.tx); +} + +/* Generic register access functions */ +static inline u32 udma_read(void __iomem *base, int reg) +{ + return readl(base + reg); +} + +static inline void udma_write(void __iomem *base, int reg, u32 val) +{ + writel(val, base + reg); +} + +static inline void udma_update_bits(void __iomem *base, int reg, + u32 mask, u32 val) +{ + u32 tmp, orig; + + orig =3D readl(base + reg); + tmp =3D orig & ~mask; + tmp |=3D (val & mask); + + if (tmp !=3D orig) + writel(tmp, base + reg); +} + +/* TCHANRT */ +static inline u32 udma_tchanrt_read(struct udma_chan *uc, int reg) +{ + if (!uc->tchan) + return 0; + return udma_read(uc->tchan->reg_rt, reg); +} + +static inline void udma_tchanrt_write(struct udma_chan *uc, int reg, u32 v= al) +{ + if (!uc->tchan) + return; + udma_write(uc->tchan->reg_rt, reg, val); +} + +static inline void udma_tchanrt_update_bits(struct udma_chan *uc, int reg, + u32 mask, u32 val) +{ + if (!uc->tchan) + return; + udma_update_bits(uc->tchan->reg_rt, reg, mask, val); +} + +/* RCHANRT */ +static inline u32 udma_rchanrt_read(struct udma_chan *uc, int reg) +{ + if (!uc->rchan) + return 0; + return udma_read(uc->rchan->reg_rt, reg); +} + +static inline void udma_rchanrt_write(struct udma_chan *uc, int reg, u32 v= al) +{ + if (!uc->rchan) + return; + udma_write(uc->rchan->reg_rt, reg, val); +} + +static inline void udma_rchanrt_update_bits(struct udma_chan *uc, int reg, + u32 mask, u32 val) +{ + if (!uc->rchan) + return; + udma_update_bits(uc->rchan->reg_rt, reg, mask, val); +} + +static inline dma_addr_t udma_curr_cppi5_desc_paddr(struct udma_desc *d, + int idx) +{ + return d->hwdesc[idx].cppi5_desc_paddr; +} + +static inline void *udma_curr_cppi5_desc_vaddr(struct udma_desc *d, int id= x) +{ + return d->hwdesc[idx].cppi5_desc_vaddr; +} + +static inline dma_addr_t udma_get_rx_flush_hwdesc_paddr(struct udma_chan *= uc) +{ + return uc->ud->rx_flush.hwdescs[uc->config.pkt_mode].cppi5_desc_paddr; +} + +static inline void udma_fetch_epib(struct udma_chan *uc, struct udma_desc = *d) +{ + struct cppi5_host_desc_t *h_desc =3D d->hwdesc[0].cppi5_desc_vaddr; + + memcpy(d->metadata, h_desc->epib, d->metadata_size); +} + /* Direct access to UDMA low lever resources for the glue layer */ int xudma_navss_psil_pair(struct udma_dev *ud, u32 src_thread, u32 dst_thr= ead); int xudma_navss_psil_unpair(struct udma_dev *ud, u32 src_thread, --=20 2.54.0 From nobody Thu Sep 24 17:02:17 2026 Received: from mx0b-0002e601.pphosted.com (mx0b-0002e601.pphosted.com [148.163.154.28]) (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 655D04FB9D3; Tue, 22 Sep 2026 06:50:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.154.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059855; cv=fail; b=GOJ/tBibXH5H6+PJnHigm7p2JIJwtgeHuWMoaBfFt4Z5pod4B8BOhbyp2RWmWBSkRmGTbGoR214zw/Tn+xdzB/4gvxKQ7j2Icfwn0Z2lSunCHRWOo65kIfDkz4yPUuWWmhVhdvXPosF19dsuCeFiihiap7nlqNmyPAMQBW6pavE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059855; c=relaxed/simple; bh=oOVkMmTaGAXp5/IPFcWjjYID0tc7XJq9PhiQXfYL74M=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WGNPj2IOq6KbTZYs1ICRetNPuK2kstOAm03wO7kmsFGhcRw7NUHsA+vQZoh9361AXS3VAk98EsIhJ8MO9I1cB3VHaohPrkRF7A5LhJczVaCqcI54p+oQ+QhloCCJ9GfWTi/JSVjuGDkbqWzmmpMqNq/PS+fvUjhU0vo3q9i3UE4= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=lktrgWab; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=s2FxEU4G; arc=fail smtp.client-ip=148.163.154.28 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="lktrgWab"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="s2FxEU4G" Received: from pps.filterd (m0374956.ppops.net [127.0.0.1]) by mx0b-0002e601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68M2URnk1035305; Tue, 22 Sep 2026 01:50:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=HmrWC352jGNFSwZ8VO5JUAExUZ3Gk8JbL9ClBlqAw DA=; b=lktrgWaboP7+ipKKR18fd3rUj0fxO6G/roviJMuKSWSodGi5Ry3L6VZx5 2h8EEk/KaPs0JNyEwF38PlpTeLr3MyqvCHKv9As3XJetOm0d9zdOzLUkaQl6IELJ JqRgWLj/yotGrFt55OpmrpZTOYeia1PWYkZn2sM0VQxWyjCazY6wLKs46rJPGatQ GFEj559vR+/Hxrqcs234AtZLMpggx4ij00mB3cwKuDqRDQEw2AkWz0vACSN9m7nY JmG4+uNW6eRZBY/fM29c/83sWKrDMh8rQRJkWVlugvgzntoUahEanRKOscWlL+Ip oSA0j9LNfDrTGcTT4rEIk6XPPjiGQ== Received: from byapr05cu005.outbound.protection.outlook.com (mail-westusazon11010067.outbound.protection.outlook.com [52.101.85.67]) by mx0b-0002e601.pphosted.com (PPS) with ESMTPS id 4gugxm16ms-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:50:31 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FwyF71I/INkehbe7V1yeRyEps30oIrkmommAZuqDTfN+oVXx8Ify22+zesJ/D8f020EVBB4F30lSd0AI9ZP4un/EN01hFuVMmSG531PUrKnbADjkoBU6TR4/8cJNnCWikkFoQlkD/0N3BZZ5OgugGSR82Dh7cEWAaWUjPXb5hX67V7zNfEGOYIvGyxE9rk/0jbmYFBKNWfLbIh+JrO+09N5tCil9n2CEZ7UwNTYfprKg1Nv/tCIICR6TggBd1GxT3pHeCv1yfoBTEVZUBcQaqbOYHcJk6ZKNP1apm97+aCnKAVGvgqzoFRUUYbF4VfFKaHuy9IH/b0aYaM8S8jfIcw== 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=HmrWC352jGNFSwZ8VO5JUAExUZ3Gk8JbL9ClBlqAwDA=; b=GXofcVbxi9u/MnaTHPR+OeyyCE68MLMPB7Yd5M68aaNYLKQbGH4Cwe2CiR/9FhhE3DZKmOAKg55vO/4rQzqD5idnr202vRLbk0jPutB1rP5tjwaTfwpQyGd7kqKIUTDLJ4/F8ULGzn37QhRgIaPn6uU0RX5ABFjiQ+pxY7H+uoe6HZURW9ZM/SsKmrO+38+UhB0YMpgwr8rqr/NyTsa/JB1ze7uYZTtBoxmkj9Jyix0a/n+mwdjR3mnRdRSS1G45BErra/eet/BVEpxbzbCycOr1jxB9q1uYS16R6Tnfz43RYgwST0Mu1pDPQMFI7ikD4LpRz1naX8giXeqlqhS1vQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.21.194) smtp.rcpttodomain=nxp.com 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=HmrWC352jGNFSwZ8VO5JUAExUZ3Gk8JbL9ClBlqAwDA=; b=s2FxEU4G5TEp9HiP0X/HV9YBvvyYdGnuIk5yFhYqJanQbnYOYxynZMcUVpoRypTfOPW9dLJmTvYsaUxJY5lSNpfgyIXX0QUilj1qOeGd109ngBQpBzBZhlRa2kPL7+yS/QmWXu8yDhaX2Yn5wPM+cJTlIa6vvu4CEh8MrFvSfrY= Received: from BL1PR13CA0115.namprd13.prod.outlook.com (2603:10b6:208:2b9::30) by MW4PR10MB5881.namprd10.prod.outlook.com (2603:10b6:303:18e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.14; Tue, 22 Sep 2026 06:50:21 +0000 Received: from BN1PEPF00018070.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::31) by BL1PR13CA0115.outlook.office365.com (2603:10b6:208:2b9::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.13 via Frontend Transport; Tue, 22 Sep 2026 06:50:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 198.47.21.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.21.194 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.21.194; helo=flwvzet200.ext.ti.com; pr=C Received: from flwvzet200.ext.ti.com (198.47.21.194) by BN1PEPF00018070.mail.protection.outlook.com (10.167.245.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:50:19 +0000 Received: from DFLE207.ent.ti.com (10.64.6.65) by flwvzet200.ext.ti.com (10.248.192.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:49:48 -0500 Received: from DFLE214.ent.ti.com (10.64.6.72) by DFLE207.ent.ti.com (10.64.6.65) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:49:48 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DFLE214.ent.ti.com (10.64.6.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:49:48 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI3v3626771; Tue, 22 Sep 2026 01:49:43 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 05/19] dmaengine: ti: k3-udma: move descriptor management to k3-udma-common.c Date: Tue, 22 Sep 2026 12:17:29 +0530 Message-ID: <20260922064902.2719979-6-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00018070:EE_|MW4PR10MB5881:EE_ X-MS-Office365-Filtering-Correlation-Id: 83de2a07-234e-4c41-45b3-08df1875c43a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700016|23010399003|376014|7416014|1800799024|13003099007|921020|6133799003|10067099003|56012099006|5023799004|10063799003|3023799007|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: kmIE8irdD9P5gVgidhdrSC+xMjDMHmZRonliixsh1xCtCu/MGd7kMEllmbG0FoTyVyEPOSXkCxj6mBzNkmlGzCNp6TxamTe5ZNez5bBQkZWdqf2bhbQnPWt1WxjJKqDvMmh0037NZ6+SSnPPwey/wAo3l5ODHsixvli58cVGYJj8fwaATtoUSKEuqNvSHiJYHVHDhRGfJwiAK2kuC7q7WCRIE1110iDdbIPCzhhkmAvNlybtTUzAPznXJEWaT2OlKgw0aaBqtatMe7A7mn8wwDFcR10/1Jk8YquoD8RLW4Tbp2t+XorbUirgPGz33D9Szfm95UhEhWOVRH6M53szGMoz7gWLyezsuWb2YxjnKfhn2g4smAIjEhHdrHJuZvenQ2NTI8tc8OA/uE3cD9Pbg+nuJxuKTVT2IMVfhfn1UeswD06DlaWXwncO10qGtaQxgObtlMHUDjb/zyFpFkrNu+xxDcp9wYz9zKOzBPlsbqfA4jF1IvUKUZhIsuk658GhQwJltgjtGJq7Q+ampmjpjibmFoYAyr5aWZlROJIOVhGNo2i++AKrmX7xLZqtqDAnEZPhhGqE+4zsjsb799SO3fti40OvdjFen1f1Sdb9apGnG4PvlR3ahFug2iHVhnFxUjjG9DAOnZxajfEvOOVIIdCIu0vuFkAIWFBrYwef8QXxXi6VZkBk8yBbZtEjqczR X-Forefront-Antispam-Report: CIP:198.47.21.194;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:flwvzet200.ext.ti.com;PTR:ErrorRetry;CAT:NONE;SFS:(13230040)(82310400026)(36860700016)(23010399003)(376014)(7416014)(1800799024)(13003099007)(921020)(6133799003)(10067099003)(56012099006)(5023799004)(10063799003)(3023799007)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZgmmGv4GtucebeScjLkdI4N0m8XA0hbJP55knPNxNwZZEUfwjQb2TDVkM5LIB8eua5jQ3BO8p/E6Jh/vGooeV4wu3Bh6UERXvEoxmUL6N28VzCK2TIFgb4tRyaO+32Nge7grYYKbqnPwO9dDolKQbownFyAt+U43ARvkvroxvMY9akhseaS9P4OdhPW09NnHlF2zOb7tzOalzP/d+PN0BWjiACA8pR96tK0gS2/tG7g7D+3Kolb+uz4dY+SuCjzInVSDeYtA/kKhXL7o47tr5ICPV8c4oBUscOVI5xHG0sx1j1O5EmUw0uwyWx4V1fZOCFThnOjrZ1uxJjSztAPmhqAo7NJHQbn13hKBwzFdIXrgU0Py2rQzp6YCGEErriQFAfKyRsUDSnPhT7iHmeTNR/kq0ExVCeBYYoqfZXbk/o2hHQD5gZ4WOZdeMeGrLwIu X-Exchange-RoutingPolicyChecked: GxEwn1CjXqtpmfktdfgchsLRqvGPuAOxnLe554tLSC2XyaVh0nJNBLbPnGI8CFs0mYLzjUpkxZiHtDWfTqyaVyKHreEY0tMQYAtgDs0pmxkxeAURQL3TYfplRjnHu4slSWoZFwouksPWLwoKF9ZbN4Lnh5q53x2wjen/Gr2Uxfx5MXCoGPJMmLJS+q5HB1KAaqZoblRyzemrOkR5DmCiegCJmsV/zw/2qGz8F/qyVUXYsgRRJCfkT8WHVRefD1h/PDQQJZSqgk9P2c6Byt7BJbOVGoBvgshn+2DmjRRZqrzl7PEptXG7IbAfWWefmcIrFixilcH83gTpah3qX9Mm+Q== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:50:19.1011 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 83de2a07-234e-4c41-45b3-08df1875c43a X-MS-Exchange-CrossTenant-Id: e5b49634-450b-4709-8abb-1e2b19b982b7 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e5b49634-450b-4709-8abb-1e2b19b982b7;Ip=[198.47.21.194];Helo=[flwvzet200.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF00018070.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB5881 X-Proofpoint-ORIG-GUID: Ou0kUUT5bU2-0xD_SnVOdRS5x5656Xgo X-Proofpoint-GUID: Ou0kUUT5bU2-0xD_SnVOdRS5x5656Xgo X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX9e28YYKJY/5c 4+iYLtftp30kmng623IHFvQ91f4NcDOJolLUEJToxjP6nmUDD2Pw9riM75eTgh4CjHn4C1PTJtc fFqvQ/Tq7/X7iL0hXti3oy2x8ugEhnl1s2vZAYSaNIIPoZz3LTUCOCQJ6IlkZclAjnx0L9aQrSJ UUa1Qt4PmSryZNoxXlZKNpn45c8rfXDlVuDiBYbd0f1rdBudslMy1vghdfn1InZNRcYBoXhbboG 9/SNq2N/CnW4bxOW1+tq37V+FyKJ0wd4z7DNPUB0RYcP3pTNeqwIAbZzTdAXWzS+GGB+Vc283/y +p+gHcC9VsVrmaE/KSPdg7KCdliqHN4ucckfNbd5jM28m3TgsYgdppdRgE0YbI7hXVUhPYk9g7a buMD2poGS6lB2/RH8s7F2smZO2R5wj/oPHWrzRzB5xBWPZT79nQgeQZS1bI8/u7Y+w5CCg4MGgc dAqaFM4IF6SCCsDxdhQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX135NK9Np0EOy sDs4X3xf/hJYPdZGfld5hu4S1cfW3Wiet/l8/m/qa98YyoYQVSPbCfpwg9rHMicWViRL8isAmlt sVGSxaLD4/FmqNDpIPrg5fq2Dr58dIs= X-Authority-Analysis: v=2.4 cv=INeXmQvG c=1 sm=1 tr=0 ts=6ab22537 cx=c_pps a=7HTsEC4o+G4Ts3XEwqQVug==:117 a=iwqwCZQqcuTv3JOpYdM7/Q==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=jwouBfj2j3NM8CExmVVE:22 a=sozttTNsAAAA:8 a=9fA4dagTuIDSJ7NYoQoA:9 a=x_a8ZKo73Tz1WADx:21 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 malwarescore=0 phishscore=0 spamscore=0 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220097 Content-Type: text/plain; charset="utf-8" Refactor the K3 UDMA driver by moving all DMA descriptor handling functions from k3-udma.c to a new common library, k3-udma-common.c. This prepares the driver for supporting new K3 UDMA v2 variant (used in AM62L) that can reuse the same descriptor handling logic. To ensure this common code works correctly across all build configurations (built-in vs modules), introduce a hidden Kconfig symbol: CONFIG_TI_K3_UDMA_COMMON. No functional changes intended. Signed-off-by: Sai Sree Kartheek Adivi --- drivers/dma/ti/Kconfig | 4 + drivers/dma/ti/Makefile | 1 + drivers/dma/ti/k3-udma-common.c | 1243 +++++++++++++++++++++++++++++++ drivers/dma/ti/k3-udma.c | 1218 ------------------------------ drivers/dma/ti/k3-udma.h | 54 ++ 5 files changed, 1302 insertions(+), 1218 deletions(-) create mode 100644 drivers/dma/ti/k3-udma-common.c diff --git a/drivers/dma/ti/Kconfig b/drivers/dma/ti/Kconfig index cbc30ab627832..a389ae04ec930 100644 --- a/drivers/dma/ti/Kconfig +++ b/drivers/dma/ti/Kconfig @@ -42,12 +42,16 @@ config TI_K3_UDMA select DMA_ENGINE select DMA_VIRTUAL_CHANNELS select SOC_TI + select TI_K3_UDMA_COMMON select TI_K3_RINGACC select TI_K3_PSIL help Enable support for the TI UDMA (Unified DMA) controller. This DMA engine is used in AM65x and j721e. =20 +config TI_K3_UDMA_COMMON + tristate + config TI_K3_UDMA_GLUE_LAYER tristate "Texas Instruments UDMA Glue layer for non DMAengine users" depends on ARCH_K3 || COMPILE_TEST diff --git a/drivers/dma/ti/Makefile b/drivers/dma/ti/Makefile index d376c117cecf6..3b91c02e55eaf 100644 --- a/drivers/dma/ti/Makefile +++ b/drivers/dma/ti/Makefile @@ -3,6 +3,7 @@ obj-$(CONFIG_TI_CPPI41) +=3D cppi41.o obj-$(CONFIG_TI_EDMA) +=3D edma.o obj-$(CONFIG_DMA_OMAP) +=3D omap-dma.o obj-$(CONFIG_TI_K3_UDMA) +=3D k3-udma.o +obj-$(CONFIG_TI_K3_UDMA_COMMON) +=3D k3-udma-common.o obj-$(CONFIG_TI_K3_UDMA_GLUE_LAYER) +=3D k3-udma-glue.o k3-psil-lib-objs :=3D k3-psil.o \ k3-psil-am654.o \ diff --git a/drivers/dma/ti/k3-udma-common.c b/drivers/dma/ti/k3-udma-commo= n.c new file mode 100644 index 0000000000000..3130805a8ec40 --- /dev/null +++ b/drivers/dma/ti/k3-udma-common.c @@ -0,0 +1,1243 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2025 Texas Instruments Incorporated - http://www.ti.com + * Author: Peter Ujfalusi + */ + +#include +#include +#include +#include +#include + +#include "k3-udma.h" + +static const struct dma_descriptor_metadata_ops metadata_ops =3D { + .attach =3D udma_attach_metadata, + .get_ptr =3D udma_get_metadata_ptr, + .set_len =3D udma_set_metadata_len, +}; + +struct udma_desc *udma_udma_desc_from_paddr(struct udma_chan *uc, + dma_addr_t paddr) +{ + struct udma_desc *d =3D uc->terminated_desc; + + if (d) { + dma_addr_t desc_paddr =3D udma_curr_cppi5_desc_paddr(d, + d->desc_idx); + + if (desc_paddr !=3D paddr) + d =3D NULL; + } + + if (!d) { + d =3D uc->desc; + if (d) { + dma_addr_t desc_paddr =3D udma_curr_cppi5_desc_paddr(d, + d->desc_idx); + + if (desc_paddr !=3D paddr) + d =3D NULL; + } + } + + return d; +} +EXPORT_SYMBOL_GPL(udma_udma_desc_from_paddr); + +void udma_free_hwdesc(struct udma_chan *uc, struct udma_desc *d) +{ + if (uc->use_dma_pool) { + int i; + + for (i =3D 0; i < d->hwdesc_count; i++) { + if (!d->hwdesc[i].cppi5_desc_vaddr) + continue; + + dma_pool_free(uc->hdesc_pool, + d->hwdesc[i].cppi5_desc_vaddr, + d->hwdesc[i].cppi5_desc_paddr); + + d->hwdesc[i].cppi5_desc_vaddr =3D NULL; + } + } else if (d->hwdesc[0].cppi5_desc_vaddr) { + dma_free_coherent(uc->dma_dev, d->hwdesc[0].cppi5_desc_size, + d->hwdesc[0].cppi5_desc_vaddr, + d->hwdesc[0].cppi5_desc_paddr); + + d->hwdesc[0].cppi5_desc_vaddr =3D NULL; + } +} + +void udma_purge_desc_work(struct work_struct *work) +{ + struct udma_dev *ud =3D container_of(work, typeof(*ud), purge_work); + struct virt_dma_desc *vd, *_vd; + unsigned long flags; + LIST_HEAD(head); + + spin_lock_irqsave(&ud->lock, flags); + list_splice_tail_init(&ud->desc_to_purge, &head); + spin_unlock_irqrestore(&ud->lock, flags); + + list_for_each_entry_safe(vd, _vd, &head, node) { + struct udma_chan *uc =3D to_udma_chan(vd->tx.chan); + struct udma_desc *d =3D to_udma_desc(&vd->tx); + + udma_free_hwdesc(uc, d); + list_del(&vd->node); + kfree(d); + } + + /* If more to purge, schedule the work again */ + if (!list_empty(&ud->desc_to_purge)) + schedule_work(&ud->purge_work); +} +EXPORT_SYMBOL_GPL(udma_purge_desc_work); + +void udma_desc_free(struct virt_dma_desc *vd) +{ + struct udma_dev *ud =3D to_udma_dev(vd->tx.chan->device); + struct udma_chan *uc =3D to_udma_chan(vd->tx.chan); + struct udma_desc *d =3D to_udma_desc(&vd->tx); + unsigned long flags; + + if (uc->terminated_desc =3D=3D d) + uc->terminated_desc =3D NULL; + + if (uc->use_dma_pool) { + udma_free_hwdesc(uc, d); + kfree(d); + return; + } + + spin_lock_irqsave(&ud->lock, flags); + list_add_tail(&vd->node, &ud->desc_to_purge); + spin_unlock_irqrestore(&ud->lock, flags); + + schedule_work(&ud->purge_work); +} +EXPORT_SYMBOL_GPL(udma_desc_free); + +bool udma_desc_is_rx_flush(struct udma_chan *uc, dma_addr_t addr) +{ + if (uc->config.dir !=3D DMA_DEV_TO_MEM) + return false; + + if (addr =3D=3D udma_get_rx_flush_hwdesc_paddr(uc)) + return true; + + return false; +} +EXPORT_SYMBOL_GPL(udma_desc_is_rx_flush); + +bool udma_is_desc_really_done(struct udma_chan *uc, struct udma_desc *d) +{ + u32 peer_bcnt, bcnt; + + /* + * Only TX towards PDMA is affected. + * If DMA_PREP_INTERRUPT is not set by consumer then skip the transfer + * completion calculation, consumer must ensure that there is no stale + * data in DMA fabric in this case. + */ + if (uc->config.ep_type =3D=3D PSIL_EP_NATIVE || + uc->config.dir !=3D DMA_MEM_TO_DEV || !(uc->config.tx_flags & DMA_PRE= P_INTERRUPT)) + return true; + + peer_bcnt =3D udma_tchanrt_read(uc, UDMA_CHAN_RT_PEER_BCNT_REG); + bcnt =3D udma_tchanrt_read(uc, UDMA_CHAN_RT_BCNT_REG); + + /* Transfer is incomplete, store current residue and time stamp */ + if (peer_bcnt < bcnt) { + uc->tx_drain.residue =3D bcnt - peer_bcnt; + uc->tx_drain.tstamp =3D ktime_get(); + return false; + } + + return true; +} +EXPORT_SYMBOL_GPL(udma_is_desc_really_done); + +struct udma_desc *udma_alloc_tr_desc(struct udma_chan *uc, + size_t tr_size, int tr_count, + enum dma_transfer_direction dir) +{ + struct udma_hwdesc *hwdesc; + struct cppi5_desc_hdr_t *tr_desc; + struct udma_desc *d; + u32 reload_count =3D 0; + u32 ring_id; + + switch (tr_size) { + case 16: + case 32: + case 64: + case 128: + break; + default: + dev_err(uc->ud->dev, "Unsupported TR size of %zu\n", tr_size); + return NULL; + } + + /* We have only one descriptor containing multiple TRs */ + d =3D kzalloc(sizeof(*d) + sizeof(d->hwdesc[0]), GFP_NOWAIT); + if (!d) + return NULL; + + d->sglen =3D tr_count; + + d->hwdesc_count =3D 1; + hwdesc =3D &d->hwdesc[0]; + + /* Allocate memory for DMA ring descriptor */ + if (uc->use_dma_pool) { + hwdesc->cppi5_desc_size =3D uc->config.hdesc_size; + hwdesc->cppi5_desc_vaddr =3D dma_pool_zalloc(uc->hdesc_pool, + GFP_NOWAIT, + &hwdesc->cppi5_desc_paddr); + } else { + hwdesc->cppi5_desc_size =3D cppi5_trdesc_calc_size(tr_size, + tr_count); + hwdesc->cppi5_desc_size =3D ALIGN(hwdesc->cppi5_desc_size, + uc->ud->desc_align); + hwdesc->cppi5_desc_vaddr =3D dma_alloc_coherent(uc->ud->dev, + hwdesc->cppi5_desc_size, + &hwdesc->cppi5_desc_paddr, + GFP_NOWAIT); + } + + if (!hwdesc->cppi5_desc_vaddr) { + kfree(d); + return NULL; + } + + /* Start of the TR req records */ + hwdesc->tr_req_base =3D hwdesc->cppi5_desc_vaddr + tr_size; + /* Start address of the TR response array */ + hwdesc->tr_resp_base =3D hwdesc->tr_req_base + tr_size * tr_count; + + tr_desc =3D hwdesc->cppi5_desc_vaddr; + + if (uc->cyclic) + reload_count =3D CPPI5_INFO0_TRDESC_RLDCNT_INFINITE; + + if (dir =3D=3D DMA_DEV_TO_MEM) + ring_id =3D k3_ringacc_get_ring_id(uc->rflow->r_ring); + else + ring_id =3D k3_ringacc_get_ring_id(uc->tchan->tc_ring); + + cppi5_trdesc_init(tr_desc, tr_count, tr_size, 0, reload_count); + cppi5_desc_set_pktids(tr_desc, uc->id, + CPPI5_INFO1_DESC_FLOWID_DEFAULT); + cppi5_desc_set_retpolicy(tr_desc, 0, ring_id); + + return d; +} + +/** + * udma_get_tr_counters - calculate TR counters for a given length + * @len: Length of the transfer + * @align_to: Preferred alignment + * @tr0_cnt0: First TR icnt0 + * @tr0_cnt1: First TR icnt1 + * @tr1_cnt0: Second (if used) TR icnt0 + * + * For len < SZ_64K only one TR is enough, tr1_cnt0 is not updated + * For len >=3D SZ_64K two TRs are used in a simple way: + * First TR: SZ_64K-alignment blocks (tr0_cnt0, tr0_cnt1) + * Second TR: the remaining length (tr1_cnt0) + * + * Returns the number of TRs the length needs (1 or 2) + * -EINVAL if the length can not be supported + */ +int udma_get_tr_counters(size_t len, unsigned long align_to, + u16 *tr0_cnt0, u16 *tr0_cnt1, u16 *tr1_cnt0) +{ + if (len < SZ_64K) { + *tr0_cnt0 =3D len; + *tr0_cnt1 =3D 1; + + return 1; + } + + if (align_to > 3) + align_to =3D 3; + +realign: + *tr0_cnt0 =3D SZ_64K - BIT(align_to); + if (len / *tr0_cnt0 >=3D SZ_64K) { + if (align_to) { + align_to--; + goto realign; + } + return -EINVAL; + } + + *tr0_cnt1 =3D len / *tr0_cnt0; + *tr1_cnt0 =3D len % *tr0_cnt0; + + return 2; +} + +struct udma_desc * +udma_prep_slave_sg_tr(struct udma_chan *uc, struct scatterlist *sgl, + unsigned int sglen, enum dma_transfer_direction dir, + unsigned long tx_flags, void *context) +{ + struct scatterlist *sgent; + struct udma_desc *d; + struct cppi5_tr_type1_t *tr_req =3D NULL; + u16 tr0_cnt0, tr0_cnt1, tr1_cnt0; + unsigned int i; + size_t tr_size; + int num_tr =3D 0; + int tr_idx =3D 0; + u64 asel; + + /* estimate the number of TRs we will need */ + for_each_sg(sgl, sgent, sglen, i) { + if (sg_dma_len(sgent) < SZ_64K) + num_tr++; + else + num_tr +=3D 2; + } + + /* Now allocate and setup the descriptor. */ + tr_size =3D sizeof(struct cppi5_tr_type1_t); + d =3D udma_alloc_tr_desc(uc, tr_size, num_tr, dir); + if (!d) + return NULL; + + d->sglen =3D sglen; + + if (uc->ud->match_data->type =3D=3D DMA_TYPE_UDMA) + asel =3D 0; + else + asel =3D (u64)uc->config.asel << K3_ADDRESS_ASEL_SHIFT; + + tr_req =3D d->hwdesc[0].tr_req_base; + for_each_sg(sgl, sgent, sglen, i) { + dma_addr_t sg_addr =3D sg_dma_address(sgent); + + num_tr =3D udma_get_tr_counters(sg_dma_len(sgent), __ffs(sg_addr), + &tr0_cnt0, &tr0_cnt1, &tr1_cnt0); + if (num_tr < 0) { + dev_err(uc->ud->dev, "size %u is not supported\n", + sg_dma_len(sgent)); + udma_free_hwdesc(uc, d); + kfree(d); + return NULL; + } + + cppi5_tr_init(&tr_req[tr_idx].flags, CPPI5_TR_TYPE1, false, + false, CPPI5_TR_EVENT_SIZE_COMPLETION, 0); + cppi5_tr_csf_set(&tr_req[tr_idx].flags, CPPI5_TR_CSF_SUPR_EVT); + + sg_addr |=3D asel; + tr_req[tr_idx].addr =3D sg_addr; + tr_req[tr_idx].icnt0 =3D tr0_cnt0; + tr_req[tr_idx].icnt1 =3D tr0_cnt1; + tr_req[tr_idx].dim1 =3D tr0_cnt0; + tr_idx++; + + if (num_tr =3D=3D 2) { + cppi5_tr_init(&tr_req[tr_idx].flags, CPPI5_TR_TYPE1, + false, false, + CPPI5_TR_EVENT_SIZE_COMPLETION, 0); + cppi5_tr_csf_set(&tr_req[tr_idx].flags, + CPPI5_TR_CSF_SUPR_EVT); + + tr_req[tr_idx].addr =3D sg_addr + tr0_cnt1 * tr0_cnt0; + tr_req[tr_idx].icnt0 =3D tr1_cnt0; + tr_req[tr_idx].icnt1 =3D 1; + tr_req[tr_idx].dim1 =3D tr1_cnt0; + tr_idx++; + } + + d->residue +=3D sg_dma_len(sgent); + } + + cppi5_tr_csf_set(&tr_req[tr_idx - 1].flags, + CPPI5_TR_CSF_SUPR_EVT | CPPI5_TR_CSF_EOP); + + return d; +} + +struct udma_desc * +udma_prep_slave_sg_triggered_tr(struct udma_chan *uc, struct scatterlist *= sgl, + unsigned int sglen, + enum dma_transfer_direction dir, + unsigned long tx_flags, void *context) +{ + struct scatterlist *sgent; + struct cppi5_tr_type15_t *tr_req =3D NULL; + enum dma_slave_buswidth dev_width; + u32 csf =3D CPPI5_TR_CSF_SUPR_EVT; + u16 tr_cnt0, tr_cnt1; + dma_addr_t dev_addr; + struct udma_desc *d; + unsigned int i; + size_t tr_size, sg_len; + int num_tr =3D 0; + int tr_idx =3D 0; + u32 burst, trigger_size, port_window; + u64 asel; + + if (dir =3D=3D DMA_DEV_TO_MEM) { + dev_addr =3D uc->cfg.src_addr; + dev_width =3D uc->cfg.src_addr_width; + burst =3D uc->cfg.src_maxburst; + port_window =3D uc->cfg.src_port_window_size; + } else if (dir =3D=3D DMA_MEM_TO_DEV) { + dev_addr =3D uc->cfg.dst_addr; + dev_width =3D uc->cfg.dst_addr_width; + burst =3D uc->cfg.dst_maxburst; + port_window =3D uc->cfg.dst_port_window_size; + } else { + dev_err(uc->ud->dev, "%s: bad direction?\n", __func__); + return NULL; + } + + if (!burst) + burst =3D 1; + + if (port_window) { + if (port_window !=3D burst) { + dev_err(uc->ud->dev, + "The burst must be equal to port_window\n"); + return NULL; + } + + tr_cnt0 =3D dev_width * port_window; + tr_cnt1 =3D 1; + } else { + tr_cnt0 =3D dev_width; + tr_cnt1 =3D burst; + } + trigger_size =3D tr_cnt0 * tr_cnt1; + + /* estimate the number of TRs we will need */ + for_each_sg(sgl, sgent, sglen, i) { + sg_len =3D sg_dma_len(sgent); + + if (sg_len % trigger_size) { + dev_err(uc->ud->dev, + "Not aligned SG entry (%zu for %u)\n", sg_len, + trigger_size); + return NULL; + } + + if (sg_len / trigger_size < SZ_64K) + num_tr++; + else + num_tr +=3D 2; + } + + /* Now allocate and setup the descriptor. */ + tr_size =3D sizeof(struct cppi5_tr_type15_t); + d =3D udma_alloc_tr_desc(uc, tr_size, num_tr, dir); + if (!d) + return NULL; + + d->sglen =3D sglen; + + if (uc->ud->match_data->type =3D=3D DMA_TYPE_UDMA) { + asel =3D 0; + csf |=3D CPPI5_TR_CSF_EOL_ICNT0; + } else { + asel =3D (u64)uc->config.asel << K3_ADDRESS_ASEL_SHIFT; + dev_addr |=3D asel; + } + + tr_req =3D d->hwdesc[0].tr_req_base; + for_each_sg(sgl, sgent, sglen, i) { + u16 tr0_cnt2, tr0_cnt3, tr1_cnt2; + dma_addr_t sg_addr =3D sg_dma_address(sgent); + + sg_len =3D sg_dma_len(sgent); + num_tr =3D udma_get_tr_counters(sg_len / trigger_size, 0, + &tr0_cnt2, &tr0_cnt3, &tr1_cnt2); + if (num_tr < 0) { + dev_err(uc->ud->dev, "size %zu is not supported\n", + sg_len); + udma_free_hwdesc(uc, d); + kfree(d); + return NULL; + } + + cppi5_tr_init(&tr_req[tr_idx].flags, CPPI5_TR_TYPE15, false, + true, CPPI5_TR_EVENT_SIZE_COMPLETION, 0); + cppi5_tr_csf_set(&tr_req[tr_idx].flags, csf); + cppi5_tr_set_trigger(&tr_req[tr_idx].flags, + uc->config.tr_trigger_type, + CPPI5_TR_TRIGGER_TYPE_ICNT2_DEC, 0, 0); + + sg_addr |=3D asel; + if (dir =3D=3D DMA_DEV_TO_MEM) { + tr_req[tr_idx].addr =3D dev_addr; + tr_req[tr_idx].icnt0 =3D tr_cnt0; + tr_req[tr_idx].icnt1 =3D tr_cnt1; + tr_req[tr_idx].icnt2 =3D tr0_cnt2; + tr_req[tr_idx].icnt3 =3D tr0_cnt3; + tr_req[tr_idx].dim1 =3D (-1) * tr_cnt0; + + tr_req[tr_idx].daddr =3D sg_addr; + tr_req[tr_idx].dicnt0 =3D tr_cnt0; + tr_req[tr_idx].dicnt1 =3D tr_cnt1; + tr_req[tr_idx].dicnt2 =3D tr0_cnt2; + tr_req[tr_idx].dicnt3 =3D tr0_cnt3; + tr_req[tr_idx].ddim1 =3D tr_cnt0; + tr_req[tr_idx].ddim2 =3D trigger_size; + tr_req[tr_idx].ddim3 =3D trigger_size * tr0_cnt2; + } else { + tr_req[tr_idx].addr =3D sg_addr; + tr_req[tr_idx].icnt0 =3D tr_cnt0; + tr_req[tr_idx].icnt1 =3D tr_cnt1; + tr_req[tr_idx].icnt2 =3D tr0_cnt2; + tr_req[tr_idx].icnt3 =3D tr0_cnt3; + tr_req[tr_idx].dim1 =3D tr_cnt0; + tr_req[tr_idx].dim2 =3D trigger_size; + tr_req[tr_idx].dim3 =3D trigger_size * tr0_cnt2; + + tr_req[tr_idx].daddr =3D dev_addr; + tr_req[tr_idx].dicnt0 =3D tr_cnt0; + tr_req[tr_idx].dicnt1 =3D tr_cnt1; + tr_req[tr_idx].dicnt2 =3D tr0_cnt2; + tr_req[tr_idx].dicnt3 =3D tr0_cnt3; + tr_req[tr_idx].ddim1 =3D (-1) * tr_cnt0; + } + + tr_idx++; + + if (num_tr =3D=3D 2) { + cppi5_tr_init(&tr_req[tr_idx].flags, CPPI5_TR_TYPE15, + false, true, + CPPI5_TR_EVENT_SIZE_COMPLETION, 0); + cppi5_tr_csf_set(&tr_req[tr_idx].flags, csf); + cppi5_tr_set_trigger(&tr_req[tr_idx].flags, + uc->config.tr_trigger_type, + CPPI5_TR_TRIGGER_TYPE_ICNT2_DEC, + 0, 0); + + sg_addr +=3D trigger_size * tr0_cnt2 * tr0_cnt3; + if (dir =3D=3D DMA_DEV_TO_MEM) { + tr_req[tr_idx].addr =3D dev_addr; + tr_req[tr_idx].icnt0 =3D tr_cnt0; + tr_req[tr_idx].icnt1 =3D tr_cnt1; + tr_req[tr_idx].icnt2 =3D tr1_cnt2; + tr_req[tr_idx].icnt3 =3D 1; + tr_req[tr_idx].dim1 =3D (-1) * tr_cnt0; + + tr_req[tr_idx].daddr =3D sg_addr; + tr_req[tr_idx].dicnt0 =3D tr_cnt0; + tr_req[tr_idx].dicnt1 =3D tr_cnt1; + tr_req[tr_idx].dicnt2 =3D tr1_cnt2; + tr_req[tr_idx].dicnt3 =3D 1; + tr_req[tr_idx].ddim1 =3D tr_cnt0; + tr_req[tr_idx].ddim2 =3D trigger_size; + } else { + tr_req[tr_idx].addr =3D sg_addr; + tr_req[tr_idx].icnt0 =3D tr_cnt0; + tr_req[tr_idx].icnt1 =3D tr_cnt1; + tr_req[tr_idx].icnt2 =3D tr1_cnt2; + tr_req[tr_idx].icnt3 =3D 1; + tr_req[tr_idx].dim1 =3D tr_cnt0; + tr_req[tr_idx].dim2 =3D trigger_size; + + tr_req[tr_idx].daddr =3D dev_addr; + tr_req[tr_idx].dicnt0 =3D tr_cnt0; + tr_req[tr_idx].dicnt1 =3D tr_cnt1; + tr_req[tr_idx].dicnt2 =3D tr1_cnt2; + tr_req[tr_idx].dicnt3 =3D 1; + tr_req[tr_idx].ddim1 =3D (-1) * tr_cnt0; + } + tr_idx++; + } + + d->residue +=3D sg_len; + } + + cppi5_tr_csf_set(&tr_req[tr_idx - 1].flags, csf | CPPI5_TR_CSF_EOP); + + return d; +} + +int udma_configure_statictr(struct udma_chan *uc, struct udma_desc *d, + enum dma_slave_buswidth dev_width, + u16 elcnt) +{ + if (uc->config.ep_type !=3D PSIL_EP_PDMA_XY) + return 0; + + /* Bus width translates to the element size (ES) */ + switch (dev_width) { + case DMA_SLAVE_BUSWIDTH_1_BYTE: + d->static_tr.elsize =3D 0; + break; + case DMA_SLAVE_BUSWIDTH_2_BYTES: + d->static_tr.elsize =3D 1; + break; + case DMA_SLAVE_BUSWIDTH_3_BYTES: + d->static_tr.elsize =3D 2; + break; + case DMA_SLAVE_BUSWIDTH_4_BYTES: + d->static_tr.elsize =3D 3; + break; + case DMA_SLAVE_BUSWIDTH_8_BYTES: + d->static_tr.elsize =3D 4; + break; + default: /* not reached */ + return -EINVAL; + } + + d->static_tr.elcnt =3D elcnt; + + if (uc->config.pkt_mode || !uc->cyclic) { + /* + * PDMA must close the packet when the channel is in packet mode. + * For TR mode when the channel is not cyclic we also need PDMA + * to close the packet otherwise the transfer will stall because + * PDMA holds on the data it has received from the peripheral. + */ + unsigned int div =3D dev_width * elcnt; + + if (uc->cyclic) + d->static_tr.bstcnt =3D d->residue / d->sglen / div; + else + d->static_tr.bstcnt =3D d->residue / div; + } else if (uc->ud->match_data->type =3D=3D DMA_TYPE_BCDMA && + uc->config.dir =3D=3D DMA_DEV_TO_MEM && + uc->cyclic) { + /* + * For cyclic mode with BCDMA we have to set EOP in each TR to + * prevent short packet errors seen on channel teardown. So the + * PDMA must close the packet after every TR transfer by setting + * burst count equal to the number of bytes transferred. + */ + struct cppi5_tr_type1_t *tr_req =3D d->hwdesc[0].tr_req_base; + + d->static_tr.bstcnt =3D + (tr_req->icnt0 * tr_req->icnt1) / dev_width; + } else { + d->static_tr.bstcnt =3D 0; + } + + if (uc->config.dir =3D=3D DMA_DEV_TO_MEM && + d->static_tr.bstcnt > uc->ud->match_data->statictr_z_mask) + return -EINVAL; + + return 0; +} + +struct udma_desc * +udma_prep_slave_sg_pkt(struct udma_chan *uc, struct scatterlist *sgl, + unsigned int sglen, enum dma_transfer_direction dir, + unsigned long tx_flags, void *context) +{ + struct scatterlist *sgent; + struct cppi5_host_desc_t *h_desc =3D NULL; + struct udma_desc *d; + u32 ring_id; + unsigned int i; + u64 asel; + + d =3D kzalloc(struct_size(d, hwdesc, sglen), GFP_NOWAIT); + if (!d) + return NULL; + + d->sglen =3D sglen; + d->hwdesc_count =3D sglen; + + if (dir =3D=3D DMA_DEV_TO_MEM) + ring_id =3D k3_ringacc_get_ring_id(uc->rflow->r_ring); + else + ring_id =3D k3_ringacc_get_ring_id(uc->tchan->tc_ring); + + if (uc->ud->match_data->type =3D=3D DMA_TYPE_UDMA) + asel =3D 0; + else + asel =3D (u64)uc->config.asel << K3_ADDRESS_ASEL_SHIFT; + + for_each_sg(sgl, sgent, sglen, i) { + struct udma_hwdesc *hwdesc =3D &d->hwdesc[i]; + dma_addr_t sg_addr =3D sg_dma_address(sgent); + struct cppi5_host_desc_t *desc; + size_t sg_len =3D sg_dma_len(sgent); + + hwdesc->cppi5_desc_vaddr =3D dma_pool_zalloc(uc->hdesc_pool, + GFP_NOWAIT, + &hwdesc->cppi5_desc_paddr); + if (!hwdesc->cppi5_desc_vaddr) { + dev_err(uc->ud->dev, + "descriptor%d allocation failed\n", i); + + udma_free_hwdesc(uc, d); + kfree(d); + return NULL; + } + + d->residue +=3D sg_len; + hwdesc->cppi5_desc_size =3D uc->config.hdesc_size; + desc =3D hwdesc->cppi5_desc_vaddr; + + if (i =3D=3D 0) { + cppi5_hdesc_init(desc, 0, 0); + /* Flow and Packed ID */ + cppi5_desc_set_pktids(&desc->hdr, uc->id, + CPPI5_INFO1_DESC_FLOWID_DEFAULT); + cppi5_desc_set_retpolicy(&desc->hdr, 0, ring_id); + } else { + cppi5_hdesc_reset_hbdesc(desc); + cppi5_desc_set_retpolicy(&desc->hdr, 0, 0xffff); + } + + /* attach the sg buffer to the descriptor */ + sg_addr |=3D asel; + cppi5_hdesc_attach_buf(desc, sg_addr, sg_len, sg_addr, sg_len); + + /* Attach link as host buffer descriptor */ + if (h_desc) + cppi5_hdesc_link_hbdesc(h_desc, + hwdesc->cppi5_desc_paddr | asel); + + if (uc->ud->match_data->type =3D=3D DMA_TYPE_PKTDMA || + dir =3D=3D DMA_MEM_TO_DEV) + h_desc =3D desc; + } + + if (d->residue >=3D SZ_4M) { + dev_err(uc->ud->dev, + "%s: Transfer size %u is over the supported 4M range\n", + __func__, d->residue); + udma_free_hwdesc(uc, d); + kfree(d); + return NULL; + } + + h_desc =3D d->hwdesc[0].cppi5_desc_vaddr; + cppi5_hdesc_set_pktlen(h_desc, d->residue); + + return d; +} + +int udma_attach_metadata(struct dma_async_tx_descriptor *desc, + void *data, size_t len) +{ + struct udma_desc *d =3D to_udma_desc(desc); + struct udma_chan *uc =3D to_udma_chan(desc->chan); + struct cppi5_host_desc_t *h_desc; + u32 psd_size =3D len; + u32 flags =3D 0; + + if (!uc->config.pkt_mode || !uc->config.metadata_size) + return -EOPNOTSUPP; + + if (!data || len > uc->config.metadata_size) + return -EINVAL; + + if (uc->config.needs_epib && len < CPPI5_INFO0_HDESC_EPIB_SIZE) + return -EINVAL; + + h_desc =3D d->hwdesc[0].cppi5_desc_vaddr; + if (d->dir =3D=3D DMA_MEM_TO_DEV) + memcpy(h_desc->epib, data, len); + + if (uc->config.needs_epib) + psd_size -=3D CPPI5_INFO0_HDESC_EPIB_SIZE; + + d->metadata =3D data; + d->metadata_size =3D len; + if (uc->config.needs_epib) + flags |=3D CPPI5_INFO0_HDESC_EPIB_PRESENT; + + cppi5_hdesc_update_flags(h_desc, flags); + cppi5_hdesc_update_psdata_size(h_desc, psd_size); + + return 0; +} + +void *udma_get_metadata_ptr(struct dma_async_tx_descriptor *desc, + size_t *payload_len, size_t *max_len) +{ + struct udma_desc *d =3D to_udma_desc(desc); + struct udma_chan *uc =3D to_udma_chan(desc->chan); + struct cppi5_host_desc_t *h_desc; + + if (!uc->config.pkt_mode || !uc->config.metadata_size) + return ERR_PTR(-EOPNOTSUPP); + + h_desc =3D d->hwdesc[0].cppi5_desc_vaddr; + + *max_len =3D uc->config.metadata_size; + + *payload_len =3D cppi5_hdesc_epib_present(&h_desc->hdr) ? + CPPI5_INFO0_HDESC_EPIB_SIZE : 0; + *payload_len +=3D cppi5_hdesc_get_psdata_size(h_desc); + + return h_desc->epib; +} + +int udma_set_metadata_len(struct dma_async_tx_descriptor *desc, + size_t payload_len) +{ + struct udma_desc *d =3D to_udma_desc(desc); + struct udma_chan *uc =3D to_udma_chan(desc->chan); + struct cppi5_host_desc_t *h_desc; + u32 psd_size =3D payload_len; + u32 flags =3D 0; + + if (!uc->config.pkt_mode || !uc->config.metadata_size) + return -EOPNOTSUPP; + + if (payload_len > uc->config.metadata_size) + return -EINVAL; + + if (uc->config.needs_epib && payload_len < CPPI5_INFO0_HDESC_EPIB_SIZE) + return -EINVAL; + + h_desc =3D d->hwdesc[0].cppi5_desc_vaddr; + + if (uc->config.needs_epib) { + psd_size -=3D CPPI5_INFO0_HDESC_EPIB_SIZE; + flags |=3D CPPI5_INFO0_HDESC_EPIB_PRESENT; + } + + cppi5_hdesc_update_flags(h_desc, flags); + cppi5_hdesc_update_psdata_size(h_desc, psd_size); + + return 0; +} + +struct dma_async_tx_descriptor * +udma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, + unsigned int sglen, enum dma_transfer_direction dir, + unsigned long tx_flags, void *context) +{ + struct udma_chan *uc =3D to_udma_chan(chan); + enum dma_slave_buswidth dev_width; + struct udma_desc *d; + u32 burst; + + if (dir !=3D uc->config.dir && + (uc->config.dir =3D=3D DMA_MEM_TO_MEM && !uc->config.tr_trigger_type)= ) { + dev_err(chan->device->dev, + "%s: chan%d is for %s, not supporting %s\n", + __func__, uc->id, + dmaengine_get_direction_text(uc->config.dir), + dmaengine_get_direction_text(dir)); + return NULL; + } + + if (dir =3D=3D DMA_DEV_TO_MEM) { + dev_width =3D uc->cfg.src_addr_width; + burst =3D uc->cfg.src_maxburst; + } else if (dir =3D=3D DMA_MEM_TO_DEV) { + dev_width =3D uc->cfg.dst_addr_width; + burst =3D uc->cfg.dst_maxburst; + } else { + dev_err(chan->device->dev, "%s: bad direction?\n", __func__); + return NULL; + } + + if (!burst) + burst =3D 1; + + uc->config.tx_flags =3D tx_flags; + + if (uc->config.pkt_mode) + d =3D udma_prep_slave_sg_pkt(uc, sgl, sglen, dir, tx_flags, + context); + else if (is_slave_direction(uc->config.dir)) + d =3D udma_prep_slave_sg_tr(uc, sgl, sglen, dir, tx_flags, + context); + else + d =3D udma_prep_slave_sg_triggered_tr(uc, sgl, sglen, dir, + tx_flags, context); + + if (!d) + return NULL; + + d->dir =3D dir; + d->desc_idx =3D 0; + d->tr_idx =3D 0; + + /* static TR for remote PDMA */ + if (udma_configure_statictr(uc, d, dev_width, burst)) { + dev_err(uc->ud->dev, + "%s: StaticTR Z is limited to maximum %u (%u)\n", + __func__, uc->ud->match_data->statictr_z_mask, + d->static_tr.bstcnt); + + udma_free_hwdesc(uc, d); + kfree(d); + return NULL; + } + + if (uc->config.metadata_size) + d->vd.tx.metadata_ops =3D &metadata_ops; + + return vchan_tx_prep(&uc->vc, &d->vd, tx_flags); +} +EXPORT_SYMBOL_GPL(udma_prep_slave_sg); + +struct udma_desc * +udma_prep_dma_cyclic_tr(struct udma_chan *uc, dma_addr_t buf_addr, + size_t buf_len, size_t period_len, + enum dma_transfer_direction dir, unsigned long flags) +{ + struct udma_desc *d; + size_t tr_size, period_addr; + struct cppi5_tr_type1_t *tr_req; + unsigned int periods =3D buf_len / period_len; + u16 tr0_cnt0, tr0_cnt1, tr1_cnt0; + unsigned int i; + int num_tr; + u32 period_csf =3D 0; + + num_tr =3D udma_get_tr_counters(period_len, __ffs(buf_addr), &tr0_cnt0, + &tr0_cnt1, &tr1_cnt0); + if (num_tr < 0) { + dev_err(uc->ud->dev, "size %zu is not supported\n", + period_len); + return NULL; + } + + /* Now allocate and setup the descriptor. */ + tr_size =3D sizeof(struct cppi5_tr_type1_t); + d =3D udma_alloc_tr_desc(uc, tr_size, periods * num_tr, dir); + if (!d) + return NULL; + + tr_req =3D d->hwdesc[0].tr_req_base; + if (uc->ud->match_data->type =3D=3D DMA_TYPE_UDMA) + period_addr =3D buf_addr; + else + period_addr =3D buf_addr | + ((u64)uc->config.asel << K3_ADDRESS_ASEL_SHIFT); + + /* + * For BCDMA <-> PDMA transfers, the EOP flag needs to be set on the + * last TR of a descriptor, to mark the packet as complete. + * This is required for getting the teardown completion message in case + * of TX, and to avoid short-packet error in case of RX. + * + * As we are in cyclic mode, we do not know which period might be the + * last one, so set the flag for each period. + */ + if (uc->config.ep_type =3D=3D PSIL_EP_PDMA_XY && + uc->ud->match_data->type =3D=3D DMA_TYPE_BCDMA) { + period_csf =3D CPPI5_TR_CSF_EOP; + } + + for (i =3D 0; i < periods; i++) { + int tr_idx =3D i * num_tr; + + cppi5_tr_init(&tr_req[tr_idx].flags, CPPI5_TR_TYPE1, false, + false, CPPI5_TR_EVENT_SIZE_COMPLETION, 0); + + tr_req[tr_idx].addr =3D period_addr; + tr_req[tr_idx].icnt0 =3D tr0_cnt0; + tr_req[tr_idx].icnt1 =3D tr0_cnt1; + tr_req[tr_idx].dim1 =3D tr0_cnt0; + + if (num_tr =3D=3D 2) { + cppi5_tr_csf_set(&tr_req[tr_idx].flags, + CPPI5_TR_CSF_SUPR_EVT); + tr_idx++; + + cppi5_tr_init(&tr_req[tr_idx].flags, CPPI5_TR_TYPE1, + false, false, + CPPI5_TR_EVENT_SIZE_COMPLETION, 0); + + tr_req[tr_idx].addr =3D period_addr + tr0_cnt1 * tr0_cnt0; + tr_req[tr_idx].icnt0 =3D tr1_cnt0; + tr_req[tr_idx].icnt1 =3D 1; + tr_req[tr_idx].dim1 =3D tr1_cnt0; + } + + if (!(flags & DMA_PREP_INTERRUPT)) + period_csf |=3D CPPI5_TR_CSF_SUPR_EVT; + + if (period_csf) + cppi5_tr_csf_set(&tr_req[tr_idx].flags, period_csf); + + period_addr +=3D period_len; + } + + return d; +} + +struct udma_desc * +udma_prep_dma_cyclic_pkt(struct udma_chan *uc, dma_addr_t buf_addr, + size_t buf_len, size_t period_len, + enum dma_transfer_direction dir, unsigned long flags) +{ + struct udma_desc *d; + u32 ring_id; + int i; + int periods =3D buf_len / period_len; + + if (periods > (K3_UDMA_DEFAULT_RING_SIZE - 1)) + return NULL; + + if (period_len >=3D SZ_4M) + return NULL; + + d =3D kzalloc(struct_size(d, hwdesc, periods), GFP_NOWAIT); + if (!d) + return NULL; + + d->hwdesc_count =3D periods; + + /* TODO: re-check this... */ + if (dir =3D=3D DMA_DEV_TO_MEM) + ring_id =3D k3_ringacc_get_ring_id(uc->rflow->r_ring); + else + ring_id =3D k3_ringacc_get_ring_id(uc->tchan->tc_ring); + + if (uc->ud->match_data->type !=3D DMA_TYPE_UDMA) + buf_addr |=3D (u64)uc->config.asel << K3_ADDRESS_ASEL_SHIFT; + + for (i =3D 0; i < periods; i++) { + struct udma_hwdesc *hwdesc =3D &d->hwdesc[i]; + dma_addr_t period_addr =3D buf_addr + (period_len * i); + struct cppi5_host_desc_t *h_desc; + + hwdesc->cppi5_desc_vaddr =3D dma_pool_zalloc(uc->hdesc_pool, + GFP_NOWAIT, + &hwdesc->cppi5_desc_paddr); + if (!hwdesc->cppi5_desc_vaddr) { + dev_err(uc->ud->dev, + "descriptor%d allocation failed\n", i); + + udma_free_hwdesc(uc, d); + kfree(d); + return NULL; + } + + hwdesc->cppi5_desc_size =3D uc->config.hdesc_size; + h_desc =3D hwdesc->cppi5_desc_vaddr; + + cppi5_hdesc_init(h_desc, 0, 0); + cppi5_hdesc_set_pktlen(h_desc, period_len); + + /* Flow and Packed ID */ + cppi5_desc_set_pktids(&h_desc->hdr, uc->id, + CPPI5_INFO1_DESC_FLOWID_DEFAULT); + cppi5_desc_set_retpolicy(&h_desc->hdr, 0, ring_id); + + /* attach each period to a new descriptor */ + cppi5_hdesc_attach_buf(h_desc, + period_addr, period_len, + period_addr, period_len); + } + + return d; +} + +struct dma_async_tx_descriptor * +udma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, size_t bu= f_len, + size_t period_len, enum dma_transfer_direction dir, + unsigned long flags) +{ + struct udma_chan *uc =3D to_udma_chan(chan); + enum dma_slave_buswidth dev_width; + struct udma_desc *d; + u32 burst; + + if (dir !=3D uc->config.dir) { + dev_err(chan->device->dev, + "%s: chan%d is for %s, not supporting %s\n", + __func__, uc->id, + dmaengine_get_direction_text(uc->config.dir), + dmaengine_get_direction_text(dir)); + return NULL; + } + + uc->cyclic =3D true; + + if (dir =3D=3D DMA_DEV_TO_MEM) { + dev_width =3D uc->cfg.src_addr_width; + burst =3D uc->cfg.src_maxburst; + } else if (dir =3D=3D DMA_MEM_TO_DEV) { + dev_width =3D uc->cfg.dst_addr_width; + burst =3D uc->cfg.dst_maxburst; + } else { + dev_err(uc->ud->dev, "%s: bad direction?\n", __func__); + return NULL; + } + + if (!burst) + burst =3D 1; + + if (uc->config.pkt_mode) + d =3D udma_prep_dma_cyclic_pkt(uc, buf_addr, buf_len, period_len, + dir, flags); + else + d =3D udma_prep_dma_cyclic_tr(uc, buf_addr, buf_len, period_len, + dir, flags); + + if (!d) + return NULL; + + d->sglen =3D buf_len / period_len; + + d->dir =3D dir; + d->residue =3D buf_len; + + /* static TR for remote PDMA */ + if (udma_configure_statictr(uc, d, dev_width, burst)) { + dev_err(uc->ud->dev, + "%s: StaticTR Z is limited to maximum %u (%u)\n", + __func__, uc->ud->match_data->statictr_z_mask, + d->static_tr.bstcnt); + + udma_free_hwdesc(uc, d); + kfree(d); + return NULL; + } + + if (uc->config.metadata_size) + d->vd.tx.metadata_ops =3D &metadata_ops; + + return vchan_tx_prep(&uc->vc, &d->vd, flags); +} +EXPORT_SYMBOL_GPL(udma_prep_dma_cyclic); + +struct dma_async_tx_descriptor * +udma_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t sr= c, + size_t len, unsigned long tx_flags) +{ + struct udma_chan *uc =3D to_udma_chan(chan); + struct udma_desc *d; + struct cppi5_tr_type15_t *tr_req; + int num_tr; + size_t tr_size =3D sizeof(struct cppi5_tr_type15_t); + u16 tr0_cnt0, tr0_cnt1, tr1_cnt0; + u32 csf =3D CPPI5_TR_CSF_SUPR_EVT; + + if (uc->config.dir !=3D DMA_MEM_TO_MEM) { + dev_err(chan->device->dev, + "%s: chan%d is for %s, not supporting %s\n", + __func__, uc->id, + dmaengine_get_direction_text(uc->config.dir), + dmaengine_get_direction_text(DMA_MEM_TO_MEM)); + return NULL; + } + + num_tr =3D udma_get_tr_counters(len, __ffs(src | dest), &tr0_cnt0, + &tr0_cnt1, &tr1_cnt0); + if (num_tr < 0) { + dev_err(uc->ud->dev, "size %zu is not supported\n", + len); + return NULL; + } + + d =3D udma_alloc_tr_desc(uc, tr_size, num_tr, DMA_MEM_TO_MEM); + if (!d) + return NULL; + + d->dir =3D DMA_MEM_TO_MEM; + d->desc_idx =3D 0; + d->tr_idx =3D 0; + d->residue =3D len; + + if (uc->ud->match_data->type !=3D DMA_TYPE_UDMA) { + src |=3D (u64)uc->ud->asel << K3_ADDRESS_ASEL_SHIFT; + dest |=3D (u64)uc->ud->asel << K3_ADDRESS_ASEL_SHIFT; + } else { + csf |=3D CPPI5_TR_CSF_EOL_ICNT0; + } + + tr_req =3D d->hwdesc[0].tr_req_base; + + cppi5_tr_init(&tr_req[0].flags, CPPI5_TR_TYPE15, false, true, + CPPI5_TR_EVENT_SIZE_COMPLETION, 0); + cppi5_tr_csf_set(&tr_req[0].flags, csf); + + tr_req[0].addr =3D src; + tr_req[0].icnt0 =3D tr0_cnt0; + tr_req[0].icnt1 =3D tr0_cnt1; + tr_req[0].icnt2 =3D 1; + tr_req[0].icnt3 =3D 1; + tr_req[0].dim1 =3D tr0_cnt0; + + tr_req[0].daddr =3D dest; + tr_req[0].dicnt0 =3D tr0_cnt0; + tr_req[0].dicnt1 =3D tr0_cnt1; + tr_req[0].dicnt2 =3D 1; + tr_req[0].dicnt3 =3D 1; + tr_req[0].ddim1 =3D tr0_cnt0; + + if (num_tr =3D=3D 2) { + cppi5_tr_init(&tr_req[1].flags, CPPI5_TR_TYPE15, false, true, + CPPI5_TR_EVENT_SIZE_COMPLETION, 0); + cppi5_tr_csf_set(&tr_req[1].flags, csf); + + tr_req[1].addr =3D src + tr0_cnt1 * tr0_cnt0; + tr_req[1].icnt0 =3D tr1_cnt0; + tr_req[1].icnt1 =3D 1; + tr_req[1].icnt2 =3D 1; + tr_req[1].icnt3 =3D 1; + + tr_req[1].daddr =3D dest + tr0_cnt1 * tr0_cnt0; + tr_req[1].dicnt0 =3D tr1_cnt0; + tr_req[1].dicnt1 =3D 1; + tr_req[1].dicnt2 =3D 1; + tr_req[1].dicnt3 =3D 1; + } + + cppi5_tr_csf_set(&tr_req[num_tr - 1].flags, csf | CPPI5_TR_CSF_EOP); + + if (uc->config.metadata_size) + d->vd.tx.metadata_ops =3D &metadata_ops; + + return vchan_tx_prep(&uc->vc, &d->vd, tx_flags); +} +EXPORT_SYMBOL_GPL(udma_prep_dma_memcpy); + +void udma_desc_pre_callback(struct virt_dma_chan *vc, + struct virt_dma_desc *vd, + struct dmaengine_result *result) +{ + struct udma_chan *uc =3D to_udma_chan(&vc->chan); + struct udma_desc *d; + u8 status; + + if (!vd) + return; + + d =3D to_udma_desc(&vd->tx); + + if (d->metadata_size) + udma_fetch_epib(uc, d); + + if (result) { + void *desc_vaddr =3D udma_curr_cppi5_desc_vaddr(d, d->desc_idx); + + if (cppi5_desc_get_type(desc_vaddr) =3D=3D + CPPI5_INFO0_DESC_TYPE_VAL_HOST) { + /* Provide residue information for the client */ + result->residue =3D d->residue - + cppi5_hdesc_get_pktlen(desc_vaddr); + if (result->residue) + result->result =3D DMA_TRANS_ABORTED; + else + result->result =3D DMA_TRANS_NOERROR; + } else { + result->residue =3D 0; + /* Propagate TR Response errors to the client */ + status =3D d->hwdesc[0].tr_resp_base->status; + if (status) + result->result =3D DMA_TRANS_ABORTED; + else + result->result =3D DMA_TRANS_NOERROR; + } + } +} +EXPORT_SYMBOL_GPL(udma_desc_pre_callback); + +MODULE_DESCRIPTION("Texas Instruments K3 UDMA Common Library"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 5336ec9fe79ce..a8fe919f307f6 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -131,105 +131,6 @@ static void udma_dump_chan_stdata(struct udma_chan *u= c) } } =20 -static struct udma_desc *udma_udma_desc_from_paddr(struct udma_chan *uc, - dma_addr_t paddr) -{ - struct udma_desc *d =3D uc->terminated_desc; - - if (d) { - dma_addr_t desc_paddr =3D udma_curr_cppi5_desc_paddr(d, - d->desc_idx); - - if (desc_paddr !=3D paddr) - d =3D NULL; - } - - if (!d) { - d =3D uc->desc; - if (d) { - dma_addr_t desc_paddr =3D udma_curr_cppi5_desc_paddr(d, - d->desc_idx); - - if (desc_paddr !=3D paddr) - d =3D NULL; - } - } - - return d; -} - -static void udma_free_hwdesc(struct udma_chan *uc, struct udma_desc *d) -{ - if (uc->use_dma_pool) { - int i; - - for (i =3D 0; i < d->hwdesc_count; i++) { - if (!d->hwdesc[i].cppi5_desc_vaddr) - continue; - - dma_pool_free(uc->hdesc_pool, - d->hwdesc[i].cppi5_desc_vaddr, - d->hwdesc[i].cppi5_desc_paddr); - - d->hwdesc[i].cppi5_desc_vaddr =3D NULL; - } - } else if (d->hwdesc[0].cppi5_desc_vaddr) { - dma_free_coherent(uc->dma_dev, d->hwdesc[0].cppi5_desc_size, - d->hwdesc[0].cppi5_desc_vaddr, - d->hwdesc[0].cppi5_desc_paddr); - - d->hwdesc[0].cppi5_desc_vaddr =3D NULL; - } -} - -static void udma_purge_desc_work(struct work_struct *work) -{ - struct udma_dev *ud =3D container_of(work, typeof(*ud), purge_work); - struct virt_dma_desc *vd, *_vd; - unsigned long flags; - LIST_HEAD(head); - - spin_lock_irqsave(&ud->lock, flags); - list_splice_tail_init(&ud->desc_to_purge, &head); - spin_unlock_irqrestore(&ud->lock, flags); - - list_for_each_entry_safe(vd, _vd, &head, node) { - struct udma_chan *uc =3D to_udma_chan(vd->tx.chan); - struct udma_desc *d =3D to_udma_desc(&vd->tx); - - udma_free_hwdesc(uc, d); - list_del(&vd->node); - kfree(d); - } - - /* If more to purge, schedule the work again */ - if (!list_empty(&ud->desc_to_purge)) - schedule_work(&ud->purge_work); -} - -static void udma_desc_free(struct virt_dma_desc *vd) -{ - struct udma_dev *ud =3D to_udma_dev(vd->tx.chan->device); - struct udma_chan *uc =3D to_udma_chan(vd->tx.chan); - struct udma_desc *d =3D to_udma_desc(&vd->tx); - unsigned long flags; - - if (uc->terminated_desc =3D=3D d) - uc->terminated_desc =3D NULL; - - if (uc->use_dma_pool) { - udma_free_hwdesc(uc, d); - kfree(d); - return; - } - - spin_lock_irqsave(&ud->lock, flags); - list_add_tail(&vd->node, &ud->desc_to_purge); - spin_unlock_irqrestore(&ud->lock, flags); - - schedule_work(&ud->purge_work); -} - static bool udma_is_chan_running(struct udma_chan *uc) { u32 trt_ctl =3D 0; @@ -303,17 +204,6 @@ static int udma_push_to_ring(struct udma_chan *uc, int= idx) return k3_ringacc_ring_push(ring, &paddr); } =20 -static bool udma_desc_is_rx_flush(struct udma_chan *uc, dma_addr_t addr) -{ - if (uc->config.dir !=3D DMA_DEV_TO_MEM) - return false; - - if (addr =3D=3D udma_get_rx_flush_hwdesc_paddr(uc)) - return true; - - return false; -} - static int udma_pop_from_ring(struct udma_chan *uc, dma_addr_t *addr) { struct k3_ring *ring =3D NULL; @@ -674,33 +564,6 @@ static void udma_cyclic_packet_elapsed(struct udma_cha= n *uc) d->desc_idx =3D (d->desc_idx + 1) % d->sglen; } =20 -static bool udma_is_desc_really_done(struct udma_chan *uc, struct udma_des= c *d) -{ - u32 peer_bcnt, bcnt; - - /* - * Only TX towards PDMA is affected. - * If DMA_PREP_INTERRUPT is not set by consumer then skip the transfer - * completion calculation, consumer must ensure that there is no stale - * data in DMA fabric in this case. - */ - if (uc->config.ep_type =3D=3D PSIL_EP_NATIVE || - uc->config.dir !=3D DMA_MEM_TO_DEV || !(uc->config.tx_flags & DMA_PRE= P_INTERRUPT)) - return true; - - peer_bcnt =3D udma_tchanrt_read(uc, UDMA_CHAN_RT_PEER_BCNT_REG); - bcnt =3D udma_tchanrt_read(uc, UDMA_CHAN_RT_BCNT_REG); - - /* Transfer is incomplete, store current residue and time stamp */ - if (peer_bcnt < bcnt) { - uc->tx_drain.residue =3D bcnt - peer_bcnt; - uc->tx_drain.tstamp =3D ktime_get(); - return false; - } - - return true; -} - static void udma_check_tx_completion(struct work_struct *work) { struct udma_chan *uc =3D container_of(work, typeof(*uc), @@ -2344,1047 +2207,6 @@ static int udma_slave_config(struct dma_chan *chan, return 0; } =20 -static struct udma_desc *udma_alloc_tr_desc(struct udma_chan *uc, - size_t tr_size, int tr_count, - enum dma_transfer_direction dir) -{ - struct udma_hwdesc *hwdesc; - struct cppi5_desc_hdr_t *tr_desc; - struct udma_desc *d; - u32 reload_count =3D 0; - u32 ring_id; - - switch (tr_size) { - case 16: - case 32: - case 64: - case 128: - break; - default: - dev_err(uc->ud->dev, "Unsupported TR size of %zu\n", tr_size); - return NULL; - } - - /* We have only one descriptor containing multiple TRs */ - d =3D kzalloc(sizeof(*d) + sizeof(d->hwdesc[0]), GFP_NOWAIT); - if (!d) - return NULL; - - d->sglen =3D tr_count; - - d->hwdesc_count =3D 1; - hwdesc =3D &d->hwdesc[0]; - - /* Allocate memory for DMA ring descriptor */ - if (uc->use_dma_pool) { - hwdesc->cppi5_desc_size =3D uc->config.hdesc_size; - hwdesc->cppi5_desc_vaddr =3D dma_pool_zalloc(uc->hdesc_pool, - GFP_NOWAIT, - &hwdesc->cppi5_desc_paddr); - } else { - hwdesc->cppi5_desc_size =3D cppi5_trdesc_calc_size(tr_size, - tr_count); - hwdesc->cppi5_desc_size =3D ALIGN(hwdesc->cppi5_desc_size, - uc->ud->desc_align); - hwdesc->cppi5_desc_vaddr =3D dma_alloc_coherent(uc->ud->dev, - hwdesc->cppi5_desc_size, - &hwdesc->cppi5_desc_paddr, - GFP_NOWAIT); - } - - if (!hwdesc->cppi5_desc_vaddr) { - kfree(d); - return NULL; - } - - /* Start of the TR req records */ - hwdesc->tr_req_base =3D hwdesc->cppi5_desc_vaddr + tr_size; - /* Start address of the TR response array */ - hwdesc->tr_resp_base =3D hwdesc->tr_req_base + tr_size * tr_count; - - tr_desc =3D hwdesc->cppi5_desc_vaddr; - - if (uc->cyclic) - reload_count =3D CPPI5_INFO0_TRDESC_RLDCNT_INFINITE; - - if (dir =3D=3D DMA_DEV_TO_MEM) - ring_id =3D k3_ringacc_get_ring_id(uc->rflow->r_ring); - else - ring_id =3D k3_ringacc_get_ring_id(uc->tchan->tc_ring); - - cppi5_trdesc_init(tr_desc, tr_count, tr_size, 0, reload_count); - cppi5_desc_set_pktids(tr_desc, uc->id, - CPPI5_INFO1_DESC_FLOWID_DEFAULT); - cppi5_desc_set_retpolicy(tr_desc, 0, ring_id); - - return d; -} - -/** - * udma_get_tr_counters - calculate TR counters for a given length - * @len: Length of the trasnfer - * @align_to: Preferred alignment - * @tr0_cnt0: First TR icnt0 - * @tr0_cnt1: First TR icnt1 - * @tr1_cnt0: Second (if used) TR icnt0 - * - * For len < SZ_64K only one TR is enough, tr1_cnt0 is not updated - * For len >=3D SZ_64K two TRs are used in a simple way: - * First TR: SZ_64K-alignment blocks (tr0_cnt0, tr0_cnt1) - * Second TR: the remaining length (tr1_cnt0) - * - * Returns the number of TRs the length needs (1 or 2) - * -EINVAL if the length can not be supported - */ -static int udma_get_tr_counters(size_t len, unsigned long align_to, - u16 *tr0_cnt0, u16 *tr0_cnt1, u16 *tr1_cnt0) -{ - if (len < SZ_64K) { - *tr0_cnt0 =3D len; - *tr0_cnt1 =3D 1; - - return 1; - } - - if (align_to > 3) - align_to =3D 3; - -realign: - *tr0_cnt0 =3D SZ_64K - BIT(align_to); - if (len / *tr0_cnt0 >=3D SZ_64K) { - if (align_to) { - align_to--; - goto realign; - } - return -EINVAL; - } - - *tr0_cnt1 =3D len / *tr0_cnt0; - *tr1_cnt0 =3D len % *tr0_cnt0; - - return 2; -} - -static struct udma_desc * -udma_prep_slave_sg_tr(struct udma_chan *uc, struct scatterlist *sgl, - unsigned int sglen, enum dma_transfer_direction dir, - unsigned long tx_flags, void *context) -{ - struct scatterlist *sgent; - struct udma_desc *d; - struct cppi5_tr_type1_t *tr_req =3D NULL; - u16 tr0_cnt0, tr0_cnt1, tr1_cnt0; - unsigned int i; - size_t tr_size; - int num_tr =3D 0; - int tr_idx =3D 0; - u64 asel; - - /* estimate the number of TRs we will need */ - for_each_sg(sgl, sgent, sglen, i) { - if (sg_dma_len(sgent) < SZ_64K) - num_tr++; - else - num_tr +=3D 2; - } - - /* Now allocate and setup the descriptor. */ - tr_size =3D sizeof(struct cppi5_tr_type1_t); - d =3D udma_alloc_tr_desc(uc, tr_size, num_tr, dir); - if (!d) - return NULL; - - d->sglen =3D sglen; - - if (uc->ud->match_data->type =3D=3D DMA_TYPE_UDMA) - asel =3D 0; - else - asel =3D (u64)uc->config.asel << K3_ADDRESS_ASEL_SHIFT; - - tr_req =3D d->hwdesc[0].tr_req_base; - for_each_sg(sgl, sgent, sglen, i) { - dma_addr_t sg_addr =3D sg_dma_address(sgent); - - num_tr =3D udma_get_tr_counters(sg_dma_len(sgent), __ffs(sg_addr), - &tr0_cnt0, &tr0_cnt1, &tr1_cnt0); - if (num_tr < 0) { - dev_err(uc->ud->dev, "size %u is not supported\n", - sg_dma_len(sgent)); - udma_free_hwdesc(uc, d); - kfree(d); - return NULL; - } - - cppi5_tr_init(&tr_req[tr_idx].flags, CPPI5_TR_TYPE1, false, - false, CPPI5_TR_EVENT_SIZE_COMPLETION, 0); - cppi5_tr_csf_set(&tr_req[tr_idx].flags, CPPI5_TR_CSF_SUPR_EVT); - - sg_addr |=3D asel; - tr_req[tr_idx].addr =3D sg_addr; - tr_req[tr_idx].icnt0 =3D tr0_cnt0; - tr_req[tr_idx].icnt1 =3D tr0_cnt1; - tr_req[tr_idx].dim1 =3D tr0_cnt0; - tr_idx++; - - if (num_tr =3D=3D 2) { - cppi5_tr_init(&tr_req[tr_idx].flags, CPPI5_TR_TYPE1, - false, false, - CPPI5_TR_EVENT_SIZE_COMPLETION, 0); - cppi5_tr_csf_set(&tr_req[tr_idx].flags, - CPPI5_TR_CSF_SUPR_EVT); - - tr_req[tr_idx].addr =3D sg_addr + tr0_cnt1 * tr0_cnt0; - tr_req[tr_idx].icnt0 =3D tr1_cnt0; - tr_req[tr_idx].icnt1 =3D 1; - tr_req[tr_idx].dim1 =3D tr1_cnt0; - tr_idx++; - } - - d->residue +=3D sg_dma_len(sgent); - } - - cppi5_tr_csf_set(&tr_req[tr_idx - 1].flags, - CPPI5_TR_CSF_SUPR_EVT | CPPI5_TR_CSF_EOP); - - return d; -} - -static struct udma_desc * -udma_prep_slave_sg_triggered_tr(struct udma_chan *uc, struct scatterlist *= sgl, - unsigned int sglen, - enum dma_transfer_direction dir, - unsigned long tx_flags, void *context) -{ - struct scatterlist *sgent; - struct cppi5_tr_type15_t *tr_req =3D NULL; - enum dma_slave_buswidth dev_width; - u32 csf =3D CPPI5_TR_CSF_SUPR_EVT; - u16 tr_cnt0, tr_cnt1; - dma_addr_t dev_addr; - struct udma_desc *d; - unsigned int i; - size_t tr_size, sg_len; - int num_tr =3D 0; - int tr_idx =3D 0; - u32 burst, trigger_size, port_window; - u64 asel; - - if (dir =3D=3D DMA_DEV_TO_MEM) { - dev_addr =3D uc->cfg.src_addr; - dev_width =3D uc->cfg.src_addr_width; - burst =3D uc->cfg.src_maxburst; - port_window =3D uc->cfg.src_port_window_size; - } else if (dir =3D=3D DMA_MEM_TO_DEV) { - dev_addr =3D uc->cfg.dst_addr; - dev_width =3D uc->cfg.dst_addr_width; - burst =3D uc->cfg.dst_maxburst; - port_window =3D uc->cfg.dst_port_window_size; - } else { - dev_err(uc->ud->dev, "%s: bad direction?\n", __func__); - return NULL; - } - - if (!burst) - burst =3D 1; - - if (port_window) { - if (port_window !=3D burst) { - dev_err(uc->ud->dev, - "The burst must be equal to port_window\n"); - return NULL; - } - - tr_cnt0 =3D dev_width * port_window; - tr_cnt1 =3D 1; - } else { - tr_cnt0 =3D dev_width; - tr_cnt1 =3D burst; - } - trigger_size =3D tr_cnt0 * tr_cnt1; - - /* estimate the number of TRs we will need */ - for_each_sg(sgl, sgent, sglen, i) { - sg_len =3D sg_dma_len(sgent); - - if (sg_len % trigger_size) { - dev_err(uc->ud->dev, - "Not aligned SG entry (%zu for %u)\n", sg_len, - trigger_size); - return NULL; - } - - if (sg_len / trigger_size < SZ_64K) - num_tr++; - else - num_tr +=3D 2; - } - - /* Now allocate and setup the descriptor. */ - tr_size =3D sizeof(struct cppi5_tr_type15_t); - d =3D udma_alloc_tr_desc(uc, tr_size, num_tr, dir); - if (!d) - return NULL; - - d->sglen =3D sglen; - - if (uc->ud->match_data->type =3D=3D DMA_TYPE_UDMA) { - asel =3D 0; - csf |=3D CPPI5_TR_CSF_EOL_ICNT0; - } else { - asel =3D (u64)uc->config.asel << K3_ADDRESS_ASEL_SHIFT; - dev_addr |=3D asel; - } - - tr_req =3D d->hwdesc[0].tr_req_base; - for_each_sg(sgl, sgent, sglen, i) { - u16 tr0_cnt2, tr0_cnt3, tr1_cnt2; - dma_addr_t sg_addr =3D sg_dma_address(sgent); - - sg_len =3D sg_dma_len(sgent); - num_tr =3D udma_get_tr_counters(sg_len / trigger_size, 0, - &tr0_cnt2, &tr0_cnt3, &tr1_cnt2); - if (num_tr < 0) { - dev_err(uc->ud->dev, "size %zu is not supported\n", - sg_len); - udma_free_hwdesc(uc, d); - kfree(d); - return NULL; - } - - cppi5_tr_init(&tr_req[tr_idx].flags, CPPI5_TR_TYPE15, false, - true, CPPI5_TR_EVENT_SIZE_COMPLETION, 0); - cppi5_tr_csf_set(&tr_req[tr_idx].flags, csf); - cppi5_tr_set_trigger(&tr_req[tr_idx].flags, - uc->config.tr_trigger_type, - CPPI5_TR_TRIGGER_TYPE_ICNT2_DEC, 0, 0); - - sg_addr |=3D asel; - if (dir =3D=3D DMA_DEV_TO_MEM) { - tr_req[tr_idx].addr =3D dev_addr; - tr_req[tr_idx].icnt0 =3D tr_cnt0; - tr_req[tr_idx].icnt1 =3D tr_cnt1; - tr_req[tr_idx].icnt2 =3D tr0_cnt2; - tr_req[tr_idx].icnt3 =3D tr0_cnt3; - tr_req[tr_idx].dim1 =3D (-1) * tr_cnt0; - - tr_req[tr_idx].daddr =3D sg_addr; - tr_req[tr_idx].dicnt0 =3D tr_cnt0; - tr_req[tr_idx].dicnt1 =3D tr_cnt1; - tr_req[tr_idx].dicnt2 =3D tr0_cnt2; - tr_req[tr_idx].dicnt3 =3D tr0_cnt3; - tr_req[tr_idx].ddim1 =3D tr_cnt0; - tr_req[tr_idx].ddim2 =3D trigger_size; - tr_req[tr_idx].ddim3 =3D trigger_size * tr0_cnt2; - } else { - tr_req[tr_idx].addr =3D sg_addr; - tr_req[tr_idx].icnt0 =3D tr_cnt0; - tr_req[tr_idx].icnt1 =3D tr_cnt1; - tr_req[tr_idx].icnt2 =3D tr0_cnt2; - tr_req[tr_idx].icnt3 =3D tr0_cnt3; - tr_req[tr_idx].dim1 =3D tr_cnt0; - tr_req[tr_idx].dim2 =3D trigger_size; - tr_req[tr_idx].dim3 =3D trigger_size * tr0_cnt2; - - tr_req[tr_idx].daddr =3D dev_addr; - tr_req[tr_idx].dicnt0 =3D tr_cnt0; - tr_req[tr_idx].dicnt1 =3D tr_cnt1; - tr_req[tr_idx].dicnt2 =3D tr0_cnt2; - tr_req[tr_idx].dicnt3 =3D tr0_cnt3; - tr_req[tr_idx].ddim1 =3D (-1) * tr_cnt0; - } - - tr_idx++; - - if (num_tr =3D=3D 2) { - cppi5_tr_init(&tr_req[tr_idx].flags, CPPI5_TR_TYPE15, - false, true, - CPPI5_TR_EVENT_SIZE_COMPLETION, 0); - cppi5_tr_csf_set(&tr_req[tr_idx].flags, csf); - cppi5_tr_set_trigger(&tr_req[tr_idx].flags, - uc->config.tr_trigger_type, - CPPI5_TR_TRIGGER_TYPE_ICNT2_DEC, - 0, 0); - - sg_addr +=3D trigger_size * tr0_cnt2 * tr0_cnt3; - if (dir =3D=3D DMA_DEV_TO_MEM) { - tr_req[tr_idx].addr =3D dev_addr; - tr_req[tr_idx].icnt0 =3D tr_cnt0; - tr_req[tr_idx].icnt1 =3D tr_cnt1; - tr_req[tr_idx].icnt2 =3D tr1_cnt2; - tr_req[tr_idx].icnt3 =3D 1; - tr_req[tr_idx].dim1 =3D (-1) * tr_cnt0; - - tr_req[tr_idx].daddr =3D sg_addr; - tr_req[tr_idx].dicnt0 =3D tr_cnt0; - tr_req[tr_idx].dicnt1 =3D tr_cnt1; - tr_req[tr_idx].dicnt2 =3D tr1_cnt2; - tr_req[tr_idx].dicnt3 =3D 1; - tr_req[tr_idx].ddim1 =3D tr_cnt0; - tr_req[tr_idx].ddim2 =3D trigger_size; - } else { - tr_req[tr_idx].addr =3D sg_addr; - tr_req[tr_idx].icnt0 =3D tr_cnt0; - tr_req[tr_idx].icnt1 =3D tr_cnt1; - tr_req[tr_idx].icnt2 =3D tr1_cnt2; - tr_req[tr_idx].icnt3 =3D 1; - tr_req[tr_idx].dim1 =3D tr_cnt0; - tr_req[tr_idx].dim2 =3D trigger_size; - - tr_req[tr_idx].daddr =3D dev_addr; - tr_req[tr_idx].dicnt0 =3D tr_cnt0; - tr_req[tr_idx].dicnt1 =3D tr_cnt1; - tr_req[tr_idx].dicnt2 =3D tr1_cnt2; - tr_req[tr_idx].dicnt3 =3D 1; - tr_req[tr_idx].ddim1 =3D (-1) * tr_cnt0; - } - tr_idx++; - } - - d->residue +=3D sg_len; - } - - cppi5_tr_csf_set(&tr_req[tr_idx - 1].flags, csf | CPPI5_TR_CSF_EOP); - - return d; -} - -static int udma_configure_statictr(struct udma_chan *uc, struct udma_desc = *d, - enum dma_slave_buswidth dev_width, - u16 elcnt) -{ - if (uc->config.ep_type !=3D PSIL_EP_PDMA_XY) - return 0; - - /* Bus width translates to the element size (ES) */ - switch (dev_width) { - case DMA_SLAVE_BUSWIDTH_1_BYTE: - d->static_tr.elsize =3D 0; - break; - case DMA_SLAVE_BUSWIDTH_2_BYTES: - d->static_tr.elsize =3D 1; - break; - case DMA_SLAVE_BUSWIDTH_3_BYTES: - d->static_tr.elsize =3D 2; - break; - case DMA_SLAVE_BUSWIDTH_4_BYTES: - d->static_tr.elsize =3D 3; - break; - case DMA_SLAVE_BUSWIDTH_8_BYTES: - d->static_tr.elsize =3D 4; - break; - default: /* not reached */ - return -EINVAL; - } - - d->static_tr.elcnt =3D elcnt; - - if (uc->config.pkt_mode || !uc->cyclic) { - /* - * PDMA must close the packet when the channel is in packet mode. - * For TR mode when the channel is not cyclic we also need PDMA - * to close the packet otherwise the transfer will stall because - * PDMA holds on the data it has received from the peripheral. - */ - unsigned int div =3D dev_width * elcnt; - - if (uc->cyclic) - d->static_tr.bstcnt =3D d->residue / d->sglen / div; - else - d->static_tr.bstcnt =3D d->residue / div; - } else if (uc->ud->match_data->type =3D=3D DMA_TYPE_BCDMA && - uc->config.dir =3D=3D DMA_DEV_TO_MEM && - uc->cyclic) { - /* - * For cyclic mode with BCDMA we have to set EOP in each TR to - * prevent short packet errors seen on channel teardown. So the - * PDMA must close the packet after every TR transfer by setting - * burst count equal to the number of bytes transferred. - */ - struct cppi5_tr_type1_t *tr_req =3D d->hwdesc[0].tr_req_base; - - d->static_tr.bstcnt =3D - (tr_req->icnt0 * tr_req->icnt1) / dev_width; - } else { - d->static_tr.bstcnt =3D 0; - } - - if (uc->config.dir =3D=3D DMA_DEV_TO_MEM && - d->static_tr.bstcnt > uc->ud->match_data->statictr_z_mask) - return -EINVAL; - - return 0; -} - -static struct udma_desc * -udma_prep_slave_sg_pkt(struct udma_chan *uc, struct scatterlist *sgl, - unsigned int sglen, enum dma_transfer_direction dir, - unsigned long tx_flags, void *context) -{ - struct scatterlist *sgent; - struct cppi5_host_desc_t *h_desc =3D NULL; - struct udma_desc *d; - u32 ring_id; - unsigned int i; - u64 asel; - - d =3D kzalloc_flex(*d, hwdesc, sglen, GFP_NOWAIT); - if (!d) - return NULL; - - d->sglen =3D sglen; - d->hwdesc_count =3D sglen; - - if (dir =3D=3D DMA_DEV_TO_MEM) - ring_id =3D k3_ringacc_get_ring_id(uc->rflow->r_ring); - else - ring_id =3D k3_ringacc_get_ring_id(uc->tchan->tc_ring); - - if (uc->ud->match_data->type =3D=3D DMA_TYPE_UDMA) - asel =3D 0; - else - asel =3D (u64)uc->config.asel << K3_ADDRESS_ASEL_SHIFT; - - for_each_sg(sgl, sgent, sglen, i) { - struct udma_hwdesc *hwdesc =3D &d->hwdesc[i]; - dma_addr_t sg_addr =3D sg_dma_address(sgent); - struct cppi5_host_desc_t *desc; - size_t sg_len =3D sg_dma_len(sgent); - - hwdesc->cppi5_desc_vaddr =3D dma_pool_zalloc(uc->hdesc_pool, - GFP_NOWAIT, - &hwdesc->cppi5_desc_paddr); - if (!hwdesc->cppi5_desc_vaddr) { - dev_err(uc->ud->dev, - "descriptor%d allocation failed\n", i); - - udma_free_hwdesc(uc, d); - kfree(d); - return NULL; - } - - d->residue +=3D sg_len; - hwdesc->cppi5_desc_size =3D uc->config.hdesc_size; - desc =3D hwdesc->cppi5_desc_vaddr; - - if (i =3D=3D 0) { - cppi5_hdesc_init(desc, 0, 0); - /* Flow and Packed ID */ - cppi5_desc_set_pktids(&desc->hdr, uc->id, - CPPI5_INFO1_DESC_FLOWID_DEFAULT); - cppi5_desc_set_retpolicy(&desc->hdr, 0, ring_id); - } else { - cppi5_hdesc_reset_hbdesc(desc); - cppi5_desc_set_retpolicy(&desc->hdr, 0, 0xffff); - } - - /* attach the sg buffer to the descriptor */ - sg_addr |=3D asel; - cppi5_hdesc_attach_buf(desc, sg_addr, sg_len, sg_addr, sg_len); - - /* Attach link as host buffer descriptor */ - if (h_desc) - cppi5_hdesc_link_hbdesc(h_desc, - hwdesc->cppi5_desc_paddr | asel); - - if (uc->ud->match_data->type =3D=3D DMA_TYPE_PKTDMA || - dir =3D=3D DMA_MEM_TO_DEV) - h_desc =3D desc; - } - - if (d->residue >=3D SZ_4M) { - dev_err(uc->ud->dev, - "%s: Transfer size %u is over the supported 4M range\n", - __func__, d->residue); - udma_free_hwdesc(uc, d); - kfree(d); - return NULL; - } - - h_desc =3D d->hwdesc[0].cppi5_desc_vaddr; - cppi5_hdesc_set_pktlen(h_desc, d->residue); - - return d; -} - -static int udma_attach_metadata(struct dma_async_tx_descriptor *desc, - void *data, size_t len) -{ - struct udma_desc *d =3D to_udma_desc(desc); - struct udma_chan *uc =3D to_udma_chan(desc->chan); - struct cppi5_host_desc_t *h_desc; - u32 psd_size =3D len; - u32 flags =3D 0; - - if (!uc->config.pkt_mode || !uc->config.metadata_size) - return -ENOTSUPP; - - if (!data || len > uc->config.metadata_size) - return -EINVAL; - - if (uc->config.needs_epib && len < CPPI5_INFO0_HDESC_EPIB_SIZE) - return -EINVAL; - - h_desc =3D d->hwdesc[0].cppi5_desc_vaddr; - if (d->dir =3D=3D DMA_MEM_TO_DEV) - memcpy(h_desc->epib, data, len); - - if (uc->config.needs_epib) - psd_size -=3D CPPI5_INFO0_HDESC_EPIB_SIZE; - - d->metadata =3D data; - d->metadata_size =3D len; - if (uc->config.needs_epib) - flags |=3D CPPI5_INFO0_HDESC_EPIB_PRESENT; - - cppi5_hdesc_update_flags(h_desc, flags); - cppi5_hdesc_update_psdata_size(h_desc, psd_size); - - return 0; -} - -static void *udma_get_metadata_ptr(struct dma_async_tx_descriptor *desc, - size_t *payload_len, size_t *max_len) -{ - struct udma_desc *d =3D to_udma_desc(desc); - struct udma_chan *uc =3D to_udma_chan(desc->chan); - struct cppi5_host_desc_t *h_desc; - - if (!uc->config.pkt_mode || !uc->config.metadata_size) - return ERR_PTR(-ENOTSUPP); - - h_desc =3D d->hwdesc[0].cppi5_desc_vaddr; - - *max_len =3D uc->config.metadata_size; - - *payload_len =3D cppi5_hdesc_epib_present(&h_desc->hdr) ? - CPPI5_INFO0_HDESC_EPIB_SIZE : 0; - *payload_len +=3D cppi5_hdesc_get_psdata_size(h_desc); - - return h_desc->epib; -} - -static int udma_set_metadata_len(struct dma_async_tx_descriptor *desc, - size_t payload_len) -{ - struct udma_desc *d =3D to_udma_desc(desc); - struct udma_chan *uc =3D to_udma_chan(desc->chan); - struct cppi5_host_desc_t *h_desc; - u32 psd_size =3D payload_len; - u32 flags =3D 0; - - if (!uc->config.pkt_mode || !uc->config.metadata_size) - return -ENOTSUPP; - - if (payload_len > uc->config.metadata_size) - return -EINVAL; - - if (uc->config.needs_epib && payload_len < CPPI5_INFO0_HDESC_EPIB_SIZE) - return -EINVAL; - - h_desc =3D d->hwdesc[0].cppi5_desc_vaddr; - - if (uc->config.needs_epib) { - psd_size -=3D CPPI5_INFO0_HDESC_EPIB_SIZE; - flags |=3D CPPI5_INFO0_HDESC_EPIB_PRESENT; - } - - cppi5_hdesc_update_flags(h_desc, flags); - cppi5_hdesc_update_psdata_size(h_desc, psd_size); - - return 0; -} - -static const struct dma_descriptor_metadata_ops metadata_ops =3D { - .attach =3D udma_attach_metadata, - .get_ptr =3D udma_get_metadata_ptr, - .set_len =3D udma_set_metadata_len, -}; - -static struct dma_async_tx_descriptor * -udma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, - unsigned int sglen, enum dma_transfer_direction dir, - unsigned long tx_flags, void *context) -{ - struct udma_chan *uc =3D to_udma_chan(chan); - enum dma_slave_buswidth dev_width; - struct udma_desc *d; - u32 burst; - - if (dir !=3D uc->config.dir && - (uc->config.dir =3D=3D DMA_MEM_TO_MEM && !uc->config.tr_trigger_type)= ) { - dev_err(chan->device->dev, - "%s: chan%d is for %s, not supporting %s\n", - __func__, uc->id, - dmaengine_get_direction_text(uc->config.dir), - dmaengine_get_direction_text(dir)); - return NULL; - } - - if (dir =3D=3D DMA_DEV_TO_MEM) { - dev_width =3D uc->cfg.src_addr_width; - burst =3D uc->cfg.src_maxburst; - } else if (dir =3D=3D DMA_MEM_TO_DEV) { - dev_width =3D uc->cfg.dst_addr_width; - burst =3D uc->cfg.dst_maxburst; - } else { - dev_err(chan->device->dev, "%s: bad direction?\n", __func__); - return NULL; - } - - if (!burst) - burst =3D 1; - - uc->config.tx_flags =3D tx_flags; - - if (uc->config.pkt_mode) - d =3D udma_prep_slave_sg_pkt(uc, sgl, sglen, dir, tx_flags, - context); - else if (is_slave_direction(uc->config.dir)) - d =3D udma_prep_slave_sg_tr(uc, sgl, sglen, dir, tx_flags, - context); - else - d =3D udma_prep_slave_sg_triggered_tr(uc, sgl, sglen, dir, - tx_flags, context); - - if (!d) - return NULL; - - d->dir =3D dir; - d->desc_idx =3D 0; - d->tr_idx =3D 0; - - /* static TR for remote PDMA */ - if (udma_configure_statictr(uc, d, dev_width, burst)) { - dev_err(uc->ud->dev, - "%s: StaticTR Z is limited to maximum %u (%u)\n", - __func__, uc->ud->match_data->statictr_z_mask, - d->static_tr.bstcnt); - - udma_free_hwdesc(uc, d); - kfree(d); - return NULL; - } - - if (uc->config.metadata_size) - d->vd.tx.metadata_ops =3D &metadata_ops; - - return vchan_tx_prep(&uc->vc, &d->vd, tx_flags); -} - -static struct udma_desc * -udma_prep_dma_cyclic_tr(struct udma_chan *uc, dma_addr_t buf_addr, - size_t buf_len, size_t period_len, - enum dma_transfer_direction dir, unsigned long flags) -{ - struct udma_desc *d; - size_t tr_size, period_addr; - struct cppi5_tr_type1_t *tr_req; - unsigned int periods =3D buf_len / period_len; - u16 tr0_cnt0, tr0_cnt1, tr1_cnt0; - unsigned int i; - int num_tr; - u32 period_csf =3D 0; - - num_tr =3D udma_get_tr_counters(period_len, __ffs(buf_addr), &tr0_cnt0, - &tr0_cnt1, &tr1_cnt0); - if (num_tr < 0) { - dev_err(uc->ud->dev, "size %zu is not supported\n", - period_len); - return NULL; - } - - /* Now allocate and setup the descriptor. */ - tr_size =3D sizeof(struct cppi5_tr_type1_t); - d =3D udma_alloc_tr_desc(uc, tr_size, periods * num_tr, dir); - if (!d) - return NULL; - - tr_req =3D d->hwdesc[0].tr_req_base; - if (uc->ud->match_data->type =3D=3D DMA_TYPE_UDMA) - period_addr =3D buf_addr; - else - period_addr =3D buf_addr | - ((u64)uc->config.asel << K3_ADDRESS_ASEL_SHIFT); - - /* - * For BCDMA <-> PDMA transfers, the EOP flag needs to be set on the - * last TR of a descriptor, to mark the packet as complete. - * This is required for getting the teardown completion message in case - * of TX, and to avoid short-packet error in case of RX. - * - * As we are in cyclic mode, we do not know which period might be the - * last one, so set the flag for each period. - */ - if (uc->config.ep_type =3D=3D PSIL_EP_PDMA_XY && - uc->ud->match_data->type =3D=3D DMA_TYPE_BCDMA) { - period_csf =3D CPPI5_TR_CSF_EOP; - } - - for (i =3D 0; i < periods; i++) { - int tr_idx =3D i * num_tr; - - cppi5_tr_init(&tr_req[tr_idx].flags, CPPI5_TR_TYPE1, false, - false, CPPI5_TR_EVENT_SIZE_COMPLETION, 0); - - tr_req[tr_idx].addr =3D period_addr; - tr_req[tr_idx].icnt0 =3D tr0_cnt0; - tr_req[tr_idx].icnt1 =3D tr0_cnt1; - tr_req[tr_idx].dim1 =3D tr0_cnt0; - - if (num_tr =3D=3D 2) { - cppi5_tr_csf_set(&tr_req[tr_idx].flags, - CPPI5_TR_CSF_SUPR_EVT); - tr_idx++; - - cppi5_tr_init(&tr_req[tr_idx].flags, CPPI5_TR_TYPE1, - false, false, - CPPI5_TR_EVENT_SIZE_COMPLETION, 0); - - tr_req[tr_idx].addr =3D period_addr + tr0_cnt1 * tr0_cnt0; - tr_req[tr_idx].icnt0 =3D tr1_cnt0; - tr_req[tr_idx].icnt1 =3D 1; - tr_req[tr_idx].dim1 =3D tr1_cnt0; - } - - if (!(flags & DMA_PREP_INTERRUPT)) - period_csf |=3D CPPI5_TR_CSF_SUPR_EVT; - - if (period_csf) - cppi5_tr_csf_set(&tr_req[tr_idx].flags, period_csf); - - period_addr +=3D period_len; - } - - return d; -} - -static struct udma_desc * -udma_prep_dma_cyclic_pkt(struct udma_chan *uc, dma_addr_t buf_addr, - size_t buf_len, size_t period_len, - enum dma_transfer_direction dir, unsigned long flags) -{ - struct udma_desc *d; - u32 ring_id; - int i; - int periods =3D buf_len / period_len; - - if (periods > (K3_UDMA_DEFAULT_RING_SIZE - 1)) - return NULL; - - if (period_len >=3D SZ_4M) - return NULL; - - d =3D kzalloc_flex(*d, hwdesc, periods, GFP_NOWAIT); - if (!d) - return NULL; - - d->hwdesc_count =3D periods; - - /* TODO: re-check this... */ - if (dir =3D=3D DMA_DEV_TO_MEM) - ring_id =3D k3_ringacc_get_ring_id(uc->rflow->r_ring); - else - ring_id =3D k3_ringacc_get_ring_id(uc->tchan->tc_ring); - - if (uc->ud->match_data->type !=3D DMA_TYPE_UDMA) - buf_addr |=3D (u64)uc->config.asel << K3_ADDRESS_ASEL_SHIFT; - - for (i =3D 0; i < periods; i++) { - struct udma_hwdesc *hwdesc =3D &d->hwdesc[i]; - dma_addr_t period_addr =3D buf_addr + (period_len * i); - struct cppi5_host_desc_t *h_desc; - - hwdesc->cppi5_desc_vaddr =3D dma_pool_zalloc(uc->hdesc_pool, - GFP_NOWAIT, - &hwdesc->cppi5_desc_paddr); - if (!hwdesc->cppi5_desc_vaddr) { - dev_err(uc->ud->dev, - "descriptor%d allocation failed\n", i); - - udma_free_hwdesc(uc, d); - kfree(d); - return NULL; - } - - hwdesc->cppi5_desc_size =3D uc->config.hdesc_size; - h_desc =3D hwdesc->cppi5_desc_vaddr; - - cppi5_hdesc_init(h_desc, 0, 0); - cppi5_hdesc_set_pktlen(h_desc, period_len); - - /* Flow and Packed ID */ - cppi5_desc_set_pktids(&h_desc->hdr, uc->id, - CPPI5_INFO1_DESC_FLOWID_DEFAULT); - cppi5_desc_set_retpolicy(&h_desc->hdr, 0, ring_id); - - /* attach each period to a new descriptor */ - cppi5_hdesc_attach_buf(h_desc, - period_addr, period_len, - period_addr, period_len); - } - - return d; -} - -static struct dma_async_tx_descriptor * -udma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, size_t bu= f_len, - size_t period_len, enum dma_transfer_direction dir, - unsigned long flags) -{ - struct udma_chan *uc =3D to_udma_chan(chan); - enum dma_slave_buswidth dev_width; - struct udma_desc *d; - u32 burst; - - if (dir !=3D uc->config.dir) { - dev_err(chan->device->dev, - "%s: chan%d is for %s, not supporting %s\n", - __func__, uc->id, - dmaengine_get_direction_text(uc->config.dir), - dmaengine_get_direction_text(dir)); - return NULL; - } - - uc->cyclic =3D true; - - if (dir =3D=3D DMA_DEV_TO_MEM) { - dev_width =3D uc->cfg.src_addr_width; - burst =3D uc->cfg.src_maxburst; - } else if (dir =3D=3D DMA_MEM_TO_DEV) { - dev_width =3D uc->cfg.dst_addr_width; - burst =3D uc->cfg.dst_maxburst; - } else { - dev_err(uc->ud->dev, "%s: bad direction?\n", __func__); - return NULL; - } - - if (!burst) - burst =3D 1; - - if (uc->config.pkt_mode) - d =3D udma_prep_dma_cyclic_pkt(uc, buf_addr, buf_len, period_len, - dir, flags); - else - d =3D udma_prep_dma_cyclic_tr(uc, buf_addr, buf_len, period_len, - dir, flags); - - if (!d) - return NULL; - - d->sglen =3D buf_len / period_len; - - d->dir =3D dir; - d->residue =3D buf_len; - - /* static TR for remote PDMA */ - if (udma_configure_statictr(uc, d, dev_width, burst)) { - dev_err(uc->ud->dev, - "%s: StaticTR Z is limited to maximum %u (%u)\n", - __func__, uc->ud->match_data->statictr_z_mask, - d->static_tr.bstcnt); - - udma_free_hwdesc(uc, d); - kfree(d); - return NULL; - } - - if (uc->config.metadata_size) - d->vd.tx.metadata_ops =3D &metadata_ops; - - return vchan_tx_prep(&uc->vc, &d->vd, flags); -} - -static struct dma_async_tx_descriptor * -udma_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t sr= c, - size_t len, unsigned long tx_flags) -{ - struct udma_chan *uc =3D to_udma_chan(chan); - struct udma_desc *d; - struct cppi5_tr_type15_t *tr_req; - int num_tr; - size_t tr_size =3D sizeof(struct cppi5_tr_type15_t); - u16 tr0_cnt0, tr0_cnt1, tr1_cnt0; - u32 csf =3D CPPI5_TR_CSF_SUPR_EVT; - - if (uc->config.dir !=3D DMA_MEM_TO_MEM) { - dev_err(chan->device->dev, - "%s: chan%d is for %s, not supporting %s\n", - __func__, uc->id, - dmaengine_get_direction_text(uc->config.dir), - dmaengine_get_direction_text(DMA_MEM_TO_MEM)); - return NULL; - } - - num_tr =3D udma_get_tr_counters(len, __ffs(src | dest), &tr0_cnt0, - &tr0_cnt1, &tr1_cnt0); - if (num_tr < 0) { - dev_err(uc->ud->dev, "size %zu is not supported\n", - len); - return NULL; - } - - d =3D udma_alloc_tr_desc(uc, tr_size, num_tr, DMA_MEM_TO_MEM); - if (!d) - return NULL; - - d->dir =3D DMA_MEM_TO_MEM; - d->desc_idx =3D 0; - d->tr_idx =3D 0; - d->residue =3D len; - - if (uc->ud->match_data->type !=3D DMA_TYPE_UDMA) { - src |=3D (u64)uc->ud->asel << K3_ADDRESS_ASEL_SHIFT; - dest |=3D (u64)uc->ud->asel << K3_ADDRESS_ASEL_SHIFT; - } else { - csf |=3D CPPI5_TR_CSF_EOL_ICNT0; - } - - tr_req =3D d->hwdesc[0].tr_req_base; - - cppi5_tr_init(&tr_req[0].flags, CPPI5_TR_TYPE15, false, true, - CPPI5_TR_EVENT_SIZE_COMPLETION, 0); - cppi5_tr_csf_set(&tr_req[0].flags, csf); - - tr_req[0].addr =3D src; - tr_req[0].icnt0 =3D tr0_cnt0; - tr_req[0].icnt1 =3D tr0_cnt1; - tr_req[0].icnt2 =3D 1; - tr_req[0].icnt3 =3D 1; - tr_req[0].dim1 =3D tr0_cnt0; - - tr_req[0].daddr =3D dest; - tr_req[0].dicnt0 =3D tr0_cnt0; - tr_req[0].dicnt1 =3D tr0_cnt1; - tr_req[0].dicnt2 =3D 1; - tr_req[0].dicnt3 =3D 1; - tr_req[0].ddim1 =3D tr0_cnt0; - - if (num_tr =3D=3D 2) { - cppi5_tr_init(&tr_req[1].flags, CPPI5_TR_TYPE15, false, true, - CPPI5_TR_EVENT_SIZE_COMPLETION, 0); - cppi5_tr_csf_set(&tr_req[1].flags, csf); - - tr_req[1].addr =3D src + tr0_cnt1 * tr0_cnt0; - tr_req[1].icnt0 =3D tr1_cnt0; - tr_req[1].icnt1 =3D 1; - tr_req[1].icnt2 =3D 1; - tr_req[1].icnt3 =3D 1; - - tr_req[1].daddr =3D dest + tr0_cnt1 * tr0_cnt0; - tr_req[1].dicnt0 =3D tr1_cnt0; - tr_req[1].dicnt1 =3D 1; - tr_req[1].dicnt2 =3D 1; - tr_req[1].dicnt3 =3D 1; - } - - cppi5_tr_csf_set(&tr_req[num_tr - 1].flags, csf | CPPI5_TR_CSF_EOP); - - if (uc->config.metadata_size) - d->vd.tx.metadata_ops =3D &metadata_ops; - - return vchan_tx_prep(&uc->vc, &d->vd, tx_flags); -} - static void udma_issue_pending(struct dma_chan *chan) { struct udma_chan *uc =3D to_udma_chan(chan); @@ -3587,46 +2409,6 @@ static void udma_synchronize(struct dma_chan *chan) udma_reset_rings(uc); } =20 -static void udma_desc_pre_callback(struct virt_dma_chan *vc, - struct virt_dma_desc *vd, - struct dmaengine_result *result) -{ - struct udma_chan *uc =3D to_udma_chan(&vc->chan); - struct udma_desc *d; - u8 status; - - if (!vd) - return; - - d =3D to_udma_desc(&vd->tx); - - if (d->metadata_size) - udma_fetch_epib(uc, d); - - if (result) { - void *desc_vaddr =3D udma_curr_cppi5_desc_vaddr(d, d->desc_idx); - - if (cppi5_desc_get_type(desc_vaddr) =3D=3D - CPPI5_INFO0_DESC_TYPE_VAL_HOST) { - /* Provide residue information for the client */ - result->residue =3D d->residue - - cppi5_hdesc_get_pktlen(desc_vaddr); - if (result->residue) - result->result =3D DMA_TRANS_ABORTED; - else - result->result =3D DMA_TRANS_NOERROR; - } else { - result->residue =3D 0; - /* Propagate TR Response errors to the client */ - status =3D d->hwdesc[0].tr_resp_base->status; - if (status) - result->result =3D DMA_TRANS_ABORTED; - else - result->result =3D DMA_TRANS_NOERROR; - } - } -} - /* * This tasklet handles the completion of a DMA descriptor by * calling its callback and freeing it. diff --git a/drivers/dma/ti/k3-udma.h b/drivers/dma/ti/k3-udma.h index 54e1757c3de38..62c15b0cc9ae7 100644 --- a/drivers/dma/ti/k3-udma.h +++ b/drivers/dma/ti/k3-udma.h @@ -560,6 +560,60 @@ static inline void udma_fetch_epib(struct udma_chan *u= c, struct udma_desc *d) memcpy(d->metadata, h_desc->epib, d->metadata_size); } =20 +/* Common functions */ +struct udma_desc *udma_udma_desc_from_paddr(struct udma_chan *uc, + dma_addr_t paddr); +void udma_free_hwdesc(struct udma_chan *uc, struct udma_desc *d); +void udma_purge_desc_work(struct work_struct *work); +void udma_desc_free(struct virt_dma_desc *vd); +bool udma_desc_is_rx_flush(struct udma_chan *uc, dma_addr_t addr); +bool udma_is_desc_really_done(struct udma_chan *uc, struct udma_desc *d); +struct udma_desc *udma_alloc_tr_desc(struct udma_chan *uc, + size_t tr_size, int tr_count, + enum dma_transfer_direction dir); +int udma_get_tr_counters(size_t len, unsigned long align_to, + u16 *tr0_cnt0, u16 *tr0_cnt1, u16 *tr1_cnt0); +struct udma_desc *udma_prep_slave_sg_tr(struct udma_chan *uc, + struct scatterlist *sgl, unsigned int sglen, + enum dma_transfer_direction dir, + unsigned long tx_flags, void *context); +struct udma_desc *udma_prep_slave_sg_triggered_tr(struct udma_chan *uc, + struct scatterlist *sgl, unsigned int sglen, + enum dma_transfer_direction dir, + unsigned long tx_flags, void *context); +int udma_configure_statictr(struct udma_chan *uc, struct udma_desc *d, + enum dma_slave_buswidth dev_width, u16 elcnt); +struct udma_desc *udma_prep_slave_sg_pkt(struct udma_chan *uc, + struct scatterlist *sgl, unsigned int sglen, + enum dma_transfer_direction dir, + unsigned long tx_flags, void *context); +int udma_attach_metadata(struct dma_async_tx_descriptor *desc, + void *data, size_t len); +void *udma_get_metadata_ptr(struct dma_async_tx_descriptor *desc, + size_t *payload_len, size_t *max_len); +int udma_set_metadata_len(struct dma_async_tx_descriptor *desc, + size_t payload_len); +struct dma_async_tx_descriptor *udma_prep_slave_sg(struct dma_chan *chan, + struct scatterlist *sgl, unsigned int sglen, + enum dma_transfer_direction dir, + unsigned long tx_flags, void *context); +struct udma_desc *udma_prep_dma_cyclic_tr(struct udma_chan *uc, + dma_addr_t buf_addr, size_t buf_len, size_t period_len, + enum dma_transfer_direction dir, unsigned long flags); +struct udma_desc *udma_prep_dma_cyclic_pkt(struct udma_chan *uc, + dma_addr_t buf_addr, size_t buf_len, size_t period_len, + enum dma_transfer_direction dir, unsigned long flags); +struct dma_async_tx_descriptor *udma_prep_dma_cyclic(struct dma_chan *chan= , dma_addr_t buf_addr, + size_t buf_len, size_t period_len, + enum dma_transfer_direction dir, + unsigned long flags); +struct dma_async_tx_descriptor *udma_prep_dma_memcpy(struct dma_chan *chan, + dma_addr_t dest, dma_addr_t src, + size_t len, unsigned long tx_flags); +void udma_desc_pre_callback(struct virt_dma_chan *vc, + struct virt_dma_desc *vd, + struct dmaengine_result *result); + /* Direct access to UDMA low lever resources for the glue layer */ int xudma_navss_psil_pair(struct udma_dev *ud, u32 src_thread, u32 dst_thr= ead); int xudma_navss_psil_unpair(struct udma_dev *ud, u32 src_thread, --=20 2.54.0 From nobody Thu Sep 24 17:02:17 2026 Received: from mx0b-0002e601.pphosted.com (mx0b-0002e601.pphosted.com [148.163.154.28]) (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 88092211466; Tue, 22 Sep 2026 06:50:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.154.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059828; cv=fail; b=nS5gOrsBAXEB0Eil88suHvvuhbZPv73nJ3U21S9u4dw53OJo7+ZzQEeJmGU01J/suqSxpOjakiWvuEI41uDwhGa9EhphR7QmiBs2VxYoTTX3+2KpMPPvvhevoUMBYbsJKiJ5yVvcb5YBuoCiuFWGzsBEsQuix3qjhzkSnuQqBfw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059828; c=relaxed/simple; bh=dD/rsHsFBpjNGtyELuHpnh2tpYV+yShZHEqC8bX3qLo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Jw7Bo5i58KvARr6wCBJriHo8989qR9CR1UPSW3MkxdvIi21VxCgCnDpWwntU6O4qOgVDrkSw3X8U1gmi7Jmp2NbStLIKkZGIwJ9sp5Y0W5y/SuzZnASyUbde/fIrjDhytyUha26Lx7cdf4bzQORKZQwlT76ay5WeNGNap23gsbs= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=XVb3oYN4; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=DZeo5nqs; arc=fail smtp.client-ip=148.163.154.28 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="XVb3oYN4"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="DZeo5nqs" Received: from pps.filterd (m0374956.ppops.net [127.0.0.1]) by mx0b-0002e601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68M2UKos1034864; Tue, 22 Sep 2026 01:50:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=wnd7uUCK8Gj6RW+b9cimF4nYF7gX+Lhr0xbdaWpzZ Kw=; b=XVb3oYN4GcHp3Kd/204T8go+z6+h9lZxPzKSn1UZlS+H9FrunUyOvj/mY Ky11w/RXJopS7LSXxOyO9vmBaoZAGbNgY9F5EK96Hqvbo27InVY+DOXGKnX1iCUF iIy82hHo0bssAteGGfkA0MZVMMsokNXXyFGOwrpU+Nkl8njhPRvWVNvBiwCAXnug CvGf2tHI3JUJvtdKkyUXnYamA+4pNyZsxMXM8lOrxnQdYOmeZ/+DYKDEFKozuWhF 2dNXWg3BB12va+RPZ5GZXUP6k1Q0nlnlJyyXWjTCgI1HBAL40ISZFGuGgm1zawhf 12SF9sllDt+iyj1TU4G7vihsXNdNg== Received: from ph7pr06cu001.outbound.protection.outlook.com (mail-westus3azon11010069.outbound.protection.outlook.com [52.101.201.69]) by mx0b-0002e601.pphosted.com (PPS) with ESMTPS id 4gugxm16k4-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:50:13 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wfSGHaj3dIAu2ookGjKBgyhD22G5MDzd/nbBoW96Ya7Bh0+EizzFlvO06yUGwJAi7xLIj9bvNFeZkhSb6Q9KbQVkYeCYVXKVafMPOvdMrlHCl4BhgpOlzPOQCfLW9zMEBBu/V+ayGt6oAWn40zkT6v1mLfvD66zdzjTJrBI+xn/hRgD34s8q5A3pEAx1BmH2qz7Jabob4KHrOpA7WFzvG6TXYJfaqlJaMCNSq/dD2dFxZKgSjwkfJUwIWauBBF4N3GDaaDwOLM4FxVgjB+pexXQD+Fdn12yeG0+lLYjd+j8UMX8tVqoCU7Zx8u3AQPQbsgTa9CEwNtm6jbl2MiJ15Q== 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=wnd7uUCK8Gj6RW+b9cimF4nYF7gX+Lhr0xbdaWpzZKw=; b=SlTge8aiJXdIYpxYEXIALtdz+mWekkQyhZ0TINwJo3mo15wtC0Hm7GsfqLD0wP0qGKh144mjFX0E+Ar0UfYc7HvfzH9yXUb+D8CwFcUHJSUQIKrxCIWdfdJKqRqKj32ZhiPOhmFBTQVKn63lcPxCszs2fyD/55A5BtVUvDtbEBR8PMacQJuyh2JZ/oiD6Dxp55Pk/jdyJtDJWcXTTyp8JxXoNp9MqHhTLdudlGjZz0ADJ5cHim0XexU7uJI20fqMSMetMTYtM8ZeeScDLERJpGFTQfDsDN2V58o/sBv8uV/1HfPukYyiLqpAEbalakMnjZ5m4qxbOJt8nuDAiBFfjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.23.194) smtp.rcpttodomain=nxp.com 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=wnd7uUCK8Gj6RW+b9cimF4nYF7gX+Lhr0xbdaWpzZKw=; b=DZeo5nqsBjDaQNws8XupAYCVhoAO+r/nsMfhd5uexTmDXhn9PI5TJLfDoYJ4sXrA6tcTgYlJGMzgGHlUkKjRb0kRR76btOR8mQwk2l5caP3+0PfCl/Nqk3eZ7/sGStHkB5Y5SVqQMlLqvosKr1Tl0PcOSCIfPHqmk56LBDYfMTM= Received: from SJ0PR05CA0109.namprd05.prod.outlook.com (2603:10b6:a03:334::24) by IA0PR10MB7275.namprd10.prod.outlook.com (2603:10b6:208:3de::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.13; Tue, 22 Sep 2026 06:50:11 +0000 Received: from SJ5PEPF00000203.namprd05.prod.outlook.com (2603:10b6:a03:334:cafe::88) by SJ0PR05CA0109.outlook.office365.com (2603:10b6:a03:334::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:50:10 +0000 X-MS-Exchange-Authentication-Results: mx.microsoft.com 1; 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 SJ5PEPF00000203.mail.protection.outlook.com (10.167.244.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:50:10 +0000 Received: from DLEE200.ent.ti.com (157.170.170.75) 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.45; Tue, 22 Sep 2026 01:49:53 -0500 Received: from DLEE209.ent.ti.com (157.170.170.98) by DLEE200.ent.ti.com (157.170.170.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:49:53 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DLEE209.ent.ti.com (157.170.170.98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:49:53 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI3w3626771; Tue, 22 Sep 2026 01:49:48 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 06/19] dmaengine: ti: k3-udma: move ring management functions to k3-udma-common.c Date: Tue, 22 Sep 2026 12:17:30 +0530 Message-ID: <20260922064902.2719979-7-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF00000203:EE_|IA0PR10MB7275:EE_ X-MS-Office365-Filtering-Correlation-Id: 064265f6-9a93-4d86-9b96-08df1875bf1b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|82310400026|23010399003|36860700016|1800799024|921020|6133799003|22082099003|18002099003|56012099006|10067099003|3023799007; X-Microsoft-Antispam-Message-Info: /ePmWrHwZYqQ5yexg1sbUorT8PgGkuuTQlaA5l1WP/U9Q72z6h8WRM3XNyxBwUvQtWE/ZrI6hCUDLCoreY0bE2SoJdDlwDQTJZrvCgc+UF+kjj1JqCKjtnnc1IPWUwLcz60PQG9wlXG6yqHM5afWG11MqJipo5p43DdJRDtM8A7HiBvkX7vZY8yP0yV/W0RIbW1sXmtsbRTPDYH6VZBOXSNT0RbPHynI6iCOE+XKmWLDCNpoR9OEcAdOVcf7RAvP3hmhyx27huxrzOBEW4+WjOzMxfyfM6oYiA5FOdh1a5JB+DhUIZq2cvbVXQOsa+NdLapMwAJYoqsAF6TcEe1Rki2zuxa7XS59Ue1yp9lcICfMXDgDRy+M/QBTHyvYl6jkBFwwRX4hu/UyFKPPPN6J8Cp4b9rEG4eZYsw9NgqWcF1F/JE8fIiHVaQfr8zJGQzexil8ABf9pShKD0HPwf+ZHcQJKnBTjZyln+boQ8Ujw//7w7GPVwyfqizksxBzXZ93H4E2uvmHAXU8Uyrf+1ZW0/9VTjLjcRKniGT82Rt0JuDV71kwLQgoU8a8iP/8ADHucLPYXi59EGkkz+e5Dpq7HP5Za/d5xaeDyJtX0/PFshY9T1kA7A36vBDiRD2JfBsQctezM8hTZbz94vJxWuTCWX+Cpxv0mzTUypTbjDi+Pan1ncLEjAIkTU/M3E2vPYHmnesd+N4vIU5RESDja7Tbnq/vJLteBzChvMa6gfs93pEfm9mgWKaExC5xOrJ16ESz 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)(376014)(7416014)(82310400026)(23010399003)(36860700016)(1800799024)(921020)(6133799003)(22082099003)(18002099003)(56012099006)(10067099003)(3023799007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: c4Mp0rDs+3Xg1x5jfDsnVhzNTmOsFZuSraBgXLu6KNSjid9ceb7n7oRYQnk+IbxHn301//Ep4yw1uuhFm2RtxRrVE0mKwVdK4pcI3HADaqKc1jcLuQBL6KL4wW0kCdPICPdNuglXM3T/JCE9qQDswG0Z1xe3/3ahqU83ss0diEOOwREqUN+jitO9Jf2EtPCqLs6ObdOhcFgHItNmkC4ljV84iwobeiWd5aQLF4SjOYCkLfmv8/MfoWJ0OwZdb/Z9QtlGNgvWzfnofKtl9o24RF6iL+1Bwy+UH9B6p/Hrww8ViRrT5GP4RDvjBaDGPf7IyGnRtlhD0w5l3DwsAEk3+eMqAXfL7vOM76MPnv4QeiXWEpJI/wKfoSJwdKV191PqmAkpZNOETVuOQ5MhAlpJV5+k/VboyktMGhKvozew/oMK4zkyN3/+qP1Gfi9iYWcp X-Exchange-RoutingPolicyChecked: Sqo29AcpbJDXcuK7+RykAUNkvMT34BVIDaRXgfLNxRAtqUutwIfP31C+900FDeMap4iPFE4XPbNbNvprMsL4DaqBSXzSST+7OWebUIfhZENxWHg7VTAmWzafljJR96ZnYY9CJvxlvnuNwRaaDR1Z9hpSfUR64zDjFqfkqV1uHN7CquEIa8dLlGhmBmsPubctNgK3dyHEYB/+twcBEt1+1Ivj+5xPP2EkA7CaH1yQJigEi/UtmwmnNFCbKca+xGBAqBKml1u2W+rzGgvF4tfkvS7hgVhosdx/oGMZYfsHTGeS3+j37isYdeAh/Batp76INkOPD+RUZJ7VaxQX4Rpxdw== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:50:10.5058 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 064265f6-9a93-4d86-9b96-08df1875bf1b 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: SJ5PEPF00000203.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB7275 X-Proofpoint-ORIG-GUID: Ruw6aIrcaCJULdBKbAs8FeJ1ZXjeEO11 X-Proofpoint-GUID: Ruw6aIrcaCJULdBKbAs8FeJ1ZXjeEO11 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfXz3i9fJUWgApP jcbWjOYNdD0JOKHxr09lT81Qu9TvpBEiHXMJfT1MlqS6B//CpResm52kijP1Thyx4Fv803KrDoq ta8Jh79KWPDhy2VMrfbj1IowEOJBWF5OvpkFWz8bP8mSDLkuklPiOH5D4YTPIYaslsJ4VrzL+uV qChVDb9elmzoXrXW2eSFic0vAuq0rvfAif2ARlwxhrubWdqwJieAdpUlFrw29MSDonsjqxRQw0/ zjzhWfrnjcVQnr27NCAjWVTDn6uwE9Dwzw9u4TttV+tioUEztgdvt5QvjR4QektjgkdQWS225G3 rT+j4gCNAGFP70PNQZz+7Tmd4waOyy6gByDpsUEPnCV2Wz+XnqhMGnVeCrrd9nGMbWdL8OHE/uA CnFNPUICYJ6X1D0U+gIDi5tYimu1DgIW258wa8hMuKvZuHVXEKhncvXsHM0Qgu621edoXKJQ1pv 9Iv+idxiELq15LGf87w== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX9JP10agG7m7y FBuf9CgBg+rUwhOX8QqYge/QzhRwVmI3DMFKarCIPIYUYWZ0lJIlmsfwnmOwS5BYNbeu4oBo1fM 1hr4FMdD+sQyWVd+ryEptSumZdqPwQM= X-Authority-Analysis: v=2.4 cv=INeXmQvG c=1 sm=1 tr=0 ts=6ab22526 cx=c_pps a=Q5I7zFPfgszDbE/a6V3qwA==:117 a=WotqVVQAdb04rnGuttW3Kw==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=s63m1ICgrNkA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=jwouBfj2j3NM8CExmVVE:22 a=8AirrxEcAAAA:8 a=sozttTNsAAAA:8 a=g6TaX78G5PB857Cctd4A:9 a=ST-jHhOKWsTCqRlWije3:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 malwarescore=0 phishscore=0 spamscore=0 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220097 Content-Type: text/plain; charset="utf-8" Relocate the ring management functions such as push, pop, and reset from k3-udma.c to k3-udma-common.c file. These operations are common across multiple K3 UDMA variants and will be reused by future implementations like K3 UDMA v2. No functional changes intended. Reviewed-by: Frank Li Signed-off-by: Sai Sree Kartheek Adivi --- drivers/dma/ti/k3-udma-common.c | 103 ++++++++++++++++++++++++++++++++ drivers/dma/ti/k3-udma.c | 100 ------------------------------- drivers/dma/ti/k3-udma.h | 4 ++ 3 files changed, 107 insertions(+), 100 deletions(-) diff --git a/drivers/dma/ti/k3-udma-common.c b/drivers/dma/ti/k3-udma-commo= n.c index 3130805a8ec40..3ec5cc932280c 100644 --- a/drivers/dma/ti/k3-udma-common.c +++ b/drivers/dma/ti/k3-udma-common.c @@ -1239,5 +1239,108 @@ void udma_desc_pre_callback(struct virt_dma_chan *v= c, } EXPORT_SYMBOL_GPL(udma_desc_pre_callback); =20 +int udma_push_to_ring(struct udma_chan *uc, int idx) +{ + struct udma_desc *d =3D uc->desc; + struct k3_ring *ring =3D NULL; + dma_addr_t paddr; + + switch (uc->config.dir) { + case DMA_DEV_TO_MEM: + ring =3D uc->rflow->fd_ring; + break; + case DMA_MEM_TO_DEV: + case DMA_MEM_TO_MEM: + ring =3D uc->tchan->t_ring; + break; + default: + return -EINVAL; + } + + /* RX flush packet: idx =3D=3D -1 is only passed in case of DEV_TO_MEM */ + if (idx =3D=3D -1) { + paddr =3D udma_get_rx_flush_hwdesc_paddr(uc); + } else { + paddr =3D udma_curr_cppi5_desc_paddr(d, idx); + + wmb(); /* Ensure that writes are not moved over this point */ + } + + return k3_ringacc_ring_push(ring, &paddr); +} +EXPORT_SYMBOL_GPL(udma_push_to_ring); + +int udma_pop_from_ring(struct udma_chan *uc, dma_addr_t *addr) +{ + struct k3_ring *ring =3D NULL; + int ret; + + switch (uc->config.dir) { + case DMA_DEV_TO_MEM: + ring =3D uc->rflow->r_ring; + break; + case DMA_MEM_TO_DEV: + case DMA_MEM_TO_MEM: + ring =3D uc->tchan->tc_ring; + break; + default: + return -ENOENT; + } + + ret =3D k3_ringacc_ring_pop(ring, addr); + if (ret) + return ret; + + rmb(); /* Ensure that reads are not moved before this point */ + + /* Teardown completion */ + if (cppi5_desc_is_tdcm(*addr)) + return 0; + + /* Check for flush descriptor */ + if (udma_desc_is_rx_flush(uc, *addr)) + return -ENOENT; + + return 0; +} +EXPORT_SYMBOL_GPL(udma_pop_from_ring); + +void udma_reset_rings(struct udma_chan *uc) +{ + struct k3_ring *ring1 =3D NULL; + struct k3_ring *ring2 =3D NULL; + + switch (uc->config.dir) { + case DMA_DEV_TO_MEM: + if (uc->rchan) { + ring1 =3D uc->rflow->fd_ring; + ring2 =3D uc->rflow->r_ring; + } + break; + case DMA_MEM_TO_DEV: + case DMA_MEM_TO_MEM: + if (uc->tchan) { + ring1 =3D uc->tchan->t_ring; + ring2 =3D uc->tchan->tc_ring; + } + break; + default: + break; + } + + if (ring1) + k3_ringacc_ring_reset_dma(ring1, + k3_ringacc_ring_get_occ(ring1)); + if (ring2) + k3_ringacc_ring_reset(ring2); + + /* make sure we are not leaking memory by stalled descriptor */ + if (uc->terminated_desc) { + udma_desc_free(&uc->terminated_desc->vd); + uc->terminated_desc =3D NULL; + } +} +EXPORT_SYMBOL_GPL(udma_reset_rings); + MODULE_DESCRIPTION("Texas Instruments K3 UDMA Common Library"); MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index a8fe919f307f6..6a731fcfc0697 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -174,106 +174,6 @@ static bool udma_is_chan_paused(struct udma_chan *uc) return false; } =20 -static int udma_push_to_ring(struct udma_chan *uc, int idx) -{ - struct udma_desc *d =3D uc->desc; - struct k3_ring *ring =3D NULL; - dma_addr_t paddr; - - switch (uc->config.dir) { - case DMA_DEV_TO_MEM: - ring =3D uc->rflow->fd_ring; - break; - case DMA_MEM_TO_DEV: - case DMA_MEM_TO_MEM: - ring =3D uc->tchan->t_ring; - break; - default: - return -EINVAL; - } - - /* RX flush packet: idx =3D=3D -1 is only passed in case of DEV_TO_MEM */ - if (idx =3D=3D -1) { - paddr =3D udma_get_rx_flush_hwdesc_paddr(uc); - } else { - paddr =3D udma_curr_cppi5_desc_paddr(d, idx); - - wmb(); /* Ensure that writes are not moved over this point */ - } - - return k3_ringacc_ring_push(ring, &paddr); -} - -static int udma_pop_from_ring(struct udma_chan *uc, dma_addr_t *addr) -{ - struct k3_ring *ring =3D NULL; - int ret; - - switch (uc->config.dir) { - case DMA_DEV_TO_MEM: - ring =3D uc->rflow->r_ring; - break; - case DMA_MEM_TO_DEV: - case DMA_MEM_TO_MEM: - ring =3D uc->tchan->tc_ring; - break; - default: - return -ENOENT; - } - - ret =3D k3_ringacc_ring_pop(ring, addr); - if (ret) - return ret; - - rmb(); /* Ensure that reads are not moved before this point */ - - /* Teardown completion */ - if (cppi5_desc_is_tdcm(*addr)) - return 0; - - /* Check for flush descriptor */ - if (udma_desc_is_rx_flush(uc, *addr)) - return -ENOENT; - - return 0; -} - -static void udma_reset_rings(struct udma_chan *uc) -{ - struct k3_ring *ring1 =3D NULL; - struct k3_ring *ring2 =3D NULL; - - switch (uc->config.dir) { - case DMA_DEV_TO_MEM: - if (uc->rchan) { - ring1 =3D uc->rflow->fd_ring; - ring2 =3D uc->rflow->r_ring; - } - break; - case DMA_MEM_TO_DEV: - case DMA_MEM_TO_MEM: - if (uc->tchan) { - ring1 =3D uc->tchan->t_ring; - ring2 =3D uc->tchan->tc_ring; - } - break; - default: - break; - } - - if (ring1) - k3_ringacc_ring_reset_dma(ring1, - k3_ringacc_ring_get_occ(ring1)); - if (ring2) - k3_ringacc_ring_reset(ring2); - - /* make sure we are not leaking memory by stalled descriptor */ - if (uc->terminated_desc) { - udma_desc_free(&uc->terminated_desc->vd); - uc->terminated_desc =3D NULL; - } -} - static void udma_decrement_byte_counters(struct udma_chan *uc, u32 val) { if (uc->desc->dir =3D=3D DMA_DEV_TO_MEM) { diff --git a/drivers/dma/ti/k3-udma.h b/drivers/dma/ti/k3-udma.h index 62c15b0cc9ae7..767b73021390d 100644 --- a/drivers/dma/ti/k3-udma.h +++ b/drivers/dma/ti/k3-udma.h @@ -614,6 +614,10 @@ void udma_desc_pre_callback(struct virt_dma_chan *vc, struct virt_dma_desc *vd, struct dmaengine_result *result); =20 +int udma_push_to_ring(struct udma_chan *uc, int idx); +int udma_pop_from_ring(struct udma_chan *uc, dma_addr_t *addr); +void udma_reset_rings(struct udma_chan *uc); + /* Direct access to UDMA low lever resources for the glue layer */ int xudma_navss_psil_pair(struct udma_dev *ud, u32 src_thread, u32 dst_thr= ead); int xudma_navss_psil_unpair(struct udma_dev *ud, u32 src_thread, --=20 2.54.0 From nobody Thu Sep 24 17:02:17 2026 Received: from mx0b-0002e601.pphosted.com (mx0b-0002e601.pphosted.com [148.163.154.28]) (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 A9735418A46; Tue, 22 Sep 2026 06:50:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.154.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059829; cv=fail; b=ZU+eKYlowTk8ghEnrsn3PoRr7lKNqyXP5kw/xiyxLAFXVgagYp6l8kTe8sP2IxopNup6yCcy9lfXD0wrqw/7hIeiyXCCN5ocq5toB8y9afBGYUTjIL2Zxrg9YyF1a165udhTM3SK8xxsBFqUxuV0fLEJxWdQNMq0puFPLsjZjhg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059829; c=relaxed/simple; bh=RW+PqzSQ5WvJoIsZ7JEixWn8SAb1EUozaq6kISlvTK4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LIeocHzFGsu8WUENMfGmEBFOJBL4UTCzdehMD9llPSz7z0WuRwFuyIl9gSJB3pTrWkfpE6GYdXwS3IaudyhSh0xbLxJpRmiLZwsC1GREHFPySsN+beU4H9PL8EiTF4PMlikTf30hcZ+HQSwD2IRr03WjopY4Cw8CgVARC0sw8iU= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=nVkGJ081; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=FCWv1pPJ; arc=fail smtp.client-ip=148.163.154.28 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="nVkGJ081"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="FCWv1pPJ" Received: from pps.filterd (m0374956.ppops.net [127.0.0.1]) by mx0b-0002e601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68M2UKot1034864; Tue, 22 Sep 2026 01:50:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=KrULaVwgCCElip4aRKBYaZURAqN1+fYOie+cnf4tK eI=; b=nVkGJ081ElBVWLwRzKBAFfHOTWSUmafm8RO+29WJECFsR42amIZ7B6VWm Ebi8CvrGm6KhRkjN4kGB9bn0RZ7ZW1bM1hlZQ9+JcOtSZO1ni3uhX9WEUCMq0ngx zwU6hrlahYl/idw0T1F/Fj0vhRF0+CIgZAyu1vOps7FB4z9ilTGWpivWQmCxw0Rf +C07xLe2m2JKNDlxTvk96Jf0RwNHTXbZNKiYHTZ1UULTdz0MgRKT5aYJ7Eqn8PLu DFMr1mIKdXwYzOxeUmej3bhtAwOeeyUR+wLqSAkFjQaLPHsUoZPqQhjS/ZvGUWRw a/7FHJ9CtqHOvAuHLl3S7vR40Oc5A== Received: from sa9pr02cu001.outbound.protection.outlook.com (mail-southcentralusazon11013007.outbound.protection.outlook.com [40.93.196.7]) by mx0b-0002e601.pphosted.com (PPS) with ESMTPS id 4gugxm16kg-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:50:17 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xIM2VX5jr/eIHt35T4iuW29seoTVpkW5g6ZnNOjXxBO/EsKEM2nTcCeM04GMnmpwt0arEY3YPiHtZwhKy3NyrgtngTPB1dARThEirvqr1XdnIX3WU4Rgdu5/QKD2CUhMzQ/IZdsum7Yidt6MEGOMU8fBTbKOIL9eygnRamjvF2Y/9atiH7d9+7pJ3kLwrfhoCHJvGX+VbkmK2ckpf0+SNcJv8phdaqwwNtsZxaJ56OibPCcFhY20lsrw3VEywg5+wM2dt4bCXkFVyKoYBbCU3Z7qAjxZXQ3QQt/2L8afHqF6ksEsfqtDL9syqQGPst3Tov+wrSyWKb4XvKTcSiWRxg== 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=KrULaVwgCCElip4aRKBYaZURAqN1+fYOie+cnf4tKeI=; b=AdHu9Qim1TxwO9PZY9c/yyY3eKtz9St4OEE9CH4Yf8pgSlK7qfpWmJkdY/797EYqD5G3H5uHJXrzdNi/LrI/OwJibu8vYVG0N7WM5eqzAAzz6Zp9pMGJSyg+B7VqDPvd8Aib6wwFVa9WN/jJHTIfXU6el0sMzlHhyBcxNuNYqq+0a5na5cV6fpMgDG+geL2sXBCscZJcILHJDzkOaZOhhnGQdvBjOCvOf/folItwTn7WV3MxeV3ACHpL/0t5YY+ajvzRoBYHIobvCU77Na98Xd7nzFBL3DeivcCQqsDeyKof9UryQRN5ZYc+7/d+EHkaMIplMDjvJtO7miVdFaFnew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.23.194) smtp.rcpttodomain=nxp.com 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=KrULaVwgCCElip4aRKBYaZURAqN1+fYOie+cnf4tKeI=; b=FCWv1pPJLb8ojhJJia+dP2ELureEvaKP87b+cOumvJ7xnfkxxJuv+fuuMyq2iTjG98C54LYCQ/v3EaIKBT0wkjpIaSMveeE1iWAfqnPHYgl7ICnKSHWgrD2M6hYMVBY4iFrd+mcr3xq2ypdnY4C7BuRG11AHxKiPi895CxiKiSw= Received: from SJ0PR05CA0116.namprd05.prod.outlook.com (2603:10b6:a03:334::31) by CO1PR10MB4785.namprd10.prod.outlook.com (2603:10b6:303:95::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.13; Tue, 22 Sep 2026 06:50:13 +0000 Received: from SJ5PEPF00000203.namprd05.prod.outlook.com (2603:10b6:a03:334:cafe::82) by SJ0PR05CA0116.outlook.office365.com (2603:10b6:a03:334::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.13 via Frontend Transport; Tue, 22 Sep 2026 06:50:13 +0000 X-MS-Exchange-Authentication-Results: mx.microsoft.com 1; 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 SJ5PEPF00000203.mail.protection.outlook.com (10.167.244.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:50:13 +0000 Received: from DLEE203.ent.ti.com (157.170.170.78) 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.45; Tue, 22 Sep 2026 01:49:58 -0500 Received: from DLEE202.ent.ti.com (157.170.170.77) by DLEE203.ent.ti.com (157.170.170.78) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:49:58 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DLEE202.ent.ti.com (157.170.170.77) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:49:58 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI3x3626771; Tue, 22 Sep 2026 01:49:53 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 07/19] dmaengine: ti: k3-udma: Add variant-specific function pointers to udma_dev Date: Tue, 22 Sep 2026 12:17:31 +0530 Message-ID: <20260922064902.2719979-8-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF00000203:EE_|CO1PR10MB4785:EE_ X-MS-Office365-Filtering-Correlation-Id: 71207e83-d5d5-4711-bfcd-08df1875c0ad X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|23010399003|1800799024|82310400026|7416014|36860700016|921020|6133799003|10067099003|56012099006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: KBo4qDI4aQYFrjhyXyj8IwDp+PTRhipDeIpW/294VtWmcHhqoHeT3yh2MythlTtztTitm/qMX8O9FPO74mDe4rsNco1rs4nWn4fUFrP4taGegCzPRe9TFd7BfXw7JphQNoHvh3eJX3h74NCUsIvKZBhEgWrnxJlNFyXTF4zmrTVkwl1duO7KC3WxUcNv4aW+K8XryMOQI/TrVcNiqKnlzBNuswL0QtngaQpO/DTUwAbZ6eR+lHXfkngMOvxB5QZ4/aZ1uAQUKS19rhKduIH8/lGjU6ed66l8HIGNX3d6o+5rUD4g70ttzvRM2SnO3BWHLoil3YfK7lJnEVhFsC0b0hK8weO0EzSbWQETuSN5JAjIAlUFOQzsFDaW8E3hBqoGRgtCczy+KJ1BRdbV6lLapMpPDYrD5qYWakgkLLgw61b0vsZ8le8qX0ztn6lPfCxkAPJS7KVUnmoQR5ox7NwWAwO52u+FpncGYK81q3BYe+cirrF/YGVAysaB14YWlXzXHLD6nNnpAbZ80tuUAqpg4vJSMmuQmuImyDXTdPmq5M/TTktIOaaVynTnMOtZ6bSl1aGSJB23b+LgmFCznrRyi3xcoOc7H/ZeULE4ZFFqUgGnx3pPsngflo3ZqImtqVqb7jGrHJYpEl2sQkXahBJ4dd5CA6RrPUYag0i1TOk/ahfbknMSX/CbCrpUxyNv3eOcb5POK5+QgNGfZ4hJlk4QZ2fi2vNdqkHuHtHGLyaAnw8HerMhfWCXv/6m5H7Jevce 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)(376014)(23010399003)(1800799024)(82310400026)(7416014)(36860700016)(921020)(6133799003)(10067099003)(56012099006)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NWEzyxGHQJGWd24bbuGndGUmdl4yL3Cl4XHi3cOlvxR3/77SS2p2/VFhkv2WUZvHrmo5+m8TDZpHfmkf0pUvQiH28mNd03cv0UrHqh9uAey/7NK+E9xDLFwumbShmvRc2dYEZX87R0k5dB+IkdVraLHiJN3TRoHQL2EtlRYiBsaYEBzSXR9cW5g+262tEmgefNhvUpzkgCCAk2AwCg1k2KSQNlIBqudR1cNxyUvNXJQ7zI6Glo3Ig8eFFJeWxUPl+UiBYeJKl0bfo7Ix8UVVWV5d+z0WdEAxTiUDl+MeqKwUWc56etXSChWcRf1paq+FcnUZ67AAoAHFvEDo0PMGpNqGSnP8yEms/66avp61VILTv2UeZP2NN3aAZdjKqpRsVBfnHDgkQiLVqTaMKi49/Gv7TQr4ByeoECEmGvqYS2qYa/aIrurtAiAMRM1KHrLU X-Exchange-RoutingPolicyChecked: DnYkZvaYzZVWVqQTntV1yFL6dkCmd+G1rOvNiy2NhLy+xwaIWtwHNtomtV326wmpV7a3WnLRgnAP7V8sioyNcQcH958yDmPQYLQzw06MKNK/kycMxDE21REwfQ7J6uDlZ160nxnN5YA3cy1iHOcUsZob+yWo2x6lR7pTxsaiTwhcxlWQwpbPmjzXAJv3ag0irHGXmRd5SdPkaviT7CWyimVkugkgklz50P035ublbhK2V3eVzCMck0P+nqFcZOUSrvo5dAhcOpD+R0bxUjdLPRrnUfPrCCFVhXkbQ/zzlF4vNJoawotdBVtnoU3NqAl5XyZtj4M0k7rmIlLQUm+IGA== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:50:13.1356 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 71207e83-d5d5-4711-bfcd-08df1875c0ad 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: SJ5PEPF00000203.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4785 X-Proofpoint-ORIG-GUID: c0DURkEvOojVAkV3Lx1BA1VOJoQW8Mnj X-Proofpoint-GUID: c0DURkEvOojVAkV3Lx1BA1VOJoQW8Mnj X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfXyxF+iIZt1LAn Ehc5zHhGtx1YqbDnQSqnV9thBu1+VgPkHTZcgpMr18fM9QyLpK0T8iJT1hk+uYgFo6xayiYQQhZ NvZG9LXK2kZsOn4zg9Guwhaj8C9BCbupM+jTZjl3nvJiwxxZ2sKJnWOnDJTG9DmbQPTlvtKjTqE cN3q9UscOhkQSRSZVYf3GohOhdPszLak4BQlvbSAI7NW7/lpYXZc5hscnGPrZoniIBbs+FJC+b4 DKoBmfeLJLkOjRjTpzZCEFfjLbkPVk3Eo0Mumgd3gWxjTOgqqqGhot9Yfn4roEz417ghlqieSZ9 XokFKwTlnoNEoQrPaF9ArE7qnEJOTht6wl2VbHH3+nls5NGC7L8wM9rE66N4RxTOmoRUtcdhv1B 22Xsn57xYD/CR+rndgvnVFK/osko+9Arfd8kDPo7PK7tRucAjyCwN4QDbVVaPOyaHaRrpMxkAd2 HO7OMcTBFaf5Enx7fEA== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX6zNy6eGMm30O +3AyhrQW9v1lH+ku3jhvL/1f0irn5OKsSR3cVQD8VMs4lEaILJENGg71BfWfGOvlIi8bEa7Fu7B s/jzEklRUG/5GmDq9eoNPY8PkkFPL4A= X-Authority-Analysis: v=2.4 cv=INeXmQvG c=1 sm=1 tr=0 ts=6ab22529 cx=c_pps a=B1kIKGfTVomdQYahC0fm5g==:117 a=WotqVVQAdb04rnGuttW3Kw==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=s63m1ICgrNkA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=jwouBfj2j3NM8CExmVVE:22 a=8AirrxEcAAAA:8 a=sozttTNsAAAA:8 a=G_UKfOQgHLmTBcQ1_a4A:9 a=ST-jHhOKWsTCqRlWije3:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 malwarescore=0 phishscore=0 spamscore=0 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220097 Content-Type: text/plain; charset="utf-8" Introduce function pointers in the udma_dev structure to allow variant-specific implementations for certain operations. This prepares the driver for supporting multiple K3 UDMA variants, such as UDMA v2, with minimal code duplication. No functional changes intended in this commit. Reviewed-by: Frank Li Signed-off-by: Sai Sree Kartheek Adivi --- drivers/dma/ti/k3-udma-private.c | 10 ++++- drivers/dma/ti/k3-udma.c | 66 ++++++++++++++++++-------------- drivers/dma/ti/k3-udma.h | 12 ++++++ 3 files changed, 57 insertions(+), 31 deletions(-) diff --git a/drivers/dma/ti/k3-udma-private.c b/drivers/dma/ti/k3-udma-priv= ate.c index 624360423ef17..44c097fff5ee6 100644 --- a/drivers/dma/ti/k3-udma-private.c +++ b/drivers/dma/ti/k3-udma-private.c @@ -8,13 +8,19 @@ =20 int xudma_navss_psil_pair(struct udma_dev *ud, u32 src_thread, u32 dst_thr= ead) { - return navss_psil_pair(ud, src_thread, dst_thread); + if (ud->psil_pair) + return ud->psil_pair(ud, src_thread, dst_thread); + + return 0; } EXPORT_SYMBOL(xudma_navss_psil_pair); =20 int xudma_navss_psil_unpair(struct udma_dev *ud, u32 src_thread, u32 dst_t= hread) { - return navss_psil_unpair(ud, src_thread, dst_thread); + if (ud->psil_unpair) + return ud->psil_unpair(ud, src_thread, dst_thread); + + return 0; } EXPORT_SYMBOL(xudma_navss_psil_unpair); =20 diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 6a731fcfc0697..36dcc888815ea 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -40,7 +40,7 @@ static const char * const mmr_names[] =3D { [MMR_TCHANRT] =3D "tchanrt", }; =20 -static int navss_psil_pair(struct udma_dev *ud, u32 src_thread, u32 dst_th= read) +int navss_psil_pair(struct udma_dev *ud, u32 src_thread, u32 dst_thread) { struct udma_tisci_rm *tisci_rm =3D &ud->tisci_rm; =20 @@ -50,8 +50,8 @@ static int navss_psil_pair(struct udma_dev *ud, u32 src_t= hread, u32 dst_thread) src_thread, dst_thread); } =20 -static int navss_psil_unpair(struct udma_dev *ud, u32 src_thread, - u32 dst_thread) +int navss_psil_unpair(struct udma_dev *ud, u32 src_thread, + u32 dst_thread) { struct udma_tisci_rm *tisci_rm =3D &ud->tisci_rm; =20 @@ -329,7 +329,7 @@ static int udma_start(struct udma_chan *uc) } =20 /* Make sure that we clear the teardown bit, if it is set */ - udma_reset_chan(uc, false); + uc->ud->reset_chan(uc, false); =20 /* Push descriptors before we start the channel */ udma_start_desc(uc); @@ -521,8 +521,8 @@ static void udma_check_tx_completion(struct work_struct= *work) if (uc->desc) { struct udma_desc *d =3D uc->desc; =20 - udma_decrement_byte_counters(uc, d->residue); - udma_start(uc); + uc->ud->decrement_byte_counters(uc, d->residue); + uc->ud->start(uc); vchan_cookie_complete(&d->vd); break; } @@ -554,7 +554,7 @@ static irqreturn_t udma_ring_irq_handler(int irq, void = *data) } =20 if (!uc->desc) - udma_start(uc); + uc->ud->start(uc); =20 goto out; } @@ -576,8 +576,8 @@ static irqreturn_t udma_ring_irq_handler(int irq, void = *data) vchan_cyclic_callback(&d->vd); } else { if (udma_is_desc_really_done(uc, d)) { - udma_decrement_byte_counters(uc, d->residue); - udma_start(uc); + uc->ud->decrement_byte_counters(uc, d->residue); + uc->ud->start(uc); vchan_cookie_complete(&d->vd); } else { schedule_delayed_work(&uc->tx_drain.work, @@ -612,8 +612,8 @@ static irqreturn_t udma_udma_irq_handler(int irq, void = *data) vchan_cyclic_callback(&d->vd); } else { /* TODO: figure out the real amount of data */ - udma_decrement_byte_counters(uc, d->residue); - udma_start(uc); + uc->ud->decrement_byte_counters(uc, d->residue); + uc->ud->start(uc); vchan_cookie_complete(&d->vd); } } @@ -1654,7 +1654,7 @@ static int udma_alloc_chan_resources(struct dma_chan = *chan) =20 if (udma_is_chan_running(uc)) { dev_warn(ud->dev, "chan%d: is running!\n", uc->id); - udma_reset_chan(uc, false); + ud->reset_chan(uc, false); if (udma_is_chan_running(uc)) { dev_err(ud->dev, "chan%d: won't stop!\n", uc->id); ret =3D -EBUSY; @@ -1663,7 +1663,7 @@ static int udma_alloc_chan_resources(struct dma_chan = *chan) } =20 /* PSI-L pairing */ - ret =3D navss_psil_pair(ud, uc->config.src_thread, uc->config.dst_thread); + ret =3D ud->psil_pair(ud, uc->config.src_thread, uc->config.dst_thread); if (ret) { dev_err(ud->dev, "PSI-L pairing failed: 0x%04x -> 0x%04x\n", uc->config.src_thread, uc->config.dst_thread); @@ -1718,7 +1718,7 @@ static int udma_alloc_chan_resources(struct dma_chan = *chan) uc->irq_num_ring =3D 0; uc->irq_num_udma =3D 0; err_psi_free: - navss_psil_unpair(ud, uc->config.src_thread, uc->config.dst_thread); + ud->psil_unpair(ud, uc->config.src_thread, uc->config.dst_thread); uc->psil_paired =3D false; err_res_free: udma_free_tx_resources(uc); @@ -1821,7 +1821,7 @@ static int bcdma_alloc_chan_resources(struct dma_chan= *chan) =20 if (udma_is_chan_running(uc)) { dev_warn(ud->dev, "chan%d: is running!\n", uc->id); - udma_reset_chan(uc, false); + ud->reset_chan(uc, false); if (udma_is_chan_running(uc)) { dev_err(ud->dev, "chan%d: won't stop!\n", uc->id); ret =3D -EBUSY; @@ -1849,8 +1849,8 @@ static int bcdma_alloc_chan_resources(struct dma_chan= *chan) uc->use_dma_pool =3D true; } else if (uc->config.dir !=3D DMA_MEM_TO_MEM) { /* PSI-L pairing */ - ret =3D navss_psil_pair(ud, uc->config.src_thread, - uc->config.dst_thread); + ret =3D ud->psil_pair(ud, uc->config.src_thread, + uc->config.dst_thread); if (ret) { dev_err(ud->dev, "PSI-L pairing failed: 0x%04x -> 0x%04x\n", @@ -1910,8 +1910,8 @@ static int bcdma_alloc_chan_resources(struct dma_chan= *chan) uc->irq_num_udma =3D 0; err_psi_free: if (uc->psil_paired) - navss_psil_unpair(ud, uc->config.src_thread, - uc->config.dst_thread); + ud->psil_unpair(ud, uc->config.src_thread, + uc->config.dst_thread); uc->psil_paired =3D false; err_res_free: bcdma_free_bchan_resources(uc); @@ -2014,7 +2014,7 @@ static int pktdma_alloc_chan_resources(struct dma_cha= n *chan) =20 if (udma_is_chan_running(uc)) { dev_warn(ud->dev, "chan%d: is running!\n", uc->id); - udma_reset_chan(uc, false); + ud->reset_chan(uc, false); if (udma_is_chan_running(uc)) { dev_err(ud->dev, "chan%d: won't stop!\n", uc->id); ret =3D -EBUSY; @@ -2037,7 +2037,7 @@ static int pktdma_alloc_chan_resources(struct dma_cha= n *chan) uc->use_dma_pool =3D true; =20 /* PSI-L pairing */ - ret =3D navss_psil_pair(ud, uc->config.src_thread, uc->config.dst_thread); + ret =3D ud->psil_pair(ud, uc->config.src_thread, uc->config.dst_thread); if (ret) { dev_err(ud->dev, "PSI-L pairing failed: 0x%04x -> 0x%04x\n", uc->config.src_thread, uc->config.dst_thread); @@ -2083,7 +2083,7 @@ static int pktdma_alloc_chan_resources(struct dma_cha= n *chan) err_irq_free: uc->irq_num_ring =3D 0; err_psi_free: - navss_psil_unpair(ud, uc->config.src_thread, uc->config.dst_thread); + ud->psil_unpair(ud, uc->config.src_thread, uc->config.dst_thread); uc->psil_paired =3D false; err_res_free: udma_free_tx_resources(uc); @@ -2123,7 +2123,7 @@ static void udma_issue_pending(struct dma_chan *chan) */ if (!(uc->state =3D=3D UDMA_CHAN_IS_TERMINATING && udma_is_chan_running(uc))) - udma_start(uc); + uc->ud->start(uc); } =20 spin_unlock_irqrestore(&uc->vc.lock, flags); @@ -2265,7 +2265,7 @@ static int udma_terminate_all(struct dma_chan *chan) spin_lock_irqsave(&uc->vc.lock, flags); =20 if (udma_is_chan_running(uc)) - udma_stop(uc); + uc->ud->stop(uc); =20 if (uc->desc) { uc->terminated_desc =3D uc->desc; @@ -2297,11 +2297,11 @@ static void udma_synchronize(struct dma_chan *chan) dev_warn(uc->ud->dev, "chan%d teardown timeout!\n", uc->id); udma_dump_chan_stdata(uc); - udma_reset_chan(uc, true); + uc->ud->reset_chan(uc, true); } } =20 - udma_reset_chan(uc, false); + uc->ud->reset_chan(uc, false); if (udma_is_chan_running(uc)) dev_warn(uc->ud->dev, "chan%d refused to stop!\n", uc->id); =20 @@ -2355,7 +2355,7 @@ static void udma_free_chan_resources(struct dma_chan = *chan) =20 udma_terminate_all(chan); if (uc->terminated_desc) { - udma_reset_chan(uc, false); + ud->reset_chan(uc, false); udma_reset_rings(uc); } =20 @@ -2374,8 +2374,8 @@ static void udma_free_chan_resources(struct dma_chan = *chan) =20 /* Release PSI-L pairing */ if (uc->psil_paired) { - navss_psil_unpair(ud, uc->config.src_thread, - uc->config.dst_thread); + ud->psil_unpair(ud, uc->config.src_thread, + uc->config.dst_thread); uc->psil_paired =3D false; } =20 @@ -3694,6 +3694,14 @@ static int udma_probe(struct platform_device *pdev) ud->soc_data =3D soc->data; } =20 + // Setup function pointers + ud->start =3D udma_start; + ud->stop =3D udma_stop; + ud->reset_chan =3D udma_reset_chan; + ud->decrement_byte_counters =3D udma_decrement_byte_counters; + ud->psil_pair =3D navss_psil_pair; + ud->psil_unpair =3D navss_psil_unpair; + ret =3D udma_get_mmrs(pdev, ud); if (ret) return ret; diff --git a/drivers/dma/ti/k3-udma.h b/drivers/dma/ti/k3-udma.h index 767b73021390d..16de0b218d8ad 100644 --- a/drivers/dma/ti/k3-udma.h +++ b/drivers/dma/ti/k3-udma.h @@ -348,6 +348,15 @@ struct udma_dev { u32 psil_base; u32 atype; u32 asel; + + int (*start)(struct udma_chan *uc); + int (*stop)(struct udma_chan *uc); + int (*reset_chan)(struct udma_chan *uc, bool hard); + void (*decrement_byte_counters)(struct udma_chan *uc, u32 val); + int (*psil_pair)(struct udma_dev *ud, u32 src_thread, + u32 dst_thread); + int (*psil_unpair)(struct udma_dev *ud, u32 src_thread, + u32 dst_thread); }; =20 struct udma_desc { @@ -618,6 +627,9 @@ int udma_push_to_ring(struct udma_chan *uc, int idx); int udma_pop_from_ring(struct udma_chan *uc, dma_addr_t *addr); void udma_reset_rings(struct udma_chan *uc); =20 +int navss_psil_pair(struct udma_dev *ud, u32 src_thread, u32 dst_thread); +int navss_psil_unpair(struct udma_dev *ud, u32 src_thread, u32 dst_thread); + /* Direct access to UDMA low lever resources for the glue layer */ int xudma_navss_psil_pair(struct udma_dev *ud, u32 src_thread, u32 dst_thr= ead); int xudma_navss_psil_unpair(struct udma_dev *ud, u32 src_thread, --=20 2.54.0 From nobody Thu Sep 24 17:02:17 2026 Received: from mx0b-0002e601.pphosted.com (mx0b-0002e601.pphosted.com [148.163.154.28]) (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 280764F68DE; Tue, 22 Sep 2026 06:51:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.154.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059865; cv=fail; b=SZdxMx3TGJ+qkFFRd6CeA7iKTFKQQ6p3UgbZ7tTPTGo6u4rsgqBTJhJ4g0JBHoW9G/K6Lj549d9oCKaXlYjQOlP+E4agaZC6aolrZJwiqzhWztzyaMEfuxhiuZRh1oqRkzoTfnTthHgIxFiGfX2pvyMacMOLpdmCheZDc/v1jeI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059865; c=relaxed/simple; bh=nbboQwr+r6K/mlp324YEHHX6OzKxyxUfhtz0Y5t777A=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=T0aBjXy1kRts5VbM9uC3O5p7U0A72t1z7MRbuGYMiz1gzMj76AyKCcJNTUxWaxC6m6BQ518Y5ga6K6U6nFeQ+n91CggL38FktgGd5sYaN0dNuQswjx6IAU55Re0kIpcx82EUpoxpVWuPVb68ySnsEG7DTz3NbaGXGViJ3hdNLQk= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=FP8OKgCu; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=pLIIym3J; arc=fail smtp.client-ip=148.163.154.28 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="FP8OKgCu"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="pLIIym3J" Received: from pps.filterd (m0374955.ppops.net [127.0.0.1]) by mx0b-0002e601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68M1qaQ31436841; Tue, 22 Sep 2026 01:50:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=sWggb4LwGdFXmbCia/o8TFUFG5mJHyx58KIubg4Xb nI=; b=FP8OKgCufuURi0cCzpNa8T43V1eI+4axEnVtP6zCzCXFzFPJot+TBT4mR ggrK3cM4hmys2Jsr093gGqvTXMBGzk670G/uW1MIvajuDcWCZXgnFDH1WxxYsFvL mLpcdYflVRxWeiKROz02f+vpPmYYq81iXGZ3T0Z5uC2glzP8NbCJMxCixWur/YYV TCR6dd3S2BXQVnNcj54OmY1RCi6e4BXlTUzB8DCY5sxfV53VvY19ZJZJaYkaWXuq ZNvwwQAZfeepATsZH9E8q0MSaPIyVMVdraQQ1Q4yfRJoTc493/LIgKplt3PFUzqR U4cfHryUyvG6rO+4vsbPjFRsL/KGQ== Received: from sa9pr02cu001.outbound.protection.outlook.com (mail-southcentralusazon11013019.outbound.protection.outlook.com [40.93.196.19]) by mx0b-0002e601.pphosted.com (PPS) with ESMTPS id 4gugcssck9-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:50:46 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OBx8GGgKSyZkH1vHW3BhxDTKCHwwKojhhEuDkV9mBHP9pG+j75IY0+u1HxhnjDjWCFDW09z4vsHu1p11tlEU232lKy4K1WnO58+1z5HWXKZcpNpB7CqHXXb1pAzrdKMoB+wRFACnhIpqQXllwHV3d7BBKY0cRtUvmbRT8xj0NnPSFwUM7F9XbZ1+gGYQ9A7/It8+7qFBfVwvMfezln7+O85A2UkHfXtc2x9lkE8LVyXe+FTvlag1i+AXwHeiDOG1C9XjwuPXIIDVLZZ4aUWMLCJhvsSXmWWiAlh1feeYMGl7Gp2p4Drr8zvtQBBE1/QHKT8KReAXguudSV0gDPg+wg== 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=sWggb4LwGdFXmbCia/o8TFUFG5mJHyx58KIubg4XbnI=; b=kGilvUl4g+D7/jBaGjG8v3VVQkcMjSYROhWNVxJf+gllF3RAn8gf6CH9lkU1ndilllHCJGKS+v3cEBIuEJvhWrz3FXGmjc79EY4Jv7c4mr9a2m7RYsfR9qOAlRZercVEzbd2Nm/2e2ofjn+2vTEOepPYACx/Y52OJdziAllBqB3dpkOasd/Qmc3ILsltHRdbGjm1v48RyJJsnUdopPl2jMq97sIQIRLQ9BfL+3RvLohLC99BjJa9uY8i66UBrUcZS81H+fe9im4fs1gTlNAUOu2JqITGwAZ+9gfGn/Zza9fhz9Z9yZEePVtyG9G6FvUsP4DqwjYHj4dOGXcNqynusA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.21.194) smtp.rcpttodomain=nxp.com 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=sWggb4LwGdFXmbCia/o8TFUFG5mJHyx58KIubg4XbnI=; b=pLIIym3Jx6PZc7QwD+zJ1Vqz0wgHyDLMIp+a3D2DFrey4Uz/vabs9zp/VKvukO3PsoAdI+7iQs72Y0WzCdF+0S1f5JgDGj4tadRud1/+JEfVQGd69CdD83GdkdyPlqBbd1SAtha2/DengEuuqivzdFIoaGD/wdOFDlNMnZ0viCs= Received: from BN9PR03CA0852.namprd03.prod.outlook.com (2603:10b6:408:13d::17) by DM4PR10MB6207.namprd10.prod.outlook.com (2603:10b6:8:8c::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.14; Tue, 22 Sep 2026 06:50:42 +0000 Received: from BY1PEPF0002695D.namprd05.prod.outlook.com (2603:10b6:408:13d:cafe::3d) by BN9PR03CA0852.outlook.office365.com (2603:10b6:408:13d::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.428.16 via Frontend Transport; Tue, 22 Sep 2026 06:50:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 198.47.21.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.21.194 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.21.194; helo=flwvzet200.ext.ti.com; pr=C Received: from flwvzet200.ext.ti.com (198.47.21.194) by BY1PEPF0002695D.mail.protection.outlook.com (10.167.244.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:50:39 +0000 Received: from DFLE207.ent.ti.com (10.64.6.65) by flwvzet200.ext.ti.com (10.248.192.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:03 -0500 Received: from DFLE202.ent.ti.com (10.64.6.60) by DFLE207.ent.ti.com (10.64.6.65) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:03 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DFLE202.ent.ti.com (10.64.6.60) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:50:03 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI403626771; Tue, 22 Sep 2026 01:49:58 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 08/19] dmaengine: ti: k3-udma: move udma utility functions to k3-udma-common.c Date: Tue, 22 Sep 2026 12:17:32 +0530 Message-ID: <20260922064902.2719979-9-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PEPF0002695D:EE_|DM4PR10MB6207:EE_ X-MS-Office365-Filtering-Correlation-Id: c0e3ea43-e659-4feb-abc5-08df1875d03b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|82310400026|23010399003|36860700016|921020|3023799007|6133799003|10067099003|56012099006|5023799004|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: a8KlgI6Q34E96bbxqTZun7pgnDrfiFDd5w3mSy6GPOmPRzs+FvoTQT7P/F7eQt0exKuuyDO0VvHHRdcQ2cCWJKFpy1uxgOv/RXdf8QyZhCKALTpEGEBXaAScmfkeD+RLnnZqrELiDNwFXVvao8N0NRFLxLz39ZujiyNS0Q1KiKYRxCDNprgxz8O4GUkt+i5Dh1lGYGJkctf/n+hoK13U9Y9BpIgED6walTEE5ELo9Cg3NTZG0UoxeDgWW9PG6xE3fOXoAmh4Qz8LO2aXO0Ku2BXJuz+h4TgebnpjfVooPMPLF+pIdYT/67qQmoKKo2anJFq7m22V5bEwjMKrG8/ouEJiL/Zs5nHo2TQWnTlNVoidcTQYufNJHTEOB1pI0b/7lI0NTqunF5xfBN9rtE7Wkm8FcDuTiL3vjRb7inWeHYJLXTeJW4jMHaa2fk+PLDanlLHXnEZLLRl/StIf/NiwOY76ubix+cr/XIeqL3byTcU/zjcZu5kOrJJPcizw1NK2AJJWeDHrqTKIoKsTEnfSdOHEiukJ+TzURXJqLr+5M5Zz9NJ+hNjmiY3+jyLt8uay2eJlLTSpE/Jz2/pnqR0FomIlcTnQia5U6J8we6+e49NqcY+S5oqIXsIBJ7Al1pXdOU3Mt84GGcucV7uMlqWZdPLfw4MpUig+c1MrU3zEtEXxjemOM1GkYq9sMWB9CiY3Z48AaNGRW3r10I1xWX3B6ZP7aSEgGG1JAy/8PtgLMJlmu5z8pvjCn8flrO+N5pgw X-Forefront-Antispam-Report: CIP:198.47.21.194;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:flwvzet200.ext.ti.com;PTR:ErrorRetry;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(82310400026)(23010399003)(36860700016)(921020)(3023799007)(6133799003)(10067099003)(56012099006)(5023799004)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MbDITRiT/yv9nRAaJkriz2jiwudRJEVYiw631Y8i8hJ1u6PMq0mkgyl0kQ5eLXsWwZLsOW7lwOtb0ZmAgCYp19dY+ekF4Irhff43qsp/EvSVwL/f8V5++i8giRPpNYZb+xpeQPHiU/0uQb4WjJ+i4j81ohHflK8m5iqsmW3TXv9CvB1gAl+Y6A/JEt0dTOF+2EQTsGje2b1a25ohIFGBcq/j2zIIeyyXERGTNFNeG5j8JUlH613j5srSoN1yHucnK4MnJ+WjFhnfaTEtIk0t+Ew1ZJiQfgdNIwZJF08thWG44WzdryQuKUf1Jj9pWKRco47HMq9og5eKULjjPuQFSIgf0KszkcXpFgbm+nWDsaB2jcTfkxxZZ8wNwx4y8Omh7Q055MThFGtKGLVGGba+6SS2zTc2vbJeQ7Iz1SRMyqAUz2ggTlcl7QlblFD1R2CA X-Exchange-RoutingPolicyChecked: p4yGRw53cD27OU1Ce7/SdkUgqwvuJ1ZotvyKTSirfKzWrayD1eTRcCZr1/WY6aiVVhAR+g4FlJPGOJ0w8YtTQP2q7jrB2sx9xvaSf8ZeA5FD30Nv8KKOHZFdwJZLD/lm2zEkXsSoJZPq+CtmvstaYmJcJ3Pry/UhlxMp7P8BzfIM7+IQqwCu3kTzQywsXiwMGnJry/y4qmWfQZ7yeinIU43eKvTzaLZr9+VijD0akesIlt6Yyy0ScFuyzX1ZmCrPn2u8HAd9YhFOeVUqSvBZnlPpgFwjYz0g4JkQ9XYop8yGpxgRED1jbRctT30sfvOkCKPIo6cjGxv1JhlFbVRp+A== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:50:39.2299 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c0e3ea43-e659-4feb-abc5-08df1875d03b X-MS-Exchange-CrossTenant-Id: e5b49634-450b-4709-8abb-1e2b19b982b7 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e5b49634-450b-4709-8abb-1e2b19b982b7;Ip=[198.47.21.194];Helo=[flwvzet200.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: BY1PEPF0002695D.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB6207 X-Proofpoint-GUID: fJKDHKVPv8lOmIQjr4wO5j2eurus1ADO X-Authority-Analysis: v=2.4 cv=GI+dgeNK c=1 sm=1 tr=0 ts=6ab22546 cx=c_pps a=QTU/OWcW2qKRxVucCLrmDQ==:117 a=iwqwCZQqcuTv3JOpYdM7/Q==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=fPAWb5peG099m5CrUpKH:22 a=sozttTNsAAAA:8 a=bI_GjgVLxrynCmwSAzAA:9 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX8Lv46aGTuhkg L7qJkmtEuIIKF7l12wDjGuRrYN4s2KSwX8UxnhSGX0bq9zUakuTyCJB8RxQ1yAk5j46kT59Dl/L 8S4ukf9wM8lI1gBUwZcOS7v9e/8lSBE= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfXxjENq7qD8iDN PgAKOCz1dendox4l+y6+CsX93uarwxO7vEJM0mouDD+nyud/dE/PTBCpv0zz7VCyRUskMpoVd/U /0eLdXnmEOHMPvcsOG2i8YjnBHIcuKvjnJLDXVYhNS1jNgWHMRmUvyAEFCZoD3RgerZmEIZ7uAE UgJqNk/FnBYbP6dwlrbMkgJQqa/PiLwAqELullO2po4U4qjXMR14nrdOw/jSE75tLJaDm4h2OQ1 cj6cy55bPYyl984FTQrygsGnVjbKte8S9V52fHW3IGkbsdYPbveWSWBBGzuRysIy907Xxw7mj2O yFm6L+7su4UA9ISZysfZ8XxlMz8VznUfqIbOXqXoamYWqUQ3caeW814nJZIaKars85QgWQ69smE Q8LcB5SNdZSjqsllaoZz8i1mHe1CYJqLAa0yXZtpNFyNAM9vtvnPJOPdAdWAZB0RBw8QOr/+F7r SY872tkrdtHQL2az5yQ== X-Proofpoint-ORIG-GUID: fJKDHKVPv8lOmIQjr4wO5j2eurus1ADO X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 adultscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 clxscore=1015 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220097 Content-Type: text/plain; charset="utf-8" Relocate udma utility functions from k3-udma.c to k3-udma-common.c file. The implementation of these functions is largely shared between K3 UDMA and K3 UDMA v2. This refactor improves code reuse and maintainability across multiple variants. No functional changes intended. Signed-off-by: Sai Sree Kartheek Adivi --- drivers/dma/ti/k3-udma-common.c | 549 ++++++++++++++++++++++++++++++++ drivers/dma/ti/k3-udma.c | 531 ------------------------------ drivers/dma/ti/k3-udma.h | 28 ++ 3 files changed, 577 insertions(+), 531 deletions(-) diff --git a/drivers/dma/ti/k3-udma-common.c b/drivers/dma/ti/k3-udma-commo= n.c index 3ec5cc932280c..dbd667d77f137 100644 --- a/drivers/dma/ti/k3-udma-common.c +++ b/drivers/dma/ti/k3-udma-common.c @@ -4,6 +4,7 @@ * Author: Peter Ujfalusi */ =20 +#include #include #include #include @@ -46,6 +47,28 @@ struct udma_desc *udma_udma_desc_from_paddr(struct udma_= chan *uc, } EXPORT_SYMBOL_GPL(udma_udma_desc_from_paddr); =20 +void udma_start_desc(struct udma_chan *uc) +{ + struct udma_chan_config *ucc =3D &uc->config; + + if (uc->ud->match_data->type =3D=3D DMA_TYPE_UDMA && ucc->pkt_mode && + (uc->cyclic || ucc->dir =3D=3D DMA_DEV_TO_MEM)) { + int i; + + /* + * UDMA only: Push all descriptors to ring for packet mode + * cyclic or RX + * PKTDMA supports pre-linked descriptor and cyclic is not + * supported + */ + for (i =3D 0; i < uc->desc->sglen; i++) + udma_push_to_ring(uc, i); + } else { + udma_push_to_ring(uc, 0); + } +} +EXPORT_SYMBOL_GPL(udma_start_desc); + void udma_free_hwdesc(struct udma_chan *uc, struct udma_desc *d) { if (uc->use_dma_pool) { @@ -1342,5 +1365,531 @@ void udma_reset_rings(struct udma_chan *uc) } EXPORT_SYMBOL_GPL(udma_reset_rings); =20 +u8 udma_get_chan_tpl_index(struct udma_tpl *tpl_map, int chan_id) +{ + int i; + + for (i =3D 0; i < tpl_map->levels; i++) { + if (chan_id >=3D tpl_map->start_idx[i]) + return i; + } + + return 0; +} +EXPORT_SYMBOL_GPL(udma_get_chan_tpl_index); + +void k3_configure_chan_coherency(struct dma_chan *chan, u32 asel) +{ + struct device *chan_dev =3D dmaengine_chan_dev(chan); + + if (asel =3D=3D 0) { + /* No special handling for the channel */ + chan->chan_dev->chan_dma_dev =3D false; + + dev_clear_dma_coherent(chan_dev); + chan_dev->dma_parms =3D NULL; + } else if (asel =3D=3D 14 || asel =3D=3D 15) { + chan->chan_dev->chan_dma_dev =3D true; + + dev_set_dma_coherent(chan_dev); + dma_coerce_mask_and_coherent(chan_dev, DMA_BIT_MASK(48)); + chan_dev->dma_parms =3D chan_dev->parent->dma_parms; + } else { + dev_warn(chan->device->dev, "Invalid ASEL value: %u\n", asel); + + dev_clear_dma_coherent(chan_dev); + chan_dev->dma_parms =3D NULL; + } +} +EXPORT_SYMBOL_GPL(k3_configure_chan_coherency); + +void udma_reset_uchan(struct udma_chan *uc) +{ + memset(&uc->config, 0, sizeof(uc->config)); + uc->config.remote_thread_id =3D -1; + uc->config.mapped_channel_id =3D -1; + uc->config.default_flow_id =3D -1; + uc->state =3D UDMA_CHAN_IS_IDLE; +} +EXPORT_SYMBOL_GPL(udma_reset_uchan); + +void udma_dump_chan_stdata(struct udma_chan *uc) +{ + struct device *dev =3D uc->ud->dev; + u32 offset; + int i; + + if (uc->config.dir =3D=3D DMA_MEM_TO_DEV || uc->config.dir =3D=3D DMA_MEM= _TO_MEM) { + dev_dbg(dev, "TCHAN State data:\n"); + for (i =3D 0; i < 32; i++) { + offset =3D UDMA_CHAN_RT_STDATA_REG + i * 4; + dev_dbg(dev, "TRT_STDATA[%02d]: 0x%08x\n", i, + udma_tchanrt_read(uc, offset)); + } + } + + if (uc->config.dir =3D=3D DMA_DEV_TO_MEM || uc->config.dir =3D=3D DMA_MEM= _TO_MEM) { + dev_dbg(dev, "RCHAN State data:\n"); + for (i =3D 0; i < 32; i++) { + offset =3D UDMA_CHAN_RT_STDATA_REG + i * 4; + dev_dbg(dev, "RRT_STDATA[%02d]: 0x%08x\n", i, + udma_rchanrt_read(uc, offset)); + } + } +} + +bool udma_is_chan_running(struct udma_chan *uc) +{ + u32 trt_ctl =3D 0; + u32 rrt_ctl =3D 0; + + if (uc->tchan) + trt_ctl =3D udma_tchanrt_read(uc, UDMA_CHAN_RT_CTL_REG); + if (uc->rchan) + rrt_ctl =3D udma_rchanrt_read(uc, UDMA_CHAN_RT_CTL_REG); + + if (trt_ctl & UDMA_CHAN_RT_CTL_EN || rrt_ctl & UDMA_CHAN_RT_CTL_EN) + return true; + + return false; +} +EXPORT_SYMBOL_GPL(udma_is_chan_running); + +bool udma_chan_needs_reconfiguration(struct udma_chan *uc) +{ + /* Only PDMAs have staticTR */ + if (uc->config.ep_type =3D=3D PSIL_EP_NATIVE) + return false; + + /* Check if the staticTR configuration has changed for TX */ + if (memcmp(&uc->static_tr, &uc->desc->static_tr, sizeof(uc->static_tr))) + return true; + + return false; +} +EXPORT_SYMBOL_GPL(udma_chan_needs_reconfiguration); + +void udma_cyclic_packet_elapsed(struct udma_chan *uc) +{ + struct udma_desc *d =3D uc->desc; + struct cppi5_host_desc_t *h_desc; + + h_desc =3D d->hwdesc[d->desc_idx].cppi5_desc_vaddr; + cppi5_hdesc_reset_to_original(h_desc); + udma_push_to_ring(uc, d->desc_idx); + d->desc_idx =3D (d->desc_idx + 1) % d->sglen; +} +EXPORT_SYMBOL_GPL(udma_cyclic_packet_elapsed); + +void udma_check_tx_completion(struct work_struct *work) +{ + struct udma_chan *uc =3D container_of(work, typeof(*uc), + tx_drain.work.work); + bool desc_done =3D true; + u32 residue_diff; + ktime_t time_diff; + unsigned long delay; + unsigned long flags; + + while (1) { + spin_lock_irqsave(&uc->vc.lock, flags); + + if (uc->desc) { + /* Get previous residue and time stamp */ + residue_diff =3D uc->tx_drain.residue; + time_diff =3D uc->tx_drain.tstamp; + /* + * Get current residue and time stamp or see if + * transfer is complete + */ + desc_done =3D udma_is_desc_really_done(uc, uc->desc); + } + + if (!desc_done) { + /* + * Find the time delta and residue delta w.r.t + * previous poll + */ + time_diff =3D ktime_sub(uc->tx_drain.tstamp, + time_diff) + 1; + residue_diff -=3D uc->tx_drain.residue; + if (residue_diff) { + /* + * Try to guess when we should check + * next time by calculating rate at + * which data is being drained at the + * peer device + */ + delay =3D (time_diff / residue_diff) * + uc->tx_drain.residue; + } else { + /* No progress, check again in 1 second */ + schedule_delayed_work(&uc->tx_drain.work, HZ); + break; + } + + spin_unlock_irqrestore(&uc->vc.lock, flags); + + usleep_range(ktime_to_us(delay), + ktime_to_us(delay) + 10); + continue; + } + + if (uc->desc) { + struct udma_desc *d =3D uc->desc; + + uc->ud->decrement_byte_counters(uc, d->residue); + uc->ud->start(uc); + vchan_cookie_complete(&d->vd); + break; + } + + break; + } + + spin_unlock_irqrestore(&uc->vc.lock, flags); +} +EXPORT_SYMBOL_GPL(udma_check_tx_completion); + +int udma_slave_config(struct dma_chan *chan, + struct dma_slave_config *cfg) +{ + struct udma_chan *uc =3D to_udma_chan(chan); + + memcpy(&uc->cfg, cfg, sizeof(uc->cfg)); + + return 0; +} +EXPORT_SYMBOL_GPL(udma_slave_config); + +void udma_issue_pending(struct dma_chan *chan) +{ + struct udma_chan *uc =3D to_udma_chan(chan); + unsigned long flags; + + spin_lock_irqsave(&uc->vc.lock, flags); + + /* If we have something pending and no active descriptor, then */ + if (vchan_issue_pending(&uc->vc) && !uc->desc) { + /* + * start a descriptor if the channel is NOT [marked as + * terminating _and_ it is still running (teardown has not + * completed yet)]. + */ + if (!(uc->state =3D=3D UDMA_CHAN_IS_TERMINATING && + udma_is_chan_running(uc))) + uc->ud->start(uc); + } + + spin_unlock_irqrestore(&uc->vc.lock, flags); +} +EXPORT_SYMBOL_GPL(udma_issue_pending); + +int udma_terminate_all(struct dma_chan *chan) +{ + struct udma_chan *uc =3D to_udma_chan(chan); + unsigned long flags; + LIST_HEAD(head); + + spin_lock_irqsave(&uc->vc.lock, flags); + + if (udma_is_chan_running(uc)) + uc->ud->stop(uc); + + if (uc->desc) { + uc->terminated_desc =3D uc->desc; + uc->desc =3D NULL; + uc->terminated_desc->terminated =3D true; + cancel_delayed_work(&uc->tx_drain.work); + } + + uc->paused =3D false; + + vchan_get_all_descriptors(&uc->vc, &head); + spin_unlock_irqrestore(&uc->vc.lock, flags); + vchan_dma_desc_free_list(&uc->vc, &head); + + return 0; +} +EXPORT_SYMBOL_GPL(udma_terminate_all); + +void udma_synchronize(struct dma_chan *chan) +{ + struct udma_chan *uc =3D to_udma_chan(chan); + unsigned long timeout =3D msecs_to_jiffies(1000); + + vchan_synchronize(&uc->vc); + + if (uc->state =3D=3D UDMA_CHAN_IS_TERMINATING) { + timeout =3D wait_for_completion_timeout(&uc->teardown_completed, + timeout); + if (!timeout) { + dev_warn(uc->ud->dev, "chan%d teardown timeout!\n", + uc->id); + udma_dump_chan_stdata(uc); + uc->ud->reset_chan(uc, true); + } + } + + uc->ud->reset_chan(uc, false); + if (udma_is_chan_running(uc)) + dev_warn(uc->ud->dev, "chan%d refused to stop!\n", uc->id); + + cancel_delayed_work_sync(&uc->tx_drain.work); + udma_reset_rings(uc); +} +EXPORT_SYMBOL_GPL(udma_synchronize); + +/* + * This tasklet handles the completion of a DMA descriptor by + * calling its callback and freeing it. + */ +void udma_vchan_complete(struct tasklet_struct *t) +{ + struct virt_dma_chan *vc =3D from_tasklet(vc, t, task); + struct virt_dma_desc *vd, *_vd; + struct dmaengine_desc_callback cb; + LIST_HEAD(head); + + spin_lock_irq(&vc->lock); + list_splice_tail_init(&vc->desc_completed, &head); + vd =3D vc->cyclic; + if (vd) { + vc->cyclic =3D NULL; + dmaengine_desc_get_callback(&vd->tx, &cb); + } else { + memset(&cb, 0, sizeof(cb)); + } + spin_unlock_irq(&vc->lock); + + udma_desc_pre_callback(vc, vd, NULL); + dmaengine_desc_callback_invoke(&cb, NULL); + + list_for_each_entry_safe(vd, _vd, &head, node) { + struct dmaengine_result result; + + dmaengine_desc_get_callback(&vd->tx, &cb); + + list_del(&vd->node); + + udma_desc_pre_callback(vc, vd, &result); + dmaengine_desc_callback_invoke(&cb, &result); + + vchan_vdesc_fini(vd); + } +} +EXPORT_SYMBOL_GPL(udma_vchan_complete); + +void udma_mark_resource_ranges(struct udma_dev *ud, unsigned long *map, + struct ti_sci_resource_desc *rm_desc, + char *name) +{ + bitmap_clear(map, rm_desc->start, rm_desc->num); + bitmap_clear(map, rm_desc->start_sec, rm_desc->num_sec); + dev_dbg(ud->dev, "ti_sci resource range for %s: %d:%d | %d:%d\n", name, + rm_desc->start, rm_desc->num, rm_desc->start_sec, + rm_desc->num_sec); +} +EXPORT_SYMBOL_GPL(udma_mark_resource_ranges); + +int udma_setup_rx_flush(struct udma_dev *ud) +{ + struct udma_rx_flush *rx_flush =3D &ud->rx_flush; + struct cppi5_desc_hdr_t *tr_desc; + struct cppi5_tr_type1_t *tr_req; + struct cppi5_host_desc_t *desc; + struct device *dev =3D ud->dev; + struct udma_hwdesc *hwdesc; + size_t tr_size; + + /* Allocate 1K buffer for discarded data on RX channel teardown */ + rx_flush->buffer_size =3D SZ_1K; + rx_flush->buffer_vaddr =3D devm_kzalloc(dev, rx_flush->buffer_size, + GFP_KERNEL); + if (!rx_flush->buffer_vaddr) + return -ENOMEM; + + rx_flush->buffer_paddr =3D dma_map_single(dev, rx_flush->buffer_vaddr, + rx_flush->buffer_size, + DMA_TO_DEVICE); + if (dma_mapping_error(dev, rx_flush->buffer_paddr)) + return -ENOMEM; + + /* Set up descriptor to be used for TR mode */ + hwdesc =3D &rx_flush->hwdescs[0]; + tr_size =3D sizeof(struct cppi5_tr_type1_t); + hwdesc->cppi5_desc_size =3D cppi5_trdesc_calc_size(tr_size, 1); + hwdesc->cppi5_desc_size =3D ALIGN(hwdesc->cppi5_desc_size, + ud->desc_align); + + hwdesc->cppi5_desc_vaddr =3D devm_kzalloc(dev, hwdesc->cppi5_desc_size, + GFP_KERNEL); + if (!hwdesc->cppi5_desc_vaddr) + return -ENOMEM; + + hwdesc->cppi5_desc_paddr =3D dma_map_single(dev, hwdesc->cppi5_desc_vaddr, + hwdesc->cppi5_desc_size, + DMA_TO_DEVICE); + if (dma_mapping_error(dev, hwdesc->cppi5_desc_paddr)) + return -ENOMEM; + + /* Start of the TR req records */ + hwdesc->tr_req_base =3D hwdesc->cppi5_desc_vaddr + tr_size; + /* Start address of the TR response array */ + hwdesc->tr_resp_base =3D hwdesc->tr_req_base + tr_size; + + tr_desc =3D hwdesc->cppi5_desc_vaddr; + cppi5_trdesc_init(tr_desc, 1, tr_size, 0, 0); + cppi5_desc_set_pktids(tr_desc, 0, CPPI5_INFO1_DESC_FLOWID_DEFAULT); + cppi5_desc_set_retpolicy(tr_desc, 0, 0); + + tr_req =3D hwdesc->tr_req_base; + cppi5_tr_init(&tr_req->flags, CPPI5_TR_TYPE1, false, false, + CPPI5_TR_EVENT_SIZE_COMPLETION, 0); + cppi5_tr_csf_set(&tr_req->flags, CPPI5_TR_CSF_SUPR_EVT); + + tr_req->addr =3D rx_flush->buffer_paddr; + tr_req->icnt0 =3D rx_flush->buffer_size; + tr_req->icnt1 =3D 1; + + dma_sync_single_for_device(dev, hwdesc->cppi5_desc_paddr, + hwdesc->cppi5_desc_size, DMA_TO_DEVICE); + + /* Set up descriptor to be used for packet mode */ + hwdesc =3D &rx_flush->hwdescs[1]; + hwdesc->cppi5_desc_size =3D ALIGN(sizeof(struct cppi5_host_desc_t) + + CPPI5_INFO0_HDESC_EPIB_SIZE + + CPPI5_INFO0_HDESC_PSDATA_MAX_SIZE, + ud->desc_align); + + hwdesc->cppi5_desc_vaddr =3D devm_kzalloc(dev, hwdesc->cppi5_desc_size, + GFP_KERNEL); + if (!hwdesc->cppi5_desc_vaddr) + return -ENOMEM; + + hwdesc->cppi5_desc_paddr =3D dma_map_single(dev, hwdesc->cppi5_desc_vaddr, + hwdesc->cppi5_desc_size, + DMA_TO_DEVICE); + if (dma_mapping_error(dev, hwdesc->cppi5_desc_paddr)) + return -ENOMEM; + + desc =3D hwdesc->cppi5_desc_vaddr; + cppi5_hdesc_init(desc, 0, 0); + cppi5_desc_set_pktids(&desc->hdr, 0, CPPI5_INFO1_DESC_FLOWID_DEFAULT); + cppi5_desc_set_retpolicy(&desc->hdr, 0, 0); + + cppi5_hdesc_attach_buf(desc, + rx_flush->buffer_paddr, rx_flush->buffer_size, + rx_flush->buffer_paddr, rx_flush->buffer_size); + + dma_sync_single_for_device(dev, hwdesc->cppi5_desc_paddr, + hwdesc->cppi5_desc_size, DMA_TO_DEVICE); + return 0; +} +EXPORT_SYMBOL_GPL(udma_setup_rx_flush); + +#ifdef CONFIG_DEBUG_FS +void udma_dbg_summary_show_chan(struct seq_file *s, + struct dma_chan *chan) +{ + struct udma_chan *uc =3D to_udma_chan(chan); + struct udma_chan_config *ucc =3D &uc->config; + + seq_printf(s, " %-13s| %s", dma_chan_name(chan), + chan->dbg_client_name ?: "in-use"); + if (ucc->tr_trigger_type) + seq_puts(s, " (triggered, "); + else + seq_printf(s, " (%s, ", + dmaengine_get_direction_text(uc->config.dir)); + + switch (uc->config.dir) { + case DMA_MEM_TO_MEM: + if (uc->ud->match_data->type =3D=3D DMA_TYPE_BCDMA) { + seq_printf(s, "bchan%d)\n", uc->bchan->id); + return; + } + + seq_printf(s, "chan%d pair [0x%04x -> 0x%04x], ", uc->tchan->id, + ucc->src_thread, ucc->dst_thread); + break; + case DMA_DEV_TO_MEM: + seq_printf(s, "rchan%d [0x%04x -> 0x%04x], ", uc->rchan->id, + ucc->src_thread, ucc->dst_thread); + if (uc->ud->match_data->type =3D=3D DMA_TYPE_PKTDMA) + seq_printf(s, "rflow%d, ", uc->rflow->id); + break; + case DMA_MEM_TO_DEV: + seq_printf(s, "tchan%d [0x%04x -> 0x%04x], ", uc->tchan->id, + ucc->src_thread, ucc->dst_thread); + if (uc->ud->match_data->type =3D=3D DMA_TYPE_PKTDMA) + seq_printf(s, "tflow%d, ", uc->tchan->tflow_id); + break; + default: + seq_puts(s, ")\n"); + return; + } + + if (ucc->ep_type =3D=3D PSIL_EP_NATIVE) { + seq_puts(s, "PSI-L Native"); + if (ucc->metadata_size) { + seq_printf(s, "[%s", ucc->needs_epib ? " EPIB" : ""); + if (ucc->psd_size) + seq_printf(s, " PSDsize:%u", ucc->psd_size); + seq_puts(s, " ]"); + } + } else { + seq_puts(s, "PDMA"); + if (ucc->enable_acc32 || ucc->enable_burst) + seq_printf(s, "[%s%s ]", + ucc->enable_acc32 ? " ACC32" : "", + ucc->enable_burst ? " BURST" : ""); + } + + seq_printf(s, ", %s)\n", ucc->pkt_mode ? "Packet mode" : "TR mode"); +} + +void udma_dbg_summary_show(struct seq_file *s, + struct dma_device *dma_dev) +{ + struct dma_chan *chan; + + list_for_each_entry(chan, &dma_dev->channels, device_node) { + if (chan->client_count) + udma_dbg_summary_show_chan(s, chan); + } +} +EXPORT_SYMBOL_GPL(udma_dbg_summary_show); +#endif /* CONFIG_DEBUG_FS */ + +enum dmaengine_alignment udma_get_copy_align(struct udma_dev *ud) +{ + const struct udma_match_data *match_data =3D ud->match_data; + u8 tpl; + + if (!match_data->enable_memcpy_support) + return DMAENGINE_ALIGN_8_BYTES; + + /* Get the highest TPL level the device supports for memcpy */ + if (ud->bchan_cnt) + tpl =3D udma_get_chan_tpl_index(&ud->bchan_tpl, 0); + else if (ud->tchan_cnt) + tpl =3D udma_get_chan_tpl_index(&ud->tchan_tpl, 0); + else + return DMAENGINE_ALIGN_8_BYTES; + + switch (match_data->burst_size[tpl]) { + case TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_256_BYTES: + return DMAENGINE_ALIGN_256_BYTES; + case TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_128_BYTES: + return DMAENGINE_ALIGN_128_BYTES; + case TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_64_BYTES: + fallthrough; + default: + return DMAENGINE_ALIGN_64_BYTES; + } +} +EXPORT_SYMBOL_GPL(udma_get_copy_align); + MODULE_DESCRIPTION("Texas Instruments K3 UDMA Common Library"); MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 36dcc888815ea..cd73bf03e9cc6 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -61,92 +61,6 @@ int navss_psil_unpair(struct udma_dev *ud, u32 src_threa= d, src_thread, dst_thread); } =20 -static void k3_configure_chan_coherency(struct dma_chan *chan, u32 asel) -{ - struct device *chan_dev =3D dmaengine_chan_dev(chan); - - if (asel =3D=3D 0) { - /* No special handling for the channel */ - chan->chan_dev->chan_dma_dev =3D false; - - dev_clear_dma_coherent(chan_dev); - chan_dev->dma_parms =3D NULL; - } else if (asel =3D=3D 14 || asel =3D=3D 15) { - chan->chan_dev->chan_dma_dev =3D true; - - dev_set_dma_coherent(chan_dev); - dma_coerce_mask_and_coherent(chan_dev, DMA_BIT_MASK(48)); - chan_dev->dma_parms =3D chan_dev->parent->dma_parms; - } else { - dev_warn(chan->device->dev, "Invalid ASEL value: %u\n", asel); - - dev_clear_dma_coherent(chan_dev); - chan_dev->dma_parms =3D NULL; - } -} - -static u8 udma_get_chan_tpl_index(struct udma_tpl *tpl_map, int chan_id) -{ - int i; - - for (i =3D 0; i < tpl_map->levels; i++) { - if (chan_id >=3D tpl_map->start_idx[i]) - return i; - } - - return 0; -} - -static void udma_reset_uchan(struct udma_chan *uc) -{ - memset(&uc->config, 0, sizeof(uc->config)); - uc->config.remote_thread_id =3D -1; - uc->config.mapped_channel_id =3D -1; - uc->config.default_flow_id =3D -1; - uc->state =3D UDMA_CHAN_IS_IDLE; -} - -static void udma_dump_chan_stdata(struct udma_chan *uc) -{ - struct device *dev =3D uc->ud->dev; - u32 offset; - int i; - - if (uc->config.dir =3D=3D DMA_MEM_TO_DEV || uc->config.dir =3D=3D DMA_MEM= _TO_MEM) { - dev_dbg(dev, "TCHAN State data:\n"); - for (i =3D 0; i < 32; i++) { - offset =3D UDMA_CHAN_RT_STDATA_REG + i * 4; - dev_dbg(dev, "TRT_STDATA[%02d]: 0x%08x\n", i, - udma_tchanrt_read(uc, offset)); - } - } - - if (uc->config.dir =3D=3D DMA_DEV_TO_MEM || uc->config.dir =3D=3D DMA_MEM= _TO_MEM) { - dev_dbg(dev, "RCHAN State data:\n"); - for (i =3D 0; i < 32; i++) { - offset =3D UDMA_CHAN_RT_STDATA_REG + i * 4; - dev_dbg(dev, "RRT_STDATA[%02d]: 0x%08x\n", i, - udma_rchanrt_read(uc, offset)); - } - } -} - -static bool udma_is_chan_running(struct udma_chan *uc) -{ - u32 trt_ctl =3D 0; - u32 rrt_ctl =3D 0; - - if (uc->tchan) - trt_ctl =3D udma_tchanrt_read(uc, UDMA_CHAN_RT_CTL_REG); - if (uc->rchan) - rrt_ctl =3D udma_rchanrt_read(uc, UDMA_CHAN_RT_CTL_REG); - - if (trt_ctl & UDMA_CHAN_RT_CTL_EN || rrt_ctl & UDMA_CHAN_RT_CTL_EN) - return true; - - return false; -} - static bool udma_is_chan_paused(struct udma_chan *uc) { u32 val, pause_mask; @@ -275,40 +189,6 @@ static int udma_reset_chan(struct udma_chan *uc, bool = hard) return 0; } =20 -static void udma_start_desc(struct udma_chan *uc) -{ - struct udma_chan_config *ucc =3D &uc->config; - - if (uc->ud->match_data->type =3D=3D DMA_TYPE_UDMA && ucc->pkt_mode && - (uc->cyclic || ucc->dir =3D=3D DMA_DEV_TO_MEM)) { - int i; - - /* - * UDMA only: Push all descriptors to ring for packet mode - * cyclic or RX - * PKTDMA supports pre-linked descriptor and cyclic is not - * supported - */ - for (i =3D 0; i < uc->desc->sglen; i++) - udma_push_to_ring(uc, i); - } else { - udma_push_to_ring(uc, 0); - } -} - -static bool udma_chan_needs_reconfiguration(struct udma_chan *uc) -{ - /* Only PDMAs have staticTR */ - if (uc->config.ep_type =3D=3D PSIL_EP_NATIVE) - return false; - - /* Check if the staticTR configuration has changed for TX */ - if (memcmp(&uc->static_tr, &uc->desc->static_tr, sizeof(uc->static_tr))) - return true; - - return false; -} - static int udma_start(struct udma_chan *uc) { struct virt_dma_desc *vd =3D vchan_next_desc(&uc->vc); @@ -453,86 +333,6 @@ static int udma_stop(struct udma_chan *uc) return 0; } =20 -static void udma_cyclic_packet_elapsed(struct udma_chan *uc) -{ - struct udma_desc *d =3D uc->desc; - struct cppi5_host_desc_t *h_desc; - - h_desc =3D d->hwdesc[d->desc_idx].cppi5_desc_vaddr; - cppi5_hdesc_reset_to_original(h_desc); - udma_push_to_ring(uc, d->desc_idx); - d->desc_idx =3D (d->desc_idx + 1) % d->sglen; -} - -static void udma_check_tx_completion(struct work_struct *work) -{ - struct udma_chan *uc =3D container_of(work, typeof(*uc), - tx_drain.work.work); - bool desc_done =3D true; - u32 residue_diff; - ktime_t time_diff; - unsigned long delay; - unsigned long flags; - - while (1) { - spin_lock_irqsave(&uc->vc.lock, flags); - - if (uc->desc) { - /* Get previous residue and time stamp */ - residue_diff =3D uc->tx_drain.residue; - time_diff =3D uc->tx_drain.tstamp; - /* - * Get current residue and time stamp or see if - * transfer is complete - */ - desc_done =3D udma_is_desc_really_done(uc, uc->desc); - } - - if (!desc_done) { - /* - * Find the time delta and residue delta w.r.t - * previous poll - */ - time_diff =3D ktime_sub(uc->tx_drain.tstamp, - time_diff) + 1; - residue_diff -=3D uc->tx_drain.residue; - if (residue_diff) { - /* - * Try to guess when we should check - * next time by calculating rate at - * which data is being drained at the - * peer device - */ - delay =3D (time_diff / residue_diff) * - uc->tx_drain.residue; - } else { - /* No progress, check again in 1 second */ - schedule_delayed_work(&uc->tx_drain.work, HZ); - break; - } - - spin_unlock_irqrestore(&uc->vc.lock, flags); - - usleep_range(ktime_to_us(delay), - ktime_to_us(delay) + 10); - continue; - } - - if (uc->desc) { - struct udma_desc *d =3D uc->desc; - - uc->ud->decrement_byte_counters(uc, d->residue); - uc->ud->start(uc); - vchan_cookie_complete(&d->vd); - break; - } - - break; - } - - spin_unlock_irqrestore(&uc->vc.lock, flags); -} - static irqreturn_t udma_ring_irq_handler(int irq, void *data) { struct udma_chan *uc =3D data; @@ -2097,38 +1897,6 @@ static int pktdma_alloc_chan_resources(struct dma_ch= an *chan) return ret; } =20 -static int udma_slave_config(struct dma_chan *chan, - struct dma_slave_config *cfg) -{ - struct udma_chan *uc =3D to_udma_chan(chan); - - memcpy(&uc->cfg, cfg, sizeof(uc->cfg)); - - return 0; -} - -static void udma_issue_pending(struct dma_chan *chan) -{ - struct udma_chan *uc =3D to_udma_chan(chan); - unsigned long flags; - - spin_lock_irqsave(&uc->vc.lock, flags); - - /* If we have something pending and no active descriptor, then */ - if (vchan_issue_pending(&uc->vc) && !uc->desc) { - /* - * start a descriptor if the channel is NOT [marked as - * terminating _and_ it is still running (teardown has not - * completed yet)]. - */ - if (!(uc->state =3D=3D UDMA_CHAN_IS_TERMINATING && - udma_is_chan_running(uc))) - uc->ud->start(uc); - } - - spin_unlock_irqrestore(&uc->vc.lock, flags); -} - static enum dma_status udma_tx_status(struct dma_chan *chan, dma_cookie_t cookie, struct dma_tx_state *txstate) @@ -2256,98 +2024,6 @@ static int udma_resume(struct dma_chan *chan) return 0; } =20 -static int udma_terminate_all(struct dma_chan *chan) -{ - struct udma_chan *uc =3D to_udma_chan(chan); - unsigned long flags; - LIST_HEAD(head); - - spin_lock_irqsave(&uc->vc.lock, flags); - - if (udma_is_chan_running(uc)) - uc->ud->stop(uc); - - if (uc->desc) { - uc->terminated_desc =3D uc->desc; - uc->desc =3D NULL; - uc->terminated_desc->terminated =3D true; - cancel_delayed_work(&uc->tx_drain.work); - } - - uc->paused =3D false; - - vchan_get_all_descriptors(&uc->vc, &head); - spin_unlock_irqrestore(&uc->vc.lock, flags); - vchan_dma_desc_free_list(&uc->vc, &head); - - return 0; -} - -static void udma_synchronize(struct dma_chan *chan) -{ - struct udma_chan *uc =3D to_udma_chan(chan); - unsigned long timeout =3D msecs_to_jiffies(1000); - - vchan_synchronize(&uc->vc); - - if (uc->state =3D=3D UDMA_CHAN_IS_TERMINATING) { - timeout =3D wait_for_completion_timeout(&uc->teardown_completed, - timeout); - if (!timeout) { - dev_warn(uc->ud->dev, "chan%d teardown timeout!\n", - uc->id); - udma_dump_chan_stdata(uc); - uc->ud->reset_chan(uc, true); - } - } - - uc->ud->reset_chan(uc, false); - if (udma_is_chan_running(uc)) - dev_warn(uc->ud->dev, "chan%d refused to stop!\n", uc->id); - - cancel_delayed_work_sync(&uc->tx_drain.work); - udma_reset_rings(uc); -} - -/* - * This tasklet handles the completion of a DMA descriptor by - * calling its callback and freeing it. - */ -static void udma_vchan_complete(struct tasklet_struct *t) -{ - struct virt_dma_chan *vc =3D from_tasklet(vc, t, task); - struct virt_dma_desc *vd, *_vd; - struct dmaengine_desc_callback cb; - LIST_HEAD(head); - - spin_lock_irq(&vc->lock); - list_splice_tail_init(&vc->desc_completed, &head); - vd =3D vc->cyclic; - if (vd) { - vc->cyclic =3D NULL; - dmaengine_desc_get_callback(&vd->tx, &cb); - } else { - memset(&cb, 0, sizeof(cb)); - } - spin_unlock_irq(&vc->lock); - - udma_desc_pre_callback(vc, vd, NULL); - dmaengine_desc_callback_invoke(&cb, NULL); - - list_for_each_entry_safe(vd, _vd, &head, node) { - struct dmaengine_result result; - - dmaengine_desc_get_callback(&vd->tx, &cb); - - list_del(&vd->node); - - udma_desc_pre_callback(vc, vd, &result); - dmaengine_desc_callback_invoke(&cb, &result); - - vchan_vdesc_fini(vd); - } -} - static void udma_free_chan_resources(struct dma_chan *chan) { struct udma_chan *uc =3D to_udma_chan(chan); @@ -2822,17 +2498,6 @@ static int udma_get_mmrs(struct platform_device *pde= v, struct udma_dev *ud) return 0; } =20 -static void udma_mark_resource_ranges(struct udma_dev *ud, unsigned long *= map, - struct ti_sci_resource_desc *rm_desc, - char *name) -{ - bitmap_clear(map, rm_desc->start, rm_desc->num); - bitmap_clear(map, rm_desc->start_sec, rm_desc->num_sec); - dev_dbg(ud->dev, "ti_sci resource range for %s: %d:%d | %d:%d\n", name, - rm_desc->start, rm_desc->num, rm_desc->start_sec, - rm_desc->num_sec); -} - static const char * const range_names[] =3D { [RM_RANGE_BCHAN] =3D "ti,sci-rm-range-bchan", [RM_RANGE_TCHAN] =3D "ti,sci-rm-range-tchan", @@ -3463,202 +3128,6 @@ static int setup_resources(struct udma_dev *ud) return ch_count; } =20 -static int udma_setup_rx_flush(struct udma_dev *ud) -{ - struct udma_rx_flush *rx_flush =3D &ud->rx_flush; - struct cppi5_desc_hdr_t *tr_desc; - struct cppi5_tr_type1_t *tr_req; - struct cppi5_host_desc_t *desc; - struct device *dev =3D ud->dev; - struct udma_hwdesc *hwdesc; - size_t tr_size; - - /* Allocate 1K buffer for discarded data on RX channel teardown */ - rx_flush->buffer_size =3D SZ_1K; - rx_flush->buffer_vaddr =3D devm_kzalloc(dev, rx_flush->buffer_size, - GFP_KERNEL); - if (!rx_flush->buffer_vaddr) - return -ENOMEM; - - rx_flush->buffer_paddr =3D dma_map_single(dev, rx_flush->buffer_vaddr, - rx_flush->buffer_size, - DMA_TO_DEVICE); - if (dma_mapping_error(dev, rx_flush->buffer_paddr)) - return -ENOMEM; - - /* Set up descriptor to be used for TR mode */ - hwdesc =3D &rx_flush->hwdescs[0]; - tr_size =3D sizeof(struct cppi5_tr_type1_t); - hwdesc->cppi5_desc_size =3D cppi5_trdesc_calc_size(tr_size, 1); - hwdesc->cppi5_desc_size =3D ALIGN(hwdesc->cppi5_desc_size, - ud->desc_align); - - hwdesc->cppi5_desc_vaddr =3D devm_kzalloc(dev, hwdesc->cppi5_desc_size, - GFP_KERNEL); - if (!hwdesc->cppi5_desc_vaddr) - return -ENOMEM; - - hwdesc->cppi5_desc_paddr =3D dma_map_single(dev, hwdesc->cppi5_desc_vaddr, - hwdesc->cppi5_desc_size, - DMA_TO_DEVICE); - if (dma_mapping_error(dev, hwdesc->cppi5_desc_paddr)) - return -ENOMEM; - - /* Start of the TR req records */ - hwdesc->tr_req_base =3D hwdesc->cppi5_desc_vaddr + tr_size; - /* Start address of the TR response array */ - hwdesc->tr_resp_base =3D hwdesc->tr_req_base + tr_size; - - tr_desc =3D hwdesc->cppi5_desc_vaddr; - cppi5_trdesc_init(tr_desc, 1, tr_size, 0, 0); - cppi5_desc_set_pktids(tr_desc, 0, CPPI5_INFO1_DESC_FLOWID_DEFAULT); - cppi5_desc_set_retpolicy(tr_desc, 0, 0); - - tr_req =3D hwdesc->tr_req_base; - cppi5_tr_init(&tr_req->flags, CPPI5_TR_TYPE1, false, false, - CPPI5_TR_EVENT_SIZE_COMPLETION, 0); - cppi5_tr_csf_set(&tr_req->flags, CPPI5_TR_CSF_SUPR_EVT); - - tr_req->addr =3D rx_flush->buffer_paddr; - tr_req->icnt0 =3D rx_flush->buffer_size; - tr_req->icnt1 =3D 1; - - dma_sync_single_for_device(dev, hwdesc->cppi5_desc_paddr, - hwdesc->cppi5_desc_size, DMA_TO_DEVICE); - - /* Set up descriptor to be used for packet mode */ - hwdesc =3D &rx_flush->hwdescs[1]; - hwdesc->cppi5_desc_size =3D ALIGN(sizeof(struct cppi5_host_desc_t) + - CPPI5_INFO0_HDESC_EPIB_SIZE + - CPPI5_INFO0_HDESC_PSDATA_MAX_SIZE, - ud->desc_align); - - hwdesc->cppi5_desc_vaddr =3D devm_kzalloc(dev, hwdesc->cppi5_desc_size, - GFP_KERNEL); - if (!hwdesc->cppi5_desc_vaddr) - return -ENOMEM; - - hwdesc->cppi5_desc_paddr =3D dma_map_single(dev, hwdesc->cppi5_desc_vaddr, - hwdesc->cppi5_desc_size, - DMA_TO_DEVICE); - if (dma_mapping_error(dev, hwdesc->cppi5_desc_paddr)) - return -ENOMEM; - - desc =3D hwdesc->cppi5_desc_vaddr; - cppi5_hdesc_init(desc, 0, 0); - cppi5_desc_set_pktids(&desc->hdr, 0, CPPI5_INFO1_DESC_FLOWID_DEFAULT); - cppi5_desc_set_retpolicy(&desc->hdr, 0, 0); - - cppi5_hdesc_attach_buf(desc, - rx_flush->buffer_paddr, rx_flush->buffer_size, - rx_flush->buffer_paddr, rx_flush->buffer_size); - - dma_sync_single_for_device(dev, hwdesc->cppi5_desc_paddr, - hwdesc->cppi5_desc_size, DMA_TO_DEVICE); - return 0; -} - -#ifdef CONFIG_DEBUG_FS -static void udma_dbg_summary_show_chan(struct seq_file *s, - struct dma_chan *chan) -{ - struct udma_chan *uc =3D to_udma_chan(chan); - struct udma_chan_config *ucc =3D &uc->config; - - seq_printf(s, " %-13s| %s", dma_chan_name(chan), - chan->dbg_client_name ?: "in-use"); - if (ucc->tr_trigger_type) - seq_puts(s, " (triggered, "); - else - seq_printf(s, " (%s, ", - dmaengine_get_direction_text(uc->config.dir)); - - switch (uc->config.dir) { - case DMA_MEM_TO_MEM: - if (uc->ud->match_data->type =3D=3D DMA_TYPE_BCDMA) { - seq_printf(s, "bchan%d)\n", uc->bchan->id); - return; - } - - seq_printf(s, "chan%d pair [0x%04x -> 0x%04x], ", uc->tchan->id, - ucc->src_thread, ucc->dst_thread); - break; - case DMA_DEV_TO_MEM: - seq_printf(s, "rchan%d [0x%04x -> 0x%04x], ", uc->rchan->id, - ucc->src_thread, ucc->dst_thread); - if (uc->ud->match_data->type =3D=3D DMA_TYPE_PKTDMA) - seq_printf(s, "rflow%d, ", uc->rflow->id); - break; - case DMA_MEM_TO_DEV: - seq_printf(s, "tchan%d [0x%04x -> 0x%04x], ", uc->tchan->id, - ucc->src_thread, ucc->dst_thread); - if (uc->ud->match_data->type =3D=3D DMA_TYPE_PKTDMA) - seq_printf(s, "tflow%d, ", uc->tchan->tflow_id); - break; - default: - seq_printf(s, ")\n"); - return; - } - - if (ucc->ep_type =3D=3D PSIL_EP_NATIVE) { - seq_printf(s, "PSI-L Native"); - if (ucc->metadata_size) { - seq_printf(s, "[%s", ucc->needs_epib ? " EPIB" : ""); - if (ucc->psd_size) - seq_printf(s, " PSDsize:%u", ucc->psd_size); - seq_printf(s, " ]"); - } - } else { - seq_printf(s, "PDMA"); - if (ucc->enable_acc32 || ucc->enable_burst) - seq_printf(s, "[%s%s ]", - ucc->enable_acc32 ? " ACC32" : "", - ucc->enable_burst ? " BURST" : ""); - } - - seq_printf(s, ", %s)\n", ucc->pkt_mode ? "Packet mode" : "TR mode"); -} - -static void udma_dbg_summary_show(struct seq_file *s, - struct dma_device *dma_dev) -{ - struct dma_chan *chan; - - list_for_each_entry(chan, &dma_dev->channels, device_node) { - if (chan->client_count) - udma_dbg_summary_show_chan(s, chan); - } -} -#endif /* CONFIG_DEBUG_FS */ - -static enum dmaengine_alignment udma_get_copy_align(struct udma_dev *ud) -{ - const struct udma_match_data *match_data =3D ud->match_data; - u8 tpl; - - if (!match_data->enable_memcpy_support) - return DMAENGINE_ALIGN_8_BYTES; - - /* Get the highest TPL level the device supports for memcpy */ - if (ud->bchan_cnt) - tpl =3D udma_get_chan_tpl_index(&ud->bchan_tpl, 0); - else if (ud->tchan_cnt) - tpl =3D udma_get_chan_tpl_index(&ud->tchan_tpl, 0); - else - return DMAENGINE_ALIGN_8_BYTES; - - switch (match_data->burst_size[tpl]) { - case TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_256_BYTES: - return DMAENGINE_ALIGN_256_BYTES; - case TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_128_BYTES: - return DMAENGINE_ALIGN_128_BYTES; - case TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_64_BYTES: - fallthrough; - default: - return DMAENGINE_ALIGN_64_BYTES; - } -} - static int udma_probe(struct platform_device *pdev) { struct device_node *navss_node =3D pdev->dev.parent->of_node; diff --git a/drivers/dma/ti/k3-udma.h b/drivers/dma/ti/k3-udma.h index 16de0b218d8ad..4878d13d84ed0 100644 --- a/drivers/dma/ti/k3-udma.h +++ b/drivers/dma/ti/k3-udma.h @@ -629,6 +629,34 @@ void udma_reset_rings(struct udma_chan *uc); =20 int navss_psil_pair(struct udma_dev *ud, u32 src_thread, u32 dst_thread); int navss_psil_unpair(struct udma_dev *ud, u32 src_thread, u32 dst_thread); +void udma_start_desc(struct udma_chan *uc); +u8 udma_get_chan_tpl_index(struct udma_tpl *tpl_map, int chan_id); +void k3_configure_chan_coherency(struct dma_chan *chan, u32 asel); +void udma_reset_uchan(struct udma_chan *uc); +void udma_dump_chan_stdata(struct udma_chan *uc); +bool udma_is_chan_running(struct udma_chan *uc); + +bool udma_chan_needs_reconfiguration(struct udma_chan *uc); +void udma_cyclic_packet_elapsed(struct udma_chan *uc); +void udma_check_tx_completion(struct work_struct *work); +int udma_slave_config(struct dma_chan *chan, + struct dma_slave_config *cfg); +void udma_issue_pending(struct dma_chan *chan); +int udma_terminate_all(struct dma_chan *chan); +void udma_synchronize(struct dma_chan *chan); +void udma_vchan_complete(struct tasklet_struct *t); +void udma_mark_resource_ranges(struct udma_dev *ud, unsigned long *map, + struct ti_sci_resource_desc *rm_desc, + char *name); +int udma_setup_rx_flush(struct udma_dev *ud); +enum dmaengine_alignment udma_get_copy_align(struct udma_dev *ud); + +#ifdef CONFIG_DEBUG_FS +void udma_dbg_summary_show_chan(struct seq_file *s, + struct dma_chan *chan); +void udma_dbg_summary_show(struct seq_file *s, + struct dma_device *dma_dev); +#endif /* CONFIG_DEBUG_FS */ =20 /* Direct access to UDMA low lever resources for the glue layer */ int xudma_navss_psil_pair(struct udma_dev *ud, u32 src_thread, u32 dst_thr= ead); --=20 2.54.0 From nobody Thu Sep 24 17:02:17 2026 Received: from mx0b-0002e601.pphosted.com (mx0b-0002e601.pphosted.com [148.163.154.28]) (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 39E6E4F054E; Tue, 22 Sep 2026 06:50:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.154.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059848; cv=fail; b=IyTByQuzBDKk1zvT/hRp+M9NUESFMiPl0kF8fy+kRSp8tJbFr6r+Mt6KwVrF5d8QjeACBgwgVDyA6LhUKuf9/aL7AL4rboa0UMhQubpTcsD3WpwgtpnL4K/C16xB352rosCaKxIW+NPiudqWyc3UJ0oNm9pT/c4gdZpg81CqiOg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059848; c=relaxed/simple; bh=3qAjKuu7BBHPqWb2rrF3pmtgChauMAgmrOONQXSywDQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=am6EBI3y8vzJxLF7/kzTGRetnewLjjUnjL/h6NhzfmwNNWjxOtAFoAbyD9a9xf1fdh4EeUhaFzf6vGJGz9fxkSLud95z7qsO9imaD/a0i0iG3xrzl1MOh6KqfGKd9DzxenIPTjyveDzywd5bRebNG28E2biIgeYBoUgKq3vTsls= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=a9T08m3+; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=YcT6OShX; arc=fail smtp.client-ip=148.163.154.28 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="a9T08m3+"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="YcT6OShX" Received: from pps.filterd (m0374956.ppops.net [127.0.0.1]) by mx0b-0002e601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68M2UL6h1034913; Tue, 22 Sep 2026 01:50:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=CpaO3ZkhzfTUqtlNX7D2ZF8DKvExXHd+0jazA8xEy +g=; b=a9T08m3+j3inogcH2wxVRpE9MY2mdDdhcJ42yjtg3GcF5T/asYcVOVj3p uWBLE4SHPXtLHs5e6s3UFbU/JARF6I0Phes8lD4D+UwqGz3iKdZ/eGkbcQsMXBMt w8csLF0E4a5yVXofXlFbm4RkIO+7pGy0upAOXu8vWAKkYeAeJgrRlmzqd2cBDakp odJUTcJL97JP9l9gPpOAynlcisPO02wFdVnkOwe6LBoyF9AZLXM99MoEkUJroktV iHjmL2bj69ZvmdMg3DoWA6lizwt4orV6hXIgmjwZUjDhHHhOdTtPPYLHAWIH9Cqw iRBFToWwRZiu1hk6k+5242mKULSeQ== Received: from ch4pr04cu002.outbound.protection.outlook.com (mail-northcentralusazon11013033.outbound.protection.outlook.com [40.107.201.33]) by mx0b-0002e601.pphosted.com (PPS) with ESMTPS id 4gugxm16m6-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:50:25 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QbiSitbZrovA77mBssZjBl6trLmpXkGWKT9+ecANu7qRlIxmNCeDdnO8XscKMksFyUlF3BaEHGQelO847+/Prjfwf+FiBK86Ek9YvlsEJpcmD2y3elHN1pRJYz5aBfp5j4uAq+1fofmKKB5OOHa8h2N7zr56otAb5MCk0WnipvAChGyGT7N4g+giz+e+GzuMv+DQvlBFbsJkQ0TP8bIApxYyIs3sUGMcVF/93DZX+NXxeb0hKPGetAr5QPLWaOeOWWnzj7dEd++Yy3tf7FSChkxAotyFlvnppQso9okr8Bhv0NEXbqlQB7ShY7YPpOvbRXtQ6b8mAimgtV7JSp+HnA== 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=CpaO3ZkhzfTUqtlNX7D2ZF8DKvExXHd+0jazA8xEy+g=; b=D7wPGShRkX18M2aYt5liYIaNHXC0Uto82woLxusu5o/Gg0Hn1GfgQJHGkBUU1US22h8H8oJoAhgE+xKp/3thm+DUyM7/qfde6eU6olhnKFMp+WgtuI+l66XVPjKaXEKKDWwbHp+BQwwW1fusB9PSVavyGu2SJ6AUBX/1W4edNZ3p4lX+c4jQ021FF+9JCpgNSmM1fYpmTP/fyxNjv/MKtRWsW4bKhx8ELbqhbAe6KjnwAWmT5fR7WiVP34qdw62TKYGiwsucMHrNnyQ7gNfXwJzx1Tx2HEievs0W6D1Hl/ezJzUJcv8azdJj8oby8Wh5hAaXpKjjmKxRRGzhNDY2YQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.23.195) smtp.rcpttodomain=nxp.com 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=CpaO3ZkhzfTUqtlNX7D2ZF8DKvExXHd+0jazA8xEy+g=; b=YcT6OShX6IJIQ/sciqrdpG9OVCFsut9yypLvCsLguX2UJGtm6LlkrLWDHnSiyWL6DM0+LJLv/uwP7DehDslY0xYgi3Mw8ar+QvQCY+LnTl53p+RgNhmtypCrb6rljyMPDaSDv959wzciZNYzcu5dTQHFlq2MNXSIgFAQuVs06ZM= Received: from CH2PR19CA0015.namprd19.prod.outlook.com (2603:10b6:610:4d::25) by IA1PR10MB7469.namprd10.prod.outlook.com (2603:10b6:208:446::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.13; Tue, 22 Sep 2026 06:50:20 +0000 Received: from CH1PEPF0000AD76.namprd04.prod.outlook.com (2603:10b6:610:4d:cafe::51) by CH2PR19CA0015.outlook.office365.com (2603:10b6:610:4d::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.428.16 via Frontend Transport; Tue, 22 Sep 2026 06:50:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 198.47.23.195) 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.195 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.23.195; helo=lewvzet201.ext.ti.com; pr=C Received: from lewvzet201.ext.ti.com (198.47.23.195) by CH1PEPF0000AD76.mail.protection.outlook.com (10.167.244.53) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:50:20 +0000 Received: from DLEE207.ent.ti.com (157.170.170.95) by lewvzet201.ext.ti.com (10.4.14.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:08 -0500 Received: from DLEE202.ent.ti.com (157.170.170.77) by DLEE207.ent.ti.com (157.170.170.95) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:07 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DLEE202.ent.ti.com (157.170.170.77) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:50:07 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI413626771; Tue, 22 Sep 2026 01:50:03 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 09/19] dmaengine: ti: k3-udma: move resource management functions to k3-udma-common.c Date: Tue, 22 Sep 2026 12:17:33 +0530 Message-ID: <20260922064902.2719979-10-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000AD76:EE_|IA1PR10MB7469:EE_ X-MS-Office365-Filtering-Correlation-Id: 9fe05cf5-e4c7-4357-0f0e-08df1875c525 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|36860700016|82310400026|7416014|376014|1800799024|10067099003|921020|3023799007|6133799003|22082099003|18002099003|56012099006; X-Microsoft-Antispam-Message-Info: UMEHhlipf0a8J6QK9FJdpi90nVk/d3pHLIbzDEvcHni+bqokVW0xtIIlXxKNDpNLmpBFoStKRNVZexYCpcTwhb+04Hi9C+mzvwRcaMtmnP8Pgr9M+i+0/fvD565w7G5ejiLUrmp1tBEBn+S9cVpoYhjKxR0dVKNkBQSoNEi8jkcQB619YzCMiKfV0FO9Xq+JJoVZLPtWnB8CI/CGPl5P6o2iw+uGFa5+m8fnrDWJCieFqtj/QEioCgaRWTdQdbK2vpU02OYHLs3Qf1kpgcBQSEnqYHkm4tQZY3ICpmvsl4RwwNqiF0Ic3DcU4udLg6woZ5oS/isBCRVaATDKztqmE8iEjWG9lLXwraAcWT0rC2+KWQ1J7C9vlCwjtM2OfcDLFU6hgnRYLfH7zPAcY35iVAN0ZmDxd8Gd6adrNPcxXU3d36qI0x33wxhbTX1+H9Ha+xt/7bruVdXzo/MMtaO3Vrg5wtw7Qz6zWKlqS9ZRhjztP+I33fy8GMIgbuqJSRthadaOZz8DfSt/839JYhnPE71+Jr5gYwwFzP74YuGNfeDLDUBxdRL85EUR5X6Imx3+lcFbeIWLZwXELRrK38SjptQByW7gpCGtF89XKtg578CuUuIBmrUvqjlYkDzWcY6Zv9kgQlJ6C5dgTbsXT91R3+GKRii5d9mRKfxReALfn6Sw0DgfMVYKpkXXyK1eA8+VTQT/gOEOvNtburFLr/dapQxgpLICCyvMnACikDShWaOp63ootAbVgsEbueY0ewk8 X-Forefront-Antispam-Report: CIP:198.47.23.195;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:lewvzet201.ext.ti.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(23010399003)(36860700016)(82310400026)(7416014)(376014)(1800799024)(10067099003)(921020)(3023799007)(6133799003)(22082099003)(18002099003)(56012099006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4RwDHW30CONQ4YzWpYvoniZio1wREMNe1Mtgs/oCgxGUhdJm2SJQ1ZeYKkNZaOkP6ZaZ20YD0/7Ts4LtJLOgTtcw75OHP3mfSgcvQbCv9YKPailwqqlkgak2YZ/jQhIkPNkpkktTbstrZzSBvXkOaKjsT2PuBUQNmNFKzpMR5+gKEhfHPtdS+9u1fcvZymDV3r/bXIALCGiW6jrvTqtFX0B0jCZClHy6AcdDkIkt2pMgobGTEiHeOJ3MH1MFytBSxay+N0Y/QdCN+ZrZ7XZ9WNaks921R+UrDSG6EqkFhD0EbgS6/TQRC8mVxr1I8SKNlxNnUrKoaadlwfy7EpbMG5vNfggPbPq9XvYCD4DRhLlZaLOGaActI/GEqLLJjObErU8v7BLBPl07TwQMNjjdmG5z+OYPA+17TRjBZ4D40F2n0mmqfNvlK5I+B82lWKJp X-Exchange-RoutingPolicyChecked: T5gqWtd3ySEgKy/uE4B4FgnP99/3MUgKL0J4v52WTg1uiohBP9BoPz92WJWAlZYpmB2WxJYC6pd9fJC2dx4kLhXr8zIzS7Zmf6xQGnioV3WUAZAPvZBOiIMk/xOM6xVd9c9d4lVwliZr7kXxb7VzrE/iLlHNN4tAvUbGSEjhx7q/waAEbmd0ygm14bHAnTHHLAMDcS+O7M7CmwobRxcQZbuM56V4Pxnz5RjP63WnimFHsvwozlOOg4rrWob42xEsxW/KVmCW5KJUZ8mX90Gm4K06KBrRJNdOxPJZluwJHIr5UI2tOGnWYgR3lyeldV1NMKgGZyqFFnqV1MTqrd0FKw== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:50:20.6687 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9fe05cf5-e4c7-4357-0f0e-08df1875c525 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.195];Helo=[lewvzet201.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000AD76.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB7469 X-Proofpoint-ORIG-GUID: e_rftGo03itRf_CPDcok03w4sPHGNsM4 X-Proofpoint-GUID: e_rftGo03itRf_CPDcok03w4sPHGNsM4 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX4PE727T9LdUv dzbu63pX9WjfKwPw6zedmd6mzZ3h8cXx7bsXzcSdHlH1c/Vq6pEzm7cuJK9Id+lheTJXEfclYIV slljh9Pa0RLodAp+O/NYKApB2LohpiKoFW1C1EJAxds92EqnIBC9Bvia372HVfwnceYsk9mH3RC ATOlSZjyC4piFlnr22h4wMRiziQV6eou4NiYWzXHxJkkhg/MVLyYGR66I6/4crMJPFwZvyFP8ae JQscaWlmi3XYokJs+a8+UThmXPmPeBbEyqKZgVxG3eLLmMkIf4XPsePBFwCFXLBJ5G48C0ATkgS tTF3yJuBayUmrpWJ9C3JNBPwMIuo7vgKIN/UxjEhc2bWlsqdWCgTE53aJwFVzkztmcTdp29eeB6 P3O5PCaGN0+zTwqXPWrRqFPHYgF2oy91nQa+dnHa4vE+2tlGs5JJjIePnw4LwIZORK6cCxb9kHj oxYDZcCOB2yBKymZptw== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX25SgNeIl06qT JiFoeqLy5PlGSVMXX/BYLeu6n+O19ehYoDGV6Uc5o7xgOJmUwWVMQLLGvMFCOOqWn8au9NzIxMT KYpPTuyj5EBNKt7iY3vjMdoeM+AG/NQ= X-Authority-Analysis: v=2.4 cv=INeXmQvG c=1 sm=1 tr=0 ts=6ab22531 cx=c_pps a=H8U4Gh8omvmqDI9iB/RWMg==:117 a=f+v6EHfkeJbVwR46tk4DMg==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=s63m1ICgrNkA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=jwouBfj2j3NM8CExmVVE:22 a=sozttTNsAAAA:8 a=AMbNDxq4J1R_ZtRBPm4A:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 malwarescore=0 phishscore=0 spamscore=0 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220097 Content-Type: text/plain; charset="utf-8" Move functions responsible for allocation and release of udma resources such as channels, rings and flows from k3-udma.c to the common k3-udma-common.c file. The implementation of these functions is largely shared between K3 UDMA and K3 UDMA v2. This refactor improves code reuse and maintainability across multiple variants. No functional changes intended. Signed-off-by: Sai Sree Kartheek Adivi --- drivers/dma/ti/k3-udma-common.c | 443 ++++++++++++++++++++++++++++++++ drivers/dma/ti/k3-udma.c | 423 ------------------------------ drivers/dma/ti/k3-udma.h | 21 ++ 3 files changed, 464 insertions(+), 423 deletions(-) diff --git a/drivers/dma/ti/k3-udma-common.c b/drivers/dma/ti/k3-udma-commo= n.c index dbd667d77f137..34f8eab9ddb57 100644 --- a/drivers/dma/ti/k3-udma-common.c +++ b/drivers/dma/ti/k3-udma-common.c @@ -1891,5 +1891,448 @@ enum dmaengine_alignment udma_get_copy_align(struct= udma_dev *ud) } EXPORT_SYMBOL_GPL(udma_get_copy_align); =20 +/** + * __udma_alloc_gp_rflow_range - alloc range of GP RX flows + * @ud: UDMA device + * @from: Start the search from this flow id number + * @cnt: Number of consecutive flow ids to allocate + * + * Allocate range of RX flow ids for future use, those flows can be reques= ted + * only using explicit flow id number. if @from is set to -1 it will try t= o find + * first free range. if @from is positive value it will force allocation o= nly + * of the specified range of flows. + * + * Returns -ENOMEM if can't find free range. + * -EEXIST if requested range is busy. + * -EINVAL if wrong input values passed. + * Returns flow id on success. + */ +int __udma_alloc_gp_rflow_range(struct udma_dev *ud, int from, int cnt) +{ + int start, tmp_from; + DECLARE_BITMAP(tmp, K3_UDMA_MAX_RFLOWS); + + tmp_from =3D from; + if (tmp_from < 0) + tmp_from =3D ud->rchan_cnt; + /* default flows can't be allocated and accessible only by id */ + if (tmp_from < ud->rchan_cnt) + return -EINVAL; + + if (tmp_from + cnt > ud->rflow_cnt) + return -EINVAL; + + bitmap_or(tmp, ud->rflow_gp_map, ud->rflow_gp_map_allocated, + ud->rflow_cnt); + + start =3D bitmap_find_next_zero_area(tmp, + ud->rflow_cnt, + tmp_from, cnt, 0); + if (start >=3D ud->rflow_cnt) + return -ENOMEM; + + if (from >=3D 0 && start !=3D from) + return -EEXIST; + + bitmap_set(ud->rflow_gp_map_allocated, start, cnt); + return start; +} +EXPORT_SYMBOL_GPL(__udma_alloc_gp_rflow_range); + +int __udma_free_gp_rflow_range(struct udma_dev *ud, int from, int cnt) +{ + if (from < ud->rchan_cnt) + return -EINVAL; + if (from + cnt > ud->rflow_cnt) + return -EINVAL; + + bitmap_clear(ud->rflow_gp_map_allocated, from, cnt); + return 0; +} +EXPORT_SYMBOL_GPL(__udma_free_gp_rflow_range); + +struct udma_rflow *__udma_get_rflow(struct udma_dev *ud, int id) +{ + /* + * Attempt to request rflow by ID can be made for any rflow + * if not in use with assumption that caller knows what's doing. + * TI-SCI FW will perform additional permission check ant way, it's + * safe + */ + + if (id < 0 || id >=3D ud->rflow_cnt) + return ERR_PTR(-ENOENT); + + if (test_bit(id, ud->rflow_in_use)) + return ERR_PTR(-ENOENT); + + if (ud->rflow_gp_map) { + /* GP rflow has to be allocated first */ + if (!test_bit(id, ud->rflow_gp_map) && + !test_bit(id, ud->rflow_gp_map_allocated)) + return ERR_PTR(-EINVAL); + } + + dev_dbg(ud->dev, "get rflow%d\n", id); + set_bit(id, ud->rflow_in_use); + return &ud->rflows[id]; +} +EXPORT_SYMBOL_GPL(__udma_get_rflow); + +void __udma_put_rflow(struct udma_dev *ud, struct udma_rflow *rflow) +{ + if (!test_bit(rflow->id, ud->rflow_in_use)) { + dev_err(ud->dev, "attempt to put unused rflow%d\n", rflow->id); + return; + } + + dev_dbg(ud->dev, "put rflow%d\n", rflow->id); + clear_bit(rflow->id, ud->rflow_in_use); +} +EXPORT_SYMBOL_GPL(__udma_put_rflow); + +#define UDMA_RESERVE_RESOURCE(res) \ +struct udma_##res *__udma_reserve_##res(struct udma_dev *ud, \ + enum udma_tp_level tpl, \ + int id) \ +{ \ + if (id >=3D 0) { \ + if (test_bit(id, ud->res##_map)) { \ + dev_err(ud->dev, "res##%d is in use\n", id); \ + return ERR_PTR(-ENOENT); \ + } \ + } else { \ + int start; \ + \ + if (tpl >=3D ud->res##_tpl.levels) \ + tpl =3D ud->res##_tpl.levels - 1; \ + \ + start =3D ud->res##_tpl.start_idx[tpl]; \ + \ + id =3D find_next_zero_bit(ud->res##_map, ud->res##_cnt, \ + start); \ + if (id =3D=3D ud->res##_cnt) { \ + return ERR_PTR(-ENOENT); \ + } \ + } \ + \ + set_bit(id, ud->res##_map); \ + return &ud->res##s[id]; \ +} + +UDMA_RESERVE_RESOURCE(bchan); +EXPORT_SYMBOL_GPL(__udma_reserve_bchan); +UDMA_RESERVE_RESOURCE(tchan); +EXPORT_SYMBOL_GPL(__udma_reserve_tchan); +UDMA_RESERVE_RESOURCE(rchan); +EXPORT_SYMBOL_GPL(__udma_reserve_rchan); + +int udma_get_tchan(struct udma_chan *uc) +{ + struct udma_dev *ud =3D uc->ud; + int ret; + + if (uc->tchan) { + dev_dbg(ud->dev, "chan%d: already have tchan%d allocated\n", + uc->id, uc->tchan->id); + return 0; + } + + /* + * mapped_channel_id is -1 for UDMA, BCDMA and PKTDMA unmapped channels. + * For PKTDMA mapped channels it is configured to a channel which must + * be used to service the peripheral. + */ + uc->tchan =3D __udma_reserve_tchan(ud, uc->config.channel_tpl, + uc->config.mapped_channel_id); + if (IS_ERR(uc->tchan)) { + ret =3D PTR_ERR(uc->tchan); + uc->tchan =3D NULL; + return ret; + } + + if (ud->tflow_cnt) { + int tflow_id; + + /* Only PKTDMA have support for tx flows */ + if (uc->config.default_flow_id >=3D 0) + tflow_id =3D uc->config.default_flow_id; + else + tflow_id =3D uc->tchan->id; + + if (test_bit(tflow_id, ud->tflow_map)) { + dev_err(ud->dev, "tflow%d is in use\n", tflow_id); + clear_bit(uc->tchan->id, ud->tchan_map); + uc->tchan =3D NULL; + return -ENOENT; + } + + uc->tchan->tflow_id =3D tflow_id; + set_bit(tflow_id, ud->tflow_map); + } else { + uc->tchan->tflow_id =3D -1; + } + + return 0; +} +EXPORT_SYMBOL_GPL(udma_get_tchan); + +int udma_get_rchan(struct udma_chan *uc) +{ + struct udma_dev *ud =3D uc->ud; + int ret; + + if (uc->rchan) { + dev_dbg(ud->dev, "chan%d: already have rchan%d allocated\n", + uc->id, uc->rchan->id); + return 0; + } + + /* + * mapped_channel_id is -1 for UDMA, BCDMA and PKTDMA unmapped channels. + * For PKTDMA mapped channels it is configured to a channel which must + * be used to service the peripheral. + */ + uc->rchan =3D __udma_reserve_rchan(ud, uc->config.channel_tpl, + uc->config.mapped_channel_id); + if (IS_ERR(uc->rchan)) { + ret =3D PTR_ERR(uc->rchan); + uc->rchan =3D NULL; + return ret; + } + + return 0; +} +EXPORT_SYMBOL_GPL(udma_get_rchan); + +int udma_get_chan_pair(struct udma_chan *uc) +{ + struct udma_dev *ud =3D uc->ud; + int chan_id, end; + + if ((uc->tchan && uc->rchan) && uc->tchan->id =3D=3D uc->rchan->id) { + dev_info(ud->dev, "chan%d: already have %d pair allocated\n", + uc->id, uc->tchan->id); + return 0; + } + + if (uc->tchan) { + dev_err(ud->dev, "chan%d: already have tchan%d allocated\n", + uc->id, uc->tchan->id); + return -EBUSY; + } else if (uc->rchan) { + dev_err(ud->dev, "chan%d: already have rchan%d allocated\n", + uc->id, uc->rchan->id); + return -EBUSY; + } + + /* Can be optimized, but let's have it like this for now */ + end =3D min(ud->tchan_cnt, ud->rchan_cnt); + /* + * Try to use the highest TPL channel pair for MEM_TO_MEM channels + * Note: in UDMAP the channel TPL is symmetric between tchan and rchan + */ + chan_id =3D ud->tchan_tpl.start_idx[ud->tchan_tpl.levels - 1]; + for (; chan_id < end; chan_id++) { + if (!test_bit(chan_id, ud->tchan_map) && + !test_bit(chan_id, ud->rchan_map)) + break; + } + + if (chan_id =3D=3D end) + return -ENOENT; + + set_bit(chan_id, ud->tchan_map); + set_bit(chan_id, ud->rchan_map); + uc->tchan =3D &ud->tchans[chan_id]; + uc->rchan =3D &ud->rchans[chan_id]; + + /* UDMA does not use tx flows */ + uc->tchan->tflow_id =3D -1; + + return 0; +} +EXPORT_SYMBOL_GPL(udma_get_chan_pair); + +int udma_get_rflow(struct udma_chan *uc, int flow_id) +{ + struct udma_dev *ud =3D uc->ud; + int ret; + + if (!uc->rchan) { + dev_err(ud->dev, "chan%d: does not have rchan??\n", uc->id); + return -EINVAL; + } + + if (uc->rflow) { + dev_dbg(ud->dev, "chan%d: already have rflow%d allocated\n", + uc->id, uc->rflow->id); + return 0; + } + + uc->rflow =3D __udma_get_rflow(ud, flow_id); + if (IS_ERR(uc->rflow)) { + ret =3D PTR_ERR(uc->rflow); + uc->rflow =3D NULL; + return ret; + } + + return 0; +} +EXPORT_SYMBOL_GPL(udma_get_rflow); + +void udma_put_rchan(struct udma_chan *uc) +{ + struct udma_dev *ud =3D uc->ud; + + if (uc->rchan) { + dev_dbg(ud->dev, "chan%d: put rchan%d\n", uc->id, + uc->rchan->id); + clear_bit(uc->rchan->id, ud->rchan_map); + uc->rchan =3D NULL; + } +} +EXPORT_SYMBOL_GPL(udma_put_rchan); + +void udma_put_tchan(struct udma_chan *uc) +{ + struct udma_dev *ud =3D uc->ud; + + if (uc->tchan) { + dev_dbg(ud->dev, "chan%d: put tchan%d\n", uc->id, + uc->tchan->id); + clear_bit(uc->tchan->id, ud->tchan_map); + + if (uc->tchan->tflow_id >=3D 0) + clear_bit(uc->tchan->tflow_id, ud->tflow_map); + + uc->tchan =3D NULL; + } +} +EXPORT_SYMBOL_GPL(udma_put_tchan); + +void udma_put_rflow(struct udma_chan *uc) +{ + struct udma_dev *ud =3D uc->ud; + + if (uc->rflow) { + dev_dbg(ud->dev, "chan%d: put rflow%d\n", uc->id, + uc->rflow->id); + __udma_put_rflow(ud, uc->rflow); + uc->rflow =3D NULL; + } +} +EXPORT_SYMBOL_GPL(udma_put_rflow); + +void udma_free_tx_resources(struct udma_chan *uc) +{ + if (!uc->tchan) + return; + + k3_ringacc_ring_free(uc->tchan->t_ring); + k3_ringacc_ring_free(uc->tchan->tc_ring); + uc->tchan->t_ring =3D NULL; + uc->tchan->tc_ring =3D NULL; + + udma_put_tchan(uc); +} +EXPORT_SYMBOL_GPL(udma_free_tx_resources); + +void udma_free_rx_resources(struct udma_chan *uc) +{ + if (!uc->rchan) + return; + + if (uc->rflow) { + struct udma_rflow *rflow =3D uc->rflow; + + k3_ringacc_ring_free(rflow->fd_ring); + k3_ringacc_ring_free(rflow->r_ring); + rflow->fd_ring =3D NULL; + rflow->r_ring =3D NULL; + + udma_put_rflow(uc); + } + + udma_put_rchan(uc); +} +EXPORT_SYMBOL_GPL(udma_free_rx_resources); + +void udma_free_chan_resources(struct dma_chan *chan) +{ + struct udma_chan *uc =3D to_udma_chan(chan); + struct udma_dev *ud =3D to_udma_dev(chan->device); + + udma_terminate_all(chan); + if (uc->terminated_desc) { + ud->reset_chan(uc, false); + udma_reset_rings(uc); + } + + cancel_delayed_work_sync(&uc->tx_drain.work); + + if (uc->irq_num_ring > 0) { + free_irq(uc->irq_num_ring, uc); + + uc->irq_num_ring =3D 0; + } + if (uc->irq_num_udma > 0) { + free_irq(uc->irq_num_udma, uc); + + uc->irq_num_udma =3D 0; + } + + /* Release PSI-L pairing */ + if (uc->psil_paired) { + if (ud->psil_unpair) + ud->psil_unpair(ud, uc->config.src_thread, + uc->config.dst_thread); + uc->psil_paired =3D false; + } + + vchan_free_chan_resources(&uc->vc); + tasklet_kill(&uc->vc.task); + + bcdma_free_bchan_resources(uc); + udma_free_tx_resources(uc); + udma_free_rx_resources(uc); + udma_reset_uchan(uc); + + if (uc->use_dma_pool) { + dma_pool_destroy(uc->hdesc_pool); + uc->use_dma_pool =3D false; + } +} +EXPORT_SYMBOL_GPL(udma_free_chan_resources); + +void bcdma_put_bchan(struct udma_chan *uc) +{ + struct udma_dev *ud =3D uc->ud; + + if (uc->bchan) { + dev_dbg(ud->dev, "chan%d: put bchan%d\n", uc->id, + uc->bchan->id); + clear_bit(uc->bchan->id, ud->bchan_map); + uc->bchan =3D NULL; + uc->tchan =3D NULL; + } +} +EXPORT_SYMBOL_GPL(bcdma_put_bchan); + +void bcdma_free_bchan_resources(struct udma_chan *uc) +{ + if (!uc->bchan) + return; + + k3_ringacc_ring_free(uc->bchan->tc_ring); + k3_ringacc_ring_free(uc->bchan->t_ring); + uc->bchan->tc_ring =3D NULL; + uc->bchan->t_ring =3D NULL; + k3_configure_chan_coherency(&uc->vc.chan, 0); + + bcdma_put_bchan(uc); +} +EXPORT_SYMBOL_GPL(bcdma_free_bchan_resources); + MODULE_DESCRIPTION("Texas Instruments K3 UDMA Common Library"); MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index cd73bf03e9cc6..21978f17e327f 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -423,135 +423,6 @@ static irqreturn_t udma_udma_irq_handler(int irq, voi= d *data) return IRQ_HANDLED; } =20 -/** - * __udma_alloc_gp_rflow_range - alloc range of GP RX flows - * @ud: UDMA device - * @from: Start the search from this flow id number - * @cnt: Number of consecutive flow ids to allocate - * - * Allocate range of RX flow ids for future use, those flows can be reques= ted - * only using explicit flow id number. if @from is set to -1 it will try t= o find - * first free range. if @from is positive value it will force allocation o= nly - * of the specified range of flows. - * - * Returns -ENOMEM if can't find free range. - * -EEXIST if requested range is busy. - * -EINVAL if wrong input values passed. - * Returns flow id on success. - */ -static int __udma_alloc_gp_rflow_range(struct udma_dev *ud, int from, int = cnt) -{ - int start, tmp_from; - DECLARE_BITMAP(tmp, K3_UDMA_MAX_RFLOWS); - - tmp_from =3D from; - if (tmp_from < 0) - tmp_from =3D ud->rchan_cnt; - /* default flows can't be allocated and accessible only by id */ - if (tmp_from < ud->rchan_cnt) - return -EINVAL; - - if (tmp_from + cnt > ud->rflow_cnt) - return -EINVAL; - - bitmap_or(tmp, ud->rflow_gp_map, ud->rflow_gp_map_allocated, - ud->rflow_cnt); - - start =3D bitmap_find_next_zero_area(tmp, - ud->rflow_cnt, - tmp_from, cnt, 0); - if (start >=3D ud->rflow_cnt) - return -ENOMEM; - - if (from >=3D 0 && start !=3D from) - return -EEXIST; - - bitmap_set(ud->rflow_gp_map_allocated, start, cnt); - return start; -} - -static int __udma_free_gp_rflow_range(struct udma_dev *ud, int from, int c= nt) -{ - if (from < ud->rchan_cnt) - return -EINVAL; - if (from + cnt > ud->rflow_cnt) - return -EINVAL; - - bitmap_clear(ud->rflow_gp_map_allocated, from, cnt); - return 0; -} - -static struct udma_rflow *__udma_get_rflow(struct udma_dev *ud, int id) -{ - /* - * Attempt to request rflow by ID can be made for any rflow - * if not in use with assumption that caller knows what's doing. - * TI-SCI FW will perform additional permission check ant way, it's - * safe - */ - - if (id < 0 || id >=3D ud->rflow_cnt) - return ERR_PTR(-ENOENT); - - if (test_bit(id, ud->rflow_in_use)) - return ERR_PTR(-ENOENT); - - if (ud->rflow_gp_map) { - /* GP rflow has to be allocated first */ - if (!test_bit(id, ud->rflow_gp_map) && - !test_bit(id, ud->rflow_gp_map_allocated)) - return ERR_PTR(-EINVAL); - } - - dev_dbg(ud->dev, "get rflow%d\n", id); - set_bit(id, ud->rflow_in_use); - return &ud->rflows[id]; -} - -static void __udma_put_rflow(struct udma_dev *ud, struct udma_rflow *rflow) -{ - if (!test_bit(rflow->id, ud->rflow_in_use)) { - dev_err(ud->dev, "attempt to put unused rflow%d\n", rflow->id); - return; - } - - dev_dbg(ud->dev, "put rflow%d\n", rflow->id); - clear_bit(rflow->id, ud->rflow_in_use); -} - -#define UDMA_RESERVE_RESOURCE(res) \ -static struct udma_##res *__udma_reserve_##res(struct udma_dev *ud, \ - enum udma_tp_level tpl, \ - int id) \ -{ \ - if (id >=3D 0) { \ - if (test_bit(id, ud->res##_map)) { \ - dev_err(ud->dev, "res##%d is in use\n", id); \ - return ERR_PTR(-ENOENT); \ - } \ - } else { \ - int start; \ - \ - if (tpl >=3D ud->res##_tpl.levels) \ - tpl =3D ud->res##_tpl.levels - 1; \ - \ - start =3D ud->res##_tpl.start_idx[tpl]; \ - \ - id =3D find_next_zero_bit(ud->res##_map, ud->res##_cnt, \ - start); \ - if (id =3D=3D ud->res##_cnt) { \ - return ERR_PTR(-ENOENT); \ - } \ - } \ - \ - set_bit(id, ud->res##_map); \ - return &ud->res##s[id]; \ -} - -UDMA_RESERVE_RESOURCE(bchan); -UDMA_RESERVE_RESOURCE(tchan); -UDMA_RESERVE_RESOURCE(rchan); - static int bcdma_get_bchan(struct udma_chan *uc) { struct udma_dev *ud =3D uc->ud; @@ -585,223 +456,6 @@ static int bcdma_get_bchan(struct udma_chan *uc) return 0; } =20 -static int udma_get_tchan(struct udma_chan *uc) -{ - struct udma_dev *ud =3D uc->ud; - int ret; - - if (uc->tchan) { - dev_dbg(ud->dev, "chan%d: already have tchan%d allocated\n", - uc->id, uc->tchan->id); - return 0; - } - - /* - * mapped_channel_id is -1 for UDMA, BCDMA and PKTDMA unmapped channels. - * For PKTDMA mapped channels it is configured to a channel which must - * be used to service the peripheral. - */ - uc->tchan =3D __udma_reserve_tchan(ud, uc->config.channel_tpl, - uc->config.mapped_channel_id); - if (IS_ERR(uc->tchan)) { - ret =3D PTR_ERR(uc->tchan); - uc->tchan =3D NULL; - return ret; - } - - if (ud->tflow_cnt) { - int tflow_id; - - /* Only PKTDMA have support for tx flows */ - if (uc->config.default_flow_id >=3D 0) - tflow_id =3D uc->config.default_flow_id; - else - tflow_id =3D uc->tchan->id; - - if (test_bit(tflow_id, ud->tflow_map)) { - dev_err(ud->dev, "tflow%d is in use\n", tflow_id); - clear_bit(uc->tchan->id, ud->tchan_map); - uc->tchan =3D NULL; - return -ENOENT; - } - - uc->tchan->tflow_id =3D tflow_id; - set_bit(tflow_id, ud->tflow_map); - } else { - uc->tchan->tflow_id =3D -1; - } - - return 0; -} - -static int udma_get_rchan(struct udma_chan *uc) -{ - struct udma_dev *ud =3D uc->ud; - int ret; - - if (uc->rchan) { - dev_dbg(ud->dev, "chan%d: already have rchan%d allocated\n", - uc->id, uc->rchan->id); - return 0; - } - - /* - * mapped_channel_id is -1 for UDMA, BCDMA and PKTDMA unmapped channels. - * For PKTDMA mapped channels it is configured to a channel which must - * be used to service the peripheral. - */ - uc->rchan =3D __udma_reserve_rchan(ud, uc->config.channel_tpl, - uc->config.mapped_channel_id); - if (IS_ERR(uc->rchan)) { - ret =3D PTR_ERR(uc->rchan); - uc->rchan =3D NULL; - return ret; - } - - return 0; -} - -static int udma_get_chan_pair(struct udma_chan *uc) -{ - struct udma_dev *ud =3D uc->ud; - int chan_id, end; - - if ((uc->tchan && uc->rchan) && uc->tchan->id =3D=3D uc->rchan->id) { - dev_info(ud->dev, "chan%d: already have %d pair allocated\n", - uc->id, uc->tchan->id); - return 0; - } - - if (uc->tchan) { - dev_err(ud->dev, "chan%d: already have tchan%d allocated\n", - uc->id, uc->tchan->id); - return -EBUSY; - } else if (uc->rchan) { - dev_err(ud->dev, "chan%d: already have rchan%d allocated\n", - uc->id, uc->rchan->id); - return -EBUSY; - } - - /* Can be optimized, but let's have it like this for now */ - end =3D min(ud->tchan_cnt, ud->rchan_cnt); - /* - * Try to use the highest TPL channel pair for MEM_TO_MEM channels - * Note: in UDMAP the channel TPL is symmetric between tchan and rchan - */ - chan_id =3D ud->tchan_tpl.start_idx[ud->tchan_tpl.levels - 1]; - for (; chan_id < end; chan_id++) { - if (!test_bit(chan_id, ud->tchan_map) && - !test_bit(chan_id, ud->rchan_map)) - break; - } - - if (chan_id =3D=3D end) - return -ENOENT; - - set_bit(chan_id, ud->tchan_map); - set_bit(chan_id, ud->rchan_map); - uc->tchan =3D &ud->tchans[chan_id]; - uc->rchan =3D &ud->rchans[chan_id]; - - /* UDMA does not use tx flows */ - uc->tchan->tflow_id =3D -1; - - return 0; -} - -static int udma_get_rflow(struct udma_chan *uc, int flow_id) -{ - struct udma_dev *ud =3D uc->ud; - int ret; - - if (!uc->rchan) { - dev_err(ud->dev, "chan%d: does not have rchan??\n", uc->id); - return -EINVAL; - } - - if (uc->rflow) { - dev_dbg(ud->dev, "chan%d: already have rflow%d allocated\n", - uc->id, uc->rflow->id); - return 0; - } - - uc->rflow =3D __udma_get_rflow(ud, flow_id); - if (IS_ERR(uc->rflow)) { - ret =3D PTR_ERR(uc->rflow); - uc->rflow =3D NULL; - return ret; - } - - return 0; -} - -static void bcdma_put_bchan(struct udma_chan *uc) -{ - struct udma_dev *ud =3D uc->ud; - - if (uc->bchan) { - dev_dbg(ud->dev, "chan%d: put bchan%d\n", uc->id, - uc->bchan->id); - clear_bit(uc->bchan->id, ud->bchan_map); - uc->bchan =3D NULL; - uc->tchan =3D NULL; - } -} - -static void udma_put_rchan(struct udma_chan *uc) -{ - struct udma_dev *ud =3D uc->ud; - - if (uc->rchan) { - dev_dbg(ud->dev, "chan%d: put rchan%d\n", uc->id, - uc->rchan->id); - clear_bit(uc->rchan->id, ud->rchan_map); - uc->rchan =3D NULL; - } -} - -static void udma_put_tchan(struct udma_chan *uc) -{ - struct udma_dev *ud =3D uc->ud; - - if (uc->tchan) { - dev_dbg(ud->dev, "chan%d: put tchan%d\n", uc->id, - uc->tchan->id); - clear_bit(uc->tchan->id, ud->tchan_map); - - if (uc->tchan->tflow_id >=3D 0) - clear_bit(uc->tchan->tflow_id, ud->tflow_map); - - uc->tchan =3D NULL; - } -} - -static void udma_put_rflow(struct udma_chan *uc) -{ - struct udma_dev *ud =3D uc->ud; - - if (uc->rflow) { - dev_dbg(ud->dev, "chan%d: put rflow%d\n", uc->id, - uc->rflow->id); - __udma_put_rflow(ud, uc->rflow); - uc->rflow =3D NULL; - } -} - -static void bcdma_free_bchan_resources(struct udma_chan *uc) -{ - if (!uc->bchan) - return; - - k3_ringacc_ring_free(uc->bchan->tc_ring); - k3_ringacc_ring_free(uc->bchan->t_ring); - uc->bchan->tc_ring =3D NULL; - uc->bchan->t_ring =3D NULL; - k3_configure_chan_coherency(&uc->vc.chan, 0); - - bcdma_put_bchan(uc); -} - static int bcdma_alloc_bchan_resources(struct udma_chan *uc) { struct k3_ring_cfg ring_cfg; @@ -847,19 +501,6 @@ static int bcdma_alloc_bchan_resources(struct udma_cha= n *uc) return ret; } =20 -static void udma_free_tx_resources(struct udma_chan *uc) -{ - if (!uc->tchan) - return; - - k3_ringacc_ring_free(uc->tchan->t_ring); - k3_ringacc_ring_free(uc->tchan->tc_ring); - uc->tchan->t_ring =3D NULL; - uc->tchan->tc_ring =3D NULL; - - udma_put_tchan(uc); -} - static int udma_alloc_tx_resources(struct udma_chan *uc) { struct k3_ring_cfg ring_cfg; @@ -917,25 +558,6 @@ static int udma_alloc_tx_resources(struct udma_chan *u= c) return ret; } =20 -static void udma_free_rx_resources(struct udma_chan *uc) -{ - if (!uc->rchan) - return; - - if (uc->rflow) { - struct udma_rflow *rflow =3D uc->rflow; - - k3_ringacc_ring_free(rflow->fd_ring); - k3_ringacc_ring_free(rflow->r_ring); - rflow->fd_ring =3D NULL; - rflow->r_ring =3D NULL; - - udma_put_rflow(uc); - } - - udma_put_rchan(uc); -} - static int udma_alloc_rx_resources(struct udma_chan *uc) { struct udma_dev *ud =3D uc->ud; @@ -2024,51 +1646,6 @@ static int udma_resume(struct dma_chan *chan) return 0; } =20 -static void udma_free_chan_resources(struct dma_chan *chan) -{ - struct udma_chan *uc =3D to_udma_chan(chan); - struct udma_dev *ud =3D to_udma_dev(chan->device); - - udma_terminate_all(chan); - if (uc->terminated_desc) { - ud->reset_chan(uc, false); - udma_reset_rings(uc); - } - - cancel_delayed_work_sync(&uc->tx_drain.work); - - if (uc->irq_num_ring > 0) { - free_irq(uc->irq_num_ring, uc); - - uc->irq_num_ring =3D 0; - } - if (uc->irq_num_udma > 0) { - free_irq(uc->irq_num_udma, uc); - - uc->irq_num_udma =3D 0; - } - - /* Release PSI-L pairing */ - if (uc->psil_paired) { - ud->psil_unpair(ud, uc->config.src_thread, - uc->config.dst_thread); - uc->psil_paired =3D false; - } - - vchan_free_chan_resources(&uc->vc); - tasklet_kill(&uc->vc.task); - - bcdma_free_bchan_resources(uc); - udma_free_tx_resources(uc); - udma_free_rx_resources(uc); - udma_reset_uchan(uc); - - if (uc->use_dma_pool) { - dma_pool_destroy(uc->hdesc_pool); - uc->use_dma_pool =3D false; - } -} - static struct platform_driver udma_driver; static struct platform_driver bcdma_driver; static struct platform_driver pktdma_driver; diff --git a/drivers/dma/ti/k3-udma.h b/drivers/dma/ti/k3-udma.h index 4878d13d84ed0..329df7eb156b2 100644 --- a/drivers/dma/ti/k3-udma.h +++ b/drivers/dma/ti/k3-udma.h @@ -658,6 +658,27 @@ void udma_dbg_summary_show(struct seq_file *s, struct dma_device *dma_dev); #endif /* CONFIG_DEBUG_FS */ =20 +int __udma_alloc_gp_rflow_range(struct udma_dev *ud, int from, int cnt); +int __udma_free_gp_rflow_range(struct udma_dev *ud, int from, int cnt); +struct udma_rflow *__udma_get_rflow(struct udma_dev *ud, int id); +void __udma_put_rflow(struct udma_dev *ud, struct udma_rflow *rflow); +int udma_get_tchan(struct udma_chan *uc); +int udma_get_rchan(struct udma_chan *uc); +int udma_get_chan_pair(struct udma_chan *uc); +int udma_get_rflow(struct udma_chan *uc, int flow_id); +void udma_put_rchan(struct udma_chan *uc); +void udma_put_tchan(struct udma_chan *uc); +void udma_put_rflow(struct udma_chan *uc); +void udma_free_tx_resources(struct udma_chan *uc); +void udma_free_rx_resources(struct udma_chan *uc); +void udma_free_chan_resources(struct dma_chan *chan); +void bcdma_put_bchan(struct udma_chan *uc); +void bcdma_free_bchan_resources(struct udma_chan *uc); + +struct udma_bchan *__udma_reserve_bchan(struct udma_dev *ud, enum udma_tp_= level tpl, int id); +struct udma_tchan *__udma_reserve_tchan(struct udma_dev *ud, enum udma_tp_= level tpl, int id); +struct udma_rchan *__udma_reserve_rchan(struct udma_dev *ud, enum udma_tp_= level tpl, int id); + /* Direct access to UDMA low lever resources for the glue layer */ int xudma_navss_psil_pair(struct udma_dev *ud, u32 src_thread, u32 dst_thr= ead); int xudma_navss_psil_unpair(struct udma_dev *ud, u32 src_thread, --=20 2.54.0 From nobody Thu Sep 24 17:02:17 2026 Received: from mx0b-0002e601.pphosted.com (mx0b-0002e601.pphosted.com [148.163.154.28]) (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 92D02211466; Tue, 22 Sep 2026 06:50:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.154.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059849; cv=fail; b=ID/ju5czXwmKBY08TLm9MvpR0Y3nx+NC9ieQmMDSDqHXk8ks3Z5rVpeqbjenej1rHL6uMXrEkorREa0zPDWTgxgq+fwBmMuHEyady9uj+aH+TTZ30M1J2QUWEf240MphWkkfi2ioRk8QujAB2daysJJpHByfa6nlJyrPkJ6bIG0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059849; c=relaxed/simple; bh=NKs96bFDGRUwGUx17Y/gdXO7sxNdXAeMS2yTBLYBaAs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Qe7f02cikJhwUGCgjJBD2q+dhF0lWC4KwHQjAAFgBhEaEh5/wMt7zJek1j0UjXbKLiIXJGfFsOzWSFrPySZPIxjC3klwm9DnSI7XlsFiYMUfi+pWfLbpzUUMegHMGBIJelNNGv6zVxXErmtOBSbxzUAg7PaRUTGzpPLDzoyd9BY= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=pgSzNWnr; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=RJzbExPh; arc=fail smtp.client-ip=148.163.154.28 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="pgSzNWnr"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="RJzbExPh" Received: from pps.filterd (m0374956.ppops.net [127.0.0.1]) by mx0b-0002e601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68M2UJ2a1034849; Tue, 22 Sep 2026 01:50:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=a15/C6QzRzzsL5TYHeYHQt/0QQVuGNSGXjd2F6SNL CQ=; b=pgSzNWnrHLq2FmLw23kIJgyvxcRPZs4UNse23buiDpvJjQ9eSuCu5fhQS gpAOGJNLkKDG6xhX4790PGKMeaUvbd48zJ0BKfeMssGzKGXFir431ZuQ2aOuwEFE s2K2C1UoRgjS7anNSzPv7coiqlWC06VvmFC7VLpYD3DAyjkKTf+EpkwBBqGa/xw7 GGjt0Owwt+5gGwIExtqmY15YZ71kBLyOmc8lgF5Yx2M4Wb706C7iJPu6HuKp1hT3 GxsaEsDpPDXYd7iMUKeXAoBoFaEx2D/GlqDg6huEwqK1zEDtBF/ORQWc2+m+Sen9 izW6g+siEe38YpKT4q+tvYYqMdtUw== Received: from bl2pr02cu003.outbound.protection.outlook.com (mail-eastusazon11011046.outbound.protection.outlook.com [52.101.52.46]) by mx0b-0002e601.pphosted.com (PPS) with ESMTPS id 4gugxm16mx-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:50:33 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PbLrJJBzmCo1YDwvMJuHOLqhDNMSqs6n1iISCjlj8G/+369DPIPSqctJKv5+ebSBqpbtwP9QBdSQ7u+bfcRXTqSjcZq5OYcPcjZElEjMlGBCIwtevwRVr255JTjHsQYigEsa6Eno0gRQG2Oy+3jTwiRRjkLtE2gVo4vUyOh4nimYX/51cJukKLN8GyRFts4Ld+WLOEFLr8Ch+kOPQuZIkcKgzKahIbMPesLE/o/wVX11O38+dP6N4/J/NWthkveupa7I0VJ8nmyJAH8ah6HVGyZsmsYeVHwpJzk3Hf/r41uU20RCIoAPAjW1ZsNFJxvpdD5WQ1a4kAOopY0O1JOwGg== 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=a15/C6QzRzzsL5TYHeYHQt/0QQVuGNSGXjd2F6SNLCQ=; b=oWNWj0IVVmO26Dk2iYx4o1bFWW3JM39ObVYIwYNxaODVIUc3dLOVOZDGRrMkKh3soc1pGymPaSdzZ6xMokmEfu05MUpdyhG3CvpIpqWLWWQbbvpVRp9mRAQsibSbSRSgiD6ZlvzpCfP9R6GoxiiUvIsFGbFVlJmp1Hq1DemCYuy/UZmrxZCPnrvUafTeu4VsvVG7Qb9bQ9up//2kCThx4YVqhhdPzralXDA32nEoz+8LOHWIhlWhpAyto3QLY5B8UqvK4Ex6dIHjA7+DEsDPBsyxx1ineU5PNdA6WQH2MLwaoey9NkBStDqcW/Rnm/pazhnbDLpr/k4a9tlzi1OaKA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.23.195) smtp.rcpttodomain=nxp.com 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=a15/C6QzRzzsL5TYHeYHQt/0QQVuGNSGXjd2F6SNLCQ=; b=RJzbExPh9rYWrGvmCce0dK/QJKDmvjvIkSdvot+z85jdSv6mFeLN/TDBygKtusEXKsHzJZ4hJdzTvrYzFa1wQi38Lls3olejnOttxx5PN5/XWXY+O6dN2YfbHUwT8C0Ndvn5FjUS/cnVl7bCRGPAlEYZFbukqt15djD6pRihaA4= Received: from CH0PR03CA0357.namprd03.prod.outlook.com (2603:10b6:610:11a::6) by BLAPR10MB4979.namprd10.prod.outlook.com (2603:10b6:208:30d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.14; Tue, 22 Sep 2026 06:50:28 +0000 Received: from CH1PEPF0000AD75.namprd04.prod.outlook.com (2603:10b6:610:11a:cafe::d) by CH0PR03CA0357.outlook.office365.com (2603:10b6:610:11a::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.13 via Frontend Transport; Tue, 22 Sep 2026 06:50:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 198.47.23.195) 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.195 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.23.195; helo=lewvzet201.ext.ti.com; pr=C Received: from lewvzet201.ext.ti.com (198.47.23.195) by CH1PEPF0000AD75.mail.protection.outlook.com (10.167.244.54) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:50:28 +0000 Received: from DLEE206.ent.ti.com (157.170.170.90) by lewvzet201.ext.ti.com (10.4.14.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:12 -0500 Received: from DLEE208.ent.ti.com (157.170.170.97) by DLEE206.ent.ti.com (157.170.170.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:12 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DLEE208.ent.ti.com (157.170.170.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:50:12 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI423626771; Tue, 22 Sep 2026 01:50:08 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 10/19] dmaengine: ti: k3-udma: refactor resource setup functions Date: Tue, 22 Sep 2026 12:17:34 +0530 Message-ID: <20260922064902.2719979-11-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000AD75:EE_|BLAPR10MB4979:EE_ X-MS-Office365-Filtering-Correlation-Id: d29262f9-9365-4172-b6fe-08df1875c9a5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|82310400026|23010399003|36860700016|921020|3023799007|6133799003|10067099003|56012099006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: 5wCB1UuZzzV5HiVBA4w4wCoIfdDrhxrwr/SILW3zEiWhKrhOlKdsPj/6pThgxrB8z9ZhxWl8ECLvxBgN83aC4gryqibn8cvXuJSTd5tOBMR36NGtxfatSYVTJKOn3kPVXSKMl+wbldwx/NqFkasfxTGG5UD4svW7gMkJ/v5OmHD75+D2WeHcf7xYh+70dcMto1GiVf+vb642vdHw4plvlL+C3TYMC9SrjiMExKaz23B2GvWSZbcCoNbpwTILrrWE6gLEuGTvMORN5M6j4KSgRT0D6MD0nFVIEqa4zcKburRQScuSRIzvKKcLNiU52Epev2iFsjF1NppDndorrYxJ9/1Kb+/035ydnvEaGFpjhn/hy3nWNh7E/EpIk9nYeve/sCNwnxnWOTq4w8xAZ0ur16ehgOpXJzzi/q1NoVLrKcuRfvWbhNy+v7hYVMTtWWz6NbuOGl0Cj3AhFvYE1b9rUMbEZ1eP7GlSdfdHZ+pM09PuDrQCdpHhMCtUBEPPCKSoysEAmCnFzLPzo6RiRF25HTFNE1TtmIxU8EKKoDInufLxT5vaOsR+mzmcxqBV3IOBctmE6hQ1rdEyHLLej1GWiRxXfeTS9R1GrjSdQAiPeYy1UaaopIZJAIO+GnoYnTxZfdFDRTF3zW2Oulhtebn3ye6OYhWshjQqE8LJHd7od2xGBoY94YSIHnJlFKjpOFxXkmM918g+udW3vof/C6FVoV12gW6fN1P21Chs4Sq2dIeWpv+bJjlq5zxesWP0H0Ku X-Forefront-Antispam-Report: CIP:198.47.23.195;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:lewvzet201.ext.ti.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(7416014)(1800799024)(82310400026)(23010399003)(36860700016)(921020)(3023799007)(6133799003)(10067099003)(56012099006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1srikFV2YXzNpmmDkFhoH8MDrNjVyIJjGLY+GxiUuvq271MjTn49bj7D4NGvfnZBCF7DGZG2H6ajOV1FLymrzxMK4YHQXP8Q8l8Z+Q8vEkmMtZEfJgHN4R1W2pr9XIljJ0Khs7Hp5j4xqJ2A+5qkiH81t9Mea55gLT3BAhYvFn7/WlPf+10vjjF6bcoe1ilPvTrjeQtdWQN6oYh48ADp3FQlWt/bCfspx3TFXIEho8UvMrBzQPEjhtVr4sELMK3xkMcHujsr0FAWETJqj1Q/ozIAVroIhHcwSdQaIDQR5oG5QW/UinbRG16Gmc9RqPqPMu7l8UrQkLnckhZX0N19O4wcAJnfc22LIE/EWDrXVGMzejun4/siAlGGqC6JtvZvAMpM3XL1KGLWlIAo0pa9NSSP344PjjuzQIbEGQMKmwP9uDkkPjWaeaMqlVFZdlza X-Exchange-RoutingPolicyChecked: OMadkfXAkKZGnTIWi7DhlB/H5HKbXg3Ekv/9iB5h1B/TgmyAMCmp9byT+6kedYeNer96UfifUC8rKVNb4Q3Ks0/y9g/omO3TwgpnvPemYGSb4hUGHQcjIY7jlCEzVhyGH9Or61zNEldhuRg2xWLdAMvuiwnRskn8sRQAIV/gGbi4POaVgCtt7lK1fz0ImMGZXb0RawaG1v9/natYDTQD1QOJ4JyrKQvSKOYtiL3yMKDcekZRM32jg4JZh4glnBfChtdkLJ7FO2S1HinW9wbXoXm688quHf/cgfWBWykP27GLvwD6/JEzmiIeTIV9oT2jpBwu6PHtbv77kiVZBkLSqQ== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:50:28.2203 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d29262f9-9365-4172-b6fe-08df1875c9a5 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.195];Helo=[lewvzet201.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000AD75.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4979 X-Proofpoint-ORIG-GUID: oS0OU3AQv93PNE3MR3jsDIh7QxY0lhmD X-Proofpoint-GUID: oS0OU3AQv93PNE3MR3jsDIh7QxY0lhmD X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfXxRZn80/rLM6h fG1/voVR8Er66TKEMmLC/fitxP6lttBLX2wkeSuhsSdhbR71dgMecf3HFgcrw7nVShlBrrDjKHo u3Btu/1GzfSgO0X3+cH1pJQy1A84pBF5I8m/h42z9x9lYM57BECAGHtI6QaCma1VXayPUfIkYeN DyzT7YzyS9PsRspxPrOd3Hw3VSyGHyWZFOZfeJTjeEJpJ1XryyLhHJaCATFRbYlgjR0v4Xnz3FU er9sddM/oXvlx9ZSbtqP+lvRUxCRrIicU2OJssAfXQq/dHU5oaFCr0cTsZcgzWVx75lR7PUG9I3 eKroHDqhvry74C201LF2uQziJoDes9BYFgMySkAcLiQwC/Vb8Fgg015yxJhmATyje/yQGrP22oW OlU8VxDopVQkN+vxaKxvN64ybNpPzyVdf3vLn7TDN0CgXLjX2sqXchzZKI4vxsguDZ3b6VEXfkF C+E8eVKB74pN8RWO/bA== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfXxo4KLJA8tjjx jmoEVxEuNb418bh/58dVwkIPE57WLHtFUO24oNs+rG1KlshKtCHfmUa/Mvson+RryFt9jdGd856 H3oRJLiosfDSx1g8/0QkZpU4CJkd5/o= X-Authority-Analysis: v=2.4 cv=INeXmQvG c=1 sm=1 tr=0 ts=6ab22539 cx=c_pps a=bbY6CEmM+CWjO+hqT4zsvA==:117 a=f+v6EHfkeJbVwR46tk4DMg==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=s63m1ICgrNkA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=jwouBfj2j3NM8CExmVVE:22 a=sozttTNsAAAA:8 a=I_B2hWj7ayHADsQg9NcA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 malwarescore=0 phishscore=0 spamscore=0 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220097 Content-Type: text/plain; charset="utf-8" The implementation of setup_resources, bcdma_setup_resources and pktdma_setup_resources is largely shared between all K3 UDMA variants with the only major difference being SCI resources setup. So, - Move the functions to k3-udma-common.c. - Split SCI resource setup for bcdma and pktdma into separate functions in variant specific driver (k3-udma.c). - Add function pointers for setup_sci_resources in udma_dev and call them as part of the actual resource setup implementations in k3-udma-common.c to retain the existing functionality. - Also since setup_resources call udma_setup_resources which is not required for all K3 UDMA variants, Add a function pointer in udma_dev and use that to call udma_setup_resources. - Rename setup_resources to k3_udma_setup_resources to avoid polluting global kernel namespace with generic symbol. This refactor improves code reuse and maintainability across multiple variants. No functional changes intended. Signed-off-by: Sai Sree Kartheek Adivi --- drivers/dma/ti/k3-udma-common.c | 200 ++++++++++++++++++++++++++++++++ drivers/dma/ti/k3-udma.c | 184 ++--------------------------- drivers/dma/ti/k3-udma.h | 6 + 3 files changed, 213 insertions(+), 177 deletions(-) diff --git a/drivers/dma/ti/k3-udma-common.c b/drivers/dma/ti/k3-udma-commo= n.c index 34f8eab9ddb57..d0afbab01786f 100644 --- a/drivers/dma/ti/k3-udma-common.c +++ b/drivers/dma/ti/k3-udma-common.c @@ -8,7 +8,9 @@ #include #include #include +#include #include +#include #include =20 #include "k3-udma.h" @@ -2334,5 +2336,203 @@ void bcdma_free_bchan_resources(struct udma_chan *u= c) } EXPORT_SYMBOL_GPL(bcdma_free_bchan_resources); =20 +static int bcdma_setup_resources(struct udma_dev *ud) +{ + int ret; + struct device *dev =3D ud->dev; + u32 cap; + + /* Set up the throughput level start indexes */ + cap =3D udma_read(ud->mmrs[MMR_GCFG], 0x2c); + if (BCDMA_CAP3_UBCHAN_CNT(cap)) { + ud->bchan_tpl.levels =3D 3; + ud->bchan_tpl.start_idx[1] =3D BCDMA_CAP3_UBCHAN_CNT(cap); + ud->bchan_tpl.start_idx[0] =3D BCDMA_CAP3_HBCHAN_CNT(cap); + } else if (BCDMA_CAP3_HBCHAN_CNT(cap)) { + ud->bchan_tpl.levels =3D 2; + ud->bchan_tpl.start_idx[0] =3D BCDMA_CAP3_HBCHAN_CNT(cap); + } else { + ud->bchan_tpl.levels =3D 1; + } + + cap =3D udma_read(ud->mmrs[MMR_GCFG], 0x30); + if (BCDMA_CAP4_URCHAN_CNT(cap)) { + ud->rchan_tpl.levels =3D 3; + ud->rchan_tpl.start_idx[1] =3D BCDMA_CAP4_URCHAN_CNT(cap); + ud->rchan_tpl.start_idx[0] =3D BCDMA_CAP4_HRCHAN_CNT(cap); + } else if (BCDMA_CAP4_HRCHAN_CNT(cap)) { + ud->rchan_tpl.levels =3D 2; + ud->rchan_tpl.start_idx[0] =3D BCDMA_CAP4_HRCHAN_CNT(cap); + } else { + ud->rchan_tpl.levels =3D 1; + } + + if (BCDMA_CAP4_UTCHAN_CNT(cap)) { + ud->tchan_tpl.levels =3D 3; + ud->tchan_tpl.start_idx[1] =3D BCDMA_CAP4_UTCHAN_CNT(cap); + ud->tchan_tpl.start_idx[0] =3D BCDMA_CAP4_HTCHAN_CNT(cap); + } else if (BCDMA_CAP4_HTCHAN_CNT(cap)) { + ud->tchan_tpl.levels =3D 2; + ud->tchan_tpl.start_idx[0] =3D BCDMA_CAP4_HTCHAN_CNT(cap); + } else { + ud->tchan_tpl.levels =3D 1; + } + + ud->bchan_map =3D devm_bitmap_zalloc(dev, ud->bchan_cnt, GFP_KERNEL); + ud->bchans =3D devm_kcalloc(dev, ud->bchan_cnt, sizeof(*ud->bchans), + GFP_KERNEL); + ud->tchan_map =3D devm_bitmap_zalloc(dev, ud->tchan_cnt, GFP_KERNEL); + ud->tchans =3D devm_kcalloc(dev, ud->tchan_cnt, sizeof(*ud->tchans), + GFP_KERNEL); + ud->rchan_map =3D devm_bitmap_zalloc(dev, ud->rchan_cnt, GFP_KERNEL); + ud->rchans =3D devm_kcalloc(dev, ud->rchan_cnt, sizeof(*ud->rchans), + GFP_KERNEL); + /* BCDMA do not really have flows, but the driver expect it */ + ud->rflow_in_use =3D devm_kcalloc(dev, BITS_TO_LONGS(ud->rchan_cnt), + sizeof(unsigned long), + GFP_KERNEL); + ud->rflows =3D devm_kcalloc(dev, ud->rchan_cnt, sizeof(*ud->rflows), + GFP_KERNEL); + + if (!ud->bchan_map || !ud->tchan_map || !ud->rchan_map || + !ud->rflow_in_use || !ud->bchans || !ud->tchans || !ud->rchans || + !ud->rflows) + return -ENOMEM; + + if (ud->bcdma_setup_sci_resources) { + ret =3D ud->bcdma_setup_sci_resources(ud); + if (ret) + return ret; + } + + return 0; +} + +static int pktdma_setup_resources(struct udma_dev *ud) +{ + int ret; + struct device *dev =3D ud->dev; + u32 cap3; + + /* Set up the throughput level start indexes */ + cap3 =3D udma_read(ud->mmrs[MMR_GCFG], 0x2c); + if (UDMA_CAP3_UCHAN_CNT(cap3)) { + ud->tchan_tpl.levels =3D 3; + ud->tchan_tpl.start_idx[1] =3D UDMA_CAP3_UCHAN_CNT(cap3); + ud->tchan_tpl.start_idx[0] =3D UDMA_CAP3_HCHAN_CNT(cap3); + } else if (UDMA_CAP3_HCHAN_CNT(cap3)) { + ud->tchan_tpl.levels =3D 2; + ud->tchan_tpl.start_idx[0] =3D UDMA_CAP3_HCHAN_CNT(cap3); + } else { + ud->tchan_tpl.levels =3D 1; + } + + ud->rchan_tpl.levels =3D ud->tchan_tpl.levels; + ud->rchan_tpl.start_idx[0] =3D ud->tchan_tpl.start_idx[0]; + ud->rchan_tpl.start_idx[1] =3D ud->tchan_tpl.start_idx[1]; + + ud->tchan_map =3D devm_bitmap_zalloc(dev, ud->tchan_cnt, GFP_KERNEL); + ud->tchans =3D devm_kcalloc(dev, ud->tchan_cnt, sizeof(*ud->tchans), + GFP_KERNEL); + ud->rchan_map =3D devm_bitmap_zalloc(dev, ud->rchan_cnt, GFP_KERNEL); + ud->rchans =3D devm_kcalloc(dev, ud->rchan_cnt, sizeof(*ud->rchans), + GFP_KERNEL); + ud->rflow_in_use =3D devm_kcalloc(dev, BITS_TO_LONGS(ud->rflow_cnt), + sizeof(unsigned long), + GFP_KERNEL); + ud->rflows =3D devm_kcalloc(dev, ud->rflow_cnt, sizeof(*ud->rflows), + GFP_KERNEL); + ud->tflow_map =3D devm_bitmap_zalloc(dev, ud->tflow_cnt, GFP_KERNEL); + + if (!ud->tchan_map || !ud->rchan_map || !ud->tflow_map || !ud->tchans || + !ud->rchans || !ud->rflows || !ud->rflow_in_use) + return -ENOMEM; + + if (ud->pktdma_setup_sci_resources) { + ret =3D ud->pktdma_setup_sci_resources(ud); + if (ret) + return ret; + } + + return 0; +} + +int k3_udma_setup_resources(struct udma_dev *ud) +{ + struct device *dev =3D ud->dev; + int ch_count, ret; + + switch (ud->match_data->type) { + case DMA_TYPE_UDMA: + if (!ud->udma_setup_resources) + return -EINVAL; + ret =3D ud->udma_setup_resources(ud); + break; + case DMA_TYPE_BCDMA: + ret =3D bcdma_setup_resources(ud); + break; + case DMA_TYPE_PKTDMA: + ret =3D pktdma_setup_resources(ud); + break; + default: + return -EINVAL; + } + + if (ret) + return ret; + + ch_count =3D ud->bchan_cnt + ud->tchan_cnt + ud->rchan_cnt; + if (ud->bchan_cnt) + ch_count -=3D bitmap_weight(ud->bchan_map, ud->bchan_cnt); + ch_count -=3D bitmap_weight(ud->tchan_map, ud->tchan_cnt); + ch_count -=3D bitmap_weight(ud->rchan_map, ud->rchan_cnt); + if (!ch_count) + return -ENODEV; + + ud->channels =3D devm_kcalloc(dev, ch_count, sizeof(*ud->channels), + GFP_KERNEL); + if (!ud->channels) + return -ENOMEM; + + switch (ud->match_data->type) { + case DMA_TYPE_UDMA: + dev_info(dev, + "Channels: %d (tchan: %u, rchan: %u, gp-rflow: %u)\n", + ch_count, + ud->tchan_cnt - bitmap_weight(ud->tchan_map, + ud->tchan_cnt), + ud->rchan_cnt - bitmap_weight(ud->rchan_map, + ud->rchan_cnt), + ud->rflow_cnt - bitmap_weight(ud->rflow_gp_map, + ud->rflow_cnt)); + break; + case DMA_TYPE_BCDMA: + dev_info(dev, + "Channels: %d (bchan: %u, tchan: %u, rchan: %u)\n", + ch_count, + ud->bchan_cnt - bitmap_weight(ud->bchan_map, + ud->bchan_cnt), + ud->tchan_cnt - bitmap_weight(ud->tchan_map, + ud->tchan_cnt), + ud->rchan_cnt - bitmap_weight(ud->rchan_map, + ud->rchan_cnt)); + break; + case DMA_TYPE_PKTDMA: + dev_info(dev, + "Channels: %d (tchan: %u, rchan: %u)\n", + ch_count, + ud->tchan_cnt - bitmap_weight(ud->tchan_map, + ud->tchan_cnt), + ud->rchan_cnt - bitmap_weight(ud->rchan_map, + ud->rchan_cnt)); + break; + default: + break; + } + + return ch_count; +} +EXPORT_SYMBOL_GPL(k3_udma_setup_resources); + MODULE_DESCRIPTION("Texas Instruments K3 UDMA Common Library"); MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 21978f17e327f..9a261747c8709 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -2083,7 +2083,7 @@ static const char * const range_names[] =3D { [RM_RANGE_TFLOW] =3D "ti,sci-rm-range-tflow", }; =20 -static int udma_setup_resources(struct udma_dev *ud) +int udma_setup_resources(struct udma_dev *ud) { int ret, i, j; struct device *dev =3D ud->dev; @@ -2245,74 +2245,13 @@ static int udma_setup_resources(struct udma_dev *ud) return 0; } =20 -static int bcdma_setup_resources(struct udma_dev *ud) +static int bcdma_setup_sci_resources(struct udma_dev *ud) { int ret, i, j; struct device *dev =3D ud->dev; struct ti_sci_resource *rm_res, irq_res; struct udma_tisci_rm *tisci_rm =3D &ud->tisci_rm; const struct udma_oes_offsets *oes =3D &ud->soc_data->oes; - u32 cap; - - /* Set up the throughput level start indexes */ - cap =3D udma_read(ud->mmrs[MMR_GCFG], 0x2c); - if (BCDMA_CAP3_UBCHAN_CNT(cap)) { - ud->bchan_tpl.levels =3D 3; - ud->bchan_tpl.start_idx[1] =3D BCDMA_CAP3_UBCHAN_CNT(cap); - ud->bchan_tpl.start_idx[0] =3D BCDMA_CAP3_HBCHAN_CNT(cap); - } else if (BCDMA_CAP3_HBCHAN_CNT(cap)) { - ud->bchan_tpl.levels =3D 2; - ud->bchan_tpl.start_idx[0] =3D BCDMA_CAP3_HBCHAN_CNT(cap); - } else { - ud->bchan_tpl.levels =3D 1; - } - - cap =3D udma_read(ud->mmrs[MMR_GCFG], 0x30); - if (BCDMA_CAP4_URCHAN_CNT(cap)) { - ud->rchan_tpl.levels =3D 3; - ud->rchan_tpl.start_idx[1] =3D BCDMA_CAP4_URCHAN_CNT(cap); - ud->rchan_tpl.start_idx[0] =3D BCDMA_CAP4_HRCHAN_CNT(cap); - } else if (BCDMA_CAP4_HRCHAN_CNT(cap)) { - ud->rchan_tpl.levels =3D 2; - ud->rchan_tpl.start_idx[0] =3D BCDMA_CAP4_HRCHAN_CNT(cap); - } else { - ud->rchan_tpl.levels =3D 1; - } - - if (BCDMA_CAP4_UTCHAN_CNT(cap)) { - ud->tchan_tpl.levels =3D 3; - ud->tchan_tpl.start_idx[1] =3D BCDMA_CAP4_UTCHAN_CNT(cap); - ud->tchan_tpl.start_idx[0] =3D BCDMA_CAP4_HTCHAN_CNT(cap); - } else if (BCDMA_CAP4_HTCHAN_CNT(cap)) { - ud->tchan_tpl.levels =3D 2; - ud->tchan_tpl.start_idx[0] =3D BCDMA_CAP4_HTCHAN_CNT(cap); - } else { - ud->tchan_tpl.levels =3D 1; - } - - ud->bchan_map =3D devm_kmalloc_array(dev, BITS_TO_LONGS(ud->bchan_cnt), - sizeof(unsigned long), GFP_KERNEL); - ud->bchans =3D devm_kcalloc(dev, ud->bchan_cnt, sizeof(*ud->bchans), - GFP_KERNEL); - ud->tchan_map =3D devm_kmalloc_array(dev, BITS_TO_LONGS(ud->tchan_cnt), - sizeof(unsigned long), GFP_KERNEL); - ud->tchans =3D devm_kcalloc(dev, ud->tchan_cnt, sizeof(*ud->tchans), - GFP_KERNEL); - ud->rchan_map =3D devm_kmalloc_array(dev, BITS_TO_LONGS(ud->rchan_cnt), - sizeof(unsigned long), GFP_KERNEL); - ud->rchans =3D devm_kcalloc(dev, ud->rchan_cnt, sizeof(*ud->rchans), - GFP_KERNEL); - /* BCDMA do not really have flows, but the driver expect it */ - ud->rflow_in_use =3D devm_kcalloc(dev, BITS_TO_LONGS(ud->rchan_cnt), - sizeof(unsigned long), - GFP_KERNEL); - ud->rflows =3D devm_kcalloc(dev, ud->rchan_cnt, sizeof(*ud->rflows), - GFP_KERNEL); - - if (!ud->bchan_map || !ud->tchan_map || !ud->rchan_map || - !ud->rflow_in_use || !ud->bchans || !ud->tchans || !ud->rchans || - !ud->rflows) - return -ENOMEM; =20 /* Get resource ranges from tisci */ for (i =3D 0; i < RM_RANGE_LAST; i++) { @@ -2476,51 +2415,13 @@ static int bcdma_setup_resources(struct udma_dev *u= d) return 0; } =20 -static int pktdma_setup_resources(struct udma_dev *ud) +static int pktdma_setup_sci_resources(struct udma_dev *ud) { int ret, i, j; struct device *dev =3D ud->dev; struct ti_sci_resource *rm_res, irq_res; struct udma_tisci_rm *tisci_rm =3D &ud->tisci_rm; const struct udma_oes_offsets *oes =3D &ud->soc_data->oes; - u32 cap3; - - /* Set up the throughput level start indexes */ - cap3 =3D udma_read(ud->mmrs[MMR_GCFG], 0x2c); - if (UDMA_CAP3_UCHAN_CNT(cap3)) { - ud->tchan_tpl.levels =3D 3; - ud->tchan_tpl.start_idx[1] =3D UDMA_CAP3_UCHAN_CNT(cap3); - ud->tchan_tpl.start_idx[0] =3D UDMA_CAP3_HCHAN_CNT(cap3); - } else if (UDMA_CAP3_HCHAN_CNT(cap3)) { - ud->tchan_tpl.levels =3D 2; - ud->tchan_tpl.start_idx[0] =3D UDMA_CAP3_HCHAN_CNT(cap3); - } else { - ud->tchan_tpl.levels =3D 1; - } - - ud->rchan_tpl.levels =3D ud->tchan_tpl.levels; - ud->rchan_tpl.start_idx[0] =3D ud->tchan_tpl.start_idx[0]; - ud->rchan_tpl.start_idx[1] =3D ud->tchan_tpl.start_idx[1]; - - ud->tchan_map =3D devm_kmalloc_array(dev, BITS_TO_LONGS(ud->tchan_cnt), - sizeof(unsigned long), GFP_KERNEL); - ud->tchans =3D devm_kcalloc(dev, ud->tchan_cnt, sizeof(*ud->tchans), - GFP_KERNEL); - ud->rchan_map =3D devm_kmalloc_array(dev, BITS_TO_LONGS(ud->rchan_cnt), - sizeof(unsigned long), GFP_KERNEL); - ud->rchans =3D devm_kcalloc(dev, ud->rchan_cnt, sizeof(*ud->rchans), - GFP_KERNEL); - ud->rflow_in_use =3D devm_kcalloc(dev, BITS_TO_LONGS(ud->rflow_cnt), - sizeof(unsigned long), - GFP_KERNEL); - ud->rflows =3D devm_kcalloc(dev, ud->rflow_cnt, sizeof(*ud->rflows), - GFP_KERNEL); - ud->tflow_map =3D devm_kmalloc_array(dev, BITS_TO_LONGS(ud->tflow_cnt), - sizeof(unsigned long), GFP_KERNEL); - - if (!ud->tchan_map || !ud->rchan_map || !ud->tflow_map || !ud->tchans || - !ud->rchans || !ud->rflows || !ud->rflow_in_use) - return -ENOMEM; =20 /* Get resource ranges from tisci */ for (i =3D 0; i < RM_RANGE_LAST; i++) { @@ -2631,80 +2532,6 @@ static int pktdma_setup_resources(struct udma_dev *u= d) return 0; } =20 -static int setup_resources(struct udma_dev *ud) -{ - struct device *dev =3D ud->dev; - int ch_count, ret; - - switch (ud->match_data->type) { - case DMA_TYPE_UDMA: - ret =3D udma_setup_resources(ud); - break; - case DMA_TYPE_BCDMA: - ret =3D bcdma_setup_resources(ud); - break; - case DMA_TYPE_PKTDMA: - ret =3D pktdma_setup_resources(ud); - break; - default: - return -EINVAL; - } - - if (ret) - return ret; - - ch_count =3D ud->bchan_cnt + ud->tchan_cnt + ud->rchan_cnt; - if (ud->bchan_cnt) - ch_count -=3D bitmap_weight(ud->bchan_map, ud->bchan_cnt); - ch_count -=3D bitmap_weight(ud->tchan_map, ud->tchan_cnt); - ch_count -=3D bitmap_weight(ud->rchan_map, ud->rchan_cnt); - if (!ch_count) - return -ENODEV; - - ud->channels =3D devm_kcalloc(dev, ch_count, sizeof(*ud->channels), - GFP_KERNEL); - if (!ud->channels) - return -ENOMEM; - - switch (ud->match_data->type) { - case DMA_TYPE_UDMA: - dev_info(dev, - "Channels: %d (tchan: %u, rchan: %u, gp-rflow: %u)\n", - ch_count, - ud->tchan_cnt - bitmap_weight(ud->tchan_map, - ud->tchan_cnt), - ud->rchan_cnt - bitmap_weight(ud->rchan_map, - ud->rchan_cnt), - ud->rflow_cnt - bitmap_weight(ud->rflow_gp_map, - ud->rflow_cnt)); - break; - case DMA_TYPE_BCDMA: - dev_info(dev, - "Channels: %d (bchan: %u, tchan: %u, rchan: %u)\n", - ch_count, - ud->bchan_cnt - bitmap_weight(ud->bchan_map, - ud->bchan_cnt), - ud->tchan_cnt - bitmap_weight(ud->tchan_map, - ud->tchan_cnt), - ud->rchan_cnt - bitmap_weight(ud->rchan_map, - ud->rchan_cnt)); - break; - case DMA_TYPE_PKTDMA: - dev_info(dev, - "Channels: %d (tchan: %u, rchan: %u)\n", - ch_count, - ud->tchan_cnt - bitmap_weight(ud->tchan_map, - ud->tchan_cnt), - ud->rchan_cnt - bitmap_weight(ud->rchan_map, - ud->rchan_cnt)); - break; - default: - break; - } - - return ch_count; -} - static int udma_probe(struct platform_device *pdev) { struct device_node *navss_node =3D pdev->dev.parent->of_node; @@ -2747,6 +2574,9 @@ static int udma_probe(struct platform_device *pdev) ud->decrement_byte_counters =3D udma_decrement_byte_counters; ud->psil_pair =3D navss_psil_pair; ud->psil_unpair =3D navss_psil_unpair; + ud->udma_setup_resources =3D udma_setup_resources; + ud->bcdma_setup_sci_resources =3D bcdma_setup_sci_resources; + ud->pktdma_setup_sci_resources =3D pktdma_setup_sci_resources; =20 ret =3D udma_get_mmrs(pdev, ud); if (ret) @@ -2876,7 +2706,7 @@ static int udma_probe(struct platform_device *pdev) INIT_LIST_HEAD(&ud->ddev.channels); INIT_LIST_HEAD(&ud->desc_to_purge); =20 - ch_count =3D setup_resources(ud); + ch_count =3D k3_udma_setup_resources(ud); if (ch_count <=3D 0) return ch_count; =20 diff --git a/drivers/dma/ti/k3-udma.h b/drivers/dma/ti/k3-udma.h index 329df7eb156b2..d64b670d42490 100644 --- a/drivers/dma/ti/k3-udma.h +++ b/drivers/dma/ti/k3-udma.h @@ -357,6 +357,9 @@ struct udma_dev { u32 dst_thread); int (*psil_unpair)(struct udma_dev *ud, u32 src_thread, u32 dst_thread); + int (*udma_setup_resources)(struct udma_dev *ud); + int (*bcdma_setup_sci_resources)(struct udma_dev *ud); + int (*pktdma_setup_sci_resources)(struct udma_dev *ud); }; =20 struct udma_desc { @@ -679,6 +682,9 @@ struct udma_bchan *__udma_reserve_bchan(struct udma_dev= *ud, enum udma_tp_level struct udma_tchan *__udma_reserve_tchan(struct udma_dev *ud, enum udma_tp_= level tpl, int id); struct udma_rchan *__udma_reserve_rchan(struct udma_dev *ud, enum udma_tp_= level tpl, int id); =20 +int udma_setup_resources(struct udma_dev *ud); +int k3_udma_setup_resources(struct udma_dev *ud); + /* Direct access to UDMA low lever resources for the glue layer */ int xudma_navss_psil_pair(struct udma_dev *ud, u32 src_thread, u32 dst_thr= ead); int xudma_navss_psil_unpair(struct udma_dev *ud, u32 src_thread, --=20 2.54.0 From nobody Thu Sep 24 17:02:17 2026 Received: from mx0b-0002e601.pphosted.com (mx0b-0002e601.pphosted.com [148.163.154.28]) (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 0940C4EFFCA; Tue, 22 Sep 2026 06:51:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.154.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059913; cv=fail; b=f6CrX80frBJFNxVvtk3WoG4GI9AYQK6XpqApM9hcrb4rOmiA974JkMKeHFUay4mfd+Y8MG/bbrZSZVvtWlY76VO7oWZwDW6d+GROA5m46kIuxKhzAashCiP3vkN/f7qpxEw+F7votsltz1gC3xRpIyLX5pWPvqywZQ7GINTYjR0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059913; c=relaxed/simple; bh=Z5yqiGYQb+zbhB5jd+Fn5cjG2p1x73Xbil4wKmJeRnY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HAMJe8G7Ulfsgl+YwE4HxGlt83VJQGoRRPJkVqTUeW9d3dnHH/NEUqpYk9EmwUcdyh7Of/1P7qUacPXB5fGG/iRH8jCBPqhCOMMYpLFfRSdAoUvqOJZzuj/1zIBN2pwCujTL6gZ5ChtBTw4hg9FKcv8y/+jkY+w3YaZ8ctd2B0w= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=ifgdmEBT; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=SApBNrcv; arc=fail smtp.client-ip=148.163.154.28 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="ifgdmEBT"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="SApBNrcv" Received: from pps.filterd (m0374956.ppops.net [127.0.0.1]) by mx0b-0002e601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68M2UZfC1035403; Tue, 22 Sep 2026 01:51:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=H7SuJRbIzkpZSygmg8FrIDrs0PBd7WpV3zdPr7z8b TQ=; b=ifgdmEBTIeYK1whS8BTyu9cxV8yojlbiH9YgGFs/CQ7SXHhOMiFu4NyPp Cu1bdY1k3HCEdl2kmKGtSLNlKUIpnDsBGIZp+DtH0n6BVxh0Nc6jG6Fb+/NJpXhj Q39ajNLw6Vo+/JZfOl61ARD3LkIaxaXAVFx5U8NoRMPRTiFtG51McRhSka4Le4Uj qnx8VWpXTpMt94/133qr+TWmd6MMKD6P2SOivfpnTD1uZvOCVuxnGH9boXiWsPwp l99w+PeotnH11XKiHI2ZLDX/yRyy0gO9lsLuc3+TyOJAa8OyvWWQ8/HUSor6newH 2yoB34NL1DO8Tx+qMpm7xSTGhQKPg== Received: from byapr05cu005.outbound.protection.outlook.com (mail-westusazon11010033.outbound.protection.outlook.com [52.101.85.33]) by mx0b-0002e601.pphosted.com (PPS) with ESMTPS id 4gugxm16r5-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:51:06 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Y/mJfZ9K5o1qXfzCBUhEyWHCrHKDywJpof74ImoqvI3UyaOpBHvYygVbST0fU5Dimn9GS6aXogzeapYdZ6GHgra6QHQCFwjhOT/P9QCWFGrz0Zj41/ndAE1EuoJKBbZxY6qDDXwW2k+OOlSssVK/RysvU175S445lRl6AATC7GLX2M4EcDC4VaqAHPwzSTGP7XS6gmef65lcHU6f4g2zSJlx3ohZiIOektVo1AA+KVD8QBXyfcyvFTdqZEGU02+RtKA2TdkqBc+mfVkxUcrqLV0TaoLhHcqV/yqUOQzegHgVyOWSiAGgGhLUu0t8U+25irJxeGHTlP6ktscT0KwZMQ== 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=H7SuJRbIzkpZSygmg8FrIDrs0PBd7WpV3zdPr7z8bTQ=; b=SgH/gxdYd+9KdkTV2c4Ck4NpK0s9XYJ1ZZGzu1tKR8XxE/AEh6ZBKEAgRWFsK92oQtjkHAGnkktQcLYGrrL3o0KUzYMixznJuiqjOEV+AKW/BKDkpeJ1Ild+iDd1aUL3bIyh886B3jiN/PsDqlPyse3rVKLtR5EEceNLzuOzZQrrsDRL97GcM6u3jCbVaKpJ8LxwdIjQF/V72B1Gm3V3Qem/uIyY6rolyC+t95abzydR+wy9qdbSqfzQp+c46FEIIDJ6gTYWwAvssNYUwFpFy2JrSxD2kkN8Rnb7CZL8jOQDz40XWsUQYoO0rz+qq1wkjpA4fDxBc5X9KMqh+ZEvfQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.21.195) smtp.rcpttodomain=nxp.com 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=H7SuJRbIzkpZSygmg8FrIDrs0PBd7WpV3zdPr7z8bTQ=; b=SApBNrcvXTGTBWbXvadP1pK6xAsD87vkD3U7lijl7U7jcfFGynFmJEkBufhEvGMuA/zVDkp60sHVY4iqtvuQU6u5JhiUgyM/4CE1CIoNcKPqDVxy35JnUZ01esKeGP+ZZ2jFlWbEqfnbqZN+b5bnvIpsa1l0fDjcz+kWYwpODQI= Received: from BYAPR21CA0027.namprd21.prod.outlook.com (2603:10b6:a03:114::37) by CH3PR10MB6761.namprd10.prod.outlook.com (2603:10b6:610:146::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.14; Tue, 22 Sep 2026 06:51:01 +0000 Received: from CO1PEPF00012E60.namprd05.prod.outlook.com (2603:10b6:a03:114:cafe::61) by BYAPR21CA0027.outlook.office365.com (2603:10b6:a03:114::37) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.14 via Frontend Transport; Tue, 22 Sep 2026 06:51:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 198.47.21.195) 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.21.195 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.21.195; helo=flwvzet201.ext.ti.com; pr=C Received: from flwvzet201.ext.ti.com (198.47.21.195) by CO1PEPF00012E60.mail.protection.outlook.com (10.167.249.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:50:59 +0000 Received: from DFLE207.ent.ti.com (10.64.6.65) by flwvzet201.ext.ti.com (10.248.192.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:17 -0500 Received: from DFLE213.ent.ti.com (10.64.6.71) by DFLE207.ent.ti.com (10.64.6.65) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:17 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DFLE213.ent.ti.com (10.64.6.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:50:17 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI433626771; Tue, 22 Sep 2026 01:50:13 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 11/19] dmaengine: ti: k3-udma: move inclusion of k3-udma-private.c to k3-udma-common.c Date: Tue, 22 Sep 2026 12:17:35 +0530 Message-ID: <20260922064902.2719979-12-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF00012E60:EE_|CH3PR10MB6761:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f8d7eff-4ef2-449f-be53-08df1875dc8e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700016|1800799024|23010399003|7416014|376014|10067099003|3023799007|22082099003|18002099003|56012099006|921020; X-Microsoft-Antispam-Message-Info: F3Ma1jncvjVcvSCnXaKmn1T0hWbFaEm7YU84zIJ3ObvbQtU+gYIKXztjOxzf9JYuzZN48LgUoCQkhC5h7C8SdV3XWbf0wAPdL57B5JoASjVn2ZffsMQs2cO31kTK3jwzx8jq7vH1EDufncyMWuF5YaLBhEPKMVNnPe9XGnmKbEehE8o2IJPV/0lPklAA/FCuoTl9L5h/QI685i+4SM79CNO5r3QPT+wr1NgRKokQVFXItpESqQSodQVMkHFfdzSgAaHEezCJJAeLSucs62fHNkqFJo+8Jgi235t/xfD3PHbd3zkHYcwBKLnMy700SUKc/VzpTBPfG6fQMv7thfn85tV7pGJWOFDAb3KvQq0djKYsoHisT/dqgjfox383Iv7lBx7rUM32F+R/Ul117gRWp6YU6kYBoj0NCpZvK/I3eRY/jNKQRyQjbNzwOudEKnxPh5dEKNZnueQTopjWBN0YxaekcJyWXubehR7szbLeHpiHlEQ5i2+t38kdkzaHWZGnYxh9nGeDZ+jc8K2+5O1P6TnEjCAQ0csVEcLM+QEiXg495rDBNCDPkfdhiySwHAVFpFM3+58uGV6dkP07WzgpVX4IxpQhTkGVT6YEp13SW7hw+O4585jIYnMAgJ6iSBDgkuJxzwQuc+DiTOgUgqsnVsJP/iWNQeRF65T3wR+oosF5cygUIejPCz14Mui4+yHTxAvAwg9hWEqGjCmJRIxSaeKe05V6Vsrngq4bHGx+qCIkPSAlyEqGgc4KOEBJwdOM X-Forefront-Antispam-Report: CIP:198.47.21.195;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:flwvzet201.ext.ti.com;PTR:ErrorRetry;CAT:NONE;SFS:(13230040)(82310400026)(36860700016)(1800799024)(23010399003)(7416014)(376014)(10067099003)(3023799007)(22082099003)(18002099003)(56012099006)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7x0ESJ2OVyVBuUl4CVgg4qANENCPl7yWwp82AoQZQA2kBJK0We0T9idsZlRTLckw6OF8rgI/B56TmxTcVwx78bvzKrikaWNl9ZZREAXN/aUY7CqWV+vPhHO7WwZSfCHedgiBtNinWLQ5s1UFf4sUYBsf/7b5W2OJ3cfzqmH5a9gVK7eIBTGu7feScSx78Pc76CNirIgxqTN192RqIJaqqMfzoKt0vboM0S5UnBaokH6XLqKTHow2rQ1L1LK9pOjEVgOEBb26ADijN0pUXNljweUOY/zxZIEEcIEvuQIE28jVWaWSeAl8eAC6mvwoQfGrFx7MqA5nimLE1uxmfrppo8YeP7P/N5wzUCYrvu3e5hCPVOGawbB2dC8mJ6y5SpoA1MfbgjcrosPSui7X7+L4cqxdyAzbJ8Uf4IdF6WZ74TO8VGsIPH3kw7scrpFHrhSo X-Exchange-RoutingPolicyChecked: lVWUCcmit+nXmhTWBYyzzbbCekbrR+QqzxeMnE3z+i9F2uHsKzxchtXH12s4gfWQoi7FAS3SLY2tT5nsoUM9hGPudnfFnPxTQwkJ0Xz4OJIHF+Ov2op2zemyCQWwkCo+jd19nwdZOA7VmypbXAClKiXVDwV/3Tk2PNq3T5tWoieIYUL3oStc4SkuHuPoBr0NmEuZndP0RuDTFuZnx/ATL8+7xBtVnlNaaK0AVHo9tXdzjddxnSXFtZy3TCGMghJ+hUgb3XIWFVUI6WQRkEcQO+6q+U8wRod1DBj6JRaaBkbUW8S15eW1WRzVW+TXgno47W1y0LBr6W9MMIoFR/HztQ== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:50:59.9109 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3f8d7eff-4ef2-449f-be53-08df1875dc8e X-MS-Exchange-CrossTenant-Id: e5b49634-450b-4709-8abb-1e2b19b982b7 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e5b49634-450b-4709-8abb-1e2b19b982b7;Ip=[198.47.21.195];Helo=[flwvzet201.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF00012E60.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB6761 X-Proofpoint-ORIG-GUID: KZjSYv3KUJVs1ktH-bhmqozDo7s7uAWM X-Proofpoint-GUID: KZjSYv3KUJVs1ktH-bhmqozDo7s7uAWM X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX9BDXgAxNU+VL c7AAI/CkAS1AHhp+HowAMDpmAhPOCeQJGe62tKMj/d+8LLOAmuqVzinOdTBfOBxEllvDPleHQwu V8FuXlBS75klTfOwhwZgJLLn8lFqYazrmS06x2nCewBYz3uRS5fcnjgCote8QNZsAOpSo7DGfqN xyA8FLrvy9+jWTlC7FQdwYV/D2Cgl9tNLYy+6Gg34JiknqoNl0+V7tdS8m3whU0WjUq4sNPL6gR WKU3J2cgLlv6Y7kfc5kAC+Z+H7X/uGoGVjtmAN2pqYLHTXh8hMi0FSyvVReErpQJ9L4fzpvz9ij F71UV6UujqooRBqK9RgUCbwFXHFCyJiFOEMlhTakFsvAf1WF7ppEgiKBIDIah8FEUPyVePEWbEA 7ITtyQNM2VrtTs7sQAz3Lhp/Ol/cXtCE2B7BplLlXPJLSPVJlpQZmIhKFcl4OO5dpL+SwjnKKQG +XyT+J5Ftyl6X5LtrfQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX98A8L/VCnOhR 2lR/SvKePjHPFRGY58AJx1uiPOXkHxbY+CzQig1xnM4rw7DREF+bs0cyk2FUxo9kzS4mpNYjv7H H/BrZ42vHOryfpD4UtKRwxRfdSpu3tU= X-Authority-Analysis: v=2.4 cv=INeXmQvG c=1 sm=1 tr=0 ts=6ab2255a cx=c_pps a=+v7uXpzEFv5PX1YPhMLqHw==:117 a=tJyPKKxUohctrY4NYmUjkA==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=jwouBfj2j3NM8CExmVVE:22 a=sozttTNsAAAA:8 a=tBjUjbL6H5YkyfA7LM4A:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 malwarescore=0 phishscore=0 spamscore=0 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220097 Content-Type: text/plain; charset="utf-8" Relocate the #include directive for k3-udma-private.c to k3-udma-common.c so that the code can be shared between other UDMA variants (like k3-udma-v2). This change improves modularity and prepares for variant-specific implementations. No functional changes intended. Signed-off-by: Sai Sree Kartheek Adivi --- drivers/dma/ti/k3-udma-common.c | 3 +++ drivers/dma/ti/k3-udma.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/dma/ti/k3-udma-common.c b/drivers/dma/ti/k3-udma-commo= n.c index d0afbab01786f..eb555cc08347d 100644 --- a/drivers/dma/ti/k3-udma-common.c +++ b/drivers/dma/ti/k3-udma-common.c @@ -2536,3 +2536,6 @@ EXPORT_SYMBOL_GPL(k3_udma_setup_resources); =20 MODULE_DESCRIPTION("Texas Instruments K3 UDMA Common Library"); MODULE_LICENSE("GPL v2"); + +/* Private interfaces to UDMA */ +#include "k3-udma-private.c" diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 9a261747c8709..ddedd51ab26d9 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -2857,5 +2857,3 @@ module_platform_driver(udma_driver); MODULE_DESCRIPTION("Texas Instruments UDMA support"); MODULE_LICENSE("GPL v2"); =20 -/* Private interfaces to UDMA */ -#include "k3-udma-private.c" --=20 2.54.0 From nobody Thu Sep 24 17:02:17 2026 Received: from mx0a-0002e601.pphosted.com (mx0a-0002e601.pphosted.com [148.163.150.75]) (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 DF6044F7CA4; Tue, 22 Sep 2026 06:51:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.150.75 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059875; cv=fail; b=PqVkm5N6ULn8jajHMn1siqNy6xk3OshJEZWuFDN3C1tRsiZP4OT1x3EE+8+CkSpaxD92a74ySjf5NrXebepifLCYRA3Gt/Xs/f7IjN51Dz586FYnh3Wv1iLpAkiM8CizH37DG61nkgs6jrjxYTH41DpYaoUu7vKJCfrAegY8AzI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059875; c=relaxed/simple; bh=Yi84l4rgMbs3LkYAUXw4rwuMvfWIYeSOtSc4KsdUI54=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XqnjPenpGEsR1GpSEahq1JiXAejbxVilcgFpAnUXBMtDEMrDBlNsqUhERnvwYaL31MVJUER3bjhDL7FxHFQ2ntJjGZQ4qtY5hDZx0pv4RpILtqPd0onY0bHQgHY0q5MWKRZJncwKIrQiuv71CBb5JJtOx6x53BIInRPjGTFuraY= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=bQB7H+X5; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=vRnVWh6A; arc=fail smtp.client-ip=148.163.150.75 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="bQB7H+X5"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="vRnVWh6A" Received: from pps.filterd (m0384305.ppops.net [127.0.0.1]) by m0384305.ppops.net (8.18.1.11/8.18.1.11) with ESMTP id 68M5BSfH2149820; Tue, 22 Sep 2026 01:50:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=6KMgOuSNuX7xG1qKd4LXi4iRk6iS/SzCWjZhnQvpC B0=; b=bQB7H+X5YyfAbhWDBvJFIwqOTLJzAjmzSepOSQ8iaJerIOMGBQQDYIc+H c0PuTq04Xuoc17sdVI0pOeRl/irAMsYpRIzlCag+FeR92evRsX06G8diegO3Lw6H IXsOkXdfA/lnAaeaZR8TiPG8XcUcEyYAKohY4n84McaBlJOhrQHTLW2Mi3Ne2cLc fUhzWmko6I+fh1ZNmScUbbzgqqojI6HiXyTqOcZwQ9IHOX3/9bYl3yOZK//NA6h8 YYngTbGVYU+Gsa0Oiv44kqxnzpomZoD0MT3yU9yctxe+2n/Fc4Cv/YxmYRF3xJgA U/mWhcU1qWuRtkqaf1IBJUpCxNa+Q== Received: from sn4pr2101cu001.outbound.protection.outlook.com (mail-southcentralusazon11012022.outbound.protection.outlook.com [40.93.195.22]) by m0384305.ppops.net (PPS) with ESMTPS id 4gu9cq427b-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:50:55 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ep8729asQULUHx5ve28Fr9V3RLR6iP+f7PN8kxAXd4lZ1PpLeXmpEIPDEk6ac1fMf4+5MC/roQYq1s/m5EzgWx47TOspsHYnj2GydEw9IM7K4zf8QGehknYL++GI19cnVgyY/FtzDGLHxqIrp70Nx4BI50T5yU+GCqEwC73qnuEPFtyZ9SHPNp1Vhv3rZ8SuFsdbU5ZyCGrX6H1goTWK1I8L6dUUPJlQsbrhrK5YuyqwHs/7eKcJx8831UvQQC45VoXISGLD3AcWiqMVM5kNtJWzc/0qdragDnrwAa2Yk4zjZZqDVZsqnxcNkK73/Ve/UIBpy1aBTNHMrrFFJQifaQ== 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=6KMgOuSNuX7xG1qKd4LXi4iRk6iS/SzCWjZhnQvpCB0=; b=rPqhyQmLbNYBSxtiXfHPUwuAQTT4xNySBfWuJghmlsj7K8SRDVu3OC33qU/iwZ3udfH2hrDe8KXKUAYgE8wrqNmnrpvpZD9HTcp9NShtqnXKFGwlDOtt+cJhBCB0Ga1vVPAujo08x3Qep/2csARXgvH94DCCTMqnX4Rz4kRzl/4/TlNrW209CAoHNRtaVX0kTpg6NhfTfXlDw2Zk65Z0/V/YBrM45NPv2xX5Jc8uBnJ7gFwdIpTcXzRvZv2HinEn/OZ1wpR027Jzqaviqzns4IWtS7djBP2ErVWjZ2f2UR/by5dgzHOdMbuN6GG3gwlLBTj+tZhAg6CsxkudR/swyg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.23.194) smtp.rcpttodomain=nxp.com 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=6KMgOuSNuX7xG1qKd4LXi4iRk6iS/SzCWjZhnQvpCB0=; b=vRnVWh6An4AsjU6pij675XtWRyuiWHReft64xU2kEnJVYSilVWQxiH6uF3Z/kIJ0DBwOq6HJbclEpOejt2EUHa6l1x5uw+DrknY3+QJThlNeDAAhB9CAHa1TywQ8aMTpkxDkVUA47yltKUh5RNSgqdIQdkPMiahf4NoyHIISfbo= Received: from CY5PR17CA0051.namprd17.prod.outlook.com (2603:10b6:930:12::6) by SA1PR10MB7740.namprd10.prod.outlook.com (2603:10b6:806:3af::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.13; Tue, 22 Sep 2026 06:50:50 +0000 Received: from SJ5PEPF00000204.namprd05.prod.outlook.com (2603:10b6:930:12:cafe::1b) by CY5PR17CA0051.outlook.office365.com (2603:10b6:930:12::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.14 via Frontend Transport; Tue, 22 Sep 2026 06:50:48 +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 SJ5PEPF00000204.mail.protection.outlook.com (10.167.244.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:50:48 +0000 Received: from DLEE204.ent.ti.com (157.170.170.84) 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.45; Tue, 22 Sep 2026 01:50:22 -0500 Received: from DLEE202.ent.ti.com (157.170.170.77) 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.45; Tue, 22 Sep 2026 01:50:22 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DLEE202.ent.ti.com (157.170.170.77) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:50:22 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI443626771; Tue, 22 Sep 2026 01:50:18 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 12/19] drivers: soc: ti: k3-ringacc: handle absence of tisci Date: Tue, 22 Sep 2026 12:17:36 +0530 Message-ID: <20260922064902.2719979-13-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF00000204:EE_|SA1PR10MB7740:EE_ X-MS-Office365-Filtering-Correlation-Id: 7da3adef-f4c8-46a8-9c5d-08df1875d58a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700016|23010399003|7416014|376014|10067099003|56012099006|6133799003|22082099003|18002099003|921020; X-Microsoft-Antispam-Message-Info: 7nqCqKATs0nEiaesqdk/Vhy5EyT3t3EmGq3QN1cpSlIP/ETX3IrJbO1grmfNxDDxvkXDO6nkFoZjrZOLC0i+TZ0JmAdmSQs2Cigjs9Be9NgRJg/LMLhM0q+wgEQQ6oQVdz3FV0Sq9o6pKgLGjJ1D2ZEkM8+0k6dQdho3rEzxcwyuHpH/DfSXyia1N3Yb4IRvMYwbg3sSptbsKdqSpYkdv862YP75Pwac0owEaZMOtu+CDh8o/Pgu56RY1eqR3cfhEzUMyz2zSVQw/w2YxCfUdBocDCWl2pjLA3AEI6PEEI+lbiBnnhIWhCLHSJwwp0PCEwsnj5/A5hdX2Gs6xUZtDgLQbGsCPKBSI135M3pCZr+i+TL50916XA9Q0FbEqyntMbJI7O22DBkYJmpfqr899xAMVwLm6cRPF6w1VYF6QLSOOVQ9rDtPbFIze/KWuMOeTXVAtMwwZ4XSPAEc/lheJSuvMx3SpxHErj/Mhx0FdHcKgYJhOL6Ca41lqIPGCWx5hkItOTMCqXOI58khXvgapfnB+aowFWitBa+XQNoZ9LQVaYTDJp5eUfhCyWowfDBFUwArbdhks2FoSDTg9cSCKuMDRi3/ulHQFzpN5EwXdvVAVIUNsisMsTsKfDS7L2nKDu8LVR1gggd61EZzL67kc3adSlNfyUXf9jK90Y8qWYAw4xEhA811pdxgC03SbOEFHVCJpAt4842g9dOaDxrG0cCbw2Tg//HUCXAmStGYwB2UlMQgo/nic4hBXPPBE+7H 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)(82310400026)(1800799024)(36860700016)(23010399003)(7416014)(376014)(10067099003)(56012099006)(6133799003)(22082099003)(18002099003)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8g/Dr9BkMX/JjoBxSTED55x/ElF4MUxwVRs44haat3N5DltQ+ek7Bi4wKQngQHTwy2FxN+iivL9ddS1eFyY8RLp4sUTbjLB+d1IeST0Rk1GL6uPOtfOiy4eo0URxiFyaRskuZKL6qwsIijg5yG1ekIj07ooXjlzGnRDetC3nDfk23HqCuc3+balDBDr5gPKMnuIXD0IZSqkodAN1WWDMiPDUiEgvsLBaeSUo+lqZMIXkm9LWxmvluSXBjGbhXUeLqNMTH9FkqCibdBjIdUElcm3XnrT8SyPG55uC/rQwWVRMnzu83DocA+VjXabMMxwDQVmgxKN1ojMPByrO+bX6f7Vgh7rt/h69LEgYprwUhUzopNt4mTKn3aU9Po9/dI6MbeZJyeFvHDNQyAdLiPqXfEVCEa2xkDj9TKYQofSzy20Gx0HKsVDLzLJRzXwifkxO X-Exchange-RoutingPolicyChecked: ItAPbyE/xdMB3SzpU5j+a+kJ8qoZ9nuTL1LCLSMRoDBz6J+EFCg3XXg/l0/u85Ft4qjyZcAKI3im/85MYl0rB0lRpx+yBxsYeqpvSxQibicUeBsrJB8xBZVrqAyDx3O4JXYqG+UCXG/LAZSPJXBJqQjdZDcCpZ/WRoO4D59erWkNQ+A83TSZN6d/stRcKNDnZVGJsAsCSxepfdfbPKyQgcnbutBmcnrxdyrnR4v9KqUTcjzImHOOPAoF2extCT9w7k/KOT5eKND6hJMkg2YSazUhZvsjoN15a6Y8lsafFn3rPPvNOMen2D+28z0qfdYFf4v6XZiYOrGfFDqqC9OQ6g== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:50:48.1395 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7da3adef-f4c8-46a8-9c5d-08df1875d58a 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: SJ5PEPF00000204.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB7740 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX7ogQDsRIV3GU s4wWU7aj9gEnoVyUiz2QPjGU5c5hSXGjwnZ4u91YrZzqj/cOq9k+wXBQyOfZkK9wCcBHcOMnkUx 0yImjUC/eigLS8pPGE0IGeG0zkcpR/s= X-Proofpoint-GUID: caTyY-N2CbXvooMZ1xANoG8M-nOIs18O X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX9UIJHir4EQ5z mUao/Zyefz2t7kRRsJeKWxRFkDFSF87AbSDjIotVRSazKhX9MlijL0plLkRI7Bbg+P5GghB49J1 Y+hAq46XujcVhpMq0eCA3bFWyL5dNVXk4v03y2q95SpNRcUtE3cHYgOOx0S3ktrV7lk4tTSr/Wz oUV9yuRELHHaTzRIi1TZmjOlBR5WMXLodL9p22y/kjP5qWgYP49Hoi4LSYpKhH/9iBoPGjRbdao jOxS/Q8ccNxh2J0QjxFkZj+q0USrjsRggTWn6vep5WrMtqdoQYnLDntkIvLVMVuaFsNMgtaWmIo aw3v8KPsYsk5C5D251mN8zSOnzk7u4Ov3v3wZqCQoMHWoVCUPJFOk0E5NjCaPOM2Qoft4rROAWD ACoJyM3ooA9z04Du0g6cWG8ewYqnJXlWt4yDj8yhbbZ9tckyH3f9mXkrnuxLsgnIU5gugoo8A5m Bd+h7GyWxrAXDVk4YuA== X-Proofpoint-ORIG-GUID: caTyY-N2CbXvooMZ1xANoG8M-nOIs18O X-Authority-Analysis: v=2.4 cv=X+PHu2Te c=1 sm=1 tr=0 ts=6ab2254f cx=c_pps a=YSkC1VwTRJCIXQXpGgeI2Q==:117 a=WotqVVQAdb04rnGuttW3Kw==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=s63m1ICgrNkA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=taLDd7a_hP9WKsMzeGRc:22 a=sozttTNsAAAA:8 a=AlZmxT5CGg0Uo3zr_lEA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 adultscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 spamscore=0 suspectscore=0 lowpriorityscore=0 phishscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220097 Content-Type: text/plain; charset="utf-8" Handle absence of tisci with direct register writes. This will support platforms that do not have tisci firmware like AM62L. Signed-off-by: Sai Sree Kartheek Adivi --- drivers/soc/ti/k3-ringacc.c | 177 ++++++++++++++++++++++++++---- include/linux/soc/ti/k3-ringacc.h | 18 +++ 2 files changed, 176 insertions(+), 19 deletions(-) diff --git a/drivers/soc/ti/k3-ringacc.c b/drivers/soc/ti/k3-ringacc.c index 5966db4327b13..0ef07207e1dfa 100644 --- a/drivers/soc/ti/k3-ringacc.c +++ b/drivers/soc/ti/k3-ringacc.c @@ -7,6 +7,7 @@ =20 #include #include +#include #include #include #include @@ -46,6 +47,53 @@ struct k3_ring_rt_regs { u32 hwindx; }; =20 +#define K3_RINGACC_RT_CFG_REGS_OFS 0x40 +#define K3_DMARING_CFG_ADDR_HI_MASK GENMASK(3, 0) +#define K3_DMARING_CFG_ASEL_SHIFT 16 +#define K3_DMARING_CFG_SIZE_MASK GENMASK(15, 0) + +/** + * struct k3_ring_cfg_regs - The RA Configuration Registers region + * + * @ba_lo: Ring Base Address Low Register + * @ba_hi: Ring Base Address High Register + * @size: Ring Size Register + */ +struct k3_ring_cfg_regs { + u32 ba_lo; + u32 ba_hi; + u32 size; +}; + +#define K3_RINGACC_RT_INT_REGS_OFS 0x140 +#define K3_RINGACC_RT_INT_ENABLE_SET_COMPLETE BIT(0) +#define K3_RINGACC_RT_INT_ENABLE_SET_TR BIT(2) + +/** + * struct k3_ring_intr_regs { + * + * @enable_set: Ring Interrupt Enable Register + * @resv_1: Reserved + * @clr: Ring Interrupt Clear Register + * @resv_2: Reserved + * @status_set: Ring Interrupt Status Set Register + * @resv_3: Reserved + * @status: Ring Interrupt Status Register + * @resv_4: Reserved + * @status_masked: Ring Interrupt Status Masked Register + */ +struct k3_ring_intr_regs { + u32 enable_set; + u32 resv_1; + u32 clr; + u32 resv_2; + u32 status_set; + u32 resv_3; + u32 status; + u32 resv_4; + u32 status_masked; +}; + #define K3_RINGACC_RT_REGS_STEP 0x1000 #define K3_DMARING_RT_REGS_STEP 0x2000 #define K3_DMARING_RT_REGS_REVERSE_OFS 0x1000 @@ -139,6 +187,8 @@ struct k3_ring_state { * struct k3_ring - RA Ring descriptor * * @rt: Ring control/status registers + * @cfg: Ring config registers + * @intr: Ring interrupt registers * @fifos: Ring queues registers * @proxy: Ring Proxy Datapath registers * @ring_mem_dma: Ring buffer dma address @@ -158,6 +208,8 @@ struct k3_ring_state { */ struct k3_ring { struct k3_ring_rt_regs __iomem *rt; + struct k3_ring_cfg_regs __iomem *cfg; + struct k3_ring_intr_regs __iomem *intr; struct k3_ring_fifo_regs __iomem *fifos; struct k3_ringacc_proxy_target_regs __iomem *proxy; dma_addr_t ring_mem_dma; @@ -467,15 +519,37 @@ static void k3_ringacc_ring_reset_sci(struct k3_ring = *ring) struct k3_ringacc *ringacc =3D ring->parent; int ret; =20 - ring_cfg.nav_id =3D ringacc->tisci_dev_id; - ring_cfg.index =3D ring->ring_id; - ring_cfg.valid_params =3D TI_SCI_MSG_VALUE_RM_RING_COUNT_VALID; - ring_cfg.count =3D ring->size; + if (!ringacc->tisci) { + u32 reg; =20 - ret =3D ringacc->tisci_ring_ops->set_cfg(ringacc->tisci, &ring_cfg); - if (ret) - dev_err(ringacc->dev, "TISCI reset ring fail (%d) ring_idx %d\n", - ret, ring->ring_id); + if (!ring->cfg) + return; + + reg =3D readl(&ring->cfg->size); + reg &=3D ~K3_DMARING_CFG_SIZE_MASK; + writel(reg, &ring->cfg->size); + + ret =3D readl_poll_timeout(&ring->cfg->size, reg, + !(reg & K3_DMARING_CFG_SIZE_MASK), + 1, 100); + if (ret) + dev_err(ringacc->dev, "ring %d size clear timeout\n", + ring->ring_id); + + reg =3D readl(&ring->cfg->size); + reg |=3D ring->size; + writel(reg, &ring->cfg->size); + } else { + ring_cfg.nav_id =3D ringacc->tisci_dev_id; + ring_cfg.index =3D ring->ring_id; + ring_cfg.valid_params =3D TI_SCI_MSG_VALUE_RM_RING_COUNT_VALID; + ring_cfg.count =3D ring->size; + + ret =3D ringacc->tisci_ring_ops->set_cfg(ringacc->tisci, &ring_cfg); + if (ret) + dev_err(ringacc->dev, "TISCI reset ring fail (%d) ring_idx %d\n", + ret, ring->ring_id); + } } =20 void k3_ringacc_ring_reset(struct k3_ring *ring) @@ -501,6 +575,9 @@ static void k3_ringacc_ring_reconfig_qmode_sci(struct k= 3_ring *ring, ring_cfg.valid_params =3D TI_SCI_MSG_VALUE_RM_RING_MODE_VALID; ring_cfg.mode =3D mode; =20 + if (!ringacc->tisci) + return; + ret =3D ringacc->tisci_ring_ops->set_cfg(ringacc->tisci, &ring_cfg); if (ret) dev_err(ringacc->dev, "TISCI reconf qmode fail (%d) ring_idx %d\n", @@ -576,10 +653,25 @@ static void k3_ringacc_ring_free_sci(struct k3_ring *= ring) ring_cfg.index =3D ring->ring_id; ring_cfg.valid_params =3D TI_SCI_MSG_VALUE_RM_ALL_NO_ORDER; =20 - ret =3D ringacc->tisci_ring_ops->set_cfg(ringacc->tisci, &ring_cfg); - if (ret) - dev_err(ringacc->dev, "TISCI ring free fail (%d) ring_idx %d\n", - ret, ring->ring_id); + if (!ringacc->tisci) { + u32 reg; + + writel(ring_cfg.addr_lo, &ring->cfg->ba_lo); + writel((ring_cfg.addr_hi & K3_DMARING_CFG_ADDR_HI_MASK) + + (ring_cfg.asel << K3_DMARING_CFG_ASEL_SHIFT), + &ring->cfg->ba_hi); + + reg =3D readl(&ring->cfg->size); + reg &=3D ~K3_DMARING_CFG_SIZE_MASK; + reg |=3D ring_cfg.count & K3_DMARING_CFG_SIZE_MASK; + + writel(reg, &ring->cfg->size); + } else { + ret =3D ringacc->tisci_ring_ops->set_cfg(ringacc->tisci, &ring_cfg); + if (ret) + dev_err(ringacc->dev, "TISCI ring free fail (%d) ring_idx %d\n", + ret, ring->ring_id); + } } =20 int k3_ringacc_ring_free(struct k3_ring *ring) @@ -670,15 +762,36 @@ int k3_ringacc_get_ring_irq_num(struct k3_ring *ring) } EXPORT_SYMBOL_GPL(k3_ringacc_get_ring_irq_num); =20 +u32 k3_ringacc_ring_get_irq_status(struct k3_ring *ring) +{ + struct k3_ringacc *ringacc =3D ring->parent; + struct k3_ring *fwd_ring =3D &ringacc->rings[ring->ring_id]; + + if (!fwd_ring->intr) + return 0; + + return readl(&fwd_ring->intr->status); +} +EXPORT_SYMBOL_GPL(k3_ringacc_ring_get_irq_status); + +void k3_ringacc_ring_clear_irq(struct k3_ring *ring, u32 status) +{ + struct k3_ringacc *ringacc =3D ring->parent; + struct k3_ring *fwd_ring =3D &ringacc->rings[ring->ring_id]; + + if (!fwd_ring->intr) + return; + + writel(status, &fwd_ring->intr->status); +} +EXPORT_SYMBOL_GPL(k3_ringacc_ring_clear_irq); + static int k3_ringacc_ring_cfg_sci(struct k3_ring *ring) { struct ti_sci_msg_rm_ring_cfg ring_cfg =3D { 0 }; struct k3_ringacc *ringacc =3D ring->parent; int ret; =20 - if (!ringacc->tisci) - return -EINVAL; - ring_cfg.nav_id =3D ringacc->tisci_dev_id; ring_cfg.index =3D ring->ring_id; ring_cfg.valid_params =3D TI_SCI_MSG_VALUE_RM_ALL_NO_ORDER; @@ -689,6 +802,24 @@ static int k3_ringacc_ring_cfg_sci(struct k3_ring *rin= g) ring_cfg.size =3D ring->elm_size; ring_cfg.asel =3D ring->asel; =20 + if (!ringacc->tisci) { + u32 reg; + + writel(ring_cfg.addr_lo, &ring->cfg->ba_lo); + writel((ring_cfg.addr_hi & K3_DMARING_CFG_ADDR_HI_MASK) + + (ring_cfg.asel << K3_DMARING_CFG_ASEL_SHIFT), + &ring->cfg->ba_hi); + + reg =3D readl(&ring->cfg->size); + reg &=3D ~K3_DMARING_CFG_SIZE_MASK; + reg |=3D ring_cfg.count & K3_DMARING_CFG_SIZE_MASK; + + writel(reg, &ring->cfg->size); + writel(K3_RINGACC_RT_INT_ENABLE_SET_COMPLETE | K3_RINGACC_RT_INT_ENABLE_= SET_TR, + &ring->intr->enable_set); + return 0; + } + ret =3D ringacc->tisci_ring_ops->set_cfg(ringacc->tisci, &ring_cfg); if (ret) dev_err(ringacc->dev, "TISCI config ring fail (%d) ring_idx %d\n", @@ -1481,9 +1612,12 @@ struct k3_ringacc *k3_ringacc_dmarings_init(struct p= latform_device *pdev, =20 mutex_init(&ringacc->req_lock); =20 - base_rt =3D devm_platform_ioremap_resource_byname(pdev, "ringrt"); - if (IS_ERR(base_rt)) - return ERR_CAST(base_rt); + base_rt =3D data->base_rt; + if (!base_rt) { + base_rt =3D devm_platform_ioremap_resource_byname(pdev, "ringrt"); + if (IS_ERR(base_rt)) + return ERR_CAST(base_rt); + } =20 ringacc->rings =3D devm_kzalloc(dev, sizeof(*ringacc->rings) * @@ -1499,6 +1633,10 @@ struct k3_ringacc *k3_ringacc_dmarings_init(struct p= latform_device *pdev, struct k3_ring *ring =3D &ringacc->rings[i]; =20 ring->rt =3D base_rt + K3_DMARING_RT_REGS_STEP * i; + ring->cfg =3D base_rt + K3_RINGACC_RT_CFG_REGS_OFS + + K3_DMARING_RT_REGS_STEP * i; + ring->intr =3D base_rt + K3_RINGACC_RT_INT_REGS_OFS + + K3_DMARING_RT_REGS_STEP * i; ring->parent =3D ringacc; ring->ring_id =3D i; ring->proxy_id =3D K3_RINGACC_PROXY_NOT_USED; @@ -1512,7 +1650,8 @@ struct k3_ringacc *k3_ringacc_dmarings_init(struct pl= atform_device *pdev, ring->flags =3D K3_RING_FLAG_REVERSE; } =20 - ringacc->tisci_ring_ops =3D &ringacc->tisci->ops.rm_ring_ops; + if (ringacc->tisci) + ringacc->tisci_ring_ops =3D &ringacc->tisci->ops.rm_ring_ops; =20 dev_info(dev, "Number of rings: %u\n", ringacc->num_rings); =20 diff --git a/include/linux/soc/ti/k3-ringacc.h b/include/linux/soc/ti/k3-ri= ngacc.h index 39b022b925986..4b6ec925e2f2d 100644 --- a/include/linux/soc/ti/k3-ringacc.h +++ b/include/linux/soc/ti/k3-ringacc.h @@ -158,6 +158,23 @@ u32 k3_ringacc_get_ring_id(struct k3_ring *ring); */ int k3_ringacc_get_ring_irq_num(struct k3_ring *ring); =20 +/** + * k3_ringacc_ring_get_irq_status - Get the irq status for the ring + * @ring: pointer on ring + * + * Returns the interrupt status + */ +u32 k3_ringacc_ring_get_irq_status(struct k3_ring *ring); + +/** + * k3_ringacc_ring_clear_irq - Clear the given interrupts + * @ring: pointer on ring + * @status: mask of interrupt status bits to clear + * + * Clears only the interrupt status bits set in @status on the ring + */ +void k3_ringacc_ring_clear_irq(struct k3_ring *ring, u32 status); + /** * k3_ringacc_ring_cfg - ring configure * @ring: pointer on ring @@ -262,6 +279,7 @@ struct k3_ringacc_init_data { const struct ti_sci_handle *tisci; u32 tisci_dev_id; u32 num_rings; + void __iomem *base_rt; }; =20 struct k3_ringacc *k3_ringacc_dmarings_init(struct platform_device *pdev, --=20 2.54.0 From nobody Thu Sep 24 17:02:17 2026 Received: from mx0a-0002e601.pphosted.com (mx0a-0002e601.pphosted.com [148.163.150.75]) (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 4C2114F30EC; Tue, 22 Sep 2026 06:51:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.150.75 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059899; cv=fail; b=YZlpbfLmGRTbRLM/K1N+BC1Fbo2IwxzPQaf+yeL78Ns+ovQRIPhFsAnmXolG5Tf7DP/5Km/JNe5D2rwmNnYRgvFKekhkfVbc2HiciUs6NEE1CJ8m330qf4itX6o+kat1nwNDtK3DuDMakOH0vi8DXDT0psQls4HuZT1vJPMNJq4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059899; c=relaxed/simple; bh=ohB6AyPL1yGPs/XQrk1PoSqa8tTfeiAf7nsFDQnY7WU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mvVFidlUTtlTUvVNnLc9grW8Ky0NEStqXCSZ7V+UxGb2Na2KKMBAZqKveMUYOliT8fGW1uy+1ytmAMa42ShXuVrKJ7r82R/rQH/MrVFj/7tWfp/ur9LLWfd21FkF00enmg9uli9DxI6pj3LbVh/4d94SpW8Wgi5iPh7BkrQ0vKY= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=jeFg629t; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=ffuzFvFg; arc=fail smtp.client-ip=148.163.150.75 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="jeFg629t"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="ffuzFvFg" Received: from pps.filterd (m0384305.ppops.net [127.0.0.1]) by m0384305.ppops.net (8.18.1.11/8.18.1.11) with ESMTP id 68M5BSfO2149820; Tue, 22 Sep 2026 01:51:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=sOa2U5ZSaBR2ea/MCYm95KDZuvR6EJKU/8kMxBPtU yI=; b=jeFg629tkLoJ8cpYf9lgGue40twa+oKWaYkwQNjs2FVHcFPxnmLzEzfJ6 8K8PhX0Z7D62l53Aq/N3G7KgK/59mAt/RLaovvVxDlxSx4ROalxChvGOJBuhlKGA A12XKgQcighghZa54uiyJQ9A5la+A8jCKeGC4R1corS3KizAdXcy6ye5yjhvVz2v V8nI3mkSOTUggj1qfvE437CRTPiAyvKm+VnF6RL9KG4ti9PJIlsEJenklelfhVio iRzMu+Y8ES7owZpIFc8JmKdBS2dg49VxNLu0Vt0TLiDFSme21m8kEZenbBSlvNs6 xxUIpiW8OCGbHtTVT7G40+9g+6FSA== Received: from ph7pr06cu001.outbound.protection.outlook.com (mail-westus3azon11010070.outbound.protection.outlook.com [52.101.201.70]) by m0384305.ppops.net (PPS) with ESMTPS id 4gu9cq429j-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:51:22 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oanfMRWZr5m9ew4nuFfU2JsYK85ko88J2S7uDqxk+LckQm7RCoKjcmuvn+xXzrtUx35gONkMp11VoJCciWPxJgoDYXnuVGQvkfrIEXSsfuDcYDz86Ag9B3wH/+Bx1mMmdX3V4p9LJyYE9gSllaOybkV/3ZonNvKeJtErTMjwhJiXHE1Gh/sr6h6qjPKdL1Yuad7bgVelXZNc6qx4FmJ7y1aZZOB1EFtCyFFZ+wSFoaQYuqVTntXJ8pr7dxh5NScjCOs6JFJ13FDGMo46Nk/9qGiybPr3L+cM8OwLq5Y0llz0r48j0I7adl5qBQL4wbzrkvZInY7CnIpV4HQp8psDyw== 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=sOa2U5ZSaBR2ea/MCYm95KDZuvR6EJKU/8kMxBPtUyI=; b=Ea+pHyzZIbc2OACRpraaVfjJpk/fkwGXYkF3Gohlax1QGz+Tk0KhgdLF/G3jgFfBgrlVMSCv+uuErhyIRXCPYvokgPVMNZIZs5PaogRzRQvVia/sOzb0FY4PEioQaj90ouSvYLNFYnpZfM7aWB9sDchNIkqUZWbLkZHtv4TEfTAdMWH+0ruIG1MzAwKPyImGpymFo/GflMVorCP+UzvAs5Z8DVNyWEQEdMGjaHJm3n9pTwcv/+QNujefILvzDfZSebbuA31Y+Qm+02AblNVjbhXTAT3ddnEhdRerRjTqwGrLJozuUpXPghIjfTeEAPMdLssgZXcCpo79Jzh1R4Mf4Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.21.194) smtp.rcpttodomain=nxp.com 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=sOa2U5ZSaBR2ea/MCYm95KDZuvR6EJKU/8kMxBPtUyI=; b=ffuzFvFg9jQ9mmsuPz3AESTMfe8GSjA7rR9NAT2Q7LqgOWT0g3IqV4m1SFhIAgKwq4SQySKs+3ozYbgFdLfw8f4qZYD7BuQ1XSXDMXY5YV/xBZUGKoveYgtLg89VxSIUya1MJbHBt4RwMAAN8UMT3epbb/ZviOS+ZgC2YVFoPMc= Received: from BN9PR03CA0864.namprd03.prod.outlook.com (2603:10b6:408:13d::29) by CY8PR10MB6660.namprd10.prod.outlook.com (2603:10b6:930:52::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.13; Tue, 22 Sep 2026 06:51:18 +0000 Received: from BY1PEPF0002695D.namprd05.prod.outlook.com (2603:10b6:408:13d:cafe::23) by BN9PR03CA0864.outlook.office365.com (2603:10b6:408:13d::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.428.16 via Frontend Transport; Tue, 22 Sep 2026 06:51:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 198.47.21.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.21.194 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.21.194; helo=flwvzet200.ext.ti.com; pr=C Received: from flwvzet200.ext.ti.com (198.47.21.194) by BY1PEPF0002695D.mail.protection.outlook.com (10.167.244.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:51:15 +0000 Received: from DFLE210.ent.ti.com (10.64.6.68) by flwvzet200.ext.ti.com (10.248.192.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:27 -0500 Received: from DFLE209.ent.ti.com (10.64.6.67) by DFLE210.ent.ti.com (10.64.6.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:27 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DFLE209.ent.ti.com (10.64.6.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:50:27 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI453626771; Tue, 22 Sep 2026 01:50:23 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 13/19] dt-bindings: dma: ti: Add K3 BCDMA V2 Date: Tue, 22 Sep 2026 12:17:37 +0530 Message-ID: <20260922064902.2719979-14-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PEPF0002695D:EE_|CY8PR10MB6660:EE_ X-MS-Office365-Filtering-Correlation-Id: e3caaab3-f108-4fc8-1627-08df1875e5e9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700016|23010399003|376014|82310400026|7416014|13003099007|921020|6133799003|3023799007|56012099006|22082099003|10067099003|18002099003; X-Microsoft-Antispam-Message-Info: W/f2fQHBuUOyzoxPqyWtOoptOQ+UYJw1S2B1XC0MFyA5qsrAt23rM3PYm32PX9scj1adlHl0hqvQNTkOirIpm+YtnwEPpQEcEfmB88/IAJlY1KgE0U8CpqUWhK0N8xvxD9izcek/MJA6pFORG3FcJD1vVYWpHadVvI+z+syHQzlREksvXCVk2lfKP4xmA9FdO89aneY3zLzZ78CuD+iWucSUGoKqSDYsCn+V08pzVsZCLlIQT5eN56fwld4Aqd5Mke9BWUHR2kHQ0sMRbPS6FCxaADQ50KoTMjCLYCRdTaJpqGpe1/y65lwCcGQZWA5KBz8ooCDvuu38Y4jn5B/Xq3C/Qxlud+hW6oiAEmczZ9y1Wvwqxs1rK2hw5zR8mQs6T6J57i0vITrPDnz8Tb5v067NmK0g0YPtsjh2n4a1diLrD0wd9489CT4YrxH3X+agU3IDxG2FWJmojRpAP70Hn5rSkv6oLhBmVj/KmimMlojN4vkENcUyhyQn9lQSUJ+TyiHBjZSSmaQYRszTwofu0cToBegjB0kYY9nemYqcJKFZaUyKVs+Vce5z+r8z554HASuBZlH0LBtH5BcgKH9MKi7h+hcLpS/s4+WwgM/u4iOO/Zx3nx9mqw1iCvWNkNK6MUUro2Wr4LmTdxy5TN5qmDO0jVTxUmkc7xdcQb4WiRGDhBBd6W7lntHBIAoDmu+wRN11Zyq7EyrQ74z0YHnlMw== X-Forefront-Antispam-Report: CIP:198.47.21.194;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:flwvzet200.ext.ti.com;PTR:ErrorRetry;CAT:NONE;SFS:(13230040)(1800799024)(36860700016)(23010399003)(376014)(82310400026)(7416014)(13003099007)(921020)(6133799003)(3023799007)(56012099006)(22082099003)(10067099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3aweATV1LDbO9fE3pvHG+zqoOlDKJ59U5JOb5N00EmTEyyLQzLzSM8y3RqcBieKBaPAYp82vDCK4QB99uTzIJj/WUzHF6ju55lveW3dH8OHUxdVGIH4Z/p+GA4zw7y7X2Jx6bxtKK1mQMonabt+GY046nOUFhH96zUJaO3V+oszoIZsYHKB09DuoYvxPLYyyFzFAuTsgtT6orrGRc+1z17Bl81iNe3zYNAIMkD604cGybsH3pr4xaAQacGqEv4F/7KqBdb8H9pg9fefsaBB13SVQQPjq8WcPZOmPA+zsttL2H2MigI2rZ5l9w2bXsgt/Y9Gz+lmTLm0gd/J0roxt3R0RsqybOMiOlwW3MfwJoVv+ZIqg2nyFlWksdADFe261YxMHAO5B0cZs/Xti1eMc33yCyP+vsVUhilk9zF5rvIpDZJs/V6dQXM1/QPdhYcmG X-Exchange-RoutingPolicyChecked: PGRhVU5NlxVRtwy0MlDkdJPM3QEQ4YfwAMxppvG7p6wsHPgcX2nh+2/BvXDWcuSNxRclvSuLwzHJC+rvoOyVxzwyewfiV9ANG+Z+oiZCttPP6izvNJpEHF5RTETwbIyXD+G1NYc4tqf/uz1LbRk3yWt+MaaYc9G2TAdw6tofVvOPOjSoMQ5HxK0JpShibD8mtPkWHd08SpiOJXfWBmNCdNr4STmwb8Lr0wXRW/cmFOeICaMDcy8OPpJ/ulbI9I0zJy/SovV/pEY6uW6ZdPXF5W+Yu69sVWjUQmjVUHGw7EzIBpQLt4DYjda78pWK0lcD1YKnZgOelAVNfS0UR6+pfA== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:51:15.6098 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e3caaab3-f108-4fc8-1627-08df1875e5e9 X-MS-Exchange-CrossTenant-Id: e5b49634-450b-4709-8abb-1e2b19b982b7 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e5b49634-450b-4709-8abb-1e2b19b982b7;Ip=[198.47.21.194];Helo=[flwvzet200.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: BY1PEPF0002695D.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6660 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX1axtZFqrPd4j XQwPqH5P8fZ5+sWvC0OB6U2W+x8VWLa07NEZsGmlBNKcs5CTLGRMrGKTeV7Fkge+a4o04ox1Qts yGIj0UW70lEpXv/+X6HfuKh3OhdTmdk= X-Proofpoint-GUID: 7MolDwmRulPsxtnmBVGKjiHUHyucUi0C X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX2eJRB8Q5N6bZ N9R9dTS1I1l3MjlWbRpst4UdWQVXIE8IW+gtazRHhNxJZFM1ytdk0fg6xJgrK20XxeDh1jjKFpr T78l9Wjzu59j7oUW5BiRJY2aywfhCz/kPA5eo1ZbaqkQtXtiYrzHcVHLScPVeSLAZCksqGu2rE3 AA9US/F2DqTriQnPxzTpmj7WJnzzLbIPrxuNm7dnBZAv9e5XNe5arthKckUUeV3DyO/jDI2RT7t 3D25JxMi2GiPr6iQ3VHA9jNYiInVYNqmt/f4cznYjk7wThjzu2qsjJp0od37UVmxHOdBj6YzJTU e7xeSESQmX1I71ZC8Iaxa+aoq7m8CFmYE/C5uwi0yXK4xvY0ELAq1VQrYS8Iqasg0N1WGbBGi6p Cphvs9CLpiXiiTHb26rKaCfBGiDZ429d0lTN6k+Snpmf7hVmwLkR5IAqUrhI7rf4jZ6vgVc1leE 2S0RM9yAxlgHUYewRpw== X-Proofpoint-ORIG-GUID: 7MolDwmRulPsxtnmBVGKjiHUHyucUi0C X-Authority-Analysis: v=2.4 cv=X+PHu2Te c=1 sm=1 tr=0 ts=6ab2256a cx=c_pps a=RGUNHxVObgwraRyadLFC+w==:117 a=iwqwCZQqcuTv3JOpYdM7/Q==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=taLDd7a_hP9WKsMzeGRc:22 a=gEfo2CItAAAA:8 a=sozttTNsAAAA:8 a=EUspDBNiAAAA:8 a=6W6IBMoaatw3SABbmX8A:9 a=sptkURWiP4Gy88Gu7hUp:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 adultscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 spamscore=0 suspectscore=0 lowpriorityscore=0 phishscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220097 Content-Type: text/plain; charset="utf-8" New binding document for Texas Instruments K3 Block Copy DMA (BCDMA) V2. BCDMA V2 is introduced as part of AM62L. Signed-off-by: Sai Sree Kartheek Adivi Reviewed-by: Krzysztof Kozlowski --- .../bindings/dma/ti/ti,am62l-dmss-bcdma.yaml | 211 ++++++++++++++++++ 1 file changed, 211 insertions(+) create mode 100644 Documentation/devicetree/bindings/dma/ti/ti,am62l-dmss-= bcdma.yaml diff --git a/Documentation/devicetree/bindings/dma/ti/ti,am62l-dmss-bcdma.y= aml b/Documentation/devicetree/bindings/dma/ti/ti,am62l-dmss-bcdma.yaml new file mode 100644 index 0000000000000..76184485ebcba --- /dev/null +++ b/Documentation/devicetree/bindings/dma/ti/ti,am62l-dmss-bcdma.yaml @@ -0,0 +1,211 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (C) 2026 Texas Instruments Incorporated +# Author: Sai Sree Kartheek Adivi +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/dma/ti/ti,am62l-dmss-bcdma.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Texas Instruments K3 DMSS BCDMA V2 + +maintainers: + - Sai Sree Kartheek Adivi + +description: + The BCDMA V2 is intended to perform similar functions as the TR + mode channels of K3 UDMA-P. + BCDMA V2 includes block copy channels and Split channels. + + Block copy channels mainly used for memory to memory transfers, but with + optional triggers a block copy channel can service peripherals by access= ing + directly to memory mapped registers or area. + + Split channels can be used to service PSI-L based peripherals. + The peripherals can be PSI-L native or legacy, non PSI-L native peripher= als + with PDMAs. PDMA is tasked to act as a bridge between the PSI-L fabric a= nd the + legacy peripheral. + +allOf: + - $ref: /schemas/dma/dma-controller.yaml# + +properties: + compatible: + const: ti,am62l-dmss-bcdma + + reg: + items: + - description: BCDMA Control & Status Registers region + - description: Block Copy Channel Realtime Registers region + - description: Channel Realtime Registers region + - description: Ring Realtime Registers region + + reg-names: + items: + - const: gcfg + - const: bchanrt + - const: chanrt + - const: ringrt + + "#dma-cells": + const: 4 + description: | + cell 1: Trigger type for the channel + 0 - disable / no trigger + 1 - internal channel event + 2 - external signal + 3 - timer manager event + + cell 2: parameter for the trigger: + if cell 1 is 0 (disable / no trigger): + Unused, ignored + if cell 1 is 1 (internal channel event): + channel number whose TR event should trigger the current channel. + if cell 1 is 2 or 3 (external signal or timer manager event): + index of global interfaces that come into the DMA. + + Please refer to the device documentation for global interface in= dexes. + + cell 3: Channel ID for the peripheral + This is the mapped_channel_id assigned to the peripheral in the PS= I-L + endpoint map. For XYMF peripherals (SPI, CRC32) each chip-select/F= IFO + has a distinct channel ID; use the channel ID for the specific + direction and chip-select being requested. Use 0 for triggered + block-copy channels (cell 1 !=3D 0). + + Please refer to the device documentation for the channel map. + + cell 4: ASEL value for the channel + + interrupts: + maxItems: 75 + description: + Interrupts for DMA channels. + + interrupt-names: + minItems: 75 + maxItems: 75 + items: + pattern: "^chan([0-9]|1[0-3]|1[6-9]|2[0-9]|3[0-9]|4[0-7]|4[89]|5[0-3= ]|6[4-8]|8[01]|12[89]|13[0-9]|14[0-3])$" + description: + The name of the interrupt corresponding to the DMA channel. + +required: + - compatible + - reg + - reg-names + - "#dma-cells" + - interrupts + - interrupt-names + +unevaluatedProperties: false + +examples: + - | + #include + #include + + dma-controller@485c4000 { + compatible =3D "ti,am62l-dmss-bcdma"; + reg =3D <0x485c4000 0x4000>, + <0x48880000 0x10000>, + <0x48800000 0x80000>, + <0x47000000 0x200000>; + reg-names =3D "gcfg", "bchanrt", "chanrt", "ringrt"; + + #dma-cells =3D <4>; + + interrupts =3D , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-names =3D "chan0", "chan1", "chan2", "chan3", "chan4", + "chan5", "chan6", "chan7", "chan8", "chan9", + "chan10", "chan11", "chan12", "chan13", + "chan16", "chan17", "chan18", "chan19", + "chan20", "chan21", "chan22", "chan23", + "chan24", "chan25", "chan26", "chan27", + "chan28", "chan29", "chan30", "chan31", + "chan32", "chan33", "chan34", "chan35", + "chan36", "chan37", "chan38", "chan39", + "chan40", "chan41", "chan42", "chan43", + "chan44", "chan45", "chan46", "chan47", + "chan48", "chan49", "chan50", "chan51", + "chan52", "chan53", "chan64", "chan65", + "chan66", "chan80", "chan81", "chan67", + "chan68", "chan128", "chan129", "chan130", + "chan131", "chan132", "chan133", "chan134", + "chan135", "chan136", "chan137", "chan138", + "chan139", "chan140", "chan141", "chan142", + "chan143"; + }; --=20 2.54.0 From nobody Thu Sep 24 17:02:17 2026 Received: from mx0a-0002e601.pphosted.com (mx0a-0002e601.pphosted.com [148.163.150.75]) (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 C21724F5DF0; Tue, 22 Sep 2026 06:51:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.150.75 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059915; cv=fail; b=WxC4zNW012MNXF/zlvsnuwHeqtcgd9QCGjUf/w198zahh70fnwu8c9rMS0T/Mysl7BFqsptWUJTp9D5j2WvHPEPiuEm3rtysS//1x8oCXyJ98nLvwNK9PNFFlD7MIXMwkVfeJbySD5qTfs/VE7CVo7VEMyWnCySv/lHUdnfNAww= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059915; c=relaxed/simple; bh=hfx9tyedLuwQpWQzmyhpCVk7zXwPKahSmmir+wIDops=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=duDoR4xI5OKZ13yCwcZSY8pOQhaSUkz0oKUbc0f+i5kQrYfIfyOL0Nrt7HQSqylmyAnqzw2qZWDE7QvhMRJBOhV4WwisUzrbxFLCT4r8KB2AhtBDsckCozPQwI3iopCeTO0x1T27FqYCkVI5fh2q9L9lPM2icxZc7gtYVdHclis= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=pdDsnxvb; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=mg1lYx+j; arc=fail smtp.client-ip=148.163.150.75 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="pdDsnxvb"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="mg1lYx+j" Received: from pps.filterd (m0384305.ppops.net [127.0.0.1]) by m0384305.ppops.net (8.18.1.11/8.18.1.11) with ESMTP id 68M5SuXP2149826; Tue, 22 Sep 2026 01:51:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=oWMlIJVgWFG1s20YaWxHB9JpHlwzpEvZrR2JSB+RB zE=; b=pdDsnxvbGWGSEtyaQ/k7ctDQEd8r0Jq9v04RZ38prW8S+0HXcme+pF8/x nOCjzQzzITx3d9bsQZ0rd6kBkJvjWOeu9azFMH371Yba19OysJc5OQN9JcoXjEtG BsMeiA7tcrDycjEb3Txmr3IGvAe50CGBavgTRT9qOW5sgEmbI5d2WADLJ3pt13GX uxeTFrWhbjKac0aw3PCBpxiJczI+rJUQtT9slkQVfyqTUo5QFoqRhj/drJhcfzAP xqeOBuCsFwzPnYjeJ5fwIKKB/q9rNSswaMgg/lh8PlRBAmAv3GYdMxktGDN/hbe6 IKI8D75N0bl4X3ufAElctIhpEcngQ== Received: from ph8pr06cu001.outbound.protection.outlook.com (mail-westus3azon11012049.outbound.protection.outlook.com [40.107.209.49]) by m0384305.ppops.net (PPS) with ESMTPS id 4gu9cq429u-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:51:26 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kTSoE6R902mVBzYN9uFAxs+UCrLvIzhs7BmJRdYQu0DiofcmB37ShK0JVS4GT1f+0VXBOPBruNNJlu2nKwz0BCKwbYgG/8ron31iUH6OkJ9UNY1wA6UwyV3DsFPvOARn1p5xkSesO/9bV9s/L4MPz2KDxrg1FtAVB1yuoGAkhxqav2egwyxwhuEOWcuy1idvjVWsqPTU0ByOyoIjvt50xYwjDeBgEqFWP0qRY6aaZ8flKOEl6BRLIu8ztypqd9vs22wNzpUrIEQgz3HXQh0PQcA6vNVSKKb2a6V2BpTnMpTPlOpQGfA2Au3F1cuYz6KsRtu5EOshFKSWxB6WhWLJqg== 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=oWMlIJVgWFG1s20YaWxHB9JpHlwzpEvZrR2JSB+RBzE=; b=YE4QaTwNntpeOQl4XzTOs43Q+nc9Zh0RiknJqlijzot/e6KYWqqufI1ZLWCIUrc5/L0POthIeDqp+aE4GcfMHalOsKhjNf8Vw3RGk8G7PgXeqEHkq1PnywftTu6/ku80j7Cuoa99065iAdp4EHobfs8Snxsk5HLHxB6QWxCd0mF8ff7buVVnMFbL4kHqWrhXaA9N0CnU5bHaoAOMT8OhfkH5mQOQsCcPdR/E6MW+O6qxJxM8QHC9bcLAPhJdM/rx7NzTEFtpzur7p/v0B3NW1d61CWXZU+ehhGVXR5RZ41uVS6B19JZTSKxy1yDO6FtMVF07+mke8lsDz9lNWLm93Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.21.195) smtp.rcpttodomain=nxp.com 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=oWMlIJVgWFG1s20YaWxHB9JpHlwzpEvZrR2JSB+RBzE=; b=mg1lYx+jnqvGRZRE5BoUisii7yq6cfwKkmpIN3p5/ed7AZ/EwqJTnQ0mTD1bOzWhNJuKXmcx/HtKjc8jdBsjFUk4TqVZGw4objsVwRPBfuTnPOHzBpkSgOP1yzzz60LORhrXRdhgsC/MSbETRqN+Ende5As/tKtnOXtsCPg/gzM= Received: from BYAPR21CA0008.namprd21.prod.outlook.com (2603:10b6:a03:114::18) by CH0PR10MB4987.namprd10.prod.outlook.com (2603:10b6:610:c1::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.13; Tue, 22 Sep 2026 06:51:21 +0000 Received: from CO1PEPF00012E60.namprd05.prod.outlook.com (2603:10b6:a03:114:cafe::ae) by BYAPR21CA0008.outlook.office365.com (2603:10b6:a03:114::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.13 via Frontend Transport; Tue, 22 Sep 2026 06:51:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 198.47.21.195) 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.21.195 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.21.195; helo=flwvzet201.ext.ti.com; pr=C Received: from flwvzet201.ext.ti.com (198.47.21.195) by CO1PEPF00012E60.mail.protection.outlook.com (10.167.249.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:51:18 +0000 Received: from DFLE202.ent.ti.com (10.64.6.60) by flwvzet201.ext.ti.com (10.248.192.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:32 -0500 Received: from DFLE207.ent.ti.com (10.64.6.65) by DFLE202.ent.ti.com (10.64.6.60) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:32 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DFLE207.ent.ti.com (10.64.6.65) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:50:32 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI463626771; Tue, 22 Sep 2026 01:50:27 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 14/19] dt-bindings: dma: ti: Add K3 PKTDMA V2 Date: Tue, 22 Sep 2026 12:17:38 +0530 Message-ID: <20260922064902.2719979-15-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF00012E60:EE_|CH0PR10MB4987:EE_ X-MS-Office365-Filtering-Correlation-Id: 5214f917-52dd-4a38-57d8-08df1875e7e1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|23010399003|376014|7416014|1800799024|36860700016|921020|6133799003|13003099007|18002099003|22082099003|56012099006|10067099003|3023799007; X-Microsoft-Antispam-Message-Info: HLLqkbkunnYGjo81TNDnx7RDOlOv7pGH3eObd/DztnmU3MGLKA+YsD5/rWNx+AD0pPloO7zIbBly5QbWlMizAwkY3Q/Fn5FqvP9qWjJOUBBXzYRvaJGqM2Y+kMUslbOSgLb/JNeqWqCEilPPM+CinUyI4jMTMQKga9xBfPgYD1mWZAHL4QZ+4gbIWL919mS+gi4e1nm6yFOXxekezEfr4RZbwaxfzfi5uIwEXV0xkdJXwlmgujS+6ZMq+BZzs3RJF2CZaU6JWNVcN1vBr0NJ/sS9tbe+J4mxKJeirtf9isUxWJzLKNHlT4ZKH5CRHMLtYlGDz3pBAUo+TXR5MbR9CuAQZnWqwG9WDAgRtwJyZCNwYiV8/obxCaIAp6RbdzFfiZ9gMaBEJLdqmeBYbXJsC0KBXOYIQPOe48RWzuEbn5WvE5gq1flWIUrg0fzbZm7j485AEk3bXZSvJLkYAymOlLmbvphYZGdia1aO7SHH3YQYKWyU/7FaSVyKvgxHR93ntU5X91eAZ+qyjTGKgHJtRaggqeOlDdaF8T0ypzqjRjNoHPcjG2PX5ubvzCh+UeMM9GfBnPywbbaGHZdzyT0U/Tz9z7tLI0Beoiy2ClSb6Sxr2lsdJItj87yw/yoSYhrZzVF8iqhWHBZo33CNV3GFptrY9WR/X6HRh0+QenbRT0H7qvnbhG2T3vGddq6uI5vK X-Forefront-Antispam-Report: CIP:198.47.21.195;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:flwvzet201.ext.ti.com;PTR:ErrorRetry;CAT:NONE;SFS:(13230040)(82310400026)(23010399003)(376014)(7416014)(1800799024)(36860700016)(921020)(6133799003)(13003099007)(18002099003)(22082099003)(56012099006)(10067099003)(3023799007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bVsZaYMRIZbcLFYRMHGzd6HTLhKBx3pT8DL2kk2c+V9w8/wsuGK6L96VDYW63foQqVNF9D/EQD3kyMDxQmiFReSHoi7W/G3+mC1vaJYNhwPB66m0NtofQOgeB+xgEvUtqvpiGN6pQulj0JuCyeQrMqH7taM3kWBh1BwZqn2N1o5JB/vxK8b5YuxeCp8MKidKxBCu80C5Vt+h8Dx3eLWlSxPfkf/SzW7JUHryigVjbikpcP1ecWZP54am5YDTxE6r/eYsMxNAN/i8Nf1NxnG60UI7nfwJS0bu5ck+f8aR+iyj7gkg1vjfrRSHZYDz0FopZRu6avQGZFtjdirdQoJAFoTI1W+3p6gGfWuXx+31XEKiWMw09wgHTJbZ2pClVesK1ZJnNBK6qU0kvqXbLAG+Ig2ZZdZgsX3+mOq36QDLHyFJBnXUyqo7x/scBSC9Ondr X-Exchange-RoutingPolicyChecked: pL0YUKbrrLVpMRr9DCGbVcfJIm8JgLc+Q8YQ2crh//ahV1uaWH+saSsLsOHwgwjmwRsHWvEvFqFnNhZpNCnNYtDS4uhUhxVa8IxlLDa2s4LoISBDhiNlgU1ljRYfvRSDfBhBRjTOS9yidkKs/PYyVCvMPFf3kBBStG/tQqP89D7xqqJiVHVkmFdKcAkb39dQx9y+iAgOYA0wg4p+8VljC5vKxNn/Nl+ZjI2b0mpfB/FHXUWAwW/1LbgYL3jOODuVyLenCuxV35YaGiKUbTwrNOVY8UKINjfQMCA3oe1kwk3b43Mvp/LvBz9nm7hW0lcmLszKNOoyA+EoMDkhwTIWyQ== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:51:18.9093 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5214f917-52dd-4a38-57d8-08df1875e7e1 X-MS-Exchange-CrossTenant-Id: e5b49634-450b-4709-8abb-1e2b19b982b7 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e5b49634-450b-4709-8abb-1e2b19b982b7;Ip=[198.47.21.195];Helo=[flwvzet201.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF00012E60.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB4987 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX110keRT3iT79 lLpLwokSlGN7nGob41cA/SprTsM1pPdLUXz7fjox2gjgj+czsIz0jFvOWCsDlPXudi9NH5BlFEY NsK38gNzIgbWKCxzuzi+kSh6NAFqU5M= X-Proofpoint-GUID: 3-R9zdBfDNwDV7kdBoERd2kNFDhWW6So X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfXxq7cZWHtf8T3 JYkJrtbeBE2fVY+7J+Fd08xGm3lcckfevDwMSJVEN6jCn099ixdYeZqv1R7OzK9Xy1rZlj1mhxi lDwaHmkoWW49o4e5CFtGyOOZLtYeIoP0Czl+IkGF+X/HCWeDmKa05KLGLQqqWni5lrZMKx49UEG dLUd3xPF6PRVrsJLKrFDYpWuEi1rNm5u9pVcnIlbWqRlf2YJZ79caun6EycsEcFKpmVJn/DhOlR qtU+a8lBoSrBbVfFRTCQZtSmx47MyZrvABVhAOuZniTUnJPq0BK/vhnZwnLWSMwoNV3RINvNOU1 2vKnG5SvyU6AsSWayZOzWXGWE31FRN1jLXUK7zlIFdbehiDFxXTiYMTxFiyht23H9mo0jf9q35n drpLwJAqpN5eUKRyaiPwpHdNBP4uIdBb4DhdF8OlfEWTF4BLj7pYJM4gweTSljhtPo7lUztaN92 vEdX/KtBBR8R6823W0w== X-Proofpoint-ORIG-GUID: 3-R9zdBfDNwDV7kdBoERd2kNFDhWW6So X-Authority-Analysis: v=2.4 cv=X+PHu2Te c=1 sm=1 tr=0 ts=6ab2256e cx=c_pps a=NooIwpZNnZK4GOBrdp331w==:117 a=tJyPKKxUohctrY4NYmUjkA==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=taLDd7a_hP9WKsMzeGRc:22 a=gEfo2CItAAAA:8 a=sozttTNsAAAA:8 a=3biYmkHrlXwTjyWc3LcA:9 a=sptkURWiP4Gy88Gu7hUp:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 adultscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 spamscore=0 suspectscore=0 lowpriorityscore=0 phishscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220097 Content-Type: text/plain; charset="utf-8" New binding document for Texas Instruments K3 Packet DMA (PKTDMA) V2. PKTDMA V2 is introduced as part of AM62L. Signed-off-by: Sai Sree Kartheek Adivi --- .../bindings/dma/ti/ti,am62l-dmss-pktdma.yaml | 189 ++++++++++++++++++ 1 file changed, 189 insertions(+) create mode 100644 Documentation/devicetree/bindings/dma/ti/ti,am62l-dmss-= pktdma.yaml diff --git a/Documentation/devicetree/bindings/dma/ti/ti,am62l-dmss-pktdma.= yaml b/Documentation/devicetree/bindings/dma/ti/ti,am62l-dmss-pktdma.yaml new file mode 100644 index 0000000000000..caeacd4cf5ab3 --- /dev/null +++ b/Documentation/devicetree/bindings/dma/ti/ti,am62l-dmss-pktdma.yaml @@ -0,0 +1,189 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (C) 2026 Texas Instruments Incorporated +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/dma/ti/ti,am62l-dmss-pktdma.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Texas Instruments K3 DMSS PKTDMA V2 + +maintainers: + - Sai Sree Kartheek Adivi + +description: + The PKTDMA V2 is intended to perform similar functions as the packet mode + channels of K3 UDMA-P. PKTDMA V2 only includes Split channels to service + PSI-L based peripherals. + + The peripherals can be PSI-L native or legacy, non PSI-L native peripher= als + with PDMAs. PDMA is tasked to act as a bridge between the PSI-L fabric a= nd the + legacy peripheral. + +allOf: + - $ref: /schemas/dma/dma-controller.yaml# + +properties: + compatible: + const: ti,am62l-dmss-pktdma + + reg: + items: + - description: Packet DMA Control & Status + - description: Channel Realtime + - description: Ring Realtime + + reg-names: + items: + - const: gcfg + - const: chanrt + - const: ringrt + + "#dma-cells": + const: 2 + description: | + cell 1: Flow ID for the peripheral + This is the hardware flow index assigned to the peripheral. TX and= RX + flow indices are mixed across the valid range. For XYMF peripherals + (SPI, CRC32) each chip-select/FIFO has a distinct flow ID; use the + flow ID for the specific direction and chip-select being requested. + + Please refer to the device documentation for the flow map. + + cell 2: ASEL value for the channel + + interrupts: + maxItems: 78 + description: + Interrupts for DMA channels. + + interrupt-names: + minItems: 78 + maxItems: 78 + items: + pattern: "^(t|r)x-([0-9]|1[0-3]|1[6-9]|2[0-9]|3[0-9]|4[0-7]|6[4-9]|7= [0-9]|9[6-9]|10[0-9]|11[01])$" + description: + The name of the interrupt corresponding to the DMA flow. + TX flows use the "tx-" prefix, RX flows use the "rx-" prefix. + +required: + - compatible + - reg + - reg-names + - "#dma-cells" + - interrupts + - interrupt-names + +unevaluatedProperties: false + +examples: + - | + #include + #include + + dma-controller@485c0000 { + compatible =3D "ti,am62l-dmss-pktdma"; + reg =3D <0x485c0000 0x4000>, + <0x48900000 0x80000>, + <0x47200000 0x100000>; + reg-names =3D "gcfg", "chanrt", "ringrt"; + + #dma-cells =3D <2>; + + interrupts =3D , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-names =3D "rx-0", "tx-1", "rx-2", "tx-3", "rx-4", + "tx-5", "rx-6", "tx-7", "rx-8", "tx-9", + "rx-10", "tx-11", "rx-12", "tx-13", + "rx-16", "tx-17", "rx-18", "tx-19", + "rx-20", "tx-21", "rx-22", "tx-23", + "rx-24", "tx-25", "rx-26", "tx-27", + "rx-28", "tx-29", "rx-30", "tx-31", + "rx-32", "tx-33", "rx-34", "tx-35", + "rx-36", "tx-37", "rx-38", "tx-39", + "rx-40", "tx-41", "rx-42", "tx-43", + "rx-44", "tx-45", "rx-46", "tx-47", + "tx-64", "tx-65", "tx-66", "tx-67", + "tx-68", "tx-69", "tx-70", "tx-71", + "tx-72", "tx-73", "tx-74", "tx-75", + "tx-76", "tx-77", "tx-78", "tx-79", + "rx-96", "rx-97", "rx-98", "rx-99", + "rx-100", "rx-101", "rx-102", "rx-103", + "rx-104", "rx-105", "rx-106", "rx-107", + "rx-108", "rx-109", "rx-110", "rx-111"; + }; --=20 2.54.0 From nobody Thu Sep 24 17:02:17 2026 Received: from mx0b-0002e601.pphosted.com (mx0b-0002e601.pphosted.com [148.163.154.28]) (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 630114F7CB3; Tue, 22 Sep 2026 06:51:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.154.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059876; cv=fail; b=XvkDcJpwS/4g64CqiP9G/F9lqSaAedfMgHjZbYxCSUYBZRbujjq2JK/or5FC2txrAJ4OCLvVm4O1iagtl6UBTObjE64o1vMFmUjvE8vSXSfRczqhdRBXce9jug83PVyguRjbRa/n36cZBKijLfokUD1MPgj/bM08/jH+ZilMBJQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059876; c=relaxed/simple; bh=5nWBKKrAJFQlSxaK7OHYy2/eUTeQUg5eIgUDa1P+VMo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mVYytlVw15+/ad9w3mVdVHByU6YW0B84azq0bHqJZGwrGbfJHst9R2id9lNHSBXMofi4HdX2NYgHIP4WL/Lj3oHqcXpBE1S6soLvp9iDqY5kaJRbyn52vPpV/pxvcyhEAlywBW4hq5qEAL22oZ3CqkwKIt8DOryDq1QTWQVlPik= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=OwOqS7X5; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=E3ETDDp4; arc=fail smtp.client-ip=148.163.154.28 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="OwOqS7X5"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="E3ETDDp4" Received: from pps.filterd (m0374955.ppops.net [127.0.0.1]) by mx0b-0002e601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68M1qEth1436209; Tue, 22 Sep 2026 01:50:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=8Z+/+NxsMMTFaprxTcIyhexb+wytEo/4At6ia3nQB DE=; b=OwOqS7X5YtLsqnfYUGp/E5gBaW6zrcMt4PYuS158Sc8FPMWr183o+VkI3 icgAvrm0rxUdo6uNyLUHRE30R0B0GTZeS0pM3MUtQGSssaNDfsaJivbakh0dNCMk //p+vPaxF/wbgbI4P3XZWkDl5CTgV7ps4UHmMghuDcPq8B36wOJ7ZS+QAg8SM8kr 5UwDiG1A5Vc5lhc1eFVYFm2Kv4Z+B7ZHettqii6TWzejtZak4SRC8AFhcrYwk/qu R0ekkTGZWkjIrTO5cVXYXejpIOjN6q/IXsLCZIJHOMXNHUVWbocUd/cPhtoH/Fug Bm0JPJjS8M7LjtrcTGagriRrcdYbA== Received: from bn8pr05cu002.outbound.protection.outlook.com (mail-eastus2azon11011051.outbound.protection.outlook.com [52.101.57.51]) by mx0b-0002e601.pphosted.com (PPS) with ESMTPS id 4gugcsscmk-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:50:57 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eCANB69xXb4r99fXZkPJFfgV83QphAjkK7OiZnJQxez4djB9RB01Hae2b7d+5+/7qKB7lxdq7g+F9KVl2h+vMfypV8GVzaqPLaP7bM5FuURWtZ+pd26tSmO651tNrMwiLlmx+P5e33+pQ9ThDbxW4EJRcc2gkwGLQUGnfLLeeuGJWTIjkugK7vmnUChTNPBzBZ2cCj2RImGKxpb5NBxPyRD4bduEdm9cUsuj8g2+tMiYXXCznowfyIdCABr5i6i76FI2pAVPkpdzT8xKUEOtx5xX79git7+R56xdNjJbZK1ZEfVGHgIuAUMN3OjqoqPZ+cqn9a5uv6krjEQROsAubw== 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=8Z+/+NxsMMTFaprxTcIyhexb+wytEo/4At6ia3nQBDE=; b=PZt9faU17Xibse3lWauInt3GwmtHrEXRuSY6xsvuq9IkHgTQic2VBJ4ilQNHEHekvzio1V7xnKGPqA/VEafg81T6DSXIWxkG6KZsROdfx7wf9Wo1qMbz59DjyL/7q+ZKiZ8cLAQZsCMBtGzuj+rHOuLmR5e5ZGDsfxUF7nwTBFsi9OOn847vNCJB4zg1LSSCgCJ1ifxK5BoqlW7wT3b3xm9xVpaXHYEfFa34Pi8/oq2dmhyhOZQCl5jnbfLs+rz1NyjnxbZmiO73BZlD5tkaBF9lFTdwOf8vNdRRc3lszWBKo9u+ywTgeeaKSV3FKe2sEZ9xcjrar52mITpqynwpqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.23.195) smtp.rcpttodomain=nxp.com 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=8Z+/+NxsMMTFaprxTcIyhexb+wytEo/4At6ia3nQBDE=; b=E3ETDDp4ZkK9TqVypAC+ARVJHSGvJUNChoVzwfl06cxhmBsVpn+X+7R+6jum/c6gLbCybEWSVfsau9OlQAfyCSfHtrTooTt4jApXGrjcn/z4CLczYeK/NFIhPL7zdD6qBCfeKieQTrGXxZqc3Ye4Hgo2hwBMUt+L+/naLH1vNX0= Received: from CH2PR04CA0013.namprd04.prod.outlook.com (2603:10b6:610:52::23) by BN0PR10MB4934.namprd10.prod.outlook.com (2603:10b6:408:120::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.13; Tue, 22 Sep 2026 06:50:53 +0000 Received: from CH1PEPF0000AD74.namprd04.prod.outlook.com (2603:10b6:610:52:cafe::12) by CH2PR04CA0013.outlook.office365.com (2603:10b6:610:52::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.428.16 via Frontend Transport; Tue, 22 Sep 2026 06:50:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 198.47.23.195) 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.195 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.23.195; helo=lewvzet201.ext.ti.com; pr=C Received: from lewvzet201.ext.ti.com (198.47.23.195) by CH1PEPF0000AD74.mail.protection.outlook.com (10.167.244.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:50:53 +0000 Received: from DLEE207.ent.ti.com (157.170.170.95) by lewvzet201.ext.ti.com (10.4.14.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:37 -0500 Received: from DLEE202.ent.ti.com (157.170.170.77) by DLEE207.ent.ti.com (157.170.170.95) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:37 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DLEE202.ent.ti.com (157.170.170.77) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:50:37 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI473626771; Tue, 22 Sep 2026 01:50:32 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 15/19] dmaengine: ti: k3-psil-am62l: Add AM62Lx PSIL and PDMA data Date: Tue, 22 Sep 2026 12:17:39 +0530 Message-ID: <20260922064902.2719979-16-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000AD74:EE_|BN0PR10MB4934:EE_ X-MS-Office365-Filtering-Correlation-Id: fdaeac85-9401-4adb-46e6-08df1875d8bd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|36860700016|1800799024|23010399003|82310400026|56012099006|10067099003|3023799007|22082099003|18002099003|921020|13003099007; X-Microsoft-Antispam-Message-Info: /VbveqKaWWeyzdWEKChaJHvVNUpoSPgZNm7L9ADQKFf/bfjd5N4PkXpnE4xArkJyQjfESuX1LoVGcFGeVlvJJnKA6karmvt1KU3MpVvpOm8NTUSvBB+76eM4kV+AhI8bqR+mTCw9bT51PGH6q3kUXVXbgcz7ak/7ord92CT30J1Jqt+DT/JoRqWgDIoMx5rqKBy/G3t9+iXuQ2sDGI+EOb3ZuqoobCld7Idv+h8pc0u6XXYph+zKHbecN+EvLspS1dtzQbtZz26qDYEsQEpcdEoDO025lPbLLjNXkGtPRMfwYoptRv1e+tJWmYK5TJvt/Dyf4G1INCKsC3nNGe+DpEuja/x7mci0PYIs+6qKhfOHgax/A+8ygw6MAYaJSH9Cz7VtHfFxv4Ob49IXmZxa1ABwMy9TUgC0CTrKsi7eqLYlH1q+RlWOEJCT9HiL92FXZ6g112KBxgcHo6JJHqDcG1HJeD77olFcbPMV9FgGM5gKVhODLXtPcLFK2x4rRrC2Bghw46FrlqO/pboyrT6Rt/p1FNuhETv55hiMa5NSyIRNq2IT0BaJ0d61KAUoNu25yFMSmgz0I1o9xjeSawC+RJCT9OuIw0oQMhnJ4t3KEJ+GLBWY3EfRs3ciMRfQJSJNkzXXbaeh201JO5BazlzDWr1ifBgllJzMC9akXvJSeu0JLsV8uxHqX28jmeB09ml5 X-Forefront-Antispam-Report: CIP:198.47.23.195;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:lewvzet201.ext.ti.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(7416014)(36860700016)(1800799024)(23010399003)(82310400026)(56012099006)(10067099003)(3023799007)(22082099003)(18002099003)(921020)(13003099007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2mDmK9Ldhj6tcY05ucgXDt2eLonLv+Xih4hGtshfrspbbYq16GCdukCyJ1k0Zmx/pZqbimzWAv2sGvK7eI5sRKAdoYsLGtI+56Ixch2VARXyC+wnACT8uac4i0ax8p+nGwnGbswdbHUPGeuYcYAdHkdPq6DaP74hrhcCRwLGvZXugUsbmuzeKEgOxYvAz+4G6FJKXTYnQT3Vo7AfdcqOg0Hh6dby71WSBDIUQ3/n/y6fDs/FmZK1YKkeH5wzDBeqDN98oXMS5gZk/uQeI9pcUDdaJpnayICK4OoQJ2qV7fmper1Nd8ESrSGv+z8LZSOt7iAwfO9GJtEDKL0IZpKop3eUO6w5/FBozviv+tPOBnJ29iLHvTQ4tPMuQS9ZxW2/stveVDj9vbrUWTUpOYRNLXb9x+PEVuyODu1jqR7H9z27CBDoW8tUOU20kl9mQWWf X-Exchange-RoutingPolicyChecked: TBAb8fd1NgsDq8RomMCYYHCHe05SqMK0QlWoenjPrq/SMPtfIKIgs/mFZlgv2eij/8B4ILsCcGb0sbN3OewLfvsbEnXZ/ZjgcxonAEXLZaSNeiBd4lDp+sS66tlr8VVGh5GLTlXhHvS7gR21ADIUQ4cxX7HzgEL9JW+Iy/gQ6tDUzwkvbhrIL5BJGpW8OgtqSWrmmuHTZ8hA9kk9MATroRx/rb+dpZuMqlX6N341/L1FrmDS+A+3pj+uLmV8BH3LBj92UDPLhVbGAEU0O+FZs6pz3pUquls4H95MQ1+IwPydWx3hNMSJd32LF38V0UbctGc2czBda47AHZUYkO25EQ== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:50:53.5441 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fdaeac85-9401-4adb-46e6-08df1875d8bd 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.195];Helo=[lewvzet201.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000AD74.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB4934 X-Proofpoint-GUID: yxYm8POdPZ2iBH6_KqHvrtYEaG3Ryb_7 X-Authority-Analysis: v=2.4 cv=GI+dgeNK c=1 sm=1 tr=0 ts=6ab22551 cx=c_pps a=aOchWjQmdX1ADhYh+yUFEQ==:117 a=f+v6EHfkeJbVwR46tk4DMg==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=s63m1ICgrNkA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=fPAWb5peG099m5CrUpKH:22 a=sozttTNsAAAA:8 a=SxTibnW5tSAW0Is98DsA:9 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX+OjnXZ6jpZS9 c3TFwiIepS98D4ALqV6OkgdczibJTkFTliGT2UmeXlfv0HEHfdQCL0Ai9gnI0b4bjUmD+g4kCYu iTx7ZW3twSyFi+RGVwZzaRUnG00bFgc= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfXwGFW54vFeMIV qe5O3xBrxlIDWS8lFggjqsVtOHkqdGFfHZuUpaZRcEap79LmL3rLGtzcU16ffgtnjsT/kuyOyg+ yjP+PTACYUuIe1/0pcEuqX75EcrmLp3ixIC/HDp/q953a+qxwhQ7YM80nXzFkHuM2jjn2+M0f8p h2rjMr2n9VnM2nKE5vHHydZkXlN00yBtwQLjwYDBN5Wh/WdJ8u86y0CMKl8tHEeQbKoFwOHwyef M0apsJ4z3FKTgkXksXoera8ofin3XMkwI0qWUPJP9pLObJp7mF2z3EXiuxiLbinLEBokqHw+RER nCLA5zZK0D1ITUrxxhFe+kktmmskenkUfvW+gPn2XTPiboN3lIr3UQeRbCqmDOIGeTisMjxdUut yqaLuxTW/tH/zcpMCFgEgCyfsna8ZmQqeKw/WN6Py0eftb3MDcTCauGG0ret943Rq1A9/ZMrT9A nJLauZ5nvIGN3pVnN3w== X-Proofpoint-ORIG-GUID: yxYm8POdPZ2iBH6_KqHvrtYEaG3Ryb_7 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 adultscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 clxscore=1015 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220097 Content-Type: text/plain; charset="utf-8" Add PSIL and PDMA data for AM62Lx SoC. Introduce new PSIL_EP_PDMA_XYMF type for channels that have multiple selectable fifos. Also add a new fifo_id field to psil_endpoint_config to specify the selectable fifo_id. Signed-off-by: Sai Sree Kartheek Adivi --- drivers/dma/ti/Makefile | 3 +- drivers/dma/ti/k3-psil-am62l.c | 169 +++++++++++++++++++++++++++++++++ drivers/dma/ti/k3-psil-priv.h | 5 + drivers/dma/ti/k3-psil.c | 78 ++++++++++++++- include/linux/dma/k3-psil.h | 3 + 5 files changed, 253 insertions(+), 5 deletions(-) create mode 100644 drivers/dma/ti/k3-psil-am62l.c diff --git a/drivers/dma/ti/Makefile b/drivers/dma/ti/Makefile index 3b91c02e55eaf..41bfba944dc6c 100644 --- a/drivers/dma/ti/Makefile +++ b/drivers/dma/ti/Makefile @@ -14,6 +14,7 @@ k3-psil-lib-objs :=3D k3-psil.o \ k3-psil-am62.o \ k3-psil-am62a.o \ k3-psil-j784s4.o \ - k3-psil-am62p.o + k3-psil-am62p.o \ + k3-psil-am62l.o obj-$(CONFIG_TI_K3_PSIL) +=3D k3-psil-lib.o obj-$(CONFIG_TI_DMA_CROSSBAR) +=3D dma-crossbar.o diff --git a/drivers/dma/ti/k3-psil-am62l.c b/drivers/dma/ti/k3-psil-am62l.c new file mode 100644 index 0000000000000..ee77fae3787a4 --- /dev/null +++ b/drivers/dma/ti/k3-psil-am62l.c @@ -0,0 +1,169 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2024-2025 Texas Instruments Incorporated - https://www.t= i.com + */ + +#include + +#include "k3-psil-priv.h" + +#define PSIL_PDMA_XY_TR(x, ch) \ + { \ + .thread_id =3D x, \ + .ep_config =3D { \ + .ep_type =3D PSIL_EP_PDMA_XY, \ + .mapped_channel_id =3D ch, \ + .default_flow_id =3D -1, \ + }, \ + } + +#define PSIL_PDMA_XYMF_TR(x, ch, fifo) \ + { \ + .thread_id =3D x, \ + .ep_config =3D { \ + .ep_type =3D PSIL_EP_PDMA_XYMF, \ + .mapped_channel_id =3D ch, \ + .default_flow_id =3D -1, \ + .fifo_id =3D fifo, \ + }, \ + } + +#define PSIL_PDMA_XY_PKT(x, ch) \ + { \ + .thread_id =3D x, \ + .ep_config =3D { \ + .ep_type =3D PSIL_EP_PDMA_XY, \ + .mapped_channel_id =3D ch, \ + .pkt_mode =3D 1, \ + .default_flow_id =3D -1 \ + }, \ + } + +#define PSIL_ETHERNET(x, ch, flow_base, flow_cnt) \ + { \ + .thread_id =3D x, \ + .ep_config =3D { \ + .ep_type =3D PSIL_EP_NATIVE, \ + .pkt_mode =3D 1, \ + .needs_epib =3D 1, \ + .psd_size =3D 16, \ + .mapped_channel_id =3D ch, \ + .flow_start =3D flow_base, \ + .flow_num =3D flow_cnt, \ + .default_flow_id =3D flow_base, \ + }, \ + } + +#define PSIL_PDMA_MCASP(x, ch) \ + { \ + .thread_id =3D x, \ + .ep_config =3D { \ + .ep_type =3D PSIL_EP_PDMA_XY, \ + .pdma_acc32 =3D 1, \ + .pdma_burst =3D 1, \ + .mapped_channel_id =3D ch, \ + .default_flow_id =3D -1 \ + }, \ + } + +/* PSI-L source thread IDs, used for RX (DMA_DEV_TO_MEM) */ +static struct psil_ep am62l_src_ep_map[] =3D { + /* PDMA_MAIN1 - UART0-6 */ + PSIL_PDMA_XY_PKT(0x4400, 0), + PSIL_PDMA_XY_PKT(0x4401, 2), + PSIL_PDMA_XY_PKT(0x4402, 4), + PSIL_PDMA_XY_PKT(0x4403, 6), + PSIL_PDMA_XY_PKT(0x4404, 8), + PSIL_PDMA_XY_PKT(0x4405, 10), + PSIL_PDMA_XY_PKT(0x4406, 12), + /* PDMA_MAIN0 - SPI0 - CH0-3 */ + PSIL_PDMA_XYMF_TR(0x4300, 16, 0), + PSIL_PDMA_XYMF_TR(0x4300, 18, 1), + PSIL_PDMA_XYMF_TR(0x4300, 20, 2), + PSIL_PDMA_XYMF_TR(0x4300, 22, 3), + /* PDMA_MAIN0 - SPI1 - CH0-3 */ + PSIL_PDMA_XYMF_TR(0x4301, 24, 0), + PSIL_PDMA_XYMF_TR(0x4301, 26, 1), + PSIL_PDMA_XYMF_TR(0x4301, 28, 2), + PSIL_PDMA_XYMF_TR(0x4301, 30, 3), + /* PDMA_MAIN0 - SPI2 - CH0-3 */ + PSIL_PDMA_XYMF_TR(0x4302, 32, 0), + PSIL_PDMA_XYMF_TR(0x4302, 34, 1), + PSIL_PDMA_XYMF_TR(0x4302, 36, 2), + PSIL_PDMA_XYMF_TR(0x4302, 38, 3), + /* PDMA_MAIN0 - SPI3 - CH0-3 */ + PSIL_PDMA_XYMF_TR(0x4303, 40, 0), + PSIL_PDMA_XYMF_TR(0x4303, 42, 1), + PSIL_PDMA_XYMF_TR(0x4303, 44, 2), + PSIL_PDMA_XYMF_TR(0x4303, 46, 3), + /* PDMA_MAIN2 - MCASP0-2 */ + PSIL_PDMA_MCASP(0x4500, 48), + PSIL_PDMA_MCASP(0x4501, 50), + PSIL_PDMA_MCASP(0x4502, 52), + /* PDMA_MAIN0 - AES */ + PSIL_PDMA_XY_TR(0x4700, 65), + /* PDMA_MAIN0 - ADC */ + PSIL_PDMA_XY_TR(0x4503, 80), + PSIL_PDMA_XY_TR(0x4504, 81), + PSIL_ETHERNET(0x4600, 96, 96, 16), +}; + +/* PSI-L destination thread IDs, used for TX (DMA_MEM_TO_DEV) */ +static struct psil_ep am62l_dst_ep_map[] =3D { + /* PDMA_MAIN1 - UART0-6 */ + PSIL_PDMA_XY_PKT(0xC400, 1), + PSIL_PDMA_XY_PKT(0xC401, 3), + PSIL_PDMA_XY_PKT(0xC402, 5), + PSIL_PDMA_XY_PKT(0xC403, 7), + PSIL_PDMA_XY_PKT(0xC404, 9), + PSIL_PDMA_XY_PKT(0xC405, 11), + PSIL_PDMA_XY_PKT(0xC406, 13), + /* PDMA_MAIN0 - SPI0 - CH0-3 */ + PSIL_PDMA_XYMF_TR(0xC300, 17, 0), + PSIL_PDMA_XYMF_TR(0xC300, 19, 1), + PSIL_PDMA_XYMF_TR(0xC300, 21, 2), + PSIL_PDMA_XYMF_TR(0xC300, 23, 3), + /* PDMA_MAIN0 - SPI1 - CH0-3 */ + PSIL_PDMA_XYMF_TR(0xC301, 25, 0), + PSIL_PDMA_XYMF_TR(0xC301, 27, 1), + PSIL_PDMA_XYMF_TR(0xC301, 29, 2), + PSIL_PDMA_XYMF_TR(0xC301, 31, 3), + /* PDMA_MAIN0 - SPI2 - CH0-3 */ + PSIL_PDMA_XYMF_TR(0xC302, 33, 0), + PSIL_PDMA_XYMF_TR(0xC302, 35, 1), + PSIL_PDMA_XYMF_TR(0xC302, 37, 2), + PSIL_PDMA_XYMF_TR(0xC302, 39, 3), + /* PDMA_MAIN0 - SPI3 - CH0-3 */ + PSIL_PDMA_XYMF_TR(0xC303, 41, 0), + PSIL_PDMA_XYMF_TR(0xC303, 43, 1), + PSIL_PDMA_XYMF_TR(0xC303, 45, 2), + PSIL_PDMA_XYMF_TR(0xC303, 47, 3), + /* PDMA_MAIN2 - MCASP0-2 */ + PSIL_PDMA_MCASP(0xC500, 49), + PSIL_PDMA_MCASP(0xC501, 51), + PSIL_PDMA_MCASP(0xC502, 53), + /* PDMA_MAIN0 - SHA */ + PSIL_PDMA_XY_TR(0xC700, 64), + /* PDMA_MAIN0 - AES */ + PSIL_PDMA_XY_TR(0xC701, 66), + /* PDMA_MAIN0 - CRC32 - CH0-1 */ + PSIL_PDMA_XYMF_TR(0xC702, 67, 0), + PSIL_PDMA_XYMF_TR(0xC702, 68, 1), + /* CPSW3G */ + PSIL_ETHERNET(0xc600, 64, 64, 2), + PSIL_ETHERNET(0xc601, 66, 66, 2), + PSIL_ETHERNET(0xc602, 68, 68, 2), + PSIL_ETHERNET(0xc603, 70, 70, 2), + PSIL_ETHERNET(0xc604, 72, 72, 2), + PSIL_ETHERNET(0xc605, 74, 74, 2), + PSIL_ETHERNET(0xc606, 76, 76, 2), + PSIL_ETHERNET(0xc607, 78, 78, 2), +}; + +struct psil_ep_map am62l_ep_map =3D { + .name =3D "am62l", + .src =3D am62l_src_ep_map, + .src_count =3D ARRAY_SIZE(am62l_src_ep_map), + .dst =3D am62l_dst_ep_map, + .dst_count =3D ARRAY_SIZE(am62l_dst_ep_map), +}; diff --git a/drivers/dma/ti/k3-psil-priv.h b/drivers/dma/ti/k3-psil-priv.h index a577be97e3447..970afd46a79e6 100644 --- a/drivers/dma/ti/k3-psil-priv.h +++ b/drivers/dma/ti/k3-psil-priv.h @@ -35,6 +35,10 @@ struct psil_ep_map { }; =20 struct psil_endpoint_config *psil_get_ep_config(u32 thread_id); +struct psil_endpoint_config *psil_get_ep_config_by_id(u32 channel_id, + bool is_pktdma, + u32 *thread_id, + bool *dev_to_mem); =20 /* SoC PSI-L endpoint maps */ extern struct psil_ep_map am654_ep_map; @@ -46,5 +50,6 @@ extern struct psil_ep_map am62_ep_map; extern struct psil_ep_map am62a_ep_map; extern struct psil_ep_map j784s4_ep_map; extern struct psil_ep_map am62p_ep_map; +extern struct psil_ep_map am62l_ep_map; =20 #endif /* K3_PSIL_PRIV_H_ */ diff --git a/drivers/dma/ti/k3-psil.c b/drivers/dma/ti/k3-psil.c index c4b6f0df46861..580fc553e23fa 100644 --- a/drivers/dma/ti/k3-psil.c +++ b/drivers/dma/ti/k3-psil.c @@ -28,6 +28,7 @@ static const struct soc_device_attribute k3_soc_devices[]= =3D { { .family =3D "J784S4", .data =3D &j784s4_ep_map }, { .family =3D "AM62PX", .data =3D &am62p_ep_map }, { .family =3D "J722S", .data =3D &am62p_ep_map }, + { .family =3D "AM62LX", .data =3D &am62l_ep_map }, { /* sentinel */ } }; =20 @@ -71,12 +72,68 @@ struct psil_endpoint_config *psil_get_ep_config(u32 thr= ead_id) } EXPORT_SYMBOL_GPL(psil_get_ep_config); =20 +struct psil_endpoint_config *psil_get_ep_config_by_id(u32 channel_id, + bool is_pktdma, + u32 *thread_id, + bool *dev_to_mem) +{ + int i; + + mutex_lock(&ep_map_mutex); + if (!soc_ep_map) { + const struct soc_device_attribute *soc; + + soc =3D soc_device_match(k3_soc_devices); + if (soc) { + soc_ep_map =3D soc->data; + } else { + pr_err("PSIL: No compatible machine found for map\n"); + mutex_unlock(&ep_map_mutex); + return ERR_PTR(-ENOTSUPP); + } + } + + if (soc_ep_map->src) { + for (i =3D 0; i < soc_ep_map->src_count; i++) { + struct psil_ep *ep =3D &soc_ep_map->src[i]; + + if (ep->ep_config.mapped_channel_id !=3D (s16)channel_id) + continue; + if ((bool)ep->ep_config.pkt_mode !=3D is_pktdma) + continue; + *thread_id =3D ep->thread_id; + *dev_to_mem =3D true; + mutex_unlock(&ep_map_mutex); + return &ep->ep_config; + } + } + + if (soc_ep_map->dst) { + for (i =3D 0; i < soc_ep_map->dst_count; i++) { + struct psil_ep *ep =3D &soc_ep_map->dst[i]; + + if (ep->ep_config.mapped_channel_id !=3D (s16)channel_id) + continue; + if ((bool)ep->ep_config.pkt_mode !=3D is_pktdma) + continue; + *thread_id =3D ep->thread_id; + *dev_to_mem =3D false; + mutex_unlock(&ep_map_mutex); + return &ep->ep_config; + } + } + + mutex_unlock(&ep_map_mutex); + return ERR_PTR(-ENOENT); +} +EXPORT_SYMBOL_GPL(psil_get_ep_config_by_id); + int psil_set_new_ep_config(struct device *dev, const char *name, struct psil_endpoint_config *ep_config) { struct psil_endpoint_config *dst_ep_config; struct of_phandle_args dma_spec; - u32 thread_id; + u32 thread_id =3D 0; int index; =20 if (!dev || !dev->of_node) @@ -90,9 +147,22 @@ int psil_set_new_ep_config(struct device *dev, const ch= ar *name, index, &dma_spec)) return -ENOENT; =20 - thread_id =3D dma_spec.args[0]; - - dst_ep_config =3D psil_get_ep_config(thread_id); + if (of_device_is_compatible(dma_spec.np, "ti,am62l-dmss-pktdma")) { + bool dev_to_mem; + + dst_ep_config =3D psil_get_ep_config_by_id(dma_spec.args[0], + true, + &thread_id, &dev_to_mem); + } else if (of_device_is_compatible(dma_spec.np, "ti,am62l-dmss-bcdma")) { + bool dev_to_mem; + + dst_ep_config =3D psil_get_ep_config_by_id(dma_spec.args[2], + false, + &thread_id, &dev_to_mem); + } else { + thread_id =3D dma_spec.args[0]; + dst_ep_config =3D psil_get_ep_config(thread_id); + } if (IS_ERR(dst_ep_config)) { pr_err("PSIL: thread ID 0x%04x not defined in map\n", thread_id); diff --git a/include/linux/dma/k3-psil.h b/include/linux/dma/k3-psil.h index 5f106d852f1cf..36e347311f8b2 100644 --- a/include/linux/dma/k3-psil.h +++ b/include/linux/dma/k3-psil.h @@ -35,6 +35,7 @@ enum udma_tp_level { enum psil_endpoint_type { PSIL_EP_NATIVE =3D 0, PSIL_EP_PDMA_XY, + PSIL_EP_PDMA_XYMF, PSIL_EP_PDMA_MCAN, PSIL_EP_PDMA_AASRC, }; @@ -78,6 +79,8 @@ struct psil_endpoint_config { u16 flow_start; u16 flow_num; s16 default_flow_id; + /* XYMF FIFO index (0-3 for CS0-CS3), Only for PSIL_EP_PDMA_XYMF */ + u8 fifo_id; }; =20 int psil_set_new_ep_config(struct device *dev, const char *name, --=20 2.54.0 From nobody Thu Sep 24 17:02:17 2026 Received: from mx0b-0002e601.pphosted.com (mx0b-0002e601.pphosted.com [148.163.154.28]) (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 4E7824F405D; Tue, 22 Sep 2026 06:51:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.154.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059913; cv=fail; b=frJcw1L3e4eyRdYstt2Y6g0SkNMpAVhhAJwFWzz6mqSOJOEcoPCCs2wHRPNzFisDKgqRoQHgTvHztYrhs6J+lmk7DLqDB8Z9pdEZN0Bg886fpUF9wfnKsXnRrMZob0PZLJhXNCRTgB9UM2MEq8XPBj7gEU5HBFAlT9NjUakPYdI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059913; c=relaxed/simple; bh=zs60udRvL9JF/uoOeP1/D7ir+nT+FmtX/cfr3eNBEpI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nuj/dgCLCpGSmXXdKLONUVbJyOl3/zRh41tEfXxxRsojMIILFJJgddpXQ2/quGfJjuJqgBonckigAvgS08+pbcA2X8Pgd7IdM8pHq+ZQmTJl3TKTYSlo0CaUO3caDKSYL0MpXwvaKmEpVQjTqzKuKAebshxmie3EtyQhsn7DYwE= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=T8eNVBFw; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=OglYGKia; arc=fail smtp.client-ip=148.163.154.28 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="T8eNVBFw"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="OglYGKia" Received: from pps.filterd (m0374956.ppops.net [127.0.0.1]) by mx0b-0002e601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68M2URnv1035305; Tue, 22 Sep 2026 01:51:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=ZAhZsnfYyfoGpZWMc6MBYI8ID9vZ/ka7vAnOHFdFe 5A=; b=T8eNVBFwbEKzOdjn6IXsTDS/s3f0OlsQ7PT218qMUSv7lYPcdSlgcyild SpXBm6qARQdb2OiOQbn4ak5SuVOB3UdZ5doTMWwfeuLCd/f052Ik6YNfNwmBkO88 Z9lyOI+G2t6J+VtIQ0JzyEOa2S/x//S/c0Y9iChvAv02ogIQAZq/FPK16mkrRlo6 AYPVQPeEfejx6HCs1DwwZvsSYQRTje8GLQ6rEhWwzzEBQihIwxjAxGNylwYJhHnY /BvVrUaOCMTgF8CEUQjFKL4MOcQrvKA63VKh6qWu+Tui1ozjXIcc2qXL/bcIBbeF u6tTM2+BlRBF/8kj+kBTsmTlNsjoA== Received: from ph8pr06cu001.outbound.protection.outlook.com (mail-westus3azon11012032.outbound.protection.outlook.com [40.107.209.32]) by mx0b-0002e601.pphosted.com (PPS) with ESMTPS id 4gugxm16t6-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:51:31 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yqEp3VOXokWaF9/ODNQWmY/tAslXhJsv421HVvCm8bVu6Vi4YOkuqXl2F/GKxzXoAx+sGNurcEZuzkTeFJznomqIGaMpBL5/WQyTSUVKQ3gViXUA/N/8XPqV4IHYEYwErkQyNTD8D8SgiDsWVDksX+KG9p4OI41BmtAzOSzsH+x6fBDTpum5ohvAMHe0GO2wmSAJxts5qC334qMBpwkWeYMa8yPCM9hFtZiRNqRf3cJsEAmSMmRwZjgYclHQu1QA6JqA/OccOwXtfVkcHkQQ52zdBoB7S7frJClljuDTnrg2/PeIXJpWQEs2zI7ovpz5tydGEtUszbQCmfJiGhMcjA== 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=ZAhZsnfYyfoGpZWMc6MBYI8ID9vZ/ka7vAnOHFdFe5A=; b=WyLzMXnYHCikqXvImiEPUBmE4PQrLHUJoNUiV9wsKSSPF7OUYTl3gSGfWchVINKD7zmAIgBqruHVyigAbNUMH3f+ZjKZuh8l37K0eXNy+GrX6lrKrqTxFH6BfVXC5cHMAVsr3xFuEJmpfn57/4BmlZcT89t6ILGXA4VyGquEYDQaN9ChT7mzqh8ILdAa5YtquddrtNTuBJR2J01sszm7frpOWZtxJ1O2/nGImDcmlRNuSLmvNB3Iq5PV8CMsN8V/5sE/l1e76shc80ov+SXaKmGsM0rE/F94dB22rRoim8KwlblDjdMT7rEMZS671KfVqJU15D9N0YEdK865aOm6tw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.21.194) smtp.rcpttodomain=nxp.com 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=ZAhZsnfYyfoGpZWMc6MBYI8ID9vZ/ka7vAnOHFdFe5A=; b=OglYGKiaF/sUUeWX2RKGSv9EiRIXtXGsQFw+8sdUWY80HtEJYN7I4SDXJ+22LiRkq4woVqyvS9W6sok/WxRoKKzu9uNLgRcMjQWVEPKyg644WxR12Y5aYkng3hcPza5T+Mo8nzVGjbuUDvVMVTNTq+SVKzzl0DTD93ZuXiJk2fA= Received: from BN9PR03CA0867.namprd03.prod.outlook.com (2603:10b6:408:13d::32) by SN4PR10MB5608.namprd10.prod.outlook.com (2603:10b6:806:20b::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.13; Tue, 22 Sep 2026 06:51:26 +0000 Received: from BY1PEPF0002695D.namprd05.prod.outlook.com (2603:10b6:408:13d:cafe::19) by BN9PR03CA0867.outlook.office365.com (2603:10b6:408:13d::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.428.16 via Frontend Transport; Tue, 22 Sep 2026 06:51:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 198.47.21.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.21.194 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.21.194; helo=flwvzet200.ext.ti.com; pr=C Received: from flwvzet200.ext.ti.com (198.47.21.194) by BY1PEPF0002695D.mail.protection.outlook.com (10.167.244.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:51:24 +0000 Received: from DFLE202.ent.ti.com (10.64.6.60) by flwvzet200.ext.ti.com (10.248.192.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:42 -0500 Received: from DFLE202.ent.ti.com (10.64.6.60) by DFLE202.ent.ti.com (10.64.6.60) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:42 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DFLE202.ent.ti.com (10.64.6.60) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:50:42 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI483626771; Tue, 22 Sep 2026 01:50:38 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 16/19] dmaengine: ti: k3-udma-v2: New driver for K3 BCDMA_V2 Date: Tue, 22 Sep 2026 12:17:40 +0530 Message-ID: <20260922064902.2719979-17-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PEPF0002695D:EE_|SN4PR10MB5608:EE_ X-MS-Office365-Filtering-Correlation-Id: 81169768-0c10-4587-ab73-08df1875eb25 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|82310400026|23010399003|36860700016|921020|13003099007|6133799003|3023799007|10067099003|56012099006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: lM2SuIoD+XEf6jX70oPUtgxkOsoSTQGU+e/TO6oekQXPCKUUMIU9PbKDI7ZzrSRJCp8JXVO4la7W+wGufbwOPTYqJqPOPPue3VzoDDSDIP36jumg+vbnKzf7MCw8av5TKcU/doZ/GcPHUSaTWcG2javbJfbIqlbpU0x6LhdcWEXtiyX/fg02abVaaCJH5Wso0pGpY9tK5I/38zgNNWMjyXQUSIDw46z/Hb0ukcaYpoEkZIadFKuoudar2Jv9xa1RnN25CFDXzZ7jtHTciFVdlNol3kgh77AE6ayZ7FlaJRnjSKkDAXgBVyR0VEO5aX1o4R4d42VOWNM85Nit+d7dvi1WKAcKkID19t9v04h4paapWJhyqxiEdEIGvFjjOKbf2LdBZy09JNG406Bn2FmpLKHCPq5w6QEyq6MyhY+2kYqFMKaxLmcbjul2BwJeIBYQc03lb14zjz4o2hi9ERpSiAsAblgRICpQnuvsXKs9LsJ7clh0cUkHZBSG5vx/Uqa58/D1a9cOEH5tD/BvgRDUMP6W3BjPO0BkK4gTwHgXB6xkM3Aoe11II1s9Y2vkheSJvoa7RtgN7n6zxWtqFcdtkU8ld6N7jgj+NDU/YaDMOLoT+wo1pGSM3HSAtWHvwab4tvTpboTWEzUnpcETKiPLQz0n0TzdqJq6YlKvLQ36/ZoYZEtFvYnFacVEeH8MJMSS X-Forefront-Antispam-Report: CIP:198.47.21.194;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:flwvzet200.ext.ti.com;PTR:ErrorRetry;CAT:NONE;SFS:(13230040)(376014)(7416014)(1800799024)(82310400026)(23010399003)(36860700016)(921020)(13003099007)(6133799003)(3023799007)(10067099003)(56012099006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CrkmyMdg+Ji8RwpRGXXEalywkm/Y2ybl1ZafY7fY5//qaVXdlWjtL2U3rm0bdh9OP/Ik85FJvsEOXGs4VMH0wrowZWJ2SzQ8RWaOpsAF2avEHZHOUwmv8T+wuHlZgFDfr9nSibT+9NejUGz5WLWthhB2ZQYeM/6mLMLVL/i2KG7BstmUaAuWsP8O8SKmqJks5eSvE0NatH7ePIFyJJSOfE4Wfzho+qD8sejJ5SzJeofDy6opWVPx/suEMDhgTtkCurxvjlGtsKMFyzmz9r4EkfHutTcrLZLmmQHoWKs20mFqFdJWknS1OmSaOllH5uFaWcWIIISDMDyPR4Avu0L+RFe/9Wwhb9LxAVgV/UsAQPWnq0FjpkgPlIYDhscxzrW2mDc08Cm1hQREglR3L6LWUuXDKZ2mnULuuE8Yuo00TXdY68inuMbmfBnZo8MuGtPe X-Exchange-RoutingPolicyChecked: yynAcrl9FTRR0qEE863yemdXjGgwLcfn6CCzsNEpxGvPpT5hkqsKJOVfM0YlbqePp3BDtp4a/SwCDXXj66tc57kJUMJURAiAByMQSj1JHVcYMXCvwEK3igHxwH8fDxwkkNnlRAgQ2a95IO69uvMlHDdwdwwwtmY/c/zPVQcLytQHwg/KfC3mp3o596EFu5f1P07duUnwrUMwXoWUobcuwT95AS/33n12S9c2EdfhyiwbU8QqVFhxi+eg7zzFH4u/Vhxkyr0JgpBHTGHAVOXt7VJcxNl0Ck55ox3uN+kDZ7YHBtjBWIM+rAU8rF/FmAmM961MO6ikY+u7V49oNwYzdw== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:51:24.3843 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 81169768-0c10-4587-ab73-08df1875eb25 X-MS-Exchange-CrossTenant-Id: e5b49634-450b-4709-8abb-1e2b19b982b7 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e5b49634-450b-4709-8abb-1e2b19b982b7;Ip=[198.47.21.194];Helo=[flwvzet200.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: BY1PEPF0002695D.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR10MB5608 X-Proofpoint-ORIG-GUID: TDUzDls4t_bXHSPGrJqd6Qn6SkQpzMCQ X-Proofpoint-GUID: TDUzDls4t_bXHSPGrJqd6Qn6SkQpzMCQ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX+41YXWEJenFL LpZRaY8xDyDWR1hIqqaTuExGnn+rSdQ76IO7+hY/ZYxf+FVZjSCN3uT6qDQM13uArSb9nQpoy7e eIv5g3i+UIQghwt45V2uMLiak7LlO/xN6OpSRdCszFsrjGcki6NFmoDvrBDRV/0rEvgU7wfX3if trSOIVo/QZsKbM43PNf6x5/tM2gBLCzjYIQlQq0/T2aZ4zxWgg2V0jkBcYh1hrhp60pt0r23P77 QI2qvNC0lAejUlnC2rRjW1Zp09k2Y5rPJoOPObyyVGeSnYGW+DbepnivxpnKTH/QGB8PCtRbtv3 mPqdpW0Vbhxj1yOK4zTUk0vRpdS2g68iOU58i1QlmbiOn3JE1O+vccJyB2xmxaz+mY740wPdnM1 tu0jUkNOmFRv7F3F+2oyyqGwRtU2W61Gv/AGEloXFJbYTblfucVUlCKEWEdwjKb6aN9KKag1V13 Ntfx4FpeSScpxc7zIuw== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX2wG61Rn1vVNJ xSUdXhNOiqw6Ezu3oAYYh3Z1X+eL9BbJQ8eeXZcC0TI6shCgRYk4Mu18AMYKrZNPKRmMesWyncU +MhzEmB8TtWoQSwIbMbUV3ER+ehUx4k= X-Authority-Analysis: v=2.4 cv=INeXmQvG c=1 sm=1 tr=0 ts=6ab22574 cx=c_pps a=Eb813/LJkoRL1pr8t+D1ZA==:117 a=iwqwCZQqcuTv3JOpYdM7/Q==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=jwouBfj2j3NM8CExmVVE:22 a=sozttTNsAAAA:8 a=gedxhmekW7z0cqXWnrIA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 malwarescore=0 phishscore=0 spamscore=0 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220097 Content-Type: text/plain; charset="utf-8" Add support for BCDMA_V2. The BCDMA_V2 is different than the existing BCDMA supported by the k3-udma driver. The changes in BCDMA_V2 are: - Autopair: There is no longer a need for PSIL pair and AUTOPAIR bit needs to set in the RT_CTL register. - Static channel mapping: Each channel is mapped to a single peripheral. - Direct IRQs: There is no INT-A and interrupt lines from DMA are directly connected to GIC. - Remote side configuration handled by DMA. So no need to write to PEER registers to START / STOP / PAUSE / TEARDOWN. - Unified Channel Space: Tx and Rx channels share a single register space. Each channel index is specifically fixed in hardware as either Tx or Rx in an interleaved manner. Also, since a version member is introduced in the match_data, Add version v1 in match_data of SoCs using v1 DMA. Signed-off-by: Sai Sree Kartheek Adivi --- drivers/dma/ti/Kconfig | 14 +- drivers/dma/ti/Makefile | 1 + drivers/dma/ti/k3-udma-common.c | 91 +- drivers/dma/ti/k3-udma-v2.c | 1325 +++++++++++++++++++++++++++++ drivers/dma/ti/k3-udma.c | 9 + drivers/dma/ti/k3-udma.h | 123 +-- include/linux/soc/ti/k3-ringacc.h | 3 + 7 files changed, 1494 insertions(+), 72 deletions(-) create mode 100644 drivers/dma/ti/k3-udma-v2.c diff --git a/drivers/dma/ti/Kconfig b/drivers/dma/ti/Kconfig index a389ae04ec930..595fdf3ecbc9d 100644 --- a/drivers/dma/ti/Kconfig +++ b/drivers/dma/ti/Kconfig @@ -49,6 +49,18 @@ config TI_K3_UDMA Enable support for the TI UDMA (Unified DMA) controller. This DMA engine is used in AM65x and j721e. =20 +config TI_K3_UDMA_V2 + tristate "Texas Instruments K3 UDMA v2 support" + depends on ARCH_K3 + select DMA_ENGINE + select DMA_VIRTUAL_CHANNELS + select TI_K3_UDMA_COMMON + select TI_K3_RINGACC + select TI_K3_PSIL + help + Enable support for the TI UDMA (Unified DMA) v2 controller. This + DMA engine is used in AM62L. + config TI_K3_UDMA_COMMON tristate =20 @@ -62,7 +74,7 @@ config TI_K3_UDMA_GLUE_LAYER =20 config TI_K3_PSIL tristate - default TI_K3_UDMA + default TI_K3_UDMA || TI_K3_UDMA_V2 =20 config TI_DMA_CROSSBAR bool diff --git a/drivers/dma/ti/Makefile b/drivers/dma/ti/Makefile index 41bfba944dc6c..296aa3421e71b 100644 --- a/drivers/dma/ti/Makefile +++ b/drivers/dma/ti/Makefile @@ -3,6 +3,7 @@ obj-$(CONFIG_TI_CPPI41) +=3D cppi41.o obj-$(CONFIG_TI_EDMA) +=3D edma.o obj-$(CONFIG_DMA_OMAP) +=3D omap-dma.o obj-$(CONFIG_TI_K3_UDMA) +=3D k3-udma.o +obj-$(CONFIG_TI_K3_UDMA_V2) +=3D k3-udma-v2.o obj-$(CONFIG_TI_K3_UDMA_COMMON) +=3D k3-udma-common.o obj-$(CONFIG_TI_K3_UDMA_GLUE_LAYER) +=3D k3-udma-glue.o k3-psil-lib-objs :=3D k3-psil.o \ diff --git a/drivers/dma/ti/k3-udma-common.c b/drivers/dma/ti/k3-udma-commo= n.c index eb555cc08347d..1ddaab39692db 100644 --- a/drivers/dma/ti/k3-udma-common.c +++ b/drivers/dma/ti/k3-udma-common.c @@ -171,8 +171,13 @@ bool udma_is_desc_really_done(struct udma_chan *uc, st= ruct udma_desc *d) uc->config.dir !=3D DMA_MEM_TO_DEV || !(uc->config.tx_flags & DMA_PRE= P_INTERRUPT)) return true; =20 - peer_bcnt =3D udma_tchanrt_read(uc, UDMA_CHAN_RT_PEER_BCNT_REG); - bcnt =3D udma_tchanrt_read(uc, UDMA_CHAN_RT_BCNT_REG); + if (uc->ud->match_data->version =3D=3D K3_UDMA_V1) { + peer_bcnt =3D udma_tchanrt_read(uc, UDMA_CHAN_RT_PEER_BCNT_REG); + bcnt =3D udma_tchanrt_read(uc, UDMA_CHAN_RT_BCNT_REG); + } else { + peer_bcnt =3D udma_chanrt_read(uc, UDMA_CHAN_RT_PERIPH_BCNT_REG); + bcnt =3D udma_chanrt_read(uc, UDMA_CHAN_RT_BCNT_REG); + } =20 /* Transfer is incomplete, store current residue and time stamp */ if (peer_bcnt < bcnt) { @@ -319,6 +324,7 @@ udma_prep_slave_sg_tr(struct udma_chan *uc, struct scat= terlist *sgl, size_t tr_size; int num_tr =3D 0; int tr_idx =3D 0; + u32 extra_flags =3D 0; u64 asel; =20 /* estimate the number of TRs we will need */ @@ -342,6 +348,16 @@ udma_prep_slave_sg_tr(struct udma_chan *uc, struct sca= tterlist *sgl, else asel =3D (u64)uc->config.asel << K3_ADDRESS_ASEL_SHIFT; =20 + /* + * BCDMA V2 stalls and stops processing further TRs if a TR's ICNT0 + * is not a multiple of 16 bytes. Setting EOP on every TR (not just + * the last one) avoids that stall condition. Intentional, not a bug. + */ + if (uc->ud->match_data->type =3D=3D DMA_TYPE_BCDMA && + uc->ud->match_data->version =3D=3D K3_UDMA_V2 && + dir =3D=3D DMA_MEM_TO_DEV) + extra_flags =3D CPPI5_TR_CSF_EOP; + tr_req =3D d->hwdesc[0].tr_req_base; for_each_sg(sgl, sgent, sglen, i) { dma_addr_t sg_addr =3D sg_dma_address(sgent); @@ -358,7 +374,7 @@ udma_prep_slave_sg_tr(struct udma_chan *uc, struct scat= terlist *sgl, =20 cppi5_tr_init(&tr_req[tr_idx].flags, CPPI5_TR_TYPE1, false, false, CPPI5_TR_EVENT_SIZE_COMPLETION, 0); - cppi5_tr_csf_set(&tr_req[tr_idx].flags, CPPI5_TR_CSF_SUPR_EVT); + cppi5_tr_csf_set(&tr_req[tr_idx].flags, CPPI5_TR_CSF_SUPR_EVT | extra_fl= ags); =20 sg_addr |=3D asel; tr_req[tr_idx].addr =3D sg_addr; @@ -372,7 +388,7 @@ udma_prep_slave_sg_tr(struct udma_chan *uc, struct scat= terlist *sgl, false, false, CPPI5_TR_EVENT_SIZE_COMPLETION, 0); cppi5_tr_csf_set(&tr_req[tr_idx].flags, - CPPI5_TR_CSF_SUPR_EVT); + CPPI5_TR_CSF_SUPR_EVT | extra_flags); =20 tr_req[tr_idx].addr =3D sg_addr + tr0_cnt1 * tr0_cnt0; tr_req[tr_idx].icnt0 =3D tr1_cnt0; @@ -593,7 +609,7 @@ int udma_configure_statictr(struct udma_chan *uc, struc= t udma_desc *d, enum dma_slave_buswidth dev_width, u16 elcnt) { - if (uc->config.ep_type !=3D PSIL_EP_PDMA_XY) + if (uc->config.ep_type !=3D PSIL_EP_PDMA_XY && uc->config.ep_type !=3D PS= IL_EP_PDMA_XYMF) return 0; =20 /* Bus width translates to the element size (ES) */ @@ -951,7 +967,8 @@ udma_prep_dma_cyclic_tr(struct udma_chan *uc, dma_addr_= t buf_addr, * As we are in cyclic mode, we do not know which period might be the * last one, so set the flag for each period. */ - if (uc->config.ep_type =3D=3D PSIL_EP_PDMA_XY && + if ((uc->config.ep_type =3D=3D PSIL_EP_PDMA_XY || + uc->config.ep_type =3D=3D PSIL_EP_PDMA_XYMF) && uc->ud->match_data->type =3D=3D DMA_TYPE_BCDMA) { period_csf =3D CPPI5_TR_CSF_EOP; } @@ -2052,6 +2069,8 @@ int udma_get_tchan(struct udma_chan *uc) uc->tchan =3D NULL; return ret; } + if (ud->match_data->version =3D=3D K3_UDMA_V2) + uc->chan =3D uc->tchan; =20 if (ud->tflow_cnt) { int tflow_id; @@ -2102,6 +2121,8 @@ int udma_get_rchan(struct udma_chan *uc) uc->rchan =3D NULL; return ret; } + if (ud->match_data->version =3D=3D K3_UDMA_V2) + uc->chan =3D uc->rchan; =20 return 0; } @@ -2384,9 +2405,16 @@ static int bcdma_setup_resources(struct udma_dev *ud) ud->tchan_map =3D devm_bitmap_zalloc(dev, ud->tchan_cnt, GFP_KERNEL); ud->tchans =3D devm_kcalloc(dev, ud->tchan_cnt, sizeof(*ud->tchans), GFP_KERNEL); - ud->rchan_map =3D devm_bitmap_zalloc(dev, ud->rchan_cnt, GFP_KERNEL); - ud->rchans =3D devm_kcalloc(dev, ud->rchan_cnt, sizeof(*ud->rchans), - GFP_KERNEL); + if (ud->match_data->version =3D=3D K3_UDMA_V1) { + ud->rchan_map =3D devm_bitmap_zalloc(dev, ud->rchan_cnt, GFP_KERNEL); + ud->rchans =3D devm_kcalloc(dev, ud->rchan_cnt, sizeof(*ud->rchans), + GFP_KERNEL); + } else { + ud->rchan_map =3D ud->tchan_map; + ud->rchans =3D ud->tchans; + ud->chan_map =3D ud->tchan_map; + ud->chans =3D ud->tchans; + } /* BCDMA do not really have flows, but the driver expect it */ ud->rflow_in_use =3D devm_kcalloc(dev, BITS_TO_LONGS(ud->rchan_cnt), sizeof(unsigned long), @@ -2481,11 +2509,18 @@ int k3_udma_setup_resources(struct udma_dev *ud) if (ret) return ret; =20 - ch_count =3D ud->bchan_cnt + ud->tchan_cnt + ud->rchan_cnt; - if (ud->bchan_cnt) - ch_count -=3D bitmap_weight(ud->bchan_map, ud->bchan_cnt); - ch_count -=3D bitmap_weight(ud->tchan_map, ud->tchan_cnt); - ch_count -=3D bitmap_weight(ud->rchan_map, ud->rchan_cnt); + if (ud->match_data->version =3D=3D K3_UDMA_V1) { + ch_count =3D ud->bchan_cnt + ud->tchan_cnt + ud->rchan_cnt; + if (ud->bchan_cnt) + ch_count -=3D bitmap_weight(ud->bchan_map, ud->bchan_cnt); + ch_count -=3D bitmap_weight(ud->tchan_map, ud->tchan_cnt); + ch_count -=3D bitmap_weight(ud->rchan_map, ud->rchan_cnt); + } else { + ch_count =3D ud->bchan_cnt + ud->tchan_cnt; + if (ud->bchan_cnt) + ch_count -=3D bitmap_weight(ud->bchan_map, ud->bchan_cnt); + ch_count -=3D bitmap_weight(ud->tchan_map, ud->tchan_cnt); + } if (!ch_count) return -ENODEV; =20 @@ -2507,15 +2542,25 @@ int k3_udma_setup_resources(struct udma_dev *ud) ud->rflow_cnt)); break; case DMA_TYPE_BCDMA: - dev_info(dev, - "Channels: %d (bchan: %u, tchan: %u, rchan: %u)\n", - ch_count, - ud->bchan_cnt - bitmap_weight(ud->bchan_map, - ud->bchan_cnt), - ud->tchan_cnt - bitmap_weight(ud->tchan_map, - ud->tchan_cnt), - ud->rchan_cnt - bitmap_weight(ud->rchan_map, - ud->rchan_cnt)); + if (ud->match_data->version =3D=3D K3_UDMA_V1) { + dev_info(dev, + "Channels: %d (bchan: %u, tchan: %u, rchan: %u)\n", + ch_count, + ud->bchan_cnt - bitmap_weight(ud->bchan_map, + ud->bchan_cnt), + ud->tchan_cnt - bitmap_weight(ud->tchan_map, + ud->tchan_cnt), + ud->rchan_cnt - bitmap_weight(ud->rchan_map, + ud->rchan_cnt)); + } else { + dev_info(dev, + "Channels: %d (bchan: %u, chan: %u)\n", + ch_count, + ud->bchan_cnt - bitmap_weight(ud->bchan_map, + ud->bchan_cnt), + ud->chan_cnt - bitmap_weight(ud->chan_map, + ud->chan_cnt)); + } break; case DMA_TYPE_PKTDMA: dev_info(dev, diff --git a/drivers/dma/ti/k3-udma-v2.c b/drivers/dma/ti/k3-udma-v2.c new file mode 100644 index 0000000000000..120c6d26a2dd0 --- /dev/null +++ b/drivers/dma/ti/k3-udma-v2.c @@ -0,0 +1,1325 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Derived from K3 UDMA driver (k3-udma.c) + * Copyright (C) 2024-2025 Texas Instruments Incorporated - http://www.ti= .com + * Author: Peter Ujfalusi + * Author: Sai Sree Kartheek Adivi + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../virt-dma.h" +#include "k3-udma.h" +#include "k3-psil-priv.h" + +static const char * const v2_mmr_names[] =3D { + [V2_MMR_GCFG] =3D "gcfg", + [V2_MMR_BCHANRT] =3D "bchanrt", + [V2_MMR_CHANRT] =3D "chanrt", +}; + +static int udma_v2_check_chan_autopair_completion(struct udma_chan *uc) +{ + u32 val; + + val =3D udma_chanrt_read(uc, UDMA_CHAN_RT_CTL_REG); + if (val & UDMA_CHAN_RT_CTL_PAIR_TIMEOUT) + return -ETIMEDOUT; + else if (val & UDMA_CHAN_RT_CTL_PAIR_COMPLETE) + return 1; + + /* timeout didn't occur and also pairing didn't happen yet. */ + return 0; +} + +static bool udma_v2_is_chan_paused(struct udma_chan *uc) +{ + u32 val, pause_mask; + + if (uc->config.dir =3D=3D DMA_MEM_TO_MEM) { + val =3D udma_chanrt_read(uc, UDMA_CHAN_RT_CTL_REG); + pause_mask =3D UDMA_CHAN_RT_CTL_PAUSE; + } else { + val =3D udma_chanrt_read(uc, UDMA_CHAN_RT_PDMA_STATE_REG); + pause_mask =3D UDMA_CHAN_RT_PDMA_STATE_PAUSE; + } + + if (val & pause_mask) + return true; + + return false; +} + +static void udma_v2_decrement_byte_counters(struct udma_chan *uc, u32 val) +{ + udma_chanrt_write(uc, UDMA_CHAN_RT_BCNT_REG, val); + udma_chanrt_write(uc, UDMA_CHAN_RT_SBCNT_REG, val); + if (uc->config.ep_type !=3D PSIL_EP_NATIVE) + udma_chanrt_write(uc, UDMA_CHAN_RT_PERIPH_BCNT_REG, val); +} + +static void udma_v2_reset_counters(struct udma_chan *uc) +{ + u32 val; + + val =3D udma_chanrt_read(uc, UDMA_CHAN_RT_BCNT_REG); + udma_chanrt_write(uc, UDMA_CHAN_RT_BCNT_REG, val); + + val =3D udma_chanrt_read(uc, UDMA_CHAN_RT_SBCNT_REG); + udma_chanrt_write(uc, UDMA_CHAN_RT_SBCNT_REG, val); + + val =3D udma_chanrt_read(uc, UDMA_CHAN_RT_PCNT_REG); + udma_chanrt_write(uc, UDMA_CHAN_RT_PCNT_REG, val); + + if (!uc->bchan) { + val =3D udma_chanrt_read(uc, UDMA_CHAN_RT_PERIPH_BCNT_REG); + udma_chanrt_write(uc, UDMA_CHAN_RT_PERIPH_BCNT_REG, val); + } +} + +static int udma_v2_reset_chan(struct udma_chan *uc, bool hard) +{ + udma_chanrt_write(uc, UDMA_CHAN_RT_CTL_REG, 0); + + /* Reset all counters */ + udma_v2_reset_counters(uc); + + /* Hard reset: re-initialize the channel to reset */ + if (hard) { + struct udma_chan_config ucc_backup; + int ret; + + memcpy(&ucc_backup, &uc->config, sizeof(uc->config)); + uc->ud->ddev.device_free_chan_resources(&uc->vc.chan); + + /* restore the channel configuration */ + memcpy(&uc->config, &ucc_backup, sizeof(uc->config)); + ret =3D uc->ud->ddev.device_alloc_chan_resources(&uc->vc.chan); + if (ret) + return ret; + + /* + * Setting forced teardown after forced reset helps recovering + * the rchan. + */ + if (uc->config.dir =3D=3D DMA_DEV_TO_MEM) + udma_chanrt_update_bits(uc, UDMA_CHAN_RT_CTL_REG, + UDMA_CHAN_RT_CTL_EN | UDMA_CHAN_RT_CTL_TDOWN | + UDMA_CHAN_RT_CTL_FTDOWN, + UDMA_CHAN_RT_CTL_EN | UDMA_CHAN_RT_CTL_TDOWN | + UDMA_CHAN_RT_CTL_FTDOWN); + } + uc->state =3D UDMA_CHAN_IS_IDLE; + + return 0; +} + +static int udma_v2_start(struct udma_chan *uc) +{ + struct virt_dma_desc *vd =3D vchan_next_desc(&uc->vc); + struct udma_dev *ud =3D uc->ud; + int status; + + if (!vd) { + uc->desc =3D NULL; + return -ENOENT; + } + + list_del(&vd->node); + + uc->desc =3D to_udma_desc(&vd->tx); + + /* Channel is already running and does not need reconfiguration */ + if (udma_is_chan_running(uc) && !udma_chan_needs_reconfiguration(uc)) { + udma_start_desc(uc); + goto out; + } + + /* Make sure that we clear the teardown bit, if it is set */ + ud->reset_chan(uc, false); + + /* Push descriptors before we start the channel */ + udma_start_desc(uc); + + switch (uc->config.dir) { + case DMA_DEV_TO_MEM: + /* Config remote TR */ + if (uc->config.ep_type =3D=3D PSIL_EP_PDMA_XY || + uc->config.ep_type =3D=3D PSIL_EP_PDMA_XYMF) { + u32 val =3D PDMA_STATIC_TR_Y(uc->desc->static_tr.elcnt) | + PDMA_STATIC_TR_X(uc->desc->static_tr.elsize); + const struct udma_match_data *match_data =3D + uc->ud->match_data; + + if (uc->config.enable_acc32) + val |=3D PDMA_STATIC_TR_XY_ACC32; + if (uc->config.enable_burst) + val |=3D PDMA_STATIC_TR_XY_BURST; + + udma_chanrt_write(uc, + UDMA_CHAN_RT_STATIC_TR_XY_REG, + val); + + udma_chanrt_write(uc, + UDMA_CHAN_RT_STATIC_TR_Z_REG, + PDMA_STATIC_TR_Z(uc->desc->static_tr.bstcnt, + match_data->statictr_z_mask)); + + /* save the current staticTR configuration */ + memcpy(&uc->static_tr, &uc->desc->static_tr, + sizeof(uc->static_tr)); + } + + if (uc->config.ep_type =3D=3D PSIL_EP_PDMA_XYMF) + udma_chanrt_write(uc, UDMA_CHAN_RT_FIFO_SEL_REG, uc->config.fifo_id); + + udma_chanrt_write(uc, UDMA_CHAN_RT_CTL_REG, + UDMA_CHAN_RT_CTL_EN | UDMA_CHAN_RT_CTL_AUTOPAIR); + + /* Poll for autopair completion */ + read_poll_timeout_atomic(udma_v2_check_chan_autopair_completion, + status, status !=3D 0, 100, 500, false, uc); + + if (status <=3D 0) { + udma_chanrt_write(uc, UDMA_CHAN_RT_CTL_REG, 0); + return -ETIMEDOUT; + } + + break; + case DMA_MEM_TO_DEV: + /* Config remote TR */ + if (uc->config.ep_type =3D=3D PSIL_EP_PDMA_XY || + uc->config.ep_type =3D=3D PSIL_EP_PDMA_XYMF) { + u32 val =3D PDMA_STATIC_TR_Y(uc->desc->static_tr.elcnt) | + PDMA_STATIC_TR_X(uc->desc->static_tr.elsize); + + if (uc->config.enable_acc32) + val |=3D PDMA_STATIC_TR_XY_ACC32; + if (uc->config.enable_burst) + val |=3D PDMA_STATIC_TR_XY_BURST; + + udma_chanrt_write(uc, + UDMA_CHAN_RT_STATIC_TR_XY_REG, + val); + + /* save the current staticTR configuration */ + memcpy(&uc->static_tr, &uc->desc->static_tr, + sizeof(uc->static_tr)); + } + + if (uc->config.ep_type =3D=3D PSIL_EP_PDMA_XYMF) + udma_chanrt_write(uc, UDMA_CHAN_RT_FIFO_SEL_REG, uc->config.fifo_id); + + udma_chanrt_write(uc, UDMA_CHAN_RT_CTL_REG, + UDMA_CHAN_RT_CTL_EN | UDMA_CHAN_RT_CTL_AUTOPAIR); + + /* Poll for autopair completion */ + read_poll_timeout_atomic(udma_v2_check_chan_autopair_completion, + status, status !=3D 0, 100, 500, false, uc); + + if (status <=3D 0) { + udma_chanrt_write(uc, UDMA_CHAN_RT_CTL_REG, 0); + return -ETIMEDOUT; + } + + break; + case DMA_MEM_TO_MEM: + udma_bchanrt_write(uc, UDMA_CHAN_RT_CTL_REG, + UDMA_CHAN_RT_CTL_EN); + udma_bchanrt_write(uc, UDMA_CHAN_RT_CTL_REG, + UDMA_CHAN_RT_CTL_EN); + + break; + default: + return -EINVAL; + } + + uc->state =3D UDMA_CHAN_IS_ACTIVE; +out: + + return 0; +} + +static int udma_v2_stop(struct udma_chan *uc) +{ + uc->state =3D UDMA_CHAN_IS_TERMINATING; + reinit_completion(&uc->teardown_completed); + + if (uc->config.dir =3D=3D DMA_DEV_TO_MEM) { + if (!uc->cyclic && !uc->desc) + udma_push_to_ring(uc, -1); + } + + if (uc->config.dir !=3D DMA_MEM_TO_MEM) + udma_chanrt_write(uc, UDMA_CHAN_RT_PEER_REG(8), UDMA_CHAN_RT_PEER_REG8_F= LUSH); + + udma_chanrt_update_bits(uc, UDMA_CHAN_RT_CTL_REG, + UDMA_CHAN_RT_CTL_EN | UDMA_CHAN_RT_CTL_TDOWN, + UDMA_CHAN_RT_CTL_EN | UDMA_CHAN_RT_CTL_TDOWN); + + return 0; +} + +static irqreturn_t udma_v2_udma_irq_handler(int irq, void *data) +{ + struct udma_chan *uc =3D data; + struct udma_dev *ud =3D uc->ud; + struct udma_desc *d; + + switch (uc->config.dir) { + case DMA_DEV_TO_MEM: + k3_ringacc_ring_clear_irq(uc->rflow->r_ring, + K3_RINGACC_RT_INT_STATUS_TR); + break; + case DMA_MEM_TO_DEV: + case DMA_MEM_TO_MEM: + k3_ringacc_ring_clear_irq(uc->tchan->tc_ring, + K3_RINGACC_RT_INT_STATUS_TR); + break; + default: + return -ENOENT; + } + + spin_lock(&uc->vc.lock); + d =3D uc->desc; + if (d) { + d->tr_idx =3D (d->tr_idx + 1) % d->sglen; + + if (uc->cyclic) { + vchan_cyclic_callback(&d->vd); + } else { + /* TODO: figure out the real amount of data */ + ud->decrement_byte_counters(uc, d->residue); + ud->start(uc); + vchan_cookie_complete(&d->vd); + } + } + + spin_unlock(&uc->vc.lock); + + return IRQ_HANDLED; +} + +static irqreturn_t udma_v2_ring_irq_handler(int irq, void *data) +{ + struct udma_chan *uc =3D data; + struct udma_dev *ud =3D uc->ud; + struct udma_desc *d; + dma_addr_t paddr =3D 0; + u32 intr_status, reg; + + switch (uc->config.dir) { + case DMA_DEV_TO_MEM: + intr_status =3D k3_ringacc_ring_get_irq_status(uc->rflow->r_ring); + break; + case DMA_MEM_TO_DEV: + case DMA_MEM_TO_MEM: + intr_status =3D k3_ringacc_ring_get_irq_status(uc->tchan->tc_ring); + break; + default: + return IRQ_NONE; + } + + if (!intr_status) + return IRQ_NONE; /* Not this channel's interrupt */ + + if (intr_status & K3_RINGACC_RT_INT_STATUS_TR) { + reg =3D udma_chanrt_read(uc, UDMA_CHAN_RT_CTL_REG); + + /* check teardown status */ + if ((reg & UDMA_CHAN_RT_CTL_TDOWN) && !(reg & UDMA_CHAN_RT_CTL_EN)) + complete_all(&uc->teardown_completed); + udma_v2_udma_irq_handler(irq, data); + + if (!(intr_status & K3_RINGACC_RT_INT_STATUS_COMPLETE)) + return IRQ_HANDLED; + } + + if (udma_pop_from_ring(uc, &paddr) || !paddr) + return IRQ_NONE; + + spin_lock(&uc->vc.lock); + + /* Teardown completion message */ + if (cppi5_desc_is_tdcm(paddr)) { + complete_all(&uc->teardown_completed); + + if (uc->terminated_desc) { + udma_desc_free(&uc->terminated_desc->vd); + uc->terminated_desc =3D NULL; + } + + if (!uc->desc) + ud->start(uc); + + goto out; + } + + d =3D udma_udma_desc_from_paddr(uc, paddr); + + if (d) { + dma_addr_t desc_paddr =3D udma_curr_cppi5_desc_paddr(d, + d->desc_idx); + if (desc_paddr !=3D paddr) { + dev_err(uc->ud->dev, "not matching descriptors!\n"); + goto out; + } + + if (d =3D=3D uc->desc) { + /* active descriptor */ + if (uc->cyclic) { + udma_cyclic_packet_elapsed(uc); + vchan_cyclic_callback(&d->vd); + } else { + if (udma_is_desc_really_done(uc, d)) { + ud->decrement_byte_counters(uc, d->residue); + ud->start(uc); + vchan_cookie_complete(&d->vd); + } else { + schedule_delayed_work(&uc->tx_drain.work, + 0); + } + } + } else { + /* + * terminated descriptor, mark the descriptor as + * completed to update the channel's cookie marker + */ + dma_cookie_complete(&d->vd.tx); + } + } +out: + spin_unlock(&uc->vc.lock); + + return IRQ_HANDLED; +} + +static int bcdma_v2_get_bchan(struct udma_chan *uc) +{ + struct udma_dev *ud =3D uc->ud; + enum udma_tp_level tpl; + int ret; + + if (uc->bchan) { + dev_dbg(ud->dev, "chan%d: already have bchan%d allocated\n", + uc->id, uc->bchan->id); + return 0; + } + + /* + * Use normal channels for peripherals, and highest TPL channel for + * mem2mem + */ + if (uc->config.tr_trigger_type) + tpl =3D 0; + else + tpl =3D ud->bchan_tpl.levels - 1; + + /* + * UDMA V2 uses a static 1:1 mapping between the virtual channel index + * (uc->id) and the hardware bchan/tchan/rchan index -- unlike V1, which + * dynamically allocates from a shared pool. Passing uc->id directly to + * __udma_reserve_*() is intentional, not a bug. + */ + uc->bchan =3D __udma_reserve_bchan(ud, tpl, uc->id); + if (IS_ERR(uc->bchan)) { + ret =3D PTR_ERR(uc->bchan); + uc->bchan =3D NULL; + return ret; + } + uc->chan =3D uc->bchan; + uc->tchan =3D uc->bchan; + + return 0; +} + +static int bcdma_v2_alloc_bchan_resources(struct udma_chan *uc) +{ + struct k3_ring_cfg ring_cfg; + struct udma_dev *ud =3D uc->ud; + int ret; + + ret =3D bcdma_v2_get_bchan(uc); + if (ret) + return ret; + + ret =3D k3_ringacc_request_rings_pair(ud->ringacc, ud->match_data->chan_c= nt + uc->id, -1, + &uc->bchan->t_ring, + &uc->bchan->tc_ring); + if (ret) { + ret =3D -EBUSY; + goto err_ring; + } + + memset(&ring_cfg, 0, sizeof(ring_cfg)); + ring_cfg.size =3D K3_UDMA_DEFAULT_RING_SIZE; + ring_cfg.elm_size =3D K3_RINGACC_RING_ELSIZE_8; + ring_cfg.mode =3D K3_RINGACC_RING_MODE_RING; + + k3_configure_chan_coherency(&uc->vc.chan, ud->asel); + ring_cfg.asel =3D ud->asel; + ring_cfg.dma_dev =3D dmaengine_get_dma_device(&uc->vc.chan); + + ret =3D k3_ringacc_ring_cfg(uc->bchan->t_ring, &ring_cfg); + if (ret) + goto err_ringcfg; + + return 0; + +err_ringcfg: + k3_ringacc_ring_free(uc->bchan->tc_ring); + uc->bchan->tc_ring =3D NULL; + k3_ringacc_ring_free(uc->bchan->t_ring); + uc->bchan->t_ring =3D NULL; + k3_configure_chan_coherency(&uc->vc.chan, 0); +err_ring: + bcdma_put_bchan(uc); + + return ret; +} + +static int udma_v2_alloc_tx_resources(struct udma_chan *uc) +{ + struct k3_ring_cfg ring_cfg; + struct udma_dev *ud =3D uc->ud; + struct udma_tchan *tchan; + int ring_idx, ret; + + ret =3D udma_get_tchan(uc); + if (ret) + return ret; + + tchan =3D uc->tchan; + if (tchan->tflow_id >=3D 0) + ring_idx =3D tchan->tflow_id; + else + ring_idx =3D tchan->id; + + ret =3D k3_ringacc_request_rings_pair(ud->ringacc, ring_idx, -1, + &tchan->t_ring, + &tchan->tc_ring); + if (ret) { + ret =3D -EBUSY; + goto err_ring; + } + + memset(&ring_cfg, 0, sizeof(ring_cfg)); + ring_cfg.size =3D K3_UDMA_DEFAULT_RING_SIZE; + ring_cfg.elm_size =3D K3_RINGACC_RING_ELSIZE_8; + ring_cfg.mode =3D K3_RINGACC_RING_MODE_RING; + + k3_configure_chan_coherency(&uc->vc.chan, uc->config.asel); + ring_cfg.asel =3D uc->config.asel; + ring_cfg.dma_dev =3D dmaengine_get_dma_device(&uc->vc.chan); + + ret =3D k3_ringacc_ring_cfg(tchan->t_ring, &ring_cfg); + ret |=3D k3_ringacc_ring_cfg(tchan->tc_ring, &ring_cfg); + + if (ret) + goto err_ringcfg; + + return 0; + +err_ringcfg: + k3_ringacc_ring_free(uc->tchan->tc_ring); + uc->tchan->tc_ring =3D NULL; + k3_ringacc_ring_free(uc->tchan->t_ring); + uc->tchan->t_ring =3D NULL; +err_ring: + udma_put_tchan(uc); + + return ret; +} + +static int udma_v2_alloc_rx_resources(struct udma_chan *uc) +{ + struct udma_dev *ud =3D uc->ud; + struct k3_ring_cfg ring_cfg; + struct udma_rflow *rflow; + int fd_ring_id; + int ret; + + ret =3D udma_get_rchan(uc); + if (ret) + return ret; + + /* For MEM_TO_MEM we don't need rflow or rings */ + if (uc->config.dir =3D=3D DMA_MEM_TO_MEM) + return 0; + + if (uc->config.default_flow_id >=3D 0) + ret =3D udma_get_rflow(uc, uc->config.default_flow_id); + else + ret =3D udma_get_rflow(uc, uc->rchan->id); + + if (ret) { + ret =3D -EBUSY; + goto err_rflow; + } + + rflow =3D uc->rflow; + if (ud->tflow_cnt) + fd_ring_id =3D ud->tflow_cnt + rflow->id; + else + fd_ring_id =3D uc->rchan->id; + ret =3D k3_ringacc_request_rings_pair(ud->ringacc, fd_ring_id, -1, + &rflow->fd_ring, &rflow->r_ring); + if (ret) { + ret =3D -EBUSY; + goto err_ring; + } + + memset(&ring_cfg, 0, sizeof(ring_cfg)); + + ring_cfg.elm_size =3D K3_RINGACC_RING_ELSIZE_8; + ring_cfg.size =3D K3_UDMA_DEFAULT_RING_SIZE; + ring_cfg.mode =3D K3_RINGACC_RING_MODE_RING; + + k3_configure_chan_coherency(&uc->vc.chan, uc->config.asel); + ring_cfg.asel =3D uc->config.asel; + ring_cfg.dma_dev =3D dmaengine_get_dma_device(&uc->vc.chan); + + ret =3D k3_ringacc_ring_cfg(rflow->fd_ring, &ring_cfg); + + ring_cfg.size =3D K3_UDMA_DEFAULT_RING_SIZE; + ret |=3D k3_ringacc_ring_cfg(rflow->r_ring, &ring_cfg); + + if (ret) + goto err_ringcfg; + + return 0; + +err_ringcfg: + k3_ringacc_ring_free(rflow->r_ring); + rflow->r_ring =3D NULL; + k3_ringacc_ring_free(rflow->fd_ring); + rflow->fd_ring =3D NULL; +err_ring: + udma_put_rflow(uc); +err_rflow: + udma_put_rchan(uc); + + return ret; +} + +static int bcdma_v2_alloc_chan_resources(struct dma_chan *chan) +{ + struct udma_chan *uc =3D to_udma_chan(chan); + struct udma_dev *ud =3D to_udma_dev(chan->device); + struct platform_device *pdev =3D to_platform_device(ud->dev); + char irq_name[10]; + u32 irq_ring_idx; + int ret; + + /* Only TR mode is supported */ + uc->config.pkt_mode =3D false; + + /* + * Make sure that the completion is in a known state: + * No teardown, the channel is idle + */ + reinit_completion(&uc->teardown_completed); + complete_all(&uc->teardown_completed); + uc->state =3D UDMA_CHAN_IS_IDLE; + + switch (uc->config.dir) { + case DMA_MEM_TO_MEM: + /* Non synchronized - mem to mem type of transfer */ + dev_dbg(uc->ud->dev, "%s: chan%d as MEM-to-MEM\n", __func__, + uc->id); + + ret =3D bcdma_v2_alloc_bchan_resources(uc); + if (ret) + return ret; + + irq_ring_idx =3D ud->match_data->chan_cnt + uc->id; + break; + case DMA_MEM_TO_DEV: + /* Slave transfer synchronized - mem to dev (TX) transfer */ + dev_dbg(uc->ud->dev, "%s: chan%d as MEM-to-DEV\n", __func__, + uc->id); + + ret =3D udma_v2_alloc_tx_resources(uc); + if (ret) { + uc->config.remote_thread_id =3D -1; + return ret; + } + + uc->config.src_thread =3D ud->psil_base + uc->tchan->id; + uc->config.dst_thread =3D uc->config.remote_thread_id; + uc->config.dst_thread |=3D K3_PSIL_DST_THREAD_ID_OFFSET; + + irq_ring_idx =3D uc->tchan->id; + + break; + case DMA_DEV_TO_MEM: + /* Slave transfer synchronized - dev to mem (RX) transfer */ + dev_dbg(uc->ud->dev, "%s: chan%d as DEV-to-MEM\n", __func__, + uc->id); + + ret =3D udma_v2_alloc_rx_resources(uc); + if (ret) { + uc->config.remote_thread_id =3D -1; + return ret; + } + + uc->config.src_thread =3D uc->config.remote_thread_id; + uc->config.dst_thread =3D (ud->psil_base + uc->rchan->id) | + K3_PSIL_DST_THREAD_ID_OFFSET; + + irq_ring_idx =3D uc->rchan->id; + + break; + default: + /* Can not happen */ + dev_err(uc->ud->dev, "%s: chan%d invalid direction (%u)\n", + __func__, uc->id, uc->config.dir); + return -EINVAL; + } + + /* check if the channel configuration was successful */ + if (ret) + goto err_res_free; + + if (udma_is_chan_running(uc)) { + dev_warn(ud->dev, "chan%d: is running!\n", uc->id); + ud->reset_chan(uc, false); + if (udma_is_chan_running(uc)) { + dev_err(ud->dev, "chan%d: won't stop!\n", uc->id); + ret =3D -EBUSY; + goto err_res_free; + } + } + + uc->dma_dev =3D dmaengine_get_dma_device(chan); + if (uc->config.dir =3D=3D DMA_MEM_TO_MEM && !uc->config.tr_trigger_type)= { + uc->config.hdesc_size =3D + cppi5_trdesc_calc_size(sizeof(struct cppi5_tr_type15_t), 2); + + uc->hdesc_pool =3D dma_pool_create(uc->name, ud->ddev.dev, + uc->config.hdesc_size, + ud->desc_align, + 0); + if (!uc->hdesc_pool) { + dev_err(ud->ddev.dev, + "Descriptor pool allocation failed\n"); + uc->use_dma_pool =3D false; + ret =3D -ENOMEM; + goto err_res_free; + } + + uc->use_dma_pool =3D true; + } else if (uc->config.dir !=3D DMA_MEM_TO_MEM) { + uc->psil_paired =3D true; + } + + INIT_DELAYED_WORK(&uc->tx_drain.work, udma_check_tx_completion); + + snprintf(irq_name, sizeof(irq_name), "chan%u", irq_ring_idx); + uc->irq_num_ring =3D platform_get_irq_byname(pdev, irq_name); + if (uc->irq_num_ring < 0) { + ret =3D uc->irq_num_ring; + goto err_res_free; + } + + ret =3D request_irq(uc->irq_num_ring, udma_v2_ring_irq_handler, + IRQF_SHARED | IRQF_TRIGGER_HIGH, uc->name, uc); + if (ret) { + dev_err(ud->dev, "chan%d: ring irq request failed\n", uc->id); + goto err_irq_free; + } + + udma_reset_rings(uc); + + return 0; + +err_irq_free: + uc->irq_num_ring =3D 0; + uc->irq_num_udma =3D 0; +err_res_free: + bcdma_free_bchan_resources(uc); + udma_free_tx_resources(uc); + udma_free_rx_resources(uc); + + udma_reset_uchan(uc); + + if (uc->use_dma_pool) { + dma_pool_destroy(uc->hdesc_pool); + uc->use_dma_pool =3D false; + } + + return ret; +} + +static enum dma_status udma_v2_tx_status(struct dma_chan *chan, + dma_cookie_t cookie, + struct dma_tx_state *txstate) +{ + struct udma_chan *uc =3D to_udma_chan(chan); + enum dma_status ret; + unsigned long flags; + + spin_lock_irqsave(&uc->vc.lock, flags); + + ret =3D dma_cookie_status(chan, cookie, txstate); + + if (!udma_is_chan_running(uc)) + ret =3D DMA_COMPLETE; + + if (ret =3D=3D DMA_IN_PROGRESS && udma_v2_is_chan_paused(uc)) + ret =3D DMA_PAUSED; + + if (ret =3D=3D DMA_COMPLETE || !txstate) + goto out; + + if (uc->desc && uc->desc->vd.tx.cookie =3D=3D cookie) { + u32 peer_bcnt =3D 0; + u32 bcnt =3D 0; + u32 residue =3D uc->desc->residue; + u32 delay =3D 0; + + if (uc->desc->dir =3D=3D DMA_MEM_TO_DEV) { + bcnt =3D udma_chanrt_read(uc, UDMA_CHAN_RT_SBCNT_REG); + + if (uc->config.ep_type !=3D PSIL_EP_NATIVE) { + peer_bcnt =3D udma_chanrt_read(uc, UDMA_CHAN_RT_PERIPH_BCNT_REG); + + if (bcnt > peer_bcnt) + delay =3D bcnt - peer_bcnt; + } + } else if (uc->desc->dir =3D=3D DMA_DEV_TO_MEM) { + bcnt =3D udma_chanrt_read(uc, UDMA_CHAN_RT_BCNT_REG); + + if (uc->config.ep_type !=3D PSIL_EP_NATIVE) { + peer_bcnt =3D udma_chanrt_read(uc, UDMA_CHAN_RT_PERIPH_BCNT_REG); + + if (peer_bcnt > bcnt) + delay =3D peer_bcnt - bcnt; + } + } else { + bcnt =3D udma_chanrt_read(uc, UDMA_CHAN_RT_BCNT_REG); + } + + if (bcnt && !(bcnt % uc->desc->residue)) + residue =3D 0; + else + residue -=3D bcnt % uc->desc->residue; + + if (!residue && (uc->config.dir =3D=3D DMA_DEV_TO_MEM || !delay)) { + ret =3D DMA_COMPLETE; + delay =3D 0; + } + + dma_set_residue(txstate, residue); + dma_set_in_flight_bytes(txstate, delay); + + } else { + ret =3D DMA_COMPLETE; + } + +out: + spin_unlock_irqrestore(&uc->vc.lock, flags); + return ret; +} + +static int udma_v2_pause(struct dma_chan *chan) +{ + struct udma_chan *uc =3D to_udma_chan(chan); + unsigned long flags; + + /* pause the channel */ + spin_lock_irqsave(&uc->vc.lock, flags); + udma_chanrt_update_bits(uc, UDMA_CHAN_RT_CTL_REG, + UDMA_CHAN_RT_CTL_PAUSE, UDMA_CHAN_RT_CTL_PAUSE); + spin_unlock_irqrestore(&uc->vc.lock, flags); + + return 0; +} + +static int udma_v2_resume(struct dma_chan *chan) +{ + struct udma_chan *uc =3D to_udma_chan(chan); + unsigned long flags; + + /* resume the channel */ + spin_lock_irqsave(&uc->vc.lock, flags); + udma_chanrt_update_bits(uc, UDMA_CHAN_RT_CTL_REG, + UDMA_CHAN_RT_CTL_PAUSE, 0); + spin_unlock_irqrestore(&uc->vc.lock, flags); + + return 0; +} + +static struct platform_driver bcdma_v2_driver; + +static bool udma_v2_dma_filter_fn(struct dma_chan *chan, void *param) +{ + struct udma_v2_filter_param *filter_param; + struct psil_endpoint_config *ep_config; + struct udma_chan_config *ucc; + struct udma_chan *uc; + struct udma_dev *ud; + + if (chan->device->dev->driver !=3D &bcdma_v2_driver.driver) + return false; + + uc =3D to_udma_chan(chan); + ucc =3D &uc->config; + ud =3D uc->ud; + filter_param =3D param; + + if (filter_param->asel > 15) { + dev_err(ud->dev, "Invalid channel asel: %u\n", + filter_param->asel); + return false; + } + + ucc->asel =3D filter_param->asel; + ucc->tr_trigger_type =3D filter_param->tr_trigger_type; + + if (ucc->tr_trigger_type) { + ucc->dir =3D DMA_MEM_TO_MEM; + goto triggered_bchan; + } else { + u32 thread_id; + bool dev_to_mem; + + ep_config =3D psil_get_ep_config_by_id(filter_param->channel_id, + (ud->match_data->type =3D=3D DMA_TYPE_PKTDMA), + &thread_id, &dev_to_mem); + if (IS_ERR(ep_config)) { + dev_err(ud->dev, "No config for channel %u\n", + filter_param->channel_id); + ucc->atype =3D 0; + ucc->asel =3D 0; + return false; + } + ucc->remote_thread_id =3D thread_id; + ucc->dir =3D dev_to_mem ? DMA_DEV_TO_MEM : DMA_MEM_TO_DEV; + } + if (IS_ERR(ep_config)) { + dev_err(ud->dev, "No configuration for psi-l thread 0x%04x\n", + ucc->remote_thread_id); + ucc->dir =3D DMA_MEM_TO_MEM; + ucc->remote_thread_id =3D -1; + ucc->atype =3D 0; + ucc->asel =3D 0; + return false; + } + + ucc->pkt_mode =3D ep_config->pkt_mode; + ucc->channel_tpl =3D ep_config->channel_tpl; + ucc->notdpkt =3D ep_config->notdpkt; + ucc->ep_type =3D ep_config->ep_type; + ucc->fifo_id =3D ep_config->fifo_id; + + if (ud->match_data->version =3D=3D K3_UDMA_V2 && + ep_config->mapped_channel_id >=3D 0) { + ucc->mapped_channel_id =3D ep_config->mapped_channel_id; + ucc->default_flow_id =3D ep_config->default_flow_id; + } else { + ucc->mapped_channel_id =3D -1; + ucc->default_flow_id =3D -1; + } + + ucc->needs_epib =3D ep_config->needs_epib; + ucc->psd_size =3D ep_config->psd_size; + ucc->metadata_size =3D + (ucc->needs_epib ? CPPI5_INFO0_HDESC_EPIB_SIZE : 0) + + ucc->psd_size; + + if (ucc->ep_type !=3D PSIL_EP_NATIVE) { + const struct udma_match_data *match_data =3D ud->match_data; + + if ((match_data->flags & UDMA_FLAG_PDMA_ACC32) && ep_config->pdma_acc32) + ucc->enable_acc32 =3D true; + else + ucc->enable_acc32 =3D false; + + if ((match_data->flags & UDMA_FLAG_PDMA_BURST) && ep_config->pdma_burst) + ucc->enable_burst =3D true; + else + ucc->enable_burst =3D false; + } + if (ucc->pkt_mode) + ucc->hdesc_size =3D ALIGN(sizeof(struct cppi5_host_desc_t) + + ucc->metadata_size, ud->desc_align); + + dev_dbg(ud->dev, "chan%d: Remote thread: 0x%04x (%s)\n", uc->id, + ucc->remote_thread_id, dmaengine_get_direction_text(ucc->dir)); + + return true; + +triggered_bchan: + dev_dbg(ud->dev, "chan%d: triggered channel (type: %u)\n", uc->id, + ucc->tr_trigger_type); + + return true; +} + +static struct dma_chan *udma_v2_of_xlate(struct of_phandle_args *dma_spec, + struct of_dma *ofdma) +{ + struct udma_dev *ud =3D ofdma->of_dma_data; + dma_cap_mask_t mask =3D ud->ddev.cap_mask; + struct udma_v2_filter_param filter_param; + struct dma_chan *chan; + + if (ud->match_data->type =3D=3D DMA_TYPE_BCDMA) { + if (dma_spec->args_count !=3D 4) + return NULL; + + filter_param.tr_trigger_type =3D dma_spec->args[0]; + filter_param.trigger_param =3D dma_spec->args[1]; + filter_param.channel_id =3D dma_spec->args[2]; + filter_param.asel =3D dma_spec->args[3]; + } else { + if (dma_spec->args_count !=3D 1 && dma_spec->args_count !=3D 2) + return NULL; + + filter_param.channel_id =3D dma_spec->args[0]; + filter_param.tr_trigger_type =3D 0; + if (dma_spec->args_count =3D=3D 2) + filter_param.asel =3D dma_spec->args[1]; + else + filter_param.asel =3D 0; + } + + chan =3D __dma_request_channel(&mask, udma_v2_dma_filter_fn, &filter_para= m, + ofdma->of_node); + if (!chan) { + dev_err(ud->dev, "get channel fail in %s.\n", __func__); + return ERR_PTR(-EINVAL); + } + + return chan; +} + +static struct udma_match_data bcdma_v2_am62l_data =3D { + .type =3D DMA_TYPE_BCDMA, + .version =3D K3_UDMA_V2, + .psil_base =3D 0x2000, /* for tchan and rchan, not applicable to bchan */ + .enable_memcpy_support =3D true, /* Supported via bchan */ + .flags =3D UDMA_FLAGS_J7_CLASS, + .statictr_z_mask =3D GENMASK(23, 0), + .burst_size =3D { + TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_64_BYTES, /* Normal Channels */ + 0, /* No H Channels */ + 0, /* No UH Channels */ + }, + .bchan_cnt =3D 16, + .chan_cnt =3D 128, + .tchan_cnt =3D 128, + .rchan_cnt =3D 128, +}; + +static const struct of_device_id udma_of_match[] =3D { + { + .compatible =3D "ti,am62l-dmss-bcdma", + .data =3D &bcdma_v2_am62l_data, + }, + { /* Sentinel */ }, +}; + +static const struct soc_device_attribute k3_soc_devices[] =3D { + { .family =3D "AM62LX", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, udma_of_match); + +static int udma_v2_get_mmrs(struct platform_device *pdev, struct udma_dev = *ud) +{ + int i; + + ud->mmrs[V2_MMR_GCFG] =3D devm_platform_ioremap_resource_byname(pdev, + v2_mmr_names[V2_MMR_GCFG]); + if (IS_ERR(ud->mmrs[V2_MMR_GCFG])) + return PTR_ERR(ud->mmrs[V2_MMR_GCFG]); + + ud->bchan_cnt =3D ud->match_data->bchan_cnt; + /* There are no tchan and rchan in BCDMA_V2. + * Duplicate chan as tchan and rchan to keep the common code + * in k3-udma-common.c functional for BCDMA_V2. + */ + ud->chan_cnt =3D ud->match_data->chan_cnt; + ud->tchan_cnt =3D ud->match_data->chan_cnt; + ud->rchan_cnt =3D ud->match_data->chan_cnt; + ud->rflow_cnt =3D ud->chan_cnt; + + for (i =3D 1; i < V2_MMR_LAST; i++) { + if (i =3D=3D V2_MMR_BCHANRT && ud->bchan_cnt =3D=3D 0) + continue; + if (i =3D=3D V2_MMR_CHANRT && ud->chan_cnt =3D=3D 0) + continue; + + ud->mmrs[i] =3D devm_platform_ioremap_resource_byname(pdev, v2_mmr_names= [i]); + if (IS_ERR(ud->mmrs[i])) + return PTR_ERR(ud->mmrs[i]); + } + + return 0; +} + +static int udma_v2_probe(struct platform_device *pdev) +{ + const struct soc_device_attribute *soc; + struct device *dev =3D &pdev->dev; + const struct of_device_id *match; + struct udma_dev *ud; + int ch_count, i, ret; + + ret =3D dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(48)); + if (ret) + dev_err(dev, "failed to set dma mask stuff\n"); + + ud =3D devm_kzalloc(dev, sizeof(*ud), GFP_KERNEL); + if (!ud) + return -ENOMEM; + + match =3D of_match_node(udma_of_match, dev->of_node); + if (!match) { + dev_err(dev, "No compatible match found\n"); + return -ENODEV; + } + ud->match_data =3D match->data; + + ud->soc_data =3D ud->match_data->soc_data; + if (!ud->soc_data) { + soc =3D soc_device_match(k3_soc_devices); + if (!soc) { + dev_err(dev, "No compatible SoC found\n"); + return -ENODEV; + } + ud->soc_data =3D soc->data; + } + + ud->start =3D udma_v2_start; + ud->stop =3D udma_v2_stop; + ud->reset_chan =3D udma_v2_reset_chan; + ud->decrement_byte_counters =3D udma_v2_decrement_byte_counters; + ud->bcdma_setup_sci_resources =3D NULL; + + ret =3D udma_v2_get_mmrs(pdev, ud); + if (ret) + return ret; + + struct k3_ringacc_init_data ring_init_data =3D {0}; + + ring_init_data.num_rings =3D ud->bchan_cnt + ud->chan_cnt; + + ud->ringacc =3D k3_ringacc_dmarings_init(pdev, &ring_init_data); + + if (IS_ERR(ud->ringacc)) + return PTR_ERR(ud->ringacc); + + dma_cap_set(DMA_SLAVE, ud->ddev.cap_mask); + + dma_cap_set(DMA_CYCLIC, ud->ddev.cap_mask); + ud->ddev.device_prep_dma_cyclic =3D udma_prep_dma_cyclic; + + ud->ddev.device_config =3D udma_slave_config; + ud->ddev.device_prep_slave_sg =3D udma_prep_slave_sg; + ud->ddev.device_issue_pending =3D udma_issue_pending; + ud->ddev.device_tx_status =3D udma_v2_tx_status; + ud->ddev.device_pause =3D udma_v2_pause; + ud->ddev.device_resume =3D udma_v2_resume; + ud->ddev.device_terminate_all =3D udma_terminate_all; + ud->ddev.device_synchronize =3D udma_synchronize; +#ifdef CONFIG_DEBUG_FS + ud->ddev.dbg_summary_show =3D udma_dbg_summary_show; +#endif + + ud->ddev.device_alloc_chan_resources =3D + bcdma_v2_alloc_chan_resources; + + ud->ddev.device_free_chan_resources =3D udma_free_chan_resources; + + ud->ddev.src_addr_widths =3D TI_UDMAC_BUSWIDTHS; + ud->ddev.dst_addr_widths =3D TI_UDMAC_BUSWIDTHS; + ud->ddev.directions =3D BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); + ud->ddev.residue_granularity =3D DMA_RESIDUE_GRANULARITY_BURST; + ud->ddev.desc_metadata_modes =3D DESC_METADATA_CLIENT | + DESC_METADATA_ENGINE; + if (ud->match_data->enable_memcpy_support && + !(ud->match_data->type =3D=3D DMA_TYPE_BCDMA && ud->bchan_cnt =3D=3D = 0)) { + dma_cap_set(DMA_MEMCPY, ud->ddev.cap_mask); + ud->ddev.device_prep_dma_memcpy =3D udma_prep_dma_memcpy; + ud->ddev.directions |=3D BIT(DMA_MEM_TO_MEM); + } + + ud->ddev.dev =3D dev; + ud->dev =3D dev; + ud->psil_base =3D ud->match_data->psil_base; + + INIT_LIST_HEAD(&ud->ddev.channels); + INIT_LIST_HEAD(&ud->desc_to_purge); + + ch_count =3D k3_udma_setup_resources(ud); + if (ch_count <=3D 0) + return ch_count; + + spin_lock_init(&ud->lock); + INIT_WORK(&ud->purge_work, udma_purge_desc_work); + + ud->desc_align =3D 64; + if (ud->desc_align < dma_get_cache_alignment()) + ud->desc_align =3D dma_get_cache_alignment(); + + ret =3D udma_setup_rx_flush(ud); + if (ret) + return ret; + + for (i =3D 0; i < ud->bchan_cnt; i++) { + struct udma_bchan *bchan =3D &ud->bchans[i]; + + bchan->id =3D i; + bchan->reg_rt =3D ud->mmrs[V2_MMR_BCHANRT] + i * 0x1000; + } + + for (i =3D 0; i < ud->tchan_cnt; i++) { + struct udma_tchan *tchan =3D &ud->tchans[i]; + + tchan->id =3D i; + tchan->reg_rt =3D ud->mmrs[V2_MMR_CHANRT] + i * 0x1000; + } + + for (i =3D 0; i < ud->rchan_cnt; i++) { + struct udma_rchan *rchan =3D &ud->rchans[i]; + + rchan->id =3D i; + rchan->reg_rt =3D ud->mmrs[V2_MMR_CHANRT] + i * 0x1000; + } + + for (i =3D 0; i < ud->rflow_cnt; i++) { + struct udma_rflow *rflow =3D &ud->rflows[i]; + + rflow->id =3D i; + rflow->reg_rt =3D ud->rflow_rt + i * 0x2000; + } + + for (i =3D 0; i < ch_count; i++) { + struct udma_chan *uc =3D &ud->channels[i]; + + uc->ud =3D ud; + uc->vc.desc_free =3D udma_desc_free; + uc->id =3D i; + uc->bchan =3D NULL; + uc->tchan =3D NULL; + uc->rchan =3D NULL; + uc->config.remote_thread_id =3D -1; + uc->config.mapped_channel_id =3D -1; + uc->config.default_flow_id =3D -1; + uc->config.dir =3D DMA_MEM_TO_MEM; + uc->name =3D devm_kasprintf(dev, GFP_KERNEL, "%s chan%d", + dev_name(dev), i); + + vchan_init(&uc->vc, &ud->ddev); + /* Use custom vchan completion handling */ + tasklet_setup(&uc->vc.task, udma_vchan_complete); + init_completion(&uc->teardown_completed); + INIT_DELAYED_WORK(&uc->tx_drain.work, udma_check_tx_completion); + } + + /* Configure the copy_align to the maximum burst size the device supports= */ + ud->ddev.copy_align =3D udma_get_copy_align(ud); + + ret =3D dma_async_device_register(&ud->ddev); + if (ret) { + dev_err(dev, "failed to register slave DMA engine: %d\n", ret); + return ret; + } + + platform_set_drvdata(pdev, ud); + + ret =3D of_dma_controller_register(dev->of_node, udma_v2_of_xlate, ud); + if (ret) { + dev_err(dev, "failed to register of_dma controller\n"); + dma_async_device_unregister(&ud->ddev); + } + + return ret; +} + +static int __maybe_unused udma_v2_pm_suspend(struct device *dev) +{ + struct udma_dev *ud =3D dev_get_drvdata(dev); + struct dma_device *dma_dev =3D &ud->ddev; + struct dma_chan *chan; + struct udma_chan *uc; + + list_for_each_entry(chan, &dma_dev->channels, device_node) { + if (chan->client_count) { + uc =3D to_udma_chan(chan); + /* backup the channel configuration */ + memcpy(&uc->backup_config, &uc->config, + sizeof(struct udma_chan_config)); + dev_dbg(dev, "Suspending channel %s\n", + dma_chan_name(chan)); + ud->ddev.device_free_chan_resources(chan); + } + } + + return 0; +} + +static int __maybe_unused udma_v2_pm_resume(struct device *dev) +{ + struct udma_dev *ud =3D dev_get_drvdata(dev); + struct dma_device *dma_dev =3D &ud->ddev; + struct dma_chan *chan; + struct udma_chan *uc; + int ret; + + list_for_each_entry(chan, &dma_dev->channels, device_node) { + if (chan->client_count) { + uc =3D to_udma_chan(chan); + /* restore the channel configuration */ + memcpy(&uc->config, &uc->backup_config, + sizeof(struct udma_chan_config)); + dev_dbg(dev, "Resuming channel %s\n", + dma_chan_name(chan)); + ret =3D ud->ddev.device_alloc_chan_resources(chan); + if (ret) + return ret; + } + } + + return 0; +} + +static const struct dev_pm_ops udma_pm_ops =3D { + SET_LATE_SYSTEM_SLEEP_PM_OPS(udma_v2_pm_suspend, udma_v2_pm_resume) +}; + +static struct platform_driver bcdma_v2_driver =3D { + .driver =3D { + .name =3D "ti-udma-v2", + .of_match_table =3D udma_of_match, + .suppress_bind_attrs =3D true, + .pm =3D &udma_pm_ops, + }, + .probe =3D udma_v2_probe, +}; + +module_platform_driver(bcdma_v2_driver); +MODULE_DESCRIPTION("Texas Instruments K3 UDMA v2 support"); +MODULE_LICENSE("GPL"); diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index ddedd51ab26d9..6bf35dfec5e4e 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -1810,6 +1810,7 @@ static struct dma_chan *udma_of_xlate(struct of_phand= le_args *dma_spec, =20 static struct udma_match_data am654_main_data =3D { .type =3D DMA_TYPE_UDMA, + .version =3D K3_UDMA_V1, .psil_base =3D 0x1000, .enable_memcpy_support =3D true, .statictr_z_mask =3D GENMASK(11, 0), @@ -1822,6 +1823,7 @@ static struct udma_match_data am654_main_data =3D { =20 static struct udma_match_data am654_mcu_data =3D { .type =3D DMA_TYPE_UDMA, + .version =3D K3_UDMA_V1, .psil_base =3D 0x6000, .enable_memcpy_support =3D false, .statictr_z_mask =3D GENMASK(11, 0), @@ -1834,6 +1836,7 @@ static struct udma_match_data am654_mcu_data =3D { =20 static struct udma_match_data j721e_main_data =3D { .type =3D DMA_TYPE_UDMA, + .version =3D K3_UDMA_V1, .psil_base =3D 0x1000, .enable_memcpy_support =3D true, .flags =3D UDMA_FLAGS_J7_CLASS, @@ -1847,6 +1850,7 @@ static struct udma_match_data j721e_main_data =3D { =20 static struct udma_match_data j721e_mcu_data =3D { .type =3D DMA_TYPE_UDMA, + .version =3D K3_UDMA_V1, .psil_base =3D 0x6000, .enable_memcpy_support =3D false, /* MEM_TO_MEM is slow via MCU UDMA */ .flags =3D UDMA_FLAGS_J7_CLASS, @@ -1876,6 +1880,7 @@ static struct udma_soc_data j721s2_bcdma_csi_soc_data= =3D { =20 static struct udma_match_data am62a_bcdma_csirx_data =3D { .type =3D DMA_TYPE_BCDMA, + .version =3D K3_UDMA_V1, .psil_base =3D 0x3100, .enable_memcpy_support =3D false, .burst_size =3D { @@ -1888,6 +1893,7 @@ static struct udma_match_data am62a_bcdma_csirx_data = =3D { =20 static struct udma_match_data am64_bcdma_data =3D { .type =3D DMA_TYPE_BCDMA, + .version =3D K3_UDMA_V1, .psil_base =3D 0x2000, /* for tchan and rchan, not applicable to bchan */ .enable_memcpy_support =3D true, /* Supported via bchan */ .flags =3D UDMA_FLAGS_J7_CLASS, @@ -1901,6 +1907,7 @@ static struct udma_match_data am64_bcdma_data =3D { =20 static struct udma_match_data am64_pktdma_data =3D { .type =3D DMA_TYPE_PKTDMA, + .version =3D K3_UDMA_V1, .psil_base =3D 0x1000, .enable_memcpy_support =3D false, /* PKTDMA does not support MEM_TO_MEM */ .flags =3D UDMA_FLAGS_J7_CLASS, @@ -1914,6 +1921,7 @@ static struct udma_match_data am64_pktdma_data =3D { =20 static struct udma_match_data j721s2_bcdma_csi_data =3D { .type =3D DMA_TYPE_BCDMA, + .version =3D K3_UDMA_V1, .psil_base =3D 0x2000, .enable_memcpy_support =3D false, .burst_size =3D { @@ -1926,6 +1934,7 @@ static struct udma_match_data j721s2_bcdma_csi_data = =3D { =20 static struct udma_match_data j722s_bcdma_csi_data =3D { .type =3D DMA_TYPE_BCDMA, + .version =3D K3_UDMA_V1, .psil_base =3D 0x3100, .enable_memcpy_support =3D false, .burst_size =3D { diff --git a/drivers/dma/ti/k3-udma.h b/drivers/dma/ti/k3-udma.h index d64b670d42490..b2e5455b1087e 100644 --- a/drivers/dma/ti/k3-udma.h +++ b/drivers/dma/ti/k3-udma.h @@ -32,6 +32,12 @@ #define UDMA_CHAN_RT_SWTRIG_REG 0x8 #define UDMA_CHAN_RT_STDATA_REG 0x80 =20 +#define UDMA_CHAN_RT_STATIC_TR_XY_REG 0x800 +#define UDMA_CHAN_RT_STATIC_TR_Z_REG 0x804 +#define UDMA_CHAN_RT_PERIPH_BCNT_REG 0x810 +#define UDMA_CHAN_RT_FIFO_SEL_REG 0x824 +#define UDMA_CHAN_RT_PDMA_STATE_REG 0x80c + #define UDMA_CHAN_RT_PEER_REG(i) (0x200 + ((i) * 0x4)) #define UDMA_CHAN_RT_PEER_STATIC_TR_XY_REG \ UDMA_CHAN_RT_PEER_REG(0) /* PSI-L: 0x400 */ @@ -71,8 +77,16 @@ #define UDMA_CHAN_RT_CTL_TDOWN BIT(30) #define UDMA_CHAN_RT_CTL_PAUSE BIT(29) #define UDMA_CHAN_RT_CTL_FTDOWN BIT(28) +#define UDMA_CHAN_RT_CTL_AUTOPAIR BIT(23) +#define UDMA_CHAN_RT_CTL_PAIR_TIMEOUT BIT(17) +#define UDMA_CHAN_RT_CTL_PAIR_COMPLETE BIT(16) #define UDMA_CHAN_RT_CTL_ERROR BIT(0) =20 +/* UDMA_CHAN_RT_PDMA_STATE_REG */ +#define UDMA_CHAN_RT_PDMA_STATE_IN_EVT BIT(31) +#define UDMA_CHAN_RT_PDMA_STATE_TDOWN BIT(30) +#define UDMA_CHAN_RT_PDMA_STATE_PAUSE BIT(29) + /* UDMA_CHAN_RT_PEER_RT_EN_REG */ #define UDMA_PEER_RT_EN_ENABLE BIT(31) #define UDMA_PEER_RT_EN_TEARDOWN BIT(30) @@ -103,6 +117,9 @@ */ #define PDMA_STATIC_TR_Z(x, mask) ((x) & (mask)) =20 +/* UDMA_CHAN_RT_PEER_REG(8) */ +#define UDMA_CHAN_RT_PEER_REG8_FLUSH 0x09000000 + /* Address Space Select */ #define K3_ADDRESS_ASEL_SHIFT 48 =20 @@ -208,6 +225,11 @@ enum k3_dma_type { DMA_TYPE_PKTDMA, }; =20 +enum k3_dma_version { + K3_UDMA_V1 =3D 0, + K3_UDMA_V2, +}; + enum udma_mmr { MMR_GCFG =3D 0, MMR_BCHANRT, @@ -216,6 +238,13 @@ enum udma_mmr { MMR_LAST, }; =20 +enum udma_v2_mmr { + V2_MMR_GCFG =3D 0, + V2_MMR_BCHANRT, + V2_MMR_CHANRT, + V2_MMR_LAST, +}; + struct udma_filter_param { int remote_thread_id; u32 atype; @@ -223,6 +252,13 @@ struct udma_filter_param { u32 tr_trigger_type; }; =20 +struct udma_v2_filter_param { + u32 tr_trigger_type; + u32 trigger_param; + u32 channel_id; + u32 asel; +}; + struct udma_tchan { void __iomem *reg_rt; =20 @@ -234,17 +270,13 @@ struct udma_tchan { }; =20 #define udma_bchan udma_tchan +#define udma_rchan udma_tchan =20 struct udma_rflow { int id; struct k3_ring *fd_ring; /* Free Descriptor ring */ struct k3_ring *r_ring; /* Receive ring */ -}; - -struct udma_rchan { void __iomem *reg_rt; - - int id; }; =20 struct udma_oes_offsets { @@ -266,12 +298,19 @@ struct udma_oes_offsets { =20 struct udma_match_data { enum k3_dma_type type; + enum k3_dma_version version; u32 psil_base; bool enable_memcpy_support; u32 flags; u32 statictr_z_mask; u8 burst_size[3]; struct udma_soc_data *soc_data; + u32 bchan_cnt; + u32 chan_cnt; + u32 tchan_cnt; + u32 rchan_cnt; + u32 tflow_cnt; + u32 rflow_cnt; }; =20 struct udma_soc_data { @@ -306,6 +345,7 @@ struct udma_dev { struct dma_device ddev; struct device *dev; void __iomem *mmrs[MMR_LAST]; + void __iomem *rflow_rt; const struct udma_match_data *match_data; const struct udma_soc_data *soc_data; =20 @@ -326,12 +366,14 @@ struct udma_dev { struct udma_rx_flush rx_flush; =20 int bchan_cnt; + int chan_cnt; int tchan_cnt; int echan_cnt; int rchan_cnt; int rflow_cnt; int tflow_cnt; unsigned long *bchan_map; + unsigned long *chan_map; unsigned long *tchan_map; unsigned long *rchan_map; unsigned long *rflow_gp_map; @@ -340,6 +382,7 @@ struct udma_dev { unsigned long *tflow_map; =20 struct udma_bchan *bchans; + struct udma_tchan *chans; struct udma_tchan *tchans; struct udma_rchan *rchans; struct udma_rflow *rflows; @@ -411,6 +454,7 @@ struct udma_chan_config { bool enable_acc32; bool enable_burst; enum udma_tp_level channel_tpl; /* Channel Throughput Level */ + u8 fifo_id; /* XYMF FIFO index */ =20 u32 tr_trigger_type; unsigned long tx_flags; @@ -434,6 +478,7 @@ struct udma_chan { char *name; =20 struct udma_bchan *bchan; + struct udma_tchan *chan; struct udma_tchan *tchan; struct udma_rchan *rchan; struct udma_rflow *rflow; @@ -503,51 +548,33 @@ static inline void udma_update_bits(void __iomem *bas= e, int reg, writel(tmp, base + reg); } =20 -/* TCHANRT */ -static inline u32 udma_tchanrt_read(struct udma_chan *uc, int reg) -{ - if (!uc->tchan) - return 0; - return udma_read(uc->tchan->reg_rt, reg); -} - -static inline void udma_tchanrt_write(struct udma_chan *uc, int reg, u32 v= al) -{ - if (!uc->tchan) - return; - udma_write(uc->tchan->reg_rt, reg, val); +#define _UDMA_REG_ACCESS(channel) \ +static inline u32 udma_##channel##rt_read(struct udma_chan *uc, int reg) \ +{ \ + if (!uc->channel) \ + return 0; \ + return udma_read(uc->channel->reg_rt, reg); \ +} \ +\ +static inline void udma_##channel##rt_write(struct udma_chan *uc, int reg,= u32 val) \ +{ \ + if (!uc->channel) \ + return; \ + udma_write(uc->channel->reg_rt, reg, val); \ +} \ +\ +static inline void udma_##channel##rt_update_bits(struct udma_chan *uc, in= t reg, \ + u32 mask, u32 val) \ +{ \ + if (!uc->channel) \ + return; \ + udma_update_bits(uc->channel->reg_rt, reg, mask, val); \ } =20 -static inline void udma_tchanrt_update_bits(struct udma_chan *uc, int reg, - u32 mask, u32 val) -{ - if (!uc->tchan) - return; - udma_update_bits(uc->tchan->reg_rt, reg, mask, val); -} - -/* RCHANRT */ -static inline u32 udma_rchanrt_read(struct udma_chan *uc, int reg) -{ - if (!uc->rchan) - return 0; - return udma_read(uc->rchan->reg_rt, reg); -} - -static inline void udma_rchanrt_write(struct udma_chan *uc, int reg, u32 v= al) -{ - if (!uc->rchan) - return; - udma_write(uc->rchan->reg_rt, reg, val); -} - -static inline void udma_rchanrt_update_bits(struct udma_chan *uc, int reg, - u32 mask, u32 val) -{ - if (!uc->rchan) - return; - udma_update_bits(uc->rchan->reg_rt, reg, mask, val); -} +_UDMA_REG_ACCESS(chan); +_UDMA_REG_ACCESS(bchan); +_UDMA_REG_ACCESS(tchan); +_UDMA_REG_ACCESS(rchan); =20 static inline dma_addr_t udma_curr_cppi5_desc_paddr(struct udma_desc *d, int idx) diff --git a/include/linux/soc/ti/k3-ringacc.h b/include/linux/soc/ti/k3-ri= ngacc.h index 4b6ec925e2f2d..deb2c569ed14e 100644 --- a/include/linux/soc/ti/k3-ringacc.h +++ b/include/linux/soc/ti/k3-ringacc.h @@ -10,6 +10,9 @@ =20 #include =20 +#define K3_RINGACC_RT_INT_STATUS_COMPLETE BIT(0) +#define K3_RINGACC_RT_INT_STATUS_TR BIT(2) + struct device_node; =20 /** --=20 2.54.0 From nobody Thu Sep 24 17:02:17 2026 Received: from mx0a-0002e601.pphosted.com (mx0a-0002e601.pphosted.com [148.163.150.75]) (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 E54FB4FDA59; Tue, 22 Sep 2026 06:51:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.150.75 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059883; cv=fail; b=G1aBdCJckE7RPekEvgKgYSKEgEtH++2WqTUmKE82VLyaOKanQhycYTlg1jAfTRq6fyFHcQTROhe2PiiQDxtF9VRvNRswhBk6R/DNTIMxw/Bpwuo+R94ivviGQkPrFMfGRN+zmzQD03xkj+U1mIVf1lWlUHnOMFVaznCuZSnt2t4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059883; c=relaxed/simple; bh=A2P2vemd6JRBWLoyc+qomC7VKq5LpNBDddtH4AxqhbE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XP9K7fC9irx9mLZ4CYoqJXf+Tbuf+lVMeiASnd8nTOcYyk2zdN2AR9/aCf0EblAxTmvNXqC8yLaR/NDFSY2kvJudei/NyJ94MWNlD/GGqIXQHllt+IhNeoikJ3UipMGuYRxPsiHEcfch0c6YFPHAOMsM/N3jll2Xa+J5plEKSWc= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=HPGxlbTZ; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=SbsvI+wf; arc=fail smtp.client-ip=148.163.150.75 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="HPGxlbTZ"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="SbsvI+wf" Received: from pps.filterd (m0380145.ppops.net [127.0.0.1]) by m0380145.ppops.net (8.18.1.11/8.18.1.11) with ESMTP id 68M5rBwI932459; Tue, 22 Sep 2026 01:51:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=5j/umJCJf+JShg1sYVAxj1kRv5HnjgoFZOFXei055 FY=; b=HPGxlbTZ5gw9kCGUJwBiDFNqo28F2ofRTwHrEKzo12flDV2QJyIPvbFx0 sSyWd4tN3M7eTsGNq9PKOeU+sN2MJFeMAqG04urrK0CR3lLUrPj4p5lI5x0MJ/7y b/ZMgKR1xorEU3aNPwAJI5I87dkEyvYzoZclapFubpfWK8mHg80AIlmSDR0Qr5UD FYHaLVGap1Jv2zZkwQd4Mw3o7hpNv9Gg/x2pU6Pv421pGXq69uH8/0Zne1D6L9Dv LT7GTAjpIxCwHDi5pKIQTGU/oS7a5ANvSq6opAdjNFud+H3FhGW0jvoS+0QVoy5y u5yFNKRB/4vnG8yt/PCO6gZplMuGw== Received: from byapr05cu005.outbound.protection.outlook.com (mail-westusazon11010004.outbound.protection.outlook.com [52.101.85.4]) by m0380145.ppops.net (PPS) with ESMTPS id 4guf4x1v7e-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:51:06 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tWxmPSBVs4ccN2VKBdEzqQk7wbt1ZB/2LOI1r3VpxLerEXQgcffHRdqxn/CO3z54dbCBW+w32omDVfdpWGwdPd+QR7nuc0+GRL9/mRNStHZrTct3DupGoO5D4/InXyV+Ha4TYimrgHiM69nL/VbTHzmh0dY0nu4j0m+Sdk0F0iea5QeT0gUbNv3BuJUYwSExnS9e2Xfs7RSYIq7Cwf9PmSM6qn2TFqXSBjbnzPCyKt8v69lBr+XxzZWDSemb1e6usRMQ/88cJpqxjVHfRFVMFSZqzelSp1ajMQbakdHWp40VLq6pCuMTt6y1LQyU0xcGPkUj3t8/eydqIOvQyCrdVw== 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=5j/umJCJf+JShg1sYVAxj1kRv5HnjgoFZOFXei055FY=; b=EOsv+t2ABr0xo5NBJ7A/Jt6GMmjT+XHsZ5oOlggIKtN7KL7YzBZa4R5wE9A5PjLuiXz1CMKq+8NUkZrS9m3KCOkLAY2Ef7MyTrvrJ0ffSIVmMclXJHc11vh3uVV6UrIHMQeV2SwiJlSoArwIJ9hEWQ50Ec92KoP22oGAtQ7OeKGbEJZjqIL5gMgjYvzvgE0nVyMjqVj73/PVbTPi4dM2iTNHwa3KofGwuCVhip0PE0mJc6yV9NJwQrRnF/JspZtrzTHMHtYdN8qUHMgVnZwiXQEFa6ArcPWKSa+nOski/jdjTApT8UwaHA+gRtpzqm4aSQrGn7VnMb+XB1B3mbqYVw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.23.194) smtp.rcpttodomain=nxp.com 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=5j/umJCJf+JShg1sYVAxj1kRv5HnjgoFZOFXei055FY=; b=SbsvI+wfk03iMpr5hBtdIDHhlsxUyo7vRjsg5C/v0Q0RBDhdhvh7PmkPix+OIraoPBXSFa0p4HDEEcLRPj/Lr+acvRwRGkv1+dLOZd76QEpOYn7yFUd0YpTGk6rhTXYkeQ4QZQYhTXfmjdsb0nuKYPz0KwJw3V8DSYNMi7u7iRc= Received: from CY5PR17CA0048.namprd17.prod.outlook.com (2603:10b6:930:12::9) by PH7PR10MB6355.namprd10.prod.outlook.com (2603:10b6:510:1b6::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.13; Tue, 22 Sep 2026 06:51:01 +0000 Received: from SJ5PEPF00000204.namprd05.prod.outlook.com (2603:10b6:930:12:cafe::6) by CY5PR17CA0048.outlook.office365.com (2603:10b6:930:12::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.14 via Frontend Transport; Tue, 22 Sep 2026 06:51:01 +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 SJ5PEPF00000204.mail.protection.outlook.com (10.167.244.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:51:01 +0000 Received: from DLEE214.ent.ti.com (157.170.170.117) 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.45; Tue, 22 Sep 2026 01:50:47 -0500 Received: from DLEE215.ent.ti.com (157.170.170.118) by DLEE214.ent.ti.com (157.170.170.117) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:47 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DLEE215.ent.ti.com (157.170.170.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:50:47 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI493626771; Tue, 22 Sep 2026 01:50:43 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 17/19] dmaengine: ti: k3-udma-v2: Add support for PKTDMA V2 Date: Tue, 22 Sep 2026 12:17:41 +0530 Message-ID: <20260922064902.2719979-18-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF00000204:EE_|PH7PR10MB6355:EE_ X-MS-Office365-Filtering-Correlation-Id: be2644b0-4cdf-45ae-36d0-08df1875dd5e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|23010399003|82310400026|36860700016|921020|6133799003|10067099003|56012099006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: x1zLzT7BU1y04DnBxjr7dKWU6r/Q/8SeIGMMu8sKzq6+E6yi+oezyi9ChJCR7taGB4PR6Y+g9V0hff+6IkwR9bwBA6nE93+DxP8X1gajLy2a1sr9GfRuorDpe+WTjWL2OK7L5/6pe0kPAHd2Z77UULC3QPUvYcdGA2p++MAFBFZEMkyDz2K9T09eexM7ojdL5FcAc5/PsBN23kX823ex8ENvwsVsTn0SpRfyesp29x7zip+6JZ4spFQGsbm5g0vw4MK6i/BhxpFS9s6xSE+MBn6463QVKIRZS4tsOjTnDjOXsdkzdidp7O38cemZjkB4OHbPFraYbnPtxsORAfL8jD6mLgkEdREIkbeQIuCSqJJzFkOsYX4TcgQ/9i9DWuB84O6XjqX46QIfRw5T8ln9s8tSSHcpnIMI04MTLfbL2JyGaLGvzj0rO3DCJD0sIr+XqCYbY4FppOiayH0f0HZnFIppQc0tHWY+aPpa1yauAJCA8qweetzwoQN0mQeIulZQFUeSWIA65EyGkT8ZSIbS7y7zvAcmDL60aqmTjDDd3ghhOItB0AzWllid8qKPWEa+3iABgybuAoKZ2aHaydAexbcYVbtVyLn1Oss5rQfuU13J7J9bSFk9BgqBceaySIx2hlwXbz2H2VYOLxMz6z8S2bjNdKlj0KAjlKrGumRHK8u3SYIbw+J7H8k7OnDz7SCw0k8bjmT4vtpLjrkM6+Y5wReEkt+vkhpxD+DcLLPNiZoJHGXgzIx2cxlris88mB/y 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)(376014)(7416014)(1800799024)(23010399003)(82310400026)(36860700016)(921020)(6133799003)(10067099003)(56012099006)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0ZvE/MBLPxG/2RtF/mQHIU2Fe+gvzN6sd6JwHsFwvoqf+A8ZZjJPdGi0JEi0FTgWdi+J8wXcHfGUulvOxVtVVOX56GkYE0UGGUdlCLp6wyFG5PtTU/cexTZzrSwtPtVlEPfdJyVnH9FKcAsuj1mtbMhhrN/DfraP7w+bLiPWAVGQRGfHFPfnbPnICSgVbBwvbI5viWfGj97smWxsGzNm8jBSxdM0Ncn2H3h0uxklIuTSVZDGGZCoTr5n4ZP0jC+Umb4ZZVxjDxgmAIhPCDDIfFmiA4m5HVEIXSmz8MwKMf+Gj+A9s0miJ5fp350NTPHlXAzJjx4aVUaILqtmuEPkNcFgRo5KEKS4wjtP9LRK2LqmV71XDGdA096D3i2y1B47M6bsaD1pDdgjzm2eokygBf4uXAeE00pVnT9arjzZLvI8DG850tMkBtju4ylZYeXI X-Exchange-RoutingPolicyChecked: yjifSZ0LQaFLg7ZyqLmTDRrDyL75PrF9S9bFjv5gblNTwqEiZbwd3kvibDdQLUnwUIBbk2Y69vYN7ASQ0u8Sp+ynr9WkwvZLmzCK8YT2il3lt2sAvE0/bHnzJQ4bS4Rn2PBFqbwyTKhMJ1Q/3lRnbP0YCnNUOGaZeUSVdJzcPSyPpahS0aG0zRhmfDOxbKSPFKDVOY+na2cmGBP0gzEB2w0bqdrcTqOr24SLSuJAuPSWbyRTV2W/aTmyyJvv1KQS2LRTUB0OEvzUononFUCO7dWefisd3p2KR21+xmf1eYYRIt9YROLRoZdNcqjTJ8WJ1d9/ldHEDrEzSy4gKPyHDA== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:51:01.2663 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: be2644b0-4cdf-45ae-36d0-08df1875dd5e 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: SJ5PEPF00000204.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6355 X-Proofpoint-ORIG-GUID: ekfjbNSqnLDOU2pakh1MCAFTOfZjoSfx X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX7ZMy/cf3s6/P Q2fErukZDL4SH5J9rICbhccECYpISDyQAfkNqC7nYSIVFZ5HjL7d4+7e63NvJG9Lv09D92+U6yP AZhfTWoj33/SCqFVYZW3Lsti1rt/IY7NVDIUnBaizlqmw7B3ulQHcze+KaevOocIhdvUzjBWZR3 aswuAiajP63av91DXQfc930aYVh4Ex2Wx/1ZMyz7BPqwq9P8bq1f8OnkhdqxSnROpnOT6iFWx0A NV+cD0w2HQLJw0lXdB7aiNLpB0mUldbhsqeTOda9GXpYqLGaA8NopB9OYe99/kTyR3WFuIOXgyQ tIQ6GwIlRAjB9U1wXte/+MRXpq3f67RAq4ODyWtNRGcM+o0CLlhHY5QMIPRjQmpTyDL7FUlWrDe ONMsq2hyPPm/ikBXC2xECeGv9Np6NwU8NONHD+c5b3PuUH+X6qkdGAxleisOUlw9/NluUaQs3QL Aowj6q60zzH/+yUNFwQ== X-Proofpoint-GUID: ekfjbNSqnLDOU2pakh1MCAFTOfZjoSfx X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX7XQEoXO3uJZp GZXuol/DZM2Kuj9kAh7IXSHtx+PQxP1kiBDVV8K4/ezBV09ZZAez7UzBj0rku2oZ7JzkF3kttUK pa8rO3qdoMJl1vN9UMcfyWh1J1UoUFs= X-Authority-Analysis: v=2.4 cv=XYYcX455 c=1 sm=1 tr=0 ts=6ab2255a cx=c_pps a=GX94MXth5n4ySrE0IhOemQ==:117 a=WotqVVQAdb04rnGuttW3Kw==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=s63m1ICgrNkA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=gO1vWkAQAl3rybz1DQOp:22 a=sozttTNsAAAA:8 a=kuJ5fwJTF0DCxNmv2DYA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 clxscore=1015 bulkscore=0 phishscore=0 adultscore=0 malwarescore=0 suspectscore=0 priorityscore=1501 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220097 Content-Type: text/plain; charset="utf-8" The PKTDMA V2 is different than the existing PKTDMA supported by the k3-udma driver. The changes in PKTDMA V2 are: - Autopair: There is no longer a need for PSIL pair and AUTOPAIR bit needs to set in the RT_CTL register. - Static channel mapping: Each channel is mapped to a single peripheral. - Direct IRQs: There is no INT-A and interrupt lines from DMA are directly connected to GIC. - Remote side configuration handled by DMA. So no need to write to PEER registers to START / STOP / PAUSE / TEARDOWN. - Unified Channel Space: Tx and Rx channels share a single register space. Each channel index is specifically fixed in hardware as either Tx or Rx in an interleaved manner. Signed-off-by: Sai Sree Kartheek Adivi --- drivers/dma/ti/k3-udma-common.c | 35 +++-- drivers/dma/ti/k3-udma-glue.c | 23 ++++ drivers/dma/ti/k3-udma-private.c | 22 ++- drivers/dma/ti/k3-udma-v2.c | 226 +++++++++++++++++++++++++++++-- drivers/dma/ti/k3-udma.h | 3 + 5 files changed, 281 insertions(+), 28 deletions(-) diff --git a/drivers/dma/ti/k3-udma-common.c b/drivers/dma/ti/k3-udma-commo= n.c index 1ddaab39692db..1220ac13c5fd1 100644 --- a/drivers/dma/ti/k3-udma-common.c +++ b/drivers/dma/ti/k3-udma-common.c @@ -2462,9 +2462,16 @@ static int pktdma_setup_resources(struct udma_dev *u= d) ud->tchan_map =3D devm_bitmap_zalloc(dev, ud->tchan_cnt, GFP_KERNEL); ud->tchans =3D devm_kcalloc(dev, ud->tchan_cnt, sizeof(*ud->tchans), GFP_KERNEL); - ud->rchan_map =3D devm_bitmap_zalloc(dev, ud->rchan_cnt, GFP_KERNEL); - ud->rchans =3D devm_kcalloc(dev, ud->rchan_cnt, sizeof(*ud->rchans), - GFP_KERNEL); + if (ud->match_data->version =3D=3D K3_UDMA_V1) { + ud->rchan_map =3D devm_bitmap_zalloc(dev, ud->rchan_cnt, GFP_KERNEL); + ud->rchans =3D devm_kcalloc(dev, ud->rchan_cnt, sizeof(*ud->rchans), + GFP_KERNEL); + } else { + ud->rchan_map =3D ud->tchan_map; + ud->rchans =3D ud->tchans; + ud->chan_map =3D ud->tchan_map; + ud->chans =3D ud->tchans; + } ud->rflow_in_use =3D devm_kcalloc(dev, BITS_TO_LONGS(ud->rflow_cnt), sizeof(unsigned long), GFP_KERNEL); @@ -2563,13 +2570,21 @@ int k3_udma_setup_resources(struct udma_dev *ud) } break; case DMA_TYPE_PKTDMA: - dev_info(dev, - "Channels: %d (tchan: %u, rchan: %u)\n", - ch_count, - ud->tchan_cnt - bitmap_weight(ud->tchan_map, - ud->tchan_cnt), - ud->rchan_cnt - bitmap_weight(ud->rchan_map, - ud->rchan_cnt)); + if (ud->match_data->version =3D=3D K3_UDMA_V1) { + dev_info(dev, + "Channels: %d (tchan: %u, rchan: %u)\n", + ch_count, + ud->tchan_cnt - bitmap_weight(ud->tchan_map, + ud->tchan_cnt), + ud->rchan_cnt - bitmap_weight(ud->rchan_map, + ud->rchan_cnt)); + } else { + dev_info(dev, + "Channels: %d (tchan + rchan: %u)\n", + ch_count, + ud->chan_cnt - bitmap_weight(ud->chan_map, + ud->chan_cnt)); + } break; default: break; diff --git a/drivers/dma/ti/k3-udma-glue.c b/drivers/dma/ti/k3-udma-glue.c index 70eaf7ee57e68..3721edf71f9b3 100644 --- a/drivers/dma/ti/k3-udma-glue.c +++ b/drivers/dma/ti/k3-udma-glue.c @@ -166,6 +166,29 @@ static int of_k3_udma_glue_parse_chn(struct device_nod= e *chn_np, goto out_put_spec; =20 thread_id =3D dma_spec.args[0]; + + /* + * V2 PKTDMA DT specifiers encode the hardware flow/channel ID in + * args[0] rather than the PSI-L thread ID used by V1. Resolve the + * PSI-L thread ID before the common path checks the direction bit. + */ + if (common->udmax->match_data->version =3D=3D K3_UDMA_V2 && + xudma_is_pktdma(common->udmax)) { + struct psil_endpoint_config *ep_cfg; + u32 psil_thread_id; + bool dev_to_mem; + + ep_cfg =3D psil_get_ep_config_by_id(thread_id, DMA_TYPE_PKTDMA, + &psil_thread_id, &dev_to_mem); + if (IS_ERR(ep_cfg)) { + dev_err(common->dev, + "No PSI-L config for flow %u\n", thread_id); + ret =3D PTR_ERR(ep_cfg); + goto out_put_spec; + } + thread_id =3D psil_thread_id; + } + if (dma_spec.args_count =3D=3D 2) { if (dma_spec.args[1] > 2 && !xudma_is_pktdma(common->udmax)) { dev_err(common->dev, "Invalid channel atype: %u\n", diff --git a/drivers/dma/ti/k3-udma-private.c b/drivers/dma/ti/k3-udma-priv= ate.c index 44c097fff5ee6..525155d3bb513 100644 --- a/drivers/dma/ti/k3-udma-private.c +++ b/drivers/dma/ti/k3-udma-private.c @@ -174,16 +174,30 @@ EXPORT_SYMBOL(xudma_is_pktdma); =20 int xudma_pktdma_tflow_get_irq(struct udma_dev *ud, int udma_tflow_id) { - const struct udma_oes_offsets *oes =3D &ud->soc_data->oes; + if (ud->match_data->version =3D=3D K3_UDMA_V1) { + const struct udma_oes_offsets *oes =3D &ud->soc_data->oes; =20 - return msi_get_virq(ud->dev, udma_tflow_id + oes->pktdma_tchan_flow); + return msi_get_virq(ud->dev, udma_tflow_id + oes->pktdma_tchan_flow); + } + struct platform_device *pdev =3D to_platform_device(ud->dev); + char irq_name[10]; + + snprintf(irq_name, sizeof(irq_name), "tx-%u", udma_tflow_id); + return platform_get_irq_byname(pdev, irq_name); } EXPORT_SYMBOL(xudma_pktdma_tflow_get_irq); =20 int xudma_pktdma_rflow_get_irq(struct udma_dev *ud, int udma_rflow_id) { - const struct udma_oes_offsets *oes =3D &ud->soc_data->oes; + if (ud->match_data->version =3D=3D K3_UDMA_V1) { + const struct udma_oes_offsets *oes =3D &ud->soc_data->oes; + + return msi_get_virq(ud->dev, udma_rflow_id + oes->pktdma_rchan_flow); + } + struct platform_device *pdev =3D to_platform_device(ud->dev); + char irq_name[10]; =20 - return msi_get_virq(ud->dev, udma_rflow_id + oes->pktdma_rchan_flow); + snprintf(irq_name, sizeof(irq_name), "rx-%u", udma_rflow_id); + return platform_get_irq_byname(pdev, irq_name); } EXPORT_SYMBOL(xudma_pktdma_rflow_get_irq); diff --git a/drivers/dma/ti/k3-udma-v2.c b/drivers/dma/ti/k3-udma-v2.c index 120c6d26a2dd0..b8047ce151b59 100644 --- a/drivers/dma/ti/k3-udma-v2.c +++ b/drivers/dma/ti/k3-udma-v2.c @@ -578,7 +578,7 @@ static int udma_v2_alloc_rx_resources(struct udma_chan = *uc) =20 rflow =3D uc->rflow; if (ud->tflow_cnt) - fd_ring_id =3D ud->tflow_cnt + rflow->id; + fd_ring_id =3D rflow->id; else fd_ring_id =3D uc->rchan->id; ret =3D k3_ringacc_request_rings_pair(ud->ringacc, fd_ring_id, -1, @@ -770,6 +770,148 @@ static int bcdma_v2_alloc_chan_resources(struct dma_c= han *chan) return ret; } =20 +static int pktdma_v2_alloc_chan_resources(struct dma_chan *chan) +{ + struct udma_chan *uc =3D to_udma_chan(chan); + struct udma_dev *ud =3D to_udma_dev(chan->device); + struct platform_device *pdev =3D to_platform_device(ud->dev); + char irq_name[10]; + u32 irq_ring_idx; + int ret; + + /* + * Make sure that the completion is in a known state: + * No teardown, the channel is idle + */ + reinit_completion(&uc->teardown_completed); + complete_all(&uc->teardown_completed); + uc->state =3D UDMA_CHAN_IS_IDLE; + + switch (uc->config.dir) { + case DMA_MEM_TO_DEV: + /* Slave transfer synchronized - mem to dev (TX) transfer */ + dev_dbg(uc->ud->dev, "%s: chan%d as MEM-to-DEV\n", __func__, + uc->id); + + ret =3D udma_v2_alloc_tx_resources(uc); + if (ret) { + uc->config.remote_thread_id =3D -1; + return ret; + } + + uc->config.src_thread =3D ud->psil_base + uc->tchan->id; + uc->config.dst_thread =3D uc->config.remote_thread_id; + uc->config.dst_thread |=3D K3_PSIL_DST_THREAD_ID_OFFSET; + + irq_ring_idx =3D uc->config.mapped_channel_id; + break; + case DMA_DEV_TO_MEM: + /* Slave transfer synchronized - dev to mem (RX) transfer */ + dev_dbg(uc->ud->dev, "%s: chan%d as DEV-to-MEM\n", __func__, + uc->id); + + ret =3D udma_v2_alloc_rx_resources(uc); + if (ret) { + uc->config.remote_thread_id =3D -1; + return ret; + } + + uc->config.src_thread =3D uc->config.remote_thread_id; + uc->config.dst_thread =3D (ud->psil_base + uc->rchan->id) | + K3_PSIL_DST_THREAD_ID_OFFSET; + + irq_ring_idx =3D uc->config.mapped_channel_id; + udma_write(uc->rflow->reg_rt, UDMA_RX_FLOWRT_RFA, BIT(28)); + break; + default: + /* Can not happen */ + dev_err(uc->ud->dev, "%s: chan%d invalid direction (%u)\n", + __func__, uc->id, uc->config.dir); + return -EINVAL; + } + + /* check if the channel configuration was successful */ + if (ret) + goto err_res_free; + + if (udma_is_chan_running(uc)) { + dev_warn(ud->dev, "chan%d: is running!\n", uc->id); + ud->reset_chan(uc, false); + if (udma_is_chan_running(uc)) { + dev_err(ud->dev, "chan%d: won't stop!\n", uc->id); + ret =3D -EBUSY; + goto err_res_free; + } + } + + uc->dma_dev =3D dmaengine_get_dma_device(chan); + uc->hdesc_pool =3D dma_pool_create(uc->name, uc->dma_dev, + uc->config.hdesc_size, ud->desc_align, + 0); + if (!uc->hdesc_pool) { + dev_err(ud->ddev.dev, + "Descriptor pool allocation failed\n"); + uc->use_dma_pool =3D false; + ret =3D -ENOMEM; + goto err_res_free; + } + + uc->use_dma_pool =3D true; + + uc->psil_paired =3D true; + + INIT_DELAYED_WORK(&uc->tx_drain.work, udma_check_tx_completion); + + if (uc->config.dir =3D=3D DMA_MEM_TO_DEV) + snprintf(irq_name, sizeof(irq_name), "tx-%u", irq_ring_idx); + else + snprintf(irq_name, sizeof(irq_name), "rx-%u", irq_ring_idx); + uc->irq_num_ring =3D platform_get_irq_byname(pdev, irq_name); + if (uc->irq_num_ring < 0) { + ret =3D uc->irq_num_ring; + goto err_res_free; + } + + ret =3D request_irq(uc->irq_num_ring, udma_v2_ring_irq_handler, + IRQF_SHARED | IRQF_TRIGGER_HIGH, uc->name, uc); + + if (ret) { + dev_err(ud->dev, "chan%d: ring irq request failed\n", uc->id); + goto err_irq_free; + } + + uc->irq_num_udma =3D 0; + + udma_reset_rings(uc); + + if (uc->tchan) + dev_dbg(ud->dev, + "chan%d: tchan%d, tflow%d, Remote thread: 0x%04x\n", + uc->id, uc->tchan->id, uc->tchan->tflow_id, + uc->config.remote_thread_id); + else if (uc->rchan) + dev_dbg(ud->dev, + "chan%d: rchan%d, rflow%d, Remote thread: 0x%04x\n", + uc->id, uc->rchan->id, uc->rflow->id, + uc->config.remote_thread_id); + return 0; + +err_irq_free: + uc->irq_num_ring =3D 0; +err_res_free: + udma_free_tx_resources(uc); + udma_free_rx_resources(uc); + + udma_reset_uchan(uc); + + if (uc->use_dma_pool) { + dma_pool_destroy(uc->hdesc_pool); + uc->use_dma_pool =3D false; + } + + return ret; +} + static enum dma_status udma_v2_tx_status(struct dma_chan *chan, dma_cookie_t cookie, struct dma_tx_state *txstate) @@ -870,6 +1012,7 @@ static int udma_v2_resume(struct dma_chan *chan) } =20 static struct platform_driver bcdma_v2_driver; +static struct platform_driver pktdma_v2_driver; =20 static bool udma_v2_dma_filter_fn(struct dma_chan *chan, void *param) { @@ -879,7 +1022,8 @@ static bool udma_v2_dma_filter_fn(struct dma_chan *cha= n, void *param) struct udma_chan *uc; struct udma_dev *ud; =20 - if (chan->device->dev->driver !=3D &bcdma_v2_driver.driver) + if (chan->device->dev->driver !=3D &bcdma_v2_driver.driver && + chan->device->dev->driver !=3D &pktdma_v2_driver.driver) return false; =20 uc =3D to_udma_chan(chan); @@ -1032,11 +1176,34 @@ static struct udma_match_data bcdma_v2_am62l_data = =3D { .rchan_cnt =3D 128, }; =20 +static struct udma_match_data pktdma_v2_am62l_data =3D { + .type =3D DMA_TYPE_PKTDMA, + .version =3D K3_UDMA_V2, + .psil_base =3D 0x1000, + .enable_memcpy_support =3D false, /* PKTDMA does not support MEM_TO_MEM */ + .flags =3D UDMA_FLAGS_J7_CLASS, + .statictr_z_mask =3D GENMASK(23, 0), + .burst_size =3D { + TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_64_BYTES, /* Normal Channels */ + 0, /* No H Channels */ + 0, /* No UH Channels */ + }, + .tchan_cnt =3D 97, + .rchan_cnt =3D 97, + .chan_cnt =3D 97, + .tflow_cnt =3D 112, + .rflow_cnt =3D 112, +}; + static const struct of_device_id udma_of_match[] =3D { { .compatible =3D "ti,am62l-dmss-bcdma", .data =3D &bcdma_v2_am62l_data, }, + { + .compatible =3D "ti,am62l-dmss-pktdma", + .data =3D &pktdma_v2_am62l_data, + }, { /* Sentinel */ }, }; =20 @@ -1055,15 +1222,23 @@ static int udma_v2_get_mmrs(struct platform_device = *pdev, struct udma_dev *ud) if (IS_ERR(ud->mmrs[V2_MMR_GCFG])) return PTR_ERR(ud->mmrs[V2_MMR_GCFG]); =20 - ud->bchan_cnt =3D ud->match_data->bchan_cnt; - /* There are no tchan and rchan in BCDMA_V2. + /* There are no tchan and rchan in BCDMA_V2 and PKTDMA_V2. * Duplicate chan as tchan and rchan to keep the common code - * in k3-udma-common.c functional for BCDMA_V2. + * in k3-udma-common.c functional. */ - ud->chan_cnt =3D ud->match_data->chan_cnt; - ud->tchan_cnt =3D ud->match_data->chan_cnt; - ud->rchan_cnt =3D ud->match_data->chan_cnt; - ud->rflow_cnt =3D ud->chan_cnt; + if (ud->match_data->type =3D=3D DMA_TYPE_BCDMA) { + ud->bchan_cnt =3D ud->match_data->bchan_cnt; + ud->chan_cnt =3D ud->match_data->chan_cnt; + ud->tchan_cnt =3D ud->match_data->chan_cnt; + ud->rchan_cnt =3D ud->match_data->chan_cnt; + ud->rflow_cnt =3D ud->chan_cnt; + } else if (ud->match_data->type =3D=3D DMA_TYPE_PKTDMA) { + ud->chan_cnt =3D ud->match_data->chan_cnt; + ud->tchan_cnt =3D ud->match_data->tchan_cnt; + ud->rchan_cnt =3D ud->match_data->rchan_cnt; + ud->tflow_cnt =3D ud->match_data->tflow_cnt; + ud->rflow_cnt =3D ud->match_data->rflow_cnt; + } =20 for (i =3D 1; i < V2_MMR_LAST; i++) { if (i =3D=3D V2_MMR_BCHANRT && ud->bchan_cnt =3D=3D 0) @@ -1117,6 +1292,7 @@ static int udma_v2_probe(struct platform_device *pdev) ud->reset_chan =3D udma_v2_reset_chan; ud->decrement_byte_counters =3D udma_v2_decrement_byte_counters; ud->bcdma_setup_sci_resources =3D NULL; + ud->pktdma_setup_sci_resources =3D NULL; =20 ret =3D udma_v2_get_mmrs(pdev, ud); if (ret) @@ -1124,7 +1300,17 @@ static int udma_v2_probe(struct platform_device *pde= v) =20 struct k3_ringacc_init_data ring_init_data =3D {0}; =20 - ring_init_data.num_rings =3D ud->bchan_cnt + ud->chan_cnt; + if (ud->match_data->type =3D=3D DMA_TYPE_BCDMA) { + ring_init_data.num_rings =3D ud->bchan_cnt + ud->chan_cnt; + } else if (ud->match_data->type =3D=3D DMA_TYPE_PKTDMA) { + ring_init_data.num_rings =3D ud->rflow_cnt; + + ud->rflow_rt =3D devm_platform_ioremap_resource_byname(pdev, "ringrt"); + if (IS_ERR(ud->rflow_rt)) + return PTR_ERR(ud->rflow_rt); + + ring_init_data.base_rt =3D ud->rflow_rt; + } =20 ud->ringacc =3D k3_ringacc_dmarings_init(pdev, &ring_init_data); =20 @@ -1133,8 +1319,10 @@ static int udma_v2_probe(struct platform_device *pde= v) =20 dma_cap_set(DMA_SLAVE, ud->ddev.cap_mask); =20 - dma_cap_set(DMA_CYCLIC, ud->ddev.cap_mask); - ud->ddev.device_prep_dma_cyclic =3D udma_prep_dma_cyclic; + if (ud->match_data->type !=3D DMA_TYPE_PKTDMA) { + dma_cap_set(DMA_CYCLIC, ud->ddev.cap_mask); + ud->ddev.device_prep_dma_cyclic =3D udma_prep_dma_cyclic; + } =20 ud->ddev.device_config =3D udma_slave_config; ud->ddev.device_prep_slave_sg =3D udma_prep_slave_sg; @@ -1148,8 +1336,18 @@ static int udma_v2_probe(struct platform_device *pde= v) ud->ddev.dbg_summary_show =3D udma_dbg_summary_show; #endif =20 - ud->ddev.device_alloc_chan_resources =3D - bcdma_v2_alloc_chan_resources; + switch (ud->match_data->type) { + case DMA_TYPE_BCDMA: + ud->ddev.device_alloc_chan_resources =3D + bcdma_v2_alloc_chan_resources; + break; + case DMA_TYPE_PKTDMA: + ud->ddev.device_alloc_chan_resources =3D + pktdma_v2_alloc_chan_resources; + break; + default: + return -EINVAL; + } =20 ud->ddev.device_free_chan_resources =3D udma_free_chan_resources; =20 diff --git a/drivers/dma/ti/k3-udma.h b/drivers/dma/ti/k3-udma.h index b2e5455b1087e..2a9686f7a09bc 100644 --- a/drivers/dma/ti/k3-udma.h +++ b/drivers/dma/ti/k3-udma.h @@ -27,8 +27,11 @@ #define UDMA_RX_FLOW_ID_FW_OES_REG 0x80 #define UDMA_RX_FLOW_ID_FW_STATUS_REG 0x88 =20 +#define UDMA_RX_FLOWRT_RFA 0x8 + /* BCHANRT/TCHANRT/RCHANRT registers */ #define UDMA_CHAN_RT_CTL_REG 0x0 +#define UDMA_CHAN_RT_CFG_REG 0x4 #define UDMA_CHAN_RT_SWTRIG_REG 0x8 #define UDMA_CHAN_RT_STDATA_REG 0x80 =20 --=20 2.54.0 From nobody Thu Sep 24 17:02:17 2026 Received: from mx0b-0002e601.pphosted.com (mx0b-0002e601.pphosted.com [148.163.154.28]) (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 A34F04F474C; Tue, 22 Sep 2026 06:51:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.154.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059914; cv=fail; b=bi3F120LWrLWD/pwT+9dqXlJl4o6/26rln026SKLvOqAauDbNYnKbO1t8iAKtew9pqABQpCTJIjL7tJP37TBW8z5l+wLLZoLgZLLHL0DrmI1pKUgx94bK6yIUANKVjDvVzAgc94sAVvcIoUdmTGwWTJrszhiKVY6GBcNgetHxe8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059914; c=relaxed/simple; bh=l5HCSceNJHP8TwZnBtW4w59utV3/XkWjM2Vcmc61iCY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BvnJ7cq4HNp7UJXClthzP39fH7QkQfk8hexBb8t7790uPwJCfcG1W1KyAGYagbFqdGQF3l7ddwBcvSndv9eXOkI1S12meD8JdKSMtquCf+O6XScCMkyvaRUFPWsg5I3Lzu3eAYv2HP8v8fL0l9SkmIwWmYDQhIOEDzSw0PftPnE= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=SlI/yN4h; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=HzsoEGae; arc=fail smtp.client-ip=148.163.154.28 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="SlI/yN4h"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="HzsoEGae" Received: from pps.filterd (m0374955.ppops.net [127.0.0.1]) by mx0b-0002e601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68M1qIVt1436269; Tue, 22 Sep 2026 01:51:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=URHji2vRtji05zoabpcgiR25uI4QDqMDsGNmbRPKJ 9o=; b=SlI/yN4hJbKQVkAGbmHiHJrEXPF2lFZbHvAOHoHjIIggzpaQoXkMlv/K/ su6OXXuZzCLwLg3y3o9UySe9y4N8g2Yz+g6u6zTOoNZlAu38SoOedafnU/BbdI2v 5dJjPa3unD3QWEAI2auK1vdOxgG8f6265/3qBnucZfzUpiAdNHf1LCK4Au8Fp1Mh MSvYAUmrH9A5jcL+5+uZxkK6ykIdCk68kLQ+BYDFIIN/HDiTUi4WvFtO5htE8tBO 0oC9+cQDc3CR5wh2/ncV7l0MvwpAaCz3UiR03f1soOsusaYlHcLSQX6UcWx12eRA n0zIVQk1Lk7Bcb7XKOgWDULgs5pwg== Received: from cy7pr03cu001.outbound.protection.outlook.com (mail-westcentralusazon11010027.outbound.protection.outlook.com [40.93.198.27]) by mx0b-0002e601.pphosted.com (PPS) with ESMTPS id 4gugcsscns-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:51:12 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=la4w19gQOKsStAxj0GzThjdk8Qi6kgMAp5vZ3PG3Xf8iNCNbiKOmUAOobVCHecuiAQbIv/ThhVGr/zMWxK5GNv7vVEJ7uAnKMYcBtSVqvV5Iz50oC6RdY8Pe0xAEQunGgIMnDEUkwI5mwln6jCV++wtICuVsuiww6QPJmkaGcoYTUSm3h85I//W0mBj3InAp1aIPbUAtqO0izfYCgwkKcfAa1n6CI80fPg8I4ACZ12gluvHZOA9IPRc2EFBNtJi5FH2R75byrG2nVsEsZye0vs0e9WioyuUo9nwZlwtM8M/BffkgKYlepavLlEQVLNyeiJobnOMfc7jkZu7ZWYytUg== 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=URHji2vRtji05zoabpcgiR25uI4QDqMDsGNmbRPKJ9o=; b=MWLMevUoGy//J60pLnJrphz8Rv/HKBq2txqMX48K3oGbzuLpT6Y80rUCI+rpBQQuIAECgVRfTilGyk2Qtbt7j0kOTKWz8jUW8wBm7mS/9nvF151AHpakIm9whMHWT6tVyXdP446DLRRxPSMhuySAN+/GEhL9/ff3vCDmOYRUrJrRptHXUqddujTntKlHWpGemY/nVAx/+DwlA5QmWxmyURfD+k14o410DoiflSu/Y0ybblu0I/HkkWt2w86oociETni22rs2nenalH3WkRF1LjOmVWv45O8v6e53CIfqBBKM7MyPuw9wDohkjOw1roetjocLRoUROD7NmiQUW0l90w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.23.194) smtp.rcpttodomain=nxp.com 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=URHji2vRtji05zoabpcgiR25uI4QDqMDsGNmbRPKJ9o=; b=HzsoEGaeA7zVTbK2Ic6SYm3+9dXcMFF9YIMXoVVWndQyJ1oDkBQtTvQawQhXm0iVGkXahCfncanh2QfECS30roR0d/GZtOGGllBxBNULUrL14W1ng8Nc9cAQ59qe1S8wi+GjF6rlEV1Zx5gABxIx6pIqUitzMbmV7EqGu3GDihI= Received: from CY5PR17CA0055.namprd17.prod.outlook.com (2603:10b6:930:12::26) by LVWPR10MB997862.namprd10.prod.outlook.com (2603:10b6:408:3c2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.9; Tue, 22 Sep 2026 06:51:05 +0000 Received: from SJ5PEPF00000204.namprd05.prod.outlook.com (2603:10b6:930:12:cafe::62) by CY5PR17CA0055.outlook.office365.com (2603:10b6:930:12::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.13 via Frontend Transport; Tue, 22 Sep 2026 06:51:04 +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 SJ5PEPF00000204.mail.protection.outlook.com (10.167.244.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:51:04 +0000 Received: from DLEE200.ent.ti.com (157.170.170.75) 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.45; Tue, 22 Sep 2026 01:50:53 -0500 Received: from DLEE201.ent.ti.com (157.170.170.76) by DLEE200.ent.ti.com (157.170.170.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:52 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DLEE201.ent.ti.com (157.170.170.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:50:52 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI4A3626771; Tue, 22 Sep 2026 01:50:47 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 18/19] dmaengine: ti: k3-udma-v2: Update glue layer to support PKTDMA V2 Date: Tue, 22 Sep 2026 12:17:42 +0530 Message-ID: <20260922064902.2719979-19-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF00000204:EE_|LVWPR10MB997862:EE_ X-MS-Office365-Filtering-Correlation-Id: 59e9bd6d-b4a1-4adb-a609-08df1875df56 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700016|7416014|23010399003|376014|82310400026|56012099006|3023799007|10067099003|921020|6133799003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: nsZwvtfuK8PbH3XjwaLFock7V6ByALROHhpkqaPLgAffp1hBIY6jQ1aM3q9Sggru0pT4Wwt6rM+CHiQFtQI6X3j6fQnS0zkHAyau0PB5/5CDit0SdVTa/RUqRx1C2LydgMFlAnYvOPUMc1KDCb59VpR9/Gs4qZGGJIzFMJFXEIxAFCsB/5gLCiCI7Kkq1Mu5jq+oqRcCLp4itGUbtTyubxNDh4YU5usjlj5uSrSIsaPov/B/oEVB8E4YLYx1+z05ggtGMTlTVfAShCANn3/r6xqnBtcATRmTsQ8SuxTBjbJwTzX+olUgxov1z515yn9tjpn5m7toRbYcZNJfln2Uej5Y40tGa8fP2XIGbrFnzQJrZEZtbcK6CYws/wcPF1dN4dgcpO616ySOWg7Nx7Je7KqDp4LltORC9LGQHE754k1QqqeIrmHRpaAjno38/1caYKXqu7XulHX3NtWetp6dOkYIecE2BAuBaQoqKRDtOTUjNZuLWFh+OTb+cM3sCwfme/JrZYNA+f3usgYM4x/ouxgRRL6PKtm3B2SBrmEyJcyEdrXhtj8VcjHAhxlpIlMf3kn7G/enSDgGJSLYh4qNjpZzdlL1yi/RvbqfqZNIMzbpaxQv7uOtL/y8PDJ8K0JHLgshsPRRjBUOgIyu3A6HH6n2IpzZjPn56wTsgPK4wcV51VsJDwE56qAwfUTrQDp2 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)(1800799024)(36860700016)(7416014)(23010399003)(376014)(82310400026)(56012099006)(3023799007)(10067099003)(921020)(6133799003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pSJ5m7HL0d5Tyf0VATnbs4F9XqB8wCW5DxVMOuTPS958Xm6/L93OLcEOH0DetU8kx1IJzgRcXfuR+rFeThhiwsQ6klyF8XWUK1zOxAMhuseps6TPHj6j8AKAsf0d/OKjwE5qe4XLwq0dAUk4bsmtIiLuFE5OryAKvC2CViPLnNHp8nAalBfIUSTR/gvEuQkeLwWch/q5Y2kysG1MTJPRXTdOSl5N9mXNsczh1qtUpwp6oulTqBx7Je8kHbW3wKczc4AiNMmExTMDBhu6MMDy9i2eOyfSF7WlIcj7cue2lnEJikbInANCsW/gKMLMNepMSaORxWhf0ql7/WNndl78pg7/kX2mCGOPAZ6MxYAnI4eSU88RlFUJKnrylpT07Rdbl6LFHV0UThyUhWuUTYlt3iJQ4v/ZU2eM2bh7aKsPYfuxzlCMtGIywBAhwfpfpatQ X-Exchange-RoutingPolicyChecked: AgrN5acvKzwxH1oR5xEw7sKesqnrUJKAo738vleAbAaX3Y9Pzw/G9W1K6E/9xAB9m555hOlIvqVeZ8jzoBDP1EpUGMaapWaRI67xpcOM2Nm+UBpDqBNddCQHq/U0eUazyJuH37/GlfIcmYTu6PkafFueocZtElQZp3QhtrLc2NAkBqvPcamt3+HXR6dKbzHW+QStCc4etWPotUmaQzFPuZAiHUhucO8qgIZpAE62Hyl00FZA2nFkejCHFPh7wXUdzHWYFqPbzdWKRI1A4FcUHFxPuEbCo0fsxTtGfNs7APZyopOxw8KMlzxSaofMUGpu0ZUOmHnbrCTg/7EAkhb0Pw== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:51:04.5726 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 59e9bd6d-b4a1-4adb-a609-08df1875df56 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: SJ5PEPF00000204.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LVWPR10MB997862 X-Proofpoint-GUID: nqAPqkwW5EU2u_H_jctoHure_SlPwMYi X-Authority-Analysis: v=2.4 cv=GI+dgeNK c=1 sm=1 tr=0 ts=6ab22560 cx=c_pps a=oTJwsqqp05Np5voO4IKyrw==:117 a=WotqVVQAdb04rnGuttW3Kw==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=s63m1ICgrNkA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=fPAWb5peG099m5CrUpKH:22 a=sozttTNsAAAA:8 a=4Ig8warNfptl5lTuD7MA:9 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX8qlI2YUe7hrJ A+5spAW7ARf159NtlUOPgMCNAAWQ/v5NLrzHtPL//oaQa/xSOflckdvtVvESjNKaKu4ev3rzPft qAqDm0mNwSTLFecB/e78D4N39okisnY= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX9rRNVkjKpbTS F1UfS5v/Yx8p6qK1er7PICDlos09Ow50T4GdYsvrLGzjNylMxNXJd/15x831fYREt648OiH+tWV QJKZs5gDEvdr6jaBJ2WVGXD5ayCxm1lCJ9YtvIdx5s6+5nSC55hbkToskgGQf1cRFg3Ef8DTk5j VS6Zt6B8Ri42YVqoYjNa080StIYV4g/pUsrI273Mggfi2Eo8g7CZ68liNK0f9DXZKAnHz0iExMN c4saz2NamweNH0RRPUlEeKcG6aMaURpVXC86N+wIgwW7xutCg0Uv3dBXM+2Nvx/NgZ4q1tc5xae 9LNjy+08C9nt3TpOc0eo0kKgeHHiIW2JX/VBa2waV5vL82Hq/KCYOooZ2q3fiuoYlli3Afc0PVY tt/pKs1ekaZfTvYxmfeUzC6a065UVrUEbwoyIDZGUrcBK+t8Wwj5q7OtICNidyOwXJqyiPii1A1 CGnn/8gXDz2jOdCg/MA== X-Proofpoint-ORIG-GUID: nqAPqkwW5EU2u_H_jctoHure_SlPwMYi X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 adultscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 clxscore=1015 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220097 Content-Type: text/plain; charset="utf-8" Update glue layer to support PKTDMA V2 for non DMAengine users. The updates include - Handling absence of TISCI - Direct IRQs - Autopair: Lack of PSIL pair. Signed-off-by: Sai Sree Kartheek Adivi --- drivers/dma/ti/Kconfig | 2 +- drivers/dma/ti/k3-udma-glue.c | 184 ++++++++++++++++++++++++------- drivers/dma/ti/k3-udma-private.c | 5 + drivers/dma/ti/k3-udma.h | 10 ++ 4 files changed, 160 insertions(+), 41 deletions(-) diff --git a/drivers/dma/ti/Kconfig b/drivers/dma/ti/Kconfig index 595fdf3ecbc9d..3d001f2e3f040 100644 --- a/drivers/dma/ti/Kconfig +++ b/drivers/dma/ti/Kconfig @@ -67,7 +67,7 @@ config TI_K3_UDMA_COMMON config TI_K3_UDMA_GLUE_LAYER tristate "Texas Instruments UDMA Glue layer for non DMAengine users" depends on ARCH_K3 || COMPILE_TEST - depends on TI_K3_UDMA + depends on TI_K3_UDMA || TI_K3_UDMA_V2 help Say y here to support the K3 NAVSS DMA glue interface If unsure, say N. diff --git a/drivers/dma/ti/k3-udma-glue.c b/drivers/dma/ti/k3-udma-glue.c index 3721edf71f9b3..5a3cac685a46c 100644 --- a/drivers/dma/ti/k3-udma-glue.c +++ b/drivers/dma/ti/k3-udma-glue.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -267,6 +268,19 @@ static int k3_udma_glue_cfg_tx_chn(struct k3_udma_glue= _tx_channel *tx_chn) const struct udma_tisci_rm *tisci_rm =3D tx_chn->common.tisci_rm; struct ti_sci_msg_rm_udmap_tx_ch_cfg req; =20 + if (!tisci_rm->tisci) { + u32 val =3D 0; + + if (tx_chn->tx_filt_einfo) + val |=3D UDMA_CHAN_CFG_FILT_EINFO; + if (tx_chn->tx_filt_pswords) + val |=3D UDMA_CHAN_CFG_FILT_PSWORDS; + + xudma_tchanrt_write(tx_chn->udma_tchanx, UDMA_CHAN_RT_CFG_REG, val); + + return 0; + } + memset(&req, 0, sizeof(req)); =20 req.valid_params =3D TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID | @@ -525,21 +539,39 @@ int k3_udma_glue_enable_tx_chn(struct k3_udma_glue_tx= _channel *tx_chn) { int ret; =20 - ret =3D xudma_navss_psil_pair(tx_chn->common.udmax, - tx_chn->common.src_thread, - tx_chn->common.dst_thread); - if (ret) { - dev_err(tx_chn->common.dev, "PSI-L request err %d\n", ret); - return ret; - } + if (tx_chn->common.udmax->match_data->version =3D=3D K3_UDMA_V1) { + ret =3D xudma_navss_psil_pair(tx_chn->common.udmax, + tx_chn->common.src_thread, + tx_chn->common.dst_thread); + if (ret) { + dev_err(tx_chn->common.dev, "PSI-L request err %d\n", ret); + return ret; + } =20 - tx_chn->psil_paired =3D true; + tx_chn->psil_paired =3D true; =20 - xudma_tchanrt_write(tx_chn->udma_tchanx, UDMA_CHAN_RT_PEER_RT_EN_REG, - UDMA_PEER_RT_EN_ENABLE); + xudma_tchanrt_write(tx_chn->udma_tchanx, UDMA_CHAN_RT_PEER_RT_EN_REG, + UDMA_PEER_RT_EN_ENABLE); =20 - xudma_tchanrt_write(tx_chn->udma_tchanx, UDMA_CHAN_RT_CTL_REG, - UDMA_CHAN_RT_CTL_EN); + xudma_tchanrt_write(tx_chn->udma_tchanx, UDMA_CHAN_RT_CTL_REG, + UDMA_CHAN_RT_CTL_EN); + } else { + u32 val; + + xudma_tchanrt_write(tx_chn->udma_tchanx, UDMA_CHAN_RT_CTL_REG, + UDMA_CHAN_RT_CTL_AUTOPAIR | UDMA_CHAN_RT_CTL_EN); + + ret =3D read_poll_timeout(xudma_tchanrt_read, val, + val & (UDMA_CHAN_RT_CTL_PAIR_COMPLETE | + UDMA_CHAN_RT_CTL_PAIR_TIMEOUT), + 100, 500, false, + tx_chn->udma_tchanx, UDMA_CHAN_RT_CTL_REG); + if (ret || (val & UDMA_CHAN_RT_CTL_PAIR_TIMEOUT)) { + dev_err(tx_chn->common.dev, "TX channel autopair timeout\n"); + xudma_tchanrt_write(tx_chn->udma_tchanx, UDMA_CHAN_RT_CTL_REG, 0); + return -ETIMEDOUT; + } + } =20 k3_udma_glue_dump_tx_rt_chn(tx_chn, "txchn en"); return 0; @@ -573,8 +605,16 @@ void k3_udma_glue_tdown_tx_chn(struct k3_udma_glue_tx_= channel *tx_chn, =20 k3_udma_glue_dump_tx_rt_chn(tx_chn, "txchn tdown1"); =20 - xudma_tchanrt_write(tx_chn->udma_tchanx, UDMA_CHAN_RT_CTL_REG, - UDMA_CHAN_RT_CTL_EN | UDMA_CHAN_RT_CTL_TDOWN); + if (tx_chn->common.udmax->match_data->version =3D=3D K3_UDMA_V1) { + xudma_tchanrt_write(tx_chn->udma_tchanx, UDMA_CHAN_RT_CTL_REG, + UDMA_CHAN_RT_CTL_EN | UDMA_CHAN_RT_CTL_TDOWN); + } else { + val =3D xudma_tchanrt_read(tx_chn->udma_tchanx, UDMA_CHAN_RT_CTL_REG); + xudma_tchanrt_write(tx_chn->udma_tchanx, UDMA_CHAN_RT_CTL_REG, + val | UDMA_CHAN_RT_CTL_TDOWN); + xudma_tchanrt_write(tx_chn->udma_tchanx, UDMA_CHAN_RT_PEER_REG(8), + UDMA_CHAN_RT_PEER_REG8_FLUSH); + } =20 val =3D xudma_tchanrt_read(tx_chn->udma_tchanx, UDMA_CHAN_RT_CTL_REG); =20 @@ -589,10 +629,12 @@ void k3_udma_glue_tdown_tx_chn(struct k3_udma_glue_tx= _channel *tx_chn, i++; } =20 - val =3D xudma_tchanrt_read(tx_chn->udma_tchanx, - UDMA_CHAN_RT_PEER_RT_EN_REG); - if (sync && (val & UDMA_PEER_RT_EN_ENABLE)) - dev_err(tx_chn->common.dev, "TX tdown peer not stopped\n"); + if (tx_chn->common.udmax->match_data->version =3D=3D K3_UDMA_V1) { + val =3D xudma_tchanrt_read(tx_chn->udma_tchanx, + UDMA_CHAN_RT_PEER_RT_EN_REG); + if (sync && (val & UDMA_PEER_RT_EN_ENABLE)) + dev_err(tx_chn->common.dev, "TX tdown peer not stopped\n"); + } k3_udma_glue_dump_tx_rt_chn(tx_chn, "txchn tdown2"); } EXPORT_SYMBOL_GPL(k3_udma_glue_tdown_tx_chn); @@ -705,7 +747,6 @@ static int k3_udma_glue_cfg_rx_chn(struct k3_udma_glue_= rx_channel *rx_chn) TI_SCI_MSG_VALUE_RM_UDMAP_CH_CHAN_TYPE_VALID | TI_SCI_MSG_VALUE_RM_UDMAP_CH_ATYPE_VALID; =20 - req.nav_id =3D tisci_rm->tisci_dev_id; req.index =3D rx_chn->udma_rchan_id; req.rx_fetch_size =3D rx_chn->common.hdesc_size >> 2; /* @@ -725,11 +766,24 @@ static int k3_udma_glue_cfg_rx_chn(struct k3_udma_glu= e_rx_channel *rx_chn) req.rx_chan_type =3D TI_SCI_RM_UDMAP_CHAN_TYPE_PKT_PBRR; req.rx_atype =3D rx_chn->common.atype_asel; =20 + if (!tisci_rm->tisci) { + u32 val =3D 0; + + if (rx_chn->common.epib) + val |=3D UDMA_CHAN_CFG_FILT_EINFO; + if (rx_chn->common.psdata_size) + val |=3D UDMA_CHAN_CFG_FILT_PSWORDS; + + xudma_rchanrt_write(rx_chn->udma_rchanx, UDMA_CHAN_RT_CFG_REG, val); + + return 0; + } + + req.nav_id =3D tisci_rm->tisci_dev_id; ret =3D tisci_rm->tisci_udmap_ops->rx_ch_cfg(tisci_rm->tisci, &req); if (ret) dev_err(rx_chn->common.dev, "rchan%d cfg failed %d\n", - rx_chn->udma_rchan_id, ret); - + rx_chn->udma_rchan_id, ret); return ret; } =20 @@ -778,8 +832,11 @@ static int k3_udma_glue_cfg_rx_flow(struct k3_udma_glu= e_rx_channel *rx_chn, } =20 if (xudma_is_pktdma(rx_chn->common.udmax)) { - rx_ringfdq_id =3D flow->udma_rflow_id + + if (tisci_rm->tisci) + rx_ringfdq_id =3D flow->udma_rflow_id + xudma_get_rflow_ring_offset(rx_chn->common.udmax); + else + rx_ringfdq_id =3D flow->udma_rflow_id; rx_ring_id =3D 0; } else { rx_ring_id =3D flow_cfg->ring_rxq_id; @@ -826,6 +883,19 @@ static int k3_udma_glue_cfg_rx_flow(struct k3_udma_glu= e_rx_channel *rx_chn, rx_ringfdq_id =3D k3_ringacc_get_ring_id(flow->ringrxfdq); } =20 + if (!tisci_rm->tisci) { + u32 val =3D 0; + + if (rx_chn->common.epib) + val |=3D UDMA_FLOWRT_RFA_RX_EINFO_PRESENT; + if (rx_chn->common.psdata_size) + val |=3D UDMA_FLOWRT_RFA_RX_PSINFO_PRESENT; + + xudma_rflowrt_write(flow->udma_rflow, UDMA_RX_FLOWRT_RFA, val); + rx_chn->flows_ready++; + return 0; + } + memset(&req, 0, sizeof(req)); =20 req.valid_params =3D @@ -1331,6 +1401,9 @@ int k3_udma_glue_rx_flow_enable(struct k3_udma_glue_r= x_channel *rx_chn, if (!rx_chn->remote) return -EINVAL; =20 + if (!tisci_rm->tisci) + return 0; + rx_ring_id =3D k3_ringacc_get_ring_id(flow->ringrx); rx_ringfdq_id =3D k3_ringacc_get_ring_id(flow->ringrxfdq); =20 @@ -1372,6 +1445,9 @@ int k3_udma_glue_rx_flow_disable(struct k3_udma_glue_= rx_channel *rx_chn, if (!rx_chn->remote) return -EINVAL; =20 + if (!tisci_rm->tisci) + return 0; + memset(&req, 0, sizeof(req)); req.valid_params =3D TI_SCI_MSG_VALUE_RM_UDMAP_FLOW_DEST_QNUM_VALID | @@ -1407,21 +1483,39 @@ int k3_udma_glue_enable_rx_chn(struct k3_udma_glue_= rx_channel *rx_chn) if (rx_chn->flows_ready < rx_chn->flow_num) return -EINVAL; =20 - ret =3D xudma_navss_psil_pair(rx_chn->common.udmax, - rx_chn->common.src_thread, - rx_chn->common.dst_thread); - if (ret) { - dev_err(rx_chn->common.dev, "PSI-L request err %d\n", ret); - return ret; - } + if (rx_chn->common.udmax->match_data->version =3D=3D K3_UDMA_V1) { + ret =3D xudma_navss_psil_pair(rx_chn->common.udmax, + rx_chn->common.src_thread, + rx_chn->common.dst_thread); + if (ret) { + dev_err(rx_chn->common.dev, "PSI-L request err %d\n", ret); + return ret; + } =20 - rx_chn->psil_paired =3D true; + rx_chn->psil_paired =3D true; =20 - xudma_rchanrt_write(rx_chn->udma_rchanx, UDMA_CHAN_RT_CTL_REG, - UDMA_CHAN_RT_CTL_EN); + xudma_rchanrt_write(rx_chn->udma_rchanx, UDMA_CHAN_RT_CTL_REG, + UDMA_CHAN_RT_CTL_EN); =20 - xudma_rchanrt_write(rx_chn->udma_rchanx, UDMA_CHAN_RT_PEER_RT_EN_REG, - UDMA_PEER_RT_EN_ENABLE); + xudma_rchanrt_write(rx_chn->udma_rchanx, UDMA_CHAN_RT_PEER_RT_EN_REG, + UDMA_PEER_RT_EN_ENABLE); + } else { + u32 val; + + xudma_rchanrt_write(rx_chn->udma_rchanx, UDMA_CHAN_RT_CTL_REG, + UDMA_CHAN_RT_CTL_AUTOPAIR | UDMA_CHAN_RT_CTL_EN); + + ret =3D read_poll_timeout(xudma_rchanrt_read, val, + val & (UDMA_CHAN_RT_CTL_PAIR_COMPLETE | + UDMA_CHAN_RT_CTL_PAIR_TIMEOUT), + 100, 500, false, + rx_chn->udma_rchanx, UDMA_CHAN_RT_CTL_REG); + if (ret || (val & UDMA_CHAN_RT_CTL_PAIR_TIMEOUT)) { + dev_err(rx_chn->common.dev, "RX channel autopair timeout\n"); + xudma_rchanrt_write(rx_chn->udma_rchanx, UDMA_CHAN_RT_CTL_REG, 0); + return -ETIMEDOUT; + } + } =20 k3_udma_glue_dump_rx_rt_chn(rx_chn, "rxrt en"); return 0; @@ -1458,8 +1552,16 @@ void k3_udma_glue_tdown_rx_chn(struct k3_udma_glue_r= x_channel *rx_chn, =20 k3_udma_glue_dump_rx_rt_chn(rx_chn, "rxrt tdown1"); =20 - xudma_rchanrt_write(rx_chn->udma_rchanx, UDMA_CHAN_RT_PEER_RT_EN_REG, - UDMA_PEER_RT_EN_ENABLE | UDMA_PEER_RT_EN_TEARDOWN); + if (rx_chn->common.udmax->match_data->version =3D=3D K3_UDMA_V1) { + xudma_rchanrt_write(rx_chn->udma_rchanx, UDMA_CHAN_RT_PEER_RT_EN_REG, + UDMA_PEER_RT_EN_ENABLE | UDMA_PEER_RT_EN_TEARDOWN); + } else { + xudma_rchanrt_write(rx_chn->udma_rchanx, UDMA_CHAN_RT_PEER_REG(8), + UDMA_CHAN_RT_PEER_REG8_FLUSH); + val =3D xudma_rchanrt_read(rx_chn->udma_rchanx, UDMA_CHAN_RT_CTL_REG); + xudma_rchanrt_write(rx_chn->udma_rchanx, UDMA_CHAN_RT_CTL_REG, + val | UDMA_CHAN_RT_CTL_TDOWN); + } =20 val =3D xudma_rchanrt_read(rx_chn->udma_rchanx, UDMA_CHAN_RT_CTL_REG); =20 @@ -1474,10 +1576,12 @@ void k3_udma_glue_tdown_rx_chn(struct k3_udma_glue_= rx_channel *rx_chn, i++; } =20 - val =3D xudma_rchanrt_read(rx_chn->udma_rchanx, - UDMA_CHAN_RT_PEER_RT_EN_REG); - if (sync && (val & UDMA_PEER_RT_EN_ENABLE)) - dev_err(rx_chn->common.dev, "TX tdown peer not stopped\n"); + if (rx_chn->common.udmax->match_data->version =3D=3D K3_UDMA_V1) { + val =3D xudma_rchanrt_read(rx_chn->udma_rchanx, + UDMA_CHAN_RT_PEER_RT_EN_REG); + if (sync && (val & UDMA_PEER_RT_EN_ENABLE)) + dev_err(rx_chn->common.dev, "TX tdown peer not stopped\n"); + } k3_udma_glue_dump_rx_rt_chn(rx_chn, "rxrt tdown2"); } EXPORT_SYMBOL_GPL(k3_udma_glue_tdown_rx_chn); diff --git a/drivers/dma/ti/k3-udma-private.c b/drivers/dma/ti/k3-udma-priv= ate.c index 525155d3bb513..d6d99f60519a1 100644 --- a/drivers/dma/ti/k3-udma-private.c +++ b/drivers/dma/ti/k3-udma-private.c @@ -3,6 +3,10 @@ * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com * Author: Peter Ujfalusi */ +#include +#include +#include +#include #include #include =20 @@ -165,6 +169,7 @@ void xudma_##res##rt_write(struct udma_##res *p, int re= g, u32 val) \ EXPORT_SYMBOL(xudma_##res##rt_write) XUDMA_RT_IO_FUNCTIONS(tchan); XUDMA_RT_IO_FUNCTIONS(rchan); +XUDMA_RT_IO_FUNCTIONS(rflow); =20 int xudma_is_pktdma(struct udma_dev *ud) { diff --git a/drivers/dma/ti/k3-udma.h b/drivers/dma/ti/k3-udma.h index 2a9686f7a09bc..aa7425380dbef 100644 --- a/drivers/dma/ti/k3-udma.h +++ b/drivers/dma/ti/k3-udma.h @@ -85,6 +85,14 @@ #define UDMA_CHAN_RT_CTL_PAIR_COMPLETE BIT(16) #define UDMA_CHAN_RT_CTL_ERROR BIT(0) =20 +/* UDMA_CHAN_CFG_REG */ +#define UDMA_CHAN_CFG_FILT_EINFO BIT(30) +#define UDMA_CHAN_CFG_FILT_PSWORDS BIT(29) + +/* UDMA_RX_FLOWRT_RFA */ +#define UDMA_FLOWRT_RFA_RX_EINFO_PRESENT BIT(30) +#define UDMA_FLOWRT_RFA_RX_PSINFO_PRESENT BIT(29) + /* UDMA_CHAN_RT_PDMA_STATE_REG */ #define UDMA_CHAN_RT_PDMA_STATE_IN_EVT BIT(31) #define UDMA_CHAN_RT_PDMA_STATE_TDOWN BIT(30) @@ -747,6 +755,8 @@ u32 xudma_rchanrt_read(struct udma_rchan *rchan, int re= g); void xudma_rchanrt_write(struct udma_rchan *rchan, int reg, u32 val); bool xudma_rflow_is_gp(struct udma_dev *ud, int id); int xudma_get_rflow_ring_offset(struct udma_dev *ud); +u32 xudma_rflowrt_read(struct udma_rflow *rflow, int reg); +void xudma_rflowrt_write(struct udma_rflow *rflow, int reg, u32 val); =20 int xudma_is_pktdma(struct udma_dev *ud); =20 --=20 2.54.0 From nobody Thu Sep 24 17:02:17 2026 Received: from mx0a-0002e601.pphosted.com (mx0a-0002e601.pphosted.com [148.163.150.75]) (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 97FE94F85B5; Tue, 22 Sep 2026 06:51:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=148.163.150.75 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059884; cv=fail; b=UAweQ1oBH1bxmDnJOSyBYuVY8Gn5jLgp12wmfxKPQGU3nQn+FKup27NKL2sfJS/BFnZq+snSs7f3S554xvBnYuM7PQqopUSgAtNGtCavJdHVBq2FIKWaURwEG7KisSe79jbvCd0rdoXtyU9UcWfMUolYs62vu0BvB5Y7mhhJLdc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790059884; c=relaxed/simple; bh=RbGkKXStC/0O8P9NjO0Ab0RAy7+5NfpvNWK3i3tvuZk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jq227HiByFemwpump/yAxTyYhCT2fjx6+5OwKK27/G4t2cKrZGuTxMpXfwa6hwpWegkXqoDTwaOk9OQn/xEDkK0AgfphBembPtMkbdyY5iLvqc9n0araGZ5Lxm/2Bbcvz4p9eEx3/Drr3nxwZyby8FtT+kRIIdRaArQD9lQWg4A= 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b=ROpe0T3e; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=vtXWWuRA; arc=fail smtp.client-ip=148.163.150.75 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 (2048-bit key) header.d=ti.com header.i=@ti.com header.b="ROpe0T3e"; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="vtXWWuRA" Received: from pps.filterd (m0380145.ppops.net [127.0.0.1]) by m0380145.ppops.net (8.18.1.11/8.18.1.11) with ESMTP id 68M60USh932462; Tue, 22 Sep 2026 01:51:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint-05-2026; bh=ZleSMW4/tBH6B6BJFKnmATz8bvU/qqVwclISm4zGf 9g=; b=ROpe0T3esauNtYodhHD1biOaoUievpeWIaqxN6pPOtCsA77vB33BpFNoS IdHZBIYoZOn04zbhvj3CwJLGHC2X/45r7QwticC5DzdiqJfnDJd/1kHB3leKyDc6 pyRFOvpQBozhS0k4SMo2y9LoIasclQ7rJaIO9T18bVPEb8NIV1dxUmEQuE/GVA0t nvTKUnda8YEENy2UJfw3rE7o1ehOUyaTNloXyPWCpCmVzEp8Ne0BemRzExgp4lmj S5yMhVso+eZ8G2xcHSJqwoyjLv8wEhwn3p1b9UzXVwJaIimzRwBgsjfHg/zPGVJ7 jgwDCqlFqzJoktTBpXGIiohhR5XeQ== Received: from sn4pr0501cu005.outbound.protection.outlook.com (mail-southcentralusazon11011048.outbound.protection.outlook.com [40.93.194.48]) by m0380145.ppops.net (PPS) with ESMTPS id 4guf4x1v7v-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 01:51:12 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=b/oAOp62Z7N+8sfjb6aDrD8hFinxxOaavgqy6WjMf1PUK7trby1Ejn6HayUa+dkvn/Qiv1VHR3IblXRx5l4YA7+hjGMTwc/6b+YRVzjBaUEEYzRHbnTuanfeIzg412fxtZ7lKC5hRsQiKF6t3ZdayCnIZe/sVxmNJMOH/9xgfv7MZSYsEmwK/fau+P7CSR/OHoFR3x6ljh2naxW4VC0V/+gQPEk1q5qyHgnLOwoQWUw3cAJAz6aJHLvmVdKH90yuFqBH+CMiX8l0+HwJ/kHSQVSPaHsePZxCqGtWA4QLoPg+bcXU0vJH3MA5EaPe2JLYBeVnTYhAnpQlAL9EII9jwg== 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=ZleSMW4/tBH6B6BJFKnmATz8bvU/qqVwclISm4zGf9g=; b=y+/9i94JAj7sUfCvjWyJTWy0UPIlm7RdWguiNelRMBiJEj5BwmVcp6QrpSUheWzisHksg8bV1vS6HgU6BIbd3V5XqxP9dE3JvFWnZQ8ovSR2c3CQ8ziCUpCQszHVDia3FPZ1ooDS+n+nPSC0kYDBBxN41YQ3KYQ9C0gfKjz9iBla2NjczlG8w9bXnEexAdfDCjK65PdslA/WHTXWE1Yxy7OpszHRU1rH5liT/4V5LGO2B060RaIEP0zxK1OjpRkSrI0OGTTAuUR354q6Z6NCItSwjxhckkV3aswNUtGU3pnPcAXlc7B+wM/KS2utqkeXcQ59kkGfb3yY/gwyQmJZGg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.23.195) smtp.rcpttodomain=nxp.com 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=ZleSMW4/tBH6B6BJFKnmATz8bvU/qqVwclISm4zGf9g=; b=vtXWWuRAxilfEFwFzW1SaClsdW954WjyrjvmuI5/3HwkNk59AROFOnqN/s9e6NynqXbYZPwe297bLX47LuulT3s5r2Q4bv4Yq2tyXOhZT4uooWPaITQ460GZWiEA4LBSu3LkJgy9mWjQ4dcR8Ajx0KALiGMsK/4aNZ5sF9mXwxU= Received: from CH2PR03CA0001.namprd03.prod.outlook.com (2603:10b6:610:59::11) by DM4PR10MB7507.namprd10.prod.outlook.com (2603:10b6:8:187::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.13; Tue, 22 Sep 2026 06:51:08 +0000 Received: from CH1PEPF0000AD7A.namprd04.prod.outlook.com (2603:10b6:610:59:cafe::97) by CH2PR03CA0001.outlook.office365.com (2603:10b6:610:59::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.428.16 via Frontend Transport; Tue, 22 Sep 2026 06:51:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 198.47.23.195) 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.195 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.23.195; helo=lewvzet201.ext.ti.com; pr=C Received: from lewvzet201.ext.ti.com (198.47.23.195) by CH1PEPF0000AD7A.mail.protection.outlook.com (10.167.244.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Tue, 22 Sep 2026 06:51:08 +0000 Received: from DLEE207.ent.ti.com (157.170.170.95) by lewvzet201.ext.ti.com (10.4.14.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:57 -0500 Received: from DLEE211.ent.ti.com (157.170.170.113) by DLEE207.ent.ti.com (157.170.170.95) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 22 Sep 2026 01:50:57 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DLEE211.ent.ti.com (157.170.170.113) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 22 Sep 2026 01:50:57 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [10.24.51.254]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 68M6nI4B3626771; Tue, 22 Sep 2026 01:50:53 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v9 19/19] dmaengine: ti: k3-udma: Validate resource ID and fix logging in reservation Date: Tue, 22 Sep 2026 12:17:43 +0530 Message-ID: <20260922064902.2719979-20-s-adivi@ti.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260922064902.2719979-1-s-adivi@ti.com> References: <20260922064902.2719979-1-s-adivi@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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000AD7A:EE_|DM4PR10MB7507:EE_ X-MS-Office365-Filtering-Correlation-Id: 11528352-8693-444e-8f38-08df1875e1b1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|36860700016|82310400026|1800799024|23010399003|10067099003|56012099006|22082099003|18002099003|921020; X-Microsoft-Antispam-Message-Info: 7s/zGmr/HgxrvB4Xs/i1nyQbl/AnYSNDYQCifNocmVdXhYVe+PEI3MLzQyZzuqLiLOVBjZqIEaX9uCnG9kG1uxyWiPcSUlUt25FJTomPTEU35LyAIRlfPGNrm/W54GMwWTN8m/DgTo8f7ZOrfKMU0Cc/WgMww12VqYN9gBlAnOz1GLqcvGhH4FDNpG49aKDK+SNK+63vDWbg/nceoLJea4RJwjl/9m5M6v4/oJAT2FmvRNDaoVwjEeaMQSBKhM+tqWi9xX6sUHf6cegL+dYu5qzI026mi8/x/NNhpmHbgPuUNF6xySFoyorPsDGzXQI8wTiIyeH950aDmSQQezhWJP3t4CdRpguJM2Phk9OLo0hpkBmDsp/pmf/+RCeH44rQIC2l/QqcHt2DlbvyAAnav66hJbly2vm7mnkNhnkeF+BrSprGDOJW08UUabB3+Pae97izdDpvndnoQtimZjJ++Ja5S85+FmUUqmX51NBZPIzD+EAAVrwtUgDEc3iNyuaUXBOOES8YPSvQ1ZAoz8ZensCPUto4Rb8VNtf+ib5+CclbMjCOfd8PuXnKbAXHMBauvbde1LZd6dRmOlsbXXxDdkmGnxieAJ8yj7Sn54hMfqEMnu+RufqOmmnWJpVu9jJSnUNLJV4oiTEA39mQiVa8ufbbRLJdvlSPOPRvv9wcJbEwWhsKjxVw6PVZvniXf442m17hcSSRjQRHitoQSb5etI7v8oQi4kUXLHdjMAnYTOAJPol98Od6Jq0/lBxA9K0k X-Forefront-Antispam-Report: CIP:198.47.23.195;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:lewvzet201.ext.ti.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(7416014)(376014)(36860700016)(82310400026)(1800799024)(23010399003)(10067099003)(56012099006)(22082099003)(18002099003)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: iYS7Br0hbmiVaVdHtjloJYgbGKeob0gjAFgBbnpQGjYtV64ExJPYd227VdP94GULZlFjQuGCTFuLU1qikTUUrv8D1AtEqS+PxLdhOBUkhbVXC8Cr12vkWYp4sdz3xPzgSXTvlX5bp88jqcVB795vJl0rkIlQ5tF1Sjd6LDtvqTAFbx8pzhdhmoTD1RrJ6y5TbsJx0CVb0IsLpXclP+lhlFUOUrY2j7FsjVpIBbCWEAH06jrTpy2nQAxwH4KVWnqotJeeulUdkLsaEvneC9WY5aTq6kw1Afx48SSOhJvRsShRhDOGMRasAP6jCy7dzJjpbQUwA6kHPP69gOZvLKiXve85sQ4ymO+HJbzHU3th11DJScqEHxyaNYHglKLSZefZ0+UtUKo9pkFgktvB7dthS7AS2daUzKKeq8G3zyBJ3vZcEMyBcRsZzpJi7osmCoAA X-Exchange-RoutingPolicyChecked: rqJphfPVzNGDCvrzh/IB9NJjyys8r2c+cdXCwEJU8eND8vC/8L/Q5Q/SzrUtUwBFuqh9sslqsgsPsuZS3d4XsI2t0V5JoEDAUcgi1kfeDa5N65rbTVL+BcZTW0EDz666OEJcSdWGHJm0aPrMraqMIO0Krs7chcbFToTSt5YkJ/L8Sc/i/B+yjbW/a1dD+Gpq+M0aZnIHFlV4bLtM7M70gWVPXjVnaTuz518CJA/wPfTVeot41j2yXpKSKPIfxTMJiA3HUnniBWtA+j0A77E7A7Y4i2sqexJ+J70CqXrRwR02wWI/NiCfaRu0Jyn5ShIRJrBlS7vNKD7zXONuTemEdw== X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2026 06:51:08.5638 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 11528352-8693-444e-8f38-08df1875e1b1 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.195];Helo=[lewvzet201.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000AD7A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7507 X-Proofpoint-ORIG-GUID: k5KcjZ8TjhXyF9WypfbNh0lyMKCDQQEd X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfXzjjo1lIySImx tDOpMD25CP/mXUh14VJo331+bVUSadONEQuGzDKRRpUNeP0x0CgaSabq+3/kzdV+lP4NmXn/wrW AV+kByQDLo623QzvRjpXlHdMKqbbxOgs9eCkKaju8jGdN7O1ODLyJx0mO6I7UrHKpU7CqSu27w7 X6sRhXAatooek1sh4JzfvP1NynBhH9+vx5UZTBes1UOSzPG79X+yHro01HdpY343bYQdWWzMetV eK7YXd/WYzoxl57pDbOiQoJ+rv9VZ1fW9QNIAfNAwO1uSQeuhYQxByxG0tZGIb3CLQbXMSVxcco qMLHd4wnn1jgSkudBFOd0ZSkSPRH7Bkz075VCEDAzrz87vervJJRJPxClljVvAhghviAH4OwS5z gU8sz3NdLVgAg2xBLmTEQC2gBJHozQcDOtiFDHed0d0oxzG3ZGlnhJYlY08AXyZC8hRUDFFVrC3 3+YLTkxVdIvWDY6c0DQ== X-Proofpoint-GUID: k5KcjZ8TjhXyF9WypfbNh0lyMKCDQQEd X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDA5NyBTYWx0ZWRfX1NcOfc64oOB7 dzIfRF8v2J8CH/Nfgeoh1B4i/z5scQ7IeD34hhTASw+WmhX0IVEn+kWyyGQHuvfgmvMMngKt3Fs 8tcXcTIXTADBLXEEHhznhUAvnQ3oIEs= X-Authority-Analysis: v=2.4 cv=XYYcX455 c=1 sm=1 tr=0 ts=6ab22561 cx=c_pps a=56tib/hgGBcemyuyLZC9AQ==:117 a=f+v6EHfkeJbVwR46tk4DMg==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=VdqzKS8jKosA:10 a=s63m1ICgrNkA:10 a=V5UXEbMT0ywA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Z8NIEmU8O1QQgoT56wFK:22 a=gO1vWkAQAl3rybz1DQOp:22 a=sozttTNsAAAA:8 a=awo6gdX1Wv1SqJAOH5YA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-21_07,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 clxscore=1015 bulkscore=0 phishscore=0 adultscore=0 malwarescore=0 suspectscore=0 priorityscore=1501 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220097 Content-Type: text/plain; charset="utf-8" The `__udma_reserve_##res` macro currently lacks a bounds check for the provided `id`. If a caller passes an ID exceeding the resource count (`ud->res##_cnt`), `test_bit()` performs an out-of-bounds memory access on the bitmap. Additionally, the macro returns `-ENOENT` when a resource is already in use, which is semantically incorrect. The logging logic is also broken, printing the literal "res##" instead of the resource name. Update the macro to: 1. Validate `id` against `ud->res##_cnt` and return `-EINVAL` if out of bounds. 2. Return `-EBUSY` instead of `-ENOENT` when a resource is already reserved, correctly reflecting the resource state. 3. Use the stringification operator `#res` to correctly print the resource name (e.g., "tchan") in error messages. Signed-off-by: Sai Sree Kartheek Adivi --- drivers/dma/ti/k3-udma-common.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/dma/ti/k3-udma-common.c b/drivers/dma/ti/k3-udma-commo= n.c index 1220ac13c5fd1..74aa700bc5d20 100644 --- a/drivers/dma/ti/k3-udma-common.c +++ b/drivers/dma/ti/k3-udma-common.c @@ -2016,9 +2016,14 @@ struct udma_##res *__udma_reserve_##res(struct udma_= dev *ud, \ int id) \ { \ if (id >=3D 0) { \ + if (id >=3D ud->res##_cnt) { \ + dev_err(ud->dev, \ + #res " id %d is out of bounds.\n", id); \ + return ERR_PTR(-EINVAL); \ + } \ if (test_bit(id, ud->res##_map)) { \ - dev_err(ud->dev, "res##%d is in use\n", id); \ - return ERR_PTR(-ENOENT); \ + dev_err(ud->dev, #res "%d is in use\n", id); \ + return ERR_PTR(-EBUSY); \ } \ } else { \ int start; \ --=20 2.54.0