From: Imre Deak Subject: [PATCH v2 RESEND 1/2] drm/i915: Cleanup instdone collection Date: Tue, 20 Sep 2016 16:54:32 +0300 Message-ID: <1474379673-28326-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id F35836E6E1 for ; Tue, 20 Sep 2016 13:54:43 +0000 (UTC) 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 Cc: Jani Nikula , Ben Widawsky , Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQmVuIFdpZGF3c2t5IDxiZW5qYW1pbi53aWRhd3NreUBpbnRlbC5jb20+CgpDb25zb2xp ZGF0ZSB0aGUgaW5zdGRvbmUgbG9naWMgc28gd2UgY2FuIGdldCBhIGJpdCBmYW5jaWVyLiBUaGlz IHBhdGNoIGFsc28KcmVtb3ZlcyB0aGUgZHVwbGljYXRlZCBwcmludCBvZiBJTlNURE9ORVswXS4K CnYyOiAoSW1yZSkKLSBSZWJhc2VkIG9uIHRvcCBvZiBoYW5nY2hlY2sgSU5TVERPTkUgY2hhbmdl cy4KLSBNb3ZlIGFsbCBJTlNURE9ORSByZWdpc3RlcnMgaW50byBhIHNpbmdsZSBzdHJ1Y3QsIHN0 b3JlIGl0IHdpdGhpbiB0aGUKICBlbmdpbmUgZXJyb3Igc3RydWN0IGR1cmluZyBlcnJvciBjYXB0 dXJpbmcuCgpTaWduZWQtb2ZmLWJ5OiBCZW4gV2lkYXdza3kgPGJlbkBid2lkYXdzay5uZXQ+ClNp Z25lZC1vZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6 IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICAgICB8IDQxICsrKysrKysrKysrLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICB8ICA4ICsrLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgICB8IDg0ICsrKysrKysrKysrKysrKysrKysrKysr LS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyAgICAgICAgIHwgNjkg KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Jl Zy5oICAgICAgICAgfCAgMSAtCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmggfCAxMCArKystCiA2IGZpbGVzIGNoYW5nZWQsIDE1MSBpbnNlcnRpb25zKCspLCA2MiBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IGE2ZDE3NGEuLmJh MTU1YzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC0xMjc3LDE1ICsxMjc3 LDM2IEBAIG91dDoKIAlyZXR1cm4gcmV0OwogfQogCitzdGF0aWMgdm9pZCBpOTE1X2luc3Rkb25l X2luZm8oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJICAgICAgIHN0cnVj dCBzZXFfZmlsZSAqbSwKKwkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfaW5zdGRvbmUgKmluc3Rkb25l KQoreworCXNlcV9wcmludGYobSwgIlx0XHRJTlNURE9ORTogMHglMDh4XG4iLAorCQkgICBpbnN0 ZG9uZS0+aW5zdGRvbmUpOworCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPD0gMykKKwkJcmV0 dXJuOworCisJc2VxX3ByaW50ZihtLCAiXHRcdFNDX0lOU1RET05FOiAweCUwOHhcbiIsCisJCSAg IGluc3Rkb25lLT5zbGljZV9jb21tb24pOworCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPD0g NikKKwkJcmV0dXJuOworCisJc2VxX3ByaW50ZihtLCAiXHRcdFNBTVBMRVJfSU5TVERPTkU6IDB4 JTA4eFxuIiwKKwkJICAgaW5zdGRvbmUtPnNhbXBsZXIpOworCXNlcV9wcmludGYobSwgIlx0XHRS T1dfSU5TVERPTkU6IDB4JTA4eFxuIiwKKwkJICAgaW5zdGRvbmUtPnJvdyk7Cit9CisKIHN0YXRp YyBpbnQgaTkxNV9oYW5nY2hlY2tfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNl ZCkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBub2RlX3RvX2k5MTUo bS0+cHJpdmF0ZSk7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCXU2NCBhY3Ro ZFtJOTE1X05VTV9FTkdJTkVTXTsKIAl1MzIgc2Vxbm9bSTkxNV9OVU1fRU5HSU5FU107Ci0JdTMy IGluc3Rkb25lW0k5MTVfTlVNX0lOU1RET05FX1JFR107CisJc3RydWN0IGludGVsX2luc3Rkb25l IGluc3Rkb25lOwogCWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOwotCWludCBqOwogCiAJaWYgKHRl c3RfYml0KEk5MTVfV0VER0VELCAmZGV2X3ByaXYtPmdwdV9lcnJvci5mbGFncykpCiAJCXNlcV9w cmludGYobSwgIldlZGdlZFxuIik7CkBAIC0xMzA4LDcgKzEzMjksNyBAQCBzdGF0aWMgaW50IGk5 MTVfaGFuZ2NoZWNrX2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQpCiAJCXNl cW5vW2lkXSA9IGludGVsX2VuZ2luZV9nZXRfc2Vxbm8oZW5naW5lKTsKIAl9CiAKLQlpOTE1X2dl dF9leHRyYV9pbnN0ZG9uZShkZXZfcHJpdiwgaW5zdGRvbmUpOworCWk5MTVfZ2V0X2VuZ2luZV9p bnN0ZG9uZShkZXZfcHJpdiwgUkNTLCAmaW5zdGRvbmUpOwogCiAJaW50ZWxfcnVudGltZV9wbV9w dXQoZGV2X3ByaXYpOwogCkBAIC0xMzM2LDE4ICsxMzU3LDE0IEBAIHN0YXRpYyBpbnQgaTkxNV9o YW5nY2hlY2tfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNlZCkKIAkJc2VxX3By aW50ZihtLCAiXHRhY3Rpb24gPSAlZFxuIiwgZW5naW5lLT5oYW5nY2hlY2suYWN0aW9uKTsKIAog CQlpZiAoZW5naW5lLT5pZCA9PSBSQ1MpIHsKLQkJCXNlcV9wdXRzKG0sICJcdGluc3Rkb25lIHJl YWQgPSIpOworCQkJc2VxX3B1dHMobSwgIlx0aW5zdGRvbmUgcmVhZCA9XG4iKTsKIAotCQkJZm9y IChqID0gMDsgaiA8IEk5MTVfTlVNX0lOU1RET05FX1JFRzsgaisrKQotCQkJCXNlcV9wcmludGYo bSwgIiAweCUwOHgiLCBpbnN0ZG9uZVtqXSk7CisJCQlpOTE1X2luc3Rkb25lX2luZm8oZGV2X3By aXYsIG0sICZpbnN0ZG9uZSk7CiAKLQkJCXNlcV9wdXRzKG0sICJcblx0aW5zdGRvbmUgYWNjdSA9 Iik7CisJCQlzZXFfcHV0cyhtLCAiXHRpbnN0ZG9uZSBhY2N1ID1cbiIpOwogCi0JCQlmb3IgKGog PSAwOyBqIDwgSTkxNV9OVU1fSU5TVERPTkVfUkVHOyBqKyspCi0JCQkJc2VxX3ByaW50ZihtLCAi IDB4JTA4eCIsCi0JCQkJCSAgIGVuZ2luZS0+aGFuZ2NoZWNrLmluc3Rkb25lW2pdKTsKLQotCQkJ c2VxX3B1dHMobSwgIlxuIik7CisJCQlpOTE1X2luc3Rkb25lX2luZm8oZGV2X3ByaXYsIG0sCisJ CQkJCSAgICZlbmdpbmUtPmhhbmdjaGVjay5pbnN0ZG9uZSk7CiAJCX0KIAl9CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCmluZGV4IDRkZDMwN2UuLjM1Njg5OTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaApAQCAtNzU5LDcgKzc1OSw3IEBAIHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZSB7CiAJ dTMyIGdhbV9lY29jaGs7CiAJdTMyIGdhYl9jdGw7CiAJdTMyIGdmeF9tb2RlOwotCXUzMiBleHRy YV9pbnN0ZG9uZVtJOTE1X05VTV9JTlNURE9ORV9SRUddOworCiAJdTY0IGZlbmNlW0k5MTVfTUFY X05VTV9GRU5DRVNdOwogCXN0cnVjdCBpbnRlbF9vdmVybGF5X2Vycm9yX3N0YXRlICpvdmVybGF5 OwogCXN0cnVjdCBpbnRlbF9kaXNwbGF5X2Vycm9yX3N0YXRlICpkaXNwbGF5OwpAQCAtNzkxLDcg Kzc5MSw2IEBAIHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZSB7CiAJCXUzMiBod3M7CiAJCXUz MiBpcGVpcjsKIAkJdTMyIGlwZWhyOwotCQl1MzIgaW5zdGRvbmU7CiAJCXUzMiBiYnN0YXRlOwog CQl1MzIgaW5zdHBtOwogCQl1MzIgaW5zdHBzOwpAQCAtODAyLDYgKzgwMSw3IEBAIHN0cnVjdCBk cm1faTkxNV9lcnJvcl9zdGF0ZSB7CiAJCXU2NCBmYWRkcjsKIAkJdTMyIHJjX3BzbWk7IC8qIHNs ZWVwIHN0YXRlICovCiAJCXUzMiBzZW1hcGhvcmVfbWJveGVzW0k5MTVfTlVNX0VOR0lORVMgLSAx XTsKKwkJc3RydWN0IGludGVsX2luc3Rkb25lIGluc3Rkb25lOwogCiAJCXN0cnVjdCBkcm1faTkx NV9lcnJvcl9vYmplY3QgewogCQkJaW50IHBhZ2VfY291bnQ7CkBAIC0zNTQyLDcgKzM1NDIsOSBA QCB2b2lkIGk5MTVfZXJyb3Jfc3RhdGVfZ2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiB2b2lk IGk5MTVfZXJyb3Jfc3RhdGVfcHV0KHN0cnVjdCBpOTE1X2Vycm9yX3N0YXRlX2ZpbGVfcHJpdiAq ZXJyb3JfcHJpdik7CiB2b2lkIGk5MTVfZGVzdHJveV9lcnJvcl9zdGF0ZShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KTsKIAotdm9pZCBpOTE1X2dldF9leHRyYV9pbnN0ZG9uZShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHVpbnQzMl90ICppbnN0ZG9uZSk7Cit2b2lkIGk5MTVfZ2V0 X2VuZ2luZV9pbnN0ZG9uZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkg ICAgICBlbnVtIGludGVsX2VuZ2luZV9pZCBlbmdpbmVfaWQsCisJCQkgICAgICBzdHJ1Y3QgaW50 ZWxfaW5zdGRvbmUgKmluc3Rkb25lKTsKIGNvbnN0IGNoYXIgKmk5MTVfY2FjaGVfbGV2ZWxfc3Ry KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LCBpbnQgdHlwZSk7CiAKIC8qIGk5MTVfY21k X3BhcnNlci5jICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9l cnJvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwppbmRleCAzMzRm MTVkLi42YTI3NzVhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9l cnJvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKQEAgLTIy OCw2ICsyMjgsMjcgQEAgc3RhdGljIGNvbnN0IGNoYXIgKmhhbmdjaGVja19hY3Rpb25fdG9fc3Ry KGVudW0gaW50ZWxfZW5naW5lX2hhbmdjaGVja19hY3Rpb24gYSkKIAlyZXR1cm4gInVua25vd24i OwogfQogCitzdGF0aWMgdm9pZCBlcnJvcl9wcmludF9pbnN0ZG9uZShzdHJ1Y3QgZHJtX2k5MTVf ZXJyb3Jfc3RhdGVfYnVmICptLAorCQkJCSBzdHJ1Y3QgZHJtX2k5MTVfZXJyb3JfZW5naW5lICpl ZSkKK3sKKwllcnJfcHJpbnRmKG0sICIgIElOU1RET05FOiAweCUwOHhcbiIsCisJCSAgIGVlLT5p bnN0ZG9uZS5pbnN0ZG9uZSk7CisKKwlpZiAoZWUtPmVuZ2luZV9pZCAhPSBSQ1MgfHwgSU5URUxf R0VOKG0tPmk5MTUpIDw9IDMpCisJCXJldHVybjsKKworCWVycl9wcmludGYobSwgIiAgU0NfSU5T VERPTkU6IDB4JTA4eFxuIiwKKwkJICAgZWUtPmluc3Rkb25lLnNsaWNlX2NvbW1vbik7CisKKwlp ZiAoSU5URUxfR0VOKG0tPmk5MTUpIDw9IDYpCisJCXJldHVybjsKKworCWVycl9wcmludGYobSwg IiAgU0FNUExFUl9JTlNURE9ORTogMHglMDh4XG4iLAorCQkgICBlZS0+aW5zdGRvbmUuc2FtcGxl cik7CisJZXJyX3ByaW50ZihtLCAiICBST1dfSU5TVERPTkU6IDB4JTA4eFxuIiwKKwkJICAgZWUt Pmluc3Rkb25lLnJvdyk7Cit9CisKIHN0YXRpYyB2b2lkIGVycm9yX3ByaW50X2VuZ2luZShzdHJ1 Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptLAogCQkJICAgICAgIHN0cnVjdCBkcm1faTkx NV9lcnJvcl9lbmdpbmUgKmVlKQogewpAQCAtMjQyLDcgKzI2Myw5IEBAIHN0YXRpYyB2b2lkIGVy cm9yX3ByaW50X2VuZ2luZShzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptLAogCQkg ICAodTMyKShlZS0+YWN0aGQ+PjMyKSwgKHUzMillZS0+YWN0aGQpOwogCWVycl9wcmludGYobSwg IiAgSVBFSVI6IDB4JTA4eFxuIiwgZWUtPmlwZWlyKTsKIAllcnJfcHJpbnRmKG0sICIgIElQRUhS OiAweCUwOHhcbiIsIGVlLT5pcGVocik7Ci0JZXJyX3ByaW50ZihtLCAiICBJTlNURE9ORTogMHgl MDh4XG4iLCBlZS0+aW5zdGRvbmUpOworCisJZXJyb3JfcHJpbnRfaW5zdGRvbmUobSwgZWUpOwor CiAJaWYgKGVlLT5iYXRjaGJ1ZmZlcikgewogCQl1NjQgc3RhcnQgPSBlZS0+YmF0Y2hidWZmZXIt Pmd0dF9vZmZzZXQ7CiAJCXU2NCBlbmQgPSBzdGFydCArIGVlLT5iYXRjaGJ1ZmZlci0+Z3R0X3Np emU7CkBAIC00MDIsMTAgKzQyNSw2IEBAIGludCBpOTE1X2Vycm9yX3N0YXRlX3RvX3N0cihzdHJ1 Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptLAogCWZvciAoaSA9IDA7IGkgPCBkZXZfcHJp di0+bnVtX2ZlbmNlX3JlZ3M7IGkrKykKIAkJZXJyX3ByaW50ZihtLCAiICBmZW5jZVslZF0gPSAl MDhsbHhcbiIsIGksIGVycm9yLT5mZW5jZVtpXSk7CiAKLQlmb3IgKGkgPSAwOyBpIDwgQVJSQVlf U0laRShlcnJvci0+ZXh0cmFfaW5zdGRvbmUpOyBpKyspCi0JCWVycl9wcmludGYobSwgIiAgSU5T VERPTkVfJWQ6IDB4JTA4eFxuIiwgaSwKLQkJCSAgIGVycm9yLT5leHRyYV9pbnN0ZG9uZVtpXSk7 Ci0KIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNikgewogCQllcnJfcHJpbnRmKG0sICJF UlJPUjogMHglMDh4XG4iLCBlcnJvci0+ZXJyb3IpOwogCkBAIC04NTUsNyArODc0LDggQEAgc3Rh dGljIHVpbnQzMl90IGk5MTVfZXJyb3JfZ2VuZXJhdGVfY29kZShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCiAJCQlpZiAoZW5naW5lX2lkKQogCQkJCSplbmdpbmVfaWQgPSBpOwog Ci0JCQlyZXR1cm4gZXJyb3ItPmVuZ2luZVtpXS5pcGVociBeIGVycm9yLT5lbmdpbmVbaV0uaW5z dGRvbmU7CisJCQlyZXR1cm4gZXJyb3ItPmVuZ2luZVtpXS5pcGVociBeCisJCQkgICAgICAgZXJy b3ItPmVuZ2luZVtpXS5pbnN0ZG9uZS5pbnN0ZG9uZTsKIAkJfQogCX0KIApAQCAtOTk4LDcgKzEw MTgsNiBAQCBzdGF0aWMgdm9pZCBlcnJvcl9yZWNvcmRfZW5naW5lX3JlZ2lzdGVycyhzdHJ1Y3Qg ZHJtX2k5MTVfZXJyb3Jfc3RhdGUgKmVycm9yLAogCQllZS0+ZmFkZHIgPSBJOTE1X1JFQUQoUklO R19ETUFfRkFERChlbmdpbmUtPm1taW9fYmFzZSkpOwogCQllZS0+aXBlaXIgPSBJOTE1X1JFQUQo UklOR19JUEVJUihlbmdpbmUtPm1taW9fYmFzZSkpOwogCQllZS0+aXBlaHIgPSBJOTE1X1JFQUQo UklOR19JUEVIUihlbmdpbmUtPm1taW9fYmFzZSkpOwotCQllZS0+aW5zdGRvbmUgPSBJOTE1X1JF QUQoUklOR19JTlNURE9ORShlbmdpbmUtPm1taW9fYmFzZSkpOwogCQllZS0+aW5zdHBzID0gSTkx NV9SRUFEKFJJTkdfSU5TVFBTKGVuZ2luZS0+bW1pb19iYXNlKSk7CiAJCWVlLT5iYmFkZHIgPSBJ OTE1X1JFQUQoUklOR19CQkFERFIoZW5naW5lLT5tbWlvX2Jhc2UpKTsKIAkJaWYgKElOVEVMX0dF TihkZXZfcHJpdikgPj0gOCkgewpAQCAtMTAxMCw5ICsxMDI5LDEwIEBAIHN0YXRpYyB2b2lkIGVy cm9yX3JlY29yZF9lbmdpbmVfcmVnaXN0ZXJzKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZSAq ZXJyb3IsCiAJCWVlLT5mYWRkciA9IEk5MTVfUkVBRChETUFfRkFERF9JOFhYKTsKIAkJZWUtPmlw ZWlyID0gSTkxNV9SRUFEKElQRUlSKTsKIAkJZWUtPmlwZWhyID0gSTkxNV9SRUFEKElQRUhSKTsK LQkJZWUtPmluc3Rkb25lID0gSTkxNV9SRUFEKEdFTjJfSU5TVERPTkUpOwogCX0KIAorCWk5MTVf Z2V0X2VuZ2luZV9pbnN0ZG9uZShkZXZfcHJpdiwgZW5naW5lLT5pZCwgJmVlLT5pbnN0ZG9uZSk7 CisKIAllZS0+d2FpdGluZyA9IGludGVsX2VuZ2luZV9oYXNfd2FpdGVyKGVuZ2luZSk7CiAJZWUt Pmluc3RwbSA9IEk5MTVfUkVBRChSSU5HX0lOU1RQTShlbmdpbmUtPm1taW9fYmFzZSkpOwogCWVl LT5hY3RoZCA9IGludGVsX2VuZ2luZV9nZXRfYWN0aXZlX2hlYWQoZW5naW5lKTsKQEAgLTEzNzIs OCArMTM5Miw2IEBAIHN0YXRpYyB2b2lkIGk5MTVfY2FwdHVyZV9yZWdfc3RhdGUoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCX0KIAllcnJvci0+ZWlyID0gSTkxNV9SRUFEKEVJ Uik7CiAJZXJyb3ItPnBndGJsX2VyID0gSTkxNV9SRUFEKFBHVEJMX0VSKTsKLQotCWk5MTVfZ2V0 X2V4dHJhX2luc3Rkb25lKGRldl9wcml2LCBlcnJvci0+ZXh0cmFfaW5zdGRvbmUpOwogfQogCiBz dGF0aWMgdm9pZCBpOTE1X2Vycm9yX2NhcHR1cmVfbXNnKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKQEAgLTE1MzIsMjAgKzE1NTAsMzggQEAgY29uc3QgY2hhciAqaTkxNV9jYWNo ZV9sZXZlbF9zdHIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIGludCB0eXBlKQogfQog CiAvKiBOQjogcGxlYXNlIG5vdGljZSB0aGUgbWVtc2V0ICovCi12b2lkIGk5MTVfZ2V0X2V4dHJh X2luc3Rkb25lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCSAgICAgdWlu dDMyX3QgKmluc3Rkb25lKQordm9pZCBpOTE1X2dldF9lbmdpbmVfaW5zdGRvbmUoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJICAgICAgZW51bSBpbnRlbF9lbmdpbmVfaWQg ZW5naW5lX2lkLAorCQkJICAgICAgc3RydWN0IGludGVsX2luc3Rkb25lICppbnN0ZG9uZSkKIHsK LQltZW1zZXQoaW5zdGRvbmUsIDAsIHNpemVvZigqaW5zdGRvbmUpICogSTkxNV9OVU1fSU5TVERP TkVfUkVHKTsKLQotCWlmIChJU19HRU4yKGRldl9wcml2KSB8fCBJU19HRU4zKGRldl9wcml2KSkK LQkJaW5zdGRvbmVbMF0gPSBJOTE1X1JFQUQoR0VOMl9JTlNURE9ORSk7Ci0JZWxzZSBpZiAoSVNf R0VONChkZXZfcHJpdikgfHwgSVNfR0VONShkZXZfcHJpdikgfHwgSVNfR0VONihkZXZfcHJpdikp IHsKLQkJaW5zdGRvbmVbMF0gPSBJOTE1X1JFQUQoUklOR19JTlNURE9ORShSRU5ERVJfUklOR19C QVNFKSk7Ci0JCWluc3Rkb25lWzFdID0gSTkxNV9SRUFEKEdFTjRfSU5TVERPTkUxKTsKLQl9IGVs c2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNykgewotCQlpbnN0ZG9uZVswXSA9IEk5MTVf UkVBRChSSU5HX0lOU1RET05FKFJFTkRFUl9SSU5HX0JBU0UpKTsKLQkJaW5zdGRvbmVbMV0gPSBJ OTE1X1JFQUQoR0VON19TQ19JTlNURE9ORSk7Ci0JCWluc3Rkb25lWzJdID0gSTkxNV9SRUFEKEdF TjdfU0FNUExFUl9JTlNURE9ORSk7Ci0JCWluc3Rkb25lWzNdID0gSTkxNV9SRUFEKEdFTjdfUk9X X0lOU1RET05FKTsKKwl1MzIgbW1pb19iYXNlID0gZGV2X3ByaXYtPmVuZ2luZVtlbmdpbmVfaWRd Lm1taW9fYmFzZTsKKworCW1lbXNldChpbnN0ZG9uZSwgMCwgc2l6ZW9mKCppbnN0ZG9uZSkpOwor CisJc3dpdGNoIChJTlRFTF9HRU4oZGV2X3ByaXYpKSB7CisJZGVmYXVsdDoKKwkJaW5zdGRvbmUt Pmluc3Rkb25lID0gSTkxNV9SRUFEKFJJTkdfSU5TVERPTkUobW1pb19iYXNlKSk7CisKKwkJaWYg KGVuZ2luZV9pZCAhPSBSQ1MpCisJCQlicmVhazsKKworCQlpbnN0ZG9uZS0+c2xpY2VfY29tbW9u ID0gSTkxNV9SRUFEKEdFTjdfU0NfSU5TVERPTkUpOworCQlpbnN0ZG9uZS0+c2FtcGxlciA9IEk5 MTVfUkVBRChHRU43X1NBTVBMRVJfSU5TVERPTkUpOworCQlpbnN0ZG9uZS0+cm93ID0gSTkxNV9S RUFEKEdFTjdfUk9XX0lOU1RET05FKTsKKworCQlicmVhazsKKwljYXNlIDY6CisJY2FzZSA1Ogor CWNhc2UgNDoKKwkJaW5zdGRvbmUtPmluc3Rkb25lID0gSTkxNV9SRUFEKFJJTkdfSU5TVERPTkUo bW1pb19iYXNlKSk7CisKKwkJaWYgKGVuZ2luZV9pZCA9PSBSQ1MpCisJCQkvKiBIQUNLOiBVc2lu ZyB0aGUgd3Jvbmcgc3RydWN0IG1lbWJlciAqLworCQkJaW5zdGRvbmUtPnNsaWNlX2NvbW1vbiA9 IEk5MTVfUkVBRChHRU40X0lOU1RET05FMSk7CisJCWJyZWFrOworCWNhc2UgMzoKKwljYXNlIDI6 CisJCWluc3Rkb25lLT5pbnN0ZG9uZSA9IEk5MTVfUkVBRChHRU4yX0lOU1RET05FKTsKKwkJYnJl YWs7CiAJfQogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKaW5kZXggYzEyOGZkYi4uMzcxNjQ3YyAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC0yNTQ1LDE4ICsyNTQ1LDM2IEBAIHN0YXRpYyB2 b2lkIGk5MTVfcmVzZXRfYW5kX3dha2V1cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpCiAJd2FrZV91cF9hbGwoJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRfcXVldWUpOwogfQog CitzdGF0aWMgaW5saW5lIHZvaWQKK2k5MTVfZXJyX3ByaW50X2luc3Rkb25lKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCXN0cnVjdCBpbnRlbF9pbnN0ZG9uZSAqaW5zdGRv bmUpCit7CisJcHJfZXJyKCIgIElOU1RET05FOiAweCUwOHhcbiIsIGluc3Rkb25lLT5pbnN0ZG9u ZSk7CisKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8PSAzKQorCQlyZXR1cm47CisKKwlwcl9l cnIoIiAgU0NfSU5TVERPTkU6IDB4JTA4eFxuIiwgaW5zdGRvbmUtPnNsaWNlX2NvbW1vbik7CisK KwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8PSA2KQorCQlyZXR1cm47CisKKwlwcl9lcnIoIiAg U0FNUExFUl9JTlNURE9ORTogMHglMDh4XG4iLCBpbnN0ZG9uZS0+c2FtcGxlcik7CisJcHJfZXJy KCIgIFJPV19JTlNURE9ORTogMHglMDh4XG4iLCBpbnN0ZG9uZS0+cm93KTsKK30KKwogc3RhdGlj IHZvaWQgaTkxNV9yZXBvcnRfYW5kX2NsZWFyX2VpcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiB7Ci0JdWludDMyX3QgaW5zdGRvbmVbSTkxNV9OVU1fSU5TVERPTkVfUkVHXTsK KwlzdHJ1Y3QgaW50ZWxfaW5zdGRvbmUgaW5zdGRvbmU7CiAJdTMyIGVpciA9IEk5MTVfUkVBRChF SVIpOwotCWludCBwaXBlLCBpOworCWludCBwaXBlOwogCiAJaWYgKCFlaXIpCiAJCXJldHVybjsK IAogCXByX2VycigicmVuZGVyIGVycm9yIGRldGVjdGVkLCBFSVI6IDB4JTA4eFxuIiwgZWlyKTsK IAotCWk5MTVfZ2V0X2V4dHJhX2luc3Rkb25lKGRldl9wcml2LCBpbnN0ZG9uZSk7CisJaTkxNV9n ZXRfZW5naW5lX2luc3Rkb25lKGRldl9wcml2LCBSQ1MsICZpbnN0ZG9uZSk7CiAKIAlpZiAoSVNf RzRYKGRldl9wcml2KSkgewogCQlpZiAoZWlyICYgKEdNNDVfRVJST1JfTUVNX1BSSVYgfCBHTTQ1 X0VSUk9SX0NQX1BSSVYpKSB7CkBAIC0yNTY0LDggKzI1ODIsNyBAQCBzdGF0aWMgdm9pZCBpOTE1 X3JlcG9ydF9hbmRfY2xlYXJfZWlyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IAogCQkJcHJfZXJyKCIgIElQRUlSOiAweCUwOHhcbiIsIEk5MTVfUkVBRChJUEVJUl9JOTY1KSk7 CiAJCQlwcl9lcnIoIiAgSVBFSFI6IDB4JTA4eFxuIiwgSTkxNV9SRUFEKElQRUhSX0k5NjUpKTsK LQkJCWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGluc3Rkb25lKTsgaSsrKQotCQkJCXByX2Vy cigiICBJTlNURE9ORV8lZDogMHglMDh4XG4iLCBpLCBpbnN0ZG9uZVtpXSk7CisJCQlpOTE1X2Vy cl9wcmludF9pbnN0ZG9uZShkZXZfcHJpdiwgJmluc3Rkb25lKTsKIAkJCXByX2VycigiICBJTlNU UFM6IDB4JTA4eFxuIiwgSTkxNV9SRUFEKElOU1RQUykpOwogCQkJcHJfZXJyKCIgIEFDVEhEOiAw eCUwOHhcbiIsIEk5MTVfUkVBRChBQ1RIRF9JOTY1KSk7CiAJCQlJOTE1X1dSSVRFKElQRUlSX0k5 NjUsIGlwZWlyKTsKQEAgLTI2MDAsOCArMjYxNyw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfcmVwb3J0 X2FuZF9jbGVhcl9laXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWlmIChl aXIgJiBJOTE1X0VSUk9SX0lOU1RSVUNUSU9OKSB7CiAJCXByX2VycigiaW5zdHJ1Y3Rpb24gZXJy b3JcbiIpOwogCQlwcl9lcnIoIiAgSU5TVFBNOiAweCUwOHhcbiIsIEk5MTVfUkVBRChJTlNUUE0p KTsKLQkJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoaW5zdGRvbmUpOyBpKyspCi0JCQlwcl9l cnIoIiAgSU5TVERPTkVfJWQ6IDB4JTA4eFxuIiwgaSwgaW5zdGRvbmVbaV0pOworCQlpOTE1X2Vy cl9wcmludF9pbnN0ZG9uZShkZXZfcHJpdiwgJmluc3Rkb25lKTsKIAkJaWYgKElOVEVMX0dFTihk ZXZfcHJpdikgPCA0KSB7CiAJCQl1MzIgaXBlaXIgPSBJOTE1X1JFQUQoSVBFSVIpOwogCkBAIC0y OTQ4LDMxICsyOTY0LDQyIEBAIHN0YXRpYyB2b2lkIHNlbWFwaG9yZV9jbGVhcl9kZWFkbG9ja3Mo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQllbmdpbmUtPmhhbmdjaGVjay5k ZWFkbG9jayA9IDA7CiB9CiAKK3N0YXRpYyBib29sIGluc3Rkb25lX3VuY2hhbmdlZCh1MzIgY3Vy cmVudF9pbnN0ZG9uZSwgdTMyICpvbGRfaW5zdGRvbmUpCit7CisJdTMyIHRtcCA9IGN1cnJlbnRf aW5zdGRvbmUgfCAqb2xkX2luc3Rkb25lOworCWJvb2wgdW5jaGFuZ2VkOworCisJdW5jaGFuZ2Vk ID0gdG1wID09ICpvbGRfaW5zdGRvbmU7CisJKm9sZF9pbnN0ZG9uZSB8PSB0bXA7CisKKwlyZXR1 cm4gdW5jaGFuZ2VkOworfQorCiBzdGF0aWMgYm9vbCBzdWJ1bml0c19zdHVjayhzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7Ci0JdTMyIGluc3Rkb25lW0k5MTVfTlVNX0lOU1RET05F X1JFR107CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1 OworCXN0cnVjdCBpbnRlbF9pbnN0ZG9uZSBpbnN0ZG9uZTsKKwlzdHJ1Y3QgaW50ZWxfaW5zdGRv bmUgKmFjY3VfaW5zdGRvbmUgPSAmZW5naW5lLT5oYW5nY2hlY2suaW5zdGRvbmU7CiAJYm9vbCBz dHVjazsKLQlpbnQgaTsKIAogCWlmIChlbmdpbmUtPmlkICE9IFJDUykKIAkJcmV0dXJuIHRydWU7 CiAKLQlpOTE1X2dldF9leHRyYV9pbnN0ZG9uZShlbmdpbmUtPmk5MTUsIGluc3Rkb25lKTsKKwlp OTE1X2dldF9lbmdpbmVfaW5zdGRvbmUoZGV2X3ByaXYsIFJDUywgJmluc3Rkb25lKTsKIAogCS8q IFRoZXJlIG1pZ2h0IGJlIHVuc3RhYmxlIHN1YnVuaXQgc3RhdGVzIGV2ZW4gd2hlbgogCSAqIGFj dHVhbCBoZWFkIGlzIG5vdCBtb3ZpbmcuIEZpbHRlciBvdXQgdGhlIHVuc3RhYmxlIG9uZXMgYnkK IAkgKiBhY2N1bXVsYXRpbmcgdGhlIHVuZG9uZSAtPiBkb25lIHRyYW5zaXRpb25zIGFuZCBvbmx5 CiAJICogY29uc2lkZXIgdGhvc2UgYXMgcHJvZ3Jlc3MuCiAJICovCi0Jc3R1Y2sgPSB0cnVlOwot CWZvciAoaSA9IDA7IGkgPCBJOTE1X05VTV9JTlNURE9ORV9SRUc7IGkrKykgewotCQljb25zdCB1 MzIgdG1wID0gaW5zdGRvbmVbaV0gfCBlbmdpbmUtPmhhbmdjaGVjay5pbnN0ZG9uZVtpXTsKLQot CQlpZiAodG1wICE9IGVuZ2luZS0+aGFuZ2NoZWNrLmluc3Rkb25lW2ldKQotCQkJc3R1Y2sgPSBm YWxzZTsKLQotCQllbmdpbmUtPmhhbmdjaGVjay5pbnN0ZG9uZVtpXSB8PSB0bXA7Ci0JfQorCXN0 dWNrID0gaW5zdGRvbmVfdW5jaGFuZ2VkKGluc3Rkb25lLmluc3Rkb25lLAorCQkJCSAgICZhY2N1 X2luc3Rkb25lLT5pbnN0ZG9uZSk7CisJc3R1Y2sgJj0gaW5zdGRvbmVfdW5jaGFuZ2VkKGluc3Rk b25lLnNsaWNlX2NvbW1vbiwKKwkJCQkgICAgJmFjY3VfaW5zdGRvbmUtPnNsaWNlX2NvbW1vbik7 CisJc3R1Y2sgJj0gaW5zdGRvbmVfdW5jaGFuZ2VkKGluc3Rkb25lLnNhbXBsZXIsCisJCQkJICAg ICZhY2N1X2luc3Rkb25lLT5zYW1wbGVyKTsKKwlzdHVjayAmPSBpbnN0ZG9uZV91bmNoYW5nZWQo aW5zdGRvbmUucm93LAorCQkJCSAgICAmYWNjdV9pbnN0ZG9uZS0+cm93KTsKIAogCXJldHVybiBz dHVjazsKIH0KQEAgLTI5ODMsNyArMzAxMCw3IEBAIGhlYWRfc3R1Y2soc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lLCB1NjQgYWN0aGQpCiAJaWYgKGFjdGhkICE9IGVuZ2luZS0+aGFuZ2No ZWNrLmFjdGhkKSB7CiAKIAkJLyogQ2xlYXIgc3VidW5pdCBzdGF0ZXMgb24gaGVhZCBtb3ZlbWVu dCAqLwotCQltZW1zZXQoZW5naW5lLT5oYW5nY2hlY2suaW5zdGRvbmUsIDAsCisJCW1lbXNldCgm ZW5naW5lLT5oYW5nY2hlY2suaW5zdGRvbmUsIDAsCiAJCSAgICAgICBzaXplb2YoZW5naW5lLT5o YW5nY2hlY2suaW5zdGRvbmUpKTsKIAogCQlyZXR1cm4gSEFOR0NIRUNLX0FDVElWRTsKQEAgLTMx NTMsNyArMzE4MCw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfaGFuZ2NoZWNrX2VsYXBzZWQoc3RydWN0 IHdvcmtfc3RydWN0ICp3b3JrKQogCQkJLyogQ2xlYXIgaGVhZCBhbmQgc3VidW5pdCBzdGF0ZXMg b24gc2Vxbm8gbW92ZW1lbnQgKi8KIAkJCWFjdGhkID0gMDsKIAotCQkJbWVtc2V0KGVuZ2luZS0+ aGFuZ2NoZWNrLmluc3Rkb25lLCAwLAorCQkJbWVtc2V0KCZlbmdpbmUtPmhhbmdjaGVjay5pbnN0 ZG9uZSwgMCwKIAkJCSAgICAgICBzaXplb2YoZW5naW5lLT5oYW5nY2hlY2suaW5zdGRvbmUpKTsK IAkJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAppbmRleCA3MGQ5NjE2Li40MTMzMTQ1IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfcmVnLmgKQEAgLTE3MDgsNyArMTcwOCw2IEBAIGVudW0gc2tsX2Rpc3Bf cG93ZXJfd2VsbHMgewogI2RlZmluZSBHRU43X1NDX0lOU1RET05FCV9NTUlPKDB4NzEwMCkKICNk ZWZpbmUgR0VON19TQU1QTEVSX0lOU1RET05FCV9NTUlPKDB4ZTE2MCkKICNkZWZpbmUgR0VON19S T1dfSU5TVERPTkUJX01NSU8oMHhlMTY0KQotI2RlZmluZSBJOTE1X05VTV9JTlNURE9ORV9SRUcJ NAogI2RlZmluZSBSSU5HX0lQRUlSKGJhc2UpCV9NTUlPKChiYXNlKSsweDY0KQogI2RlZmluZSBS SU5HX0lQRUhSKGJhc2UpCV9NTUlPKChiYXNlKSsweDY4KQogLyoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCA3ZjY0ZDYxLi40ZmY0NzAyIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC03MywxMyArNzMsMjEgQEAgZW51bSBpbnRl bF9lbmdpbmVfaGFuZ2NoZWNrX2FjdGlvbiB7CiAKICNkZWZpbmUgSEFOR0NIRUNLX1NDT1JFX1JJ TkdfSFVORyAzMQogCitzdHJ1Y3QgaW50ZWxfaW5zdGRvbmUgeworCXUzMiBpbnN0ZG9uZTsKKwkv KiBUaGUgZm9sbG93aW5nIGV4aXN0IG9ubHkgaW4gdGhlIFJDUyBlbmdpbmUgKi8KKwl1MzIgc2xp Y2VfY29tbW9uOworCXUzMiBzYW1wbGVyOworCXUzMiByb3c7Cit9OworCiBzdHJ1Y3QgaW50ZWxf ZW5naW5lX2hhbmdjaGVjayB7CiAJdTY0IGFjdGhkOwogCXUzMiBzZXFubzsKIAlpbnQgc2NvcmU7 CiAJZW51bSBpbnRlbF9lbmdpbmVfaGFuZ2NoZWNrX2FjdGlvbiBhY3Rpb247CiAJaW50IGRlYWRs b2NrOwotCXUzMiBpbnN0ZG9uZVtJOTE1X05VTV9JTlNURE9ORV9SRUddOworCXN0cnVjdCBpbnRl bF9pbnN0ZG9uZSBpbnN0ZG9uZTsKIH07CiAKIHN0cnVjdCBpbnRlbF9yaW5nIHsKLS0gCjIuNS4w CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK