serial: qcom-geni: fix false console tx restart

Commit 663abb1a7a7f ("tty: serial: qcom_geni_serial: Fix UART hang")
addressed an issue with stalled tx after the console code interrupted
the last bytes of a tx command by reenabling the watermark interrupt if
there is data in write buffer. This can however break software flow
control by re-enabling tx after the user has stopped it.

Address the original issue by not clearing the CMD_DONE flag after
polling for command completion. This allows the interrupt handler to
start another transfer when the CMD_DONE interrupt has not been disabled
due to flow control.

Fixes: c4f528795d1a ("tty: serial: msm_geni_serial: Add serial driver support for GENI based QUP")
Fixes: 663abb1a7a7f ("tty: serial: qcom_geni_serial: Fix UART hang")
Cc: stable@vger.kernel.org	# 4.17
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20240906131336.23625-3-johan+linaro@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
index 309c0bddf26a1c77fe12e091cc07a76fb0c4482e..b88435c0ea50737db53855f6074d566f7f373dfe 100644 (file)
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@ -306,18 +306,16 @@ static void qcom_geni_serial_setup_tx(struct uart_port *uport, u32 xmit_size)
 static void qcom_geni_serial_poll_tx_done(struct uart_port *uport)
 {
        int done;
-       u32 irq_clear = M_CMD_DONE_EN;
 
        done = qcom_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS,
                                                M_CMD_DONE_EN, true);
        if (!done) {
                writel(M_GENI_CMD_ABORT, uport->membase +
                                                SE_GENI_M_CMD_CTRL_REG);
-               irq_clear |= M_CMD_ABORT_EN;
                qcom_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS,
                                                        M_CMD_ABORT_EN, true);
+               writel(M_CMD_ABORT_EN, uport->membase + SE_GENI_M_IRQ_CLEAR);
        }
-       writel(irq_clear, uport->membase + SE_GENI_M_IRQ_CLEAR);
 }
 
 static void qcom_geni_serial_abort_rx(struct uart_port *uport)
@@ -378,6 +376,7 @@ static void qcom_geni_serial_poll_put_char(struct uart_port *uport,
                                                        unsigned char c)
 {
        writel(DEF_TX_WM, uport->membase + SE_GENI_TX_WATERMARK_REG);
+       writel(M_CMD_DONE_EN, uport->membase + SE_GENI_M_IRQ_CLEAR);
        qcom_geni_serial_setup_tx(uport, 1);
        WARN_ON(!qcom_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS,
                                                M_TX_FIFO_WATERMARK_EN, true));
@@ -422,6 +421,7 @@ __qcom_geni_serial_console_write(struct uart_port *uport, const char *s,
        }
 
        writel(DEF_TX_WM, uport->membase + SE_GENI_TX_WATERMARK_REG);
+       writel(M_CMD_DONE_EN, uport->membase + SE_GENI_M_IRQ_CLEAR);
        qcom_geni_serial_setup_tx(uport, bytes_to_send);
        for (i = 0; i < count; ) {
                size_t chars_to_write = 0;
@@ -463,7 +463,6 @@ static void qcom_geni_serial_console_write(struct console *co, const char *s,
        bool locked = true;
        unsigned long flags;
        u32 geni_status;
-       u32 irq_en;
 
        WARN_ON(co->index < 0 || co->index >= GENI_UART_CONS_PORTS);
 
@@ -495,12 +494,6 @@ static void qcom_geni_serial_console_write(struct console *co, const char *s,
                 * has been sent, in which case we need to look for done first.
                 */
                qcom_geni_serial_poll_tx_done(uport);
-
-               if (!kfifo_is_empty(&uport->state->port.xmit_fifo)) {
-                       irq_en = readl(uport->membase + SE_GENI_M_IRQ_EN);
-                       writel(irq_en | M_TX_FIFO_WATERMARK_EN,
-                                       uport->membase + SE_GENI_M_IRQ_EN);
-               }
        }
 
        __qcom_geni_serial_console_write(uport, s, count);