From: Mika Kuoppala Subject: [PATCH 2/6] drm/i915: Decouple hang detection from hangcheck period Date: Tue, 15 Nov 2016 16:36:32 +0200 Message-ID: <1479220596-2784-2-git-send-email-mika.kuoppala@intel.com> References: <1479220596-2784-1-git-send-email-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1F2C76E5BF for ; Tue, 15 Nov 2016 14:36:49 +0000 (UTC) In-Reply-To: <1479220596-2784-1-git-send-email-mika.kuoppala@intel.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 SGFuZ2NoZWNrIHN0YXRlIGFjY3VtdWxhdGlvbiBoYXMgZ2FpbmVkIG1vcmUgc3RlcHMKYWxvbmcg dGhlIHllYXJzLCBsaWtlIGhlYWQgbW92ZW1lbnQgYW5kIG1vcmUgcmVjZW50bHkgdGhlCnN1YnVu aXQgaW5hY3Rpdml0eSBjaGVjay4gQXMgdGhlIHN1YnVuaXQgc2FtcGxpbmcgaXMgb25seQpkb25l IGlmIHRoZSBwcmV2aW91cyBzdGF0ZSBjaGVjayBzaG93ZWQgaW5hY3Rpdml0eSwgd2UKaGF2ZSBh ZGRlZCBtb3JlIHN0YWdlcyAoYW5kIHRpbWUpIHRvIHJlYWNoIGEgaGFuZyB2ZXJkaWN0LgoKQXN5 bW1ldHJpYyBlbmdpbmUgc3RhdGVzIGxlZCB0byBkaWZmZXJlbnQgYWN0dWFsIHdlaWdodCBvZgon b25lIGhhbmdjaGVjayB1bml0JyBhbmQgaXQgd2FzIGRlbW9uc3RyYXRlZCBpbiBzb21lCmhhbmdz IHRoYXQgZHVlIHRvIGRpZmZlcmVuY2UgaW4gc3RhZ2VzLCBzaW1wbGVyIGVuZ2luZXMKd2VyZSBh Y2N1c2VkIGZhbHNlbHkgb2YgYSBoYW5nIGFzIHRoZWlyIHNjb3Jpbmcgd2FzIG11Y2gKbW9yZSBx dWlja2VyIHRvIGFjY3VtdWxhdGUgYWJvdmUgdGhlIGhhbmcgdHJlc2hvbGQuCgpUbyBjb21wbGV0 ZWx5IGRlY291cGxlIHRoZSBoYW5nY2hlY2sgZ3VpbHR5IHNjb3JlCmZyb20gdGhlIGhhbmdjaGVj ayBwZXJpb2QsIGNvbnZlcnQgaGFuZ2NoZWNrIHNjb3JlIHRvIGEKcm91Z2ggcGVyaW9kIG9mIGlu YWN0aXZpdHkgbWVhc3VyZW1lbnQuIEFzIHRoZXNlIGFyZQp0cmFja2VkIGFzIGppZmZpZXMsIHRo ZXkgYXJlIG1lYW5pbmdmdWwgYWxzbyBhY3Jvc3MKcmVzZXQgYm91bmRhcmllcy4gVGhpcyBtYWtl cyBmaW5kaW5nIGEgZ3VpbHR5IGVuZ2luZQptb3JlIGFjY3VyYXRlIGFjcm9zcyBtdWx0aSBlbmdp bmUgYWN0aXZpdHkgc2NlbmFyaW9zLAplc3BlY2lhbGx5IGFjcm9zcyBhc3ltbWV0cmljIGVuZ2lu ZXMuCgpXZSBsb3NlIHRoZSBhYmlsaXR5IHRvIGRldGVjdCBjcm9zcyBiYXRjaCBtYWxpY2lvdXMg YXR0ZW1wdHMKdG8gaGluZGVyIHRoZSBwcm9ncmVzcy4gUGxhbiBpcyB0byBtb3ZlIHRoaXMgZnVu Y3Rpb25hbGl0eQp0byBiZSBwYXJ0IG9mIGNvbnRleHQgYmFubmluZyB3aGljaCBpcyBtb3JlIG5h dHVyYWwgZml0LApsYXRlciBpbiB0aGUgc2VyaWVzLgoKdjI6IHVzZSB0aW1lX2JlZm9yZSBtYWNy b3MgKENocmlzKQogICAgcmVpbnN0YXRlIHRoZSBwYXJkb25pbmcgb2YgbW92aW5nIGVuZ2luZSBh ZnRlciBoYyAoQ2hyaXMpCgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28u dWs+ClNpZ25lZC1vZmYtYnk6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICAgICAgfCAgMTcgKyst LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICB8ICAyMCArKystLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgICB8ICAxMSArKy0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyAgfCAgIDIgKy0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgICAgfCAgMzkgKystLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9icmVhZGNydW1icy5jIHwgICAyICstCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9oYW5nY2hlY2suYyAgIHwgMTM0ICsrKysrKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCAgfCAgMjYgKysr KystCiA4IGZpbGVzIGNoYW5nZWQsIDE1OSBpbnNlcnRpb25zKCspLCA5MiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IDFjYzk3MWMuLmNmMGNhMGYgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC0xMzUxLDEwICsxMzUxLDEyIEBAIHN0 YXRpYyBpbnQgaTkxNV9oYW5nY2hlY2tfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVu dXNlZCkKIAkJc2VxX3ByaW50ZihtLCAiXHRzZXFubyA9ICV4IFtjdXJyZW50ICV4LCBsYXN0ICV4 XVxuIiwKIAkJCSAgIGVuZ2luZS0+aGFuZ2NoZWNrLnNlcW5vLCBzZXFub1tpZF0sCiAJCQkgICBp bnRlbF9lbmdpbmVfbGFzdF9zdWJtaXQoZW5naW5lKSk7Ci0JCXNlcV9wcmludGYobSwgIlx0d2Fp dGVycz8gJXMsIGZha2UgaXJxIGFjdGl2ZT8gJXNcbiIsCisJCXNlcV9wcmludGYobSwgIlx0d2Fp dGVycz8gJXMsIGZha2UgaXJxIGFjdGl2ZT8gJXMsIGd1aWx0eT8gJXNcbiIsCiAJCQkgICB5ZXNu byhpbnRlbF9lbmdpbmVfaGFzX3dhaXRlcihlbmdpbmUpKSwKIAkJCSAgIHllc25vKHRlc3RfYml0 KGVuZ2luZS0+aWQsCi0JCQkJCSAgJmRldl9wcml2LT5ncHVfZXJyb3IubWlzc2VkX2lycV9yaW5n cykpKTsKKwkJCQkJICAmZGV2X3ByaXYtPmdwdV9lcnJvci5taXNzZWRfaXJxX3JpbmdzKSksCisJ CQkgICB5ZXNubyhlbmdpbmUtPmhhbmdjaGVjay5ndWlsdHkpKTsKKwogCQlzcGluX2xvY2tfaXJx KCZiLT5sb2NrKTsKIAkJZm9yIChyYiA9IHJiX2ZpcnN0KCZiLT53YWl0ZXJzKTsgcmI7IHJiID0g cmJfbmV4dChyYikpIHsKIAkJCXN0cnVjdCBpbnRlbF93YWl0ICp3ID0gY29udGFpbmVyX29mKHJi LCB0eXBlb2YoKncpLCBub2RlKTsKQEAgLTEzNjcsOCArMTM2OSwxMSBAQCBzdGF0aWMgaW50IGk5 MTVfaGFuZ2NoZWNrX2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQpCiAJCXNl cV9wcmludGYobSwgIlx0QUNUSEQgPSAweCUwOGxseCBbY3VycmVudCAweCUwOGxseF1cbiIsCiAJ CQkgICAobG9uZyBsb25nKWVuZ2luZS0+aGFuZ2NoZWNrLmFjdGhkLAogCQkJICAgKGxvbmcgbG9u ZylhY3RoZFtpZF0pOwotCQlzZXFfcHJpbnRmKG0sICJcdHNjb3JlID0gJWRcbiIsIGVuZ2luZS0+ aGFuZ2NoZWNrLnNjb3JlKTsKLQkJc2VxX3ByaW50ZihtLCAiXHRhY3Rpb24gPSAlZFxuIiwgZW5n aW5lLT5oYW5nY2hlY2suYWN0aW9uKTsKKwkJc2VxX3ByaW50ZihtLCAiXHRhY3Rpb24gPSAlcygl ZCkgJWQgbXMgYWdvXG4iLAorCQkJICAgaGFuZ2NoZWNrX2FjdGlvbl90b19zdHIoZW5naW5lLT5o YW5nY2hlY2suYWN0aW9uKSwKKwkJCSAgIGVuZ2luZS0+aGFuZ2NoZWNrLmFjdGlvbiwKKwkJCSAg IGppZmZpZXNfdG9fbXNlY3MoamlmZmllcyAtCisJCQkJCSAgICBlbmdpbmUtPmhhbmdjaGVjay5h Y3Rpb25fdGltZXN0YW1wKSk7CiAKIAkJaWYgKGVuZ2luZS0+aWQgPT0gUkNTKSB7CiAJCQlzZXFf cHV0cyhtLCAiXHRpbnN0ZG9uZSByZWFkID1cbiIpOwpAQCAtMzE2MywxMSArMzE2OCwxMSBAQCBz dGF0aWMgaW50IGk5MTVfZW5naW5lX2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVz ZWQpCiAJCXU2NCBhZGRyOwogCiAJCXNlcV9wcmludGYobSwgIiVzXG4iLCBlbmdpbmUtPm5hbWUp OwotCQlzZXFfcHJpbnRmKG0sICJcdGN1cnJlbnQgc2Vxbm8gJXgsIGxhc3QgJXgsIGhhbmdjaGVj ayAleCBbc2NvcmUgJWRdXG4iLAorCQlzZXFfcHJpbnRmKG0sICJcdGN1cnJlbnQgc2Vxbm8gJXgs IGxhc3QgJXgsIGhhbmdjaGVjayAleCBbJWQgbXNdXG4iLAogCQkJICAgaW50ZWxfZW5naW5lX2dl dF9zZXFubyhlbmdpbmUpLAogCQkJICAgaW50ZWxfZW5naW5lX2xhc3Rfc3VibWl0KGVuZ2luZSks CiAJCQkgICBlbmdpbmUtPmhhbmdjaGVjay5zZXFubywKLQkJCSAgIGVuZ2luZS0+aGFuZ2NoZWNr LnNjb3JlKTsKKwkJCSAgIGppZmZpZXNfdG9fbXNlY3MoamlmZmllcyAtIGVuZ2luZS0+aGFuZ2No ZWNrLmFjdGlvbl90aW1lc3RhbXApKTsKIAogCQlyY3VfcmVhZF9sb2NrKCk7CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCmluZGV4IDAwNjkxNGMuLjNjYWE1NWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaApAQCAtNzgyLDcgKzc4Miw4IEBAIHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZSB7CiAJ CS8qIFNvZnR3YXJlIHRyYWNrZWQgc3RhdGUgKi8KIAkJYm9vbCB3YWl0aW5nOwogCQlpbnQgbnVt X3dhaXRlcnM7Ci0JCWludCBoYW5nY2hlY2tfc2NvcmU7CisJCXVuc2lnbmVkIGxvbmcgaGFuZ2No ZWNrX3RpbWVzdGFtcDsKKwkJYm9vbCBoYW5nY2hlY2tfZ3VpbHR5OwogCQllbnVtIGludGVsX2Vu Z2luZV9oYW5nY2hlY2tfYWN0aW9uIGhhbmdjaGVja19hY3Rpb247CiAJCXN0cnVjdCBpOTE1X2Fk ZHJlc3Nfc3BhY2UgKnZtOwogCQlpbnQgbnVtX3JlcXVlc3RzOwpAQCAtMTQyOSwxMSArMTQzMCwx NiBAQCBzdHJ1Y3QgaTkxNV9lcnJvcl9zdGF0ZV9maWxlX3ByaXYgewogI2RlZmluZSBJOTE1X0ZF TkNFX1RJTUVPVVQgKDEwICogSFopIC8qIDEwcyAqLwogCiBzdHJ1Y3QgaTkxNV9ncHVfZXJyb3Ig ewotCS8qIEZvciBoYW5nY2hlY2sgdGltZXIgKi8KLSNkZWZpbmUgRFJNX0k5MTVfSEFOR0NIRUNL X1BFUklPRCAxNTAwIC8qIGluIG1zICovCi0jZGVmaW5lIERSTV9JOTE1X0hBTkdDSEVDS19KSUZG SUVTIG1zZWNzX3RvX2ppZmZpZXMoRFJNX0k5MTVfSEFOR0NIRUNLX1BFUklPRCkKLQkvKiBIYW5n IGdwdSB0d2ljZSBpbiB0aGlzIHdpbmRvdyBhbmQgeW91ciBjb250ZXh0IGdldHMgYmFubmVkICov Ci0jZGVmaW5lIERSTV9JOTE1X0NUWF9CQU5fUEVSSU9EIERJVl9ST1VORF9VUCg4KkRSTV9JOTE1 X0hBTkdDSEVDS19QRVJJT0QsIDEwMDApCisKKyNkZWZpbmUgRFJNX0k5MTVfU1RVQ0tfUEVSSU9E X1NFQyAyNCAvKiBObyBvYnNlcnZlZCBzZXFubyBwcm9ncmVzcyAqLworI2RlZmluZSBEUk1fSTkx NV9IVU5HX1BFUklPRF9TRUMgNCAvKiBObyBvYnNlcnZlZCBzZXFubyBub3IgaGVhZCBwcm9ncmVz cyAqLworCisvKiBIYW5nIGdwdSB0d2ljZSBpbiB0aGlzIHdpbmRvdyBhbmQgeW91ciBjb250ZXh0 IGdldHMgYmFubmVkICovCisjZGVmaW5lIERSTV9JOTE1X0NUWF9CQU5fUEVSSU9EX1NFQyAxMgor CisjZGVmaW5lIEhBTkdDSEVDS19TVFVDS19KSUZGSUVTIChEUk1fSTkxNV9TVFVDS19QRVJJT0Rf U0VDICogSFopCisjZGVmaW5lIEhBTkdDSEVDS19IVU5HX0pJRkZJRVMgKERSTV9JOTE1X0hVTkdf UEVSSU9EX1NFQyAqIEhaKQorI2RlZmluZSBIQU5HQ0hFQ0tfUEVSSU9EX0pJRkZJRVMgbXNlY3Nf dG9famlmZmllcygxNTAwKQogCiAJc3RydWN0IGRlbGF5ZWRfd29yayBoYW5nY2hlY2tfd29yazsK IApAQCAtMjcyMyw3ICsyNzI5LDcgQEAgc3RhdGljIGlubGluZSB2b2lkIGk5MTVfcXVldWVfaGFu Z2NoZWNrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkgKiB3ZSB3aWxsIGln bm9yZSBhIGh1bmcgcmluZyBpZiBhIHNlY29uZCByaW5nIGlzIGtlcHQgYnVzeS4KIAkgKi8KIAot CWRlbGF5ID0gcm91bmRfamlmZmllc191cF9yZWxhdGl2ZShEUk1fSTkxNV9IQU5HQ0hFQ0tfSklG RklFUyk7CisJZGVsYXkgPSByb3VuZF9qaWZmaWVzX3VwX3JlbGF0aXZlKEhBTkdDSEVDS19QRVJJ T0RfSklGRklFUyk7CiAJcXVldWVfZGVsYXllZF93b3JrKHN5c3RlbV9sb25nX3dxLAogCQkJICAg JmRldl9wcml2LT5ncHVfZXJyb3IuaGFuZ2NoZWNrX3dvcmssIGRlbGF5KTsKIH0KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbS5jCmluZGV4IDNmYjVlNjYuLjcwOGUyODkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYwpAQCAtMjcwMyw5ICsyNzAzLDE2IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2VtX3Jlc2V0X2Vu Z2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJaWYgKCFyZXF1ZXN0KQogCQly ZXR1cm47CiAKLQlyaW5nX2h1bmcgPSBlbmdpbmUtPmhhbmdjaGVjay5zY29yZSA+PSBIQU5HQ0hF Q0tfU0NPUkVfUklOR19IVU5HOwotCWlmIChlbmdpbmUtPmhhbmdjaGVjay5zZXFubyAhPSBpbnRl bF9lbmdpbmVfZ2V0X3NlcW5vKGVuZ2luZSkpCisJcmluZ19odW5nID0gZW5naW5lLT5oYW5nY2hl Y2suZ3VpbHR5OworCWlmIChlbmdpbmUtPmhhbmdjaGVjay5zZXFubyAhPSBpbnRlbF9lbmdpbmVf Z2V0X3NlcW5vKGVuZ2luZSkpIHsKKwkJaWYgKHJpbmdfaHVuZykKKwkJCURSTV9FUlJPUigiJXMg cGFyZG9uZWQgZHVlIHRvIHByb2dyZXNzIGFmdGVyIGhhbmdjaGVjayAleCB2cyAleFxuIiwKKwkJ CQkgIGVuZ2luZS0+bmFtZSwKKwkJCQkgIGVuZ2luZS0+aGFuZ2NoZWNrLnNlcW5vLAorCQkJCSAg aW50ZWxfZW5naW5lX2dldF9zZXFubyhlbmdpbmUpKTsKKwogCQlyaW5nX2h1bmcgPSBmYWxzZTsK Kwl9CiAKIAlpOTE1X3NldF9yZXNldF9zdGF0dXMocmVxdWVzdC0+Y3R4LCByaW5nX2h1bmcpOwog CWlmICghcmluZ19odW5nKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fY29udGV4dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCmlu ZGV4IDFmOTRiOGQuLjk1OGE1MjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250 ZXh0LmMKQEAgLTMzMSw3ICszMzEsNyBAQCBfX2NyZWF0ZV9od19jb250ZXh0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCiAJICogaXMgbm8gcmVtYXAgaW5mbywgaXQgd2lsbCBiZSBhIE5PUC4gKi8K IAljdHgtPnJlbWFwX3NsaWNlID0gQUxMX0wzX1NMSUNFUyhkZXZfcHJpdik7CiAKLQljdHgtPmhh bmdfc3RhdHMuYmFuX3BlcmlvZF9zZWNvbmRzID0gRFJNX0k5MTVfQ1RYX0JBTl9QRVJJT0Q7CisJ Y3R4LT5oYW5nX3N0YXRzLmJhbl9wZXJpb2Rfc2Vjb25kcyA9IERSTV9JOTE1X0NUWF9CQU5fUEVS SU9EX1NFQzsKIAljdHgtPnJpbmdfc2l6ZSA9IDQgKiBQQUdFX1NJWkU7CiAJY3R4LT5kZXNjX3Rl bXBsYXRlID0gR0VOOF9DVFhfQUREUkVTU0lOR19NT0RFKGRldl9wcml2KSA8PAogCQkJICAgICBH RU44X0NUWF9BRERSRVNTSU5HX01PREVfU0hJRlQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVf ZXJyb3IuYwppbmRleCBmMDJmNTgxLi44ZDBmMmJjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z3B1X2Vycm9yLmMKQEAgLTMxNiwyOCArMzE2LDYgQEAgc3RhdGljIHZvaWQgcHJpbnRfZXJyb3Jf YnVmZmVycyhzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptLAogCX0KIH0KIAotc3Rh dGljIGNvbnN0IGNoYXIgKmhhbmdjaGVja19hY3Rpb25fdG9fc3RyKGVudW0gaW50ZWxfZW5naW5l X2hhbmdjaGVja19hY3Rpb24gYSkKLXsKLQlzd2l0Y2ggKGEpIHsKLQljYXNlIEhBTkdDSEVDS19J RExFOgotCQlyZXR1cm4gImlkbGUiOwotCWNhc2UgSEFOR0NIRUNLX1dBSVQ6Ci0JCXJldHVybiAi d2FpdCI7Ci0JY2FzZSBIQU5HQ0hFQ0tfQUNUSVZFX1NFUU5POgotCQlyZXR1cm4gImFjdGl2ZSBz ZXFubyI7Ci0JY2FzZSBIQU5HQ0hFQ0tfQUNUSVZFX0hFQUQ6Ci0JCXJldHVybiAiYWN0aXZlIGhl YWQiOwotCWNhc2UgSEFOR0NIRUNLX0FDVElWRV9TVUJVTklUUzoKLQkJcmV0dXJuICJhY3RpdmUg c3VidW5pdHMiOwotCWNhc2UgSEFOR0NIRUNLX0tJQ0s6Ci0JCXJldHVybiAia2ljayI7Ci0JY2Fz ZSBIQU5HQ0hFQ0tfSFVORzoKLQkJcmV0dXJuICJodW5nIjsKLQl9Ci0KLQlyZXR1cm4gInVua25v d24iOwotfQotCiBzdGF0aWMgdm9pZCBlcnJvcl9wcmludF9pbnN0ZG9uZShzdHJ1Y3QgZHJtX2k5 MTVfZXJyb3Jfc3RhdGVfYnVmICptLAogCQkJCSBzdHJ1Y3QgZHJtX2k5MTVfZXJyb3JfZW5naW5l ICplZSkKIHsKQEAgLTQ0NSw5ICs0MjMsMTAgQEAgc3RhdGljIHZvaWQgZXJyb3JfcHJpbnRfZW5n aW5lKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9idWYgKm0sCiAJZXJyX3ByaW50ZihtLCAi ICB3YWl0aW5nOiAlc1xuIiwgeWVzbm8oZWUtPndhaXRpbmcpKTsKIAllcnJfcHJpbnRmKG0sICIg IHJpbmctPmhlYWQ6IDB4JTA4eFxuIiwgZWUtPmNwdV9yaW5nX2hlYWQpOwogCWVycl9wcmludGYo bSwgIiAgcmluZy0+dGFpbDogMHglMDh4XG4iLCBlZS0+Y3B1X3JpbmdfdGFpbCk7Ci0JZXJyX3By aW50ZihtLCAiICBoYW5nY2hlY2s6ICVzIFslZF1cbiIsCisJZXJyX3ByaW50ZihtLCAiICBoYW5n Y2hlY2s6ICVzICVzIFslbHVdXG4iLAorCQkgICB5ZXNubyhlZS0+aGFuZ2NoZWNrX2d1aWx0eSks CiAJCSAgIGhhbmdjaGVja19hY3Rpb25fdG9fc3RyKGVlLT5oYW5nY2hlY2tfYWN0aW9uKSwKLQkJ ICAgZWUtPmhhbmdjaGVja19zY29yZSk7CisJCSAgIGVlLT5oYW5nY2hlY2tfdGltZXN0YW1wKTsK IAllcnJvcl9wcmludF9yZXF1ZXN0KG0sICIgIEVMU1BbMF06ICIsICZlZS0+ZXhlY2xpc3RbMF0p OwogCWVycm9yX3ByaW50X3JlcXVlc3QobSwgIiAgRUxTUFsxXTogIiwgJmVlLT5leGVjbGlzdFsx XSk7CiB9CkBAIC01MzcsNyArNTE2LDYgQEAgaW50IGk5MTVfZXJyb3Jfc3RhdGVfdG9fc3RyKHN0 cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9idWYgKm0sCiAJc3RydWN0IHBjaV9kZXYgKnBkZXYg PSBkZXZfcHJpdi0+ZHJtLnBkZXY7CiAJc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlICplcnJv ciA9IGVycm9yX3ByaXYtPmVycm9yOwogCXN0cnVjdCBkcm1faTkxNV9lcnJvcl9vYmplY3QgKm9i ajsKLQlpbnQgbWF4X2hhbmdjaGVja19zY29yZTsKIAlpbnQgaSwgajsKIAogCWlmICghZXJyb3Ip IHsKQEAgLTU1NCwxMyArNTMyLDkgQEAgaW50IGk5MTVfZXJyb3Jfc3RhdGVfdG9fc3RyKHN0cnVj dCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9idWYgKm0sCiAJZXJyX3ByaW50ZihtLCAiVXB0aW1lOiAl bGQgcyAlbGQgdXNcbiIsCiAJCSAgIGVycm9yLT51cHRpbWUudHZfc2VjLCBlcnJvci0+dXB0aW1l LnR2X3VzZWMpOwogCWVycl9wcmludF9jYXBhYmlsaXRpZXMobSwgJmVycm9yLT5kZXZpY2VfaW5m byk7Ci0JbWF4X2hhbmdjaGVja19zY29yZSA9IDA7Ci0JZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJ WkUoZXJyb3ItPmVuZ2luZSk7IGkrKykgewotCQlpZiAoZXJyb3ItPmVuZ2luZVtpXS5oYW5nY2hl Y2tfc2NvcmUgPiBtYXhfaGFuZ2NoZWNrX3Njb3JlKQotCQkJbWF4X2hhbmdjaGVja19zY29yZSA9 IGVycm9yLT5lbmdpbmVbaV0uaGFuZ2NoZWNrX3Njb3JlOwotCX0KKwogCWZvciAoaSA9IDA7IGkg PCBBUlJBWV9TSVpFKGVycm9yLT5lbmdpbmUpOyBpKyspIHsKLQkJaWYgKGVycm9yLT5lbmdpbmVb aV0uaGFuZ2NoZWNrX3Njb3JlID09IG1heF9oYW5nY2hlY2tfc2NvcmUgJiYKKwkJaWYgKGVycm9y LT5lbmdpbmVbaV0uaGFuZ2NoZWNrX2d1aWx0eSAmJgogCQkgICAgZXJyb3ItPmVuZ2luZVtpXS5w aWQgIT0gLTEpIHsKIAkJCWVycl9wcmludGYobSwgIkFjdGl2ZSBwcm9jZXNzIChvbiByaW5nICVz KTogJXMgWyVkXVxuIiwKIAkJCQkgICBlbmdpbmVfc3RyKGkpLApAQCAtMTE2NCw4ICsxMTM4LDkg QEAgc3RhdGljIHZvaWQgZXJyb3JfcmVjb3JkX2VuZ2luZV9yZWdpc3RlcnMoc3RydWN0IGRybV9p OTE1X2Vycm9yX3N0YXRlICplcnJvciwKIAkJZWUtPmh3cyA9IEk5MTVfUkVBRChtbWlvKTsKIAl9 CiAKLQllZS0+aGFuZ2NoZWNrX3Njb3JlID0gZW5naW5lLT5oYW5nY2hlY2suc2NvcmU7CisJZWUt PmhhbmdjaGVja190aW1lc3RhbXAgPSBlbmdpbmUtPmhhbmdjaGVjay5hY3Rpb25fdGltZXN0YW1w OwogCWVlLT5oYW5nY2hlY2tfYWN0aW9uID0gZW5naW5lLT5oYW5nY2hlY2suYWN0aW9uOworCWVl LT5oYW5nY2hlY2tfZ3VpbHR5ID0gZW5naW5lLT5oYW5nY2hlY2suZ3VpbHR5OwogCiAJaWYgKFVT RVNfUFBHVFQoZGV2X3ByaXYpKSB7CiAJCWludCBpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfYnJlYWRjcnVtYnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2JyZWFkY3J1bWJzLmMKaW5kZXggYzljNDZhNS4uZWJiM2I4ZSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfYnJlYWRjcnVtYnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9icmVhZGNydW1icy5jCkBAIC01Nyw3ICs1Nyw3IEBAIHN0YXRpYyB2b2lkIGlu dGVsX2JyZWFkY3J1bWJzX2hhbmdjaGVjayh1bnNpZ25lZCBsb25nIGRhdGEpCiAKIHN0YXRpYyB1 bnNpZ25lZCBsb25nIHdhaXRfdGltZW91dCh2b2lkKQogewotCXJldHVybiByb3VuZF9qaWZmaWVz X3VwKGppZmZpZXMgKyBEUk1fSTkxNV9IQU5HQ0hFQ0tfSklGRklFUyk7CisJcmV0dXJuIHJvdW5k X2ppZmZpZXNfdXAoamlmZmllcyArIEhBTkdDSEVDS19QRVJJT0RfSklGRklFUyk7CiB9CiAKIHN0 YXRpYyB2b2lkIGludGVsX2JyZWFkY3J1bWJzX2Zha2VfaXJxKHVuc2lnbmVkIGxvbmcgZGF0YSkK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hhbmdjaGVjay5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGFuZ2NoZWNrLmMKaW5kZXggM2QyZTgxYy4uN2JjOGVh YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGFuZ2NoZWNrLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGFuZ2NoZWNrLmMKQEAgLTMwNiw3ICszMDYs NiBAQCBzdGF0aWMgdm9pZCBoYW5nY2hlY2tfbG9hZF9zYW1wbGUoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lLAogCiAJaGMtPmFjdGhkID0gaW50ZWxfZW5naW5lX2dldF9hY3RpdmVfaGVh ZChlbmdpbmUpOwogCWhjLT5zZXFubyA9IGludGVsX2VuZ2luZV9nZXRfc2Vxbm8oZW5naW5lKTsK LQloYy0+c2NvcmUgPSBlbmdpbmUtPmhhbmdjaGVjay5zY29yZTsKIH0KIAogc3RhdGljIHZvaWQg aGFuZ2NoZWNrX3N0b3JlX3NhbXBsZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCkBA IC0zMTQsNyArMzEzLDYgQEAgc3RhdGljIHZvaWQgaGFuZ2NoZWNrX3N0b3JlX3NhbXBsZShzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiB7CiAJZW5naW5lLT5oYW5nY2hlY2suYWN0aGQg PSBoYy0+YWN0aGQ7CiAJZW5naW5lLT5oYW5nY2hlY2suc2Vxbm8gPSBoYy0+c2Vxbm87Ci0JZW5n aW5lLT5oYW5nY2hlY2suc2NvcmUgPSBoYy0+c2NvcmU7CiAJZW5naW5lLT5oYW5nY2hlY2suYWN0 aW9uID0gaGMtPmFjdGlvbjsKIH0KIApAQCAtMzM2LDU4ICszMzQsMTA5IEBAIHN0YXRpYyB2b2lk IGhhbmdjaGVja19hY2N1bXVsYXRlX3NhbXBsZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUsCiB7CiAJaGMtPmFjdGlvbiA9IGhhbmdjaGVja19nZXRfYWN0aW9uKGVuZ2luZSwgaGMpOwog CisJLyogV2UgYWx3YXlzIGluY3JlbWVudCB0aGUgcHJvZ3Jlc3MKKwkgKiBpZiB0aGUgZW5naW5l IGlzIGJ1c3kgYW5kIHN0aWxsIHByb2Nlc3NpbmcKKwkgKiB0aGUgc2FtZSByZXF1ZXN0LCBzbyB0 aGF0IG5vIHNpbmdsZSByZXF1ZXN0CisJICogY2FuIHJ1biBpbmRlZmluaXRlbHkgKHN1Y2ggYXMg YSBjaGFpbiBvZgorCSAqIGJhdGNoZXMpLiBUaGUgb25seSB0aW1lIHdlIGRvIG5vdCBpbmNyZW1l bnQKKwkgKiB0aGUgaGFuZ2NoZWNrIHNjb3JlIG9uIHRoaXMgcmluZywgaWYgdGhpcworCSAqIGVu Z2luZSBpcyBpbiBhIGxlZ2l0aW1hdGUgd2FpdCBmb3IgYW5vdGhlcgorCSAqIGVuZ2luZS4gSW4g dGhhdCBjYXNlIHRoZSB3YWl0aW5nIGVuZ2luZSBpcyBhCisJICogdmljdGltIGFuZCB3ZSB3YW50 IHRvIGJlIHN1cmUgd2UgY2F0Y2ggdGhlCisJICogcmlnaHQgY3VscHJpdC4gVGhlbiBldmVyeSB0 aW1lIHdlIGRvIGtpY2sKKwkgKiB0aGUgcmluZywgbWFrZSBpdCBhcyBhIHByb2dyZXNzIGFzIHRo ZSBzZXFubworCSAqIGFkdmFuY2VtZW50IG1pZ2h0IGVuc3VyZSBhbmQgaWYgbm90LCBpdAorCSAq IHdpbGwgY2F0Y2ggdGhlIGhhbmdpbmcgZW5naW5lLgorCSAqLworCiAJc3dpdGNoIChoYy0+YWN0 aW9uKSB7CiAJY2FzZSBIQU5HQ0hFQ0tfSURMRToKLQljYXNlIEhBTkdDSEVDS19XQUlUOgorCWNh c2UgSEFOR0NIRUNLX0FDVElWRV9TRVFOTzoKKwkJLyogQ2xlYXIgaGVhZCBhbmQgc3VidW5pdCBz dGF0ZXMgb24gc2Vxbm8gbW92ZW1lbnQgKi8KKwkJaGMtPmFjdGhkID0gMDsKKworCQltZW1zZXQo JmVuZ2luZS0+aGFuZ2NoZWNrLmluc3Rkb25lLCAwLAorCQkgICAgICAgc2l6ZW9mKGVuZ2luZS0+ aGFuZ2NoZWNrLmluc3Rkb25lKSk7CisKKwkJZW5naW5lLT5oYW5nY2hlY2suYWN0aW9uX3RpbWVz dGFtcCA9IGppZmZpZXM7CiAJCWJyZWFrOwogCiAJY2FzZSBIQU5HQ0hFQ0tfQUNUSVZFX0hFQUQ6 CiAJY2FzZSBIQU5HQ0hFQ0tfQUNUSVZFX1NVQlVOSVRTOgotCQkvKiBXZSBhbHdheXMgaW5jcmVt ZW50IHRoZSBoYW5nY2hlY2sgc2NvcmUKLQkJICogaWYgdGhlIGVuZ2luZSBpcyBidXN5IGFuZCBz dGlsbCBwcm9jZXNzaW5nCi0JCSAqIHRoZSBzYW1lIHJlcXVlc3QsIHNvIHRoYXQgbm8gc2luZ2xl IHJlcXVlc3QKLQkJICogY2FuIHJ1biBpbmRlZmluaXRlbHkgKHN1Y2ggYXMgYSBjaGFpbiBvZgot CQkgKiBiYXRjaGVzKS4gVGhlIG9ubHkgdGltZSB3ZSBkbyBub3QgaW5jcmVtZW50Ci0JCSAqIHRo ZSBoYW5nY2hlY2sgc2NvcmUgb24gdGhpcyByaW5nLCBpZiB0aGlzCi0JCSAqIGVuZ2luZSBpcyBp biBhIGxlZ2l0aW1hdGUgd2FpdCBmb3IgYW5vdGhlcgotCQkgKiBlbmdpbmUuIEluIHRoYXQgY2Fz ZSB0aGUgd2FpdGluZyBlbmdpbmUgaXMgYQotCQkgKiB2aWN0aW0gYW5kIHdlIHdhbnQgdG8gYmUg c3VyZSB3ZSBjYXRjaCB0aGUKLQkJICogcmlnaHQgY3VscHJpdC4gVGhlbiBldmVyeSB0aW1lIHdl IGRvIGtpY2sKLQkJICogdGhlIHJpbmcsIGFkZCBhIHNtYWxsIGluY3JlbWVudCB0byB0aGUKLQkJ ICogc2NvcmUgc28gdGhhdCB3ZSBjYW4gY2F0Y2ggYSBiYXRjaCB0aGF0IGlzCi0JCSAqIGJlaW5n IHJlcGVhdGVkbHkga2lja2VkIGFuZCBzbyByZXNwb25zaWJsZQotCQkgKiBmb3Igc3RhbGxpbmcg dGhlIG1hY2hpbmUuCi0JCSAqLwotCQloYy0+c2NvcmUgKz0gMTsKLQkJYnJlYWs7Ci0KIAljYXNl IEhBTkdDSEVDS19LSUNLOgotCQloYy0+c2NvcmUgKz0gNTsKLQkJYnJlYWs7CiAKKwljYXNlIEhB TkdDSEVDS19XQUlUOgogCWNhc2UgSEFOR0NIRUNLX0hVTkc6Ci0JCWhjLT5zY29yZSArPSAyMDsK IAkJYnJlYWs7CiAKLQljYXNlIEhBTkdDSEVDS19BQ1RJVkVfU0VRTk86Ci0JCS8qIEdyYWR1YWxs eSByZWR1Y2UgdGhlIGNvdW50IHNvIHRoYXQgd2UgY2F0Y2ggRG9TCi0JCSAqIGF0dGVtcHRzIGFj cm9zcyBtdWx0aXBsZSBiYXRjaGVzLgotCQkgKi8KLQkJaWYgKGhjLT5zY29yZSA+IDApCi0JCQlo Yy0+c2NvcmUgLT0gMTU7Ci0JCWlmIChoYy0+c2NvcmUgPCAwKQotCQkJaGMtPnNjb3JlID0gMDsK KwlkZWZhdWx0OgorCQlNSVNTSU5HX0NBU0UoaGMtPmFjdGlvbik7CisJfQorfQogCi0JCS8qIENs ZWFyIGhlYWQgYW5kIHN1YnVuaXQgc3RhdGVzIG9uIHNlcW5vIG1vdmVtZW50ICovCi0JCWhjLT5h Y3RoZCA9IDA7CitzdGF0aWMgYm9vbAoraGFuZ2NoZWNrX2VuZ2luZV9zdGFsbChzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUsCisJCSAgICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2hhbmdj aGVjayAqaGMpCit7CisJY29uc3QgdW5zaWduZWQgbG9uZyBsYXN0X2FjdGlvbiA9IGVuZ2luZS0+ aGFuZ2NoZWNrLmFjdGlvbl90aW1lc3RhbXA7CiAKLQkJbWVtc2V0KCZlbmdpbmUtPmhhbmdjaGVj ay5pbnN0ZG9uZSwgMCwKLQkJICAgICAgIHNpemVvZihlbmdpbmUtPmhhbmdjaGVjay5pbnN0ZG9u ZSkpOwotCQlicmVhazsKKwlpZiAoaGMtPmFjdGlvbiA9PSBIQU5HQ0hFQ0tfQUNUSVZFX1NFUU5P IHx8CisJICAgIGhjLT5hY3Rpb24gPT0gSEFOR0NIRUNLX0lETEUpCisJCXJldHVybiBmYWxzZTsK KworCWlmICh0aW1lX2JlZm9yZShqaWZmaWVzLCBsYXN0X2FjdGlvbiArIEhBTkdDSEVDS19IVU5H X0pJRkZJRVMpKQorCQlyZXR1cm4gZmFsc2U7CisKKwlpZiAodGltZV9iZWZvcmUoamlmZmllcywg bGFzdF9hY3Rpb24gKyBIQU5HQ0hFQ0tfU1RVQ0tfSklGRklFUykpCisJCWlmIChoYy0+YWN0aW9u ICE9IEhBTkdDSEVDS19IVU5HKQorCQkJcmV0dXJuIGZhbHNlOworCisJcmV0dXJuIHRydWU7Cit9 CisKK3N0YXRpYyBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpmaW5kX2xyYV9lbmdpbmUoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsCisJCQkJCSAgICAgICBjb25zdCB1bnNpZ25lZCBpbnQg bWFzaykKK3sKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUgPSBOVUxMLCAqYzsKKwll bnVtIGludGVsX2VuZ2luZV9pZCBpZDsKKworCWZvcl9lYWNoX2VuZ2luZV9tYXNrZWQoYywgaTkx NSwgbWFzaywgaWQpIHsKKwkJaWYgKGVuZ2luZSA9PSBOVUxMKSB7CisJCQllbmdpbmUgPSBjOwor CQkJY29udGludWU7CisJCX0KKworCQlpZiAodGltZV9iZWZvcmUoYy0+aGFuZ2NoZWNrLmFjdGlv bl90aW1lc3RhbXAsCisJCQkJZW5naW5lLT5oYW5nY2hlY2suYWN0aW9uX3RpbWVzdGFtcCkpCisJ CQllbmdpbmUgPSBjOworCQllbHNlIGlmIChjLT5oYW5nY2hlY2suYWN0aW9uX3RpbWVzdGFtcCA9 PQorCQkJIGVuZ2luZS0+aGFuZ2NoZWNrLmFjdGlvbl90aW1lc3RhbXAgJiYKKwkJCSBjLT5oYW5n Y2hlY2suc2Vxbm8gPCBlbmdpbmUtPmhhbmdjaGVjay5zZXFubykKKwkJCWVuZ2luZSA9IGM7CiAK LQlkZWZhdWx0OgotCQlNSVNTSU5HX0NBU0UoaGMtPmFjdGlvbik7CiAJfQorCisJcmV0dXJuIGVu Z2luZTsKK30KKworc3RhdGljIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmZpbmRfZ3VpbHR5X2Vu Z2luZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwKKwkJCQkJCSAgY29uc3QgdW5zaWdu ZWQgaW50IGh1bmdfbWFzaywKKwkJCQkJCSAgY29uc3QgdW5zaWduZWQgaW50IHN0dWNrX21hc2sp Cit7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOworCisJZW5naW5lID0gZmluZF9s cmFfZW5naW5lKGk5MTUsIGh1bmdfbWFzayk7CisJaWYgKGVuZ2luZSkKKwkJcmV0dXJuIGVuZ2lu ZTsKKworCWVuZ2luZSA9IGZpbmRfbHJhX2VuZ2luZShpOTE1LCBzdHVja19tYXNrKTsKKwlpZiAo ZW5naW5lKQorCQlyZXR1cm4gZW5naW5lOworCisJRFJNX0RFQlVHX0RSSVZFUigiTm8gZW5naW5l IGZvdW5kIGZvciBoYW5nICgweCV4LDB4JXgpXG4iLAorCQkJIGh1bmdfbWFzaywgc3R1Y2tfbWFz ayk7CisJLyogU2hvdWxkIG5vdCBnZXQgaGVyZS4gQnV0IGFzIGEgc2FmZXR5IHZhbHZlLCBibGFt ZSBzb21lb25lICovCisJcmV0dXJuIGZpbmRfbHJhX2VuZ2luZShpOTE1LCB+MCk7CiB9CiAKIHN0 YXRpYyB2b2lkIGhhbmdjaGVja19kZWNsYXJlX2hhbmcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg Kmk5MTUsCkBAIC00NTQsNyArNTAzLDcgQEAgc3RhdGljIHZvaWQgaTkxNV9oYW5nY2hlY2tfZWxh cHNlZChzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJCWhhbmdjaGVja19hY2N1bXVsYXRlX3Nh bXBsZShlbmdpbmUsIGhjKTsKIAkJaGFuZ2NoZWNrX3N0b3JlX3NhbXBsZShlbmdpbmUsIGhjKTsK IAotCQlpZiAoaGMtPnNjb3JlID49IEhBTkdDSEVDS19TQ09SRV9SSU5HX0hVTkcpIHsKKwkJaWYg KGhhbmdjaGVja19lbmdpbmVfc3RhbGwoZW5naW5lLCBoYykpIHsKIAkJCWh1bmcgfD0gaW50ZWxf ZW5naW5lX2ZsYWcoZW5naW5lKTsKIAkJCWlmIChoYy0+YWN0aW9uICE9IEhBTkdDSEVDS19IVU5H KQogCQkJCXN0dWNrIHw9IGludGVsX2VuZ2luZV9mbGFnKGVuZ2luZSk7CkBAIC00NjMsOCArNTEy LDExIEBAIHN0YXRpYyB2b2lkIGk5MTVfaGFuZ2NoZWNrX2VsYXBzZWQoc3RydWN0IHdvcmtfc3Ry dWN0ICp3b3JrKQogCQlidXN5X2NvdW50ICs9IGJ1c3k7CiAJfQogCi0JaWYgKGh1bmcpCisJaWYg KGh1bmcpIHsKKwkJZW5naW5lID0gZmluZF9ndWlsdHlfZW5naW5lKGRldl9wcml2LCBodW5nLCBz dHVjayk7CisJCWVuZ2luZS0+aGFuZ2NoZWNrLmd1aWx0eSA9IHRydWU7CiAJCWhhbmdjaGVja19k ZWNsYXJlX2hhbmcoZGV2X3ByaXYsIGh1bmcsIHN0dWNrKTsKKwl9CiAKIAkvKiBSZXNldCB0aW1l ciBpbiBjYXNlIEdQVSBoYW5ncyB3aXRob3V0IGFub3RoZXIgcmVxdWVzdCBiZWluZyBhZGRlZCAq LwogCWlmIChidXN5X2NvdW50KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o CmluZGV4IDMxNTJiMmIuLjkyODUyZTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmgKQEAgLTc0LDcgKzc0LDI4IEBAIGVudW0gaW50ZWxfZW5naW5lX2hhbmdjaGVja19h Y3Rpb24gewogCUhBTkdDSEVDS19IVU5HLAogfTsKIAotI2RlZmluZSBIQU5HQ0hFQ0tfU0NPUkVf UklOR19IVU5HIDMxCitzdGF0aWMgaW5saW5lIGNvbnN0IGNoYXIgKgoraGFuZ2NoZWNrX2FjdGlv bl90b19zdHIoY29uc3QgZW51bSBpbnRlbF9lbmdpbmVfaGFuZ2NoZWNrX2FjdGlvbiBhKQorewor CXN3aXRjaCAoYSkgeworCWNhc2UgSEFOR0NIRUNLX0lETEU6CisJCXJldHVybiAiaWRsZSI7CisJ Y2FzZSBIQU5HQ0hFQ0tfV0FJVDoKKwkJcmV0dXJuICJ3YWl0IjsKKwljYXNlIEhBTkdDSEVDS19B Q1RJVkVfU0VRTk86CisJCXJldHVybiAiYWN0aXZlIHNlcW5vIjsKKwljYXNlIEhBTkdDSEVDS19B Q1RJVkVfSEVBRDoKKwkJcmV0dXJuICJhY3RpdmUgaGVhZCI7CisJY2FzZSBIQU5HQ0hFQ0tfQUNU SVZFX1NVQlVOSVRTOgorCQlyZXR1cm4gImFjdGl2ZSBzdWJ1bml0cyI7CisJY2FzZSBIQU5HQ0hF Q0tfS0lDSzoKKwkJcmV0dXJuICJraWNrIjsKKwljYXNlIEhBTkdDSEVDS19IVU5HOgorCQlyZXR1 cm4gImh1bmciOworCX0KKworCXJldHVybiAidW5rbm93biI7Cit9CiAKICNkZWZpbmUgSTkxNV9N QVhfU0xJQ0VTCTMKICNkZWZpbmUgSTkxNV9NQVhfU1VCU0xJQ0VTIDMKQEAgLTEwNiwxMCArMTI3 LDExIEBAIHN0cnVjdCBpbnRlbF9pbnN0ZG9uZSB7CiBzdHJ1Y3QgaW50ZWxfZW5naW5lX2hhbmdj aGVjayB7CiAJdTY0IGFjdGhkOwogCXUzMiBzZXFubzsKLQlpbnQgc2NvcmU7CiAJZW51bSBpbnRl bF9lbmdpbmVfaGFuZ2NoZWNrX2FjdGlvbiBhY3Rpb247CisJdW5zaWduZWQgbG9uZyBhY3Rpb25f dGltZXN0YW1wOwogCWludCBkZWFkbG9jazsKIAlzdHJ1Y3QgaW50ZWxfaW5zdGRvbmUgaW5zdGRv bmU7CisJYm9vbCBndWlsdHk7CiB9OwogCiBzdHJ1Y3QgaW50ZWxfcmluZyB7Ci0tIAoyLjcuNAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==