Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v3,5/9] usb: typec: mux: Find the muxes by also matching against the device node From: Heikki Krogerus Message-Id: <20190213074557.66028-6-heikki.krogerus@linux.intel.com> Date: Wed, 13 Feb 2019 10:45:53 +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 LWJ5OiBKdW4gTGkgPGp1bi5saUBueHAuY29tPgpTaWduZWQtb2ZmLWJ5OiBIZWlra2kgS3JvZ2Vy dXMgPGhlaWtraS5rcm9nZXJ1c0BsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy91c2IvdHlw ZWMvbXV4LmMgfCA4NiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDc0IGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvdXNiL3R5cGVjL211eC5jIGIvZHJpdmVycy91c2IvdHlwZWMvbXV4LmMK aW5kZXggODk3NWY1OGUxZDYwLi5hNTk0N2Q5ODgyNGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNi L3R5cGVjL211eC5jCisrKyBiL2RyaXZlcnMvdXNiL3R5cGVjL211eC5jCkBAIC0xMSw2ICsxMSw4 IEBACiAjaW5jbHVkZSA8bGludXgvbGlzdC5oPgogI2luY2x1ZGUgPGxpbnV4L21vZHVsZS5oPgog I2luY2x1ZGUgPGxpbnV4L211dGV4Lmg+CisjaW5jbHVkZSA8bGludXgvcHJvcGVydHkuaD4KKyNp bmNsdWRlIDxsaW51eC9zbGFiLmg+CiAjaW5jbHVkZSA8bGludXgvdXNiL3R5cGVjX211eC5oPgog CiBzdGF0aWMgREVGSU5FX01VVEVYKHN3aXRjaF9sb2NrKTsKQEAgLTIzLDE1ICsyNSwyNSBAQCBz dGF0aWMgdm9pZCAqdHlwZWNfc3dpdGNoX21hdGNoKHN0cnVjdCBkZXZpY2VfY29ubmVjdGlvbiAq Y29uLCBpbnQgZXAsCiB7CiAJc3RydWN0IHR5cGVjX3N3aXRjaCAqc3c7CiAKLQlsaXN0X2Zvcl9l YWNoX2VudHJ5KHN3LCAmc3dpdGNoX2xpc3QsIGVudHJ5KQotCQlpZiAoIXN0cmNtcChjb24tPmVu ZHBvaW50W2VwXSwgZGV2X25hbWUoc3ctPmRldikpKQotCQkJcmV0dXJuIHN3OworCWlmICghY29u LT5md25vZGUpIHsKKwkJbGlzdF9mb3JfZWFjaF9lbnRyeShzdywgJnN3aXRjaF9saXN0LCBlbnRy eSkKKwkJCWlmICghc3RyY21wKGNvbi0+ZW5kcG9pbnRbZXBdLCBkZXZfbmFtZShzdy0+ZGV2KSkp CisJCQkJcmV0dXJuIHN3OworCQlyZXR1cm4gRVJSX1BUUigtRVBST0JFX0RFRkVSKTsKKwl9CiAK IAkvKgotCSAqIFdlIG9ubHkgZ2V0IGNhbGxlZCBpZiBhIGNvbm5lY3Rpb24gd2FzIGZvdW5kLCB0 ZWxsIHRoZSBjYWxsZXIgdG8KLQkgKiB3YWl0IGZvciB0aGUgc3dpdGNoIHRvIHNob3cgdXAuCisJ ICogV2l0aCBPRiBncmFwaCB0aGUgbXV4IG5vZGUgbXVzdCBoYXZlIGEgYm9vbGVhbiBkZXZpY2Ug cHJvcGVydHkgbmFtZWQKKwkgKiAib3JpZW50YXRpb24tc3dpdGNoIi4KIAkgKi8KLQlyZXR1cm4g RVJSX1BUUigtRVBST0JFX0RFRkVSKTsKKwlpZiAoY29uLT5pZCAmJiAhZndub2RlX3Byb3BlcnR5 X3ByZXNlbnQoY29uLT5md25vZGUsIGNvbi0+aWQpKQorCQlyZXR1cm4gTlVMTDsKKworCWxpc3Rf Zm9yX2VhY2hfZW50cnkoc3csICZzd2l0Y2hfbGlzdCwgZW50cnkpCisJCWlmIChkZXZfZndub2Rl KHN3LT5kZXYpID09IGNvbi0+Zndub2RlKQorCQkJcmV0dXJuIHN3OworCisJcmV0dXJuIGNvbi0+ aWQgPyBFUlJfUFRSKC1FUFJPQkVfREVGRVIpIDogTlVMTDsKIH0KIAogLyoqCkBAIC0xMTIsMTcg KzEyNCw2NyBAQCBFWFBPUlRfU1lNQk9MX0dQTCh0eXBlY19zd2l0Y2hfdW5yZWdpc3Rlcik7CiAK IHN0YXRpYyB2b2lkICp0eXBlY19tdXhfbWF0Y2goc3RydWN0IGRldmljZV9jb25uZWN0aW9uICpj b24sIGludCBlcCwgdm9pZCAqZGF0YSkKIHsKKwljb25zdCBzdHJ1Y3QgdHlwZWNfYWx0bW9kZV9k ZXNjICpkZXNjID0gZGF0YTsKIAlzdHJ1Y3QgdHlwZWNfbXV4ICptdXg7CisJc2l6ZV90IG52YWw7 CisJYm9vbCBtYXRjaDsKKwl1MTYgKnZhbDsKKwlpbnQgaTsKIAotCWxpc3RfZm9yX2VhY2hfZW50 cnkobXV4LCAmbXV4X2xpc3QsIGVudHJ5KQotCQlpZiAoIXN0cmNtcChjb24tPmVuZHBvaW50W2Vw XSwgZGV2X25hbWUobXV4LT5kZXYpKSkKLQkJCXJldHVybiBtdXg7CisJaWYgKCFjb24tPmZ3bm9k ZSkgeworCQlsaXN0X2Zvcl9lYWNoX2VudHJ5KG11eCwgJm11eF9saXN0LCBlbnRyeSkKKwkJCWlm ICghc3RyY21wKGNvbi0+ZW5kcG9pbnRbZXBdLCBkZXZfbmFtZShtdXgtPmRldikpKQorCQkJCXJl dHVybiBtdXg7CisJCXJldHVybiBFUlJfUFRSKC1FUFJPQkVfREVGRVIpOworCX0KIAogCS8qCi0J ICogV2Ugb25seSBnZXQgY2FsbGVkIGlmIGEgY29ubmVjdGlvbiB3YXMgZm91bmQsIHRlbGwgdGhl IGNhbGxlciB0bwotCSAqIHdhaXQgZm9yIHRoZSBzd2l0Y2ggdG8gc2hvdyB1cC4KKwkgKiBDaGVj ayBoYXMgdGhlIGlkZW50aWZpZXIgYWxyZWFkeSBiZWVuICJjb25zdW1lZCIuIElmIGl0CisJICog aGFzLCBubyBuZWVkIHRvIGRvIGFueSBleHRyYSBjb25uZWN0aW9uIGlkZW50aWZpY2F0aW9uLgog CSAqLwotCXJldHVybiBFUlJfUFRSKC1FUFJPQkVfREVGRVIpOworCW1hdGNoID0gIWNvbi0+aWQ7 CisJaWYgKG1hdGNoKQorCQlnb3RvIGZpbmRfbXV4OworCisJLyogQWNjZXNzb3J5IE1vZGUgbXV4 ZXMgKi8KKwlpZiAoIWRlc2MpIHsKKwkJbWF0Y2ggPSBmd25vZGVfcHJvcGVydHlfcHJlc2VudChj b24tPmZ3bm9kZSwgImFjY2Vzc29yeSIpOworCQlpZiAobWF0Y2gpCisJCQlnb3RvIGZpbmRfbXV4 OworCQlyZXR1cm4gTlVMTDsKKwl9CisKKwkvKiBBbHRlcm5hdGUgTW9kZSBtdXhlcyAqLworCW52 YWwgPSBmd25vZGVfcHJvcGVydHlfcmVhZF91MTZfYXJyYXkoY29uLT5md25vZGUsICJzdmlkIiwg TlVMTCwgMCk7CisJaWYgKG52YWwgPD0gMCkKKwkJcmV0dXJuIE5VTEw7CisKKwl2YWwgPSBrY2Fs bG9jKG52YWwsIHNpemVvZigqdmFsKSwgR0ZQX0tFUk5FTCk7CisJaWYgKCF2YWwpCisJCXJldHVy biBFUlJfUFRSKC1FTk9NRU0pOworCisJbnZhbCA9IGZ3bm9kZV9wcm9wZXJ0eV9yZWFkX3UxNl9h cnJheShjb24tPmZ3bm9kZSwgInN2aWQiLCB2YWwsIG52YWwpOworCWlmIChudmFsIDwgMCkgewor CQlrZnJlZSh2YWwpOworCQlyZXR1cm4gRVJSX1BUUihudmFsKTsKKwl9CisKKwlmb3IgKGkgPSAw OyBpIDwgbnZhbDsgaSsrKSB7CisJCW1hdGNoID0gdmFsW2ldID09IGRlc2MtPnN2aWQ7CisJCWlm IChtYXRjaCkgeworCQkJa2ZyZWUodmFsKTsKKwkJCWdvdG8gZmluZF9tdXg7CisJCX0KKwl9CisJ a2ZyZWUodmFsKTsKKwlyZXR1cm4gTlVMTDsKKworZmluZF9tdXg6CisJbGlzdF9mb3JfZWFjaF9l bnRyeShtdXgsICZtdXhfbGlzdCwgZW50cnkpCisJCWlmIChkZXZfZndub2RlKG11eC0+ZGV2KSA9 PSBjb24tPmZ3bm9kZSkKKwkJCXJldHVybiBtdXg7CisKKwlyZXR1cm4gbWF0Y2ggPyBFUlJfUFRS KC1FUFJPQkVfREVGRVIpIDogTlVMTDsKIH0KIAogLyoqCg==