From: Arun Siluvery Subject: [PATCH 04/14] drm/i915/tdr: Modify error handler for per engine hang recovery Date: Tue, 12 Apr 2016 17:59:31 +0100 Message-ID: <1460480381-8777-5-git-send-email-arun.siluvery@linux.intel.com> References: <1460480381-8777-1-git-send-email-arun.siluvery@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 241A96E73E for ; Tue, 12 Apr 2016 16:59:54 +0000 (UTC) In-Reply-To: <1460480381-8777-1-git-send-email-arun.siluvery@linux.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 Cc: Ian Lister , Tomas Elf List-Id: intel-gfx@lists.freedesktop.org VGhpcyBpcyBhIHByZXBhcmF0b3J5IHBhdGNoIHdoaWNoIG1vZGlmaWVzIGVycm9yIGhhbmRsZXIg dG8gZG8gcGVyIGVuZ2luZQpoYW5nIHJlY292ZXJ5LiBUaGUgYWN0dWFsIHBhdGNoIHdoaWNoIGlt cGxlbWVudHMgdGhpcyBzZXF1ZW5jZSBmb2xsb3dzCmxhdGVyIGluIHRoZSBzZXJpZXMuIFRoZSBh aW0gaXMgdG8gcHJlcGFyZSBleGlzdGluZyByZWNvdmVyeSBmdW5jdGlvbiB0bwphZGFwdCB0byB0 aGlzIG5ldyBmdW5jdGlvbiB3aGVyZSBhcHBsaWNhYmxlICh3aGljaCBmYWlscyBhdCB0aGlzIHBv aW50CmJlY2F1c2UgY29yZSBpbXBsZW1lbnRhdGlvbiBpcyBsYWNraW5nKSBhbmQgY29udGludWUg cmVjb3ZlcnkgdXNpbmcgbGVnYWN5CmZ1bGwgZ3B1IHJlc2V0LgoKQSBoZWxwZXIgZnVuY3Rpb24g aXMgYWxzbyBhZGRlZCB0byBxdWVyeSB3aGV0aGVyIGVuZ2luZSByZXNldCBpcyBhdmFpbGFibGUK b24gYSBwYXJ0aWN1bGFyIGVuZ2luZSBiZWNhdXNlIHRoaXMgY2FuIGJlIGNvbnRyb2xsZWQgb24g YW4gZW5naW5lIGJhc2lzIHRvCmhlbHAgd2l0aCBhIGh5cG90aGV0aWNhbCBzaXR1dGF0aW9uIG9m IGEgYmFkIGVuZ2luZSBlLmcuLCBlbmdpbmUgcmVzZXQKd29ya3MgZmluZSBmb3IgcmVuZGVyIGJ1 dCBmYWlscyBvbiBibGl0dGVyLiBFbmdpbmUgcmVzZXQgaXMgY2hvc2VuIG9ubHkKd2hlbiBhbGwg ZW5naW5lcyBzdXBwb3J0IHRoaXMgb3RoZXJ3aXNlIHdlIGZhbGxiYWNrIHRvIGZ1bGwgZ3B1IHJl c2V0LgoKaTkxNS5yZXNldCBpcyBhbHJlYWR5IHByZXBhcmVkIGZvciB0aGlzIHB1cnBvc2UuIEl0 IG5vdyBhY2NlcHRzIGEgbWFzawpmb3JtZWQgb2YgZXhlY19pZCBpbmRpY2F0aW5nIHdoZXRoZXIg dGhhdCBlbmdpbmUgc3VwcG9ydHMgZW5naW5lIHJlc2V0IG9yCm5vdCwgZGVmYXVsdCBpcyBmdWxs IGdwdSByZXNldCBmb3Igbm93LgoKaTkxNS5yZXNldCA9PSAxLCBmdWxsIGdwdSByZXNldAppOTE1 LnJlc2V0ID09IG1hc2sgb2YgZXhlY19pZCwgZWc6ICgxIDw8IEk5MTVfRVhFQ19SRU5ERVIpIHwg Li4uOwoKRW5naW5lIHJlc2V0IGFuZCBmdWxsIGdwdSByZXNldCBzZWN0aW9ucyBhcmUgYWxzbyBl eHRyYWN0ZWQgdG8gc2VwYXJhdGUKZnVuY3Rpb25zLCBpdCBoZWxwcyByZWFkYWJpbGl0eSBhbmQg YnJhbmNoaW5nIGJldHdlZW4gcmVzZXQgdHlwZSBzaW1wbGVyLgoKVGhlIGVycm9yIGV2ZW50cyBi ZWhhdmlvdXIgdGhhdCBhcmUgdXNlZCB0byBub3RpZnkgdXNlciBvZiByZXNldCBhcmUKYWRhcHRl ZCB0byBlbmdpbmUgcmVzZXQgc3VjaCB0aGF0IGl0IGRvZXNuJ3QgYnJlYWsgdXNlcnMgbGlzdGVu aW5nIHRvIHRoZXNlCmV2ZW50cy4gSW4gbGVnYWN5IHdlIHJlcG9ydCBhbiBlcnJvciBldmVudCwg YSByZXNldCBldmVudCBiZWZvcmUgcmVzZXR0aW5nCnRoZSBncHUgYW5kIGEgcmVzZXQgZG9uZSBl dmVudCBtYXJraW5nIHRoZSBjb21wbGV0aW9uIG9mIHJlc2V0LiBUaGUgc2FtZQpiZWhhdmlvdXIg aXMgYWRhcHRlZCBidXQgcmVzZXQgZXZlbnQgaXMgb25seSBkaXNwYXRjaGVkIG9uY2UgZXZlbiB3 aGVuCm11bHRpcGxlIGVuZ2luZXMgYXJlIGh1bmcuIEZpbmFsbHkgb25jZSByZXNldCBpcyBjb21w bGV0ZSB3ZSBzZW5kIHJlc2V0CmRvbmUgZXZlbnQgYXMgdXN1YWwuCgpDYzogQ2hyaXMgV2lsc29u IDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3Bw YWxhQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSWFuIExpc3RlciA8aWFuLmxpc3Rl ckBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFRvbWFzIEVsZiA8dG9tYXMuZWxmQGludGVsLmNv bT4KU2lnbmVkLW9mZi1ieTogQXJ1biBTaWx1dmVyeSA8YXJ1bi5zaWx1dmVyeUBsaW51eC5pbnRl bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgfCAgMjMgKysr KwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgfCAgIDIgKwogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9pcnEuYyAgICAgfCAyMzMgKysrKysrKysrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyB8ICAxMiAr KwogNCBmaWxlcyBjaGFuZ2VkLCAyMDYgaW5zZXJ0aW9ucygrKSwgNjQgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggMjliNGU3OS4uMTkzM2Y4NyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5jCkBAIC05NTUsNiArOTU1LDI5IEBAIGludCBpOTE1X3Jlc2V0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJcmV0dXJuIDA7CiB9CiAKKy8qKgorICogaTkxNV9yZXNldF9lbmdp bmUgLSByZXNldCBHUFUgZW5naW5lIHRvIHJlY292ZXIgZnJvbSBhIGhhbmcKKyAqIEBlbmdpbmU6 IGVuZ2luZSB0byByZXNldAorICoKKyAqIFJlc2V0IGEgc3BlY2lmaWMgR1BVIGVuZ2luZS4gVXNl ZnVsIGlmIGEgaGFuZyBpcyBkZXRlY3RlZC4KKyAqIFJldHVybnMgemVybyBvbiBzdWNjZXNzZnVs IHJlc2V0IG9yIG90aGVyd2lzZSBhbiBlcnJvciBjb2RlLgorICoKKyAqIFByb2NlZHVyZSBpcyBm YWlybHkgc2ltcGxlOgorICogIC0gZm9yY2UgZW5naW5lIHRvIGlkbGUKKyAqICAtIHNhdmUgY3Vy cmVudCBzdGF0ZSB3aGljaCBpbmNsdWRlcyBoZWFkIGFuZCBjdXJyZW50IHJlcXVlc3QKKyAqICAt IHJlc2V0IGVuZ2luZQorICogIC0gcmVzdG9yZSBzYXZlZCBzdGF0ZSBhbmQgcmVzdWJtaXQgY29u dGV4dAorICovCitpbnQgaTkxNV9yZXNldF9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lKQoreworCWludCByZXQ7CisKKwkvKiBGSVhNRTogcmVwbGFjZSBtZSB3aXRoIGVuZ2lu ZSByZXNldCBzZXF1ZW5jZSAqLworCXJldCA9IC1FTk9ERVY7CisKKwlyZXR1cm4gcmV0OworfQor CiBzdGF0aWMgaW50IGk5MTVfcGNpX3Byb2JlKHN0cnVjdCBwY2lfZGV2ICpwZGV2LCBjb25zdCBz dHJ1Y3QgcGNpX2RldmljZV9pZCAqZW50KQogewogCXN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyAq aW50ZWxfaW5mbyA9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA2NzRkMmFiLi5iYjM0MTA3 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI3NTUsNyArMjc1NSw5IEBAIGV4dGVybiBs b25nIGk5MTVfY29tcGF0X2lvY3RsKHN0cnVjdCBmaWxlICpmaWxwLCB1bnNpZ25lZCBpbnQgY21k LAogI2VuZGlmCiBleHRlcm4gaW50IGludGVsX2dwdV9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCB1MzIgZW5naW5lX21hc2spOwogZXh0ZXJuIGJvb2wgaW50ZWxfaGFzX2dwdV9yZXNldChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKK2V4dGVybiBib29sIGludGVsX2hhc19lbmdpbmVfcmVz ZXRfc3VwcG9ydChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogZXh0ZXJuIGludCBp OTE1X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOworZXh0ZXJuIGludCBpOTE1X3Jlc2V0 X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogZXh0ZXJuIGludCBpbnRl bF9ndWNfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGV4dGVybiB2 b2lkIGludGVsX2VuZ2luZV9pbml0X2hhbmdjaGVjayhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmUpOwogZXh0ZXJuIHVuc2lnbmVkIGxvbmcgaTkxNV9jaGlwc2V0X3ZhbChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKaW5kZXggNmY2 YTJhMi4uNDY4MDU4ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC0yNDczLDYgKzI0NzMs ODkgQEAgc3RhdGljIHZvaWQgaTkxNV9lcnJvcl93YWtlX3VwKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKIAkJd2FrZV91cF9hbGwoJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRf cXVldWUpOwogfQogCitzdGF0aWMgaW50IGk5MTVfcmVzZXRfZW5naW5lcyhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l OworCisJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYpIHsKKwkJaW50IHJldDsKKwkJ c3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvciA9ICZkZXZfcHJpdi0+Z3B1X2Vycm9yOworCisJ CWlmICghaTkxNV9lbmdpbmVfcmVzZXRfaW5fcHJvZ3Jlc3MoZXJyb3IsIGVuZ2luZS0+aWQpKQor CQkJY29udGludWU7CisKKwkJcmV0ID0gaTkxNV9yZXNldF9lbmdpbmUoZW5naW5lKTsKKwkJaWYg KHJldCkgeworCQkJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZTsKKworCQkJRFJNX0VSUk9SKCJS ZXNldCBvZiAlcyBmYWlsZWQhIHJldD0lZCIsCisJCQkJICBlbmdpbmUtPm5hbWUsIHJldCk7CisK KwkJCS8qCisJCQkgKiB3aGVuIGVuZ2luZSByZXNldCBmYWlscyB3ZSBzd2l0Y2ggdG8gZnVsbCBn cHUgcmVzZXQKKwkJCSAqIHdoaWNoIGNsZWFycyBldmVyeXRoaW5nOyBJbiB0aGUgY2FzZSB3aGVy ZSBtdWx0aXBsZQorCQkJICogZW5naW5lcyBhcmUgaHVuZyB3ZSB3b3VsZCd2ZSBhbHJlYWR5IHNj aGVkdWxlZCB3b3JrCisJCQkgKiBpdGVtcyBhbmQgd2hlbiB0aGV5IGF0dGVtcHQgdG8gZG8gZW5n aW5lIHJlc2V0IHRoZXkKKwkJCSAqIHdvbid0IGZpbmQgYW55IGFjdGl2ZSByZXF1ZXN0IChmdWxs IGdwdSByZXNldAorCQkJICogd291bGQndmUgY2xlYXJlZCBpdCkuIFRvIG1ha2UgdGhlIHdvcmsg aXRlbXMgZXhpdAorCQkJICogc2FmZWx5LCBjbGVhciBlbmdpbmUgcmVzZXQgcGVuZGluZyBtYXNr LgorCQkJICovCisJCQlmb3JfZWFjaF9lbmdpbmUoZSwgZGV2X3ByaXYpIHsKKwkJCQlpZiAoaTkx NV9lbmdpbmVfcmVzZXRfaW5fcHJvZ3Jlc3MoZXJyb3IsIGUtPmlkKSkKKwkJCQkJYXRvbWljX2Fu ZCh+STkxNV9FTkdJTkVfUkVTRVRfSU5fUFJPR1JFU1MsCisJCQkJCQkgICAmZXJyb3ItPmVuZ2lu ZV9yZXNldF9jb3VudGVyW2UtPmlkXSk7CisJCQl9CisKKwkJCXJldHVybiByZXQ7CisJCX0KKwor CQlhdG9taWNfaW5jKCZlcnJvci0+ZW5naW5lX3Jlc2V0X2NvdW50ZXJbZW5naW5lLT5pZF0pOwor CX0KKworCXJldHVybiAwOworfQorCitzdGF0aWMgaW50IGk5MTVfcmVzZXRfZnVsbChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJc3RydWN0IGk5MTVfZ3B1X2Vycm9yICpl cnJvciA9ICZkZXZfcHJpdi0+Z3B1X2Vycm9yOworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBk ZXZfcHJpdi0+ZGV2OworCWludCByZXQ7CisKKwkvKiBlbnN1cmUgZGV2aWNlIGlzIGF3YWtlICov CisJYXNzZXJ0X3JwbV93YWtlbG9ja19oZWxkKGRldl9wcml2KTsKKworCWludGVsX3ByZXBhcmVf cmVzZXQoZGV2KTsKKworCS8qCisJICogQWxsIHN0YXRlIHJlc2V0IF9tdXN0XyBiZSBjb21wbGV0 ZWQgYmVmb3JlIHdlIHVwZGF0ZSB0aGUKKwkgKiByZXNldCBjb3VudGVyLCBmb3Igb3RoZXJ3aXNl IHdhaXRlcnMgbWlnaHQgbWlzcyB0aGUgcmVzZXQKKwkgKiBwZW5kaW5nIHN0YXRlIGFuZCBub3Qg cHJvcGVybHkgZHJvcCBsb2NrcywgcmVzdWx0aW5nIGluCisJICogZGVhZGxvY2tzIHdpdGggdGhl IHJlc2V0IHdvcmsuCisJICovCisJcmV0ID0gaTkxNV9yZXNldChkZXYpOworCisJaW50ZWxfZmlu aXNoX3Jlc2V0KGRldik7CisKKwlpZiAocmV0ID09IDApIHsKKwkJLyoKKwkJICogQWZ0ZXIgYWxs IHRoZSBnZW0gc3RhdGUgaXMgcmVzZXQsIGluY3JlbWVudCB0aGUgcmVzZXQKKwkJICogY291bnRl ciBhbmQgd2FrZSB1cCBldmVyeW9uZSB3YWl0aW5nIGZvciB0aGUgcmVzZXQgdG8KKwkJICogY29t cGxldGUuCisJCSAqCisJCSAqIFNpbmNlIHVubG9jayBvcGVyYXRpb25zIGFyZSBhIG9uZS1zaWRl ZCBiYXJyaWVyIG9ubHksCisJCSAqIHdlIG5lZWQgdG8gaW5zZXJ0IGEgYmFycmllciBoZXJlIHRv IG9yZGVyIGFueSBzZXFubworCQkgKiB1cGRhdGVzIGJlZm9yZQorCQkgKiB0aGUgY291bnRlciBp bmNyZW1lbnQuCisJCSAqLworCQlzbXBfbWJfX2JlZm9yZV9hdG9taWMoKTsKKwkJYXRvbWljX2lu YygmZXJyb3ItPnJlc2V0X2NvdW50ZXIpOworCX0gZWxzZSB7CisJCWF0b21pY19vcihJOTE1X1dF REdFRCwgJmVycm9yLT5yZXNldF9jb3VudGVyKTsKKwl9CisKKwlyZXR1cm4gcmV0OworfQorCiAv KioKICAqIGk5MTVfZXJyb3Jfd29ya19mdW5jIC0gZG8gcHJvY2VzcyBjb250ZXh0IGVycm9yIGhh bmRsaW5nIHdvcmsKICAqIEB3b3JrOiB3b3JrIGl0ZW0gY29udGFpbmluZyBlcnJvciBzdHJ1Y3Qs IHBhc3NlZCBieSB0aGUgZXJyb3IgaGFuZGxlcgpAQCAtMjQ5NSw2ICsyNTc4LDM5IEBAIHN0YXRp YyB2b2lkIGk5MTVfZXJyb3Jfd29ya19mdW5jKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAlr b2JqZWN0X3VldmVudF9lbnYoJmRldi0+cHJpbWFyeS0+a2Rldi0+a29iaiwgS09CSl9DSEFOR0Us IGVycm9yX2V2ZW50KTsKIAogCS8qCisJICogVGhpcyBldmVudCBuZWVkcyB0byBiZSBzZW50IGJl Zm9yZSBwZXJmb3JtaW5nIGdwdSByZXNldC4gV2hlbgorCSAqIGVuZ2luZSByZXNldHMgYXJlIHN1 cHBvcnRlZCB3ZSBpdGVyYXRlIHRocm91Z2ggYWxsIGVuZ2luZXMgYW5kCisJICogcmVzZXQgaHVu ZyBlbmdpbmVzIGluZGl2aWR1YWxseS4gVG8ga2VlcCB0aGUgZXZlbnQgZGlzcGF0Y2gKKwkgKiBt ZWNoYW5pc20gY29uc2lzdGVudCB3aXRoIGZ1bGwgZ3B1IHJlc2V0LCB0aGlzIGlzIG9ubHkgc2Vu dCBvbmNlCisJICogZXZlbiB3aGVuIG11bHRpcGxlIGVuZ2luZXMgYXJlIGh1bmcuIEl0IGlzIGFs c28gc2FmZSB0byBtb3ZlIHRoaXMKKwkgKiBoZXJlIGJlY2F1c2Ugd2hlbiB3ZSBhcmUgaW4gdGhp cyBmdW5jdGlvbiwgd2Ugd2lsbCBkZWZpbml0ZWx5CisJICogcGVyZm9ybSBncHUgcmVzZXQuCisJ ICovCisJa29iamVjdF91ZXZlbnRfZW52KCZkZXYtPnByaW1hcnktPmtkZXYtPmtvYmosIEtPQkpf Q0hBTkdFLCByZXNldF9ldmVudCk7CisKKwkvKgorCSAqIEluIG1vc3QgY2FzZXMgaXQncyBndWFy YW50ZWVkIHRoYXQgd2UgZ2V0IGhlcmUgd2l0aCBhbiBSUE0KKwkgKiByZWZlcmVuY2UgaGVsZCwg Zm9yIGV4YW1wbGUgYmVjYXVzZSB0aGVyZSBpcyBhIHBlbmRpbmcgR1BVCisJICogcmVxdWVzdCB0 aGF0IHdvbid0IGZpbmlzaCB1bnRpbCB0aGUgcmVzZXQgaXMgZG9uZS4gVGhpcworCSAqIGlzbid0 IHRoZSBjYXNlIGF0IGxlYXN0IHdoZW4gd2UgZ2V0IGhlcmUgYnkgZG9pbmcgYQorCSAqIHNpbXVs YXRlZCByZXNldCB2aWEgZGVidWdzLCBzbyBnZXQgYW4gUlBNIHJlZmVyZW5jZS4KKwkgKi8KKwlp bnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7CisKKwltdXRleF9sb2NrKCZkZXYtPnN0cnVj dF9tdXRleCk7CisKKwlpZiAoIWk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3MoZXJyb3IpKSB7CisJCXJl dCA9IGk5MTVfcmVzZXRfZW5naW5lcyhkZXZfcHJpdik7CisJCWlmIChyZXQpIHsKKwkJCS8qIGF0 dGVtcHQgZnVsbCBncHUgcmVzZXQgdG8gcmVjb3ZlciAqLworCQkJYXRvbWljX29yKEk5MTVfUkVT RVRfSU5fUFJPR1JFU1NfRkxBRywKKwkJCQkgICZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X2Nv dW50ZXIpOworCQl9CisJfQorCisJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CisK KwkvKgogCSAqIE5vdGUgdGhhdCB0aGVyZSdzIG9ubHkgb25lIHdvcmsgaXRlbSB3aGljaCBkb2Vz IGdwdSByZXNldHMsIHNvIHdlCiAJICogbmVlZCBub3Qgd29ycnkgYWJvdXQgY29uY3VycmVudCBn cHUgcmVzZXRzIHBvdGVudGlhbGx5IGluY3JlbWVudGluZwogCSAqIGVycm9yLT5yZXNldF9jb3Vu dGVyIHR3aWNlLiBXZSBvbmx5IG5lZWQgdG8gdGFrZSBjYXJlIG9mIGFub3RoZXIKQEAgLTI1MDYs NTggKzI2MjIsMjEgQEAgc3RhdGljIHZvaWQgaTkxNV9lcnJvcl93b3JrX2Z1bmMoc3RydWN0IHdv cmtfc3RydWN0ICp3b3JrKQogCSAqLwogCWlmIChpOTE1X3Jlc2V0X2luX3Byb2dyZXNzKGVycm9y KSAmJiAhaTkxNV90ZXJtaW5hbGx5X3dlZGdlZChlcnJvcikpIHsKIAkJRFJNX0RFQlVHX0RSSVZF UigicmVzZXR0aW5nIGNoaXBcbiIpOwotCQlrb2JqZWN0X3VldmVudF9lbnYoJmRldi0+cHJpbWFy eS0+a2Rldi0+a29iaiwgS09CSl9DSEFOR0UsCi0JCQkJICAgcmVzZXRfZXZlbnQpOwotCi0JCS8q Ci0JCSAqIEluIG1vc3QgY2FzZXMgaXQncyBndWFyYW50ZWVkIHRoYXQgd2UgZ2V0IGhlcmUgd2l0 aCBhbiBSUE0KLQkJICogcmVmZXJlbmNlIGhlbGQsIGZvciBleGFtcGxlIGJlY2F1c2UgdGhlcmUg aXMgYSBwZW5kaW5nIEdQVQotCQkgKiByZXF1ZXN0IHRoYXQgd29uJ3QgZmluaXNoIHVudGlsIHRo ZSByZXNldCBpcyBkb25lLiBUaGlzCi0JCSAqIGlzbid0IHRoZSBjYXNlIGF0IGxlYXN0IHdoZW4g d2UgZ2V0IGhlcmUgYnkgZG9pbmcgYQotCQkgKiBzaW11bGF0ZWQgcmVzZXQgdmlhIGRlYnVncywg c28gZ2V0IGFuIFJQTSByZWZlcmVuY2UuCi0JCSAqLwotCQlpbnRlbF9ydW50aW1lX3BtX2dldChk ZXZfcHJpdik7Ci0KLQkJaW50ZWxfcHJlcGFyZV9yZXNldChkZXYpOwotCi0JCS8qCi0JCSAqIEFs bCBzdGF0ZSByZXNldCBfbXVzdF8gYmUgY29tcGxldGVkIGJlZm9yZSB3ZSB1cGRhdGUgdGhlCi0J CSAqIHJlc2V0IGNvdW50ZXIsIGZvciBvdGhlcndpc2Ugd2FpdGVycyBtaWdodCBtaXNzIHRoZSBy ZXNldAotCQkgKiBwZW5kaW5nIHN0YXRlIGFuZCBub3QgcHJvcGVybHkgZHJvcCBsb2NrcywgcmVz dWx0aW5nIGluCi0JCSAqIGRlYWRsb2NrcyB3aXRoIHRoZSByZXNldCB3b3JrLgotCQkgKi8KLQkJ cmV0ID0gaTkxNV9yZXNldChkZXYpOwogCi0JCWludGVsX2ZpbmlzaF9yZXNldChkZXYpOwotCi0J CWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKLQotCQlpZiAocmV0ID09IDApIHsKLQkJ CS8qCi0JCQkgKiBBZnRlciBhbGwgdGhlIGdlbSBzdGF0ZSBpcyByZXNldCwgaW5jcmVtZW50IHRo ZSByZXNldAotCQkJICogY291bnRlciBhbmQgd2FrZSB1cCBldmVyeW9uZSB3YWl0aW5nIGZvciB0 aGUgcmVzZXQgdG8KLQkJCSAqIGNvbXBsZXRlLgotCQkJICoKLQkJCSAqIFNpbmNlIHVubG9jayBv cGVyYXRpb25zIGFyZSBhIG9uZS1zaWRlZCBiYXJyaWVyIG9ubHksCi0JCQkgKiB3ZSBuZWVkIHRv IGluc2VydCBhIGJhcnJpZXIgaGVyZSB0byBvcmRlciBhbnkgc2Vxbm8KLQkJCSAqIHVwZGF0ZXMg YmVmb3JlCi0JCQkgKiB0aGUgY291bnRlciBpbmNyZW1lbnQuCi0JCQkgKi8KLQkJCXNtcF9tYl9f YmVmb3JlX2F0b21pYygpOwotCQkJYXRvbWljX2luYygmZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNl dF9jb3VudGVyKTsKLQotCQkJa29iamVjdF91ZXZlbnRfZW52KCZkZXYtPnByaW1hcnktPmtkZXYt PmtvYmosCi0JCQkJCSAgIEtPQkpfQ0hBTkdFLCByZXNldF9kb25lX2V2ZW50KTsKLQkJfSBlbHNl IHsKLQkJCWF0b21pY19vcihJOTE1X1dFREdFRCwgJmVycm9yLT5yZXNldF9jb3VudGVyKTsKLQkJ fQorCQlyZXQgPSBpOTE1X3Jlc2V0X2Z1bGwoZGV2X3ByaXYpOworCX0KIAotCQkvKgotCQkgKiBO b3RlOiBUaGUgd2FrZV91cCBhbHNvIHNlcnZlcyBhcyBhIG1lbW9yeSBiYXJyaWVyIHNvIHRoYXQK LQkJICogd2FpdGVycyBzZWUgdGhlIHVwZGF0ZSB2YWx1ZSBvZiB0aGUgcmVzZXQgY291bnRlciBh dG9taWNfdC4KLQkJICovCisJLyoKKwkgKiBOb3RlOiBUaGUgd2FrZV91cCBhbHNvIHNlcnZlcyBh cyBhIG1lbW9yeSBiYXJyaWVyIHNvIHRoYXQKKwkgKiB3YWl0ZXJzIHNlZSB0aGUgdXBkYXRlIHZh bHVlIG9mIHRoZSByZXNldCBjb3VudGVyIGF0b21pY190LgorCSAqLworCWlmICghaTkxNV90ZXJt aW5hbGx5X3dlZGdlZChlcnJvcikpIHsKIAkJaTkxNV9lcnJvcl93YWtlX3VwKGRldl9wcml2LCB0 cnVlKTsKKwkJa29iamVjdF91ZXZlbnRfZW52KCZkZXYtPnByaW1hcnktPmtkZXYtPmtvYmosCisJ CQkJICAgS09CSl9DSEFOR0UsIHJlc2V0X2RvbmVfZXZlbnQpOwogCX0KKworCWludGVsX3J1bnRp bWVfcG1fcHV0KGRldl9wcml2KTsKIH0KIAogc3RhdGljIHZvaWQgaTkxNV9yZXBvcnRfYW5kX2Ns ZWFyX2VpcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQpAQCAtMjY1Niw2ICsyNzM1LDggQEAgc3Rh dGljIHZvaWQgaTkxNV9yZXBvcnRfYW5kX2NsZWFyX2VpcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogICogaTkxNV9oYW5kbGVfZXJyb3IgLSBoYW5kbGUgYSBncHUgZXJyb3IKICAqIEBkZXY6IGRy bSBkZXZpY2UKICAqIEBlbmdpbmVfbWFzazogbWFzayByZXByZXNlbnRpbmcgZW5naW5lcyB0aGF0 IGFyZSBodW5nCisgKiBAZm10OiBmb3JtYXR0ZWQgaGFuZyBtc2cgdGhhdCBnZXRzIGxvZ2dlZCBp biBjYXB0dXJlZCBlcnJvciBzdGF0ZQorICoKICAqIERvIHNvbWUgYmFzaWMgY2hlY2tpbmcgb2Yg cmVnaXN0ZXIgc3RhdGUgYXQgZXJyb3IgdGltZSBhbmQKICAqIGR1bXAgaXQgdG8gdGhlIHN5c2xv Zy4gIEFsc28gY2FsbCBpOTE1X2NhcHR1cmVfZXJyb3Jfc3RhdGUoKSB0byBtYWtlCiAgKiBzdXJl IHdlIGdldCBhIHJlY29yZCBhbmQgbWFrZSBpdCBhdmFpbGFibGUgaW4gZGVidWdmcy4gIEZpcmUg YSB1ZXZlbnQKQEAgLTI2NjgsNiArMjc0OSw4IEBAIHZvaWQgaTkxNV9oYW5kbGVfZXJyb3Ioc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgdTMyIGVuZ2luZV9tYXNrLAogCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJdmFfbGlzdCBhcmdzOwogCWNo YXIgZXJyb3JfbXNnWzgwXTsKKwlib29sIHVzZV9lbmdpbmVfcmVzZXQ7CisJc3RydWN0IGludGVs X2VuZ2luZV9jcyAqZW5naW5lOwogCiAJdmFfc3RhcnQoYXJncywgZm10KTsKIAl2c2NucHJpbnRm KGVycm9yX21zZywgc2l6ZW9mKGVycm9yX21zZyksIGZtdCwgYXJncyk7CkBAIC0yNjc2LDI3ICsy NzU5LDQ5IEBAIHZvaWQgaTkxNV9oYW5kbGVfZXJyb3Ioc3RydWN0IGRybV9kZXZpY2UgKmRldiwg dTMyIGVuZ2luZV9tYXNrLAogCWk5MTVfY2FwdHVyZV9lcnJvcl9zdGF0ZShkZXYsIGVuZ2luZV9t YXNrLCBlcnJvcl9tc2cpOwogCWk5MTVfcmVwb3J0X2FuZF9jbGVhcl9laXIoZGV2KTsKIAorCXVz ZV9lbmdpbmVfcmVzZXQgPSBmYWxzZTsKIAlpZiAoZW5naW5lX21hc2spIHsKLQkJYXRvbWljX29y KEk5MTVfUkVTRVRfSU5fUFJPR1JFU1NfRkxBRywKLQkJCQkmZGV2X3ByaXYtPmdwdV9lcnJvci5y ZXNldF9jb3VudGVyKTsKKwkJdTMyIGVuZ2luZXNfYWxsb3dlZCA9IDA7CiAKLQkJLyoKLQkJICog V2FrZXVwIHdhaXRpbmcgcHJvY2Vzc2VzIHNvIHRoYXQgdGhlIHJlc2V0IGZ1bmN0aW9uCi0JCSAq IGk5MTVfcmVzZXRfYW5kX3dha2V1cCBkb2Vzbid0IGRlYWRsb2NrIHRyeWluZyB0byBncmFiCi0J CSAqIHZhcmlvdXMgbG9ja3MuIEJ5IGJ1bXBpbmcgdGhlIHJlc2V0IGNvdW50ZXIgZmlyc3QsIHRo ZSB3b2tlbgotCQkgKiBwcm9jZXNzZXMgd2lsbCBzZWUgYSByZXNldCBpbiBwcm9ncmVzcyBhbmQg YmFjayBvZmYsCi0JCSAqIHJlbGVhc2luZyB0aGVpciBsb2NrcyBhbmQgdGhlbiB3YWl0IGZvciB0 aGUgcmVzZXQgY29tcGxldGlvbi4KLQkJICogV2UgbXVzdCBkbyB0aGlzIGZvciBfYWxsXyBncHUg d2FpdGVycyB0aGF0IG1pZ2h0IGhvbGQgbG9ja3MKLQkJICogdGhhdCB0aGUgcmVzZXQgd29yayBu ZWVkcyB0byBhY3F1aXJlLgotCQkgKgotCQkgKiBOb3RlOiBUaGUgd2FrZV91cCBzZXJ2ZXMgYXMg dGhlIHJlcXVpcmVkIG1lbW9yeSBiYXJyaWVyIHRvCi0JCSAqIGVuc3VyZSB0aGF0IHRoZSB3YWl0 ZXJzIHNlZSB0aGUgdXBkYXRlZCB2YWx1ZSBvZiB0aGUgcmVzZXQKLQkJICogY291bnRlciBhdG9t aWNfdC4KLQkJICovCi0JCWk5MTVfZXJyb3Jfd2FrZV91cChkZXZfcHJpdiwgZmFsc2UpOworCQlm b3JfZWFjaF9lbmdpbmVfbWFza2VkKGVuZ2luZSwgZGV2X3ByaXYsIGVuZ2luZV9tYXNrKSB7CisJ CQlpZiAoaW50ZWxfaGFzX2VuZ2luZV9yZXNldF9zdXBwb3J0KGVuZ2luZSkpCisJCQkJZW5naW5l c19hbGxvd2VkIHw9IGludGVsX2VuZ2luZV9mbGFnKGVuZ2luZSk7CisJCX0KKworCQl1c2VfZW5n aW5lX3Jlc2V0ID0gKGVuZ2luZXNfYWxsb3dlZCA9PSBlbmdpbmVfbWFzayk7CisJfQorCisJaWYg KHVzZV9lbmdpbmVfcmVzZXQpIHsKKwkJc3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvciA9ICZk ZXZfcHJpdi0+Z3B1X2Vycm9yOworCisJCWZvcl9lYWNoX2VuZ2luZV9tYXNrZWQoZW5naW5lLCBk ZXZfcHJpdiwgZW5naW5lX21hc2spIHsKKwkJCWlmIChpOTE1X2VuZ2luZV9yZXNldF9pbl9wcm9n cmVzcyhlcnJvciwgZW5naW5lLT5pZCkpCisJCQkJY29udGludWU7CisKKwkJCWF0b21pY19vcihJ OTE1X0VOR0lORV9SRVNFVF9JTl9QUk9HUkVTUywKKwkJCQkgICZlcnJvci0+ZW5naW5lX3Jlc2V0 X2NvdW50ZXJbZW5naW5lLT5pZF0pOworCQl9CisJfSBlbHNlIHsKKwkJYXRvbWljX29yKEk5MTVf UkVTRVRfSU5fUFJPR1JFU1NfRkxBRywKKwkJCSAgJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRf Y291bnRlcik7CiAJfQogCiAJLyoKKwkgKiBXYWtldXAgd2FpdGluZyBwcm9jZXNzZXMgc28gdGhh dCB0aGUgcmVzZXQgZnVuY3Rpb24KKwkgKiBpOTE1X3Jlc2V0X2FuZF93YWtldXAgZG9lc24ndCBk ZWFkbG9jayB0cnlpbmcgdG8gZ3JhYgorCSAqIHZhcmlvdXMgbG9ja3MuIEJ5IGJ1bXBpbmcgdGhl IHJlc2V0IGNvdW50ZXIgZmlyc3QsIHRoZSB3b2tlbgorCSAqIHByb2Nlc3NlcyB3aWxsIHNlZSBh IHJlc2V0IGluIHByb2dyZXNzIGFuZCBiYWNrIG9mZiwKKwkgKiByZWxlYXNpbmcgdGhlaXIgbG9j a3MgYW5kIHRoZW4gd2FpdCBmb3IgdGhlIHJlc2V0IGNvbXBsZXRpb24uCisJICogV2UgbXVzdCBk byB0aGlzIGZvciBfYWxsXyBncHUgd2FpdGVycyB0aGF0IG1pZ2h0IGhvbGQgbG9ja3MKKwkgKiB0 aGF0IHRoZSByZXNldCB3b3JrIG5lZWRzIHRvIGFjcXVpcmUuCisJICoKKwkgKiBOb3RlOiBUaGUg d2FrZV91cCBzZXJ2ZXMgYXMgdGhlIHJlcXVpcmVkIG1lbW9yeSBiYXJyaWVyIHRvCisJICogZW5z dXJlIHRoYXQgdGhlIHdhaXRlcnMgc2VlIHRoZSB1cGRhdGVkIHZhbHVlIG9mIHRoZSByZXNldAor CSAqIGNvdW50ZXIgYXRvbWljX3QuCisJICovCisJaTkxNV9lcnJvcl93YWtlX3VwKGRldl9wcml2 LCBmYWxzZSk7CisKKwkvKgogCSAqIE91ciByZXNldCB3b3JrIGNhbiBncmFiIG1vZGVzZXQgbG9j a3MgKHNpbmNlIGl0IG5lZWRzIHRvIHJlc2V0IHRoZQogCSAqIHN0YXRlIG9mIG91dHN0YW5kaW5n IHBhZ2VmbGlwcykuIEhlbmNlIGl0IG11c3Qgbm90IGJlIHJ1biBvbiBvdXIgb3duCiAJICogZGV2 LXByaXYtPndxIHdvcmsgcXVldWUgZm9yIG90aGVyd2lzZSB0aGUgZmx1c2hfd29yayBpbiB0aGUg cGFnZWZsaXAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKaW5kZXggYWMyYWMwNy4uOWNl MjQ3MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKQEAgLTE2NzMsNiArMTY3Mywx OCBAQCBib29sIGludGVsX2hhc19ncHVfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAly ZXR1cm4gaW50ZWxfZ2V0X2dwdV9yZXNldChkZXYpICE9IE5VTEw7CiB9CiAKK2Jvb2wgaW50ZWxf aGFzX2VuZ2luZV9yZXNldF9zdXBwb3J0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkK K3sKKwl1MzIgcmVzZXRfcGFyYW07CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuZ2luZS0+ ZGV2OworCisJcmVzZXRfcGFyYW0gPSBpOTE1LnJlc2V0ICYgKCgxIDw8IChJOTE1X05VTV9FTkdJ TkVTICsgMSkpIC0gMSk7CisKKwlyZXR1cm4gKElOVEVMX0lORk8oZGV2KS0+Z2VuID49OCAmJgor CQkhKHJlc2V0X3BhcmFtICYgMHgwMSkgJiYKKwkJKHJlc2V0X3BhcmFtICYgKDEgPDwgZW5naW5l LT5leGVjX2lkKSkpOworfQorCiBpbnQgaW50ZWxfZ3VjX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKIHsKIAlpbnQgcmV0OwotLSAKMS45LjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=