Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v3,6/9] usb: roles: Find the muxes by also matching against the device node From: Heikki Krogerus Message-Id: <20190213074557.66028-7-heikki.krogerus@linux.intel.com> Date: Wed, 13 Feb 2019 10:45:54 +0300 To: Greg Kroah-Hartman Cc: Andy Shevchenko , Chen Yu , Jun Li , Hans de Goede , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: V2hlbiB0aGUgY29ubmVjdGlvbnMgYXJlIGRlZmluZWQgaW4gZmlybXdhcmUsIHN0cnVjdApkZXZp Y2VfY29ubmVjdGlvbiB3aWxsIGhhdmUgdGhlIGZ3bm9kZSBtZW1iZXIgcG9pbnRpbmcgdG8KdGhl IGRldmljZSBub2RlIChzdHJ1Y3QgZndub2RlX2hhbmRsZSkgb2YgdGhlIHJlcXVlc3RlZApkZXZp Y2UsIGFuZCB0aGUgZW5kcG9pbnQgd2lsbCBub3QgYmUgdXNlZCBhdCBhbGwgaW4gdGhhdApjYXNl LgoKQWNrZWQtYnk6IEhhbnMgZGUgR29lZGUgPGhkZWdvZWRlQHJlZGhhdC5jb20+ClJldmlld2Vk LWJ5OiBBbmR5IFNoZXZjaGVua28gPGFuZHkuc2hldmNoZW5rb0BnbWFpbC5jb20+ClJldmlld2Vk LWJ5OiBKdW4gTGkgPGp1bi5saUBueHAuY29tPgpUZXN0ZWQtYnk6IEp1biBMaSA8anVuLmxpQG54 cC5jb20+ClNpZ25lZC1vZmYtYnk6IEhlaWtraSBLcm9nZXJ1cyA8aGVpa2tpLmtyb2dlcnVzQGxp bnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL3VzYi9yb2xlcy9jbGFzcy5jIHwgMjEgKysrKysr KysrKysrKysrKysrLS0tCiBpbmNsdWRlL2xpbnV4L3VzYi9yb2xlLmggIHwgIDIgKysKIDIgZmls ZXMgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL3VzYi9yb2xlcy9jbGFzcy5jIGIvZHJpdmVycy91c2Ivcm9sZXMvY2xhc3MuYwpp bmRleCA5OTExNmFmMDdmMWQuLmY0NWQ4ZGY1Y2ZiOCAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2Iv cm9sZXMvY2xhc3MuYworKysgYi9kcml2ZXJzL3VzYi9yb2xlcy9jbGFzcy5jCkBAIC04LDYgKzgs NyBAQAogICovCiAKICNpbmNsdWRlIDxsaW51eC91c2Ivcm9sZS5oPgorI2luY2x1ZGUgPGxpbnV4 L3Byb3BlcnR5Lmg+CiAjaW5jbHVkZSA8bGludXgvZGV2aWNlLmg+CiAjaW5jbHVkZSA8bGludXgv bW9kdWxlLmg+CiAjaW5jbHVkZSA8bGludXgvbXV0ZXguaD4KQEAgLTg0LDcgKzg1LDEyIEBAIGVu dW0gdXNiX3JvbGUgdXNiX3JvbGVfc3dpdGNoX2dldF9yb2xlKHN0cnVjdCB1c2Jfcm9sZV9zd2l0 Y2ggKnN3KQogfQogRVhQT1JUX1NZTUJPTF9HUEwodXNiX3JvbGVfc3dpdGNoX2dldF9yb2xlKTsK IAotc3RhdGljIGludCBfX3N3aXRjaF9tYXRjaChzdHJ1Y3QgZGV2aWNlICpkZXYsIGNvbnN0IHZv aWQgKm5hbWUpCitzdGF0aWMgaW50IHN3aXRjaF9md25vZGVfbWF0Y2goc3RydWN0IGRldmljZSAq ZGV2LCBjb25zdCB2b2lkICpmd25vZGUpCit7CisJcmV0dXJuIGRldl9md25vZGUoZGV2KSA9PSBm d25vZGU7Cit9CisKK3N0YXRpYyBpbnQgc3dpdGNoX25hbWVfbWF0Y2goc3RydWN0IGRldmljZSAq ZGV2LCBjb25zdCB2b2lkICpuYW1lKQogewogCXJldHVybiAhc3RyY21wKChjb25zdCBjaGFyICop bmFtZSwgZGV2X25hbWUoZGV2KSk7CiB9CkBAIC05NCw4ICsxMDAsMTYgQEAgc3RhdGljIHZvaWQg KnVzYl9yb2xlX3N3aXRjaF9tYXRjaChzdHJ1Y3QgZGV2aWNlX2Nvbm5lY3Rpb24gKmNvbiwgaW50 IGVwLAogewogCXN0cnVjdCBkZXZpY2UgKmRldjsKIAotCWRldiA9IGNsYXNzX2ZpbmRfZGV2aWNl KHJvbGVfY2xhc3MsIE5VTEwsIGNvbi0+ZW5kcG9pbnRbZXBdLAotCQkJCV9fc3dpdGNoX21hdGNo KTsKKwlpZiAoY29uLT5md25vZGUpIHsKKwkJaWYgKCFmd25vZGVfcHJvcGVydHlfcHJlc2VudChj b24tPmZ3bm9kZSwgY29uLT5pZCkpCisJCQlyZXR1cm4gTlVMTDsKKworCQlkZXYgPSBjbGFzc19m aW5kX2RldmljZShyb2xlX2NsYXNzLCBOVUxMLCBjb24tPmZ3bm9kZSwKKwkJCQkJc3dpdGNoX2Z3 bm9kZV9tYXRjaCk7CisJfSBlbHNlIHsKKwkJZGV2ID0gY2xhc3NfZmluZF9kZXZpY2Uocm9sZV9j bGFzcywgTlVMTCwgY29uLT5lbmRwb2ludFtlcF0sCisJCQkJCXN3aXRjaF9uYW1lX21hdGNoKTsK Kwl9CiAKIAlyZXR1cm4gZGV2ID8gdG9fcm9sZV9zd2l0Y2goZGV2KSA6IEVSUl9QVFIoLUVQUk9C RV9ERUZFUik7CiB9CkBAIC0yNjYsNiArMjgwLDcgQEAgdXNiX3JvbGVfc3dpdGNoX3JlZ2lzdGVy KHN0cnVjdCBkZXZpY2UgKnBhcmVudCwKIAlzdy0+Z2V0ID0gZGVzYy0+Z2V0OwogCiAJc3ctPmRl di5wYXJlbnQgPSBwYXJlbnQ7CisJc3ctPmRldi5md25vZGUgPSBkZXNjLT5md25vZGU7CiAJc3ct PmRldi5jbGFzcyA9IHJvbGVfY2xhc3M7CiAJc3ctPmRldi50eXBlID0gJnVzYl9yb2xlX2Rldl90 eXBlOwogCWRldl9zZXRfbmFtZSgmc3ctPmRldiwgIiVzLXJvbGUtc3dpdGNoIiwgZGV2X25hbWUo cGFyZW50KSk7CmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L3VzYi9yb2xlLmggYi9pbmNsdWRl L2xpbnV4L3VzYi9yb2xlLmgKaW5kZXggZWRjNTFiZTRhNzdjLi5jMDVmZmE2YWJkYTkgMTAwNjQ0 Ci0tLSBhL2luY2x1ZGUvbGludXgvdXNiL3JvbGUuaAorKysgYi9pbmNsdWRlL2xpbnV4L3VzYi9y b2xlLmgKQEAgLTE4LDYgKzE4LDcgQEAgdHlwZWRlZiBlbnVtIHVzYl9yb2xlICgqdXNiX3JvbGVf c3dpdGNoX2dldF90KShzdHJ1Y3QgZGV2aWNlICpkZXYpOwogCiAvKioKICAqIHN0cnVjdCB1c2Jf cm9sZV9zd2l0Y2hfZGVzYyAtIFVTQiBSb2xlIFN3aXRjaCBEZXNjcmlwdG9yCisgKiBAZndub2Rl OiBUaGUgZGV2aWNlIG5vZGUgdG8gYmUgYXNzb2NpYXRlZCB3aXRoIHRoZSByb2xlIHN3aXRjaAog ICogQHVzYjJfcG9ydDogT3B0aW9uYWwgcmVmZXJlbmNlIHRvIHRoZSBob3N0IGNvbnRyb2xsZXIg cG9ydCBkZXZpY2UgKFVTQjIpCiAgKiBAdXNiM19wb3J0OiBPcHRpb25hbCByZWZlcmVuY2UgdG8g dGhlIGhvc3QgY29udHJvbGxlciBwb3J0IGRldmljZSAoVVNCMykKICAqIEB1ZGM6IE9wdGlvbmFs IHJlZmVyZW5jZSB0byB0aGUgcGVyaXBoZXJhbCBjb250cm9sbGVyIGRldmljZQpAQCAtMzIsNiAr MzMsNyBAQCB0eXBlZGVmIGVudW0gdXNiX3JvbGUgKCp1c2Jfcm9sZV9zd2l0Y2hfZ2V0X3QpKHN0 cnVjdCBkZXZpY2UgKmRldik7CiAgKiB1c2Jfcm9sZV9zd2l0Y2hfcmVnaXN0ZXIoKSBiZWZvcmUg cmVnaXN0ZXJpbmcgdGhlIHN3aXRjaC4KICAqLwogc3RydWN0IHVzYl9yb2xlX3N3aXRjaF9kZXNj IHsKKwlzdHJ1Y3QgZndub2RlX2hhbmRsZSAqZndub2RlOwogCXN0cnVjdCBkZXZpY2UgKnVzYjJf cG9ydDsKIAlzdHJ1Y3QgZGV2aWNlICp1c2IzX3BvcnQ7CiAJc3RydWN0IGRldmljZSAqdWRjOwo=