From: Paul Cercueil <paul@crapouillou.net> To: Vinod Koul <vkoul@kernel.org>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Ralf Baechle <ralf@linux-mips.org>, Paul Burton <paul.burton@mips.com>, James Hogan <jhogan@kernel.org>, Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> Cc: Mathieu Malaterre <malat@debian.org>, Daniel Silsby <dansilsby@gmail.com>, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@linux-mips.org Subject: [12/14] dmaengine: dma-jz4780: Use dma_set_residue() Date: Tue, 3 Jul 2018 14:32:12 +0200 [thread overview] Message-ID: <20180703123214.23090-13-paul@crapouillou.net> (raw) From: Daniel Silsby <dansilsby@gmail.com> This is the standard method provided by dmaengine header. Signed-off-by: Daniel Silsby <dansilsby@gmail.com> --- drivers/dma/dma-jz4780.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c index 690b853977b2..084b7a46a68d 100644 --- a/drivers/dma/dma-jz4780.c +++ b/drivers/dma/dma-jz4780.c @@ -633,6 +633,7 @@ static enum dma_status jz4780_dma_tx_status(struct dma_chan *chan, struct virt_dma_desc *vdesc; enum dma_status status; unsigned long flags; + unsigned long residue = 0; status = dma_cookie_status(chan, cookie, txstate); if ((status == DMA_COMPLETE) || (txstate == NULL)) @@ -643,13 +644,13 @@ static enum dma_status jz4780_dma_tx_status(struct dma_chan *chan, vdesc = vchan_find_desc(&jzchan->vchan, cookie); if (vdesc) { /* On the issued list, so hasn't been processed yet */ - txstate->residue = jz4780_dma_desc_residue(jzchan, + residue = jz4780_dma_desc_residue(jzchan, to_jz4780_dma_desc(vdesc), 0); } else if (cookie == jzchan->desc->vdesc.tx.cookie) { - txstate->residue = jz4780_dma_desc_residue(jzchan, jzchan->desc, + residue = jz4780_dma_desc_residue(jzchan, jzchan->desc, jzchan->curr_hwdesc + 1); - } else - txstate->residue = 0; + } + dma_set_residue(txstate, residue); if (vdesc && jzchan->desc && vdesc == &jzchan->desc->vdesc && jzchan->desc->status & (JZ_DMA_DCS_AR | JZ_DMA_DCS_HLT))
WARNING: multiple messages have this Message-ID (diff)
From: Paul Cercueil <paul@crapouillou.net> To: Vinod Koul <vkoul@kernel.org>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Ralf Baechle <ralf@linux-mips.org>, Paul Burton <paul.burton@mips.com>, James Hogan <jhogan@kernel.org>, Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> Cc: Mathieu Malaterre <malat@debian.org>, Daniel Silsby <dansilsby@gmail.com>, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@linux-mips.org Subject: [PATCH 12/14] dmaengine: dma-jz4780: Use dma_set_residue() Date: Tue, 3 Jul 2018 14:32:12 +0200 [thread overview] Message-ID: <20180703123214.23090-13-paul@crapouillou.net> (raw) In-Reply-To: <20180703123214.23090-1-paul@crapouillou.net> From: Daniel Silsby <dansilsby@gmail.com> This is the standard method provided by dmaengine header. Signed-off-by: Daniel Silsby <dansilsby@gmail.com> --- drivers/dma/dma-jz4780.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c index 690b853977b2..084b7a46a68d 100644 --- a/drivers/dma/dma-jz4780.c +++ b/drivers/dma/dma-jz4780.c @@ -633,6 +633,7 @@ static enum dma_status jz4780_dma_tx_status(struct dma_chan *chan, struct virt_dma_desc *vdesc; enum dma_status status; unsigned long flags; + unsigned long residue = 0; status = dma_cookie_status(chan, cookie, txstate); if ((status == DMA_COMPLETE) || (txstate == NULL)) @@ -643,13 +644,13 @@ static enum dma_status jz4780_dma_tx_status(struct dma_chan *chan, vdesc = vchan_find_desc(&jzchan->vchan, cookie); if (vdesc) { /* On the issued list, so hasn't been processed yet */ - txstate->residue = jz4780_dma_desc_residue(jzchan, + residue = jz4780_dma_desc_residue(jzchan, to_jz4780_dma_desc(vdesc), 0); } else if (cookie == jzchan->desc->vdesc.tx.cookie) { - txstate->residue = jz4780_dma_desc_residue(jzchan, jzchan->desc, + residue = jz4780_dma_desc_residue(jzchan, jzchan->desc, jzchan->curr_hwdesc + 1); - } else - txstate->residue = 0; + } + dma_set_residue(txstate, residue); if (vdesc && jzchan->desc && vdesc == &jzchan->desc->vdesc && jzchan->desc->status & (JZ_DMA_DCS_AR | JZ_DMA_DCS_HLT)) -- 2.18.0
next reply other threads:[~2018-07-03 12:32 UTC|newest] Thread overview: 111+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-03 12:32 Paul Cercueil [this message] 2018-07-03 12:32 ` [PATCH 12/14] dmaengine: dma-jz4780: Use dma_set_residue() Paul Cercueil -- strict thread matches above, loose matches on Subject: below -- 2018-07-18 5:27 [05/14] dmaengine: dma-jz4780: Add support for the JZ4740 SoC Vinod Koul 2018-07-18 5:27 ` [PATCH 05/14] " Vinod 2018-07-18 5:27 ` Vinod 2018-07-17 17:40 [05/14] " Rob Herring 2018-07-17 17:40 ` [PATCH 05/14] " Rob Herring 2018-07-17 17:40 ` Rob Herring 2018-07-17 15:34 [05/14] " Vinod Koul 2018-07-17 15:34 ` [PATCH 05/14] " Vinod 2018-07-17 11:00 [05/14] " Paul Cercueil 2018-07-17 11:00 ` [PATCH 05/14] " Paul Cercueil 2018-07-16 21:33 [05/14] " Rob Herring 2018-07-16 21:33 ` [PATCH 05/14] " Rob Herring 2018-07-16 21:28 [02/14] dmaengine: dma-jz4780: Separate chan/ctrl registers Rob Herring 2018-07-16 21:28 ` [PATCH 02/14] " Rob Herring 2018-07-11 23:27 [02/14] " Paul Burton 2018-07-11 23:27 ` [PATCH 02/14] " Paul Burton 2018-07-11 23:13 [06/14] dmaengine: dma-jz4780: Add support for the JZ4725B SoC Paul Cercueil 2018-07-11 23:13 ` [PATCH 06/14] " Paul Cercueil 2018-07-11 23:13 [02/14] dmaengine: dma-jz4780: Separate chan/ctrl registers Paul Cercueil 2018-07-11 23:13 ` [PATCH 02/14] " Paul Cercueil 2018-07-11 12:18 [06/14] dmaengine: dma-jz4780: Add support for the JZ4725B SoC Vinod Koul 2018-07-11 12:18 ` [PATCH 06/14] " Vinod 2018-07-11 12:16 [02/14] dmaengine: dma-jz4780: Separate chan/ctrl registers Vinod Koul 2018-07-11 12:16 ` [PATCH 02/14] " Vinod 2018-07-11 12:14 [01/14] dmaengine: dma-jz4780: Avoid hardcoding number of channels Vinod Koul 2018-07-11 12:14 ` [PATCH 01/14] " Vinod 2018-07-10 15:45 [06/14] dmaengine: dma-jz4780: Add support for the JZ4725B SoC Paul Cercueil 2018-07-10 15:45 ` [PATCH 06/14] " Paul Cercueil 2018-07-10 15:41 [04/14] dmaengine: dma-jz4780: Add support for the JZ4770 SoC Paul Cercueil 2018-07-10 15:41 ` [PATCH 04/14] " Paul Cercueil 2018-07-10 15:36 [02/14] dmaengine: dma-jz4780: Separate chan/ctrl registers Paul Cercueil 2018-07-10 15:36 ` [PATCH 02/14] " Paul Cercueil 2018-07-09 17:14 [06/14] dmaengine: dma-jz4780: Add support for the JZ4725B SoC Vinod Koul 2018-07-09 17:14 ` [PATCH 06/14] " Vinod 2018-07-09 17:12 [05/14] dmaengine: dma-jz4780: Add support for the JZ4740 SoC Vinod Koul 2018-07-09 17:12 ` [PATCH 05/14] " Vinod 2018-07-09 17:10 [04/14] dmaengine: dma-jz4780: Add support for the JZ4770 SoC Vinod Koul 2018-07-09 17:10 ` [PATCH 04/14] " Vinod 2018-07-09 17:03 [02/14] dmaengine: dma-jz4780: Separate chan/ctrl registers Vinod Koul 2018-07-09 17:03 ` [PATCH 02/14] " Vinod 2018-07-07 11:01 [01/14] dmaengine: dma-jz4780: Avoid hardcoding number of channels Paul Cercueil 2018-07-07 11:01 ` [PATCH 01/14] " Paul Cercueil 2018-07-07 11:01 ` Paul Cercueil 2018-07-07 7:34 [01/14] " PrasannaKumar Muralidharan 2018-07-07 7:34 ` [PATCH 01/14] " PrasannaKumar Muralidharan 2018-07-07 7:34 ` PrasannaKumar Muralidharan 2018-07-07 7:27 [02/14] dmaengine: dma-jz4780: Separate chan/ctrl registers PrasannaKumar Muralidharan 2018-07-07 7:27 ` [PATCH 02/14] " PrasannaKumar Muralidharan 2018-07-07 7:27 ` PrasannaKumar Muralidharan 2018-07-05 21:45 [02/14] " Paul Cercueil 2018-07-05 21:45 ` [PATCH 02/14] " Paul Cercueil 2018-07-05 21:45 ` Paul Cercueil 2018-07-05 18:26 [01/14] dmaengine: dma-jz4780: Avoid hardcoding number of channels Paul Cercueil 2018-07-05 18:26 ` [PATCH 01/14] " Paul Cercueil 2018-07-05 18:26 ` Paul Cercueil 2018-07-05 18:23 [02/14] dmaengine: dma-jz4780: Separate chan/ctrl registers Paul Cercueil 2018-07-05 18:23 ` [PATCH 02/14] " Paul Cercueil 2018-07-04 17:00 [07/14] dmaengine: dma-jz4780: Enable Fast DMA to the AIC PrasannaKumar Muralidharan 2018-07-04 17:00 ` [PATCH 07/14] " PrasannaKumar Muralidharan 2018-07-04 17:00 ` PrasannaKumar Muralidharan 2018-07-04 16:55 [06/14] dmaengine: dma-jz4780: Add support for the JZ4725B SoC PrasannaKumar Muralidharan 2018-07-04 16:55 ` [PATCH 06/14] " PrasannaKumar Muralidharan 2018-07-04 16:55 ` PrasannaKumar Muralidharan 2018-07-04 16:52 [05/14] dmaengine: dma-jz4780: Add support for the JZ4740 SoC PrasannaKumar Muralidharan 2018-07-04 16:52 ` [PATCH 05/14] " PrasannaKumar Muralidharan 2018-07-04 16:52 ` PrasannaKumar Muralidharan 2018-07-04 16:40 [03/14] dmaengine: dma-jz4780: Use 4-word descriptors PrasannaKumar Muralidharan 2018-07-04 16:40 ` [PATCH 03/14] " PrasannaKumar Muralidharan 2018-07-04 16:40 ` PrasannaKumar Muralidharan 2018-07-04 16:35 [02/14] dmaengine: dma-jz4780: Separate chan/ctrl registers PrasannaKumar Muralidharan 2018-07-04 16:35 ` [PATCH 02/14] " PrasannaKumar Muralidharan 2018-07-04 16:35 ` PrasannaKumar Muralidharan 2018-07-04 16:28 [01/14] dmaengine: dma-jz4780: Avoid hardcoding number of channels PrasannaKumar Muralidharan 2018-07-04 16:28 ` [PATCH 01/14] " PrasannaKumar Muralidharan 2018-07-04 16:28 ` PrasannaKumar Muralidharan 2018-07-03 16:53 [02/14] dmaengine: dma-jz4780: Separate chan/ctrl registers Paul Burton 2018-07-03 16:53 ` [PATCH 02/14] " Paul Burton 2018-07-03 12:32 [14/14] MIPS: JZ4770: DTS: Add DMA nodes Paul Cercueil 2018-07-03 12:32 ` [PATCH 14/14] " Paul Cercueil 2018-07-03 12:32 [13/14] MIPS: JZ4780: DTS: Update DMA node to match driver changes Paul Cercueil 2018-07-03 12:32 ` [PATCH 13/14] " Paul Cercueil 2018-07-03 12:32 [11/14] dmaengine: dma-jz4780: Further residue status fix Paul Cercueil 2018-07-03 12:32 ` [PATCH 11/14] " Paul Cercueil 2018-07-03 12:32 [10/14] dmaengine: dma-jz4780: Set DTCn register explicitly Paul Cercueil 2018-07-03 12:32 ` [PATCH 10/14] " Paul Cercueil 2018-07-03 12:32 [09/14] dmaengine: dma-jz4780: Simplify jz4780_dma_desc_residue() Paul Cercueil 2018-07-03 12:32 ` [PATCH 09/14] " Paul Cercueil 2018-07-03 12:32 [08/14] dmaengine: dma-jz4780: Add missing residue DTC mask Paul Cercueil 2018-07-03 12:32 ` [PATCH 08/14] " Paul Cercueil 2018-07-03 12:32 [07/14] dmaengine: dma-jz4780: Enable Fast DMA to the AIC Paul Cercueil 2018-07-03 12:32 ` [PATCH 07/14] " Paul Cercueil 2018-07-03 12:32 [06/14] dmaengine: dma-jz4780: Add support for the JZ4725B SoC Paul Cercueil 2018-07-03 12:32 ` [PATCH 06/14] " Paul Cercueil 2018-07-03 12:32 [05/14] dmaengine: dma-jz4780: Add support for the JZ4740 SoC Paul Cercueil 2018-07-03 12:32 ` [PATCH 05/14] " Paul Cercueil 2018-07-03 12:32 [04/14] dmaengine: dma-jz4780: Add support for the JZ4770 SoC Paul Cercueil 2018-07-03 12:32 ` [PATCH 04/14] " Paul Cercueil 2018-07-03 12:32 [03/14] dmaengine: dma-jz4780: Use 4-word descriptors Paul Cercueil 2018-07-03 12:32 ` [PATCH 03/14] " Paul Cercueil 2018-07-03 12:32 [02/14] dmaengine: dma-jz4780: Separate chan/ctrl registers Paul Cercueil 2018-07-03 12:32 ` [PATCH 02/14] " Paul Cercueil 2018-07-03 12:32 [PATCH 00/14] dma-jz4780 improvements Paul Cercueil 2018-07-03 12:32 ` [01/14] dmaengine: dma-jz4780: Avoid hardcoding number of channels Paul Cercueil 2018-07-03 12:32 ` [PATCH 01/14] " Paul Cercueil 2018-07-09 16:59 ` [01/14] " Vinod Koul 2018-07-09 16:59 ` [PATCH 01/14] " Vinod 2018-07-10 15:29 ` Paul Cercueil 2018-07-03 19:32 ` [PATCH 00/14] dma-jz4780 improvements Mathieu Malaterre 2018-07-03 19:32 ` Mathieu Malaterre
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180703123214.23090-13-paul@crapouillou.net \ --to=paul@crapouillou.net \ --cc=Zubair.Kakakhel@imgtec.com \ --cc=dansilsby@gmail.com \ --cc=devicetree@vger.kernel.org \ --cc=dmaengine@vger.kernel.org \ --cc=jhogan@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mips@linux-mips.org \ --cc=malat@debian.org \ --cc=mark.rutland@arm.com \ --cc=paul.burton@mips.com \ --cc=ralf@linux-mips.org \ --cc=robh+dt@kernel.org \ --cc=vkoul@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.