Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v5,4/4] Bluetooth: btusb: Use the cmd_timeout method to reset the Intel BT chip From: Rajat Jain Message-Id: <20190123205725.239661-4-rajatja@google.com> Date: Wed, 23 Jan 2019 12:57:25 -0800 To: Marcel Holtmann , Johan Hedberg , Greg Kroah-Hartman , "David S. Miller" , Dmitry Torokhov , Rajat Jain , Alex Hung , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, netdev@vger.kernel.org Cc: rajatxjain@gmail.com, dtor@google.com, raghuram.hegde@intel.com, chethan.tumkur.narayan@intel.com, sukumar.ghorai@intel.com List-ID: SWYgdGhlIHBsYXRmb3JtIHByb3ZpZGVzIGl0LCB1c2UgdGhlIHJlc2V0IGdwaW8gdG8gcmVzZXQg dGhlIEludGVsIEJUCmNoaXAsIGFzIHBhcnQgb2YgY21kX3RpbWVvdXQgaGFuZGxpbmcuIFRoaXMg aGFzIGJlZW4gZm91bmQgaGVscGZ1bCBvbgpJbnRlbCBibHVldG9vdGggY29udHJvbGxlcnMgd2hl cmUgdGhlIGZpcm13YXJlIGdldHMgc3R1Y2sgYW5kIHRoZSBvbmx5CndheSBvdXQgaXMgYSBoYXJk IHJlc2V0IHBpbiBwcm92aWRlZCBieSB0aGUgcGxhdGZvcm0uCgpTaWduZWQtb2ZmLWJ5OiBSYWph dCBKYWluIDxyYWphdGphQGdvb2dsZS5jb20+Ci0tLQp2NTogUmVuYW1lIHRoZSBob29rIHRvIGNt ZF90aW1lb3V0LCBhbmQgd2FpdCBmb3IgNSB0aW1lb3V0cyBiZWZvcmUKICAgIHJlc2V0dGluZyB0 aGUgZGV2aWNlLgp2NDogVXNlIGRhdGEtPmZsYWdzIGluc3RlYWQgb2YgY2xlYXJpbmcgdGhlIHF1 aXJrIGluIGJ0dXNiX2h3X3Jlc2V0KCkKdjM6IEJldHRlciBlcnJvciBoYW5kbGluZyBmb3IgZ3Bp b2RfZ2V0X29wdGlvbmFsKCkKdjI6IEhhbmRsZSB0aGUgRVBST0JFX0RFRkVSIGNhc2UuCgogZHJp dmVycy9ibHVldG9vdGgvYnR1c2IuYyB8IDU0ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDU0IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2JsdWV0b290aC9idHVzYi5jIGIvZHJpdmVycy9ibHVldG9vdGgvYnR1c2IuYwpp bmRleCA0NzYxNDk5ZGI5ZWUuLjg5NDllYTMwYTFiYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ibHVl dG9vdGgvYnR1c2IuYworKysgYi9kcml2ZXJzL2JsdWV0b290aC9idHVzYi5jCkBAIC0yOSw2ICsy OSw3IEBACiAjaW5jbHVkZSA8bGludXgvb2ZfZGV2aWNlLmg+CiAjaW5jbHVkZSA8bGludXgvb2Zf aXJxLmg+CiAjaW5jbHVkZSA8bGludXgvc3VzcGVuZC5oPgorI2luY2x1ZGUgPGxpbnV4L2dwaW8v Y29uc3VtZXIuaD4KICNpbmNsdWRlIDxhc20vdW5hbGlnbmVkLmg+CiAKICNpbmNsdWRlIDxuZXQv Ymx1ZXRvb3RoL2JsdWV0b290aC5oPgpAQCAtNDM5LDYgKzQ0MCw3IEBAIHN0YXRpYyBjb25zdCBz dHJ1Y3QgZG1pX3N5c3RlbV9pZCBidHVzYl9uZWVkc19yZXNldF9yZXN1bWVfdGFibGVbXSA9IHsK ICNkZWZpbmUgQlRVU0JfQk9PVElORwkJOQogI2RlZmluZSBCVFVTQl9ESUFHX1JVTk5JTkcJMTAK ICNkZWZpbmUgQlRVU0JfT09CX1dBS0VfRU5BQkxFRAkxMQorI2RlZmluZSBCVFVTQl9IV19SRVNF VF9BQ1RJVkUJMTIKIAogc3RydWN0IGJ0dXNiX2RhdGEgewogCXN0cnVjdCBoY2lfZGV2ICAgICAg ICpoZGV2OwpAQCAtNDc2LDYgKzQ3OCw4IEBAIHN0cnVjdCBidHVzYl9kYXRhIHsKIAlzdHJ1Y3Qg dXNiX2VuZHBvaW50X2Rlc2NyaXB0b3IgKmRpYWdfdHhfZXA7CiAJc3RydWN0IHVzYl9lbmRwb2lu dF9kZXNjcmlwdG9yICpkaWFnX3J4X2VwOwogCisJc3RydWN0IGdwaW9fZGVzYyAqcmVzZXRfZ3Bp bzsKKwogCV9fdTggY21kcmVxX3R5cGU7CiAJX191OCBjbWRyZXE7CiAKQEAgLTQ4OSw4ICs0OTMs MzkgQEAgc3RydWN0IGJ0dXNiX2RhdGEgewogCWludCAoKnNldHVwX29uX3VzYikoc3RydWN0IGhj aV9kZXYgKmhkZXYpOwogCiAJaW50IG9vYl93YWtlX2lycTsgICAvKiBpcnEgZm9yIG91dC1vZi1i YW5kIHdha2Utb24tYnQgKi8KKwl1bnNpZ25lZCBudW1fY21kX3RpbWVvdXQ7CiB9OwogCisKK3N0 YXRpYyB2b2lkIGJ0dXNiX2ludGVsX2NtZF90aW1lb3V0KHN0cnVjdCBoY2lfZGV2ICpoZGV2LAor CQkJCSAgICBzdHJ1Y3QgaGNpX2NvbW1hbmRfaGRyICpjbWQpCit7CisJc3RydWN0IGJ0dXNiX2Rh dGEgKmRhdGEgPSBoY2lfZ2V0X2RydmRhdGEoaGRldik7CisJc3RydWN0IGdwaW9fZGVzYyAqcmVz ZXRfZ3BpbyA9IGRhdGEtPnJlc2V0X2dwaW87CisKKwlidF9kZXZfZXJyKGhkZXYsICJidHVzYiBu dW1fY21kX3RpbWVvdXQgPSAldSIsICsrZGF0YS0+bnVtX2NtZF90aW1lb3V0KTsKKworCWlmIChk YXRhLT5udW1fY21kX3RpbWVvdXQgPCA1KQorCQlyZXR1cm47CisKKwkvKgorCSAqIFRvZ2dsZSB0 aGUgaGFyZCByZXNldCBsaW5lIGlmIHRoZSBwbGF0Zm9ybSBwcm92aWRlcyBvbmUuIFRoZSByZXNl dAorCSAqIGlzIGdvaW5nIHRvIHlhbmsgdGhlIGRldmljZSBvZmYgdGhlIFVTQiBhbmQgdGhlbiBy ZXBsdWcuIFNvIGRvaW5nCisJICogb25jZSBpcyBlbm91Z2guIFRoZSBjbGVhbnVwIGlzIGhhbmRs ZWQgY29ycmVjdGx5IG9uIHRoZSB3YXkgb3V0CisJICogKHN0YW5kYXJkIFVTQiBkaXNjb25uZWN0 KSwgYW5kIHRoZSBuZXcgZGV2aWNlIGlzIGRldGVjdGVkIGNsZWFubHkKKwkgKiBhbmQgYm91bmQg dG8gdGhlIGRyaXZlciBhZ2FpbiBsaWtlIGl0IHNob3VsZCBiZS4KKwkgKi8KKwlpZiAodGVzdF9h bmRfc2V0X2JpdChCVFVTQl9IV19SRVNFVF9BQ1RJVkUsICZkYXRhLT5mbGFncykpIHsKKwkJYnRf ZGV2X2VycihoZGV2LCAibGFzdCByZXNldCBmYWlsZWQ/IE5vdCByZXNldHRpbmcgYWdhaW4iKTsK KwkJcmV0dXJuOworCX0KKworCWJ0X2Rldl9lcnIoaGRldiwgIkluaXRpYXRpbmcgSFcgcmVzZXQg dmlhIGdwaW8iKTsKKwlncGlvZF9zZXRfdmFsdWUocmVzZXRfZ3BpbywgMSk7CisJbWRlbGF5KDEw MCk7CisJZ3Bpb2Rfc2V0X3ZhbHVlKHJlc2V0X2dwaW8sIDApOworfQorCiBzdGF0aWMgaW5saW5l IHZvaWQgYnR1c2JfZnJlZV9mcmFncyhzdHJ1Y3QgYnR1c2JfZGF0YSAqZGF0YSkKIHsKIAl1bnNp Z25lZCBsb25nIGZsYWdzOwpAQCAtMjkxNSw2ICsyOTUwLDcgQEAgc3RhdGljIGludCBidHVzYl9w cm9iZShzdHJ1Y3QgdXNiX2ludGVyZmFjZSAqaW50ZiwKIAkJICAgICAgIGNvbnN0IHN0cnVjdCB1 c2JfZGV2aWNlX2lkICppZCkKIHsKIAlzdHJ1Y3QgdXNiX2VuZHBvaW50X2Rlc2NyaXB0b3IgKmVw X2Rlc2M7CisJc3RydWN0IGdwaW9fZGVzYyAqcmVzZXRfZ3BpbzsKIAlzdHJ1Y3QgYnR1c2JfZGF0 YSAqZGF0YTsKIAlzdHJ1Y3QgaGNpX2RldiAqaGRldjsKIAl1bnNpZ25lZCBpZm51bV9iYXNlOwpA QCAtMzAyOCw2ICszMDY0LDE1IEBAIHN0YXRpYyBpbnQgYnR1c2JfcHJvYmUoc3RydWN0IHVzYl9p bnRlcmZhY2UgKmludGYsCiAKIAlTRVRfSENJREVWX0RFVihoZGV2LCAmaW50Zi0+ZGV2KTsKIAor CXJlc2V0X2dwaW8gPSBncGlvZF9nZXRfb3B0aW9uYWwoJmRhdGEtPnVkZXYtPmRldiwgInJlc2V0 IiwKKwkJCQkJR1BJT0RfT1VUX0xPVyk7CisJaWYgKElTX0VSUihyZXNldF9ncGlvKSkgeworCQll cnIgPSBQVFJfRVJSKHJlc2V0X2dwaW8pOworCQlnb3RvIG91dF9mcmVlX2RldjsKKwl9IGVsc2Ug aWYgKHJlc2V0X2dwaW8pIHsKKwkJZGF0YS0+cmVzZXRfZ3BpbyA9IHJlc2V0X2dwaW87CisJfQor CiAJaGRldi0+b3BlbiAgID0gYnR1c2Jfb3BlbjsKIAloZGV2LT5jbG9zZSAgPSBidHVzYl9jbG9z ZTsKIAloZGV2LT5mbHVzaCAgPSBidHVzYl9mbHVzaDsKQEAgLTMwODUsNiArMzEzMCw4IEBAIHN0 YXRpYyBpbnQgYnR1c2JfcHJvYmUoc3RydWN0IHVzYl9pbnRlcmZhY2UgKmludGYsCiAJCXNldF9i aXQoSENJX1FVSVJLX1NUUklDVF9EVVBMSUNBVEVfRklMVEVSLCAmaGRldi0+cXVpcmtzKTsKIAkJ c2V0X2JpdChIQ0lfUVVJUktfU0lNVUxUQU5FT1VTX0RJU0NPVkVSWSwgJmhkZXYtPnF1aXJrcyk7 CiAJCXNldF9iaXQoSENJX1FVSVJLX05PTl9QRVJTSVNURU5UX0RJQUcsICZoZGV2LT5xdWlya3Mp OworCQlpZiAoZGF0YS0+cmVzZXRfZ3BpbykKKwkJCWhkZXYtPmNtZF90aW1lb3V0ID0gYnR1c2Jf aW50ZWxfY21kX3RpbWVvdXQ7CiAJfQogCiAJaWYgKGlkLT5kcml2ZXJfaW5mbyAmIEJUVVNCX0lO VEVMX05FVykgewpAQCAtMzA5Nyw2ICszMTQ0LDggQEAgc3RhdGljIGludCBidHVzYl9wcm9iZShz dHJ1Y3QgdXNiX2ludGVyZmFjZSAqaW50ZiwKIAkJc2V0X2JpdChIQ0lfUVVJUktfU1RSSUNUX0RV UExJQ0FURV9GSUxURVIsICZoZGV2LT5xdWlya3MpOwogCQlzZXRfYml0KEhDSV9RVUlSS19TSU1V TFRBTkVPVVNfRElTQ09WRVJZLCAmaGRldi0+cXVpcmtzKTsKIAkJc2V0X2JpdChIQ0lfUVVJUktf Tk9OX1BFUlNJU1RFTlRfRElBRywgJmhkZXYtPnF1aXJrcyk7CisJCWlmIChkYXRhLT5yZXNldF9n cGlvKQorCQkJaGRldi0+Y21kX3RpbWVvdXQgPSBidHVzYl9pbnRlbF9jbWRfdGltZW91dDsKIAl9 CiAKIAlpZiAoaWQtPmRyaXZlcl9pbmZvICYgQlRVU0JfTUFSVkVMTCkKQEAgLTMyMjYsNiArMzI3 NSw4IEBAIHN0YXRpYyBpbnQgYnR1c2JfcHJvYmUoc3RydWN0IHVzYl9pbnRlcmZhY2UgKmludGYs CiAJcmV0dXJuIDA7CiAKIG91dF9mcmVlX2RldjoKKwlpZiAoZGF0YS0+cmVzZXRfZ3BpbykKKwkJ Z3Bpb2RfcHV0KGRhdGEtPnJlc2V0X2dwaW8pOwogCWhjaV9mcmVlX2RldihoZGV2KTsKIAlyZXR1 cm4gZXJyOwogfQpAQCAtMzI2OSw2ICszMzIwLDkgQEAgc3RhdGljIHZvaWQgYnR1c2JfZGlzY29u bmVjdChzdHJ1Y3QgdXNiX2ludGVyZmFjZSAqaW50ZikKIAlpZiAoZGF0YS0+b29iX3dha2VfaXJx KQogCQlkZXZpY2VfaW5pdF93YWtldXAoJmRhdGEtPnVkZXYtPmRldiwgZmFsc2UpOwogCisJaWYg KGRhdGEtPnJlc2V0X2dwaW8pCisJCWdwaW9kX3B1dChkYXRhLT5yZXNldF9ncGlvKTsKKwogCWhj aV9mcmVlX2RldihoZGV2KTsKIH0KIAo=