Commit 9c844133 authored by Vijaya Krishna Nivarthi's avatar Vijaya Krishna Nivarthi Committed by Greg Kroah-Hartman
Browse files

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



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: 2aaa43c7 ("tty: serial: qcom-geni-serial: add support for serial engine DMA")
Signed-off-by: default avatarVijaya 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0aaf7818

drivers/tty/serial/qcom_geni_serial.c

+2 −5
Original line number Diff line number Diff line
@@ -591,7 +591,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;
@@ -603,12 +602,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,