From: Tvrtko Ursulin Subject: [PATCH v3 16/19] drm/i915: Make IS_CHERRYVIEW only take dev_priv Date: Fri, 14 Oct 2016 10:13:44 +0100 Message-ID: <1476436424-31018-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1476352990-2504-16-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-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0A1856EBE3 for ; Fri, 14 Oct 2016 09:13:53 +0000 (UTC) Received: by mail-lf0-x243.google.com with SMTP id l131so14220443lfl.0 for ; Fri, 14 Oct 2016 02:13:52 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:9b6d:e300:916a:6cab:ac67:71c2]) by smtp.gmail.com with ESMTPSA id rv12sm30256753wjb.29.2016.10.14.02.13.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Oct 2016 02:13:50 -0700 (PDT) In-Reply-To: <1476352990-2504-16-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 NCBieXRlcyBvZiAucm9kYXRhIHN0cmluZ3MgYW5kIH4xMDAgb2YgLnRleHQuCgp2MjogQWRkIHBh cmFudGhlc2VzIGFyb3VuZCBkZXZfcHJpdi4gKFZpbGxlIFN5cmphbGEpCnYzOiBSZWJhc2UuCgpT aWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpS ZXZpZXdlZC1ieTogRGF2aWQgV2VpbmVoYWxsIDxkYXZpZC53ZWluZWhhbGxAbGludXguaW50ZWwu Y29tPgpBY2tlZC1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQWNr ZWQtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBsaW51eC5pbnRlbC5jb20+CkFja2VkLWJ5 OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQWNrZWQtYnk6IE1hYXJ0 ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICB8ICA4ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5jICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9hdWRpby5jICAgICAgfCAgNCArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY29sb3Iu YyAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICB8 IDY3ICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHAuYyAgICAgICAgIHwgNTUgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYyAgICAgICAgfCAgOCArKy0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMgICAgICAgfCAxMCArKy0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfaTJjLmMgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMgICAgICAgICB8ICA0ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w c3IuYyAgICAgICAgfCAgNCArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9w bS5jIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICAgICB8IDEw ICsrKy0tCiAxNCBmaWxlcyBjaGFuZ2VkLCA5MyBpbnNlcnRpb25zKCspLCA4NyBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCA2NGUzMWNkMjVkZWEuLjFiNGNmYWEwZTBl MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC00MjQsNyArNDI0LDcgQEAgaW50ZWxfc2V0 dXBfbWNoYmFyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJdTMyIHRlbXA7CiAJYm9vbCBlbmFi bGVkOwogCi0JaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVXKGRldikpCisJ aWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQog CQlyZXR1cm47CiAKIAlkZXZfcHJpdi0+bWNoYmFyX25lZWRfZGlzYWJsZSA9IGZhbHNlOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggZjllZjczMzRmNmRkLi4xNWU4MWNmMDFjZTIgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjY1Niw3ICsyNjU2LDcgQEAgc3RydWN0IGRybV9pOTE1 X2NtZF90YWJsZSB7CiAJCQkJIElOVEVMX0RFVklEKGRldl9wcml2KSA9PSAweDAxNTIgfHwgXAog CQkJCSBJTlRFTF9ERVZJRChkZXZfcHJpdikgPT0gMHgwMTVhKQogI2RlZmluZSBJU19WQUxMRVlW SUVXKGRldikJKElOVEVMX0lORk8oZGV2KS0+aXNfdmFsbGV5dmlldykKLSNkZWZpbmUgSVNfQ0hF UlJZVklFVyhkZXYpCShJTlRFTF9JTkZPKGRldiktPmlzX2NoZXJyeXZpZXcpCisjZGVmaW5lIElT X0NIRVJSWVZJRVcoZGV2X3ByaXYpCSgoZGV2X3ByaXYpLT5pbmZvLmlzX2NoZXJyeXZpZXcpCiAj ZGVmaW5lIElTX0hBU1dFTEwoZGV2X3ByaXYpCSgoZGV2X3ByaXYpLT5pbmZvLmlzX2hhc3dlbGwp CiAjZGVmaW5lIElTX0JST0FEV0VMTChkZXZfcHJpdikJKChkZXZfcHJpdiktPmluZm8uaXNfYnJv YWR3ZWxsKQogI2RlZmluZSBJU19TS1lMQUtFKGRldl9wcml2KQkoKGRldl9wcml2KS0+aW5mby5p c19za3lsYWtlKQpAQCAtMzg0NywxMSArMzg0NywxMSBAQCBfX3Jhd193cml0ZSg2NCwgcSkKICNk ZWZpbmUgSU5URUxfQlJPQURDQVNUX1JHQl9GVUxMIDEKICNkZWZpbmUgSU5URUxfQlJPQURDQVNU X1JHQl9MSU1JVEVEIDIKIAotc3RhdGljIGlubGluZSBpOTE1X3JlZ190IGk5MTVfdmdhY250cmxf cmVnKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitzdGF0aWMgaW5saW5lIGk5MTVfcmVnX3QgaTkx NV92Z2FjbnRybF9yZWcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCWlm IChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKQorCWlmIChJU19WQUxM RVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJcmV0dXJuIFZM Vl9WR0FDTlRSTDsKLQllbHNlIGlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA1KQorCWVsc2Ug aWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNSkKIAkJcmV0dXJuIENQVV9WR0FDTlRSTDsKIAll bHNlCiAJCXJldHVybiBWR0FDTlRSTDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5k ZXggMWVlZjBkZTAzMTU5Li5jM2MzZjI4YWE1YTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jCkBAIC0yMTM1LDcgKzIxMzUsNyBAQCBzdGF0aWMgdm9pZCBndHRfd3JpdGVfd29ya2Fy b3VuZHMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkvKiBXYUluY3JlYXNlRGVmYXVsdFRMQkVu dHJpZXM6Y2h2LGJkdyxza2wsYnh0ICovCiAJaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikpCiAJ CUk5MTVfV1JJVEUoR0VOOF9MM19MUkFfMV9HUEdQVSwgR0VOOF9MM19MUkFfMV9HUEdQVV9ERUZB VUxUX1ZBTFVFX0JEVyk7Ci0JZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKQorCWVsc2UgaWYg KElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQlJOTE1X1dSSVRFKEdFTjhfTDNfTFJBXzFfR1BH UFUsIEdFTjhfTDNfTFJBXzFfR1BHUFVfREVGQVVMVF9WQUxVRV9DSFYpOwogCWVsc2UgaWYgKElT X1NLWUxBS0UoZGV2X3ByaXYpKQogCQlJOTE1X1dSSVRFKEdFTjhfTDNfTFJBXzFfR1BHUFUsIEdF TjlfTDNfTFJBXzFfR1BHUFVfREVGQVVMVF9WQUxVRV9TS0wpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2F1ZGlvLmMKaW5kZXggZTIwZGE1OWIxMDIwLi43MDkzY2ZiYjYyYjEgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F1ZGlvLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfYXVkaW8uYwpAQCAtNDM1LDggKzQzNSw4IEBAIHN0YXRpYyB2b2lkIGlsa19hdWRp b19jb2RlY19lbmFibGUoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAkJYXVkX2Nv bmZpZyA9IElCWF9BVURfQ0ZHKHBpcGUpOwogCQlhdWRfY250bF9zdCA9IElCWF9BVURfQ05UTF9T VChwaXBlKTsKIAkJYXVkX2NudHJsX3N0MiA9IElCWF9BVURfQ05UTF9TVDI7Ci0JfSBlbHNlIGlm IChJU19WQUxMRVlWSUVXKGNvbm5lY3Rvci0+ZGV2KSB8fAotCQkgICBJU19DSEVSUllWSUVXKGNv bm5lY3Rvci0+ZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwK KwkJICAgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJaGRtaXdfaGRtaWVkaWQgPSBWTFZf SERNSVdfSERNSUVESUQocGlwZSk7CiAJCWF1ZF9jb25maWcgPSBWTFZfQVVEX0NGRyhwaXBlKTsK IAkJYXVkX2NudGxfc3QgPSBWTFZfQVVEX0NOVExfU1QocGlwZSk7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfY29sb3IuYwppbmRleCBkYTc2YTc5OTQxMWEuLjQ0NTEwODg1NTI3NSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY29sb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9jb2xvci5jCkBAIC01MzQsNyArNTM0LDcgQEAgdm9pZCBpbnRlbF9jb2xvcl9p bml0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogCWRybV9tb2RlX2NydGNfc2V0X2dhbW1hX3Np emUoY3J0YywgMjU2KTsKIAotCWlmIChJU19DSEVSUllWSUVXKGRldikpIHsKKwlpZiAoSVNfQ0hF UlJZVklFVyhkZXZfcHJpdikpIHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkubG9hZF9jc2NfbWF0cml4 ID0gY2hlcnJ5dmlld19sb2FkX2NzY19tYXRyaXg7CiAJCWRldl9wcml2LT5kaXNwbGF5LmxvYWRf bHV0cyA9IGNoZXJyeXZpZXdfbG9hZF9sdXRzOwogCX0gZWxzZSBpZiAoSVNfSEFTV0VMTChkZXZf cHJpdikpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA3NDliYzMyOTky MDYuLmFhYTFjNzA3ZjZmMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAt ODQ5LDcgKzg0OSw3IEBAIHN0YXRpYyBib29sIHZsdl9QTExfaXNfb3B0aW1hbChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBpbnQgdGFyZ2V0X2ZyZXEsCiAJICogRm9yIENIViBpZ25vcmUgdGhlIGVy cm9yIGFuZCBjb25zaWRlciBvbmx5IHRoZSBQIHZhbHVlLgogCSAqIFByZWZlciBhIGJpZ2dlciBQ IHZhbHVlIGJhc2VkIG9uIEhXIHJlcXVpcmVtZW50cy4KIAkgKi8KLQlpZiAoSVNfQ0hFUlJZVklF VyhkZXYpKSB7CisJaWYgKElTX0NIRVJSWVZJRVcodG9faTkxNShkZXYpKSkgewogCQkqZXJyb3Jf cHBtID0gMDsKIAogCQlyZXR1cm4gY2FsY3VsYXRlZF9jbG9jay0+cCA+IGJlc3RfY2xvY2stPnA7 CkBAIC0xMzMyLDcgKzEzMzIsNyBAQCBzdGF0aWMgdm9pZCBhc3NlcnRfc3ByaXRlc19kaXNhYmxl ZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgICAgICJwbGFuZSAlZCBh c3NlcnRpb24gZmFpbHVyZSwgc2hvdWxkIGJlIG9mZiBvbiBwaXBlICVjIGJ1dCBpcyBzdGlsbCBh Y3RpdmVcbiIsCiAJCQkgICAgIHNwcml0ZSwgcGlwZV9uYW1lKHBpcGUpKTsKIAkJfQotCX0gZWxz ZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkgeworCX0gZWxz ZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikp IHsKIAkJZm9yX2VhY2hfc3ByaXRlKGRldl9wcml2LCBwaXBlLCBzcHJpdGUpIHsKIAkJCXUzMiB2 YWwgPSBJOTE1X1JFQUQoU1BDTlRSKHBpcGUsIHNwcml0ZSkpOwogCQkJSTkxNV9TVEFURV9XQVJO KHZhbCAmIFNQX0VOQUJMRSwKQEAgLTMwMzMsNyArMzAzMyw3IEBAIHN0YXRpYyB2b2lkIGk5eHhf dXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSwKIAkJCSAgICgo Y3J0Y19zdGF0ZS0+cGlwZV9zcmNfaCAtIDEpIDw8IDE2KSB8CiAJCQkgICAoY3J0Y19zdGF0ZS0+ cGlwZV9zcmNfdyAtIDEpKTsKIAkJSTkxNV9XUklURShEU1BQT1MocGxhbmUpLCAwKTsKLQl9IGVs c2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2KSAmJiBwbGFuZSA9PSBQTEFORV9CKSB7CisJfSBlbHNl IGlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSAmJiBwbGFuZSA9PSBQTEFORV9CKSB7CiAJCUk5 MTVfV1JJVEUoUFJJTVNJWkUocGxhbmUpLAogCQkJICAgKChjcnRjX3N0YXRlLT5waXBlX3NyY19o IC0gMSkgPDwgMTYpIHwKIAkJCSAgIChjcnRjX3N0YXRlLT5waXBlX3NyY193IC0gMSkpOwpAQCAt NTg3Miw3ICs1ODcyLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX21heF9jZGNsayhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJZGV2X3ByaXYtPm1heF9jZGNsa19mcmVxID0gNTQwMDAw OwogCQllbHNlCiAJCQlkZXZfcHJpdi0+bWF4X2NkY2xrX2ZyZXEgPSA2NzUwMDA7Ci0JfSBlbHNl IGlmIChJU19DSEVSUllWSUVXKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2 X3ByaXYpKSB7CiAJCWRldl9wcml2LT5tYXhfY2RjbGtfZnJlcSA9IDMyMDAwMDsKIAl9IGVsc2Ug aWYgKElTX1ZBTExFWVZJRVcoZGV2KSkgewogCQlkZXZfcHJpdi0+bWF4X2NkY2xrX2ZyZXEgPSA0 MDAwMDA7CkBAIC02Njc0LDcgKzY2NzQsNyBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X21vZGVz ZXRfY29tbWl0X2NkY2xrKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUpCiAJICov CiAJaW50ZWxfZGlzcGxheV9wb3dlcl9nZXQoZGV2X3ByaXYsIFBPV0VSX0RPTUFJTl9QSVBFX0Ep OwogCi0JaWYgKElTX0NIRVJSWVZJRVcoZGV2KSkKKwlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJp dikpCiAJCWNoZXJyeXZpZXdfc2V0X2NkY2xrKGRldiwgcmVxX2NkY2xrKTsKIAllbHNlCiAJCXZh bGxleXZpZXdfc2V0X2NkY2xrKGRldiwgcmVxX2NkY2xrKTsKQEAgLTY3MDIsNyArNjcwMiw3IEBA IHN0YXRpYyB2b2lkIHZhbGxleXZpZXdfY3J0Y19lbmFibGUoc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKnBpcGVfY29uZmlnLAogCWludGVsX3NldF9waXBlX3RpbWluZ3MoaW50ZWxfY3J0Yyk7CiAJ aW50ZWxfc2V0X3BpcGVfc3JjX3NpemUoaW50ZWxfY3J0Yyk7CiAKLQlpZiAoSVNfQ0hFUlJZVklF VyhkZXYpICYmIHBpcGUgPT0gUElQRV9CKSB7CisJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYp ICYmIHBpcGUgPT0gUElQRV9CKSB7CiAJCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHRvX2k5MTUoZGV2KTsKIAogCQlJOTE1X1dSSVRFKENIVl9CTEVORChwaXBlKSwgQ0hWX0JM RU5EX0xFR0FDWSk7CkBAIC02NzE3LDcgKzY3MTcsNyBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3 X2NydGNfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKIAogCWlu dGVsX2VuY29kZXJzX3ByZV9wbGxfZW5hYmxlKGNydGMsIHBpcGVfY29uZmlnLCBvbGRfc3RhdGUp OwogCi0JaWYgKElTX0NIRVJSWVZJRVcoZGV2KSkgeworCWlmIChJU19DSEVSUllWSUVXKGRldl9w cml2KSkgewogCQljaHZfcHJlcGFyZV9wbGwoaW50ZWxfY3J0YywgaW50ZWxfY3J0Yy0+Y29uZmln KTsKIAkJY2h2X2VuYWJsZV9wbGwoaW50ZWxfY3J0YywgaW50ZWxfY3J0Yy0+Y29uZmlnKTsKIAl9 IGVsc2UgewpAQCAtNjgzNiw3ICs2ODM2LDcgQEAgc3RhdGljIHZvaWQgaTl4eF9jcnRjX2Rpc2Fi bGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAogCWludGVsX2VuY29k ZXJzX3Bvc3RfZGlzYWJsZShjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgb2xkX3N0YXRlKTsKIAogCWlm ICghaW50ZWxfY3J0Y19oYXNfdHlwZShpbnRlbF9jcnRjLT5jb25maWcsIElOVEVMX09VVFBVVF9E U0kpKSB7Ci0JCWlmIChJU19DSEVSUllWSUVXKGRldikpCisJCWlmIChJU19DSEVSUllWSUVXKGRl dl9wcml2KSkKIAkJCWNodl9kaXNhYmxlX3BsbChkZXZfcHJpdiwgcGlwZSk7CiAJCWVsc2UgaWYg KElTX1ZBTExFWVZJRVcoZGV2KSkKIAkJCXZsdl9kaXNhYmxlX3BsbChkZXZfcHJpdiwgcGlwZSk7 CkBAIC03ODAzLDggKzc4MDMsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9jcHVfdHJhbnNjb2Rlcl9z ZXRfbV9uKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkgKiBmb3IgZ2VuIDwgOCkgYW5kIGlm IERSUlMgaXMgc3VwcG9ydGVkICh0byBtYWtlIHN1cmUgdGhlCiAJCSAqIHJlZ2lzdGVycyBhcmUg bm90IHVubmVjZXNzYXJpbHkgYWNjZXNzZWQpLgogCQkgKi8KLQkJaWYgKG0yX24yICYmIChJU19D SEVSUllWSUVXKGRldikgfHwgSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA4KSAmJgotCQkJY3J0Yy0+ Y29uZmlnLT5oYXNfZHJycykgeworCQlpZiAobTJfbjIgJiYgKElTX0NIRVJSWVZJRVcoZGV2X3By aXYpIHx8CisJCSAgICBJTlRFTF9HRU4oZGV2X3ByaXYpIDwgOCkgJiYgY3J0Yy0+Y29uZmlnLT5o YXNfZHJycykgewogCQkJSTkxNV9XUklURShQSVBFX0RBVEFfTTIodHJhbnNjb2RlciksCiAJCQkJ CVRVX1NJWkUobTJfbjItPnR1KSB8IG0yX24yLT5nbWNoX20pOwogCQkJSTkxNV9XUklURShQSVBF X0RBVEFfTjIodHJhbnNjb2RlciksIG0yX24yLT5nbWNoX24pOwpAQCAtODEwNiw3ICs4MTA2LDcg QEAgaW50IHZsdl9mb3JjZV9wbGxfb24oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBwaXBl IHBpcGUsCiAJcGlwZV9jb25maWctPnBpeGVsX211bHRpcGxpZXIgPSAxOwogCXBpcGVfY29uZmln LT5kcGxsID0gKmRwbGw7CiAKLQlpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJaWYgKElTX0NI RVJSWVZJRVcodG9faTkxNShkZXYpKSkgewogCQljaHZfY29tcHV0ZV9kcGxsKGNydGMsIHBpcGVf Y29uZmlnKTsKIAkJY2h2X3ByZXBhcmVfcGxsKGNydGMsIHBpcGVfY29uZmlnKTsKIAkJY2h2X2Vu YWJsZV9wbGwoY3J0YywgcGlwZV9jb25maWcpOwpAQCAtODEzMSw3ICs4MTMxLDcgQEAgaW50IHZs dl9mb3JjZV9wbGxfb24oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBwaXBlIHBpcGUsCiAg Ki8KIHZvaWQgdmx2X2ZvcmNlX3BsbF9vZmYoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBw aXBlIHBpcGUpCiB7Ci0JaWYgKElTX0NIRVJSWVZJRVcoZGV2KSkKKwlpZiAoSVNfQ0hFUlJZVklF Vyh0b19pOTE1KGRldikpKQogCQljaHZfZGlzYWJsZV9wbGwodG9faTkxNShkZXYpLCBwaXBlKTsK IAllbHNlCiAJCXZsdl9kaXNhYmxlX3BsbCh0b19pOTE1KGRldiksIHBpcGUpOwpAQCAtODQ1NSw3 ICs4NDU1LDcgQEAgc3RhdGljIHZvaWQgaTl4eF9zZXRfcGlwZWNvbmYoc3RydWN0IGludGVsX2Ny dGMgKmludGVsX2NydGMpCiAJfSBlbHNlCiAJCXBpcGVjb25mIHw9IFBJUEVDT05GX1BST0dSRVNT SVZFOwogCi0JaWYgKChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSAm JgorCWlmICgoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJp dikpICYmCiAJICAgICBpbnRlbF9jcnRjLT5jb25maWctPmxpbWl0ZWRfY29sb3JfcmFuZ2UpCiAJ CXBpcGVjb25mIHw9IFBJUEVDT05GX0NPTE9SX1JBTkdFX1NFTEVDVDsKIApAQCAtODg0OSw3ICs4 ODQ5LDcgQEAgc3RhdGljIGJvb2wgaTl4eF9nZXRfcGlwZV9jb25maWcoc3RydWN0IGludGVsX2Ny dGMgKmNydGMsCiAJCX0KIAl9CiAKLQlpZiAoKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVS UllWSUVXKGRldikpICYmCisJaWYgKChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVS UllWSUVXKGRldl9wcml2KSkgJiYKIAkgICAgKHRtcCAmIFBJUEVDT05GX0NPTE9SX1JBTkdFX1NF TEVDVCkpCiAJCXBpcGVfY29uZmlnLT5saW1pdGVkX2NvbG9yX3JhbmdlID0gdHJ1ZTsKIApAQCAt ODg2Myw3ICs4ODYzLDcgQEAgc3RhdGljIGJvb2wgaTl4eF9nZXRfcGlwZV9jb25maWcoc3RydWN0 IGludGVsX2NydGMgKmNydGMsCiAKIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNCkgewog CQkvKiBObyB3YXkgdG8gcmVhZCBpdCBvdXQgb24gcGlwZXMgQiBhbmQgQyAqLwotCQlpZiAoSVNf Q0hFUlJZVklFVyhkZXYpICYmIGNydGMtPnBpcGUgIT0gUElQRV9BKQorCQlpZiAoSVNfQ0hFUlJZ VklFVyhkZXZfcHJpdikgJiYgY3J0Yy0+cGlwZSAhPSBQSVBFX0EpCiAJCQl0bXAgPSBkZXZfcHJp di0+Y2h2X2RwbGxfbWRbY3J0Yy0+cGlwZV07CiAJCWVsc2UKIAkJCXRtcCA9IEk5MTVfUkVBRChE UExMX01EKGNydGMtPnBpcGUpKTsKQEAgLTg4ODQsNyArODg4NCw3IEBAIHN0YXRpYyBib29sIGk5 eHhfZ2V0X3BpcGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQlwaXBlX2NvbmZp Zy0+cGl4ZWxfbXVsdGlwbGllciA9IDE7CiAJfQogCXBpcGVfY29uZmlnLT5kcGxsX2h3X3N0YXRl LmRwbGwgPSBJOTE1X1JFQUQoRFBMTChjcnRjLT5waXBlKSk7Ci0JaWYgKCFJU19WQUxMRVlWSUVX KGRldikgJiYgIUlTX0NIRVJSWVZJRVcoZGV2KSkgeworCWlmICghSVNfVkFMTEVZVklFVyhkZXZf cHJpdikgJiYgIUlTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCS8qCiAJCSAqIERQTExfRFZP XzJYX01PREUgbXVzdCBiZSBlbmFibGVkIGZvciBib3RoIERQTExzCiAJCSAqIG9uIDgzMC4gRmls dGVyIGl0IG91dCBoZXJlIHNvIHRoYXQgd2UgZG9uJ3QKQEAgLTg5MDIsNyArODkwMiw3IEBAIHN0 YXRpYyBib29sIGk5eHhfZ2V0X3BpcGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAog CQkJCQkJICAgICBEUExMX1BPUlRCX1JFQURZX01BU0spOwogCX0KIAotCWlmIChJU19DSEVSUllW SUVXKGRldikpCisJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQljaHZfY3J0Y19jbG9j a19nZXQoY3J0YywgcGlwZV9jb25maWcpOwogCWVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkK IAkJdmx2X2NydGNfY2xvY2tfZ2V0KGNydGMsIHBpcGVfY29uZmlnKTsKQEAgLTEyMjQ4LDcgKzEy MjQ4LDcgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMg KmNydGMsCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNSB8fCBJU19HNFgoZGV2X3ByaXYp KQogCQl3b3JrLT5mbGlwX2NvdW50ID0gSTkxNV9SRUFEKFBJUEVfRkxJUENPVU5UX0c0WChwaXBl KSkgKyAxOwogCi0JaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVXKGRldikp IHsKKwlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJp dikpIHsKIAkJZW5naW5lID0gZGV2X3ByaXYtPmVuZ2luZVtCQ1NdOwogCQlpZiAoZmItPm1vZGlm aWVyWzBdICE9IG9sZF9mYi0+bW9kaWZpZXJbMF0pCiAJCQkvKiB2bHY6IERJU1BMQVlfRkxJUCBm YWlscyB0byBjaGFuZ2UgdGlsaW5nICovCkBAIC0xMzM0Niw3ICsxMzM0Niw3IEBAIGludGVsX3Bp cGVfY29uZmlnX2NvbXBhcmUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlQSVBFX0NPTkZfQ0hF Q0tfSShwaXhlbF9tdWx0aXBsaWVyKTsKIAlQSVBFX0NPTkZfQ0hFQ0tfSShoYXNfaGRtaV9zaW5r KTsKIAlpZiAoKElOVEVMX0dFTihkZXZfcHJpdikgPCA4ICYmICFJU19IQVNXRUxMKGRldl9wcml2 KSkgfHwKLQkgICAgSVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkKKwkg ICAgSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJ CVBJUEVfQ09ORl9DSEVDS19JKGxpbWl0ZWRfY29sb3JfcmFuZ2UpOwogCVBJUEVfQ09ORl9DSEVD S19JKGhhc19pbmZvZnJhbWUpOwogCkBAIC0xNTA2Niw3ICsxNTA2Niw3IEBAIGludGVsX2NoZWNr X2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkgKiBkaXNwbGF5IHBvd2Vy IHdlbGwgbXVzdCBiZSB0dXJuZWQgb2ZmIGFuZCBvbiBhZ2Fpbi4KIAkgKiBSZWZ1c2UgdGhlIHB1 dCB0aGUgY3Vyc29yIGludG8gdGhhdCBjb21wcm9taXNlZCBwb3NpdGlvbi4KIAkgKi8KLQlpZiAo SVNfQ0hFUlJZVklFVyhwbGFuZS0+ZGV2KSAmJiBwaXBlID09IFBJUEVfQyAmJgorCWlmIChJU19D SEVSUllWSUVXKHRvX2k5MTUocGxhbmUtPmRldikpICYmIHBpcGUgPT0gUElQRV9DICYmCiAJICAg IHN0YXRlLT5iYXNlLnZpc2libGUgJiYgc3RhdGUtPmJhc2UuY3J0Y194IDwgMCkgewogCQlEUk1f REVCVUdfS01TKCJDSFYgY3Vyc29yIEMgbm90IGFsbG93ZWQgdG8gc3RyYWRkbGUgdGhlIGxlZnQg c2NyZWVuIGVkZ2VcbiIpOwogCQlyZXR1cm4gLUVJTlZBTDsKQEAgLTE1MzM2LDcgKzE1MzM2LDcg QEAgc3RhdGljIGJvb2wgaW50ZWxfY3J0X3ByZXNlbnQoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAlpZiAoSVNfSFNXX1VMVChkZXZfcHJpdikgfHwgSVNfQkRXX1VMVChkZXZfcHJpdikpCiAJCXJl dHVybiBmYWxzZTsKIAotCWlmIChJU19DSEVSUllWSUVXKGRldikpCisJaWYgKElTX0NIRVJSWVZJ RVcoZGV2X3ByaXYpKQogCQlyZXR1cm4gZmFsc2U7CiAKIAlpZiAoSEFTX1BDSF9MUFRfSChkZXZf cHJpdikgJiYKQEAgLTE1NDc3LDcgKzE1NDc3LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2V0dXBf b3V0cHV0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJCWlmIChJOTE1X1JFQUQoUENIX0RQ X0QpICYgRFBfREVURUNURUQpCiAJCQlpbnRlbF9kcF9pbml0KGRldiwgUENIX0RQX0QsIFBPUlRf RCk7Ci0JfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYp KSB7CisJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVX KGRldl9wcml2KSkgewogCQlib29sIGhhc19lZHAsIGhhc19wb3J0OwogCiAJCS8qCkBAIC0xNTUw OSw3ICsxNTUwOSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3NldHVwX291dHB1dHMoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAkJaWYgKChJOTE1X1JFQUQoVkxWX0hETUlDKSAmIFNEVk9fREVURUNU RUQgfHwgaGFzX3BvcnQpICYmICFoYXNfZWRwKQogCQkJaW50ZWxfaGRtaV9pbml0KGRldiwgVkxW X0hETUlDLCBQT1JUX0MpOwogCi0JCWlmIChJU19DSEVSUllWSUVXKGRldikpIHsKKwkJaWYgKElT X0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCQkvKgogCQkJICogZURQIG5vdCBzdXBwb3J0ZWQg b24gcG9ydCBELAogCQkJICogc28gbm8gbmVlZCB0byB3b3JyeSBhYm91dCBpdApAQCAtMTU2Mjcs MTAgKzE1NjI3LDEwIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyX2Z1bmNz IGludGVsX2ZiX2Z1bmNzID0gewogfTsKIAogc3RhdGljCi11MzIgaW50ZWxfZmJfcGl0Y2hfbGlt aXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdWludDY0X3QgZmJfbW9kaWZpZXIsCi0JCQkgdWlu dDMyX3QgcGl4ZWxfZm9ybWF0KQordTMyIGludGVsX2ZiX3BpdGNoX2xpbWl0KHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCSB1aW50NjRfdCBmYl9tb2RpZmllciwgdWludDMy X3QgcGl4ZWxfZm9ybWF0KQogewotCXUzMiBnZW4gPSBJTlRFTF9JTkZPKGRldiktPmdlbjsKKwl1 MzIgZ2VuID0gSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbjsKIAogCWlmIChnZW4gPj0gOSkgewog CQlpbnQgY3BwID0gZHJtX2Zvcm1hdF9wbGFuZV9jcHAocGl4ZWxfZm9ybWF0LCAwKTsKQEAgLTE1 NjM5LDcgKzE1NjM5LDggQEAgdTMyIGludGVsX2ZiX3BpdGNoX2xpbWl0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHVpbnQ2NF90IGZiX21vZGlmaWVyLAogCQkgKiAgcGl4ZWxzIGFuZCAzMksgYnl0 ZXMuIgogCQkgKi8KIAkJcmV0dXJuIG1pbig4MTkyICogY3BwLCAzMjc2OCk7Ci0JfSBlbHNlIGlm IChnZW4gPj0gNSAmJiAhSVNfVkFMTEVZVklFVyhkZXYpICYmICFJU19DSEVSUllWSUVXKGRldikp IHsKKwl9IGVsc2UgaWYgKGdlbiA+PSA1ICYmICFJU19WQUxMRVlWSUVXKGRldl9wcml2KSAmJgor CQkgICAhSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJcmV0dXJuIDMyKjEwMjQ7CiAJfSBl bHNlIGlmIChnZW4gPj0gNCkgewogCQlpZiAoZmJfbW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9E X1hfVElMRUQpCkBAIC0xNTcyNiw3ICsxNTcyNyw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfZnJhbWVi dWZmZXJfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlyZXR1cm4gLUVJTlZBTDsKIAl9 CiAKLQlwaXRjaF9saW1pdCA9IGludGVsX2ZiX3BpdGNoX2xpbWl0KGRldiwgbW9kZV9jbWQtPm1v ZGlmaWVyWzBdLAorCXBpdGNoX2xpbWl0ID0gaW50ZWxfZmJfcGl0Y2hfbGltaXQoZGV2X3ByaXYs IG1vZGVfY21kLT5tb2RpZmllclswXSwKIAkJCQkJICAgbW9kZV9jbWQtPnBpeGVsX2Zvcm1hdCk7 CiAJaWYgKG1vZGVfY21kLT5waXRjaGVzWzBdID4gcGl0Y2hfbGltaXQpIHsKIAkJRFJNX0RFQlVH KCIlcyBwaXRjaCAoJXUpIG11c3QgYmUgYXQgbGVzcyB0aGFuICVkXG4iLApAQCAtMTU3NjQsNyAr MTU3NjUsNyBAQCBzdGF0aWMgaW50IGludGVsX2ZyYW1lYnVmZmVyX2luaXQoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAkJfQogCQlicmVhazsKIAljYXNlIERSTV9GT1JNQVRfQUJHUjg4ODg6Ci0J CWlmICghSVNfVkFMTEVZVklFVyhkZXYpICYmICFJU19DSEVSUllWSUVXKGRldikgJiYKKwkJaWYg KCFJU19WQUxMRVlWSUVXKGRldl9wcml2KSAmJiAhSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikgJiYK IAkJICAgIElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgOSkgewogCQkJZm9ybWF0X25hbWUgPSBkcm1f Z2V0X2Zvcm1hdF9uYW1lKG1vZGVfY21kLT5waXhlbF9mb3JtYXQpOwogCQkJRFJNX0RFQlVHKCJ1 bnN1cHBvcnRlZCBwaXhlbCBmb3JtYXQ6ICVzXG4iLCBmb3JtYXRfbmFtZSk7CkBAIC0xNTc4Myw3 ICsxNTc4NCw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfZnJhbWVidWZmZXJfaW5pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCQl9CiAJCWJyZWFrOwogCWNhc2UgRFJNX0ZPUk1BVF9BQkdSMjEwMTAx MDoKLQkJaWYgKCFJU19WQUxMRVlWSUVXKGRldikgJiYgIUlTX0NIRVJSWVZJRVcoZGV2KSkgewor CQlpZiAoIUlTX1ZBTExFWVZJRVcoZGV2X3ByaXYpICYmICFJU19DSEVSUllWSUVXKGRldl9wcml2 KSkgewogCQkJZm9ybWF0X25hbWUgPSBkcm1fZ2V0X2Zvcm1hdF9uYW1lKG1vZGVfY21kLT5waXhl bF9mb3JtYXQpOwogCQkJRFJNX0RFQlVHKCJ1bnN1cHBvcnRlZCBwaXhlbCBmb3JtYXQ6ICVzXG4i LCBmb3JtYXRfbmFtZSk7CiAJCQlrZnJlZShmb3JtYXRfbmFtZSk7CkBAIC0xNjIzMCw3ICsxNjIz MSw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfZGlzYWJsZV92Z2Eoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJ c3RydWN0IHBjaV9kZXYgKnBkZXYgPSBkZXZfcHJpdi0+ZHJtLnBkZXY7CiAJdTggc3IxOwotCWk5 MTVfcmVnX3QgdmdhX3JlZyA9IGk5MTVfdmdhY250cmxfcmVnKGRldik7CisJaTkxNV9yZWdfdCB2 Z2FfcmVnID0gaTkxNV92Z2FjbnRybF9yZWcoZGV2X3ByaXYpOwogCiAJLyogV2FFbmFibGVWR0FB Y2Nlc3NUaHJvdWdoSU9Qb3J0OmN0ZyxlbGssaWxrLHNuYixpdmIsdmx2LGhzdyAqLwogCXZnYV9n ZXRfdW5pbnRlcnJ1cHRpYmxlKHBkZXYsIFZHQV9SU1JDX0xFR0FDWV9JTyk7CkBAIC0xNjY3NSw3 ICsxNjY3Niw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3Nhbml0aXplX2VuY29kZXIoc3RydWN0IGlu dGVsX2VuY29kZXIgKmVuY29kZXIpCiB2b2lkIGk5MTVfcmVkaXNhYmxlX3ZnYV9wb3dlcl9vbihz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlpOTE1X3JlZ190IHZnYV9yZWcgPSBpOTE1X3ZnYWNudHJs X3JlZyhkZXYpOworCWk5MTVfcmVnX3QgdmdhX3JlZyA9IGk5MTVfdmdhY250cmxfcmVnKGRldl9w cml2KTsKIAogCWlmICghKEk5MTVfUkVBRCh2Z2FfcmVnKSAmIFZHQV9ESVNQX0RJU0FCTEUpKSB7 CiAJCURSTV9ERUJVR19LTVMoIlNvbWV0aGluZyBlbmFibGVkIFZHQSBwbGFuZSwgZGlzYWJsaW5n IGl0XG4iKTsKQEAgLTE2OTEzLDcgKzE2OTE0LDcgQEAgaW50ZWxfbW9kZXNldF9zZXR1cF9od19z dGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlwbGwtPm9uID0gZmFsc2U7CiAJfQogCi0J aWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVXKGRldikpCisJaWYgKElTX1ZB TExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQl2bHZfd21f Z2V0X2h3X3N0YXRlKGRldik7CiAJZWxzZSBpZiAoSVNfR0VOOShkZXYpKQogCQlza2xfd21fZ2V0 X2h3X3N0YXRlKGRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwppbmRleCA2M2JmNTAwZWRiYmQu LjAzMzc5YmFmZmU0OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCkBAIC0zNDQsNyArMzQ0LDcg QEAgdmx2X3Bvd2VyX3NlcXVlbmNlcl9raWNrKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJ RFAgfD0gRFBfUE9SVF9XSURUSCgxKTsKIAlEUCB8PSBEUF9MSU5LX1RSQUlOX1BBVF8xOwogCi0J aWYgKElTX0NIRVJSWVZJRVcoZGV2KSkKKwlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJ CURQIHw9IERQX1BJUEVfU0VMRUNUX0NIVihwaXBlKTsKIAllbHNlIGlmIChwaXBlID09IFBJUEVf QikKIAkJRFAgfD0gRFBfUElQRUJfU0VMRUNUOwpAQCAtMzU2LDEwICszNTYsMTAgQEAgdmx2X3Bv d2VyX3NlcXVlbmNlcl9raWNrKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJICogU28gZW5h YmxlIHRlbXBvcmFyaWx5IGl0IGlmIGl0J3Mgbm90IGFscmVhZHkgZW5hYmxlZC4KIAkgKi8KIAlp ZiAoIXBsbF9lbmFibGVkKSB7Ci0JCXJlbGVhc2VfY2xfb3ZlcnJpZGUgPSBJU19DSEVSUllWSUVX KGRldikgJiYKKwkJcmVsZWFzZV9jbF9vdmVycmlkZSA9IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYp ICYmCiAJCQkhY2h2X3BoeV9wb3dlcmdhdGVfY2goZGV2X3ByaXYsIHBoeSwgY2gsIHRydWUpOwog Ci0JCWlmICh2bHZfZm9yY2VfcGxsX29uKGRldiwgcGlwZSwgSVNfQ0hFUlJZVklFVyhkZXYpID8K KwkJaWYgKHZsdl9mb3JjZV9wbGxfb24oZGV2LCBwaXBlLCBJU19DSEVSUllWSUVXKGRldl9wcml2 KSA/CiAJCQkJICAgICAmY2h2X2RwbGxbMF0uZHBsbCA6ICZ2bHZfZHBsbFswXS5kcGxsKSkgewog CQkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gZm9yY2Ugb24gcGxsIGZvciBwaXBlICVjIVxuIiwKIAkJ CQkgIHBpcGVfbmFtZShwaXBlKSk7CkBAIC01NzAsNyArNTcwLDcgQEAgdm9pZCBpbnRlbF9wb3dl cl9zZXF1ZW5jZXJfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCXN0 cnVjdCBkcm1fZGV2aWNlICpkZXYgPSAmZGV2X3ByaXYtPmRybTsKIAlzdHJ1Y3QgaW50ZWxfZW5j b2RlciAqZW5jb2RlcjsKIAotCWlmIChXQVJOX09OKCFJU19WQUxMRVlWSUVXKGRldikgJiYgIUlT X0NIRVJSWVZJRVcoZGV2KSAmJgorCWlmIChXQVJOX09OKCFJU19WQUxMRVlWSUVXKGRldl9wcml2 KSAmJiAhSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikgJiYKIAkJICAgICFJU19CUk9YVE9OKGRldl9w cml2KSkpCiAJCXJldHVybjsKIApAQCAtNjY0LDcgKzY2NCw3IEBAIHN0YXRpYyBpbnQgZWRwX25v dGlmeV9oYW5kbGVyKHN0cnVjdCBub3RpZmllcl9ibG9jayAqdGhpcywgdW5zaWduZWQgbG9uZyBj b2RlLAogCiAJcHBzX2xvY2soaW50ZWxfZHApOwogCi0JaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8 fCBJU19DSEVSUllWSUVXKGRldikpIHsKKwlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwg SVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJZW51bSBwaXBlIHBpcGUgPSB2bHZfcG93ZXJf c2VxdWVuY2VyX3BpcGUoaW50ZWxfZHApOwogCQlpOTE1X3JlZ190IHBwX2N0cmxfcmVnLCBwcF9k aXZfcmVnOwogCQl1MzIgcHBfZGl2OwpAQCAtNjkyLDcgKzY5Miw3IEBAIHN0YXRpYyBib29sIGVk cF9oYXZlX3BhbmVsX3Bvd2VyKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAKIAlsb2NrZGVw X2Fzc2VydF9oZWxkKCZkZXZfcHJpdi0+cHBzX211dGV4KTsKIAotCWlmICgoSVNfVkFMTEVZVklF VyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkgJiYKKwlpZiAoKElTX1ZBTExFWVZJRVcoZGV2 X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSAmJgogCSAgICBpbnRlbF9kcC0+cHBz X3BpcGUgPT0gSU5WQUxJRF9QSVBFKQogCQlyZXR1cm4gZmFsc2U7CiAKQEAgLTcwNiw3ICs3MDYs NyBAQCBzdGF0aWMgYm9vbCBlZHBfaGF2ZV9wYW5lbF92ZGQoc3RydWN0IGludGVsX2RwICppbnRl bF9kcCkKIAogCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmRldl9wcml2LT5wcHNfbXV0ZXgpOwogCi0J aWYgKChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSAmJgorCWlmICgo SVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpICYmCiAJ ICAgIGludGVsX2RwLT5wcHNfcGlwZSA9PSBJTlZBTElEX1BJUEUpCiAJCXJldHVybiBmYWxzZTsK IApAQCAtMTM0Nyw3ICsxMzQ3LDcgQEAgaW50ZWxfZHBfc2V0X2Nsb2NrKHN0cnVjdCBpbnRlbF9l bmNvZGVyICplbmNvZGVyLAogCX0gZWxzZSBpZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikpIHsK IAkJZGl2aXNvciA9IHBjaF9kcGxsOwogCQljb3VudCA9IEFSUkFZX1NJWkUocGNoX2RwbGwpOwot CX0gZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJfSBlbHNlIGlmIChJU19DSEVSUllW SUVXKGRldl9wcml2KSkgewogCQlkaXZpc29yID0gY2h2X2RwbGw7CiAJCWNvdW50ID0gQVJSQVlf U0laRShjaHZfZHBsbCk7CiAJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldikpIHsKQEAgLTE3 OTEsNyArMTc5MSw4IEBAIHN0YXRpYyB2b2lkIGludGVsX2RwX3ByZXBhcmUoc3RydWN0IGludGVs X2VuY29kZXIgKmVuY29kZXIsCiAJCUk5MTVfV1JJVEUoVFJBTlNfRFBfQ1RMKGNydGMtPnBpcGUp LCB0cmFuc19kcCk7CiAJfSBlbHNlIHsKIAkJaWYgKCFIQVNfUENIX1NQTElUKGRldl9wcml2KSAm JiAhSVNfVkFMTEVZVklFVyhkZXYpICYmCi0JCSAgICAhSVNfQ0hFUlJZVklFVyhkZXYpICYmIHBp cGVfY29uZmlnLT5saW1pdGVkX2NvbG9yX3JhbmdlKQorCQkgICAgIUlTX0NIRVJSWVZJRVcoZGV2 X3ByaXYpICYmCisJCSAgICBwaXBlX2NvbmZpZy0+bGltaXRlZF9jb2xvcl9yYW5nZSkKIAkJCWlu dGVsX2RwLT5EUCB8PSBEUF9DT0xPUl9SQU5HRV8xNl8yMzU7CiAKIAkJaWYgKGFkanVzdGVkX21v ZGUtPmZsYWdzICYgRFJNX01PREVfRkxBR19QSFNZTkMpCkBAIC0xODAzLDcgKzE4MDQsNyBAQCBz dGF0aWMgdm9pZCBpbnRlbF9kcF9wcmVwYXJlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVy LAogCQlpZiAoZHJtX2RwX2VuaGFuY2VkX2ZyYW1lX2NhcChpbnRlbF9kcC0+ZHBjZCkpCiAJCQlp bnRlbF9kcC0+RFAgfD0gRFBfRU5IQU5DRURfRlJBTUlORzsKIAotCQlpZiAoSVNfQ0hFUlJZVklF VyhkZXYpKQorCQlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCQlpbnRlbF9kcC0+RFAg fD0gRFBfUElQRV9TRUxFQ1RfQ0hWKGNydGMtPnBpcGUpOwogCQllbHNlIGlmIChjcnRjLT5waXBl ID09IFBJUEVfQikKIAkJCWludGVsX2RwLT5EUCB8PSBEUF9QSVBFQl9TRUxFQ1Q7CkBAIC0yNDU5 LDcgKzI0NjAsNyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9kcF9nZXRfaHdfc3RhdGUoc3RydWN0IGlu dGVsX2VuY29kZXIgKmVuY29kZXIsCiAKIAkJRFJNX0RFQlVHX0tNUygiTm8gcGlwZSBmb3IgZHAg cG9ydCAweCV4IGZvdW5kXG4iLAogCQkJICAgICAgaTkxNV9tbWlvX3JlZ19vZmZzZXQoaW50ZWxf ZHAtPm91dHB1dF9yZWcpKTsKLQl9IGVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2KSkgeworCX0g ZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJKnBpcGUgPSBEUF9QT1JUX1RP X1BJUEVfQ0hWKHRtcCk7CiAJfSBlbHNlIHsKIAkJKnBpcGUgPSBQT1JUX1RPX1BJUEUodG1wKTsK QEAgLTI2ODEsNyArMjY4Miw3IEBAIF9pbnRlbF9kcF9zZXRfbGlua190cmFpbihzdHJ1Y3QgaW50 ZWxfZHAgKmludGVsX2RwLAogCQl9CiAKIAl9IGVsc2UgewotCQlpZiAoSVNfQ0hFUlJZVklFVyhk ZXYpKQorCQlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCQkqRFAgJj0gfkRQX0xJTktf VFJBSU5fTUFTS19DSFY7CiAJCWVsc2UKIAkJCSpEUCAmPSB+RFBfTElOS19UUkFJTl9NQVNLOwpA QCAtMjY5Nyw3ICsyNjk4LDcgQEAgX2ludGVsX2RwX3NldF9saW5rX3RyYWluKHN0cnVjdCBpbnRl bF9kcCAqaW50ZWxfZHAsCiAJCQkqRFAgfD0gRFBfTElOS19UUkFJTl9QQVRfMjsKIAkJCWJyZWFr OwogCQljYXNlIERQX1RSQUlOSU5HX1BBVFRFUk5fMzoKLQkJCWlmIChJU19DSEVSUllWSUVXKGRl dikpIHsKKwkJCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQkJCSpEUCB8PSBEUF9M SU5LX1RSQUlOX1BBVF8zX0NIVjsKIAkJCX0gZWxzZSB7CiAJCQkJRFJNX0RFQlVHX0tNUygiVFBT MyBub3Qgc3VwcG9ydGVkLCB1c2luZyBUUFMyIGluc3RlYWRcbiIpOwpAQCAtMjc0Nyw3ICsyNzQ4 LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZW5hYmxlX2RwKHN0cnVjdCBpbnRlbF9lbmNvZGVyICpl bmNvZGVyLAogCiAJcHBzX2xvY2soaW50ZWxfZHApOwogCi0JaWYgKElTX1ZBTExFWVZJRVcoZGV2 KSB8fCBJU19DSEVSUllWSUVXKGRldikpCisJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8 IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQl2bHZfaW5pdF9wYW5lbF9wb3dlcl9zZXF1ZW5j ZXIoaW50ZWxfZHApOwogCiAJaW50ZWxfZHBfZW5hYmxlX3BvcnQoaW50ZWxfZHAsIHBpcGVfY29u ZmlnKTsKQEAgLTI3NTgsMTAgKzI3NTksMTAgQEAgc3RhdGljIHZvaWQgaW50ZWxfZW5hYmxlX2Rw KHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCiAJcHBzX3VubG9jayhpbnRlbF9kcCk7 CiAKLQlpZiAoSVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkgeworCWlm IChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewog CQl1bnNpZ25lZCBpbnQgbGFuZV9tYXNrID0gMHgwOwogCi0JCWlmIChJU19DSEVSUllWSUVXKGRl dikpCisJCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJCWxhbmVfbWFzayA9IGludGVs X2RwX3VudXNlZF9sYW5lX21hc2socGlwZV9jb25maWctPmxhbmVfY291bnQpOwogCiAJCXZsdl93 YWl0X3BvcnRfcmVhZHkoZGV2X3ByaXYsIGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKSwKQEAgLTI5 ODcsNyArMjk4OCw3IEBAIGludGVsX2RwX3ZvbHRhZ2VfbWF4KHN0cnVjdCBpbnRlbF9kcCAqaW50 ZWxfZHApCiAJCWlmIChkZXZfcHJpdi0+dmJ0LmVkcC5sb3dfdnN3aW5nICYmIHBvcnQgPT0gUE9S VF9BKQogCQkJcmV0dXJuIERQX1RSQUlOX1ZPTFRBR0VfU1dJTkdfTEVWRUxfMzsKIAkJcmV0dXJu IERQX1RSQUlOX1ZPTFRBR0VfU1dJTkdfTEVWRUxfMjsKLQl9IGVsc2UgaWYgKElTX1ZBTExFWVZJ RVcoZGV2KSB8fCBJU19DSEVSUllWSUVXKGRldikpCisJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVX KGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJcmV0dXJuIERQX1RSQUlO X1ZPTFRBR0VfU1dJTkdfTEVWRUxfMzsKIAllbHNlIGlmIChJU19HRU43KGRldikgJiYgcG9ydCA9 PSBQT1JUX0EpCiAJCXJldHVybiBEUF9UUkFJTl9WT0xUQUdFX1NXSU5HX0xFVkVMXzI7CkBAIC0z MzQ4LDcgKzMzNDksNyBAQCBpbnRlbF9kcF9zZXRfc2lnbmFsX2xldmVscyhzdHJ1Y3QgaW50ZWxf ZHAgKmludGVsX2RwKQogCQkJc2lnbmFsX2xldmVscyA9IDA7CiAJCWVsc2UKIAkJCW1hc2sgPSBE RElfQlVGX0VNUF9NQVNLOwotCX0gZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJfSBl bHNlIGlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQlzaWduYWxfbGV2ZWxzID0gY2h2 X3NpZ25hbF9sZXZlbHMoaW50ZWxfZHApOwogCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYp KSB7CiAJCXNpZ25hbF9sZXZlbHMgPSB2bHZfc2lnbmFsX2xldmVscyhpbnRlbF9kcCk7CkBAIC0z NDQ4LDcgKzM0NDksNyBAQCBpbnRlbF9kcF9saW5rX2Rvd24oc3RydWN0IGludGVsX2RwICppbnRl bF9kcCkKIAkJRFAgJj0gfkRQX0xJTktfVFJBSU5fTUFTS19DUFQ7CiAJCURQIHw9IERQX0xJTktf VFJBSU5fUEFUX0lETEVfQ1BUOwogCX0gZWxzZSB7Ci0JCWlmIChJU19DSEVSUllWSUVXKGRldikp CisJCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJCURQICY9IH5EUF9MSU5LX1RSQUlO X01BU0tfQ0hWOwogCQllbHNlCiAJCQlEUCAmPSB+RFBfTElOS19UUkFJTl9NQVNLOwpAQCAtNTA4 NSw3ICs1MDg2LDcgQEAgaW50ZWxfZHBfaW5pdF9wYW5lbF9wb3dlcl9zZXF1ZW5jZXJfcmVnaXN0 ZXJzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAkvKiBIYXN3ZWxsIGRvZXNuJ3QgaGF2ZSBh bnkgcG9ydCBzZWxlY3Rpb24gYml0cyBmb3IgdGhlIHBhbmVsCiAJICogcG93ZXIgc2VxdWVuY2Vy IGFueSBtb3JlLiAqLwotCWlmIChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhk ZXYpKSB7CisJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2 X3ByaXYpKSB7CiAJCXBvcnRfc2VsID0gUEFORUxfUE9SVF9TRUxFQ1RfVkxWKHBvcnQpOwogCX0g ZWxzZSBpZiAoSEFTX1BDSF9JQlgoZGV2X3ByaXYpIHx8IEhBU19QQ0hfQ1BUKGRldl9wcml2KSkg ewogCQlpZiAocG9ydCA9PSBQT1JUX0EpCkBAIC01MTE0LDcgKzUxMTUsOSBAQCBpbnRlbF9kcF9p bml0X3BhbmVsX3Bvd2VyX3NlcXVlbmNlcl9yZWdpc3RlcnMoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIHN0YXRpYyB2b2lkIGludGVsX2RwX3Bwc19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs CiAJCQkgICAgICBzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogewotCWlmIChJU19WQUxMRVlW SUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCisJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3By aXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCXZsdl9pbml0aWFsX3Bvd2VyX3Nl cXVlbmNlcl9zZXR1cChpbnRlbF9kcCk7CiAJfSBlbHNlIHsKIAkJaW50ZWxfZHBfaW5pdF9wYW5l bF9wb3dlcl9zZXF1ZW5jZXIoZGV2LCBpbnRlbF9kcCk7CkBAIC01NTg0LDcgKzU1ODcsNyBAQCBz dGF0aWMgYm9vbCBpbnRlbF9lZHBfaW5pdF9jb25uZWN0b3Ioc3RydWN0IGludGVsX2RwICppbnRl bF9kcCwKIAl9CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPm1vZGVfY29uZmlnLm11dGV4KTsKIAotCWlm IChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJaWYgKElTX1ZB TExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCWludGVs X2RwLT5lZHBfbm90aWZpZXIubm90aWZpZXJfY2FsbCA9IGVkcF9ub3RpZnlfaGFuZGxlcjsKIAkJ cmVnaXN0ZXJfcmVib290X25vdGlmaWVyKCZpbnRlbF9kcC0+ZWRwX25vdGlmaWVyKTsKIApAQCAt NTU5Myw3ICs1NTk2LDcgQEAgc3RhdGljIGJvb2wgaW50ZWxfZWRwX2luaXRfY29ubmVjdG9yKHN0 cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAJCSAqIElmIHRoZSBjdXJyZW50IHBpcGUgaXNuJ3Qg dmFsaWQsIHRyeSB0aGUgUFBTIHBpcGUsIGFuZCBpZiB0aGF0CiAJCSAqIGZhaWxzIGp1c3QgYXNz dW1lIHBpcGUgQS4KIAkJICovCi0JCWlmIChJU19DSEVSUllWSUVXKGRldikpCisJCWlmIChJU19D SEVSUllWSUVXKGRldl9wcml2KSkKIAkJCXBpcGUgPSBEUF9QT1JUX1RPX1BJUEVfQ0hWKGludGVs X2RwLT5EUCk7CiAJCWVsc2UKIAkJCXBpcGUgPSBQT1JUX1RPX1BJUEUoaW50ZWxfZHAtPkRQKTsK QEAgLTU2ODIsNyArNTY4NSw3IEBAIGludGVsX2RwX2luaXRfY29ubmVjdG9yKHN0cnVjdCBpbnRl bF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0LAogCQlpbnRlbF9lbmNvZGVyLT50eXBlID0g SU5URUxfT1VUUFVUX0VEUDsKIAogCS8qIGVEUCBvbmx5IG9uIHBvcnQgQiBhbmQvb3IgQyBvbiB2 bHYvY2h2ICovCi0JaWYgKFdBUk5fT04oKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllW SUVXKGRldikpICYmCisJaWYgKFdBUk5fT04oKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElT X0NIRVJSWVZJRVcoZGV2X3ByaXYpKSAmJgogCQkgICAgaXNfZWRwKGludGVsX2RwKSAmJiBwb3J0 ICE9IFBPUlRfQiAmJiBwb3J0ICE9IFBPUlRfQykpCiAJCXJldHVybiBmYWxzZTsKIApAQCAtNTc5 Miw3ICs1Nzk1LDcgQEAgYm9vbCBpbnRlbF9kcF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs CiAJaW50ZWxfZW5jb2Rlci0+Z2V0X2h3X3N0YXRlID0gaW50ZWxfZHBfZ2V0X2h3X3N0YXRlOwog CWludGVsX2VuY29kZXItPmdldF9jb25maWcgPSBpbnRlbF9kcF9nZXRfY29uZmlnOwogCWludGVs X2VuY29kZXItPnN1c3BlbmQgPSBpbnRlbF9kcF9lbmNvZGVyX3N1c3BlbmQ7Ci0JaWYgKElTX0NI RVJSWVZJRVcoZGV2KSkgeworCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQlpbnRl bF9lbmNvZGVyLT5wcmVfcGxsX2VuYWJsZSA9IGNodl9kcF9wcmVfcGxsX2VuYWJsZTsKIAkJaW50 ZWxfZW5jb2Rlci0+cHJlX2VuYWJsZSA9IGNodl9wcmVfZW5hYmxlX2RwOwogCQlpbnRlbF9lbmNv ZGVyLT5lbmFibGUgPSB2bHZfZW5hYmxlX2RwOwpAQCAtNTgxNSw3ICs1ODE4LDcgQEAgYm9vbCBp bnRlbF9kcF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaW50ZWxfZGlnX3BvcnQtPm1h eF9sYW5lcyA9IDQ7CiAKIAlpbnRlbF9lbmNvZGVyLT50eXBlID0gSU5URUxfT1VUUFVUX0RQOwot CWlmIChJU19DSEVSUllWSUVXKGRldikpIHsKKwlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikp IHsKIAkJaWYgKHBvcnQgPT0gUE9SVF9EKQogCQkJaW50ZWxfZW5jb2Rlci0+Y3J0Y19tYXNrID0g MSA8PCAyOwogCQllbHNlCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k c2kuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RzaS5jCmluZGV4IDQ4ZThkZDEwOGY0 Zi4uNGUwZDAyNTQ5MGEzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k c2kuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYwpAQCAtNzQwLDcgKzc0 MCw2IEBAIHN0YXRpYyBib29sIGludGVsX2RzaV9nZXRfaHdfc3RhdGUoc3RydWN0IGludGVsX2Vu Y29kZXIgKmVuY29kZXIsCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7CiAJc3RydWN0IGludGVsX2RzaSAqaW50ZWxfZHNp ID0gZW5jX3RvX2ludGVsX2RzaSgmZW5jb2Rlci0+YmFzZSk7Ci0Jc3RydWN0IGRybV9kZXZpY2Ug KmRldiA9IGVuY29kZXItPmJhc2UuZGV2OwogCWVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9kb21h aW4gcG93ZXJfZG9tYWluOwogCWVudW0gcG9ydCBwb3J0OwogCWJvb2wgYWN0aXZlID0gZmFsc2U7 CkBAIC03NzAsNyArNzY5LDggQEAgc3RhdGljIGJvb2wgaW50ZWxfZHNpX2dldF9od19zdGF0ZShz dHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJICogYml0IGluIHBvcnQgQyBjb250cm9s IHJlZ2lzdGVyIGRvZXMgbm90IGdldCBzZXQuIEFzIGEKIAkJICogd29ya2Fyb3VuZCwgY2hlY2sg cGlwZSBCIGNvbmYgaW5zdGVhZC4KIAkJICovCi0JCWlmICgoSVNfVkFMTEVZVklFVyhkZXYpIHx8 IElTX0NIRVJSWVZJRVcoZGV2KSkgJiYgcG9ydCA9PSBQT1JUX0MpCisJCWlmICgoSVNfVkFMTEVZ VklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpICYmCisJCSAgICBwb3J0 ID09IFBPUlRfQykKIAkJCWVuYWJsZWQgPSBJOTE1X1JFQUQoUElQRUNPTkYoUElQRV9CKSkgJiBQ SVBFQ09ORl9FTkFCTEU7CiAKIAkJLyogVHJ5IGNvbW1hbmQgbW9kZSBpZiB2aWRlbyBtb2RlIG5v dCBlbmFibGVkICovCkBAIC0xMTM3LDcgKzExMzcsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kc2lf cHJlcGFyZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlciwKIAl9CiAKIAlmb3Jf ZWFjaF9kc2lfcG9ydChwb3J0LCBpbnRlbF9kc2ktPnBvcnRzKSB7Ci0JCWlmIChJU19WQUxMRVlW SUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJCWlmIChJU19WQUxMRVlWSUVXKGRl dl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQkJLyoKIAkJCSAqIGVzY2Fw ZSBjbG9jayBkaXZpZGVyLCAyME1Ieiwgc2hhcmVkIGZvciBBIGFuZCBDLgogCQkJICogZGV2aWNl IHJlYWR5IG11c3QgYmUgb2ZmIHdoZW4gZG9pbmcgdGhpcyEgdHhjbGtlc2M/CkBAIC0xNDQ5LDcg KzE0NDksNyBAQCB2b2lkIGludGVsX2RzaV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJ aWYgKCFpbnRlbF9iaW9zX2lzX2RzaV9wcmVzZW50KGRldl9wcml2LCAmcG9ydCkpCiAJCXJldHVy bjsKIAotCWlmIChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJ aWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7 CiAJCWRldl9wcml2LT5taXBpX21taW9fYmFzZSA9IFZMVl9NSVBJX0JBU0U7CiAJfSBlbHNlIGlm IChJU19CUk9YVE9OKGRldl9wcml2KSkgewogCQlkZXZfcHJpdi0+bWlwaV9tbWlvX2Jhc2UgPSBC WFRfTUlQSV9CQVNFOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRt aS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jCmluZGV4IGM3ZDljZGRmNGUz ZS4uYzgyNDNkYzRkMmI5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9o ZG1pLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jCkBAIC04ODEsNyAr ODgxLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfaGRtaV9wcmVwYXJlKHN0cnVjdCBpbnRlbF9lbmNv ZGVyICplbmNvZGVyKQogCiAJaWYgKEhBU19QQ0hfQ1BUKGRldl9wcml2KSkKIAkJaGRtaV92YWwg fD0gU0RWT19QSVBFX1NFTF9DUFQoY3J0Yy0+cGlwZSk7Ci0JZWxzZSBpZiAoSVNfQ0hFUlJZVklF VyhkZXYpKQorCWVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQloZG1pX3ZhbCB8 PSBTRFZPX1BJUEVfU0VMX0NIVihjcnRjLT5waXBlKTsKIAllbHNlCiAJCWhkbWlfdmFsIHw9IFNE Vk9fUElQRV9TRUwoY3J0Yy0+cGlwZSk7CkBAIC05MTMsNyArOTEzLDcgQEAgc3RhdGljIGJvb2wg aW50ZWxfaGRtaV9nZXRfaHdfc3RhdGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAK IAlpZiAoSEFTX1BDSF9DUFQoZGV2X3ByaXYpKQogCQkqcGlwZSA9IFBPUlRfVE9fUElQRV9DUFQo dG1wKTsKLQllbHNlIGlmIChJU19DSEVSUllWSUVXKGRldikpCisJZWxzZSBpZiAoSVNfQ0hFUlJZ VklFVyhkZXZfcHJpdikpCiAJCSpwaXBlID0gU0RWT19QT1JUX1RPX1BJUEVfQ0hWKHRtcCk7CiAJ ZWxzZQogCQkqcGlwZSA9IFBPUlRfVE9fUElQRSh0bXApOwpAQCAtMTg4NSw3ICsxODg1LDcgQEAg dm9pZCBpbnRlbF9oZG1pX2luaXRfY29ubmVjdG9yKHN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQg KmludGVsX2RpZ19wb3J0LAogCQlCVUcoKTsKIAl9CiAKLQlpZiAoSVNfVkFMTEVZVklFVyhkZXYp IHx8IElTX0NIRVJSWVZJRVcoZGV2KSkgeworCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8 fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQlpbnRlbF9oZG1pLT53cml0ZV9pbmZvZnJh bWUgPSB2bHZfd3JpdGVfaW5mb2ZyYW1lOwogCQlpbnRlbF9oZG1pLT5zZXRfaW5mb2ZyYW1lcyA9 IHZsdl9zZXRfaW5mb2ZyYW1lczsKIAkJaW50ZWxfaGRtaS0+aW5mb2ZyYW1lX2VuYWJsZWQgPSB2 bHZfaW5mb2ZyYW1lX2VuYWJsZWQ7CkBAIC0xOTU5LDcgKzE5NTksNyBAQCB2b2lkIGludGVsX2hk bWlfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCX0KIAlpbnRlbF9lbmNvZGVyLT5nZXRf aHdfc3RhdGUgPSBpbnRlbF9oZG1pX2dldF9od19zdGF0ZTsKIAlpbnRlbF9lbmNvZGVyLT5nZXRf Y29uZmlnID0gaW50ZWxfaGRtaV9nZXRfY29uZmlnOwotCWlmIChJU19DSEVSUllWSUVXKGRldikp IHsKKwlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJaW50ZWxfZW5jb2Rlci0+cHJl X3BsbF9lbmFibGUgPSBjaHZfaGRtaV9wcmVfcGxsX2VuYWJsZTsKIAkJaW50ZWxfZW5jb2Rlci0+ cHJlX2VuYWJsZSA9IGNodl9oZG1pX3ByZV9lbmFibGU7CiAJCWludGVsX2VuY29kZXItPmVuYWJs ZSA9IHZsdl9lbmFibGVfaGRtaTsKQEAgLTE5ODIsNyArMTk4Miw3IEBAIHZvaWQgaW50ZWxfaGRt aV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAlpbnRlbF9lbmNvZGVyLT50eXBlID0g SU5URUxfT1VUUFVUX0hETUk7CiAJaW50ZWxfZW5jb2Rlci0+cG9ydCA9IHBvcnQ7Ci0JaWYgKElT X0NIRVJSWVZJRVcoZGV2KSkgeworCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQlp ZiAocG9ydCA9PSBQT1JUX0QpCiAJCQlpbnRlbF9lbmNvZGVyLT5jcnRjX21hc2sgPSAxIDw8IDI7 CiAJCWVsc2UKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaTJjLmMKaW5kZXggYWZiMjY1MjkxOWQwLi5kMDQx ODVlMWVkZDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jCkBAIC02MzUsNyArNjM1LDcgQEAg aW50IGludGVsX3NldHVwX2dtYnVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKEhBU19Q Q0hfTk9QKGRldl9wcml2KSkKIAkJcmV0dXJuIDA7CiAKLQlpZiAoSVNfVkFMTEVZVklFVyhkZXYp IHx8IElTX0NIRVJSWVZJRVcoZGV2KSkKKwlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwg SVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCWRldl9wcml2LT5ncGlvX21taW9fYmFzZSA9IFZM Vl9ESVNQTEFZX0JBU0U7CiAJZWxzZSBpZiAoIUhBU19HTUNIX0RJU1BMQVkoZGV2X3ByaXYpKQog CQlkZXZfcHJpdi0+Z3Bpb19tbWlvX2Jhc2UgPQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXgg MGUzZDU1N2YyMTRiLi5kMzZiNTA3MWUwNjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAt MzIyLDcgKzMyMiw3IEBAIHZvaWQgaW50ZWxfc2V0X21lbW9yeV9jeHNyKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwgYm9vbCBlbmFibGUpCiAJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9ICZkZXZfcHJpdi0+ZHJtOwogCXUzMiB2YWw7CiAKLQlpZiAoSVNfVkFMTEVZVklFVyhkZXYp IHx8IElTX0NIRVJSWVZJRVcoZGV2KSkgeworCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8 fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQlJOTE1X1dSSVRFKEZXX0JMQ19TRUxGX1ZM ViwgZW5hYmxlID8gRldfQ1NQV1JEV05FTiA6IDApOwogCQlQT1NUSU5HX1JFQUQoRldfQkxDX1NF TEZfVkxWKTsKIAkJZGV2X3ByaXYtPndtLnZsdi5jeHNyID0gZW5hYmxlOwpAQCAtNzc2OCw3ICs3 NzY4LDcgQEAgdm9pZCBpbnRlbF9pbml0X3BtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQlE Uk1fREVCVUdfS01TKCJGYWlsZWQgdG8gcmVhZCBkaXNwbGF5IHBsYW5lIGxhdGVuY3kuICIKIAkJ CQkgICAgICAiRGlzYWJsZSBDeFNSXG4iKTsKIAkJfQotCX0gZWxzZSBpZiAoSVNfQ0hFUlJZVklF VyhkZXYpKSB7CisJfSBlbHNlIGlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQl2bHZf c2V0dXBfd21fbGF0ZW5jeShkZXYpOwogCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfd20gPSB2 bHZfdXBkYXRlX3dtOwogCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKSB7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3Bzci5jCmluZGV4IDRhOTczYjM0MzQ4YS4uMjcxYTNlMjlmZjIzIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wc3IuYwpAQCAtMzU0LDcgKzM1NCw3IEBAIHN0YXRpYyBib29sIGludGVs X3Bzcl9tYXRjaF9jb25kaXRpb25zKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJCXJldHVy biBmYWxzZTsKIAl9CiAKLQlpZiAoKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVX KGRldikpICYmCisJaWYgKChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVX KGRldl9wcml2KSkgJiYKIAkgICAgIWRldl9wcml2LT5wc3IubGlua19zdGFuZGJ5KSB7CiAJCURS TV9FUlJPUigiUFNSIGNvbmRpdGlvbiBmYWlsZWQ6IExpbmsgb2ZmIHJlcXVlc3RlZCBidXQgbm90 IHN1cHBvcnRlZCBvbiB0aGlzIHBsYXRmb3JtXG4iKTsKIAkJcmV0dXJuIGZhbHNlOwpAQCAtODM3 LDcgKzgzNyw3IEBAIHZvaWQgaW50ZWxfcHNyX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkKIAkJ LyogSFNXIGFuZCBCRFcgcmVxdWlyZSB3b3JrYXJvdW5kcyB0aGF0IHdlIGRvbid0IGltcGxlbWVu dC4gKi8KIAkJZGV2X3ByaXYtPnBzci5saW5rX3N0YW5kYnkgPSBmYWxzZTsKLQllbHNlIGlmIChJ U19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKQorCWVsc2UgaWYgKElTX1ZB TExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQkvKiBPbiBW TFYgYW5kIENIViBvbmx5IHN0YW5kYnkgbW9kZSBpcyBzdXBwb3J0ZWQuICovCiAJCWRldl9wcml2 LT5wc3IubGlua19zdGFuZGJ5ID0gdHJ1ZTsKIAllbHNlCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ydW50aW1lX3BtLmMKaW5kZXggZTRiYjg1YzljNmUxLi4zYTZlMWE5M2FlZDkgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKQEAgLTI1OTgsNyArMjU5OCw3IEBAIHZv aWQgaW50ZWxfcG93ZXJfZG9tYWluc19pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwgYm9vbCByZXN1bWUpCiAJCXNrbF9kaXNwbGF5X2NvcmVfaW5pdChkZXZfcHJpdiwg cmVzdW1lKTsKIAl9IGVsc2UgaWYgKElTX0JST1hUT04oZGV2X3ByaXYpKSB7CiAJCWJ4dF9kaXNw bGF5X2NvcmVfaW5pdChkZXZfcHJpdiwgcmVzdW1lKTsKLQl9IGVsc2UgaWYgKElTX0NIRVJSWVZJ RVcoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJbXV0 ZXhfbG9jaygmcG93ZXJfZG9tYWlucy0+bG9jayk7CiAJCWNodl9waHlfY29udHJvbF9pbml0KGRl dl9wcml2KTsKIAkJbXV0ZXhfdW5sb2NrKCZwb3dlcl9kb21haW5zLT5sb2NrKTsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggZmVmZDMwMzRhZWFkLi5mNzYwZDVmY2JlNDggMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC00NTAsNyArNDUwLDcgQEAgdmx2X3Vw ZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUsCiAJaWYgKGtleS0+ZmxhZ3MgJiBJ OTE1X1NFVF9DT0xPUktFWV9TT1VSQ0UpCiAJCXNwcmN0bCB8PSBTUF9TT1VSQ0VfS0VZOwogCi0J aWYgKElTX0NIRVJSWVZJRVcoZGV2KSAmJiBwaXBlID09IFBJUEVfQikKKwlpZiAoSVNfQ0hFUlJZ VklFVyhkZXZfcHJpdikgJiYgcGlwZSA9PSBQSVBFX0IpCiAJCWNodl91cGRhdGVfY3NjKGludGVs X3BsYW5lLCBmYi0+cGl4ZWxfZm9ybWF0KTsKIAogCUk5MTVfV1JJVEUoU1BTVFJJREUocGlwZSwg cGxhbmUpLCBmYi0+cGl0Y2hlc1swXSk7CkBAIC05NDQsNiArOTQ0LDcgQEAgaW50ZWxfY2hlY2tf c3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogaW50IGludGVsX3Nwcml0ZV9z ZXRfY29sb3JrZXkoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJCSAgICAg IHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2KQogeworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgZHJtX2ludGVsX3Nwcml0ZV9jb2xv cmtleSAqc2V0ID0gZGF0YTsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKIAlzdHJ1Y3QgZHJt X3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZTsKQEAgLTk1NSw3ICs5NTYsNyBAQCBpbnQgaW50ZWxf c3ByaXRlX3NldF9jb2xvcmtleShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAog CWlmICgoc2V0LT5mbGFncyAmIChJOTE1X1NFVF9DT0xPUktFWV9ERVNUSU5BVElPTiB8IEk5MTVf U0VUX0NPTE9SS0VZX1NPVVJDRSkpID09IChJOTE1X1NFVF9DT0xPUktFWV9ERVNUSU5BVElPTiB8 IEk5MTVfU0VUX0NPTE9SS0VZX1NPVVJDRSkpCiAJCXJldHVybiAtRUlOVkFMOwogCi0JaWYgKChJ U19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSAmJgorCWlmICgoSVNfVkFM TEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpICYmCiAJICAgIHNl dC0+ZmxhZ3MgJiBJOTE1X1NFVF9DT0xPUktFWV9ERVNUSU5BVElPTikKIAkJcmV0dXJuIC1FSU5W QUw7CiAKQEAgLTEwNDIsNiArMTA0Myw3IEBAIHN0YXRpYyB1aW50MzJfdCBza2xfcGxhbmVfZm9y bWF0c1tdID0gewogaW50CiBpbnRlbF9wbGFuZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IGVudW0gcGlwZSBwaXBlLCBpbnQgcGxhbmUpCiB7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxh bmUgPSBOVUxMOwogCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUgPSBOVUxMOwogCXVu c2lnbmVkIGxvbmcgcG9zc2libGVfY3J0Y3M7CkBAIC0xMDg0LDcgKzEwODYsNyBAQCBpbnRlbF9w bGFuZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVudW0gcGlwZSBwaXBlLCBpbnQgcGxh bmUpCiAKIAljYXNlIDc6CiAJY2FzZSA4OgotCQlpZiAoSVNfSVZZQlJJREdFKHRvX2k5MTUoZGV2 KSkpIHsKKwkJaWYgKElTX0lWWUJSSURHRShkZXZfcHJpdikpIHsKIAkJCWludGVsX3BsYW5lLT5j YW5fc2NhbGUgPSB0cnVlOwogCQkJaW50ZWxfcGxhbmUtPm1heF9kb3duc2NhbGUgPSAyOwogCQl9 IGVsc2UgewpAQCAtMTA5Miw3ICsxMDk0LDcgQEAgaW50ZWxfcGxhbmVfaW5pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBlbnVtIHBpcGUgcGlwZSwgaW50IHBsYW5lKQogCQkJaW50ZWxfcGxhbmUt Pm1heF9kb3duc2NhbGUgPSAxOwogCQl9CiAKLQkJaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJ U19DSEVSUllWSUVXKGRldikpIHsKKwkJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElT X0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCQlpbnRlbF9wbGFuZS0+dXBkYXRlX3BsYW5lID0g dmx2X3VwZGF0ZV9wbGFuZTsKIAkJCWludGVsX3BsYW5lLT5kaXNhYmxlX3BsYW5lID0gdmx2X2Rp c2FibGVfcGxhbmU7CiAKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK