From: Tvrtko Ursulin Subject: [CI 16/19] drm/i915: Make IS_CHERRYVIEW only take dev_priv Date: Thu, 13 Oct 2016 11:03:07 +0100 Message-ID: <1476352990-2504-16-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1476352990-2504-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-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C85B6EA07 for ; Thu, 13 Oct 2016 10:03:35 +0000 (UTC) Received: by mail-lf0-x243.google.com with SMTP id l131so8993790lfl.0 for ; Thu, 13 Oct 2016 03:03:35 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:9b6d:e300:916a:6cab:ac67:71c2]) by smtp.gmail.com with ESMTPSA id yo1sm21209210wjc.16.2016.10.13.03.03.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Oct 2016 03:03:32 -0700 (PDT) In-Reply-To: <1476352990-2504-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 NCBieXRlcyBvZiAucm9kYXRhIHN0cmluZ3MgYW5kIH4xMDAgb2YgLnRleHQuCgp2MjogQWRkIHBh cmFudGhlc2VzIGFyb3VuZCBkZXZfcHJpdi4gKFZpbGxlIFN5cmphbGEpCgpTaWduZWQtb2ZmLWJ5 OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTog RGF2aWQgV2VpbmVoYWxsIDxkYXZpZC53ZWluZWhhbGxAbGludXguaW50ZWwuY29tPgpBY2tlZC1i eTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQWNrZWQtYnk6IEphbmkg TmlrdWxhIDxqYW5pLm5pa3VsYUBsaW51eC5pbnRlbC5jb20+CkFja2VkLWJ5OiBDaHJpcyBXaWxz b24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQWNrZWQtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0 IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuYyAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmggICAgICAgICB8ICA4ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5jICAg ICAgfCAgNCArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY29sb3IuYyAgICAgIHwgIDIg Ky0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICB8IDY3ICsrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YyAgICAgICAgIHwgNTUgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kc2kuYyAgICAgICAgfCAgOCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9oZG1pLmMgICAgICAgfCAxMCArKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfaTJjLmMgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMg ICAgICAgICB8ICA0ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYyAgICAgICAg fCAgNCArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIHwgIDIgKy0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICAgICB8IDEwICsrKy0tCiAxNCBm aWxlcyBjaGFuZ2VkLCA5MyBpbnNlcnRpb25zKCspLCA4NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuYwppbmRleCBiMjhiMTc4NTA5NzYuLmIxMWVjZTczZTM2OCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5jCkBAIC00MjQsNyArNDI0LDcgQEAgaW50ZWxfc2V0dXBfbWNoYmFyKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJdTMyIHRlbXA7CiAJYm9vbCBlbmFibGVkOwogCi0JaWYg KElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVXKGRldikpCisJaWYgKElTX1ZBTExF WVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQlyZXR1cm47CiAK IAlkZXZfcHJpdi0+bWNoYmFyX25lZWRfZGlzYWJsZSA9IGZhbHNlOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKaW5kZXggZmU5NGUxMWZiM2QzLi5kYjE0NTQ2MDZjNjMgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaApAQCAtMjY2Myw3ICsyNjYzLDcgQEAgc3RydWN0IGRybV9pOTE1X2NtZF90YWJsZSB7 CiAJCQkJIElOVEVMX0RFVklEKGRldl9wcml2KSA9PSAweDAxNTIgfHwgXAogCQkJCSBJTlRFTF9E RVZJRChkZXZfcHJpdikgPT0gMHgwMTVhKQogI2RlZmluZSBJU19WQUxMRVlWSUVXKGRldikJKElO VEVMX0lORk8oZGV2KS0+aXNfdmFsbGV5dmlldykKLSNkZWZpbmUgSVNfQ0hFUlJZVklFVyhkZXYp CShJTlRFTF9JTkZPKGRldiktPmlzX2NoZXJyeXZpZXcpCisjZGVmaW5lIElTX0NIRVJSWVZJRVco ZGV2X3ByaXYpCSgoZGV2X3ByaXYpLT5pbmZvLmlzX2NoZXJyeXZpZXcpCiAjZGVmaW5lIElTX0hB U1dFTEwoZGV2X3ByaXYpCSgoZGV2X3ByaXYpLT5pbmZvLmlzX2hhc3dlbGwpCiAjZGVmaW5lIElT X0JST0FEV0VMTChkZXZfcHJpdikJKChkZXZfcHJpdiktPmluZm8uaXNfYnJvYWR3ZWxsKQogI2Rl ZmluZSBJU19TS1lMQUtFKGRldl9wcml2KQkoKGRldl9wcml2KS0+aW5mby5pc19za3lsYWtlKQpA QCAtMzg1NCwxMSArMzg1NCwxMSBAQCBfX3Jhd193cml0ZSg2NCwgcSkKICNkZWZpbmUgSU5URUxf QlJPQURDQVNUX1JHQl9GVUxMIDEKICNkZWZpbmUgSU5URUxfQlJPQURDQVNUX1JHQl9MSU1JVEVE IDIKIAotc3RhdGljIGlubGluZSBpOTE1X3JlZ190IGk5MTVfdmdhY250cmxfcmVnKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCitzdGF0aWMgaW5saW5lIGk5MTVfcmVnX3QgaTkxNV92Z2FjbnRybF9y ZWcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCWlmIChJU19WQUxMRVlW SUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKQorCWlmIChJU19WQUxMRVlWSUVXKGRldl9w cml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJcmV0dXJuIFZMVl9WR0FDTlRSTDsK LQllbHNlIGlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA1KQorCWVsc2UgaWYgKElOVEVMX0dF TihkZXZfcHJpdikgPj0gNSkKIAkJcmV0dXJuIENQVV9WR0FDTlRSTDsKIAllbHNlCiAJCXJldHVy biBWR0FDTlRSTDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggZDIxNWRiNWU2 ZDM4Li5hYmFhMjhkMmZjNTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0y MTMzLDcgKzIxMzMsNyBAQCBzdGF0aWMgdm9pZCBndHRfd3JpdGVfd29ya2Fyb3VuZHMoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAkvKiBXYUluY3JlYXNlRGVmYXVsdFRMQkVudHJpZXM6Y2h2LGJk dyxza2wsYnh0ICovCiAJaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikpCiAJCUk5MTVfV1JJVEUo R0VOOF9MM19MUkFfMV9HUEdQVSwgR0VOOF9MM19MUkFfMV9HUEdQVV9ERUZBVUxUX1ZBTFVFX0JE Vyk7Ci0JZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKQorCWVsc2UgaWYgKElTX0NIRVJSWVZJ RVcoZGV2X3ByaXYpKQogCQlJOTE1X1dSSVRFKEdFTjhfTDNfTFJBXzFfR1BHUFUsIEdFTjhfTDNf TFJBXzFfR1BHUFVfREVGQVVMVF9WQUxVRV9DSFYpOwogCWVsc2UgaWYgKElTX1NLWUxBS0UoZGV2 X3ByaXYpKQogCQlJOTE1X1dSSVRFKEdFTjhfTDNfTFJBXzFfR1BHUFUsIEdFTjlfTDNfTFJBXzFf R1BHUFVfREVGQVVMVF9WQUxVRV9TS0wpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfYXVkaW8uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F1ZGlvLmMKaW5k ZXggZTIwZGE1OWIxMDIwLi43MDkzY2ZiYjYyYjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2F1ZGlvLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVk aW8uYwpAQCAtNDM1LDggKzQzNSw4IEBAIHN0YXRpYyB2b2lkIGlsa19hdWRpb19jb2RlY19lbmFi bGUoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAkJYXVkX2NvbmZpZyA9IElCWF9B VURfQ0ZHKHBpcGUpOwogCQlhdWRfY250bF9zdCA9IElCWF9BVURfQ05UTF9TVChwaXBlKTsKIAkJ YXVkX2NudHJsX3N0MiA9IElCWF9BVURfQ05UTF9TVDI7Ci0JfSBlbHNlIGlmIChJU19WQUxMRVlW SUVXKGNvbm5lY3Rvci0+ZGV2KSB8fAotCQkgICBJU19DSEVSUllWSUVXKGNvbm5lY3Rvci0+ZGV2 KSkgeworCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwKKwkJICAgSVNfQ0hF UlJZVklFVyhkZXZfcHJpdikpIHsKIAkJaGRtaXdfaGRtaWVkaWQgPSBWTFZfSERNSVdfSERNSUVE SUQocGlwZSk7CiAJCWF1ZF9jb25maWcgPSBWTFZfQVVEX0NGRyhwaXBlKTsKIAkJYXVkX2NudGxf c3QgPSBWTFZfQVVEX0NOVExfU1QocGlwZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9jb2xvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY29sb3IuYwpp bmRleCBkYTc2YTc5OTQxMWEuLjQ0NTEwODg1NTI3NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfY29sb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9j b2xvci5jCkBAIC01MzQsNyArNTM0LDcgQEAgdm9pZCBpbnRlbF9jb2xvcl9pbml0KHN0cnVjdCBk cm1fY3J0YyAqY3J0YykKIAogCWRybV9tb2RlX2NydGNfc2V0X2dhbW1hX3NpemUoY3J0YywgMjU2 KTsKIAotCWlmIChJU19DSEVSUllWSUVXKGRldikpIHsKKwlpZiAoSVNfQ0hFUlJZVklFVyhkZXZf cHJpdikpIHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkubG9hZF9jc2NfbWF0cml4ID0gY2hlcnJ5dmll d19sb2FkX2NzY19tYXRyaXg7CiAJCWRldl9wcml2LT5kaXNwbGF5LmxvYWRfbHV0cyA9IGNoZXJy eXZpZXdfbG9hZF9sdXRzOwogCX0gZWxzZSBpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikpIHsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAwNGY4YTczYTQ2MzIuLjg1MzY2Yzlk NmJjMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtODQ5LDcgKzg0OSw3 IEBAIHN0YXRpYyBib29sIHZsdl9QTExfaXNfb3B0aW1hbChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCBpbnQgdGFyZ2V0X2ZyZXEsCiAJICogRm9yIENIViBpZ25vcmUgdGhlIGVycm9yIGFuZCBjb25z aWRlciBvbmx5IHRoZSBQIHZhbHVlLgogCSAqIFByZWZlciBhIGJpZ2dlciBQIHZhbHVlIGJhc2Vk IG9uIEhXIHJlcXVpcmVtZW50cy4KIAkgKi8KLQlpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJ aWYgKElTX0NIRVJSWVZJRVcodG9faTkxNShkZXYpKSkgewogCQkqZXJyb3JfcHBtID0gMDsKIAog CQlyZXR1cm4gY2FsY3VsYXRlZF9jbG9jay0+cCA+IGJlc3RfY2xvY2stPnA7CkBAIC0xMzMyLDcg KzEzMzIsNyBAQCBzdGF0aWMgdm9pZCBhc3NlcnRfc3ByaXRlc19kaXNhYmxlZChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgICAgICJwbGFuZSAlZCBhc3NlcnRpb24gZmFp bHVyZSwgc2hvdWxkIGJlIG9mZiBvbiBwaXBlICVjIGJ1dCBpcyBzdGlsbCBhY3RpdmVcbiIsCiAJ CQkgICAgIHNwcml0ZSwgcGlwZV9uYW1lKHBpcGUpKTsKIAkJfQotCX0gZWxzZSBpZiAoSVNfVkFM TEVZVklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfVkFM TEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJZm9yX2Vh Y2hfc3ByaXRlKGRldl9wcml2LCBwaXBlLCBzcHJpdGUpIHsKIAkJCXUzMiB2YWwgPSBJOTE1X1JF QUQoU1BDTlRSKHBpcGUsIHNwcml0ZSkpOwogCQkJSTkxNV9TVEFURV9XQVJOKHZhbCAmIFNQX0VO QUJMRSwKQEAgLTMwMzMsNyArMzAzMyw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3ByaW1h cnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSwKIAkJCSAgICgoY3J0Y19zdGF0ZS0+ cGlwZV9zcmNfaCAtIDEpIDw8IDE2KSB8CiAJCQkgICAoY3J0Y19zdGF0ZS0+cGlwZV9zcmNfdyAt IDEpKTsKIAkJSTkxNV9XUklURShEU1BQT1MocGxhbmUpLCAwKTsKLQl9IGVsc2UgaWYgKElTX0NI RVJSWVZJRVcoZGV2KSAmJiBwbGFuZSA9PSBQTEFORV9CKSB7CisJfSBlbHNlIGlmIChJU19DSEVS UllWSUVXKGRldl9wcml2KSAmJiBwbGFuZSA9PSBQTEFORV9CKSB7CiAJCUk5MTVfV1JJVEUoUFJJ TVNJWkUocGxhbmUpLAogCQkJICAgKChjcnRjX3N0YXRlLT5waXBlX3NyY19oIC0gMSkgPDwgMTYp IHwKIAkJCSAgIChjcnRjX3N0YXRlLT5waXBlX3NyY193IC0gMSkpOwpAQCAtNTg3Miw3ICs1ODcy LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX21heF9jZGNsayhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCQkJZGV2X3ByaXYtPm1heF9jZGNsa19mcmVxID0gNTQwMDAwOwogCQllbHNlCiAJ CQlkZXZfcHJpdi0+bWF4X2NkY2xrX2ZyZXEgPSA2NzUwMDA7Ci0JfSBlbHNlIGlmIChJU19DSEVS UllWSUVXKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJ CWRldl9wcml2LT5tYXhfY2RjbGtfZnJlcSA9IDMyMDAwMDsKIAl9IGVsc2UgaWYgKElTX1ZBTExF WVZJRVcoZGV2KSkgewogCQlkZXZfcHJpdi0+bWF4X2NkY2xrX2ZyZXEgPSA0MDAwMDA7CkBAIC02 Njc0LDcgKzY2NzQsNyBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X21vZGVzZXRfY29tbWl0X2Nk Y2xrKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUpCiAJICovCiAJaW50ZWxfZGlz cGxheV9wb3dlcl9nZXQoZGV2X3ByaXYsIFBPV0VSX0RPTUFJTl9QSVBFX0EpOwogCi0JaWYgKElT X0NIRVJSWVZJRVcoZGV2KSkKKwlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCWNoZXJy eXZpZXdfc2V0X2NkY2xrKGRldiwgcmVxX2NkY2xrKTsKIAllbHNlCiAJCXZhbGxleXZpZXdfc2V0 X2NkY2xrKGRldiwgcmVxX2NkY2xrKTsKQEAgLTY3MDIsNyArNjcwMiw3IEBAIHN0YXRpYyB2b2lk IHZhbGxleXZpZXdfY3J0Y19lbmFibGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29u ZmlnLAogCWludGVsX3NldF9waXBlX3RpbWluZ3MoaW50ZWxfY3J0Yyk7CiAJaW50ZWxfc2V0X3Bp cGVfc3JjX3NpemUoaW50ZWxfY3J0Yyk7CiAKLQlpZiAoSVNfQ0hFUlJZVklFVyhkZXYpICYmIHBp cGUgPT0gUElQRV9CKSB7CisJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpICYmIHBpcGUgPT0g UElQRV9CKSB7CiAJCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo ZGV2KTsKIAogCQlJOTE1X1dSSVRFKENIVl9CTEVORChwaXBlKSwgQ0hWX0JMRU5EX0xFR0FDWSk7 CkBAIC02NzE3LDcgKzY3MTcsNyBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X2NydGNfZW5hYmxl KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKIAogCWludGVsX2VuY29kZXJz X3ByZV9wbGxfZW5hYmxlKGNydGMsIHBpcGVfY29uZmlnLCBvbGRfc3RhdGUpOwogCi0JaWYgKElT X0NIRVJSWVZJRVcoZGV2KSkgeworCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQlj aHZfcHJlcGFyZV9wbGwoaW50ZWxfY3J0YywgaW50ZWxfY3J0Yy0+Y29uZmlnKTsKIAkJY2h2X2Vu YWJsZV9wbGwoaW50ZWxfY3J0YywgaW50ZWxfY3J0Yy0+Y29uZmlnKTsKIAl9IGVsc2UgewpAQCAt NjgzNiw3ICs2ODM2LDcgQEAgc3RhdGljIHZvaWQgaTl4eF9jcnRjX2Rpc2FibGUoc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAogCWludGVsX2VuY29kZXJzX3Bvc3RfZGlz YWJsZShjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgb2xkX3N0YXRlKTsKIAogCWlmICghaW50ZWxfY3J0 Y19oYXNfdHlwZShpbnRlbF9jcnRjLT5jb25maWcsIElOVEVMX09VVFBVVF9EU0kpKSB7Ci0JCWlm IChJU19DSEVSUllWSUVXKGRldikpCisJCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJ CWNodl9kaXNhYmxlX3BsbChkZXZfcHJpdiwgcGlwZSk7CiAJCWVsc2UgaWYgKElTX1ZBTExFWVZJ RVcoZGV2KSkKIAkJCXZsdl9kaXNhYmxlX3BsbChkZXZfcHJpdiwgcGlwZSk7CkBAIC03ODAzLDgg Kzc4MDMsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9jcHVfdHJhbnNjb2Rlcl9zZXRfbV9uKHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjLAogCQkgKiBmb3IgZ2VuIDwgOCkgYW5kIGlmIERSUlMgaXMgc3Vw cG9ydGVkICh0byBtYWtlIHN1cmUgdGhlCiAJCSAqIHJlZ2lzdGVycyBhcmUgbm90IHVubmVjZXNz YXJpbHkgYWNjZXNzZWQpLgogCQkgKi8KLQkJaWYgKG0yX24yICYmIChJU19DSEVSUllWSUVXKGRl dikgfHwgSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA4KSAmJgotCQkJY3J0Yy0+Y29uZmlnLT5oYXNf ZHJycykgeworCQlpZiAobTJfbjIgJiYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpIHx8CisJCSAg ICBJTlRFTF9HRU4oZGV2X3ByaXYpIDwgOCkgJiYgY3J0Yy0+Y29uZmlnLT5oYXNfZHJycykgewog CQkJSTkxNV9XUklURShQSVBFX0RBVEFfTTIodHJhbnNjb2RlciksCiAJCQkJCVRVX1NJWkUobTJf bjItPnR1KSB8IG0yX24yLT5nbWNoX20pOwogCQkJSTkxNV9XUklURShQSVBFX0RBVEFfTjIodHJh bnNjb2RlciksIG0yX24yLT5nbWNoX24pOwpAQCAtODEwNiw3ICs4MTA2LDcgQEAgaW50IHZsdl9m b3JjZV9wbGxfb24oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBwaXBlIHBpcGUsCiAJcGlw ZV9jb25maWctPnBpeGVsX211bHRpcGxpZXIgPSAxOwogCXBpcGVfY29uZmlnLT5kcGxsID0gKmRw bGw7CiAKLQlpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJaWYgKElTX0NIRVJSWVZJRVcodG9f aTkxNShkZXYpKSkgewogCQljaHZfY29tcHV0ZV9kcGxsKGNydGMsIHBpcGVfY29uZmlnKTsKIAkJ Y2h2X3ByZXBhcmVfcGxsKGNydGMsIHBpcGVfY29uZmlnKTsKIAkJY2h2X2VuYWJsZV9wbGwoY3J0 YywgcGlwZV9jb25maWcpOwpAQCAtODEzMSw3ICs4MTMxLDcgQEAgaW50IHZsdl9mb3JjZV9wbGxf b24oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBwaXBlIHBpcGUsCiAgKi8KIHZvaWQgdmx2 X2ZvcmNlX3BsbF9vZmYoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBwaXBlIHBpcGUpCiB7 Ci0JaWYgKElTX0NIRVJSWVZJRVcoZGV2KSkKKwlpZiAoSVNfQ0hFUlJZVklFVyh0b19pOTE1KGRl dikpKQogCQljaHZfZGlzYWJsZV9wbGwodG9faTkxNShkZXYpLCBwaXBlKTsKIAllbHNlCiAJCXZs dl9kaXNhYmxlX3BsbCh0b19pOTE1KGRldiksIHBpcGUpOwpAQCAtODQ1NSw3ICs4NDU1LDcgQEAg c3RhdGljIHZvaWQgaTl4eF9zZXRfcGlwZWNvbmYoc3RydWN0IGludGVsX2NydGMgKmludGVsX2Ny dGMpCiAJfSBlbHNlCiAJCXBpcGVjb25mIHw9IFBJUEVDT05GX1BST0dSRVNTSVZFOwogCi0JaWYg KChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSAmJgorCWlmICgoSVNf VkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpICYmCiAJICAg ICBpbnRlbF9jcnRjLT5jb25maWctPmxpbWl0ZWRfY29sb3JfcmFuZ2UpCiAJCXBpcGVjb25mIHw9 IFBJUEVDT05GX0NPTE9SX1JBTkdFX1NFTEVDVDsKIApAQCAtODg0OSw3ICs4ODQ5LDcgQEAgc3Rh dGljIGJvb2wgaTl4eF9nZXRfcGlwZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJ CX0KIAl9CiAKLQlpZiAoKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVXKGRldikp ICYmCisJaWYgKChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9w cml2KSkgJiYKIAkgICAgKHRtcCAmIFBJUEVDT05GX0NPTE9SX1JBTkdFX1NFTEVDVCkpCiAJCXBp cGVfY29uZmlnLT5saW1pdGVkX2NvbG9yX3JhbmdlID0gdHJ1ZTsKIApAQCAtODg2Myw3ICs4ODYz LDcgQEAgc3RhdGljIGJvb2wgaTl4eF9nZXRfcGlwZV9jb25maWcoc3RydWN0IGludGVsX2NydGMg KmNydGMsCiAKIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNCkgewogCQkvKiBObyB3YXkg dG8gcmVhZCBpdCBvdXQgb24gcGlwZXMgQiBhbmQgQyAqLwotCQlpZiAoSVNfQ0hFUlJZVklFVyhk ZXYpICYmIGNydGMtPnBpcGUgIT0gUElQRV9BKQorCQlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJp dikgJiYgY3J0Yy0+cGlwZSAhPSBQSVBFX0EpCiAJCQl0bXAgPSBkZXZfcHJpdi0+Y2h2X2RwbGxf bWRbY3J0Yy0+cGlwZV07CiAJCWVsc2UKIAkJCXRtcCA9IEk5MTVfUkVBRChEUExMX01EKGNydGMt PnBpcGUpKTsKQEAgLTg4ODQsNyArODg4NCw3IEBAIHN0YXRpYyBib29sIGk5eHhfZ2V0X3BpcGVf Y29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQlwaXBlX2NvbmZpZy0+cGl4ZWxfbXVs dGlwbGllciA9IDE7CiAJfQogCXBpcGVfY29uZmlnLT5kcGxsX2h3X3N0YXRlLmRwbGwgPSBJOTE1 X1JFQUQoRFBMTChjcnRjLT5waXBlKSk7Ci0JaWYgKCFJU19WQUxMRVlWSUVXKGRldikgJiYgIUlT X0NIRVJSWVZJRVcoZGV2KSkgeworCWlmICghSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgJiYgIUlT X0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCS8qCiAJCSAqIERQTExfRFZPXzJYX01PREUgbXVz dCBiZSBlbmFibGVkIGZvciBib3RoIERQTExzCiAJCSAqIG9uIDgzMC4gRmlsdGVyIGl0IG91dCBo ZXJlIHNvIHRoYXQgd2UgZG9uJ3QKQEAgLTg5MDIsNyArODkwMiw3IEBAIHN0YXRpYyBib29sIGk5 eHhfZ2V0X3BpcGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJCQkJICAgICBE UExMX1BPUlRCX1JFQURZX01BU0spOwogCX0KIAotCWlmIChJU19DSEVSUllWSUVXKGRldikpCisJ aWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQljaHZfY3J0Y19jbG9ja19nZXQoY3J0Yywg cGlwZV9jb25maWcpOwogCWVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkKIAkJdmx2X2NydGNf Y2xvY2tfZ2V0KGNydGMsIHBpcGVfY29uZmlnKTsKQEAgLTEyMjQ4LDcgKzEyMjQ4LDcgQEAgc3Rh dGljIGludCBpbnRlbF9jcnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaWYg KElOVEVMX0dFTihkZXZfcHJpdikgPj0gNSB8fCBJU19HNFgoZGV2X3ByaXYpKQogCQl3b3JrLT5m bGlwX2NvdW50ID0gSTkxNV9SRUFEKFBJUEVfRkxJUENPVU5UX0c0WChwaXBlKSkgKyAxOwogCi0J aWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVXKGRldikpIHsKKwlpZiAoSVNf VkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJZW5n aW5lID0gJmRldl9wcml2LT5lbmdpbmVbQkNTXTsKIAkJaWYgKGZiLT5tb2RpZmllclswXSAhPSBv bGRfZmItPm1vZGlmaWVyWzBdKQogCQkJLyogdmx2OiBESVNQTEFZX0ZMSVAgZmFpbHMgdG8gY2hh bmdlIHRpbGluZyAqLwpAQCAtMTMzNDYsNyArMTMzNDYsNyBAQCBpbnRlbF9waXBlX2NvbmZpZ19j b21wYXJlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJUElQRV9DT05GX0NIRUNLX0kocGl4ZWxf bXVsdGlwbGllcik7CiAJUElQRV9DT05GX0NIRUNLX0koaGFzX2hkbWlfc2luayk7CiAJaWYgKChJ TlRFTF9HRU4oZGV2X3ByaXYpIDwgOCAmJiAhSVNfSEFTV0VMTChkZXZfcHJpdikpIHx8Ci0JICAg IElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVXKGRldikpCisJICAgIElTX1ZBTExF WVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQlQSVBFX0NPTkZf Q0hFQ0tfSShsaW1pdGVkX2NvbG9yX3JhbmdlKTsKIAlQSVBFX0NPTkZfQ0hFQ0tfSShoYXNfaW5m b2ZyYW1lKTsKIApAQCAtMTUwNjYsNyArMTUwNjYsNyBAQCBpbnRlbF9jaGVja19jdXJzb3JfcGxh bmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJICogZGlzcGxheSBwb3dlciB3ZWxsIG11c3Qg YmUgdHVybmVkIG9mZiBhbmQgb24gYWdhaW4uCiAJICogUmVmdXNlIHRoZSBwdXQgdGhlIGN1cnNv ciBpbnRvIHRoYXQgY29tcHJvbWlzZWQgcG9zaXRpb24uCiAJICovCi0JaWYgKElTX0NIRVJSWVZJ RVcocGxhbmUtPmRldikgJiYgcGlwZSA9PSBQSVBFX0MgJiYKKwlpZiAoSVNfQ0hFUlJZVklFVyh0 b19pOTE1KHBsYW5lLT5kZXYpKSAmJiBwaXBlID09IFBJUEVfQyAmJgogCSAgICBzdGF0ZS0+YmFz ZS52aXNpYmxlICYmIHN0YXRlLT5iYXNlLmNydGNfeCA8IDApIHsKIAkJRFJNX0RFQlVHX0tNUygi Q0hWIGN1cnNvciBDIG5vdCBhbGxvd2VkIHRvIHN0cmFkZGxlIHRoZSBsZWZ0IHNjcmVlbiBlZGdl XG4iKTsKIAkJcmV0dXJuIC1FSU5WQUw7CkBAIC0xNTMzNiw3ICsxNTMzNiw3IEBAIHN0YXRpYyBi b29sIGludGVsX2NydF9wcmVzZW50KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKElTX0hT V19VTFQoZGV2X3ByaXYpIHx8IElTX0JEV19VTFQoZGV2X3ByaXYpKQogCQlyZXR1cm4gZmFsc2U7 CiAKLQlpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKQorCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2 KSkKIAkJcmV0dXJuIGZhbHNlOwogCiAJaWYgKEhBU19QQ0hfTFBUX0goZGV2X3ByaXYpICYmCkBA IC0xNTQ3Nyw3ICsxNTQ3Nyw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3NldHVwX291dHB1dHMoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAogCQlpZiAoSTkxNV9SRUFEKFBDSF9EUF9EKSAmIERQX0RF VEVDVEVEKQogCQkJaW50ZWxfZHBfaW5pdChkZXYsIFBDSF9EUF9ELCBQT1JUX0QpOwotCX0gZWxz ZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkgeworCX0gZWxz ZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikp IHsKIAkJYm9vbCBoYXNfZWRwLCBoYXNfcG9ydDsKIAogCQkvKgpAQCAtMTU1MDksNyArMTU1MDks NyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zZXR1cF9vdXRwdXRzKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJCWlmICgoSTkxNV9SRUFEKFZMVl9IRE1JQykgJiBTRFZPX0RFVEVDVEVEIHx8IGhhc19w b3J0KSAmJiAhaGFzX2VkcCkKIAkJCWludGVsX2hkbWlfaW5pdChkZXYsIFZMVl9IRE1JQywgUE9S VF9DKTsKIAotCQlpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJCWlmIChJU19DSEVSUllWSUVX KGRldl9wcml2KSkgewogCQkJLyoKIAkJCSAqIGVEUCBub3Qgc3VwcG9ydGVkIG9uIHBvcnQgRCwK IAkJCSAqIHNvIG5vIG5lZWQgdG8gd29ycnkgYWJvdXQgaXQKQEAgLTE1NjI3LDEwICsxNTYyNywx MCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlcl9mdW5jcyBpbnRlbF9mYl9m dW5jcyA9IHsKIH07CiAKIHN0YXRpYwotdTMyIGludGVsX2ZiX3BpdGNoX2xpbWl0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHVpbnQ2NF90IGZiX21vZGlmaWVyLAotCQkJIHVpbnQzMl90IHBpeGVs X2Zvcm1hdCkKK3UzMiBpbnRlbF9mYl9waXRjaF9saW1pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCisJCQkgdWludDY0X3QgZmJfbW9kaWZpZXIsIHVpbnQzMl90IHBpeGVsX2Zv cm1hdCkKIHsKLQl1MzIgZ2VuID0gSU5URUxfSU5GTyhkZXYpLT5nZW47CisJdTMyIGdlbiA9IElO VEVMX0lORk8oZGV2X3ByaXYpLT5nZW47CiAKIAlpZiAoZ2VuID49IDkpIHsKIAkJaW50IGNwcCA9 IGRybV9mb3JtYXRfcGxhbmVfY3BwKHBpeGVsX2Zvcm1hdCwgMCk7CkBAIC0xNTYzOSw3ICsxNTYz OSw4IEBAIHUzMiBpbnRlbF9mYl9waXRjaF9saW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1 aW50NjRfdCBmYl9tb2RpZmllciwKIAkJICogIHBpeGVscyBhbmQgMzJLIGJ5dGVzLiIKIAkJICov CiAJCXJldHVybiBtaW4oODE5MiAqIGNwcCwgMzI3NjgpOwotCX0gZWxzZSBpZiAoZ2VuID49IDUg JiYgIUlTX1ZBTExFWVZJRVcoZGV2KSAmJiAhSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJfSBlbHNl IGlmIChnZW4gPj0gNSAmJiAhSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgJiYKKwkJICAgIUlTX0NI RVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCXJldHVybiAzMioxMDI0OwogCX0gZWxzZSBpZiAoZ2Vu ID49IDQpIHsKIAkJaWYgKGZiX21vZGlmaWVyID09IEk5MTVfRk9STUFUX01PRF9YX1RJTEVEKQpA QCAtMTU3MjYsNyArMTU3MjcsNyBAQCBzdGF0aWMgaW50IGludGVsX2ZyYW1lYnVmZmVyX2luaXQo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCi0JcGl0Y2hf bGltaXQgPSBpbnRlbF9mYl9waXRjaF9saW1pdChkZXYsIG1vZGVfY21kLT5tb2RpZmllclswXSwK KwlwaXRjaF9saW1pdCA9IGludGVsX2ZiX3BpdGNoX2xpbWl0KGRldl9wcml2LCBtb2RlX2NtZC0+ bW9kaWZpZXJbMF0sCiAJCQkJCSAgIG1vZGVfY21kLT5waXhlbF9mb3JtYXQpOwogCWlmIChtb2Rl X2NtZC0+cGl0Y2hlc1swXSA+IHBpdGNoX2xpbWl0KSB7CiAJCURSTV9ERUJVRygiJXMgcGl0Y2gg KCV1KSBtdXN0IGJlIGF0IGxlc3MgdGhhbiAlZFxuIiwKQEAgLTE1NzY0LDcgKzE1NzY1LDcgQEAg c3RhdGljIGludCBpbnRlbF9mcmFtZWJ1ZmZlcl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs CiAJCX0KIAkJYnJlYWs7CiAJY2FzZSBEUk1fRk9STUFUX0FCR1I4ODg4OgotCQlpZiAoIUlTX1ZB TExFWVZJRVcoZGV2KSAmJiAhSVNfQ0hFUlJZVklFVyhkZXYpICYmCisJCWlmICghSVNfVkFMTEVZ VklFVyhkZXZfcHJpdikgJiYgIUlTX0NIRVJSWVZJRVcoZGV2X3ByaXYpICYmCiAJCSAgICBJTlRF TF9JTkZPKGRldiktPmdlbiA8IDkpIHsKIAkJCWZvcm1hdF9uYW1lID0gZHJtX2dldF9mb3JtYXRf bmFtZShtb2RlX2NtZC0+cGl4ZWxfZm9ybWF0KTsKIAkJCURSTV9ERUJVRygidW5zdXBwb3J0ZWQg cGl4ZWwgZm9ybWF0OiAlc1xuIiwgZm9ybWF0X25hbWUpOwpAQCAtMTU3ODMsNyArMTU3ODQsNyBA QCBzdGF0aWMgaW50IGludGVsX2ZyYW1lYnVmZmVyX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIAkJfQogCQlicmVhazsKIAljYXNlIERSTV9GT1JNQVRfQUJHUjIxMDEwMTA6Ci0JCWlmICgh SVNfVkFMTEVZVklFVyhkZXYpICYmICFJU19DSEVSUllWSUVXKGRldikpIHsKKwkJaWYgKCFJU19W QUxMRVlWSUVXKGRldl9wcml2KSAmJiAhSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJCWZv cm1hdF9uYW1lID0gZHJtX2dldF9mb3JtYXRfbmFtZShtb2RlX2NtZC0+cGl4ZWxfZm9ybWF0KTsK IAkJCURSTV9ERUJVRygidW5zdXBwb3J0ZWQgcGl4ZWwgZm9ybWF0OiAlc1xuIiwgZm9ybWF0X25h bWUpOwogCQkJa2ZyZWUoZm9ybWF0X25hbWUpOwpAQCAtMTYyMzAsNyArMTYyMzEsNyBAQCBzdGF0 aWMgdm9pZCBpOTE1X2Rpc2FibGVfdmdhKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBwY2lf ZGV2ICpwZGV2ID0gZGV2X3ByaXYtPmRybS5wZGV2OwogCXU4IHNyMTsKLQlpOTE1X3JlZ190IHZn YV9yZWcgPSBpOTE1X3ZnYWNudHJsX3JlZyhkZXYpOworCWk5MTVfcmVnX3QgdmdhX3JlZyA9IGk5 MTVfdmdhY250cmxfcmVnKGRldl9wcml2KTsKIAogCS8qIFdhRW5hYmxlVkdBQWNjZXNzVGhyb3Vn aElPUG9ydDpjdGcsZWxrLGlsayxzbmIsaXZiLHZsdixoc3cgKi8KIAl2Z2FfZ2V0X3VuaW50ZXJy dXB0aWJsZShwZGV2LCBWR0FfUlNSQ19MRUdBQ1lfSU8pOwpAQCAtMTY2NzUsNyArMTY2NzYsNyBA QCBzdGF0aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9lbmNvZGVyKHN0cnVjdCBpbnRlbF9lbmNvZGVy ICplbmNvZGVyKQogdm9pZCBpOTE1X3JlZGlzYWJsZV92Z2FfcG93ZXJfb24oc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19p OTE1KGRldik7Ci0JaTkxNV9yZWdfdCB2Z2FfcmVnID0gaTkxNV92Z2FjbnRybF9yZWcoZGV2KTsK KwlpOTE1X3JlZ190IHZnYV9yZWcgPSBpOTE1X3ZnYWNudHJsX3JlZyhkZXZfcHJpdik7CiAKIAlp ZiAoIShJOTE1X1JFQUQodmdhX3JlZykgJiBWR0FfRElTUF9ESVNBQkxFKSkgewogCQlEUk1fREVC VUdfS01TKCJTb21ldGhpbmcgZW5hYmxlZCBWR0EgcGxhbmUsIGRpc2FibGluZyBpdFxuIik7CkBA IC0xNjkxMyw3ICsxNjkxNCw3IEBAIGludGVsX21vZGVzZXRfc2V0dXBfaHdfc3RhdGUoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAkJcGxsLT5vbiA9IGZhbHNlOwogCX0KIAotCWlmIChJU19WQUxM RVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKQorCWlmIChJU19WQUxMRVlWSUVXKGRl dl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJdmx2X3dtX2dldF9od19zdGF0 ZShkZXYpOwogCWVsc2UgaWYgKElTX0dFTjkoZGV2KSkKIAkJc2tsX3dtX2dldF9od19zdGF0ZShk ZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXggZGZjOTNjYzExYTEzLi4xZTFjY2YwOTJl MTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtMzQ0LDcgKzM0NCw3IEBAIHZsdl9wb3dl cl9zZXF1ZW5jZXJfa2ljayhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCURQIHw9IERQX1BP UlRfV0lEVEgoMSk7CiAJRFAgfD0gRFBfTElOS19UUkFJTl9QQVRfMTsKIAotCWlmIChJU19DSEVS UllWSUVXKGRldikpCisJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQlEUCB8PSBEUF9Q SVBFX1NFTEVDVF9DSFYocGlwZSk7CiAJZWxzZSBpZiAocGlwZSA9PSBQSVBFX0IpCiAJCURQIHw9 IERQX1BJUEVCX1NFTEVDVDsKQEAgLTM1NiwxMCArMzU2LDEwIEBAIHZsdl9wb3dlcl9zZXF1ZW5j ZXJfa2ljayhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCSAqIFNvIGVuYWJsZSB0ZW1wb3Jh cmlseSBpdCBpZiBpdCdzIG5vdCBhbHJlYWR5IGVuYWJsZWQuCiAJICovCiAJaWYgKCFwbGxfZW5h YmxlZCkgewotCQlyZWxlYXNlX2NsX292ZXJyaWRlID0gSVNfQ0hFUlJZVklFVyhkZXYpICYmCisJ CXJlbGVhc2VfY2xfb3ZlcnJpZGUgPSBJU19DSEVSUllWSUVXKGRldl9wcml2KSAmJgogCQkJIWNo dl9waHlfcG93ZXJnYXRlX2NoKGRldl9wcml2LCBwaHksIGNoLCB0cnVlKTsKIAotCQlpZiAodmx2 X2ZvcmNlX3BsbF9vbihkZXYsIHBpcGUsIElTX0NIRVJSWVZJRVcoZGV2KSA/CisJCWlmICh2bHZf Zm9yY2VfcGxsX29uKGRldiwgcGlwZSwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikgPwogCQkJCSAg ICAgJmNodl9kcGxsWzBdLmRwbGwgOiAmdmx2X2RwbGxbMF0uZHBsbCkpIHsKIAkJCURSTV9FUlJP UigiRmFpbGVkIHRvIGZvcmNlIG9uIHBsbCBmb3IgcGlwZSAlYyFcbiIsCiAJCQkJICBwaXBlX25h bWUocGlwZSkpOwpAQCAtNTcwLDcgKzU3MCw3IEBAIHZvaWQgaW50ZWxfcG93ZXJfc2VxdWVuY2Vy X3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gJmRldl9wcml2LT5kcm07CiAJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29k ZXI7CiAKLQlpZiAoV0FSTl9PTighSVNfVkFMTEVZVklFVyhkZXYpICYmICFJU19DSEVSUllWSUVX KGRldikgJiYKKwlpZiAoV0FSTl9PTighSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgJiYgIUlTX0NI RVJSWVZJRVcoZGV2X3ByaXYpICYmCiAJCSAgICAhSVNfQlJPWFRPTihkZXZfcHJpdikpKQogCQly ZXR1cm47CiAKQEAgLTY2NCw3ICs2NjQsNyBAQCBzdGF0aWMgaW50IGVkcF9ub3RpZnlfaGFuZGxl cihzdHJ1Y3Qgbm90aWZpZXJfYmxvY2sgKnRoaXMsIHVuc2lnbmVkIGxvbmcgY29kZSwKIAogCXBw c19sb2NrKGludGVsX2RwKTsKIAotCWlmIChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZ VklFVyhkZXYpKSB7CisJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJ RVcoZGV2X3ByaXYpKSB7CiAJCWVudW0gcGlwZSBwaXBlID0gdmx2X3Bvd2VyX3NlcXVlbmNlcl9w aXBlKGludGVsX2RwKTsKIAkJaTkxNV9yZWdfdCBwcF9jdHJsX3JlZywgcHBfZGl2X3JlZzsKIAkJ dTMyIHBwX2RpdjsKQEAgLTY5Miw3ICs2OTIsNyBAQCBzdGF0aWMgYm9vbCBlZHBfaGF2ZV9wYW5l bF9wb3dlcihzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCiAJbG9ja2RlcF9hc3NlcnRfaGVs ZCgmZGV2X3ByaXYtPnBwc19tdXRleCk7CiAKLQlpZiAoKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJ U19DSEVSUllWSUVXKGRldikpICYmCisJaWYgKChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJ U19DSEVSUllWSUVXKGRldl9wcml2KSkgJiYKIAkgICAgaW50ZWxfZHAtPnBwc19waXBlID09IElO VkFMSURfUElQRSkKIAkJcmV0dXJuIGZhbHNlOwogCkBAIC03MDYsNyArNzA2LDcgQEAgc3RhdGlj IGJvb2wgZWRwX2hhdmVfcGFuZWxfdmRkKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAKIAls b2NrZGVwX2Fzc2VydF9oZWxkKCZkZXZfcHJpdi0+cHBzX211dGV4KTsKIAotCWlmICgoSVNfVkFM TEVZVklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkgJiYKKwlpZiAoKElTX1ZBTExFWVZJ RVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSAmJgogCSAgICBpbnRlbF9k cC0+cHBzX3BpcGUgPT0gSU5WQUxJRF9QSVBFKQogCQlyZXR1cm4gZmFsc2U7CiAKQEAgLTEzNDcs NyArMTM0Nyw3IEBAIGludGVsX2RwX3NldF9jbG9jayhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5j b2RlciwKIAl9IGVsc2UgaWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKSB7CiAJCWRpdmlzb3Ig PSBwY2hfZHBsbDsKIAkJY291bnQgPSBBUlJBWV9TSVpFKHBjaF9kcGxsKTsKLQl9IGVsc2UgaWYg KElTX0NIRVJSWVZJRVcoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJp dikpIHsKIAkJZGl2aXNvciA9IGNodl9kcGxsOwogCQljb3VudCA9IEFSUkFZX1NJWkUoY2h2X2Rw bGwpOwogCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKSB7CkBAIC0xNzkxLDcgKzE3OTEs OCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kcF9wcmVwYXJlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICpl bmNvZGVyLAogCQlJOTE1X1dSSVRFKFRSQU5TX0RQX0NUTChjcnRjLT5waXBlKSwgdHJhbnNfZHAp OwogCX0gZWxzZSB7CiAJCWlmICghSEFTX1BDSF9TUExJVChkZXZfcHJpdikgJiYgIUlTX1ZBTExF WVZJRVcoZGV2KSAmJgotCQkgICAgIUlTX0NIRVJSWVZJRVcoZGV2KSAmJiBwaXBlX2NvbmZpZy0+ bGltaXRlZF9jb2xvcl9yYW5nZSkKKwkJICAgICFJU19DSEVSUllWSUVXKGRldl9wcml2KSAmJgor CQkgICAgcGlwZV9jb25maWctPmxpbWl0ZWRfY29sb3JfcmFuZ2UpCiAJCQlpbnRlbF9kcC0+RFAg fD0gRFBfQ09MT1JfUkFOR0VfMTZfMjM1OwogCiAJCWlmIChhZGp1c3RlZF9tb2RlLT5mbGFncyAm IERSTV9NT0RFX0ZMQUdfUEhTWU5DKQpAQCAtMTgwMyw3ICsxODA0LDcgQEAgc3RhdGljIHZvaWQg aW50ZWxfZHBfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJaWYgKGRy bV9kcF9lbmhhbmNlZF9mcmFtZV9jYXAoaW50ZWxfZHAtPmRwY2QpKQogCQkJaW50ZWxfZHAtPkRQ IHw9IERQX0VOSEFOQ0VEX0ZSQU1JTkc7CiAKLQkJaWYgKElTX0NIRVJSWVZJRVcoZGV2KSkKKwkJ aWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQkJaW50ZWxfZHAtPkRQIHw9IERQX1BJUEVf U0VMRUNUX0NIVihjcnRjLT5waXBlKTsKIAkJZWxzZSBpZiAoY3J0Yy0+cGlwZSA9PSBQSVBFX0Ip CiAJCQlpbnRlbF9kcC0+RFAgfD0gRFBfUElQRUJfU0VMRUNUOwpAQCAtMjQ1OSw3ICsyNDYwLDcg QEAgc3RhdGljIGJvb2wgaW50ZWxfZHBfZ2V0X2h3X3N0YXRlKHN0cnVjdCBpbnRlbF9lbmNvZGVy ICplbmNvZGVyLAogCiAJCURSTV9ERUJVR19LTVMoIk5vIHBpcGUgZm9yIGRwIHBvcnQgMHgleCBm b3VuZFxuIiwKIAkJCSAgICAgIGk5MTVfbW1pb19yZWdfb2Zmc2V0KGludGVsX2RwLT5vdXRwdXRf cmVnKSk7Ci0JfSBlbHNlIGlmIChJU19DSEVSUllWSUVXKGRldikpIHsKKwl9IGVsc2UgaWYgKElT X0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCSpwaXBlID0gRFBfUE9SVF9UT19QSVBFX0NIVih0 bXApOwogCX0gZWxzZSB7CiAJCSpwaXBlID0gUE9SVF9UT19QSVBFKHRtcCk7CkBAIC0yNjgxLDcg KzI2ODIsNyBAQCBfaW50ZWxfZHBfc2V0X2xpbmtfdHJhaW4oc3RydWN0IGludGVsX2RwICppbnRl bF9kcCwKIAkJfQogCiAJfSBlbHNlIHsKLQkJaWYgKElTX0NIRVJSWVZJRVcoZGV2KSkKKwkJaWYg KElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQkJKkRQICY9IH5EUF9MSU5LX1RSQUlOX01BU0tf Q0hWOwogCQllbHNlCiAJCQkqRFAgJj0gfkRQX0xJTktfVFJBSU5fTUFTSzsKQEAgLTI2OTcsNyAr MjY5OCw3IEBAIF9pbnRlbF9kcF9zZXRfbGlua190cmFpbihzdHJ1Y3QgaW50ZWxfZHAgKmludGVs X2RwLAogCQkJKkRQIHw9IERQX0xJTktfVFJBSU5fUEFUXzI7CiAJCQlicmVhazsKIAkJY2FzZSBE UF9UUkFJTklOR19QQVRURVJOXzM6Ci0JCQlpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJCQlp ZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJCQkqRFAgfD0gRFBfTElOS19UUkFJTl9Q QVRfM19DSFY7CiAJCQl9IGVsc2UgewogCQkJCURSTV9ERUJVR19LTVMoIlRQUzMgbm90IHN1cHBv cnRlZCwgdXNpbmcgVFBTMiBpbnN0ZWFkXG4iKTsKQEAgLTI3NDcsNyArMjc0OCw3IEBAIHN0YXRp YyB2b2lkIGludGVsX2VuYWJsZV9kcChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAog CXBwc19sb2NrKGludGVsX2RwKTsKIAotCWlmIChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hF UlJZVklFVyhkZXYpKQorCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllW SUVXKGRldl9wcml2KSkKIAkJdmx2X2luaXRfcGFuZWxfcG93ZXJfc2VxdWVuY2VyKGludGVsX2Rw KTsKIAogCWludGVsX2RwX2VuYWJsZV9wb3J0KGludGVsX2RwLCBwaXBlX2NvbmZpZyk7CkBAIC0y NzU4LDEwICsyNzU5LDEwIEBAIHN0YXRpYyB2b2lkIGludGVsX2VuYWJsZV9kcChzdHJ1Y3QgaW50 ZWxfZW5jb2RlciAqZW5jb2RlciwKIAogCXBwc191bmxvY2soaW50ZWxfZHApOwogCi0JaWYgKElT X1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVXKGRldikpIHsKKwlpZiAoSVNfVkFMTEVZ VklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJdW5zaWduZWQg aW50IGxhbmVfbWFzayA9IDB4MDsKIAotCQlpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKQorCQlpZiAo SVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCQlsYW5lX21hc2sgPSBpbnRlbF9kcF91bnVzZWRf bGFuZV9tYXNrKHBpcGVfY29uZmlnLT5sYW5lX2NvdW50KTsKIAogCQl2bHZfd2FpdF9wb3J0X3Jl YWR5KGRldl9wcml2LCBkcF90b19kaWdfcG9ydChpbnRlbF9kcCksCkBAIC0yOTg3LDcgKzI5ODgs NyBAQCBpbnRlbF9kcF92b2x0YWdlX21heChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCQlp ZiAoZGV2X3ByaXYtPnZidC5lZHAubG93X3Zzd2luZyAmJiBwb3J0ID09IFBPUlRfQSkKIAkJCXJl dHVybiBEUF9UUkFJTl9WT0xUQUdFX1NXSU5HX0xFVkVMXzM7CiAJCXJldHVybiBEUF9UUkFJTl9W T0xUQUdFX1NXSU5HX0xFVkVMXzI7Ci0JfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldikgfHwg SVNfQ0hFUlJZVklFVyhkZXYpKQorCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikg fHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCXJldHVybiBEUF9UUkFJTl9WT0xUQUdFX1NX SU5HX0xFVkVMXzM7CiAJZWxzZSBpZiAoSVNfR0VONyhkZXYpICYmIHBvcnQgPT0gUE9SVF9BKQog CQlyZXR1cm4gRFBfVFJBSU5fVk9MVEFHRV9TV0lOR19MRVZFTF8yOwpAQCAtMzM0OCw3ICszMzQ5 LDcgQEAgaW50ZWxfZHBfc2V0X3NpZ25hbF9sZXZlbHMoc3RydWN0IGludGVsX2RwICppbnRlbF9k cCkKIAkJCXNpZ25hbF9sZXZlbHMgPSAwOwogCQllbHNlCiAJCQltYXNrID0gRERJX0JVRl9FTVBf TUFTSzsKLQl9IGVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNf Q0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJc2lnbmFsX2xldmVscyA9IGNodl9zaWduYWxfbGV2 ZWxzKGludGVsX2RwKTsKIAl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkgewogCQlzaWdu YWxfbGV2ZWxzID0gdmx2X3NpZ25hbF9sZXZlbHMoaW50ZWxfZHApOwpAQCAtMzQ0OCw3ICszNDQ5 LDcgQEAgaW50ZWxfZHBfbGlua19kb3duKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJCURQ ICY9IH5EUF9MSU5LX1RSQUlOX01BU0tfQ1BUOwogCQlEUCB8PSBEUF9MSU5LX1RSQUlOX1BBVF9J RExFX0NQVDsKIAl9IGVsc2UgewotCQlpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKQorCQlpZiAoSVNf Q0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCQlEUCAmPSB+RFBfTElOS19UUkFJTl9NQVNLX0NIVjsK IAkJZWxzZQogCQkJRFAgJj0gfkRQX0xJTktfVFJBSU5fTUFTSzsKQEAgLTUwODUsNyArNTA4Niw3 IEBAIGludGVsX2RwX2luaXRfcGFuZWxfcG93ZXJfc2VxdWVuY2VyX3JlZ2lzdGVycyhzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogCiAJLyogSGFzd2VsbCBkb2Vzbid0IGhhdmUgYW55IHBvcnQgc2Vs ZWN0aW9uIGJpdHMgZm9yIHRoZSBwYW5lbAogCSAqIHBvd2VyIHNlcXVlbmNlciBhbnkgbW9yZS4g Ki8KLQlpZiAoSVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkgeworCWlm IChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewog CQlwb3J0X3NlbCA9IFBBTkVMX1BPUlRfU0VMRUNUX1ZMVihwb3J0KTsKIAl9IGVsc2UgaWYgKEhB U19QQ0hfSUJYKGRldl9wcml2KSB8fCBIQVNfUENIX0NQVChkZXZfcHJpdikpIHsKIAkJaWYgKHBv cnQgPT0gUE9SVF9BKQpAQCAtNTExNCw3ICs1MTE1LDkgQEAgaW50ZWxfZHBfaW5pdF9wYW5lbF9w b3dlcl9zZXF1ZW5jZXJfcmVnaXN0ZXJzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiBzdGF0aWMg dm9pZCBpbnRlbF9kcF9wcHNfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJICAgICAg c3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIHsKLQlpZiAoSVNfVkFMTEVZVklFVyhkZXYpIHx8 IElTX0NIRVJSWVZJRVcoZGV2KSkgeworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHRvX2k5MTUoZGV2KTsKKworCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19D SEVSUllWSUVXKGRldl9wcml2KSkgewogCQl2bHZfaW5pdGlhbF9wb3dlcl9zZXF1ZW5jZXJfc2V0 dXAoaW50ZWxfZHApOwogCX0gZWxzZSB7CiAJCWludGVsX2RwX2luaXRfcGFuZWxfcG93ZXJfc2Vx dWVuY2VyKGRldiwgaW50ZWxfZHApOwpAQCAtNTU4NCw3ICs1NTg3LDcgQEAgc3RhdGljIGJvb2wg aW50ZWxfZWRwX2luaXRfY29ubmVjdG9yKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAJfQog CW11dGV4X3VubG9jaygmZGV2LT5tb2RlX2NvbmZpZy5tdXRleCk7CiAKLQlpZiAoSVNfVkFMTEVZ VklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkgeworCWlmIChJU19WQUxMRVlWSUVXKGRl dl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQlpbnRlbF9kcC0+ZWRwX25v dGlmaWVyLm5vdGlmaWVyX2NhbGwgPSBlZHBfbm90aWZ5X2hhbmRsZXI7CiAJCXJlZ2lzdGVyX3Jl Ym9vdF9ub3RpZmllcigmaW50ZWxfZHAtPmVkcF9ub3RpZmllcik7CiAKQEAgLTU1OTMsNyArNTU5 Niw3IEBAIHN0YXRpYyBib29sIGludGVsX2VkcF9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxf ZHAgKmludGVsX2RwLAogCQkgKiBJZiB0aGUgY3VycmVudCBwaXBlIGlzbid0IHZhbGlkLCB0cnkg dGhlIFBQUyBwaXBlLCBhbmQgaWYgdGhhdAogCQkgKiBmYWlscyBqdXN0IGFzc3VtZSBwaXBlIEEu CiAJCSAqLwotCQlpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKQorCQlpZiAoSVNfQ0hFUlJZVklFVyhk ZXZfcHJpdikpCiAJCQlwaXBlID0gRFBfUE9SVF9UT19QSVBFX0NIVihpbnRlbF9kcC0+RFApOwog CQllbHNlCiAJCQlwaXBlID0gUE9SVF9UT19QSVBFKGludGVsX2RwLT5EUCk7CkBAIC01NjgyLDcg KzU2ODUsNyBAQCBpbnRlbF9kcF9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9w b3J0ICppbnRlbF9kaWdfcG9ydCwKIAkJaW50ZWxfZW5jb2Rlci0+dHlwZSA9IElOVEVMX09VVFBV VF9FRFA7CiAKIAkvKiBlRFAgb25seSBvbiBwb3J0IEIgYW5kL29yIEMgb24gdmx2L2NodiAqLwot CWlmIChXQVJOX09OKChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSAm JgorCWlmIChXQVJOX09OKChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVX KGRldl9wcml2KSkgJiYKIAkJICAgIGlzX2VkcChpbnRlbF9kcCkgJiYgcG9ydCAhPSBQT1JUX0Ig JiYgcG9ydCAhPSBQT1JUX0MpKQogCQlyZXR1cm4gZmFsc2U7CiAKQEAgLTU3OTIsNyArNTc5NSw3 IEBAIGJvb2wgaW50ZWxfZHBfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWludGVsX2Vu Y29kZXItPmdldF9od19zdGF0ZSA9IGludGVsX2RwX2dldF9od19zdGF0ZTsKIAlpbnRlbF9lbmNv ZGVyLT5nZXRfY29uZmlnID0gaW50ZWxfZHBfZ2V0X2NvbmZpZzsKIAlpbnRlbF9lbmNvZGVyLT5z dXNwZW5kID0gaW50ZWxfZHBfZW5jb2Rlcl9zdXNwZW5kOwotCWlmIChJU19DSEVSUllWSUVXKGRl dikpIHsKKwlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJaW50ZWxfZW5jb2Rlci0+ cHJlX3BsbF9lbmFibGUgPSBjaHZfZHBfcHJlX3BsbF9lbmFibGU7CiAJCWludGVsX2VuY29kZXIt PnByZV9lbmFibGUgPSBjaHZfcHJlX2VuYWJsZV9kcDsKIAkJaW50ZWxfZW5jb2Rlci0+ZW5hYmxl ID0gdmx2X2VuYWJsZV9kcDsKQEAgLTU4MTUsNyArNTgxOCw3IEBAIGJvb2wgaW50ZWxfZHBfaW5p dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWludGVsX2RpZ19wb3J0LT5tYXhfbGFuZXMgPSA0 OwogCiAJaW50ZWxfZW5jb2Rlci0+dHlwZSA9IElOVEVMX09VVFBVVF9EUDsKLQlpZiAoSVNfQ0hF UlJZVklFVyhkZXYpKSB7CisJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCWlmIChw b3J0ID09IFBPUlRfRCkKIAkJCWludGVsX2VuY29kZXItPmNydGNfbWFzayA9IDEgPDwgMjsKIAkJ ZWxzZQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHNpLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYwppbmRleCA0OGU4ZGQxMDhmNGYuLjRlMGQwMjU0 OTBhMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHNpLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHNpLmMKQEAgLTc0MCw3ICs3NDAsNiBAQCBzdGF0 aWMgYm9vbCBpbnRlbF9kc2lfZ2V0X2h3X3N0YXRlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNv ZGVyLAogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5j b2Rlci0+YmFzZS5kZXYpOwogCXN0cnVjdCBpbnRlbF9kc2kgKmludGVsX2RzaSA9IGVuY190b19p bnRlbF9kc2koJmVuY29kZXItPmJhc2UpOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBlbmNv ZGVyLT5iYXNlLmRldjsKIAllbnVtIGludGVsX2Rpc3BsYXlfcG93ZXJfZG9tYWluIHBvd2VyX2Rv bWFpbjsKIAllbnVtIHBvcnQgcG9ydDsKIAlib29sIGFjdGl2ZSA9IGZhbHNlOwpAQCAtNzcwLDcg Kzc2OSw4IEBAIHN0YXRpYyBib29sIGludGVsX2RzaV9nZXRfaHdfc3RhdGUoc3RydWN0IGludGVs X2VuY29kZXIgKmVuY29kZXIsCiAJCSAqIGJpdCBpbiBwb3J0IEMgY29udHJvbCByZWdpc3RlciBk b2VzIG5vdCBnZXQgc2V0LiBBcyBhCiAJCSAqIHdvcmthcm91bmQsIGNoZWNrIHBpcGUgQiBjb25m IGluc3RlYWQuCiAJCSAqLwotCQlpZiAoKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllW SUVXKGRldikpICYmIHBvcnQgPT0gUE9SVF9DKQorCQlpZiAoKElTX1ZBTExFWVZJRVcoZGV2X3By aXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSAmJgorCQkgICAgcG9ydCA9PSBQT1JUX0Mp CiAJCQllbmFibGVkID0gSTkxNV9SRUFEKFBJUEVDT05GKFBJUEVfQikpICYgUElQRUNPTkZfRU5B QkxFOwogCiAJCS8qIFRyeSBjb21tYW5kIG1vZGUgaWYgdmlkZW8gbW9kZSBub3QgZW5hYmxlZCAq LwpAQCAtMTEzNyw3ICsxMTM3LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZHNpX3ByZXBhcmUoc3Ry dWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIsCiAJfQogCiAJZm9yX2VhY2hfZHNpX3Bv cnQocG9ydCwgaW50ZWxfZHNpLT5wb3J0cykgewotCQlpZiAoSVNfVkFMTEVZVklFVyhkZXYpIHx8 IElTX0NIRVJSWVZJRVcoZGV2KSkgeworCQlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwg SVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJCS8qCiAJCQkgKiBlc2NhcGUgY2xvY2sgZGl2 aWRlciwgMjBNSHosIHNoYXJlZCBmb3IgQSBhbmQgQy4KIAkJCSAqIGRldmljZSByZWFkeSBtdXN0 IGJlIG9mZiB3aGVuIGRvaW5nIHRoaXMhIHR4Y2xrZXNjPwpAQCAtMTQ0OSw3ICsxNDQ5LDcgQEAg dm9pZCBpbnRlbF9kc2lfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmICghaW50ZWxf Ymlvc19pc19kc2lfcHJlc2VudChkZXZfcHJpdiwgJnBvcnQpKQogCQlyZXR1cm47CiAKLQlpZiAo SVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkgeworCWlmIChJU19WQUxM RVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQlkZXZfcHJp di0+bWlwaV9tbWlvX2Jhc2UgPSBWTFZfTUlQSV9CQVNFOwogCX0gZWxzZSBpZiAoSVNfQlJPWFRP TihkZXZfcHJpdikpIHsKIAkJZGV2X3ByaXYtPm1pcGlfbW1pb19iYXNlID0gQlhUX01JUElfQkFT RTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYwppbmRleCBjN2Q5Y2RkZjRlM2UuLmM4MjQzZGM0 ZDJiOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYwpAQCAtODgxLDcgKzg4MSw3IEBAIHN0 YXRpYyB2b2lkIGludGVsX2hkbWlfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rl cikKIAogCWlmIChIQVNfUENIX0NQVChkZXZfcHJpdikpCiAJCWhkbWlfdmFsIHw9IFNEVk9fUElQ RV9TRUxfQ1BUKGNydGMtPnBpcGUpOwotCWVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2KSkKKwll bHNlIGlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJaGRtaV92YWwgfD0gU0RWT19QSVBF X1NFTF9DSFYoY3J0Yy0+cGlwZSk7CiAJZWxzZQogCQloZG1pX3ZhbCB8PSBTRFZPX1BJUEVfU0VM KGNydGMtPnBpcGUpOwpAQCAtOTEzLDcgKzkxMyw3IEBAIHN0YXRpYyBib29sIGludGVsX2hkbWlf Z2V0X2h3X3N0YXRlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCiAJaWYgKEhBU19Q Q0hfQ1BUKGRldl9wcml2KSkKIAkJKnBpcGUgPSBQT1JUX1RPX1BJUEVfQ1BUKHRtcCk7Ci0JZWxz ZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKQorCWVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2X3By aXYpKQogCQkqcGlwZSA9IFNEVk9fUE9SVF9UT19QSVBFX0NIVih0bXApOwogCWVsc2UKIAkJKnBp cGUgPSBQT1JUX1RPX1BJUEUodG1wKTsKQEAgLTE4ODUsNyArMTg4NSw3IEBAIHZvaWQgaW50ZWxf aGRtaV9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdf cG9ydCwKIAkJQlVHKCk7CiAJfQogCi0JaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVS UllWSUVXKGRldikpIHsKKwlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZ VklFVyhkZXZfcHJpdikpIHsKIAkJaW50ZWxfaGRtaS0+d3JpdGVfaW5mb2ZyYW1lID0gdmx2X3dy aXRlX2luZm9mcmFtZTsKIAkJaW50ZWxfaGRtaS0+c2V0X2luZm9mcmFtZXMgPSB2bHZfc2V0X2lu Zm9mcmFtZXM7CiAJCWludGVsX2hkbWktPmluZm9mcmFtZV9lbmFibGVkID0gdmx2X2luZm9mcmFt ZV9lbmFibGVkOwpAQCAtMTk1OSw3ICsxOTU5LDcgQEAgdm9pZCBpbnRlbF9oZG1pX2luaXQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKIAl9CiAJaW50ZWxfZW5jb2Rlci0+Z2V0X2h3X3N0YXRlID0g aW50ZWxfaGRtaV9nZXRfaHdfc3RhdGU7CiAJaW50ZWxfZW5jb2Rlci0+Z2V0X2NvbmZpZyA9IGlu dGVsX2hkbWlfZ2V0X2NvbmZpZzsKLQlpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJaWYgKElT X0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCWludGVsX2VuY29kZXItPnByZV9wbGxfZW5hYmxl ID0gY2h2X2hkbWlfcHJlX3BsbF9lbmFibGU7CiAJCWludGVsX2VuY29kZXItPnByZV9lbmFibGUg PSBjaHZfaGRtaV9wcmVfZW5hYmxlOwogCQlpbnRlbF9lbmNvZGVyLT5lbmFibGUgPSB2bHZfZW5h YmxlX2hkbWk7CkBAIC0xOTgyLDcgKzE5ODIsNyBAQCB2b2lkIGludGVsX2hkbWlfaW5pdChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJaW50ZWxfZW5jb2Rlci0+dHlwZSA9IElOVEVMX09VVFBV VF9IRE1JOwogCWludGVsX2VuY29kZXItPnBvcnQgPSBwb3J0OwotCWlmIChJU19DSEVSUllWSUVX KGRldikpIHsKKwlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJaWYgKHBvcnQgPT0g UE9SVF9EKQogCQkJaW50ZWxfZW5jb2Rlci0+Y3J0Y19tYXNrID0gMSA8PCAyOwogCQllbHNlCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9pMmMuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2kyYy5jCmluZGV4IGFmYjI2NTI5MTlkMC4uZDA0MTg1ZTFlZGQ2IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9pMmMuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9pMmMuYwpAQCAtNjM1LDcgKzYzNSw3IEBAIGludCBpbnRlbF9z ZXR1cF9nbWJ1cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChIQVNfUENIX05PUChkZXZf cHJpdikpCiAJCXJldHVybiAwOwogCi0JaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVS UllWSUVXKGRldikpCisJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJ RVcoZGV2X3ByaXYpKQogCQlkZXZfcHJpdi0+Z3Bpb19tbWlvX2Jhc2UgPSBWTFZfRElTUExBWV9C QVNFOwogCWVsc2UgaWYgKCFIQVNfR01DSF9ESVNQTEFZKGRldl9wcml2KSkKIAkJZGV2X3ByaXYt PmdwaW9fbW1pb19iYXNlID0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDhiMTE1ZGZlNjU0 Ni4uYzMwYTM3NWY2NmEwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTMyMiw3ICszMjIs NyBAQCB2b2lkIGludGVsX3NldF9tZW1vcnlfY3hzcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsIGJvb2wgZW5hYmxlKQogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSAmZGV2X3By aXYtPmRybTsKIAl1MzIgdmFsOwogCi0JaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVS UllWSUVXKGRldikpIHsKKwlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZ VklFVyhkZXZfcHJpdikpIHsKIAkJSTkxNV9XUklURShGV19CTENfU0VMRl9WTFYsIGVuYWJsZSA/ IEZXX0NTUFdSRFdORU4gOiAwKTsKIAkJUE9TVElOR19SRUFEKEZXX0JMQ19TRUxGX1ZMVik7CiAJ CWRldl9wcml2LT53bS52bHYuY3hzciA9IGVuYWJsZTsKQEAgLTc3NjMsNyArNzc2Myw3IEBAIHZv aWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJRFJNX0RFQlVHX0tN UygiRmFpbGVkIHRvIHJlYWQgZGlzcGxheSBwbGFuZSBsYXRlbmN5LiAiCiAJCQkJICAgICAgIkRp c2FibGUgQ3hTUlxuIik7CiAJCX0KLQl9IGVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2KSkgewor CX0gZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJdmx2X3NldHVwX3dtX2xh dGVuY3koZGV2KTsKIAkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtID0gdmx2X3VwZGF0ZV93 bTsKIAl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkgewpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w c3IuYwppbmRleCA0YTk3M2IzNDM0OGEuLjI3MWEzZTI5ZmYyMyAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcHNyLmMKQEAgLTM1NCw3ICszNTQsNyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9wc3JfbWF0Y2hf Y29uZGl0aW9ucyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCQlyZXR1cm4gZmFsc2U7CiAJ fQogCi0JaWYgKChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSAmJgor CWlmICgoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikp ICYmCiAJICAgICFkZXZfcHJpdi0+cHNyLmxpbmtfc3RhbmRieSkgewogCQlEUk1fRVJST1IoIlBT UiBjb25kaXRpb24gZmFpbGVkOiBMaW5rIG9mZiByZXF1ZXN0ZWQgYnV0IG5vdCBzdXBwb3J0ZWQg b24gdGhpcyBwbGF0Zm9ybVxuIik7CiAJCXJldHVybiBmYWxzZTsKQEAgLTgzNyw3ICs4MzcsNyBA QCB2b2lkIGludGVsX3Bzcl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKElTX0hB U1dFTEwoZGV2X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpCiAJCS8qIEhTVyBhbmQg QkRXIHJlcXVpcmUgd29ya2Fyb3VuZHMgdGhhdCB3ZSBkb24ndCBpbXBsZW1lbnQuICovCiAJCWRl dl9wcml2LT5wc3IubGlua19zdGFuZGJ5ID0gZmFsc2U7Ci0JZWxzZSBpZiAoSVNfVkFMTEVZVklF VyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkKKwllbHNlIGlmIChJU19WQUxMRVlWSUVXKGRl dl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJLyogT24gVkxWIGFuZCBDSFYg b25seSBzdGFuZGJ5IG1vZGUgaXMgc3VwcG9ydGVkLiAqLwogCQlkZXZfcHJpdi0+cHNyLmxpbmtf c3RhbmRieSA9IHRydWU7CiAJZWxzZQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcnVudGltZV9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9w bS5jCmluZGV4IGU0YmI4NWM5YzZlMS4uM2E2ZTFhOTNhZWQ5IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcnVudGltZV9wbS5jCkBAIC0yNTk4LDcgKzI1OTgsNyBAQCB2b2lkIGludGVsX3Bv d2VyX2RvbWFpbnNfaW5pdF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGJv b2wgcmVzdW1lKQogCQlza2xfZGlzcGxheV9jb3JlX2luaXQoZGV2X3ByaXYsIHJlc3VtZSk7CiAJ fSBlbHNlIGlmIChJU19CUk9YVE9OKGRldl9wcml2KSkgewogCQlieHRfZGlzcGxheV9jb3JlX2lu aXQoZGV2X3ByaXYsIHJlc3VtZSk7Ci0JfSBlbHNlIGlmIChJU19DSEVSUllWSUVXKGRldikpIHsK Kwl9IGVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCW11dGV4X2xvY2soJnBv d2VyX2RvbWFpbnMtPmxvY2spOwogCQljaHZfcGh5X2NvbnRyb2xfaW5pdChkZXZfcHJpdik7CiAJ CW11dGV4X3VubG9jaygmcG93ZXJfZG9tYWlucy0+bG9jayk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3Nwcml0ZS5jCmluZGV4IGZlZmQzMDM0YWVhZC4uZjc2MGQ1ZmNiZTQ4IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtNDUwLDcgKzQ1MCw3IEBAIHZsdl91cGRhdGVfcGxhbmUo c3RydWN0IGRybV9wbGFuZSAqZHBsYW5lLAogCWlmIChrZXktPmZsYWdzICYgSTkxNV9TRVRfQ09M T1JLRVlfU09VUkNFKQogCQlzcHJjdGwgfD0gU1BfU09VUkNFX0tFWTsKIAotCWlmIChJU19DSEVS UllWSUVXKGRldikgJiYgcGlwZSA9PSBQSVBFX0IpCisJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3By aXYpICYmIHBpcGUgPT0gUElQRV9CKQogCQljaHZfdXBkYXRlX2NzYyhpbnRlbF9wbGFuZSwgZmIt PnBpeGVsX2Zvcm1hdCk7CiAKIAlJOTE1X1dSSVRFKFNQU1RSSURFKHBpcGUsIHBsYW5lKSwgZmIt PnBpdGNoZXNbMF0pOwpAQCAtOTQ0LDYgKzk0NCw3IEBAIGludGVsX2NoZWNrX3Nwcml0ZV9wbGFu ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIGludCBpbnRlbF9zcHJpdGVfc2V0X2NvbG9ya2V5 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJCQkgICAgICBzdHJ1Y3QgZHJt X2ZpbGUgKmZpbGVfcHJpdikKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KGRldik7CiAJc3RydWN0IGRybV9pbnRlbF9zcHJpdGVfY29sb3JrZXkgKnNldCA9 IGRhdGE7CiAJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7CiAJc3RydWN0IGRybV9wbGFuZV9zdGF0 ZSAqcGxhbmVfc3RhdGU7CkBAIC05NTUsNyArOTU2LDcgQEAgaW50IGludGVsX3Nwcml0ZV9zZXRf Y29sb3JrZXkoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAlpZiAoKHNldC0+ ZmxhZ3MgJiAoSTkxNV9TRVRfQ09MT1JLRVlfREVTVElOQVRJT04gfCBJOTE1X1NFVF9DT0xPUktF WV9TT1VSQ0UpKSA9PSAoSTkxNV9TRVRfQ09MT1JLRVlfREVTVElOQVRJT04gfCBJOTE1X1NFVF9D T0xPUktFWV9TT1VSQ0UpKQogCQlyZXR1cm4gLUVJTlZBTDsKIAotCWlmICgoSVNfVkFMTEVZVklF VyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkgJiYKKwlpZiAoKElTX1ZBTExFWVZJRVcoZGV2 X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSAmJgogCSAgICBzZXQtPmZsYWdzICYg STkxNV9TRVRfQ09MT1JLRVlfREVTVElOQVRJT04pCiAJCXJldHVybiAtRUlOVkFMOwogCkBAIC0x MDQyLDYgKzEwNDMsNyBAQCBzdGF0aWMgdWludDMyX3Qgc2tsX3BsYW5lX2Zvcm1hdHNbXSA9IHsK IGludAogaW50ZWxfcGxhbmVfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBlbnVtIHBpcGUg cGlwZSwgaW50IHBsYW5lKQogeworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gTlVMTDsK IAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlID0gTlVMTDsKIAl1bnNpZ25lZCBsb25n IHBvc3NpYmxlX2NydGNzOwpAQCAtMTA4NCw3ICsxMDg2LDcgQEAgaW50ZWxfcGxhbmVfaW5pdChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBlbnVtIHBpcGUgcGlwZSwgaW50IHBsYW5lKQogCiAJY2Fz ZSA3OgogCWNhc2UgODoKLQkJaWYgKElTX0lWWUJSSURHRSh0b19pOTE1KGRldikpKSB7CisJCWlm IChJU19JVllCUklER0UoZGV2X3ByaXYpKSB7CiAJCQlpbnRlbF9wbGFuZS0+Y2FuX3NjYWxlID0g dHJ1ZTsKIAkJCWludGVsX3BsYW5lLT5tYXhfZG93bnNjYWxlID0gMjsKIAkJfSBlbHNlIHsKQEAg LTEwOTIsNyArMTA5NCw3IEBAIGludGVsX3BsYW5lX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgZW51bSBwaXBlIHBpcGUsIGludCBwbGFuZSkKIAkJCWludGVsX3BsYW5lLT5tYXhfZG93bnNj YWxlID0gMTsKIAkJfQogCi0JCWlmIChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklF VyhkZXYpKSB7CisJCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVX KGRldl9wcml2KSkgewogCQkJaW50ZWxfcGxhbmUtPnVwZGF0ZV9wbGFuZSA9IHZsdl91cGRhdGVf cGxhbmU7CiAJCQlpbnRlbF9wbGFuZS0+ZGlzYWJsZV9wbGFuZSA9IHZsdl9kaXNhYmxlX3BsYW5l OwogCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==