Fixes for 6.1

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.1/serial-8250-fix-oops-for-port-pm-on-uart_change_pm.patch b/queue-6.1/serial-8250-fix-oops-for-port-pm-on-uart_change_pm.patch
new file mode 100644 (file)
index 0000000..8dc9279
--- /dev/null
+++ b/queue-6.1/serial-8250-fix-oops-for-port-pm-on-uart_change_pm.patch
@@ -0,0 +1,44 @@
+From eb9453618f879f6283df59de41a4c7e2e2648117 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Fri, 4 Aug 2023 16:15:51 +0300
+Subject: serial: 8250: Fix oops for port->pm on uart_change_pm()
+
+From: Tony Lindgren <tony@atomide.com>
+
+[ Upstream commit dfe2aeb226fd5e19b0ee795f4f6ed8bc494c1534 ]
+
+Unloading a hardware specific 8250 driver can produce error "Unable to
+handle kernel paging request at virtual address" about ten seconds after
+unloading the driver. This happens on uart_hangup() calling
+uart_change_pm().
+
+Turns out commit 04e82793f068 ("serial: 8250: Reinit port->pm on port
+specific driver unbind") was only a partial fix. If the hardware specific
+driver has initialized port->pm function, we need to clear port->pm too.
+Just reinitializing port->ops does not do this. Otherwise serial8250_pm()
+will call port->pm() instead of serial8250_do_pm().
+
+Fixes: 04e82793f068 ("serial: 8250: Reinit port->pm on port specific driver unbind")
+Signed-off-by: Tony Lindgren <tony@atomide.com>
+Link: https://lore.kernel.org/r/20230804131553.52927-1-tony@atomide.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/tty/serial/8250/8250_port.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
+index acf578aa9930b..38760bd6e0c29 100644
+--- a/drivers/tty/serial/8250/8250_port.c
++++ b/drivers/tty/serial/8250/8250_port.c
+@@ -3281,6 +3281,7 @@ void serial8250_init_port(struct uart_8250_port *up)
+       struct uart_port *port = &up->port;
+ 
+       spin_lock_init(&port->lock);
++      port->pm = NULL;
+       port->ops = &serial8250_pops;
+       port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_8250_CONSOLE);
+ 
+-- 
+2.40.1
+

diff --git a/queue-6.1/series b/queue-6.1/series
index be199af4efe52936b22caf6a686a8e5c380aa267..b0766f327845734e5e7ad2e3c6c6576130f463a2 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -154,3 +154,4 @@ alsa-hda-realtek-remodified-3k-pull-low-procedure.patch
 riscv-uaccess-return-the-number-of-bytes-effectively.patch
 x86-static_call-fix-__static_call_fixup.patch
 x86-srso-correct-the-mitigation-status-when-smt-is-d.patch
+serial-8250-fix-oops-for-port-pm-on-uart_change_pm.patch