From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9731CFF886D for ; Tue, 28 Apr 2026 08:53:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Bd6jmkci0QKsJk2nCDDSZn7AM0lqsJgD8k8MS/Dm6k8=; b=wkkVRNrCzLRi1D9GSUavQ+Hyed sbt8AJILRZzU1Pcj2nWoV1pCorujG7rlhJ3QPSsDnbt/8azUMk8f6neMRppJTv0ASHwSpIR45q+5c kwfrseV/NY8hb5HdklOULI+heFwCJUsP98UJTaAd5yf3TqlsWuuZlrnKSKiu/340VlRSU9W2f4UX8 p8lgDRpWi4YvI2XhKyPFbG1vtIUZrn59y1L30rl0AXEWY2XG1ApvbLHD6QUinEf8yfaWBZ5R+Go8o H7V5ufNjt8Y2nOrBbf5G0yEaWlnHrxeMMeNwmd08YHz6KEDcDbzsoT93sfa7Hapb8vdVmYPhRPRq6 ehtqGgyA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wHeBu-00000000vdu-2m8Q; Tue, 28 Apr 2026 08:53:14 +0000 Received: from mail-northcentralusazon11010006.outbound.protection.outlook.com ([52.101.193.6] helo=CH1PR05CU001.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1wHeBo-00000000vYE-05iA for linux-arm-kernel@lists.infradead.org; Tue, 28 Apr 2026 08:53:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wL0RD9EZc/ktVMuvv1r9lKw8BuXDXuRywroQz6mPTn6HXAEdMi3VpleV1TAjEYwoD6gl4b/m9AGr4+u3xEirUfxYV+mm0vH33Z65oKND8NQm2ooUoUkB9UQzQMFMXgk0qDA6hKAHbpdtw4SD/mfzDf/MmQ5/gau9rchThkdWR7HgD8xZhDt2Ykpr3x8xAY19usHaucRdfdd9TIAjObMWPr30I/g6ECzWhaTUl7MbK8X8E3A/HN0QdmLuBndRfUXosY9zX0xdflEey1xjJzcZgJsSFGdHILW6JWk4n2aWvyDfdnmkfpXqm+XexUjTKP8jUcbzDyhExxIG653Mr4smfw== 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=Bd6jmkci0QKsJk2nCDDSZn7AM0lqsJgD8k8MS/Dm6k8=; b=M/4rP5wn0pAWGbiVM1YTZ/n7T33lEbO6XXCyM6ozHBTe1mjqTbO0/v6Fz1u5KEdt4N6wda0R2pJxAKMz1jkVUVQlW6HEQoSMZtTJ6m3/C01gC8AT1tB7Wr82KuxAPbNX3aunB6RQ6XZ72iSlP0RK+TQbmI2pzNzOoDztwXDUDp21GFEA/DpDbATCQlj3VtXjIwuI8XsldN003OalHpWqvrS+LbqnysIRBJ/K88lZjnLa8Pbb2Fse0LbncPFcJdae10ubd+rOrGtf9mll4kd9m1YO/Yc0Oy+zlkCgmCZVgLYjIeu2ZqbTnnJ9cEKrhoocyWfOE5jsaflLFWYrVnLGWA== 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=Bd6jmkci0QKsJk2nCDDSZn7AM0lqsJgD8k8MS/Dm6k8=; b=DiK9jQwaXM3OFaz6VeskjyGKQVmlR7BlFMaq5zlwflnaSoMH64yzAGJhnt/0sJ1UyXykr2nAn4MioIR3QriCME2ixOu141nAHCnGsfuYKXDqlGgJQqeM3F0k6rRJL7gfA54gfSx5pPHodTQH9jndyNpAxUP34E9MlClra/FFWEE= Received: from MW4PR03CA0206.namprd03.prod.outlook.com (2603:10b6:303:b8::31) by IA3PR10MB8707.namprd10.prod.outlook.com (2603:10b6:208:571::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.26; Tue, 28 Apr 2026 08:53:03 +0000 Received: from SJ5PEPF000001F2.namprd05.prod.outlook.com (2603:10b6:303:b8:cafe::a6) by MW4PR03CA0206.outlook.office365.com (2603:10b6:303:b8::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9846.26 via Frontend Transport; Tue, 28 Apr 2026 08:53:02 +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 SJ5PEPF000001F2.mail.protection.outlook.com (10.167.242.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.18 via Frontend Transport; Tue, 28 Apr 2026 08:53:01 +0000 Received: from DFLE203.ent.ti.com (10.64.6.61) 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.20; Tue, 28 Apr 2026 03:52:40 -0500 Received: from DFLE208.ent.ti.com (10.64.6.66) 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.20; Tue, 28 Apr 2026 03:52:39 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DFLE208.ent.ti.com (10.64.6.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Tue, 28 Apr 2026 03:52:39 -0500 Received: from uda0498651.dhcp.ti.com (uda0498651.dhcp.ti.com [172.24.233.239]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 63S8q6MO623293; Tue, 28 Apr 2026 03:52:35 -0500 From: Sai Sree Kartheek Adivi To: , , , , , , , , , , , , , CC: , Subject: [PATCH v6 06/19] dmaengine: ti: k3-udma: move ring management functions to k3-udma-common.c Date: Tue, 28 Apr 2026 14:21:35 +0530 Message-ID: <20260428085202.1724548-7-s-adivi@ti.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260428085202.1724548-1-s-adivi@ti.com> References: <20260428085202.1724548-1-s-adivi@ti.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001F2:EE_|IA3PR10MB8707:EE_ X-MS-Office365-Filtering-Correlation-Id: 71c9d6e9-e0a3-4513-ee7e-08dea5038dea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|7416014|36860700016|921020|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: iNsaAg+FrU1MteLAcinmDyItrflG+iJ7jIfiXGV1i+q/PJqsU/smcp4oA6cVOZrhHZl08It2eAfedPXs7qm0mXZ1MkZD0ysWSBScfomjKOjfPlQIo0PH13UZKri1izpJusX4J1xzX4E4SyQC3n9IgeTYmlmj2ljrWcsoeBfAZgdiFHZVLlnc2fep0jqOymD5MNKD+38YP1ifyQZQ08UZZDmFqAzMLU2iEKAFOuPqMz94axiARJd0B6k5ATpjPxWgIj8ydLScHFS4IPteiscHoQ3fZmi4WeKEKk7DcPGJAgGs+eJZKb6QOYnM3dvPBci3IRi5nsAJA5j+ae7BFyTWiZrA5pzPCDzzyAGb+3lc5V2zkt+qwIwwuFJXwFWaH7Rayi0IiaRxK4Z2CXhNLRZingc25lI5h2zjZjLdDJ+jae8Gwzo2huJ1YmT8nO8FhTfmXdkohszBZWJW6kqOumo9novstbqiirgu0wrYS6Ug//Lo/QDg2pcVKaMCVTms+Fm4D5AwXpiRQSHfL6AO6+rA4Y1dju7rOD834Bi/u6K8qBy0hSMu4yw++lCLk6XcvRe5oWjtywQ2Cwol9HgG2a/gbAEfpO5a2aC88/9WkuFX7N5fJKNMSYfaZC7bk6vYQ7cZHxvebb7bQpN4uhBgDEHjHce1VoEmkRmcvVZ71Dgkvw9UFEHXfmS1BpKIcLoXagxzJnfeGPogNXd8Ip5ZODrl2ytk+S7Qy9lxxDzxh5NQGsS9rZSIBCSJ3SSSIQhc+8lSC2vSRb2YBlbzKEywfqtGr2dwFgO2xd7azzv/D0XijQYfi9erN8diQwnGP9Vr6LjH 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)(1800799024)(376014)(7416014)(36860700016)(921020)(18002099003)(22082099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gaewmLXw3jvUAs/0I2ARwnQVbsaUb70n8SdaeaAHW4ZpsUNwdn/bDArcohETi9HnXXSGqQ4k0keuf5elE7Bt1/FLqHGCvWJu+gtVSA+lcABP7Ebm5SUhm5cZK5gLRFZQv2vZLV5u2C+GMsfos2fc6XKurXh/mscnxjWV8uNXjsmnkLdHwjtgGDj6FlN5/l3uTXsn54uv/0pD84dBAHbE7UJ66p8NcS7pve1EWnwZkEQrp4ebL4xwSc7AYv7BawvDb6xEJf+S8mKWh5yV0Fm7jb0TVvmns4USLUt76R920GhgfQENYm9RJF5SXGpyLAGywYIVgexSW8G+nlkkEzcHHGhGXShj1LUKxRdwXYMgxr7RzI2pPLnW4bREBUUYH9QyjpdAMA0YuR6y3vXzOuSMcBwFbWWROVK8rjj2vR5PTANeRpIQtslIRgp9e4T92v53 X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2026 08:53:01.6344 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 71c9d6e9-e0a3-4513-ee7e-08dea5038dea 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: SJ5PEPF000001F2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8707 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260428_015308_087116_3A03B778 X-CRM114-Status: GOOD ( 16.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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-common.c index 9cb35759c70bb..4dcf986f84d87 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 *vc, } EXPORT_SYMBOL_GPL(udma_desc_pre_callback); +int udma_push_to_ring(struct udma_chan *uc, int idx) +{ + struct udma_desc *d = uc->desc; + struct k3_ring *ring = NULL; + dma_addr_t paddr; + + switch (uc->config.dir) { + case DMA_DEV_TO_MEM: + ring = uc->rflow->fd_ring; + break; + case DMA_MEM_TO_DEV: + case DMA_MEM_TO_MEM: + ring = uc->tchan->t_ring; + break; + default: + return -EINVAL; + } + + /* RX flush packet: idx == -1 is only passed in case of DEV_TO_MEM */ + if (idx == -1) { + paddr = udma_get_rx_flush_hwdesc_paddr(uc); + } else { + paddr = 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 = NULL; + int ret; + + switch (uc->config.dir) { + case DMA_DEV_TO_MEM: + ring = uc->rflow->r_ring; + break; + case DMA_MEM_TO_DEV: + case DMA_MEM_TO_MEM: + ring = uc->tchan->tc_ring; + break; + default: + return -ENOENT; + } + + ret = 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 = NULL; + struct k3_ring *ring2 = NULL; + + switch (uc->config.dir) { + case DMA_DEV_TO_MEM: + if (uc->rchan) { + ring1 = uc->rflow->fd_ring; + ring2 = uc->rflow->r_ring; + } + break; + case DMA_MEM_TO_DEV: + case DMA_MEM_TO_MEM: + if (uc->tchan) { + ring1 = uc->tchan->t_ring; + ring2 = 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 = 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 96df0893fa095..5c84741881cae 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; } -static int udma_push_to_ring(struct udma_chan *uc, int idx) -{ - struct udma_desc *d = uc->desc; - struct k3_ring *ring = NULL; - dma_addr_t paddr; - - switch (uc->config.dir) { - case DMA_DEV_TO_MEM: - ring = uc->rflow->fd_ring; - break; - case DMA_MEM_TO_DEV: - case DMA_MEM_TO_MEM: - ring = uc->tchan->t_ring; - break; - default: - return -EINVAL; - } - - /* RX flush packet: idx == -1 is only passed in case of DEV_TO_MEM */ - if (idx == -1) { - paddr = udma_get_rx_flush_hwdesc_paddr(uc); - } else { - paddr = 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 = NULL; - int ret; - - switch (uc->config.dir) { - case DMA_DEV_TO_MEM: - ring = uc->rflow->r_ring; - break; - case DMA_MEM_TO_DEV: - case DMA_MEM_TO_MEM: - ring = uc->tchan->tc_ring; - break; - default: - return -ENOENT; - } - - ret = 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 = NULL; - struct k3_ring *ring2 = NULL; - - switch (uc->config.dir) { - case DMA_DEV_TO_MEM: - if (uc->rchan) { - ring1 = uc->rflow->fd_ring; - ring2 = uc->rflow->r_ring; - } - break; - case DMA_MEM_TO_DEV: - case DMA_MEM_TO_MEM: - if (uc->tchan) { - ring1 = uc->tchan->t_ring; - ring2 = 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 = NULL; - } -} - static void udma_decrement_byte_counters(struct udma_chan *uc, u32 val) { if (uc->desc->dir == DMA_DEV_TO_MEM) { diff --git a/drivers/dma/ti/k3-udma.h b/drivers/dma/ti/k3-udma.h index 7c807bd9e178b..4c6e5b946d5cf 100644 --- a/drivers/dma/ti/k3-udma.h +++ b/drivers/dma/ti/k3-udma.h @@ -610,6 +610,10 @@ void udma_desc_pre_callback(struct virt_dma_chan *vc, struct virt_dma_desc *vd, struct dmaengine_result *result); +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_thread); int xudma_navss_psil_unpair(struct udma_dev *ud, u32 src_thread, -- 2.53.0