From nobody Thu Dec 18 18:39:51 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 E7F19C77B79 for ; Sat, 15 Apr 2023 10:50:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229799AbjDOKuJ (ORCPT ); Sat, 15 Apr 2023 06:50:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230477AbjDOKts (ORCPT ); Sat, 15 Apr 2023 06:49:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA3D0AD38; Sat, 15 Apr 2023 03:49:16 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0CA8E6181A; Sat, 15 Apr 2023 10:47:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7C736C433A0; Sat, 15 Apr 2023 10:47:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681555630; bh=iP3PWNMb+3tRizoMnR4yxUHqhZ9zp9+fFtQ/nNwpumk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oXv9uxLoVAr5ls6Itb9ugVt6EB+K6BCBXT7RN0PxBJLTg+66ybFQQ1jFYQ1TO0/MM omLfs4DzjLDpB2WoqGB3JnobfDeKTy550Oe/j2+UwSd3I91k7w0rESggsyZ4MnmlP+ PA2fUX9pcdhwYvkcfBNEH5oipviz2Co8/7FGQyC9bggD6eWcfDp/sANzoYMaeStURO 1dya3nwzGf4S82qColc98e+f2n9pYmYmgqFce2u19PJTKaQT91cnlJuYwXV4BPq+Ic mxEIuZWj9025ERpBEGYoC4qwVOjn0uU1aiiO5NbgKqdnhpbPzErEIWoweE8VDMc1VW iL4C1FayMlZXQ== From: Jisheng Zhang To: Eugeniy Paltsev , Vinod Koul Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 10/11] dmaengine: dw-axi-dmac: move dma_chan_tx_status() Date: Sat, 15 Apr 2023 18:36:00 +0800 Message-Id: <20230415103601.2979-11-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415103601.2979-1-jszhang@kernel.org> References: <20230415103601.2979-1-jszhang@kernel.org> 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" We will add polled support soon, for which we need to call dw_axi_dma_handle_ch() in dma_chan_tx_status(). Move the function to avoid pre-declaration. No functionality changes. Signed-off-by: Jisheng Zhang --- .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/d= w-axi-dmac/dw-axi-dmac-platform.c index 1c1b9574985a..1d00793a83bf 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c @@ -300,48 +300,6 @@ static void vchan_desc_put(struct virt_dma_desc *vdesc) axi_desc_put(vd_to_axi_desc(vdesc)); } =20 -static enum dma_status -dma_chan_tx_status(struct dma_chan *dchan, dma_cookie_t cookie, - struct dma_tx_state *txstate) -{ - struct axi_dma_chan *chan =3D dchan_to_axi_dma_chan(dchan); - struct axi_dma_desc *desc =3D NULL; - struct virt_dma_desc *vdesc; - enum dma_status status; - u32 completed_length; - unsigned long flags; - u32 completed_blocks; - size_t bytes =3D 0; - u32 length; - u32 len; - - status =3D dma_cookie_status(dchan, cookie, txstate); - if (status =3D=3D DMA_COMPLETE || !txstate) - return status; - - spin_lock_irqsave(&chan->vc.lock, flags); - - vdesc =3D vchan_find_desc(&chan->vc, cookie); - if (vdesc) { - desc =3D vd_to_axi_desc(vdesc); - } else if (chan->desc && chan->desc->vd.tx.cookie =3D=3D cookie) { - desc =3D chan->desc; - } - - if (desc) { - length =3D desc->length; - completed_blocks =3D desc->completed_blocks; - len =3D desc->hw_desc[0].len; - completed_length =3D completed_blocks * len; - bytes =3D length - completed_length; - } - - spin_unlock_irqrestore(&chan->vc.lock, flags); - dma_set_residue(txstate, bytes); - - return status; -} - static void write_desc_llp(struct axi_dma_hw_desc *desc, dma_addr_t adr) { desc->lli->llp =3D cpu_to_le64(adr); @@ -1166,6 +1124,48 @@ static irqreturn_t dw_axi_dma_ch_interrupt(int irq, = void *dev_id) return IRQ_HANDLED; } =20 +static enum dma_status +dma_chan_tx_status(struct dma_chan *dchan, dma_cookie_t cookie, + struct dma_tx_state *txstate) +{ + struct axi_dma_chan *chan =3D dchan_to_axi_dma_chan(dchan); + struct axi_dma_desc *desc =3D NULL; + struct virt_dma_desc *vdesc; + enum dma_status status; + u32 completed_length; + unsigned long flags; + u32 completed_blocks; + size_t bytes =3D 0; + u32 length; + u32 len; + + status =3D dma_cookie_status(dchan, cookie, txstate); + if (status =3D=3D DMA_COMPLETE || !txstate) + return status; + + spin_lock_irqsave(&chan->vc.lock, flags); + + vdesc =3D vchan_find_desc(&chan->vc, cookie); + if (vdesc) { + desc =3D vd_to_axi_desc(vdesc); + } else if (chan->desc && chan->desc->vd.tx.cookie =3D=3D cookie) { + desc =3D chan->desc; + } + + if (desc) { + length =3D desc->length; + completed_blocks =3D desc->completed_blocks; + len =3D desc->hw_desc[0].len; + completed_length =3D completed_blocks * len; + bytes =3D length - completed_length; + } + + spin_unlock_irqrestore(&chan->vc.lock, flags); + dma_set_residue(txstate, bytes); + + return status; +} + static int dma_chan_terminate_all(struct dma_chan *dchan) { struct axi_dma_chan *chan =3D dchan_to_axi_dma_chan(dchan); --=20 2.39.2