From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 22 Jan 2025 09:34:25 +0000 (+0100)
Subject: Revert "serial: 8250: Revert "drop lockdep annotation from serial8250_clear_IER()""
X-Git-Tag: v6.14-rc1~59^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=244eb5c6ec62ccab59ecac1f4815bb33130c423a;p=thirdparty%2Flinux.git

Revert "serial: 8250: Revert "drop lockdep annotation from serial8250_clear_IER()""

This reverts commit 422c9727b07f9f86e2ec11c56622e566221591cc.

kernel test robot has found problems with this commit so revert it for
now.

Link: https://lore.kernel.org/r/202501221029.fb0d574d-lkp@intel.com
Reported-by: kernel test robot <oliver.sang@intel.com>
Closes: https://lore.kernel.org/oe-lkp/202501221029.fb0d574d-lkp@intel.com
Cc: John Ogness <john.ogness@linutronix.de>
Cc: Petr Mladek <pmladek@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 76a8d74f16e8b..08466cf10d737 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -726,9 +726,6 @@ 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);
 }