Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2,5/9] usb: typec: mux: Find the muxes by also matching against the device node From: Heikki Krogerus Message-Id: <20190130160259.46919-6-heikki.krogerus@linux.intel.com> Date: Wed, 30 Jan 2019 19:02:55 +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 LgoKU2lnbmVkLW9mZi1ieTogSGVpa2tpIEtyb2dlcnVzIDxoZWlra2kua3JvZ2VydXNAbGludXgu aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvdXNiL3R5cGVjL211eC5jIHwgODYgKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKystLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA3NCBpbnNlcnRp b25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi90eXBlYy9t dXguYyBiL2RyaXZlcnMvdXNiL3R5cGVjL211eC5jCmluZGV4IDg5NzVmNThlMWQ2MC4uYTU5NDdk OTg4MjRkIDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi90eXBlYy9tdXguYworKysgYi9kcml2ZXJz L3VzYi90eXBlYy9tdXguYwpAQCAtMTEsNiArMTEsOCBAQAogI2luY2x1ZGUgPGxpbnV4L2xpc3Qu aD4KICNpbmNsdWRlIDxsaW51eC9tb2R1bGUuaD4KICNpbmNsdWRlIDxsaW51eC9tdXRleC5oPgor I2luY2x1ZGUgPGxpbnV4L3Byb3BlcnR5Lmg+CisjaW5jbHVkZSA8bGludXgvc2xhYi5oPgogI2lu Y2x1ZGUgPGxpbnV4L3VzYi90eXBlY19tdXguaD4KIAogc3RhdGljIERFRklORV9NVVRFWChzd2l0 Y2hfbG9jayk7CkBAIC0yMywxNSArMjUsMjUgQEAgc3RhdGljIHZvaWQgKnR5cGVjX3N3aXRjaF9t YXRjaChzdHJ1Y3QgZGV2aWNlX2Nvbm5lY3Rpb24gKmNvbiwgaW50IGVwLAogewogCXN0cnVjdCB0 eXBlY19zd2l0Y2ggKnN3OwogCi0JbGlzdF9mb3JfZWFjaF9lbnRyeShzdywgJnN3aXRjaF9saXN0 LCBlbnRyeSkKLQkJaWYgKCFzdHJjbXAoY29uLT5lbmRwb2ludFtlcF0sIGRldl9uYW1lKHN3LT5k ZXYpKSkKLQkJCXJldHVybiBzdzsKKwlpZiAoIWNvbi0+Zndub2RlKSB7CisJCWxpc3RfZm9yX2Vh Y2hfZW50cnkoc3csICZzd2l0Y2hfbGlzdCwgZW50cnkpCisJCQlpZiAoIXN0cmNtcChjb24tPmVu ZHBvaW50W2VwXSwgZGV2X25hbWUoc3ctPmRldikpKQorCQkJCXJldHVybiBzdzsKKwkJcmV0dXJu IEVSUl9QVFIoLUVQUk9CRV9ERUZFUik7CisJfQogCiAJLyoKLQkgKiBXZSBvbmx5IGdldCBjYWxs ZWQgaWYgYSBjb25uZWN0aW9uIHdhcyBmb3VuZCwgdGVsbCB0aGUgY2FsbGVyIHRvCi0JICogd2Fp dCBmb3IgdGhlIHN3aXRjaCB0byBzaG93IHVwLgorCSAqIFdpdGggT0YgZ3JhcGggdGhlIG11eCBu b2RlIG11c3QgaGF2ZSBhIGJvb2xlYW4gZGV2aWNlIHByb3BlcnR5IG5hbWVkCisJICogIm9yaWVu dGF0aW9uLXN3aXRjaCIuCiAJICovCi0JcmV0dXJuIEVSUl9QVFIoLUVQUk9CRV9ERUZFUik7CisJ aWYgKGNvbi0+aWQgJiYgIWZ3bm9kZV9wcm9wZXJ0eV9wcmVzZW50KGNvbi0+Zndub2RlLCBjb24t PmlkKSkKKwkJcmV0dXJuIE5VTEw7CisKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KHN3LCAmc3dpdGNo X2xpc3QsIGVudHJ5KQorCQlpZiAoZGV2X2Z3bm9kZShzdy0+ZGV2KSA9PSBjb24tPmZ3bm9kZSkK KwkJCXJldHVybiBzdzsKKworCXJldHVybiBjb24tPmlkID8gRVJSX1BUUigtRVBST0JFX0RFRkVS KSA6IE5VTEw7CiB9CiAKIC8qKgpAQCAtMTEyLDE3ICsxMjQsNjcgQEAgRVhQT1JUX1NZTUJPTF9H UEwodHlwZWNfc3dpdGNoX3VucmVnaXN0ZXIpOwogCiBzdGF0aWMgdm9pZCAqdHlwZWNfbXV4X21h dGNoKHN0cnVjdCBkZXZpY2VfY29ubmVjdGlvbiAqY29uLCBpbnQgZXAsIHZvaWQgKmRhdGEpCiB7 CisJY29uc3Qgc3RydWN0IHR5cGVjX2FsdG1vZGVfZGVzYyAqZGVzYyA9IGRhdGE7CiAJc3RydWN0 IHR5cGVjX211eCAqbXV4OworCXNpemVfdCBudmFsOworCWJvb2wgbWF0Y2g7CisJdTE2ICp2YWw7 CisJaW50IGk7CiAKLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KG11eCwgJm11eF9saXN0LCBlbnRyeSkK LQkJaWYgKCFzdHJjbXAoY29uLT5lbmRwb2ludFtlcF0sIGRldl9uYW1lKG11eC0+ZGV2KSkpCi0J CQlyZXR1cm4gbXV4OworCWlmICghY29uLT5md25vZGUpIHsKKwkJbGlzdF9mb3JfZWFjaF9lbnRy eShtdXgsICZtdXhfbGlzdCwgZW50cnkpCisJCQlpZiAoIXN0cmNtcChjb24tPmVuZHBvaW50W2Vw XSwgZGV2X25hbWUobXV4LT5kZXYpKSkKKwkJCQlyZXR1cm4gbXV4OworCQlyZXR1cm4gRVJSX1BU UigtRVBST0JFX0RFRkVSKTsKKwl9CiAKIAkvKgotCSAqIFdlIG9ubHkgZ2V0IGNhbGxlZCBpZiBh IGNvbm5lY3Rpb24gd2FzIGZvdW5kLCB0ZWxsIHRoZSBjYWxsZXIgdG8KLQkgKiB3YWl0IGZvciB0 aGUgc3dpdGNoIHRvIHNob3cgdXAuCisJICogQ2hlY2sgaGFzIHRoZSBpZGVudGlmaWVyIGFscmVh ZHkgYmVlbiAiY29uc3VtZWQiLiBJZiBpdAorCSAqIGhhcywgbm8gbmVlZCB0byBkbyBhbnkgZXh0 cmEgY29ubmVjdGlvbiBpZGVudGlmaWNhdGlvbi4KIAkgKi8KLQlyZXR1cm4gRVJSX1BUUigtRVBS T0JFX0RFRkVSKTsKKwltYXRjaCA9ICFjb24tPmlkOworCWlmIChtYXRjaCkKKwkJZ290byBmaW5k X211eDsKKworCS8qIEFjY2Vzc29yeSBNb2RlIG11eGVzICovCisJaWYgKCFkZXNjKSB7CisJCW1h dGNoID0gZndub2RlX3Byb3BlcnR5X3ByZXNlbnQoY29uLT5md25vZGUsICJhY2Nlc3NvcnkiKTsK KwkJaWYgKG1hdGNoKQorCQkJZ290byBmaW5kX211eDsKKwkJcmV0dXJuIE5VTEw7CisJfQorCisJ LyogQWx0ZXJuYXRlIE1vZGUgbXV4ZXMgKi8KKwludmFsID0gZndub2RlX3Byb3BlcnR5X3JlYWRf dTE2X2FycmF5KGNvbi0+Zndub2RlLCAic3ZpZCIsIE5VTEwsIDApOworCWlmIChudmFsIDw9IDAp CisJCXJldHVybiBOVUxMOworCisJdmFsID0ga2NhbGxvYyhudmFsLCBzaXplb2YoKnZhbCksIEdG UF9LRVJORUwpOworCWlmICghdmFsKQorCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKKworCW52 YWwgPSBmd25vZGVfcHJvcGVydHlfcmVhZF91MTZfYXJyYXkoY29uLT5md25vZGUsICJzdmlkIiwg dmFsLCBudmFsKTsKKwlpZiAobnZhbCA8IDApIHsKKwkJa2ZyZWUodmFsKTsKKwkJcmV0dXJuIEVS Ul9QVFIobnZhbCk7CisJfQorCisJZm9yIChpID0gMDsgaSA8IG52YWw7IGkrKykgeworCQltYXRj aCA9IHZhbFtpXSA9PSBkZXNjLT5zdmlkOworCQlpZiAobWF0Y2gpIHsKKwkJCWtmcmVlKHZhbCk7 CisJCQlnb3RvIGZpbmRfbXV4OworCQl9CisJfQorCWtmcmVlKHZhbCk7CisJcmV0dXJuIE5VTEw7 CisKK2ZpbmRfbXV4OgorCWxpc3RfZm9yX2VhY2hfZW50cnkobXV4LCAmbXV4X2xpc3QsIGVudHJ5 KQorCQlpZiAoZGV2X2Z3bm9kZShtdXgtPmRldikgPT0gY29uLT5md25vZGUpCisJCQlyZXR1cm4g bXV4OworCisJcmV0dXJuIG1hdGNoID8gRVJSX1BUUigtRVBST0JFX0RFRkVSKSA6IE5VTEw7CiB9 CiAKIC8qKgo=