* Patch "USB: serial: ch341: fix resume after reset" has been added to the 4.4-stable tree
@ 2017-01-17 16:11 gregkh
0 siblings, 0 replies; 4+ messages in thread
From: gregkh @ 2017-01-17 16:11 UTC (permalink / raw)
To: johan, gregkh; +Cc: stable, stable-commits
This is a note to let you know that I've just added the patch titled
USB: serial: ch341: fix resume after reset
to the 4.4-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:
usb-serial-ch341-fix-resume-after-reset.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From ce5e292828117d1b71cbd3edf9e9137cf31acd30 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan@kernel.org>
Date: Fri, 6 Jan 2017 19:15:14 +0100
Subject: USB: serial: ch341: fix resume after reset
From: Johan Hovold <johan@kernel.org>
commit ce5e292828117d1b71cbd3edf9e9137cf31acd30 upstream.
Fix reset-resume handling which failed to resubmit the read and
interrupt URBs, thereby leaving a port that was open before suspend in a
broken state until closed and reopened.
Fixes: 1ded7ea47b88 ("USB: ch341 serial: fix port number changed after
resume")
Fixes: 2bfd1c96a9fb ("USB: serial: ch341: remove reset_resume callback")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/usb/serial/ch341.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -554,14 +554,23 @@ static int ch341_tiocmget(struct tty_str
static int ch341_reset_resume(struct usb_serial *serial)
{
- struct ch341_private *priv;
-
- priv = usb_get_serial_port_data(serial->port[0]);
+ struct usb_serial_port *port = serial->port[0];
+ struct ch341_private *priv = usb_get_serial_port_data(port);
+ int ret;
/* reconfigure ch341 serial port after bus-reset */
ch341_configure(serial->dev, priv);
- return 0;
+ if (test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
+ ret = usb_submit_urb(port->interrupt_in_urb, GFP_NOIO);
+ if (ret) {
+ dev_err(&port->dev, "failed to submit interrupt urb: %d\n",
+ ret);
+ return ret;
+ }
+ }
+
+ return usb_serial_generic_resume(serial);
}
static struct usb_serial_driver ch341_device = {
Patches currently in stable-queue which might be from johan@kernel.org are
queue-4.4/usb-serial-ch341-fix-modem-control-and-b0-handling.patch
queue-4.4/powerpc-ibmebus-fix-further-device-reference-leaks.patch
queue-4.4/usb-serial-ch341-fix-control-message-error-handling.patch
queue-4.4/usb-serial-ch341-fix-open-and-resume-after-b0.patch
queue-4.4/usb-serial-ch341-fix-open-error-handling.patch
queue-4.4/usb-serial-ch341-fix-initial-modem-control-state.patch
queue-4.4/bus-vexpress-config-fix-device-reference-leak.patch
queue-4.4/powerpc-ibmebus-fix-device-reference-leaks-in-sysfs-interface.patch
queue-4.4/usb-serial-kl5kusb105-fix-line-state-error-handling.patch
queue-4.4/usb-serial-ch341-fix-resume-after-reset.patch
^ permalink raw reply [flat|nested] 4+ messages in thread* Patch "USB: serial: ch341: fix resume after reset" has been added to the 4.4-stable tree
@ 2017-01-17 13:04 gregkh
2017-01-17 14:22 ` Johan Hovold
0 siblings, 1 reply; 4+ messages in thread
From: gregkh @ 2017-01-17 13:04 UTC (permalink / raw)
To: johan, gregkh; +Cc: stable, stable-commits
This is a note to let you know that I've just added the patch titled
USB: serial: ch341: fix resume after reset
to the 4.4-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:
usb-serial-ch341-fix-resume-after-reset.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From ce5e292828117d1b71cbd3edf9e9137cf31acd30 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan@kernel.org>
Date: Fri, 6 Jan 2017 19:15:14 +0100
Subject: USB: serial: ch341: fix resume after reset
From: Johan Hovold <johan@kernel.org>
commit ce5e292828117d1b71cbd3edf9e9137cf31acd30 upstream.
Fix reset-resume handling which failed to resubmit the read and
interrupt URBs, thereby leaving a port that was open before suspend in a
broken state until closed and reopened.
Fixes: 1ded7ea47b88 ("USB: ch341 serial: fix port number changed after resume")
Fixes: 2bfd1c96a9fb ("USB: serial: ch341: remove reset_resume callback")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/usb/serial/ch341.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -538,14 +538,23 @@ static int ch341_tiocmget(struct tty_str
static int ch341_reset_resume(struct usb_serial *serial)
{
- struct ch341_private *priv;
-
- priv = usb_get_serial_port_data(serial->port[0]);
+ struct usb_serial_port *port = serial->port[0];
+ struct ch341_private *priv = usb_get_serial_port_data(port);
+ int ret;
/* reconfigure ch341 serial port after bus-reset */
ch341_configure(serial->dev, priv);
- return 0;
+ if (tty_port_initialized(&port->port)) {
+ ret = usb_submit_urb(port->interrupt_in_urb, GFP_NOIO);
+ if (ret) {
+ dev_err(&port->dev, "failed to submit interrupt urb: %d\n",
+ ret);
+ return ret;
+ }
+ }
+
+ return usb_serial_generic_resume(serial);
}
static struct usb_serial_driver ch341_device = {
Patches currently in stable-queue which might be from johan@kernel.org are
queue-4.4/usb-serial-ch341-fix-control-message-error-handling.patch
queue-4.4/usb-serial-ch341-fix-open-and-resume-after-b0.patch
queue-4.4/usb-serial-ch341-fix-open-error-handling.patch
queue-4.4/usb-serial-ch341-fix-initial-modem-control-state.patch
queue-4.4/usb-serial-kl5kusb105-fix-line-state-error-handling.patch
queue-4.4/usb-serial-ch341-fix-resume-after-reset.patch
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: Patch "USB: serial: ch341: fix resume after reset" has been added to the 4.4-stable tree
2017-01-17 13:04 gregkh
@ 2017-01-17 14:22 ` Johan Hovold
2017-01-17 15:16 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Johan Hovold @ 2017-01-17 14:22 UTC (permalink / raw)
To: gregkh; +Cc: johan, stable, stable-commits
On Tue, Jan 17, 2017 at 02:04:41PM +0100, Greg Kroah-Hartman wrote:
>
> This is a note to let you know that I've just added the patch titled
>
> USB: serial: ch341: fix resume after reset
>
> to the 4.4-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:
> usb-serial-ch341-fix-resume-after-reset.patch
> and it can be found in the queue-4.4 subdirectory.
>
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable@vger.kernel.org> know about it.
>
>
> From ce5e292828117d1b71cbd3edf9e9137cf31acd30 Mon Sep 17 00:00:00 2001
> From: Johan Hovold <johan@kernel.org>
> Date: Fri, 6 Jan 2017 19:15:14 +0100
> Subject: USB: serial: ch341: fix resume after reset
>
> From: Johan Hovold <johan@kernel.org>
>
> commit ce5e292828117d1b71cbd3edf9e9137cf31acd30 upstream.
>
> Fix reset-resume handling which failed to resubmit the read and
> interrupt URBs, thereby leaving a port that was open before suspend in a
> broken state until closed and reopened.
>
> Fixes: 1ded7ea47b88 ("USB: ch341 serial: fix port number changed after resume")
> Fixes: 2bfd1c96a9fb ("USB: serial: ch341: remove reset_resume callback")
> Signed-off-by: Johan Hovold <johan@kernel.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> ---
> drivers/usb/serial/ch341.c | 17 +++++++++++++----
> 1 file changed, 13 insertions(+), 4 deletions(-)
>
> --- a/drivers/usb/serial/ch341.c
> +++ b/drivers/usb/serial/ch341.c
> @@ -538,14 +538,23 @@ static int ch341_tiocmget(struct tty_str
>
> static int ch341_reset_resume(struct usb_serial *serial)
> {
> - struct ch341_private *priv;
> -
> - priv = usb_get_serial_port_data(serial->port[0]);
> + struct usb_serial_port *port = serial->port[0];
> + struct ch341_private *priv = usb_get_serial_port_data(port);
> + int ret;
>
> /* reconfigure ch341 serial port after bus-reset */
> ch341_configure(serial->dev, priv);
>
> - return 0;
> + if (tty_port_initialized(&port->port)) {
Note that this needs to be
if (test_bit(ASYNCB_INITIALIZED, &port->port.flags))
prior to commit d41861ca19c9 ("tty: Replace ASYNC_INITIALIZED bit and
update atomically") that went into 4.7.
I'll send a backport.
Johan
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: Patch "USB: serial: ch341: fix resume after reset" has been added to the 4.4-stable tree
2017-01-17 14:22 ` Johan Hovold
@ 2017-01-17 15:16 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2017-01-17 15:16 UTC (permalink / raw)
To: Johan Hovold; +Cc: stable, stable-commits
On Tue, Jan 17, 2017 at 03:22:05PM +0100, Johan Hovold wrote:
> On Tue, Jan 17, 2017 at 02:04:41PM +0100, Greg Kroah-Hartman wrote:
> >
> > This is a note to let you know that I've just added the patch titled
> >
> > USB: serial: ch341: fix resume after reset
> >
> > to the 4.4-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:
> > usb-serial-ch341-fix-resume-after-reset.patch
> > and it can be found in the queue-4.4 subdirectory.
> >
> > If you, or anyone else, feels it should not be added to the stable tree,
> > please let <stable@vger.kernel.org> know about it.
> >
> >
> > From ce5e292828117d1b71cbd3edf9e9137cf31acd30 Mon Sep 17 00:00:00 2001
> > From: Johan Hovold <johan@kernel.org>
> > Date: Fri, 6 Jan 2017 19:15:14 +0100
> > Subject: USB: serial: ch341: fix resume after reset
> >
> > From: Johan Hovold <johan@kernel.org>
> >
> > commit ce5e292828117d1b71cbd3edf9e9137cf31acd30 upstream.
> >
> > Fix reset-resume handling which failed to resubmit the read and
> > interrupt URBs, thereby leaving a port that was open before suspend in a
> > broken state until closed and reopened.
> >
> > Fixes: 1ded7ea47b88 ("USB: ch341 serial: fix port number changed after resume")
> > Fixes: 2bfd1c96a9fb ("USB: serial: ch341: remove reset_resume callback")
> > Signed-off-by: Johan Hovold <johan@kernel.org>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> >
> > ---
> > drivers/usb/serial/ch341.c | 17 +++++++++++++----
> > 1 file changed, 13 insertions(+), 4 deletions(-)
> >
> > --- a/drivers/usb/serial/ch341.c
> > +++ b/drivers/usb/serial/ch341.c
> > @@ -538,14 +538,23 @@ static int ch341_tiocmget(struct tty_str
> >
> > static int ch341_reset_resume(struct usb_serial *serial)
> > {
> > - struct ch341_private *priv;
> > -
> > - priv = usb_get_serial_port_data(serial->port[0]);
> > + struct usb_serial_port *port = serial->port[0];
> > + struct ch341_private *priv = usb_get_serial_port_data(port);
> > + int ret;
> >
> > /* reconfigure ch341 serial port after bus-reset */
> > ch341_configure(serial->dev, priv);
> >
> > - return 0;
> > + if (tty_port_initialized(&port->port)) {
>
> Note that this needs to be
>
> if (test_bit(ASYNCB_INITIALIZED, &port->port.flags))
>
> prior to commit d41861ca19c9 ("tty: Replace ASYNC_INITIALIZED bit and
> update atomically") that went into 4.7.
>
> I'll send a backport.
Many thanks, my build system just hit this error. I'll drop this patch
for now.
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-01-17 16:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-17 16:11 Patch "USB: serial: ch341: fix resume after reset" has been added to the 4.4-stable tree gregkh
-- strict thread matches above, loose matches on Subject: below --
2017-01-17 13:04 gregkh
2017-01-17 14:22 ` Johan Hovold
2017-01-17 15:16 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).