From: Oscar Mateo Subject: [PATCH v3 05/22] drm/i915: Rename saved workarounds to make it explicit that they are context WAs Date: Fri, 13 Oct 2017 13:53:59 -0700 Message-ID: <1507928056-6966-6-git-send-email-oscar.mateo@intel.com> References: <1507928056-6966-1-git-send-email-oscar.mateo@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5780A6E0CD for ; Fri, 13 Oct 2017 20:54:14 +0000 (UTC) In-Reply-To: <1507928056-6966-1-git-send-email-oscar.mateo@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 U29tZSBXQXMgdG91Y2ggcmVnaXN0ZXJzIHRoYXQgZ2V0IHNhdmVkL3Jlc3RvcmVkIHRvZ2V0aGVy IHdpdGggdGhlIGxvZ2ljYWwgY29udGV4dC4KTWFrZSB0aGlzIHZlcnkgZXhwbGljaXQgYnkgcmVu YW1pbmcgYSBmZXcgdGhpbmdzIGluIHRoZSBjb2RlLgoKdjI6CiAgLSBJbXByb3ZlZCBuYW1pbmcK ICAtIFJlYmFzZWQKCnYzOiBBbHNvIHJlbmFtZSBJOTE1X01BWF9DVFhfV0FfUkVHUwoKU2lnbmVk LW9mZi1ieTogT3NjYXIgTWF0ZW8gPG9zY2FyLm1hdGVvQGludGVsLmNvbT4KQ2M6IENocmlzIFdp bHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogTWlrYSBLdW9wcGFsYSA8bWlrYS5r dW9wcGFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMgICAgICB8ICAxMCArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAg ICAgICAgICB8ICAgNyArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd29ya2Fyb3VuZHMu YyB8IDIzMiArKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQs IDEyNSBpbnNlcnRpb25zKCspLCAxMjQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RlYnVnZnMuYwppbmRleCAwYmI2ZTAxLi4xZWI2ZTU4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RlYnVnZnMuYwpAQCAtMzQxNSwxOCArMzQxNSwxOCBAQCBzdGF0aWMgaW50IGk5MTVfd2FfcmVn aXN0ZXJzKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKQogCiAJaW50ZWxfcnVudGlt ZV9wbV9nZXQoZGV2X3ByaXYpOwogCi0Jc2VxX3ByaW50ZihtLCAiV29ya2Fyb3VuZHMgYXBwbGll ZDogJWRcbiIsIHdvcmthcm91bmRzLT5jb3VudCk7CisJc2VxX3ByaW50ZihtLCAiQ29udGV4dCB3 b3JrYXJvdW5kcyBhcHBsaWVkOiAlZFxuIiwgd29ya2Fyb3VuZHMtPmN0eF93YV9jb3VudCk7CiAJ Zm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGlkKQogCQlzZXFfcHJpbnRmKG0sICJI VyB3aGl0ZWxpc3QgY291bnQgZm9yICVzOiAlZFxuIiwKIAkJCSAgIGVuZ2luZS0+bmFtZSwgd29y a2Fyb3VuZHMtPmh3X3doaXRlbGlzdF9jb3VudFtpZF0pOwotCWZvciAoaSA9IDA7IGkgPCB3b3Jr YXJvdW5kcy0+Y291bnQ7ICsraSkgeworCWZvciAoaSA9IDA7IGkgPCB3b3JrYXJvdW5kcy0+Y3R4 X3dhX2NvdW50OyArK2kpIHsKIAkJaTkxNV9yZWdfdCBhZGRyOwogCQl1MzIgbWFzaywgdmFsdWUs IHJlYWQ7CiAJCWJvb2wgb2s7CiAKLQkJYWRkciA9IHdvcmthcm91bmRzLT5yZWdbaV0uYWRkcjsK LQkJbWFzayA9IHdvcmthcm91bmRzLT5yZWdbaV0ubWFzazsKLQkJdmFsdWUgPSB3b3JrYXJvdW5k cy0+cmVnW2ldLnZhbHVlOworCQlhZGRyID0gd29ya2Fyb3VuZHMtPmN0eF93YV9yZWdbaV0uYWRk cjsKKwkJbWFzayA9IHdvcmthcm91bmRzLT5jdHhfd2FfcmVnW2ldLm1hc2s7CisJCXZhbHVlID0g d29ya2Fyb3VuZHMtPmN0eF93YV9yZWdbaV0udmFsdWU7CiAJCXJlYWQgPSBJOTE1X1JFQUQoYWRk cik7CiAJCW9rID0gKHZhbHVlICYgbWFzaykgPT0gKHJlYWQgJiBtYXNrKTsKIAkJc2VxX3ByaW50 ZihtLCAiMHglWDogMHglMDhYLCBtYXNrOiAweCUwOFgsIHJlYWQ6IDB4JTA4eCwgc3RhdHVzOiAl c1xuIiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGE1ZjM5OTkuLmM3MThmZmQgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMTk2MCwxMSArMTk2MCwxMiBAQCBzdHJ1Y3QgaTkxNV93 YV9yZWcgewogCXUzMiBtYXNrOwogfTsKIAotI2RlZmluZSBJOTE1X01BWF9XQV9SRUdTIDE2Cisj ZGVmaW5lIEk5MTVfTUFYX0NUWF9XQV9SRUdTIDE2CiAKIHN0cnVjdCBpOTE1X3dvcmthcm91bmRz IHsKLQlzdHJ1Y3QgaTkxNV93YV9yZWcgcmVnW0k5MTVfTUFYX1dBX1JFR1NdOwotCXUzMiBjb3Vu dDsKKwlzdHJ1Y3QgaTkxNV93YV9yZWcgY3R4X3dhX3JlZ1tJOTE1X01BWF9DVFhfV0FfUkVHU107 CisJdTMyIGN0eF93YV9jb3VudDsKKwogCXUzMiBod193aGl0ZWxpc3RfY291bnRbSTkxNV9OVU1f RU5HSU5FU107CiB9OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93 b3JrYXJvdW5kcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd29ya2Fyb3VuZHMuYwpp bmRleCAwYThmMjY1Li5mNGJjMmQzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF93b3JrYXJvdW5kcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcmth cm91bmRzLmMKQEAgLTI1LDQ5ICsyNSw0OSBAQAogI2luY2x1ZGUgImk5MTVfZHJ2LmgiCiAjaW5j bHVkZSAiaW50ZWxfd29ya2Fyb3VuZHMuaCIKIAotc3RhdGljIGludCB3YV9hZGQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkgIGk5MTVfcmVnX3QgYWRkciwKLQkJICBjb25z dCB1MzIgbWFzaywgY29uc3QgdTMyIHZhbCkKK3N0YXRpYyBpbnQgY3R4X3dhX2FkZChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCSAgICAgIGk5MTVfcmVnX3QgYWRkciwKKwkJ ICAgICAgY29uc3QgdTMyIG1hc2ssIGNvbnN0IHUzMiB2YWwpCiB7Ci0JY29uc3QgdTMyIGlkeCA9 IGRldl9wcml2LT53b3JrYXJvdW5kcy5jb3VudDsKKwljb25zdCB1MzIgaWR4ID0gZGV2X3ByaXYt Pndvcmthcm91bmRzLmN0eF93YV9jb3VudDsKIAotCWlmIChXQVJOX09OKGlkeCA+PSBJOTE1X01B WF9XQV9SRUdTKSkKKwlpZiAoV0FSTl9PTihpZHggPj0gSTkxNV9NQVhfQ1RYX1dBX1JFR1MpKQog CQlyZXR1cm4gLUVOT1NQQzsKIAotCWRldl9wcml2LT53b3JrYXJvdW5kcy5yZWdbaWR4XS5hZGRy ID0gYWRkcjsKLQlkZXZfcHJpdi0+d29ya2Fyb3VuZHMucmVnW2lkeF0udmFsdWUgPSB2YWw7Ci0J ZGV2X3ByaXYtPndvcmthcm91bmRzLnJlZ1tpZHhdLm1hc2sgPSBtYXNrOworCWRldl9wcml2LT53 b3JrYXJvdW5kcy5jdHhfd2FfcmVnW2lkeF0uYWRkciA9IGFkZHI7CisJZGV2X3ByaXYtPndvcmth cm91bmRzLmN0eF93YV9yZWdbaWR4XS52YWx1ZSA9IHZhbDsKKwlkZXZfcHJpdi0+d29ya2Fyb3Vu ZHMuY3R4X3dhX3JlZ1tpZHhdLm1hc2sgPSBtYXNrOwogCi0JZGV2X3ByaXYtPndvcmthcm91bmRz LmNvdW50Kys7CisJZGV2X3ByaXYtPndvcmthcm91bmRzLmN0eF93YV9jb3VudCsrOwogCiAJcmV0 dXJuIDA7CiB9CiAKLSNkZWZpbmUgV0FfUkVHKGFkZHIsIG1hc2ssIHZhbCkgZG8geyBcCi0JCWNv bnN0IGludCByID0gd2FfYWRkKGRldl9wcml2LCAoYWRkciksIChtYXNrKSwgKHZhbCkpOyBcCisj ZGVmaW5lIENUWF9XQV9SRUcoYWRkciwgbWFzaywgdmFsKSBkbyB7IFwKKwkJY29uc3QgaW50IHIg PSBjdHhfd2FfYWRkKGRldl9wcml2LCAoYWRkciksIChtYXNrKSwgKHZhbCkpOyBcCiAJCWlmIChy KSBcCiAJCQlyZXR1cm4gcjsgXAogCX0gd2hpbGUgKDApCiAKLSNkZWZpbmUgV0FfU0VUX0JJVF9N QVNLRUQoYWRkciwgbWFzaykgXAotCVdBX1JFRyhhZGRyLCAobWFzayksIF9NQVNLRURfQklUX0VO QUJMRShtYXNrKSkKKyNkZWZpbmUgQ1RYX1dBX1NFVF9CSVRfTUFTS0VEKGFkZHIsIG1hc2spIFwK KwlDVFhfV0FfUkVHKGFkZHIsIChtYXNrKSwgX01BU0tFRF9CSVRfRU5BQkxFKG1hc2spKQogCi0j ZGVmaW5lIFdBX0NMUl9CSVRfTUFTS0VEKGFkZHIsIG1hc2spIFwKLQlXQV9SRUcoYWRkciwgKG1h c2spLCBfTUFTS0VEX0JJVF9ESVNBQkxFKG1hc2spKQorI2RlZmluZSBDVFhfV0FfQ0xSX0JJVF9N QVNLRUQoYWRkciwgbWFzaykgXAorCUNUWF9XQV9SRUcoYWRkciwgKG1hc2spLCBfTUFTS0VEX0JJ VF9ESVNBQkxFKG1hc2spKQogCi0jZGVmaW5lIFdBX1NFVF9GSUVMRF9NQVNLRUQoYWRkciwgbWFz aywgdmFsdWUpIFwKLQlXQV9SRUcoYWRkciwgbWFzaywgX01BU0tFRF9GSUVMRChtYXNrLCB2YWx1 ZSkpCisjZGVmaW5lIENUWF9XQV9TRVRfRklFTERfTUFTS0VEKGFkZHIsIG1hc2ssIHZhbHVlKSBc CisJQ1RYX1dBX1JFRyhhZGRyLCBtYXNrLCBfTUFTS0VEX0ZJRUxEKG1hc2ssIHZhbHVlKSkKIAog c3RhdGljIGludCBnZW44X2N0eF93b3JrYXJvdW5kc19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIHsKLQlXQV9TRVRfQklUX01BU0tFRChJTlNUUE0sIElOU1RQTV9GT1JD RV9PUkRFUklORyk7CisJQ1RYX1dBX1NFVF9CSVRfTUFTS0VEKElOU1RQTSwgSU5TVFBNX0ZPUkNF X09SREVSSU5HKTsKIAogCS8qIFdhRGlzYWJsZUFzeW5jRmxpcFBlcmZNb2RlOmJkdyxjaHYgKi8K LQlXQV9TRVRfQklUX01BU0tFRChNSV9NT0RFLCBBU1lOQ19GTElQX1BFUkZfRElTQUJMRSk7CisJ Q1RYX1dBX1NFVF9CSVRfTUFTS0VEKE1JX01PREUsIEFTWU5DX0ZMSVBfUEVSRl9ESVNBQkxFKTsK IAogCS8qIFdhRGlzYWJsZVBhcnRpYWxJbnN0U2hvb3Rkb3duOmJkdyxjaHYgKi8KLQlXQV9TRVRf QklUX01BU0tFRChHRU44X1JPV19DSElDS0VOLAotCQkJICBQQVJUSUFMX0lOU1RSVUNUSU9OX1NI T09URE9XTl9ESVNBQkxFKTsKKwlDVFhfV0FfU0VUX0JJVF9NQVNLRUQoR0VOOF9ST1dfQ0hJQ0tF TiwKKwkJCSAgICAgIFBBUlRJQUxfSU5TVFJVQ1RJT05fU0hPT1RET1dOX0RJU0FCTEUpOwogCiAJ LyogVXNlIEZvcmNlIE5vbi1Db2hlcmVudCB3aGVuZXZlciBleGVjdXRpbmcgYSAzRCBjb250ZXh0 LiBUaGlzIGlzIGEKIAkgKiB3b3JrYXJvdW5kIGZvciBmb3IgYSBwb3NzaWJsZSBoYW5nIGluIHRo ZSB1bmxpa2VseSBldmVudCBhIFRMQgpAQCAtNzUsOSArNzUsOSBAQCBzdGF0aWMgaW50IGdlbjhf Y3R4X3dvcmthcm91bmRzX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CSAqLwogCS8qIFdhRm9yY2VFbmFibGVOb25Db2hlcmVudDpiZHcsY2h2ICovCiAJLyogV2FIZGNE aXNhYmxlRmV0Y2hXaGVuTWFza2VkOmJkdyxjaHYgKi8KLQlXQV9TRVRfQklUX01BU0tFRChIRENf Q0hJQ0tFTjAsCi0JCQkgIEhEQ19ET05PVF9GRVRDSF9NRU1fV0hFTl9NQVNLRUQgfAotCQkJICBI RENfRk9SQ0VfTk9OX0NPSEVSRU5UKTsKKwlDVFhfV0FfU0VUX0JJVF9NQVNLRUQoSERDX0NISUNL RU4wLAorCQkJICAgICAgSERDX0RPTk9UX0ZFVENIX01FTV9XSEVOX01BU0tFRCB8CisJCQkgICAg ICBIRENfRk9SQ0VfTk9OX0NPSEVSRU5UKTsKIAogCS8qIEZyb20gdGhlIEhhc3dlbGwgUFJNLCBD b21tYW5kIFJlZmVyZW5jZTogUmVnaXN0ZXJzLCBDQUNIRV9NT0RFXzA6CiAJICogIlRoZSBIaWVy YXJjaGljYWwgWiBSQVcgU3RhbGwgT3B0aW1pemF0aW9uIGFsbG93cyBub24tb3ZlcmxhcHBpbmcK QEAgLTg3LDEwICs4NywxMCBAQCBzdGF0aWMgaW50IGdlbjhfY3R4X3dvcmthcm91bmRzX2luaXQo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCSAqCiAJICogVGhpcyBvcHRpbWl6 YXRpb24gaXMgb2ZmIGJ5IGRlZmF1bHQgZm9yIEJEVyBhbmQgQ0hWOyB0dXJuIGl0IG9uLgogCSAq LwotCVdBX0NMUl9CSVRfTUFTS0VEKENBQ0hFX01PREVfMF9HRU43LCBISVpfUkFXX1NUQUxMX09Q VF9ESVNBQkxFKTsKKwlDVFhfV0FfQ0xSX0JJVF9NQVNLRUQoQ0FDSEVfTU9ERV8wX0dFTjcsIEhJ Wl9SQVdfU1RBTExfT1BUX0RJU0FCTEUpOwogCiAJLyogV2E0eDRTVENPcHRpbWl6YXRpb25EaXNh YmxlOmJkdyxjaHYgKi8KLQlXQV9TRVRfQklUX01BU0tFRChDQUNIRV9NT0RFXzEsIEdFTjhfNHg0 X1NUQ19PUFRJTUlaQVRJT05fRElTQUJMRSk7CisJQ1RYX1dBX1NFVF9CSVRfTUFTS0VEKENBQ0hF X01PREVfMSwgR0VOOF80eDRfU1RDX09QVElNSVpBVElPTl9ESVNBQkxFKTsKIAogCS8qCiAJICog QlNwZWMgcmVjb21tZW5kcyA4eDQgd2hlbiBNU0FBIGlzIHVzZWQsCkBAIC0xMDAsOSArMTAwLDkg QEAgc3RhdGljIGludCBnZW44X2N0eF93b3JrYXJvdW5kc19pbml0KHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKIAkgKiBkaXNhYmxlIGJpdCwgd2hpY2ggd2UgZG9uJ3QgdG91Y2gg aGVyZSwgYnV0IGl0J3MgZ29vZAogCSAqIHRvIGtlZXAgaW4gbWluZCAoc2VlIDNEU1RBVEVfUFMg YW5kIDNEU1RBVEVfV00pLgogCSAqLwotCVdBX1NFVF9GSUVMRF9NQVNLRUQoR0VON19HVF9NT0RF LAotCQkJICAgIEdFTjZfV0laX0hBU0hJTkdfTUFTSywKLQkJCSAgICBHRU42X1dJWl9IQVNISU5H XzE2eDQpOworCUNUWF9XQV9TRVRfRklFTERfTUFTS0VEKEdFTjdfR1RfTU9ERSwKKwkJCQlHRU42 X1dJWl9IQVNISU5HX01BU0ssCisJCQkJR0VONl9XSVpfSEFTSElOR18xNng0KTsKIAogCXJldHVy biAwOwogfQpAQCAtMTE2LDI0ICsxMTYsMjQgQEAgc3RhdGljIGludCBiZHdfY3R4X3dvcmthcm91 bmRzX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQlyZXR1cm4gcmV0 OwogCiAJLyogV2FEaXNhYmxlVGhyZWFkU3RhbGxEb3BDbG9ja0dhdGluZzpiZHcgKHByZS1wcm9k dWN0aW9uKSAqLwotCVdBX1NFVF9CSVRfTUFTS0VEKEdFTjhfUk9XX0NISUNLRU4sIFNUQUxMX0RP UF9HQVRJTkdfRElTQUJMRSk7CisJQ1RYX1dBX1NFVF9CSVRfTUFTS0VEKEdFTjhfUk9XX0NISUNL RU4sIFNUQUxMX0RPUF9HQVRJTkdfRElTQUJMRSk7CiAKIAkvKiBXYURpc2FibGVEb3BDbG9ja0dh dGluZzpiZHcKIAkgKgogCSAqIEFsc28gc2VlIHRoZSByZWxhdGVkIFVDR1RDTDEgd3JpdGUgaW4g YnJvYWR3ZWxsX2luaXRfY2xvY2tfZ2F0aW5nKCkKIAkgKiB0byBkaXNhYmxlIEVVVEMgY2xvY2sg Z2F0aW5nLgogCSAqLwotCVdBX1NFVF9CSVRfTUFTS0VEKEdFTjdfUk9XX0NISUNLRU4yLAotCQkJ ICBET1BfQ0xPQ0tfR0FUSU5HX0RJU0FCTEUpOworCUNUWF9XQV9TRVRfQklUX01BU0tFRChHRU43 X1JPV19DSElDS0VOMiwKKwkJCSAgICAgIERPUF9DTE9DS19HQVRJTkdfRElTQUJMRSk7CiAKLQlX QV9TRVRfQklUX01BU0tFRChIQUxGX1NMSUNFX0NISUNLRU4zLAotCQkJICBHRU44X1NBTVBMRVJf UE9XRVJfQllQQVNTX0RJUyk7CisJQ1RYX1dBX1NFVF9CSVRfTUFTS0VEKEhBTEZfU0xJQ0VfQ0hJ Q0tFTjMsCisJCQkgICAgICBHRU44X1NBTVBMRVJfUE9XRVJfQllQQVNTX0RJUyk7CiAKLQlXQV9T RVRfQklUX01BU0tFRChIRENfQ0hJQ0tFTjAsCi0JCQkgIC8qIFdhRm9yY2VDb250ZXh0U2F2ZVJl c3RvcmVOb25Db2hlcmVudDpiZHcgKi8KLQkJCSAgSERDX0ZPUkNFX0NPTlRFWFRfU0FWRV9SRVNU T1JFX05PTl9DT0hFUkVOVCB8Ci0JCQkgIC8qIFdhRGlzYWJsZUZlbmNlRGVzdGluYXRpb25Ub1NM TTpiZHcgKHByZS1wcm9kKSAqLwotCQkJICAoSVNfQkRXX0dUMyhkZXZfcHJpdikgPyBIRENfRkVO Q0VfREVTVF9TTE1fRElTQUJMRSA6IDApKTsKKwlDVFhfV0FfU0VUX0JJVF9NQVNLRUQoSERDX0NI SUNLRU4wLAorCQkJICAgICAgLyogV2FGb3JjZUNvbnRleHRTYXZlUmVzdG9yZU5vbkNvaGVyZW50 OmJkdyAqLworCQkJICAgICAgSERDX0ZPUkNFX0NPTlRFWFRfU0FWRV9SRVNUT1JFX05PTl9DT0hF UkVOVCB8CisJCQkgICAgICAvKiBXYURpc2FibGVGZW5jZURlc3RpbmF0aW9uVG9TTE06YmR3IChw cmUtcHJvZCkgKi8KKwkJCSAgICAgIChJU19CRFdfR1QzKGRldl9wcml2KSA/IEhEQ19GRU5DRV9E RVNUX1NMTV9ESVNBQkxFIDogMCkpOwogCiAJcmV0dXJuIDA7CiB9CkBAIC0xNDcsMTAgKzE0Nywx MCBAQCBzdGF0aWMgaW50IGNodl9jdHhfd29ya2Fyb3VuZHNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCiAJCXJldHVybiByZXQ7CiAKIAkvKiBXYURpc2FibGVUaHJlYWRT dGFsbERvcENsb2NrR2F0aW5nOmNodiAqLwotCVdBX1NFVF9CSVRfTUFTS0VEKEdFTjhfUk9XX0NI SUNLRU4sIFNUQUxMX0RPUF9HQVRJTkdfRElTQUJMRSk7CisJQ1RYX1dBX1NFVF9CSVRfTUFTS0VE KEdFTjhfUk9XX0NISUNLRU4sIFNUQUxMX0RPUF9HQVRJTkdfRElTQUJMRSk7CiAKIAkvKiBJbXBy b3ZlIEhpWiB0aHJvdWdocHV0IG9uIENIVi4gKi8KLQlXQV9TRVRfQklUX01BU0tFRChISVpfQ0hJ Q0tFTiwgQ0hWX0haXzhYOF9NT0RFX0lOXzFYKTsKKwlDVFhfV0FfU0VUX0JJVF9NQVNLRUQoSEla X0NISUNLRU4sIENIVl9IWl84WDhfTU9ERV9JTl8xWCk7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTE2 MywzMiArMTYzLDMyIEBAIHN0YXRpYyBpbnQgZ2VuOV9jdHhfd29ya2Fyb3VuZHNfaW5pdChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCSAqIE11c3QgbWF0Y2ggRGlzcGxheSBF bmdpbmUuIFNlZQogCQkgKiBXYUNvbXByZXNzZWRSZXNvdXJjZURpc3BsYXlOZXdIYXNoTW9kZS4K IAkJICovCi0JCVdBX1NFVF9CSVRfTUFTS0VEKENPTU1PTl9TTElDRV9DSElDS0VOMiwKLQkJCQkg IEdFTjlfUEJFX0NPTVBSRVNTRURfSEFTSF9TRUxFQ1RJT04pOwotCQlXQV9TRVRfQklUX01BU0tF RChHRU45X0hBTEZfU0xJQ0VfQ0hJQ0tFTjcsCi0JCQkJICBHRU45X1NBTVBMRVJfSEFTSF9DT01Q UkVTU0VEX1JFQURfQUREUik7CisJCUNUWF9XQV9TRVRfQklUX01BU0tFRChDT01NT05fU0xJQ0Vf Q0hJQ0tFTjIsCisJCQkJICAgICAgR0VOOV9QQkVfQ09NUFJFU1NFRF9IQVNIX1NFTEVDVElPTik7 CisJCUNUWF9XQV9TRVRfQklUX01BU0tFRChHRU45X0hBTEZfU0xJQ0VfQ0hJQ0tFTjcsCisJCQkJ ICAgICAgR0VOOV9TQU1QTEVSX0hBU0hfQ09NUFJFU1NFRF9SRUFEX0FERFIpOwogCX0KIAogCS8q IFdhQ2xlYXJGbG93Q29udHJvbEdwZ3B1Q29udGV4dFNhdmU6c2tsLGJ4dCxrYmwsZ2xrLGNmbCAq LwogCS8qIFdhRGlzYWJsZVBhcnRpYWxJbnN0U2hvb3Rkb3duOnNrbCxieHQsa2JsLGdsayxjZmwg Ki8KLQlXQV9TRVRfQklUX01BU0tFRChHRU44X1JPV19DSElDS0VOLAotCQkJICBGTE9XX0NPTlRS T0xfRU5BQkxFIHwKLQkJCSAgUEFSVElBTF9JTlNUUlVDVElPTl9TSE9PVERPV05fRElTQUJMRSk7 CisJQ1RYX1dBX1NFVF9CSVRfTUFTS0VEKEdFTjhfUk9XX0NISUNLRU4sCisJCQkgICAgICBGTE9X X0NPTlRST0xfRU5BQkxFIHwKKwkJCSAgICAgIFBBUlRJQUxfSU5TVFJVQ1RJT05fU0hPT1RET1dO X0RJU0FCTEUpOwogCiAJLyogU3luY2luZyBkZXBlbmRlbmNpZXMgYmV0d2VlbiBjYW1lcmEgYW5k IGdyYXBoaWNzOnNrbCxieHQsa2JsICovCiAJaWYgKCFJU19DT0ZGRUVMQUtFKGRldl9wcml2KSkK LQkJV0FfU0VUX0JJVF9NQVNLRUQoSEFMRl9TTElDRV9DSElDS0VOMywKLQkJCQkgIEdFTjlfRElT QUJMRV9PQ0xfT09CX1NVUFBSRVNTX0xPR0lDKTsKKwkJQ1RYX1dBX1NFVF9CSVRfTUFTS0VEKEhB TEZfU0xJQ0VfQ0hJQ0tFTjMsCisJCQkJICAgICAgR0VOOV9ESVNBQkxFX09DTF9PT0JfU1VQUFJF U1NfTE9HSUMpOwogCiAJLyogV2FEaXNhYmxlRGdNaXJyb3JGaXhJbkhhbGZTbGljZUNoaWNrZW41 OmJ4dCAqLwogCWlmIChJU19CWFRfUkVWSUQoZGV2X3ByaXYsIDAsIEJYVF9SRVZJRF9BMSkpCi0J CVdBX0NMUl9CSVRfTUFTS0VEKEdFTjlfSEFMRl9TTElDRV9DSElDS0VONSwKLQkJCQkgIEdFTjlf REdfTUlSUk9SX0ZJWF9FTkFCTEUpOworCQlDVFhfV0FfQ0xSX0JJVF9NQVNLRUQoR0VOOV9IQUxG X1NMSUNFX0NISUNLRU41LAorCQkJCSAgICAgIEdFTjlfREdfTUlSUk9SX0ZJWF9FTkFCTEUpOwog CiAJLyogV2FTZXREaXNhYmxlUGl4TWFza0NhbW1pbmdBbmRSaHdvSW5Db21tb25TbGljZUNoaWNr ZW46Ynh0ICovCiAJaWYgKElTX0JYVF9SRVZJRChkZXZfcHJpdiwgMCwgQlhUX1JFVklEX0ExKSkg ewotCQlXQV9TRVRfQklUX01BU0tFRChHRU43X0NPTU1PTl9TTElDRV9DSElDS0VOMSwKLQkJCQkg IEdFTjlfUkhXT19PUFRJTUlaQVRJT05fRElTQUJMRSk7CisJCUNUWF9XQV9TRVRfQklUX01BU0tF RChHRU43X0NPTU1PTl9TTElDRV9DSElDS0VOMSwKKwkJCQkgICAgICBHRU45X1JIV09fT1BUSU1J WkFUSU9OX0RJU0FCTEUpOwogCQkvKgogCQkgKiBXQSBhbHNvIHJlcXVpcmVzIEdFTjlfU0xJQ0Vf Q09NTU9OX0VDT19DSElDS0VOMFsxNDoxNF0gdG8gYmUgc2V0CiAJCSAqIGJ1dCB3ZSBkbyB0aGF0 IGluIHBlciBjdHggYmF0Y2hidWZmZXIgYXMgdGhlcmUgaXMgYW4gaXNzdWUKQEAgLTE5OCwyOCAr MTk4LDI4IEBAIHN0YXRpYyBpbnQgZ2VuOV9jdHhfd29ya2Fyb3VuZHNfaW5pdChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIAkvKiBXYUVuYWJsZVlWMTJCdWdGaXhJbkhhbGZT bGljZUNoaWNrZW43OnNrbCxieHQsa2JsLGdsayxjZmwgKi8KIAkvKiBXYUVuYWJsZVNhbXBsZXJH UEdQVVByZWVtcHRpb25TdXBwb3J0OnNrbCxieHQsa2JsLGNmbCAqLwotCVdBX1NFVF9CSVRfTUFT S0VEKEdFTjlfSEFMRl9TTElDRV9DSElDS0VONywKLQkJCSAgR0VOOV9FTkFCTEVfWVYxMl9CVUdG SVggfAotCQkJICBHRU45X0VOQUJMRV9HUEdQVV9QUkVFTVBUSU9OKTsKKwlDVFhfV0FfU0VUX0JJ VF9NQVNLRUQoR0VOOV9IQUxGX1NMSUNFX0NISUNLRU43LAorCQkJICAgICAgR0VOOV9FTkFCTEVf WVYxMl9CVUdGSVggfAorCQkJICAgICAgR0VOOV9FTkFCTEVfR1BHUFVfUFJFRU1QVElPTik7CiAK IAkvKiBXYTR4NFNUQ09wdGltaXphdGlvbkRpc2FibGU6c2tsLGJ4dCxrYmwsZ2xrLGNmbCAqLwog CS8qIFdhRGlzYWJsZVBhcnRpYWxSZXNvbHZlSW5WYzpza2wsYnh0LGtibCxjZmwgKi8KLQlXQV9T RVRfQklUX01BU0tFRChDQUNIRV9NT0RFXzEsIChHRU44XzR4NF9TVENfT1BUSU1JWkFUSU9OX0RJ U0FCTEUgfAotCQkJCQkgR0VOOV9QQVJUSUFMX1JFU09MVkVfSU5fVkNfRElTQUJMRSkpOworCUNU WF9XQV9TRVRfQklUX01BU0tFRChDQUNIRV9NT0RFXzEsIEdFTjhfNHg0X1NUQ19PUFRJTUlaQVRJ T05fRElTQUJMRSB8CisJCQkJCSAgICBHRU45X1BBUlRJQUxfUkVTT0xWRV9JTl9WQ19ESVNBQkxF KTsKIAogCS8qIFdhQ2NzVGxiUHJlZmV0Y2hEaXNhYmxlOnNrbCxieHQsa2JsLGdsayxjZmwgKi8K LQlXQV9DTFJfQklUX01BU0tFRChHRU45X0hBTEZfU0xJQ0VfQ0hJQ0tFTjUsCi0JCQkgIEdFTjlf Q0NTX1RMQl9QUkVGRVRDSF9FTkFCTEUpOworCUNUWF9XQV9DTFJfQklUX01BU0tFRChHRU45X0hB TEZfU0xJQ0VfQ0hJQ0tFTjUsCisJCQkgICAgICBHRU45X0NDU19UTEJfUFJFRkVUQ0hfRU5BQkxF KTsKIAogCS8qIFdhRGlzYWJsZU1hc2tCYXNlZENhbW1pbmdJblJDQzpieHQgKi8KIAlpZiAoSVNf QlhUX1JFVklEKGRldl9wcml2LCAwLCBCWFRfUkVWSURfQTEpKQotCQlXQV9TRVRfQklUX01BU0tF RChTTElDRV9FQ09fQ0hJQ0tFTjAsCi0JCQkJICBQSVhFTF9NQVNLX0NBTU1JTkdfRElTQUJMRSk7 CisJCUNUWF9XQV9TRVRfQklUX01BU0tFRChTTElDRV9FQ09fQ0hJQ0tFTjAsCisJCQkJICAgICAg UElYRUxfTUFTS19DQU1NSU5HX0RJU0FCTEUpOwogCiAJLyogV2FGb3JjZUNvbnRleHRTYXZlUmVz dG9yZU5vbkNvaGVyZW50OnNrbCxieHQsa2JsLGNmbCAqLwotCVdBX1NFVF9CSVRfTUFTS0VEKEhE Q19DSElDS0VOMCwKLQkJCSAgSERDX0ZPUkNFX0NPTlRFWFRfU0FWRV9SRVNUT1JFX05PTl9DT0hF UkVOVCB8Ci0JCQkgIEhEQ19GT1JDRV9DU1JfTk9OX0NPSEVSRU5UX09WUl9ESVNBQkxFKTsKKwlD VFhfV0FfU0VUX0JJVF9NQVNLRUQoSERDX0NISUNLRU4wLAorCQkJICAgICAgSERDX0ZPUkNFX0NP TlRFWFRfU0FWRV9SRVNUT1JFX05PTl9DT0hFUkVOVCB8CisJCQkgICAgICBIRENfRk9SQ0VfQ1NS X05PTl9DT0hFUkVOVF9PVlJfRElTQUJMRSk7CiAKIAkvKiBXYUZvcmNlRW5hYmxlTm9uQ29oZXJl bnQgYW5kIFdhRGlzYWJsZUhEQ0ludmFsaWRhdGlvbiBhcmUKIAkgKiBib3RoIHRpZWQgdG8gV2FG b3JjZUNvbnRleHRTYXZlUmVzdG9yZU5vbkNvaGVyZW50CkBAIC0yMzUsMTkgKzIzNSwxOSBAQCBz dGF0aWMgaW50IGdlbjlfY3R4X3dvcmthcm91bmRzX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogCSAqLwogCiAJLyogV2FGb3JjZUVuYWJsZU5vbkNvaGVyZW50OnNrbCxi eHQsa2JsLGNmbCAqLwotCVdBX1NFVF9CSVRfTUFTS0VEKEhEQ19DSElDS0VOMCwKLQkJCSAgSERD X0ZPUkNFX05PTl9DT0hFUkVOVCk7CisJQ1RYX1dBX1NFVF9CSVRfTUFTS0VEKEhEQ19DSElDS0VO MCwKKwkJCSAgICAgIEhEQ19GT1JDRV9OT05fQ09IRVJFTlQpOwogCiAJLyogV2FEaXNhYmxlU2Ft cGxlclBvd2VyQnlwYXNzRm9yU09QaW5nUG9uZzpza2wsYnh0LGtibCxjZmwgKi8KIAlpZiAoSVNf U0tZTEFLRShkZXZfcHJpdikgfHwKIAkgICAgSVNfS0FCWUxBS0UoZGV2X3ByaXYpIHx8CiAJICAg IElTX0NPRkZFRUxBS0UoZGV2X3ByaXYpIHx8CiAJICAgIElTX0JYVF9SRVZJRChkZXZfcHJpdiwg MCwgQlhUX1JFVklEX0IwKSkKLQkJV0FfU0VUX0JJVF9NQVNLRUQoSEFMRl9TTElDRV9DSElDS0VO MywKLQkJCQkgIEdFTjhfU0FNUExFUl9QT1dFUl9CWVBBU1NfRElTKTsKKwkJQ1RYX1dBX1NFVF9C SVRfTUFTS0VEKEhBTEZfU0xJQ0VfQ0hJQ0tFTjMsCisJCQkJICAgICAgR0VOOF9TQU1QTEVSX1BP V0VSX0JZUEFTU19ESVMpOwogCiAJLyogV2FEaXNhYmxlU1RVbml0UG93ZXJPcHRpbWl6YXRpb246 c2tsLGJ4dCxrYmwsZ2xrLGNmbCAqLwotCVdBX1NFVF9CSVRfTUFTS0VEKEhBTEZfU0xJQ0VfQ0hJ Q0tFTjIsIEdFTjhfU1RfUE9fRElTQUJMRSk7CisJQ1RYX1dBX1NFVF9CSVRfTUFTS0VEKEhBTEZf U0xJQ0VfQ0hJQ0tFTjIsIEdFTjhfU1RfUE9fRElTQUJMRSk7CiAKIAkvKgogCSAqIFN1cHBvcnRp bmcgcHJlZW1wdGlvbiB3aXRoIGZpbmUtZ3JhbnVsYXJpdHkgcmVxdWlyZXMgY2hhbmdlcyBpbiB0 aGUKQEAgLTI2MSwxMSArMjYxLDExIEBAIHN0YXRpYyBpbnQgZ2VuOV9jdHhfd29ya2Fyb3VuZHNf aW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJICovCiAKIAkvKiBXYURp c2FibGUzRE1pZENtZFByZWVtcHRpb246c2tsLGJ4dCxnbGssY2ZsLFtjbmxdICovCi0JV0FfQ0xS X0JJVF9NQVNLRUQoR0VOOF9DU19DSElDS0VOMSwgR0VOOV9QUkVFTVBUXzNEX09CSkVDVF9MRVZF TCk7CisJQ1RYX1dBX0NMUl9CSVRfTUFTS0VEKEdFTjhfQ1NfQ0hJQ0tFTjEsIEdFTjlfUFJFRU1Q VF8zRF9PQkpFQ1RfTEVWRUwpOwogCiAJLyogV2FEaXNhYmxlR1BHUFVNaWRDbWRQcmVlbXB0aW9u OnNrbCxieHQsYmxrLGNmbCxbY25sXSAqLwotCVdBX1NFVF9GSUVMRF9NQVNLRUQoR0VOOF9DU19D SElDS0VOMSwgR0VOOV9QUkVFTVBUX0dQR1BVX0xFVkVMX01BU0ssCi0JCQkgICAgR0VOOV9QUkVF TVBUX0dQR1BVX0NPTU1BTkRfTEVWRUwpOworCUNUWF9XQV9TRVRfRklFTERfTUFTS0VEKEdFTjhf Q1NfQ0hJQ0tFTjEsIEdFTjlfUFJFRU1QVF9HUEdQVV9MRVZFTF9NQVNLLAorCQkJCUdFTjlfUFJF RU1QVF9HUEdQVV9DT01NQU5EX0xFVkVMKTsKIAogCXJldHVybiAwOwogfQpAQCAtMjk5LDEzICsy OTksMTMgQEAgc3RhdGljIGludCBza2xfdHVuZV9pel9oYXNoaW5nKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKIAkJcmV0dXJuIDA7CiAKIAkvKiBUdW5lIElaIGhhc2hpbmcuIFNl ZSBpbnRlbF9kZXZpY2VfaW5mb19ydW50aW1lX2luaXQoKSAqLwotCVdBX1NFVF9GSUVMRF9NQVNL RUQoR0VON19HVF9NT0RFLAotCQkJICAgIEdFTjlfSVpfSEFTSElOR19NQVNLKDIpIHwKLQkJCSAg ICBHRU45X0laX0hBU0hJTkdfTUFTSygxKSB8Ci0JCQkgICAgR0VOOV9JWl9IQVNISU5HX01BU0so MCksCi0JCQkgICAgR0VOOV9JWl9IQVNISU5HKDIsIHZhbHNbMl0pIHwKLQkJCSAgICBHRU45X0la X0hBU0hJTkcoMSwgdmFsc1sxXSkgfAotCQkJICAgIEdFTjlfSVpfSEFTSElORygwLCB2YWxzWzBd KSk7CisJQ1RYX1dBX1NFVF9GSUVMRF9NQVNLRUQoR0VON19HVF9NT0RFLAorCQkJCUdFTjlfSVpf SEFTSElOR19NQVNLKDIpIHwKKwkJCQlHRU45X0laX0hBU0hJTkdfTUFTSygxKSB8CisJCQkJR0VO OV9JWl9IQVNISU5HX01BU0soMCksCisJCQkJR0VOOV9JWl9IQVNISU5HKDIsIHZhbHNbMl0pIHwK KwkJCQlHRU45X0laX0hBU0hJTkcoMSwgdmFsc1sxXSkgfAorCQkJCUdFTjlfSVpfSEFTSElORygw LCB2YWxzWzBdKSk7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTMzMCwyMCArMzMwLDIwIEBAIHN0YXRp YyBpbnQgYnh0X2N0eF93b3JrYXJvdW5kc19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKIAkJcmV0dXJuIHJldDsKIAogCS8qIFdhRGlzYWJsZVRocmVhZFN0YWxsRG9wQ2xv Y2tHYXRpbmc6Ynh0ICovCi0JV0FfU0VUX0JJVF9NQVNLRUQoR0VOOF9ST1dfQ0hJQ0tFTiwKLQkJ CSAgU1RBTExfRE9QX0dBVElOR19ESVNBQkxFKTsKKwlDVFhfV0FfU0VUX0JJVF9NQVNLRUQoR0VO OF9ST1dfQ0hJQ0tFTiwKKwkJCSAgICAgIFNUQUxMX0RPUF9HQVRJTkdfRElTQUJMRSk7CiAKIAkv KiBXYURpc2FibGVTYmVDYWNoZURpc3BhdGNoUG9ydFNoYXJpbmc6Ynh0ICovCiAJaWYgKElTX0JY VF9SRVZJRChkZXZfcHJpdiwgMCwgQlhUX1JFVklEX0IwKSkgewotCQlXQV9TRVRfQklUX01BU0tF RCgKKwkJQ1RYX1dBX1NFVF9CSVRfTUFTS0VEKAogCQkJR0VON19IQUxGX1NMSUNFX0NISUNLRU4x LAogCQkJR0VON19TQkVfU1NfQ0FDSEVfRElTUEFUQ0hfUE9SVF9TSEFSSU5HX0RJU0FCTEUpOwog CX0KIAogCS8qIFdhVG9FbmFibGVId0ZpeEZvclB1c2hDb25zdEhXQnVnOmJ4dCAqLwogCWlmIChJ U19CWFRfUkVWSUQoZGV2X3ByaXYsIEJYVF9SRVZJRF9DMCwgUkVWSURfRk9SRVZFUikpCi0JCVdB X1NFVF9CSVRfTUFTS0VEKENPTU1PTl9TTElDRV9DSElDS0VOMiwKLQkJCQkgIEdFTjhfU0JFX0RJ U0FCTEVfUkVQTEFZX0JVRl9PUFRJTUlaQVRJT04pOworCQlDVFhfV0FfU0VUX0JJVF9NQVNLRUQo Q09NTU9OX1NMSUNFX0NISUNLRU4yLAorCQkJCSAgICAgIEdFTjhfU0JFX0RJU0FCTEVfUkVQTEFZ X0JVRl9PUFRJTUlaQVRJT04pOwogCiAJcmV0dXJuIDA7CiB9CkBAIC0zNTgsMTYgKzM1OCwxNiBA QCBzdGF0aWMgaW50IGtibF9jdHhfd29ya2Fyb3VuZHNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiAKIAkvKiBXYURpc2FibGVGZW5jZURlc3RpbmF0aW9uVG9TTE06a2Js IChwcmUtcHJvZCkgKi8KIAlpZiAoSVNfS0JMX1JFVklEKGRldl9wcml2LCBLQkxfUkVWSURfQTAs IEtCTF9SRVZJRF9BMCkpCi0JCVdBX1NFVF9CSVRfTUFTS0VEKEhEQ19DSElDS0VOMCwKLQkJCQkg IEhEQ19GRU5DRV9ERVNUX1NMTV9ESVNBQkxFKTsKKwkJQ1RYX1dBX1NFVF9CSVRfTUFTS0VEKEhE Q19DSElDS0VOMCwKKwkJCQkgICAgICBIRENfRkVOQ0VfREVTVF9TTE1fRElTQUJMRSk7CiAKIAkv KiBXYVRvRW5hYmxlSHdGaXhGb3JQdXNoQ29uc3RIV0J1ZzprYmwgKi8KIAlpZiAoSVNfS0JMX1JF VklEKGRldl9wcml2LCBLQkxfUkVWSURfQzAsIFJFVklEX0ZPUkVWRVIpKQotCQlXQV9TRVRfQklU X01BU0tFRChDT01NT05fU0xJQ0VfQ0hJQ0tFTjIsCi0JCQkJICBHRU44X1NCRV9ESVNBQkxFX1JF UExBWV9CVUZfT1BUSU1JWkFUSU9OKTsKKwkJQ1RYX1dBX1NFVF9CSVRfTUFTS0VEKENPTU1PTl9T TElDRV9DSElDS0VOMiwKKwkJCQkgICAgICBHRU44X1NCRV9ESVNBQkxFX1JFUExBWV9CVUZfT1BU SU1JWkFUSU9OKTsKIAogCS8qIFdhRGlzYWJsZVNiZUNhY2hlRGlzcGF0Y2hQb3J0U2hhcmluZzpr YmwgKi8KLQlXQV9TRVRfQklUX01BU0tFRCgKKwlDVFhfV0FfU0VUX0JJVF9NQVNLRUQoCiAJCUdF TjdfSEFMRl9TTElDRV9DSElDS0VOMSwKIAkJR0VON19TQkVfU1NfQ0FDSEVfRElTUEFUQ0hfUE9S VF9TSEFSSU5HX0RJU0FCTEUpOwogCkBAIC0zODMsOCArMzgzLDggQEAgc3RhdGljIGludCBnbGtf Y3R4X3dvcmthcm91bmRzX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CQlyZXR1cm4gcmV0OwogCiAJLyogV2FUb0VuYWJsZUh3Rml4Rm9yUHVzaENvbnN0SFdCdWc6Z2xr ICovCi0JV0FfU0VUX0JJVF9NQVNLRUQoQ09NTU9OX1NMSUNFX0NISUNLRU4yLAotCQkJICBHRU44 X1NCRV9ESVNBQkxFX1JFUExBWV9CVUZfT1BUSU1JWkFUSU9OKTsKKwlDVFhfV0FfU0VUX0JJVF9N QVNLRUQoQ09NTU9OX1NMSUNFX0NISUNLRU4yLAorCQkJICAgICAgR0VOOF9TQkVfRElTQUJMRV9S RVBMQVlfQlVGX09QVElNSVpBVElPTik7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTM5OCwxMSArMzk4 LDExIEBAIHN0YXRpYyBpbnQgY2ZsX2N0eF93b3JrYXJvdW5kc19pbml0KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAkJcmV0dXJuIHJldDsKIAogCS8qIFdhVG9FbmFibGVId0Zp eEZvclB1c2hDb25zdEhXQnVnOmNmbCAqLwotCVdBX1NFVF9CSVRfTUFTS0VEKENPTU1PTl9TTElD RV9DSElDS0VOMiwKLQkJCSAgR0VOOF9TQkVfRElTQUJMRV9SRVBMQVlfQlVGX09QVElNSVpBVElP Tik7CisJQ1RYX1dBX1NFVF9CSVRfTUFTS0VEKENPTU1PTl9TTElDRV9DSElDS0VOMiwKKwkJCSAg ICAgIEdFTjhfU0JFX0RJU0FCTEVfUkVQTEFZX0JVRl9PUFRJTUlaQVRJT04pOwogCiAJLyogV2FE aXNhYmxlU2JlQ2FjaGVEaXNwYXRjaFBvcnRTaGFyaW5nOmNmbCAqLwotCVdBX1NFVF9CSVRfTUFT S0VEKAorCUNUWF9XQV9TRVRfQklUX01BU0tFRCgKIAkJR0VON19IQUxGX1NMSUNFX0NISUNLRU4x LAogCQlHRU43X1NCRV9TU19DQUNIRV9ESVNQQVRDSF9QT1JUX1NIQVJJTkdfRElTQUJMRSk7CiAK QEAgLTQxMiwzNCArNDEyLDM0IEBAIHN0YXRpYyBpbnQgY2ZsX2N0eF93b3JrYXJvdW5kc19pbml0 KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHN0YXRpYyBpbnQgY25sX2N0eF93 b3JrYXJvdW5kc19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAkv KiBXYUZvcmNlQ29udGV4dFNhdmVSZXN0b3JlTm9uQ29oZXJlbnQ6Y25sICovCi0JV0FfU0VUX0JJ VF9NQVNLRUQoQ05MX0hEQ19DSElDS0VOMCwKLQkJCSAgSERDX0ZPUkNFX0NPTlRFWFRfU0FWRV9S RVNUT1JFX05PTl9DT0hFUkVOVCk7CisJQ1RYX1dBX1NFVF9CSVRfTUFTS0VEKENOTF9IRENfQ0hJ Q0tFTjAsCisJCQkgICAgICBIRENfRk9SQ0VfQ09OVEVYVF9TQVZFX1JFU1RPUkVfTk9OX0NPSEVS RU5UKTsKIAogCS8qIFdhVGhyb3R0bGVFVVBlcmZUb0F2b2lkVERCYWNrUHJlc3N1cmU6Y25sKHBy ZS1wcm9kKSAqLwogCWlmIChJU19DTkxfUkVWSUQoZGV2X3ByaXYsIENOTF9SRVZJRF9CMCwgQ05M X1JFVklEX0IwKSkKLQkJV0FfU0VUX0JJVF9NQVNLRUQoR0VOOF9ST1dfQ0hJQ0tFTiwgVEhST1RU TEVfMTJfNSk7CisJCUNUWF9XQV9TRVRfQklUX01BU0tFRChHRU44X1JPV19DSElDS0VOLCBUSFJP VFRMRV8xMl81KTsKIAogCS8qIFdhRGlzYWJsZVJlcGxheUJ1ZmZlckJhbmtBcmJpdHJhdGlvbk9w dGltaXphdGlvbjpjbmwgKi8KLQlXQV9TRVRfQklUX01BU0tFRChDT01NT05fU0xJQ0VfQ0hJQ0tF TjIsCi0JCQkgIEdFTjhfU0JFX0RJU0FCTEVfUkVQTEFZX0JVRl9PUFRJTUlaQVRJT04pOworCUNU WF9XQV9TRVRfQklUX01BU0tFRChDT01NT05fU0xJQ0VfQ0hJQ0tFTjIsCisJCQkgICAgICBHRU44 X1NCRV9ESVNBQkxFX1JFUExBWV9CVUZfT1BUSU1JWkFUSU9OKTsKIAogCS8qIFdhRGlzYWJsZUVu aGFuY2VkU0JFVmVydGV4Q2FjaGluZzpjbmwgKHByZS1wcm9kKSAqLwogCWlmIChJU19DTkxfUkVW SUQoZGV2X3ByaXYsIDAsIENOTF9SRVZJRF9CMCkpCi0JCVdBX1NFVF9CSVRfTUFTS0VEKENPTU1P Tl9TTElDRV9DSElDS0VOMiwKLQkJCQkgIEdFTjhfQ1NDMl9TQkVfVlVFX0NBQ0hFX0NPTlNFUlZB VElWRSk7CisJCUNUWF9XQV9TRVRfQklUX01BU0tFRChDT01NT05fU0xJQ0VfQ0hJQ0tFTjIsCisJ CQkJICAgICAgR0VOOF9DU0MyX1NCRV9WVUVfQ0FDSEVfQ09OU0VSVkFUSVZFKTsKIAogCS8qIFdh UHVzaENvbnN0YW50RGVyZWZlcmVuY2VIb2xkRGlzYWJsZTpjbmwgKi8KLQlXQV9TRVRfQklUX01B U0tFRChHRU43X1JPV19DSElDS0VOMiwgUFVTSF9DT05TVEFOVF9ERVJFRl9ESVNBQkxFKTsKKwlD VFhfV0FfU0VUX0JJVF9NQVNLRUQoR0VON19ST1dfQ0hJQ0tFTjIsIFBVU0hfQ09OU1RBTlRfREVS RUZfRElTQUJMRSk7CiAKIAkvKiBGdHJFbmFibGVGYXN0QW5pc29MMUJhbmtpbmdGaXg6Y25sICov Ci0JV0FfU0VUX0JJVF9NQVNLRUQoSEFMRl9TTElDRV9DSElDS0VOMywgQ05MX0ZBU1RfQU5JU09f TDFfQkFOS0lOR19GSVgpOworCUNUWF9XQV9TRVRfQklUX01BU0tFRChIQUxGX1NMSUNFX0NISUNL RU4zLCBDTkxfRkFTVF9BTklTT19MMV9CQU5LSU5HX0ZJWCk7CiAKIAkvKiBXYURpc2FibGUzRE1p ZENtZFByZWVtcHRpb246Y25sICovCi0JV0FfQ0xSX0JJVF9NQVNLRUQoR0VOOF9DU19DSElDS0VO MSwgR0VOOV9QUkVFTVBUXzNEX09CSkVDVF9MRVZFTCk7CisJQ1RYX1dBX0NMUl9CSVRfTUFTS0VE KEdFTjhfQ1NfQ0hJQ0tFTjEsIEdFTjlfUFJFRU1QVF8zRF9PQkpFQ1RfTEVWRUwpOwogCiAJLyog V2FEaXNhYmxlR1BHUFVNaWRDbWRQcmVlbXB0aW9uOmNubCAqLwotCVdBX1NFVF9GSUVMRF9NQVNL RUQoR0VOOF9DU19DSElDS0VOMSwgR0VOOV9QUkVFTVBUX0dQR1BVX0xFVkVMX01BU0ssCi0JCQkg ICAgR0VOOV9QUkVFTVBUX0dQR1BVX0NPTU1BTkRfTEVWRUwpOworCUNUWF9XQV9TRVRfRklFTERf TUFTS0VEKEdFTjhfQ1NfQ0hJQ0tFTjEsIEdFTjlfUFJFRU1QVF9HUEdQVV9MRVZFTF9NQVNLLAor CQkJCUdFTjlfUFJFRU1QVF9HUEdQVV9DT01NQU5EX0xFVkVMKTsKIAogCXJldHVybiAwOwogfQpA QCAtNDQ4LDcgKzQ0OCw3IEBAIGludCBpbnRlbF9jdHhfd29ya2Fyb3VuZHNfaW5pdChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJaW50IGVycjsKIAotCWRldl9wcml2LT53 b3JrYXJvdW5kcy5jb3VudCA9IDA7CisJZGV2X3ByaXYtPndvcmthcm91bmRzLmN0eF93YV9jb3Vu dCA9IDA7CiAKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDgpCiAJCWVyciA9IDA7CkBAIC00 NzYsNyArNDc2LDcgQEAgaW50IGludGVsX2N0eF93b3JrYXJvdW5kc19pbml0KHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJcmV0dXJuIGVycjsKIAogCURSTV9ERUJVR19EUklW RVIoIk51bWJlciBvZiBjb250ZXh0IHNwZWNpZmljIHcvYTogJWRcbiIsCi0JCQkgZGV2X3ByaXYt Pndvcmthcm91bmRzLmNvdW50KTsKKwkJCSBkZXZfcHJpdi0+d29ya2Fyb3VuZHMuY3R4X3dhX2Nv dW50KTsKIAlyZXR1cm4gMDsKIH0KIApAQCAtNDg2LDIxICs0ODYsMjEgQEAgaW50IGludGVsX2N0 eF93b3JrYXJvdW5kc19lbWl0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogCXUz MiAqY3M7CiAJaW50IHJldCwgaTsKIAotCWlmICh3LT5jb3VudCA9PSAwKQorCWlmICh3LT5jdHhf d2FfY291bnQgPT0gMCkKIAkJcmV0dXJuIDA7CiAKIAlyZXQgPSByZXEtPmVuZ2luZS0+ZW1pdF9m bHVzaChyZXEsIEVNSVRfQkFSUklFUik7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotCWNz ID0gaW50ZWxfcmluZ19iZWdpbihyZXEsICh3LT5jb3VudCAqIDIgKyAyKSk7CisJY3MgPSBpbnRl bF9yaW5nX2JlZ2luKHJlcSwgKHctPmN0eF93YV9jb3VudCAqIDIgKyAyKSk7CiAJaWYgKElTX0VS UihjcykpCiAJCXJldHVybiBQVFJfRVJSKGNzKTsKIAotCSpjcysrID0gTUlfTE9BRF9SRUdJU1RF Ul9JTU0ody0+Y291bnQpOwotCWZvciAoaSA9IDA7IGkgPCB3LT5jb3VudDsgaSsrKSB7Ci0JCSpj cysrID0gaTkxNV9tbWlvX3JlZ19vZmZzZXQody0+cmVnW2ldLmFkZHIpOwotCQkqY3MrKyA9IHct PnJlZ1tpXS52YWx1ZTsKKwkqY3MrKyA9IE1JX0xPQURfUkVHSVNURVJfSU1NKHctPmN0eF93YV9j b3VudCk7CisJZm9yIChpID0gMDsgaSA8IHctPmN0eF93YV9jb3VudDsgaSsrKSB7CisJCSpjcysr ID0gaTkxNV9tbWlvX3JlZ19vZmZzZXQody0+Y3R4X3dhX3JlZ1tpXS5hZGRyKTsKKwkJKmNzKysg PSB3LT5jdHhfd2FfcmVnW2ldLnZhbHVlOwogCX0KIAkqY3MrKyA9IE1JX05PT1A7CiAKLS0gCjEu OS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK