mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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 13/24] tty: serial: fsl_lpuart: Use appropriate lpuart32_* I/O funcs
Date: Mon, 29 Jul 2019 12:52:15 -0700	[thread overview]
Message-ID: <20190729195226.8862-14-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190729195226.8862-1-andrew.smirnov@gmail.com>

When dealing with 32-bit variant of LPUART IP block appropriate I/O
helpers have to be used to properly deal with endianness
differences. Change all of the offending code to do that.

Fixes: a5fa2660d787 ("tty/serial/fsl_lpuart: Add CONSOLE_POLL support
for lpuart32.")
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 | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index 10f1af51c58d..50a707c88a16 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -616,26 +616,26 @@ static int lpuart32_poll_init(struct uart_port *port)
 	spin_lock_irqsave(&sport->port.lock, flags);
 
 	/* Disable Rx & Tx */
-	writel(0, sport->port.membase + UARTCTRL);
+	lpuart32_write(&sport->port, UARTCTRL, 0);
 
-	temp = readl(sport->port.membase + UARTFIFO);
+	temp = lpuart32_read(&sport->port, UARTFIFO);
 
 	/* Enable Rx and Tx FIFO */
-	writel(temp | UARTFIFO_RXFE | UARTFIFO_TXFE,
-		   sport->port.membase + UARTFIFO);
+	lpuart32_write(&sport->port, UARTFIFO,
+		       temp | UARTFIFO_RXFE | UARTFIFO_TXFE);
 
 	/* flush Tx and Rx FIFO */
-	writel(UARTFIFO_TXFLUSH | UARTFIFO_RXFLUSH,
-			sport->port.membase + UARTFIFO);
+	lpuart32_write(&sport->port, UARTFIFO,
+		       UARTFIFO_TXFLUSH | UARTFIFO_RXFLUSH);
 
 	/* explicitly clear RDRF */
-	if (readl(sport->port.membase + UARTSTAT) & UARTSTAT_RDRF) {
-		readl(sport->port.membase + UARTDATA);
-		writel(UARTFIFO_RXUF, sport->port.membase + UARTFIFO);
+	if (lpuart32_read(&sport->port, UARTSTAT) & UARTSTAT_RDRF) {
+		lpuart32_read(&sport->port, UARTDATA);
+		lpuart32_write(&sport->port, UARTFIFO, UARTFIFO_RXUF);
 	}
 
 	/* Enable Rx and Tx */
-	writel(UARTCTRL_RE | UARTCTRL_TE, sport->port.membase + UARTCTRL);
+	lpuart32_write(&sport->port, UARTCTRL, UARTCTRL_RE | UARTCTRL_TE);
 	spin_unlock_irqrestore(&sport->port.lock, flags);
 
 	return 0;
@@ -643,18 +643,18 @@ static int lpuart32_poll_init(struct uart_port *port)
 
 static void lpuart32_poll_put_char(struct uart_port *port, unsigned char c)
 {
-	while (!(readl(port->membase + UARTSTAT) & UARTSTAT_TDRE))
+	while (!(lpuart32_read(port, UARTSTAT) & UARTSTAT_TDRE))
 		barrier();
 
-	writel(c, port->membase + UARTDATA);
+	lpuart32_write(port, UARTDATA, c);
 }
 
 static int lpuart32_poll_get_char(struct uart_port *port)
 {
-	if (!(readl(port->membase + UARTSTAT) & UARTSTAT_RDRF))
+	if (!(lpuart32_read(port, UARTSTAT) & UARTSTAT_RDRF))
 		return NO_POLL_CHAR;
 
-	return readl(port->membase + UARTDATA);
+	return lpuart32_read(port, UARTDATA);
 }
 #endif
 
-- 
2.21.0


  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 ` Andrey Smirnov [this message]
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 ` [PATCH 19/24] tty: serial: fsl_lpuart: Introduce lpuart_tx_dma_startup() Andrey Smirnov
2019-07-30 15:56   ` 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-14-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

all inboxes | Powered by JetHome®