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,3/4] USB: serial: f81232: add high baud rate support From: "Ji-Ze Hong \(Peter Hong\)" Message-Id: <1556587352-19500-3-git-send-email-hpeter+linux_kernel@gmail.com> Date: Tue, 30 Apr 2019 09:22:31 +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: VGhlIEY4MTIzMiBoYWQgNCBjbG9ja3NvdXJjZSAxLjg0Ni8xOC40Ni8xNC43Ny8yNE1IeiBhbmQg YmF1ZCByYXRlcwpjYW4gYmUgdXAgdG8gMS41TWJpdHMgd2l0aCAyNE1Iei4KCkY4MTIzMiBDbG9j ayByZWdpc3RlcnMgKDEwNmgpCgpCaXQxLTA6ICAgICBDbG9jayBzb3VyY2Ugc2VsZWN0b3IKICAg ICAgICAgICAgICAgICAgICAwMDogMS44NDZNSHouCiAgICAgICAgICAgICAgICAgICAgMDE6IDE4 LjQ2TUh6LgogICAgICAgICAgICAgICAgICAgIDEwOiAyNE1Iei4KICAgICAgICAgICAgICAgICAg ICAxMTogMTQuNzdNSHouCgpTaWduZWQtb2ZmLWJ5OiBKaS1aZSBIb25nIChQZXRlciBIb25nKSA8 aHBldGVyK2xpbnV4X2tlcm5lbEBnbWFpbC5jb20+Ci0tLQp2OToKCTE6IG5vIGNoYW5nZQoKdjg6 CgkxOiBubyBjaGFuZ2UKCnY3OgoJMTogbm8gY2hhbmdlCgp2NjoKCTE6IG5vIGNoYW5nZQoKdjU6 CgkxOiBubyBjaGFuZ2UKCnY0OgoJMTogbm8gY2hhbmdlCgp2MzoKCTE6IGNoYW5nZSB0aGUgYmF1 ZF9iYXNlIGluIGY4MTIzMl9nZXRfc2VyaWFsX2luZm8oKQoKIGRyaXZlcnMvdXNiL3NlcmlhbC9m ODEyMzIuYyB8IDEwNSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0t LQogMSBmaWxlIGNoYW5nZWQsIDk0IGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvdXNiL3NlcmlhbC9mODEyMzIuYyBiL2RyaXZlcnMvdXNiL3Nlcmlh bC9mODEyMzIuYwppbmRleCBmMGRlMjBhODE4Y2QuLjZhMWU2YTI3Y2UxNiAxMDA2NDQKLS0tIGEv ZHJpdmVycy91c2Ivc2VyaWFsL2Y4MTIzMi5jCisrKyBiL2RyaXZlcnMvdXNiL3NlcmlhbC9mODEy MzIuYwpAQCAtMjgsNyArMjgsOCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHVzYl9kZXZpY2VfaWQg aWRfdGFibGVbXSA9IHsKIE1PRFVMRV9ERVZJQ0VfVEFCTEUodXNiLCBpZF90YWJsZSk7CiAKIC8q IE1heGltdW0gYmF1ZHJhdGUgZm9yIEY4MTIzMiAqLwotI2RlZmluZSBGODEyMzJfTUFYX0JBVURS QVRFCQkxMTUyMDAKKyNkZWZpbmUgRjgxMjMyX01BWF9CQVVEUkFURQkJMTUwMDAwMAorI2RlZmlu ZSBGODEyMzJfREVGX0JBVURSQVRFCQk5NjAwCiAKIC8qIFVTQiBDb250cm9sIEVQIHBhcmFtZXRl ciAqLwogI2RlZmluZSBGODEyMzJfUkVHSVNURVJfUkVRVUVTVAkJMHhhMApAQCAtNDQsMTggKzQ1 LDQyIEBAIE1PRFVMRV9ERVZJQ0VfVEFCTEUodXNiLCBpZF90YWJsZSk7CiAjZGVmaW5lIExJTkVf U1RBVFVTX1JFR0lTVEVSCQkoMHgwNSArIFNFUklBTF9CQVNFX0FERFJFU1MpCiAjZGVmaW5lIE1P REVNX1NUQVRVU19SRUdJU1RFUgkJKDB4MDYgKyBTRVJJQUxfQkFTRV9BRERSRVNTKQogCisvKgor ICogRjgxMjMyIENsb2NrIHJlZ2lzdGVycyAoMTA2aCkKKyAqCisgKiBCaXQxLTA6CUNsb2NrIHNv dXJjZSBzZWxlY3RvcgorICoJCQkwMDogMS44NDZNSHouCisgKgkJCTAxOiAxOC40Nk1Iei4KKyAq CQkJMTA6IDI0TUh6LgorICoJCQkxMTogMTQuNzdNSHouCisgKi8KKyNkZWZpbmUgRjgxMjMyX0NM S19SRUdJU1RFUgkJMHgxMDYKKyNkZWZpbmUgRjgxMjMyX0NMS18xXzg0Nl9NSFoJCTAKKyNkZWZp bmUgRjgxMjMyX0NMS18xOF80Nl9NSFoJCUJJVCgwKQorI2RlZmluZSBGODEyMzJfQ0xLXzI0X01I WgkJQklUKDEpCisjZGVmaW5lIEY4MTIzMl9DTEtfMTRfNzdfTUhaCQkoQklUKDEpIHwgQklUKDAp KQorI2RlZmluZSBGODEyMzJfQ0xLX01BU0sJCQlHRU5NQVNLKDEsIDApCisKIHN0cnVjdCBmODEy MzJfcHJpdmF0ZSB7CiAJc3RydWN0IG11dGV4IGxvY2s7CiAJdTggbW9kZW1fY29udHJvbDsKIAl1 OCBtb2RlbV9zdGF0dXM7CisJc3BlZWRfdCBiYXVkX2Jhc2U7CiAJc3RydWN0IHdvcmtfc3RydWN0 IGxzcl93b3JrOwogCXN0cnVjdCB3b3JrX3N0cnVjdCBpbnRlcnJ1cHRfd29yazsKIAlzdHJ1Y3Qg dXNiX3NlcmlhbF9wb3J0ICpwb3J0OwogfTsKIAotc3RhdGljIGludCBjYWxjX2JhdWRfZGl2aXNv cihzcGVlZF90IGJhdWRyYXRlKQorc3RhdGljIHUzMiBjb25zdCBiYXVkcmF0ZV90YWJsZVtdID0g eyAxMTUyMDAsIDkyMTYwMCwgMTE1MjAwMCwgMTUwMDAwMCB9Oworc3RhdGljIHU4IGNvbnN0IGNs b2NrX3RhYmxlW10gPSB7IEY4MTIzMl9DTEtfMV84NDZfTUhaLCBGODEyMzJfQ0xLXzE0Xzc3X01I WiwKKwkJCQlGODEyMzJfQ0xLXzE4XzQ2X01IWiwgRjgxMjMyX0NMS18yNF9NSFogfTsKKworc3Rh dGljIGludCBjYWxjX2JhdWRfZGl2aXNvcihzcGVlZF90IGJhdWRyYXRlLCBzcGVlZF90IGNsb2Nr cmF0ZSkKIHsKLQlyZXR1cm4gRElWX1JPVU5EX0NMT1NFU1QoRjgxMjMyX01BWF9CQVVEUkFURSwg YmF1ZHJhdGUpOworCWlmICghYmF1ZHJhdGUpCisJCXJldHVybiAwOworCisJcmV0dXJuIERJVl9S T1VORF9DTE9TRVNUKGNsb2NrcmF0ZSwgYmF1ZHJhdGUpOwogfQogCiBzdGF0aWMgaW50IGY4MTIz Ml9nZXRfcmVnaXN0ZXIoc3RydWN0IHVzYl9zZXJpYWxfcG9ydCAqcG9ydCwgdTE2IHJlZywgdTgg KnZhbCkKQEAgLTEyOSw2ICsxNTQsMjEgQEAgc3RhdGljIGludCBmODEyMzJfc2V0X3JlZ2lzdGVy KHN0cnVjdCB1c2Jfc2VyaWFsX3BvcnQgKnBvcnQsIHUxNiByZWcsIHU4IHZhbCkKIAlyZXR1cm4g c3RhdHVzOwogfQogCitzdGF0aWMgaW50IGY4MTIzMl9zZXRfbWFza19yZWdpc3RlcihzdHJ1Y3Qg dXNiX3NlcmlhbF9wb3J0ICpwb3J0LCB1MTYgcmVnLAorCQkJCQl1OCBtYXNrLCB1OCB2YWwpCit7 CisJaW50IHN0YXR1czsKKwl1OCB0bXA7CisKKwlzdGF0dXMgPSBmODEyMzJfZ2V0X3JlZ2lzdGVy KHBvcnQsIHJlZywgJnRtcCk7CisJaWYgKHN0YXR1cykKKwkJcmV0dXJuIHN0YXR1czsKKworCXRt cCA9ICh0bXAgJiB+bWFzaykgfCAodmFsICYgbWFzayk7CisKKwlyZXR1cm4gZjgxMjMyX3NldF9y ZWdpc3Rlcihwb3J0LCByZWcsIHRtcCk7Cit9CisKIHN0YXRpYyB2b2lkIGY4MTIzMl9yZWFkX21z cihzdHJ1Y3QgdXNiX3NlcmlhbF9wb3J0ICpwb3J0KQogewogCWludCBzdGF0dXM7CkBAIC0zNDYs MTMgKzM4Niw1MyBAQCBzdGF0aWMgdm9pZCBmODEyMzJfYnJlYWtfY3RsKHN0cnVjdCB0dHlfc3Ry dWN0ICp0dHksIGludCBicmVha19zdGF0ZSkKIAkgKi8KIH0KIAotc3RhdGljIHZvaWQgZjgxMjMy X3NldF9iYXVkcmF0ZShzdHJ1Y3QgdXNiX3NlcmlhbF9wb3J0ICpwb3J0LCBzcGVlZF90IGJhdWRy YXRlKQorc3RhdGljIGludCBmODEyMzJfZmluZF9jbGsoc3BlZWRfdCBiYXVkcmF0ZSkKK3sKKwlp bnQgaWR4OworCisJZm9yIChpZHggPSAwOyBpZHggPCBBUlJBWV9TSVpFKGJhdWRyYXRlX3RhYmxl KTsgKytpZHgpIHsKKwkJaWYgKGJhdWRyYXRlIDw9IGJhdWRyYXRlX3RhYmxlW2lkeF0gJiYKKwkJ CQliYXVkcmF0ZV90YWJsZVtpZHhdICUgYmF1ZHJhdGUgPT0gMCkKKwkJCXJldHVybiBpZHg7CisJ fQorCisJcmV0dXJuIC1FSU5WQUw7Cit9CisKK3N0YXRpYyB2b2lkIGY4MTIzMl9zZXRfYmF1ZHJh dGUoc3RydWN0IHR0eV9zdHJ1Y3QgKnR0eSwKKwkJCQlzdHJ1Y3QgdXNiX3NlcmlhbF9wb3J0ICpw b3J0LCBzcGVlZF90IGJhdWRyYXRlLAorCQkJCXNwZWVkX3Qgb2xkX2JhdWRyYXRlKQogeworCXN0 cnVjdCBmODEyMzJfcHJpdmF0ZSAqcHJpdiA9IHVzYl9nZXRfc2VyaWFsX3BvcnRfZGF0YShwb3J0 KTsKIAl1OCBsY3I7CiAJaW50IGRpdmlzb3I7CiAJaW50IHN0YXR1cyA9IDA7CisJaW50IGk7CisJ aW50IGlkeDsKKwlzcGVlZF90IGJhdWRfbGlzdFtdID0ge2JhdWRyYXRlLCBvbGRfYmF1ZHJhdGUs IEY4MTIzMl9ERUZfQkFVRFJBVEV9OworCisJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoYmF1 ZF9saXN0KTsgKytpKSB7CisJCWlkeCA9IGY4MTIzMl9maW5kX2NsayhiYXVkX2xpc3RbaV0pOwor CQlpZiAoaWR4ID49IDApIHsKKwkJCWJhdWRyYXRlID0gYmF1ZF9saXN0W2ldOworCQkJdHR5X2Vu Y29kZV9iYXVkX3JhdGUodHR5LCBiYXVkcmF0ZSwgYmF1ZHJhdGUpOworCQkJYnJlYWs7CisJCX0K Kwl9CisKKwlpZiAoaWR4IDwgMCkKKwkJcmV0dXJuOwogCi0JZGl2aXNvciA9IGNhbGNfYmF1ZF9k aXZpc29yKGJhdWRyYXRlKTsKKwlwcml2LT5iYXVkX2Jhc2UgPSBiYXVkcmF0ZV90YWJsZVtpZHhd OworCWRpdmlzb3IgPSBjYWxjX2JhdWRfZGl2aXNvcihiYXVkcmF0ZSwgcHJpdi0+YmF1ZF9iYXNl KTsKKworCXN0YXR1cyA9IGY4MTIzMl9zZXRfbWFza19yZWdpc3Rlcihwb3J0LCBGODEyMzJfQ0xL X1JFR0lTVEVSLAorCQkJRjgxMjMyX0NMS19NQVNLLCBjbG9ja190YWJsZVtpZHhdKTsKKwlpZiAo c3RhdHVzKSB7CisJCWRldl9lcnIoJnBvcnQtPmRldiwgIiVzIGZhaWxlZCB0byBzZXQgQ0xLX1JF RzogJWRcbiIsCisJCQlfX2Z1bmNfXywgc3RhdHVzKTsKKwkJcmV0dXJuOworCX0KIAogCXN0YXR1 cyA9IGY4MTIzMl9nZXRfcmVnaXN0ZXIocG9ydCwgTElORV9DT05UUk9MX1JFR0lTVEVSLAogCQkJ ICZsY3IpOyAvKiBnZXQgTENSICovCkBAIC00NDIsNiArNTIyLDcgQEAgc3RhdGljIHZvaWQgZjgx MjMyX3NldF90ZXJtaW9zKHN0cnVjdCB0dHlfc3RydWN0ICp0dHksCiAJdTggbmV3X2xjciA9IDA7 CiAJaW50IHN0YXR1cyA9IDA7CiAJc3BlZWRfdCBiYXVkcmF0ZTsKKwlzcGVlZF90IG9sZF9iYXVk OwogCiAJLyogRG9uJ3QgY2hhbmdlIGFueXRoaW5nIGlmIG5vdGhpbmcgaGFzIGNoYW5nZWQgKi8K IAlpZiAob2xkX3Rlcm1pb3MgJiYgIXR0eV90ZXJtaW9zX2h3X2NoYW5nZSgmdHR5LT50ZXJtaW9z LCBvbGRfdGVybWlvcykpCkBAIC00NTQsMTEgKzUzNSwxMiBAQCBzdGF0aWMgdm9pZCBmODEyMzJf c2V0X3Rlcm1pb3Moc3RydWN0IHR0eV9zdHJ1Y3QgKnR0eSwKIAogCWJhdWRyYXRlID0gdHR5X2dl dF9iYXVkX3JhdGUodHR5KTsKIAlpZiAoYmF1ZHJhdGUgPiAwKSB7Ci0JCWlmIChiYXVkcmF0ZSA+ IEY4MTIzMl9NQVhfQkFVRFJBVEUpIHsKLQkJCWJhdWRyYXRlID0gRjgxMjMyX01BWF9CQVVEUkFU RTsKLQkJCXR0eV9lbmNvZGVfYmF1ZF9yYXRlKHR0eSwgYmF1ZHJhdGUsIGJhdWRyYXRlKTsKLQkJ fQotCQlmODEyMzJfc2V0X2JhdWRyYXRlKHBvcnQsIGJhdWRyYXRlKTsKKwkJaWYgKG9sZF90ZXJt aW9zKQorCQkJb2xkX2JhdWQgPSB0dHlfdGVybWlvc19iYXVkX3JhdGUob2xkX3Rlcm1pb3MpOwor CQllbHNlCisJCQlvbGRfYmF1ZCA9IEY4MTIzMl9ERUZfQkFVRFJBVEU7CisKKwkJZjgxMjMyX3Nl dF9iYXVkcmF0ZSh0dHksIHBvcnQsIGJhdWRyYXRlLCBvbGRfYmF1ZCk7CiAJfQogCiAJaWYgKENf UEFSRU5CKHR0eSkpIHsKQEAgLTU5NSwxMSArNjc3LDEyIEBAIHN0YXRpYyBpbnQgZjgxMjMyX2dl dF9zZXJpYWxfaW5mbyhzdHJ1Y3QgdHR5X3N0cnVjdCAqdHR5LAogCQlzdHJ1Y3Qgc2VyaWFsX3N0 cnVjdCAqc3MpCiB7CiAJc3RydWN0IHVzYl9zZXJpYWxfcG9ydCAqcG9ydCA9IHR0eS0+ZHJpdmVy X2RhdGE7CisJc3RydWN0IGY4MTIzMl9wcml2YXRlICpwcml2ID0gdXNiX2dldF9zZXJpYWxfcG9y dF9kYXRhKHBvcnQpOwogCiAJc3MtPnR5cGUgPSBQT1JUXzE2NTUwQTsKIAlzcy0+bGluZSA9IHBv cnQtPm1pbm9yOwogCXNzLT5wb3J0ID0gcG9ydC0+cG9ydF9udW1iZXI7Ci0Jc3MtPmJhdWRfYmFz ZSA9IEY4MTIzMl9NQVhfQkFVRFJBVEU7CisJc3MtPmJhdWRfYmFzZSA9IHByaXYtPmJhdWRfYmFz ZTsKIAlyZXR1cm4gMDsKIH0KIAo= 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 0283CC43219 for ; Tue, 30 Apr 2019 01:23:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC29321655 for ; Tue, 30 Apr 2019 01:23:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SyOEivJZ" 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 Content-Type: text/plain; charset="UTF-8" Message-ID: <20190430012231.gBEARfjE6et909-GSUBG7iJDZNF2Zohgge5xvnkUjQY@z> 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; } -- 2.7.4