Merge "serial: msm_geni_serial: Fix DMA TX FSM reset sequence" (495a85ae) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/tty/serial/msm_geni_serial.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -625,7 +625,8 @@ static unsigned int msm_geni_serial_get_mctrl(struct uart_port *uport)
		geni_ios = geni_read_reg_nolog(uport->membase, SE_GENI_IOS);
		if (!(geni_ios & IO2_DATA_IN))
		mctrl \|= TIOCM_CTS;

		IPC_LOG_MSG(port->ipc_log_misc, "%s: geni_ios:0x%x, mctrl:0x%x\n",
		__func__, geni_ios, mctrl);
		return mctrl;
		}

		@@ -1890,15 +1891,15 @@ static void msm_geni_serial_handle_isr(struct uart_port *uport,
		geni_write_reg_nolog(dma_tx_status, uport->membase,
		SE_DMA_TX_IRQ_CLR);

		if (dma_tx_status & TX_DMA_DONE)
		msm_geni_serial_handle_dma_tx(uport);

		if (dma_tx_status & (TX_RESET_DONE \|
		TX_GENI_CANCEL_IRQ))
		m_cmd_done = true;

		if (m_irq_status & (M_CMD_CANCEL_EN \| M_CMD_ABORT_EN))
		m_cmd_done = true;

		if ((dma_tx_status & TX_DMA_DONE) && !m_cmd_done)
		msm_geni_serial_handle_dma_tx(uport);
		}

		if (dma_rx_status) {