From 42f12d1918c1b1cf548aa849f99646a3eab6e8a9 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 20 Aug 2023 21:53:17 -0400 Subject: [PATCH] Fixes for 5.4 Signed-off-by: Sasha Levin --- ...x-oops-for-port-pm-on-uart_change_pm.patch | 44 +++++++++++++++++++ queue-5.4/series | 1 + 2 files changed, 45 insertions(+) create mode 100644 queue-5.4/serial-8250-fix-oops-for-port-pm-on-uart_change_pm.patch diff --git a/queue-5.4/serial-8250-fix-oops-for-port-pm-on-uart_change_pm.patch b/queue-5.4/serial-8250-fix-oops-for-port-pm-on-uart_change_pm.patch new file mode 100644 index 00000000000..2d3df278486 --- /dev/null +++ b/queue-5.4/serial-8250-fix-oops-for-port-pm-on-uart_change_pm.patch @@ -0,0 +1,44 @@ +From 8b19e3508c6c8fdc1ba119e4df55c4a89bef64ce Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Aug 2023 16:15:51 +0300 +Subject: serial: 8250: Fix oops for port->pm on uart_change_pm() + +From: Tony Lindgren + +[ 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 +Link: https://lore.kernel.org/r/20230804131553.52927-1-tony@atomide.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + 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 f49f3b017206c..4770513944d43 100644 +--- a/drivers/tty/serial/8250/8250_port.c ++++ b/drivers/tty/serial/8250/8250_port.c +@@ -3135,6 +3135,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; + + up->cur_iotype = 0xFF; +-- +2.40.1 + diff --git a/queue-5.4/series b/queue-5.4/series index bdd3b1182d4..63e9657a54a 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -83,3 +83,4 @@ arm-dts-imx-set-default-tuning-step-for-imx7d-usdhc.patch arm-dts-imx-set-default-tuning-step-for-imx6sx-usdhc.patch asoc-rt5665-add-missed-regulator_bulk_disable.patch asoc-meson-axg-tdm-formatter-fix-channel-slot-alloca.patch +serial-8250-fix-oops-for-port-pm-on-uart_change_pm.patch -- 2.47.2