From: Michel Thierry Subject: [PATCH v6 05/20] drm/i915/tdr: Add support for per engine reset recovery Date: Tue, 18 Apr 2017 13:23:20 -0700 Message-ID: <20170418202335.35232-6-michel.thierry@intel.com> References: <20170418202335.35232-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 611DD6E1AF for ; Tue, 18 Apr 2017 20:23:36 +0000 (UTC) In-Reply-To: <20170418202335.35232-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 RnJvbTogQXJ1biBTaWx1dmVyeSA8YXJ1bi5zaWx1dmVyeUBsaW51eC5pbnRlbC5jb20+CgpUaGlz IGNoYW5nZSBpbXBsZW1lbnRzIHN1cHBvcnQgZm9yIHBlci1lbmdpbmUgcmVzZXQgYXMgYW4gaW5p dGlhbCwgbGVzcwppbnRydXNpdmUgaGFuZyByZWNvdmVyeSBvcHRpb24gdG8gYmUgYXR0ZW1wdGVk IGJlZm9yZSBmYWxsaW5nIGJhY2sgdG8gdGhlCmxlZ2FjeSBmdWxsIEdQVSByZXNldCByZWNvdmVy eSBtb2RlIGlmIG5lY2Vzc2FyeS4gVGhpcyBpcyBvbmx5IHN1cHBvcnRlZApmcm9tIEdlbjggb253 YXJkcy4KCkhhbmdjaGVja2VyIGRldGVybWluZXMgd2hpY2ggZW5naW5lcyBhcmUgaHVuZyBhbmQg aW52b2tlcyBlcnJvciBoYW5kbGVyIHRvCnJlY292ZXIgZnJvbSBpdC4gRXJyb3IgaGFuZGxlciBz Y2hlZHVsZXMgcmVjb3ZlcnkgZm9yIGVhY2ggb2YgdGhvc2UgZW5naW5lcwp0aGF0IGFyZSBodW5n LiBUaGUgcmVjb3ZlcnkgcHJvY2VkdXJlIGlzIGFzIGZvbGxvd3MsCiAtIGlkZW50aWZpZXMgdGhl IHJlcXVlc3QgdGhhdCBjYXVzZWQgdGhlIGhhbmcgYW5kIGl0IGlzIGRyb3BwZWQKIC0gZm9yY2Ug ZW5naW5lIHRvIGlkbGU6IHRoaXMgaXMgZG9uZSBieSBpc3N1aW5nIGEgcmVzZXQgcmVxdWVzdAog LSByZXNldCBhbmQgcmUtaW5pdCBlbmdpbmUKIC0gcmVzdGFydCBzdWJtaXNzaW9ucyB0byB0aGUg ZW5naW5lCgpJZiBlbmdpbmUgcmVzZXQgZmFpbHMgdGhlbiB3ZSBmYWxsIGJhY2sgdG8gaGVhdnkg d2VpZ2h0IGZ1bGwgZ3B1IHJlc2V0CndoaWNoIHJlc2V0cyBhbGwgZW5naW5lcyBhbmQgcmVpbml0 aWF6ZXMgY29tcGxldGUgc3RhdGUgb2YgSFcgYW5kIFNXLgoKdjI6IFJlYmFzZS4KdjM6IHMvKmVu Z2luZV9yZXNldCovKnJlc2V0X2VuZ2luZSovOyBmcmVlemUgZW5naW5lIGFuZCBpcnFzIGJlZm9y ZQpjYWxsaW5nIGk5MTVfZ2VtX3Jlc2V0X2VuZ2luZSAoQ2hyaXMpLgp2NDogUmViYXNlLCBtb2Rp ZnkgaTkxNV9nZW1fcmVzZXRfcHJlcGFyZSB0byB1c2UgYSByaW5nIG1hc2sgYW5kCnJldXNlIHRo ZSBmdW5jdGlvbiBmb3IgcmVzZXRfZW5naW5lLgp2NTogaW50ZWxfcmVzZXRfZW5naW5lX3N0YXJ0 L2NhbmNlbCBpbnN0ZWFkIG9mIHJlcXVlc3QvdW5yZXF1ZXN0X3Jlc2V0Lgp2NjogQ2xlYW4gdXAg cmVzZXRfZW5naW5lIGZ1bmN0aW9uIHRvIG5vdCByZXF1aXJlIG11dGV4LCBpLmUuIG5vIG5lZWQg dG8gY2FsbApyZXZva2UvcmVzdG9yZV9mZW5jZXMgYW5kIF9yZXRpcmVfcmVxdWVzdHMgKENocmlz KS4KCkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IE1pa2Eg S3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBU b21hcyBFbGYgPHRvbWFzLmVsZkBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEFydW4gU2lsdXZl cnkgPGFydW4uc2lsdXZlcnlAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNaWNoZWwg VGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmMgICAgICAgICB8IDc2ICsrKysrKysrKysrKysrKysrKysrKysrKy0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgfCAxMiArKystCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgfCA5NyArKysrKysrKysrKysrKysrKysr LS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYyB8 ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyAgICAgfCAyMCArKysr KysrCiA1IGZpbGVzIGNoYW5nZWQsIDE1OCBpbnNlcnRpb25zKCspLCA0OSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCBlMDNkMDY0M2RiZDYuLjYzNDg5M2NkOTNiMyAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC0xODEwLDcgKzE4MTAsNyBAQCB2b2lkIGk5MTVf cmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJcHJfbm90aWNlKCJk cm0vaTkxNTogUmVzZXR0aW5nIGNoaXAgYWZ0ZXIgZ3B1IGhhbmdcbiIpOwogCWRpc2FibGVfaXJx KGRldl9wcml2LT5kcm0uaXJxKTsKLQlyZXQgPSBpOTE1X2dlbV9yZXNldF9wcmVwYXJlKGRldl9w cml2KTsKKwlyZXQgPSBpOTE1X2dlbV9yZXNldF9wcmVwYXJlKGRldl9wcml2LCBBTExfRU5HSU5F Uyk7CiAJaWYgKHJldCkgewogCQlEUk1fRVJST1IoIkdQVSByZWNvdmVyeSBmYWlsZWRcbiIpOwog CQlpbnRlbF9ncHVfcmVzZXQoZGV2X3ByaXYsIEFMTF9FTkdJTkVTKTsKQEAgLTE4NTIsNyArMTg1 Miw3IEBAIHZvaWQgaTkxNV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAJaTkxNV9xdWV1ZV9oYW5nY2hlY2soZGV2X3ByaXYpOwogCiBmaW5pc2g6Ci0JaTkxNV9nZW1f cmVzZXRfZmluaXNoKGRldl9wcml2KTsKKwlpOTE1X2dlbV9yZXNldF9maW5pc2goZGV2X3ByaXYs IEFMTF9FTkdJTkVTKTsKIAllbmFibGVfaXJxKGRldl9wcml2LT5kcm0uaXJxKTsKIAogd2FrZXVw OgpAQCAtMTg3MSwxMSArMTg3MSw3OSBAQCB2b2lkIGk5MTVfcmVzZXQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogICoKICAqIFJlc2V0IGEgc3BlY2lmaWMgR1BVIGVuZ2luZS4g VXNlZnVsIGlmIGEgaGFuZyBpcyBkZXRlY3RlZC4KICAqIFJldHVybnMgemVybyBvbiBzdWNjZXNz ZnVsIHJlc2V0IG9yIG90aGVyd2lzZSBhbiBlcnJvciBjb2RlLgorICoKKyAqIFByb2NlZHVyZSBp czoKKyAqICAtIGlkZW50aWZpZXMgdGhlIHJlcXVlc3QgdGhhdCBjYXVzZWQgdGhlIGhhbmcgYW5k IGl0IGlzIGRyb3BwZWQKKyAqICAtIGZvcmNlIGVuZ2luZSB0byBpZGxlOiB0aGlzIGlzIGRvbmUg YnkgaXNzdWluZyBhIHJlc2V0IHJlcXVlc3QKKyAqICAtIHJlc2V0IGVuZ2luZQorICogIC0gcmVz dGFydCBzdWJtaXNzaW9ucyB0byB0aGUgZW5naW5lCiAgKi8KIGludCBpOTE1X3Jlc2V0X2VuZ2lu ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7Ci0JLyogRklYTUU6IHJlcGxhY2Ug bWUgd2l0aCBlbmdpbmUgcmVzZXQgc2VxdWVuY2UgKi8KLQlyZXR1cm4gLUVOT0RFVjsKKwlpbnQg cmV0OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+aTkxNTsK KwlzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yID0gJmRldl9wcml2LT5ncHVfZXJyb3I7CisK KwlHRU1fQlVHX09OKCF0ZXN0X2JpdChJOTE1X1JFU0VUX0JBQ0tPRkYsICZlcnJvci0+ZmxhZ3Mp KTsKKworCURSTV9ERUJVR19EUklWRVIoInJlc2V0dGluZyAlc1xuIiwgZW5naW5lLT5uYW1lKTsK KworCS8qCisJICogV2UgbmVlZCB0byBmaXJzdCBpZGxlIHRoZSBlbmdpbmUgYnkgaXNzdWluZyBh IHJlc2V0IHJlcXVlc3QsCisJICogdGhlbiBwZXJmb3JtIHNvZnQgcmVzZXQgYW5kIHJlLWluaXRp YWxpemUgaHcgc3RhdGUsIGZvciBhbGwgb2YKKwkgKiB0aGlzIEdUIHBvd2VyIG5lZWQgdG8gYmUg YXdha2Ugc28gZW5zdXJlIGl0IGRvZXMgdGhyb3VnaG91dCB0aGUKKwkgKiBwcm9jZXNzCisJICov CisJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9nZXQoZGV2X3ByaXYsIEZPUkNFV0FLRV9BTEwpOwor CisJZGlzYWJsZV9pcnEoZGV2X3ByaXYtPmRybS5pcnEpOworCXJldCA9IGk5MTVfZ2VtX3Jlc2V0 X3ByZXBhcmVfZW5naW5lKGVuZ2luZSk7CisJaWYgKHJldCkgeworCQlEUk1fRVJST1IoIlByZXZp b3VzIHJlc2V0IGZhaWxlZCAtIHByb21vdGUgdG8gZnVsbCByZXNldFxuIik7CisJCWdvdG8gZXJy b3I7CisJfQorCisJLyoKKwkgKiB0aGUgcmVxdWVzdCB0aGF0IGNhdXNlZCB0aGUgaGFuZyBpcyBz dHVjayBvbiBlbHNwLCBpZGVudGlmeSB0aGUKKwkgKiBhY3RpdmUgcmVxdWVzdCBhbmQgZHJvcCBp dCwgYWRqdXN0IGhlYWQgdG8gc2tpcCB0aGUgb2ZmZW5kaW5nCisJICogcmVxdWVzdCB0byByZXN1 bWUgZXhlY3V0aW5nIHJlbWFpbmluZyByZXF1ZXN0cyBpbiB0aGUgcXVldWUuCisJICovCisJaTkx NV9nZW1fcmVzZXRfZW5naW5lKGVuZ2luZSk7CisKKwkvKiBmb3JjaW5nIGVuZ2luZSB0byBpZGxl ICovCisJcmV0ID0gaW50ZWxfcmVzZXRfZW5naW5lX3N0YXJ0KGVuZ2luZSk7CisJaWYgKHJldCkg eworCQlEUk1fRVJST1IoIkZhaWxlZCB0byBkaXNhYmxlICVzXG4iLCBlbmdpbmUtPm5hbWUpOwor CQlnb3RvIGVycm9yOworCX0KKworCS8qIGZpbmFsbHksIHJlc2V0IGVuZ2luZSAqLworCXJldCA9 IGludGVsX2dwdV9yZXNldChkZXZfcHJpdiwgaW50ZWxfZW5naW5lX2ZsYWcoZW5naW5lKSk7CisJ aWYgKHJldCkgeworCQlEUk1fRVJST1IoIkZhaWxlZCB0byByZXNldCAlcywgcmV0PSVkXG4iLCBl bmdpbmUtPm5hbWUsIHJldCk7CisJCWludGVsX3Jlc2V0X2VuZ2luZV9jYW5jZWwoZW5naW5lKTsK KwkJZ290byBlcnJvcjsKKwl9CisKKwkvKiBiZSBzdXJlIHRoZSByZXF1ZXN0IHJlc2V0IGJpdCBn ZXRzIGNsZWFyZWQgKi8KKwlpbnRlbF9yZXNldF9lbmdpbmVfY2FuY2VsKGVuZ2luZSk7CisKKwlp OTE1X2dlbV9yZXNldF9maW5pc2hfZW5naW5lKGVuZ2luZSk7CisKKwkvKiByZXBsYXkgcmVtYWlu aW5nIHJlcXVlc3RzIGluIHRoZSBxdWV1ZSAqLworCXJldCA9IGVuZ2luZS0+aW5pdF9odyhlbmdp bmUpOworCWlmIChyZXQpCisJCWdvdG8gZXJyb3I7CisKK3dha2V1cDoKKwllbmFibGVfaXJxKGRl dl9wcml2LT5kcm0uaXJxKTsKKwlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3B1dChkZXZfcHJpdiwg Rk9SQ0VXQUtFX0FMTCk7CisJd2FrZV91cF9iaXQoJmVycm9yLT5mbGFncywgSTkxNV9SRVNFVF9I QU5ET0ZGKTsKKwlyZXR1cm4gcmV0OworCitlcnJvcjoKKwkvKiB1c2UgZnVsbCBncHUgcmVzZXQg dG8gcmVjb3ZlciBvbiBlcnJvciAqLworCWdvdG8gd2FrZXVwOwogfQogCiBzdGF0aWMgaW50IGk5 MTVfcG1fc3VzcGVuZChzdHJ1Y3QgZGV2aWNlICprZGV2KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK aW5kZXggN2JjNWY1NTJhZGQ3Li5lYjNlNWJjZGE0NzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aApAQCAtMzAyNSw2ICszMDI1LDggQEAgZXh0ZXJuIGJvb2wgaW50ZWxfaGFzX2dwdV9yZXNldChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogZXh0ZXJuIHZvaWQgaTkxNV9yZXNl dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogZXh0ZXJuIGludCBpOTE1X3Jl c2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogZXh0ZXJuIGJvb2wg aW50ZWxfaGFzX3Jlc2V0X2VuZ2luZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp OworZXh0ZXJuIGludCBpbnRlbF9yZXNldF9lbmdpbmVfc3RhcnQoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lKTsKK2V4dGVybiB2b2lkIGludGVsX3Jlc2V0X2VuZ2luZV9jYW5jZWwoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIGV4dGVybiBpbnQgaW50ZWxfZ3VjX3Jlc2V0 KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiBleHRlcm4gdm9pZCBpbnRlbF9l bmdpbmVfaW5pdF9oYW5nY2hlY2soc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIGV4 dGVybiB2b2lkIGludGVsX2hhbmdjaGVja19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdik7CkBAIC0zNDEzLDcgKzM0MTUsNiBAQCBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2Vt X3NldF9nbG9iYWxfc2Vxbm8oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdTMyIHNlcW5vKTsKIAog c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICoKIGk5MTVfZ2VtX2ZpbmRfYWN0aXZlX3JlcXVl c3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKLQogdm9pZCBpOTE1X2dlbV9yZXRp cmVfcmVxdWVzdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIAogc3RhdGlj IGlubGluZSBib29sIGk5MTVfcmVzZXRfYmFja29mZihzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVy cm9yKQpAQCAtMzQ0MSwxMSArMzQ0MiwxNiBAQCBzdGF0aWMgaW5saW5lIHUzMiBpOTE1X3Jlc2V0 X2NvdW50KHN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJyb3IpCiAJcmV0dXJuIFJFQURfT05DRShl cnJvci0+cmVzZXRfY291bnQpOwogfQogCi1pbnQgaTkxNV9nZW1fcmVzZXRfcHJlcGFyZShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOworaW50IGk5MTVfZ2VtX3Jlc2V0X3ByZXBh cmVfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CitpbnQgaTkxNV9nZW1f cmVzZXRfcHJlcGFyZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkgICB1 bnNpZ25lZCBpbnQgZW5naW5lX21hc2spOwogdm9pZCBpOTE1X2dlbV9yZXNldChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwotdm9pZCBpOTE1X2dlbV9yZXNldF9maW5pc2goc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKK3ZvaWQgaTkxNV9nZW1fcmVzZXRfZmlu aXNoX2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwordm9pZCBpOTE1X2dl bV9yZXNldF9maW5pc2goc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJICAg dW5zaWduZWQgaW50IGVuZ2luZV9tYXNrKTsKIHZvaWQgaTkxNV9nZW1fc2V0X3dlZGdlZChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogYm9vbCBpOTE1X2dlbV91bnNldF93ZWRn ZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKK3ZvaWQgaTkxNV9nZW1fcmVz ZXRfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiAKIHZvaWQgaTkxNV9n ZW1faW5pdF9tbWlvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KTsKIGludCBfX211c3Rf Y2hlY2sgaTkxNV9nZW1faW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggMzNmYjExY2M1YWNjLi5iY2UzODA2MmY5NGUgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjc5Myw0OCArMjc5Myw1NyBAQCBzdGF0aWMgYm9v bCBlbmdpbmVfc3RhbGxlZChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJcmV0dXJu IHRydWU7CiB9CiAKLWludCBpOTE1X2dlbV9yZXNldF9wcmVwYXJlKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKKy8qIEVuc3VyZSBpcnEgaGFuZGxlciBmaW5pc2hlcywgYW5kIG5v dCBydW4gYWdhaW4uICovCitpbnQgaTkxNV9nZW1fcmVzZXRfcHJlcGFyZV9lbmdpbmUoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewotCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZTsKLQllbnVtIGludGVsX2VuZ2luZV9pZCBpZDsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcXVlc3Q7CiAJaW50IGVyciA9IDA7CiAKLQkvKiBFbnN1cmUgaXJxIGhhbmRsZXIg ZmluaXNoZXMsIGFuZCBub3QgcnVuIGFnYWluLiAqLwotCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUs IGRldl9wcml2LCBpZCkgewotCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3Q7 Ci0KLQkJLyogUHJldmVudCB0aGUgc2lnbmFsZXIgdGhyZWFkIGZyb20gdXBkYXRpbmcgdGhlIHJl cXVlc3QKLQkJICogc3RhdGUgKGJ5IGNhbGxpbmcgZG1hX2ZlbmNlX3NpZ25hbCkgYXMgd2UgYXJl IHByb2Nlc3NpbmcKLQkJICogdGhlIHJlc2V0LiBUaGUgd3JpdGUgZnJvbSB0aGUgR1BVIG9mIHRo ZSBzZXFubyBpcwotCQkgKiBhc3luY2hyb25vdXMgYW5kIHRoZSBzaWduYWxlciB0aHJlYWQgbWF5 IHNlZSBhIGRpZmZlcmVudAotCQkgKiB2YWx1ZSB0byB1cyBhbmQgZGVjbGFyZSB0aGUgcmVxdWVz dCBjb21wbGV0ZSwgZXZlbiB0aG91Z2gKLQkJICogdGhlIHJlc2V0IHJvdXRpbmUgaGF2ZSBwaWNr ZWQgdGhhdCByZXF1ZXN0IGFzIHRoZSBhY3RpdmUKLQkJICogKGluY29tcGxldGUpIHJlcXVlc3Qu IFRoaXMgY29uZmxpY3QgaXMgbm90IGhhbmRsZWQKLQkJICogZ3JhY2VmdWxseSEKLQkJICovCi0J CWt0aHJlYWRfcGFyayhlbmdpbmUtPmJyZWFkY3J1bWJzLnNpZ25hbGVyKTsKLQotCQkvKiBQcmV2 ZW50IHJlcXVlc3Qgc3VibWlzc2lvbiB0byB0aGUgaGFyZHdhcmUgdW50aWwgd2UgaGF2ZQotCQkg KiBjb21wbGV0ZWQgdGhlIHJlc2V0IGluIGk5MTVfZ2VtX3Jlc2V0X2ZpbmlzaCgpLiBJZiBhIHJl cXVlc3QKLQkJICogaXMgY29tcGxldGVkIGJ5IG9uZSBlbmdpbmUsIGl0IG1heSB0aGVuIHF1ZXVl IGEgcmVxdWVzdAotCQkgKiB0byBhIHNlY29uZCB2aWEgaXRzIGVuZ2luZS0+aXJxX3Rhc2tsZXQg Kmp1c3QqIGFzIHdlIGFyZQotCQkgKiBjYWxsaW5nIGVuZ2luZS0+aW5pdF9odygpIGFuZCBhbHNv IHdyaXRpbmcgdGhlIEVMU1AuCi0JCSAqIFR1cm5pbmcgb2ZmIHRoZSBlbmdpbmUtPmlycV90YXNr bGV0IHVudGlsIHRoZSByZXNldCBpcyBvdmVyCi0JCSAqIHByZXZlbnRzIHRoZSByYWNlLgotCQkg Ki8KLQkJdGFza2xldF9raWxsKCZlbmdpbmUtPmlycV90YXNrbGV0KTsKLQkJdGFza2xldF9kaXNh YmxlKCZlbmdpbmUtPmlycV90YXNrbGV0KTsKIAotCQlpZiAoZW5naW5lLT5pcnFfc2Vxbm9fYmFy cmllcikKLQkJCWVuZ2luZS0+aXJxX3NlcW5vX2JhcnJpZXIoZW5naW5lKTsKKwkvKiBQcmV2ZW50 IHRoZSBzaWduYWxlciB0aHJlYWQgZnJvbSB1cGRhdGluZyB0aGUgcmVxdWVzdAorCSAqIHN0YXRl IChieSBjYWxsaW5nIGRtYV9mZW5jZV9zaWduYWwpIGFzIHdlIGFyZSBwcm9jZXNzaW5nCisJICog dGhlIHJlc2V0LiBUaGUgd3JpdGUgZnJvbSB0aGUgR1BVIG9mIHRoZSBzZXFubyBpcworCSAqIGFz eW5jaHJvbm91cyBhbmQgdGhlIHNpZ25hbGVyIHRocmVhZCBtYXkgc2VlIGEgZGlmZmVyZW50CisJ ICogdmFsdWUgdG8gdXMgYW5kIGRlY2xhcmUgdGhlIHJlcXVlc3QgY29tcGxldGUsIGV2ZW4gdGhv dWdoCisJICogdGhlIHJlc2V0IHJvdXRpbmUgaGF2ZSBwaWNrZWQgdGhhdCByZXF1ZXN0IGFzIHRo ZSBhY3RpdmUKKwkgKiAoaW5jb21wbGV0ZSkgcmVxdWVzdC4gVGhpcyBjb25mbGljdCBpcyBub3Qg aGFuZGxlZAorCSAqIGdyYWNlZnVsbHkhCisJICovCisJa3RocmVhZF9wYXJrKGVuZ2luZS0+YnJl YWRjcnVtYnMuc2lnbmFsZXIpOworCisJLyogUHJldmVudCByZXF1ZXN0IHN1Ym1pc3Npb24gdG8g dGhlIGhhcmR3YXJlIHVudGlsIHdlIGhhdmUKKwkgKiBjb21wbGV0ZWQgdGhlIHJlc2V0IGluIGk5 MTVfZ2VtX3Jlc2V0X2ZpbmlzaCgpLiBJZiBhIHJlcXVlc3QKKwkgKiBpcyBjb21wbGV0ZWQgYnkg b25lIGVuZ2luZSwgaXQgbWF5IHRoZW4gcXVldWUgYSByZXF1ZXN0CisJICogdG8gYSBzZWNvbmQg dmlhIGl0cyBlbmdpbmUtPmlycV90YXNrbGV0ICpqdXN0KiBhcyB3ZSBhcmUKKwkgKiBjYWxsaW5n IGVuZ2luZS0+aW5pdF9odygpIGFuZCBhbHNvIHdyaXRpbmcgdGhlIEVMU1AuCisJICogVHVybmlu ZyBvZmYgdGhlIGVuZ2luZS0+aXJxX3Rhc2tsZXQgdW50aWwgdGhlIHJlc2V0IGlzIG92ZXIKKwkg KiBwcmV2ZW50cyB0aGUgcmFjZS4KKwkgKi8KKwl0YXNrbGV0X2tpbGwoJmVuZ2luZS0+aXJxX3Rh c2tsZXQpOworCXRhc2tsZXRfZGlzYWJsZSgmZW5naW5lLT5pcnFfdGFza2xldCk7CiAKLQkJaWYg KGVuZ2luZV9zdGFsbGVkKGVuZ2luZSkpIHsKLQkJCXJlcXVlc3QgPSBpOTE1X2dlbV9maW5kX2Fj dGl2ZV9yZXF1ZXN0KGVuZ2luZSk7Ci0JCQlpZiAocmVxdWVzdCAmJiByZXF1ZXN0LT5mZW5jZS5l cnJvciA9PSAtRUlPKQotCQkJCWVyciA9IC1FSU87IC8qIFByZXZpb3VzIHJlc2V0IGZhaWxlZCEg Ki8KLQkJfQorCWlmIChlbmdpbmUtPmlycV9zZXFub19iYXJyaWVyKQorCQllbmdpbmUtPmlycV9z ZXFub19iYXJyaWVyKGVuZ2luZSk7CisKKwlpZiAoZW5naW5lX3N0YWxsZWQoZW5naW5lKSkgewor CQlyZXF1ZXN0ID0gaTkxNV9nZW1fZmluZF9hY3RpdmVfcmVxdWVzdChlbmdpbmUpOworCQlpZiAo cmVxdWVzdCAmJiByZXF1ZXN0LT5mZW5jZS5lcnJvciA9PSAtRUlPKQorCQkJZXJyID0gLUVJTzsg LyogUHJldmlvdXMgcmVzZXQgZmFpbGVkISAqLwogCX0KIAorCXJldHVybiBlcnI7Cit9CisKK2lu dCBpOTE1X2dlbV9yZXNldF9wcmVwYXJlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKKwkJCSAgIHVuc2lnbmVkIGludCBlbmdpbmVfbWFzaykKK3sKKwlzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmU7CisJdW5zaWduZWQgaW50IHRtcDsKKwlpbnQgZXJyID0gMDsKKworCWZv cl9lYWNoX2VuZ2luZV9tYXNrZWQoZW5naW5lLCBkZXZfcHJpdiwgZW5naW5lX21hc2ssIHRtcCkK KwkJZXJyID0gaTkxNV9nZW1fcmVzZXRfcHJlcGFyZV9lbmdpbmUoZW5naW5lKTsKKwogCWk5MTVf Z2VtX3Jldm9rZV9mZW5jZXMoZGV2X3ByaXYpOwogCiAJcmV0dXJuIGVycjsKQEAgLTI5MjAsNyAr MjkyOSw3IEBAIHN0YXRpYyBib29sIGk5MTVfZ2VtX3Jlc2V0X3JlcXVlc3Qoc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogCXJldHVybiBndWlsdHk7CiB9CiAKLXN0YXRpYyB2 b2lkIGk5MTVfZ2VtX3Jlc2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp Cit2b2lkIGk5MTVfZ2VtX3Jlc2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0OwogCkBAIC0yOTY2 LDE2ICsyOTc1LDIyIEBAIHZvaWQgaTkxNV9nZW1fcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogCX0KIH0KIAotdm9pZCBpOTE1X2dlbV9yZXNldF9maW5pc2goc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQordm9pZCBpOTE1X2dlbV9yZXNldF9maW5pc2hf ZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwl0YXNrbGV0X2VuYWJs ZSgmZW5naW5lLT5pcnFfdGFza2xldCk7CisJa3RocmVhZF91bnBhcmsoZW5naW5lLT5icmVhZGNy dW1icy5zaWduYWxlcik7Cit9CisKK3ZvaWQgaTkxNV9nZW1fcmVzZXRfZmluaXNoKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCSAgIHVuc2lnbmVkIGludCBlbmdpbmVfbWFz aykKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7Ci0JZW51bSBpbnRlbF9lbmdp bmVfaWQgaWQ7CisJdW5zaWduZWQgaW50IHRtcDsKIAogCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmRl dl9wcml2LT5kcm0uc3RydWN0X211dGV4KTsKIAotCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRl dl9wcml2LCBpZCkgewotCQl0YXNrbGV0X2VuYWJsZSgmZW5naW5lLT5pcnFfdGFza2xldCk7Ci0J CWt0aHJlYWRfdW5wYXJrKGVuZ2luZS0+YnJlYWRjcnVtYnMuc2lnbmFsZXIpOworCWZvcl9lYWNo X2VuZ2luZV9tYXNrZWQoZW5naW5lLCBkZXZfcHJpdiwgZW5naW5lX21hc2ssIHRtcCkgeworCQlp OTE1X2dlbV9yZXNldF9maW5pc2hfZW5naW5lKGVuZ2luZSk7CiAJfQogfQogCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMKaW5kZXggMDk1Y2NjYzJlOGIyLi4wODU0MDVlNTVh MjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMKQEAgLTEyMDUsNyAr MTIwNSw3IEBAIGxvbmcgaTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXEsCiAJcmV0dXJuIHRpbWVvdXQ7CiB9CiAKLXN0YXRpYyB2b2lkIGVuZ2luZV9yZXRp cmVfcmVxdWVzdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQordm9pZCBlbmdpbmVf cmV0aXJlX3JlcXVlc3RzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QsICpuZXh0OwogCXUzMiBzZXFubyA9IGlu dGVsX2VuZ2luZV9nZXRfc2Vxbm8oZW5naW5lKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3VuY29yZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3Jl LmMKaW5kZXggYWI1YmRkMTEwYWMzLi4zZWJiYTZiMmRkNzQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3VuY29yZS5jCkBAIC0xODAxLDYgKzE4MDEsMjYgQEAgaW50IGludGVsX2d1Y19yZXNldChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJcmV0dXJuIHJldDsKIH0KIAorLyoK KyAqIE9uIGdlbjgrIGEgcmVzZXQgcmVxdWVzdCBoYXMgdG8gYmUgaXNzdWVkIHZpYSB0aGUgcmVz ZXQgY29udHJvbCByZWdpc3RlcgorICogYmVmb3JlIGEgR1BVIGVuZ2luZSBjYW4gYmUgcmVzZXQg aW4gb3JkZXIgdG8gc3RvcCB0aGUgY29tbWFuZCBzdHJlYW1lcgorICogYW5kIGlkbGUgdGhlIGVu Z2luZS4gVGhpcyByZXBsYWNlcyB0aGUgbGVnYWN5IHdheSBvZiBzdG9wcGluZyBhbiBlbmdpbmUK KyAqIGJ5IHdyaXRpbmcgdG8gdGhlIHN0b3AgcmluZyBiaXQgaW4gdGhlIE1JX01PREUgcmVnaXN0 ZXIuCisgKi8KK2ludCBpbnRlbF9yZXNldF9lbmdpbmVfc3RhcnQoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lKQoreworCXJldHVybiBnZW44X3Jlc2V0X2VuZ2luZV9zdGFydChlbmdpbmUp OworfQorCisvKgorICogSXQgaXMgcG9zc2libGUgdG8gYmFjayBvZmYgZnJvbSBhIHByZXZpb3Vz bHkgaXNzdWVkIHJlc2V0IHJlcXVlc3QgYnkgc2ltcGx5CisgKiBjbGVhcmluZyB0aGUgcmVzZXQg cmVxdWVzdCBiaXQgaW4gdGhlIHJlc2V0IGNvbnRyb2wgcmVnaXN0ZXIuCisgKi8KK3ZvaWQgaW50 ZWxfcmVzZXRfZW5naW5lX2NhbmNlbChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7 CisJZ2VuOF9yZXNldF9lbmdpbmVfY2FuY2VsKGVuZ2luZSk7Cit9CisKIGJvb2wgaW50ZWxfdW5j b3JlX3VuY2xhaW1lZF9tbWlvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsK IAlyZXR1cm4gY2hlY2tfZm9yX3VuY2xhaW1lZF9tbWlvKGRldl9wcml2KTsKLS0gCjIuMTEuMAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==