commit 7edbd7e06faa5c9fbbdc46ef4a36784f6dc0ff87
author Akash Asthana <akashast@codeaurora.org> Tue Oct 01 22:45:51 2019 +0530
committer Chandana Kishori Chiluveru <cchiluve@codeaurora.org> Tue Nov 05 10:42:28 2019 +0530
tree 071a0db7eb9386a141ad3ab01b862bc6cd9a5470
parent 2aa8d916b323f1d5837add6d4115cd31e33a4557

tty: serial: msm_geni_serial: Cancel console write

Terminate console write with cancel operation when fails to acquire
spinlock on uart port.

Change-Id: I7c8732fa0c4732a328e8338822671c007ad15d25
Signed-off-by: Akash Asthana <akashast@codeaurora.org>

drivers/tty/serial/msm_geni_serial.c

diff --git a/drivers/tty/serial/msm_geni_serial.c b/drivers/tty/serial/msm_geni_serial.c
index c91a47b..79cad3f 100644
--- a/drivers/tty/serial/msm_geni_serial.c
+++ b/drivers/tty/serial/msm_geni_serial.c
@@ -779,7 +779,7 @@
 {
 	struct uart_port *uport;
 	struct msm_geni_serial_port *port;
-	int locked = 1;
+	bool locked = true;
 	unsigned long flags;
 
 	WARN_ON(co->index < 0 || co->index >= GENI_UART_NR_PORTS);
@@ -794,10 +794,24 @@
 	else
 		spin_lock_irqsave(&uport->lock, flags);
 
-	if (locked) {
-		__msm_geni_serial_console_write(uport, s, count);
-		spin_unlock_irqrestore(&uport->lock, flags);
+	/* Cancel the current write to log the fault */
+	if (!locked) {
+		geni_cancel_m_cmd(uport->membase);
+		if (!msm_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS,
+						M_CMD_CANCEL_EN, true)) {
+			geni_abort_m_cmd(uport->membase);
+			msm_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS,
+							M_CMD_ABORT_EN, true);
+			geni_write_reg_nolog(M_CMD_ABORT_EN, uport->membase,
+							SE_GENI_M_IRQ_CLEAR);
+		}
+		writel_relaxed(M_CMD_CANCEL_EN, uport->membase +
+							SE_GENI_M_IRQ_CLEAR);
 	}
+
+	__msm_geni_serial_console_write(uport, s, count);
+	if (locked)
+		spin_unlock_irqrestore(&uport->lock, flags);
 }
 
 static int handle_rx_console(struct uart_port *uport,