On Mon, Mar 20, 2023 at 11:03:54AM +0100, Johan Hovold wrote: > On Mon, Mar 20, 2023 at 10:54:40AM +0100, Bartosz Golaszewski wrote: > > On Mon, 20 Mar 2023 at 10:47, Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > > > > > On Mon, Mar 20, 2023 at 10:30:55AM +0100, Bartosz Golaszewski wrote: > > > > On Mon, 20 Mar 2023 at 10:15, <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > > > > > > > > > > > > > > This is a note to let you know that I've just added the patch titled > > > > > > > > > > tty: serial: qcom-geni-serial: stop operations in progress at shutdown > > > > > > > > > > to the 5.10-stable tree which can be found at: > > > > > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > > > > > > > > > The filename of the patch is: > > > > > tty-serial-qcom-geni-serial-stop-operations-in-progress-at-shutdown.patch > > > > > and it can be found in the queue-5.10 subdirectory. > > > > > > > > > > If you, or anyone else, feels it should not be added to the stable tree, > > > > > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > > > > > > > > > > > > > From d8aca2f96813d51df574a811eda9a2cbed00f261 Mon Sep 17 00:00:00 2001 > > > > > From: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx> > > > > > Date: Thu, 29 Dec 2022 16:50:17 +0100 > > > > > Subject: tty: serial: qcom-geni-serial: stop operations in progress at shutdown > > > > > > > > > > From: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx> > > > > > > > > > > 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 <bartosz.golaszewski@xxxxxxxxxx> > > > > > Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx> > > > > > Link: https://lore.kernel.org/r/20221229155030.418800-2-brgl@xxxxxxxx > > > > > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > > > > --- > > > > > 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) > > > > > > > > > > > > > > > Patches currently in stable-queue which might be from bartosz.golaszewski@xxxxxxxxxx are > > > > > > > > > > queue-5.10/tty-serial-qcom-geni-serial-stop-operations-in-progress-at-shutdown.patch > > > > > > > > Greg, > > > > > > > > as discussed last week - this needs to be dropped from stable branches. > > > > > > Really? We have a fix now in Linus's tree, and I just took that as > > > well. Should that also be dropped? > > > > > > confused, > > > > > > greg k-h > > > > Cc'ing Johan. > > > > If the fix is commit 9aff74cc4e9e ("serial: qcom-geni: fix console > > shutdown hang") then both can be dropped from stable branches as doing > > anything on shutdown is only needed with DMA support which only got > > into mainline at v6.3-rc1. > > Yes, it is better to drop both in this case as calling stop_tx() for > non-console ports could cause trouble on earlier kernels. Ok, will drop both, but note, Johan had marked the later one for cc: stable which is what caused this to happen, I was just trying to do what he asked for :) thanks, greg k-h
