summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0068-serial-sunsu-Use-port-lock-wrappers.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0068-serial-sunsu-Use-port-lock-wrappers.patch')
-rw-r--r--debian/patches-rt/0068-serial-sunsu-Use-port-lock-wrappers.patch219
1 files changed, 0 insertions, 219 deletions
diff --git a/debian/patches-rt/0068-serial-sunsu-Use-port-lock-wrappers.patch b/debian/patches-rt/0068-serial-sunsu-Use-port-lock-wrappers.patch
deleted file mode 100644
index 77945a1ed..000000000
--- a/debian/patches-rt/0068-serial-sunsu-Use-port-lock-wrappers.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From: Thomas Gleixner <tglx@linutronix.de>
-Date: Thu, 14 Sep 2023 20:44:25 +0206
-Subject: [PATCH 068/134] serial: sunsu: Use port lock wrappers
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.6/older/patches-6.6.7-rt18.tar.xz
-
-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>
-Signed-off-by: John Ogness <john.ogness@linutronix.de>
-Link: https://lore.kernel.org/r/20230914183831.587273-69-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/sunsu.c | 46 ++++++++++++++++++++++-----------------------
- 1 file changed, 23 insertions(+), 23 deletions(-)
-
---- a/drivers/tty/serial/sunsu.c
-+++ b/drivers/tty/serial/sunsu.c
-@@ -212,9 +212,9 @@ static void enable_rsa(struct uart_sunsu
- {
- if (up->port.type == PORT_RSA) {
- if (up->port.uartclk != SERIAL_RSA_BAUD_BASE * 16) {
-- spin_lock_irq(&up->port.lock);
-+ uart_port_lock_irq(&up->port);
- __enable_rsa(up);
-- spin_unlock_irq(&up->port.lock);
-+ uart_port_unlock_irq(&up->port);
- }
- if (up->port.uartclk == SERIAL_RSA_BAUD_BASE * 16)
- serial_outp(up, UART_RSA_FRR, 0);
-@@ -234,7 +234,7 @@ static void disable_rsa(struct uart_suns
-
- if (up->port.type == PORT_RSA &&
- up->port.uartclk == SERIAL_RSA_BAUD_BASE * 16) {
-- spin_lock_irq(&up->port.lock);
-+ uart_port_lock_irq(&up->port);
-
- mode = serial_inp(up, UART_RSA_MSR);
- result = !(mode & UART_RSA_MSR_FIFO);
-@@ -247,7 +247,7 @@ static void disable_rsa(struct uart_suns
-
- if (result)
- up->port.uartclk = SERIAL_RSA_BAUD_BASE_LO * 16;
-- spin_unlock_irq(&up->port.lock);
-+ uart_port_unlock_irq(&up->port);
- }
- }
- #endif /* CONFIG_SERIAL_8250_RSA */
-@@ -311,10 +311,10 @@ static void sunsu_enable_ms(struct uart_
- container_of(port, struct uart_sunsu_port, port);
- unsigned long flags;
-
-- spin_lock_irqsave(&up->port.lock, flags);
-+ uart_port_lock_irqsave(&up->port, &flags);
- up->ier |= UART_IER_MSI;
- serial_out(up, UART_IER, up->ier);
-- spin_unlock_irqrestore(&up->port.lock, flags);
-+ uart_port_unlock_irqrestore(&up->port, flags);
- }
-
- static void
-@@ -456,7 +456,7 @@ static irqreturn_t sunsu_serial_interrup
- unsigned long flags;
- unsigned char status;
-
-- spin_lock_irqsave(&up->port.lock, flags);
-+ uart_port_lock_irqsave(&up->port, &flags);
-
- do {
- status = serial_inp(up, UART_LSR);
-@@ -470,7 +470,7 @@ static irqreturn_t sunsu_serial_interrup
-
- } while (!(serial_in(up, UART_IIR) & UART_IIR_NO_INT));
-
-- spin_unlock_irqrestore(&up->port.lock, flags);
-+ uart_port_unlock_irqrestore(&up->port, flags);
-
- return IRQ_HANDLED;
- }
-@@ -545,9 +545,9 @@ static unsigned int sunsu_tx_empty(struc
- unsigned long flags;
- unsigned int ret;
-
-- spin_lock_irqsave(&up->port.lock, flags);
-+ uart_port_lock_irqsave(&up->port, &flags);
- ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
-- spin_unlock_irqrestore(&up->port.lock, flags);
-+ uart_port_unlock_irqrestore(&up->port, flags);
-
- return ret;
- }
-@@ -599,13 +599,13 @@ static void sunsu_break_ctl(struct uart_
- container_of(port, struct uart_sunsu_port, port);
- unsigned long flags;
-
-- spin_lock_irqsave(&up->port.lock, flags);
-+ uart_port_lock_irqsave(&up->port, &flags);
- if (break_state == -1)
- up->lcr |= UART_LCR_SBC;
- else
- up->lcr &= ~UART_LCR_SBC;
- serial_out(up, UART_LCR, up->lcr);
-- spin_unlock_irqrestore(&up->port.lock, flags);
-+ uart_port_unlock_irqrestore(&up->port, flags);
- }
-
- static int sunsu_startup(struct uart_port *port)
-@@ -683,12 +683,12 @@ static int sunsu_startup(struct uart_por
- */
- serial_outp(up, UART_LCR, UART_LCR_WLEN8);
-
-- spin_lock_irqsave(&up->port.lock, flags);
-+ uart_port_lock_irqsave(&up->port, &flags);
-
- up->port.mctrl |= TIOCM_OUT2;
-
- sunsu_set_mctrl(&up->port, up->port.mctrl);
-- spin_unlock_irqrestore(&up->port.lock, flags);
-+ uart_port_unlock_irqrestore(&up->port, flags);
-
- /*
- * Finally, enable interrupts. Note: Modem status interrupts
-@@ -731,7 +731,7 @@ static void sunsu_shutdown(struct uart_p
- up->ier = 0;
- serial_outp(up, UART_IER, 0);
-
-- spin_lock_irqsave(&up->port.lock, flags);
-+ uart_port_lock_irqsave(&up->port, &flags);
- if (up->port.flags & UPF_FOURPORT) {
- /* reset interrupts on the AST Fourport board */
- inb((up->port.iobase & 0xfe0) | 0x1f);
-@@ -740,7 +740,7 @@ static void sunsu_shutdown(struct uart_p
- up->port.mctrl &= ~TIOCM_OUT2;
-
- sunsu_set_mctrl(&up->port, up->port.mctrl);
-- spin_unlock_irqrestore(&up->port.lock, flags);
-+ uart_port_unlock_irqrestore(&up->port, flags);
-
- /*
- * Disable break condition and FIFOs
-@@ -826,7 +826,7 @@ sunsu_change_speed(struct uart_port *por
- * Ok, we're now changing the port state. Do it with
- * interrupts disabled.
- */
-- spin_lock_irqsave(&up->port.lock, flags);
-+ uart_port_lock_irqsave(&up->port, &flags);
-
- /*
- * Update the per-port timeout.
-@@ -891,7 +891,7 @@ sunsu_change_speed(struct uart_port *por
-
- up->cflag = cflag;
-
-- spin_unlock_irqrestore(&up->port.lock, flags);
-+ uart_port_unlock_irqrestore(&up->port, flags);
- }
-
- static void
-@@ -1038,7 +1038,7 @@ static void sunsu_autoconfig(struct uart
- up->type_probed = PORT_UNKNOWN;
- up->port.iotype = UPIO_MEM;
-
-- spin_lock_irqsave(&up->port.lock, flags);
-+ uart_port_lock_irqsave(&up->port, &flags);
-
- if (!(up->port.flags & UPF_BUGGY_UART)) {
- /*
-@@ -1173,7 +1173,7 @@ static void sunsu_autoconfig(struct uart
- serial_outp(up, UART_IER, 0);
-
- out:
-- spin_unlock_irqrestore(&up->port.lock, flags);
-+ uart_port_unlock_irqrestore(&up->port, flags);
- }
-
- static struct uart_driver sunsu_reg = {
-@@ -1298,9 +1298,9 @@ static void sunsu_console_write(struct c
- int locked = 1;
-
- if (up->port.sysrq || oops_in_progress)
-- locked = spin_trylock_irqsave(&up->port.lock, flags);
-+ locked = uart_port_trylock_irqsave(&up->port, &flags);
- else
-- spin_lock_irqsave(&up->port.lock, flags);
-+ uart_port_lock_irqsave(&up->port, &flags);
-
- /*
- * First save the UER then disable the interrupts
-@@ -1318,7 +1318,7 @@ static void sunsu_console_write(struct c
- serial_out(up, UART_IER, ier);
-
- if (locked)
-- spin_unlock_irqrestore(&up->port.lock, flags);
-+ uart_port_unlock_irqrestore(&up->port, flags);
- }
-
- /*
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-10 00:40:30 +0000