From: zonque@gmail.com (Daniel Mack)
To: linux-arm-kernel@lists.infradead.org
Subject: [v3 1/2] dma: mmp_pdma: add support for residue reporting
Date: Wed, 14 Aug 2013 18:19:48 +0200 [thread overview]
Message-ID: <1376497189-21298-1-git-send-email-zonque@gmail.com> (raw)
In order to report the channel's residue, we have to memorize the first
dma buffer position when the channel is configured.
Signed-off-by: Daniel Mack <zonque@gmail.com>
---
drivers/dma/mmp_pdma.c | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 43 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c
index 579f79a..d66340a 100644
--- a/drivers/dma/mmp_pdma.c
+++ b/drivers/dma/mmp_pdma.c
@@ -28,8 +28,8 @@
#define DALGN 0x00a0
#define DINT 0x00f0
#define DDADR 0x0200
-#define DSADR 0x0204
-#define DTADR 0x0208
+#define DSADR(n) (0x0204 + ((n) << 4))
+#define DTADR(n) (0x0208 + ((n) << 4))
#define DCMD 0x020c
#define DCSR_RUN (1 << 31) /* Run Bit (read / write) */
@@ -97,6 +97,11 @@ struct mmp_pdma_chan {
struct dma_async_tx_descriptor desc;
struct mmp_pdma_phy *phy;
enum dma_transfer_direction dir;
+ /*
+ * We memorize the original total length so we can later determine the
+ * channel's residue.
+ */
+ u32 total_len;
/* channel's basic info */
struct tasklet_struct tasklet;
@@ -470,6 +475,8 @@ mmp_pdma_prep_memcpy(struct dma_chan *dchan,
chan->dcmd |= DCMD_BURST32;
}
+ chan->total_len = len;
+
do {
/* Allocate the link descriptor from DMA pool */
new = mmp_pdma_alloc_descriptor(chan);
@@ -541,11 +548,14 @@ mmp_pdma_prep_slave_sg(struct dma_chan *dchan, struct scatterlist *sgl,
return NULL;
chan->byte_align = false;
+ chan->total_len = 0;
for_each_sg(sgl, sg, sg_len, i) {
addr = sg_dma_address(sg);
avail = sg_dma_len(sgl);
+ chan->total_len += avail;
+
do {
len = min_t(size_t, avail, PDMA_MAX_DESC_BYTES);
if (addr & 0x7)
@@ -666,6 +676,36 @@ static int mmp_pdma_control(struct dma_chan *dchan, enum dma_ctrl_cmd cmd,
return ret;
}
+static unsigned int mmp_pdma_residue(struct mmp_pdma_chan *chan)
+{
+ struct mmp_pdma_desc_sw *sw;
+ u32 curr, done = 0;
+
+ if (chan->dir == DMA_DEV_TO_MEM)
+ curr = readl(chan->phy->base + DTADR(chan->phy->idx));
+ else
+ curr = readl(chan->phy->base + DSADR(chan->phy->idx));
+
+ list_for_each_entry(sw, &chan->chain_running, node) {
+ u32 start;
+ u32 len = sw->desc.dcmd & DCMD_LENGTH;
+
+ if (chan->dir == DMA_DEV_TO_MEM)
+ start = sw->desc.dtadr;
+ else
+ start = sw->desc.dsadr;
+
+ if (curr >= start && curr <= (start + len)) {
+ done += curr - start;
+ break;
+ }
+
+ done += len;
+ }
+
+ return chan->total_len - done;
+}
+
static enum dma_status mmp_pdma_tx_status(struct dma_chan *dchan,
dma_cookie_t cookie, struct dma_tx_state *txstate)
{
@@ -675,6 +715,7 @@ static enum dma_status mmp_pdma_tx_status(struct dma_chan *dchan,
spin_lock_irqsave(&chan->desc_lock, flags);
ret = dma_cookie_status(dchan, cookie, txstate);
+ txstate->residue = mmp_pdma_residue(chan);
spin_unlock_irqrestore(&chan->desc_lock, flags);
return ret;
--
1.8.3.1
next reply other threads:[~2013-08-14 16:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-14 16:19 Daniel Mack [this message]
2013-08-14 16:23 ` [v3 1/2] dma: mmp_pdma: add support for residue reporting Russell King - ARM Linux
2013-08-15 1:57 ` Chao Xie
2013-08-15 3:44 ` Daniel Mack
2013-08-15 8:08 ` Chao Xie
2013-08-15 18:12 ` Daniel Mack
2013-08-16 2:21 ` Chao Xie
2013-08-16 7:57 ` Xiang Wang
2013-08-16 15:40 ` Daniel Mack
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=1376497189-21298-1-git-send-email-zonque@gmail.com \
--to=zonque@gmail.com \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).