77 lines
3.1 KiB
Diff
77 lines
3.1 KiB
Diff
From 1f68c281021058402d7afdc27d8a3787271ce0c1 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Thu, 14 Sep 2023 20:44:06 +0206
|
|
Subject: [PATCH 075/198] serial: qcom-geni: Use port lock wrappers
|
|
|
|
When a serial port is used for kernel console output, then all
|
|
modifications to the UART registers which are done from other contexts,
|
|
e.g. getty, termios, are interference points for the kernel console.
|
|
|
|
So far this has been ignored and the printk output is based on the
|
|
principle of hope. The rework of the console infrastructure which aims to
|
|
support threaded and atomic consoles, requires to mark sections which
|
|
modify the UART registers as unsafe. This allows the atomic write function
|
|
to make informed decisions and eventually to restore operational state. It
|
|
also allows to prevent the regular UART code from modifying UART registers
|
|
while printk output is in progress.
|
|
|
|
All modifications of UART registers are guarded by the UART port lock,
|
|
which provides an obvious synchronization point with the console
|
|
infrastructure.
|
|
|
|
To avoid adding this functionality to all UART drivers, wrap the
|
|
spin_[un]lock*() invocations for uart_port::lock into helper functions
|
|
which just contain the spin_[un]lock*() invocations for now. In a
|
|
subsequent step these helpers will gain the console synchronization
|
|
mechanisms.
|
|
|
|
Converted with coccinelle. No functional change.
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
Reviewed-by: Bjorn Andersson <quic_bjorande@quicinc.com>
|
|
Signed-off-by: John Ogness <john.ogness@linutronix.de>
|
|
Link: https://lore.kernel.org/r/20230914183831.587273-50-john.ogness@linutronix.de
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
drivers/tty/serial/qcom_geni_serial.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
|
|
index 2e1b1c827dfe..549909644011 100644
|
|
--- a/drivers/tty/serial/qcom_geni_serial.c
|
|
+++ b/drivers/tty/serial/qcom_geni_serial.c
|
|
@@ -482,9 +482,9 @@ static void qcom_geni_serial_console_write(struct console *co, const char *s,
|
|
|
|
uport = &port->uport;
|
|
if (oops_in_progress)
|
|
- locked = spin_trylock_irqsave(&uport->lock, flags);
|
|
+ locked = uart_port_trylock_irqsave(uport, &flags);
|
|
else
|
|
- spin_lock_irqsave(&uport->lock, flags);
|
|
+ uart_port_lock_irqsave(uport, &flags);
|
|
|
|
geni_status = readl(uport->membase + SE_GENI_STATUS);
|
|
|
|
@@ -520,7 +520,7 @@ static void qcom_geni_serial_console_write(struct console *co, const char *s,
|
|
qcom_geni_serial_setup_tx(uport, port->tx_remaining);
|
|
|
|
if (locked)
|
|
- spin_unlock_irqrestore(&uport->lock, flags);
|
|
+ uart_port_unlock_irqrestore(uport, flags);
|
|
}
|
|
|
|
static void handle_rx_console(struct uart_port *uport, u32 bytes, bool drop)
|
|
@@ -972,7 +972,7 @@ static irqreturn_t qcom_geni_serial_isr(int isr, void *dev)
|
|
if (uport->suspended)
|
|
return IRQ_NONE;
|
|
|
|
- spin_lock(&uport->lock);
|
|
+ uart_port_lock(uport);
|
|
|
|
m_irq_status = readl(uport->membase + SE_GENI_M_IRQ_STATUS);
|
|
s_irq_status = readl(uport->membase + SE_GENI_S_IRQ_STATUS);
|
|
--
|
|
2.44.0
|
|
|