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: [V5,1/3] USB: serial: f81232: clear overrun flag From: Oliver Neukum Message-Id: <1554278395.20869.5.camel@suse.com> Date: Wed, 03 Apr 2019 09:59:55 +0200 To: "Ji-Ze Hong \(Peter Hong\)" , peter_hong@fintek.com.tw, johan@kernel.org, gregkh@linuxfoundation.org Cc: "Ji-Ze Hong \(Peter Hong\)" , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org List-ID: T24gTWksIDIwMTktMDQtMDMgYXQgMTQ6MjYgKzA4MDAsICBKaS1aZSBIb25nIChQZXRlciBIb25n KSAgd3JvdGU6Cj4gVGhlIEY4MTIzMiB3aWxsIHJlcG9ydCBkYXRhIGFuZCBMU1Igd2l0aCBidWxr IGxpa2UgZm9sbG93aW5nIGZvcm1hdDoKPiBidWxrLWluIGRhdGE6IFtMU1IoMUJ5dGUpK0RBVEEo MUJ5dGUpXVtMU1IoMUJ5dGUpK0RBVEEoMUJ5dGUpXS4uLgo+IAo+IExTUiB3aWxsIGF1dG8gY2xl YXIgZnJhbWUvcGFyaXR5L2JyZWFrIGVycm9yIGZsYWcgd2hlbiByZWFkaW5nIGJ5IEgvVywKPiBi dXQgb3ZlcnJydW4gd2lsbCBvbmx5IGNsZWFyZWQgd2hlbiByZWFkaW5nIExTUi4gU28gdGhpcyBw YXRjaCBhZGQgYQo+IHdvcmtlciB0byByZWFkIExTUiB3aGVuIG92ZXJydW4gYW5kIGZsdXNoIHRo ZSB3b3JrZXIgb24gY2xvc2UoKSAmCj4gc3VzcGVuZCgpLgoKSGksCgpJIGFtIG1vc3Qgc29ycnkg dG8gY29tcGxhaW4gYWdhaW4uIFBsZWFzZSBmb3JnaXZlIG1lIGZvciBiZWluZyBsZXNzCmNsZWFy IHRoYW4gbmVjZXNzYXJ5LgoKPiAKPiBDYzogT2xpdmVyIE5ldWt1bSA8b25ldWt1bUBzdXNlLmNv bT4KPiBTaWduZWQtb2ZmLWJ5OiBKaS1aZSBIb25nIChQZXRlciBIb25nKSA8aHBldGVyK2xpbnV4 X2tlcm5lbEBnbWFpbC5jb20+Cj4gLS0tCj4gdjU6Cj4gCTE6IFNvdXJjZSBjb2RlIGJhc2UgcmV2 ZXJ0IHRvIHYzIGFuZCByZW1vdmUgYWxsIHY0IGNoYW5nZXMuCj4gCTI6IEFkZCBzZXJpYWwtPnN1 c3BlbmRpbmcgY2hlY2sgaW4gZjgxMjMyX3Byb2Nlc3NfcmVhZF91cmIoKQo+IAkgICBiZWZvcmUg c2NoZWR1bGVfd29yaygmcHJpdi0+bHNyX3dvcmspIHRvIGF2b2lkIHJhY2UgY29uZGl0aW9uLgo+ IAo+IHY0Ogo+IAkxOiBBZGQgc2VyaWFsLT5zdXNwZW5kaW5nIGNoZWNrIGluIGY4MTIzMl9sc3Jf d29ya2VyKCkgdG8gYXZvaWQKPiAJICAgcmUtdHJpZ2dlcgo+IAkyOiBBZGQgcG9ydF9wcml2LWxz cl93b3JrX3Jlc2NoZWQgdG8gcmUtdHJpZ2dlciBMU1Igd29ya2VyCj4gCj4gdjM6Cj4gCTE6IEFk ZCBmbHVzaF93b3JrKCZwb3J0X3ByaXYtPmxzcl93b3JrKSBpbiBmODEyMzJfc3VzcGVuZCgpLgo+ IAo+IHYyOgo+IAkxOiBBZGQgZmx1c2hfd29yaygmcG9ydF9wcml2LT5sc3Jfd29yaykgaW4gZjgx MjMyX2Nsb3NlKCkuCj4gCj4gIGRyaXZlcnMvdXNiL3NlcmlhbC9mODEyMzIuYyB8IDM3ICsrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKPiAgMSBmaWxlIGNoYW5nZWQsIDM3IGlu c2VydGlvbnMoKykKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2Ivc2VyaWFsL2Y4MTIzMi5j IGIvZHJpdmVycy91c2Ivc2VyaWFsL2Y4MTIzMi5jCj4gaW5kZXggMGRjZGNiNGIyY2RlLi5kOGEw YmI3YTQxZjAgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy91c2Ivc2VyaWFsL2Y4MTIzMi5jCj4gKysr IGIvZHJpdmVycy91c2Ivc2VyaWFsL2Y4MTIzMi5jCj4gQEAgLTQxLDEyICs0MSwxNCBAQCBNT0RV TEVfREVWSUNFX1RBQkxFKHVzYiwgaWRfdGFibGUpOwo+ICAjZGVmaW5lIEZJRk9fQ09OVFJPTF9S RUdJU1RFUgkJKDB4MDIgKyBTRVJJQUxfQkFTRV9BRERSRVNTKQo+ICAjZGVmaW5lIExJTkVfQ09O VFJPTF9SRUdJU1RFUgkJKDB4MDMgKyBTRVJJQUxfQkFTRV9BRERSRVNTKQo+ICAjZGVmaW5lIE1P REVNX0NPTlRST0xfUkVHSVNURVIJCSgweDA0ICsgU0VSSUFMX0JBU0VfQUREUkVTUykKPiArI2Rl ZmluZSBMSU5FX1NUQVRVU19SRUdJU1RFUgkJKDB4MDUgKyBTRVJJQUxfQkFTRV9BRERSRVNTKQo+ ICAjZGVmaW5lIE1PREVNX1NUQVRVU19SRUdJU1RFUgkJKDB4MDYgKyBTRVJJQUxfQkFTRV9BRERS RVNTKQo+ICAKPiAgc3RydWN0IGY4MTIzMl9wcml2YXRlIHsKPiAgCXN0cnVjdCBtdXRleCBsb2Nr Owo+ICAJdTggbW9kZW1fY29udHJvbDsKPiAgCXU4IG1vZGVtX3N0YXR1czsKCkhlcmUgeW91IG5l ZWQgYSBmbGFnCgpib29sIGRlZmVycmVkX2xzcl93b3JrX25lZWRlZDsKPiArCXN0cnVjdCB3b3Jr X3N0cnVjdCBsc3Jfd29yazsKPiAgCXN0cnVjdCB3b3JrX3N0cnVjdCBpbnRlcnJ1cHRfd29yazsK PiAgCXN0cnVjdCB1c2Jfc2VyaWFsX3BvcnQgKnBvcnQ7Cj4gIH07Cj4gQEAgLTI4Miw2ICsyODQs OCBAQCBzdGF0aWMgdm9pZCBmODEyMzJfcmVhZF9pbnRfY2FsbGJhY2soc3RydWN0IHVyYiAqdXJi KQo+ICBzdGF0aWMgdm9pZCBmODEyMzJfcHJvY2Vzc19yZWFkX3VyYihzdHJ1Y3QgdXJiICp1cmIp Cj4gIHsKPiAgCXN0cnVjdCB1c2Jfc2VyaWFsX3BvcnQgKnBvcnQgPSB1cmItPmNvbnRleHQ7Cj4g KwlzdHJ1Y3QgdXNiX3NlcmlhbCAqc2VyaWFsID0gcG9ydC0+c2VyaWFsOwo+ICsJc3RydWN0IGY4 MTIzMl9wcml2YXRlICpwcml2ID0gdXNiX2dldF9zZXJpYWxfcG9ydF9kYXRhKHBvcnQpOwo+ICAJ dW5zaWduZWQgY2hhciAqZGF0YSA9IHVyYi0+dHJhbnNmZXJfYnVmZmVyOwo+ICAJY2hhciB0dHlf ZmxhZzsKPiAgCXVuc2lnbmVkIGludCBpOwo+IEBAIC0zMTUsNiArMzE5LDkgQEAgc3RhdGljIHZv aWQgZjgxMjMyX3Byb2Nlc3NfcmVhZF91cmIoc3RydWN0IHVyYiAqdXJiKQo+ICAKPiAgCQkJaWYg KGxzciAmIFVBUlRfTFNSX09FKSB7Cj4gIAkJCQlwb3J0LT5pY291bnQub3ZlcnJ1bisrOwo+ICsK PiArCQkJCWlmICghc2VyaWFsLT5zdXNwZW5kaW5nKQo+ICsJCQkJCXNjaGVkdWxlX3dvcmsoJnBy aXYtPmxzcl93b3JrKTsKWWVzLCBidXQgeW91IGNhbm5vdCBqdXN0IGRyb3AgaXQuIFlvdSBhbHNv IG5lZWQKCmVsc2UKCXByaXYtPmRlZmVycmVkX2xzcl93b3JrX25lZWRlZCA9IHRydWU7Cj4gIAkJ CQl0dHlfaW5zZXJ0X2ZsaXBfY2hhcigmcG9ydC0+cG9ydCwgMCwKPiAgCQkJCQkJVFRZX09WRVJS VU4pOwo+ICAJCQl9Cj4gQEAgLTU1Niw5ICs1NjMsMTIgQEAgc3RhdGljIGludCBmODEyMzJfb3Bl bihzdHJ1Y3QgdHR5X3N0cnVjdCAqdHR5LCBzdHJ1Y3QgdXNiX3NlcmlhbF9wb3J0ICpwb3J0KQo+ ICAKPiAgc3RhdGljIHZvaWQgZjgxMjMyX2Nsb3NlKHN0cnVjdCB1c2Jfc2VyaWFsX3BvcnQgKnBv cnQpCj4gIHsKPiArCXN0cnVjdCBmODEyMzJfcHJpdmF0ZSAqcG9ydF9wcml2ID0gdXNiX2dldF9z ZXJpYWxfcG9ydF9kYXRhKHBvcnQpOwo+ICsKPiAgCWY4MTIzMl9wb3J0X2Rpc2FibGUocG9ydCk7 Cj4gIAl1c2Jfc2VyaWFsX2dlbmVyaWNfY2xvc2UocG9ydCk7Cj4gIAl1c2Jfa2lsbF91cmIocG9y dC0+aW50ZXJydXB0X2luX3VyYik7Cj4gKwlmbHVzaF93b3JrKCZwb3J0X3ByaXYtPmxzcl93b3Jr KTsKPiAgfQo+ICAKPiAgc3RhdGljIHZvaWQgZjgxMjMyX2R0cl9ydHMoc3RydWN0IHVzYl9zZXJp YWxfcG9ydCAqcG9ydCwgaW50IG9uKQo+IEBAIC02MDMsNiArNjEzLDIxIEBAIHN0YXRpYyB2b2lk ICBmODEyMzJfaW50ZXJydXB0X3dvcmsoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQo+ICAJZjgx MjMyX3JlYWRfbXNyKHByaXYtPnBvcnQpOwo+ICB9Cj4gIAo+ICtzdGF0aWMgdm9pZCBmODEyMzJf bHNyX3dvcmtlcihzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCj4gK3sKPiArCXN0cnVjdCBmODEy MzJfcHJpdmF0ZSAqcHJpdjsKPiArCXN0cnVjdCB1c2Jfc2VyaWFsX3BvcnQgKnBvcnQ7Cj4gKwlp bnQgc3RhdHVzOwo+ICsJdTggdG1wOwo+ICsKPiArCXByaXYgPSBjb250YWluZXJfb2Yod29yaywg c3RydWN0IGY4MTIzMl9wcml2YXRlLCBsc3Jfd29yayk7Cj4gKwlwb3J0ID0gcHJpdi0+cG9ydDsK PiArCj4gKwlzdGF0dXMgPSBmODEyMzJfZ2V0X3JlZ2lzdGVyKHBvcnQsIExJTkVfU1RBVFVTX1JF R0lTVEVSLCAmdG1wKTsKPiArCWlmIChzdGF0dXMpCj4gKwkJZGV2X3dhcm4oJnBvcnQtPmRldiwg InJlYWQgTFNSIGZhaWxlZDogJWRcbiIsIHN0YXR1cyk7Cj4gK30KPiArCj4gIHN0YXRpYyBpbnQg ZjgxMjMyX3BvcnRfcHJvYmUoc3RydWN0IHVzYl9zZXJpYWxfcG9ydCAqcG9ydCkKPiAgewo+ICAJ c3RydWN0IGY4MTIzMl9wcml2YXRlICpwcml2Owo+IEBAIC02MTMsNiArNjM4LDcgQEAgc3RhdGlj IGludCBmODEyMzJfcG9ydF9wcm9iZShzdHJ1Y3QgdXNiX3NlcmlhbF9wb3J0ICpwb3J0KQo+ICAK PiAgCW11dGV4X2luaXQoJnByaXYtPmxvY2spOwo+ICAJSU5JVF9XT1JLKCZwcml2LT5pbnRlcnJ1 cHRfd29yaywgIGY4MTIzMl9pbnRlcnJ1cHRfd29yayk7Cj4gKwlJTklUX1dPUksoJnByaXYtPmxz cl93b3JrLCBmODEyMzJfbHNyX3dvcmtlcik7Cj4gIAo+ICAJdXNiX3NldF9zZXJpYWxfcG9ydF9k YXRhKHBvcnQsIHByaXYpOwo+ICAKPiBAQCAtNjMyLDYgKzY1OCwxNiBAQCBzdGF0aWMgaW50IGY4 MTIzMl9wb3J0X3JlbW92ZShzdHJ1Y3QgdXNiX3NlcmlhbF9wb3J0ICpwb3J0KQo+ICAJcmV0dXJu IDA7Cj4gIH0KPiAgCj4gK3N0YXRpYyBpbnQgZjgxMjMyX3N1c3BlbmQoc3RydWN0IHVzYl9zZXJp YWwgKnNlcmlhbCwgcG1fbWVzc2FnZV90IG1lc3NhZ2UpCj4gK3sKPiArCXN0cnVjdCBmODEyMzJf cHJpdmF0ZSAqcG9ydF9wcml2Owo+ICsKPiArCXBvcnRfcHJpdiA9IHVzYl9nZXRfc2VyaWFsX3Bv cnRfZGF0YShzZXJpYWwtPnBvcnRbMF0pOwo+ICsJZmx1c2hfd29yaygmcG9ydF9wcml2LT5sc3Jf d29yayk7Cj4gKwo+ICsJcmV0dXJuIDA7Cj4gK30KCkFuZCB5b3UgZG8gbmVlZCBhIHJlc3VtZSwg d2hpY2ggeW91IGhhZCBpbiB2ZXJzaW9uIHY0IHRvIGNoZWNrCnRoZSAgZGVmZXJyZWRfbHNyX3dv cmtfbmVlZGVkIGZsYWcgYW5kIHNjaGVkdWxlIHRoZSB3b3JrIGlmIGl0IGlzCnNldC4KCglNb3N0 IHNvcnJ5CgkJT2xpdmVyCg== 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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 570CCC4360F for ; Wed, 3 Apr 2019 08:00:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2939B20830 for ; Wed, 3 Apr 2019 08:00:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728792AbfDCIAL (ORCPT ); Wed, 3 Apr 2019 04:00:11 -0400 Received: from mx2.suse.de ([195.135.220.15]:40104 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726084AbfDCIAL (ORCPT ); Wed, 3 Apr 2019 04:00:11 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id DBDDAADA3; Wed, 3 Apr 2019 08:00:08 +0000 (UTC) Message-ID: <1554278395.20869.5.camel@suse.com> Subject: Re: [PATCH V5 1/3] USB: serial: f81232: clear overrun flag From: Oliver Neukum To: "Ji-Ze Hong (Peter Hong)" , peter_hong@fintek.com.tw, johan@kernel.org, gregkh@linuxfoundation.org Cc: "Ji-Ze Hong (Peter Hong)" , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Date: Wed, 03 Apr 2019 09:59:55 +0200 In-Reply-To: <1554272790-26747-1-git-send-email-hpeter+linux_kernel@gmail.com> References: <1554272790-26747-1-git-send-email-hpeter+linux_kernel@gmail.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.26.6 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mi, 2019-04-03 at 14:26 +0800, Ji-Ze Hong (Peter Hong) wrote: > 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(). Hi, I am most sorry to complain again. Please forgive me for being less clear than necessary. > > Cc: Oliver Neukum > Signed-off-by: Ji-Ze Hong (Peter Hong) > --- > 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 | 37 +++++++++++++++++++++++++++++++++++++ > 1 file changed, 37 insertions(+) > > diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c > index 0dcdcb4b2cde..d8a0bb7a41f0 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; Here you need a flag bool deferred_lsr_work_needed; > + struct work_struct lsr_work; > struct work_struct interrupt_work; > struct usb_serial_port *port; > }; > @@ -282,6 +284,8 @@ 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 usb_serial *serial = port->serial; > + 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,9 @@ static void f81232_process_read_urb(struct urb *urb) > > if (lsr & UART_LSR_OE) { > port->icount.overrun++; > + > + if (!serial->suspending) > + schedule_work(&priv->lsr_work); Yes, but you cannot just drop it. You also need else priv->deferred_lsr_work_needed = true; > tty_insert_flip_char(&port->port, 0, > TTY_OVERRUN); > } > @@ -556,9 +563,12 @@ static int f81232_open(struct tty_struct *tty, struct usb_serial_port *port) > > static void f81232_close(struct usb_serial_port *port) > { > + struct f81232_private *port_priv = usb_get_serial_port_data(port); > + > f81232_port_disable(port); > usb_serial_generic_close(port); > usb_kill_urb(port->interrupt_in_urb); > + flush_work(&port_priv->lsr_work); > } > > static void f81232_dtr_rts(struct usb_serial_port *port, int on) > @@ -603,6 +613,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 +638,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 +658,16 @@ static int f81232_port_remove(struct usb_serial_port *port) > return 0; > } > > +static int f81232_suspend(struct usb_serial *serial, pm_message_t message) > +{ > + struct f81232_private *port_priv; > + > + port_priv = usb_get_serial_port_data(serial->port[0]); > + flush_work(&port_priv->lsr_work); > + > + return 0; > +} And you do need a resume, which you had in version v4 to check the deferred_lsr_work_needed flag and schedule the work if it is set. Most sorry Oliver