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: [V6,1/3] USB: serial: f81232: clear overrun flag From: "Ji-Ze Hong \(Peter Hong\)" Message-Id: <1554280832-29286-1-git-send-email-hpeter+linux_kernel@gmail.com> Date: Wed, 3 Apr 2019 16:40:30 +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\)" , Oliver Neukum List-ID: VGhlIEY4MTIzMiB3aWxsIHJlcG9ydCBkYXRhIGFuZCBMU1Igd2l0aCBidWxrIGxpa2UgZm9sbG93 aW5nIGZvcm1hdDoKYnVsay1pbiBkYXRhOiBbTFNSKDFCeXRlKStEQVRBKDFCeXRlKV1bTFNSKDFC eXRlKStEQVRBKDFCeXRlKV0uLi4KCkxTUiB3aWxsIGF1dG8gY2xlYXIgZnJhbWUvcGFyaXR5L2Jy ZWFrIGVycm9yIGZsYWcgd2hlbiByZWFkaW5nIGJ5IEgvVywKYnV0IG92ZXJycnVuIHdpbGwgb25s eSBjbGVhcmVkIHdoZW4gcmVhZGluZyBMU1IuIFNvIHRoaXMgcGF0Y2ggYWRkIGEKd29ya2VyIHRv IHJlYWQgTFNSIHdoZW4gb3ZlcnJ1biBhbmQgZmx1c2ggdGhlIHdvcmtlciBvbiBjbG9zZSgpICYK c3VzcGVuZCgpLgoKQ2M6IE9saXZlciBOZXVrdW0gPG9uZXVrdW1Ac3VzZS5jb20+ClNpZ25lZC1v ZmYtYnk6IEppLVplIEhvbmcgKFBldGVyIEhvbmcpIDxocGV0ZXIrbGludXhfa2VybmVsQGdtYWls LmNvbT4KLS0tClY2OgoJMTogQWRkIGRlZmVycmVkX2xzcl93b3JrX25lZWRlZCB0byByZS10cmln Z2VyIHdoZW4gZjgxMjMyX3Jlc3VtZSgpCgp2NToKCTE6IFNvdXJjZSBjb2RlIGJhc2UgcmV2ZXJ0 IHRvIHYzIGFuZCByZW1vdmUgYWxsIHY0IGNoYW5nZXMuCgkyOiBBZGQgc2VyaWFsLT5zdXNwZW5k aW5nIGNoZWNrIGluIGY4MTIzMl9wcm9jZXNzX3JlYWRfdXJiKCkKCSAgIGJlZm9yZSBzY2hlZHVs ZV93b3JrKCZwcml2LT5sc3Jfd29yaykgdG8gYXZvaWQgcmFjZSBjb25kaXRpb24uCgp2NDoKCTE6 IEFkZCBzZXJpYWwtPnN1c3BlbmRpbmcgY2hlY2sgaW4gZjgxMjMyX2xzcl93b3JrZXIoKSB0byBh dm9pZAoJICAgcmUtdHJpZ2dlcgoJMjogQWRkIHBvcnRfcHJpdi1sc3Jfd29ya19yZXNjaGVkIHRv IHJlLXRyaWdnZXIgTFNSIHdvcmtlcgoKdjM6CgkxOiBBZGQgZmx1c2hfd29yaygmcG9ydF9wcml2 LT5sc3Jfd29yaykgaW4gZjgxMjMyX3N1c3BlbmQoKS4KCnYyOgoJMTogQWRkIGZsdXNoX3dvcmso JnBvcnRfcHJpdi0+bHNyX3dvcmspIGluIGY4MTIzMl9jbG9zZSgpLgoKIGRyaXZlcnMvdXNiL3Nl cmlhbC9mODEyMzIuYyB8IDU1ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDU1IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9k cml2ZXJzL3VzYi9zZXJpYWwvZjgxMjMyLmMgYi9kcml2ZXJzL3VzYi9zZXJpYWwvZjgxMjMyLmMK aW5kZXggMGRjZGNiNGIyY2RlLi42MDBlMWY0ZDk0ZTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNi L3NlcmlhbC9mODEyMzIuYworKysgYi9kcml2ZXJzL3VzYi9zZXJpYWwvZjgxMjMyLmMKQEAgLTQx LDEyICs0MSwxNSBAQCBNT0RVTEVfREVWSUNFX1RBQkxFKHVzYiwgaWRfdGFibGUpOwogI2RlZmlu ZSBGSUZPX0NPTlRST0xfUkVHSVNURVIJCSgweDAyICsgU0VSSUFMX0JBU0VfQUREUkVTUykKICNk ZWZpbmUgTElORV9DT05UUk9MX1JFR0lTVEVSCQkoMHgwMyArIFNFUklBTF9CQVNFX0FERFJFU1Mp CiAjZGVmaW5lIE1PREVNX0NPTlRST0xfUkVHSVNURVIJCSgweDA0ICsgU0VSSUFMX0JBU0VfQURE UkVTUykKKyNkZWZpbmUgTElORV9TVEFUVVNfUkVHSVNURVIJCSgweDA1ICsgU0VSSUFMX0JBU0Vf QUREUkVTUykKICNkZWZpbmUgTU9ERU1fU1RBVFVTX1JFR0lTVEVSCQkoMHgwNiArIFNFUklBTF9C QVNFX0FERFJFU1MpCiAKIHN0cnVjdCBmODEyMzJfcHJpdmF0ZSB7CiAJc3RydWN0IG11dGV4IGxv Y2s7CiAJdTggbW9kZW1fY29udHJvbDsKIAl1OCBtb2RlbV9zdGF0dXM7CisJYm9vbCBkZWZlcnJl ZF9sc3Jfd29ya19uZWVkZWQ7CisJc3RydWN0IHdvcmtfc3RydWN0IGxzcl93b3JrOwogCXN0cnVj dCB3b3JrX3N0cnVjdCBpbnRlcnJ1cHRfd29yazsKIAlzdHJ1Y3QgdXNiX3NlcmlhbF9wb3J0ICpw b3J0OwogfTsKQEAgLTI4Miw2ICsyODUsOCBAQCBzdGF0aWMgdm9pZCBmODEyMzJfcmVhZF9pbnRf Y2FsbGJhY2soc3RydWN0IHVyYiAqdXJiKQogc3RhdGljIHZvaWQgZjgxMjMyX3Byb2Nlc3NfcmVh ZF91cmIoc3RydWN0IHVyYiAqdXJiKQogewogCXN0cnVjdCB1c2Jfc2VyaWFsX3BvcnQgKnBvcnQg PSB1cmItPmNvbnRleHQ7CisJc3RydWN0IHVzYl9zZXJpYWwgKnNlcmlhbCA9IHBvcnQtPnNlcmlh bDsKKwlzdHJ1Y3QgZjgxMjMyX3ByaXZhdGUgKnByaXYgPSB1c2JfZ2V0X3NlcmlhbF9wb3J0X2Rh dGEocG9ydCk7CiAJdW5zaWduZWQgY2hhciAqZGF0YSA9IHVyYi0+dHJhbnNmZXJfYnVmZmVyOwog CWNoYXIgdHR5X2ZsYWc7CiAJdW5zaWduZWQgaW50IGk7CkBAIC0zMTUsNiArMzIwLDEyIEBAIHN0 YXRpYyB2b2lkIGY4MTIzMl9wcm9jZXNzX3JlYWRfdXJiKHN0cnVjdCB1cmIgKnVyYikKIAogCQkJ aWYgKGxzciAmIFVBUlRfTFNSX09FKSB7CiAJCQkJcG9ydC0+aWNvdW50Lm92ZXJydW4rKzsKKwor CQkJCWlmICghc2VyaWFsLT5zdXNwZW5kaW5nKQorCQkJCQlzY2hlZHVsZV93b3JrKCZwcml2LT5s c3Jfd29yayk7CisJCQkJZWxzZQorCQkJCQlwcml2LT5kZWZlcnJlZF9sc3Jfd29ya19uZWVkZWQg PSB0cnVlOworCiAJCQkJdHR5X2luc2VydF9mbGlwX2NoYXIoJnBvcnQtPnBvcnQsIDAsCiAJCQkJ CQlUVFlfT1ZFUlJVTik7CiAJCQl9CkBAIC01NTYsOSArNTY3LDEyIEBAIHN0YXRpYyBpbnQgZjgx MjMyX29wZW4oc3RydWN0IHR0eV9zdHJ1Y3QgKnR0eSwgc3RydWN0IHVzYl9zZXJpYWxfcG9ydCAq cG9ydCkKIAogc3RhdGljIHZvaWQgZjgxMjMyX2Nsb3NlKHN0cnVjdCB1c2Jfc2VyaWFsX3BvcnQg KnBvcnQpCiB7CisJc3RydWN0IGY4MTIzMl9wcml2YXRlICpwb3J0X3ByaXYgPSB1c2JfZ2V0X3Nl cmlhbF9wb3J0X2RhdGEocG9ydCk7CisKIAlmODEyMzJfcG9ydF9kaXNhYmxlKHBvcnQpOwogCXVz Yl9zZXJpYWxfZ2VuZXJpY19jbG9zZShwb3J0KTsKIAl1c2Jfa2lsbF91cmIocG9ydC0+aW50ZXJy dXB0X2luX3VyYik7CisJZmx1c2hfd29yaygmcG9ydF9wcml2LT5sc3Jfd29yayk7CiB9CiAKIHN0 YXRpYyB2b2lkIGY4MTIzMl9kdHJfcnRzKHN0cnVjdCB1c2Jfc2VyaWFsX3BvcnQgKnBvcnQsIGlu dCBvbikKQEAgLTYwMyw2ICs2MTcsMjEgQEAgc3RhdGljIHZvaWQgIGY4MTIzMl9pbnRlcnJ1cHRf d29yayhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJZjgxMjMyX3JlYWRfbXNyKHByaXYtPnBv cnQpOwogfQogCitzdGF0aWMgdm9pZCBmODEyMzJfbHNyX3dvcmtlcihzdHJ1Y3Qgd29ya19zdHJ1 Y3QgKndvcmspCit7CisJc3RydWN0IGY4MTIzMl9wcml2YXRlICpwcml2OworCXN0cnVjdCB1c2Jf c2VyaWFsX3BvcnQgKnBvcnQ7CisJaW50IHN0YXR1czsKKwl1OCB0bXA7CisKKwlwcml2ID0gY29u dGFpbmVyX29mKHdvcmssIHN0cnVjdCBmODEyMzJfcHJpdmF0ZSwgbHNyX3dvcmspOworCXBvcnQg PSBwcml2LT5wb3J0OworCisJc3RhdHVzID0gZjgxMjMyX2dldF9yZWdpc3Rlcihwb3J0LCBMSU5F X1NUQVRVU19SRUdJU1RFUiwgJnRtcCk7CisJaWYgKHN0YXR1cykKKwkJZGV2X3dhcm4oJnBvcnQt PmRldiwgInJlYWQgTFNSIGZhaWxlZDogJWRcbiIsIHN0YXR1cyk7Cit9CisKIHN0YXRpYyBpbnQg ZjgxMjMyX3BvcnRfcHJvYmUoc3RydWN0IHVzYl9zZXJpYWxfcG9ydCAqcG9ydCkKIHsKIAlzdHJ1 Y3QgZjgxMjMyX3ByaXZhdGUgKnByaXY7CkBAIC02MTMsNiArNjQyLDcgQEAgc3RhdGljIGludCBm ODEyMzJfcG9ydF9wcm9iZShzdHJ1Y3QgdXNiX3NlcmlhbF9wb3J0ICpwb3J0KQogCiAJbXV0ZXhf aW5pdCgmcHJpdi0+bG9jayk7CiAJSU5JVF9XT1JLKCZwcml2LT5pbnRlcnJ1cHRfd29yaywgIGY4 MTIzMl9pbnRlcnJ1cHRfd29yayk7CisJSU5JVF9XT1JLKCZwcml2LT5sc3Jfd29yaywgZjgxMjMy X2xzcl93b3JrZXIpOwogCiAJdXNiX3NldF9zZXJpYWxfcG9ydF9kYXRhKHBvcnQsIHByaXYpOwog CkBAIC02MzIsNiArNjYyLDI5IEBAIHN0YXRpYyBpbnQgZjgxMjMyX3BvcnRfcmVtb3ZlKHN0cnVj dCB1c2Jfc2VyaWFsX3BvcnQgKnBvcnQpCiAJcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyBpbnQgZjgx MjMyX3N1c3BlbmQoc3RydWN0IHVzYl9zZXJpYWwgKnNlcmlhbCwgcG1fbWVzc2FnZV90IG1lc3Nh Z2UpCit7CisJc3RydWN0IGY4MTIzMl9wcml2YXRlICpwb3J0X3ByaXY7CisKKwlwb3J0X3ByaXYg PSB1c2JfZ2V0X3NlcmlhbF9wb3J0X2RhdGEoc2VyaWFsLT5wb3J0WzBdKTsKKwlmbHVzaF93b3Jr KCZwb3J0X3ByaXYtPmxzcl93b3JrKTsKKworCXJldHVybiAwOworfQorCitzdGF0aWMgaW50IGY4 MTIzMl9yZXN1bWUoc3RydWN0IHVzYl9zZXJpYWwgKnNlcmlhbCkKK3sKKwlzdHJ1Y3QgZjgxMjMy X3ByaXZhdGUgKnBvcnRfcHJpdjsKKworCXBvcnRfcHJpdiA9IHVzYl9nZXRfc2VyaWFsX3BvcnRf ZGF0YShzZXJpYWwtPnBvcnRbMF0pOworCWlmIChwb3J0X3ByaXYtPmRlZmVycmVkX2xzcl93b3Jr X25lZWRlZCkgeworCQlwb3J0X3ByaXYtPmRlZmVycmVkX2xzcl93b3JrX25lZWRlZCA9IGZhbHNl OworCQlzY2hlZHVsZV93b3JrKCZwb3J0X3ByaXYtPmxzcl93b3JrKTsKKwl9CisKKwlyZXR1cm4g dXNiX3NlcmlhbF9nZW5lcmljX3Jlc3VtZShzZXJpYWwpOworfQorCiBzdGF0aWMgc3RydWN0IHVz Yl9zZXJpYWxfZHJpdmVyIGY4MTIzMl9kZXZpY2UgPSB7CiAJLmRyaXZlciA9IHsKIAkJLm93bmVy ID0JVEhJU19NT0RVTEUsCkBAIC02NTUsNiArNzA4LDggQEAgc3RhdGljIHN0cnVjdCB1c2Jfc2Vy aWFsX2RyaXZlciBmODEyMzJfZGV2aWNlID0gewogCS5yZWFkX2ludF9jYWxsYmFjayA9CWY4MTIz Ml9yZWFkX2ludF9jYWxsYmFjaywKIAkucG9ydF9wcm9iZSA9CQlmODEyMzJfcG9ydF9wcm9iZSwK IAkucG9ydF9yZW1vdmUgPQkJZjgxMjMyX3BvcnRfcmVtb3ZlLAorCS5zdXNwZW5kID0JCWY4MTIz Ml9zdXNwZW5kLAorCS5yZXN1bWUgPQkJZjgxMjMyX3Jlc3VtZSwKIH07CiAKIHN0YXRpYyBzdHJ1 Y3QgdXNiX3NlcmlhbF9kcml2ZXIgKiBjb25zdCBzZXJpYWxfZHJpdmVyc1tdID0gewo= 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,URIBL_BLOCKED,USER_AGENT_GIT 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 1F5D1C4360F for ; Wed, 3 Apr 2019 08:40:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D96F4206B7 for ; Wed, 3 Apr 2019 08:40:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jTf2QaeP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728973AbfDCIkj (ORCPT ); Wed, 3 Apr 2019 04:40:39 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:37535 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726084AbfDCIkj (ORCPT ); Wed, 3 Apr 2019 04:40:39 -0400 Received: by mail-pg1-f194.google.com with SMTP id e6so3597738pgc.4; Wed, 03 Apr 2019 01:40:38 -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=aM2h7Uy7SZKtM8C0EfW2GUNH1XIUxG3SsKixMsxZK4Q=; b=jTf2QaePVkgzP5yVJgfn+3XMWUuVyIm3nnfI6zaTGX+gnpRNbS2EToVH+WbJyeSPw6 IVExptzbgAqCP/W/h3CWEJip+zN2qJzZLCFcAPVJhOAen1qfanuE7et0Qp00aKZ/Gx/G 7K8+SRF3+MJakxmvLjNr5qIcj0dSLy+RfdGrtHvPPuiY6GQofkBq1R0q3Xc3jcWJCqO3 MqUrhiCD6Y6iHU2sea14k93WILx0vIownZPWnqSMnA0pW4y4JTMfdiZmAiGACpiJ7CTR a/4pJQ7zDK9Cio9Rn/dDaw7UsP2QGjO7Wb0UA6uT/PCDrkyjR9Uukr48PWGqCMtV8bu4 gUtw== 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=aM2h7Uy7SZKtM8C0EfW2GUNH1XIUxG3SsKixMsxZK4Q=; b=m10lRdGuIejrAOSyhSLdO6n8RSPFexwpclN3KVvkyPSyMFhdjylManeyj1ierYX1jZ 6CaeA/0bw7EfiQx2Eb996FQBcusrfbwHFl4tHueX0waRBw+LInzPfA5KGiW7rtY0aYpv 3jZAODPJtmmlKdJ0LUl/Ssdap5Z4VQMYKedkmwzP+sapwsbzRNmEb6nhkaq7fRTOitAp 3m0pNhRMOveH/d8F79bvWT5gERNeVHWrnzu6Rg4f3KTsrtVECPSDtk1VH+oWJ9RXUdM2 CqOc8rqDCpaz7sXA4tKMA9hlb9jgCXSXQCVmcrjoFifB6mP+UbNbxdWspu6XSsC3fEho iATQ== X-Gm-Message-State: APjAAAUTui8xZOTvZrMHVnJ6yuHUKEE6F6BkpcWoNU5P4TNJM5FIIOHd F7JC4648E+7RqvLSPRmJdgo= X-Google-Smtp-Source: APXvYqyDKux11Uf0SXqGFn79aEwz6/XhzcCO/Fz5loG25ods8KZLNlaHtvGzNdDp5vu/54KU7x69Xw== X-Received: by 2002:a63:3190:: with SMTP id x138mr64048908pgx.273.1554280838057; Wed, 03 Apr 2019 01:40:38 -0700 (PDT) Received: from localhost (59-120-186-245.HINET-IP.hinet.net. [59.120.186.245]) by smtp.gmail.com with ESMTPSA id d15sm22997514pfo.34.2019.04.03.01.40.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 01:40:37 -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 V6 1/3] USB: serial: f81232: clear overrun flag Date: Wed, 3 Apr 2019 16:40:30 +0800 Message-Id: <1554280832-29286-1-git-send-email-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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) --- 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 | 55 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index 0dcdcb4b2cde..600e1f4d94e0 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 deferred_lsr_work_needed; + struct work_struct lsr_work; struct work_struct interrupt_work; struct usb_serial_port *port; }; @@ -282,6 +285,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 +320,12 @@ 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); + else + priv->deferred_lsr_work_needed = true; + tty_insert_flip_char(&port->port, 0, TTY_OVERRUN); } @@ -556,9 +567,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 +617,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 +642,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 +662,29 @@ 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; +} + +static int f81232_resume(struct usb_serial *serial) +{ + struct f81232_private *port_priv; + + port_priv = usb_get_serial_port_data(serial->port[0]); + if (port_priv->deferred_lsr_work_needed) { + port_priv->deferred_lsr_work_needed = false; + schedule_work(&port_priv->lsr_work); + } + + return usb_serial_generic_resume(serial); +} + static struct usb_serial_driver f81232_device = { .driver = { .owner = THIS_MODULE, @@ -655,6 +708,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