From 3e31841c13e4052f3b942fcce629169db827a119 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 10 Mar 2023 09:21:43 +0100 Subject: [PATCH] drop tty-serial-qcom-geni-serial-stop-operations-in-progr.patch from everywhere --- queue-5.15/series | 1 - ...geni-serial-stop-operations-in-progr.patch | 40 ------------------- queue-6.1/series | 1 - ...geni-serial-stop-operations-in-progr.patch | 40 ------------------- queue-6.2/series | 1 - ...geni-serial-stop-operations-in-progr.patch | 40 ------------------- 6 files changed, 123 deletions(-) delete mode 100644 queue-5.15/tty-serial-qcom-geni-serial-stop-operations-in-progr.patch delete mode 100644 queue-6.1/tty-serial-qcom-geni-serial-stop-operations-in-progr.patch delete mode 100644 queue-6.2/tty-serial-qcom-geni-serial-stop-operations-in-progr.patch diff --git a/queue-5.15/series b/queue-5.15/series index 93b80d58f4c..09069a55045 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -296,7 +296,6 @@ pci-iov-enlarge-virtfn-sysfs-name-buffer.patch pci-switchtec-return-efault-for-copy_to_user-errors.patch tty-serial-fsl_lpuart-disable-rx-tx-dma-in-lpuart32_.patch tty-serial-fsl_lpuart-clear-lpuart-status-register-i.patch -tty-serial-qcom-geni-serial-stop-operations-in-progr.patch serial-tegra-add-missing-clk_disable_unprepare-in-te.patch revert-char-pcmcia-cm4000_cs-replace-mdelay-with-usl.patch eeprom-idt_89hpesx-fix-error-handling-in-idt_init.patch diff --git a/queue-5.15/tty-serial-qcom-geni-serial-stop-operations-in-progr.patch b/queue-5.15/tty-serial-qcom-geni-serial-stop-operations-in-progr.patch deleted file mode 100644 index c20f9a12696..00000000000 --- a/queue-5.15/tty-serial-qcom-geni-serial-stop-operations-in-progr.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a9b64eb040aa8e32f707de41837ac46341fc12fc Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 29 Dec 2022 16:50:17 +0100 -Subject: tty: serial: qcom-geni-serial: stop operations in progress at - shutdown - -From: Bartosz Golaszewski - -[ Upstream commit d8aca2f96813d51df574a811eda9a2cbed00f261 ] - -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 -Signed-off-by: Sasha Levin ---- - drivers/tty/serial/qcom_geni_serial.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c -index ce1c81731a2a8..e5ca3c3c27d21 100644 ---- 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_serial_port *port) - 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) --- -2.39.2 - diff --git a/queue-6.1/series b/queue-6.1/series index bec3cba8540..9a515993721 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -427,7 +427,6 @@ pci-endpoint-pci-epf-vntb-add-epf_ntb_mw_bar_clear-n.patch hwtracing-hisi_ptt-only-add-the-supported-devices-to.patch tty-serial-fsl_lpuart-disable-rx-tx-dma-in-lpuart32_.patch tty-serial-fsl_lpuart-clear-lpuart-status-register-i.patch -tty-serial-qcom-geni-serial-stop-operations-in-progr.patch serial-tegra-add-missing-clk_disable_unprepare-in-te.patch revert-char-pcmcia-cm4000_cs-replace-mdelay-with-usl.patch eeprom-idt_89hpesx-fix-error-handling-in-idt_init.patch diff --git a/queue-6.1/tty-serial-qcom-geni-serial-stop-operations-in-progr.patch b/queue-6.1/tty-serial-qcom-geni-serial-stop-operations-in-progr.patch deleted file mode 100644 index 4d338f785f9..00000000000 --- a/queue-6.1/tty-serial-qcom-geni-serial-stop-operations-in-progr.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 962b105acb73b3ce9cb650eba446b1bafcc679ae Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 29 Dec 2022 16:50:17 +0100 -Subject: tty: serial: qcom-geni-serial: stop operations in progress at - shutdown - -From: Bartosz Golaszewski - -[ Upstream commit d8aca2f96813d51df574a811eda9a2cbed00f261 ] - -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 -Signed-off-by: Sasha Levin ---- - drivers/tty/serial/qcom_geni_serial.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c -index 7905935b9f1b4..fd72644605e05 100644 ---- 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_serial_port *port) - 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) --- -2.39.2 - diff --git a/queue-6.2/series b/queue-6.2/series index 828212c7442..506ab2e36f6 100644 --- a/queue-6.2/series +++ b/queue-6.2/series @@ -506,7 +506,6 @@ pci-endpoint-pci-epf-vntb-add-epf_ntb_mw_bar_clear-n.patch hwtracing-hisi_ptt-only-add-the-supported-devices-to.patch tty-serial-fsl_lpuart-disable-rx-tx-dma-in-lpuart32_.patch tty-serial-fsl_lpuart-clear-lpuart-status-register-i.patch -tty-serial-qcom-geni-serial-stop-operations-in-progr.patch serial-tegra-add-missing-clk_disable_unprepare-in-te.patch revert-char-pcmcia-cm4000_cs-replace-mdelay-with-usl.patch eeprom-idt_89hpesx-fix-error-handling-in-idt_init.patch diff --git a/queue-6.2/tty-serial-qcom-geni-serial-stop-operations-in-progr.patch b/queue-6.2/tty-serial-qcom-geni-serial-stop-operations-in-progr.patch deleted file mode 100644 index 1bea5a55440..00000000000 --- a/queue-6.2/tty-serial-qcom-geni-serial-stop-operations-in-progr.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9b2d194639636fba58fa5dc6a9e8d119a90e592c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 29 Dec 2022 16:50:17 +0100 -Subject: tty: serial: qcom-geni-serial: stop operations in progress at - shutdown - -From: Bartosz Golaszewski - -[ Upstream commit d8aca2f96813d51df574a811eda9a2cbed00f261 ] - -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 -Signed-off-by: Sasha Levin ---- - drivers/tty/serial/qcom_geni_serial.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c -index 57f04f8bf5043..851a5d2133aa2 100644 ---- 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_serial_port *port) - 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) --- -2.39.2 - -- 2.47.3