From nobody Mon Dec 29 16:53:33 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17A6CC61DF4 for ; Fri, 24 Nov 2023 19:26:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346012AbjKXT0S (ORCPT ); Fri, 24 Nov 2023 14:26:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345941AbjKXT0Q (ORCPT ); Fri, 24 Nov 2023 14:26:16 -0500 Received: from helios.alatek.com.pl (helios.alatek.com.pl [85.14.123.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E26B3596; Fri, 24 Nov 2023 11:26:22 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by helios.alatek.com.pl (Postfix) with ESMTP id 5669A2CE00D5; Fri, 24 Nov 2023 20:26:20 +0100 (CET) Received: from helios.alatek.com.pl ([127.0.0.1]) by localhost (helios.alatek.com.pl [127.0.0.1]) (amavis, port 10032) with ESMTP id 8aBC_2sWDiXG; Fri, 24 Nov 2023 20:26:19 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by helios.alatek.com.pl (Postfix) with ESMTP id DDF102CE00D3; Fri, 24 Nov 2023 20:26:18 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.10.3 helios.alatek.com.pl DDF102CE00D3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alatek.krakow.pl; s=99EE5E86-D06A-11EC-BE24-DBCCD0A148D3; t=1700853978; bh=7vqJzCSKmffoYniIho4qYT8MOcj1+wJs//YsF1u/zCk=; h=From:To:Date:Message-Id:MIME-Version; b=CRCZpVGtj7ibXqSULhLgSaCATfP/8Kcl6ic7dfdDryItjWl5ejWoiC3CjLVJkX7BG NRXHZsLoSXgVBI9a5d6P7vxLkXqipK5/znT8c0DugE8sL826BA9+B+FDCq1Ba3lIvA uumnnJXDu7r7wUwJocfcO15XWJ7R3r1GEin/K3O5y9Dz00RYjLc298Xdg02jFtgOAt ZGAcn1uTZ1rPXka+3MMdb2xq6UGq1vgPK31qY0qjDSEUCfgHAmJyemhHjGSIFDg0WR KMuSNBclRG/qrsmCTsNnuWnYDkzVCZyZs4SiUy1qCVCjO3+/rv+aVC8Wa8+rKkXgcT MlkcUwfVf+BTA== X-Virus-Scanned: amavis at alatek.com.pl Received: from helios.alatek.com.pl ([127.0.0.1]) by localhost (helios.alatek.com.pl [127.0.0.1]) (amavis, port 10026) with ESMTP id kvSdhwQaJYn8; Fri, 24 Nov 2023 20:26:18 +0100 (CET) Received: from ideapad.. (unknown [10.0.2.2]) by helios.alatek.com.pl (Postfix) with ESMTPSA id 955922CE00D1; Fri, 24 Nov 2023 20:26:18 +0100 (CET) From: Jan Kuliga To: lizhi.hou@amd.com, brian.xu@amd.com, raj.kumar.rampelli@amd.com, vkoul@kernel.org, michal.simek@amd.com, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, runtimeca39d@amd.com Cc: Jan Kuliga Subject: [PATCH v3 1/5] dmaengine: xilinx: xdma: Add transfer termination callbacks Date: Fri, 24 Nov 2023 20:25:54 +0100 Message-Id: <20231124192558.135004-2-jankul@alatek.krakow.pl> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231124192524.134989-1-jankul@alatek.krakow.pl> References: <20231124192524.134989-1-jankul@alatek.krakow.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The xdma driver currently doesn't implement proper transfer termination callbacks. Therefore, there is no way to gracefully terminate the on-going DMA transactions. That is particularly useful for cyclic DMA transfers. Implement these callbacks. Signed-off-by: Jan Kuliga --- drivers/dma/xilinx/xdma-regs.h | 1 + drivers/dma/xilinx/xdma.c | 60 ++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/drivers/dma/xilinx/xdma-regs.h b/drivers/dma/xilinx/xdma-regs.h index e641a5083e14..1f17ce165f92 100644 --- a/drivers/dma/xilinx/xdma-regs.h +++ b/drivers/dma/xilinx/xdma-regs.h @@ -76,6 +76,7 @@ struct xdma_hw_desc { #define XDMA_CHAN_CONTROL_W1S 0x8 #define XDMA_CHAN_CONTROL_W1C 0xc #define XDMA_CHAN_STATUS 0x40 +#define XDMA_CHAN_STATUS_RC 0x44 #define XDMA_CHAN_COMPLETED_DESC 0x48 #define XDMA_CHAN_ALIGNMENTS 0x4c #define XDMA_CHAN_INTR_ENABLE 0x90 diff --git a/drivers/dma/xilinx/xdma.c b/drivers/dma/xilinx/xdma.c index 84a88029226f..b8de15e3dcfc 100644 --- a/drivers/dma/xilinx/xdma.c +++ b/drivers/dma/xilinx/xdma.c @@ -632,6 +632,64 @@ xdma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t= address, return NULL; } =20 +/** + * xdma_terminate_all - Halt the DMA channel + * @chan: DMA channel + */ +static int xdma_terminate_all(struct dma_chan *chan) +{ + int ret; + u32 val; + unsigned long flags; + struct xdma_chan *xchan =3D to_xdma_chan(chan); + struct xdma_device *xdev =3D xchan->xdev_hdl; + struct virt_dma_desc *vd; + LIST_HEAD(head); + + /* Clear the RUN bit to stop the transfer */ + ret =3D regmap_write(xdev->rmap, xchan->base + XDMA_CHAN_CONTROL_W1C, + CHAN_CTRL_RUN_STOP); + if (ret) + return ret; + + /* Clear the channel status register */ + ret =3D regmap_read(xdev->rmap, xchan->base + XDMA_CHAN_STATUS_RC, &val); + if (ret) + return ret; + + spin_lock_irqsave(&xchan->vchan.lock, flags); + + /* Don't care if there were no descriptors issued */ + vd =3D vchan_next_desc(&xchan->vchan); + if (vd) { + /* + * No need to delete the vd from the vc.desc_issued list, + * every desc list is going to be spliced into vc.desc_terminated + * and initialized anyway. + */ + dma_cookie_complete(&vd->tx); + vchan_terminate_vdesc(vd); + } + vchan_get_all_descriptors(&xchan->vchan, &head); + list_splice_tail(&head, &xchan->vchan.desc_terminated); + + xchan->busy =3D false; + spin_unlock_irqrestore(&xchan->vchan.lock, flags); + + return 0; +} + +/** + * xdma_synchronize - Synchronize current execution context to the DMA cha= nnel + * @chan: DMA channel + */ +static void xdma_synchronize(struct dma_chan *chan) +{ + struct xdma_chan *xchan =3D to_xdma_chan(chan); + + vchan_synchronize(&xchan->vchan); +} + /** * xdma_device_config - Configure the DMA channel * @chan: DMA channel @@ -1093,6 +1151,8 @@ static int xdma_probe(struct platform_device *pdev) xdev->dma_dev.filter.mapcnt =3D pdata->device_map_cnt; xdev->dma_dev.filter.fn =3D xdma_filter_fn; xdev->dma_dev.device_prep_dma_cyclic =3D xdma_prep_dma_cyclic; + xdev->dma_dev.device_terminate_all =3D xdma_terminate_all; + xdev->dma_dev.device_synchronize =3D xdma_synchronize; =20 ret =3D dma_async_device_register(&xdev->dma_dev); if (ret) { --=20 2.34.1 From nobody Mon Dec 29 16:53:33 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 681CCC61DF4 for ; Fri, 24 Nov 2023 19:26:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346020AbjKXT02 (ORCPT ); Fri, 24 Nov 2023 14:26:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345941AbjKXT0Z (ORCPT ); Fri, 24 Nov 2023 14:26:25 -0500 Received: from helios.alatek.com.pl (helios.alatek.com.pl [85.14.123.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4886E35B4; Fri, 24 Nov 2023 11:26:30 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by helios.alatek.com.pl (Postfix) with ESMTP id C806B2CE00D5; Fri, 24 Nov 2023 20:26:28 +0100 (CET) Received: from helios.alatek.com.pl ([127.0.0.1]) by localhost (helios.alatek.com.pl [127.0.0.1]) (amavis, port 10032) with ESMTP id KNT9NsVn8hlx; Fri, 24 Nov 2023 20:26:28 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by helios.alatek.com.pl (Postfix) with ESMTP id 571CF2CE00D3; Fri, 24 Nov 2023 20:26:28 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.10.3 helios.alatek.com.pl 571CF2CE00D3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alatek.krakow.pl; s=99EE5E86-D06A-11EC-BE24-DBCCD0A148D3; t=1700853988; bh=zqhIViRnFAruL/za3c8L0vX7XiguXIze1f1rq462g3c=; h=From:To:Date:Message-Id:MIME-Version; b=oe2kSsOsQT+t8VLbc/jz6+b7+ZxSYy0gfL71v+ZaCSYkzikTavdFxZco7+kOxf8g8 7jCYG1JTDZRoprvdF8Jcu+QvZhQj4m/TYHqCwl3+zskImLA5nlTZHJWXgx7rbanu+h LmJdQChYcLfKQKZBE5Z944suto2/mR2Qj0ff9KIEJtgqRXhSO5T0cq4E+pcGderoTw 8p2MJumWLfmoqYRV1+TdNc53aOxyCmj/B/Hp31eOYbK0omcYDrjzg33Sn3L67lDegk ToBGYPFWB0v8aBXLkEqFmGxnYX6tU1wh18P0zP25boCb015HncK3Z6iQwDlXrhrBhF wxIz9m/VIQoaQ== X-Virus-Scanned: amavis at alatek.com.pl Received: from helios.alatek.com.pl ([127.0.0.1]) by localhost (helios.alatek.com.pl [127.0.0.1]) (amavis, port 10026) with ESMTP id pbP_qd8M5zBS; Fri, 24 Nov 2023 20:26:28 +0100 (CET) Received: from ideapad.. (unknown [10.0.2.2]) by helios.alatek.com.pl (Postfix) with ESMTPSA id 22BF02CE00D1; Fri, 24 Nov 2023 20:26:28 +0100 (CET) From: Jan Kuliga To: lizhi.hou@amd.com, brian.xu@amd.com, raj.kumar.rampelli@amd.com, vkoul@kernel.org, michal.simek@amd.com, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, runtimeca39d@amd.com Cc: Jan Kuliga Subject: [PATCH v3 2/5] dmaengine: xilinx: xdma: Get rid of duplicated macros definitions Date: Fri, 24 Nov 2023 20:25:55 +0100 Message-Id: <20231124192558.135004-3-jankul@alatek.krakow.pl> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231124192524.134989-1-jankul@alatek.krakow.pl> References: <20231124192524.134989-1-jankul@alatek.krakow.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" These macros are defined earlier in the file. Signed-off-by: Jan Kuliga --- drivers/dma/xilinx/xdma-regs.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/dma/xilinx/xdma-regs.h b/drivers/dma/xilinx/xdma-regs.h index 1f17ce165f92..7a169377b483 100644 --- a/drivers/dma/xilinx/xdma-regs.h +++ b/drivers/dma/xilinx/xdma-regs.h @@ -135,18 +135,6 @@ struct xdma_hw_desc { #define XDMA_SGDMA_DESC_ADJ 0x4088 #define XDMA_SGDMA_DESC_CREDIT 0x408c =20 -/* bits of the SG DMA control register */ -#define XDMA_CTRL_RUN_STOP BIT(0) -#define XDMA_CTRL_IE_DESC_STOPPED BIT(1) -#define XDMA_CTRL_IE_DESC_COMPLETED BIT(2) -#define XDMA_CTRL_IE_DESC_ALIGN_MISMATCH BIT(3) -#define XDMA_CTRL_IE_MAGIC_STOPPED BIT(4) -#define XDMA_CTRL_IE_IDLE_STOPPED BIT(6) -#define XDMA_CTRL_IE_READ_ERROR GENMASK(13, 9) -#define XDMA_CTRL_IE_DESC_ERROR GENMASK(23, 19) -#define XDMA_CTRL_NON_INCR_ADDR BIT(25) -#define XDMA_CTRL_POLL_MODE_WB BIT(26) - /* * interrupt registers */ --=20 2.34.1 From nobody Mon Dec 29 16:53:33 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59F5AC61D97 for ; Fri, 24 Nov 2023 19:26:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346058AbjKXT0g (ORCPT ); Fri, 24 Nov 2023 14:26:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346033AbjKXT0c (ORCPT ); Fri, 24 Nov 2023 14:26:32 -0500 Received: from helios.alatek.com.pl (helios.alatek.com.pl [85.14.123.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 823BD384D; Fri, 24 Nov 2023 11:26:38 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by helios.alatek.com.pl (Postfix) with ESMTP id 8B33E2CE00D8; Fri, 24 Nov 2023 20:26:36 +0100 (CET) Received: from helios.alatek.com.pl ([127.0.0.1]) by localhost (helios.alatek.com.pl [127.0.0.1]) (amavis, port 10032) with ESMTP id 3Wyw9UDK6470; Fri, 24 Nov 2023 20:26:36 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by helios.alatek.com.pl (Postfix) with ESMTP id 31E232CE00D5; Fri, 24 Nov 2023 20:26:36 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.10.3 helios.alatek.com.pl 31E232CE00D5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alatek.krakow.pl; s=99EE5E86-D06A-11EC-BE24-DBCCD0A148D3; t=1700853996; bh=H3UOebWbztiN0l07oDLxMwZHegqQNqhnZ63Q4IX1xxM=; h=From:To:Date:Message-Id:MIME-Version; b=sx/kn3UN96dLfEqk3VI5IhC/VPJkWSSP8cPDmTa3yBW47VIS41J+/K/JtIjPZu1oK R+CvpTMsUQo7vo+s2L86DfIwj+eFKJzVrn8wslUmbuYjyrEaiCOpTJdHh1AsbIvFY2 dLiV6VZFpoSJXn2X1/opmSStQg4/RFo0p8ctm9zFmt31ypU1tcYy0H83tifqGDOe5P LCJblmPesz25d8VPRykHgqHrVrGhGgcjBohr5PvYEvMz12/AEnqJv7cpjbq3ukm1b+ EcLNMyXpAI4lvADuhrNkF1qDFH5zDN/vSp/nYsMhCEIaV49OgV/SDlAQD2agg2ypP7 33Y4goo7YCe6Q== X-Virus-Scanned: amavis at alatek.com.pl Received: from helios.alatek.com.pl ([127.0.0.1]) by localhost (helios.alatek.com.pl [127.0.0.1]) (amavis, port 10026) with ESMTP id OPjaALiZmbOG; Fri, 24 Nov 2023 20:26:36 +0100 (CET) Received: from ideapad.. (unknown [10.0.2.2]) by helios.alatek.com.pl (Postfix) with ESMTPSA id F3C862CE00D3; Fri, 24 Nov 2023 20:26:35 +0100 (CET) From: Jan Kuliga To: lizhi.hou@amd.com, brian.xu@amd.com, raj.kumar.rampelli@amd.com, vkoul@kernel.org, michal.simek@amd.com, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, runtimeca39d@amd.com Cc: Jan Kuliga Subject: [PATCH v3 3/5] dmaengine: xilinx: xdma: Complete lacking register description Date: Fri, 24 Nov 2023 20:25:56 +0100 Message-Id: <20231124192558.135004-4-jankul@alatek.krakow.pl> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231124192524.134989-1-jankul@alatek.krakow.pl> References: <20231124192524.134989-1-jankul@alatek.krakow.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Complete lacking bits, that describe the status/control register values. Signed-off-by: Jan Kuliga --- drivers/dma/xilinx/xdma-regs.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/dma/xilinx/xdma-regs.h b/drivers/dma/xilinx/xdma-regs.h index 7a169377b483..654c5e41112d 100644 --- a/drivers/dma/xilinx/xdma-regs.h +++ b/drivers/dma/xilinx/xdma-regs.h @@ -102,6 +102,7 @@ struct xdma_hw_desc { #define CHAN_CTRL_IE_MAGIC_STOPPED BIT(4) #define CHAN_CTRL_IE_IDLE_STOPPED BIT(6) #define CHAN_CTRL_IE_READ_ERROR GENMASK(13, 9) +#define CHAN_CTRL_IE_WRITE_ERROR GENMASK(18, 14) #define CHAN_CTRL_IE_DESC_ERROR GENMASK(23, 19) #define CHAN_CTRL_NON_INCR_ADDR BIT(25) #define CHAN_CTRL_POLL_MODE_WB BIT(26) @@ -112,6 +113,7 @@ struct xdma_hw_desc { CHAN_CTRL_IE_DESC_ALIGN_MISMATCH | \ CHAN_CTRL_IE_MAGIC_STOPPED | \ CHAN_CTRL_IE_READ_ERROR | \ + CHAN_CTRL_IE_WRITE_ERROR | \ CHAN_CTRL_IE_DESC_ERROR) =20 /* bits of the channel interrupt enable mask */ --=20 2.34.1 From nobody Mon Dec 29 16:53:33 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7485C61D97 for ; Fri, 24 Nov 2023 19:26:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346070AbjKXT0r (ORCPT ); Fri, 24 Nov 2023 14:26:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346039AbjKXT0k (ORCPT ); Fri, 24 Nov 2023 14:26:40 -0500 Received: from helios.alatek.com.pl (helios.alatek.com.pl [85.14.123.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09A173864; Fri, 24 Nov 2023 11:26:45 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by helios.alatek.com.pl (Postfix) with ESMTP id 15F2C2CE00DA; Fri, 24 Nov 2023 20:26:43 +0100 (CET) Received: from helios.alatek.com.pl ([127.0.0.1]) by localhost (helios.alatek.com.pl [127.0.0.1]) (amavis, port 10032) with ESMTP id NX6Ds4Qmq5FP; Fri, 24 Nov 2023 20:26:42 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by helios.alatek.com.pl (Postfix) with ESMTP id A4BC72CE00D9; Fri, 24 Nov 2023 20:26:42 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.10.3 helios.alatek.com.pl A4BC72CE00D9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alatek.krakow.pl; s=99EE5E86-D06A-11EC-BE24-DBCCD0A148D3; t=1700854002; bh=t2DvnPm/DmspTUPI5isSC5hKU7aNqpJg/iZh1RieKVk=; h=From:To:Date:Message-Id:MIME-Version; b=NAXPePizDyluzoIYXNGgwTbgLizk7FSpGZAGRGlK2ePP/os0ZEWj6oLBmNobORfxN V6OVBJqWD3ZHuOXgw4MKYEvlqhNLomHOKqiUMCfGtRA2g9PghgJU33z2i4tu/dqpHD IY/ujoX1TYdHBWFdA/0FcckFVcQFcZ2AZGwvgMxWmvVbq6PJqkMqIVH4G4nwSIhzZV ilYzr+mtMR+MDLvbZ8XTuVTx0zClecYF/5vLTOAu16YSyt1R7ziub3QkmgD4fngUKu KXwIj+8QRkfXz+SKJuzyez3vxJ4li+gCm/1nkXgfqnN0hzi7r+fk8Qe6dzt7VlqTRj wll3wbnJcNs+A== X-Virus-Scanned: amavis at alatek.com.pl Received: from helios.alatek.com.pl ([127.0.0.1]) by localhost (helios.alatek.com.pl [127.0.0.1]) (amavis, port 10026) with ESMTP id UsCI8iUtAkr6; Fri, 24 Nov 2023 20:26:42 +0100 (CET) Received: from ideapad.. (unknown [10.0.2.2]) by helios.alatek.com.pl (Postfix) with ESMTPSA id 70DAA2CE00D8; Fri, 24 Nov 2023 20:26:42 +0100 (CET) From: Jan Kuliga To: lizhi.hou@amd.com, brian.xu@amd.com, raj.kumar.rampelli@amd.com, vkoul@kernel.org, michal.simek@amd.com, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, runtimeca39d@amd.com Cc: Jan Kuliga Subject: [PATCH v3 4/5] dmaengine: xilinx: xdma: Rework xdma_channel_isr() Date: Fri, 24 Nov 2023 20:25:57 +0100 Message-Id: <20231124192558.135004-5-jankul@alatek.krakow.pl> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231124192524.134989-1-jankul@alatek.krakow.pl> References: <20231124192524.134989-1-jankul@alatek.krakow.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The xdma's channel status register may be read and cleared simultaneously, by accesing it via seperate XDMA_CHAN_STATUS_RC register. Therefore, it is possible to simplify the code by just getting rid of a seperate redundant write. Also, implement the actual status register checking as well. Previously, the cyclic callback would be scheduled regardless of the status register state. Fix it. Signed-off-by: Jan Kuliga --- drivers/dma/xilinx/xdma-regs.h | 2 ++ drivers/dma/xilinx/xdma.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/dma/xilinx/xdma-regs.h b/drivers/dma/xilinx/xdma-regs.h index 654c5e41112d..6bf7ae84e452 100644 --- a/drivers/dma/xilinx/xdma-regs.h +++ b/drivers/dma/xilinx/xdma-regs.h @@ -116,6 +116,8 @@ struct xdma_hw_desc { CHAN_CTRL_IE_WRITE_ERROR | \ CHAN_CTRL_IE_DESC_ERROR) =20 +#define XDMA_CHAN_STATUS_MASK CHAN_CTRL_START + /* bits of the channel interrupt enable mask */ #define CHAN_IM_DESC_ERROR BIT(19) #define CHAN_IM_READ_ERROR BIT(9) diff --git a/drivers/dma/xilinx/xdma.c b/drivers/dma/xilinx/xdma.c index b8de15e3dcfc..de4615bd4ee5 100644 --- a/drivers/dma/xilinx/xdma.c +++ b/drivers/dma/xilinx/xdma.c @@ -814,15 +814,15 @@ static irqreturn_t xdma_channel_isr(int irq, void *de= v_id) =20 desc->completed_desc_num +=3D complete_desc_num; =20 - if (desc->cyclic) { - ret =3D regmap_read(xdev->rmap, xchan->base + XDMA_CHAN_STATUS, - &st); - if (ret) - goto out; - - regmap_write(xdev->rmap, xchan->base + XDMA_CHAN_STATUS, st); + /* clear-on-read the status register */ + ret =3D regmap_read(xdev->rmap, xchan->base + XDMA_CHAN_STATUS_RC, &st); + if (ret) + goto out; =20 - vchan_cyclic_callback(vd); + if (desc->cyclic) { + st &=3D XDMA_CHAN_STATUS_MASK; + if (st & CHAN_CTRL_IE_DESC_COMPLETED) + vchan_cyclic_callback(vd); goto out; } =20 --=20 2.34.1 From nobody Mon Dec 29 16:53:33 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B690C61DF4 for ; Fri, 24 Nov 2023 19:27:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346038AbjKXT06 (ORCPT ); Fri, 24 Nov 2023 14:26:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346043AbjKXT0r (ORCPT ); Fri, 24 Nov 2023 14:26:47 -0500 Received: from helios.alatek.com.pl (helios.alatek.com.pl [85.14.123.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4443C30F6; Fri, 24 Nov 2023 11:26:52 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by helios.alatek.com.pl (Postfix) with ESMTP id 433D32CE00DC; Fri, 24 Nov 2023 20:26:50 +0100 (CET) Received: from helios.alatek.com.pl ([127.0.0.1]) by localhost (helios.alatek.com.pl [127.0.0.1]) (amavis, port 10032) with ESMTP id zks-Igk9_28N; Fri, 24 Nov 2023 20:26:49 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by helios.alatek.com.pl (Postfix) with ESMTP id 9F68C2CE00DA; Fri, 24 Nov 2023 20:26:49 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.10.3 helios.alatek.com.pl 9F68C2CE00DA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alatek.krakow.pl; s=99EE5E86-D06A-11EC-BE24-DBCCD0A148D3; t=1700854009; bh=iavZyvPckMzvsc4PJ76HGqTRtzDPAKaZ+PAcAb4Ooms=; h=From:To:Date:Message-Id:MIME-Version; b=NXuMCyTfUxMoRSTat1fhRymXai4F4TUn3SdDVzUBue580t1n4Ul99zVtpOFwgxlu1 UIx9hQBXqR8ayg57kTDkhPKhT/miGEzjdqvF893OPPY4EK3ctxVOdaps8lkqHp4vxT ZUA6Lr8RBSZn6chMlbRlaK2P+t6rs3/l3q3SkPxUn/9ZNR0st6yAIK8R4esh+/YlRy AssQWo3rQ01MGme7859AEC4sHV+AWoDvy8l/cCocBAPMSUhMEVkmEEnJLV/3cG3aMx /p1XUMBvqyEa2rQLKCDFOJy5ENIo2gBHRX8lDXGl4zykPd4D8Z4SR51zT2KCSH3ffd EisC6gCVjD1Hg== X-Virus-Scanned: amavis at alatek.com.pl Received: from helios.alatek.com.pl ([127.0.0.1]) by localhost (helios.alatek.com.pl [127.0.0.1]) (amavis, port 10026) with ESMTP id slmmGsWKQuNK; Fri, 24 Nov 2023 20:26:49 +0100 (CET) Received: from ideapad.. (unknown [10.0.2.2]) by helios.alatek.com.pl (Postfix) with ESMTPSA id 63BBF2CE00D9; Fri, 24 Nov 2023 20:26:49 +0100 (CET) From: Jan Kuliga To: lizhi.hou@amd.com, brian.xu@amd.com, raj.kumar.rampelli@amd.com, vkoul@kernel.org, michal.simek@amd.com, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, runtimeca39d@amd.com Cc: Jan Kuliga Subject: [PATCH v3 5/5] dmaengine: xilinx: xdma: Ease dma_pool alignment requirements Date: Fri, 24 Nov 2023 20:25:58 +0100 Message-Id: <20231124192558.135004-6-jankul@alatek.krakow.pl> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231124192524.134989-1-jankul@alatek.krakow.pl> References: <20231124192524.134989-1-jankul@alatek.krakow.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" According to the XDMA datasheet (PG195), the address of any descriptor must be 32 byte aligned. The datasheet also states that a contiguous block of descriptors must not cross a 4k address boundary. Therefore, it is possible to ease the pressure put on the dma_pool allocator just by requiring sufficient alignment and boundary values. Add proper macro definition and change the values passed into the dma_pool_create(). Signed-off-by: Jan Kuliga --- drivers/dma/xilinx/xdma-regs.h | 7 ++++--- drivers/dma/xilinx/xdma.c | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/dma/xilinx/xdma-regs.h b/drivers/dma/xilinx/xdma-regs.h index 6bf7ae84e452..d5cb12e6b8d4 100644 --- a/drivers/dma/xilinx/xdma-regs.h +++ b/drivers/dma/xilinx/xdma-regs.h @@ -64,9 +64,10 @@ struct xdma_hw_desc { __le64 next_desc; }; =20 -#define XDMA_DESC_SIZE sizeof(struct xdma_hw_desc) -#define XDMA_DESC_BLOCK_SIZE (XDMA_DESC_SIZE * XDMA_DESC_ADJACENT) -#define XDMA_DESC_BLOCK_ALIGN 4096 +#define XDMA_DESC_SIZE sizeof(struct xdma_hw_desc) +#define XDMA_DESC_BLOCK_SIZE (XDMA_DESC_SIZE * XDMA_DESC_ADJACENT) +#define XDMA_DESC_BLOCK_ALIGN 32 +#define XDMA_DESC_BLOCK_BOUNDARY 4096 =20 /* * Channel registers diff --git a/drivers/dma/xilinx/xdma.c b/drivers/dma/xilinx/xdma.c index de4615bd4ee5..d32ae93e18b6 100644 --- a/drivers/dma/xilinx/xdma.c +++ b/drivers/dma/xilinx/xdma.c @@ -735,9 +735,9 @@ static int xdma_alloc_chan_resources(struct dma_chan *c= han) return -EINVAL; } =20 - xdma_chan->desc_pool =3D dma_pool_create(dma_chan_name(chan), - dev, XDMA_DESC_BLOCK_SIZE, - XDMA_DESC_BLOCK_ALIGN, 0); + xdma_chan->desc_pool =3D dma_pool_create(dma_chan_name(chan), dev, + XDMA_DESC_BLOCK_SIZE, XDMA_DESC_BLOCK_ALIGN, + XDMA_DESC_BLOCK_BOUNDARY); if (!xdma_chan->desc_pool) { xdma_err(xdev, "unable to allocate descriptor pool"); return -ENOMEM; --=20 2.34.1