From patchwork Fri Apr 19 02:45: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: 10908615 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 F3A2F1515 for ; Fri, 19 Apr 2019 02:46:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DCFE3289B9 for ; Fri, 19 Apr 2019 02:46:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1843289CF; Fri, 19 Apr 2019 02:46: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 3C683289B9 for ; Fri, 19 Apr 2019 02:46:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727193AbfDSCpn (ORCPT ); Thu, 18 Apr 2019 22:45:43 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:39127 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726822AbfDSCpn (ORCPT ); Thu, 18 Apr 2019 22:45:43 -0400 Received: by mail-pf1-f194.google.com with SMTP id i17so1958641pfo.6; Thu, 18 Apr 2019 19:45: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=bGjxE57b+sAJtijpBTPtqZ9fwf0KWs86liucmXiKgLc=; b=FZX2sySY0mAIx85oNvUgXhxW4/mChLYkZ3MLfwdE0bSjaFdcxeKGyvyLGn9KWw2xA4 a56YpT7SnA/kgLfsXUKIw0H8WhXIsVQC63BhyiFqtBh/DJ49Gz7ZVkk3admhaUCZbReB esalGMra5iMZnsyY+4zE1SWi0RG3bOtaAQKk2FLRMB1mMEOaD7Ilh2ST5NcrcmVLDUeU +RXCizDFRnSTCANhjj8voynyRSQF63xE3iqKAjJP8K2ksM3/RNymYQgyLg2F++sQFuKk K7VKIwuJNzcXr7KETSvhamXP/ApArbNZli+/ihFgzcGMbiZhcrU8IYge5ZVhQMJzZci6 0BSA== 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=bGjxE57b+sAJtijpBTPtqZ9fwf0KWs86liucmXiKgLc=; b=WO8MOOQuq1X7MNnQTzwnQHFp17atZ6Z2/Sx+oRlem4qU8XCa+BFo1o7r90RuIX4Zoe AmEsha1Y+8WARo24955HRpdxlNB/GjlhHihnFAbbYnOh1t18kGnx48m0g2hIwSC6tzoc pJmyWt5gXfWa6EuvCc7qSzWfSAs7IJMCeEYNj5AUBzMn7pb+KgSEBvgGbjKFcyVZL2Io c5dkYXA230U+INVx0Zz8VTeBmtTCX+PDb3FGmrInCUGgeqnczeiFyMmOZcEhdwA2I3Uz mZNuwChwBo9L8Amt8/jY+y8vcocJsqz6kI2mBVPtBQNZHK5zza9GUqhQKB0QuWZjmAvb 7cGA== X-Gm-Message-State: APjAAAUnJ7etr+DpIIBbD40fV1IKqvJbDsZo63pUvQP5StZm3YsI8v3+ 7cRBvuJWDRIIhYZpw8iYLfM= X-Google-Smtp-Source: APXvYqytEvGEN3UvH6ThjFtqihx/0qfRrRIxtpZJDUpo0KcNGbdmmPGz+7iaLwRYQQMXGYNZNCBCag== X-Received: by 2002:a63:1359:: with SMTP id 25mr1447049pgt.92.1555641942177; Thu, 18 Apr 2019 19:45: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 c1sm3363317pgq.33.2019.04.18.19.45.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Apr 2019 19:45: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)" , Oliver Neukum Subject: [PATCH V8 1/4] USB: serial: f81232: clear overrun flag Date: Fri, 19 Apr 2019 10:45:30 +0800 Message-Id: <1555641933-19336-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) --- 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 | 97 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 89 insertions(+), 8 deletions(-) diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index 0dcdcb4b2cde..1f0dd4087d79 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_NOIO); + 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 Fri Apr 19 02:45: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: 10908613 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 0E9751515 for ; Fri, 19 Apr 2019 02:46:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA656289B9 for ; Fri, 19 Apr 2019 02:46:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DDFC8289CF; Fri, 19 Apr 2019 02:46:01 +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 90879289B9 for ; Fri, 19 Apr 2019 02:46:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727217AbfDSCpq (ORCPT ); Thu, 18 Apr 2019 22:45:46 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:35000 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726822AbfDSCpo (ORCPT ); Thu, 18 Apr 2019 22:45:44 -0400 Received: by mail-pg1-f193.google.com with SMTP id g8so2055769pgf.2; Thu, 18 Apr 2019 19:45: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=gDQf3PA01qvbrGfvHZT0g5UE97POJa7dkmHX5dqDnqk=; b=rasZdmYcER5k2K/9gjXpyihRLyrVs1IGSp93gYPV6R0BOLg65IfjBdYRafeSYLB28C 8kfe9IxBT9eNi9TbBIKrifrG/7R+dSOfO5GOD3Mf09AOZgc+WfgcWrmaRWsjGrhJotbH zrNNwKwLmqUxGQgDO8Hfg2vhF+Gv9niewJOkAdtLoZ0YPTtaf/eGNeJOfOhsdhyXTHsT 2Ikf2x3fRsDHqIIZ50eLRUrq/PYEnfKLH7mBUGhHs7rET6JmecIZFORaSbQFZgIu3KRi JGKSeYro8PDw4CA7Sc7FTlFyEkF9uEkWNIS4V79hfOUYqceSOIp9RLCC+qx3iYlc/gdV ItlA== 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=gDQf3PA01qvbrGfvHZT0g5UE97POJa7dkmHX5dqDnqk=; b=Yj5Do+7qJK0hIUgdLGQzb9TY0ZdmKfaPsjBHwlfb33ODs9I4s7P2WMgI6TzTDam40f 97aQ1qBHM3s17jMRpBhVsNGm3B1IeB3oBmFLhzjj1eiDiD8+q6A8hsWW6bQftcdvgSbI tVooagC1Hiw0eVeo+obNbJLIofIu3/LzlXlCovChfxWHfmv9X0G2nIReXl0/7IfUuJdj ZhNv465mnxOmLDYO+z76xFDUPzw92GfKCcl+QU4wrtAwy/c5WD2kZjw+z0ArqEcduurp GnRIhaNdxA+sojVU731EtC3i2GSqrE1yLszuaGwfB1Q/ezf2h9/5Cqx3N9Qkcn7uSiu8 A6nw== X-Gm-Message-State: APjAAAWsCW2FM1r0qMESPEqsOGPc6maT+nQlfQnJNtFjEQNLfbHdhSPM 9Wo9qIE+Z1ecc5VAW5crzYA= X-Google-Smtp-Source: APXvYqyP0OTdkc1BrI+oxtK0m0tKlxbmJ3TFaTRZeNbe3hpcRa1cFnyaU3/Xc2kYZp2cD9f+l4FjDw== X-Received: by 2002:a65:51c8:: with SMTP id i8mr1426287pgq.175.1555641944195; Thu, 18 Apr 2019 19:45: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 g67sm4633025pfg.94.2019.04.18.19.45.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Apr 2019 19:45: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)" Subject: [PATCH V8 2/4] USB: serial: f81232: fix interrupt worker not stop Date: Fri, 19 Apr 2019 10:45:31 +0800 Message-Id: <1555641933-19336-2-git-send-email-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1555641933-19336-1-git-send-email-hpeter+linux_kernel@gmail.com> References: <1555641933-19336-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) --- v8: 1: no change 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 1f0dd4087d79..25ec47d7f318 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 Fri Apr 19 02:45: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: 10908611 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 46236922 for ; Fri, 19 Apr 2019 02:46:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E99F289B9 for ; Fri, 19 Apr 2019 02:46:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 22CCB289CF; Fri, 19 Apr 2019 02:46:00 +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 8F147289B9 for ; Fri, 19 Apr 2019 02:45:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727232AbfDSCpr (ORCPT ); Thu, 18 Apr 2019 22:45:47 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:34581 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727220AbfDSCpq (ORCPT ); Thu, 18 Apr 2019 22:45:46 -0400 Received: by mail-pg1-f194.google.com with SMTP id v12so2062241pgq.1; Thu, 18 Apr 2019 19:45: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=myBkGid2rHMf5hFSI68OhG8Us9+NUOFPqI7xSktGyyw=; b=UKAfQPS6sxIYkdaeqEIx+VKeREI3jo5RvRe0zMmAvRgOjlbRwhw8sSvD91of07fwc/ 7J7X+kFJITSRvu2+fGXITwaNSHs/KtyG5PiLbJP26P4Zrpdjb9VyxIKm2BuNfNpujcgp DoQqsDHtpa5MhFeoDFjYJMnQ9Q/yxctIbSb8yayyRSa4CFIFHHSEMxgtGtjhF/IBlPk0 ZFKUmJkzboVni4rZs1UUavYpyRidvscPFsjWKb2Q+EhwTdtQZBenjuT2ww+BjWwtvmPF g5KxtoePB1i2ncyXBn3KEOi+qul41dyR+84SfXz5NzOQV4ztVKV6S/FBB3qj8oN1Us5A 16uQ== 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=myBkGid2rHMf5hFSI68OhG8Us9+NUOFPqI7xSktGyyw=; b=cwHkku7TwImdQxXvb5c+fQ8CI8GHgwuCQ3pYlxv1Ktovc3wXXEOxNlQEoL8EJ81/gz 0qXpsz6P7uOLPJsQ0Pq7iaNk1QLCTOkbAxDdrrI7Fp6f1GpG9/o1htz/h+CH+vEdHdXB YEJkMx2THo2vYj/s0FQOQol6ZHQmhR3FKbyBGRsDEN5aLm10b2yG0YQHc+xIqozt+c3Q oztiaSIW04b6KRyY15ofL3DqUafXvTt2gHnLVnVmtthuNKhkfOYwBT1/pWv5OQqj12k5 yI0znCs0qhi6aaDPTMzIf/WgosZI1gIP6Hptxk3VMWD32bCqJ8SAJVysQPQpdmiFMN9T ndGQ== X-Gm-Message-State: APjAAAV3ve8ozAWW9FDo+s69KuQLzyuEO5aZp4MjErgM0Xo2aVB9qR0O q7C+csww/WHhzDyj3aAQY2I= X-Google-Smtp-Source: APXvYqwOZbKoIEopjwHh9wAm9AHM0PhffkUWfoRcimtPAxaV6mS3KaPX+uIn3QQ7GPT0K3iFmhAiSg== X-Received: by 2002:a62:6587:: with SMTP id z129mr1314397pfb.88.1555641945888; Thu, 18 Apr 2019 19:45:45 -0700 (PDT) Received: from localhost (59-120-186-245.HINET-IP.hinet.net. [59.120.186.245]) by smtp.gmail.com with ESMTPSA id y20sm4813626pfe.188.2019.04.18.19.45.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Apr 2019 19:45: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 V8 3/4] USB: serial: f81232: add high baud rate support Date: Fri, 19 Apr 2019 10:45:32 +0800 Message-Id: <1555641933-19336-3-git-send-email-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1555641933-19336-1-git-send-email-hpeter+linux_kernel@gmail.com> References: <1555641933-19336-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) --- 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 25ec47d7f318..3da70f406a81 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 Fri Apr 19 02:45:33 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: 10908609 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 B6D4D922 for ; Fri, 19 Apr 2019 02:45:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D803289B9 for ; Fri, 19 Apr 2019 02:45:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F28E289CF; Fri, 19 Apr 2019 02:45:56 +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 33A2C289B9 for ; Fri, 19 Apr 2019 02:45:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727253AbfDSCpu (ORCPT ); Thu, 18 Apr 2019 22:45:50 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:39130 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727237AbfDSCps (ORCPT ); Thu, 18 Apr 2019 22:45:48 -0400 Received: by mail-pf1-f193.google.com with SMTP id i17so1958720pfo.6; Thu, 18 Apr 2019 19:45: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=huet5IvXuGZORtjsh3mDCkw5xIOcvfTPvi/dI3SmUkE=; b=P/jPeefrTZ9ia6XkdAaGXpWPOoW0rlCOyndpS8aPKgrqsDGT2HGIYBGr4ek2Lwe3MR 5gSd+qNsqpafx8Y8DNQw8F+hTQnVBFCbn2kQRGd0sLBz2xCkBiyfAHpWpg10LuIXOtdw jwa2YKaKZqAtSW4DIiYmhKZsNzdBzqSa/PdWrzY8KDGsg55kiwmHqPcwe/Ae2WSvqpNt hNUUck54iki+t775QC4oTKJSK8ZC12wwxQzXjSUSkKbLoEdwOsHxkVJ0WBDGckI1vmWD QG2UA7vlEf1I7B1yFFL0ejszsVmXm+OxmMb97fhoCnB2EJBQFMn6m0MahuZlZxmV4MBR UiVA== 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=huet5IvXuGZORtjsh3mDCkw5xIOcvfTPvi/dI3SmUkE=; b=krJPcLNqHN33xi8p4Fqmm8Vm0B6MFBYF210Yr39zizWdGkfwOPeo04u3GbLULM6zxv MKkT1kYrzZIQVCvN0DsfG+DEExhg6xyOAoguEoZ3LkpGeUG4LikkE7WFUybjbKUI6YVH uqnMK4ok1o3hjQkL55tNv74ehw4+h/Dx7Y1lDIQdyXdRj7dt1WIki0DuWyGnGb5aEx2b JKC4U8narcd3TbZz45VWMt//Yr0I4juze8uaAep3w3TAiWNqSpkOfCIWdxlkLVawINkK ELQUb6JwLDWjVoQDJspWes14BhF2TnSZqD4Ksuu2nQu7hruG2lfH8tAbD+USCem98iXm 05yA== X-Gm-Message-State: APjAAAUNt6zx+lYUDVu0SQ4XaOq9a9Eo9gXj+KJDeQ0jVi30m5ACr+Gi uIFEY+n68oT82b0fNJCH8TM= X-Google-Smtp-Source: APXvYqwPGV1dhdsc9b334rrqCHLL2ti/PtTp6GWSj/U9VRU6GFND2UohUZydNf1SZg7iWXoS/6eTxg== X-Received: by 2002:aa7:9e9a:: with SMTP id p26mr1116653pfq.201.1555641947595; Thu, 18 Apr 2019 19:45: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 i135sm4108844pgd.41.2019.04.18.19.45.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Apr 2019 19:45: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 V8 4/4] USB: serial: f81232: implement break control Date: Fri, 19 Apr 2019 10:45:33 +0800 Message-Id: <1555641933-19336-4-git-send-email-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1555641933-19336-1-git-send-email-hpeter+linux_kernel@gmail.com> References: <1555641933-19336-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) --- 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 3da70f406a81..d852bf3b8df8 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)