From f209365b5458b3a04ae706878a5cd2cf12086c1f Mon Sep 17 00:00:00 2001 From: John Ogness Date: Mon, 2 Oct 2023 15:30:43 +0000 Subject: [PATCH] serial: 8250: Revert "drop lockdep annotation from serial8250_clear_IER()" BugLink: https://bugs.launchpad.net/bugs/2060704 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 Signed-off-by: Kevin Becker --- drivers/tty/serial/8250/8250_port.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index d6e5c2ea82eb..77d36ad116af 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -719,6 +719,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); }