From patchwork Tue Apr 16 08:27:02 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: 10902149 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 B358A922 for ; Tue, 16 Apr 2019 08:27:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B93428477 for ; Tue, 16 Apr 2019 08:27:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F65B2893F; Tue, 16 Apr 2019 08:27:35 +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 EEACF28477 for ; Tue, 16 Apr 2019 08:27:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728698AbfDPI1L (ORCPT ); Tue, 16 Apr 2019 04:27:11 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:33977 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727195AbfDPI1K (ORCPT ); Tue, 16 Apr 2019 04:27:10 -0400 Received: by mail-pg1-f194.google.com with SMTP id v12so9981317pgq.1; Tue, 16 Apr 2019 01:27:10 -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=uhAEkyyjkNnZbB0S3fzuTsDrada7JnXbrIJMvnrBSrI=; b=KdJaQVIrbFlAZU1oWu6iHq0Mj3DGxdpIxkVS/fchNgdNzh3Y1bwSDEg6/AzfXu9oq/ pzd8ZWXE8MwHJg7agrQWGKDIUi5YMls3FRjjjKv3ZBE8bYtpPYrmGu817ttu6zg0Fu8l 5+2KToS1+o6eh61WVQmIY1xFxu94TRP5Qt6HEVftCPnlhstjeBmgQ0tzCqPGDFdm4Rvi rQpbBGx90IRjwAHSe2q4lmaBJnnu7n6Ldyzai1B5zsB7WGyg6aI/22fSItPd6htsh9oV CSk/IuoG2IvzwdZmbbvYR8Ti8ojzUqMumGzmSYaGVG0dTP+b3GL1k/mgcSuLG2XDMynk fZhw== 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=uhAEkyyjkNnZbB0S3fzuTsDrada7JnXbrIJMvnrBSrI=; b=PyS+LACe5eU88Bx1Fh3ebvCcJ0AqCyg0Cl8TyrG+RyHg9rNbnj6G/1mNoDSIlK5uMc VKGifa6XDh6r52t/bJxzAnlXkDiVBbDm5AYdkR3JASyULX+bUI6kN91D3SepTK2dwipI 1P5ksNFKrnrhguc95qp88q+yXiawYiqK3Qz3ytUlH79tKHd6Nl5SLRUNR6PrLhaV+t1T yjI4MA76j7jay+IVCVV1U2ngcbLeAQJtP6fEWPlYqHU7QbEdAZiqC98KN8Vn50mxXjwM 0MrpI4c4yEHa8OIi35mtjO0xcJsD64GwH24wKrIqOCOqu0C4JVdB1o8L4AUM7L+PxFL0 9nGA== X-Gm-Message-State: APjAAAXZz2ieYXTnqcYViyiCCyW3qfEN1q8x14V8qA6EgE6GWXy3CZJs v3nTy4Ivw69PFWFcg3EKVMa9y9cI X-Google-Smtp-Source: APXvYqyUSMKnqCZoxSun45hgeV9BOtz5Hrr2nbAqLEzPXmLGnCL+4AZHiwU177fj41velZ7pkqz13g== X-Received: by 2002:a65:6144:: with SMTP id o4mr74941023pgv.247.1555403229593; Tue, 16 Apr 2019 01:27:09 -0700 (PDT) Received: from localhost (59-120-186-245.HINET-IP.hinet.net. [59.120.186.245]) by smtp.gmail.com with ESMTPSA id w1sm47325757pfw.101.2019.04.16.01.27.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 01:27:09 -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: [PATCH V7 1/4] USB: serial: f81232: clear overrun flag Date: Tue, 16 Apr 2019 16:27:02 +0800 Message-Id: <1555403225-3430-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) --- v7: 1: Remove serial->suspending check 2: Add port priv is_port_open to save port open state. We'll register interrupt-in urb in f81232_resume() when port is opened. 3: Using usb_kill_urb for read/interrupt urb to ensure urb stopped. V6: 1: Add deferred_lsr_work_needed to re-trigger when f81232_resume() v5: 1: Source code base revert to v3 and remove all v4 changes. 2: Add serial->suspending check in f81232_process_read_urb() before schedule_work(&priv->lsr_work) to avoid race condition. v4: 1: Add serial->suspending check in f81232_lsr_worker() to avoid re-trigger 2: Add port_priv-lsr_work_resched to re-trigger LSR worker 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 | 97 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 89 insertions(+), 8 deletions(-) diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index 0dcdcb4b2cde..18d3fcf2907a 100644 --- a/drivers/usb/serial/f81232.c +++ b/drivers/usb/serial/f81232.c @@ -41,12 +41,15 @@ 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; + bool is_port_open; + struct work_struct lsr_work; struct work_struct interrupt_work; struct usb_serial_port *port; }; @@ -282,6 +285,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 +319,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); } @@ -528,37 +533,52 @@ static int f81232_tiocmset(struct tty_struct *tty, static int f81232_open(struct tty_struct *tty, struct usb_serial_port *port) { - int result; - - result = f81232_port_enable(port); - if (result) - return result; + struct f81232_private *port_priv = usb_get_serial_port_data(port); + int result = 0; /* Setup termios */ if (tty) f81232_set_termios(tty, port, NULL); + mutex_lock(&port_priv->lock); + + result = f81232_port_enable(port); + if (result) + goto end; + result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); if (result) { dev_err(&port->dev, "%s - failed submitting interrupt urb," " error %d\n", __func__, result); - return result; + goto end; } result = usb_serial_generic_open(tty, port); if (result) { usb_kill_urb(port->interrupt_in_urb); - return result; + goto end; } - return 0; + port_priv->is_port_open = true; +end: + mutex_unlock(&port_priv->lock); + + return result; } static void f81232_close(struct usb_serial_port *port) { + struct f81232_private *port_priv = usb_get_serial_port_data(port); + + mutex_lock(&port_priv->lock); + f81232_port_disable(port); usb_serial_generic_close(port); usb_kill_urb(port->interrupt_in_urb); + flush_work(&port_priv->lsr_work); + port_priv->is_port_open = false; + + mutex_unlock(&port_priv->lock); } static void f81232_dtr_rts(struct usb_serial_port *port, int on) @@ -603,6 +623,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 +648,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 +668,49 @@ 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 usb_serial_port *port = serial->port[0]; + struct f81232_private *port_priv = usb_get_serial_port_data(port); + int i; + + for (i = 0; i < ARRAY_SIZE(port->read_urbs); ++i) + usb_kill_urb(port->read_urbs[i]); + + usb_kill_urb(port->interrupt_in_urb); + + if (port_priv) + flush_work(&port_priv->lsr_work); + + return 0; +} + +static int f81232_resume(struct usb_serial *serial) +{ + struct usb_serial_port *port = serial->port[0]; + struct f81232_private *port_priv = usb_get_serial_port_data(port); + int result = 0; + + mutex_lock(&port_priv->lock); + + if (port_priv && port_priv->is_port_open) { + result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); + if (result) { + dev_err(&port->dev, + "%s: submit interrupt urb failed: %d", + __func__, result); + goto end; + } + } + + result = usb_serial_generic_resume(serial); + +end: + mutex_unlock(&port_priv->lock); + + return result; +} + static struct usb_serial_driver f81232_device = { .driver = { .owner = THIS_MODULE, @@ -655,6 +734,8 @@ 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, + .resume = f81232_resume, }; static struct usb_serial_driver * const serial_drivers[] = { From patchwork Tue Apr 16 08:27:03 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: 10902147 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 C0E3817E1 for ; Tue, 16 Apr 2019 08:27:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA17728477 for ; Tue, 16 Apr 2019 08:27:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9EBEE2893F; Tue, 16 Apr 2019 08:27:30 +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 5476428477 for ; Tue, 16 Apr 2019 08:27:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728730AbfDPI1M (ORCPT ); Tue, 16 Apr 2019 04:27:12 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:38793 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728705AbfDPI1M (ORCPT ); Tue, 16 Apr 2019 04:27:12 -0400 Received: by mail-pf1-f194.google.com with SMTP id 10so10029920pfo.5; Tue, 16 Apr 2019 01:27:11 -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=wSXawtePsQ2vPenoE5g6gqTHM+qfmcA55/vvKDCelvw=; b=bY2/kTaYddTu2z6xUl+xBmSkSbfqy6E8O2LK70reRNDtXu2LP3TFqEvQQOWmg/YN1D VEZ+Yj7o13QzqQCWsmUmrNNaKSylqCd3r09zcJ/fY6C0q/+vuFbSWFkRHFuvUKqof61q gaSrkD7e6UQEqt+qjPs5BXQKKOjtCOjRs2knwuMRiJAXqVh4190Q/g4PptthFKTUAGPa 58puthAZsi0YRCsmf4SaxZ2IwOLJ2fucJM7aqPJSybX/c7PYURE4zWAUO/MqH52rCaX3 bJxRQDM9WKXlE4274F145sdir3l9Sf65wqOadMzvDlbrRZ7z516V9N5J6ZkP69rlKQjZ NFyw== 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=wSXawtePsQ2vPenoE5g6gqTHM+qfmcA55/vvKDCelvw=; b=Bgo0FJDqW6GbymI3JOWein3r4u6ybWFnDhBU1qwgqjpBKBtFWC+GvRZr/Uhw/34Eop /+ECa2E1abLDo2N1/W0F4aczNXOZvUyoRJgLQ13RwUjkUm0mhh6XTx2OuLpHL6dl+ZQx J0BdyLatQui+rLOhBOqaKkN/RNqRCSlIoviqDp101NhFEIoUUb9ZgyGlS4guzy3qbIM5 dOe2tTm5AOM72xSz4CSeFcGzbcBy1igut7Zsgfm04xrt0CHMnER84w6FQ9/iSrVoKJDP 5Str3l/+/ZvbmytdrkHK+JH5xjAaVPvZs1VGpU4Xfs36hxmJ3MaKwKU/QG46VAmF3DSQ T5Qg== X-Gm-Message-State: APjAAAUSX4Cqp/nUU37mRo5ZWX5L0U55O3okcr2dCpnm3oitR0IqQkAn yv4mWl4IopJCv6Hl0Ou/CfA= X-Google-Smtp-Source: APXvYqyIJtfDFAqfroBON9ydby3jhN9HXtT71C8ZERCECYbfh9Fe8UdjpIzCL29V4jTIbHVO/NN9Qw== X-Received: by 2002:a62:4554:: with SMTP id s81mr53087660pfa.66.1555403231264; Tue, 16 Apr 2019 01:27:11 -0700 (PDT) Received: from localhost (59-120-186-245.HINET-IP.hinet.net. [59.120.186.245]) by smtp.gmail.com with ESMTPSA id h19sm90604629pfd.130.2019.04.16.01.27.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 01:27:10 -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: [PATCH V7 2/4] USB: serial: f81232: fix interrupt worker not stop Date: Tue, 16 Apr 2019 16:27:03 +0800 Message-Id: <1555403225-3430-2-git-send-email-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1555403225-3430-1-git-send-email-hpeter+linux_kernel@gmail.com> References: <1555403225-3430-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 will use LSR/Interrupt worker to handle LSR error & MSR change. This patch will fix the interrupt work should stop in close() and suspend(). Cc: Johan Hovold Signed-off-by: Ji-Ze Hong (Peter Hong) --- V7: 1: first introduce to this series patch. drivers/usb/serial/f81232.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index 18d3fcf2907a..7c7495ae5600 100644 --- a/drivers/usb/serial/f81232.c +++ b/drivers/usb/serial/f81232.c @@ -576,6 +576,7 @@ static void f81232_close(struct usb_serial_port *port) usb_serial_generic_close(port); usb_kill_urb(port->interrupt_in_urb); flush_work(&port_priv->lsr_work); + flush_work(&port_priv->interrupt_work); port_priv->is_port_open = false; mutex_unlock(&port_priv->lock); @@ -679,8 +680,10 @@ static int f81232_suspend(struct usb_serial *serial, pm_message_t message) usb_kill_urb(port->interrupt_in_urb); - if (port_priv) + if (port_priv) { flush_work(&port_priv->lsr_work); + flush_work(&port_priv->interrupt_work); + } return 0; } From patchwork Tue Apr 16 08:27:04 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: 10902143 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 09AB3922 for ; Tue, 16 Apr 2019 08:27:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5B622893F for ; Tue, 16 Apr 2019 08:27:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D7C1028947; Tue, 16 Apr 2019 08:27:19 +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 32F142893F for ; Tue, 16 Apr 2019 08:27:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728771AbfDPI1O (ORCPT ); Tue, 16 Apr 2019 04:27:14 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:40395 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728757AbfDPI1N (ORCPT ); Tue, 16 Apr 2019 04:27:13 -0400 Received: by mail-pf1-f196.google.com with SMTP id c207so10025816pfc.7; Tue, 16 Apr 2019 01:27:13 -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=kYeiE7MP9S6yavZzm3iMprr3rhb37YzEYngO/SgR9+8=; b=MP4dR+8D8cduikJPDuPZm9kvH9dx76uQNmmr960AmDOe2Tz1MrjHHhJe+Irq+vgxAI zI0rEsEkJfFvVCjUyWiGmZAyPSrqiPGqAOWUkvY89Eirg8fUBQzGPT15NjDRQc0awLR1 mM4CyaislB2x7+AMVy3bN6KioIUBM2Mei1uJRZ8V+xnI1B9+hUr0VDaMCxsgJfnqxMWu WKDbAIsR/H6KjH1sPXDMnw6MGhHdm+qlNnvUqW7rdrdC/xMeHQAohjG5usifQQuHs7CQ ID5DVdNP/JLUoqrkXpd3yzAZePPnIB7o7pq8azf85XFNKkLj8HhpPBj9g6j3YXSNEm7z JGvA== 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=kYeiE7MP9S6yavZzm3iMprr3rhb37YzEYngO/SgR9+8=; b=AqzQi7n2G63LeVQYqWahw1q3WAddoBbTSiE9xSt9NW4nUrDVxDB7NedVx5GdPRLNza RMKOwlh/NSCf0CJrUhMVyubg6lxDX35rmtcgjAuCfR8OJlyG1Vesb3B13sSPRU+rQe6k lHrIIK1kdM2uiOTdmlMafTJ3NRVq5Vhgt6IOlbj9spQ/VnXB3V+kQLrJtUKh/DD6kir9 cAxBdaL32wqhkkCAgS7j76j3OT5ud+/zBH5vwbTI9axFfUljBpJ1Rj4+GjbiBCLbMtOT WhWX9SwJY0E6SDpWmrGvK5Lrb1wgNOP/jNpeiKIrcQ4JlA2z9fxJBJU2fKoL3qMhFgIm BbVA== X-Gm-Message-State: APjAAAUYcqJ3jnjcXLKK6nbRvueFiFzwhODy0bQZpHptnWKMJOLqTmUc Owsit3Eh0jzWqsccnqCttN8= X-Google-Smtp-Source: APXvYqxysEmvq8t+iA1ALSWhI8AiGIA1sqeXui3rhxO0URxOUm6MeSn/qnBi57iZDj5JqfqKguEj1Q== X-Received: by 2002:a63:6193:: with SMTP id v141mr75877510pgb.392.1555403233057; Tue, 16 Apr 2019 01:27:13 -0700 (PDT) Received: from localhost (59-120-186-245.HINET-IP.hinet.net. [59.120.186.245]) by smtp.gmail.com with ESMTPSA id v1sm81482916pff.81.2019.04.16.01.27.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 01:27:12 -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: [PATCH V7 3/4] USB: serial: f81232: add high baud rate support Date: Tue, 16 Apr 2019 16:27:04 +0800 Message-Id: <1555403225-3430-3-git-send-email-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1555403225-3430-1-git-send-email-hpeter+linux_kernel@gmail.com> References: <1555403225-3430-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) --- v7: 1: no change v6: 1: no change v5: 1: no change v4: 1: no change 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 7c7495ae5600..474834ddbb89 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,19 +45,43 @@ 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; bool is_port_open; + 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) @@ -130,6 +155,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; @@ -347,13 +387,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; + } + } + + if (idx < 0) + return; - divisor = calc_baud_divisor(baudrate); + 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 */ @@ -443,6 +523,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)) @@ -455,11 +536,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)) { @@ -608,11 +690,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 Tue Apr 16 08:27:05 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: 10902145 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 CEB4A922 for ; Tue, 16 Apr 2019 08:27:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B791828477 for ; Tue, 16 Apr 2019 08:27:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ABE8B2893F; Tue, 16 Apr 2019 08:27:25 +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 5242228477 for ; Tue, 16 Apr 2019 08:27:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728781AbfDPI1T (ORCPT ); Tue, 16 Apr 2019 04:27:19 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:37776 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728757AbfDPI1Q (ORCPT ); Tue, 16 Apr 2019 04:27:16 -0400 Received: by mail-pf1-f193.google.com with SMTP id 8so10032082pfr.4; Tue, 16 Apr 2019 01:27:15 -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=n5uTlfZz5DwTBtUvlc5QPNIHwem/swcuwjq6p40/0VY=; b=RNflRzjsHjhIWFfIwlq7oJnM+EEFDqfLrr/XT5O4WoUqG0xI066W0/oUSPrkvrqOkM AIRgFTSsuPyK8Bll27tA0/dj6F4Q+NUCpEksW+2hc0OPXnl7UXyi0mhUeyz9/gukwI8/ uSj4SJMrxjJOc1CJBBo/NcgPuW4uh3jHhhMR3f/CtAP4QUCaSj0Il+kJI2s1qTbJ6P7L r1YTbEpxay2WF2LX1qj/J181a9JlSisTkUyNJuR228muLODUzyQiMlAdOe/S6zFCPZgD OVc/MWRhgXUNPdWBjH/V9qTdZyYWs7GWzTEfOmmCqENRvbhObIb6lVpOZavPGDPSQprt Qlpg== 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=n5uTlfZz5DwTBtUvlc5QPNIHwem/swcuwjq6p40/0VY=; b=dOaFiN5AkDymRzzrA9eufnmMTb/9GlCSNlggHoNfHLSEqo0axLt4Wxm44olP5DgW8h FrVovBH9Q8Frb4lTOs6PN0VwFZroDlsbW92P3f6HS1yIZK59u+ai1XCOXOKPYGbY47TH Ak5AS67WKwcI58WZhfvbC8I5Mo0TU4gV8m1+SlqBN+KCSLa9mhu7PiFyhSQwDQgGTL1W A8QMZhMQhAbTfOjazqaQ553XDhvF8TBoWHSGY9MlAWdZcky1SlRnFHfxUTvaQr2p0JNc 2hqAKVBDgu9GJKLHnNcq4xWj7Sel27k70xzH6ZLlA81dxZyeLs8J68JpwrcXTOEEWjrk /4hA== X-Gm-Message-State: APjAAAXsO4rw3IBw/DJvLKjVkASaiOSOEZwGUacQo5+hrXIUHKDi8O0P lvddZK+G4kUFJo0aNHwteUM= X-Google-Smtp-Source: APXvYqwA7e2CMMzUMqR8L0DUunqpQ0FdJhxbLsS8ZxbC9BCqpDzquADdJ8iSFGS4xy+Z1SC9LW1hPw== X-Received: by 2002:a63:5466:: with SMTP id e38mr72790491pgm.340.1555403235381; Tue, 16 Apr 2019 01:27:15 -0700 (PDT) Received: from localhost (59-120-186-245.HINET-IP.hinet.net. [59.120.186.245]) by smtp.gmail.com with ESMTPSA id o67sm113103500pga.55.2019.04.16.01.27.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 01:27:14 -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: [PATCH V7 4/4] USB: serial: f81232: implement break control Date: Tue, 16 Apr 2019 16:27:05 +0800 Message-Id: <1555403225-3430-4-git-send-email-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1555403225-3430-1-git-send-email-hpeter+linux_kernel@gmail.com> References: <1555403225-3430-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) --- v7: 1: no change v6: 1: no change v5: 1: no change v4: 1: no change 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 474834ddbb89..839163ef0040 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; bool is_port_open; speed_t baud_base; struct work_struct lsr_work; @@ -378,13 +379,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) @@ -520,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; @@ -573,11 +585,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)