From: Mika Kuoppala Subject: [PATCH 4/9] drm/i915: Reduce duplicated forcewake logic Date: Wed, 17 Dec 2014 15:15:40 +0200 Message-ID: <1418822140-28544-1-git-send-email-mika.kuoppala@intel.com> References: <20141216163559.GG26498@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 40AC96E7B8 for ; Wed, 17 Dec 2014 05:16:06 -0800 (PST) In-Reply-To: <20141216163559.GG26498@nuc-i3427.alporthouse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpJbnRyb2R1Y2Ug YSBzdHJ1Y3R1cmUgdG8gdHJhY2sgdGhlIGluZGl2aWR1YWwgZm9yY2V3YWtlIGRvbWFpbnMgYW5k IHVzZQp0aGF0IHRvIGVsaW1pbmF0ZSBkdXBsaWNhdGUgbG9naWMuCgp2MjogLSBSZWJhc2Ugb24g bGF0ZXN0IGRpbnEgKE1pa2EpCiAgICAtIGZvcl9lYWNoX2Z3X2RvbWFpbiBtYWNybyAoTWlrYSkK ICAgIC0gSGFuZGxlIHJlc2V0IGF0b21pY2FsbHksIGtlZXBpbmcgdGhlIHRpbWVyIHJ1bm5pbmcg KE1pa2EpCiAgICAtIGZvcl9lYWNoX2Z3X2RvbWFpbiBwYXJhbWV0ZXIgb3JkZXJpbmcgKENocmlz KQogICAgLSBkZWZlciB0aW1lciBvbiBuZXcgcmVnaXN0ZXIgYWNjZXNzIChNaWthKQoKdjM6IC0g Rml4IGZvcmNld2FrZV9yZXNldC9nZXQgcmFjZSBieSB3YWl0aW5nIHBlbmRpbmcgdGltZXJzCgp2 NDogLSBjb25kX3Jlc2NoZWQgYW5kIHZlcmJvc2Ugd2FybmluZyBvbiB0aW1lciBkZWxldGlvbiAo Q2hyaXMpCiAgICAtIG5lZWQgdG8gcnVuIHBlbmRpbmcgdGltZXJzIG1hbnVhbGx5IG9uIHJlc2V0 CgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4g KHYxKQpTaWduZWQtb2ZmLWJ5OiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGludGVsLmNv bT4KQWNrZWQtYnk6IERlZXBhayBTIDxkZWVwYWsuc0BsaW51eC5pbnRlbC5jb20+ICh2MikKLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8ICA2NSArKystLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgIHwgIDU0ICsrKy0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF91bmNvcmUuYyB8IDQ0NSArKysrKysrKysrKysrKystLS0tLS0tLS0tLS0t LS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjQ2IGluc2VydGlvbnMoKyksIDMxOCBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IDhiYjM0YTkuLjY1YWRi NjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC0xMjg4LDE0ICsxMjg4LDM2 IEBAIHN0YXRpYyBpbnQgaXJvbmxha2VfZHJwY19pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSkKIAly ZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCB2bHZfZHJwY19pbmZvKHN0cnVjdCBzZXFfZmlsZSAq bSkKK3N0YXRpYyBpbnQgaTkxNV9nZW42X2ZvcmNld2FrZV9jb3VudF9pbmZvKHN0cnVjdCBzZXFf ZmlsZSAqbSwgdm9pZCAqZGF0YSkKIHsKKwlzdHJ1Y3QgZHJtX2luZm9fbm9kZSAqbm9kZSA9IG0t PnByaXZhdGU7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IG5vZGUtPm1pbm9yLT5kZXY7CisJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlz dHJ1Y3QgaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9kb21haW4gKmZ3X2RvbWFpbjsKKwljb25zdCBj aGFyICpkb21haW5fbmFtZXNbXSA9IHsKKwkJInJlbmRlciIsCisJCSJibGl0dGVyIiwKKwkJIm1l ZGlhIiwKKwl9OworCWludCBpOworCisJc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPnVuY29yZS5s b2NrKTsKKwlmb3JfZWFjaF9md19kb21haW4oZndfZG9tYWluLCBkZXZfcHJpdiwgaSkgeworCQlz ZXFfcHJpbnRmKG0sICIlcy53YWtlX2NvdW50ID0gJXVcbiIsCisJCQkgICBkb21haW5fbmFtZXNb aV0sCisJCQkgICBmd19kb21haW4tPndha2VfY291bnQpOworCX0KKwlzcGluX3VubG9ja19pcnEo JmRldl9wcml2LT51bmNvcmUubG9jayk7CiAKKwlyZXR1cm4gMDsKK30KKworc3RhdGljIGludCB2 bHZfZHJwY19pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSkKK3sKIAlzdHJ1Y3QgZHJtX2luZm9fbm9k ZSAqbm9kZSA9IG0tPnByaXZhdGU7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IG5vZGUtPm1p bm9yLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZf cHJpdmF0ZTsKIAl1MzIgcnBtb2RlY3RsMSwgcmNjdGwxLCBwd19zdGF0dXM7Ci0JdW5zaWduZWQg ZndfcmVuZGVyY291bnQgPSAwLCBmd19tZWRpYWNvdW50ID0gMDsKIAogCWludGVsX3J1bnRpbWVf cG1fZ2V0KGRldl9wcml2KTsKIApAQCAtMTMyNywyMiArMTM0OSwxMSBAQCBzdGF0aWMgaW50IHZs dl9kcnBjX2luZm8oc3RydWN0IHNlcV9maWxlICptKQogCXNlcV9wcmludGYobSwgIk1lZGlhIFJD NiByZXNpZGVuY3kgc2luY2UgYm9vdDogJXVcbiIsCiAJCSAgIEk5MTVfUkVBRChWTFZfR1RfTUVE SUFfUkM2KSk7CiAKLQlzcGluX2xvY2tfaXJxKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2spOwotCWZ3 X3JlbmRlcmNvdW50ID0gZGV2X3ByaXYtPnVuY29yZS5md19yZW5kZXJjb3VudDsKLQlmd19tZWRp YWNvdW50ID0gZGV2X3ByaXYtPnVuY29yZS5md19tZWRpYWNvdW50OwotCXNwaW5fdW5sb2NrX2ly cSgmZGV2X3ByaXYtPnVuY29yZS5sb2NrKTsKLQotCXNlcV9wcmludGYobSwgIkZvcmNld2FrZSBS ZW5kZXIgQ291bnQgPSAldVxuIiwgZndfcmVuZGVyY291bnQpOwotCXNlcV9wcmludGYobSwgIkZv cmNld2FrZSBNZWRpYSBDb3VudCA9ICV1XG4iLCBmd19tZWRpYWNvdW50KTsKLQotCi0JcmV0dXJu IDA7CisJcmV0dXJuIGk5MTVfZ2VuNl9mb3JjZXdha2VfY291bnRfaW5mbyhtLCBOVUxMKTsKIH0K IAotCiBzdGF0aWMgaW50IGdlbjZfZHJwY19pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSkKIHsKLQog CXN0cnVjdCBkcm1faW5mb19ub2RlICpub2RlID0gbS0+cHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gbm9kZS0+bWlub3ItPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwpAQCAtMTM1Niw3ICsxMzY3LDcgQEAgc3RhdGlj IGludCBnZW42X2RycGNfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0pCiAJaW50ZWxfcnVudGltZV9w bV9nZXQoZGV2X3ByaXYpOwogCiAJc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPnVuY29yZS5sb2Nr KTsKLQlmb3JjZXdha2VfY291bnQgPSBkZXZfcHJpdi0+dW5jb3JlLmZvcmNld2FrZV9jb3VudDsK Kwlmb3JjZXdha2VfY291bnQgPSBkZXZfcHJpdi0+dW5jb3JlLmZ3X2RvbWFpbltGV19ET01BSU5f SURfUkVOREVSXS53YWtlX2NvdW50OwogCXNwaW5fdW5sb2NrX2lycSgmZGV2X3ByaXYtPnVuY29y ZS5sb2NrKTsKIAogCWlmIChmb3JjZXdha2VfY291bnQpIHsKQEAgLTE5ODQsMzAgKzE5OTUsNiBA QCBzdGF0aWMgaW50IGk5MTVfZXhlY2xpc3RzKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0 YSkKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCBpOTE1X2dlbjZfZm9yY2V3YWtlX2NvdW50 X2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQotewotCXN0cnVjdCBkcm1faW5m b19ub2RlICpub2RlID0gbS0+cHJpdmF0ZTsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gbm9k ZS0+bWlub3ItPmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOwotCXVuc2lnbmVkIGZvcmNld2FrZV9jb3VudCA9IDAsIGZ3X3JlbmRlcmNv dW50ID0gMCwgZndfbWVkaWFjb3VudCA9IDA7Ci0KLQlzcGluX2xvY2tfaXJxKCZkZXZfcHJpdi0+ dW5jb3JlLmxvY2spOwotCWlmIChJU19WQUxMRVlWSUVXKGRldikpIHsKLQkJZndfcmVuZGVyY291 bnQgPSBkZXZfcHJpdi0+dW5jb3JlLmZ3X3JlbmRlcmNvdW50OwotCQlmd19tZWRpYWNvdW50ID0g ZGV2X3ByaXYtPnVuY29yZS5md19tZWRpYWNvdW50OwotCX0gZWxzZQotCQlmb3JjZXdha2VfY291 bnQgPSBkZXZfcHJpdi0+dW5jb3JlLmZvcmNld2FrZV9jb3VudDsKLQlzcGluX3VubG9ja19pcnEo JmRldl9wcml2LT51bmNvcmUubG9jayk7Ci0KLQlpZiAoSVNfVkFMTEVZVklFVyhkZXYpKSB7Ci0J CXNlcV9wcmludGYobSwgImZ3X3JlbmRlcmNvdW50ID0gJXVcbiIsIGZ3X3JlbmRlcmNvdW50KTsK LQkJc2VxX3ByaW50ZihtLCAiZndfbWVkaWFjb3VudCA9ICV1XG4iLCBmd19tZWRpYWNvdW50KTsK LQl9IGVsc2UKLQkJc2VxX3ByaW50ZihtLCAiZm9yY2V3YWtlIGNvdW50ID0gJXVcbiIsIGZvcmNl d2FrZV9jb3VudCk7Ci0KLQlyZXR1cm4gMDsKLX0KLQogc3RhdGljIGNvbnN0IGNoYXIgKnN3aXp6 bGVfc3RyaW5nKHVuc2lnbmVkIHN3aXp6bGUpCiB7CiAJc3dpdGNoIChzd2l6emxlKSB7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAppbmRleCBmMzE4NTI5Li4xZDQwYjdmIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKQEAgLTU5NSwyMCArNTk1LDQ1IEBAIHN0cnVjdCBpbnRlbF91bmNvcmVfZnVuY3Mg ewogCQkJCXVpbnQ2NF90IHZhbCwgYm9vbCB0cmFjZSk7CiB9OwogCitlbnVtIHsKKwlGV19ET01B SU5fSURfUkVOREVSID0gMCwKKwlGV19ET01BSU5fSURfQkxJVFRFUiwKKwlGV19ET01BSU5fSURf TUVESUEsCisKKwlGV19ET01BSU5fSURfQ09VTlQKK307CisKIHN0cnVjdCBpbnRlbF91bmNvcmUg ewogCXNwaW5sb2NrX3QgbG9jazsgLyoqIGxvY2sgaXMgYWxzbyB0YWtlbiBpbiBpcnEgY29udGV4 dHMuICovCiAKIAlzdHJ1Y3QgaW50ZWxfdW5jb3JlX2Z1bmNzIGZ1bmNzOwogCiAJdW5zaWduZWQg Zmlmb19jb3VudDsKLQl1bnNpZ25lZCBmb3JjZXdha2VfY291bnQ7Ci0KLQl1bnNpZ25lZCBmd19y ZW5kZXJjb3VudDsKLQl1bnNpZ25lZCBmd19tZWRpYWNvdW50OwotCXVuc2lnbmVkIGZ3X2JsaXR0 ZXJjb3VudDsKLQotCXN0cnVjdCB0aW1lcl9saXN0IGZvcmNlX3dha2VfdGltZXI7Ci19OworCXVu c2lnbmVkIGZ3X2RvbWFpbnM7CisKKwlzdHJ1Y3QgaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9kb21h aW4geworCQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNTsKKwkJaW50IGlkOworCQl1bnNp Z25lZCB3YWtlX2NvdW50OworCQlzdHJ1Y3QgdGltZXJfbGlzdCB0aW1lcjsKKwl9IGZ3X2RvbWFp bltGV19ET01BSU5fSURfQ09VTlRdOworI2RlZmluZSBGT1JDRVdBS0VfUkVOREVSCSgxIDw8IEZX X0RPTUFJTl9JRF9SRU5ERVIpCisjZGVmaW5lIEZPUkNFV0FLRV9CTElUVEVSCSgxIDw8IEZXX0RP TUFJTl9JRF9CTElUVEVSKQorI2RlZmluZSBGT1JDRVdBS0VfTUVESUEJCSgxIDw8IEZXX0RPTUFJ Tl9JRF9NRURJQSkKKyNkZWZpbmUgRk9SQ0VXQUtFX0FMTAkJKEZPUkNFV0FLRV9SRU5ERVIgfCBc CisJCQkJIEZPUkNFV0FLRV9CTElUVEVSIHwgXAorCQkJCSBGT1JDRVdBS0VfTUVESUEpCit9Owor CisvKiBJdGVyYXRlIG92ZXIgaW5pdGlhbGlzZWQgZncgZG9tYWlucyAqLworI2RlZmluZSBmb3Jf ZWFjaF9md19kb21haW5fbWFzayhkb21haW5fXywgbWFza19fLCBkZXZfcHJpdl9fLCBpX18pIFwK Kwlmb3IgKChpX18pID0gMCwgKGRvbWFpbl9fKSA9ICYoZGV2X3ByaXZfXyktPnVuY29yZS5md19k b21haW5bMF07IFwKKwkgICAgIChpX18pIDwgRldfRE9NQUlOX0lEX0NPVU5UOyBcCisJICAgICAo aV9fKSsrLCAoZG9tYWluX18pID0gJihkZXZfcHJpdl9fKS0+dW5jb3JlLmZ3X2RvbWFpbltpX19d KSBcCisJCWlmICgoKG1hc2tfXykgJiAoZGV2X3ByaXZfXyktPnVuY29yZS5md19kb21haW5zKSAm ICgxIDw8IChpX18pKSkKKworI2RlZmluZSBmb3JfZWFjaF9md19kb21haW4oZG9tYWluX18sIGRl dl9wcml2X18sIGlfXykgXAorCWZvcl9lYWNoX2Z3X2RvbWFpbl9tYXNrKGRvbWFpbl9fLCBGT1JD RVdBS0VfQUxMLCBkZXZfcHJpdl9fLCBpX18pCiAKICNkZWZpbmUgREVWX0lORk9fRk9SX0VBQ0hf RkxBRyhmdW5jLCBzZXApIFwKIAlmdW5jKGlzX21vYmlsZSkgc2VwIFwKQEAgLTMxMDcsOCArMzEz MiwxMCBAQCBleHRlcm4gdm9pZCBpbnRlbF9kaXNwbGF5X3ByaW50X2Vycm9yX3N0YXRlKHN0cnVj dCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9idWYgKmUsCiAgKiBtdXN0IGJlIHNldCB0byBwcmV2ZW50 IEdUIGNvcmUgZnJvbSBwb3dlciBkb3duIGFuZCBzdGFsZSB2YWx1ZXMgYmVpbmcKICAqIHJldHVy bmVkLgogICovCi12b2lkIGdlbjZfZ3RfZm9yY2Vfd2FrZV9nZXQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LCBpbnQgZndfZW5naW5lKTsKLXZvaWQgZ2VuNl9ndF9mb3JjZV93YWtl X3B1dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGludCBmd19lbmdpbmUpOwor dm9pZCBnZW42X2d0X2ZvcmNlX3dha2VfZ2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKKwkJCSAgICB1bnNpZ25lZCBmd19kb21haW5zKTsKK3ZvaWQgZ2VuNl9ndF9mb3JjZV93 YWtlX3B1dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkgICAgdW5zaWdu ZWQgZndfZG9tYWlucyk7CiB2b2lkIGFzc2VydF9mb3JjZV93YWtlX2luYWN0aXZlKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiAKIGludCBzYW5keWJyaWRnZV9wY29kZV9yZWFk KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIG1ib3gsIHUzMiAqdmFsKTsK QEAgLTMxNDAsMTMgKzMxNjcsNiBAQCB2b2lkIHZsdl9mbGlzZHNpX3dyaXRlKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIHJlZywgdTMyIHZhbCk7CiBpbnQgdmx2X2dwdV9m cmVxKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IHZhbCk7CiBpbnQgdmx2 X2ZyZXFfb3Bjb2RlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IHZhbCk7 CiAKLSNkZWZpbmUgRk9SQ0VXQUtFX1JFTkRFUgkoMSA8PCAwKQotI2RlZmluZSBGT1JDRVdBS0Vf TUVESUEJCSgxIDw8IDEpCi0jZGVmaW5lIEZPUkNFV0FLRV9CTElUVEVSCSgxIDw8IDIpCi0jZGVm aW5lIEZPUkNFV0FLRV9BTEwJCShGT1JDRVdBS0VfUkVOREVSIHwgRk9SQ0VXQUtFX01FRElBIHwg XAotCQkJCQlGT1JDRVdBS0VfQkxJVFRFUikKLQotCiAjZGVmaW5lIEk5MTVfUkVBRDgocmVnKQkJ ZGV2X3ByaXYtPnVuY29yZS5mdW5jcy5tbWlvX3JlYWRiKGRldl9wcml2LCAocmVnKSwgdHJ1ZSkK ICNkZWZpbmUgSTkxNV9XUklURTgocmVnLCB2YWwpCWRldl9wcml2LT51bmNvcmUuZnVuY3MubW1p b193cml0ZWIoZGV2X3ByaXYsIChyZWcpLCAodmFsKSwgdHJ1ZSkKIApkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF91bmNvcmUuYwppbmRleCA4M2MzMGJiLi5mZDFkMTYwIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF91bmNvcmUuYwpAQCAtNjcsNyArNjcsNyBAQCBzdGF0aWMgdm9pZCBfX2dlbjZfZ3RfZm9y Y2Vfd2FrZV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB9CiAKIHN0 YXRpYyB2b2lkIF9fZ2VuNl9ndF9mb3JjZV93YWtlX2dldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCi0JCQkJCQkJaW50IGZ3X2VuZ2luZSkKKwkJCQkgICAgIGludCBmd19lbmdp bmUpCiB7CiAJaWYgKHdhaXRfZm9yX2F0b21pYygoX19yYXdfaTkxNV9yZWFkMzIoZGV2X3ByaXYs IEZPUkNFV0FLRV9BQ0spICYgMSkgPT0gMCwKIAkJCSAgICBGT1JDRVdBS0VfQUNLX1RJTUVPVVRf TVMpKQpAQCAtOTMsNyArOTMsNyBAQCBzdGF0aWMgdm9pZCBfX2dlbjdfZ3RfZm9yY2Vfd2FrZV9t dF9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB9CiAKIHN0YXRpYyB2 b2lkIF9fZ2VuN19ndF9mb3JjZV93YWtlX210X2dldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCi0JCQkJCQkJaW50IGZ3X2VuZ2luZSkKKwkJCQkJaW50IGZ3X2VuZ2luZSkKIHsK IAl1MzIgZm9yY2V3YWtlX2FjazsKIApAQCAtMTI5LDcgKzEyOSw3IEBAIHN0YXRpYyB2b2lkIGdl bjZfZ3RfY2hlY2tfZmlmb2RiZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB9 CiAKIHN0YXRpYyB2b2lkIF9fZ2VuNl9ndF9mb3JjZV93YWtlX3B1dChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkJCQkJaW50IGZ3X2VuZ2luZSkKKwkJCQkgICAgIGludCBm d19lbmdpbmUpCiB7CiAJX19yYXdfaTkxNV93cml0ZTMyKGRldl9wcml2LCBGT1JDRVdBS0UsIDAp OwogCS8qIHNvbWV0aGluZyBmcm9tIHNhbWUgY2FjaGVsaW5lLCBidXQgIUZPUkNFV0FLRSAqLwpA QCAtMTM4LDcgKzEzOCw3IEBAIHN0YXRpYyB2b2lkIF9fZ2VuNl9ndF9mb3JjZV93YWtlX3B1dChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiB9CiAKIHN0YXRpYyB2b2lkIF9fZ2Vu N19ndF9mb3JjZV93YWtlX210X3B1dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs Ci0JCQkJCQkJaW50IGZ3X2VuZ2luZSkKKwkJCQkJaW50IGZ3X2VuZ2luZSkKIHsKIAlfX3Jhd19p OTE1X3dyaXRlMzIoZGV2X3ByaXYsIEZPUkNFV0FLRV9NVCwKIAkJCSAgIF9NQVNLRURfQklUX0RJ U0FCTEUoRk9SQ0VXQUtFX0tFUk5FTCkpOwpAQCAtMTg3LDcgKzE4Nyw3IEBAIHN0YXRpYyB2b2lk IHZsdl9mb3JjZV93YWtlX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IH0KIAogc3RhdGljIHZvaWQgX192bHZfZm9yY2Vfd2FrZV9nZXQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAotCQkJCQkJaW50IGZ3X2VuZ2luZSkKKwkJCQkgaW50IGZ3X2VuZ2lu ZSkKIHsKIAkvKiBDaGVjayBmb3IgUmVuZGVyIEVuZ2luZSAqLwogCWlmIChGT1JDRVdBS0VfUkVO REVSICYgZndfZW5naW5lKSB7CkBAIC0yMjcsOSArMjI3LDggQEAgc3RhdGljIHZvaWQgX192bHZf Zm9yY2Vfd2FrZV9nZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogfQogCiBz dGF0aWMgdm9pZCBfX3Zsdl9mb3JjZV93YWtlX3B1dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCi0JCQkJCWludCBmd19lbmdpbmUpCisJCQkJIGludCBmd19lbmdpbmUpCiB7Ci0K IAkvKiBDaGVjayBmb3IgUmVuZGVyIEVuZ2luZSAqLwogCWlmIChGT1JDRVdBS0VfUkVOREVSICYg ZndfZW5naW5lKQogCQlfX3Jhd19pOTE1X3dyaXRlMzIoZGV2X3ByaXYsIEZPUkNFV0FLRV9WTFYs CkBAIC0yNDcsMzcgKzI0Niw2IEBAIHN0YXRpYyB2b2lkIF9fdmx2X2ZvcmNlX3dha2VfcHV0KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJZ2VuNl9ndF9jaGVja19maWZvZGJn KGRldl9wcml2KTsKIH0KIAotc3RhdGljIHZvaWQgdmx2X2ZvcmNlX3dha2VfZ2V0KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IGZ3X2VuZ2luZSkKLXsKLQlpZiAoZndfZW5n aW5lICYgRk9SQ0VXQUtFX1JFTkRFUiAmJgotCSAgICBkZXZfcHJpdi0+dW5jb3JlLmZ3X3JlbmRl cmNvdW50KysgIT0gMCkKLQkJZndfZW5naW5lICY9IH5GT1JDRVdBS0VfUkVOREVSOwotCWlmIChm d19lbmdpbmUgJiBGT1JDRVdBS0VfTUVESUEgJiYKLQkgICAgZGV2X3ByaXYtPnVuY29yZS5md19t ZWRpYWNvdW50KysgIT0gMCkKLQkJZndfZW5naW5lICY9IH5GT1JDRVdBS0VfTUVESUE7Ci0KLQlp ZiAoZndfZW5naW5lKQotCQlkZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfZ2V0KGRl dl9wcml2LCBmd19lbmdpbmUpOwotfQotCi1zdGF0aWMgdm9pZCB2bHZfZm9yY2Vfd2FrZV9wdXQo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpbnQgZndfZW5naW5lKQotewotCWlm IChmd19lbmdpbmUgJiBGT1JDRVdBS0VfUkVOREVSKSB7Ci0JCVdBUk5fT04oIWRldl9wcml2LT51 bmNvcmUuZndfcmVuZGVyY291bnQpOwotCQlpZiAoLS1kZXZfcHJpdi0+dW5jb3JlLmZ3X3JlbmRl cmNvdW50ICE9IDApCi0JCQlmd19lbmdpbmUgJj0gfkZPUkNFV0FLRV9SRU5ERVI7Ci0JfQotCi0J aWYgKGZ3X2VuZ2luZSAmIEZPUkNFV0FLRV9NRURJQSkgewotCQlXQVJOX09OKCFkZXZfcHJpdi0+ dW5jb3JlLmZ3X21lZGlhY291bnQpOwotCQlpZiAoLS1kZXZfcHJpdi0+dW5jb3JlLmZ3X21lZGlh Y291bnQgIT0gMCkKLQkJCWZ3X2VuZ2luZSAmPSB+Rk9SQ0VXQUtFX01FRElBOwotCX0KLQotCWlm IChmd19lbmdpbmUpCi0JCWRldl9wcml2LT51bmNvcmUuZnVuY3MuZm9yY2Vfd2FrZV9wdXQoZGV2 X3ByaXYsIGZ3X2VuZ2luZSk7Ci19Ci0KIHN0YXRpYyB2b2lkIF9fZ2VuOV9ndF9mb3JjZV93YWtl X210X3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlfX3Jhd19p OTE1X3dyaXRlMzIoZGV2X3ByaXYsIEZPUkNFV0FLRV9SRU5ERVJfR0VOOSwKQEAgLTM2Nyw4MCAr MzM1LDcyIEBAIF9fZ2VuOV9mb3JjZV93YWtlX3B1dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsIGludCBmd19lbmdpbmUpCiAJCQkJX01BU0tFRF9CSVRfRElTQUJMRShGT1JDRVdB S0VfS0VSTkVMKSk7CiB9CiAKLXN0YXRpYyB2b2lkCi1nZW45X2ZvcmNlX3dha2VfZ2V0KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IGZ3X2VuZ2luZSkKK3N0YXRpYyB2b2lk IGdlbjZfZm9yY2Vfd2FrZV90aW1lcih1bnNpZ25lZCBsb25nIGFyZykKIHsKLQlpZiAoRk9SQ0VX QUtFX1JFTkRFUiAmIGZ3X2VuZ2luZSkgewotCQlpZiAoZGV2X3ByaXYtPnVuY29yZS5md19yZW5k ZXJjb3VudCsrID09IDApCi0JCQlkZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfZ2V0 KGRldl9wcml2LAotCQkJCQkJCUZPUkNFV0FLRV9SRU5ERVIpOwotCX0KKwlzdHJ1Y3QgaW50ZWxf dW5jb3JlX2ZvcmNld2FrZV9kb21haW4gKmRvbWFpbiA9ICh2b2lkICopYXJnOworCXVuc2lnbmVk IGxvbmcgaXJxZmxhZ3M7CiAKLQlpZiAoRk9SQ0VXQUtFX01FRElBICYgZndfZW5naW5lKSB7Ci0J CWlmIChkZXZfcHJpdi0+dW5jb3JlLmZ3X21lZGlhY291bnQrKyA9PSAwKQotCQkJZGV2X3ByaXYt PnVuY29yZS5mdW5jcy5mb3JjZV93YWtlX2dldChkZXZfcHJpdiwKLQkJCQkJCQlGT1JDRVdBS0Vf TUVESUEpOwotCX0KKwlhc3NlcnRfZGV2aWNlX25vdF9zdXNwZW5kZWQoZG9tYWluLT5pOTE1KTsK IAotCWlmIChGT1JDRVdBS0VfQkxJVFRFUiAmIGZ3X2VuZ2luZSkgewotCQlpZiAoZGV2X3ByaXYt PnVuY29yZS5md19ibGl0dGVyY291bnQrKyA9PSAwKQotCQkJZGV2X3ByaXYtPnVuY29yZS5mdW5j cy5mb3JjZV93YWtlX2dldChkZXZfcHJpdiwKLQkJCQkJCQlGT1JDRVdBS0VfQkxJVFRFUik7Ci0J fQorCXNwaW5fbG9ja19pcnFzYXZlKCZkb21haW4tPmk5MTUtPnVuY29yZS5sb2NrLCBpcnFmbGFn cyk7CisJaWYgKFdBUk5fT04oZG9tYWluLT53YWtlX2NvdW50ID09IDApKQorCQlkb21haW4tPndh a2VfY291bnQrKzsKKworCWlmICgtLWRvbWFpbi0+d2FrZV9jb3VudCA9PSAwKQorCQlkb21haW4t Pmk5MTUtPnVuY29yZS5mdW5jcy5mb3JjZV93YWtlX3B1dChkb21haW4tPmk5MTUsCisJCQkJCQkJ ICAxIDw8IGRvbWFpbi0+aWQpOworCisJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZG9tYWluLT5p OTE1LT51bmNvcmUubG9jaywgaXJxZmxhZ3MpOwogfQogCi1zdGF0aWMgdm9pZAotZ2VuOV9mb3Jj ZV93YWtlX3B1dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGludCBmd19lbmdp bmUpCit2b2lkIGludGVsX3VuY29yZV9mb3JjZXdha2VfcmVzZXQoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgYm9vbCByZXN0b3JlKQogewotCWlmIChGT1JDRVdBS0VfUkVOREVSICYgZndfZW5naW5l KSB7Ci0JCVdBUk5fT04oZGV2X3ByaXYtPnVuY29yZS5md19yZW5kZXJjb3VudCA9PSAwKTsKLQkJ aWYgKC0tZGV2X3ByaXYtPnVuY29yZS5md19yZW5kZXJjb3VudCA9PSAwKQotCQkJZGV2X3ByaXYt PnVuY29yZS5mdW5jcy5mb3JjZV93YWtlX3B1dChkZXZfcHJpdiwKLQkJCQkJCQlGT1JDRVdBS0Vf UkVOREVSKTsKLQl9CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5k ZXZfcHJpdmF0ZTsKKwl1bnNpZ25lZCBsb25nIGlycWZsYWdzLCBmdyA9IDA7CisJc3RydWN0IGlu dGVsX3VuY29yZV9mb3JjZXdha2VfZG9tYWluICpkb21haW47CisJaW50IGlkLCBhY3RpdmVfZG9t YWlucywgcmV0cnlfY291bnQgPSAxMDA7CiAKLQlpZiAoRk9SQ0VXQUtFX01FRElBICYgZndfZW5n aW5lKSB7Ci0JCVdBUk5fT04oZGV2X3ByaXYtPnVuY29yZS5md19tZWRpYWNvdW50ID09IDApOwot CQlpZiAoLS1kZXZfcHJpdi0+dW5jb3JlLmZ3X21lZGlhY291bnQgPT0gMCkKLQkJCWRldl9wcml2 LT51bmNvcmUuZnVuY3MuZm9yY2Vfd2FrZV9wdXQoZGV2X3ByaXYsCi0JCQkJCQkJRk9SQ0VXQUtF X01FRElBKTsKLQl9CisJLyogSG9sZCB1bmNvcmUubG9jayBhY3Jvc3MgcmVzZXQgdG8gcHJldmVu dCBhbnkgcmVnaXN0ZXIgYWNjZXNzCisJICogd2l0aCBmb3JjZXdha2Ugbm90IHNldCBjb3JyZWN0 bHkuIFdhaXQgdW50aWwgYWxsIHBlbmRpbmcKKwkgKiB0aW1lcnMgYXJlIHJ1biBiZWZvcmUgaG9s ZGluZy4KKwkgKi8KKwl3aGlsZSAoMSkgeworCQlhY3RpdmVfZG9tYWlucyA9IDA7CiAKLQlpZiAo Rk9SQ0VXQUtFX0JMSVRURVIgJiBmd19lbmdpbmUpIHsKLQkJV0FSTl9PTihkZXZfcHJpdi0+dW5j b3JlLmZ3X2JsaXR0ZXJjb3VudCA9PSAwKTsKLQkJaWYgKC0tZGV2X3ByaXYtPnVuY29yZS5md19i bGl0dGVyY291bnQgPT0gMCkKLQkJCWRldl9wcml2LT51bmNvcmUuZnVuY3MuZm9yY2Vfd2FrZV9w dXQoZGV2X3ByaXYsCi0JCQkJCQkJRk9SQ0VXQUtFX0JMSVRURVIpOwotCX0KLX0KKwkJZm9yX2Vh Y2hfZndfZG9tYWluKGRvbWFpbiwgZGV2X3ByaXYsIGlkKSB7CisJCQlpZiAoZGVsX3RpbWVyX3N5 bmMoJmRvbWFpbi0+dGltZXIpID09IDApCisJCQkJY29udGludWU7CiAKLXN0YXRpYyB2b2lkIGdl bjZfZm9yY2Vfd2FrZV90aW1lcih1bnNpZ25lZCBsb25nIGFyZykKLXsKLQlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSAodm9pZCAqKWFyZzsKLQl1bnNpZ25lZCBsb25nIGlycWZs YWdzOworCQkJZ2VuNl9mb3JjZV93YWtlX3RpbWVyKCh1bnNpZ25lZCBsb25nKWRvbWFpbik7CisJ CX0KIAotCWFzc2VydF9kZXZpY2Vfbm90X3N1c3BlbmRlZChkZXZfcHJpdik7CisJCXNwaW5fbG9j a19pcnFzYXZlKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKIAotCXNwaW5fbG9j a19pcnFzYXZlKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKLQlXQVJOX09OKCFk ZXZfcHJpdi0+dW5jb3JlLmZvcmNld2FrZV9jb3VudCk7CisJCWZvcl9lYWNoX2Z3X2RvbWFpbihk b21haW4sIGRldl9wcml2LCBpZCkgeworCQkJaWYgKHRpbWVyX3BlbmRpbmcoJmRvbWFpbi0+dGlt ZXIpKQorCQkJCWFjdGl2ZV9kb21haW5zIHw9ICgxIDw8IGlkKTsKKwkJfQogCi0JaWYgKC0tZGV2 X3ByaXYtPnVuY29yZS5mb3JjZXdha2VfY291bnQgPT0gMCkKLQkJZGV2X3ByaXYtPnVuY29yZS5m dW5jcy5mb3JjZV93YWtlX3B1dChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7Ci0Jc3Bpbl91bmxv Y2tfaXJxcmVzdG9yZSgmZGV2X3ByaXYtPnVuY29yZS5sb2NrLCBpcnFmbGFncyk7Ci19CisJCWlm IChhY3RpdmVfZG9tYWlucyA9PSAwKQorCQkJYnJlYWs7CiAKLXZvaWQgaW50ZWxfdW5jb3JlX2Zv cmNld2FrZV9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBib29sIHJlc3RvcmUpCi17Ci0J c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQl1 bnNpZ25lZCBsb25nIGlycWZsYWdzOworCQlpZiAoLS1yZXRyeV9jb3VudCA9PSAwKSB7CisJCQlE Uk1fRVJST1IoIlRpbWVkIG91dCB3YWl0aW5nIGZvciBmb3JjZXdha2UgdGltZXJzIHRvIGZpbmlz aFxuIik7CisJCQlicmVhazsKKwkJfQogCi0JaWYgKGRlbF90aW1lcl9zeW5jKCZkZXZfcHJpdi0+ dW5jb3JlLmZvcmNlX3dha2VfdGltZXIpKQotCQlnZW42X2ZvcmNlX3dha2VfdGltZXIoKHVuc2ln bmVkIGxvbmcpZGV2X3ByaXYpOworCQlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkZXZfcHJpdi0+ dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKKwkJY29uZF9yZXNjaGVkKCk7CisJfQogCi0JLyogSG9s ZCB1bmNvcmUubG9jayBhY3Jvc3MgcmVzZXQgdG8gcHJldmVudCBhbnkgcmVnaXN0ZXIgYWNjZXNz Ci0JICogd2l0aCBmb3JjZXdha2Ugbm90IHNldCBjb3JyZWN0bHkKLQkgKi8KLQlzcGluX2xvY2tf aXJxc2F2ZSgmZGV2X3ByaXYtPnVuY29yZS5sb2NrLCBpcnFmbGFncyk7CisJV0FSTl9PTihhY3Rp dmVfZG9tYWlucyk7CisKKwlmb3JfZWFjaF9md19kb21haW4oZG9tYWluLCBkZXZfcHJpdiwgaWQp CisJCWlmIChkb21haW4tPndha2VfY291bnQpCisJCQlmdyB8PSAxIDw8IGlkOworCisJaWYgKGZ3 KQorCQlkZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfcHV0KGRldl9wcml2LCBmdyk7 CiAKIAlpZiAoSVNfVkFMTEVZVklFVyhkZXYpKQogCQl2bHZfZm9yY2Vfd2FrZV9yZXNldChkZXZf cHJpdik7CkBAIC00NTQsMjggKzQxNCw2IEBAIHZvaWQgaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9y ZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBib29sIHJlc3RvcmUpCiAJCV9fZ2VuOV9ndF9m b3JjZV93YWtlX210X3Jlc2V0KGRldl9wcml2KTsKIAogCWlmIChyZXN0b3JlKSB7IC8qIElmIHJl c2V0IHdpdGggYSB1c2VyIGZvcmNld2FrZSwgdHJ5IHRvIHJlc3RvcmUgKi8KLQkJdW5zaWduZWQg ZncgPSAwOwotCi0JCWlmIChJU19WQUxMRVlWSUVXKGRldikpIHsKLQkJCWlmIChkZXZfcHJpdi0+ dW5jb3JlLmZ3X3JlbmRlcmNvdW50KQotCQkJCWZ3IHw9IEZPUkNFV0FLRV9SRU5ERVI7Ci0KLQkJ CWlmIChkZXZfcHJpdi0+dW5jb3JlLmZ3X21lZGlhY291bnQpCi0JCQkJZncgfD0gRk9SQ0VXQUtF X01FRElBOwotCQl9IGVsc2UgaWYgKElTX0dFTjkoZGV2KSkgewotCQkJaWYgKGRldl9wcml2LT51 bmNvcmUuZndfcmVuZGVyY291bnQpCi0JCQkJZncgfD0gRk9SQ0VXQUtFX1JFTkRFUjsKLQotCQkJ aWYgKGRldl9wcml2LT51bmNvcmUuZndfbWVkaWFjb3VudCkKLQkJCQlmdyB8PSBGT1JDRVdBS0Vf TUVESUE7Ci0KLQkJCWlmIChkZXZfcHJpdi0+dW5jb3JlLmZ3X2JsaXR0ZXJjb3VudCkKLQkJCQlm dyB8PSBGT1JDRVdBS0VfQkxJVFRFUjsKLQkJfSBlbHNlIHsKLQkJCWlmIChkZXZfcHJpdi0+dW5j b3JlLmZvcmNld2FrZV9jb3VudCkKLQkJCQlmdyA9IEZPUkNFV0FLRV9BTEw7Ci0JCX0KLQogCQlp ZiAoZncpCiAJCQlkZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfZ2V0KGRldl9wcml2 LCBmdyk7CiAKQEAgLTQ4NSw2ICs0MjMsOSBAQCB2b2lkIGludGVsX3VuY29yZV9mb3JjZXdha2Vf cmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgYm9vbCByZXN0b3JlKQogCQkJCUdUX0ZJRk9f RlJFRV9FTlRSSUVTX01BU0s7CiAJfQogCisJaWYgKCFyZXN0b3JlKQorCQlhc3NlcnRfZm9yY2Vf d2FrZV9pbmFjdGl2ZShkZXZfcHJpdik7CisKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkZXZf cHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKIH0KIApAQCAtNTMzLDUzICs0NzQsNTkgQEAg dm9pZCBpbnRlbF91bmNvcmVfc2FuaXRpemUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKICAqIGJl IGNhbGxlZCBhdCB0aGUgYmVnaW5uaW5nIG9mIHRoZSBzZXF1ZW5jZSBmb2xsb3dlZCBieSBhIGNh bGwgdG8KICAqIGdlbjZfZ3RfZm9yY2Vfd2FrZV9wdXQoKSBhdCB0aGUgZW5kIG9mIHRoZSBzZXF1 ZW5jZS4KICAqLwotdm9pZCBnZW42X2d0X2ZvcmNlX3dha2VfZ2V0KHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwgaW50IGZ3X2VuZ2luZSkKK3ZvaWQgZ2VuNl9ndF9mb3JjZV93YWtl X2dldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkgICAgdW5zaWduZWQg ZndfZG9tYWlucykKIHsKIAl1bnNpZ25lZCBsb25nIGlycWZsYWdzOworCXN0cnVjdCBpbnRlbF91 bmNvcmVfZm9yY2V3YWtlX2RvbWFpbiAqZG9tYWluOworCWludCBpZDsKIAogCWlmICghZGV2X3By aXYtPnVuY29yZS5mdW5jcy5mb3JjZV93YWtlX2dldCkKIAkJcmV0dXJuOwogCiAJV0FSTl9PTigh cG1fcnVudGltZV9hY3RpdmUoJmRldl9wcml2LT5kZXYtPnBkZXYtPmRldikpOwogCisJZndfZG9t YWlucyAmPSBkZXZfcHJpdi0+dW5jb3JlLmZ3X2RvbWFpbnM7CisKIAlzcGluX2xvY2tfaXJxc2F2 ZSgmZGV2X3ByaXYtPnVuY29yZS5sb2NrLCBpcnFmbGFncyk7CiAKLQlpZiAoSVNfR0VOOShkZXZf cHJpdi0+ZGV2KSkgewotCQlnZW45X2ZvcmNlX3dha2VfZ2V0KGRldl9wcml2LCBmd19lbmdpbmUp OwotCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdi0+ZGV2KSkgewotCQl2bHZfZm9y Y2Vfd2FrZV9nZXQoZGV2X3ByaXYsIGZ3X2VuZ2luZSk7Ci0JfSBlbHNlIHsKLQkJaWYgKGRldl9w cml2LT51bmNvcmUuZm9yY2V3YWtlX2NvdW50KysgPT0gMCkKLQkJCWRldl9wcml2LT51bmNvcmUu ZnVuY3MuZm9yY2Vfd2FrZV9nZXQoZGV2X3ByaXYsCi0JCQkJCQkJICAgICAgRk9SQ0VXQUtFX0FM TCk7CisJZm9yX2VhY2hfZndfZG9tYWluX21hc2soZG9tYWluLCBmd19kb21haW5zLCBkZXZfcHJp diwgaWQpIHsKKwkJaWYgKGRvbWFpbi0+d2FrZV9jb3VudCsrKQorCQkJZndfZG9tYWlucyAmPSB+ KDEgPDwgaWQpOwogCX0KIAorCWlmIChmd19kb21haW5zKQorCQlkZXZfcHJpdi0+dW5jb3JlLmZ1 bmNzLmZvcmNlX3dha2VfZ2V0KGRldl9wcml2LCBmd19kb21haW5zKTsKKwogCXNwaW5fdW5sb2Nr X2lycXJlc3RvcmUoJmRldl9wcml2LT51bmNvcmUubG9jaywgaXJxZmxhZ3MpOwogfQogCiAvKgog ICogc2VlIGdlbjZfZ3RfZm9yY2Vfd2FrZV9nZXQoKQogICovCi12b2lkIGdlbjZfZ3RfZm9yY2Vf d2FrZV9wdXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpbnQgZndfZW5naW5l KQordm9pZCBnZW42X2d0X2ZvcmNlX3dha2VfcHV0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKKwkJCSAgICB1bnNpZ25lZCBmd19kb21haW5zKQogewogCXVuc2lnbmVkIGxvbmcg aXJxZmxhZ3M7CisJc3RydWN0IGludGVsX3VuY29yZV9mb3JjZXdha2VfZG9tYWluICpkb21haW47 CisJaW50IGlkOwogCiAJaWYgKCFkZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfcHV0 KQogCQlyZXR1cm47CiAKKwlmd19kb21haW5zICY9IGRldl9wcml2LT51bmNvcmUuZndfZG9tYWlu czsKKwogCXNwaW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdz KTsKIAotCWlmIChJU19HRU45KGRldl9wcml2LT5kZXYpKSB7Ci0JCWdlbjlfZm9yY2Vfd2FrZV9w dXQoZGV2X3ByaXYsIGZ3X2VuZ2luZSk7Ci0JfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9w cml2LT5kZXYpKSB7Ci0JCXZsdl9mb3JjZV93YWtlX3B1dChkZXZfcHJpdiwgZndfZW5naW5lKTsK LQl9IGVsc2UgewotCQlXQVJOX09OKCFkZXZfcHJpdi0+dW5jb3JlLmZvcmNld2FrZV9jb3VudCk7 Ci0JCWlmICgtLWRldl9wcml2LT51bmNvcmUuZm9yY2V3YWtlX2NvdW50ID09IDApIHsKLQkJCWRl dl9wcml2LT51bmNvcmUuZm9yY2V3YWtlX2NvdW50Kys7Ci0JCQltb2RfdGltZXJfcGlubmVkKCZk ZXZfcHJpdi0+dW5jb3JlLmZvcmNlX3dha2VfdGltZXIsCi0JCQkJCSBqaWZmaWVzICsgMSk7Ci0J CX0KKwlmb3JfZWFjaF9md19kb21haW5fbWFzayhkb21haW4sIGZ3X2RvbWFpbnMsIGRldl9wcml2 LCBpZCkgeworCQlpZiAoV0FSTl9PTihkb21haW4tPndha2VfY291bnQgPT0gMCkpCisJCQljb250 aW51ZTsKKworCQlpZiAoLS1kb21haW4tPndha2VfY291bnQpCisJCQljb250aW51ZTsKKworCQlk b21haW4tPndha2VfY291bnQrKzsKKwkJbW9kX3RpbWVyX3Bpbm5lZCgmZG9tYWluLT50aW1lciwg amlmZmllcyArIDEpOwogCX0KIAogCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRldl9wcml2LT51 bmNvcmUubG9jaywgaXJxZmxhZ3MpOwpAQCAtNTg3LDEwICs1MzQsMTQgQEAgdm9pZCBnZW42X2d0 X2ZvcmNlX3dha2VfcHV0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IGZ3 X2VuZ2luZSkKIAogdm9pZCBhc3NlcnRfZm9yY2Vfd2FrZV9pbmFjdGl2ZShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CisJc3RydWN0IGludGVsX3VuY29yZV9mb3JjZXdha2Vf ZG9tYWluICpkb21haW47CisJaW50IGk7CisKIAlpZiAoIWRldl9wcml2LT51bmNvcmUuZnVuY3Mu Zm9yY2Vfd2FrZV9nZXQpCiAJCXJldHVybjsKIAotCVdBUk5fT04oZGV2X3ByaXYtPnVuY29yZS5m b3JjZXdha2VfY291bnQgPiAwKTsKKwlmb3JfZWFjaF9md19kb21haW4oZG9tYWluLCBkZXZfcHJp diwgaSkKKwkJV0FSTl9PTihkb21haW4tPndha2VfY291bnQpOwogfQogCiAvKiBXZSBnaXZlIGZh c3QgcGF0aHMgZm9yIHRoZSByZWFsbHkgY29vbCByZWdpc3RlcnMgKi8KQEAgLTc1MywxOSArNzA0 LDM3IEBAIF9fZ2VuMl9yZWFkKDY0KQogCXRyYWNlX2k5MTVfcmVnX3J3KGZhbHNlLCByZWcsIHZh bCwgc2l6ZW9mKHZhbCksIHRyYWNlKTsgXAogCXJldHVybiB2YWwKIAorc3RhdGljIGlubGluZSB2 b2lkIF9fZm9yY2Vfd2FrZV9nZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAor CQkJCSAgICB1bnNpZ25lZCBmd19kb21haW5zKQoreworCXN0cnVjdCBpbnRlbF91bmNvcmVfZm9y Y2V3YWtlX2RvbWFpbiAqZG9tYWluOworCWludCBpOworCisJaWYgKFdBUk5fT04oIWZ3X2RvbWFp bnMpKQorCQlyZXR1cm47CisKKwkvKiBJZGVhbGx5IEdDQyB3b3VsZCBiZSBjb25zdGFudC1mb2xk IGFuZCBlbGltaW5hdGUgdGhpcyBsb29wICovCisJZm9yX2VhY2hfZndfZG9tYWluX21hc2soZG9t YWluLCBmd19kb21haW5zLCBkZXZfcHJpdiwgaSkgeworCQlpZiAoZG9tYWluLT53YWtlX2NvdW50 KSB7CisJCQlmd19kb21haW5zICY9IH4oMSA8PCBpKTsKKwkJCWNvbnRpbnVlOworCQl9CisKKwkJ ZG9tYWluLT53YWtlX2NvdW50Kys7CisJCW1vZF90aW1lcl9waW5uZWQoJmRvbWFpbi0+dGltZXIs IGppZmZpZXMgKyAxKTsKKwl9CisKKwlpZiAoZndfZG9tYWlucykKKwkJZGV2X3ByaXYtPnVuY29y ZS5mdW5jcy5mb3JjZV93YWtlX2dldChkZXZfcHJpdiwgZndfZG9tYWlucyk7Cit9CisKICNkZWZp bmUgX19nZW42X3JlYWQoeCkgXAogc3RhdGljIHUjI3ggXAogZ2VuNl9yZWFkIyN4KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgb2ZmX3QgcmVnLCBib29sIHRyYWNlKSB7IFwKIAlH RU42X1JFQURfSEVBREVSKHgpOyBcCiAJaHN3X3VuY2xhaW1lZF9yZWdfZGVidWcoZGV2X3ByaXYs IHJlZywgdHJ1ZSwgdHJ1ZSk7IFwKLQlpZiAoZGV2X3ByaXYtPnVuY29yZS5mb3JjZXdha2VfY291 bnQgPT0gMCAmJiBcCi0JICAgIE5FRURTX0ZPUkNFX1dBS0UoKGRldl9wcml2KSwgKHJlZykpKSB7 IFwKLQkJZGV2X3ByaXYtPnVuY29yZS5mdW5jcy5mb3JjZV93YWtlX2dldChkZXZfcHJpdiwgXAot CQkJCQkJICAgICAgRk9SQ0VXQUtFX0FMTCk7IFwKLQkJZGV2X3ByaXYtPnVuY29yZS5mb3JjZXdh a2VfY291bnQrKzsgXAotCQltb2RfdGltZXJfcGlubmVkKCZkZXZfcHJpdi0+dW5jb3JlLmZvcmNl X3dha2VfdGltZXIsIFwKLQkJCQkgamlmZmllcyArIDEpOyBcCi0JfSBcCisJaWYgKE5FRURTX0ZP UkNFX1dBS0UoKGRldl9wcml2KSwgKHJlZykpKSBcCisJCV9fZm9yY2Vfd2FrZV9nZXQoZGV2X3By aXYsIEZPUkNFV0FLRV9SRU5ERVIpOyBcCiAJdmFsID0gX19yYXdfaTkxNV9yZWFkIyN4KGRldl9w cml2LCByZWcpOyBcCiAJaHN3X3VuY2xhaW1lZF9yZWdfZGVidWcoZGV2X3ByaXYsIHJlZywgdHJ1 ZSwgZmFsc2UpOyBcCiAJR0VONl9SRUFEX0ZPT1RFUjsgXApAQCAtNzc0LDQ1ICs3NDMsMjcgQEAg Z2VuNl9yZWFkIyN4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgb2ZmX3QgcmVn LCBib29sIHRyYWNlKSB7IFwKICNkZWZpbmUgX192bHZfcmVhZCh4KSBcCiBzdGF0aWMgdSMjeCBc CiB2bHZfcmVhZCMjeChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIG9mZl90IHJl ZywgYm9vbCB0cmFjZSkgeyBcCi0JdW5zaWduZWQgZndlbmdpbmUgPSAwOyBcCiAJR0VONl9SRUFE X0hFQURFUih4KTsgXAotCWlmIChGT1JDRVdBS0VfVkxWX1JFTkRFUl9SQU5HRV9PRkZTRVQocmVn KSkgeyBcCi0JCWlmIChkZXZfcHJpdi0+dW5jb3JlLmZ3X3JlbmRlcmNvdW50ID09IDApIFwKLQkJ CWZ3ZW5naW5lID0gRk9SQ0VXQUtFX1JFTkRFUjsgXAotCX0gZWxzZSBpZiAoRk9SQ0VXQUtFX1ZM Vl9NRURJQV9SQU5HRV9PRkZTRVQocmVnKSkgeyBcCi0JCWlmIChkZXZfcHJpdi0+dW5jb3JlLmZ3 X21lZGlhY291bnQgPT0gMCkgXAotCQkJZndlbmdpbmUgPSBGT1JDRVdBS0VfTUVESUE7IFwKLQl9 ICBcCi0JaWYgKGZ3ZW5naW5lKSBcCi0JCWRldl9wcml2LT51bmNvcmUuZnVuY3MuZm9yY2Vfd2Fr ZV9nZXQoZGV2X3ByaXYsIGZ3ZW5naW5lKTsgXAorCWlmIChGT1JDRVdBS0VfVkxWX1JFTkRFUl9S QU5HRV9PRkZTRVQocmVnKSkgXAorCQlfX2ZvcmNlX3dha2VfZ2V0KGRldl9wcml2LCBGT1JDRVdB S0VfUkVOREVSKTsgXAorCWVsc2UgaWYgKEZPUkNFV0FLRV9WTFZfTUVESUFfUkFOR0VfT0ZGU0VU KHJlZykpIFwKKwkJX19mb3JjZV93YWtlX2dldChkZXZfcHJpdiwgRk9SQ0VXQUtFX01FRElBKTsg XAogCXZhbCA9IF9fcmF3X2k5MTVfcmVhZCMjeChkZXZfcHJpdiwgcmVnKTsgXAotCWlmIChmd2Vu Z2luZSkgXAotCQlkZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfcHV0KGRldl9wcml2 LCBmd2VuZ2luZSk7IFwKIAlHRU42X1JFQURfRk9PVEVSOyBcCiB9CiAKICNkZWZpbmUgX19jaHZf cmVhZCh4KSBcCiBzdGF0aWMgdSMjeCBcCiBjaHZfcmVhZCMjeChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsIG9mZl90IHJlZywgYm9vbCB0cmFjZSkgeyBcCi0JdW5zaWduZWQgZndl bmdpbmUgPSAwOyBcCiAJR0VONl9SRUFEX0hFQURFUih4KTsgXAotCWlmIChGT1JDRVdBS0VfQ0hW X1JFTkRFUl9SQU5HRV9PRkZTRVQocmVnKSkgeyBcCi0JCWlmIChkZXZfcHJpdi0+dW5jb3JlLmZ3 X3JlbmRlcmNvdW50ID09IDApIFwKLQkJCWZ3ZW5naW5lID0gRk9SQ0VXQUtFX1JFTkRFUjsgXAot CX0gZWxzZSBpZiAoRk9SQ0VXQUtFX0NIVl9NRURJQV9SQU5HRV9PRkZTRVQocmVnKSkgeyBcCi0J CWlmIChkZXZfcHJpdi0+dW5jb3JlLmZ3X21lZGlhY291bnQgPT0gMCkgXAotCQkJZndlbmdpbmUg PSBGT1JDRVdBS0VfTUVESUE7IFwKLQl9IGVsc2UgaWYgKEZPUkNFV0FLRV9DSFZfQ09NTU9OX1JB TkdFX09GRlNFVChyZWcpKSB7IFwKLQkJaWYgKGRldl9wcml2LT51bmNvcmUuZndfcmVuZGVyY291 bnQgPT0gMCkgXAotCQkJZndlbmdpbmUgfD0gRk9SQ0VXQUtFX1JFTkRFUjsgXAotCQlpZiAoZGV2 X3ByaXYtPnVuY29yZS5md19tZWRpYWNvdW50ID09IDApIFwKLQkJCWZ3ZW5naW5lIHw9IEZPUkNF V0FLRV9NRURJQTsgXAotCX0gXAotCWlmIChmd2VuZ2luZSkgXAotCQlkZXZfcHJpdi0+dW5jb3Jl LmZ1bmNzLmZvcmNlX3dha2VfZ2V0KGRldl9wcml2LCBmd2VuZ2luZSk7IFwKKwlpZiAoRk9SQ0VX QUtFX0NIVl9SRU5ERVJfUkFOR0VfT0ZGU0VUKHJlZykpIFwKKwkJX19mb3JjZV93YWtlX2dldChk ZXZfcHJpdiwgRk9SQ0VXQUtFX1JFTkRFUik7IFwKKwllbHNlIGlmIChGT1JDRVdBS0VfQ0hWX01F RElBX1JBTkdFX09GRlNFVChyZWcpKSBcCisJCV9fZm9yY2Vfd2FrZV9nZXQoZGV2X3ByaXYsIEZP UkNFV0FLRV9NRURJQSk7IFwKKwllbHNlIGlmIChGT1JDRVdBS0VfQ0hWX0NPTU1PTl9SQU5HRV9P RkZTRVQocmVnKSkgXAorCQlfX2ZvcmNlX3dha2VfZ2V0KGRldl9wcml2LCBcCisJCQkJIEZPUkNF V0FLRV9SRU5ERVIgfCBGT1JDRVdBS0VfTUVESUEpOyBcCiAJdmFsID0gX19yYXdfaTkxNV9yZWFk IyN4KGRldl9wcml2LCByZWcpOyBcCi0JaWYgKGZ3ZW5naW5lKSBcCi0JCWRldl9wcml2LT51bmNv cmUuZnVuY3MuZm9yY2Vfd2FrZV9wdXQoZGV2X3ByaXYsIGZ3ZW5naW5lKTsgXAogCUdFTjZfUkVB RF9GT09URVI7IFwKIH0KIApAQCAtODIyLDMyICs3NzMsMjEgQEAgY2h2X3JlYWQjI3goc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBvZmZfdCByZWcsIGJvb2wgdHJhY2UpIHsgXAog I2RlZmluZSBfX2dlbjlfcmVhZCh4KSBcCiBzdGF0aWMgdSMjeCBcCiBnZW45X3JlYWQjI3goc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBvZmZfdCByZWcsIGJvb2wgdHJhY2UpIHsg XAorCXVuc2lnbmVkIGZ3X2VuZ2luZTsgXAogCUdFTjZfUkVBRF9IRUFERVIoeCk7IFwKLQlpZiAo IVNLTF9ORUVEU19GT1JDRV9XQUtFKChkZXZfcHJpdiksIChyZWcpKSkgeyBcCi0JCXZhbCA9IF9f cmF3X2k5MTVfcmVhZCMjeChkZXZfcHJpdiwgcmVnKTsgXAotCX0gZWxzZSB7IFwKLQkJdW5zaWdu ZWQgZndlbmdpbmUgPSAwOyBcCi0JCWlmIChGT1JDRVdBS0VfR0VOOV9SRU5ERVJfUkFOR0VfT0ZG U0VUKHJlZykpIHsgXAotCQkJaWYgKGRldl9wcml2LT51bmNvcmUuZndfcmVuZGVyY291bnQgPT0g MCkgXAotCQkJCWZ3ZW5naW5lID0gRk9SQ0VXQUtFX1JFTkRFUjsgXAotCQl9IGVsc2UgaWYgKEZP UkNFV0FLRV9HRU45X01FRElBX1JBTkdFX09GRlNFVChyZWcpKSB7IFwKLQkJCWlmIChkZXZfcHJp di0+dW5jb3JlLmZ3X21lZGlhY291bnQgPT0gMCkgXAotCQkJCWZ3ZW5naW5lID0gRk9SQ0VXQUtF X01FRElBOyBcCi0JCX0gZWxzZSBpZiAoRk9SQ0VXQUtFX0dFTjlfQ09NTU9OX1JBTkdFX09GRlNF VChyZWcpKSB7IFwKLQkJCWlmIChkZXZfcHJpdi0+dW5jb3JlLmZ3X3JlbmRlcmNvdW50ID09IDAp IFwKLQkJCQlmd2VuZ2luZSB8PSBGT1JDRVdBS0VfUkVOREVSOyBcCi0JCQlpZiAoZGV2X3ByaXYt PnVuY29yZS5md19tZWRpYWNvdW50ID09IDApIFwKLQkJCQlmd2VuZ2luZSB8PSBGT1JDRVdBS0Vf TUVESUE7IFwKLQkJfSBlbHNlIHsgXAotCQkJaWYgKGRldl9wcml2LT51bmNvcmUuZndfYmxpdHRl cmNvdW50ID09IDApIFwKLQkJCQlmd2VuZ2luZSA9IEZPUkNFV0FLRV9CTElUVEVSOyBcCi0JCX0g XAotCQlpZiAoZndlbmdpbmUpIFwKLQkJCWRldl9wcml2LT51bmNvcmUuZnVuY3MuZm9yY2Vfd2Fr ZV9nZXQoZGV2X3ByaXYsIGZ3ZW5naW5lKTsgXAotCQl2YWwgPSBfX3Jhd19pOTE1X3JlYWQjI3go ZGV2X3ByaXYsIHJlZyk7IFwKLQkJaWYgKGZ3ZW5naW5lKSBcCi0JCQlkZXZfcHJpdi0+dW5jb3Jl LmZ1bmNzLmZvcmNlX3dha2VfcHV0KGRldl9wcml2LCBmd2VuZ2luZSk7IFwKLQl9IFwKKwlpZiAo IVNLTF9ORUVEU19GT1JDRV9XQUtFKChkZXZfcHJpdiksIChyZWcpKSkJXAorCQlmd19lbmdpbmUg PSAwOyBcCisJZWxzZSBpZiAoRk9SQ0VXQUtFX0dFTjlfUkVOREVSX1JBTkdFX09GRlNFVChyZWcp KQlcCisJCWZ3X2VuZ2luZSA9IEZPUkNFV0FLRV9SRU5ERVI7IFwKKwllbHNlIGlmIChGT1JDRVdB S0VfR0VOOV9NRURJQV9SQU5HRV9PRkZTRVQocmVnKSkgXAorCQlmd19lbmdpbmUgPSBGT1JDRVdB S0VfTUVESUE7IFwKKwllbHNlIGlmIChGT1JDRVdBS0VfR0VOOV9DT01NT05fUkFOR0VfT0ZGU0VU KHJlZykpIFwKKwkJZndfZW5naW5lID0gRk9SQ0VXQUtFX1JFTkRFUiB8IEZPUkNFV0FLRV9NRURJ QTsgXAorCWVsc2UgXAorCQlmd19lbmdpbmUgPSBGT1JDRVdBS0VfQkxJVFRFUjsgXAorCWlmIChm d19lbmdpbmUpIFwKKwkJX19mb3JjZV93YWtlX2dldChkZXZfcHJpdiwgZndfZW5naW5lKTsgXAor CXZhbCA9IF9fcmF3X2k5MTVfcmVhZCMjeChkZXZfcHJpdiwgcmVnKTsgXAogCUdFTjZfUkVBRF9G T09URVI7IFwKIH0KIApAQCAtOTgxLDE3ICs5MjEsOSBAQCBzdGF0aWMgdm9pZCBcCiBnZW44X3dy aXRlIyN4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgb2ZmX3QgcmVnLCB1IyN4 IHZhbCwgYm9vbCB0cmFjZSkgeyBcCiAJR0VONl9XUklURV9IRUFERVI7IFwKIAloc3dfdW5jbGFp bWVkX3JlZ19kZWJ1ZyhkZXZfcHJpdiwgcmVnLCBmYWxzZSwgdHJ1ZSk7IFwKLQlpZiAocmVnIDwg MHg0MDAwMCAmJiAhaXNfZ2VuOF9zaGFkb3dlZChkZXZfcHJpdiwgcmVnKSkgeyBcCi0JCWlmIChk ZXZfcHJpdi0+dW5jb3JlLmZvcmNld2FrZV9jb3VudCA9PSAwKSBcCi0JCQlkZXZfcHJpdi0+dW5j b3JlLmZ1bmNzLmZvcmNlX3dha2VfZ2V0KGRldl9wcml2LAlcCi0JCQkJCQkJICAgICAgRk9SQ0VX QUtFX0FMTCk7IFwKLQkJX19yYXdfaTkxNV93cml0ZSMjeChkZXZfcHJpdiwgcmVnLCB2YWwpOyBc Ci0JCWlmIChkZXZfcHJpdi0+dW5jb3JlLmZvcmNld2FrZV9jb3VudCA9PSAwKSBcCi0JCQlkZXZf cHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfcHV0KGRldl9wcml2LCBcCi0JCQkJCQkJICAg ICAgRk9SQ0VXQUtFX0FMTCk7IFwKLQl9IGVsc2UgeyBcCi0JCV9fcmF3X2k5MTVfd3JpdGUjI3go ZGV2X3ByaXYsIHJlZywgdmFsKTsgXAotCX0gXAorCWlmIChyZWcgPCAweDQwMDAwICYmICFpc19n ZW44X3NoYWRvd2VkKGRldl9wcml2LCByZWcpKSBcCisJCV9fZm9yY2Vfd2FrZV9nZXQoZGV2X3By aXYsIEZPUkNFV0FLRV9SRU5ERVIpOyBcCisJX19yYXdfaTkxNV93cml0ZSMjeChkZXZfcHJpdiwg cmVnLCB2YWwpOyBcCiAJaHN3X3VuY2xhaW1lZF9yZWdfZGVidWcoZGV2X3ByaXYsIHJlZywgZmFs c2UsIGZhbHNlKTsgXAogCWhzd191bmNsYWltZWRfcmVnX2RldGVjdChkZXZfcHJpdik7IFwKIAlH RU42X1dSSVRFX0ZPT1RFUjsgXApAQCAtMTAwMCwyOCArOTMyLDE3IEBAIGdlbjhfd3JpdGUjI3go c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBvZmZfdCByZWcsIHUjI3ggdmFsLCBi b29sIHRyYWNlCiAjZGVmaW5lIF9fY2h2X3dyaXRlKHgpIFwKIHN0YXRpYyB2b2lkIFwKIGNodl93 cml0ZSMjeChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIG9mZl90IHJlZywgdSMj eCB2YWwsIGJvb2wgdHJhY2UpIHsgXAotCXVuc2lnbmVkIGZ3ZW5naW5lID0gMDsgXAogCWJvb2wg c2hhZG93ZWQgPSBpc19nZW44X3NoYWRvd2VkKGRldl9wcml2LCByZWcpOyBcCiAJR0VONl9XUklU RV9IRUFERVI7IFwKIAlpZiAoIXNoYWRvd2VkKSB7IFwKLQkJaWYgKEZPUkNFV0FLRV9DSFZfUkVO REVSX1JBTkdFX09GRlNFVChyZWcpKSB7IFwKLQkJCWlmIChkZXZfcHJpdi0+dW5jb3JlLmZ3X3Jl bmRlcmNvdW50ID09IDApIFwKLQkJCQlmd2VuZ2luZSA9IEZPUkNFV0FLRV9SRU5ERVI7IFwKLQkJ fSBlbHNlIGlmIChGT1JDRVdBS0VfQ0hWX01FRElBX1JBTkdFX09GRlNFVChyZWcpKSB7IFwKLQkJ CWlmIChkZXZfcHJpdi0+dW5jb3JlLmZ3X21lZGlhY291bnQgPT0gMCkgXAotCQkJCWZ3ZW5naW5l ID0gRk9SQ0VXQUtFX01FRElBOyBcCi0JCX0gZWxzZSBpZiAoRk9SQ0VXQUtFX0NIVl9DT01NT05f UkFOR0VfT0ZGU0VUKHJlZykpIHsgXAotCQkJaWYgKGRldl9wcml2LT51bmNvcmUuZndfcmVuZGVy Y291bnQgPT0gMCkgXAotCQkJCWZ3ZW5naW5lIHw9IEZPUkNFV0FLRV9SRU5ERVI7IFwKLQkJCWlm IChkZXZfcHJpdi0+dW5jb3JlLmZ3X21lZGlhY291bnQgPT0gMCkgXAotCQkJCWZ3ZW5naW5lIHw9 IEZPUkNFV0FLRV9NRURJQTsgXAotCQl9IFwKKwkJaWYgKEZPUkNFV0FLRV9DSFZfUkVOREVSX1JB TkdFX09GRlNFVChyZWcpKSBcCisJCQlfX2ZvcmNlX3dha2VfZ2V0KGRldl9wcml2LCBGT1JDRVdB S0VfUkVOREVSKTsgXAorCQllbHNlIGlmIChGT1JDRVdBS0VfQ0hWX01FRElBX1JBTkdFX09GRlNF VChyZWcpKSBcCisJCQlfX2ZvcmNlX3dha2VfZ2V0KGRldl9wcml2LCBGT1JDRVdBS0VfTUVESUEp OyBcCisJCWVsc2UgaWYgKEZPUkNFV0FLRV9DSFZfQ09NTU9OX1JBTkdFX09GRlNFVChyZWcpKSBc CisJCQlfX2ZvcmNlX3dha2VfZ2V0KGRldl9wcml2LCBGT1JDRVdBS0VfUkVOREVSIHwgRk9SQ0VX QUtFX01FRElBKTsgXAogCX0gXAotCWlmIChmd2VuZ2luZSkgXAotCQlkZXZfcHJpdi0+dW5jb3Jl LmZ1bmNzLmZvcmNlX3dha2VfZ2V0KGRldl9wcml2LCBmd2VuZ2luZSk7IFwKIAlfX3Jhd19pOTE1 X3dyaXRlIyN4KGRldl9wcml2LCByZWcsIHZhbCk7IFwKLQlpZiAoZndlbmdpbmUpIFwKLQkJZGV2 X3ByaXYtPnVuY29yZS5mdW5jcy5mb3JjZV93YWtlX3B1dChkZXZfcHJpdiwgZndlbmdpbmUpOyBc CiAJR0VONl9XUklURV9GT09URVI7IFwKIH0KIApAQCAtMTA1MiwzNSArOTczLDIyIEBAIHN0YXRp YyBib29sIGlzX2dlbjlfc2hhZG93ZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LCB1MzIgcmVnKQogc3RhdGljIHZvaWQgXAogZ2VuOV93cml0ZSMjeChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsIG9mZl90IHJlZywgdSMjeCB2YWwsIFwKIAkJYm9vbCB0cmFjZSkg eyBcCisJdW5zaWduZWQgZndfZW5naW5lOyBcCiAJR0VONl9XUklURV9IRUFERVI7IFwKLQlpZiAo IVNLTF9ORUVEU19GT1JDRV9XQUtFKChkZXZfcHJpdiksIChyZWcpKSB8fCBcCi0JCQlpc19nZW45 X3NoYWRvd2VkKGRldl9wcml2LCByZWcpKSB7IFwKLQkJX19yYXdfaTkxNV93cml0ZSMjeChkZXZf cHJpdiwgcmVnLCB2YWwpOyBcCi0JfSBlbHNlIHsgXAotCQl1bnNpZ25lZCBmd2VuZ2luZSA9IDA7 IFwKLQkJaWYgKEZPUkNFV0FLRV9HRU45X1JFTkRFUl9SQU5HRV9PRkZTRVQocmVnKSkgeyBcCi0J CQlpZiAoZGV2X3ByaXYtPnVuY29yZS5md19yZW5kZXJjb3VudCA9PSAwKSBcCi0JCQkJZndlbmdp bmUgPSBGT1JDRVdBS0VfUkVOREVSOyBcCi0JCX0gZWxzZSBpZiAoRk9SQ0VXQUtFX0dFTjlfTUVE SUFfUkFOR0VfT0ZGU0VUKHJlZykpIHsgXAotCQkJaWYgKGRldl9wcml2LT51bmNvcmUuZndfbWVk aWFjb3VudCA9PSAwKSBcCi0JCQkJZndlbmdpbmUgPSBGT1JDRVdBS0VfTUVESUE7IFwKLQkJfSBl bHNlIGlmIChGT1JDRVdBS0VfR0VOOV9DT01NT05fUkFOR0VfT0ZGU0VUKHJlZykpIHsgXAotCQkJ aWYgKGRldl9wcml2LT51bmNvcmUuZndfcmVuZGVyY291bnQgPT0gMCkgXAotCQkJCWZ3ZW5naW5l IHw9IEZPUkNFV0FLRV9SRU5ERVI7IFwKLQkJCWlmIChkZXZfcHJpdi0+dW5jb3JlLmZ3X21lZGlh Y291bnQgPT0gMCkgXAotCQkJCWZ3ZW5naW5lIHw9IEZPUkNFV0FLRV9NRURJQTsgXAotCQl9IGVs c2UgeyBcCi0JCQlpZiAoZGV2X3ByaXYtPnVuY29yZS5md19ibGl0dGVyY291bnQgPT0gMCkgXAot CQkJCWZ3ZW5naW5lID0gRk9SQ0VXQUtFX0JMSVRURVI7IFwKLQkJfSBcCi0JCWlmIChmd2VuZ2lu ZSkgXAotCQkJZGV2X3ByaXYtPnVuY29yZS5mdW5jcy5mb3JjZV93YWtlX2dldChkZXZfcHJpdiwg XAotCQkJCQlmd2VuZ2luZSk7IFwKLQkJX19yYXdfaTkxNV93cml0ZSMjeChkZXZfcHJpdiwgcmVn LCB2YWwpOyBcCi0JCWlmIChmd2VuZ2luZSkgXAotCQkJZGV2X3ByaXYtPnVuY29yZS5mdW5jcy5m b3JjZV93YWtlX3B1dChkZXZfcHJpdiwgXAotCQkJCQlmd2VuZ2luZSk7IFwKLQl9IFwKKwlpZiAo IVNLTF9ORUVEU19GT1JDRV9XQUtFKChkZXZfcHJpdiksIChyZWcpKSB8fAlcCisJICAgIGlzX2dl bjlfc2hhZG93ZWQoZGV2X3ByaXYsIHJlZykpIFwKKwkJZndfZW5naW5lID0gMDsgXAorCWVsc2Ug aWYgKEZPUkNFV0FLRV9HRU45X1JFTkRFUl9SQU5HRV9PRkZTRVQocmVnKSkgXAorCQlmd19lbmdp bmUgPSBGT1JDRVdBS0VfUkVOREVSOyBcCisJZWxzZSBpZiAoRk9SQ0VXQUtFX0dFTjlfTUVESUFf UkFOR0VfT0ZGU0VUKHJlZykpIFwKKwkJZndfZW5naW5lID0gRk9SQ0VXQUtFX01FRElBOyBcCisJ ZWxzZSBpZiAoRk9SQ0VXQUtFX0dFTjlfQ09NTU9OX1JBTkdFX09GRlNFVChyZWcpKSBcCisJCWZ3 X2VuZ2luZSA9IEZPUkNFV0FLRV9SRU5ERVIgfCBGT1JDRVdBS0VfTUVESUE7IFwKKwllbHNlIFwK KwkJZndfZW5naW5lID0gRk9SQ0VXQUtFX0JMSVRURVI7IFwKKwlpZiAoZndfZW5naW5lKSBcCisJ CV9fZm9yY2Vfd2FrZV9nZXQoZGV2X3ByaXYsIGZ3X2VuZ2luZSk7IFwKKwlfX3Jhd19pOTE1X3dy aXRlIyN4KGRldl9wcml2LCByZWcsIHZhbCk7IFwKIAlHRU42X1dSSVRFX0ZPT1RFUjsgXAogfQog CkBAIC0xMTMyLDIxICsxMDQwLDI0IEBAIGRvIHsgXAogdm9pZCBpbnRlbF91bmNvcmVfaW5pdChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0KLQlzZXR1cF90aW1lcigmZGV2X3ByaXYtPnVuY29y ZS5mb3JjZV93YWtlX3RpbWVyLAotCQkgICAgZ2VuNl9mb3JjZV93YWtlX3RpbWVyLCAodW5zaWdu ZWQgbG9uZylkZXZfcHJpdik7CisJc3RydWN0IGludGVsX3VuY29yZV9mb3JjZXdha2VfZG9tYWlu ICpkb21haW47CisJaW50IGk7CiAKIAlfX2ludGVsX3VuY29yZV9lYXJseV9zYW5pdGl6ZShkZXYs IGZhbHNlKTsKIAogCWlmIChJU19HRU45KGRldikpIHsKIAkJZGV2X3ByaXYtPnVuY29yZS5mdW5j cy5mb3JjZV93YWtlX2dldCA9IF9fZ2VuOV9mb3JjZV93YWtlX2dldDsKIAkJZGV2X3ByaXYtPnVu Y29yZS5mdW5jcy5mb3JjZV93YWtlX3B1dCA9IF9fZ2VuOV9mb3JjZV93YWtlX3B1dDsKKwkJZGV2 X3ByaXYtPnVuY29yZS5md19kb21haW5zID0gRk9SQ0VXQUtFX1JFTkRFUiB8CisJCQlGT1JDRVdB S0VfQkxJVFRFUiB8IEZPUkNFV0FLRV9NRURJQTsKIAl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVco ZGV2KSkgewogCQlkZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfZ2V0ID0gX192bHZf Zm9yY2Vfd2FrZV9nZXQ7CiAJCWRldl9wcml2LT51bmNvcmUuZnVuY3MuZm9yY2Vfd2FrZV9wdXQg PSBfX3Zsdl9mb3JjZV93YWtlX3B1dDsKKwkJZGV2X3ByaXYtPnVuY29yZS5md19kb21haW5zID0g Rk9SQ0VXQUtFX1JFTkRFUiB8IEZPUkNFV0FLRV9NRURJQTsKIAl9IGVsc2UgaWYgKElTX0hBU1dF TEwoZGV2KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkgewogCQlkZXZfcHJpdi0+dW5jb3JlLmZ1bmNz LmZvcmNlX3dha2VfZ2V0ID0gX19nZW43X2d0X2ZvcmNlX3dha2VfbXRfZ2V0OwogCQlkZXZfcHJp di0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfcHV0ID0gX19nZW43X2d0X2ZvcmNlX3dha2VfbXRf cHV0OworCQlkZXZfcHJpdi0+dW5jb3JlLmZ3X2RvbWFpbnMgPSBGT1JDRVdBS0VfUkVOREVSOwog CX0gZWxzZSBpZiAoSVNfSVZZQlJJREdFKGRldikpIHsKIAkJdTMyIGVjb2J1czsKIApAQCAtMTE3 OCwxMSArMTA4OSwyMSBAQCB2b2lkIGludGVsX3VuY29yZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJCQlkZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfcHV0ID0KIAkJCQlf X2dlbjZfZ3RfZm9yY2Vfd2FrZV9wdXQ7CiAJCX0KKwkJZGV2X3ByaXYtPnVuY29yZS5md19kb21h aW5zID0gRk9SQ0VXQUtFX1JFTkRFUjsKIAl9IGVsc2UgaWYgKElTX0dFTjYoZGV2KSkgewogCQlk ZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfZ2V0ID0KIAkJCV9fZ2VuNl9ndF9mb3Jj ZV93YWtlX2dldDsKIAkJZGV2X3ByaXYtPnVuY29yZS5mdW5jcy5mb3JjZV93YWtlX3B1dCA9CiAJ CQlfX2dlbjZfZ3RfZm9yY2Vfd2FrZV9wdXQ7CisJCWRldl9wcml2LT51bmNvcmUuZndfZG9tYWlu cyA9IEZPUkNFV0FLRV9SRU5ERVI7CisJfQorCisJZm9yX2VhY2hfZndfZG9tYWluKGRvbWFpbiwg ZGV2X3ByaXYsIGkpIHsKKwkJZG9tYWluLT5pOTE1ID0gZGV2X3ByaXY7CisJCWRvbWFpbi0+aWQg PSBpOworCisJCXNldHVwX3RpbWVyKCZkb21haW4tPnRpbWVyLCBnZW42X2ZvcmNlX3dha2VfdGlt ZXIsCisJCQkgICAgKHVuc2lnbmVkIGxvbmcpZG9tYWluKTsKIAl9CiAKIAlzd2l0Y2ggKElOVEVM X0lORk8oZGV2KS0+Z2VuKSB7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK