All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Ji-Ze Hong \(Peter Hong\)" <hpeter@gmail.com>
To: johan@kernel.org
Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
	linux-kernel@vger.kernel.org, peter_hong@fintek.com.tw,
	hpeter+linux_kernel@gmail.com
Subject: [V2,3/4] serial: f81232: implement break control
Date: Thu, 30 Aug 2018 09:47:12 +0800	[thread overview]
Message-ID: <1535593634-22004-4-git-send-email-hpeter+linux_kernel@gmail.com> (raw)

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)

WARNING: multiple messages have this Message-ID (diff)
From: "Ji-Ze Hong (Peter Hong)" <hpeter@gmail.com>
To: johan@kernel.org
Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
	linux-kernel@vger.kernel.org, peter_hong@fintek.com.tw,
	hpeter+linux_kernel@gmail.com
Subject: [PATCH V2 3/4] serial: f81232: implement break control
Date: Thu, 30 Aug 2018 09:47:12 +0800	[thread overview]
Message-ID: <1535593634-22004-4-git-send-email-hpeter+linux_kernel@gmail.com> (raw)
In-Reply-To: <1535593634-22004-1-git-send-email-hpeter+linux_kernel@gmail.com>

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)
-- 
2.7.4


             reply	other threads:[~2018-08-30  1:47 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-30  1:47 Ji-Ze Hong (Peter Hong) [this message]
2018-08-30  1:47 ` [PATCH V2 3/4] serial: f81232: implement break control Ji-Ze Hong (Peter Hong)
  -- strict thread matches above, loose matches on Subject: below --
2018-09-07  7:41 [V2,1/4] USB: serial: f81232: clear overrun flag Ji-Ze Hong (Peter Hong)
2018-09-07  7:41 ` [PATCH V2 1/4] " Ji-Ze Hong (Peter Hong)
2018-09-05 14:46 [V2,4/4] USB: serial: f81232: fix bulk_in/out size Johan Hovold
2018-09-05 14:46 ` [PATCH V2 4/4] " Johan Hovold
2018-09-05 14:41 [V2,3/4] USB: serial: f81232: implement break control Johan Hovold
2018-09-05 14:41 ` [PATCH V2 3/4] " Johan Hovold
2018-09-05 14:39 [V2,1/4] USB: serial: f81232: clear overrun flag Johan Hovold
2018-09-05 14:39 ` [PATCH V2 1/4] " Johan Hovold
2018-08-31 10:13 [V2,3/4] serial: f81232: implement break control Johan Hovold
2018-08-31 10:13 ` [PATCH V2 3/4] " Johan Hovold
2018-08-30  1:55 [V2,3/4] " Ji-Ze Hong (Peter Hong)
2018-08-30  1:55 ` [PATCH V2 3/4] " Ji-Ze Hong (Peter Hong)
2018-08-30  1:47 [V2,4/4] USB: serial: f81232: fix bulk_in/out size Ji-Ze Hong (Peter Hong)
2018-08-30  1:47 ` [PATCH V2 4/4] " Ji-Ze Hong (Peter Hong)
2018-08-30  1:47 [V2,3/4] USB: serial: f81232: implement break control Ji-Ze Hong (Peter Hong)
2018-08-30  1:47 ` [PATCH V2 3/4] " Ji-Ze Hong (Peter Hong)
2018-08-30  1:47 [V2,2/4] USB: serial: f81232: add high baud rate support Ji-Ze Hong (Peter Hong)
2018-08-30  1:47 ` [PATCH V2 2/4] " Ji-Ze Hong (Peter Hong)
2018-08-30  1:47 [V2,1/4] USB: serial: f81232: clear overrun flag Ji-Ze Hong (Peter Hong)
2018-08-30  1:47 ` [PATCH V2 1/4] " Ji-Ze Hong (Peter Hong)
2018-08-30  1:47 [PATCH V2 0/4] Fintek F81232 driver improve and fix Ji-Ze Hong (Peter Hong)

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=1535593634-22004-4-git-send-email-hpeter+linux_kernel@gmail.com \
    --to=hpeter@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hpeter+linux_kernel@gmail.com \
    --cc=johan@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=peter_hong@fintek.com.tw \
    /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.