| Message ID | 20220924102718.2984-3-pali@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ftdi_sio driver improvements | expand |
On Sat, Sep 24, 2022 at 12:27:13PM +0200, Pali Rohár wrote: > Add lower checks for requested baud rate for FT8U232AM, FT232BM, FT2232C, > FT232RL, FTX, FT2232H, FT4232H and FT232H. For all of these the minimum > baud rate they can generate is 183 Baud. > > 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 | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c > index b2febe8d573a..bfa601fc14fe 100644 > --- a/drivers/usb/serial/ftdi_sio.c > +++ b/drivers/usb/serial/ftdi_sio.c > @@ -1335,7 +1335,7 @@ static u32 get_ftdi_divisor(struct tty_struct *tty, > } > break; > case FT8U232AM: /* 8U232AM chip */ > - if (baud <= 3000000) { > + if (baud >= 183 && baud <= 3000000) { > div_value = ftdi_232am_baud_to_divisor(baud); > } else { > dev_dbg(dev, "%s - Baud rate too high!\n", __func__); As someone else already pointed out, you should update these too. Please drop the exclamation mark while at it: dev_dbg(dev, "invalid line speed\n") should do. Note that this series needs to be rebased on 6.1-rc too as the context has changed. > @@ -1348,7 +1348,7 @@ static u32 get_ftdi_divisor(struct tty_struct *tty, > case FT2232C: /* FT2232C chip */ > case FT232RL: /* FT232RL chip */ > case FTX: /* FT-X series */ > - if (baud <= 3000000) { > + if (baud >= 183 && baud <= 3000000) { > u16 product_id = le16_to_cpu( > port->serial->dev->descriptor.idProduct); > if (((product_id == FTDI_NDI_HUC_PID) || I think there's another dev_dbg() here below. > @@ -1372,7 +1372,7 @@ static u32 get_ftdi_divisor(struct tty_struct *tty, > case FT232H: /* FT232H chip */ > if ((baud <= 12000000) && (baud >= 1200)) { > div_value = ftdi_2232h_baud_to_divisor(baud); > - } else if (baud < 1200) { > + } else if (baud >= 183 && baud < 1200) { > div_value = ftdi_232bm_baud_to_divisor(baud); > } else { > dev_dbg(dev, "%s - Baud rate too high!\n", __func__); Same here. Johan
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index b2febe8d573a..bfa601fc14fe 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -1335,7 +1335,7 @@ static u32 get_ftdi_divisor(struct tty_struct *tty, } break; case FT8U232AM: /* 8U232AM chip */ - if (baud <= 3000000) { + if (baud >= 183 && baud <= 3000000) { div_value = ftdi_232am_baud_to_divisor(baud); } else { dev_dbg(dev, "%s - Baud rate too high!\n", __func__); @@ -1348,7 +1348,7 @@ static u32 get_ftdi_divisor(struct tty_struct *tty, case FT2232C: /* FT2232C chip */ case FT232RL: /* FT232RL chip */ case FTX: /* FT-X series */ - if (baud <= 3000000) { + if (baud >= 183 && baud <= 3000000) { u16 product_id = le16_to_cpu( port->serial->dev->descriptor.idProduct); if (((product_id == FTDI_NDI_HUC_PID) || @@ -1372,7 +1372,7 @@ static u32 get_ftdi_divisor(struct tty_struct *tty, case FT232H: /* FT232H chip */ if ((baud <= 12000000) && (baud >= 1200)) { div_value = ftdi_2232h_baud_to_divisor(baud); - } else if (baud < 1200) { + } else if (baud >= 183 && baud < 1200) { div_value = ftdi_232bm_baud_to_divisor(baud); } else { dev_dbg(dev, "%s - Baud rate too high!\n", __func__);