From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: linux-serial@vger.kernel.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>,
Stefan Agner <stefan@agner.ch>,
Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>,
Chris Healy <cphealy@gmail.com>, Cory Tusar <cory.tusar@zii.aero>,
Lucas Stach <l.stach@pengutronix.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>,
linux-imx@nxp.com, linux-kernel@vger.kernel.org
Subject: [PATCH 19/24] tty: serial: fsl_lpuart: Introduce lpuart_tx_dma_startup()
Date: Mon, 29 Jul 2019 12:52:21 -0700 [thread overview]
Message-ID: <20190729195226.8862-20-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190729195226.8862-1-andrew.smirnov@gmail.com>
Code configure DMA TX path in lpuart_startup(), lpuart32_startup() and
lpuart_resume() is doing exactly the same thing, so move it into a
standalone subroutine.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Cory Tusar <cory.tusar@zii.aero>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: linux-imx@nxp.com
Cc: linux-serial@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
drivers/tty/serial/fsl_lpuart.c | 53 ++++++++++++++-------------------
1 file changed, 23 insertions(+), 30 deletions(-)
diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index 2ad5750fe511..558acf29cbed 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -1434,6 +1434,26 @@ static void rx_dma_timer_init(struct lpuart_port *sport)
add_timer(&sport->lpuart_timer);
}
+static void lpuart_tx_dma_startup(struct lpuart_port *sport)
+{
+ u32 uartbaud;
+
+ if (sport->dma_tx_chan && !lpuart_dma_tx_request(&sport->port)) {
+ init_waitqueue_head(&sport->dma_wait);
+ sport->lpuart_dma_tx_use = true;
+ if (lpuart_is_32(sport)) {
+ uartbaud = lpuart32_read(&sport->port, UARTBAUD);
+ lpuart32_write(&sport->port,
+ uartbaud | UARTBAUD_TDMAE, UARTBAUD);
+ } else {
+ writeb(readb(sport->port.membase + UARTCR5) |
+ UARTCR5_TDMAS, sport->port.membase + UARTCR5);
+ }
+ } else {
+ sport->lpuart_dma_tx_use = false;
+ }
+}
+
static int lpuart_startup(struct uart_port *port)
{
struct lpuart_port *sport = container_of(port, struct lpuart_port, port);
@@ -1471,14 +1491,7 @@ static int lpuart_startup(struct uart_port *port)
sport->lpuart_dma_rx_use = false;
}
- if (sport->dma_tx_chan && !lpuart_dma_tx_request(port)) {
- init_waitqueue_head(&sport->dma_wait);
- sport->lpuart_dma_tx_use = true;
- temp = readb(port->membase + UARTCR5);
- writeb(temp | UARTCR5_TDMAS, port->membase + UARTCR5);
- } else {
- sport->lpuart_dma_tx_use = false;
- }
+ lpuart_tx_dma_startup(port);
spin_unlock_irqrestore(&sport->port.lock, flags);
@@ -1522,14 +1535,7 @@ static int lpuart32_startup(struct uart_port *port)
sport->lpuart_dma_rx_use = false;
}
- if (sport->dma_tx_chan && !lpuart_dma_tx_request(port)) {
- init_waitqueue_head(&sport->dma_wait);
- sport->lpuart_dma_tx_use = true;
- temp = lpuart32_read(&sport->port, UARTBAUD);
- lpuart32_write(&sport->port, temp | UARTBAUD_TDMAE, UARTBAUD);
- } else {
- sport->lpuart_dma_tx_use = false;
- }
+ lpuart_tx_dma_startup(port);
if (sport->lpuart_dma_rx_use) {
/* RXWATER must be 0 */
@@ -2581,20 +2587,7 @@ static int lpuart_resume(struct device *dev)
}
}
- if (sport->dma_tx_chan && !lpuart_dma_tx_request(&sport->port)) {
- init_waitqueue_head(&sport->dma_wait);
- sport->lpuart_dma_tx_use = true;
- if (lpuart_is_32(sport)) {
- temp = lpuart32_read(&sport->port, UARTBAUD);
- lpuart32_write(&sport->port,
- temp | UARTBAUD_TDMAE, UARTBAUD);
- } else {
- writeb(readb(sport->port.membase + UARTCR5) |
- UARTCR5_TDMAS, sport->port.membase + UARTCR5);
- }
- } else {
- sport->lpuart_dma_tx_use = false;
- }
+ lpuart_tx_dma_startup(sport);
if (lpuart_is_32(sport)) {
if (sport->lpuart_dma_rx_use) {
--
2.21.0
next prev parent reply other threads:[~2019-07-29 19:59 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-29 19:52 [PATCH 00/24] LPUART fixes and improvements Andrey Smirnov
2019-07-29 19:52 ` [PATCH 01/24] tty: serial: fsl_lpuart: fix framing error handling when using DMA Andrey Smirnov
2019-07-29 19:52 ` [PATCH 02/24] tty: serial: fsl_lpuart: flush receive FIFO after overruns Andrey Smirnov
2019-07-29 19:52 ` [PATCH 03/24] tty: serial: fsl_lpuart: Flush HW FIFOs in .flush_buffer Andrey Smirnov
2019-07-29 19:52 ` [PATCH 04/24] tty: serial: fsl_lpuart: Simplify RX/TX IRQ handlers Andrey Smirnov
2019-07-29 19:52 ` [PATCH 05/24] tty: serial: fsl_lpuart: Fix bogus indentation Andrey Smirnov
2019-07-29 19:52 ` [PATCH 06/24] tty: serial: fsl_lpuart: Drop unnecessary sg_set_buf() call Andrey Smirnov
2019-07-30 15:51 ` Greg Kroah-Hartman
2019-07-31 2:08 ` Andrey Smirnov
2019-07-29 19:52 ` [PATCH 07/24] tty: serial: fsl_lpuart: Drop unnecessary uart_write_wakeup() Andrey Smirnov
2019-07-29 19:52 ` [PATCH 08/24] tty: serial: fsl_lpuart: Fix issue in software flow control Andrey Smirnov
2019-07-29 19:52 ` [PATCH 09/24] tty: serial: fls_lpuart: Split shared TX IRQ handler into two Andrey Smirnov
2019-07-29 19:52 ` [PATCH 10/24] tty: serial: fsl_lpuart: Drop no-op bit opearation Andrey Smirnov
2019-07-29 19:52 ` [PATCH 11/24] tty: serial: fsl_lpuart: Drop unnecessary extra parenthesis Andrey Smirnov
2019-07-29 19:52 ` [PATCH 12/24] tty: serial: fsl_lpuart: Clear CSTOPB unconditionally Andrey Smirnov
2019-07-29 19:52 ` [PATCH 13/24] tty: serial: fsl_lpuart: Use appropriate lpuart32_* I/O funcs Andrey Smirnov
2019-07-29 19:52 ` [PATCH 14/24] tty: serial: fsl_lpuart: Introduce lpuart_wait_bit_set() Andrey Smirnov
2019-07-29 19:52 ` [PATCH 15/24] tty: serial: fsl_lpuart: Use cpu_relax() instead of barrier() Andrey Smirnov
2019-07-29 19:52 ` [PATCH 16/24] tty: serial: fsl_lpuart: Introduce lpuart_stopped_or_empty() Andrey Smirnov
2019-07-29 19:52 ` [PATCH 17/24] tty: serial: fsl_lpuart: Drop unnecessary lpuart*_stop_tx() Andrey Smirnov
2019-07-29 19:52 ` [PATCH 18/24] tty: serial: fsl_lpuart: Introduce lpuart_dma_shutdown() Andrey Smirnov
2019-07-29 19:52 ` Andrey Smirnov [this message]
2019-07-30 15:56 ` [PATCH 19/24] tty: serial: fsl_lpuart: Introduce lpuart_tx_dma_startup() Greg Kroah-Hartman
2019-07-31 2:09 ` Andrey Smirnov
2019-07-29 19:52 ` [PATCH 20/24] tty: serial: fsl_lpuart: Introduce lpuart_rx_dma_startup() Andrey Smirnov
2019-07-29 19:52 ` [PATCH 21/24] tty: serial: fsl_lpuart: Introduce lpuart32_configure() Andrey Smirnov
2019-07-29 19:52 ` [PATCH 22/24] tty: serial: fsl_lpuart: Introduce lpuart*_setup_watermark_enable() Andrey Smirnov
2019-07-29 19:52 ` [PATCH 23/24] tty: serial: fsl_lpuart: Don't enable TIE in .startup() or .resume() Andrey Smirnov
2019-07-29 19:52 ` [PATCH 24/24] tty: serial: fsl_lpuart: Ignore TX/RX interrupts if DMA is enabled Andrey Smirnov
2019-07-30 15:53 ` [PATCH 00/24] LPUART fixes and improvements Greg Kroah-Hartman
2019-07-30 15:54 ` Greg Kroah-Hartman
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=20190729195226.8862-20-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=bhuvanchandra.dv@toradex.com \
--cc=cory.tusar@zii.aero \
--cc=cphealy@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=l.stach@pengutronix.de \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=stefan@agner.ch \
/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).