From: bigeasy@linutronix.de (Sebastian Andrzej Siewior)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/16] tty: serial: 8250_dma: keep own book keeping about RX transfers
Date: Wed, 10 Sep 2014 21:30:06 +0200 [thread overview]
Message-ID: <1410377411-26656-12-git-send-email-bigeasy@linutronix.de> (raw)
In-Reply-To: <1410377411-26656-1-git-send-email-bigeasy@linutronix.de>
After dmaengine_terminate_all() has been invoked then both DMA drivers
(edma and omap-dma) do not invoke dma_cookie_complete() to mark the
transfer as complete. This dma_cookie_complete() is performed by the
Synopsys DesignWare driver which is probably the only one that is used
by omap8250-dma and hence don't see following problem?
?which is that once a RX transfer has been terminated then following
query of channel status reports DMA_IN_PROGRESS (again: the actual
transfer has been canceled, there is nothing going on anymore).
This means that serial8250_rx_dma() never enqueues another DMA transfer
because it (wrongly) assumes that there is a transer already pending.
Vinod Koul refuses to accept a patch which adds this
dma_cookie_complete() to both drivers and so dmaengine_tx_status() would
report DMA_COMPLETE instead (and behave like the Synopsys DesignWare
driver already does). He argues that I am not allowed to use the cookie
to query the status and that the driver already cleaned everything up after
the invokation of dmaengine_terminate_all().
To end this I add a bookkeeping whether or not a RX-transfer has been
started to the 8250-dma code. It has already been done for the TX side.
*Now* we learn about the RX status based on our bookkeeping and don't
need dmaengine_tx_status() for this anymore.
Cc: vinod.koul at intel.com
Reviewed-by: Tony Lindgren <tony@atomide.com>
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
drivers/tty/serial/8250/8250.h | 1 +
drivers/tty/serial/8250/8250_dma.c | 14 ++++++++------
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h
index 09489b391568..a7581b37f264 100644
--- a/drivers/tty/serial/8250/8250.h
+++ b/drivers/tty/serial/8250/8250.h
@@ -42,6 +42,7 @@ struct uart_8250_dma {
unsigned char tx_running:1;
unsigned char tx_err: 1;
+ unsigned char rx_running:1;
};
struct old_serial_port {
diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c
index e836d128e63a..fa1dc966f394 100644
--- a/drivers/tty/serial/8250/8250_dma.c
+++ b/drivers/tty/serial/8250/8250_dma.c
@@ -60,6 +60,7 @@ static void __dma_rx_do_complete(struct uart_8250_port *p, bool error)
dma_sync_single_for_cpu(dma->rxchan->device->dev, dma->rx_addr,
dma->rx_size, DMA_FROM_DEVICE);
+ dma->rx_running = 0;
dmaengine_tx_status(dma->rxchan, dma->rx_cookie, &state);
dmaengine_terminate_all(dma->rxchan);
@@ -173,21 +174,21 @@ int serial8250_rx_dma(struct uart_8250_port *p, unsigned int iir)
{
struct uart_8250_dma *dma = p->dma;
struct dma_async_tx_descriptor *desc;
- struct dma_tx_state state;
- int dma_status;
-
- dma_status = dmaengine_tx_status(dma->rxchan, dma->rx_cookie, &state);
switch (iir & 0x3f) {
case UART_IIR_RLSI:
/* 8250_core handles errors and break interrupts */
+ if (dma->rx_running) {
+ dmaengine_pause(dma->rxchan);
+ __dma_rx_do_complete(p, true);
+ }
return -EIO;
case UART_IIR_RX_TIMEOUT:
/*
* If RCVR FIFO trigger level was not reached, complete the
* transfer and let 8250_core copy the remaining data.
*/
- if (dma_status == DMA_IN_PROGRESS) {
+ if (dma->rx_running) {
dmaengine_pause(dma->rxchan);
__dma_rx_do_complete(p, true);
}
@@ -196,7 +197,7 @@ int serial8250_rx_dma(struct uart_8250_port *p, unsigned int iir)
break;
}
- if (dma_status)
+ if (dma->rx_running)
return 0;
desc = dmaengine_prep_slave_single(dma->rxchan, dma->rx_addr,
@@ -205,6 +206,7 @@ int serial8250_rx_dma(struct uart_8250_port *p, unsigned int iir)
if (!desc)
return -EBUSY;
+ dma->rx_running = 1;
desc->callback = __dma_rx_complete;
desc->callback_param = p;
--
2.1.0
next prev parent reply other threads:[~2014-09-10 19:30 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-10 19:29 [PATCH 00/16 v9] omap 8250 based uart + DMA Sebastian Andrzej Siewior
2014-09-10 19:29 ` [PATCH 01/16] tty: serial: 8250_core: allow to set ->throttle / ->unthrottle callbacks Sebastian Andrzej Siewior
2014-09-10 19:29 ` [PATCH 02/16] tty: serial: 8250_core: add run time pm Sebastian Andrzej Siewior
2014-09-29 9:46 ` Frans Klaver
2014-09-29 13:39 ` Sebastian Andrzej Siewior
2014-09-10 19:29 ` [PATCH 03/16] tty: serial: 8250_core: read only RX if there is something in the FIFO Sebastian Andrzej Siewior
2015-02-09 13:34 ` Nicolas Schichan
2015-02-09 23:34 ` Peter Hurley
2015-02-10 9:32 ` Sebastian Andrzej Siewior
2015-02-10 12:04 ` Nicolas Schichan
2015-02-10 17:46 ` Peter Hurley
2015-02-11 20:01 ` Peter Hurley
2015-02-11 20:03 ` Tony Lindgren
2015-02-11 20:42 ` Peter Hurley
2015-02-12 8:45 ` Sebastian Andrzej Siewior
2015-02-12 9:40 ` Russell King - ARM Linux
2015-02-12 16:32 ` Peter Hurley
2015-02-12 19:23 ` Sebastian Andrzej Siewior
2015-02-12 19:55 ` Peter Hurley
2015-02-12 20:34 ` Sebastian Andrzej Siewior
2015-02-13 18:51 ` Sebastian Andrzej Siewior
2015-02-13 23:15 ` Russell King - ARM Linux
2015-02-15 17:32 ` [PATCH] serial: 8250: Revert "tty: serial: 8250_core: read only RX if there is something in the FIFO" Sebastian Andrzej Siewior
2015-05-12 20:25 ` Tony Lindgren
2014-09-10 19:29 ` [PATCH 04/16] tty: serial: 8250_core: use the ->line argument as a hint in serial8250_find_match_or_unused() Sebastian Andrzej Siewior
2014-09-10 19:30 ` [PATCH 05/16] tty: serial: 8250_core: remove UART_IER_RDI in serial8250_stop_rx() Sebastian Andrzej Siewior
2014-09-11 11:19 ` Heikki Krogerus
2014-09-10 19:30 ` [PATCH 06/16] tty: serial: Add 8250-core based omap driver Sebastian Andrzej Siewior
2014-09-11 11:57 ` Peter Hurley
2014-09-16 17:01 ` Sebastian Andrzej Siewior
2014-09-29 9:38 ` Frans Klaver
2014-09-29 13:27 ` Sebastian Andrzej Siewior
2014-09-29 13:34 ` Frans Klaver
2014-09-10 19:30 ` [PATCH 07/16] tty: serial: 8250_dma: handle error on TX submit Sebastian Andrzej Siewior
2014-09-10 19:30 ` [PATCH 08/16] tty: serial: 8250_dma: enqueue RX dma again on completion Sebastian Andrzej Siewior
2014-09-10 19:30 ` [PATCH 09/16] tty: serial: 8250_dma: Add a TX trigger workaround for AM33xx Sebastian Andrzej Siewior
2014-09-11 11:17 ` Heikki Krogerus
2014-09-11 11:42 ` Sebastian Andrzej Siewior
2014-09-11 12:32 ` Peter Hurley
2014-09-11 12:50 ` Sebastian Andrzej Siewior
2014-09-11 14:35 ` Peter Hurley
2014-09-15 17:01 ` Sebastian Andrzej Siewior
2014-09-16 16:55 ` Sebastian Andrzej Siewior
2014-09-17 12:20 ` Peter Hurley
2014-09-17 16:25 ` Sebastian Andrzej Siewior
2014-09-29 16:15 ` Sebastian Andrzej Siewior
2014-09-11 15:11 ` Frans Klaver
2014-09-11 16:04 ` Sebastian Andrzej Siewior
2014-09-11 17:04 ` Frans Klaver
2014-09-12 7:23 ` Sebastian Andrzej Siewior
[not found] ` <20140912094010.GE28458@ci00147.xsens-tech.local>
2014-09-12 9:51 ` Sebastian Andrzej Siewior
2014-09-12 10:28 ` Frans Klaver
2014-09-15 16:42 ` Sebastian Andrzej Siewior
2014-09-16 9:05 ` Frans Klaver
2014-09-16 12:42 ` Frans Klaver
2014-09-16 14:23 ` Frans Klaver
2014-09-17 10:28 ` Frans Klaver
2014-09-21 20:41 ` Sebastian Andrzej Siewior
2014-09-22 9:28 ` Frans Klaver
2014-09-24 7:56 ` Sebastian Andrzej Siewior
2014-09-25 15:14 ` Sebastian Andrzej Siewior
2014-09-25 15:18 ` Frans Klaver
2014-09-29 8:50 ` Frans Klaver
2014-09-29 9:54 ` Sebastian Andrzej Siewior
2014-09-29 10:30 ` Frans Klaver
2014-09-30 8:44 ` Frans Klaver
2014-10-02 10:27 ` Sebastian Andrzej Siewior
2014-10-13 14:55 ` Frans Klaver
2014-09-23 17:03 ` Peter Hurley
2014-09-24 7:53 ` Sebastian Andrzej Siewior
2014-09-25 10:42 ` Sebastian Andrzej Siewior
2014-09-25 11:31 ` Peter Hurley
2014-09-25 13:11 ` Sebastian Andrzej Siewior
2014-09-17 16:34 ` Sebastian Andrzej Siewior
2014-09-19 10:22 ` Heikki Krogerus
2014-09-19 10:58 ` Sebastian Andrzej Siewior
2014-09-19 11:25 ` Peter Hurley
2014-09-22 7:46 ` Heikki Krogerus
2014-09-25 9:24 ` Sebastian Andrzej Siewior
2014-09-10 19:30 ` [PATCH 10/16] tty: serial: 8250_dma: optimize the xmit path due to UART_BUG_DMA_TX Sebastian Andrzej Siewior
2014-09-10 19:30 ` Sebastian Andrzej Siewior [this message]
2014-09-10 19:30 ` [PATCH 12/16] tty: serial: 8250_dma: handle the UART RDI event while DMA remains idle Sebastian Andrzej Siewior
2014-09-29 9:23 ` Frans Klaver
2014-09-10 19:30 ` [PATCH 13/16] tty: serial: 8250_dma: add pm runtime Sebastian Andrzej Siewior
2014-09-29 9:26 ` Frans Klaver
2014-09-29 9:56 ` Sebastian Andrzej Siewior
2014-09-10 19:30 ` [PATCH 14/16] arm: dts: am33xx: add DMA properties for UART Sebastian Andrzej Siewior
2014-09-10 19:30 ` [PATCH 15/16] arm: dts: dra7: " Sebastian Andrzej Siewior
2014-09-10 19:30 ` [PATCH 16/16] tty: serial: 8250: omap: add dma support Sebastian Andrzej Siewior
2014-09-12 22:43 ` [PATCH 00/16 v9] omap 8250 based uart + DMA Tony Lindgren
2014-09-15 11:50 ` Sebastian Andrzej Siewior
2014-09-16 12:57 ` Sebastian Andrzej Siewior
2014-09-16 16:48 ` Tony Lindgren
2014-09-16 21:30 ` Tony Lindgren
2014-09-17 8:38 ` Sebastian Andrzej Siewior
2014-09-17 9:05 ` Sebastian Andrzej Siewior
2014-09-26 16:02 ` Greg KH
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=1410377411-26656-12-git-send-email-bigeasy@linutronix.de \
--to=bigeasy@linutronix.de \
--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).