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>,
Paul Cercueil <paul@crapouillou.net>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mips@linux-mips.org
Subject: [PATCH v2 12/17] dmaengine: dma-jz4780: Set DTCn register explicitly
Date: Wed, 18 Jul 2018 20:20:18 +0200 [thread overview]
Message-ID: <20180718182023.8182-13-paul@crapouillou.net> (raw)
In-Reply-To: <20180718182023.8182-1-paul@crapouillou.net>
From: Daniel Silsby <dansilsby@gmail.com>
Normally, we wouldn't set the channel transfer count register directly
when using descriptor-driven transfers. However, there is no harm in
doing so, and it allows jz4780_dma_desc_residue() to report the correct
residue of an ongoing transfer, no matter when it is called.
Signed-off-by: Daniel Silsby <dansilsby@gmail.com>
Tested-by: Mathieu Malaterre <malat@debian.org>
---
drivers/dma/dma-jz4780.c | 9 +++++++++
1 file changed, 9 insertions(+)
v2: No change
diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c
index cc2a86844db4..78849131c81d 100644
--- a/drivers/dma/dma-jz4780.c
+++ b/drivers/dma/dma-jz4780.c
@@ -530,6 +530,15 @@ static void jz4780_dma_begin(struct jz4780_dma_chan *jzchan)
jz4780_dma_chn_writel(jzdma, jzchan->id, JZ_DMA_REG_DRT,
jzchan->transfer_type);
+ /*
+ * Set the transfer count. This is redundant for a descriptor-driven
+ * transfer. However, there can be a delay between the transfer start
+ * time and when DTCn reg contains the new transfer count. Setting
+ * it explicitly ensures residue is computed correctly at all times.
+ */
+ jz4780_dma_chn_writel(jzdma, jzchan->id, JZ_DMA_REG_DTC,
+ jzchan->desc->desc[jzchan->curr_hwdesc].dtc);
+
/* Write descriptor address and initiate descriptor fetch. */
desc_phys = jzchan->desc->desc_phys +
(jzchan->curr_hwdesc * sizeof(*jzchan->desc->desc));
--
2.11.0
next prev parent reply other threads:[~2018-07-18 18:21 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-18 18:20 [PATCH v2 00/17] JZ4780 DMA patchset v2 Paul Cercueil
2018-07-18 18:20 ` [PATCH v2 01/17] doc: dt-bindings: jz4780-dma: Update bindings to reflect driver changes Paul Cercueil
2018-07-18 18:20 ` [PATCH v2 02/17] dmaengine: dma-jz4780: Return error if not probed from DT Paul Cercueil
2018-07-18 18:20 ` [PATCH v2 03/17] dmaengine: dma-jz4780: Avoid hardcoding number of channels Paul Cercueil
2018-07-18 18:20 ` [PATCH v2 04/17] dmaengine: dma-jz4780: Separate chan/ctrl registers Paul Cercueil
2018-07-18 18:20 ` [PATCH v2 05/17] dmaengine: dma-jz4780: Use 4-word descriptors Paul Cercueil
2018-07-18 18:20 ` [PATCH v2 06/17] dmaengine: dma-jz4780: Add support for the JZ4770 SoC Paul Cercueil
2018-07-18 18:20 ` [PATCH v2 07/17] dmaengine: dma-jz4780: Add support for the JZ4740 SoC Paul Cercueil
2018-07-18 18:20 ` [PATCH v2 08/17] dmaengine: dma-jz4780: Add support for the JZ4725B SoC Paul Cercueil
2018-07-18 18:20 ` [PATCH v2 09/17] dmaengine: dma-jz4780: Enable Fast DMA to the AIC Paul Cercueil
2018-07-18 18:20 ` [PATCH v2 10/17] dmaengine: dma-jz4780: Add missing residue DTC mask Paul Cercueil
2018-07-18 18:20 ` [PATCH v2 11/17] dmaengine: dma-jz4780: Simplify jz4780_dma_desc_residue() Paul Cercueil
2018-07-18 18:20 ` Paul Cercueil [this message]
2018-07-18 18:20 ` [PATCH v2 13/17] dmaengine: dma-jz4780: Further residue status fix Paul Cercueil
2018-07-18 18:20 ` [PATCH v2 14/17] dmaengine: dma-jz4780: Use dma_set_residue() Paul Cercueil
2018-07-18 18:20 ` [PATCH v2 15/17] MIPS: JZ4780: DTS: Update DMA node to match driver changes Paul Cercueil
2018-07-18 18:20 ` [PATCH v2 16/17] MIPS: JZ4770: DTS: Add DMA nodes Paul Cercueil
2018-07-19 8:06 ` Sergei Shtylyov
2018-07-18 18:20 ` [PATCH v2 17/17] MIPS: JZ4740: " Paul Cercueil
2018-07-19 8:03 ` Sergei Shtylyov
2018-07-19 3:56 ` [PATCH v2 00/17] JZ4780 DMA patchset v2 Vinod
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=20180718182023.8182-13-paul@crapouillou.net \
--to=paul@crapouillou.net \
--cc=Zubair.Kakakhel@imgtec.com \
--cc=dansilsby@gmail.com \
--cc=devicetree@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®