From: John Ogness Date: Tue, 7 Jan 2025 21:27:02 +0000 (+0106) Subject: serial: 8250: Revert "drop lockdep annotation from serial8250_clear_IER()" X-Git-Tag: v6.14-rc1~59^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=422c9727b07f9f86e2ec11c56622e566221591cc;p=thirdparty%2Fkernel%2Flinux.git 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 Reviewed-by: Petr Mladek Link: https://lore.kernel.org/r/20250107212702.169493-7-john.ogness@linutronix.de Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index 08466cf10d737..76a8d74f16e8b 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -726,6 +726,9 @@ static void __serial8250_clear_IER(struct uart_8250_port *up) 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); }