From patchwork Tue Apr 30 01:22:29 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: 10922671 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 75298933 for ; Tue, 30 Apr 2019 01:23:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 649BF289FF for ; Tue, 30 Apr 2019 01:23:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5917A28A02; Tue, 30 Apr 2019 01:23:05 +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 F1520289FF for ; Tue, 30 Apr 2019 01:23:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729715AbfD3BWn (ORCPT ); Mon, 29 Apr 2019 21:22:43 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:42955 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729238AbfD3BWn (ORCPT ); Mon, 29 Apr 2019 21:22:43 -0400 Received: by mail-pl1-f193.google.com with SMTP id x15so5932678pln.9; Mon, 29 Apr 2019 18:22:42 -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=EoMvgvSdq7xp2mVjAhF0hgkQM6qSVYMsPBoCdVngzjI=; b=c7QlO3Pm+qLe5755G7xHlb6GhkRlzAhC70A+iC1eY4JRlIEANWoK/iDWrhbpzc0LMC DgKZDg8E7TAdA461+vb7nL1RWYJNwnkHf3aalSXmz9b4cAvStJFzEouR2Gfo4FTsPPeh T3vx6/uqECBqh64qGPU7efV0rOyA3QYS3A2ytwX0xgReD/g/36sJQOJHHphiIIfL7iEN hNKoftGwFfcCtVGv9vOKz+L2TRKNS95s9m94/uw3Wlqtl+EVMFW4GwcylLN1owJ0WpqB D+ehNtkz2gZIHnEHqjF4/TYW8lGET4f4ECWnjpgAKaY94N3XggTk8kXWK/OP/umUKsQY kXTA== 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=EoMvgvSdq7xp2mVjAhF0hgkQM6qSVYMsPBoCdVngzjI=; b=b7OBGq6t1bYD7VNEwI0vcpIYfvrv/7B85MBnzZfWG4kTpGBzHCDttf87HqrrWjVxhu trx+kpZPZeos/54+dsTN/zH0hHaBlSQZCBujjvAQ3uxnRaXkdvyBPEEmAXHD1zbPx4fF z1n1jNojQLg54bln3/s9LWaZBRWmdfQPEi2BG6sAHSttjPjB9Tc31hsyEVIaFTl6H1NC rp8IB44Bh7AzvhWOzRA8cNVPNO8C1TO3vwP5gbFNeIfVxnN+gcBa0nFWrYzQWfhQ86uH zn/RYJJ7A1x8E44rX6D7KZAvBHoae3usGV0F6jePghRSpjDfCcOtT79MZuF8ZzIkOc7a vgzA== X-Gm-Message-State: APjAAAXww0CE/HEp62vH/6VPq3ROFWCAFflkDgiX9KZVfPbNmRjUwvqU ZqMuo1dsgMUtebybgmkyUhI= X-Google-Smtp-Source: APXvYqw/LEUE+KiL7EniyAU18MXAjpCPXJormtvvZLg/UGUm3s4DAWZritdQghy25tajK8dfJMFg7g== X-Received: by 2002:a17:902:7e04:: with SMTP id b4mr44288169plm.211.1556587362108; Mon, 29 Apr 2019 18:22:42 -0700 (PDT) Received: from localhost (59-120-186-245.HINET-IP.hinet.net. [59.120.186.245]) by smtp.gmail.com with ESMTPSA id y3sm11207510pfe.9.2019.04.29.18.22.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 18:22:41 -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 V9 1/4] USB: serial: f81232: fix interrupt worker not stop Date: Tue, 30 Apr 2019 09:22:29 +0800 Message-Id: <1556587352-19500-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 use interrupt worker to handle MSR change. This patch will fix the issue that interrupt work should stop in close() and suspend(). Cc: Johan Hovold Signed-off-by: Ji-Ze Hong (Peter Hong) --- v9: 1: change the sequence from patch index from 2 to 1. 2: using tty_port_initialized() to determinate port open state. v8: 1: no change v7: 1: first introduce to this series patch. drivers/usb/serial/f81232.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index 0dcdcb4b2cde..d43ec999bc5e 100644 --- a/drivers/usb/serial/f81232.c +++ b/drivers/usb/serial/f81232.c @@ -556,9 +556,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->interrupt_work); } static void f81232_dtr_rts(struct usb_serial_port *port, int on) @@ -632,6 +635,40 @@ 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->interrupt_work); + + return 0; +} + +static int f81232_resume(struct usb_serial *serial) +{ + struct usb_serial_port *port = serial->port[0]; + int result; + + if (tty_port_initialized(&port->port)) { + result = usb_submit_urb(port->interrupt_in_urb, GFP_NOIO); + if (result) { + dev_err(&port->dev, "submit interrupt urb failed: %d", + result); + return result; + } + } + + return usb_serial_generic_resume(serial); +} + static struct usb_serial_driver f81232_device = { .driver = { .owner = THIS_MODULE, @@ -655,6 +692,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 30 01:22:30 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: 10922665 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 847C5933 for ; Tue, 30 Apr 2019 01:22:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72D1C289FA for ; Tue, 30 Apr 2019 01:22:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 667F028A01; Tue, 30 Apr 2019 01:22:48 +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 D0538289FA for ; Tue, 30 Apr 2019 01:22:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729791AbfD3BWq (ORCPT ); Mon, 29 Apr 2019 21:22:46 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:37915 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729238AbfD3BWp (ORCPT ); Mon, 29 Apr 2019 21:22:45 -0400 Received: by mail-pf1-f196.google.com with SMTP id 10so6224870pfo.5; Mon, 29 Apr 2019 18:22:44 -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=/34HtZ0ItBu2q8PiQCCmitcY2PUSurP/IKvZz4bka9M=; b=J/pE20HByyCtHTBS0K8ialHsJw49MhV1FCQBXAT8dgF5VJ/P9TMTmVGydpAmM3BXD6 cJ2H8/4ZhNzHF/w03baN6TTQWLvqV+9FWKZ2lq4tntBV2oOrr76LvRkmb3Y7wR/ZE5pV V4AV49b2tZUiczidPJHQ9YCrR1oPQT3bqNFRCQVDZqiYFrFzu2tS9+e0khnhPyB6zU3L Mu+dzyifzVS5FWjCgVJe/u4Kg8YWJmTD+rLs16BMZ7GBx+xQK5knl1gR3tWu4U7DBY/K UKNocCw7KXUjFR6+ZLZCCdBBRJ01QP9NU2AaiXe0fUuJUeMKP2AHmn+KSxsVzVuoXqMb iwVw== 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=/34HtZ0ItBu2q8PiQCCmitcY2PUSurP/IKvZz4bka9M=; b=Gcv/rtGejbMdCVqn0WiRixRG0s0M4DSbzI4B2TL1oiSxCrw6qnH8tppvCD2ByOIkGR BMdeH/VZXz7FxH/dlQbYCORIYwEzyPDd3qzkTfDzD3tvkoSrrCpnBHoJsekgoKhjZlhQ d5DVduHVutMda3fvH6WE4zJp7riYCHbZ9sBeW6rLr5yhlj5714+FsR2gLjkIMF64XbRV A+M0mgB7lxXhw+DpYOdIkvCk8TdLBsZJ1Iz+5OTCdaJiSOLcnamv5HHKQkFwkCX9kyx/ xve/6NZYJTrocSO5cPM70IEw4OxD1LC4hAYPnyupG1CJTOkqjOa2ZyLhShnwTcJnIsct p1zA== X-Gm-Message-State: APjAAAUjlT89FaOpTY6z/zc8jaLBm+tyS4pz40lZpHgIUSrGbZPzgEgq zjeAptrorFhDvtaS+F2WkHA= X-Google-Smtp-Source: APXvYqwc9yTp5jx88vjrv51gs13PdtFbfK3bdbaikArQGi2tAAdy+yEmclh1GV3Q5mK30ulNRfsyAw== X-Received: by 2002:aa7:8b11:: with SMTP id f17mr336712pfd.116.1556587364185; Mon, 29 Apr 2019 18:22:44 -0700 (PDT) Received: from localhost (59-120-186-245.HINET-IP.hinet.net. [59.120.186.245]) by smtp.gmail.com with ESMTPSA id m8sm53912262pgn.59.2019.04.29.18.22.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 18:22:43 -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 V9 2/4] USB: serial: f81232: clear overrun flag Date: Tue, 30 Apr 2019 09:22:30 +0800 Message-Id: <1556587352-19500-2-git-send-email-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556587352-19500-1-git-send-email-hpeter+linux_kernel@gmail.com> References: <1556587352-19500-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 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) --- v9: 1: change the patch index from 1 to 2. v8: 1: Fix usb_submit_urb() in f81232_resume() with GFP_NOIO, not GFP_KERNEL. 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 | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index d43ec999bc5e..f0de20a818cd 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); } @@ -562,6 +566,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->interrupt_work); + flush_work(&port_priv->lsr_work); } static void f81232_dtr_rts(struct usb_serial_port *port, int on) @@ -606,6 +611,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; @@ -616,6 +636,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); @@ -646,8 +667,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->interrupt_work); + flush_work(&port_priv->lsr_work); + } return 0; } From patchwork Tue Apr 30 01:22:31 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: 10922669 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 87BB81395 for ; Tue, 30 Apr 2019 01:23:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 751F0289FF for ; Tue, 30 Apr 2019 01:23:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6741A28A02; Tue, 30 Apr 2019 01:23:02 +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 D51CE289FF for ; Tue, 30 Apr 2019 01:23:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729847AbfD3BW4 (ORCPT ); Mon, 29 Apr 2019 21:22:56 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:34108 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729801AbfD3BWq (ORCPT ); Mon, 29 Apr 2019 21:22:46 -0400 Received: by mail-pl1-f193.google.com with SMTP id ck18so1640280plb.1; Mon, 29 Apr 2019 18:22:46 -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=uyq7XsF7BNdC5zFoADwb0oshhkuj91CQd2vxvhaEuJA=; b=SyOEivJZuMRcKf8BzXSw/KkD3C16LIp3BGAq1TlnKcV4wDsiyoT9mDLZXkzx8a1/rI BEPEqTPcb951ID/DP/ok6do1wfcuFwSHoC33YUy2U9q7AsXpEqcr1671P/6ccX+GzMZX k6Sr6lwIiHGeJloQXrcidDc/qutVSPGJl1mMH03W9mxCWmY6eePW3xSzYLiIV1X3fHsp XKQCzPEHC0n8b5K3wgRt2dn0bBUmVQ29QkK47+iZyHxwxOdux5uWj9hDad9vZ1uftiWL fsVCt7WwGWA8/JkoS0FtSl/gAhVZ7IsUBVhtpXkRMYHw/qNyUiZtjbEU96oYKv+YHk+3 Mx8A== 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=uyq7XsF7BNdC5zFoADwb0oshhkuj91CQd2vxvhaEuJA=; b=Dei14TFQXpnSXdx9FcurIC3o0pzWVMuU4YXvDD/3hbg8fCBDXOnglp+ubBRtJoykev TzrFBRPAObWB9t4WqQyfPM6cRyKTvd8eVd08It7i3l2Clre62Z8ir+Q8JTk1SaEwIjUQ MGaGVHr/kUZeTsrxlgtlla8+/Sz2zyT0nECk/Yf0yFX1KYu8sWRxCeCZaeH3sLHzhUCt yLVY7tQJ9TfJSIoQCH0A4mjy6WGLCcm7PMT0mnKGXKxmz9MFqbfMPJAeFUjAIg5gOwPb tblU+rasHZWTUZnxlLLXe7PDnCNoFQWAZiL2ckAqOCPEe7wCEpbUVxoHefglRJ9koFZW oNsA== X-Gm-Message-State: APjAAAVW2GRnFha9lY24t/aNfWNY/ao4w+2Barwl7IkKDh4YP3hh+ydb +14gyxhBgsTvyiuGgC/tZWg= X-Google-Smtp-Source: APXvYqwjllRUrhMvRfk1VXPh+sv2pFEFCJUnIEn9d7vFL8WusQNwQ+X6nufHAqfy+lqpWep48RPRtA== X-Received: by 2002:a17:902:7205:: with SMTP id ba5mr45141406plb.285.1556587366008; Mon, 29 Apr 2019 18:22:46 -0700 (PDT) Received: from localhost (59-120-186-245.HINET-IP.hinet.net. [59.120.186.245]) by smtp.gmail.com with ESMTPSA id k186sm59003856pfc.137.2019.04.29.18.22.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 18:22:45 -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 V9 3/4] USB: serial: f81232: add high baud rate support Date: Tue, 30 Apr 2019 09:22:31 +0800 Message-Id: <1556587352-19500-3-git-send-email-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556587352-19500-1-git-send-email-hpeter+linux_kernel@gmail.com> References: <1556587352-19500-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) --- v9: 1: no change v8: 1: no change 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 f0de20a818cd..6a1e6a27ce16 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; + } + } + + 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 */ @@ -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)) { @@ -595,11 +677,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 30 01:22:32 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: 10922667 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 694731395 for ; Tue, 30 Apr 2019 01:22:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58818289FA for ; Tue, 30 Apr 2019 01:22:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B59228A01; Tue, 30 Apr 2019 01:22:55 +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 D28C4289FA for ; Tue, 30 Apr 2019 01:22:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729831AbfD3BWt (ORCPT ); Mon, 29 Apr 2019 21:22:49 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:34887 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729828AbfD3BWs (ORCPT ); Mon, 29 Apr 2019 21:22:48 -0400 Received: by mail-pf1-f193.google.com with SMTP id t21so6227521pfh.2; Mon, 29 Apr 2019 18:22:48 -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=14BtYvopEGYF3ZyX/uprrfiK7My6iDbeW5Kct6Ko73U=; b=nplkksJwpY6fgI5iJvv5KU0Ks/zSTkh+fr7UVRw5o0CqPzmEuk+VHDefPvenM/2HrO NCjOx+1e0KMG94NEfDxm5qVGCjPklp2QnqVBWIJ1AeDxiYf9bI6MKpBkZ8q3KKpdwwv3 V3dev3KJ0lzk4mCS3llYiGEhf+jofS7Q+HyzSYBEAP/rGnd07j2Pb6mlfP3mrxK5pfbs 9uDA1JnssqHBgqdfNIh+WofAKY3qFwFu+PX3btxPf2chTknzY3cS/X0280i80xEOvVHG qegRmBwatwTzkqMwG5Tn8bvjYU3DwCskpM9dXmVRuxEn3dA/r29URAryWJ50XsUSMEBh E8pg== 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=14BtYvopEGYF3ZyX/uprrfiK7My6iDbeW5Kct6Ko73U=; b=bkiN7k3tU2RovOsvdUjBd5hkWP8FDTSvcFvXhNO6N3/yF8PAHIEJdZcnTE8cMgnxhK W7tq9Y9s25NuXF33WWg3RIIbrQcxkG0Gqw2spW5mxD+f7yuErzCzf5jKoZVbw31bYrKy 0QyIrphqTS5m8nTTI6A0KOSyhS7b3cs524PEQbWti4IKzWXx4sZc2fYXSHVi7gMYOlnO wvZC4vQcd9kA/q/cDP0Z/rPb8gWtszudEH63GmpaI6m346fX9ncTkIhvsTdkkK9FtMsN SzZE4JDqPEvcvebmFKXgaf0Pi+LTjrmUmvx9UkO2w504+lmu//0pjUyOncDlnXSH9WNq kbvQ== X-Gm-Message-State: APjAAAVxjm2uvqXhzT9QhCdg5ncbTEfs4f+F1o/cAb7Tg8KrxQzourlr 3N6ThyHzcuLqyftIqtYSoec= X-Google-Smtp-Source: APXvYqwbKT8sggQIxWyPbcv7B73rzvWgAB9NGay/Tkv1ZV8WIg4+0s0TZsiTmORgm/fT02eiQ2iFfw== X-Received: by 2002:a63:7:: with SMTP id 7mr4583794pga.108.1556587367869; Mon, 29 Apr 2019 18:22:47 -0700 (PDT) Received: from localhost (59-120-186-245.HINET-IP.hinet.net. [59.120.186.245]) by smtp.gmail.com with ESMTPSA id s74sm353739pfs.26.2019.04.29.18.22.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 18:22:47 -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 V9 4/4] USB: serial: f81232: implement break control Date: Tue, 30 Apr 2019 09:22:32 +0800 Message-Id: <1556587352-19500-4-git-send-email-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556587352-19500-1-git-send-email-hpeter+linux_kernel@gmail.com> References: <1556587352-19500-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) --- v9: 1: no change v8: 1: no change 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 6a1e6a27ce16..562c9babd144 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)