From: Greg Kroah-Hartman Date: Mon, 20 Mar 2023 10:10:04 +0000 (+0100) Subject: drop some qcom-geni patches from all queues X-Git-Tag: v4.14.311~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=98c63e2bf1eea610e7939aa7abf9262acf57ffc5;p=thirdparty%2Fkernel%2Fstable-queue.git drop some qcom-geni patches from all queues --- diff --git a/queue-5.10/serial-qcom-geni-fix-console-shutdown-hang.patch b/queue-5.10/serial-qcom-geni-fix-console-shutdown-hang.patch deleted file mode 100644 index 3f6f9b2587d..00000000000 --- a/queue-5.10/serial-qcom-geni-fix-console-shutdown-hang.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9aff74cc4e9eb841dde5fd009ed7ddca5db40e68 Mon Sep 17 00:00:00 2001 -From: Johan Hovold -Date: Tue, 7 Mar 2023 17:44:02 +0100 -Subject: serial: qcom-geni: fix console shutdown hang - -From: Johan Hovold - -commit 9aff74cc4e9eb841dde5fd009ed7ddca5db40e68 upstream. - -A recent commit added back the calls top stop tx and rx to shutdown() -which had previously been removed by commit e83766334f96 ("tty: serial: -qcom_geni_serial: No need to stop tx/rx on UART shutdown") in order to -be able to use kgdb after stopping the getty. - -Not only did this again break kgdb, but it also broke serial consoles -more generally by hanging TX when stopping the getty during reboot. - -The underlying problem has been there since the driver was first merged -and fixing it is going to be a bit involved so simply stop calling the -broken stop functions during shutdown for consoles for now. - -Fixes: d8aca2f96813 ("tty: serial: qcom-geni-serial: stop operations in progress at shutdown") -Cc: stable -Cc: Bartosz Golaszewski -Signed-off-by: Johan Hovold -Reviewed-by: Douglas Anderson -Reviewed-by: Srinivas Kandagatla -Tested-by: Srinivas Kandagatla -Reviewed-by: Andrew Halaney -Tested-by: Andrew Halaney # sa8540p-ride -Link: https://lore.kernel.org/r/20230307164405.14218-2-johan+linaro@kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/serial/qcom_geni_serial.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/tty/serial/qcom_geni_serial.c -+++ b/drivers/tty/serial/qcom_geni_serial.c -@@ -893,6 +893,10 @@ static int setup_fifos(struct qcom_geni_ - static void qcom_geni_serial_shutdown(struct uart_port *uport) - { - disable_irq(uport->irq); -+ -+ if (uart_console(uport)) -+ return; -+ - qcom_geni_serial_stop_tx(uport); - qcom_geni_serial_stop_rx(uport); - } diff --git a/queue-5.10/series b/queue-5.10/series index 3a7e07dfd3a..02103da5a8b 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -56,7 +56,5 @@ drm-amd-display-fix-shift-out-of-bounds-in-calculate.patch ext4-fix-possible-double-unlock-when-moving-a-directory.patch tty-serial-fsl_lpuart-skip-waiting-for-transmission-complete-when-uartctrl_sbk-is-asserted.patch serial-8250_em-fix-uart-port-type.patch -tty-serial-qcom-geni-serial-stop-operations-in-progress-at-shutdown.patch -serial-qcom-geni-fix-console-shutdown-hang.patch firmware-xilinx-don-t-make-a-sleepable-memory-allocation-from-an-atomic-context.patch interconnect-fix-mem-leak-when-freeing-nodes.patch diff --git a/queue-5.10/tty-serial-qcom-geni-serial-stop-operations-in-progress-at-shutdown.patch b/queue-5.10/tty-serial-qcom-geni-serial-stop-operations-in-progress-at-shutdown.patch deleted file mode 100644 index 119146fa99a..00000000000 --- a/queue-5.10/tty-serial-qcom-geni-serial-stop-operations-in-progress-at-shutdown.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d8aca2f96813d51df574a811eda9a2cbed00f261 Mon Sep 17 00:00:00 2001 -From: Bartosz Golaszewski -Date: Thu, 29 Dec 2022 16:50:17 +0100 -Subject: tty: serial: qcom-geni-serial: stop operations in progress at shutdown - -From: Bartosz Golaszewski - -commit d8aca2f96813d51df574a811eda9a2cbed00f261 upstream. - -We don't stop transmissions in progress at shutdown. This is fine with -FIFO SE mode but with DMA (support for which we'll introduce later) it -causes trouble so fix it now. - -Fixes: e83766334f96 ("tty: serial: qcom_geni_serial: No need to stop tx/rx on UART shutdown") -Signed-off-by: Bartosz Golaszewski -Reviewed-by: Konrad Dybcio -Link: https://lore.kernel.org/r/20221229155030.418800-2-brgl@bgdev.pl -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/serial/qcom_geni_serial.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/tty/serial/qcom_geni_serial.c -+++ b/drivers/tty/serial/qcom_geni_serial.c -@@ -893,6 +893,8 @@ static int setup_fifos(struct qcom_geni_ - static void qcom_geni_serial_shutdown(struct uart_port *uport) - { - disable_irq(uport->irq); -+ qcom_geni_serial_stop_tx(uport); -+ qcom_geni_serial_stop_rx(uport); - } - - static int qcom_geni_serial_port_setup(struct uart_port *uport) diff --git a/queue-5.15/serial-qcom-geni-fix-console-shutdown-hang.patch b/queue-5.15/serial-qcom-geni-fix-console-shutdown-hang.patch deleted file mode 100644 index 3f6f9b2587d..00000000000 --- a/queue-5.15/serial-qcom-geni-fix-console-shutdown-hang.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9aff74cc4e9eb841dde5fd009ed7ddca5db40e68 Mon Sep 17 00:00:00 2001 -From: Johan Hovold -Date: Tue, 7 Mar 2023 17:44:02 +0100 -Subject: serial: qcom-geni: fix console shutdown hang - -From: Johan Hovold - -commit 9aff74cc4e9eb841dde5fd009ed7ddca5db40e68 upstream. - -A recent commit added back the calls top stop tx and rx to shutdown() -which had previously been removed by commit e83766334f96 ("tty: serial: -qcom_geni_serial: No need to stop tx/rx on UART shutdown") in order to -be able to use kgdb after stopping the getty. - -Not only did this again break kgdb, but it also broke serial consoles -more generally by hanging TX when stopping the getty during reboot. - -The underlying problem has been there since the driver was first merged -and fixing it is going to be a bit involved so simply stop calling the -broken stop functions during shutdown for consoles for now. - -Fixes: d8aca2f96813 ("tty: serial: qcom-geni-serial: stop operations in progress at shutdown") -Cc: stable -Cc: Bartosz Golaszewski -Signed-off-by: Johan Hovold -Reviewed-by: Douglas Anderson -Reviewed-by: Srinivas Kandagatla -Tested-by: Srinivas Kandagatla -Reviewed-by: Andrew Halaney -Tested-by: Andrew Halaney # sa8540p-ride -Link: https://lore.kernel.org/r/20230307164405.14218-2-johan+linaro@kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/serial/qcom_geni_serial.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/tty/serial/qcom_geni_serial.c -+++ b/drivers/tty/serial/qcom_geni_serial.c -@@ -893,6 +893,10 @@ static int setup_fifos(struct qcom_geni_ - static void qcom_geni_serial_shutdown(struct uart_port *uport) - { - disable_irq(uport->irq); -+ -+ if (uart_console(uport)) -+ return; -+ - qcom_geni_serial_stop_tx(uport); - qcom_geni_serial_stop_rx(uport); - } diff --git a/queue-5.15/series b/queue-5.15/series index 9873f97222d..83c9390eb29 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -74,8 +74,6 @@ ext4-fix-possible-double-unlock-when-moving-a-directory.patch tty-serial-fsl_lpuart-skip-waiting-for-transmission-complete-when-uartctrl_sbk-is-asserted.patch serial-8250_em-fix-uart-port-type.patch serial-8250_fsl-fix-handle_irq-locking.patch -tty-serial-qcom-geni-serial-stop-operations-in-progress-at-shutdown.patch -serial-qcom-geni-fix-console-shutdown-hang.patch firmware-xilinx-don-t-make-a-sleepable-memory-allocation-from-an-atomic-context.patch s390-ipl-add-missing-intersection-check-to-ipl_report-handling.patch interconnect-fix-mem-leak-when-freeing-nodes.patch diff --git a/queue-5.15/tty-serial-qcom-geni-serial-stop-operations-in-progress-at-shutdown.patch b/queue-5.15/tty-serial-qcom-geni-serial-stop-operations-in-progress-at-shutdown.patch deleted file mode 100644 index 119146fa99a..00000000000 --- a/queue-5.15/tty-serial-qcom-geni-serial-stop-operations-in-progress-at-shutdown.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d8aca2f96813d51df574a811eda9a2cbed00f261 Mon Sep 17 00:00:00 2001 -From: Bartosz Golaszewski -Date: Thu, 29 Dec 2022 16:50:17 +0100 -Subject: tty: serial: qcom-geni-serial: stop operations in progress at shutdown - -From: Bartosz Golaszewski - -commit d8aca2f96813d51df574a811eda9a2cbed00f261 upstream. - -We don't stop transmissions in progress at shutdown. This is fine with -FIFO SE mode but with DMA (support for which we'll introduce later) it -causes trouble so fix it now. - -Fixes: e83766334f96 ("tty: serial: qcom_geni_serial: No need to stop tx/rx on UART shutdown") -Signed-off-by: Bartosz Golaszewski -Reviewed-by: Konrad Dybcio -Link: https://lore.kernel.org/r/20221229155030.418800-2-brgl@bgdev.pl -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/serial/qcom_geni_serial.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/tty/serial/qcom_geni_serial.c -+++ b/drivers/tty/serial/qcom_geni_serial.c -@@ -893,6 +893,8 @@ static int setup_fifos(struct qcom_geni_ - static void qcom_geni_serial_shutdown(struct uart_port *uport) - { - disable_irq(uport->irq); -+ qcom_geni_serial_stop_tx(uport); -+ qcom_geni_serial_stop_rx(uport); - } - - static int qcom_geni_serial_port_setup(struct uart_port *uport) diff --git a/queue-6.1/serial-qcom-geni-fix-console-shutdown-hang.patch b/queue-6.1/serial-qcom-geni-fix-console-shutdown-hang.patch deleted file mode 100644 index 77e9d121ca0..00000000000 --- a/queue-6.1/serial-qcom-geni-fix-console-shutdown-hang.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9aff74cc4e9eb841dde5fd009ed7ddca5db40e68 Mon Sep 17 00:00:00 2001 -From: Johan Hovold -Date: Tue, 7 Mar 2023 17:44:02 +0100 -Subject: serial: qcom-geni: fix console shutdown hang - -From: Johan Hovold - -commit 9aff74cc4e9eb841dde5fd009ed7ddca5db40e68 upstream. - -A recent commit added back the calls top stop tx and rx to shutdown() -which had previously been removed by commit e83766334f96 ("tty: serial: -qcom_geni_serial: No need to stop tx/rx on UART shutdown") in order to -be able to use kgdb after stopping the getty. - -Not only did this again break kgdb, but it also broke serial consoles -more generally by hanging TX when stopping the getty during reboot. - -The underlying problem has been there since the driver was first merged -and fixing it is going to be a bit involved so simply stop calling the -broken stop functions during shutdown for consoles for now. - -Fixes: d8aca2f96813 ("tty: serial: qcom-geni-serial: stop operations in progress at shutdown") -Cc: stable -Cc: Bartosz Golaszewski -Signed-off-by: Johan Hovold -Reviewed-by: Douglas Anderson -Reviewed-by: Srinivas Kandagatla -Tested-by: Srinivas Kandagatla -Reviewed-by: Andrew Halaney -Tested-by: Andrew Halaney # sa8540p-ride -Link: https://lore.kernel.org/r/20230307164405.14218-2-johan+linaro@kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/serial/qcom_geni_serial.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/tty/serial/qcom_geni_serial.c -+++ b/drivers/tty/serial/qcom_geni_serial.c -@@ -891,6 +891,10 @@ static int setup_fifos(struct qcom_geni_ - static void qcom_geni_serial_shutdown(struct uart_port *uport) - { - disable_irq(uport->irq); -+ -+ if (uart_console(uport)) -+ return; -+ - qcom_geni_serial_stop_tx(uport); - qcom_geni_serial_stop_rx(uport); - } diff --git a/queue-6.1/series b/queue-6.1/series index 3153dec73df..abb01042012 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -119,8 +119,6 @@ tty-serial-fsl_lpuart-skip-waiting-for-transmission-complete-when-uartctrl_sbk-i serial-8250_em-fix-uart-port-type.patch serial-8250_fsl-fix-handle_irq-locking.patch serial-8250-aspeed_vuart-select-regmap-instead-of-depending-on-it.patch -tty-serial-qcom-geni-serial-stop-operations-in-progress-at-shutdown.patch -serial-qcom-geni-fix-console-shutdown-hang.patch firmware-xilinx-don-t-make-a-sleepable-memory-allocation-from-an-atomic-context.patch memory-tegra-fix-interconnect-registration-race.patch memory-tegra20-emc-fix-interconnect-registration-race.patch diff --git a/queue-6.1/tty-serial-qcom-geni-serial-stop-operations-in-progress-at-shutdown.patch b/queue-6.1/tty-serial-qcom-geni-serial-stop-operations-in-progress-at-shutdown.patch deleted file mode 100644 index 437626d7432..00000000000 --- a/queue-6.1/tty-serial-qcom-geni-serial-stop-operations-in-progress-at-shutdown.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d8aca2f96813d51df574a811eda9a2cbed00f261 Mon Sep 17 00:00:00 2001 -From: Bartosz Golaszewski -Date: Thu, 29 Dec 2022 16:50:17 +0100 -Subject: tty: serial: qcom-geni-serial: stop operations in progress at shutdown - -From: Bartosz Golaszewski - -commit d8aca2f96813d51df574a811eda9a2cbed00f261 upstream. - -We don't stop transmissions in progress at shutdown. This is fine with -FIFO SE mode but with DMA (support for which we'll introduce later) it -causes trouble so fix it now. - -Fixes: e83766334f96 ("tty: serial: qcom_geni_serial: No need to stop tx/rx on UART shutdown") -Signed-off-by: Bartosz Golaszewski -Reviewed-by: Konrad Dybcio -Link: https://lore.kernel.org/r/20221229155030.418800-2-brgl@bgdev.pl -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/serial/qcom_geni_serial.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/tty/serial/qcom_geni_serial.c -+++ b/drivers/tty/serial/qcom_geni_serial.c -@@ -891,6 +891,8 @@ static int setup_fifos(struct qcom_geni_ - static void qcom_geni_serial_shutdown(struct uart_port *uport) - { - disable_irq(uport->irq); -+ qcom_geni_serial_stop_tx(uport); -+ qcom_geni_serial_stop_rx(uport); - } - - static int qcom_geni_serial_port_setup(struct uart_port *uport) diff --git a/queue-6.2/serial-qcom-geni-fix-console-shutdown-hang.patch b/queue-6.2/serial-qcom-geni-fix-console-shutdown-hang.patch deleted file mode 100644 index 77e9d121ca0..00000000000 --- a/queue-6.2/serial-qcom-geni-fix-console-shutdown-hang.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9aff74cc4e9eb841dde5fd009ed7ddca5db40e68 Mon Sep 17 00:00:00 2001 -From: Johan Hovold -Date: Tue, 7 Mar 2023 17:44:02 +0100 -Subject: serial: qcom-geni: fix console shutdown hang - -From: Johan Hovold - -commit 9aff74cc4e9eb841dde5fd009ed7ddca5db40e68 upstream. - -A recent commit added back the calls top stop tx and rx to shutdown() -which had previously been removed by commit e83766334f96 ("tty: serial: -qcom_geni_serial: No need to stop tx/rx on UART shutdown") in order to -be able to use kgdb after stopping the getty. - -Not only did this again break kgdb, but it also broke serial consoles -more generally by hanging TX when stopping the getty during reboot. - -The underlying problem has been there since the driver was first merged -and fixing it is going to be a bit involved so simply stop calling the -broken stop functions during shutdown for consoles for now. - -Fixes: d8aca2f96813 ("tty: serial: qcom-geni-serial: stop operations in progress at shutdown") -Cc: stable -Cc: Bartosz Golaszewski -Signed-off-by: Johan Hovold -Reviewed-by: Douglas Anderson -Reviewed-by: Srinivas Kandagatla -Tested-by: Srinivas Kandagatla -Reviewed-by: Andrew Halaney -Tested-by: Andrew Halaney # sa8540p-ride -Link: https://lore.kernel.org/r/20230307164405.14218-2-johan+linaro@kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/serial/qcom_geni_serial.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/tty/serial/qcom_geni_serial.c -+++ b/drivers/tty/serial/qcom_geni_serial.c -@@ -891,6 +891,10 @@ static int setup_fifos(struct qcom_geni_ - static void qcom_geni_serial_shutdown(struct uart_port *uport) - { - disable_irq(uport->irq); -+ -+ if (uart_console(uport)) -+ return; -+ - qcom_geni_serial_stop_tx(uport); - qcom_geni_serial_stop_rx(uport); - } diff --git a/queue-6.2/series b/queue-6.2/series index f282683273e..ba7770f3d3a 100644 --- a/queue-6.2/series +++ b/queue-6.2/series @@ -120,8 +120,6 @@ tty-serial-fsl_lpuart-skip-waiting-for-transmission-complete-when-uartctrl_sbk-i serial-8250_em-fix-uart-port-type.patch serial-8250_fsl-fix-handle_irq-locking.patch serial-8250-aspeed_vuart-select-regmap-instead-of-depending-on-it.patch -tty-serial-qcom-geni-serial-stop-operations-in-progress-at-shutdown.patch -serial-qcom-geni-fix-console-shutdown-hang.patch firmware-xilinx-don-t-make-a-sleepable-memory-allocation-from-an-atomic-context.patch memory-tegra-fix-interconnect-registration-race.patch memory-tegra20-emc-fix-interconnect-registration-race.patch diff --git a/queue-6.2/tty-serial-qcom-geni-serial-stop-operations-in-progress-at-shutdown.patch b/queue-6.2/tty-serial-qcom-geni-serial-stop-operations-in-progress-at-shutdown.patch deleted file mode 100644 index 437626d7432..00000000000 --- a/queue-6.2/tty-serial-qcom-geni-serial-stop-operations-in-progress-at-shutdown.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d8aca2f96813d51df574a811eda9a2cbed00f261 Mon Sep 17 00:00:00 2001 -From: Bartosz Golaszewski -Date: Thu, 29 Dec 2022 16:50:17 +0100 -Subject: tty: serial: qcom-geni-serial: stop operations in progress at shutdown - -From: Bartosz Golaszewski - -commit d8aca2f96813d51df574a811eda9a2cbed00f261 upstream. - -We don't stop transmissions in progress at shutdown. This is fine with -FIFO SE mode but with DMA (support for which we'll introduce later) it -causes trouble so fix it now. - -Fixes: e83766334f96 ("tty: serial: qcom_geni_serial: No need to stop tx/rx on UART shutdown") -Signed-off-by: Bartosz Golaszewski -Reviewed-by: Konrad Dybcio -Link: https://lore.kernel.org/r/20221229155030.418800-2-brgl@bgdev.pl -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/serial/qcom_geni_serial.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/tty/serial/qcom_geni_serial.c -+++ b/drivers/tty/serial/qcom_geni_serial.c -@@ -891,6 +891,8 @@ static int setup_fifos(struct qcom_geni_ - static void qcom_geni_serial_shutdown(struct uart_port *uport) - { - disable_irq(uport->irq); -+ qcom_geni_serial_stop_tx(uport); -+ qcom_geni_serial_stop_rx(uport); - } - - static int qcom_geni_serial_port_setup(struct uart_port *uport)