From: Michel Thierry Subject: [PATCH v6 13/20] drm/i915/guc: Provide register list to be saved/restored during engine reset Date: Wed, 19 Apr 2017 11:35:27 -0700 Message-ID: <20170419183527.16103-1-michel.thierry@intel.com> References: <02fb15a-d90a-7d82-ab57-032a77636ba8@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 572078935A for ; Wed, 19 Apr 2017 18:35:28 +0000 (UTC) In-Reply-To: <02fb15a-d90a-7d82-ab57-032a77636ba8@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+CgpHdUMg ZXhwZWN0cyBhIGxpc3Qgb2YgcmVnaXN0ZXJzIGZyb20gdGhlIGRyaXZlciB3aGljaCBhcmUgc2F2 ZWQvcmVzdG9yZWQKZHVyaW5nIGVuZ2luZSByZXNldC4gVGhlIHR5cGUgb2YgdmFsdWUgdG8gYmUg c2F2ZWQgaXMgY29udHJvbGxlZCBieQpmbGFncy4gV2UgcHJvdmlkZSBhIG1pbmltYWwgc2V0IG9m IHJlZ2lzdGVycyB0aGF0IHdlIHdhbnQgR3VDIHRvIHNhdmUgYW5kCnJlc3RvcmUuIFRoaXMgaXMg bm90IGFuIGlzc3VlIGluIGNhc2Ugb2YgZW5naW5lIHJlc2V0IGFzIGRyaXZlciBpbml0aWFsaXpl cwptb3N0IG9mIHRoZW0gZm9sbG93aW5nIGFuIGVuZ2luZSByZXNldCwgYnV0IGluIGNhc2Ugb2Yg bWVkaWEgcmVzZXQgKGFrYQp3YXRjaGRvZyByZXNldCkgd2hpY2ggaXMgY29tcGxldGVseSBpbnRl cm5hbCB0byBHdUMgKGluY2x1ZGluZyByZXN1Ym1pc3Npb24Kb2YgaHVuZyB3b3JrbG9hZCksIGl0 IGlzIG5lY2Vzc2FyeSB0byBwcm92aWRlIHRoaXMgbGlzdCwgb3RoZXJ3aXNlIEd1QyB3b24ndApi ZSBhYmxlIHRvIHNjaGVkdWxlIGZ1cnRoZXIgd29ya2xvYWRzIGFmdGVyIGEgcmVzZXQuIFRoaXMg aXMgdGhlIG1pbmltYWwKc2V0IG9mIHJlZ2lzdGVycyBpZGVudGlmaWVkIGZvciB0aGluZ3MgdG8g d29yayBhcyBleHBlY3RlZCBidXQgaWYgd2Ugc2VlCmFueSBuZXcgaXNzdWVzLCB0aGlzIHJlZ2lz dGVyIGxpc3QgY2FuIGJlIGV4cGFuZGVkLgoKSW4gb3JkZXIgdG8gbm90IGxvb3NlIGFueSBleGlz dGluZyB3b3JrYXJvdW5kcywgd2UgaGF2ZSB0byBsZXQgR3VDIGtub3cKdGhlIHJlZ2lzdGVycyBh bmQgaXRzIHZhbHVlcy4gVGhlc2Ugd2lsbCBiZSByZWFwcGxpZWQgYWZ0ZXIgdGhlIHJlc2V0LgpO b3RlIHRoYXQgd2UgY2FuJ3QganVzdCByZWFkIHRoZSBjdXJyZW50IHZhbHVlIGJlY2F1c2UgbW9z dCBvZiB0aGVzZQpyZWdpc3RlcnMgYXJlIG1hc2tlZCAoc28gd2UgaGF2ZSBhIHdvcmthcm91bmQg Zm9yIGEgd29ya2Fyb3VuZCBmb3IgYQp3b3JrYXJvdW5kKS4KCnYyOiBSRUdTRVRfTUFTS0VEIGlz IHRvbyBkaWZmaWN1bHQgZm9yIEd1QywgdXNlIFJFR1NFVF9TQVZFX0RFRkFVTFRfVkFMVUUKYW5k IGN1cnJlbnQgdmFsdWUgZnJvbSBSSU5HX01PREUgcmVnIGluc3RlYWQ7IG5vIG5lZWQgdG8gcHJl c2VydmUKaGVhZC90YWlsIGVpdGhlciwgYmUgZXh0cmEgcGFyYW5vaWQgYW5kIHNhdmUgd2hpdGVs aXN0ZWQgcmVnaXN0ZXJzIChEYW5pZWxlKS4KCnYzOiBXb3JrYXJvdW5kcyBhZGRlZCBvbmx5IG9u Y2UgZHVyaW5nIF9pbml0X3dvcmthcm91bmRzIGFsc28gaGF2ZSB0bwpiZWVuIHJlc3RvcmVkLCBv ciB3ZSByaXNrIGxvb3NpbmcgdGhlbSBhZnRlciBpbnRlcm5hbCBHdUMgcmVzZXQKKERhbmllbGUp LgoKQ2M6IERhbmllbGUgQ2VyYW9sbyBTcHVyaW8gPGRhbmllbGUuY2VyYW9sb3NwdXJpb0BpbnRl bC5jb20+ClNpZ25lZC1vZmYtYnk6IEFydW4gU2lsdXZlcnkgPGFydW4uc2lsdXZlcnlAbGludXgu aW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBKZWZmIE1jR2VlIDxqZWZmLm1jZ2VlQGludGVsLmNv bT4KU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAgfCAgMyAr KwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIHwgNjggKysrKysr KysrKysrKysrKysrKysrKysrKysrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdp bmVfY3MuYyAgICAgfCA2NSArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tCiAzIGZpbGVzIGNo YW5nZWQsIDExNCBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaAppbmRleCBmYTM5ODhjNTAzM2IuLjFiYTFhYzAxNjk3MyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCkBAIC0xOTEzLDcgKzE5MTMsMTAgQEAgc3RydWN0IGk5MTVfd2FfcmVnIHsKIAog c3RydWN0IGk5MTVfd29ya2Fyb3VuZHMgewogCXN0cnVjdCBpOTE1X3dhX3JlZyByZWdbSTkxNV9N QVhfV0FfUkVHU107CisJLyogbGlzdCBvZiByZWdpc3RlcnMgKGFuZCB0aGVpciB2YWx1ZXMpIHRo YXQgR3VDIHdpbGwgaGF2ZSB0byByZXN0b3JlICovCisJc3RydWN0IGk5MTVfd2FfcmVnIGd1Y19y ZWdbR1VDX1JFR1NFVF9NQVhfUkVHSVNURVJTXTsKIAl1MzIgY291bnQ7CisJdTMyIGd1Y19jb3Vu dDsKIAl1MzIgaHdfd2hpdGVsaXN0X2NvdW50W0k5MTVfTlVNX0VOR0lORVNdOwogfTsKIApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IDFlYTM2YTg4ZDJm Yi4uZjQwODFkYTg4ZGYyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1 Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlz c2lvbi5jCkBAIC0xMDAzLDYgKzEwMDMsMjQgQEAgc3RhdGljIHZvaWQgZ3VjX3BvbGljaWVzX2lu aXQoc3RydWN0IGd1Y19wb2xpY2llcyAqcG9saWNpZXMpCiAJcG9saWNpZXMtPmlzX3ZhbGlkID0g MTsKIH0KIAorLyoKKyAqIEluIHRoaXMgbWFjcm8gaXQgaXMgaGlnaGx5IHVubGlrZWx5IHRvIGV4 Y2VlZCBtYXggdmFsdWUgYnV0IGV2ZW4gaWYgd2UgZGlkCisgKiBpdCBpcyBub3QgYW4gZXJyb3Ig c28ganVzdCB0aHJvdyBhIHdhcm5pbmcgYW5kIGNvbnRpbnVlLiBPbmx5IHNpZGUgZWZmZWN0Cisg KiBpbiBjb250aW51aW5nIGZ1cnRoZXIgbWVhbnMgc29tZSByZWdpc3RlcnMgd29uJ3QgYmUgYWRk ZWQgdG8gc2F2ZS9yZXN0b3JlCisgKiBsaXN0LgorICovCisjZGVmaW5lIEdVQ19BRERfTU1JT19S RUdfQURTKG5vZGUsIHJlZ19hZGRyLCBfZmxhZ3MsIGRlZnZhbHVlKQkJXAorCWRvIHsJCQkJCQkJ CVwKKwkJdTMyIF9fY291bnQgPSBub2RlLT5udW1iZXJfb2ZfcmVnaXN0ZXJzOwkJXAorCQlpZiAo V0FSTl9PTihfX2NvdW50ID49IEdVQ19SRUdTRVRfTUFYX1JFR0lTVEVSUykpCVwKKwkJCWNvbnRp bnVlOwkJCQkJXAorCQlub2RlLT5yZWdpc3RlcnNbX19jb3VudF0ub2Zmc2V0ID0gcmVnX2FkZHIu cmVnOwkJXAorCQlub2RlLT5yZWdpc3RlcnNbX19jb3VudF0uZmxhZ3MgPSAoX2ZsYWdzKTsJCVwK KwkJaWYgKGRlZnZhbHVlKQkJCQkJCVwKKwkJCW5vZGUtPnJlZ2lzdGVyc1tfX2NvdW50XS52YWx1 ZSA9IChkZWZ2YWx1ZSk7CVwKKwkJbm9kZS0+bnVtYmVyX29mX3JlZ2lzdGVycysrOwkJCQlcCisJ fSB3aGlsZSAoMCkKKwogc3RhdGljIGludCBndWNfYWRzX2NyZWF0ZShzdHJ1Y3QgaW50ZWxfZ3Vj ICpndWMpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5 MTUoZ3VjKTsKQEAgLTEwMTYsNiArMTAzNCw3IEBAIHN0YXRpYyBpbnQgZ3VjX2Fkc19jcmVhdGUo c3RydWN0IGludGVsX2d1YyAqZ3VjKQogCQl1OCByZWdfc3RhdGVfYnVmZmVyW0dVQ19TM19TQVZF X1NQQUNFX1BBR0VTICogUEFHRV9TSVpFXTsKIAl9IF9fcGFja2VkICpibG9iOwogCXN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKKwlzdHJ1Y3QgaTkxNV93b3JrYXJvdW5kcyAqd29ya2Fy b3VuZHMgPSAmZGV2X3ByaXYtPndvcmthcm91bmRzOwogCWVudW0gaW50ZWxfZW5naW5lX2lkIGlk OwogCXUzMiBiYXNlOwogCkBAIC0xMDM1LDYgKzEwNTQsNDcgQEAgc3RhdGljIGludCBndWNfYWRz X2NyZWF0ZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAKIAkvKiBNTUlPIHJlZyBzdGF0ZSAqLwog CWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkgeworCQl1MzIgaTsKKwkJc3Ry dWN0IGd1Y19tbWlvX3JlZ3NldCAqZW5nX3JlZyA9CisJCQkmYmxvYi0+cmVnX3N0YXRlLmVuZ2lu ZV9yZWdbZW5naW5lLT5ndWNfaWRdOworCisJCS8qCisJCSAqIFByb3ZpZGUgYSBsaXN0IG9mIHJl Z2lzdGVycyB0byBiZSBzYXZlZC9yZXN0b3JlZCBkdXJpbmcgZ3B1CisJCSAqIHJlc2V0LiBUaGlz IGlzIG1haW5seSByZXF1aXJlZCBmb3IgTWVkaWEgcmVzZXQgKGFrYSB3YXRjaGRvZworCQkgKiB0 aW1lb3V0KSB3aGljaCBpcyBjb21wbGV0ZWx5IHVuZGVyIHRoZSBjb250cm9sIG9mIEd1QworCQkg KiAocmVzdWJtaXNzaW9uIG9mIGh1bmcgd29ya2xvYWQgaXMgaGFuZGxlZCBpbnNpZGUgR3VDKS4K KwkJICovCisJCUdVQ19BRERfTU1JT19SRUdfQURTKGVuZ19yZWcsIFJJTkdfSFdTX1BHQShlbmdp bmUtPm1taW9fYmFzZSksCisJCQkJICAgICBHVUNfUkVHU0VUX0VOR0lORVJFU0VUIHwKKwkJCQkg ICAgIEdVQ19SRUdTRVRfU0FWRV9DVVJSRU5UX1ZBTFVFLCAwKTsKKworCQkvKgorCQkgKiBXb3Jr YXJvdW5kIHRoZSBndWMgaXNzdWUgd2l0aCBtYXNrZWQgcmVnaXN0ZXJzLCBub3RlIHRoYXQKKwkJ ICogYXQgdGhpcyBwb2ludCBndWMgc3VibWlzc2lvbiBpcyBzdGlsbCBkaXNhYmxlZCBhbmQgdGhl IG1vZGUKKwkJICogcmVnaXN0ZXIgZG9lc250IGhhdmUgdGhlIGlycV9zdGVlcmluZyBiaXQgc2V0 LCB3aGljaCB3ZQorCQkgKiBuZWVkIHRvIGZ3ZCBpcnFzIHRvIEd1Qy4KKwkJICovCisJCUdVQ19B RERfTU1JT19SRUdfQURTKGVuZ19yZWcsIFJJTkdfTU9ERV9HRU43KGVuZ2luZSksCisJCQkJICAg ICBHVUNfUkVHU0VUX0VOR0lORVJFU0VUIHwKKwkJCQkgICAgIEdVQ19SRUdTRVRfU0FWRV9ERUZB VUxUX1ZBTFVFLAorCQkJCSAgICAgSTkxNV9SRUFEKFJJTkdfTU9ERV9HRU43KGVuZ2luZSkpIHwK KwkJCQkgICAgIEdGWF9JTlRFUlJVUFRfU1RFRVJJTkcgfCAoMHhGRkZGPDwxNikpOworCisJCUdV Q19BRERfTU1JT19SRUdfQURTKGVuZ19yZWcsIFJJTkdfSU1SKGVuZ2luZS0+bW1pb19iYXNlKSwK KwkJCQkgICAgIEdVQ19SRUdTRVRfRU5HSU5FUkVTRVQgfAorCQkJCSAgICAgR1VDX1JFR1NFVF9T QVZFX0NVUlJFTlRfVkFMVUUsIDApOworCisJCS8qIGFzayBndWMgdG8gcmUtYXBwbHkgd29ya2Fy b3VuZHMgc2V0IGluICpfaW5pdF93b3JrYXJvdW5kcyAqLworCQlmb3IgKGkgPSAwOyBpIDwgd29y a2Fyb3VuZHMtPmd1Y19jb3VudDsgaSsrKQorCQkJR1VDX0FERF9NTUlPX1JFR19BRFMoZW5nX3Jl ZywKKwkJCQkJICAgICB3b3JrYXJvdW5kcy0+Z3VjX3JlZ1tpXS5hZGRyLAorCQkJCQkgICAgIEdV Q19SRUdTRVRfRU5HSU5FUkVTRVQgfAorCQkJCQkgICAgIEdVQ19SRUdTRVRfU0FWRV9ERUZBVUxU X1ZBTFVFLAorCQkJCQkgICAgIHdvcmthcm91bmRzLT5ndWNfcmVnW2ldLnZhbHVlKTsKKworCQlE Uk1fREVCVUdfRFJJVkVSKCIlcyByZWdpc3RlciBzYXZlL3Jlc3RvcmUgY291bnQ6ICV1XG4iLAor CQkJCSBlbmdpbmUtPm5hbWUsIGVuZ19yZWctPm51bWJlcl9vZl9yZWdpc3RlcnMpOworCiAJCWJs b2ItPnJlZ19zdGF0ZS53aGl0ZV9saXN0W2VuZ2luZS0+Z3VjX2lkXS5tbWlvX3N0YXJ0ID0KIAkJ CWk5MTVfbW1pb19yZWdfb2Zmc2V0KFJJTkdfRk9SQ0VfVE9fTk9OUFJJVihlbmdpbmUtPm1taW9f YmFzZSwgMCkpOwogCkBAIC0xMDQ0LDkgKzExMDQsMTMgQEAgc3RhdGljIGludCBndWNfYWRzX2Ny ZWF0ZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJCSAqIGluY29uc2lzdGVuY2llcyB3aXRoIHRo ZSBoYW5kbGluZyBvZiBGT1JDRV9UT19OT05QUklWCiAJCSAqIHJlZ2lzdGVycy4KIAkJICovCi0J CWJsb2ItPnJlZ19zdGF0ZS53aGl0ZV9saXN0W2VuZ2luZS0+Z3VjX2lkXS5jb3VudCA9IDA7CisJ CWJsb2ItPnJlZ19zdGF0ZS53aGl0ZV9saXN0W2VuZ2luZS0+Z3VjX2lkXS5jb3VudCA9CisJCQkJ CXdvcmthcm91bmRzLT5od193aGl0ZWxpc3RfY291bnRbaWRdOwogCi0JCS8qIE5vdGhpbmcgdG8g YmUgc2F2ZWQgb3IgcmVzdG9yZWQgZm9yIG5vdy4gKi8KKwkJZm9yIChpID0gMDsgaSA8IHdvcmth cm91bmRzLT5od193aGl0ZWxpc3RfY291bnRbaWRdOyBpKyspIHsKKwkJCWJsb2ItPnJlZ19zdGF0 ZS53aGl0ZV9saXN0W2VuZ2luZS0+Z3VjX2lkXS5vZmZzZXRzW2ldID0KKwkJCQlJOTE1X1JFQUQo UklOR19GT1JDRV9UT19OT05QUklWKGVuZ2luZS0+bW1pb19iYXNlLCBpKSk7CisJCX0KIAl9CiAK IAkvKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYwppbmRleCA0MDI3NjlkOWQ4 NDAuLjYwMWNkYjBhMzY5NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZW5naW5lX2NzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMK QEAgLTYyNSw2ICs2MjUsMjkgQEAgc3RhdGljIGludCB3YV9yaW5nX3doaXRlbGlzdF9yZWcoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCXJldHVybiAwOwogfQogCitzdGF0aWMgaW50 IGd1Y193YV9hZGQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkgICAgICBp OTE1X3JlZ190IGFkZHIsIGNvbnN0IHUzMiB2YWwpCit7CisJY29uc3QgdTMyIGlkeCA9IGRldl9w cml2LT53b3JrYXJvdW5kcy5ndWNfY291bnQ7CisKKwlJOTE1X1dSSVRFKGFkZHIsIHZhbCk7CisJ aWYgKFdBUk5fT04oaWR4ID49IEdVQ19SRUdTRVRfTUFYX1JFR0lTVEVSUykpCisJCXJldHVybiAt RU5PU1BDOworCisJZGV2X3ByaXYtPndvcmthcm91bmRzLmd1Y19yZWdbaWR4XS5hZGRyID0gYWRk cjsKKwkvKiBHdUMgY2FuJ3QgaGFuZGxlIG1hc2tlZCByZWdzLCBzbyB3ZSBzdG9yZSB0aGUgdmFs dWV8bWFzayB0b2dldGhlciAqLworCWRldl9wcml2LT53b3JrYXJvdW5kcy5ndWNfcmVnW2lkeF0u dmFsdWUgPSB2YWw7CisJZGV2X3ByaXYtPndvcmthcm91bmRzLmd1Y19jb3VudCsrOworCisJcmV0 dXJuIDA7Cit9CisKKyNkZWZpbmUgSTkxNV9HVUNfUkVHX1dSSVRFKGFkZHIsIHZhbCkgZG8geyBc CisJCWNvbnN0IGludCByID0gZ3VjX3dhX2FkZChkZXZfcHJpdiwgKGFkZHIpLCAodmFsKSk7IFwK KwkJaWYgKHIpIFwKKwkJCXJldHVybiByOyBcCisJfSB3aGlsZSAoMCkKKwogc3RhdGljIGludCBn ZW44X2luaXRfd29ya2Fyb3VuZHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+aTkxNTsKQEAgLTcz MiwxNSArNzU1LDE2IEBAIHN0YXRpYyBpbnQgZ2VuOV9pbml0X3dvcmthcm91bmRzKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlpbnQgcmV0OwogCiAJLyogV2FDb25leHRTd2l0Y2hX aXRoQ29uY3VycmVudFRMQkludmFsaWRhdGU6c2tsLGJ4dCxrYmwsZ2xrICovCi0JSTkxNV9XUklU RShHRU45X0NTRkVfQ0hJQ0tFTjFfUkNTLCBfTUFTS0VEX0JJVF9FTkFCTEUoR0VOOV9QUkVFTVBU X0dQR1BVX1NZTkNfU1dJVENIX0RJU0FCTEUpKTsKKwlJOTE1X0dVQ19SRUdfV1JJVEUoR0VOOV9D U0ZFX0NISUNLRU4xX1JDUywKKwkJCSAgIF9NQVNLRURfQklUX0VOQUJMRShHRU45X1BSRUVNUFRf R1BHUFVfU1lOQ19TV0lUQ0hfRElTQUJMRSkpOwogCiAJLyogV2FFbmFibGVMYnNTbGFSZXRyeVRp bWVyRGVjcmVtZW50OnNrbCxieHQsa2JsLGdsayAqLwotCUk5MTVfV1JJVEUoQkRXX1NDUkFUQ0gx LCBJOTE1X1JFQUQoQkRXX1NDUkFUQ0gxKSB8Ci0JCSAgIEdFTjlfTEJTX1NMQV9SRVRSWV9USU1F Ul9ERUNSRU1FTlRfRU5BQkxFKTsKKwlJOTE1X0dVQ19SRUdfV1JJVEUoQkRXX1NDUkFUQ0gxLCBJ OTE1X1JFQUQoQkRXX1NDUkFUQ0gxKSB8CisJCQkgICBHRU45X0xCU19TTEFfUkVUUllfVElNRVJf REVDUkVNRU5UX0VOQUJMRSk7CiAKIAkvKiBXYURpc2FibGVLaWxsTG9naWM6Ynh0LHNrbCxrYmwg Ki8KLQlJOTE1X1dSSVRFKEdBTV9FQ09DSEssIEk5MTVfUkVBRChHQU1fRUNPQ0hLKSB8Ci0JCSAg IEVDT0NIS19ESVNfVExCKTsKKwlJOTE1X0dVQ19SRUdfV1JJVEUoR0FNX0VDT0NISywgSTkxNV9S RUFEKEdBTV9FQ09DSEspIHwKKwkJCSAgIEVDT0NIS19ESVNfVExCKTsKIAogCS8qIFdhQ2xlYXJG bG93Q29udHJvbEdwZ3B1Q29udGV4dFNhdmU6c2tsLGJ4dCxrYmwsZ2xrICovCiAJLyogV2FEaXNh YmxlUGFydGlhbEluc3RTaG9vdGRvd246c2tsLGJ4dCxrYmwsZ2xrICovCkBAIC04MDksOCArODMz LDggQEAgc3RhdGljIGludCBnZW45X2luaXRfd29ya2Fyb3VuZHMoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lKQogCQkJICBIRENfRk9SQ0VfTk9OX0NPSEVSRU5UKTsKIAogCS8qIFdhRGlz YWJsZUhEQ0ludmFsaWRhdGlvbjpza2wsYnh0LGtibCAqLwotCUk5MTVfV1JJVEUoR0FNX0VDT0NI SywgSTkxNV9SRUFEKEdBTV9FQ09DSEspIHwKLQkJICAgQkRXX0RJU0FCTEVfSERDX0lOVkFMSURB VElPTik7CisJSTkxNV9HVUNfUkVHX1dSSVRFKEdBTV9FQ09DSEssIEk5MTVfUkVBRChHQU1fRUNP Q0hLKSB8CisJCQkgICBCRFdfRElTQUJMRV9IRENfSU5WQUxJREFUSU9OKTsKIAogCS8qIFdhRGlz YWJsZVNhbXBsZXJQb3dlckJ5cGFzc0ZvclNPUGluZ1Bvbmc6c2tsLGJ4dCxrYmwgKi8KIAlpZiAo SVNfU0tZTEFLRShkZXZfcHJpdikgfHwKQEAgLTgyMyw4ICs4NDcsOCBAQCBzdGF0aWMgaW50IGdl bjlfaW5pdF93b3JrYXJvdW5kcyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJV0Ff U0VUX0JJVF9NQVNLRUQoSEFMRl9TTElDRV9DSElDS0VOMiwgR0VOOF9TVF9QT19ESVNBQkxFKTsK IAogCS8qIFdhT0NMQ29oZXJlbnRMaW5lRmx1c2g6c2tsLGJ4dCxrYmwgKi8KLQlJOTE1X1dSSVRF KEdFTjhfTDNTUUNSRUc0LCAoSTkxNV9SRUFEKEdFTjhfTDNTUUNSRUc0KSB8Ci0JCQkJICAgIEdF TjhfTFFTQ19GTFVTSF9DT0hFUkVOVF9MSU5FUykpOworCUk5MTVfR1VDX1JFR19XUklURShHRU44 X0wzU1FDUkVHNCwgKEk5MTVfUkVBRChHRU44X0wzU1FDUkVHNCkgfAorCQkJCQkgICAgR0VOOF9M UVNDX0ZMVVNIX0NPSEVSRU5UX0xJTkVTKSk7CiAKIAkvKiBXYVZGRVN0YXRlQWZ0ZXJQaXBlQ29u dHJvbHdpdGhNZWRpYVN0YXRlQ2xlYXI6c2tsLGJ4dCxnbGsgKi8KIAlyZXQgPSB3YV9yaW5nX3do aXRlbGlzdF9yZWcoZW5naW5lLCBHRU45X0NUWF9QUkVFTVBUX1JFRyk7CkBAIC04OTksMTIgKzky MywxMiBAQCBzdGF0aWMgaW50IHNrbF9pbml0X3dvcmthcm91bmRzKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSkKIAkgKiB1bnRpbCBEMCB3aGljaCBpcyB0aGUgZGVmYXVsdCBjYXNlIHNv IHRoaXMgaXMgZXF1aXZhbGVudCB0bwogCSAqICFXYURpc2FibGVQZXJDdHh0UHJlZW1wdGlvbkdy YW51bGFyaXR5Q29udHJvbDpza2wKIAkgKi8KLQlJOTE1X1dSSVRFKEdFTjdfRkZfU0xJQ0VfQ1Nf Q0hJQ0tFTjEsCi0JCSAgIF9NQVNLRURfQklUX0VOQUJMRShHRU45X0ZGU0NfUEVSQ1RYX1BSRUVN UFRfQ1RSTCkpOworCUk5MTVfR1VDX1JFR19XUklURShHRU43X0ZGX1NMSUNFX0NTX0NISUNLRU4x LAorCQkJICAgX01BU0tFRF9CSVRfRU5BQkxFKEdFTjlfRkZTQ19QRVJDVFhfUFJFRU1QVF9DVFJM KSk7CiAKIAkvKiBXYUVuYWJsZUdhcHNUc3ZDcmVkaXRGaXg6c2tsICovCi0JSTkxNV9XUklURShH RU44X0dBUkJDTlRMLCAoSTkxNV9SRUFEKEdFTjhfR0FSQkNOVEwpIHwKLQkJCQkgICBHRU45X0dB UFNfVFNWX0NSRURJVF9ESVNBQkxFKSk7CisJSTkxNV9HVUNfUkVHX1dSSVRFKEdFTjhfR0FSQkNO VEwsIChJOTE1X1JFQUQoR0VOOF9HQVJCQ05UTCkgfAorCQkJCQkgICBHRU45X0dBUFNfVFNWX0NS RURJVF9ESVNBQkxFKSk7CiAKIAkvKiBXYURpc2FibGVHYWZzVW5pdENsa0dhdGluZzpza2wgKi8K IAlXQV9TRVRfQklUKEdFTjdfVUNHQ1RMNCwgR0VOOF9FVV9HQVVOSVRfQ0xPQ0tfR0FURV9ESVNB QkxFKTsKQEAgLTkzNCwxMiArOTU4LDEyIEBAIHN0YXRpYyBpbnQgYnh0X2luaXRfd29ya2Fyb3Vu ZHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCS8qIFdhU3RvcmVNdWx0aXBsZVBU RWVuYWJsZTpieHQgKi8KIAkvKiBUaGlzIGlzIGEgcmVxdWlyZW1lbnQgYWNjb3JkaW5nIHRvIEhh cmR3YXJlIHNwZWNpZmljYXRpb24gKi8KIAlpZiAoSVNfQlhUX1JFVklEKGRldl9wcml2LCAwLCBC WFRfUkVWSURfQTEpKQotCQlJOTE1X1dSSVRFKFRJTEVDVEwsIEk5MTVfUkVBRChUSUxFQ1RMKSB8 IFRJTEVDVExfVExCUEYpOworCQlJOTE1X0dVQ19SRUdfV1JJVEUoVElMRUNUTCwgSTkxNV9SRUFE KFRJTEVDVEwpIHwgVElMRUNUTF9UTEJQRik7CiAKIAkvKiBXYVNldENsY2tHYXRpbmdEaXNhYmxl TWVkaWE6Ynh0ICovCiAJaWYgKElTX0JYVF9SRVZJRChkZXZfcHJpdiwgMCwgQlhUX1JFVklEX0Ex KSkgewotCQlJOTE1X1dSSVRFKEdFTjdfTUlTQ0NQQ1RMLCAoSTkxNV9SRUFEKEdFTjdfTUlTQ0NQ Q1RMKSAmCi0JCQkJCSAgICB+R0VOOF9ET1BfQ0xPQ0tfR0FURV9NRURJQV9FTkFCTEUpKTsKKwkJ STkxNV9HVUNfUkVHX1dSSVRFKEdFTjdfTUlTQ0NQQ1RMLCAoSTkxNV9SRUFEKEdFTjdfTUlTQ0NQ Q1RMKSAmCisJCQkJCQkgICAgfkdFTjhfRE9QX0NMT0NLX0dBVEVfTUVESUFfRU5BQkxFKSk7CiAJ fQogCiAJLyogV2FEaXNhYmxlVGhyZWFkU3RhbGxEb3BDbG9ja0dhdGluZzpieHQgKi8KQEAgLTk3 NSw4ICs5OTksOCBAQCBzdGF0aWMgaW50IGJ4dF9pbml0X3dvcmthcm91bmRzKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSkKIAogCS8qIFdhUHJvZ3JhbUwzU3FjUmVnMURlZmF1bHRGb3JQ ZXJmOmJ4dCAqLwogCWlmIChJU19CWFRfUkVWSUQoZGV2X3ByaXYsIEJYVF9SRVZJRF9CMCwgUkVW SURfRk9SRVZFUikpCi0JCUk5MTVfV1JJVEUoR0VOOF9MM1NRQ1JFRzEsIEwzX0dFTkVSQUxfUFJJ T19DUkVESVRTKDYyKSB8Ci0JCQkJCSAgIEwzX0hJR0hfUFJJT19DUkVESVRTKDIpKTsKKwkJSTkx NV9HVUNfUkVHX1dSSVRFKEdFTjhfTDNTUUNSRUcxLCBMM19HRU5FUkFMX1BSSU9fQ1JFRElUUyg2 MikgfAorCQkJCQkJICAgTDNfSElHSF9QUklPX0NSRURJVFMoMikpOwogCiAJLyogV2FUb0VuYWJs ZUh3Rml4Rm9yUHVzaENvbnN0SFdCdWc6Ynh0ICovCiAJaWYgKElTX0JYVF9SRVZJRChkZXZfcHJp diwgQlhUX1JFVklEX0MwLCBSRVZJRF9GT1JFVkVSKSkKQEAgLTEwMDEsOCArMTAyNSw4IEBAIHN0 YXRpYyBpbnQga2JsX2luaXRfd29ya2Fyb3VuZHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKQogCQlyZXR1cm4gcmV0OwogCiAJLyogV2FFbmFibGVHYXBzVHN2Q3JlZGl0Rml4OmtibCAq LwotCUk5MTVfV1JJVEUoR0VOOF9HQVJCQ05UTCwgKEk5MTVfUkVBRChHRU44X0dBUkJDTlRMKSB8 Ci0JCQkJICAgR0VOOV9HQVBTX1RTVl9DUkVESVRfRElTQUJMRSkpOworCUk5MTVfR1VDX1JFR19X UklURShHRU44X0dBUkJDTlRMLCAoSTkxNV9SRUFEKEdFTjhfR0FSQkNOVEwpIHwKKwkJCQkJICAg R0VOOV9HQVBTX1RTVl9DUkVESVRfRElTQUJMRSkpOwogCiAJLyogV2FEaXNhYmxlRHluYW1pY0Ny ZWRpdFNoYXJpbmc6a2JsICovCiAJaWYgKElTX0tCTF9SRVZJRChkZXZfcHJpdiwgMCwgS0JMX1JF VklEX0IwKSkKQEAgLTEwNjMsNiArMTA4Nyw3IEBAIGludCBpbml0X3dvcmthcm91bmRzX3Jpbmco c3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCVdBUk5fT04oZW5naW5lLT5pZCAhPSBS Q1MpOwogCiAJZGV2X3ByaXYtPndvcmthcm91bmRzLmNvdW50ID0gMDsKKwlkZXZfcHJpdi0+d29y a2Fyb3VuZHMuZ3VjX2NvdW50ID0gMDsKIAlkZXZfcHJpdi0+d29ya2Fyb3VuZHMuaHdfd2hpdGVs aXN0X2NvdW50W2VuZ2luZS0+aWRdID0gMDsKIAogCWlmIChJU19CUk9BRFdFTEwoZGV2X3ByaXYp KQotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK