From 5ae249a2c518d25b0a3e1211b1c5b4a2865b77f5 Mon Sep 17 00:00:00 2001 From: John Ogness Date: Mon, 2 Oct 2023 15:30:43 +0000 Subject: [PATCH 156/204] serial: 8250: revert "drop lockdep annotation from serial8250_clear_IER()" The 8250 driver no longer depends on @oops_in_progress and will no longer violate the port->lock locking constraints. This reverts commit 3d9e6f556e235ddcdc9f73600fdd46fe1736b090. Signed-off-by: John Ogness Signed-off-by: Sebastian Andrzej Siewior --- drivers/tty/serial/8250/8250_port.c | 3 +++ 1 file changed, 3 insertions(+) Index: linux-6.6.58-rt45/drivers/tty/serial/8250/8250_port.c =================================================================== --- linux-6.6.58-rt45.orig/drivers/tty/serial/8250/8250_port.c +++ linux-6.6.58-rt45/drivers/tty/serial/8250/8250_port.c @@ -728,6 +728,9 @@ static void __serial8250_clear_IER(struc static inline void serial8250_clear_IER(struct uart_8250_port *up) { + /* Port locked to synchronize UART_IER access against the console. */ + lockdep_assert_held_once(&up->port.lock); + __serial8250_clear_IER(up); }