Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [1/5] usb: split code locating ACPI companion into port and device From: Rajat Jain Message-Id: <20181117010748.24347-2-rajatja@google.com> Date: Fri, 16 Nov 2018 17:07:44 -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 SmFpbiA8cmFqYXRqYUBnb29nbGUuY29tPgotLS0KIGRyaXZlcnMvdXNiL2NvcmUvdXNiLWFjcGku YyB8IDEzMyArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFu Z2VkLCA3MiBpbnNlcnRpb25zKCspLCA2MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL3VzYi9jb3JlL3VzYi1hY3BpLmMgYi9kcml2ZXJzL3VzYi9jb3JlL3VzYi1hY3BpLmMKaW5k ZXggZTIyMTg2MWIzMTg3Li44ZmY3M2M4M2U4ZTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL2Nv cmUvdXNiLWFjcGkuYworKysgYi9kcml2ZXJzL3VzYi9jb3JlL3VzYi1hY3BpLmMKQEAgLTEzOSwx MiArMTM5LDc5IEBAIHN0YXRpYyBzdHJ1Y3QgYWNwaV9kZXZpY2UgKnVzYl9hY3BpX2ZpbmRfcG9y dChzdHJ1Y3QgYWNwaV9kZXZpY2UgKnBhcmVudCwKIAlyZXR1cm4gYWNwaV9maW5kX2NoaWxkX2Rl dmljZShwYXJlbnQsIHJhdywgZmFsc2UpOwogfQogCi1zdGF0aWMgc3RydWN0IGFjcGlfZGV2aWNl ICp1c2JfYWNwaV9maW5kX2NvbXBhbmlvbihzdHJ1Y3QgZGV2aWNlICpkZXYpCitzdGF0aWMgc3Ry dWN0IGFjcGlfZGV2aWNlICoKK3VzYl9hY3BpX2dldF9jb21wYW5pb25fZm9yX3BvcnQoc3RydWN0 IHVzYl9wb3J0ICpwb3J0X2RldikKIHsKIAlzdHJ1Y3QgdXNiX2RldmljZSAqdWRldjsKIAlzdHJ1 Y3QgYWNwaV9kZXZpY2UgKmFkZXY7CiAJYWNwaV9oYW5kbGUgKnBhcmVudF9oYW5kbGU7CisJaW50 IHBvcnQxOworCisJLyogR2V0IHRoZSBzdHJ1Y3QgdXNiX2RldmljZSBwb2ludCBvZiBwb3J0J3Mg aHViICovCisJdWRldiA9IHRvX3VzYl9kZXZpY2UocG9ydF9kZXYtPmRldi5wYXJlbnQtPnBhcmVu dCk7CisKKwkvKgorCSAqIFRoZSByb290IGh1YiBwb3J0cycgcGFyZW50IGlzIHRoZSByb290IGh1 Yi4gVGhlIG5vbi1yb290LWh1YgorCSAqIHBvcnRzJyBwYXJlbnQgaXMgdGhlIHBhcmVudCBodWIg cG9ydCB3aGljaCB0aGUgaHViIGlzCisJICogY29ubmVjdGVkIHRvLgorCSAqLworCWlmICghdWRl di0+cGFyZW50KSB7CisJCWFkZXYgPSBBQ1BJX0NPTVBBTklPTigmdWRldi0+ZGV2KTsKKwkJcG9y dDEgPSB1c2JfaGNkX2ZpbmRfcmF3X3BvcnRfbnVtYmVyKGJ1c190b19oY2QodWRldi0+YnVzKSwK KwkJCQkJCSAgICAgcG9ydF9kZXYtPnBvcnRudW0pOworCX0gZWxzZSB7CisJCXBhcmVudF9oYW5k bGUgPSB1c2JfZ2V0X2h1Yl9wb3J0X2FjcGlfaGFuZGxlKHVkZXYtPnBhcmVudCwKKwkJCQkJCQkg ICAgIHVkZXYtPnBvcnRudW0pOworCQlpZiAoIXBhcmVudF9oYW5kbGUpCisJCQlyZXR1cm4gTlVM TDsKKworCQlhY3BpX2J1c19nZXRfZGV2aWNlKHBhcmVudF9oYW5kbGUsICZhZGV2KTsKKwkJcG9y dDEgPSBwb3J0X2Rldi0+cG9ydG51bTsKKwl9CisKKwlyZXR1cm4gdXNiX2FjcGlfZmluZF9wb3J0 KGFkZXYsIHBvcnQxKTsKK30KKworc3RhdGljIHN0cnVjdCBhY3BpX2RldmljZSAqCit1c2JfYWNw aV9maW5kX2NvbXBhbmlvbl9mb3JfcG9ydChzdHJ1Y3QgdXNiX3BvcnQgKnBvcnRfZGV2KQorewor CXN0cnVjdCBhY3BpX2RldmljZSAqYWRldjsKKwlzdHJ1Y3QgYWNwaV9wbGRfaW5mbyAqcGxkOwor CWFjcGlfaGFuZGxlICpoYW5kbGU7CisJYWNwaV9zdGF0dXMgc3RhdHVzOworCisJYWRldiA9IHVz Yl9hY3BpX2dldF9jb21wYW5pb25fZm9yX3BvcnQocG9ydF9kZXYpOworCWlmICghYWRldikKKwkJ cmV0dXJuIE5VTEw7CisKKwloYW5kbGUgPSBhZGV2LT5oYW5kbGU7CisJc3RhdHVzID0gYWNwaV9n ZXRfcGh5c2ljYWxfZGV2aWNlX2xvY2F0aW9uKGhhbmRsZSwgJnBsZCk7CisJaWYgKCFBQ1BJX0ZB SUxVUkUoc3RhdHVzKSAmJiBwbGQpIHsKKwkJcG9ydF9kZXYtPmxvY2F0aW9uID0gVVNCX0FDUElf TE9DQVRJT05fVkFMSUQKKwkJCXwgcGxkLT5ncm91cF90b2tlbiA8PCA4IHwgcGxkLT5ncm91cF9w b3NpdGlvbjsKKwkJcG9ydF9kZXYtPmNvbm5lY3RfdHlwZSA9IHVzYl9hY3BpX2dldF9jb25uZWN0 X3R5cGUoaGFuZGxlLCBwbGQpOworCQlBQ1BJX0ZSRUUocGxkKTsKKwl9CiAKKwlyZXR1cm4gYWRl djsKK30KKworc3RhdGljIHN0cnVjdCBhY3BpX2RldmljZSAqCit1c2JfYWNwaV9maW5kX2NvbXBh bmlvbl9mb3JfZGV2aWNlKHN0cnVjdCB1c2JfZGV2aWNlICp1ZGV2KQoreworCXN0cnVjdCBhY3Bp X2RldmljZSAqYWRldjsKKworCWlmICghdWRldi0+cGFyZW50KQorCQlyZXR1cm4gTlVMTDsKKwor CS8qIHJvb3QgaHViIGlzIG9ubHkgY2hpbGQgKF9BRFI9MCkgdW5kZXIgaXRzIHBhcmVudCwgdGhl IEhDICovCisJYWRldiA9IEFDUElfQ09NUEFOSU9OKHVkZXYtPmRldi5wYXJlbnQpOworCXJldHVy biBhY3BpX2ZpbmRfY2hpbGRfZGV2aWNlKGFkZXYsIDAsIGZhbHNlKTsKK30KKworCitzdGF0aWMg c3RydWN0IGFjcGlfZGV2aWNlICp1c2JfYWNwaV9maW5kX2NvbXBhbmlvbihzdHJ1Y3QgZGV2aWNl ICpkZXYpCit7CiAJLyoKIAkgKiBJbiB0aGUgQUNQSSBEU0RUIHRhYmxlLCBvbmx5IHVzYiByb290 IGh1YiBhbmQgdXNiIHBvcnRzIGFyZQogCSAqIGFjcGkgZGV2aWNlIG5vZGVzLiBUaGUgaGllcmFy Y2h5IGxpa2UgZm9sbG93aW5nLgpAQCAtMTU4LDY2ICsyMjUsMTAgQEAgc3RhdGljIHN0cnVjdCBh Y3BpX2RldmljZSAqdXNiX2FjcGlfZmluZF9jb21wYW5pb24oc3RydWN0IGRldmljZSAqZGV2KQog CSAqIFNvIGFsbCBiaW5kaW5nIHByb2Nlc3MgaXMgZGl2aWRlZCBpbnRvIHR3byBwYXJ0cy4gYmlu ZGluZwogCSAqIHJvb3QgaHViIGFuZCB1c2IgcG9ydHMuCiAJICovCi0JaWYgKGlzX3VzYl9kZXZp Y2UoZGV2KSkgewotCQl1ZGV2ID0gdG9fdXNiX2RldmljZShkZXYpOwotCQlpZiAodWRldi0+cGFy ZW50KQotCQkJcmV0dXJuIE5VTEw7Ci0KLQkJLyogcm9vdCBodWIgaXMgb25seSBjaGlsZCAoX0FE Uj0wKSB1bmRlciBpdHMgcGFyZW50LCB0aGUgSEMgKi8KLQkJYWRldiA9IEFDUElfQ09NUEFOSU9O KGRldi0+cGFyZW50KTsKLQkJcmV0dXJuIGFjcGlfZmluZF9jaGlsZF9kZXZpY2UoYWRldiwgMCwg ZmFsc2UpOwotCX0gZWxzZSBpZiAoaXNfdXNiX3BvcnQoZGV2KSkgewotCQlzdHJ1Y3QgdXNiX3Bv cnQgKnBvcnRfZGV2ID0gdG9fdXNiX3BvcnQoZGV2KTsKLQkJaW50IHBvcnQxID0gcG9ydF9kZXYt PnBvcnRudW07Ci0JCXN0cnVjdCBhY3BpX3BsZF9pbmZvICpwbGQ7Ci0JCWFjcGlfaGFuZGxlICpo YW5kbGU7Ci0JCWFjcGlfc3RhdHVzIHN0YXR1czsKLQotCQkvKiBHZXQgdGhlIHN0cnVjdCB1c2Jf ZGV2aWNlIHBvaW50IG9mIHBvcnQncyBodWIgKi8KLQkJdWRldiA9IHRvX3VzYl9kZXZpY2UoZGV2 LT5wYXJlbnQtPnBhcmVudCk7Ci0KLQkJLyoKLQkJICogVGhlIHJvb3QgaHViIHBvcnRzJyBwYXJl bnQgaXMgdGhlIHJvb3QgaHViLiBUaGUgbm9uLXJvb3QtaHViCi0JCSAqIHBvcnRzJyBwYXJlbnQg aXMgdGhlIHBhcmVudCBodWIgcG9ydCB3aGljaCB0aGUgaHViIGlzCi0JCSAqIGNvbm5lY3RlZCB0 by4KLQkJICovCi0JCWlmICghdWRldi0+cGFyZW50KSB7Ci0JCQlzdHJ1Y3QgdXNiX2hjZCAqaGNk ID0gYnVzX3RvX2hjZCh1ZGV2LT5idXMpOwotCQkJaW50IHJhdzsKLQotCQkJcmF3ID0gdXNiX2hj ZF9maW5kX3Jhd19wb3J0X251bWJlcihoY2QsIHBvcnQxKTsKLQotCQkJYWRldiA9IHVzYl9hY3Bp X2ZpbmRfcG9ydChBQ1BJX0NPTVBBTklPTigmdWRldi0+ZGV2KSwKLQkJCQkJCSAgcmF3KTsKLQot CQkJaWYgKCFhZGV2KQotCQkJCXJldHVybiBOVUxMOwotCQl9IGVsc2UgewotCQkJcGFyZW50X2hh bmRsZSA9Ci0JCQkJdXNiX2dldF9odWJfcG9ydF9hY3BpX2hhbmRsZSh1ZGV2LT5wYXJlbnQsCi0J CQkJdWRldi0+cG9ydG51bSk7Ci0JCQlpZiAoIXBhcmVudF9oYW5kbGUpCi0JCQkJcmV0dXJuIE5V TEw7Ci0KLQkJCWFjcGlfYnVzX2dldF9kZXZpY2UocGFyZW50X2hhbmRsZSwgJmFkZXYpOwotCi0J CQlhZGV2ID0gdXNiX2FjcGlfZmluZF9wb3J0KGFkZXYsIHBvcnQxKTsKLQotCQkJaWYgKCFhZGV2 KQotCQkJCXJldHVybiBOVUxMOwotCQl9Ci0JCWhhbmRsZSA9IGFkZXYtPmhhbmRsZTsKLQkJc3Rh dHVzID0gYWNwaV9nZXRfcGh5c2ljYWxfZGV2aWNlX2xvY2F0aW9uKGhhbmRsZSwgJnBsZCk7Ci0J CWlmIChBQ1BJX0ZBSUxVUkUoc3RhdHVzKSB8fCAhcGxkKQotCQkJcmV0dXJuIGFkZXY7Ci0KLQkJ cG9ydF9kZXYtPmxvY2F0aW9uID0gVVNCX0FDUElfTE9DQVRJT05fVkFMSUQKLQkJCXwgcGxkLT5n cm91cF90b2tlbiA8PCA4IHwgcGxkLT5ncm91cF9wb3NpdGlvbjsKLQkJcG9ydF9kZXYtPmNvbm5l Y3RfdHlwZSA9IHVzYl9hY3BpX2dldF9jb25uZWN0X3R5cGUoaGFuZGxlLCBwbGQpOwotCQlBQ1BJ X0ZSRUUocGxkKTsKLQotCQlyZXR1cm4gYWRldjsKLQl9CisJaWYgKGlzX3VzYl9kZXZpY2UoZGV2 KSkKKwkJcmV0dXJuIHVzYl9hY3BpX2ZpbmRfY29tcGFuaW9uX2Zvcl9kZXZpY2UodG9fdXNiX2Rl dmljZShkZXYpKTsKKwllbHNlIGlmIChpc191c2JfcG9ydChkZXYpKQorCQlyZXR1cm4gdXNiX2Fj cGlfZmluZF9jb21wYW5pb25fZm9yX3BvcnQodG9fdXNiX3BvcnQoZGV2KSk7CiAKIAlyZXR1cm4g TlVMTDsKIH0K