From: "Pali Rohár" <pali@kernel.org>
To: "Johan Hovold" <johan@kernel.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Marek Behún" <kabel@kernel.org>
Cc: linux-usb@vger.kernel.org
Subject: [PATCH v3 4/7] USB: serial: ftdi_sio: Do not reset baud rate to 9600 Baud on error
Date: Sat, 24 Sep 2022 12:27:15 +0200 [thread overview]
Message-ID: <20220924102718.2984-5-pali@kernel.org> (raw)
In-Reply-To: <20220924102718.2984-1-pali@kernel.org>
If setting new baud rate fails, some other drivers leave the device at
previous baud rate, and ftdi_sio resets to 9600 Baud.
Change this behavior to not reset baud rate to 9600.
Signed-off-by: Pali Rohár <pali@kernel.org>
Tested-by: Marek Behún <kabel@kernel.org>
Signed-off-by: Marek Behún <kabel@kernel.org>
---
drivers/usb/serial/ftdi_sio.c | 47 ++++++++++++++++++++++++++---------
1 file changed, 35 insertions(+), 12 deletions(-)
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index fe8a7c5fa0e9..1ab6bf48516f 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1315,7 +1315,7 @@ static int update_mctrl(struct usb_serial_port *port, unsigned int set,
static u32 get_ftdi_divisor(struct tty_struct *tty,
- struct usb_serial_port *port)
+ struct usb_serial_port *port, speed_t old_baud)
{
struct ftdi_private *priv = usb_get_serial_port_data(port);
struct device *dev = &port->dev;
@@ -1338,6 +1338,8 @@ static u32 get_ftdi_divisor(struct tty_struct *tty,
__func__, priv->custom_divisor, baud);
}
+ if (!baud)
+ baud = old_baud;
if (!baud)
baud = 9600;
switch (priv->chip_type) {
@@ -1346,8 +1348,12 @@ static u32 get_ftdi_divisor(struct tty_struct *tty,
if (div_value == (u32)-1) {
dev_dbg(dev, "%s - Baudrate (%d) requested is not supported\n",
__func__, baud);
- baud = 9600;
+ baud = old_baud ? old_baud : 9600;
div_value = ftdi_sio_baud_to_divisor(baud);
+ if (div_value == -1) {
+ baud = 9600;
+ div_value = ftdi_sio_baud_to_divisor(baud);
+ }
div_okay = 0;
}
break;
@@ -1356,8 +1362,11 @@ static u32 get_ftdi_divisor(struct tty_struct *tty,
div_value = ftdi_232am_baud_to_divisor(baud);
} else {
dev_dbg(dev, "%s - Baud rate too high!\n", __func__);
- baud = 9600;
- div_value = ftdi_232am_baud_to_divisor(9600);
+ if (old_baud >= 183 && old_baud <= 3000000)
+ baud = old_baud;
+ else
+ baud = 9600;
+ div_value = ftdi_232am_baud_to_divisor(baud);
div_okay = 0;
}
break;
@@ -1379,9 +1388,12 @@ static u32 get_ftdi_divisor(struct tty_struct *tty,
div_value = ftdi_232bm_baud_to_divisor(baud);
} else {
dev_dbg(dev, "%s - Baud rate too high!\n", __func__);
- div_value = ftdi_232bm_baud_to_divisor(9600);
+ if (old_baud >= 183 && old_baud <= 3000000)
+ baud = old_baud;
+ else
+ baud = 9600;
+ div_value = ftdi_232bm_baud_to_divisor(baud);
div_okay = 0;
- baud = 9600;
}
break;
case FT2232H: /* FT2232H chip */
@@ -1393,9 +1405,17 @@ static u32 get_ftdi_divisor(struct tty_struct *tty,
div_value = ftdi_232bm_baud_to_divisor(baud);
} else {
dev_dbg(dev, "%s - Baud rate too high!\n", __func__);
- div_value = ftdi_232bm_baud_to_divisor(9600);
+ if (old_baud >= 183 && old_baud < 1200) {
+ baud = old_baud;
+ div_value = ftdi_232bm_baud_to_divisor(baud);
+ } else {
+ if (old_baud >= 1200 && old_baud <= 12000000)
+ baud = old_baud;
+ else
+ baud = 9600;
+ div_value = ftdi_2232h_baud_to_divisor(baud);
+ }
div_okay = 0;
- baud = 9600;
}
break;
} /* priv->chip_type */
@@ -1410,7 +1430,7 @@ static u32 get_ftdi_divisor(struct tty_struct *tty,
return div_value;
}
-static int change_speed(struct tty_struct *tty, struct usb_serial_port *port)
+static int change_speed(struct tty_struct *tty, struct usb_serial_port *port, speed_t old_baud)
{
struct ftdi_private *priv = usb_get_serial_port_data(port);
u16 value;
@@ -1418,7 +1438,7 @@ static int change_speed(struct tty_struct *tty, struct usb_serial_port *port)
u32 index_value;
int rv;
- index_value = get_ftdi_divisor(tty, port);
+ index_value = get_ftdi_divisor(tty, port, old_baud);
value = (u16)index_value;
index = (u16)(index_value >> 16);
if (priv->chip_type == FT2232C || priv->chip_type == FT2232H ||
@@ -1541,7 +1561,7 @@ static int set_serial_info(struct tty_struct *tty, struct serial_struct *ss)
if (priv->flags & ASYNC_SPD_MASK)
dev_warn_ratelimited(&port->dev, "use of SPD flags is deprecated\n");
- change_speed(tty, port);
+ change_speed(tty, port, 9600);
}
mutex_unlock(&priv->cfg_lock);
return 0;
@@ -2790,9 +2810,12 @@ static void ftdi_set_termios(struct tty_struct *tty,
/* Drop RTS and DTR */
clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
} else {
+ speed_t old_baud =
+ old_termios ? tty_termios_baud_rate(old_termios) : 9600;
+
/* set the baudrate determined before */
mutex_lock(&priv->cfg_lock);
- if (change_speed(tty, port))
+ if (change_speed(tty, port, old_baud))
dev_err(ddev, "%s urb failed to set baudrate\n", __func__);
mutex_unlock(&priv->cfg_lock);
/* Ensure RTS and DTR are raised when baudrate changed from 0 */
--
2.20.1
next prev parent reply other threads:[~2022-09-24 10:29 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-24 10:27 [PATCH v3 0/7] ftdi_sio driver improvements Pali Rohár
2022-09-24 10:27 ` [PATCH v3 1/7] USB: serial: ftdi_sio: Fix divisor overflow Pali Rohár
2022-11-28 14:54 ` Johan Hovold
2022-09-24 10:27 ` [PATCH v3 2/7] USB: serial: ftdi_sio: Add missing baud rate validation Pali Rohár
2022-11-28 15:00 ` Johan Hovold
2022-09-24 10:27 ` [PATCH v3 3/7] USB: serial: ftdi_sio: Extract SIO divisor code to function Pali Rohár
2022-09-24 10:47 ` Greg Kroah-Hartman
2022-10-09 12:17 ` Pali Rohár
2022-11-01 22:50 ` Pali Rohár
2022-11-02 1:47 ` Greg Kroah-Hartman
2022-11-26 16:29 ` Pali Rohár
2022-11-02 7:34 ` Johan Hovold
2022-11-28 15:10 ` Johan Hovold
2022-09-24 10:27 ` Pali Rohár [this message]
2022-11-28 16:37 ` [PATCH v3 4/7] USB: serial: ftdi_sio: Do not reset baud rate to 9600 Baud on error Johan Hovold
2022-09-24 10:27 ` [PATCH v3 5/7] USB: serial: ftdi_sio: Fix baud rate rounding for ASYNC_SPD_CUST Pali Rohár
2022-11-28 16:57 ` Johan Hovold
2022-09-24 10:27 ` [PATCH v3 6/7] USB: serial: ftdi_sio: Fix custom_divisor for TIOCGSERIAL and c_*speed for TCGETS2 Pali Rohár
2022-11-28 17:05 ` Johan Hovold
2022-09-24 10:27 ` [PATCH v3 7/7] USB: serial: ftdi_sio: Fill c_*speed fields with real baud rate Pali Rohár
2022-11-28 17:16 ` 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=20220924102718.2984-5-pali@kernel.org \
--to=pali@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=kabel@kernel.org \
--cc=linux-usb@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).