From: Gabriel Somlo <gsomlo@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: linux-serial@vger.kernel.org, gregkh@linuxfoundation.org,
jirislaby@kernel.org, kgugala@antmicro.com,
mholenko@antmicro.com, joel@jms.id.au,
david.abdurachmanov@gmail.com, florent@enjoy-digital.fr,
geert@linux-m68k.org, ilpo.jarvinen@linux.intel.com
Subject: [PATCH v6 13/14] serial: liteuart: add IRQ support for the TX path
Date: Wed, 23 Nov 2022 08:04:59 -0500 [thread overview]
Message-ID: <20221123130500.1030189-14-gsomlo@gmail.com> (raw)
In-Reply-To: <20221123130500.1030189-1-gsomlo@gmail.com>
Switch the TX path to IRQ-driven operation, while maintaining support
for polling mode via the poll timer.
Signed-off-by: Gabriel Somlo <gsomlo@gmail.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
drivers/tty/serial/liteuart.c | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/drivers/tty/serial/liteuart.c b/drivers/tty/serial/liteuart.c
index 8685c97d391e..6e9f58d3957c 100644
--- a/drivers/tty/serial/liteuart.c
+++ b/drivers/tty/serial/liteuart.c
@@ -93,27 +93,12 @@ static void liteuart_update_irq_reg(struct uart_port *port, bool set, u8 mask)
static void liteuart_stop_tx(struct uart_port *port)
{
+ liteuart_update_irq_reg(port, false, EV_TX);
}
static void liteuart_start_tx(struct uart_port *port)
{
- struct circ_buf *xmit = &port->state->xmit;
- unsigned char ch;
-
- if (unlikely(port->x_char)) {
- litex_write8(port->membase + OFF_RXTX, port->x_char);
- port->icount.tx++;
- port->x_char = 0;
- } else if (!uart_circ_empty(xmit)) {
- while (xmit->head != xmit->tail) {
- ch = xmit->buf[xmit->tail];
- uart_xmit_advance(port, 1);
- liteuart_putchar(port, ch);
- }
- }
-
- if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
- uart_write_wakeup(port);
+ liteuart_update_irq_reg(port, true, EV_TX);
}
static void liteuart_stop_rx(struct uart_port *port)
@@ -144,6 +129,15 @@ static void liteuart_rx_chars(struct uart_port *port)
tty_flip_buffer_push(&port->state->port);
}
+static void liteuart_tx_chars(struct uart_port *port)
+{
+ u8 ch;
+
+ uart_port_tx(port, ch,
+ !litex_read8(port->membase + OFF_TXFULL),
+ litex_write8(port->membase + OFF_RXTX, ch));
+}
+
static irqreturn_t liteuart_interrupt(int irq, void *data)
{
struct liteuart_port *uart = data;
@@ -159,6 +153,8 @@ static irqreturn_t liteuart_interrupt(int irq, void *data)
isr = litex_read8(port->membase + OFF_EV_PENDING) & uart->irq_reg;
if (isr & EV_RX)
liteuart_rx_chars(port);
+ if (isr & EV_TX)
+ liteuart_tx_chars(port);
spin_unlock_irqrestore(&port->lock, flags);
return IRQ_RETVAL(isr);
--
2.38.1
next prev parent reply other threads:[~2022-11-23 13:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-23 13:04 [PATCH v6 00/14] serial: liteuart: add IRQ support Gabriel Somlo
2022-11-23 13:04 ` [PATCH v6 01/14] serial: liteuart: use KBUILD_MODNAME as driver name Gabriel Somlo
2022-11-23 13:04 ` [PATCH v6 02/14] serial: liteuart: use bit number macros Gabriel Somlo
2022-11-23 13:04 ` [PATCH v6 03/14] serial: liteuart: remove unused uart_ops stubs Gabriel Somlo
2022-11-23 13:04 ` [PATCH v6 04/14] serial: liteuart: don't set unused port fields Gabriel Somlo
2022-11-23 13:04 ` [PATCH v6 05/14] serial: liteuart: minor style fix in liteuart_init() Gabriel Somlo
2022-11-23 13:04 ` [PATCH v6 06/14] serial: liteuart: move tty_flip_buffer_push() out of rx loop Gabriel Somlo
2022-11-23 13:04 ` [PATCH v6 07/14] serial: liteuart: rx loop should only ack rx events Gabriel Somlo
2022-11-23 13:04 ` [PATCH v6 08/14] serial: liteuart: simplify passing of uart_insert_char() flag Gabriel Somlo
2022-11-23 13:04 ` [PATCH v6 09/14] serial: liteuart: clean up rx loop variables Gabriel Somlo
2022-11-23 13:04 ` [PATCH v6 10/14] serial: liteuart: separate rx loop from poll timer Gabriel Somlo
2022-11-23 13:04 ` [PATCH v6 11/14] serial: liteuart: move function definitions Gabriel Somlo
2022-11-23 13:04 ` [PATCH v6 12/14] serial: liteuart: add IRQ support for the RX path Gabriel Somlo
2022-11-23 13:04 ` Gabriel Somlo [this message]
2022-11-23 13:05 ` [PATCH v6 14/14] serial: liteuart: move polling putchar() function Gabriel Somlo
2022-11-24 7:02 ` [PATCH v6 00/14] serial: liteuart: add IRQ support Jiri Slaby
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=20221123130500.1030189-14-gsomlo@gmail.com \
--to=gsomlo@gmail.com \
--cc=david.abdurachmanov@gmail.com \
--cc=florent@enjoy-digital.fr \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=jirislaby@kernel.org \
--cc=joel@jms.id.au \
--cc=kgugala@antmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=mholenko@antmicro.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).