From: Tvrtko Ursulin Subject: [PATCH 19/22] drm/i915: Make IS_CHERRYVIEW only take dev_priv Date: Wed, 5 Oct 2016 13:33:46 +0100 Message-ID: <1475670829-14025-20-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1475670829-14025-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6AC9C6E843 for ; Wed, 5 Oct 2016 12:34:20 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id b201so19205353wmb.1 for ; Wed, 05 Oct 2016 05:34:20 -0700 (PDT) In-Reply-To: <1475670829-14025-1-git-send-email-tvrtko.ursulin@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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDg2 NCBieXRlcyBvZiAucm9kYXRhIHN0cmluZ3MgYW5kIH4xMDAgb2YgLnRleHQuCgpTaWduZWQtb2Zm LWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgfCAgOCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9ndHQuYyAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf YXVkaW8uYyAgICAgIHwgIDQgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMg ICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICAgfCA2 NyArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RwLmMgICAgICAgICB8IDU1ICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHNpLmMgICAgICAgIHwgIDggKystLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jICAgICAgIHwgMTAgKystLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2kyYy5jICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jICAgICAgICAgfCAgNCArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNy LmMgICAgICAgIHwgIDQgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0u YyB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgICAgfCAxMCAr KystLQogMTQgZmlsZXMgY2hhbmdlZCwgOTMgaW5zZXJ0aW9ucygrKSwgODcgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggMThhZjZkMWNjZWM5Li41ZTdiNmExY2IyYzgg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtNDI0LDcgKzQyNCw3IEBAIGludGVsX3NldHVw X21jaGJhcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXUzMiB0ZW1wOwogCWJvb2wgZW5hYmxl ZDsKIAotCWlmIChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKQorCWlm IChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJ cmV0dXJuOwogCiAJZGV2X3ByaXYtPm1jaGJhcl9uZWVkX2Rpc2FibGUgPSBmYWxzZTsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCmluZGV4IDIxNjI2OTBjYTQ0ZC4uOTllNTA0NzAzZWRkIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI2NjIsNyArMjY2Miw3IEBAIHN0cnVjdCBkcm1faTkxNV9j bWRfdGFibGUgewogCQkJCSBJTlRFTF9ERVZJRChkZXZfcHJpdikgPT0gMHgwMTUyIHx8IFwKIAkJ CQkgSU5URUxfREVWSUQoZGV2X3ByaXYpID09IDB4MDE1YSkKICNkZWZpbmUgSVNfVkFMTEVZVklF VyhkZXYpCShJTlRFTF9JTkZPKGRldiktPmlzX3ZhbGxleXZpZXcpCi0jZGVmaW5lIElTX0NIRVJS WVZJRVcoZGV2KQkoSU5URUxfSU5GTyhkZXYpLT5pc19jaGVycnl2aWV3KQorI2RlZmluZSBJU19D SEVSUllWSUVXKGRldl9wcml2KQkoZGV2X3ByaXYtPmluZm8uaXNfY2hlcnJ5dmlldykKICNkZWZp bmUgSVNfSEFTV0VMTChkZXZfcHJpdikJKGRldl9wcml2LT5pbmZvLmlzX2hhc3dlbGwpCiAjZGVm aW5lIElTX0JST0FEV0VMTChkZXZfcHJpdikJKGRldl9wcml2LT5pbmZvLmlzX2Jyb2Fkd2VsbCkK ICNkZWZpbmUgSVNfU0tZTEFLRShkZXZfcHJpdikJKGRldl9wcml2LT5pbmZvLmlzX3NreWxha2Up CkBAIC0zODQwLDExICszODQwLDExIEBAIF9fcmF3X3dyaXRlKDY0LCBxKQogI2RlZmluZSBJTlRF TF9CUk9BRENBU1RfUkdCX0ZVTEwgMQogI2RlZmluZSBJTlRFTF9CUk9BRENBU1RfUkdCX0xJTUlU RUQgMgogCi1zdGF0aWMgaW5saW5lIGk5MTVfcmVnX3QgaTkxNV92Z2FjbnRybF9yZWcoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKK3N0YXRpYyBpbmxpbmUgaTkxNV9yZWdfdCBpOTE1X3ZnYWNudHJs X3JlZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0JaWYgKElTX1ZBTExF WVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVXKGRldikpCisJaWYgKElTX1ZBTExFWVZJRVcoZGV2 X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQlyZXR1cm4gVkxWX1ZHQUNOVFJM OwotCWVsc2UgaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDUpCisJZWxzZSBpZiAoSU5URUxf R0VOKGRldl9wcml2KSA+PSA1KQogCQlyZXR1cm4gQ1BVX1ZHQUNOVFJMOwogCWVsc2UKIAkJcmV0 dXJuIFZHQUNOVFJMOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCBlNjI4Njkx ZmU5N2UuLjQyMTFiOWE0YTkxOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAg LTIxMzMsNyArMjEzMyw3IEBAIHN0YXRpYyB2b2lkIGd0dF93cml0ZV93b3JrYXJvdW5kcyhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCS8qIFdhSW5jcmVhc2VEZWZhdWx0VExCRW50cmllczpjaHYs YmR3LHNrbCxieHQgKi8KIAlpZiAoSVNfQlJPQURXRUxMKGRldl9wcml2KSkKIAkJSTkxNV9XUklU RShHRU44X0wzX0xSQV8xX0dQR1BVLCBHRU44X0wzX0xSQV8xX0dQR1BVX0RFRkFVTFRfVkFMVUVf QkRXKTsKLQllbHNlIGlmIChJU19DSEVSUllWSUVXKGRldikpCisJZWxzZSBpZiAoSVNfQ0hFUlJZ VklFVyhkZXZfcHJpdikpCiAJCUk5MTVfV1JJVEUoR0VOOF9MM19MUkFfMV9HUEdQVSwgR0VOOF9M M19MUkFfMV9HUEdQVV9ERUZBVUxUX1ZBTFVFX0NIVik7CiAJZWxzZSBpZiAoSVNfU0tZTEFLRShk ZXZfcHJpdikpCiAJCUk5MTVfV1JJVEUoR0VOOF9MM19MUkFfMV9HUEdQVSwgR0VOOV9MM19MUkFf MV9HUEdQVV9ERUZBVUxUX1ZBTFVFX1NLTCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9hdWRpby5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYwpp bmRleCAxM2I3MjY5MTZmOTguLmQxMjc1Y2JkNTkwNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfYXVkaW8uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9h dWRpby5jCkBAIC00MjgsOCArNDI4LDggQEAgc3RhdGljIHZvaWQgaWxrX2F1ZGlvX2NvZGVjX2Vu YWJsZShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCQlhdWRfY29uZmlnID0gSUJY X0FVRF9DRkcocGlwZSk7CiAJCWF1ZF9jbnRsX3N0ID0gSUJYX0FVRF9DTlRMX1NUKHBpcGUpOwog CQlhdWRfY250cmxfc3QyID0gSUJYX0FVRF9DTlRMX1NUMjsKLQl9IGVsc2UgaWYgKElTX1ZBTExF WVZJRVcoY29ubmVjdG9yLT5kZXYpIHx8Ci0JCSAgIElTX0NIRVJSWVZJRVcoY29ubmVjdG9yLT5k ZXYpKSB7CisJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fAorCQkgICBJU19D SEVSUllWSUVXKGRldl9wcml2KSkgewogCQloZG1pd19oZG1pZWRpZCA9IFZMVl9IRE1JV19IRE1J RURJRChwaXBlKTsKIAkJYXVkX2NvbmZpZyA9IFZMVl9BVURfQ0ZHKHBpcGUpOwogCQlhdWRfY250 bF9zdCA9IFZMVl9BVURfQ05UTF9TVChwaXBlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2NvbG9yLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5j CmluZGV4IGRhNzZhNzk5NDExYS4uNDQ1MTA4ODU1Mjc1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2NvbG9yLmMKQEAgLTUzNCw3ICs1MzQsNyBAQCB2b2lkIGludGVsX2NvbG9yX2luaXQoc3RydWN0 IGRybV9jcnRjICpjcnRjKQogCiAJZHJtX21vZGVfY3J0Y19zZXRfZ2FtbWFfc2l6ZShjcnRjLCAy NTYpOwogCi0JaWYgKElTX0NIRVJSWVZJRVcoZGV2KSkgeworCWlmIChJU19DSEVSUllWSUVXKGRl dl9wcml2KSkgewogCQlkZXZfcHJpdi0+ZGlzcGxheS5sb2FkX2NzY19tYXRyaXggPSBjaGVycnl2 aWV3X2xvYWRfY3NjX21hdHJpeDsKIAkJZGV2X3ByaXYtPmRpc3BsYXkubG9hZF9sdXRzID0gY2hl cnJ5dmlld19sb2FkX2x1dHM7CiAJfSBlbHNlIGlmIChJU19IQVNXRUxMKGRldl9wcml2KSkgewpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDVlYTA3YTFhYzE3MC4uMjM1NmIz Y2E5NzA1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC04NDksNyArODQ5 LDcgQEAgc3RhdGljIGJvb2wgdmx2X1BMTF9pc19vcHRpbWFsKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIGludCB0YXJnZXRfZnJlcSwKIAkgKiBGb3IgQ0hWIGlnbm9yZSB0aGUgZXJyb3IgYW5kIGNv bnNpZGVyIG9ubHkgdGhlIFAgdmFsdWUuCiAJICogUHJlZmVyIGEgYmlnZ2VyIFAgdmFsdWUgYmFz ZWQgb24gSFcgcmVxdWlyZW1lbnRzLgogCSAqLwotCWlmIChJU19DSEVSUllWSUVXKGRldikpIHsK KwlpZiAoSVNfQ0hFUlJZVklFVyh0b19pOTE1KGRldikpKSB7CiAJCSplcnJvcl9wcG0gPSAwOwog CiAJCXJldHVybiBjYWxjdWxhdGVkX2Nsb2NrLT5wID4gYmVzdF9jbG9jay0+cDsKQEAgLTEzMzIs NyArMTMzMiw3IEBAIHN0YXRpYyB2b2lkIGFzc2VydF9zcHJpdGVzX2Rpc2FibGVkKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgICAgInBsYW5lICVkIGFzc2VydGlvbiBm YWlsdXJlLCBzaG91bGQgYmUgb2ZmIG9uIHBpcGUgJWMgYnV0IGlzIHN0aWxsIGFjdGl2ZVxuIiwK IAkJCSAgICAgc3ByaXRlLCBwaXBlX25hbWUocGlwZSkpOwogCQl9Ci0JfSBlbHNlIGlmIChJU19W QUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJfSBlbHNlIGlmIChJU19W QUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQlmb3Jf ZWFjaF9zcHJpdGUoZGV2X3ByaXYsIHBpcGUsIHNwcml0ZSkgewogCQkJdTMyIHZhbCA9IEk5MTVf UkVBRChTUENOVFIocGlwZSwgc3ByaXRlKSk7CiAJCQlJOTE1X1NUQVRFX1dBUk4odmFsICYgU1Bf RU5BQkxFLApAQCAtMzAzMyw3ICszMDMzLDcgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfcHJp bWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5LAogCQkJICAgKChjcnRjX3N0YXRl LT5waXBlX3NyY19oIC0gMSkgPDwgMTYpIHwKIAkJCSAgIChjcnRjX3N0YXRlLT5waXBlX3NyY193 IC0gMSkpOwogCQlJOTE1X1dSSVRFKERTUFBPUyhwbGFuZSksIDApOwotCX0gZWxzZSBpZiAoSVNf Q0hFUlJZVklFVyhkZXYpICYmIHBsYW5lID09IFBMQU5FX0IpIHsKKwl9IGVsc2UgaWYgKElTX0NI RVJSWVZJRVcoZGV2X3ByaXYpICYmIHBsYW5lID09IFBMQU5FX0IpIHsKIAkJSTkxNV9XUklURShQ UklNU0laRShwbGFuZSksCiAJCQkgICAoKGNydGNfc3RhdGUtPnBpcGVfc3JjX2ggLSAxKSA8PCAx NikgfAogCQkJICAgKGNydGNfc3RhdGUtPnBpcGVfc3JjX3cgLSAxKSk7CkBAIC01ODcxLDcgKzU4 NzEsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF91cGRhdGVfbWF4X2NkY2xrKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJCQlkZXZfcHJpdi0+bWF4X2NkY2xrX2ZyZXEgPSA1NDAwMDA7CiAJCWVsc2UK IAkJCWRldl9wcml2LT5tYXhfY2RjbGtfZnJlcSA9IDY3NTAwMDsKLQl9IGVsc2UgaWYgKElTX0NI RVJSWVZJRVcoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsK IAkJZGV2X3ByaXYtPm1heF9jZGNsa19mcmVxID0gMzIwMDAwOwogCX0gZWxzZSBpZiAoSVNfVkFM TEVZVklFVyhkZXYpKSB7CiAJCWRldl9wcml2LT5tYXhfY2RjbGtfZnJlcSA9IDQwMDAwMDsKQEAg LTY2NzMsNyArNjY3Myw3IEBAIHN0YXRpYyB2b2lkIHZhbGxleXZpZXdfbW9kZXNldF9jb21taXRf Y2RjbGsoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0ZSkKIAkgKi8KIAlpbnRlbF9k aXNwbGF5X3Bvd2VyX2dldChkZXZfcHJpdiwgUE9XRVJfRE9NQUlOX1BJUEVfQSk7CiAKLQlpZiAo SVNfQ0hFUlJZVklFVyhkZXYpKQorCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJY2hl cnJ5dmlld19zZXRfY2RjbGsoZGV2LCByZXFfY2RjbGspOwogCWVsc2UKIAkJdmFsbGV5dmlld19z ZXRfY2RjbGsoZGV2LCByZXFfY2RjbGspOwpAQCAtNjcwMSw3ICs2NzAxLDcgQEAgc3RhdGljIHZv aWQgdmFsbGV5dmlld19jcnRjX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9j b25maWcsCiAJaW50ZWxfc2V0X3BpcGVfdGltaW5ncyhpbnRlbF9jcnRjKTsKIAlpbnRlbF9zZXRf cGlwZV9zcmNfc2l6ZShpbnRlbF9jcnRjKTsKIAotCWlmIChJU19DSEVSUllWSUVXKGRldikgJiYg cGlwZSA9PSBQSVBFX0IpIHsKKwlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikgJiYgcGlwZSA9 PSBQSVBFX0IpIHsKIAkJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkx NShkZXYpOwogCiAJCUk5MTVfV1JJVEUoQ0hWX0JMRU5EKHBpcGUpLCBDSFZfQkxFTkRfTEVHQUNZ KTsKQEAgLTY3MTYsNyArNjcxNiw3IEBAIHN0YXRpYyB2b2lkIHZhbGxleXZpZXdfY3J0Y19lbmFi bGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnLAogCiAJaW50ZWxfZW5jb2Rl cnNfcHJlX3BsbF9lbmFibGUoY3J0YywgcGlwZV9jb25maWcsIG9sZF9zdGF0ZSk7CiAKLQlpZiAo SVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJ CWNodl9wcmVwYXJlX3BsbChpbnRlbF9jcnRjLCBpbnRlbF9jcnRjLT5jb25maWcpOwogCQljaHZf ZW5hYmxlX3BsbChpbnRlbF9jcnRjLCBpbnRlbF9jcnRjLT5jb25maWcpOwogCX0gZWxzZSB7CkBA IC02ODM1LDcgKzY4MzUsNyBAQCBzdGF0aWMgdm9pZCBpOXh4X2NydGNfZGlzYWJsZShzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCiAJaW50ZWxfZW5jb2RlcnNfcG9zdF9k aXNhYmxlKGNydGMsIG9sZF9jcnRjX3N0YXRlLCBvbGRfc3RhdGUpOwogCiAJaWYgKCFpbnRlbF9j cnRjX2hhc190eXBlKGludGVsX2NydGMtPmNvbmZpZywgSU5URUxfT1VUUFVUX0RTSSkpIHsKLQkJ aWYgKElTX0NIRVJSWVZJRVcoZGV2KSkKKwkJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQog CQkJY2h2X2Rpc2FibGVfcGxsKGRldl9wcml2LCBwaXBlKTsKIAkJZWxzZSBpZiAoSVNfVkFMTEVZ VklFVyhkZXYpKQogCQkJdmx2X2Rpc2FibGVfcGxsKGRldl9wcml2LCBwaXBlKTsKQEAgLTc4MDIs OCArNzgwMiw4IEBAIHN0YXRpYyB2b2lkIGludGVsX2NwdV90cmFuc2NvZGVyX3NldF9tX24oc3Ry dWN0IGludGVsX2NydGMgKmNydGMsCiAJCSAqIGZvciBnZW4gPCA4KSBhbmQgaWYgRFJSUyBpcyBz dXBwb3J0ZWQgKHRvIG1ha2Ugc3VyZSB0aGUKIAkJICogcmVnaXN0ZXJzIGFyZSBub3QgdW5uZWNl c3NhcmlseSBhY2Nlc3NlZCkuCiAJCSAqLwotCQlpZiAobTJfbjIgJiYgKElTX0NIRVJSWVZJRVco ZGV2KSB8fCBJTlRFTF9JTkZPKGRldiktPmdlbiA8IDgpICYmCi0JCQljcnRjLT5jb25maWctPmhh c19kcnJzKSB7CisJCWlmIChtMl9uMiAmJiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikgfHwKKwkJ ICAgIElOVEVMX0dFTihkZXZfcHJpdikgPCA4KSAmJiBjcnRjLT5jb25maWctPmhhc19kcnJzKSB7 CiAJCQlJOTE1X1dSSVRFKFBJUEVfREFUQV9NMih0cmFuc2NvZGVyKSwKIAkJCQkJVFVfU0laRSht Ml9uMi0+dHUpIHwgbTJfbjItPmdtY2hfbSk7CiAJCQlJOTE1X1dSSVRFKFBJUEVfREFUQV9OMih0 cmFuc2NvZGVyKSwgbTJfbjItPmdtY2hfbik7CkBAIC04MTA1LDcgKzgxMDUsNyBAQCBpbnQgdmx2 X2ZvcmNlX3BsbF9vbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBlbnVtIHBpcGUgcGlwZSwKIAlw aXBlX2NvbmZpZy0+cGl4ZWxfbXVsdGlwbGllciA9IDE7CiAJcGlwZV9jb25maWctPmRwbGwgPSAq ZHBsbDsKIAotCWlmIChJU19DSEVSUllWSUVXKGRldikpIHsKKwlpZiAoSVNfQ0hFUlJZVklFVyh0 b19pOTE1KGRldikpKSB7CiAJCWNodl9jb21wdXRlX2RwbGwoY3J0YywgcGlwZV9jb25maWcpOwog CQljaHZfcHJlcGFyZV9wbGwoY3J0YywgcGlwZV9jb25maWcpOwogCQljaHZfZW5hYmxlX3BsbChj cnRjLCBwaXBlX2NvbmZpZyk7CkBAIC04MTMwLDcgKzgxMzAsNyBAQCBpbnQgdmx2X2ZvcmNlX3Bs bF9vbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBlbnVtIHBpcGUgcGlwZSwKICAqLwogdm9pZCB2 bHZfZm9yY2VfcGxsX29mZihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBlbnVtIHBpcGUgcGlwZSkK IHsKLQlpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKQorCWlmIChJU19DSEVSUllWSUVXKHRvX2k5MTUo ZGV2KSkpCiAJCWNodl9kaXNhYmxlX3BsbCh0b19pOTE1KGRldiksIHBpcGUpOwogCWVsc2UKIAkJ dmx2X2Rpc2FibGVfcGxsKHRvX2k5MTUoZGV2KSwgcGlwZSk7CkBAIC04NDU0LDcgKzg0NTQsNyBA QCBzdGF0aWMgdm9pZCBpOXh4X3NldF9waXBlY29uZihzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxf Y3J0YykKIAl9IGVsc2UKIAkJcGlwZWNvbmYgfD0gUElQRUNPTkZfUFJPR1JFU1NJVkU7CiAKLQlp ZiAoKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVXKGRldikpICYmCisJaWYgKChJ U19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgJiYKIAkg ICAgIGludGVsX2NydGMtPmNvbmZpZy0+bGltaXRlZF9jb2xvcl9yYW5nZSkKIAkJcGlwZWNvbmYg fD0gUElQRUNPTkZfQ09MT1JfUkFOR0VfU0VMRUNUOwogCkBAIC04ODQ4LDcgKzg4NDgsNyBAQCBz dGF0aWMgYm9vbCBpOXh4X2dldF9waXBlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywK IAkJfQogCX0KIAotCWlmICgoSVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2 KSkgJiYKKwlpZiAoKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2 X3ByaXYpKSAmJgogCSAgICAodG1wICYgUElQRUNPTkZfQ09MT1JfUkFOR0VfU0VMRUNUKSkKIAkJ cGlwZV9jb25maWctPmxpbWl0ZWRfY29sb3JfcmFuZ2UgPSB0cnVlOwogCkBAIC04ODYyLDcgKzg4 NjIsNyBAQCBzdGF0aWMgYm9vbCBpOXh4X2dldF9waXBlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YywKIAogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA0KSB7CiAJCS8qIE5vIHdh eSB0byByZWFkIGl0IG91dCBvbiBwaXBlcyBCIGFuZCBDICovCi0JCWlmIChJU19DSEVSUllWSUVX KGRldikgJiYgY3J0Yy0+cGlwZSAhPSBQSVBFX0EpCisJCWlmIChJU19DSEVSUllWSUVXKGRldl9w cml2KSAmJiBjcnRjLT5waXBlICE9IFBJUEVfQSkKIAkJCXRtcCA9IGRldl9wcml2LT5jaHZfZHBs bF9tZFtjcnRjLT5waXBlXTsKIAkJZWxzZQogCQkJdG1wID0gSTkxNV9SRUFEKERQTExfTUQoY3J0 Yy0+cGlwZSkpOwpAQCAtODg4Myw3ICs4ODgzLDcgQEAgc3RhdGljIGJvb2wgaTl4eF9nZXRfcGlw ZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJCXBpcGVfY29uZmlnLT5waXhlbF9t dWx0aXBsaWVyID0gMTsKIAl9CiAJcGlwZV9jb25maWctPmRwbGxfaHdfc3RhdGUuZHBsbCA9IEk5 MTVfUkVBRChEUExMKGNydGMtPnBpcGUpKTsKLQlpZiAoIUlTX1ZBTExFWVZJRVcoZGV2KSAmJiAh SVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJaWYgKCFJU19WQUxMRVlWSUVXKGRldl9wcml2KSAmJiAh SVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJLyoKIAkJICogRFBMTF9EVk9fMlhfTU9ERSBt dXN0IGJlIGVuYWJsZWQgZm9yIGJvdGggRFBMTHMKIAkJICogb24gODMwLiBGaWx0ZXIgaXQgb3V0 IGhlcmUgc28gdGhhdCB3ZSBkb24ndApAQCAtODkwMSw3ICs4OTAxLDcgQEAgc3RhdGljIGJvb2wg aTl4eF9nZXRfcGlwZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJCQkJCQkgICAg IERQTExfUE9SVEJfUkVBRFlfTUFTSyk7CiAJfQogCi0JaWYgKElTX0NIRVJSWVZJRVcoZGV2KSkK KwlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCWNodl9jcnRjX2Nsb2NrX2dldChjcnRj LCBwaXBlX2NvbmZpZyk7CiAJZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKQogCQl2bHZfY3J0 Y19jbG9ja19nZXQoY3J0YywgcGlwZV9jb25maWcpOwpAQCAtMTIyNDcsNyArMTIyNDcsNyBAQCBz dGF0aWMgaW50IGludGVsX2NydGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlp ZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA1IHx8IElTX0c0WChkZXZfcHJpdikpCiAJCXdvcmst PmZsaXBfY291bnQgPSBJOTE1X1JFQUQoUElQRV9GTElQQ09VTlRfRzRYKHBpcGUpKSArIDE7CiAK LQlpZiAoSVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkgeworCWlmIChJ U19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQll bmdpbmUgPSAmZGV2X3ByaXYtPmVuZ2luZVtCQ1NdOwogCQlpZiAoZmItPm1vZGlmaWVyWzBdICE9 IG9sZF9mYi0+bW9kaWZpZXJbMF0pCiAJCQkvKiB2bHY6IERJU1BMQVlfRkxJUCBmYWlscyB0byBj aGFuZ2UgdGlsaW5nICovCkBAIC0xMzM0NSw3ICsxMzM0NSw3IEBAIGludGVsX3BpcGVfY29uZmln X2NvbXBhcmUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlQSVBFX0NPTkZfQ0hFQ0tfSShwaXhl bF9tdWx0aXBsaWVyKTsKIAlQSVBFX0NPTkZfQ0hFQ0tfSShoYXNfaGRtaV9zaW5rKTsKIAlpZiAo KElOVEVMX0dFTihkZXZfcHJpdikgPCA4ICYmICFJU19IQVNXRUxMKGRldl9wcml2KSkgfHwKLQkg ICAgSVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkKKwkgICAgSVNfVkFM TEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCVBJUEVfQ09O Rl9DSEVDS19JKGxpbWl0ZWRfY29sb3JfcmFuZ2UpOwogCVBJUEVfQ09ORl9DSEVDS19JKGhhc19p bmZvZnJhbWUpOwogCkBAIC0xNTA2NSw3ICsxNTA2NSw3IEBAIGludGVsX2NoZWNrX2N1cnNvcl9w bGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkgKiBkaXNwbGF5IHBvd2VyIHdlbGwgbXVz dCBiZSB0dXJuZWQgb2ZmIGFuZCBvbiBhZ2Fpbi4KIAkgKiBSZWZ1c2UgdGhlIHB1dCB0aGUgY3Vy c29yIGludG8gdGhhdCBjb21wcm9taXNlZCBwb3NpdGlvbi4KIAkgKi8KLQlpZiAoSVNfQ0hFUlJZ VklFVyhwbGFuZS0+ZGV2KSAmJiBwaXBlID09IFBJUEVfQyAmJgorCWlmIChJU19DSEVSUllWSUVX KHRvX2k5MTUocGxhbmUtPmRldikpICYmIHBpcGUgPT0gUElQRV9DICYmCiAJICAgIHN0YXRlLT5i YXNlLnZpc2libGUgJiYgc3RhdGUtPmJhc2UuY3J0Y194IDwgMCkgewogCQlEUk1fREVCVUdfS01T KCJDSFYgY3Vyc29yIEMgbm90IGFsbG93ZWQgdG8gc3RyYWRkbGUgdGhlIGxlZnQgc2NyZWVuIGVk Z2VcbiIpOwogCQlyZXR1cm4gLUVJTlZBTDsKQEAgLTE1MzM1LDcgKzE1MzM1LDcgQEAgc3RhdGlj IGJvb2wgaW50ZWxfY3J0X3ByZXNlbnQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAoSVNf SFNXX1VMVChkZXZfcHJpdikgfHwgSVNfQkRXX1VMVChkZXZfcHJpdikpCiAJCXJldHVybiBmYWxz ZTsKIAotCWlmIChJU19DSEVSUllWSUVXKGRldikpCisJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3By aXYpKQogCQlyZXR1cm4gZmFsc2U7CiAKIAlpZiAoSEFTX1BDSF9MUFRfSChkZXZfcHJpdikgJiYK QEAgLTE1NDc2LDcgKzE1NDc2LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2V0dXBfb3V0cHV0cyhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJCWlmIChJOTE1X1JFQUQoUENIX0RQX0QpICYgRFBf REVURUNURUQpCiAJCQlpbnRlbF9kcF9pbml0KGRldiwgUENIX0RQX0QsIFBPUlRfRCk7Ci0JfSBl bHNlIGlmIChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJfSBl bHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2 KSkgewogCQlib29sIGhhc19lZHAsIGhhc19wb3J0OwogCiAJCS8qCkBAIC0xNTUwOCw3ICsxNTUw OCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3NldHVwX291dHB1dHMoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAkJaWYgKChJOTE1X1JFQUQoVkxWX0hETUlDKSAmIFNEVk9fREVURUNURUQgfHwgaGFz X3BvcnQpICYmICFoYXNfZWRwKQogCQkJaW50ZWxfaGRtaV9pbml0KGRldiwgVkxWX0hETUlDLCBQ T1JUX0MpOwogCi0JCWlmIChJU19DSEVSUllWSUVXKGRldikpIHsKKwkJaWYgKElTX0NIRVJSWVZJ RVcoZGV2X3ByaXYpKSB7CiAJCQkvKgogCQkJICogZURQIG5vdCBzdXBwb3J0ZWQgb24gcG9ydCBE LAogCQkJICogc28gbm8gbmVlZCB0byB3b3JyeSBhYm91dCBpdApAQCAtMTU2MjYsMTAgKzE1NjI2 LDEwIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyX2Z1bmNzIGludGVsX2Zi X2Z1bmNzID0gewogfTsKIAogc3RhdGljCi11MzIgaW50ZWxfZmJfcGl0Y2hfbGltaXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgdWludDY0X3QgZmJfbW9kaWZpZXIsCi0JCQkgdWludDMyX3QgcGl4 ZWxfZm9ybWF0KQordTMyIGludGVsX2ZiX3BpdGNoX2xpbWl0KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKKwkJCSB1aW50NjRfdCBmYl9tb2RpZmllciwgdWludDMyX3QgcGl4ZWxf Zm9ybWF0KQogewotCXUzMiBnZW4gPSBJTlRFTF9JTkZPKGRldiktPmdlbjsKKwl1MzIgZ2VuID0g SU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbjsKIAogCWlmIChnZW4gPj0gOSkgewogCQlpbnQgY3Bw ID0gZHJtX2Zvcm1hdF9wbGFuZV9jcHAocGl4ZWxfZm9ybWF0LCAwKTsKQEAgLTE1NjM4LDcgKzE1 NjM4LDggQEAgdTMyIGludGVsX2ZiX3BpdGNoX2xpbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHVpbnQ2NF90IGZiX21vZGlmaWVyLAogCQkgKiAgcGl4ZWxzIGFuZCAzMksgYnl0ZXMuIgogCQkg Ki8KIAkJcmV0dXJuIG1pbig4MTkyICogY3BwLCAzMjc2OCk7Ci0JfSBlbHNlIGlmIChnZW4gPj0g NSAmJiAhSVNfVkFMTEVZVklFVyhkZXYpICYmICFJU19DSEVSUllWSUVXKGRldikpIHsKKwl9IGVs c2UgaWYgKGdlbiA+PSA1ICYmICFJU19WQUxMRVlWSUVXKGRldl9wcml2KSAmJgorCQkgICAhSVNf Q0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJcmV0dXJuIDMyKjEwMjQ7CiAJfSBlbHNlIGlmIChn ZW4gPj0gNCkgewogCQlpZiAoZmJfbW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1hfVElMRUQp CkBAIC0xNTcyNSw3ICsxNTcyNiw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfZnJhbWVidWZmZXJfaW5p dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKLQlwaXRj aF9saW1pdCA9IGludGVsX2ZiX3BpdGNoX2xpbWl0KGRldiwgbW9kZV9jbWQtPm1vZGlmaWVyWzBd LAorCXBpdGNoX2xpbWl0ID0gaW50ZWxfZmJfcGl0Y2hfbGltaXQoZGV2X3ByaXYsIG1vZGVfY21k LT5tb2RpZmllclswXSwKIAkJCQkJICAgbW9kZV9jbWQtPnBpeGVsX2Zvcm1hdCk7CiAJaWYgKG1v ZGVfY21kLT5waXRjaGVzWzBdID4gcGl0Y2hfbGltaXQpIHsKIAkJRFJNX0RFQlVHKCIlcyBwaXRj aCAoJXUpIG11c3QgYmUgYXQgbGVzcyB0aGFuICVkXG4iLApAQCAtMTU3NjMsNyArMTU3NjQsNyBA QCBzdGF0aWMgaW50IGludGVsX2ZyYW1lYnVmZmVyX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIAkJfQogCQlicmVhazsKIAljYXNlIERSTV9GT1JNQVRfQUJHUjg4ODg6Ci0JCWlmICghSVNf VkFMTEVZVklFVyhkZXYpICYmICFJU19DSEVSUllWSUVXKGRldikgJiYKKwkJaWYgKCFJU19WQUxM RVlWSUVXKGRldl9wcml2KSAmJiAhSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikgJiYKIAkJICAgIElO VEVMX0lORk8oZGV2KS0+Z2VuIDwgOSkgewogCQkJZm9ybWF0X25hbWUgPSBkcm1fZ2V0X2Zvcm1h dF9uYW1lKG1vZGVfY21kLT5waXhlbF9mb3JtYXQpOwogCQkJRFJNX0RFQlVHKCJ1bnN1cHBvcnRl ZCBwaXhlbCBmb3JtYXQ6ICVzXG4iLCBmb3JtYXRfbmFtZSk7CkBAIC0xNTc4Miw3ICsxNTc4Myw3 IEBAIHN0YXRpYyBpbnQgaW50ZWxfZnJhbWVidWZmZXJfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCQl9CiAJCWJyZWFrOwogCWNhc2UgRFJNX0ZPUk1BVF9BQkdSMjEwMTAxMDoKLQkJaWYg KCFJU19WQUxMRVlWSUVXKGRldikgJiYgIUlTX0NIRVJSWVZJRVcoZGV2KSkgeworCQlpZiAoIUlT X1ZBTExFWVZJRVcoZGV2X3ByaXYpICYmICFJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQkJ Zm9ybWF0X25hbWUgPSBkcm1fZ2V0X2Zvcm1hdF9uYW1lKG1vZGVfY21kLT5waXhlbF9mb3JtYXQp OwogCQkJRFJNX0RFQlVHKCJ1bnN1cHBvcnRlZCBwaXhlbCBmb3JtYXQ6ICVzXG4iLCBmb3JtYXRf bmFtZSk7CiAJCQlrZnJlZShmb3JtYXRfbmFtZSk7CkBAIC0xNjIyOSw3ICsxNjIzMCw3IEBAIHN0 YXRpYyB2b2lkIGk5MTVfZGlzYWJsZV92Z2Eoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IHBj aV9kZXYgKnBkZXYgPSBkZXZfcHJpdi0+ZHJtLnBkZXY7CiAJdTggc3IxOwotCWk5MTVfcmVnX3Qg dmdhX3JlZyA9IGk5MTVfdmdhY250cmxfcmVnKGRldik7CisJaTkxNV9yZWdfdCB2Z2FfcmVnID0g aTkxNV92Z2FjbnRybF9yZWcoZGV2X3ByaXYpOwogCiAJLyogV2FFbmFibGVWR0FBY2Nlc3NUaHJv dWdoSU9Qb3J0OmN0ZyxlbGssaWxrLHNuYixpdmIsdmx2LGhzdyAqLwogCXZnYV9nZXRfdW5pbnRl cnJ1cHRpYmxlKHBkZXYsIFZHQV9SU1JDX0xFR0FDWV9JTyk7CkBAIC0xNjY3NCw3ICsxNjY3NSw3 IEBAIHN0YXRpYyB2b2lkIGludGVsX3Nhbml0aXplX2VuY29kZXIoc3RydWN0IGludGVsX2VuY29k ZXIgKmVuY29kZXIpCiB2b2lkIGk5MTVfcmVkaXNhYmxlX3ZnYV9wb3dlcl9vbihzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRv X2k5MTUoZGV2KTsKLQlpOTE1X3JlZ190IHZnYV9yZWcgPSBpOTE1X3ZnYWNudHJsX3JlZyhkZXYp OworCWk5MTVfcmVnX3QgdmdhX3JlZyA9IGk5MTVfdmdhY250cmxfcmVnKGRldl9wcml2KTsKIAog CWlmICghKEk5MTVfUkVBRCh2Z2FfcmVnKSAmIFZHQV9ESVNQX0RJU0FCTEUpKSB7CiAJCURSTV9E RUJVR19LTVMoIlNvbWV0aGluZyBlbmFibGVkIFZHQSBwbGFuZSwgZGlzYWJsaW5nIGl0XG4iKTsK QEAgLTE2OTEyLDcgKzE2OTEzLDcgQEAgaW50ZWxfbW9kZXNldF9zZXR1cF9od19zdGF0ZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCQlwbGwtPm9uID0gZmFsc2U7CiAJfQogCi0JaWYgKElTX1ZB TExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVXKGRldikpCisJaWYgKElTX1ZBTExFWVZJRVco ZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQl2bHZfd21fZ2V0X2h3X3N0 YXRlKGRldik7CiAJZWxzZSBpZiAoSVNfR0VOOShkZXYpKQogCQlza2xfd21fZ2V0X2h3X3N0YXRl KGRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwppbmRleCBkZmM5M2NjMTFhMTMuLjFlMWNjZjA5 MmUxMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCkBAIC0zNDQsNyArMzQ0LDcgQEAgdmx2X3Bv d2VyX3NlcXVlbmNlcl9raWNrKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJRFAgfD0gRFBf UE9SVF9XSURUSCgxKTsKIAlEUCB8PSBEUF9MSU5LX1RSQUlOX1BBVF8xOwogCi0JaWYgKElTX0NI RVJSWVZJRVcoZGV2KSkKKwlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCURQIHw9IERQ X1BJUEVfU0VMRUNUX0NIVihwaXBlKTsKIAllbHNlIGlmIChwaXBlID09IFBJUEVfQikKIAkJRFAg fD0gRFBfUElQRUJfU0VMRUNUOwpAQCAtMzU2LDEwICszNTYsMTAgQEAgdmx2X3Bvd2VyX3NlcXVl bmNlcl9raWNrKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJICogU28gZW5hYmxlIHRlbXBv cmFyaWx5IGl0IGlmIGl0J3Mgbm90IGFscmVhZHkgZW5hYmxlZC4KIAkgKi8KIAlpZiAoIXBsbF9l bmFibGVkKSB7Ci0JCXJlbGVhc2VfY2xfb3ZlcnJpZGUgPSBJU19DSEVSUllWSUVXKGRldikgJiYK KwkJcmVsZWFzZV9jbF9vdmVycmlkZSA9IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpICYmCiAJCQkh Y2h2X3BoeV9wb3dlcmdhdGVfY2goZGV2X3ByaXYsIHBoeSwgY2gsIHRydWUpOwogCi0JCWlmICh2 bHZfZm9yY2VfcGxsX29uKGRldiwgcGlwZSwgSVNfQ0hFUlJZVklFVyhkZXYpID8KKwkJaWYgKHZs dl9mb3JjZV9wbGxfb24oZGV2LCBwaXBlLCBJU19DSEVSUllWSUVXKGRldl9wcml2KSA/CiAJCQkJ ICAgICAmY2h2X2RwbGxbMF0uZHBsbCA6ICZ2bHZfZHBsbFswXS5kcGxsKSkgewogCQkJRFJNX0VS Uk9SKCJGYWlsZWQgdG8gZm9yY2Ugb24gcGxsIGZvciBwaXBlICVjIVxuIiwKIAkJCQkgIHBpcGVf bmFtZShwaXBlKSk7CkBAIC01NzAsNyArNTcwLDcgQEAgdm9pZCBpbnRlbF9wb3dlcl9zZXF1ZW5j ZXJfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSAmZGV2X3ByaXYtPmRybTsKIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5j b2RlcjsKIAotCWlmIChXQVJOX09OKCFJU19WQUxMRVlWSUVXKGRldikgJiYgIUlTX0NIRVJSWVZJ RVcoZGV2KSAmJgorCWlmIChXQVJOX09OKCFJU19WQUxMRVlWSUVXKGRldl9wcml2KSAmJiAhSVNf Q0hFUlJZVklFVyhkZXZfcHJpdikgJiYKIAkJICAgICFJU19CUk9YVE9OKGRldl9wcml2KSkpCiAJ CXJldHVybjsKIApAQCAtNjY0LDcgKzY2NCw3IEBAIHN0YXRpYyBpbnQgZWRwX25vdGlmeV9oYW5k bGVyKHN0cnVjdCBub3RpZmllcl9ibG9jayAqdGhpcywgdW5zaWduZWQgbG9uZyBjb2RlLAogCiAJ cHBzX2xvY2soaW50ZWxfZHApOwogCi0JaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVS UllWSUVXKGRldikpIHsKKwlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZ VklFVyhkZXZfcHJpdikpIHsKIAkJZW51bSBwaXBlIHBpcGUgPSB2bHZfcG93ZXJfc2VxdWVuY2Vy X3BpcGUoaW50ZWxfZHApOwogCQlpOTE1X3JlZ190IHBwX2N0cmxfcmVnLCBwcF9kaXZfcmVnOwog CQl1MzIgcHBfZGl2OwpAQCAtNjkyLDcgKzY5Miw3IEBAIHN0YXRpYyBib29sIGVkcF9oYXZlX3Bh bmVsX3Bvd2VyKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAKIAlsb2NrZGVwX2Fzc2VydF9o ZWxkKCZkZXZfcHJpdi0+cHBzX211dGV4KTsKIAotCWlmICgoSVNfVkFMTEVZVklFVyhkZXYpIHx8 IElTX0NIRVJSWVZJRVcoZGV2KSkgJiYKKwlpZiAoKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8 IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSAmJgogCSAgICBpbnRlbF9kcC0+cHBzX3BpcGUgPT0g SU5WQUxJRF9QSVBFKQogCQlyZXR1cm4gZmFsc2U7CiAKQEAgLTcwNiw3ICs3MDYsNyBAQCBzdGF0 aWMgYm9vbCBlZHBfaGF2ZV9wYW5lbF92ZGQoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAog CWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmRldl9wcml2LT5wcHNfbXV0ZXgpOwogCi0JaWYgKChJU19W QUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSAmJgorCWlmICgoSVNfVkFMTEVZ VklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpICYmCiAJICAgIGludGVs X2RwLT5wcHNfcGlwZSA9PSBJTlZBTElEX1BJUEUpCiAJCXJldHVybiBmYWxzZTsKIApAQCAtMTM0 Nyw3ICsxMzQ3LDcgQEAgaW50ZWxfZHBfc2V0X2Nsb2NrKHN0cnVjdCBpbnRlbF9lbmNvZGVyICpl bmNvZGVyLAogCX0gZWxzZSBpZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikpIHsKIAkJZGl2aXNv ciA9IHBjaF9kcGxsOwogCQljb3VudCA9IEFSUkFZX1NJWkUocGNoX2RwbGwpOwotCX0gZWxzZSBp ZiAoSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJfSBlbHNlIGlmIChJU19DSEVSUllWSUVXKGRldl9w cml2KSkgewogCQlkaXZpc29yID0gY2h2X2RwbGw7CiAJCWNvdW50ID0gQVJSQVlfU0laRShjaHZf ZHBsbCk7CiAJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldikpIHsKQEAgLTE3OTEsNyArMTc5 MSw4IEBAIHN0YXRpYyB2b2lkIGludGVsX2RwX3ByZXBhcmUoc3RydWN0IGludGVsX2VuY29kZXIg KmVuY29kZXIsCiAJCUk5MTVfV1JJVEUoVFJBTlNfRFBfQ1RMKGNydGMtPnBpcGUpLCB0cmFuc19k cCk7CiAJfSBlbHNlIHsKIAkJaWYgKCFIQVNfUENIX1NQTElUKGRldl9wcml2KSAmJiAhSVNfVkFM TEVZVklFVyhkZXYpICYmCi0JCSAgICAhSVNfQ0hFUlJZVklFVyhkZXYpICYmIHBpcGVfY29uZmln LT5saW1pdGVkX2NvbG9yX3JhbmdlKQorCQkgICAgIUlTX0NIRVJSWVZJRVcoZGV2X3ByaXYpICYm CisJCSAgICBwaXBlX2NvbmZpZy0+bGltaXRlZF9jb2xvcl9yYW5nZSkKIAkJCWludGVsX2RwLT5E UCB8PSBEUF9DT0xPUl9SQU5HRV8xNl8yMzU7CiAKIAkJaWYgKGFkanVzdGVkX21vZGUtPmZsYWdz ICYgRFJNX01PREVfRkxBR19QSFNZTkMpCkBAIC0xODAzLDcgKzE4MDQsNyBAQCBzdGF0aWMgdm9p ZCBpbnRlbF9kcF9wcmVwYXJlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQlpZiAo ZHJtX2RwX2VuaGFuY2VkX2ZyYW1lX2NhcChpbnRlbF9kcC0+ZHBjZCkpCiAJCQlpbnRlbF9kcC0+ RFAgfD0gRFBfRU5IQU5DRURfRlJBTUlORzsKIAotCQlpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKQor CQlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCQlpbnRlbF9kcC0+RFAgfD0gRFBfUElQ RV9TRUxFQ1RfQ0hWKGNydGMtPnBpcGUpOwogCQllbHNlIGlmIChjcnRjLT5waXBlID09IFBJUEVf QikKIAkJCWludGVsX2RwLT5EUCB8PSBEUF9QSVBFQl9TRUxFQ1Q7CkBAIC0yNDU5LDcgKzI0NjAs NyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9kcF9nZXRfaHdfc3RhdGUoc3RydWN0IGludGVsX2VuY29k ZXIgKmVuY29kZXIsCiAKIAkJRFJNX0RFQlVHX0tNUygiTm8gcGlwZSBmb3IgZHAgcG9ydCAweCV4 IGZvdW5kXG4iLAogCQkJICAgICAgaTkxNV9tbWlvX3JlZ19vZmZzZXQoaW50ZWxfZHAtPm91dHB1 dF9yZWcpKTsKLQl9IGVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2KSkgeworCX0gZWxzZSBpZiAo SVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJKnBpcGUgPSBEUF9QT1JUX1RPX1BJUEVfQ0hW KHRtcCk7CiAJfSBlbHNlIHsKIAkJKnBpcGUgPSBQT1JUX1RPX1BJUEUodG1wKTsKQEAgLTI2ODEs NyArMjY4Miw3IEBAIF9pbnRlbF9kcF9zZXRfbGlua190cmFpbihzdHJ1Y3QgaW50ZWxfZHAgKmlu dGVsX2RwLAogCQl9CiAKIAl9IGVsc2UgewotCQlpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKQorCQlp ZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCQkqRFAgJj0gfkRQX0xJTktfVFJBSU5fTUFT S19DSFY7CiAJCWVsc2UKIAkJCSpEUCAmPSB+RFBfTElOS19UUkFJTl9NQVNLOwpAQCAtMjY5Nyw3 ICsyNjk4LDcgQEAgX2ludGVsX2RwX3NldF9saW5rX3RyYWluKHN0cnVjdCBpbnRlbF9kcCAqaW50 ZWxfZHAsCiAJCQkqRFAgfD0gRFBfTElOS19UUkFJTl9QQVRfMjsKIAkJCWJyZWFrOwogCQljYXNl IERQX1RSQUlOSU5HX1BBVFRFUk5fMzoKLQkJCWlmIChJU19DSEVSUllWSUVXKGRldikpIHsKKwkJ CWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQkJCSpEUCB8PSBEUF9MSU5LX1RSQUlO X1BBVF8zX0NIVjsKIAkJCX0gZWxzZSB7CiAJCQkJRFJNX0RFQlVHX0tNUygiVFBTMyBub3Qgc3Vw cG9ydGVkLCB1c2luZyBUUFMyIGluc3RlYWRcbiIpOwpAQCAtMjc0Nyw3ICsyNzQ4LDcgQEAgc3Rh dGljIHZvaWQgaW50ZWxfZW5hYmxlX2RwKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAog CiAJcHBzX2xvY2soaW50ZWxfZHApOwogCi0JaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19D SEVSUllWSUVXKGRldikpCisJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJS WVZJRVcoZGV2X3ByaXYpKQogCQl2bHZfaW5pdF9wYW5lbF9wb3dlcl9zZXF1ZW5jZXIoaW50ZWxf ZHApOwogCiAJaW50ZWxfZHBfZW5hYmxlX3BvcnQoaW50ZWxfZHAsIHBpcGVfY29uZmlnKTsKQEAg LTI3NTgsMTAgKzI3NTksMTAgQEAgc3RhdGljIHZvaWQgaW50ZWxfZW5hYmxlX2RwKHN0cnVjdCBp bnRlbF9lbmNvZGVyICplbmNvZGVyLAogCiAJcHBzX3VubG9jayhpbnRlbF9kcCk7CiAKLQlpZiAo SVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkgeworCWlmIChJU19WQUxM RVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQl1bnNpZ25l ZCBpbnQgbGFuZV9tYXNrID0gMHgwOwogCi0JCWlmIChJU19DSEVSUllWSUVXKGRldikpCisJCWlm IChJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJCWxhbmVfbWFzayA9IGludGVsX2RwX3VudXNl ZF9sYW5lX21hc2socGlwZV9jb25maWctPmxhbmVfY291bnQpOwogCiAJCXZsdl93YWl0X3BvcnRf cmVhZHkoZGV2X3ByaXYsIGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKSwKQEAgLTI5ODcsNyArMjk4 OCw3IEBAIGludGVsX2RwX3ZvbHRhZ2VfbWF4KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJ CWlmIChkZXZfcHJpdi0+dmJ0LmVkcC5sb3dfdnN3aW5nICYmIHBvcnQgPT0gUE9SVF9BKQogCQkJ cmV0dXJuIERQX1RSQUlOX1ZPTFRBR0VfU1dJTkdfTEVWRUxfMzsKIAkJcmV0dXJuIERQX1RSQUlO X1ZPTFRBR0VfU1dJTkdfTEVWRUxfMjsKLQl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8 fCBJU19DSEVSUllWSUVXKGRldikpCisJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2 KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJcmV0dXJuIERQX1RSQUlOX1ZPTFRBR0Vf U1dJTkdfTEVWRUxfMzsKIAllbHNlIGlmIChJU19HRU43KGRldikgJiYgcG9ydCA9PSBQT1JUX0Ep CiAJCXJldHVybiBEUF9UUkFJTl9WT0xUQUdFX1NXSU5HX0xFVkVMXzI7CkBAIC0zMzQ4LDcgKzMz NDksNyBAQCBpbnRlbF9kcF9zZXRfc2lnbmFsX2xldmVscyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVs X2RwKQogCQkJc2lnbmFsX2xldmVscyA9IDA7CiAJCWVsc2UKIAkJCW1hc2sgPSBERElfQlVGX0VN UF9NQVNLOwotCX0gZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJfSBlbHNlIGlmIChJ U19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQlzaWduYWxfbGV2ZWxzID0gY2h2X3NpZ25hbF9s ZXZlbHMoaW50ZWxfZHApOwogCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKSB7CiAJCXNp Z25hbF9sZXZlbHMgPSB2bHZfc2lnbmFsX2xldmVscyhpbnRlbF9kcCk7CkBAIC0zNDQ4LDcgKzM0 NDksNyBAQCBpbnRlbF9kcF9saW5rX2Rvd24oc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAkJ RFAgJj0gfkRQX0xJTktfVFJBSU5fTUFTS19DUFQ7CiAJCURQIHw9IERQX0xJTktfVFJBSU5fUEFU X0lETEVfQ1BUOwogCX0gZWxzZSB7Ci0JCWlmIChJU19DSEVSUllWSUVXKGRldikpCisJCWlmIChJ U19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJCURQICY9IH5EUF9MSU5LX1RSQUlOX01BU0tfQ0hW OwogCQllbHNlCiAJCQlEUCAmPSB+RFBfTElOS19UUkFJTl9NQVNLOwpAQCAtNTA4NSw3ICs1MDg2 LDcgQEAgaW50ZWxfZHBfaW5pdF9wYW5lbF9wb3dlcl9zZXF1ZW5jZXJfcmVnaXN0ZXJzKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAKIAkvKiBIYXN3ZWxsIGRvZXNuJ3QgaGF2ZSBhbnkgcG9ydCBz ZWxlY3Rpb24gYml0cyBmb3IgdGhlIHBhbmVsCiAJICogcG93ZXIgc2VxdWVuY2VyIGFueSBtb3Jl LiAqLwotCWlmIChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJ aWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7 CiAJCXBvcnRfc2VsID0gUEFORUxfUE9SVF9TRUxFQ1RfVkxWKHBvcnQpOwogCX0gZWxzZSBpZiAo SEFTX1BDSF9JQlgoZGV2X3ByaXYpIHx8IEhBU19QQ0hfQ1BUKGRldl9wcml2KSkgewogCQlpZiAo cG9ydCA9PSBQT1JUX0EpCkBAIC01MTE0LDcgKzUxMTUsOSBAQCBpbnRlbF9kcF9pbml0X3BhbmVs X3Bvd2VyX3NlcXVlbmNlcl9yZWdpc3RlcnMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIHN0YXRp YyB2b2lkIGludGVsX2RwX3Bwc19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkgICAg ICBzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogewotCWlmIChJU19WQUxMRVlWSUVXKGRldikg fHwgSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShkZXYpOworCisJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElT X0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCXZsdl9pbml0aWFsX3Bvd2VyX3NlcXVlbmNlcl9z ZXR1cChpbnRlbF9kcCk7CiAJfSBlbHNlIHsKIAkJaW50ZWxfZHBfaW5pdF9wYW5lbF9wb3dlcl9z ZXF1ZW5jZXIoZGV2LCBpbnRlbF9kcCk7CkBAIC01NTg0LDcgKzU1ODcsNyBAQCBzdGF0aWMgYm9v bCBpbnRlbF9lZHBfaW5pdF9jb25uZWN0b3Ioc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAl9 CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPm1vZGVfY29uZmlnLm11dGV4KTsKIAotCWlmIChJU19WQUxM RVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJaWYgKElTX1ZBTExFWVZJRVco ZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCWludGVsX2RwLT5lZHBf bm90aWZpZXIubm90aWZpZXJfY2FsbCA9IGVkcF9ub3RpZnlfaGFuZGxlcjsKIAkJcmVnaXN0ZXJf cmVib290X25vdGlmaWVyKCZpbnRlbF9kcC0+ZWRwX25vdGlmaWVyKTsKIApAQCAtNTU5Myw3ICs1 NTk2LDcgQEAgc3RhdGljIGJvb2wgaW50ZWxfZWRwX2luaXRfY29ubmVjdG9yKHN0cnVjdCBpbnRl bF9kcCAqaW50ZWxfZHAsCiAJCSAqIElmIHRoZSBjdXJyZW50IHBpcGUgaXNuJ3QgdmFsaWQsIHRy eSB0aGUgUFBTIHBpcGUsIGFuZCBpZiB0aGF0CiAJCSAqIGZhaWxzIGp1c3QgYXNzdW1lIHBpcGUg QS4KIAkJICovCi0JCWlmIChJU19DSEVSUllWSUVXKGRldikpCisJCWlmIChJU19DSEVSUllWSUVX KGRldl9wcml2KSkKIAkJCXBpcGUgPSBEUF9QT1JUX1RPX1BJUEVfQ0hWKGludGVsX2RwLT5EUCk7 CiAJCWVsc2UKIAkJCXBpcGUgPSBQT1JUX1RPX1BJUEUoaW50ZWxfZHAtPkRQKTsKQEAgLTU2ODIs NyArNTY4NSw3IEBAIGludGVsX2RwX2luaXRfY29ubmVjdG9yKHN0cnVjdCBpbnRlbF9kaWdpdGFs X3BvcnQgKmludGVsX2RpZ19wb3J0LAogCQlpbnRlbF9lbmNvZGVyLT50eXBlID0gSU5URUxfT1VU UFVUX0VEUDsKIAogCS8qIGVEUCBvbmx5IG9uIHBvcnQgQiBhbmQvb3IgQyBvbiB2bHYvY2h2ICov Ci0JaWYgKFdBUk5fT04oKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVXKGRldikp ICYmCisJaWYgKFdBUk5fT04oKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJ RVcoZGV2X3ByaXYpKSAmJgogCQkgICAgaXNfZWRwKGludGVsX2RwKSAmJiBwb3J0ICE9IFBPUlRf QiAmJiBwb3J0ICE9IFBPUlRfQykpCiAJCXJldHVybiBmYWxzZTsKIApAQCAtNTc5Miw3ICs1Nzk1 LDcgQEAgYm9vbCBpbnRlbF9kcF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaW50ZWxf ZW5jb2Rlci0+Z2V0X2h3X3N0YXRlID0gaW50ZWxfZHBfZ2V0X2h3X3N0YXRlOwogCWludGVsX2Vu Y29kZXItPmdldF9jb25maWcgPSBpbnRlbF9kcF9nZXRfY29uZmlnOwogCWludGVsX2VuY29kZXIt PnN1c3BlbmQgPSBpbnRlbF9kcF9lbmNvZGVyX3N1c3BlbmQ7Ci0JaWYgKElTX0NIRVJSWVZJRVco ZGV2KSkgeworCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQlpbnRlbF9lbmNvZGVy LT5wcmVfcGxsX2VuYWJsZSA9IGNodl9kcF9wcmVfcGxsX2VuYWJsZTsKIAkJaW50ZWxfZW5jb2Rl ci0+cHJlX2VuYWJsZSA9IGNodl9wcmVfZW5hYmxlX2RwOwogCQlpbnRlbF9lbmNvZGVyLT5lbmFi bGUgPSB2bHZfZW5hYmxlX2RwOwpAQCAtNTgxNSw3ICs1ODE4LDcgQEAgYm9vbCBpbnRlbF9kcF9p bml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaW50ZWxfZGlnX3BvcnQtPm1heF9sYW5lcyA9 IDQ7CiAKIAlpbnRlbF9lbmNvZGVyLT50eXBlID0gSU5URUxfT1VUUFVUX0RQOwotCWlmIChJU19D SEVSUllWSUVXKGRldikpIHsKKwlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJaWYg KHBvcnQgPT0gUE9SVF9EKQogCQkJaW50ZWxfZW5jb2Rlci0+Y3J0Y19tYXNrID0gMSA8PCAyOwog CQllbHNlCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RzaS5jCmluZGV4IDQ4ZThkZDEwOGY0Zi4uNGUwZDAy NTQ5MGEzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYwpAQCAtNzQwLDcgKzc0MCw2IEBAIHN0 YXRpYyBib29sIGludGVsX2RzaV9nZXRfaHdfc3RhdGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVu Y29kZXIsCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShl bmNvZGVyLT5iYXNlLmRldik7CiAJc3RydWN0IGludGVsX2RzaSAqaW50ZWxfZHNpID0gZW5jX3Rv X2ludGVsX2RzaSgmZW5jb2Rlci0+YmFzZSk7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVu Y29kZXItPmJhc2UuZGV2OwogCWVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9kb21haW4gcG93ZXJf ZG9tYWluOwogCWVudW0gcG9ydCBwb3J0OwogCWJvb2wgYWN0aXZlID0gZmFsc2U7CkBAIC03NzAs NyArNzY5LDggQEAgc3RhdGljIGJvb2wgaW50ZWxfZHNpX2dldF9od19zdGF0ZShzdHJ1Y3QgaW50 ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJICogYml0IGluIHBvcnQgQyBjb250cm9sIHJlZ2lzdGVy IGRvZXMgbm90IGdldCBzZXQuIEFzIGEKIAkJICogd29ya2Fyb3VuZCwgY2hlY2sgcGlwZSBCIGNv bmYgaW5zdGVhZC4KIAkJICovCi0JCWlmICgoSVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NIRVJS WVZJRVcoZGV2KSkgJiYgcG9ydCA9PSBQT1JUX0MpCisJCWlmICgoSVNfVkFMTEVZVklFVyhkZXZf cHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpICYmCisJCSAgICBwb3J0ID09IFBPUlRf QykKIAkJCWVuYWJsZWQgPSBJOTE1X1JFQUQoUElQRUNPTkYoUElQRV9CKSkgJiBQSVBFQ09ORl9F TkFCTEU7CiAKIAkJLyogVHJ5IGNvbW1hbmQgbW9kZSBpZiB2aWRlbyBtb2RlIG5vdCBlbmFibGVk ICovCkBAIC0xMTM3LDcgKzExMzcsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kc2lfcHJlcGFyZShz dHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlciwKIAl9CiAKIAlmb3JfZWFjaF9kc2lf cG9ydChwb3J0LCBpbnRlbF9kc2ktPnBvcnRzKSB7Ci0JCWlmIChJU19WQUxMRVlWSUVXKGRldikg fHwgSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8 fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQkJLyoKIAkJCSAqIGVzY2FwZSBjbG9jayBk aXZpZGVyLCAyME1Ieiwgc2hhcmVkIGZvciBBIGFuZCBDLgogCQkJICogZGV2aWNlIHJlYWR5IG11 c3QgYmUgb2ZmIHdoZW4gZG9pbmcgdGhpcyEgdHhjbGtlc2M/CkBAIC0xNDQ5LDcgKzE0NDksNyBA QCB2b2lkIGludGVsX2RzaV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKCFpbnRl bF9iaW9zX2lzX2RzaV9wcmVzZW50KGRldl9wcml2LCAmcG9ydCkpCiAJCXJldHVybjsKIAotCWlm IChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJaWYgKElTX1ZB TExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCWRldl9w cml2LT5taXBpX21taW9fYmFzZSA9IFZMVl9NSVBJX0JBU0U7CiAJfSBlbHNlIGlmIChJU19CUk9Y VE9OKGRldl9wcml2KSkgewogCQlkZXZfcHJpdi0+bWlwaV9tbWlvX2Jhc2UgPSBCWFRfTUlQSV9C QVNFOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jCmluZGV4IGM3ZDljZGRmNGUzZS4uYzgyNDNk YzRkMmI5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jCkBAIC04ODEsNyArODgxLDcgQEAg c3RhdGljIHZvaWQgaW50ZWxfaGRtaV9wcmVwYXJlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNv ZGVyKQogCiAJaWYgKEhBU19QQ0hfQ1BUKGRldl9wcml2KSkKIAkJaGRtaV92YWwgfD0gU0RWT19Q SVBFX1NFTF9DUFQoY3J0Yy0+cGlwZSk7Ci0JZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKQor CWVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQloZG1pX3ZhbCB8PSBTRFZPX1BJ UEVfU0VMX0NIVihjcnRjLT5waXBlKTsKIAllbHNlCiAJCWhkbWlfdmFsIHw9IFNEVk9fUElQRV9T RUwoY3J0Yy0+cGlwZSk7CkBAIC05MTMsNyArOTEzLDcgQEAgc3RhdGljIGJvb2wgaW50ZWxfaGRt aV9nZXRfaHdfc3RhdGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAKIAlpZiAoSEFT X1BDSF9DUFQoZGV2X3ByaXYpKQogCQkqcGlwZSA9IFBPUlRfVE9fUElQRV9DUFQodG1wKTsKLQll bHNlIGlmIChJU19DSEVSUllWSUVXKGRldikpCisJZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXZf cHJpdikpCiAJCSpwaXBlID0gU0RWT19QT1JUX1RPX1BJUEVfQ0hWKHRtcCk7CiAJZWxzZQogCQkq cGlwZSA9IFBPUlRfVE9fUElQRSh0bXApOwpAQCAtMTg4NSw3ICsxODg1LDcgQEAgdm9pZCBpbnRl bF9oZG1pX2luaXRfY29ubmVjdG9yKHN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2Rp Z19wb3J0LAogCQlCVUcoKTsKIAl9CiAKLQlpZiAoSVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NI RVJSWVZJRVcoZGV2KSkgeworCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVS UllWSUVXKGRldl9wcml2KSkgewogCQlpbnRlbF9oZG1pLT53cml0ZV9pbmZvZnJhbWUgPSB2bHZf d3JpdGVfaW5mb2ZyYW1lOwogCQlpbnRlbF9oZG1pLT5zZXRfaW5mb2ZyYW1lcyA9IHZsdl9zZXRf aW5mb2ZyYW1lczsKIAkJaW50ZWxfaGRtaS0+aW5mb2ZyYW1lX2VuYWJsZWQgPSB2bHZfaW5mb2Zy YW1lX2VuYWJsZWQ7CkBAIC0xOTU5LDcgKzE5NTksNyBAQCB2b2lkIGludGVsX2hkbWlfaW5pdChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCX0KIAlpbnRlbF9lbmNvZGVyLT5nZXRfaHdfc3RhdGUg PSBpbnRlbF9oZG1pX2dldF9od19zdGF0ZTsKIAlpbnRlbF9lbmNvZGVyLT5nZXRfY29uZmlnID0g aW50ZWxfaGRtaV9nZXRfY29uZmlnOwotCWlmIChJU19DSEVSUllWSUVXKGRldikpIHsKKwlpZiAo SVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJaW50ZWxfZW5jb2Rlci0+cHJlX3BsbF9lbmFi bGUgPSBjaHZfaGRtaV9wcmVfcGxsX2VuYWJsZTsKIAkJaW50ZWxfZW5jb2Rlci0+cHJlX2VuYWJs ZSA9IGNodl9oZG1pX3ByZV9lbmFibGU7CiAJCWludGVsX2VuY29kZXItPmVuYWJsZSA9IHZsdl9l bmFibGVfaGRtaTsKQEAgLTE5ODIsNyArMTk4Miw3IEBAIHZvaWQgaW50ZWxfaGRtaV9pbml0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAlpbnRlbF9lbmNvZGVyLT50eXBlID0gSU5URUxfT1VU UFVUX0hETUk7CiAJaW50ZWxfZW5jb2Rlci0+cG9ydCA9IHBvcnQ7Ci0JaWYgKElTX0NIRVJSWVZJ RVcoZGV2KSkgeworCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQlpZiAocG9ydCA9 PSBQT1JUX0QpCiAJCQlpbnRlbF9lbmNvZGVyLT5jcnRjX21hc2sgPSAxIDw8IDI7CiAJCWVsc2UK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfaTJjLmMKaW5kZXggYWZiMjY1MjkxOWQwLi5kMDQxODVlMWVkZDYg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jCkBAIC02MzUsNyArNjM1LDcgQEAgaW50IGludGVs X3NldHVwX2dtYnVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKEhBU19QQ0hfTk9QKGRl dl9wcml2KSkKIAkJcmV0dXJuIDA7CiAKLQlpZiAoSVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NI RVJSWVZJRVcoZGV2KSkKKwlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZ VklFVyhkZXZfcHJpdikpCiAJCWRldl9wcml2LT5ncGlvX21taW9fYmFzZSA9IFZMVl9ESVNQTEFZ X0JBU0U7CiAJZWxzZSBpZiAoIUhBU19HTUNIX0RJU1BMQVkoZGV2X3ByaXYpKQogCQlkZXZfcHJp di0+Z3Bpb19tbWlvX2Jhc2UgPQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggMGY4MmU2M2Ew YmVjLi5mMDgyYzA2NWVlZGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMzIyLDcgKzMy Miw3IEBAIHZvaWQgaW50ZWxfc2V0X21lbW9yeV9jeHNyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwgYm9vbCBlbmFibGUpCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9ICZkZXZf cHJpdi0+ZHJtOwogCXUzMiB2YWw7CiAKLQlpZiAoSVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NI RVJSWVZJRVcoZGV2KSkgeworCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVS UllWSUVXKGRldl9wcml2KSkgewogCQlJOTE1X1dSSVRFKEZXX0JMQ19TRUxGX1ZMViwgZW5hYmxl ID8gRldfQ1NQV1JEV05FTiA6IDApOwogCQlQT1NUSU5HX1JFQUQoRldfQkxDX1NFTEZfVkxWKTsK IAkJZGV2X3ByaXYtPndtLnZsdi5jeHNyID0gZW5hYmxlOwpAQCAtNzc1NSw3ICs3NzU1LDcgQEAg dm9pZCBpbnRlbF9pbml0X3BtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQlEUk1fREVCVUdf S01TKCJGYWlsZWQgdG8gcmVhZCBkaXNwbGF5IHBsYW5lIGxhdGVuY3kuICIKIAkJCQkgICAgICAi RGlzYWJsZSBDeFNSXG4iKTsKIAkJfQotCX0gZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKSB7 CisJfSBlbHNlIGlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQl2bHZfc2V0dXBfd21f bGF0ZW5jeShkZXYpOwogCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfd20gPSB2bHZfdXBkYXRl X3dtOwogCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKSB7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3Bzci5jCmluZGV4IDRhOTczYjM0MzQ4YS4uMjcxYTNlMjlmZjIzIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wc3IuYwpAQCAtMzU0LDcgKzM1NCw3IEBAIHN0YXRpYyBib29sIGludGVsX3Bzcl9tYXRj aF9jb25kaXRpb25zKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJCXJldHVybiBmYWxzZTsK IAl9CiAKLQlpZiAoKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVXKGRldikpICYm CisJaWYgKChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2 KSkgJiYKIAkgICAgIWRldl9wcml2LT5wc3IubGlua19zdGFuZGJ5KSB7CiAJCURSTV9FUlJPUigi UFNSIGNvbmRpdGlvbiBmYWlsZWQ6IExpbmsgb2ZmIHJlcXVlc3RlZCBidXQgbm90IHN1cHBvcnRl ZCBvbiB0aGlzIHBsYXRmb3JtXG4iKTsKIAkJcmV0dXJuIGZhbHNlOwpAQCAtODM3LDcgKzgzNyw3 IEBAIHZvaWQgaW50ZWxfcHNyX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAoSVNf SEFTV0VMTChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkKIAkJLyogSFNXIGFu ZCBCRFcgcmVxdWlyZSB3b3JrYXJvdW5kcyB0aGF0IHdlIGRvbid0IGltcGxlbWVudC4gKi8KIAkJ ZGV2X3ByaXYtPnBzci5saW5rX3N0YW5kYnkgPSBmYWxzZTsKLQllbHNlIGlmIChJU19WQUxMRVlW SUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKQorCWVsc2UgaWYgKElTX1ZBTExFWVZJRVco ZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQkvKiBPbiBWTFYgYW5kIENI ViBvbmx5IHN0YW5kYnkgbW9kZSBpcyBzdXBwb3J0ZWQuICovCiAJCWRldl9wcml2LT5wc3IubGlu a19zdGFuZGJ5ID0gdHJ1ZTsKIAllbHNlCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ydW50aW1lX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1l X3BtLmMKaW5kZXggZTRiYjg1YzljNmUxLi4zYTZlMWE5M2FlZDkgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKQEAgLTI1OTgsNyArMjU5OCw3IEBAIHZvaWQgaW50ZWxf cG93ZXJfZG9tYWluc19pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwg Ym9vbCByZXN1bWUpCiAJCXNrbF9kaXNwbGF5X2NvcmVfaW5pdChkZXZfcHJpdiwgcmVzdW1lKTsK IAl9IGVsc2UgaWYgKElTX0JST1hUT04oZGV2X3ByaXYpKSB7CiAJCWJ4dF9kaXNwbGF5X2NvcmVf aW5pdChkZXZfcHJpdiwgcmVzdW1lKTsKLQl9IGVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2KSkg eworCX0gZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJbXV0ZXhfbG9jaygm cG93ZXJfZG9tYWlucy0+bG9jayk7CiAJCWNodl9waHlfY29udHJvbF9pbml0KGRldl9wcml2KTsK IAkJbXV0ZXhfdW5sb2NrKCZwb3dlcl9kb21haW5zLT5sb2NrKTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfc3ByaXRlLmMKaW5kZXggZmVmZDMwMzRhZWFkLi5mNzYwZDVmY2JlNDggMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC00NTAsNyArNDUwLDcgQEAgdmx2X3VwZGF0ZV9wbGFu ZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUsCiAJaWYgKGtleS0+ZmxhZ3MgJiBJOTE1X1NFVF9D T0xPUktFWV9TT1VSQ0UpCiAJCXNwcmN0bCB8PSBTUF9TT1VSQ0VfS0VZOwogCi0JaWYgKElTX0NI RVJSWVZJRVcoZGV2KSAmJiBwaXBlID09IFBJUEVfQikKKwlpZiAoSVNfQ0hFUlJZVklFVyhkZXZf cHJpdikgJiYgcGlwZSA9PSBQSVBFX0IpCiAJCWNodl91cGRhdGVfY3NjKGludGVsX3BsYW5lLCBm Yi0+cGl4ZWxfZm9ybWF0KTsKIAogCUk5MTVfV1JJVEUoU1BTVFJJREUocGlwZSwgcGxhbmUpLCBm Yi0+cGl0Y2hlc1swXSk7CkBAIC05NDQsNiArOTQ0LDcgQEAgaW50ZWxfY2hlY2tfc3ByaXRlX3Bs YW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogaW50IGludGVsX3Nwcml0ZV9zZXRfY29sb3Jr ZXkoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJCSAgICAgIHN0cnVjdCBk cm1fZmlsZSAqZmlsZV9wcml2KQogeworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgZHJtX2ludGVsX3Nwcml0ZV9jb2xvcmtleSAqc2V0 ID0gZGF0YTsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKIAlzdHJ1Y3QgZHJtX3BsYW5lX3N0 YXRlICpwbGFuZV9zdGF0ZTsKQEAgLTk1NSw3ICs5NTYsNyBAQCBpbnQgaW50ZWxfc3ByaXRlX3Nl dF9jb2xvcmtleShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCWlmICgoc2V0 LT5mbGFncyAmIChJOTE1X1NFVF9DT0xPUktFWV9ERVNUSU5BVElPTiB8IEk5MTVfU0VUX0NPTE9S S0VZX1NPVVJDRSkpID09IChJOTE1X1NFVF9DT0xPUktFWV9ERVNUSU5BVElPTiB8IEk5MTVfU0VU X0NPTE9SS0VZX1NPVVJDRSkpCiAJCXJldHVybiAtRUlOVkFMOwogCi0JaWYgKChJU19WQUxMRVlW SUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSAmJgorCWlmICgoSVNfVkFMTEVZVklFVyhk ZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpICYmCiAJICAgIHNldC0+ZmxhZ3Mg JiBJOTE1X1NFVF9DT0xPUktFWV9ERVNUSU5BVElPTikKIAkJcmV0dXJuIC1FSU5WQUw7CiAKQEAg LTEwNDIsNiArMTA0Myw3IEBAIHN0YXRpYyB1aW50MzJfdCBza2xfcGxhbmVfZm9ybWF0c1tdID0g ewogaW50CiBpbnRlbF9wbGFuZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVudW0gcGlw ZSBwaXBlLCBpbnQgcGxhbmUpCiB7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSBOVUxM OwogCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUgPSBOVUxMOwogCXVuc2lnbmVkIGxv bmcgcG9zc2libGVfY3J0Y3M7CkBAIC0xMDg0LDcgKzEwODYsNyBAQCBpbnRlbF9wbGFuZV9pbml0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVudW0gcGlwZSBwaXBlLCBpbnQgcGxhbmUpCiAKIAlj YXNlIDc6CiAJY2FzZSA4OgotCQlpZiAoSVNfSVZZQlJJREdFKHRvX2k5MTUoZGV2KSkpIHsKKwkJ aWYgKElTX0lWWUJSSURHRShkZXZfcHJpdikpIHsKIAkJCWludGVsX3BsYW5lLT5jYW5fc2NhbGUg PSB0cnVlOwogCQkJaW50ZWxfcGxhbmUtPm1heF9kb3duc2NhbGUgPSAyOwogCQl9IGVsc2UgewpA QCAtMTA5Miw3ICsxMDk0LDcgQEAgaW50ZWxfcGxhbmVfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCBlbnVtIHBpcGUgcGlwZSwgaW50IHBsYW5lKQogCQkJaW50ZWxfcGxhbmUtPm1heF9kb3du c2NhbGUgPSAxOwogCQl9CiAKLQkJaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllW SUVXKGRldikpIHsKKwkJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJ RVcoZGV2X3ByaXYpKSB7CiAJCQlpbnRlbF9wbGFuZS0+dXBkYXRlX3BsYW5lID0gdmx2X3VwZGF0 ZV9wbGFuZTsKIAkJCWludGVsX3BsYW5lLT5kaXNhYmxlX3BsYW5lID0gdmx2X2Rpc2FibGVfcGxh bmU7CiAKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK