Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2,1/5] usb: split code locating ACPI companion into port and device From: Rajat Jain Message-Id: <20181119230409.258121-1-rajatja@google.com> Date: Mon, 19 Nov 2018 15:04:05 -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 SmFpbiA8cmFqYXRqYUBnb29nbGUuY29tPgotLS0KdjI6IHNhbWUgYXMgdjEKCiBkcml2ZXJzL3Vz Yi9jb3JlL3VzYi1hY3BpLmMgfCAxMzMgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgNzIgaW5zZXJ0aW9ucygrKSwgNjEgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvY29yZS91c2ItYWNwaS5jIGIvZHJpdmVycy91c2IvY29y ZS91c2ItYWNwaS5jCmluZGV4IGUyMjE4NjFiMzE4Ny4uOGZmNzNjODNlOGU4IDEwMDY0NAotLS0g YS9kcml2ZXJzL3VzYi9jb3JlL3VzYi1hY3BpLmMKKysrIGIvZHJpdmVycy91c2IvY29yZS91c2It YWNwaS5jCkBAIC0xMzksMTIgKzEzOSw3OSBAQCBzdGF0aWMgc3RydWN0IGFjcGlfZGV2aWNlICp1 c2JfYWNwaV9maW5kX3BvcnQoc3RydWN0IGFjcGlfZGV2aWNlICpwYXJlbnQsCiAJcmV0dXJuIGFj cGlfZmluZF9jaGlsZF9kZXZpY2UocGFyZW50LCByYXcsIGZhbHNlKTsKIH0KIAotc3RhdGljIHN0 cnVjdCBhY3BpX2RldmljZSAqdXNiX2FjcGlfZmluZF9jb21wYW5pb24oc3RydWN0IGRldmljZSAq ZGV2KQorc3RhdGljIHN0cnVjdCBhY3BpX2RldmljZSAqCit1c2JfYWNwaV9nZXRfY29tcGFuaW9u X2Zvcl9wb3J0KHN0cnVjdCB1c2JfcG9ydCAqcG9ydF9kZXYpCiB7CiAJc3RydWN0IHVzYl9kZXZp Y2UgKnVkZXY7CiAJc3RydWN0IGFjcGlfZGV2aWNlICphZGV2OwogCWFjcGlfaGFuZGxlICpwYXJl bnRfaGFuZGxlOworCWludCBwb3J0MTsKKworCS8qIEdldCB0aGUgc3RydWN0IHVzYl9kZXZpY2Ug cG9pbnQgb2YgcG9ydCdzIGh1YiAqLworCXVkZXYgPSB0b191c2JfZGV2aWNlKHBvcnRfZGV2LT5k ZXYucGFyZW50LT5wYXJlbnQpOworCisJLyoKKwkgKiBUaGUgcm9vdCBodWIgcG9ydHMnIHBhcmVu dCBpcyB0aGUgcm9vdCBodWIuIFRoZSBub24tcm9vdC1odWIKKwkgKiBwb3J0cycgcGFyZW50IGlz IHRoZSBwYXJlbnQgaHViIHBvcnQgd2hpY2ggdGhlIGh1YiBpcworCSAqIGNvbm5lY3RlZCB0by4K KwkgKi8KKwlpZiAoIXVkZXYtPnBhcmVudCkgeworCQlhZGV2ID0gQUNQSV9DT01QQU5JT04oJnVk ZXYtPmRldik7CisJCXBvcnQxID0gdXNiX2hjZF9maW5kX3Jhd19wb3J0X251bWJlcihidXNfdG9f aGNkKHVkZXYtPmJ1cyksCisJCQkJCQkgICAgIHBvcnRfZGV2LT5wb3J0bnVtKTsKKwl9IGVsc2Ug eworCQlwYXJlbnRfaGFuZGxlID0gdXNiX2dldF9odWJfcG9ydF9hY3BpX2hhbmRsZSh1ZGV2LT5w YXJlbnQsCisJCQkJCQkJICAgICB1ZGV2LT5wb3J0bnVtKTsKKwkJaWYgKCFwYXJlbnRfaGFuZGxl KQorCQkJcmV0dXJuIE5VTEw7CisKKwkJYWNwaV9idXNfZ2V0X2RldmljZShwYXJlbnRfaGFuZGxl LCAmYWRldik7CisJCXBvcnQxID0gcG9ydF9kZXYtPnBvcnRudW07CisJfQorCisJcmV0dXJuIHVz Yl9hY3BpX2ZpbmRfcG9ydChhZGV2LCBwb3J0MSk7Cit9CisKK3N0YXRpYyBzdHJ1Y3QgYWNwaV9k ZXZpY2UgKgordXNiX2FjcGlfZmluZF9jb21wYW5pb25fZm9yX3BvcnQoc3RydWN0IHVzYl9wb3J0 ICpwb3J0X2RldikKK3sKKwlzdHJ1Y3QgYWNwaV9kZXZpY2UgKmFkZXY7CisJc3RydWN0IGFjcGlf cGxkX2luZm8gKnBsZDsKKwlhY3BpX2hhbmRsZSAqaGFuZGxlOworCWFjcGlfc3RhdHVzIHN0YXR1 czsKKworCWFkZXYgPSB1c2JfYWNwaV9nZXRfY29tcGFuaW9uX2Zvcl9wb3J0KHBvcnRfZGV2KTsK KwlpZiAoIWFkZXYpCisJCXJldHVybiBOVUxMOworCisJaGFuZGxlID0gYWRldi0+aGFuZGxlOwor CXN0YXR1cyA9IGFjcGlfZ2V0X3BoeXNpY2FsX2RldmljZV9sb2NhdGlvbihoYW5kbGUsICZwbGQp OworCWlmICghQUNQSV9GQUlMVVJFKHN0YXR1cykgJiYgcGxkKSB7CisJCXBvcnRfZGV2LT5sb2Nh dGlvbiA9IFVTQl9BQ1BJX0xPQ0FUSU9OX1ZBTElECisJCQl8IHBsZC0+Z3JvdXBfdG9rZW4gPDwg OCB8IHBsZC0+Z3JvdXBfcG9zaXRpb247CisJCXBvcnRfZGV2LT5jb25uZWN0X3R5cGUgPSB1c2Jf YWNwaV9nZXRfY29ubmVjdF90eXBlKGhhbmRsZSwgcGxkKTsKKwkJQUNQSV9GUkVFKHBsZCk7CisJ fQogCisJcmV0dXJuIGFkZXY7Cit9CisKK3N0YXRpYyBzdHJ1Y3QgYWNwaV9kZXZpY2UgKgordXNi X2FjcGlfZmluZF9jb21wYW5pb25fZm9yX2RldmljZShzdHJ1Y3QgdXNiX2RldmljZSAqdWRldikK K3sKKwlzdHJ1Y3QgYWNwaV9kZXZpY2UgKmFkZXY7CisKKwlpZiAoIXVkZXYtPnBhcmVudCkKKwkJ cmV0dXJuIE5VTEw7CisKKwkvKiByb290IGh1YiBpcyBvbmx5IGNoaWxkIChfQURSPTApIHVuZGVy IGl0cyBwYXJlbnQsIHRoZSBIQyAqLworCWFkZXYgPSBBQ1BJX0NPTVBBTklPTih1ZGV2LT5kZXYu cGFyZW50KTsKKwlyZXR1cm4gYWNwaV9maW5kX2NoaWxkX2RldmljZShhZGV2LCAwLCBmYWxzZSk7 Cit9CisKKworc3RhdGljIHN0cnVjdCBhY3BpX2RldmljZSAqdXNiX2FjcGlfZmluZF9jb21wYW5p b24oc3RydWN0IGRldmljZSAqZGV2KQorewogCS8qCiAJICogSW4gdGhlIEFDUEkgRFNEVCB0YWJs ZSwgb25seSB1c2Igcm9vdCBodWIgYW5kIHVzYiBwb3J0cyBhcmUKIAkgKiBhY3BpIGRldmljZSBu b2Rlcy4gVGhlIGhpZXJhcmNoeSBsaWtlIGZvbGxvd2luZy4KQEAgLTE1OCw2NiArMjI1LDEwIEBA IHN0YXRpYyBzdHJ1Y3QgYWNwaV9kZXZpY2UgKnVzYl9hY3BpX2ZpbmRfY29tcGFuaW9uKHN0cnVj dCBkZXZpY2UgKmRldikKIAkgKiBTbyBhbGwgYmluZGluZyBwcm9jZXNzIGlzIGRpdmlkZWQgaW50 byB0d28gcGFydHMuIGJpbmRpbmcKIAkgKiByb290IGh1YiBhbmQgdXNiIHBvcnRzLgogCSAqLwot CWlmIChpc191c2JfZGV2aWNlKGRldikpIHsKLQkJdWRldiA9IHRvX3VzYl9kZXZpY2UoZGV2KTsK LQkJaWYgKHVkZXYtPnBhcmVudCkKLQkJCXJldHVybiBOVUxMOwotCi0JCS8qIHJvb3QgaHViIGlz IG9ubHkgY2hpbGQgKF9BRFI9MCkgdW5kZXIgaXRzIHBhcmVudCwgdGhlIEhDICovCi0JCWFkZXYg PSBBQ1BJX0NPTVBBTklPTihkZXYtPnBhcmVudCk7Ci0JCXJldHVybiBhY3BpX2ZpbmRfY2hpbGRf ZGV2aWNlKGFkZXYsIDAsIGZhbHNlKTsKLQl9IGVsc2UgaWYgKGlzX3VzYl9wb3J0KGRldikpIHsK LQkJc3RydWN0IHVzYl9wb3J0ICpwb3J0X2RldiA9IHRvX3VzYl9wb3J0KGRldik7Ci0JCWludCBw b3J0MSA9IHBvcnRfZGV2LT5wb3J0bnVtOwotCQlzdHJ1Y3QgYWNwaV9wbGRfaW5mbyAqcGxkOwot CQlhY3BpX2hhbmRsZSAqaGFuZGxlOwotCQlhY3BpX3N0YXR1cyBzdGF0dXM7Ci0KLQkJLyogR2V0 IHRoZSBzdHJ1Y3QgdXNiX2RldmljZSBwb2ludCBvZiBwb3J0J3MgaHViICovCi0JCXVkZXYgPSB0 b191c2JfZGV2aWNlKGRldi0+cGFyZW50LT5wYXJlbnQpOwotCi0JCS8qCi0JCSAqIFRoZSByb290 IGh1YiBwb3J0cycgcGFyZW50IGlzIHRoZSByb290IGh1Yi4gVGhlIG5vbi1yb290LWh1YgotCQkg KiBwb3J0cycgcGFyZW50IGlzIHRoZSBwYXJlbnQgaHViIHBvcnQgd2hpY2ggdGhlIGh1YiBpcwot CQkgKiBjb25uZWN0ZWQgdG8uCi0JCSAqLwotCQlpZiAoIXVkZXYtPnBhcmVudCkgewotCQkJc3Ry dWN0IHVzYl9oY2QgKmhjZCA9IGJ1c190b19oY2QodWRldi0+YnVzKTsKLQkJCWludCByYXc7Ci0K LQkJCXJhdyA9IHVzYl9oY2RfZmluZF9yYXdfcG9ydF9udW1iZXIoaGNkLCBwb3J0MSk7Ci0KLQkJ CWFkZXYgPSB1c2JfYWNwaV9maW5kX3BvcnQoQUNQSV9DT01QQU5JT04oJnVkZXYtPmRldiksCi0J CQkJCQkgIHJhdyk7Ci0KLQkJCWlmICghYWRldikKLQkJCQlyZXR1cm4gTlVMTDsKLQkJfSBlbHNl IHsKLQkJCXBhcmVudF9oYW5kbGUgPQotCQkJCXVzYl9nZXRfaHViX3BvcnRfYWNwaV9oYW5kbGUo dWRldi0+cGFyZW50LAotCQkJCXVkZXYtPnBvcnRudW0pOwotCQkJaWYgKCFwYXJlbnRfaGFuZGxl KQotCQkJCXJldHVybiBOVUxMOwotCi0JCQlhY3BpX2J1c19nZXRfZGV2aWNlKHBhcmVudF9oYW5k bGUsICZhZGV2KTsKLQotCQkJYWRldiA9IHVzYl9hY3BpX2ZpbmRfcG9ydChhZGV2LCBwb3J0MSk7 Ci0KLQkJCWlmICghYWRldikKLQkJCQlyZXR1cm4gTlVMTDsKLQkJfQotCQloYW5kbGUgPSBhZGV2 LT5oYW5kbGU7Ci0JCXN0YXR1cyA9IGFjcGlfZ2V0X3BoeXNpY2FsX2RldmljZV9sb2NhdGlvbiho YW5kbGUsICZwbGQpOwotCQlpZiAoQUNQSV9GQUlMVVJFKHN0YXR1cykgfHwgIXBsZCkKLQkJCXJl dHVybiBhZGV2OwotCi0JCXBvcnRfZGV2LT5sb2NhdGlvbiA9IFVTQl9BQ1BJX0xPQ0FUSU9OX1ZB TElECi0JCQl8IHBsZC0+Z3JvdXBfdG9rZW4gPDwgOCB8IHBsZC0+Z3JvdXBfcG9zaXRpb247Ci0J CXBvcnRfZGV2LT5jb25uZWN0X3R5cGUgPSB1c2JfYWNwaV9nZXRfY29ubmVjdF90eXBlKGhhbmRs ZSwgcGxkKTsKLQkJQUNQSV9GUkVFKHBsZCk7Ci0KLQkJcmV0dXJuIGFkZXY7Ci0JfQorCWlmIChp c191c2JfZGV2aWNlKGRldikpCisJCXJldHVybiB1c2JfYWNwaV9maW5kX2NvbXBhbmlvbl9mb3Jf ZGV2aWNlKHRvX3VzYl9kZXZpY2UoZGV2KSk7CisJZWxzZSBpZiAoaXNfdXNiX3BvcnQoZGV2KSkK KwkJcmV0dXJuIHVzYl9hY3BpX2ZpbmRfY29tcGFuaW9uX2Zvcl9wb3J0KHRvX3VzYl9wb3J0KGRl dikpOwogCiAJcmV0dXJuIE5VTEw7CiB9Cg==