From patchwork Mon Apr 1 06:00:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ji-Ze Hong (Peter Hong)" X-Patchwork-Id: 10879175 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E005515AC for ; Mon, 1 Apr 2019 06:01:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC082287EA for ; Mon, 1 Apr 2019 06:01:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A9ECE2880D; Mon, 1 Apr 2019 06:01:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 33B81287EA for ; Mon, 1 Apr 2019 06:01:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726752AbfDAGBD (ORCPT ); Mon, 1 Apr 2019 02:01:03 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:44460 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726530AbfDAGBD (ORCPT ); Mon, 1 Apr 2019 02:01:03 -0400 Received: by mail-pl1-f194.google.com with SMTP id g12so3917030pll.11; Sun, 31 Mar 2019 23:01:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=WYOkD4WgtON7NhXbdDKs2RAxRCJMONjiGs3aKy+Ykfk=; b=T6CMGb2bOCzDyzaHbl6Ln381abefwxUHUn4bBBotbbbHsX12iLD1FgvtTX34yAv2jP qNgGiUNGoDEg5C1fBvhEdUg+Wk9+NyPVuRdE51wMzwxlO4bw0TFtKSO2uEHlsAytyjQa Yr/PPFGynUHglFc2xcfIXkhWwpwC73W9PdxGgEWeHePhByhaUY//5BNjApRcKeLbPK4U iZGuqQLahdVEAcDfjuLYaDJWAVjmC30W7XZcxNLNADg5KqnOLC3soQ/qeYwvFfmIktT8 HOmuEXN/ymdh2xS6qsC6AkH1JXY4YtXjtKk8Rp3yLKVRgV6nC8V3wiStZkwRVOOm28V6 mm5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=WYOkD4WgtON7NhXbdDKs2RAxRCJMONjiGs3aKy+Ykfk=; b=HhqCc3kb7yG7fyIW+INAaVYtvhsQsIuPd6Y6DxlilNfLUfbzbnC/eM5C2AZx5PkiMU VzWXKO+dXW8Wxf1qhY6gSfVo4chSDNEvPIb2yaf6kfF/Vmb7Fm4h9+JKUDbvQMlxhCkL FI0u1IG8+wWSynzH4cAeIFYofGISfiKYh6C0zHn/ARdZTpMiKBw04kQ7jzhP7o42TdI5 ctWE9H+oOx2nWdwuz7F5a6uGwtbPm8cZzhXWPQ/V/UkMjkSsu4TYjYji/5OV5nSEyCIw xUxyr7w4lzih8MlQMFFpeK9wiKZxJw5+heVulhJEsGl3ZFgE5PVOTmiPVV6r4QBiF+Ok DZxg== X-Gm-Message-State: APjAAAWLsW5fkkCNGGjtfoeT8vhU8uGf6tZwVnjUAcpnRTITxgtGOFL1 pLBsm4BiqnJ7zuRz9vSasDQ= X-Google-Smtp-Source: APXvYqxzhKeH71Tc1IGBxU26XIHkXfg2XbjzPJtp5hOoYvfP8iyGdiNFoomhGmaTUtrHqY3DWR6Csw== X-Received: by 2002:a17:902:7885:: with SMTP id q5mr4090769pll.12.1554098462172; Sun, 31 Mar 2019 23:01:02 -0700 (PDT) Received: from localhost (59-120-186-245.HINET-IP.hinet.net. [59.120.186.245]) by smtp.gmail.com with ESMTPSA id d129sm8529761pfa.142.2019.03.31.23.01.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 Mar 2019 23:01:01 -0700 (PDT) From: "Ji-Ze Hong (Peter Hong)" X-Google-Original-From: "Ji-Ze Hong (Peter Hong)" To: peter_hong@fintek.com.tw, johan@kernel.org, gregkh@linuxfoundation.org Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, "Ji-Ze Hong (Peter Hong)" , Oliver Neukum Subject: [RESEND PATCH V3 1/3] USB: serial: f81232: clear overrun flag Date: Mon, 1 Apr 2019 14:00:51 +0800 Message-Id: <1554098453-31278-1-git-send-email-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The F81232 will report data and LSR with bulk like following format: bulk-in data: [LSR(1Byte)+DATA(1Byte)][LSR(1Byte)+DATA(1Byte)]... LSR will auto clear frame/parity/break error flag when reading by H/W, but overrrun will only cleared when reading LSR. So this patch add a worker to read LSR when overrun and flush the worker on close() & suspend(). Cc: Oliver Neukum Signed-off-by: Ji-Ze Hong (Peter Hong) --- v3: 1: Add flush_work(&port_priv->lsr_work) in f81232_suspend(). v2: 1: Add flush_work(&port_priv->lsr_work) in f81232_close(). drivers/usb/serial/f81232.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index 0dcdcb4b2cde..722a184db9fa 100644 --- a/drivers/usb/serial/f81232.c +++ b/drivers/usb/serial/f81232.c @@ -41,12 +41,14 @@ MODULE_DEVICE_TABLE(usb, id_table); #define FIFO_CONTROL_REGISTER (0x02 + SERIAL_BASE_ADDRESS) #define LINE_CONTROL_REGISTER (0x03 + SERIAL_BASE_ADDRESS) #define MODEM_CONTROL_REGISTER (0x04 + SERIAL_BASE_ADDRESS) +#define LINE_STATUS_REGISTER (0x05 + SERIAL_BASE_ADDRESS) #define MODEM_STATUS_REGISTER (0x06 + SERIAL_BASE_ADDRESS) struct f81232_private { struct mutex lock; u8 modem_control; u8 modem_status; + struct work_struct lsr_work; struct work_struct interrupt_work; struct usb_serial_port *port; }; @@ -282,6 +284,7 @@ static void f81232_read_int_callback(struct urb *urb) static void f81232_process_read_urb(struct urb *urb) { struct usb_serial_port *port = urb->context; + struct f81232_private *priv = usb_get_serial_port_data(port); unsigned char *data = urb->transfer_buffer; char tty_flag; unsigned int i; @@ -315,6 +318,7 @@ static void f81232_process_read_urb(struct urb *urb) if (lsr & UART_LSR_OE) { port->icount.overrun++; + schedule_work(&priv->lsr_work); tty_insert_flip_char(&port->port, 0, TTY_OVERRUN); } @@ -556,9 +560,12 @@ static int f81232_open(struct tty_struct *tty, struct usb_serial_port *port) static void f81232_close(struct usb_serial_port *port) { + struct f81232_private *port_priv = usb_get_serial_port_data(port); + f81232_port_disable(port); usb_serial_generic_close(port); usb_kill_urb(port->interrupt_in_urb); + flush_work(&port_priv->lsr_work); } static void f81232_dtr_rts(struct usb_serial_port *port, int on) @@ -603,6 +610,21 @@ static void f81232_interrupt_work(struct work_struct *work) f81232_read_msr(priv->port); } +static void f81232_lsr_worker(struct work_struct *work) +{ + struct f81232_private *priv; + struct usb_serial_port *port; + int status; + u8 tmp; + + priv = container_of(work, struct f81232_private, lsr_work); + port = priv->port; + + status = f81232_get_register(port, LINE_STATUS_REGISTER, &tmp); + if (status) + dev_warn(&port->dev, "read LSR failed: %d\n", status); +} + static int f81232_port_probe(struct usb_serial_port *port) { struct f81232_private *priv; @@ -613,6 +635,7 @@ static int f81232_port_probe(struct usb_serial_port *port) mutex_init(&priv->lock); INIT_WORK(&priv->interrupt_work, f81232_interrupt_work); + INIT_WORK(&priv->lsr_work, f81232_lsr_worker); usb_set_serial_port_data(port, priv); @@ -632,6 +655,16 @@ static int f81232_port_remove(struct usb_serial_port *port) return 0; } +static int f81232_suspend(struct usb_serial *serial, pm_message_t message) +{ + struct f81232_private *port_priv; + + port_priv = usb_get_serial_port_data(serial->port[0]); + flush_work(&port_priv->lsr_work); + + return 0; +} + static struct usb_serial_driver f81232_device = { .driver = { .owner = THIS_MODULE, @@ -655,6 +688,7 @@ static struct usb_serial_driver f81232_device = { .read_int_callback = f81232_read_int_callback, .port_probe = f81232_port_probe, .port_remove = f81232_port_remove, + .suspend = f81232_suspend, }; static struct usb_serial_driver * const serial_drivers[] = { From patchwork Mon Apr 1 06:00:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ji-Ze Hong (Peter Hong)" X-Patchwork-Id: 10879179 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CE3E613B5 for ; Mon, 1 Apr 2019 06:01:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B895B287EA for ; Mon, 1 Apr 2019 06:01:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC3232880D; Mon, 1 Apr 2019 06:01:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A83E287EA for ; Mon, 1 Apr 2019 06:01:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731217AbfDAGBH (ORCPT ); Mon, 1 Apr 2019 02:01:07 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:37195 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726530AbfDAGBF (ORCPT ); Mon, 1 Apr 2019 02:01:05 -0400 Received: by mail-pl1-f194.google.com with SMTP id w23so977609ply.4; Sun, 31 Mar 2019 23:01:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZKZuey2iP8R9qWZw/EoOzngqO+OCG64gHSgWaHRyPzw=; b=avJc4nvCLZe4tOKKb4eDdbv6wBGZ6i+choxidS0LJt0oYNiqgmKPeyFDMhsaRGxkPK 6XamLi3o6wnTjGV6UlM/YMG7Dtt96DdcFWlysEaJWj9HBSRpiIwTNgEnODCKo+9pdpC0 6RedFKg3A6aRBR9lqsz/E6p7mHxcVeUsndnl9VIly9T19gnAu1Q40MA8UNyT5KogUXo1 MLzC2o2cGMD9fhFm0ufeLcz2VWbGCVMzdIbkflnMtFf3pAK+yI1u2LPq7uH1mIH0wp5W LSNT78tiOQ6FvSwA6wZ1LhbkSt/NCjaZkjiG9GROItm+9kLE84m2NHO6r6waANeaEcA1 J3xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZKZuey2iP8R9qWZw/EoOzngqO+OCG64gHSgWaHRyPzw=; b=EYNztBNlrEMOXWzEJ+VjIa8VVaSDw+OdVj6H/nuLgEH82PGSwMhFjCk7ZYc+uMN/Bf lxpKmvX9fJlixH1wO2yzWhGspc7uqYNE+pnXj4NPV0lakXFhI+7DhfTzu+rdFSN4gMID gxYGIQjJhkdhOAAo4xeMYZY1eC8VxU+q7SlX8Grz7PUODf6B8Hk2kxkUpvHwKUOb/4Ei raT0Q5vZyH783LGtaVStQB+qp8zl39oNacYB4xZRhySPXN52W3A3ZYEJRL4NXytA2X18 X4uOt+wc4XplG0KpQrKYM5R79DOg+/i/CeJP9zcoMVt5Phbnn2dXVG7h/GlMr2C6PmhH gQFA== X-Gm-Message-State: APjAAAUrM/ZSjmSzomkMnfUsCzOqWrPhm9xC9nbICMOcXeEw4lO+Sa6w XazktK8+WNvDoULyNXp0eAA= X-Google-Smtp-Source: APXvYqyS5rx6HZeia/VzyPD7BhjBb+Oy1tMh1upamTY45p+5Xtg9PcDYmes84DTu9ltfDu0mNsu3mQ== X-Received: by 2002:a17:902:421:: with SMTP id 30mr61838514ple.142.1554098463951; Sun, 31 Mar 2019 23:01:03 -0700 (PDT) Received: from localhost (59-120-186-245.HINET-IP.hinet.net. [59.120.186.245]) by smtp.gmail.com with ESMTPSA id v20sm11923228pfn.116.2019.03.31.23.01.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 Mar 2019 23:01:03 -0700 (PDT) From: "Ji-Ze Hong (Peter Hong)" X-Google-Original-From: "Ji-Ze Hong (Peter Hong)" To: peter_hong@fintek.com.tw, johan@kernel.org, gregkh@linuxfoundation.org Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, "Ji-Ze Hong (Peter Hong)" Subject: [RESEND PATCH V3 2/3] USB: serial: f81232: add high baud rate support Date: Mon, 1 Apr 2019 14:00:52 +0800 Message-Id: <1554098453-31278-2-git-send-email-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554098453-31278-1-git-send-email-hpeter+linux_kernel@gmail.com> References: <1554098453-31278-1-git-send-email-hpeter+linux_kernel@gmail.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The F81232 had 4 clocksource 1.846/18.46/14.77/24MHz and baud rates can be up to 1.5Mbits with 24MHz. F81232 Clock registers (106h) Bit1-0: Clock source selector 00: 1.846MHz. 01: 18.46MHz. 10: 24MHz. 11: 14.77MHz. Signed-off-by: Ji-Ze Hong (Peter Hong) --- v3: 1: change the baud_base in f81232_get_serial_info() drivers/usb/serial/f81232.c | 105 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 94 insertions(+), 11 deletions(-) diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index 722a184db9fa..e7862997b6e4 100644 --- a/drivers/usb/serial/f81232.c +++ b/drivers/usb/serial/f81232.c @@ -28,7 +28,8 @@ static const struct usb_device_id id_table[] = { MODULE_DEVICE_TABLE(usb, id_table); /* Maximum baudrate for F81232 */ -#define F81232_MAX_BAUDRATE 115200 +#define F81232_MAX_BAUDRATE 1500000 +#define F81232_DEF_BAUDRATE 9600 /* USB Control EP parameter */ #define F81232_REGISTER_REQUEST 0xa0 @@ -44,18 +45,42 @@ MODULE_DEVICE_TABLE(usb, id_table); #define LINE_STATUS_REGISTER (0x05 + SERIAL_BASE_ADDRESS) #define MODEM_STATUS_REGISTER (0x06 + SERIAL_BASE_ADDRESS) +/* + * F81232 Clock registers (106h) + * + * Bit1-0: Clock source selector + * 00: 1.846MHz. + * 01: 18.46MHz. + * 10: 24MHz. + * 11: 14.77MHz. + */ +#define F81232_CLK_REGISTER 0x106 +#define F81232_CLK_1_846_MHZ 0 +#define F81232_CLK_18_46_MHZ BIT(0) +#define F81232_CLK_24_MHZ BIT(1) +#define F81232_CLK_14_77_MHZ (BIT(1) | BIT(0)) +#define F81232_CLK_MASK GENMASK(1, 0) + struct f81232_private { struct mutex lock; u8 modem_control; u8 modem_status; + speed_t baud_base; struct work_struct lsr_work; struct work_struct interrupt_work; struct usb_serial_port *port; }; -static int calc_baud_divisor(speed_t baudrate) +static u32 const baudrate_table[] = { 115200, 921600, 1152000, 1500000 }; +static u8 const clock_table[] = { F81232_CLK_1_846_MHZ, F81232_CLK_14_77_MHZ, + F81232_CLK_18_46_MHZ, F81232_CLK_24_MHZ }; + +static int calc_baud_divisor(speed_t baudrate, speed_t clockrate) { - return DIV_ROUND_CLOSEST(F81232_MAX_BAUDRATE, baudrate); + if (!baudrate) + return 0; + + return DIV_ROUND_CLOSEST(clockrate, baudrate); } static int f81232_get_register(struct usb_serial_port *port, u16 reg, u8 *val) @@ -129,6 +154,21 @@ static int f81232_set_register(struct usb_serial_port *port, u16 reg, u8 val) return status; } +static int f81232_set_mask_register(struct usb_serial_port *port, u16 reg, + u8 mask, u8 val) +{ + int status; + u8 tmp; + + status = f81232_get_register(port, reg, &tmp); + if (status) + return status; + + tmp = (tmp & ~mask) | (val & mask); + + return f81232_set_register(port, reg, tmp); +} + static void f81232_read_msr(struct usb_serial_port *port) { int status; @@ -346,13 +386,53 @@ static void f81232_break_ctl(struct tty_struct *tty, int break_state) */ } -static void f81232_set_baudrate(struct usb_serial_port *port, speed_t baudrate) +static int f81232_find_clk(speed_t baudrate) +{ + int idx; + + for (idx = 0; idx < ARRAY_SIZE(baudrate_table); ++idx) { + if (baudrate <= baudrate_table[idx] && + baudrate_table[idx] % baudrate == 0) + return idx; + } + + return -EINVAL; +} + +static void f81232_set_baudrate(struct tty_struct *tty, + struct usb_serial_port *port, speed_t baudrate, + speed_t old_baudrate) { + struct f81232_private *priv = usb_get_serial_port_data(port); u8 lcr; int divisor; int status = 0; + int i; + int idx; + speed_t baud_list[] = {baudrate, old_baudrate, F81232_DEF_BAUDRATE}; + + for (i = 0; i < ARRAY_SIZE(baud_list); ++i) { + idx = f81232_find_clk(baud_list[i]); + if (idx >= 0) { + baudrate = baud_list[i]; + tty_encode_baud_rate(tty, baudrate, baudrate); + break; + } + } - divisor = calc_baud_divisor(baudrate); + if (idx < 0) + return; + + priv->baud_base = baudrate_table[idx]; + divisor = calc_baud_divisor(baudrate, priv->baud_base); + + status = f81232_set_mask_register(port, F81232_CLK_REGISTER, + F81232_CLK_MASK, clock_table[idx]); + if (status) { + dev_err(&port->dev, "%s failed to set CLK_REG: %d\n", + __func__, status); + return; + } status = f81232_get_register(port, LINE_CONTROL_REGISTER, &lcr); /* get LCR */ @@ -442,6 +522,7 @@ static void f81232_set_termios(struct tty_struct *tty, u8 new_lcr = 0; int status = 0; speed_t baudrate; + speed_t old_baud; /* Don't change anything if nothing has changed */ if (old_termios && !tty_termios_hw_change(&tty->termios, old_termios)) @@ -454,11 +535,12 @@ static void f81232_set_termios(struct tty_struct *tty, baudrate = tty_get_baud_rate(tty); if (baudrate > 0) { - if (baudrate > F81232_MAX_BAUDRATE) { - baudrate = F81232_MAX_BAUDRATE; - tty_encode_baud_rate(tty, baudrate, baudrate); - } - f81232_set_baudrate(port, baudrate); + if (old_termios) + old_baud = tty_termios_baud_rate(old_termios); + else + old_baud = F81232_DEF_BAUDRATE; + + f81232_set_baudrate(tty, port, baudrate, old_baud); } if (C_PARENB(tty)) { @@ -594,11 +676,12 @@ static int f81232_get_serial_info(struct tty_struct *tty, struct serial_struct *ss) { struct usb_serial_port *port = tty->driver_data; + struct f81232_private *priv = usb_get_serial_port_data(port); ss->type = PORT_16550A; ss->line = port->minor; ss->port = port->port_number; - ss->baud_base = F81232_MAX_BAUDRATE; + ss->baud_base = priv->baud_base; return 0; } From patchwork Mon Apr 1 06:00:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ji-Ze Hong (Peter Hong)" X-Patchwork-Id: 10879177 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5926813B5 for ; Mon, 1 Apr 2019 06:01:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 422D12880B for ; Mon, 1 Apr 2019 06:01:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 341E4287EA; Mon, 1 Apr 2019 06:01:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8CF6287EA for ; Mon, 1 Apr 2019 06:01:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731556AbfDAGBH (ORCPT ); Mon, 1 Apr 2019 02:01:07 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:35463 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731160AbfDAGBG (ORCPT ); Mon, 1 Apr 2019 02:01:06 -0400 Received: by mail-pg1-f193.google.com with SMTP id g8so4187427pgf.2; Sun, 31 Mar 2019 23:01:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gpXIoYhXE68l45eFbZRWHOq9B2GvE4k6QbLfjHgrv5E=; b=hLLmPsql7Oj2AB69FAN6WGX/oeNy/YrpHtIS+v+4zVU0H7PtVqCjNjbAXpinbcTb27 ORZCQ1f3z2zjcOGqw5sNXPbrOCs2OoUuchJmEhjMBa3X/UMpte6gWyArEroTmYk53hNz 0Kyrv61iDXLC6NCoFqkAGRSdzDqNjXPR+ObInqDIP1GrAAmmEbM/4SOnGptfefHNlZ9Q qXUuDFE9bOCECwEGOSGbS3Dbq9EiIaazv8+5l6XDF7qPeJ0Iq+6lh6iHFGctmtkk8uGs uiieXMLVqC0WRMsHKxOUzyNbgXsoMcRo/VdCWflA471MgI+0qd1Jt0e1YF8JSPy0o5I4 xXTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gpXIoYhXE68l45eFbZRWHOq9B2GvE4k6QbLfjHgrv5E=; b=tNKq/wli2MY+XUQ7E1e61K+w0/2MpCHya3R0icRo5UPdpoRJUa0RYBD3KQqL16Idxd brQZQVPrcVIMpfhCx1AfP+IhFqX0YI3ipuCV6tYxJjbArC3ky5XfoH9zdVtxDuIuKTQM x4SRjhJKGsSREjzoYmEb9Jr5iwo9IDUuS2Y69VOZjH7Wp73EkmgMxtK5eDp2jZxya9QD 7bEjRz/03lxiD3cJU1JlcgoJqSkFQCPzpnCALMbVihKcdwkpxgb8wW7F0R3jGJsQ/3Wp Ee4lMYyAj48dvHzdvSCQm/9ME97w8bfRdqSdkHU1txD1MEW/KdJeYZVpQTD2WtAlv0i4 XoJQ== X-Gm-Message-State: APjAAAUdEgNFA6/2AxSgZOIP8VWWw6H3nDxN0G3ap8OAmhX8aI7SWXmZ VdFDkBVagcQYWPTwvZepaLQ= X-Google-Smtp-Source: APXvYqw/ArMqD17kN2GBqRcWimcsY1CN3a2yh9kPZabiYJvxka0mPFBUlcfkUwcb3f6OUdPo+IfjDQ== X-Received: by 2002:aa7:9193:: with SMTP id x19mr52060206pfa.108.1554098465783; Sun, 31 Mar 2019 23:01:05 -0700 (PDT) Received: from localhost (59-120-186-245.HINET-IP.hinet.net. [59.120.186.245]) by smtp.gmail.com with ESMTPSA id d129sm8530692pfa.142.2019.03.31.23.01.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 Mar 2019 23:01:05 -0700 (PDT) From: "Ji-Ze Hong (Peter Hong)" X-Google-Original-From: "Ji-Ze Hong (Peter Hong)" To: peter_hong@fintek.com.tw, johan@kernel.org, gregkh@linuxfoundation.org Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, "Ji-Ze Hong (Peter Hong)" Subject: [RESEND PATCH V3 3/3] USB: serial: f81232: implement break control Date: Mon, 1 Apr 2019 14:00:53 +0800 Message-Id: <1554098453-31278-3-git-send-email-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554098453-31278-1-git-send-email-hpeter+linux_kernel@gmail.com> References: <1554098453-31278-1-git-send-email-hpeter+linux_kernel@gmail.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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) --- v3: 1: using shadow_lcr to save LCR in f81232_break_ctl() drivers/usb/serial/f81232.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index e7862997b6e4..9377b827313a 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; + u8 shadow_lcr; speed_t baud_base; struct work_struct lsr_work; struct work_struct interrupt_work; @@ -377,13 +378,23 @@ 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; - /* - * 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->shadow_lcr |= UART_LCR_SBC; + else + priv->shadow_lcr &= ~UART_LCR_SBC; + + status = f81232_set_register(port, LINE_CONTROL_REGISTER, + priv->shadow_lcr); + 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 +530,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 +584,16 @@ static void f81232_set_termios(struct tty_struct *tty, break; } + mutex_lock(&priv->lock); + + new_lcr |= (priv->shadow_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)