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: [V4,4/5] usb: ehci: Add new EHCI driver for Broadcom STB SoC's From: Alan Cooper Message-Id: <1541772120-40394-5-git-send-email-alcooperx@gmail.com> Date: Fri, 9 Nov 2018 09:01:59 -0500 To: linux-kernel@vger.kernel.org Cc: Al Cooper , Alan Stern , Alban Bedel , Alex Elder , Andrew Morton , Arnd Bergmann , Avi Fishman , bcm-kernel-feedback-list@broadcom.com, Bjorn Andersson , Chunfeng Yun , "David S. Miller" , devicetree@vger.kernel.org, Dmitry Osipenko , Greg Kroah-Hartman , "Gustavo A. R. Silva" , Hans de Goede , James Hogan , Johan Hovold , Kees Cook , linux-usb@vger.kernel.org, Lu Baolu , Mark Rutland , Martin Blumenstingl , Mathias Nyman , Mathias Nyman , Mauro Carvalho Chehab , Rishabh Bhatnagar , Rob Herring , Roger Quadros List-ID: QWRkIGEgbmV3IEVIQ0kgZHJpdmVyIGZvciBCcm9hZGNvbSBTVEIgU29DJ3MuIEEgbmV3IEVIQ0kg ZHJpdmVyCndhcyBjcmVhdGVkIGluc3RlYWQgb2YgYWRkaW5nIHN1cHBvcnQgdG8gdGhlIGV4aXN0 aW5nIGVoY2kgcGxhdGZvcm0KZHJpdmVyIGJlY2F1c2Ugb2YgdGhlIGNvZGUgcmVxdWlyZWQgdG8g d29ya2Fyb3VuZCBidWdzIGluIHRoZSBFSENJCmNvbnRyb2xsZXIuCgpTaWduZWQtb2ZmLWJ5OiBB bCBDb29wZXIgPGFsY29vcGVyeEBnbWFpbC5jb20+Ci0tLQogZHJpdmVycy91c2IvaG9zdC9laGNp LWJyY20uYyB8IDI4NiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr CiAxIGZpbGUgY2hhbmdlZCwgMjg2IGluc2VydGlvbnMoKykKIGNyZWF0ZSBtb2RlIDEwMDY0NCBk cml2ZXJzL3VzYi9ob3N0L2VoY2ktYnJjbS5jCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvaG9z dC9laGNpLWJyY20uYyBiL2RyaXZlcnMvdXNiL2hvc3QvZWhjaS1icmNtLmMKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi5lYjBlYTAzMGE0YzgKLS0tIC9kZXYvbnVsbAor KysgYi9kcml2ZXJzL3VzYi9ob3N0L2VoY2ktYnJjbS5jCkBAIC0wLDAgKzEsMjg2IEBACisvLyBT UERYLUxpY2Vuc2UtSWRlbnRpZmllcjogR1BMLTIuMAorLyogQ29weXJpZ2h0IChjKSAyMDE4LCBC cm9hZGNvbSAqLworCisjaW5jbHVkZSA8bGludXgvYWNwaS5oPgorI2luY2x1ZGUgPGxpbnV4L2Ns ay5oPgorI2luY2x1ZGUgPGxpbnV4L2RtYS1tYXBwaW5nLmg+CisjaW5jbHVkZSA8bGludXgvZXJy Lmg+CisjaW5jbHVkZSA8bGludXgva2VybmVsLmg+CisjaW5jbHVkZSA8bGludXgvaW8uaD4KKyNp bmNsdWRlIDxsaW51eC9tb2R1bGUuaD4KKyNpbmNsdWRlIDxsaW51eC9vZi5oPgorI2luY2x1ZGUg PGxpbnV4L3BsYXRmb3JtX2RldmljZS5oPgorI2luY2x1ZGUgPGxpbnV4L3VzYi5oPgorI2luY2x1 ZGUgPGxpbnV4L3VzYi9oY2QuaD4KKworI2luY2x1ZGUgImVoY2kuaCIKKworI2RlZmluZSBCUkNN X0RSSVZFUl9ERVNDICJFSENJIEJyb2FkY29tIFNUQiBkcml2ZXIiCisKKyNkZWZpbmUgaGNkX3Rv X2VoY2lfcHJpdihoKSAoKHN0cnVjdCBicmNtX3ByaXYgKiloY2RfdG9fZWhjaShoKS0+cHJpdikK Kworc3RydWN0IGJyY21fcHJpdiB7CisJc3RydWN0IGNsayAqY2xrOworfTsKKworc3RhdGljIGNv bnN0IGNoYXIgYnJjbV9oY2RfbmFtZVtdID0gImVoY2ktYnJjbSI7CisKK3N0YXRpYyBpbnQgKCpv cmdfaHViX2NvbnRyb2wpKHN0cnVjdCB1c2JfaGNkICpoY2QsCisJCQl1MTYgdHlwZVJlcSwgdTE2 IHdWYWx1ZSwgdTE2IHdJbmRleCwKKwkJCWNoYXIgKmJ1ZiwgdTE2IHdMZW5ndGgpOworCisvKiBl aGNpX2JyY21fd2FpdF9mb3Jfc29mCisgKiBXYWl0IGZvciBzdGFydCBvZiBuZXh0IG1pY3JvZnJh bWUsIHRoZW4gd2FpdCBleHRyYSBkZWxheSBtaWNyb3NlY29uZHMKKyAqLworc3RhdGljIGlubGlu ZSB2b2lkIGVoY2lfYnJjbV93YWl0X2Zvcl9zb2Yoc3RydWN0IGVoY2lfaGNkICplaGNpLCB1MzIg ZGVsYXkpCit7CisJaW50IGZyYW1lX2lkeCA9IGVoY2lfcmVhZGwoZWhjaSwgJmVoY2ktPnJlZ3Mt PmZyYW1lX2luZGV4KTsKKworCXdoaWxlIChmcmFtZV9pZHggPT0gZWhjaV9yZWFkbChlaGNpLCAm ZWhjaS0+cmVncy0+ZnJhbWVfaW5kZXgpKQorCQk7CisJdWRlbGF5KGRlbGF5KTsKK30KKworLyoK KyAqIGVoY2lfYnJjbV9odWJfY29udHJvbAorICogSW50ZXJjZXB0IGVjaGktaGNkIHJlcXVlc3Qg dG8gY29tcGxldGUgUkVTVU1FIGFuZCBhbGlnbiBpdCB0byB0aGUgc3RhcnQKKyAqIG9mIHRoZSBu ZXh0IG1pY3JvZnJhbWUuCisgKiBJZiBSRVNVTUUgaXMgY29tcGxldGUgdG9vIGxhdGUgaW4gdGhl IG1pY3JvZnJhbWUsIGhvc3QgY29udHJvbGxlcgorICogZGV0ZWN0cyBiYWJibGUgb24gc3VzcGVu ZGVkIHBvcnQgYW5kIHJlc2V0cyB0aGUgcG9ydCBhZnRlcndhcmRzLgorICogVGhpcyBzL3cgd29y a2Fyb3VuZCBhbGxvd3MgdG8gYXZvaWQgdGhpcyBwcm9ibGVtLgorICogU2VlIFNXTElOVVgtMTkw OSBmb3IgbW9yZSBkZXRhaWxzCisgKi8KK3N0YXRpYyBpbnQgZWhjaV9icmNtX2h1Yl9jb250cm9s KAorCXN0cnVjdCB1c2JfaGNkCSpoY2QsCisJdTE2CQl0eXBlUmVxLAorCXUxNgkJd1ZhbHVlLAor CXUxNgkJd0luZGV4LAorCWNoYXIJCSpidWYsCisJdTE2CQl3TGVuZ3RoKQoreworCXN0cnVjdCBl aGNpX2hjZAkqZWhjaSA9IGhjZF90b19laGNpKGhjZCk7CisJaW50CQlwb3J0cyA9IEhDU19OX1BP UlRTKGVoY2ktPmhjc19wYXJhbXMpOworCXUzMiBfX2lvbWVtCSpzdGF0dXNfcmVnID0gJmVoY2kt PnJlZ3MtPnBvcnRfc3RhdHVzWworCQkJCSh3SW5kZXggJiAweGZmKSAtIDFdOworCXVuc2lnbmVk IGxvbmcgZmxhZ3M7CisJaW50IHJldHZhbCwgaXJxX2Rpc2FibGVkID0gMDsKKworCS8qCisJICog UkVTVU1FIGlzIGNsZWFyZWQgd2hlbiBHZXRQb3J0U3RhdHVzKCkgaXMgY2FsbGVkIDIwbXMgYWZ0 ZXIgc3RhcnQKKwkgKiBvZiBSRVNVTUUKKwkgKi8KKwlpZiAoKHR5cGVSZXEgPT0gR2V0UG9ydFN0 YXR1cykgJiYKKwkgICAgKHdJbmRleCAmJiB3SW5kZXggPD0gcG9ydHMpICYmCisJICAgIGVoY2kt PnJlc2V0X2RvbmVbd0luZGV4LTFdICYmCisJICAgIHRpbWVfYWZ0ZXJfZXEoamlmZmllcywgZWhj aS0+cmVzZXRfZG9uZVt3SW5kZXgtMV0pICYmCisJICAgIChlaGNpX3JlYWRsKGVoY2ksIHN0YXR1 c19yZWcpICYgUE9SVF9SRVNVTUUpKSB7CisKKwkJLyoKKwkJICogdG8gbWFrZSBzdXJlIHdlIGFy ZSBub3QgaW50ZXJydXB0ZWQgdW50aWwgUkVTVU1FIGJpdAorCQkgKiBpcyBjbGVhcmVkLCBkaXNh YmxlIGludGVycnVwdHMgb24gY3VycmVudCBDUFUKKwkJICovCisJCWVoY2lfZGJnKGVoY2ksICJT T0YgYWxpZ25tZW50IHdvcmthcm91bmRcbiIpOworCQlpcnFfZGlzYWJsZWQgPSAxOworCQlsb2Nh bF9pcnFfc2F2ZShmbGFncyk7CisJCWVoY2lfYnJjbV93YWl0X2Zvcl9zb2YoZWhjaSwgNSk7CisJ fQorCXJldHZhbCA9ICgqb3JnX2h1Yl9jb250cm9sKShoY2QsIHR5cGVSZXEsIHdWYWx1ZSwgd0lu ZGV4LCBidWYsIHdMZW5ndGgpOworCWlmIChpcnFfZGlzYWJsZWQpCisJCWxvY2FsX2lycV9yZXN0 b3JlKGZsYWdzKTsKKwlyZXR1cm4gcmV0dmFsOworfQorCitzdGF0aWMgaW50IGVoY2lfYnJjbV9y ZXNldChzdHJ1Y3QgdXNiX2hjZCAqaGNkKQoreworCXN0cnVjdCBlaGNpX2hjZCAqZWhjaSA9IGhj ZF90b19laGNpKGhjZCk7CisKKwllaGNpLT5iaWdfZW5kaWFuX21taW8gPSAxOworCisJZWhjaS0+ Y2FwcyA9IChzdHJ1Y3QgZWhjaV9jYXBzICopIGhjZC0+cmVnczsKKwllaGNpLT5yZWdzID0gKHN0 cnVjdCBlaGNpX3JlZ3MgKikgKGhjZC0+cmVncyArCisJCUhDX0xFTkdUSChlaGNpLCBlaGNpX3Jl YWRsKGVoY2ksICZlaGNpLT5jYXBzLT5oY19jYXBiYXNlKSkpOworCisJLyogVGhpcyBmaXhlcyB0 aGUgbG9ja3VwIGR1cmluZyByZWJvb3QgZHVlIHRvIHByaW9yIGludGVycnVwdHMgKi8KKwllaGNp X3dyaXRlbChlaGNpLCBDTURfUkVTRVQsICZlaGNpLT5yZWdzLT5jb21tYW5kKTsKKwltZGVsYXko MTApOworCisJLyoKKwkgKiBTV0xJTlVYLTE3MDU6IEF2b2lkIE9VVCBwYWNrZXQgdW5kZXJmbG93 cyBkdXJpbmcgaGlnaCBtZW1vcnkKKwkgKiAgIGJ1cyB1c2FnZQorCSAqIHBvcnRfc3RhdHVzWzB4 MGZdID0gQnJvYWRjb20tcHJvcHJpZXRhcnkgVVNCX0VIQ0lfSU5TTlJFRzAwIEAgMHg5MAorCSAq LworCWVoY2lfd3JpdGVsKGVoY2ksIDB4MDA4MDAwNDAsICZlaGNpLT5yZWdzLT5wb3J0X3N0YXR1 c1sweDEwXSk7CisJZWhjaV93cml0ZWwoZWhjaSwgMHgwMDAwMDAwMSwgJmVoY2ktPnJlZ3MtPnBv cnRfc3RhdHVzWzB4MTJdKTsKKworCXJldHVybiBlaGNpX3NldHVwKGhjZCk7Cit9CisKK3N0YXRp YyBzdHJ1Y3QgaGNfZHJpdmVyIF9fcmVhZF9tb3N0bHkgZWhjaV9icmNtX2hjX2RyaXZlcjsKKwor c3RhdGljIGNvbnN0IHN0cnVjdCBlaGNpX2RyaXZlcl9vdmVycmlkZXMgYnJjbV9vdmVycmlkZXMg X19pbml0Y29uc3QgPSB7CisKKwkucmVzZXQgPQllaGNpX2JyY21fcmVzZXQsCisJLmV4dHJhX3By aXZfc2l6ZSA9IHNpemVvZihzdHJ1Y3QgYnJjbV9wcml2KSwKK307CisKK3N0YXRpYyBpbnQgZWhj aV9icmNtX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCit7CisJc3RydWN0IHVz Yl9oY2QgKmhjZDsKKwlzdHJ1Y3QgcmVzb3VyY2UgKnJlc19tZW07CisJc3RydWN0IGJyY21fcHJp diAqcHJpdjsKKwlpbnQgaXJxOworCWludCBlcnI7CisKKwlpZiAodXNiX2Rpc2FibGVkKCkpCisJ CXJldHVybiAtRU5PREVWOworCisJZXJyID0gZG1hX3NldF9tYXNrX2FuZF9jb2hlcmVudCgmcGRl di0+ZGV2LCBETUFfQklUX01BU0soMzIpKTsKKwlpZiAoZXJyKQorCQlyZXR1cm4gZXJyOworCisJ aXJxID0gcGxhdGZvcm1fZ2V0X2lycShwZGV2LCAwKTsKKwlpZiAoaXJxIDwgMCkgeworCQlkZXZf ZXJyKCZwZGV2LT5kZXYsICJubyBpcnEgcHJvdmlkZWQiKTsKKwkJcmV0dXJuIGlycTsKKwl9CisK KwkvKiBIb29rIHRoZSBodWIgY29udHJvbCByb3V0aW5lIHRvIHdvcmsgYXJvdW5kIGEgYnVnICov CisJaWYgKG9yZ19odWJfY29udHJvbCA9PSBOVUxMKQorCQlvcmdfaHViX2NvbnRyb2wgPSBlaGNp X2JyY21faGNfZHJpdmVyLmh1Yl9jb250cm9sOworCWVoY2lfYnJjbV9oY19kcml2ZXIuaHViX2Nv bnRyb2wgPSBlaGNpX2JyY21faHViX2NvbnRyb2w7CisKKwkvKiBpbml0aWFsaXplIGhjZCAqLwor CWhjZCA9IHVzYl9jcmVhdGVfaGNkKCZlaGNpX2JyY21faGNfZHJpdmVyLAorCQkJJnBkZXYtPmRl diwgZGV2X25hbWUoJnBkZXYtPmRldikpOworCWlmICghaGNkKQorCQlyZXR1cm4gLUVOT01FTTsK KworCXBsYXRmb3JtX3NldF9kcnZkYXRhKHBkZXYsIGhjZCk7CisJcHJpdiA9IGhjZF90b19laGNp X3ByaXYoaGNkKTsKKworCXByaXYtPmNsayA9IGRldm1fY2xrX2dldCgmcGRldi0+ZGV2LCBOVUxM KTsKKwlpZiAoSVNfRVJSKHByaXYtPmNsaykpIHsKKwkJZGV2X2VycigmcGRldi0+ZGV2LCAiQ2xv Y2sgbm90IGZvdW5kIGluIERldmljZSBUcmVlXG4iKTsKKwkJcHJpdi0+Y2xrID0gTlVMTDsKKwl9 CisJZXJyID0gY2xrX3ByZXBhcmVfZW5hYmxlKHByaXYtPmNsayk7CisJaWYgKGVycikKKwkJZ290 byBlcnJfaGNkOworCisJcmVzX21lbSA9IHBsYXRmb3JtX2dldF9yZXNvdXJjZShwZGV2LCBJT1JF U09VUkNFX01FTSwgMCk7CisJaGNkLT5yZWdzID0gZGV2bV9pb3JlbWFwX3Jlc291cmNlKCZwZGV2 LT5kZXYsIHJlc19tZW0pOworCWlmIChJU19FUlIoaGNkLT5yZWdzKSkgeworCQllcnIgPSBQVFJf RVJSKGhjZC0+cmVncyk7CisJCWdvdG8gZXJyX2NsazsKKwl9CisJaGNkLT5yc3JjX3N0YXJ0ID0g cmVzX21lbS0+c3RhcnQ7CisJaGNkLT5yc3JjX2xlbiA9IHJlc291cmNlX3NpemUocmVzX21lbSk7 CisJZXJyID0gdXNiX2FkZF9oY2QoaGNkLCBpcnEsIElSUUZfU0hBUkVEKTsKKwlpZiAoZXJyKQor CQlnb3RvIGVycl9jbGs7CisKKwlkZXZpY2Vfd2FrZXVwX2VuYWJsZShoY2QtPnNlbGYuY29udHJv bGxlcik7CisJZGV2aWNlX2VuYWJsZV9hc3luY19zdXNwZW5kKGhjZC0+c2VsZi5jb250cm9sbGVy KTsKKwlwbGF0Zm9ybV9zZXRfZHJ2ZGF0YShwZGV2LCBoY2QpOworCisJcmV0dXJuIGVycjsKKwor ZXJyX2NsazoKKwljbGtfZGlzYWJsZV91bnByZXBhcmUocHJpdi0+Y2xrKTsKK2Vycl9oY2Q6CisJ dXNiX3B1dF9oY2QoaGNkKTsKKworCXJldHVybiBlcnI7Cit9CisKK3N0YXRpYyBpbnQgZWhjaV9i cmNtX3JlbW92ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpkZXYpCit7CisJc3RydWN0IHVzYl9o Y2QgKmhjZCA9IHBsYXRmb3JtX2dldF9kcnZkYXRhKGRldik7CisJc3RydWN0IGJyY21fcHJpdiAq cHJpdiA9IGhjZF90b19laGNpX3ByaXYoaGNkKTsKKworCXVzYl9yZW1vdmVfaGNkKGhjZCk7CisJ Y2xrX2Rpc2FibGVfdW5wcmVwYXJlKHByaXYtPmNsayk7CisJdXNiX3B1dF9oY2QoaGNkKTsKKwly ZXR1cm4gMDsKK30KKworI2lmZGVmIENPTkZJR19QTV9TTEVFUAorCitzdGF0aWMgaW50IGVoY2lf YnJjbV9zdXNwZW5kKHN0cnVjdCBkZXZpY2UgKmRldikKK3sKKwlpbnQgcmV0OworCXN0cnVjdCB1 c2JfaGNkICpoY2QgPSBkZXZfZ2V0X2RydmRhdGEoZGV2KTsKKwlzdHJ1Y3QgYnJjbV9wcml2ICpw cml2ID0gaGNkX3RvX2VoY2lfcHJpdihoY2QpOworCWJvb2wgZG9fd2FrZXVwID0gZGV2aWNlX21h eV93YWtldXAoZGV2KTsKKworCXJldCA9IGVoY2lfc3VzcGVuZChoY2QsIGRvX3dha2V1cCk7CisJ Y2xrX2Rpc2FibGVfdW5wcmVwYXJlKHByaXYtPmNsayk7CisJcmV0dXJuIHJldDsKK30KKworc3Rh dGljIGludCBlaGNpX2JyY21fcmVzdW1lKHN0cnVjdCBkZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3Qg dXNiX2hjZCAqaGNkID0gZGV2X2dldF9kcnZkYXRhKGRldik7CisJc3RydWN0IGVoY2lfaGNkICpl aGNpID0gaGNkX3RvX2VoY2koaGNkKTsKKwlzdHJ1Y3QgYnJjbV9wcml2ICpwcml2ID0gaGNkX3Rv X2VoY2lfcHJpdihoY2QpOworCWludCBlcnI7CisKKwllcnIgPSBjbGtfcHJlcGFyZV9lbmFibGUo cHJpdi0+Y2xrKTsKKwlpZiAoZXJyKQorCQlyZXR1cm4gZXJyOworCS8qCisJICogU1dMSU5VWC0x NzA1OiBBdm9pZCBPVVQgcGFja2V0IHVuZGVyZmxvd3MgZHVyaW5nIGhpZ2ggbWVtb3J5CisJICog ICBidXMgdXNhZ2UKKwkgKiBwb3J0X3N0YXR1c1sweDBmXSA9IEJyb2FkY29tLXByb3ByaWV0YXJ5 IFVTQl9FSENJX0lOU05SRUcwMAorCSAqIEAgMHg5MAorCSAqLworCWVoY2lfd3JpdGVsKGVoY2ks IDB4MDA4MDAwNDAsICZlaGNpLT5yZWdzLT5wb3J0X3N0YXR1c1sweDEwXSk7CisJZWhjaV93cml0 ZWwoZWhjaSwgMHgwMDAwMDAwMSwgJmVoY2ktPnJlZ3MtPnBvcnRfc3RhdHVzWzB4MTJdKTsKKwor CWVoY2lfcmVzdW1lKGhjZCwgZmFsc2UpOworCXJldHVybiAwOworfQorI2VuZGlmIC8qIENPTkZJ R19QTV9TTEVFUCAqLworCitzdGF0aWMgU0lNUExFX0RFVl9QTV9PUFMoZWhjaV9icmNtX3BtX29w cywgZWhjaV9icmNtX3N1c3BlbmQsCisJCWVoY2lfYnJjbV9yZXN1bWUpOworCitzdGF0aWMgY29u c3Qgc3RydWN0IG9mX2RldmljZV9pZCBicmNtX2VoY2lfb2ZfbWF0Y2hbXSA9IHsKKwl7IC5jb21w YXRpYmxlID0gImJyY20sYmNtNzQ0NS1laGNpIiwgfSwKKwl7fQorfTsKKworc3RhdGljIHN0cnVj dCBwbGF0Zm9ybV9kcml2ZXIgZWhjaV9icmNtX2RyaXZlciA9IHsKKwkucHJvYmUJCT0gZWhjaV9i cmNtX3Byb2JlLAorCS5yZW1vdmUJCT0gZWhjaV9icmNtX3JlbW92ZSwKKwkuc2h1dGRvd24JPSB1 c2JfaGNkX3BsYXRmb3JtX3NodXRkb3duLAorCS5kcml2ZXIJCT0geworCQkub3duZXIJPSBUSElT X01PRFVMRSwKKwkJLm5hbWUJPSAiZWhjaS1icmNtIiwKKwkJLnBtCT0gJmVoY2lfYnJjbV9wbV9v cHMsCisJCS5vZl9tYXRjaF90YWJsZSA9IGJyY21fZWhjaV9vZl9tYXRjaCwKKwl9Cit9OworCitz dGF0aWMgaW50IF9faW5pdCBlaGNpX2JyY21faW5pdCh2b2lkKQoreworCWlmICh1c2JfZGlzYWJs ZWQoKSkKKwkJcmV0dXJuIC1FTk9ERVY7CisKKwlwcl9pbmZvKCIlczogIiBCUkNNX0RSSVZFUl9E RVNDICJcbiIsIGJyY21faGNkX25hbWUpOworCisJZWhjaV9pbml0X2RyaXZlcigmZWhjaV9icmNt X2hjX2RyaXZlciwgJmJyY21fb3ZlcnJpZGVzKTsKKwlyZXR1cm4gcGxhdGZvcm1fZHJpdmVyX3Jl Z2lzdGVyKCZlaGNpX2JyY21fZHJpdmVyKTsKK30KK21vZHVsZV9pbml0KGVoY2lfYnJjbV9pbml0 KTsKKworc3RhdGljIHZvaWQgX19leGl0IGVoY2lfYnJjbV9leGl0KHZvaWQpCit7CisJcGxhdGZv cm1fZHJpdmVyX3VucmVnaXN0ZXIoJmVoY2lfYnJjbV9kcml2ZXIpOworfQorbW9kdWxlX2V4aXQo ZWhjaV9icmNtX2V4aXQpOworCitNT0RVTEVfQUxJQVMoInBsYXRmb3JtOmVoY2ktYnJjbSIpOwor TU9EVUxFX0RFU0NSSVBUSU9OKEJSQ01fRFJJVkVSX0RFU0MpOworTU9EVUxFX0FVVEhPUigiQWwg Q29vcGVyIik7CitNT0RVTEVfTElDRU5TRSgiR1BMIik7Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: Al Cooper Subject: [PATCH V4 4/5] usb: ehci: Add new EHCI driver for Broadcom STB SoC's Date: Fri, 9 Nov 2018 09:01:59 -0500 Message-ID: <1541772120-40394-5-git-send-email-alcooperx@gmail.com> References: <1541772120-40394-1-git-send-email-alcooperx@gmail.com> Return-path: In-Reply-To: <1541772120-40394-1-git-send-email-alcooperx@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: Al Cooper , Alan Stern , Alban Bedel , Alex Elder , Andrew Morton , Arnd Bergmann , Avi Fishman , bcm-kernel-feedback-list@broadcom.com, Bjorn Andersson , Chunfeng Yun , "David S. Miller" , devicetree@vger.kernel.org, Dmitry Osipenko , Greg Kroah-Hartman , "Gustavo A. R. Silva" , Hans de Goede , James Hogan , Johan Hovold , Kees Cook , linux-usb@vger.kernel.org, Lu Baolu List-Id: devicetree@vger.kernel.org Add a new EHCI driver for Broadcom STB SoC's. A new EHCI driver was created instead of adding support to the existing ehci platform driver because of the code required to workaround bugs in the EHCI controller. Signed-off-by: Al Cooper --- drivers/usb/host/ehci-brcm.c | 286 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 286 insertions(+) create mode 100644 drivers/usb/host/ehci-brcm.c diff --git a/drivers/usb/host/ehci-brcm.c b/drivers/usb/host/ehci-brcm.c new file mode 100644 index 000000000000..eb0ea030a4c8 --- /dev/null +++ b/drivers/usb/host/ehci-brcm.c @@ -0,0 +1,286 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018, Broadcom */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ehci.h" + +#define BRCM_DRIVER_DESC "EHCI Broadcom STB driver" + +#define hcd_to_ehci_priv(h) ((struct brcm_priv *)hcd_to_ehci(h)->priv) + +struct brcm_priv { + struct clk *clk; +}; + +static const char brcm_hcd_name[] = "ehci-brcm"; + +static int (*org_hub_control)(struct usb_hcd *hcd, + u16 typeReq, u16 wValue, u16 wIndex, + char *buf, u16 wLength); + +/* ehci_brcm_wait_for_sof + * Wait for start of next microframe, then wait extra delay microseconds + */ +static inline void ehci_brcm_wait_for_sof(struct ehci_hcd *ehci, u32 delay) +{ + int frame_idx = ehci_readl(ehci, &ehci->regs->frame_index); + + while (frame_idx == ehci_readl(ehci, &ehci->regs->frame_index)) + ; + udelay(delay); +} + +/* + * ehci_brcm_hub_control + * Intercept echi-hcd request to complete RESUME and align it to the start + * of the next microframe. + * If RESUME is complete too late in the microframe, host controller + * detects babble on suspended port and resets the port afterwards. + * This s/w workaround allows to avoid this problem. + * See SWLINUX-1909 for more details + */ +static int ehci_brcm_hub_control( + struct usb_hcd *hcd, + u16 typeReq, + u16 wValue, + u16 wIndex, + char *buf, + u16 wLength) +{ + struct ehci_hcd *ehci = hcd_to_ehci(hcd); + int ports = HCS_N_PORTS(ehci->hcs_params); + u32 __iomem *status_reg = &ehci->regs->port_status[ + (wIndex & 0xff) - 1]; + unsigned long flags; + int retval, irq_disabled = 0; + + /* + * RESUME is cleared when GetPortStatus() is called 20ms after start + * of RESUME + */ + if ((typeReq == GetPortStatus) && + (wIndex && wIndex <= ports) && + ehci->reset_done[wIndex-1] && + time_after_eq(jiffies, ehci->reset_done[wIndex-1]) && + (ehci_readl(ehci, status_reg) & PORT_RESUME)) { + + /* + * to make sure we are not interrupted until RESUME bit + * is cleared, disable interrupts on current CPU + */ + ehci_dbg(ehci, "SOF alignment workaround\n"); + irq_disabled = 1; + local_irq_save(flags); + ehci_brcm_wait_for_sof(ehci, 5); + } + retval = (*org_hub_control)(hcd, typeReq, wValue, wIndex, buf, wLength); + if (irq_disabled) + local_irq_restore(flags); + return retval; +} + +static int ehci_brcm_reset(struct usb_hcd *hcd) +{ + struct ehci_hcd *ehci = hcd_to_ehci(hcd); + + ehci->big_endian_mmio = 1; + + ehci->caps = (struct ehci_caps *) hcd->regs; + ehci->regs = (struct ehci_regs *) (hcd->regs + + HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase))); + + /* This fixes the lockup during reboot due to prior interrupts */ + ehci_writel(ehci, CMD_RESET, &ehci->regs->command); + mdelay(10); + + /* + * SWLINUX-1705: Avoid OUT packet underflows during high memory + * bus usage + * port_status[0x0f] = Broadcom-proprietary USB_EHCI_INSNREG00 @ 0x90 + */ + ehci_writel(ehci, 0x00800040, &ehci->regs->port_status[0x10]); + ehci_writel(ehci, 0x00000001, &ehci->regs->port_status[0x12]); + + return ehci_setup(hcd); +} + +static struct hc_driver __read_mostly ehci_brcm_hc_driver; + +static const struct ehci_driver_overrides brcm_overrides __initconst = { + + .reset = ehci_brcm_reset, + .extra_priv_size = sizeof(struct brcm_priv), +}; + +static int ehci_brcm_probe(struct platform_device *pdev) +{ + struct usb_hcd *hcd; + struct resource *res_mem; + struct brcm_priv *priv; + int irq; + int err; + + if (usb_disabled()) + return -ENODEV; + + err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); + if (err) + return err; + + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(&pdev->dev, "no irq provided"); + return irq; + } + + /* Hook the hub control routine to work around a bug */ + if (org_hub_control == NULL) + org_hub_control = ehci_brcm_hc_driver.hub_control; + ehci_brcm_hc_driver.hub_control = ehci_brcm_hub_control; + + /* initialize hcd */ + hcd = usb_create_hcd(&ehci_brcm_hc_driver, + &pdev->dev, dev_name(&pdev->dev)); + if (!hcd) + return -ENOMEM; + + platform_set_drvdata(pdev, hcd); + priv = hcd_to_ehci_priv(hcd); + + priv->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(priv->clk)) { + dev_err(&pdev->dev, "Clock not found in Device Tree\n"); + priv->clk = NULL; + } + err = clk_prepare_enable(priv->clk); + if (err) + goto err_hcd; + + res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + hcd->regs = devm_ioremap_resource(&pdev->dev, res_mem); + if (IS_ERR(hcd->regs)) { + err = PTR_ERR(hcd->regs); + goto err_clk; + } + hcd->rsrc_start = res_mem->start; + hcd->rsrc_len = resource_size(res_mem); + err = usb_add_hcd(hcd, irq, IRQF_SHARED); + if (err) + goto err_clk; + + device_wakeup_enable(hcd->self.controller); + device_enable_async_suspend(hcd->self.controller); + platform_set_drvdata(pdev, hcd); + + return err; + +err_clk: + clk_disable_unprepare(priv->clk); +err_hcd: + usb_put_hcd(hcd); + + return err; +} + +static int ehci_brcm_remove(struct platform_device *dev) +{ + struct usb_hcd *hcd = platform_get_drvdata(dev); + struct brcm_priv *priv = hcd_to_ehci_priv(hcd); + + usb_remove_hcd(hcd); + clk_disable_unprepare(priv->clk); + usb_put_hcd(hcd); + return 0; +} + +#ifdef CONFIG_PM_SLEEP + +static int ehci_brcm_suspend(struct device *dev) +{ + int ret; + struct usb_hcd *hcd = dev_get_drvdata(dev); + struct brcm_priv *priv = hcd_to_ehci_priv(hcd); + bool do_wakeup = device_may_wakeup(dev); + + ret = ehci_suspend(hcd, do_wakeup); + clk_disable_unprepare(priv->clk); + return ret; +} + +static int ehci_brcm_resume(struct device *dev) +{ + struct usb_hcd *hcd = dev_get_drvdata(dev); + struct ehci_hcd *ehci = hcd_to_ehci(hcd); + struct brcm_priv *priv = hcd_to_ehci_priv(hcd); + int err; + + err = clk_prepare_enable(priv->clk); + if (err) + return err; + /* + * SWLINUX-1705: Avoid OUT packet underflows during high memory + * bus usage + * port_status[0x0f] = Broadcom-proprietary USB_EHCI_INSNREG00 + * @ 0x90 + */ + ehci_writel(ehci, 0x00800040, &ehci->regs->port_status[0x10]); + ehci_writel(ehci, 0x00000001, &ehci->regs->port_status[0x12]); + + ehci_resume(hcd, false); + return 0; +} +#endif /* CONFIG_PM_SLEEP */ + +static SIMPLE_DEV_PM_OPS(ehci_brcm_pm_ops, ehci_brcm_suspend, + ehci_brcm_resume); + +static const struct of_device_id brcm_ehci_of_match[] = { + { .compatible = "brcm,bcm7445-ehci", }, + {} +}; + +static struct platform_driver ehci_brcm_driver = { + .probe = ehci_brcm_probe, + .remove = ehci_brcm_remove, + .shutdown = usb_hcd_platform_shutdown, + .driver = { + .owner = THIS_MODULE, + .name = "ehci-brcm", + .pm = &ehci_brcm_pm_ops, + .of_match_table = brcm_ehci_of_match, + } +}; + +static int __init ehci_brcm_init(void) +{ + if (usb_disabled()) + return -ENODEV; + + pr_info("%s: " BRCM_DRIVER_DESC "\n", brcm_hcd_name); + + ehci_init_driver(&ehci_brcm_hc_driver, &brcm_overrides); + return platform_driver_register(&ehci_brcm_driver); +} +module_init(ehci_brcm_init); + +static void __exit ehci_brcm_exit(void) +{ + platform_driver_unregister(&ehci_brcm_driver); +} +module_exit(ehci_brcm_exit); + +MODULE_ALIAS("platform:ehci-brcm"); +MODULE_DESCRIPTION(BRCM_DRIVER_DESC); +MODULE_AUTHOR("Al Cooper"); +MODULE_LICENSE("GPL"); -- 1.9.0.138.g2de3478 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=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 9D09FC43441 for ; Fri, 9 Nov 2018 14:11:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5227220825 for ; Fri, 9 Nov 2018 14:11:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="vKfyOps6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5227220825 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728778AbeKIXwW (ORCPT ); Fri, 9 Nov 2018 18:52:22 -0500 Received: from mail-yw1-f67.google.com ([209.85.161.67]:37501 "EHLO mail-yw1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728604AbeKIXwV (ORCPT ); Fri, 9 Nov 2018 18:52:21 -0500 Received: by mail-yw1-f67.google.com with SMTP id v77-v6so1678124ywc.4; Fri, 09 Nov 2018 06:11:35 -0800 (PST) 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=EVb7VCq6Tf3SsekKc2jGmlWIMkhRfo5YqgMjxLjryJ0=; b=vKfyOps6b0oePBBZXQIgLp73Oisq7GqaMlxB9UxGxe1IL22RnlLGMGSOZKcMCuWpA8 fliCbt3TC1Sa6+b+fdsW2D7AI18JXEP0kgRMJlmxSEk9zbj8Le8xI+noSCTZYgX1AArr 46WR1E9xxWHPPIpy3u3xXrxROIriS93vffbmKteqKcVoroEG4u119puv0WKaYVlSs9Te PtYZ/aGVTeohpjqI57p41HEOIJbQ240JDCwxew3foBM85Sctq3pDwMgKggSZKA2HcOMN 9UoJ4GjGcxxI7/zc46Q05Ky/1Gfqpkx1W91iCIZ3UIuMbm9uTEScRxdxV5VkjLzGpXgd wTpg== 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=EVb7VCq6Tf3SsekKc2jGmlWIMkhRfo5YqgMjxLjryJ0=; b=lxIvW+qxxk74G+SQfjfIbx8zlN8DA6SYsdunSbuNSRzIQhqJ+GkxE49Hg41kDWCctV tOIiBHSCCbwub6aKSbJRF/XyTFkVbLKqFrBOR1LxLRU1aAZpIU1uy+22OUXuWBBHe5K0 /l3JcRqGp9Vut17+6NERyh5XfOyt5wzsBSELUIGoJ/XVzRr/dFPRoH0Yun+e3IZdlusr uu7uC5hlotR/4zwzYfGcMd1cGjdIXuJqY1BuhVu6ae9dE0S1Z6HzCY43KkFflDZlA31+ rJOilTYhGZ3hAYD6jcaTDtke2Kfvi5HLO/NsiKp0E6Z4iwXQinNttJAm59Udjvz4xVHZ K+GQ== X-Gm-Message-State: AGRZ1gKq3I5eB+xzgfJ9o4fyfj1lozKzd39El86MC+pO3WuSFpTp9+Wf DM9r4qb5G6R4Q8605YOXrIJ/IvbqQd0= X-Google-Smtp-Source: AJdET5dEVJm4QYG9hKajNrQ2pyDtb5+1K3FY1L6n3kwtxDOzdb7BM4sZQW6ha2hJhW+ztuE7/VKT5w== X-Received: by 2002:a81:6f57:: with SMTP id k84-v6mr8883177ywc.348.1541772694862; Fri, 09 Nov 2018 06:11:34 -0800 (PST) Received: from stbsrv-and-3.and.broadcom.com ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id c6-v6sm7301965ywh.34.2018.11.09.06.11.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Nov 2018 06:11:34 -0800 (PST) From: Al Cooper To: linux-kernel@vger.kernel.org Cc: Al Cooper , Alan Stern , Alban Bedel , Alex Elder , Andrew Morton , Arnd Bergmann , Avi Fishman , bcm-kernel-feedback-list@broadcom.com, Bjorn Andersson , Chunfeng Yun , "David S. Miller" , devicetree@vger.kernel.org, Dmitry Osipenko , Greg Kroah-Hartman , "Gustavo A. R. Silva" , Hans de Goede , James Hogan , Johan Hovold , Kees Cook , linux-usb@vger.kernel.org, Lu Baolu , Mark Rutland , Martin Blumenstingl , Mathias Nyman , Mathias Nyman , Mauro Carvalho Chehab , Rishabh Bhatnagar , Rob Herring , Roger Quadros Subject: [PATCH V4 4/5] usb: ehci: Add new EHCI driver for Broadcom STB SoC's Date: Fri, 9 Nov 2018 09:01:59 -0500 Message-Id: <1541772120-40394-5-git-send-email-alcooperx@gmail.com> X-Mailer: git-send-email 1.9.0.138.g2de3478 In-Reply-To: <1541772120-40394-1-git-send-email-alcooperx@gmail.com> References: <1541772120-40394-1-git-send-email-alcooperx@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a new EHCI driver for Broadcom STB SoC's. A new EHCI driver was created instead of adding support to the existing ehci platform driver because of the code required to workaround bugs in the EHCI controller. Signed-off-by: Al Cooper --- drivers/usb/host/ehci-brcm.c | 286 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 286 insertions(+) create mode 100644 drivers/usb/host/ehci-brcm.c diff --git a/drivers/usb/host/ehci-brcm.c b/drivers/usb/host/ehci-brcm.c new file mode 100644 index 000000000000..eb0ea030a4c8 --- /dev/null +++ b/drivers/usb/host/ehci-brcm.c @@ -0,0 +1,286 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018, Broadcom */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ehci.h" + +#define BRCM_DRIVER_DESC "EHCI Broadcom STB driver" + +#define hcd_to_ehci_priv(h) ((struct brcm_priv *)hcd_to_ehci(h)->priv) + +struct brcm_priv { + struct clk *clk; +}; + +static const char brcm_hcd_name[] = "ehci-brcm"; + +static int (*org_hub_control)(struct usb_hcd *hcd, + u16 typeReq, u16 wValue, u16 wIndex, + char *buf, u16 wLength); + +/* ehci_brcm_wait_for_sof + * Wait for start of next microframe, then wait extra delay microseconds + */ +static inline void ehci_brcm_wait_for_sof(struct ehci_hcd *ehci, u32 delay) +{ + int frame_idx = ehci_readl(ehci, &ehci->regs->frame_index); + + while (frame_idx == ehci_readl(ehci, &ehci->regs->frame_index)) + ; + udelay(delay); +} + +/* + * ehci_brcm_hub_control + * Intercept echi-hcd request to complete RESUME and align it to the start + * of the next microframe. + * If RESUME is complete too late in the microframe, host controller + * detects babble on suspended port and resets the port afterwards. + * This s/w workaround allows to avoid this problem. + * See SWLINUX-1909 for more details + */ +static int ehci_brcm_hub_control( + struct usb_hcd *hcd, + u16 typeReq, + u16 wValue, + u16 wIndex, + char *buf, + u16 wLength) +{ + struct ehci_hcd *ehci = hcd_to_ehci(hcd); + int ports = HCS_N_PORTS(ehci->hcs_params); + u32 __iomem *status_reg = &ehci->regs->port_status[ + (wIndex & 0xff) - 1]; + unsigned long flags; + int retval, irq_disabled = 0; + + /* + * RESUME is cleared when GetPortStatus() is called 20ms after start + * of RESUME + */ + if ((typeReq == GetPortStatus) && + (wIndex && wIndex <= ports) && + ehci->reset_done[wIndex-1] && + time_after_eq(jiffies, ehci->reset_done[wIndex-1]) && + (ehci_readl(ehci, status_reg) & PORT_RESUME)) { + + /* + * to make sure we are not interrupted until RESUME bit + * is cleared, disable interrupts on current CPU + */ + ehci_dbg(ehci, "SOF alignment workaround\n"); + irq_disabled = 1; + local_irq_save(flags); + ehci_brcm_wait_for_sof(ehci, 5); + } + retval = (*org_hub_control)(hcd, typeReq, wValue, wIndex, buf, wLength); + if (irq_disabled) + local_irq_restore(flags); + return retval; +} + +static int ehci_brcm_reset(struct usb_hcd *hcd) +{ + struct ehci_hcd *ehci = hcd_to_ehci(hcd); + + ehci->big_endian_mmio = 1; + + ehci->caps = (struct ehci_caps *) hcd->regs; + ehci->regs = (struct ehci_regs *) (hcd->regs + + HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase))); + + /* This fixes the lockup during reboot due to prior interrupts */ + ehci_writel(ehci, CMD_RESET, &ehci->regs->command); + mdelay(10); + + /* + * SWLINUX-1705: Avoid OUT packet underflows during high memory + * bus usage + * port_status[0x0f] = Broadcom-proprietary USB_EHCI_INSNREG00 @ 0x90 + */ + ehci_writel(ehci, 0x00800040, &ehci->regs->port_status[0x10]); + ehci_writel(ehci, 0x00000001, &ehci->regs->port_status[0x12]); + + return ehci_setup(hcd); +} + +static struct hc_driver __read_mostly ehci_brcm_hc_driver; + +static const struct ehci_driver_overrides brcm_overrides __initconst = { + + .reset = ehci_brcm_reset, + .extra_priv_size = sizeof(struct brcm_priv), +}; + +static int ehci_brcm_probe(struct platform_device *pdev) +{ + struct usb_hcd *hcd; + struct resource *res_mem; + struct brcm_priv *priv; + int irq; + int err; + + if (usb_disabled()) + return -ENODEV; + + err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); + if (err) + return err; + + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(&pdev->dev, "no irq provided"); + return irq; + } + + /* Hook the hub control routine to work around a bug */ + if (org_hub_control == NULL) + org_hub_control = ehci_brcm_hc_driver.hub_control; + ehci_brcm_hc_driver.hub_control = ehci_brcm_hub_control; + + /* initialize hcd */ + hcd = usb_create_hcd(&ehci_brcm_hc_driver, + &pdev->dev, dev_name(&pdev->dev)); + if (!hcd) + return -ENOMEM; + + platform_set_drvdata(pdev, hcd); + priv = hcd_to_ehci_priv(hcd); + + priv->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(priv->clk)) { + dev_err(&pdev->dev, "Clock not found in Device Tree\n"); + priv->clk = NULL; + } + err = clk_prepare_enable(priv->clk); + if (err) + goto err_hcd; + + res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + hcd->regs = devm_ioremap_resource(&pdev->dev, res_mem); + if (IS_ERR(hcd->regs)) { + err = PTR_ERR(hcd->regs); + goto err_clk; + } + hcd->rsrc_start = res_mem->start; + hcd->rsrc_len = resource_size(res_mem); + err = usb_add_hcd(hcd, irq, IRQF_SHARED); + if (err) + goto err_clk; + + device_wakeup_enable(hcd->self.controller); + device_enable_async_suspend(hcd->self.controller); + platform_set_drvdata(pdev, hcd); + + return err; + +err_clk: + clk_disable_unprepare(priv->clk); +err_hcd: + usb_put_hcd(hcd); + + return err; +} + +static int ehci_brcm_remove(struct platform_device *dev) +{ + struct usb_hcd *hcd = platform_get_drvdata(dev); + struct brcm_priv *priv = hcd_to_ehci_priv(hcd); + + usb_remove_hcd(hcd); + clk_disable_unprepare(priv->clk); + usb_put_hcd(hcd); + return 0; +} + +#ifdef CONFIG_PM_SLEEP + +static int ehci_brcm_suspend(struct device *dev) +{ + int ret; + struct usb_hcd *hcd = dev_get_drvdata(dev); + struct brcm_priv *priv = hcd_to_ehci_priv(hcd); + bool do_wakeup = device_may_wakeup(dev); + + ret = ehci_suspend(hcd, do_wakeup); + clk_disable_unprepare(priv->clk); + return ret; +} + +static int ehci_brcm_resume(struct device *dev) +{ + struct usb_hcd *hcd = dev_get_drvdata(dev); + struct ehci_hcd *ehci = hcd_to_ehci(hcd); + struct brcm_priv *priv = hcd_to_ehci_priv(hcd); + int err; + + err = clk_prepare_enable(priv->clk); + if (err) + return err; + /* + * SWLINUX-1705: Avoid OUT packet underflows during high memory + * bus usage + * port_status[0x0f] = Broadcom-proprietary USB_EHCI_INSNREG00 + * @ 0x90 + */ + ehci_writel(ehci, 0x00800040, &ehci->regs->port_status[0x10]); + ehci_writel(ehci, 0x00000001, &ehci->regs->port_status[0x12]); + + ehci_resume(hcd, false); + return 0; +} +#endif /* CONFIG_PM_SLEEP */ + +static SIMPLE_DEV_PM_OPS(ehci_brcm_pm_ops, ehci_brcm_suspend, + ehci_brcm_resume); + +static const struct of_device_id brcm_ehci_of_match[] = { + { .compatible = "brcm,bcm7445-ehci", }, + {} +}; + +static struct platform_driver ehci_brcm_driver = { + .probe = ehci_brcm_probe, + .remove = ehci_brcm_remove, + .shutdown = usb_hcd_platform_shutdown, + .driver = { + .owner = THIS_MODULE, + .name = "ehci-brcm", + .pm = &ehci_brcm_pm_ops, + .of_match_table = brcm_ehci_of_match, + } +}; + +static int __init ehci_brcm_init(void) +{ + if (usb_disabled()) + return -ENODEV; + + pr_info("%s: " BRCM_DRIVER_DESC "\n", brcm_hcd_name); + + ehci_init_driver(&ehci_brcm_hc_driver, &brcm_overrides); + return platform_driver_register(&ehci_brcm_driver); +} +module_init(ehci_brcm_init); + +static void __exit ehci_brcm_exit(void) +{ + platform_driver_unregister(&ehci_brcm_driver); +} +module_exit(ehci_brcm_exit); + +MODULE_ALIAS("platform:ehci-brcm"); +MODULE_DESCRIPTION(BRCM_DRIVER_DESC); +MODULE_AUTHOR("Al Cooper"); +MODULE_LICENSE("GPL"); -- 1.9.0.138.g2de3478