From: "Marek Behún" <kabel@kernel.org>
To: linux-usb@vger.kernel.org
Cc: "Pali Rohár" <pali@kernel.org>, "Johan Hovold" <johan@kernel.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Marek Behún" <kabel@kernel.org>
Subject: [PATCH v2 6/7] USB: serial: ftdi_sio: Fix custom_divisor and c_*speed for ASYNC_SPD_CUST
Date: Tue, 12 Jul 2022 13:53:05 +0200 [thread overview]
Message-ID: <20220712115306.26471-7-kabel@kernel.org> (raw)
In-Reply-To: <20220712115306.26471-1-kabel@kernel.org>
From: Pali Rohár <pali@kernel.org>
When ASYNC_SPD_CUST is used, update custom_divisor and c_*speed fields
so that they correspond to the newly set baud rate value, so that
userspace GET ioctls will see the true baud rate that is being used.
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 | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 5db1293bb7a2..39e8c5d06157 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1303,6 +1303,7 @@ static u32 get_ftdi_divisor(struct tty_struct *tty,
{
struct ftdi_private *priv = usb_get_serial_port_data(port);
struct device *dev = &port->dev;
+ int fix_custom_divisor = 0;
int div_value = 0;
int div_okay = 1;
int baud;
@@ -1317,6 +1318,7 @@ static u32 get_ftdi_divisor(struct tty_struct *tty,
if (baud == 38400 &&
((priv->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST) &&
(priv->custom_divisor)) {
+ fix_custom_divisor = 1;
baud = DIV_ROUND_CLOSEST(priv->baud_base, priv->custom_divisor);
dev_dbg(dev, "%s - custom divisor %d sets baud rate to %d\n",
__func__, priv->custom_divisor, baud);
@@ -1401,7 +1403,19 @@ static u32 get_ftdi_divisor(struct tty_struct *tty,
ftdi_chip_name[priv->chip_type]);
}
+ /* Fix deprecated async-compatible custom_divisor hack and update tty baud rate */
+ if (fix_custom_divisor) {
+ priv->custom_divisor = DIV_ROUND_CLOSEST(priv->baud_base, baud);
+ old_baud = baud;
+ baud = 38400;
+ }
+
tty_encode_baud_rate(tty, baud, baud);
+
+ /* For async-compatible custom_divisor store into TCGETS2 c_*speed fields real baud rate */
+ if (fix_custom_divisor)
+ tty->termios.c_ispeed = tty->termios.c_ospeed = old_baud;
+
return div_value;
}
@@ -2674,6 +2688,8 @@ static void ftdi_set_termios(struct tty_struct *tty,
dev_dbg(ddev, "%s: forcing baud rate for this device\n", __func__);
tty_encode_baud_rate(tty, priv->force_baud,
priv->force_baud);
+ termios->c_ispeed = termios->c_ospeed =
+ DIV_ROUND_CLOSEST(priv->baud_base, priv->custom_divisor);
}
/* Force RTS-CTS if this device requires it. */
--
2.35.1
next prev parent reply other threads:[~2022-07-12 11:54 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-12 11:52 [PATCH v2 0/7] ftdi_sio driver improvements Marek Behún
2022-07-12 11:53 ` [PATCH v2 1/7] USB: serial: ftdi_sio: Fix divisor overflow Marek Behún
2022-07-24 12:02 ` Johan Hovold
2022-07-12 11:53 ` [PATCH v2 2/7] USB: serial: ftdi_sio: Add missing baud rate validation Marek Behún
2022-07-12 17:27 ` Rob Pearce
2022-07-12 22:24 ` Marek Behún
2022-07-12 11:53 ` [PATCH v2 3/7] USB: serial: ftdi_sio: Extract SIO divisor code to function Marek Behún
2022-07-24 12:06 ` Johan Hovold
2022-08-18 14:11 ` Pali Rohár
2022-09-13 14:49 ` Johan Hovold
2022-09-13 15:30 ` Pali Rohár
2022-09-13 15:44 ` Johan Hovold
2022-07-12 11:53 ` [PATCH v2 4/7] USB: serial: ftdi_sio: Do not reset baud rate to 9600 Baud on error Marek Behún
2022-07-24 12:20 ` Johan Hovold
2022-08-18 14:12 ` Pali Rohár
2022-09-13 14:54 ` Johan Hovold
2022-07-12 11:53 ` [PATCH v2 5/7] USB: serial: ftdi_sio: Fix baud rate rounding for ASYNC_SPD_CUST Marek Behún
2022-07-24 12:26 ` Johan Hovold
2022-07-12 11:53 ` Marek Behún [this message]
2022-07-24 12:28 ` [PATCH v2 6/7] USB: serial: ftdi_sio: Fix custom_divisor and c_*speed " Johan Hovold
2022-07-24 12:33 ` Pali Rohár
2022-07-24 12:54 ` Johan Hovold
2022-07-24 12:59 ` Pali Rohár
2022-07-24 13:08 ` Johan Hovold
2022-08-18 14:09 ` Pali Rohár
2022-09-13 14:59 ` Johan Hovold
2022-09-14 8:48 ` Pali Rohár
2022-09-14 8:58 ` Johan Hovold
2022-09-14 9:10 ` Pali Rohár
2022-09-14 9:18 ` Johan Hovold
2022-09-14 9:20 ` Pali Rohár
2022-07-12 11:53 ` [PATCH v2 7/7] USB: serial: ftdi_sio: Fill c_*speed fields with real baud rate Marek Behún
2022-07-24 12:41 ` Johan Hovold
2022-08-18 14:17 ` Pali Rohár
2022-09-13 15:02 ` Johan Hovold
2022-09-13 15:24 ` Pali Rohár
2022-09-13 15:34 ` 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=20220712115306.26471-7-kabel@kernel.org \
--to=kabel@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=pali@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.