tty: serial: qcom-geni-serial: Poll primary sequencer irq status after cancel_tx

[ Upstream commit 9c8441330bb399cba6177acce9b0e68c0dbaa597 ]

TX is handled by primary sequencer. After cancelling primary command, poll
primary sequencer's irq status instead of that of secondary.
While at it, also remove a couple of redundant lines that read from IRQ_EN
register and write back same.

Fixes: 2aaa43c70778 ("tty: serial: qcom-geni-serial: add support for serial engine DMA")
Signed-off-by: Vijaya Krishna Nivarthi <quic_vnivarth@quicinc.com>
Link: https://lore.kernel.org/r/1691578393-9891-1-git-send-email-quic_vnivarth@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
index 24ebdb0b63a8e617a317ed8bc21e693dc2bdc687..ae632a9d4f3ae20a8d81cb3bd42981c8721eb0a5 100644 (file)
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@ -592,7 +592,6 @@ static void qcom_geni_serial_stop_tx_dma(struct uart_port *uport)
 {
        struct qcom_geni_serial_port *port = to_dev_port(uport);
        bool done;
-       u32 m_irq_en;
 
        if (!qcom_geni_serial_main_active(uport))
                return;
@@ -604,12 +603,10 @@ static void qcom_geni_serial_stop_tx_dma(struct uart_port *uport)
                port->tx_remaining = 0;
        }
 
-       m_irq_en = readl(uport->membase + SE_GENI_M_IRQ_EN);
-       writel(m_irq_en, uport->membase + SE_GENI_M_IRQ_EN);
        geni_se_cancel_m_cmd(&port->se);
 
-       done = qcom_geni_serial_poll_bit(uport, SE_GENI_S_IRQ_STATUS,
-                                        S_CMD_CANCEL_EN, true);
+       done = qcom_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS,
+                                        M_CMD_CANCEL_EN, true);
        if (!done) {
                geni_se_abort_m_cmd(&port->se);
                done = qcom_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS,