From: Jim Paris <jim@jtan.com>
To: Oliver Neukum <oliver@neukum.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] cdc-acm: ensure that termios get set when the port is opened
Date: Tue, 28 Oct 2014 19:26:57 -0400 [thread overview]
Message-ID: <20141028232649.GA1064@psychosis.jim.sh> (raw)
Do what other drivers like ftdi_sio do, and ensure that termios are
written to the device when the port is first opened.
Signed-off-by: Jim Paris <jim@jtan.com>
---
Tested on v3.16.5.
I've seen a problem on two CDC-ACM systems based on a Segger J-Link
where the port does not get initialized at the correct baudrate when
opening (using e.g. python-serial). I think this occurs when the tty
device was previously opened at the same baudrate, then the device was
unplugged and replugged. While the port is open, manually switching
to a different baudrate and back fixes it.
Debug output in the failing case is e.g.:
Oct 28 18:37:45 pilot kernel: [1214446.586460] tty ttyACM0: acm_tty_install
Oct 28 18:37:45 pilot kernel: [1214446.586474] tty ttyACM0: acm_tty_open
Oct 28 18:37:45 pilot kernel: [1214446.586477] cdc_acm 1-2.7:1.0: acm_port_activate
Oct 28 18:37:45 pilot kernel: [1214446.586670] cdc_acm 1-2.7:1.0: acm_ctrl_msg - rq 0x22, val 0x3, len 0x0, result 0
which is missing the important:
Oct 28 19:03:18 pilot kernel: [1215981.178020] cdc_acm 1-2.7:1.0: acm_tty_set_termios - set line: 38400 0 0 8
Oct 28 19:03:18 pilot kernel: [1215981.178135] cdc_acm 1-2.7:1.0: acm_ctrl_msg - rq 0x20, val 0x0, len 0x7, result 7
that I get when changing settings to something different than they
previously were.
I don't really follow all of the termios and tty stuff, so I don't
know if this is the right fix or the real cause. I suspect it
have to do with cached values associated with the particular TTY
("lazy saved data" in tty-io.c); this patch just does what I see in
ftdi_sio and ensures that the termios settings are written to the
device when the port is opened.
---
drivers/usb/class/cdc-acm.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index e934e19f49f5..144bf43c9190 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -495,15 +495,6 @@ error_init_termios:
return retval;
}
-static int acm_tty_open(struct tty_struct *tty, struct file *filp)
-{
- struct acm *acm = tty->driver_data;
-
- dev_dbg(tty->dev, "%s\n", __func__);
-
- return tty_port_open(&acm->port, tty, filp);
-}
-
static void acm_port_dtr_rts(struct tty_port *port, int raise)
{
struct acm *acm = container_of(port, struct acm, port);
@@ -1000,6 +991,18 @@ static void acm_tty_set_termios(struct tty_struct *tty,
}
}
+static int acm_tty_open(struct tty_struct *tty, struct file *filp)
+{
+ struct acm *acm = tty->driver_data;
+
+ dev_dbg(tty->dev, "%s\n", __func__);
+
+ if (tty)
+ acm_tty_set_termios(tty, NULL);
+
+ return tty_port_open(&acm->port, tty, filp);
+}
+
static const struct tty_port_operations acm_port_ops = {
.dtr_rts = acm_port_dtr_rts,
.shutdown = acm_port_shutdown,
--
2.1.0
next reply other threads:[~2014-10-28 23:32 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-28 23:26 Jim Paris [this message]
2014-10-29 1:05 ` Peter Hurley
2014-10-29 13:43 ` [PATCH v2] cdc-acm: ensure that termios get set when the port is activated Jim Paris
2014-10-29 15:07 ` Johan Hovold
2014-10-29 15:30 ` [PATCH] USB: cdc-acm: only raise DTR on transitions from B0 Johan Hovold
2014-10-29 15:56 ` Greg Kroah-Hartman
2014-10-29 15:58 ` Johan Hovold
2014-10-30 0:53 ` [PATCH v3] cdc-acm: ensure that termios get set when the port is activated Jim Paris
2014-10-30 7:51 ` Johan Hovold
2014-10-30 14:45 ` [PATCH v4] " Jim Paris
2014-10-30 14:48 ` Johan Hovold
2014-10-30 15:04 ` [PATCH v4-real] " Jim Paris
2014-10-31 11:45 ` Johan Hovold
2014-10-31 16:04 ` Oliver Neukum
2014-10-30 6:48 ` [PATCH] USB: cdc-acm: only raise DTR on transitions from B0 Oliver Neukum
2014-11-05 17:41 ` [PATCH Resend] " Johan Hovold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141028232649.GA1064@psychosis.jim.sh \
--to=jim@jtan.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=oliver@neukum.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®