Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2,03/10] usb: xhci-mtk: improve bandwidth scheduling From: Mathias Nyman Message-Id: <1537460020-1009-4-git-send-email-mathias.nyman@linux.intel.com> Date: Thu, 20 Sep 2018 19:13:33 +0300 To: gregkh@linuxfoundation.org Cc: linux-usb@vger.kernel.org, Chunfeng Yun , Mathias Nyman List-ID: RnJvbTogQ2h1bmZlbmcgWXVuIDxjaHVuZmVuZy55dW5AbWVkaWF0ZWsuY29tPgoKTWFpbmx5IGlt cHJvdmUgU3VwZXJTcGVlZCBJU09DIGJhbmR3aWR0aCBpbiBsYXN0IG1pY3JvZnJhbWUsCmFuZCBM b3dTcGVlZC9GdWxsU3BlZWQgSU4gSU5UL0lTT0MgYmFuZHdpZHRoIGluIHNwbGl0IGFuZAppZGxl IG1pY3JvZnJhbWVzIGJ5IGludHJvZHVpbmcgYSBiYW5kd2lkdGggYnVkZ2V0IHRhYmxlOwoKU2ln bmVkLW9mZi1ieTogQ2h1bmZlbmcgWXVuIDxjaHVuZmVuZy55dW5AbWVkaWF0ZWsuY29tPgpTaWdu ZWQtb2ZmLWJ5OiBNYXRoaWFzIE55bWFuIDxtYXRoaWFzLm55bWFuQGxpbnV4LmludGVsLmNvbT4K LS0tCiBkcml2ZXJzL3VzYi9ob3N0L3hoY2ktbXRrLXNjaC5jIHwgMTYyICsrKysrKysrKysrKysr KysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvdXNiL2hvc3QveGhjaS1tdGsuaCAg ICAgfCAgIDIgKwogMiBmaWxlcyBjaGFuZ2VkLCAxMDQgaW5zZXJ0aW9ucygrKSwgNjAgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvaG9zdC94aGNpLW10ay1zY2guYyBiL2Ry aXZlcnMvdXNiL2hvc3QveGhjaS1tdGstc2NoLmMKaW5kZXggMDU3ZjQ1My4uN2VmZDg5MCAxMDA2 NDQKLS0tIGEvZHJpdmVycy91c2IvaG9zdC94aGNpLW10ay1zY2guYworKysgYi9kcml2ZXJzL3Vz Yi9ob3N0L3hoY2ktbXRrLXNjaC5jCkBAIC0xOCw2ICsxOCwxMSBAQAogI2RlZmluZSBIU19CV19C T1VOREFSWQk2MTQ0CiAvKiB1c2IyIHNwZWMgc2VjdGlvbjExLjE4LjE6IGF0IG1vc3QgMTg4IEZT IGJ5dGVzIHBlciBtaWNyb2ZyYW1lICovCiAjZGVmaW5lIEZTX1BBWUxPQURfTUFYIDE4OAorLyoK KyAqIG1heCBudW1iZXIgb2YgbWljcm9mcmFtZXMgZm9yIHNwbGl0IHRyYW5zZmVyLAorICogZm9y IGZzIGlzb2MgaW4gOiAxIHNzICsgMSBpZGxlICsgNyBjcworICovCisjZGVmaW5lIFRUX01JQ1JP RlJBTUVTX01BWCA5CiAKIC8qIG10ayBzY2hlZHVsZXIgYml0bWFza3MgKi8KICNkZWZpbmUgRVBf QlBLVFMocCkJKChwKSAmIDB4M2YpCkBAIC02NCwyMCArNjksNTcgQEAgc3RhdGljIGludCBnZXRf YndfaW5kZXgoc3RydWN0IHhoY2lfaGNkICp4aGNpLCBzdHJ1Y3QgdXNiX2RldmljZSAqdWRldiwK IAlyZXR1cm4gYndfaW5kZXg7CiB9CiAKK3N0YXRpYyB1MzIgZ2V0X2VzaXQoc3RydWN0IHhoY2lf ZXBfY3R4ICplcF9jdHgpCit7CisJdTMyIGVzaXQ7CisKKwllc2l0ID0gMSA8PCBDVFhfVE9fRVBf SU5URVJWQUwobGUzMl90b19jcHUoZXBfY3R4LT5lcF9pbmZvKSk7CisJaWYgKGVzaXQgPiBYSENJ X01US19NQVhfRVNJVCkKKwkJZXNpdCA9IFhIQ0lfTVRLX01BWF9FU0lUOworCisJcmV0dXJuIGVz aXQ7Cit9CisKK3N0YXRpYyBzdHJ1Y3QgbXUzaF9zY2hfZXBfaW5mbyAqY3JlYXRlX3NjaF9lcChz dHJ1Y3QgdXNiX2RldmljZSAqdWRldiwKKwlzdHJ1Y3QgdXNiX2hvc3RfZW5kcG9pbnQgKmVwLCBz dHJ1Y3QgeGhjaV9lcF9jdHggKmVwX2N0eCkKK3sKKwlzdHJ1Y3QgbXUzaF9zY2hfZXBfaW5mbyAq c2NoX2VwOworCXUzMiBsZW5fYndfYnVkZ2V0X3RhYmxlOworCXNpemVfdCBtZW1fc2l6ZTsKKwor CWlmIChpc19mc19vcl9scyh1ZGV2LT5zcGVlZCkpCisJCWxlbl9id19idWRnZXRfdGFibGUgPSBU VF9NSUNST0ZSQU1FU19NQVg7CisJZWxzZSBpZiAoKHVkZXYtPnNwZWVkID09IFVTQl9TUEVFRF9T VVBFUikKKwkJCSYmIHVzYl9lbmRwb2ludF94ZmVyX2lzb2MoJmVwLT5kZXNjKSkKKwkJbGVuX2J3 X2J1ZGdldF90YWJsZSA9IGdldF9lc2l0KGVwX2N0eCk7CisJZWxzZQorCQlsZW5fYndfYnVkZ2V0 X3RhYmxlID0gMTsKKworCW1lbV9zaXplID0gc2l6ZW9mKHN0cnVjdCBtdTNoX3NjaF9lcF9pbmZv KSArCisJCQlsZW5fYndfYnVkZ2V0X3RhYmxlICogc2l6ZW9mKHUzMik7CisJc2NoX2VwID0ga3ph bGxvYyhtZW1fc2l6ZSwgR0ZQX0tFUk5FTCk7CisJaWYgKCFzY2hfZXApCisJCXJldHVybiBFUlJf UFRSKC1FTk9NRU0pOworCisJc2NoX2VwLT5lcCA9IGVwOworCisJcmV0dXJuIHNjaF9lcDsKK30K Kwogc3RhdGljIHZvaWQgc2V0dXBfc2NoX2luZm8oc3RydWN0IHVzYl9kZXZpY2UgKnVkZXYsCiAJ CXN0cnVjdCB4aGNpX2VwX2N0eCAqZXBfY3R4LCBzdHJ1Y3QgbXUzaF9zY2hfZXBfaW5mbyAqc2No X2VwKQogewogCXUzMiBlcF90eXBlOwotCXUzMiBlcF9pbnRlcnZhbDsKLQl1MzIgbWF4X3BhY2tl dF9zaXplOworCXUzMiBtYXhwa3Q7CiAJdTMyIG1heF9idXJzdDsKIAl1MzIgbXVsdDsKIAl1MzIg ZXNpdF9wa3RzOwogCXUzMiBtYXhfZXNpdF9wYXlsb2FkOworCXUzMiAqYndiX3RhYmxlID0gc2No X2VwLT5id19idWRnZXRfdGFibGU7CisJaW50IGk7CiAKIAllcF90eXBlID0gQ1RYX1RPX0VQX1RZ UEUobGUzMl90b19jcHUoZXBfY3R4LT5lcF9pbmZvMikpOwotCWVwX2ludGVydmFsID0gQ1RYX1RP X0VQX0lOVEVSVkFMKGxlMzJfdG9fY3B1KGVwX2N0eC0+ZXBfaW5mbykpOwotCW1heF9wYWNrZXRf c2l6ZSA9IE1BWF9QQUNLRVRfREVDT0RFRChsZTMyX3RvX2NwdShlcF9jdHgtPmVwX2luZm8yKSk7 CisJbWF4cGt0ID0gTUFYX1BBQ0tFVF9ERUNPREVEKGxlMzJfdG9fY3B1KGVwX2N0eC0+ZXBfaW5m bzIpKTsKIAltYXhfYnVyc3QgPSBDVFhfVE9fTUFYX0JVUlNUKGxlMzJfdG9fY3B1KGVwX2N0eC0+ ZXBfaW5mbzIpKTsKIAltdWx0ID0gQ1RYX1RPX0VQX01VTFQobGUzMl90b19jcHUoZXBfY3R4LT5l cF9pbmZvKSk7CiAJbWF4X2VzaXRfcGF5bG9hZCA9CkBAIC04NSw5ICsxMjcsMTAgQEAgc3RhdGlj IHZvaWQgc2V0dXBfc2NoX2luZm8oc3RydWN0IHVzYl9kZXZpY2UgKnVkZXYsCiAJCQlsZTMyX3Rv X2NwdShlcF9jdHgtPmVwX2luZm8pKSA8PCAxNikgfAogCQkgQ1RYX1RPX01BWF9FU0lUX1BBWUxP QUQobGUzMl90b19jcHUoZXBfY3R4LT50eF9pbmZvKSk7CiAKLQlzY2hfZXAtPmVzaXQgPSAxIDw8 IGVwX2ludGVydmFsOworCXNjaF9lcC0+ZXNpdCA9IGdldF9lc2l0KGVwX2N0eCk7CiAJc2NoX2Vw LT5vZmZzZXQgPSAwOwogCXNjaF9lcC0+YnVyc3RfbW9kZSA9IDA7CisJc2NoX2VwLT5yZXBlYXQg PSAwOwogCiAJaWYgKHVkZXYtPnNwZWVkID09IFVTQl9TUEVFRF9ISUdIKSB7CiAJCXNjaF9lcC0+ Y3NfY291bnQgPSAwOwpAQCAtOTgsNyArMTQxLDYgQEAgc3RhdGljIHZvaWQgc2V0dXBfc2NoX2lu Zm8oc3RydWN0IHVzYl9kZXZpY2UgKnVkZXYsCiAJCSAqIGluIGEgaW50ZXJ2YWwKIAkJICovCiAJ CXNjaF9lcC0+bnVtX2J1ZGdldF9taWNyb2ZyYW1lcyA9IDE7Ci0JCXNjaF9lcC0+cmVwZWF0ID0g MDsKIAogCQkvKgogCQkgKiB4SENJIHNwZWMgc2VjdGlvbjYuMi4zLjQKQEAgLTEwNiwyNiArMTQ4 LDMwIEBAIHN0YXRpYyB2b2lkIHNldHVwX3NjaF9pbmZvKHN0cnVjdCB1c2JfZGV2aWNlICp1ZGV2 LAogCQkgKiBvcHBvcnR1bml0aWVzIHBlciBtaWNyb2ZyYW1lCiAJCSAqLwogCQlzY2hfZXAtPnBr dHMgPSBtYXhfYnVyc3QgKyAxOwotCQlzY2hfZXAtPmJ3X2Nvc3RfcGVyX21pY3JvZnJhbWUgPSBt YXhfcGFja2V0X3NpemUgKiBzY2hfZXAtPnBrdHM7CisJCXNjaF9lcC0+YndfY29zdF9wZXJfbWlj cm9mcmFtZSA9IG1heHBrdCAqIHNjaF9lcC0+cGt0czsKKwkJYndiX3RhYmxlWzBdID0gc2NoX2Vw LT5id19jb3N0X3Blcl9taWNyb2ZyYW1lOwogCX0gZWxzZSBpZiAodWRldi0+c3BlZWQgPT0gVVNC X1NQRUVEX1NVUEVSKSB7CiAJCS8qIHVzYjNfcjEgc3BlYyBzZWN0aW9uNC40LjcgJiA0LjQuOCAq LwogCQlzY2hfZXAtPmNzX2NvdW50ID0gMDsKKwkJc2NoX2VwLT5idXJzdF9tb2RlID0gMTsKIAkJ LyoKIAkJICogc29tZSBkZXZpY2UncyAoZCl3Qnl0ZXNQZXJJbnRlcnZhbCBpcyBzZXQgYXMgMCwK IAkJICogdGhlbiBtYXhfZXNpdF9wYXlsb2FkIGlzIDAsIHNvIGV2YWx1YXRlIGVzaXRfcGt0cyBm cm9tCiAJCSAqIG11bHQgYW5kIGJ1cnN0CiAJCSAqLwotCQllc2l0X3BrdHMgPSBESVZfUk9VTkRf VVAobWF4X2VzaXRfcGF5bG9hZCwgbWF4X3BhY2tldF9zaXplKTsKKwkJZXNpdF9wa3RzID0gRElW X1JPVU5EX1VQKG1heF9lc2l0X3BheWxvYWQsIG1heHBrdCk7CiAJCWlmIChlc2l0X3BrdHMgPT0g MCkKIAkJCWVzaXRfcGt0cyA9IChtdWx0ICsgMSkgKiAobWF4X2J1cnN0ICsgMSk7CiAKIAkJaWYg KGVwX3R5cGUgPT0gSU5UX0lOX0VQIHx8IGVwX3R5cGUgPT0gSU5UX09VVF9FUCkgewogCQkJc2No X2VwLT5wa3RzID0gZXNpdF9wa3RzOwogCQkJc2NoX2VwLT5udW1fYnVkZ2V0X21pY3JvZnJhbWVz ID0gMTsKLQkJCXNjaF9lcC0+cmVwZWF0ID0gMDsKKwkJCWJ3Yl90YWJsZVswXSA9IG1heHBrdCAq IHNjaF9lcC0+cGt0czsKIAkJfQogCiAJCWlmIChlcF90eXBlID09IElTT0NfSU5fRVAgfHwgZXBf dHlwZSA9PSBJU09DX09VVF9FUCkgeworCQkJdTMyIHJlbWFpbmRlcjsKKwogCQkJaWYgKHNjaF9l cC0+ZXNpdCA9PSAxKQogCQkJCXNjaF9lcC0+cGt0cyA9IGVzaXRfcGt0czsKIAkJCWVsc2UgaWYg KGVzaXRfcGt0cyA8PSBzY2hfZXAtPmVzaXQpCkBAIC0xMzcsNDMgKzE4MywzNyBAQCBzdGF0aWMg dm9pZCBzZXR1cF9zY2hfaW5mbyhzdHJ1Y3QgdXNiX2RldmljZSAqdWRldiwKIAkJCXNjaF9lcC0+ bnVtX2J1ZGdldF9taWNyb2ZyYW1lcyA9CiAJCQkJRElWX1JPVU5EX1VQKGVzaXRfcGt0cywgc2No X2VwLT5wa3RzKTsKIAotCQkJaWYgKHNjaF9lcC0+bnVtX2J1ZGdldF9taWNyb2ZyYW1lcyA+IDEp Ci0JCQkJc2NoX2VwLT5yZXBlYXQgPSAxOwotCQkJZWxzZQotCQkJCXNjaF9lcC0+cmVwZWF0ID0g MDsKKwkJCXNjaF9lcC0+cmVwZWF0ID0gISEoc2NoX2VwLT5udW1fYnVkZ2V0X21pY3JvZnJhbWVz ID4gMSk7CisJCQlzY2hfZXAtPmJ3X2Nvc3RfcGVyX21pY3JvZnJhbWUgPSBtYXhwa3QgKiBzY2hf ZXAtPnBrdHM7CisKKwkJCXJlbWFpbmRlciA9IHNjaF9lcC0+YndfY29zdF9wZXJfbWljcm9mcmFt ZTsKKwkJCXJlbWFpbmRlciAqPSBzY2hfZXAtPm51bV9idWRnZXRfbWljcm9mcmFtZXM7CisJCQly ZW1haW5kZXIgLT0gKG1heHBrdCAqIGVzaXRfcGt0cyk7CisJCQlmb3IgKGkgPSAwOyBpIDwgc2No X2VwLT5udW1fYnVkZ2V0X21pY3JvZnJhbWVzIC0gMTsgaSsrKQorCQkJCWJ3Yl90YWJsZVtpXSA9 IHNjaF9lcC0+YndfY29zdF9wZXJfbWljcm9mcmFtZTsKKworCQkJLyogbGFzdCBvbmUgPD0gYndf Y29zdF9wZXJfbWljcm9mcmFtZSAqLworCQkJYndiX3RhYmxlW2ldID0gcmVtYWluZGVyOwogCQl9 Ci0JCXNjaF9lcC0+YndfY29zdF9wZXJfbWljcm9mcmFtZSA9IG1heF9wYWNrZXRfc2l6ZSAqIHNj aF9lcC0+cGt0czsKIAl9IGVsc2UgaWYgKGlzX2ZzX29yX2xzKHVkZXYtPnNwZWVkKSkgewotCi0J CS8qCi0JCSAqIHVzYl8yMCBzcGVjIHNlY3Rpb24xMS4xOC40Ci0JCSAqIGFzc3VtZSB3b3JzdCBj YXNlcwotCQkgKi8KLQkJc2NoX2VwLT5yZXBlYXQgPSAwOwogCQlzY2hfZXAtPnBrdHMgPSAxOyAv KiBhdCBtb3N0IG9uZSBwYWNrZXQgZm9yIGVhY2ggbWljcm9mcmFtZSAqLwotCQlpZiAoZXBfdHlw ZSA9PSBJTlRfSU5fRVAgfHwgZXBfdHlwZSA9PSBJTlRfT1VUX0VQKSB7Ci0JCQlzY2hfZXAtPmNz X2NvdW50ID0gMzsgLyogYXQgbW9zdCBuZWVkIDMgQ1MqLwotCQkJLyogb25lIGZvciBTUyBhbmQg b25lIGZvciBidWRnZXRlZCB0cmFuc2FjdGlvbiAqLwotCQkJc2NoX2VwLT5udW1fYnVkZ2V0X21p Y3JvZnJhbWVzID0gc2NoX2VwLT5jc19jb3VudCArIDI7Ci0JCQlzY2hfZXAtPmJ3X2Nvc3RfcGVy X21pY3JvZnJhbWUgPSBtYXhfcGFja2V0X3NpemU7Ci0JCX0KLQkJaWYgKGVwX3R5cGUgPT0gSVNP Q19PVVRfRVApIHsKKwkJc2NoX2VwLT5jc19jb3VudCA9IERJVl9ST1VORF9VUChtYXhwa3QsIEZT X1BBWUxPQURfTUFYKTsKKwkJc2NoX2VwLT5udW1fYnVkZ2V0X21pY3JvZnJhbWVzID0gc2NoX2Vw LT5jc19jb3VudCArIDI7CisJCXNjaF9lcC0+YndfY29zdF9wZXJfbWljcm9mcmFtZSA9CisJCQko bWF4cGt0IDwgRlNfUEFZTE9BRF9NQVgpID8gbWF4cGt0IDogRlNfUEFZTE9BRF9NQVg7CiAKLQkJ CS8qCi0JCQkgKiB0aGUgYmVzdCBjYXNlIEZTIGJ1ZGdldCBhc3N1bWVzIHRoYXQgMTg4IEZTIGJ5 dGVzCi0JCQkgKiBvY2N1ciBpbiBlYWNoIG1pY3JvZnJhbWUKLQkJCSAqLwotCQkJc2NoX2VwLT5u dW1fYnVkZ2V0X21pY3JvZnJhbWVzID0gRElWX1JPVU5EX1VQKAotCQkJCW1heF9wYWNrZXRfc2l6 ZSwgRlNfUEFZTE9BRF9NQVgpOwotCQkJc2NoX2VwLT5id19jb3N0X3Blcl9taWNyb2ZyYW1lID0g RlNfUEFZTE9BRF9NQVg7Ci0JCQlzY2hfZXAtPmNzX2NvdW50ID0gc2NoX2VwLT5udW1fYnVkZ2V0 X21pY3JvZnJhbWVzOwotCQl9Ci0JCWlmIChlcF90eXBlID09IElTT0NfSU5fRVApIHsKLQkJCS8q IGF0IG1vc3QgbmVlZCBhZGRpdGlvbmFsIHR3byBDUy4gKi8KLQkJCXNjaF9lcC0+Y3NfY291bnQg PSBESVZfUk9VTkRfVVAoCi0JCQkJbWF4X3BhY2tldF9zaXplLCBGU19QQVlMT0FEX01BWCkgKyAy OwotCQkJc2NoX2VwLT5udW1fYnVkZ2V0X21pY3JvZnJhbWVzID0gc2NoX2VwLT5jc19jb3VudCAr IDI7Ci0JCQlzY2hfZXAtPmJ3X2Nvc3RfcGVyX21pY3JvZnJhbWUgPSBGU19QQVlMT0FEX01BWDsK KwkJLyogaW5pdCBidWRnZXQgdGFibGUgKi8KKwkJaWYgKGVwX3R5cGUgPT0gSVNPQ19PVVRfRVAp IHsKKwkJCWZvciAoaSA9IDA7IGkgPCBzY2hfZXAtPm51bV9idWRnZXRfbWljcm9mcmFtZXM7IGkr KykKKwkJCQlid2JfdGFibGVbaV0gPQlzY2hfZXAtPmJ3X2Nvc3RfcGVyX21pY3JvZnJhbWU7CisJ CX0gZWxzZSBpZiAoZXBfdHlwZSA9PSBJTlRfT1VUX0VQKSB7CisJCQkvKiBvbmx5IGZpcnN0IG9u ZSBjb25zdW1lcyBiYW5kd2lkdGgsIG90aGVycyBhcyB6ZXJvICovCisJCQlid2JfdGFibGVbMF0g PSBzY2hfZXAtPmJ3X2Nvc3RfcGVyX21pY3JvZnJhbWU7CisJCX0gZWxzZSB7IC8qIElOVF9JTl9F UCBvciBJU09DX0lOX0VQICovCisJCQlid2JfdGFibGVbMF0gPSAwOyAvKiBzdGFydCBzcGxpdCAq LworCQkJYndiX3RhYmxlWzFdID0gMDsgLyogaWRsZSAqLworCQkJZm9yIChpID0gMjsgaSA8IHNj aF9lcC0+bnVtX2J1ZGdldF9taWNyb2ZyYW1lczsgaSsrKQorCQkJCWJ3Yl90YWJsZVtpXSA9CXNj aF9lcC0+YndfY29zdF9wZXJfbWljcm9mcmFtZTsKIAkJfQogCX0KIH0KQEAgLTE4NCw2ICsyMjQs NyBAQCBzdGF0aWMgdTMyIGdldF9tYXhfYncoc3RydWN0IG11M2hfc2NoX2J3X2luZm8gKnNjaF9i dywKIHsKIAl1MzIgbnVtX2VzaXQ7CiAJdTMyIG1heF9idyA9IDA7CisJdTMyIGJ3OwogCWludCBp OwogCWludCBqOwogCkBAIC0xOTIsMTUgKzIzMywxNyBAQCBzdGF0aWMgdTMyIGdldF9tYXhfYnco c3RydWN0IG11M2hfc2NoX2J3X2luZm8gKnNjaF9idywKIAkJdTMyIGJhc2UgPSBvZmZzZXQgKyBp ICogc2NoX2VwLT5lc2l0OwogCiAJCWZvciAoaiA9IDA7IGogPCBzY2hfZXAtPm51bV9idWRnZXRf bWljcm9mcmFtZXM7IGorKykgewotCQkJaWYgKHNjaF9idy0+YnVzX2J3W2Jhc2UgKyBqXSA+IG1h eF9idykKLQkJCQltYXhfYncgPSBzY2hfYnctPmJ1c19id1tiYXNlICsgal07CisJCQlidyA9IHNj aF9idy0+YnVzX2J3W2Jhc2UgKyBqXSArCisJCQkJCXNjaF9lcC0+YndfYnVkZ2V0X3RhYmxlW2pd OworCQkJaWYgKGJ3ID4gbWF4X2J3KQorCQkJCW1heF9idyA9IGJ3OwogCQl9CiAJfQogCXJldHVy biBtYXhfYnc7CiB9CiAKIHN0YXRpYyB2b2lkIHVwZGF0ZV9idXNfYncoc3RydWN0IG11M2hfc2No X2J3X2luZm8gKnNjaF9idywKLQlzdHJ1Y3QgbXUzaF9zY2hfZXBfaW5mbyAqc2NoX2VwLCBpbnQg YndfY29zdCkKKwlzdHJ1Y3QgbXUzaF9zY2hfZXBfaW5mbyAqc2NoX2VwLCBib29sIHVzZWQpCiB7 CiAJdTMyIG51bV9lc2l0OwogCXUzMiBiYXNlOwpAQCAtMjEwLDggKzI1MywxNCBAQCBzdGF0aWMg dm9pZCB1cGRhdGVfYnVzX2J3KHN0cnVjdCBtdTNoX3NjaF9id19pbmZvICpzY2hfYncsCiAJbnVt X2VzaXQgPSBYSENJX01US19NQVhfRVNJVCAvIHNjaF9lcC0+ZXNpdDsKIAlmb3IgKGkgPSAwOyBp IDwgbnVtX2VzaXQ7IGkrKykgewogCQliYXNlID0gc2NoX2VwLT5vZmZzZXQgKyBpICogc2NoX2Vw LT5lc2l0OwotCQlmb3IgKGogPSAwOyBqIDwgc2NoX2VwLT5udW1fYnVkZ2V0X21pY3JvZnJhbWVz OyBqKyspCi0JCQlzY2hfYnctPmJ1c19id1tiYXNlICsgal0gKz0gYndfY29zdDsKKwkJZm9yIChq ID0gMDsgaiA8IHNjaF9lcC0+bnVtX2J1ZGdldF9taWNyb2ZyYW1lczsgaisrKSB7CisJCQlpZiAo dXNlZCkKKwkJCQlzY2hfYnctPmJ1c19id1tiYXNlICsgal0gKz0KKwkJCQkJc2NoX2VwLT5id19i dWRnZXRfdGFibGVbal07CisJCQllbHNlCisJCQkJc2NoX2J3LT5idXNfYndbYmFzZSArIGpdIC09 CisJCQkJCXNjaF9lcC0+YndfYnVkZ2V0X3RhYmxlW2pdOworCQl9CiAJfQogfQogCkBAIC0yMjAs MTcgKzI2OSwxMiBAQCBzdGF0aWMgaW50IGNoZWNrX3NjaF9idyhzdHJ1Y3QgdXNiX2RldmljZSAq dWRldiwKIHsKIAl1MzIgb2Zmc2V0OwogCXUzMiBlc2l0OwotCXUzMiBudW1fYnVkZ2V0X21pY3Jv ZnJhbWVzOwogCXUzMiBtaW5fYnc7CiAJdTMyIG1pbl9pbmRleDsKIAl1MzIgd29yc3RfYnc7CiAJ dTMyIGJ3X2JvdW5kYXJ5OwogCi0JaWYgKHNjaF9lcC0+ZXNpdCA+IFhIQ0lfTVRLX01BWF9FU0lU KQotCQlzY2hfZXAtPmVzaXQgPSBYSENJX01US19NQVhfRVNJVDsKLQogCWVzaXQgPSBzY2hfZXAt PmVzaXQ7Ci0JbnVtX2J1ZGdldF9taWNyb2ZyYW1lcyA9IHNjaF9lcC0+bnVtX2J1ZGdldF9taWNy b2ZyYW1lczsKIAogCS8qCiAJICogU2VhcmNoIHRocm91Z2ggYWxsIHBvc3NpYmxlIHNjaGVkdWxl IG1pY3JvZnJhbWVzLgpAQCAtMjM5LDcgKzI4Myw3IEBAIHN0YXRpYyBpbnQgY2hlY2tfc2NoX2J3 KHN0cnVjdCB1c2JfZGV2aWNlICp1ZGV2LAogCW1pbl9idyA9IH4wOwogCW1pbl9pbmRleCA9IDA7 CiAJZm9yIChvZmZzZXQgPSAwOyBvZmZzZXQgPCBlc2l0OyBvZmZzZXQrKykgewotCQlpZiAoKG9m ZnNldCArIG51bV9idWRnZXRfbWljcm9mcmFtZXMpID4gc2NoX2VwLT5lc2l0KQorCQlpZiAoKG9m ZnNldCArIHNjaF9lcC0+bnVtX2J1ZGdldF9taWNyb2ZyYW1lcykgPiBzY2hfZXAtPmVzaXQpCiAJ CQlicmVhazsKIAogCQkvKgpAQCAtMjYzLDExICszMDcsMTEgQEAgc3RhdGljIGludCBjaGVja19z Y2hfYncoc3RydWN0IHVzYl9kZXZpY2UgKnVkZXYsCiAJCQkJPyBTU19CV19CT1VOREFSWSA6IEhT X0JXX0JPVU5EQVJZOwogCiAJLyogY2hlY2sgYmFuZHdpZHRoICovCi0JaWYgKG1pbl9idyArIHNj aF9lcC0+YndfY29zdF9wZXJfbWljcm9mcmFtZSA+IGJ3X2JvdW5kYXJ5KQorCWlmIChtaW5fYncg PiBid19ib3VuZGFyeSkKIAkJcmV0dXJuIC1FUkFOR0U7CiAKIAkvKiB1cGRhdGUgYnVzIGJhbmR3 aWR0aCBpbmZvICovCi0JdXBkYXRlX2J1c19idyhzY2hfYncsIHNjaF9lcCwgc2NoX2VwLT5id19j b3N0X3Blcl9taWNyb2ZyYW1lKTsKKwl1cGRhdGVfYnVzX2J3KHNjaF9idywgc2NoX2VwLCAxKTsK IAogCXJldHVybiAwOwogfQpAQCAtMzYyLDggKzQwNiw4IEBAIGludCB4aGNpX210a19hZGRfZXBf cXVpcmsoc3RydWN0IHVzYl9oY2QgKmhjZCwgc3RydWN0IHVzYl9kZXZpY2UgKnVkZXYsCiAJYndf aW5kZXggPSBnZXRfYndfaW5kZXgoeGhjaSwgdWRldiwgZXApOwogCXNjaF9idyA9ICZzY2hfYXJy YXlbYndfaW5kZXhdOwogCi0Jc2NoX2VwID0ga3phbGxvYyhzaXplb2Yoc3RydWN0IG11M2hfc2No X2VwX2luZm8pLCBHRlBfTk9JTyk7Ci0JaWYgKCFzY2hfZXApCisJc2NoX2VwID0gY3JlYXRlX3Nj aF9lcCh1ZGV2LCBlcCwgZXBfY3R4KTsKKwlpZiAoSVNfRVJSX09SX05VTEwoc2NoX2VwKSkKIAkJ cmV0dXJuIC1FTk9NRU07CiAKIAlzZXR1cF9zY2hfaW5mbyh1ZGV2LCBlcF9jdHgsIHNjaF9lcCk7 CkBAIC0zNzYsNyArNDIwLDYgQEAgaW50IHhoY2lfbXRrX2FkZF9lcF9xdWlyayhzdHJ1Y3QgdXNi X2hjZCAqaGNkLCBzdHJ1Y3QgdXNiX2RldmljZSAqdWRldiwKIAl9CiAKIAlsaXN0X2FkZF90YWls KCZzY2hfZXAtPmVuZHBvaW50LCAmc2NoX2J3LT5id19lcF9saXN0KTsKLQlzY2hfZXAtPmVwID0g ZXA7CiAKIAllcF9jdHgtPnJlc2VydmVkWzBdIHw9IGNwdV90b19sZTMyKEVQX0JQS1RTKHNjaF9l cC0+cGt0cykKIAkJfCBFUF9CQ1NDT1VOVChzY2hfZXAtPmNzX2NvdW50KSB8IEVQX0JCTShzY2hf ZXAtPmJ1cnN0X21vZGUpKTsKQEAgLTQyMSw4ICs0NjQsNyBAQCB2b2lkIHhoY2lfbXRrX2Ryb3Bf ZXBfcXVpcmsoc3RydWN0IHVzYl9oY2QgKmhjZCwgc3RydWN0IHVzYl9kZXZpY2UgKnVkZXYsCiAK IAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHNjaF9lcCwgJnNjaF9idy0+YndfZXBfbGlzdCwgZW5kcG9p bnQpIHsKIAkJaWYgKHNjaF9lcC0+ZXAgPT0gZXApIHsKLQkJCXVwZGF0ZV9idXNfYncoc2NoX2J3 LCBzY2hfZXAsCi0JCQkJLXNjaF9lcC0+YndfY29zdF9wZXJfbWljcm9mcmFtZSk7CisJCQl1cGRh dGVfYnVzX2J3KHNjaF9idywgc2NoX2VwLCAwKTsKIAkJCWxpc3RfZGVsKCZzY2hfZXAtPmVuZHBv aW50KTsKIAkJCWtmcmVlKHNjaF9lcCk7CiAJCQlicmVhazsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv dXNiL2hvc3QveGhjaS1tdGsuaCBiL2RyaXZlcnMvdXNiL2hvc3QveGhjaS1tdGsuaAppbmRleCBj YzU5ZDgwLi5mODg2NGZjIDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktbXRrLmgK KysrIGIvZHJpdmVycy91c2IvaG9zdC94aGNpLW10ay5oCkBAIC01Nyw2ICs1Nyw3IEBAIHN0cnVj dCBtdTNoX3NjaF9id19pbmZvIHsKICAqCQl0aW1lczsgMTogZGlzdHJpYnV0ZSB0aGUgKGJNYXhC dXJzdCsxKSooTXVsdCsxKSBwYWNrZXRzCiAgKgkJYWNjb3JkaW5nIHRvIEBwa3RzIGFuZCBAcmVw ZWF0LiBub3JtYWwgbW9kZSBpcyB1c2VkIGJ5CiAgKgkJZGVmYXVsdAorICogQGJ3X2J1ZGdldF90 YWJsZTogdGFibGUgdG8gcmVjb3JkIGJhbmR3aWR0aCBidWRnZXQgcGVyIG1pY3JvZnJhbWUKICAq Lwogc3RydWN0IG11M2hfc2NoX2VwX2luZm8gewogCXUzMiBlc2l0OwpAQCAtNzMsNiArNzQsNyBA QCBzdHJ1Y3QgbXUzaF9zY2hfZXBfaW5mbyB7CiAJdTMyIHBrdHM7CiAJdTMyIGNzX2NvdW50Owog CXUzMiBidXJzdF9tb2RlOworCXUzMiBid19idWRnZXRfdGFibGVbMF07CiB9OwogCiAjZGVmaW5l IE1VM0NfVTNfUE9SVF9NQVggNAo=