| Message ID | 1535593634-22004-4-git-send-email-hpeter+linux_kernel@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
Hi Johan, This article is duplication with [PATCH V2 3/4] USB: serial: f81232: implement break control [PATCH V2 3/4] serial: f81232: implement break control (Title not start with USB token) Should I discard this PATCH_V2 series and re-send PATCH_V3 ? or could you discard the patch - serial: f81232: implement break control only ? Thanks Ji-Ze Hong (Peter Hong) 於 2018/8/30 上午 09:47 寫道: > Implement Fintek F81232 break on/off with LCR register. > It's the same with 16550A LCR register layout. > > Signed-off-by: Ji-Ze Hong (Peter Hong) <hpeter+linux_kernel@gmail.com> > --- > v2: > 1: Fix f81232_break_ctl() for mis-operated set_mask_register(). > 2: Add set break control bit in f81232_set_termios(). > > drivers/usb/serial/f81232.c | 32 ++++++++++++++++++++++++++------ > 1 file changed, 26 insertions(+), 6 deletions(-) > > diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c > index 56adae8a9ee0..863430d7535f 100644 > --- a/drivers/usb/serial/f81232.c > +++ b/drivers/usb/serial/f81232.c > @@ -65,6 +65,7 @@ struct f81232_private { > struct mutex lock; > u8 modem_control; > u8 modem_status; > + bool is_break; > speed_t baud_base; > struct work_struct lsr_work; > struct work_struct interrupt_work; > @@ -377,13 +378,24 @@ static void f81232_process_read_urb(struct urb *urb) > > static void f81232_break_ctl(struct tty_struct *tty, int break_state) > { > - /* FIXME - Stubbed out for now */ > + struct usb_serial_port *port = tty->driver_data; > + struct f81232_private *priv = usb_get_serial_port_data(port); > + int status; > + u8 tmp = 0; > > - /* > - * break_state = -1 to turn on break, and 0 to turn off break > - * see drivers/char/tty_io.c to see it used. > - * last_set_data_urb_value NEVER has the break bit set in it. > - */ > + mutex_lock(&priv->lock); > + > + if (break_state) { > + priv->is_break = !!break_state; > + tmp = UART_LCR_SBC; > + } > + > + status = f81232_set_mask_register(port, LINE_CONTROL_REGISTER, > + UART_LCR_SBC, tmp); > + if (status) > + dev_err(&port->dev, "set break failed: %d\n", status); > + > + mutex_unlock(&priv->lock); > } > > static int f81232_find_clk(speed_t baudrate) > @@ -519,6 +531,7 @@ static int f81232_port_disable(struct usb_serial_port *port) > static void f81232_set_termios(struct tty_struct *tty, > struct usb_serial_port *port, struct ktermios *old_termios) > { > + struct f81232_private *priv = usb_get_serial_port_data(port); > u8 new_lcr = 0; > int status = 0; > speed_t baudrate; > @@ -572,11 +585,18 @@ static void f81232_set_termios(struct tty_struct *tty, > break; > } > > + mutex_lock(&priv->lock); > + > + if (priv->is_break) > + new_lcr |= UART_LCR_SBC; > + > status = f81232_set_register(port, LINE_CONTROL_REGISTER, new_lcr); > if (status) { > dev_err(&port->dev, "%s failed to set LCR: %d\n", > __func__, status); > } > + > + mutex_unlock(&priv->lock); > } > > static int f81232_tiocmget(struct tty_struct *tty) >
On Thu, Aug 30, 2018 at 09:55:46AM +0800, Ji-Ze Hong (Peter Hong) wrote: > Hi Johan, > > This article is duplication with > [PATCH V2 3/4] USB: serial: f81232: implement break control > [PATCH V2 3/4] serial: f81232: implement break control > (Title not start with USB token) > > Should I discard this PATCH_V2 series and re-send PATCH_V3 ? > or could you discard the patch - serial: f81232: implement break control > only ? Yes, no problem, so no need to resend. But thanks for highlighting this. I'll try to look at these next week. Johan
diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index 56adae8a9ee0..863430d7535f 100644 --- a/drivers/usb/serial/f81232.c +++ b/drivers/usb/serial/f81232.c @@ -65,6 +65,7 @@ struct f81232_private { struct mutex lock; u8 modem_control; u8 modem_status; + bool is_break; speed_t baud_base; struct work_struct lsr_work; struct work_struct interrupt_work; @@ -377,13 +378,24 @@ static void f81232_process_read_urb(struct urb *urb) static void f81232_break_ctl(struct tty_struct *tty, int break_state) { - /* FIXME - Stubbed out for now */ + struct usb_serial_port *port = tty->driver_data; + struct f81232_private *priv = usb_get_serial_port_data(port); + int status; + u8 tmp = 0; - /* - * break_state = -1 to turn on break, and 0 to turn off break - * see drivers/char/tty_io.c to see it used. - * last_set_data_urb_value NEVER has the break bit set in it. - */ + mutex_lock(&priv->lock); + + if (break_state) { + priv->is_break = !!break_state; + tmp = UART_LCR_SBC; + } + + status = f81232_set_mask_register(port, LINE_CONTROL_REGISTER, + UART_LCR_SBC, tmp); + if (status) + dev_err(&port->dev, "set break failed: %d\n", status); + + mutex_unlock(&priv->lock); } static int f81232_find_clk(speed_t baudrate) @@ -519,6 +531,7 @@ static int f81232_port_disable(struct usb_serial_port *port) static void f81232_set_termios(struct tty_struct *tty, struct usb_serial_port *port, struct ktermios *old_termios) { + struct f81232_private *priv = usb_get_serial_port_data(port); u8 new_lcr = 0; int status = 0; speed_t baudrate; @@ -572,11 +585,18 @@ static void f81232_set_termios(struct tty_struct *tty, break; } + mutex_lock(&priv->lock); + + if (priv->is_break) + new_lcr |= UART_LCR_SBC; + status = f81232_set_register(port, LINE_CONTROL_REGISTER, new_lcr); if (status) { dev_err(&port->dev, "%s failed to set LCR: %d\n", __func__, status); } + + mutex_unlock(&priv->lock); } static int f81232_tiocmget(struct tty_struct *tty)
Implement Fintek F81232 break on/off with LCR register. It's the same with 16550A LCR register layout. Signed-off-by: Ji-Ze Hong (Peter Hong) <hpeter+linux_kernel@gmail.com> --- v2: 1: Fix f81232_break_ctl() for mis-operated set_mask_register(). 2: Add set break control bit in f81232_set_termios(). drivers/usb/serial/f81232.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-)