Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v4,1/5] usb: split code locating ACPI companion into port and device From: Rajat Jain Message-Id: <20190118223407.64818-1-rajatja@google.com> Date: Fri, 18 Jan 2019 14:34:03 -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: RnJvbTogRG1pdHJ5IFRvcm9raG92IDxkdG9yQGNocm9taXVtLm9yZz4KCkluIHByZXBhcmF0aW9u IGZvciBoYW5kbGluZyBlbWJlZGRlZCBVU0IgZGV2aWNlcyBsZXQncyBzcGxpdAp1c2JfYWNwaV9m aW5kX2NvbXBhbmlvbigpIGludG8gdXNiX2FjcGlfZmluZF9jb21wYW5pb25fZm9yX2RldmljZSgp IGFuZAp1c2JfYWNwaV9maW5kX2NvbXBhbmlvbl9mb3JfcG9ydCgpLgoKU2lnbmVkLW9mZi1ieTog RG1pdHJ5IFRvcm9raG92IDxkdG9yQGNocm9taXVtLm9yZz4KU2lnbmVkLW9mZi1ieTogUmFqYXQg SmFpbiA8cmFqYXRqYUBnb29nbGUuY29tPgpBY2tlZC1ieTogR3JlZyBLcm9haC1IYXJ0bWFuIDxn cmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KVGVzdGVkLWJ5OiBTdWt1bWFyIEdob3JhaSA8c3Vr dW1hci5naG9yYWlAaW50ZWwuY29tPgotLS0KdjQ6IEFkZCBBY2tlZC1ieSBhbmQgVGVzdGVkLWJ5 IGluIHNpZ25hdHVyZXMuCnYzOiBzYW1lIGFzIHYxCnYyOiBzYW1lIGFzIHYxCgogZHJpdmVycy91 c2IvY29yZS91c2ItYWNwaS5jIHwgMTMzICsrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDcyIGluc2VydGlvbnMoKyksIDYxIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL2NvcmUvdXNiLWFjcGkuYyBiL2RyaXZlcnMvdXNiL2Nv cmUvdXNiLWFjcGkuYwppbmRleCBlMjIxODYxYjMxODcuLjhmZjczYzgzZThlOCAxMDA2NDQKLS0t IGEvZHJpdmVycy91c2IvY29yZS91c2ItYWNwaS5jCisrKyBiL2RyaXZlcnMvdXNiL2NvcmUvdXNi LWFjcGkuYwpAQCAtMTM5LDEyICsxMzksNzkgQEAgc3RhdGljIHN0cnVjdCBhY3BpX2RldmljZSAq dXNiX2FjcGlfZmluZF9wb3J0KHN0cnVjdCBhY3BpX2RldmljZSAqcGFyZW50LAogCXJldHVybiBh Y3BpX2ZpbmRfY2hpbGRfZGV2aWNlKHBhcmVudCwgcmF3LCBmYWxzZSk7CiB9CiAKLXN0YXRpYyBz dHJ1Y3QgYWNwaV9kZXZpY2UgKnVzYl9hY3BpX2ZpbmRfY29tcGFuaW9uKHN0cnVjdCBkZXZpY2Ug KmRldikKK3N0YXRpYyBzdHJ1Y3QgYWNwaV9kZXZpY2UgKgordXNiX2FjcGlfZ2V0X2NvbXBhbmlv bl9mb3JfcG9ydChzdHJ1Y3QgdXNiX3BvcnQgKnBvcnRfZGV2KQogewogCXN0cnVjdCB1c2JfZGV2 aWNlICp1ZGV2OwogCXN0cnVjdCBhY3BpX2RldmljZSAqYWRldjsKIAlhY3BpX2hhbmRsZSAqcGFy ZW50X2hhbmRsZTsKKwlpbnQgcG9ydDE7CisKKwkvKiBHZXQgdGhlIHN0cnVjdCB1c2JfZGV2aWNl IHBvaW50IG9mIHBvcnQncyBodWIgKi8KKwl1ZGV2ID0gdG9fdXNiX2RldmljZShwb3J0X2Rldi0+ ZGV2LnBhcmVudC0+cGFyZW50KTsKKworCS8qCisJICogVGhlIHJvb3QgaHViIHBvcnRzJyBwYXJl bnQgaXMgdGhlIHJvb3QgaHViLiBUaGUgbm9uLXJvb3QtaHViCisJICogcG9ydHMnIHBhcmVudCBp cyB0aGUgcGFyZW50IGh1YiBwb3J0IHdoaWNoIHRoZSBodWIgaXMKKwkgKiBjb25uZWN0ZWQgdG8u CisJICovCisJaWYgKCF1ZGV2LT5wYXJlbnQpIHsKKwkJYWRldiA9IEFDUElfQ09NUEFOSU9OKCZ1 ZGV2LT5kZXYpOworCQlwb3J0MSA9IHVzYl9oY2RfZmluZF9yYXdfcG9ydF9udW1iZXIoYnVzX3Rv X2hjZCh1ZGV2LT5idXMpLAorCQkJCQkJICAgICBwb3J0X2Rldi0+cG9ydG51bSk7CisJfSBlbHNl IHsKKwkJcGFyZW50X2hhbmRsZSA9IHVzYl9nZXRfaHViX3BvcnRfYWNwaV9oYW5kbGUodWRldi0+ cGFyZW50LAorCQkJCQkJCSAgICAgdWRldi0+cG9ydG51bSk7CisJCWlmICghcGFyZW50X2hhbmRs ZSkKKwkJCXJldHVybiBOVUxMOworCisJCWFjcGlfYnVzX2dldF9kZXZpY2UocGFyZW50X2hhbmRs ZSwgJmFkZXYpOworCQlwb3J0MSA9IHBvcnRfZGV2LT5wb3J0bnVtOworCX0KKworCXJldHVybiB1 c2JfYWNwaV9maW5kX3BvcnQoYWRldiwgcG9ydDEpOworfQorCitzdGF0aWMgc3RydWN0IGFjcGlf ZGV2aWNlICoKK3VzYl9hY3BpX2ZpbmRfY29tcGFuaW9uX2Zvcl9wb3J0KHN0cnVjdCB1c2JfcG9y dCAqcG9ydF9kZXYpCit7CisJc3RydWN0IGFjcGlfZGV2aWNlICphZGV2OworCXN0cnVjdCBhY3Bp X3BsZF9pbmZvICpwbGQ7CisJYWNwaV9oYW5kbGUgKmhhbmRsZTsKKwlhY3BpX3N0YXR1cyBzdGF0 dXM7CisKKwlhZGV2ID0gdXNiX2FjcGlfZ2V0X2NvbXBhbmlvbl9mb3JfcG9ydChwb3J0X2Rldik7 CisJaWYgKCFhZGV2KQorCQlyZXR1cm4gTlVMTDsKKworCWhhbmRsZSA9IGFkZXYtPmhhbmRsZTsK KwlzdGF0dXMgPSBhY3BpX2dldF9waHlzaWNhbF9kZXZpY2VfbG9jYXRpb24oaGFuZGxlLCAmcGxk KTsKKwlpZiAoIUFDUElfRkFJTFVSRShzdGF0dXMpICYmIHBsZCkgeworCQlwb3J0X2Rldi0+bG9j YXRpb24gPSBVU0JfQUNQSV9MT0NBVElPTl9WQUxJRAorCQkJfCBwbGQtPmdyb3VwX3Rva2VuIDw8 IDggfCBwbGQtPmdyb3VwX3Bvc2l0aW9uOworCQlwb3J0X2Rldi0+Y29ubmVjdF90eXBlID0gdXNi X2FjcGlfZ2V0X2Nvbm5lY3RfdHlwZShoYW5kbGUsIHBsZCk7CisJCUFDUElfRlJFRShwbGQpOwor CX0KIAorCXJldHVybiBhZGV2OworfQorCitzdGF0aWMgc3RydWN0IGFjcGlfZGV2aWNlICoKK3Vz Yl9hY3BpX2ZpbmRfY29tcGFuaW9uX2Zvcl9kZXZpY2Uoc3RydWN0IHVzYl9kZXZpY2UgKnVkZXYp Cit7CisJc3RydWN0IGFjcGlfZGV2aWNlICphZGV2OworCisJaWYgKCF1ZGV2LT5wYXJlbnQpCisJ CXJldHVybiBOVUxMOworCisJLyogcm9vdCBodWIgaXMgb25seSBjaGlsZCAoX0FEUj0wKSB1bmRl ciBpdHMgcGFyZW50LCB0aGUgSEMgKi8KKwlhZGV2ID0gQUNQSV9DT01QQU5JT04odWRldi0+ZGV2 LnBhcmVudCk7CisJcmV0dXJuIGFjcGlfZmluZF9jaGlsZF9kZXZpY2UoYWRldiwgMCwgZmFsc2Up OworfQorCisKK3N0YXRpYyBzdHJ1Y3QgYWNwaV9kZXZpY2UgKnVzYl9hY3BpX2ZpbmRfY29tcGFu aW9uKHN0cnVjdCBkZXZpY2UgKmRldikKK3sKIAkvKgogCSAqIEluIHRoZSBBQ1BJIERTRFQgdGFi bGUsIG9ubHkgdXNiIHJvb3QgaHViIGFuZCB1c2IgcG9ydHMgYXJlCiAJICogYWNwaSBkZXZpY2Ug bm9kZXMuIFRoZSBoaWVyYXJjaHkgbGlrZSBmb2xsb3dpbmcuCkBAIC0xNTgsNjYgKzIyNSwxMCBA QCBzdGF0aWMgc3RydWN0IGFjcGlfZGV2aWNlICp1c2JfYWNwaV9maW5kX2NvbXBhbmlvbihzdHJ1 Y3QgZGV2aWNlICpkZXYpCiAJICogU28gYWxsIGJpbmRpbmcgcHJvY2VzcyBpcyBkaXZpZGVkIGlu dG8gdHdvIHBhcnRzLiBiaW5kaW5nCiAJICogcm9vdCBodWIgYW5kIHVzYiBwb3J0cy4KIAkgKi8K LQlpZiAoaXNfdXNiX2RldmljZShkZXYpKSB7Ci0JCXVkZXYgPSB0b191c2JfZGV2aWNlKGRldik7 Ci0JCWlmICh1ZGV2LT5wYXJlbnQpCi0JCQlyZXR1cm4gTlVMTDsKLQotCQkvKiByb290IGh1YiBp cyBvbmx5IGNoaWxkIChfQURSPTApIHVuZGVyIGl0cyBwYXJlbnQsIHRoZSBIQyAqLwotCQlhZGV2 ID0gQUNQSV9DT01QQU5JT04oZGV2LT5wYXJlbnQpOwotCQlyZXR1cm4gYWNwaV9maW5kX2NoaWxk X2RldmljZShhZGV2LCAwLCBmYWxzZSk7Ci0JfSBlbHNlIGlmIChpc191c2JfcG9ydChkZXYpKSB7 Ci0JCXN0cnVjdCB1c2JfcG9ydCAqcG9ydF9kZXYgPSB0b191c2JfcG9ydChkZXYpOwotCQlpbnQg cG9ydDEgPSBwb3J0X2Rldi0+cG9ydG51bTsKLQkJc3RydWN0IGFjcGlfcGxkX2luZm8gKnBsZDsK LQkJYWNwaV9oYW5kbGUgKmhhbmRsZTsKLQkJYWNwaV9zdGF0dXMgc3RhdHVzOwotCi0JCS8qIEdl dCB0aGUgc3RydWN0IHVzYl9kZXZpY2UgcG9pbnQgb2YgcG9ydCdzIGh1YiAqLwotCQl1ZGV2ID0g dG9fdXNiX2RldmljZShkZXYtPnBhcmVudC0+cGFyZW50KTsKLQotCQkvKgotCQkgKiBUaGUgcm9v dCBodWIgcG9ydHMnIHBhcmVudCBpcyB0aGUgcm9vdCBodWIuIFRoZSBub24tcm9vdC1odWIKLQkJ ICogcG9ydHMnIHBhcmVudCBpcyB0aGUgcGFyZW50IGh1YiBwb3J0IHdoaWNoIHRoZSBodWIgaXMK LQkJICogY29ubmVjdGVkIHRvLgotCQkgKi8KLQkJaWYgKCF1ZGV2LT5wYXJlbnQpIHsKLQkJCXN0 cnVjdCB1c2JfaGNkICpoY2QgPSBidXNfdG9faGNkKHVkZXYtPmJ1cyk7Ci0JCQlpbnQgcmF3Owot Ci0JCQlyYXcgPSB1c2JfaGNkX2ZpbmRfcmF3X3BvcnRfbnVtYmVyKGhjZCwgcG9ydDEpOwotCi0J CQlhZGV2ID0gdXNiX2FjcGlfZmluZF9wb3J0KEFDUElfQ09NUEFOSU9OKCZ1ZGV2LT5kZXYpLAot CQkJCQkJICByYXcpOwotCi0JCQlpZiAoIWFkZXYpCi0JCQkJcmV0dXJuIE5VTEw7Ci0JCX0gZWxz ZSB7Ci0JCQlwYXJlbnRfaGFuZGxlID0KLQkJCQl1c2JfZ2V0X2h1Yl9wb3J0X2FjcGlfaGFuZGxl KHVkZXYtPnBhcmVudCwKLQkJCQl1ZGV2LT5wb3J0bnVtKTsKLQkJCWlmICghcGFyZW50X2hhbmRs ZSkKLQkJCQlyZXR1cm4gTlVMTDsKLQotCQkJYWNwaV9idXNfZ2V0X2RldmljZShwYXJlbnRfaGFu ZGxlLCAmYWRldik7Ci0KLQkJCWFkZXYgPSB1c2JfYWNwaV9maW5kX3BvcnQoYWRldiwgcG9ydDEp OwotCi0JCQlpZiAoIWFkZXYpCi0JCQkJcmV0dXJuIE5VTEw7Ci0JCX0KLQkJaGFuZGxlID0gYWRl di0+aGFuZGxlOwotCQlzdGF0dXMgPSBhY3BpX2dldF9waHlzaWNhbF9kZXZpY2VfbG9jYXRpb24o aGFuZGxlLCAmcGxkKTsKLQkJaWYgKEFDUElfRkFJTFVSRShzdGF0dXMpIHx8ICFwbGQpCi0JCQly ZXR1cm4gYWRldjsKLQotCQlwb3J0X2Rldi0+bG9jYXRpb24gPSBVU0JfQUNQSV9MT0NBVElPTl9W QUxJRAotCQkJfCBwbGQtPmdyb3VwX3Rva2VuIDw8IDggfCBwbGQtPmdyb3VwX3Bvc2l0aW9uOwot CQlwb3J0X2Rldi0+Y29ubmVjdF90eXBlID0gdXNiX2FjcGlfZ2V0X2Nvbm5lY3RfdHlwZShoYW5k bGUsIHBsZCk7Ci0JCUFDUElfRlJFRShwbGQpOwotCi0JCXJldHVybiBhZGV2OwotCX0KKwlpZiAo aXNfdXNiX2RldmljZShkZXYpKQorCQlyZXR1cm4gdXNiX2FjcGlfZmluZF9jb21wYW5pb25fZm9y X2RldmljZSh0b191c2JfZGV2aWNlKGRldikpOworCWVsc2UgaWYgKGlzX3VzYl9wb3J0KGRldikp CisJCXJldHVybiB1c2JfYWNwaV9maW5kX2NvbXBhbmlvbl9mb3JfcG9ydCh0b191c2JfcG9ydChk ZXYpKTsKIAogCXJldHVybiBOVUxMOwogfQo=