From: Michel Thierry Subject: [PATCH v5 05/18] drm/i915/tdr: Add support for per engine reset recovery Date: Fri, 24 Mar 2017 18:29:57 -0700 Message-ID: <20170325013010.36244-6-michel.thierry@intel.com> References: <20170325013010.36244-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id CAFDB6EC9B for ; Sat, 25 Mar 2017 01:30:14 +0000 (UTC) In-Reply-To: <20170325013010.36244-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 ZSBmdW5jdGlvbiBmb3IgcmVzZXRfZW5naW5lLgoKQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy aXMtd2lsc29uLmNvLnVrPgpDYzogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBsaW51eC5p bnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFRvbWFzIEVsZiA8dG9tYXMuZWxmQGludGVsLmNvbT4K U2lnbmVkLW9mZi1ieTogQXJ1biBTaWx1dmVyeSA8YXJ1bi5zaWx1dmVyeUBsaW51eC5pbnRlbC5j b20+ClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICAgIHwgODggKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oICAgICAgICAgfCAxMSArKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YyAgICAgICAgIHwgMTYgKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1 ZXN0LmMgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgICAgIHwg MjAgKysrKysrKysKIDUgZmlsZXMgY2hhbmdlZCwgMTIyIGluc2VydGlvbnMoKyksIDE1IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4IGM3ZWI0M2RlYjMzZS4uOWM3YmRj ZjAzYzEzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTE4MzEsNyArMTgzMSw3IEBAIHZv aWQgaTkxNV9yZXNldF9jaGlwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAog CXByX25vdGljZSgiZHJtL2k5MTU6IFJlc2V0dGluZyBjaGlwIGFmdGVyIGdwdSBoYW5nXG4iKTsK IAlkaXNhYmxlX2lycShkZXZfcHJpdi0+ZHJtLmlycSk7Ci0JcmV0ID0gaTkxNV9nZW1fcmVzZXRf cHJlcGFyZShkZXZfcHJpdik7CisJcmV0ID0gaTkxNV9nZW1fcmVzZXRfcHJlcGFyZShkZXZfcHJp diwgQUxMX0VOR0lORVMpOwogCWlmIChyZXQpIHsKIAkJRFJNX0VSUk9SKCJHUFUgcmVjb3Zlcnkg ZmFpbGVkXG4iKTsKIAkJaW50ZWxfZ3B1X3Jlc2V0KGRldl9wcml2LCBBTExfRU5HSU5FUyk7CkBA IC0xODczLDcgKzE4NzMsNyBAQCB2b2lkIGk5MTVfcmVzZXRfY2hpcChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCiAJaTkxNV9xdWV1ZV9oYW5nY2hlY2soZGV2X3ByaXYpOwogCiBm aW5pc2g6Ci0JaTkxNV9nZW1fcmVzZXRfZmluaXNoKGRldl9wcml2KTsKKwlpOTE1X2dlbV9yZXNl dF9maW5pc2goZGV2X3ByaXYsIEFMTF9FTkdJTkVTKTsKIAllbmFibGVfaXJxKGRldl9wcml2LT5k cm0uaXJxKTsKIAogd2FrZXVwOgpAQCAtMTg5MiwxMSArMTg5Miw5MSBAQCB2b2lkIGk5MTVfcmVz ZXRfY2hpcChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAgKgogICogUmVzZXQg YSBzcGVjaWZpYyBHUFUgZW5naW5lLiBVc2VmdWwgaWYgYSBoYW5nIGlzIGRldGVjdGVkLgogICog UmV0dXJucyB6ZXJvIG9uIHN1Y2Nlc3NmdWwgcmVzZXQgb3Igb3RoZXJ3aXNlIGFuIGVycm9yIGNv ZGUuCisgKgorICogQ2FsbGVyIG11c3QgaG9sZCB0aGUgc3RydWN0X211dGV4LgorICoKKyAqIFBy b2NlZHVyZSBpczoKKyAqICAtIGlkZW50aWZpZXMgdGhlIHJlcXVlc3QgdGhhdCBjYXVzZWQgdGhl IGhhbmcgYW5kIGl0IGlzIGRyb3BwZWQKKyAqICAtIGZvcmNlIGVuZ2luZSB0byBpZGxlOiB0aGlz IGlzIGRvbmUgYnkgaXNzdWluZyBhIHJlc2V0IHJlcXVlc3QKKyAqICAtIHJlc2V0IGVuZ2luZQor ICogIC0gcmVzdGFydCBzdWJtaXNzaW9ucyB0byB0aGUgZW5naW5lCiAgKi8KIGludCBpOTE1X3Jl c2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7Ci0JLyogRklYTUU6 IHJlcGxhY2UgbWUgd2l0aCBlbmdpbmUgcmVzZXQgc2VxdWVuY2UgKi8KLQlyZXR1cm4gLUVOT0RF VjsKKwlpbnQgcmV0OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2lu ZS0+aTkxNTsKKwlzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yID0gJmRldl9wcml2LT5ncHVf ZXJyb3I7CisKKwlsb2NrZGVwX2Fzc2VydF9oZWxkKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRl eCk7CisJR0VNX0JVR19PTighdGVzdF9iaXQoSTkxNV9SRVNFVF9CQUNLT0ZGLCAmZXJyb3ItPmZs YWdzKSk7CisKKwlpZiAoIXRlc3RfYW5kX2NsZWFyX2JpdChJOTE1X1JFU0VUX0hBTkRPRkYsICZl cnJvci0+ZmxhZ3MpKQorCQlyZXR1cm4gMDsKKworCURSTV9ERUJVR19EUklWRVIoInJlc2V0dGlu ZyAlc1xuIiwgZW5naW5lLT5uYW1lKTsKKworCS8qCisJICogV2UgbmVlZCB0byBmaXJzdCBpZGxl IHRoZSBlbmdpbmUgYnkgaXNzdWluZyBhIHJlc2V0IHJlcXVlc3QsCisJICogdGhlbiBwZXJmb3Jt IHNvZnQgcmVzZXQgYW5kIHJlLWluaXRpYWxpemUgaHcgc3RhdGUsIGZvciBhbGwgb2YKKwkgKiB0 aGlzIEdUIHBvd2VyIG5lZWQgdG8gYmUgYXdha2Ugc28gZW5zdXJlIGl0IGRvZXMgdGhyb3VnaG91 dCB0aGUKKwkgKiBwcm9jZXNzCisJICovCisJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9nZXQoZGV2 X3ByaXYsIEZPUkNFV0FLRV9BTEwpOworCisJZGlzYWJsZV9pcnEoZGV2X3ByaXYtPmRybS5pcnEp OworCXJldCA9IGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmUoZGV2X3ByaXYsIGludGVsX2VuZ2luZV9m bGFnKGVuZ2luZSkpOworCWlmIChyZXQpIHsKKwkJRFJNX0VSUk9SKCJQcmV2aW91cyByZXNldCBm YWlsZWQgLSBwcm9tb3RlIHRvIGZ1bGwgcmVzZXRcbiIpOworCQlnb3RvIGVycm9yOworCX0KKwor CWlmIChkZXZfcHJpdi0+Z3QuYWN0aXZlX3JlcXVlc3RzKQorCQllbmdpbmVfcmV0aXJlX3JlcXVl c3RzKGVuZ2luZSk7CisKKwkvKgorCSAqIHRoZSByZXF1ZXN0IHRoYXQgY2F1c2VkIHRoZSBoYW5n IGlzIHN0dWNrIG9uIGVsc3AsIGlkZW50aWZ5IHRoZQorCSAqIGFjdGl2ZSByZXF1ZXN0IGFuZCBk cm9wIGl0LCBhZGp1c3QgaGVhZCB0byBza2lwIHRoZSBvZmZlbmRpbmcKKwkgKiByZXF1ZXN0IHRv IHJlc3VtZSBleGVjdXRpbmcgcmVtYWluaW5nIHJlcXVlc3RzIGluIHRoZSBxdWV1ZS4KKwkgKi8K KwlpOTE1X2dlbV9yZXNldF9lbmdpbmUoZW5naW5lKTsKKworCS8qIGZvcmNpbmcgZW5naW5lIHRv IGlkbGUgKi8KKwlyZXQgPSBpbnRlbF9yZXF1ZXN0X3Jlc2V0X2VuZ2luZShlbmdpbmUpOworCWlm IChyZXQpIHsKKwkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gZGlzYWJsZSAlc1xuIiwgZW5naW5lLT5u YW1lKTsKKwkJZ290byBlcnJvcjsKKwl9CisKKwkvKiBmaW5hbGx5LCByZXNldCBlbmdpbmUgKi8K KwlyZXQgPSBpbnRlbF9ncHVfcmVzZXQoZGV2X3ByaXYsIGludGVsX2VuZ2luZV9mbGFnKGVuZ2lu ZSkpOworCWlmIChyZXQpIHsKKwkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gcmVzZXQgJXMsIHJldD0l ZFxuIiwgZW5naW5lLT5uYW1lLCByZXQpOworCQlpbnRlbF91bnJlcXVlc3RfcmVzZXRfZW5naW5l KGVuZ2luZSk7CisJCWdvdG8gZXJyb3I7CisJfQorCisJLyogYmUgc3VyZSB0aGUgcmVxdWVzdCBy ZXNldCBiaXQgZ2V0cyBjbGVhcmVkICovCisJaW50ZWxfdW5yZXF1ZXN0X3Jlc2V0X2VuZ2luZShl bmdpbmUpOworCisJLyogaTkxNV9nZW1fcmVzZXRfcHJlcGFyZSByZXZva2VkIHRoZSBmZW5jZXMg Ki8KKwlpOTE1X2dlbV9yZXN0b3JlX2ZlbmNlcyhkZXZfcHJpdik7CisJaTkxNV9nZW1fcmVzZXRf ZmluaXNoKGRldl9wcml2LCBpbnRlbF9lbmdpbmVfZmxhZyhlbmdpbmUpKTsKKworCS8qIHJlcGxh eSByZW1haW5pbmcgcmVxdWVzdHMgaW4gdGhlIHF1ZXVlICovCisJcmV0ID0gZW5naW5lLT5pbml0 X2h3KGVuZ2luZSk7CisJaWYgKHJldCkKKwkJZ290byBlcnJvcjsKKword2FrZXVwOgorCWVuYWJs ZV9pcnEoZGV2X3ByaXYtPmRybS5pcnEpOworCWludGVsX3VuY29yZV9mb3JjZXdha2VfcHV0KGRl dl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKKwl3YWtlX3VwX2JpdCgmZXJyb3ItPmZsYWdzLCBJOTE1 X1JFU0VUX0hBTkRPRkYpOworCXJldHVybiByZXQ7CisKK2Vycm9yOgorCS8qIHVzZSBmdWxsIGdw dSByZXNldCB0byByZWNvdmVyIG9uIGVycm9yICovCisJc2V0X2JpdChJOTE1X1JFU0VUX0hBTkRP RkYsICZlcnJvci0+ZmxhZ3MpOworCWdvdG8gd2FrZXVwOwogfQogCiAvKioKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCmluZGV4IGIwMjM5M2YzMzc1My4uNjcyMDFlY2Q5OGU1IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKQEAgLTMwNDQsNiArMzA0NCw4IEBAIGV4dGVybiBpbnQgaW50ZWxfZ3B1X3Jl c2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIGVuZ2luZV9tYXNrKTsK IGV4dGVybiBib29sIGludGVsX2hhc19ncHVfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KTsKIGV4dGVybiB2b2lkIGk5MTVfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LCB1MzIgZW5naW5lX21hc2spOwogZXh0ZXJuIGJvb2wgaW50ZWxfaGFzX3Jl c2V0X2VuZ2luZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOworZXh0ZXJuIGlu dCBpbnRlbF9yZXF1ZXN0X3Jlc2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpOworZXh0ZXJuIHZvaWQgaW50ZWxfdW5yZXF1ZXN0X3Jlc2V0X2VuZ2luZShzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUpOwogZXh0ZXJuIGludCBpbnRlbF9ndWNfcmVzZXQoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGV4dGVybiB2b2lkIGludGVsX2VuZ2luZV9p bml0X2hhbmdjaGVjayhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogZXh0ZXJuIHZv aWQgaW50ZWxfaGFuZ2NoZWNrX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KTsKQEAgLTM0MjAsNyArMzQyMiw3IEBAIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1fc2V0X2ds b2JhbF9zZXFubyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1MzIgc2Vxbm8pOwogCiBzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKgogaTkxNV9nZW1fZmluZF9hY3RpdmVfcmVxdWVzdChzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwotCit2b2lkIGVuZ2luZV9yZXRpcmVfcmVxdWVz dHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIHZvaWQgaTkxNV9nZW1fcmV0aXJl X3JlcXVlc3RzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiAKIHN0YXRpYyBp bmxpbmUgYm9vbCBpOTE1X3Jlc2V0X2JhY2tvZmYoc3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJv cikKQEAgLTM0NDgsMTEgKzM0NTAsMTQgQEAgc3RhdGljIGlubGluZSB1MzIgaTkxNV9yZXNldF9j b3VudChzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yKQogCXJldHVybiBSRUFEX09OQ0UoZXJy b3ItPnJlc2V0X2NvdW50KTsKIH0KIAotaW50IGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmUoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKK2ludCBpOTE1X2dlbV9yZXNldF9wcmVwYXJl KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCSAgIHVuc2lnbmVkIGludCBl bmdpbmVfbWFzayk7CiB2b2lkIGk5MTVfZ2VtX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdik7Ci12b2lkIGk5MTVfZ2VtX3Jlc2V0X2ZpbmlzaChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpOwordm9pZCBpOTE1X2dlbV9yZXNldF9maW5pc2goc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJICAgdW5zaWduZWQgaW50IGVuZ2luZV9tYXNr KTsKIHZvaWQgaTkxNV9nZW1fc2V0X3dlZGdlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpOwogYm9vbCBpOTE1X2dlbV91bnNldF93ZWRnZWQoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KTsKK3ZvaWQgaTkxNV9nZW1fcmVzZXRfZW5naW5lKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSk7CiAKIHZvaWQgaTkxNV9nZW1faW5pdF9tbWlvKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICppOTE1KTsKIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1faW5pdChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5k ZXggOTUxNWRhZWE2MzU4Li5iYTBiZGFlMzBkNWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpA QCAtMjc0MSwxNCArMjc0MSwxNSBAQCBzdGF0aWMgYm9vbCBlbmdpbmVfc3RhbGxlZChzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJcmV0dXJuIHRydWU7CiB9CiAKLWludCBpOTE1X2dl bV9yZXNldF9wcmVwYXJlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK2ludCBp OTE1X2dlbV9yZXNldF9wcmVwYXJlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK KwkJCSAgIHVuc2lnbmVkIGludCBlbmdpbmVfbWFzaykKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmU7Ci0JZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CisJdW5zaWduZWQgaW50IHRt cDsKIAlpbnQgZXJyID0gMDsKIAogCS8qIEVuc3VyZSBpcnEgaGFuZGxlciBmaW5pc2hlcywgYW5k IG5vdCBydW4gYWdhaW4uICovCi0JZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGlk KSB7CisJZm9yX2VhY2hfZW5naW5lX21hc2tlZChlbmdpbmUsIGRldl9wcml2LCBlbmdpbmVfbWFz aywgdG1wKSB7CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdDsKIAogCQkv KiBQcmV2ZW50IHRoZSBzaWduYWxlciB0aHJlYWQgZnJvbSB1cGRhdGluZyB0aGUgcmVxdWVzdApA QCAtMjg2OCw3ICsyODY5LDcgQEAgc3RhdGljIGJvb2wgaTkxNV9nZW1fcmVzZXRfcmVxdWVzdChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJcmV0dXJuIGd1aWx0eTsKIH0K IAotc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVzZXRfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZSkKK3ZvaWQgaTkxNV9nZW1fcmVzZXRfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3Q7 CiAKQEAgLTI5MTQsMTQgKzI5MTUsMTUgQEAgdm9pZCBpOTE1X2dlbV9yZXNldChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJfQogfQogCi12b2lkIGk5MTVfZ2VtX3Jlc2V0X2Zp bmlzaChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit2b2lkIGk5MTVfZ2VtX3Jl c2V0X2ZpbmlzaChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkgICB1bnNp Z25lZCBpbnQgZW5naW5lX21hc2spCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l OwotCWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOworCXVuc2lnbmVkIGludCB0bXA7CiAKIAlsb2Nr ZGVwX2Fzc2VydF9oZWxkKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7CiAKLQlmb3JfZWFj aF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpIHsKKwlmb3JfZWFjaF9lbmdpbmVfbWFza2Vk KGVuZ2luZSwgZGV2X3ByaXYsIGVuZ2luZV9tYXNrLCB0bXApIHsKIAkJdGFza2xldF9lbmFibGUo JmVuZ2luZS0+aXJxX3Rhc2tsZXQpOwogCQlrdGhyZWFkX3VucGFyayhlbmdpbmUtPmJyZWFkY3J1 bWJzLnNpZ25hbGVyKTsKIAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9yZXF1ZXN0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMK aW5kZXggNWVjYjVhN2EwYzY0Li4xODBiZDg0NjE0ZmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9yZXF1ZXN0LmMKQEAgLTExNzcsNyArMTE3Nyw3IEBAIGxvbmcgaTkxNV93YWl0X3Jl cXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJcmV0dXJuIHRpbWVvdXQ7 CiB9CiAKLXN0YXRpYyB2b2lkIGVuZ2luZV9yZXRpcmVfcmVxdWVzdHMoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lKQordm9pZCBlbmdpbmVfcmV0aXJlX3JlcXVlc3RzKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cXVlc3QsICpuZXh0OwogCXUzMiBzZXFubyA9IGludGVsX2VuZ2luZV9nZXRfc2Vxbm8oZW5naW5l KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKaW5kZXggYmU1MWI1YTA2ODlhLi41OTZi OTlkYmJmZjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCkBAIC0xNzgxLDYgKzE3 ODEsMjYgQEAgaW50IGludGVsX2d1Y19yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiAJcmV0dXJuIHJldDsKIH0KIAorLyoKKyAqIE9uIGdlbjgrIGEgcmVzZXQgcmVxdWVz dCBoYXMgdG8gYmUgaXNzdWVkIHZpYSB0aGUgcmVzZXQgY29udHJvbCByZWdpc3RlcgorICogYmVm b3JlIGEgR1BVIGVuZ2luZSBjYW4gYmUgcmVzZXQgaW4gb3JkZXIgdG8gc3RvcCB0aGUgY29tbWFu ZCBzdHJlYW1lcgorICogYW5kIGlkbGUgdGhlIGVuZ2luZS4gVGhpcyByZXBsYWNlcyB0aGUgbGVn YWN5IHdheSBvZiBzdG9wcGluZyBhbiBlbmdpbmUKKyAqIGJ5IHdyaXRpbmcgdG8gdGhlIHN0b3Ag cmluZyBiaXQgaW4gdGhlIE1JX01PREUgcmVnaXN0ZXIuCisgKi8KK2ludCBpbnRlbF9yZXF1ZXN0 X3Jlc2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7CisJcmV0dXJu IGdlbjhfcmVxdWVzdF9yZXNldF9lbmdpbmUoZW5naW5lKTsKK30KKworLyoKKyAqIEl0IGlzIHBv c3NpYmxlIHRvIGJhY2sgb2ZmIGZyb20gYSBwcmV2aW91c2x5IGlzc3VlZCByZXNldCByZXF1ZXN0 IGJ5IHNpbXBseQorICogY2xlYXJpbmcgdGhlIHJlc2V0IHJlcXVlc3QgYml0IGluIHRoZSByZXNl dCBjb250cm9sIHJlZ2lzdGVyLgorICovCit2b2lkIGludGVsX3VucmVxdWVzdF9yZXNldF9lbmdp bmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQoreworCWdlbjhfdW5yZXF1ZXN0X3Jl c2V0X2VuZ2luZShlbmdpbmUpOworfQorCiBib29sIGludGVsX3VuY29yZV91bmNsYWltZWRfbW1p byhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJcmV0dXJuIGNoZWNrX2Zv cl91bmNsYWltZWRfbW1pbyhkZXZfcHJpdik7Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=