From: Michel Thierry Subject: [PATCH v8 04/20] drm/i915: Add support for per engine reset recovery Date: Mon, 22 May 2017 10:46:25 -0700 Message-ID: <20170522174641.25354-5-michel.thierry@intel.com> References: <20170522174641.25354-1-michel.thierry@intel.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 ESMTPS id 5A6156E0F3 for ; Mon, 22 May 2017 17:46:46 +0000 (UTC) In-Reply-To: <20170522174641.25354-1-michel.thierry@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 VGhpcyBjaGFuZ2UgaW1wbGVtZW50cyBzdXBwb3J0IGZvciBwZXItZW5naW5lIHJlc2V0IGFzIGFu IGluaXRpYWwsIGxlc3MKaW50cnVzaXZlIGhhbmcgcmVjb3Zlcnkgb3B0aW9uIHRvIGJlIGF0dGVt cHRlZCBiZWZvcmUgZmFsbGluZyBiYWNrIHRvIHRoZQpsZWdhY3kgZnVsbCBHUFUgcmVzZXQgcmVj b3ZlcnkgbW9kZSBpZiBuZWNlc3NhcnkuIFRoaXMgaXMgb25seSBzdXBwb3J0ZWQKZnJvbSBHZW44 IG9ud2FyZHMuCgpIYW5nY2hlY2tlciBkZXRlcm1pbmVzIHdoaWNoIGVuZ2luZXMgYXJlIGh1bmcg YW5kIGludm9rZXMgZXJyb3IgaGFuZGxlciB0bwpyZWNvdmVyIGZyb20gaXQuIEVycm9yIGhhbmRs ZXIgc2NoZWR1bGVzIHJlY292ZXJ5IGZvciBlYWNoIG9mIHRob3NlIGVuZ2luZXMKdGhhdCBhcmUg aHVuZy4gVGhlIHJlY292ZXJ5IHByb2NlZHVyZSBpcyBhcyBmb2xsb3dzLAogLSBpZGVudGlmaWVz IHRoZSByZXF1ZXN0IHRoYXQgY2F1c2VkIHRoZSBoYW5nIGFuZCBpdCBpcyBkcm9wcGVkCiAtIGZv cmNlIGVuZ2luZSB0byBpZGxlOiB0aGlzIGlzIGRvbmUgYnkgaXNzdWluZyBhIHJlc2V0IHJlcXVl c3QKIC0gcmVzZXQgdGhlIGVuZ2luZQogLSByZS1pbml0IHRoZSBlbmdpbmUgdG8gcmVzdW1lIHN1 Ym1pc3Npb25zLgoKSWYgZW5naW5lIHJlc2V0IGZhaWxzIHRoZW4gd2UgZmFsbCBiYWNrIHRvIGhl YXZ5IHdlaWdodCBmdWxsIGdwdSByZXNldAp3aGljaCByZXNldHMgYWxsIGVuZ2luZXMgYW5kIHJl aW5pdGlhemVzIGNvbXBsZXRlIHN0YXRlIG9mIEhXIGFuZCBTVy4KCnYyOiBSZWJhc2UuCnYzOiBz LyplbmdpbmVfcmVzZXQqLypyZXNldF9lbmdpbmUqLzsgZnJlZXplIGVuZ2luZSBhbmQgaXJxcyBi ZWZvcmUKY2FsbGluZyBpOTE1X2dlbV9yZXNldF9lbmdpbmUgKENocmlzKS4KdjQ6IFJlYmFzZSwg bW9kaWZ5IGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmUgdG8gdXNlIGEgcmluZyBtYXNrIGFuZApyZXVz ZSB0aGUgZnVuY3Rpb24gZm9yIHJlc2V0X2VuZ2luZS4KdjU6IGludGVsX3Jlc2V0X2VuZ2luZV9z dGFydC9jYW5jZWwgaW5zdGVhZCBvZiByZXF1ZXN0L3VucmVxdWVzdF9yZXNldC4KdjY6IENsZWFu IHVwIHJlc2V0X2VuZ2luZSBmdW5jdGlvbiB0byBub3QgcmVxdWlyZSBtdXRleCwgaS5lLiBubyBu ZWVkIHRvIGNhbGwKcmV2b2tlL3Jlc3RvcmVfZmVuY2VzIGFuZCBfcmV0aXJlX3JlcXVlc3RzIChD aHJpcykuCnY3OiBSZW1vdmUgbGVmdG92ZXJzIGZyb20gdjUsIGkuZS4gbm8gbmVlZCB0byBkaXNh YmxlIGlycSwgaG9sZApmb3JjZXdha2Ugb3Igd2FrZXVwIHRoZSBoYW5kb2ZmIGJpdCAoQ2hyaXMp Lgp2ODogZW5naW5lX3JldGlyZV9yZXF1ZXN0cyBzaG91bGQgYmUgKGFuZCBpdCB3YXMpIHN0YXRp YzsgZXhwbGFpbiB0aGF0CndlIGhhdmUgdG8gcmUtaW5pdCB0aGUgZW5naW5lIGFmdGVyIHJlc2V0 LCB3aGljaCBpcyB3aHkgdGhlIGluaXRfaHcgY2FsbAppcyBuZWVkZWQ7IGNoZWNrIHJlc2V0LWlu LXByb2dyZXNzIGZsYWcgKENocmlzKS4Kdjk6IFJlYmFzZSwgaW5jbHVkZSBjb2RlIHRvIHBhc3Mg dGhlIGFjdGl2ZSByZXF1ZXN0IHRvIGdlbV9yZXNldF9lbmdpbmUKKGFzIGl0IGlzIGFscmVhZHkg ZG9uZSBpbiBmdWxsIHJlc2V0KS4gUmVtb3ZlIHVubmVjZXNzYXJ5CmludGVsX3Jlc2V0X2VuZ2lu ZV9zdGFydC9jYW5jZWwsIHRoZXNlIGFyZSBleGVjdXRlZCBhcyBwYXJ0IG9mIHRoZQpyZXNldC4K CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IE1pa2EgS3Vv cHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBUb21h cyBFbGYgPHRvbWFzLmVsZkBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEFydW4gU2lsdXZlcnkg PGFydW4uc2lsdXZlcnlAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNaWNoZWwgVGhp ZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMgfCA0OCArKysrKysrKysrKysrKysrKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmggfCAgNSArKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg fCA5NiArKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogMyBmaWxlcyBj aGFuZ2VkLCAxMDkgaW5zZXJ0aW9ucygrKSwgNDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmMKaW5kZXggZjQ5ZjlkOTI3M2YyLi43OTI1ZTEwM2M4YmQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuYwpAQCAtMTg3OSwxMSArMTg3OSw1NSBAQCB2b2lkIGk5MTVfcmVzZXQoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogICoKICAqIFJlc2V0IGEgc3BlY2lmaWMgR1BV IGVuZ2luZS4gVXNlZnVsIGlmIGEgaGFuZyBpcyBkZXRlY3RlZC4KICAqIFJldHVybnMgemVybyBv biBzdWNjZXNzZnVsIHJlc2V0IG9yIG90aGVyd2lzZSBhbiBlcnJvciBjb2RlLgorICoKKyAqIFBy b2NlZHVyZSBpczoKKyAqICAtIGlkZW50aWZpZXMgdGhlIHJlcXVlc3QgdGhhdCBjYXVzZWQgdGhl IGhhbmcgYW5kIGl0IGlzIGRyb3BwZWQKKyAqICAtIHJlc2V0IGVuZ2luZSAod2hpY2ggd2lsbCBm b3JjZSB0aGUgZW5naW5lIHRvIGlkbGUpCisgKiAgLSByZS1pbml0L2NvbmZpZ3VyZSBlbmdpbmUK ICAqLwogaW50IGk5MTVfcmVzZXRfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZSkKIHsKLQkvKiBGSVhNRTogcmVwbGFjZSBtZSB3aXRoIGVuZ2luZSByZXNldCBzZXF1ZW5jZSAq LwotCXJldHVybiAtRU5PREVWOworCWludCByZXQ7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gZW5naW5lLT5pOTE1OworCXN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJyb3Ig PSAmZGV2X3ByaXYtPmdwdV9lcnJvcjsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKmFj dGl2ZV9yZXF1ZXN0OworCisJR0VNX0JVR19PTighdGVzdF9iaXQoSTkxNV9SRVNFVF9FTkdJTkVf SU5fUFJPR1JFU1MsICZlcnJvci0+ZmxhZ3MpKTsKKworCURSTV9ERUJVR19EUklWRVIoInJlc2V0 dGluZyAlc1xuIiwgZW5naW5lLT5uYW1lKTsKKworCWFjdGl2ZV9yZXF1ZXN0ID0gaTkxNV9nZW1f cmVzZXRfcHJlcGFyZV9lbmdpbmUoZW5naW5lKTsKKwlpZiAoSVNfRVJSKGFjdGl2ZV9yZXF1ZXN0 KSkgeworCQlEUk1fREVCVUdfRFJJVkVSKCJQcmV2aW91cyByZXNldCBmYWlsZWQsIHByb21vdGUg dG8gZnVsbCByZXNldFxuIik7CisJCXJldCA9IFBUUl9FUlIoYWN0aXZlX3JlcXVlc3QpOworCQln b3RvIG91dDsKKwl9CisKKwkvKgorCSAqIHRoZSByZXF1ZXN0IHRoYXQgY2F1c2VkIHRoZSBoYW5n IGlzIHN0dWNrIG9uIGVsc3AsIHdlIGtub3cgdGhlCisJICogYWN0aXZlIHJlcXVlc3QgYW5kIGNh biBkcm9wIGl0LCBhZGp1c3QgaGVhZCB0byBza2lwIHRoZSBvZmZlbmRpbmcKKwkgKiByZXF1ZXN0 IHRvIHJlc3VtZSBleGVjdXRpbmcgcmVtYWluaW5nIHJlcXVlc3RzIGluIHRoZSBxdWV1ZS4KKwkg Ki8KKwlpOTE1X2dlbV9yZXNldF9lbmdpbmUoZW5naW5lLCBhY3RpdmVfcmVxdWVzdCk7CisKKwkv KiBmaW5hbGx5LCByZXNldCBlbmdpbmUgKi8KKwlyZXQgPSBpbnRlbF9ncHVfcmVzZXQoZGV2X3By aXYsIGludGVsX2VuZ2luZV9mbGFnKGVuZ2luZSkpOworCWlmIChyZXQpIHsKKwkJRFJNX0VSUk9S KCJGYWlsZWQgdG8gcmVzZXQgJXMsIHJldD0lZFxuIiwgZW5naW5lLT5uYW1lLCByZXQpOworCQln b3RvIG91dDsKKwl9CisKKwlpOTE1X2dlbV9yZXNldF9maW5pc2hfZW5naW5lKGVuZ2luZSk7CisK KwkvKgorCSAqIFRoZSBlbmdpbmUgYW5kIGl0cyByZWdpc3RlcnMgKGFuZCB3b3JrYXJvdW5kcyBp biBjYXNlIG9mIHJlbmRlcikKKwkgKiBoYXZlIGJlZW4gcmVzZXQgdG8gdGhlaXIgZGVmYXVsdCB2 YWx1ZXMuIEZvbGxvdyB0aGUgaW5pdF9yaW5nCisJICogcHJvY2VzcyB0byBwcm9ncmFtIFJJTkdf TU9ERSwgSFdTUCBhbmQgcmUtZW5hYmxlIHN1Ym1pc3Npb24uCisJICovCisJcmV0ID0gZW5naW5l LT5pbml0X2h3KGVuZ2luZSk7CisKK291dDoKKwlyZXR1cm4gcmV0OwogfQogCiBzdGF0aWMgaW50 IGk5MTVfcG1fc3VzcGVuZChzdHJ1Y3QgZGV2aWNlICprZGV2KQpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmgKaW5kZXggNjg0OGVkNzU2MTFkLi5mOWZkODQ5ZGFiOGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaApAQCAtMzQxNywxMSArMzQxNywxNiBAQCBzdGF0aWMgaW5saW5lIHUzMiBpOTE1X3Jlc2V0 X2NvdW50KHN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJyb3IpCiAJcmV0dXJuIFJFQURfT05DRShl cnJvci0+cmVzZXRfY291bnQpOwogfQogCitzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKgor aTkxNV9nZW1fcmVzZXRfcHJlcGFyZV9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKTsKIGludCBpOTE1X2dlbV9yZXNldF9wcmVwYXJlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdik7CiB2b2lkIGk5MTVfZ2VtX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdik7Cit2b2lkIGk5MTVfZ2VtX3Jlc2V0X2ZpbmlzaF9lbmdpbmUoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIHZvaWQgaTkxNV9nZW1fcmVzZXRfZmluaXNoKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGk5MTVfZ2VtX3NldF93ZWRnZWQo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGJvb2wgaTkxNV9nZW1fdW5zZXRf d2VkZ2VkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7Cit2b2lkIGk5MTVfZ2Vt X3Jlc2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCisJCQkgICBzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpOwogCiB2b2lkIGk5MTVfZ2VtX2luaXRf bW1pbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSk7CiBpbnQgX19tdXN0X2NoZWNrIGk5 MTVfZ2VtX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbS5jCmluZGV4IDgyMDc0NzZiMGMzNS4uZDBmZDIyZDRmZTI2IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKQEAgLTI3OTMsNDUgKzI3OTMsNjEgQEAgc3RhdGljIGJvb2wgZW5naW5l X3N0YWxsZWQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCXJldHVybiB0cnVlOwog fQogCisvKgorICogRW5zdXJlIGlycSBoYW5kbGVyIGZpbmlzaGVzLCBhbmQgbm90IHJ1biBhZ2Fp bi4KKyAqIEFsc28gcmV0dXJuIHRoZSBhY3RpdmUgcmVxdWVzdCBzbyB0aGF0IHdlIG9ubHkgc2Vh cmNoIGZvciBpdCBvbmNlLgorICovCitzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKgoraTkx NV9nZW1fcmVzZXRfcHJlcGFyZV9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KQoreworCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCA9IE5VTEw7CisKKwkv KiBQcmV2ZW50IHRoZSBzaWduYWxlciB0aHJlYWQgZnJvbSB1cGRhdGluZyB0aGUgcmVxdWVzdAor CSAqIHN0YXRlIChieSBjYWxsaW5nIGRtYV9mZW5jZV9zaWduYWwpIGFzIHdlIGFyZSBwcm9jZXNz aW5nCisJICogdGhlIHJlc2V0LiBUaGUgd3JpdGUgZnJvbSB0aGUgR1BVIG9mIHRoZSBzZXFubyBp cworCSAqIGFzeW5jaHJvbm91cyBhbmQgdGhlIHNpZ25hbGVyIHRocmVhZCBtYXkgc2VlIGEgZGlm ZmVyZW50CisJICogdmFsdWUgdG8gdXMgYW5kIGRlY2xhcmUgdGhlIHJlcXVlc3QgY29tcGxldGUs IGV2ZW4gdGhvdWdoCisJICogdGhlIHJlc2V0IHJvdXRpbmUgaGF2ZSBwaWNrZWQgdGhhdCByZXF1 ZXN0IGFzIHRoZSBhY3RpdmUKKwkgKiAoaW5jb21wbGV0ZSkgcmVxdWVzdC4gVGhpcyBjb25mbGlj dCBpcyBub3QgaGFuZGxlZAorCSAqIGdyYWNlZnVsbHkhCisJICovCisJa3RocmVhZF9wYXJrKGVu Z2luZS0+YnJlYWRjcnVtYnMuc2lnbmFsZXIpOworCisJLyogUHJldmVudCByZXF1ZXN0IHN1Ym1p c3Npb24gdG8gdGhlIGhhcmR3YXJlIHVudGlsIHdlIGhhdmUKKwkgKiBjb21wbGV0ZWQgdGhlIHJl c2V0IGluIGk5MTVfZ2VtX3Jlc2V0X2ZpbmlzaCgpLiBJZiBhIHJlcXVlc3QKKwkgKiBpcyBjb21w bGV0ZWQgYnkgb25lIGVuZ2luZSwgaXQgbWF5IHRoZW4gcXVldWUgYSByZXF1ZXN0CisJICogdG8g YSBzZWNvbmQgdmlhIGl0cyBlbmdpbmUtPmlycV90YXNrbGV0ICpqdXN0KiBhcyB3ZSBhcmUKKwkg KiBjYWxsaW5nIGVuZ2luZS0+aW5pdF9odygpIGFuZCBhbHNvIHdyaXRpbmcgdGhlIEVMU1AuCisJ ICogVHVybmluZyBvZmYgdGhlIGVuZ2luZS0+aXJxX3Rhc2tsZXQgdW50aWwgdGhlIHJlc2V0IGlz IG92ZXIKKwkgKiBwcmV2ZW50cyB0aGUgcmFjZS4KKwkgKi8KKwl0YXNrbGV0X2tpbGwoJmVuZ2lu ZS0+aXJxX3Rhc2tsZXQpOworCXRhc2tsZXRfZGlzYWJsZSgmZW5naW5lLT5pcnFfdGFza2xldCk7 CisKKwlpZiAoZW5naW5lLT5pcnFfc2Vxbm9fYmFycmllcikKKwkJZW5naW5lLT5pcnFfc2Vxbm9f YmFycmllcihlbmdpbmUpOworCisJaWYgKGVuZ2luZV9zdGFsbGVkKGVuZ2luZSkpIHsKKwkJcmVx dWVzdCA9IGk5MTVfZ2VtX2ZpbmRfYWN0aXZlX3JlcXVlc3QoZW5naW5lKTsKKwkJaWYgKHJlcXVl c3QgJiYgcmVxdWVzdC0+ZmVuY2UuZXJyb3IgPT0gLUVJTykKKwkJCXJlcXVlc3QgPSBFUlJfUFRS KC1FSU8pOyAvKiBQcmV2aW91cyByZXNldCBmYWlsZWQhICovCisJfQorCisJcmV0dXJuIHJlcXVl c3Q7Cit9CisKIGludCBpOTE1X2dlbV9yZXNldF9wcmVwYXJlKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CisJc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0OwogCWVudW0gaW50ZWxfZW5naW5lX2lk IGlkOwogCWludCBlcnIgPSAwOwogCi0JLyogRW5zdXJlIGlycSBoYW5kbGVyIGZpbmlzaGVzLCBh bmQgbm90IHJ1biBhZ2Fpbi4gKi8KIAlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwg aWQpIHsKLQkJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0ID0gTlVMTDsKLQot CQkvKiBQcmV2ZW50IHRoZSBzaWduYWxlciB0aHJlYWQgZnJvbSB1cGRhdGluZyB0aGUgcmVxdWVz dAotCQkgKiBzdGF0ZSAoYnkgY2FsbGluZyBkbWFfZmVuY2Vfc2lnbmFsKSBhcyB3ZSBhcmUgcHJv Y2Vzc2luZwotCQkgKiB0aGUgcmVzZXQuIFRoZSB3cml0ZSBmcm9tIHRoZSBHUFUgb2YgdGhlIHNl cW5vIGlzCi0JCSAqIGFzeW5jaHJvbm91cyBhbmQgdGhlIHNpZ25hbGVyIHRocmVhZCBtYXkgc2Vl IGEgZGlmZmVyZW50Ci0JCSAqIHZhbHVlIHRvIHVzIGFuZCBkZWNsYXJlIHRoZSByZXF1ZXN0IGNv bXBsZXRlLCBldmVuIHRob3VnaAotCQkgKiB0aGUgcmVzZXQgcm91dGluZSBoYXZlIHBpY2tlZCB0 aGF0IHJlcXVlc3QgYXMgdGhlIGFjdGl2ZQotCQkgKiAoaW5jb21wbGV0ZSkgcmVxdWVzdC4gVGhp cyBjb25mbGljdCBpcyBub3QgaGFuZGxlZAotCQkgKiBncmFjZWZ1bGx5IQotCQkgKi8KLQkJa3Ro cmVhZF9wYXJrKGVuZ2luZS0+YnJlYWRjcnVtYnMuc2lnbmFsZXIpOwotCi0JCS8qIFByZXZlbnQg cmVxdWVzdCBzdWJtaXNzaW9uIHRvIHRoZSBoYXJkd2FyZSB1bnRpbCB3ZSBoYXZlCi0JCSAqIGNv bXBsZXRlZCB0aGUgcmVzZXQgaW4gaTkxNV9nZW1fcmVzZXRfZmluaXNoKCkuIElmIGEgcmVxdWVz dAotCQkgKiBpcyBjb21wbGV0ZWQgYnkgb25lIGVuZ2luZSwgaXQgbWF5IHRoZW4gcXVldWUgYSBy ZXF1ZXN0Ci0JCSAqIHRvIGEgc2Vjb25kIHZpYSBpdHMgZW5naW5lLT5pcnFfdGFza2xldCAqanVz dCogYXMgd2UgYXJlCi0JCSAqIGNhbGxpbmcgZW5naW5lLT5pbml0X2h3KCkgYW5kIGFsc28gd3Jp dGluZyB0aGUgRUxTUC4KLQkJICogVHVybmluZyBvZmYgdGhlIGVuZ2luZS0+aXJxX3Rhc2tsZXQg dW50aWwgdGhlIHJlc2V0IGlzIG92ZXIKLQkJICogcHJldmVudHMgdGhlIHJhY2UuCi0JCSAqLwot CQl0YXNrbGV0X2tpbGwoJmVuZ2luZS0+aXJxX3Rhc2tsZXQpOwotCQl0YXNrbGV0X2Rpc2FibGUo JmVuZ2luZS0+aXJxX3Rhc2tsZXQpOwotCi0JCWlmIChlbmdpbmUtPmlycV9zZXFub19iYXJyaWVy KQotCQkJZW5naW5lLT5pcnFfc2Vxbm9fYmFycmllcihlbmdpbmUpOwotCi0JCWlmIChlbmdpbmVf c3RhbGxlZChlbmdpbmUpKSB7Ci0JCQlyZXF1ZXN0ID0gaTkxNV9nZW1fZmluZF9hY3RpdmVfcmVx dWVzdChlbmdpbmUpOwotCQkJaWYgKHJlcXVlc3QgJiYgcmVxdWVzdC0+ZmVuY2UuZXJyb3IgPT0g LUVJTykKLQkJCQllcnIgPSAtRUlPOyAvKiBQcmV2aW91cyByZXNldCBmYWlsZWQhICovCisJCXJl cXVlc3QgPSBpOTE1X2dlbV9yZXNldF9wcmVwYXJlX2VuZ2luZShlbmdpbmUpOworCQlpZiAoSVNf RVJSKHJlcXVlc3QpKSB7CisJCQllcnIgPSBQVFJfRVJSKHJlcXVlc3QpOworCQkJYnJlYWs7CiAJ CX0KIAogCQllbmdpbmUtPmhhbmdjaGVjay5hY3RpdmVfcmVxdWVzdCA9IHJlcXVlc3Q7CkBAIC0y OTIyLDggKzI5MzgsOCBAQCBzdGF0aWMgYm9vbCBpOTE1X2dlbV9yZXNldF9yZXF1ZXN0KHN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIAlyZXR1cm4gZ3VpbHR5OwogfQogCi1z dGF0aWMgdm9pZCBpOTE1X2dlbV9yZXNldF9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lLAotCQkJCSAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQordm9p ZCBpOTE1X2dlbV9yZXNldF9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAor CQkJICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogewogCWlmIChyZXF1 ZXN0ICYmIGk5MTVfZ2VtX3Jlc2V0X3JlcXVlc3QocmVxdWVzdCkpIHsKIAkJRFJNX0RFQlVHX0RS SVZFUigicmVzZXR0aW5nICVzIHRvIHJlc3RhcnQgZnJvbSB0YWlsIG9mIHJlcXVlc3QgMHgleFxu IiwKQEAgLTI5NjYsNiArMjk4MiwxMiBAQCB2b2lkIGk5MTVfZ2VtX3Jlc2V0KHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAl9CiB9CiAKK3ZvaWQgaTkxNV9nZW1fcmVzZXRfZmlu aXNoX2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7CisJdGFza2xldF9l bmFibGUoJmVuZ2luZS0+aXJxX3Rhc2tsZXQpOworCWt0aHJlYWRfdW5wYXJrKGVuZ2luZS0+YnJl YWRjcnVtYnMuc2lnbmFsZXIpOworfQorCiB2b2lkIGk5MTVfZ2VtX3Jlc2V0X2ZpbmlzaChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lOwpAQCAtMjk3MywxMCArMjk5NSw4IEBAIHZvaWQgaTkxNV9nZW1fcmVzZXRfZmlu aXNoKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogCWxvY2tkZXBfYXNzZXJ0 X2hlbGQoJmRldl9wcml2LT5kcm0uc3RydWN0X211dGV4KTsKIAotCWZvcl9lYWNoX2VuZ2luZShl bmdpbmUsIGRldl9wcml2LCBpZCkgewotCQl0YXNrbGV0X2VuYWJsZSgmZW5naW5lLT5pcnFfdGFz a2xldCk7Ci0JCWt0aHJlYWRfdW5wYXJrKGVuZ2luZS0+YnJlYWRjcnVtYnMuc2lnbmFsZXIpOwot CX0KKwlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpCisJCWk5MTVfZ2VtX3Jl c2V0X2ZpbmlzaF9lbmdpbmUoZW5naW5lKTsKIH0KIAogc3RhdGljIHZvaWQgbm9wX3N1Ym1pdF9y ZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKLS0gCjIuMTEuMAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==