From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [V9,1/4] USB: serial: f81232: fix interrupt worker not stop From: "Ji-Ze Hong \(Peter Hong\)" Message-Id: <1556587352-19500-1-git-send-email-hpeter+linux_kernel@gmail.com> Date: Tue, 30 Apr 2019 09:22:29 +0800 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\)" List-ID: VGhlIEY4MTIzMiB3aWxsIHVzZSBpbnRlcnJ1cHQgd29ya2VyIHRvIGhhbmRsZSBNU1IgY2hhbmdl LgpUaGlzIHBhdGNoIHdpbGwgZml4IHRoZSBpc3N1ZSB0aGF0IGludGVycnVwdCB3b3JrIHNob3Vs ZCBzdG9wCmluIGNsb3NlKCkgYW5kIHN1c3BlbmQoKS4KCkNjOiBKb2hhbiBIb3ZvbGQgPGpvaGFu QGtlcm5lbC5vcmc+ClNpZ25lZC1vZmYtYnk6IEppLVplIEhvbmcgKFBldGVyIEhvbmcpIDxocGV0 ZXIrbGludXhfa2VybmVsQGdtYWlsLmNvbT4KLS0tCnY5OgoJMTogY2hhbmdlIHRoZSBzZXF1ZW5j ZSBmcm9tIHBhdGNoIGluZGV4IGZyb20gMiB0byAxLgoJMjogdXNpbmcgdHR5X3BvcnRfaW5pdGlh bGl6ZWQoKSB0byBkZXRlcm1pbmF0ZSBwb3J0IG9wZW4gc3RhdGUuCgp2ODoKCTE6IG5vIGNoYW5n ZQoKdjc6CgkxOiBmaXJzdCBpbnRyb2R1Y2UgdG8gdGhpcyBzZXJpZXMgcGF0Y2guCgogZHJpdmVy cy91c2Ivc2VyaWFsL2Y4MTIzMi5jIHwgMzkgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwgMzkgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvdXNiL3NlcmlhbC9mODEyMzIuYyBiL2RyaXZlcnMvdXNiL3NlcmlhbC9mODEyMzIu YwppbmRleCAwZGNkY2I0YjJjZGUuLmQ0M2VjOTk5YmM1ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy91 c2Ivc2VyaWFsL2Y4MTIzMi5jCisrKyBiL2RyaXZlcnMvdXNiL3NlcmlhbC9mODEyMzIuYwpAQCAt NTU2LDkgKzU1NiwxMiBAQCBzdGF0aWMgaW50IGY4MTIzMl9vcGVuKHN0cnVjdCB0dHlfc3RydWN0 ICp0dHksIHN0cnVjdCB1c2Jfc2VyaWFsX3BvcnQgKnBvcnQpCiAKIHN0YXRpYyB2b2lkIGY4MTIz Ml9jbG9zZShzdHJ1Y3QgdXNiX3NlcmlhbF9wb3J0ICpwb3J0KQogeworCXN0cnVjdCBmODEyMzJf cHJpdmF0ZSAqcG9ydF9wcml2ID0gdXNiX2dldF9zZXJpYWxfcG9ydF9kYXRhKHBvcnQpOworCiAJ ZjgxMjMyX3BvcnRfZGlzYWJsZShwb3J0KTsKIAl1c2Jfc2VyaWFsX2dlbmVyaWNfY2xvc2UocG9y dCk7CiAJdXNiX2tpbGxfdXJiKHBvcnQtPmludGVycnVwdF9pbl91cmIpOworCWZsdXNoX3dvcmso JnBvcnRfcHJpdi0+aW50ZXJydXB0X3dvcmspOwogfQogCiBzdGF0aWMgdm9pZCBmODEyMzJfZHRy X3J0cyhzdHJ1Y3QgdXNiX3NlcmlhbF9wb3J0ICpwb3J0LCBpbnQgb24pCkBAIC02MzIsNiArNjM1 LDQwIEBAIHN0YXRpYyBpbnQgZjgxMjMyX3BvcnRfcmVtb3ZlKHN0cnVjdCB1c2Jfc2VyaWFsX3Bv cnQgKnBvcnQpCiAJcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyBpbnQgZjgxMjMyX3N1c3BlbmQoc3Ry dWN0IHVzYl9zZXJpYWwgKnNlcmlhbCwgcG1fbWVzc2FnZV90IG1lc3NhZ2UpCit7CisJc3RydWN0 IHVzYl9zZXJpYWxfcG9ydCAqcG9ydCA9IHNlcmlhbC0+cG9ydFswXTsKKwlzdHJ1Y3QgZjgxMjMy X3ByaXZhdGUgKnBvcnRfcHJpdiA9IHVzYl9nZXRfc2VyaWFsX3BvcnRfZGF0YShwb3J0KTsKKwlp bnQgaTsKKworCWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKHBvcnQtPnJlYWRfdXJicyk7ICsr aSkKKwkJdXNiX2tpbGxfdXJiKHBvcnQtPnJlYWRfdXJic1tpXSk7CisKKwl1c2Jfa2lsbF91cmIo cG9ydC0+aW50ZXJydXB0X2luX3VyYik7CisKKwlpZiAocG9ydF9wcml2KQorCQlmbHVzaF93b3Jr KCZwb3J0X3ByaXYtPmludGVycnVwdF93b3JrKTsKKworCXJldHVybiAwOworfQorCitzdGF0aWMg aW50IGY4MTIzMl9yZXN1bWUoc3RydWN0IHVzYl9zZXJpYWwgKnNlcmlhbCkKK3sKKwlzdHJ1Y3Qg dXNiX3NlcmlhbF9wb3J0ICpwb3J0ID0gc2VyaWFsLT5wb3J0WzBdOworCWludCByZXN1bHQ7CisK KwlpZiAodHR5X3BvcnRfaW5pdGlhbGl6ZWQoJnBvcnQtPnBvcnQpKSB7CisJCXJlc3VsdCA9IHVz Yl9zdWJtaXRfdXJiKHBvcnQtPmludGVycnVwdF9pbl91cmIsIEdGUF9OT0lPKTsKKwkJaWYgKHJl c3VsdCkgeworCQkJZGV2X2VycigmcG9ydC0+ZGV2LCAic3VibWl0IGludGVycnVwdCB1cmIgZmFp bGVkOiAlZCIsCisJCQkJCXJlc3VsdCk7CisJCQlyZXR1cm4gcmVzdWx0OworCQl9CisJfQorCisJ cmV0dXJuIHVzYl9zZXJpYWxfZ2VuZXJpY19yZXN1bWUoc2VyaWFsKTsKK30KKwogc3RhdGljIHN0 cnVjdCB1c2Jfc2VyaWFsX2RyaXZlciBmODEyMzJfZGV2aWNlID0gewogCS5kcml2ZXIgPSB7CiAJ CS5vd25lciA9CVRISVNfTU9EVUxFLApAQCAtNjU1LDYgKzY5Miw4IEBAIHN0YXRpYyBzdHJ1Y3Qg dXNiX3NlcmlhbF9kcml2ZXIgZjgxMjMyX2RldmljZSA9IHsKIAkucmVhZF9pbnRfY2FsbGJhY2sg PQlmODEyMzJfcmVhZF9pbnRfY2FsbGJhY2ssCiAJLnBvcnRfcHJvYmUgPQkJZjgxMjMyX3BvcnRf cHJvYmUsCiAJLnBvcnRfcmVtb3ZlID0JCWY4MTIzMl9wb3J0X3JlbW92ZSwKKwkuc3VzcGVuZCA9 CQlmODEyMzJfc3VzcGVuZCwKKwkucmVzdW1lID0JCWY4MTIzMl9yZXN1bWUsCiB9OwogCiBzdGF0 aWMgc3RydWN0IHVzYl9zZXJpYWxfZHJpdmVyICogY29uc3Qgc2VyaWFsX2RyaXZlcnNbXSA9IHsK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23642C43219 for ; Tue, 30 Apr 2019 01:23:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E6C9F21655 for ; Tue, 30 Apr 2019 01:23:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="c7QlO3Pm" 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 Content-Type: text/plain; charset="UTF-8" Message-ID: <20190430012229.5yFoxu4g1MmNiCdVqPTsCcpmFt1mB6GQ0AzN6wv93JA@z> 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[] = { -- 2.7.4