From: Jiada Wang <jiada_wang@mentor.com>
To: <vinod.koul@intel.com>, <dan.j.williams@intel.com>
Cc: <dmaengine@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<george_davis@mentor.com>, <jiada_wang@mentor.com>
Subject: [PATCH 01/10] dma: imx-sdma: use chn_real_count to report residue for UART
Date: Mon, 16 May 2016 17:37:49 +0900 [thread overview]
Message-ID: <1463387878-7643-2-git-send-email-jiada_wang@mentor.com> (raw)
In-Reply-To: <1463387878-7643-1-git-send-email-jiada_wang@mentor.com>
For uart rx dma data may not receive fully, so the number
of data read by sdma script once isn't always equal to period_len,
thus residue returned from sdma_tx_status() isn't valid for uart rx
dma. The old way to use chn_real_count to report residue should be
used for uart rx dma.
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
drivers/dma/imx-sdma.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 0f6fd42..1f1b64b 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -680,6 +680,11 @@ static void sdma_update_channel_loop(struct sdma_channel *sdmac)
bd->mode.status |= BD_DONE;
sdmac->buf_tail++;
sdmac->buf_tail %= sdmac->num_bd;
+ if (sdmac->peripheral_type == IMX_DMATYPE_UART) {
+ /* restore mode.count after counter readed */
+ sdmac->chn_real_count = bd->mode.count;
+ bd->mode.count = sdmac->chn_count;
+ }
}
}
@@ -1285,6 +1290,9 @@ static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic(
goto err_out;
}
+ if (sdmac->peripheral_type == IMX_DMATYPE_UART)
+ sdmac->chn_count = period_len;
+
while (buf < buf_len) {
struct sdma_buffer_descriptor *bd = &sdmac->bd[i];
int param;
@@ -1361,7 +1369,8 @@ static enum dma_status sdma_tx_status(struct dma_chan *chan,
struct sdma_channel *sdmac = to_sdma_chan(chan);
u32 residue;
- if (sdmac->flags & IMX_DMA_SG_LOOP)
+ if ((sdmac->flags & IMX_DMA_SG_LOOP) &&
+ (sdmac->peripheral_type != IMX_DMATYPE_UART))
residue = (sdmac->num_bd - sdmac->buf_tail) * sdmac->period_len;
else
residue = sdmac->chn_count - sdmac->chn_real_count;
--
2.4.5
next prev parent reply other threads:[~2016-05-16 8:40 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-16 8:37 [PATCH v1 00/10] *** imx-sdma: misc fix *** Jiada Wang
2016-05-16 8:37 ` Jiada Wang [this message]
2016-05-16 8:37 ` [PATCH 02/10] dma: imx-sdma: don't update BD in isr routine Jiada Wang
2016-05-16 8:37 ` [PATCH 03/10] dma: imx-sdma: clear BD_RROR flag before pass it to sdma script Jiada Wang
2016-05-16 8:37 ` [PATCH 04/10] dma: imx-sdma: update sdma channel status for cyclic dma Jiada Wang
2016-05-16 8:37 ` [PATCH 05/10] dma: imx-sdma: add flag to indicate SDMA channel state Jiada Wang
2016-05-16 8:37 ` [PATCH 06/10] dma: imx-sdma: add terminate_all support Jiada Wang
2016-05-16 8:37 ` [PATCH 07/10] dma: imx-sdma: Add synchronization support Jiada Wang
2016-05-16 8:37 ` [PATCH 08/10] dma: imx-sdma: abort updating channel when it has been terminated Jiada Wang
2016-05-16 8:37 ` [PATCH 09/10] dma: imx-sdma: disable channel 0 when it timeouts Jiada Wang
2016-05-16 8:37 ` [PATCH 10/10] dma: imx-sdma: clear channel0 interrupt bit in irq routine Jiada Wang
2016-05-16 11:00 ` [PATCH v1 00/10] *** imx-sdma: misc fix *** Vladimir Zapolskiy
2016-05-17 3:47 Jiada Wang
2016-05-17 3:47 ` [PATCH 01/10] dma: imx-sdma: use chn_real_count to report residue for UART Jiada Wang
2016-05-17 3:48 [PATCH v1 00/10] *** imx-sdma: misc fix *** Jiada Wang
2016-05-17 3:48 ` [PATCH 01/10] dma: imx-sdma: use chn_real_count to report residue for UART Jiada Wang
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=1463387878-7643-2-git-send-email-jiada_wang@mentor.com \
--to=jiada_wang@mentor.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=george_davis@mentor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=vinod.koul@intel.com \
/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).