From: Tvrtko Ursulin Subject: [CI 13/19] drm/i915: Make IS_BROXTON only take dev_priv Date: Thu, 13 Oct 2016 11:03:04 +0100 Message-ID: <1476352990-2504-13-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 D671F6EA05 for ; Thu, 13 Oct 2016 10:03:31 +0000 (UTC) Received: by mail-lf0-x243.google.com with SMTP id b75so11686654lfg.3 for ; Thu, 13 Oct 2016 03:03:31 -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.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Oct 2016 03:03:29 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDEz OTIgYnl0ZXMgb2YgLnJvZGF0YSBzdHJpbmdzLgoKQWxzbyBjaGFuZ2UgYSBmZXcgZnVuY3Rpb24v bWFjcm8gcHJvdG90eXBlcyBpbiBpOTE1X2dlbV9ndHQuYwpmcm9tIGRldiB0byBkZXZfcHJpdiB3 aGVyZSBpdCBtYWRlIG1vcmUgc2Vuc2UgdG8gZG8gc28uCgp2MjogQWRkIHBhcmFudGhlc2VzIGFy b3VuZCBkZXZfcHJpdi4gKFZpbGxlIFN5cmphbGEpCnYzOiBNZW50aW9uIGZ1bmN0aW9uIHByb3Rv dHlwZSBjaGFuZ2VzLiAoRGF2aWQgV2VpbmVoYWxsKQoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVy c3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IERhdmlkIFdlaW5laGFsbCA8ZGF2 aWQud2VpbmVoYWxsQGxpbnV4LmludGVsLmNvbT4KQWNrZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRh bmllbC52ZXR0ZXJAZmZ3bGwuY2g+CkFja2VkLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFA bGludXguaW50ZWwuY29tPgpBY2tlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxz b24uY28udWs+CkFja2VkLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RA bGludXguaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogRGF2aWQgV2VpbmVoYWxsIDxkYXZpZC53ZWlu ZWhhbGxAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmMgICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAg ICAgfCAgNSArKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgICAgIHwg NDAgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2lycS5jICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGRpLmMgICAgICAgIHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jICAgIHwgMzEgKysrKysrKysrKysrKystLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHAuYyAgICAgICAgIHwgMTYgKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHBsbF9tZ3IuYyAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RzaS5jICAgICAgICB8IDI3ICsrKysrKysrKysrLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RzaV9wbGwuYyAgICB8IDI2ICsrKysrKysrKystLS0tLS0tLS0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIHwgIDggKysrLS0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jICAgICAgIHwgIDYgKystLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyB8ICAyICstCiAxMyBmaWxlcyBjaGFuZ2Vk LCA4OSBpbnNlcnRpb25zKCspLCA4MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu YwppbmRleCA5MDc1ZDYxMWFmZGMuLmIyOGIxNzg1MDk3NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5jCkBAIC0yNDEzLDcgKzI0MTMsNyBAQCBzdGF0aWMgaW50IGludGVsX3J1bnRpbWVfcmVzdW1l KHN0cnVjdCBkZXZpY2UgKmtkZXYpCiAJaWYgKElTX0dFTjYoZGV2X3ByaXYpKQogCQlpbnRlbF9p bml0X3BjaF9yZWZjbGsoZGV2KTsKIAotCWlmIChJU19CUk9YVE9OKGRldikpIHsKKwlpZiAoSVNf QlJPWFRPTihkZXZfcHJpdikpIHsKIAkJYnh0X2Rpc2FibGVfZGM5KGRldl9wcml2KTsKIAkJYnh0 X2Rpc3BsYXlfY29yZV9pbml0KGRldl9wcml2LCB0cnVlKTsKIAkJaWYgKGRldl9wcml2LT5jc3Iu ZG1jX3BheWxvYWQgJiYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDI5N2Y2YTEwM2Q1NC4u OWFkNzlkMTk2YTczIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI2NjcsNyArMjY2Nyw3 IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogI2RlZmluZSBJU19IQVNXRUxMKGRldl9w cml2KQkoKGRldl9wcml2KS0+aW5mby5pc19oYXN3ZWxsKQogI2RlZmluZSBJU19CUk9BRFdFTEwo ZGV2X3ByaXYpCSgoZGV2X3ByaXYpLT5pbmZvLmlzX2Jyb2Fkd2VsbCkKICNkZWZpbmUgSVNfU0tZ TEFLRShkZXZfcHJpdikJKChkZXZfcHJpdiktPmluZm8uaXNfc2t5bGFrZSkKLSNkZWZpbmUgSVNf QlJPWFRPTihkZXYpCQkoSU5URUxfSU5GTyhkZXYpLT5pc19icm94dG9uKQorI2RlZmluZSBJU19C Uk9YVE9OKGRldl9wcml2KQkoKGRldl9wcml2KS0+aW5mby5pc19icm94dG9uKQogI2RlZmluZSBJ U19LQUJZTEFLRShkZXZfcHJpdikJKChkZXZfcHJpdiktPmluZm8uaXNfa2FieWxha2UpCiAjZGVm aW5lIElTX01PQklMRShkZXYpCQkoSU5URUxfSU5GTyhkZXYpLT5pc19tb2JpbGUpCiAjZGVmaW5l IElTX0hTV19FQVJMWV9TRFYoZGV2X3ByaXYpIChJU19IQVNXRUxMKGRldl9wcml2KSAmJiBcCkBA IC0yNzI3LDcgKzI3MjcsOCBAQCBzdHJ1Y3QgZHJtX2k5MTVfY21kX3RhYmxlIHsKICNkZWZpbmUg QlhUX1JFVklEX0IwCQkweDMKICNkZWZpbmUgQlhUX1JFVklEX0MwCQkweDkKIAotI2RlZmluZSBJ U19CWFRfUkVWSUQocCwgc2luY2UsIHVudGlsKSAoSVNfQlJPWFRPTihwKSAmJiBJU19SRVZJRChw LCBzaW5jZSwgdW50aWwpKQorI2RlZmluZSBJU19CWFRfUkVWSUQoZGV2X3ByaXYsIHNpbmNlLCB1 bnRpbCkgXAorCShJU19CUk9YVE9OKGRldl9wcml2KSAmJiBJU19SRVZJRChkZXZfcHJpdiwgc2lu Y2UsIHVudGlsKSkKIAogI2RlZmluZSBLQkxfUkVWSURfQTAJCTB4MAogI2RlZmluZSBLQkxfUkVW SURfQjAJCTB4MQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCAwYjQ3MDJjZWRh ZDEuLmQyMTVkYjVlNmQzOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTM3 MywyNyArMzczLDI5IEBAIHN0YXRpYyB2b2lkICprbWFwX3BhZ2VfZG1hKHN0cnVjdCBpOTE1X3Bh Z2VfZG1hICpwKQogLyogV2UgdXNlIHRoZSBmbHVzaGluZyB1bm1hcCBvbmx5IHdpdGggcHBndHQg c3RydWN0dXJlczoKICAqIHBhZ2UgZGlyZWN0b3JpZXMsIHBhZ2UgdGFibGVzIGFuZCBzY3JhdGNo IHBhZ2VzLgogICovCi1zdGF0aWMgdm9pZCBrdW5tYXBfcGFnZV9kbWEoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgdm9pZCAqdmFkZHIpCitzdGF0aWMgdm9pZCBrdW5tYXBfcGFnZV9kbWEoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB2b2lkICp2YWRkcikKIHsKIAkvKiBUaGVyZSBh cmUgb25seSBmZXcgZXhjZXB0aW9ucyBmb3IgZ2VuID49Ni4gY2h2IGFuZCBieHQuCiAJICogQW5k IHdlIGFyZSBub3Qgc3VyZSBhYm91dCB0aGUgbGF0dGVyIHNvIHBsYXkgc2FmZSBmb3Igbm93Lgog CSAqLwotCWlmIChJU19DSEVSUllWSUVXKGRldikgfHwgSVNfQlJPWFRPTihkZXYpKQorCWlmIChJ U19DSEVSUllWSUVXKGRldl9wcml2KSB8fCBJU19CUk9YVE9OKGRldl9wcml2KSkKIAkJZHJtX2Ns Zmx1c2hfdmlydF9yYW5nZSh2YWRkciwgUEFHRV9TSVpFKTsKIAogCWt1bm1hcF9hdG9taWModmFk ZHIpOwogfQogCiAjZGVmaW5lIGttYXBfcHgocHgpIGttYXBfcGFnZV9kbWEocHhfYmFzZShweCkp Ci0jZGVmaW5lIGt1bm1hcF9weChwcGd0dCwgdmFkZHIpIGt1bm1hcF9wYWdlX2RtYSgocHBndHQp LT5iYXNlLmRldiwgKHZhZGRyKSkKKyNkZWZpbmUga3VubWFwX3B4KHBwZ3R0LCB2YWRkcikgXAor CQlrdW5tYXBfcGFnZV9kbWEodG9faTkxNSgocHBndHQpLT5iYXNlLmRldiksICh2YWRkcikpCiAK ICNkZWZpbmUgc2V0dXBfcHgoZGV2LCBweCkgc2V0dXBfcGFnZV9kbWEoKGRldiksIHB4X2Jhc2Uo cHgpKQogI2RlZmluZSBjbGVhbnVwX3B4KGRldiwgcHgpIGNsZWFudXBfcGFnZV9kbWEoKGRldiks IHB4X2Jhc2UocHgpKQotI2RlZmluZSBmaWxsX3B4KGRldiwgcHgsIHYpIGZpbGxfcGFnZV9kbWEo KGRldiksIHB4X2Jhc2UocHgpLCAodikpCi0jZGVmaW5lIGZpbGwzMl9weChkZXYsIHB4LCB2KSBm aWxsX3BhZ2VfZG1hXzMyKChkZXYpLCBweF9iYXNlKHB4KSwgKHYpKQorI2RlZmluZSBmaWxsX3B4 KGRldl9wcml2LCBweCwgdikgZmlsbF9wYWdlX2RtYSgoZGV2X3ByaXYpLCBweF9iYXNlKHB4KSwg KHYpKQorI2RlZmluZSBmaWxsMzJfcHgoZGV2X3ByaXYsIHB4LCB2KSBcCisJCWZpbGxfcGFnZV9k bWFfMzIoKGRldl9wcml2KSwgcHhfYmFzZShweCksICh2KSkKIAotc3RhdGljIHZvaWQgZmlsbF9w YWdlX2RtYShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaTkxNV9wYWdlX2RtYSAqcCwK LQkJCSAgY29uc3QgdWludDY0X3QgdmFsKQorc3RhdGljIHZvaWQgZmlsbF9wYWdlX2RtYShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkgIHN0cnVjdCBpOTE1X3BhZ2VfZG1h ICpwLCBjb25zdCB1aW50NjRfdCB2YWwpCiB7CiAJaW50IGk7CiAJdWludDY0X3QgKiBjb25zdCB2 YWRkciA9IGttYXBfcGFnZV9kbWEocCk7CkBAIC00MDEsMTcgKzQwMywxNyBAQCBzdGF0aWMgdm9p ZCBmaWxsX3BhZ2VfZG1hKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpOTE1X3BhZ2Vf ZG1hICpwLAogCWZvciAoaSA9IDA7IGkgPCA1MTI7IGkrKykKIAkJdmFkZHJbaV0gPSB2YWw7CiAK LQlrdW5tYXBfcGFnZV9kbWEoZGV2LCB2YWRkcik7CisJa3VubWFwX3BhZ2VfZG1hKGRldl9wcml2 LCB2YWRkcik7CiB9CiAKLXN0YXRpYyB2b2lkIGZpbGxfcGFnZV9kbWFfMzIoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgc3RydWN0IGk5MTVfcGFnZV9kbWEgKnAsCi0JCQkgICAgIGNvbnN0IHVpbnQz Ml90IHZhbDMyKQorc3RhdGljIHZvaWQgZmlsbF9wYWdlX2RtYV8zMihzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkgICAgIHN0cnVjdCBpOTE1X3BhZ2VfZG1hICpwLCBjb25z dCB1aW50MzJfdCB2YWwzMikKIHsKIAl1aW50NjRfdCB2ID0gdmFsMzI7CiAKIAl2ID0gdiA8PCAz MiB8IHZhbDMyOwogCi0JZmlsbF9wYWdlX2RtYShkZXYsIHAsIHYpOworCWZpbGxfcGFnZV9kbWEo ZGV2X3ByaXYsIHAsIHYpOwogfQogCiBzdGF0aWMgaW50CkBAIC00NzQsNyArNDc2LDcgQEAgc3Rh dGljIHZvaWQgZ2VuOF9pbml0aWFsaXplX3B0KHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZt LAogCXNjcmF0Y2hfcHRlID0gZ2VuOF9wdGVfZW5jb2RlKHZtLT5zY3JhdGNoX3BhZ2UuZGFkZHIs CiAJCQkJICAgICAgSTkxNV9DQUNIRV9MTEMsIHRydWUpOwogCi0JZmlsbF9weCh2bS0+ZGV2LCBw dCwgc2NyYXRjaF9wdGUpOworCWZpbGxfcHgodG9faTkxNSh2bS0+ZGV2KSwgcHQsIHNjcmF0Y2hf cHRlKTsKIH0KIAogc3RhdGljIHZvaWQgZ2VuNl9pbml0aWFsaXplX3B0KHN0cnVjdCBpOTE1X2Fk ZHJlc3Nfc3BhY2UgKnZtLApAQCAtNDg3LDcgKzQ4OSw3IEBAIHN0YXRpYyB2b2lkIGdlbjZfaW5p dGlhbGl6ZV9wdChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAlzY3JhdGNoX3B0ZSA9 IHZtLT5wdGVfZW5jb2RlKHZtLT5zY3JhdGNoX3BhZ2UuZGFkZHIsCiAJCQkJICAgICBJOTE1X0NB Q0hFX0xMQywgdHJ1ZSwgMCk7CiAKLQlmaWxsMzJfcHgodm0tPmRldiwgcHQsIHNjcmF0Y2hfcHRl KTsKKwlmaWxsMzJfcHgodG9faTkxNSh2bS0+ZGV2KSwgcHQsIHNjcmF0Y2hfcHRlKTsKIH0KIAog c3RhdGljIHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICphbGxvY19wZChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQpAQCAtNTM0LDcgKzUzNiw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfaW5pdGlhbGl6 ZV9wZChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAogCXNjcmF0Y2hfcGRlID0gZ2Vu OF9wZGVfZW5jb2RlKHB4X2RtYSh2bS0+c2NyYXRjaF9wdCksIEk5MTVfQ0FDSEVfTExDKTsKIAot CWZpbGxfcHgodm0tPmRldiwgcGQsIHNjcmF0Y2hfcGRlKTsKKwlmaWxsX3B4KHRvX2k5MTUodm0t PmRldiksIHBkLCBzY3JhdGNoX3BkZSk7CiB9CiAKIHN0YXRpYyBpbnQgX19wZHBfaW5pdChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LApAQCAtNjE1LDcgKzYxNyw3IEBAIHN0YXRpYyB2b2lkIGdlbjhf aW5pdGlhbGl6ZV9wZHAoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAKIAlzY3JhdGNo X3BkcGUgPSBnZW44X3BkcGVfZW5jb2RlKHB4X2RtYSh2bS0+c2NyYXRjaF9wZCksIEk5MTVfQ0FD SEVfTExDKTsKIAotCWZpbGxfcHgodm0tPmRldiwgcGRwLCBzY3JhdGNoX3BkcGUpOworCWZpbGxf cHgodG9faTkxNSh2bS0+ZGV2KSwgcGRwLCBzY3JhdGNoX3BkcGUpOwogfQogCiBzdGF0aWMgdm9p ZCBnZW44X2luaXRpYWxpemVfcG1sNChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKQEAg LTYyNiw3ICs2MjgsNyBAQCBzdGF0aWMgdm9pZCBnZW44X2luaXRpYWxpemVfcG1sNChzdHJ1Y3Qg aTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAlzY3JhdGNoX3BtbDRlID0gZ2VuOF9wbWw0ZV9lbmNv ZGUocHhfZG1hKHZtLT5zY3JhdGNoX3BkcCksCiAJCQkJCSAgSTkxNV9DQUNIRV9MTEMpOwogCi0J ZmlsbF9weCh2bS0+ZGV2LCBwbWw0LCBzY3JhdGNoX3BtbDRlKTsKKwlmaWxsX3B4KHRvX2k5MTUo dm0tPmRldiksIHBtbDQsIHNjcmF0Y2hfcG1sNGUpOwogfQogCiBzdGF0aWMgdm9pZApAQCAtMjEz NSw3ICsyMTM3LDcgQEAgc3RhdGljIHZvaWQgZ3R0X3dyaXRlX3dvcmthcm91bmRzKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJCUk5MTVfV1JJVEUoR0VOOF9MM19MUkFfMV9HUEdQVSwgR0VOOF9M M19MUkFfMV9HUEdQVV9ERUZBVUxUX1ZBTFVFX0NIVik7CiAJZWxzZSBpZiAoSVNfU0tZTEFLRShk ZXZfcHJpdikpCiAJCUk5MTVfV1JJVEUoR0VOOF9MM19MUkFfMV9HUEdQVSwgR0VOOV9MM19MUkFf MV9HUEdQVV9ERUZBVUxUX1ZBTFVFX1NLTCk7Ci0JZWxzZSBpZiAoSVNfQlJPWFRPTihkZXYpKQor CWVsc2UgaWYgKElTX0JST1hUT04oZGV2X3ByaXYpKQogCQlJOTE1X1dSSVRFKEdFTjhfTDNfTFJB XzFfR1BHUFUsIEdFTjlfTDNfTFJBXzFfR1BHUFVfREVGQVVMVF9WQUxVRV9CWFQpOwogfQogCkBA IC0yOTEyLDcgKzI5MTQsNyBAQCBzdGF0aWMgaW50IGdndHRfcHJvYmVfY29tbW9uKHN0cnVjdCBp OTE1X2dndHQgKmdndHQsIHU2NCBzaXplKQogCSAqIHJlc29ydCB0byBhbiB1bmNhY2hlZCBtYXBw aW5nLiBUaGUgV0MgaXNzdWUgaXMgZWFzaWx5IGNhdWdodCBieSB0aGUKIAkgKiByZWFkYmFjayBj aGVjayB3aGVuIHdyaXRpbmcgR1RUIFBURSBlbnRyaWVzLgogCSAqLwotCWlmIChJU19CUk9YVE9O KGdndHQtPmJhc2UuZGV2KSkKKwlpZiAoSVNfQlJPWFRPTih0b19pOTE1KGdndHQtPmJhc2UuZGV2 KSkpCiAJCWdndHQtPmdzbSA9IGlvcmVtYXBfbm9jYWNoZShwaHlzX2FkZHIsIHNpemUpOwogCWVs c2UKIAkJZ2d0dC0+Z3NtID0gaW9yZW1hcF93YyhwaHlzX2FkZHIsIHNpemUpOwpAQCAtMzI4NCw3 ICszMjg2LDcgQEAgdm9pZCBpOTE1X2dlbV9yZXN0b3JlX2d0dF9tYXBwaW5ncyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCWdndHQtPmJhc2UuY2xvc2VkID0gZmFsc2U7CiAKIAlpZiAoSU5URUxf SU5GTyhkZXYpLT5nZW4gPj0gOCkgewotCQlpZiAoSVNfQ0hFUlJZVklFVyhkZXYpIHx8IElTX0JS T1hUT04oZGV2KSkKKwkJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpIHx8IElTX0JST1hUT04o ZGV2X3ByaXYpKQogCQkJY2h2X3NldHVwX3ByaXZhdGVfcHBhdChkZXZfcHJpdik7CiAJCWVsc2UK IAkJCWJkd19zZXR1cF9wcml2YXRlX3BwYXQoZGV2X3ByaXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJx LmMKaW5kZXggYWU0M2Q1ZWJkNzZhLi5hOWE3M2M0YjQ5MzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9p cnEuYwpAQCAtNDU5Nyw3ICs0NTk3LDcgQEAgdm9pZCBpbnRlbF9pcnFfaW5pdChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCWRldi0+ZHJpdmVyLT5pcnFfdW5pbnN0YWxsID0g Z2VuOF9pcnFfdW5pbnN0YWxsOwogCQlkZXYtPmRyaXZlci0+ZW5hYmxlX3ZibGFuayA9IGdlbjhf ZW5hYmxlX3ZibGFuazsKIAkJZGV2LT5kcml2ZXItPmRpc2FibGVfdmJsYW5rID0gZ2VuOF9kaXNh YmxlX3ZibGFuazsKLQkJaWYgKElTX0JST1hUT04oZGV2KSkKKwkJaWYgKElTX0JST1hUT04oZGV2 X3ByaXYpKQogCQkJZGV2X3ByaXYtPmRpc3BsYXkuaHBkX2lycV9zZXR1cCA9IGJ4dF9ocGRfaXJx X3NldHVwOwogCQllbHNlIGlmIChIQVNfUENIX1NQVChkZXZfcHJpdikgfHwgSEFTX1BDSF9LQlAo ZGV2X3ByaXYpKQogCQkJZGV2X3ByaXYtPmRpc3BsYXkuaHBkX2lycV9zZXR1cCA9IHNwdF9ocGRf aXJxX3NldHVwOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYwppbmRleCAwNzE2NGUyNTBhZGYuLmE3 NmFmZDdhNjYxNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKQEAgLTI1MDksNyArMjUwOSw3 IEBAIHZvaWQgaW50ZWxfZGRpX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBwb3J0 IHBvcnQpCiAJICogY29uZmlndXJhdGlvbiBzbyB0aGF0IHdlIHVzZSB0aGUgcHJvcGVyIGxhbmUg Y291bnQgZm9yIG91cgogCSAqIGNhbGN1bGF0aW9ucy4KIAkgKi8KLQlpZiAoSVNfQlJPWFRPTihk ZXYpICYmIHBvcnQgPT0gUE9SVF9BKSB7CisJaWYgKElTX0JST1hUT04oZGV2X3ByaXYpICYmIHBv cnQgPT0gUE9SVF9BKSB7CiAJCWlmICghKGludGVsX2RpZ19wb3J0LT5zYXZlZF9wb3J0X2JpdHMg JiBERElfQV80X0xBTkVTKSkgewogCQkJRFJNX0RFQlVHX0tNUygiQlhUIEJJT1MgZm9yZ290IHRv IHNldCBERElfQV80X0xBTkVTIGZvciBwb3J0IEE7IGZpeGluZ1xuIik7CiAJCQlpbnRlbF9kaWdf cG9ydC0+c2F2ZWRfcG9ydF9iaXRzIHw9IERESV9BXzRfTEFORVM7CkBAIC0yNTMzLDcgKzI1MzMs NyBAQCB2b2lkIGludGVsX2RkaV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVudW0gcG9y dCBwb3J0KQogCQkgKiBPbiBCWFQgQTAvQTEsIHN3IG5lZWRzIHRvIGFjdGl2YXRlIERESUEgSFBE IGxvZ2ljIGFuZAogCQkgKiBpbnRlcnJ1cHRzIHRvIGNoZWNrIHRoZSBleHRlcm5hbCBwYW5lbCBj b25uZWN0aW9uLgogCQkgKi8KLQkJaWYgKElTX0JYVF9SRVZJRChkZXYsIDAsIEJYVF9SRVZJRF9B MSkgJiYgcG9ydCA9PSBQT1JUX0IpCisJCWlmIChJU19CWFRfUkVWSUQoZGV2X3ByaXYsIDAsIEJY VF9SRVZJRF9BMSkgJiYgcG9ydCA9PSBQT1JUX0IpCiAJCQlkZXZfcHJpdi0+aG90cGx1Zy5pcnFf cG9ydFtQT1JUX0FdID0gaW50ZWxfZGlnX3BvcnQ7CiAJCWVsc2UKIAkJCWRldl9wcml2LT5ob3Rw bHVnLmlycV9wb3J0W3BvcnRdID0gaW50ZWxfZGlnX3BvcnQ7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKaW5kZXggMmM3ODk5MDAwYjc0Li4zZDJiZDU1MDRhYjQgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTYwMCw3ICs2MDAsNyBAQCBpbnQgY2h2X2NhbGNf ZHBsbF9wYXJhbXMoaW50IHJlZmNsaywgc3RydWN0IGRwbGwgKmNsb2NrKQogICogdGhlIGdpdmVu IGNvbm5lY3RvcnMuCiAgKi8KIAotc3RhdGljIGJvb2wgaW50ZWxfUExMX2lzX3ZhbGlkKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCitzdGF0aWMgYm9vbCBpbnRlbF9QTExfaXNfdmFsaWQoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgICAgIGNvbnN0IHN0cnVjdCBpbnRl bF9saW1pdCAqbGltaXQsCiAJCQkgICAgICAgY29uc3Qgc3RydWN0IGRwbGwgKmNsb2NrKQogewpA QCAtNjEzLDEyICs2MTMsMTMgQEAgc3RhdGljIGJvb2wgaW50ZWxfUExMX2lzX3ZhbGlkKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAJaWYgKGNsb2NrLT5tMSAgPCBsaW1pdC0+bTEubWluICB8fCBs aW1pdC0+bTEubWF4ICA8IGNsb2NrLT5tMSkKIAkJSU5URUxQbGxJbnZhbGlkKCJtMSBvdXQgb2Yg cmFuZ2VcbiIpOwogCi0JaWYgKCFJU19QSU5FVklFVyhkZXYpICYmICFJU19WQUxMRVlWSUVXKGRl dikgJiYKLQkgICAgIUlTX0NIRVJSWVZJRVcoZGV2KSAmJiAhSVNfQlJPWFRPTihkZXYpKQorCWlm ICghSVNfUElORVZJRVcoZGV2X3ByaXYpICYmICFJU19WQUxMRVlWSUVXKGRldl9wcml2KSAmJgor CSAgICAhSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikgJiYgIUlTX0JST1hUT04oZGV2X3ByaXYpKQog CQlpZiAoY2xvY2stPm0xIDw9IGNsb2NrLT5tMikKIAkJCUlOVEVMUGxsSW52YWxpZCgibTEgPD0g bTJcbiIpOwogCi0JaWYgKCFJU19WQUxMRVlWSUVXKGRldikgJiYgIUlTX0NIRVJSWVZJRVcoZGV2 KSAmJiAhSVNfQlJPWFRPTihkZXYpKSB7CisJaWYgKCFJU19WQUxMRVlWSUVXKGRldl9wcml2KSAm JiAhSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikgJiYKKwkgICAgIUlTX0JST1hUT04oZGV2X3ByaXYp KSB7CiAJCWlmIChjbG9jay0+cCA8IGxpbWl0LT5wLm1pbiB8fCBsaW1pdC0+cC5tYXggPCBjbG9j ay0+cCkKIAkJCUlOVEVMUGxsSW52YWxpZCgicCBvdXQgb2YgcmFuZ2VcbiIpOwogCQlpZiAoY2xv Y2stPm0gPCBsaW1pdC0+bS5taW4gfHwgbGltaXQtPm0ubWF4IDwgY2xvY2stPm0pCkBAIC02OTgs NyArNjk5LDggQEAgaTl4eF9maW5kX2Jlc3RfZHBsbChjb25zdCBzdHJ1Y3QgaW50ZWxfbGltaXQg KmxpbWl0LAogCQkJCQlpbnQgdGhpc19lcnI7CiAKIAkJCQkJaTl4eF9jYWxjX2RwbGxfcGFyYW1z KHJlZmNsaywgJmNsb2NrKTsKLQkJCQkJaWYgKCFpbnRlbF9QTExfaXNfdmFsaWQoZGV2LCBsaW1p dCwKKwkJCQkJaWYgKCFpbnRlbF9QTExfaXNfdmFsaWQodG9faTkxNShkZXYpLAorCQkJCQkJCQls aW1pdCwKIAkJCQkJCQkJJmNsb2NrKSkKIAkJCQkJCWNvbnRpbnVlOwogCQkJCQlpZiAobWF0Y2hf Y2xvY2sgJiYKQEAgLTc1Myw3ICs3NTUsOCBAQCBwbnZfZmluZF9iZXN0X2RwbGwoY29uc3Qgc3Ry dWN0IGludGVsX2xpbWl0ICpsaW1pdCwKIAkJCQkJaW50IHRoaXNfZXJyOwogCiAJCQkJCXBudl9j YWxjX2RwbGxfcGFyYW1zKHJlZmNsaywgJmNsb2NrKTsKLQkJCQkJaWYgKCFpbnRlbF9QTExfaXNf dmFsaWQoZGV2LCBsaW1pdCwKKwkJCQkJaWYgKCFpbnRlbF9QTExfaXNfdmFsaWQodG9faTkxNShk ZXYpLAorCQkJCQkJCQlsaW1pdCwKIAkJCQkJCQkJJmNsb2NrKSkKIAkJCQkJCWNvbnRpbnVlOwog CQkJCQlpZiAobWF0Y2hfY2xvY2sgJiYKQEAgLTgxMyw3ICs4MTYsOCBAQCBnNHhfZmluZF9iZXN0 X2RwbGwoY29uc3Qgc3RydWN0IGludGVsX2xpbWl0ICpsaW1pdCwKIAkJCQkJaW50IHRoaXNfZXJy OwogCiAJCQkJCWk5eHhfY2FsY19kcGxsX3BhcmFtcyhyZWZjbGssICZjbG9jayk7Ci0JCQkJCWlm ICghaW50ZWxfUExMX2lzX3ZhbGlkKGRldiwgbGltaXQsCisJCQkJCWlmICghaW50ZWxfUExMX2lz X3ZhbGlkKHRvX2k5MTUoZGV2KSwKKwkJCQkJCQkJbGltaXQsCiAJCQkJCQkJCSZjbG9jaykpCiAJ CQkJCQljb250aW51ZTsKIApAQCAtOTA5LDcgKzkxMyw4IEBAIHZsdl9maW5kX2Jlc3RfZHBsbChj b25zdCBzdHJ1Y3QgaW50ZWxfbGltaXQgKmxpbWl0LAogCiAJCQkJCXZsdl9jYWxjX2RwbGxfcGFy YW1zKHJlZmNsaywgJmNsb2NrKTsKIAotCQkJCQlpZiAoIWludGVsX1BMTF9pc192YWxpZChkZXYs IGxpbWl0LAorCQkJCQlpZiAoIWludGVsX1BMTF9pc192YWxpZCh0b19pOTE1KGRldiksCisJCQkJ CQkJCWxpbWl0LAogCQkJCQkJCQkmY2xvY2spKQogCQkJCQkJY29udGludWU7CiAKQEAgLTk3Nyw3 ICs5ODIsNyBAQCBjaHZfZmluZF9iZXN0X2RwbGwoY29uc3Qgc3RydWN0IGludGVsX2xpbWl0ICps aW1pdCwKIAogCQkJY2h2X2NhbGNfZHBsbF9wYXJhbXMocmVmY2xrLCAmY2xvY2spOwogCi0JCQlp ZiAoIWludGVsX1BMTF9pc192YWxpZChkZXYsIGxpbWl0LCAmY2xvY2spKQorCQkJaWYgKCFpbnRl bF9QTExfaXNfdmFsaWQodG9faTkxNShkZXYpLCBsaW1pdCwgJmNsb2NrKSkKIAkJCQljb250aW51 ZTsKIAogCQkJaWYgKCF2bHZfUExMX2lzX29wdGltYWwoZGV2LCB0YXJnZXQsICZjbG9jaywgYmVz dF9jbG9jaywKQEAgLTU4NTAsNyArNTg1NSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3VwZGF0ZV9t YXhfY2RjbGsoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCW1heF9jZGNsayA9IDMwODU3MTsK IAogCQlkZXZfcHJpdi0+bWF4X2NkY2xrX2ZyZXEgPSBza2xfY2FsY19jZGNsayhtYXhfY2RjbGss IHZjbyk7Ci0JfSBlbHNlIGlmIChJU19CUk9YVE9OKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX0JS T1hUT04oZGV2X3ByaXYpKSB7CiAJCWRldl9wcml2LT5tYXhfY2RjbGtfZnJlcSA9IDYyNDAwMDsK IAl9IGVsc2UgaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikpICB7CiAJCS8qCkBAIC0xMDY0OCw3 ICsxMDY1Myw3IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxfZ2V0X2RkaV9wb3J0X3N0YXRlKHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjLAogCiAJaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpIHx8IElTX0tB QllMQUtFKGRldl9wcml2KSkKIAkJc2t5bGFrZV9nZXRfZGRpX3BsbChkZXZfcHJpdiwgcG9ydCwg cGlwZV9jb25maWcpOwotCWVsc2UgaWYgKElTX0JST1hUT04oZGV2KSkKKwllbHNlIGlmIChJU19C Uk9YVE9OKGRldl9wcml2KSkKIAkJYnh0X2dldF9kZGlfcGxsKGRldl9wcml2LCBwb3J0LCBwaXBl X2NvbmZpZyk7CiAJZWxzZQogCQloYXN3ZWxsX2dldF9kZGlfcGxsKGRldl9wcml2LCBwb3J0LCBw aXBlX2NvbmZpZyk7CkBAIC0xMjgwNiw3ICsxMjgxMSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2R1 bXBfcGlwZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJRFJNX0RFQlVHX0tNUygi aXBzOiAlaVxuIiwgcGlwZV9jb25maWctPmlwc19lbmFibGVkKTsKIAlEUk1fREVCVUdfS01TKCJk b3VibGUgd2lkZTogJWlcbiIsIHBpcGVfY29uZmlnLT5kb3VibGVfd2lkZSk7CiAKLQlpZiAoSVNf QlJPWFRPTihkZXYpKSB7CisJaWYgKElTX0JST1hUT04oZGV2X3ByaXYpKSB7CiAJCURSTV9ERUJV R19LTVMoImRwbGxfaHdfc3RhdGU6IGViYjA6IDB4JXgsIGViYjQ6IDB4JXgsIgogCQkJICAgICAg InBsbDA6IDB4JXgsIHBsbDE6IDB4JXgsIHBsbDI6IDB4JXgsIHBsbDM6IDB4JXgsICIKIAkJCSAg ICAgICJwbGw2OiAweCV4LCBwbGw4OiAweCV4LCBwbGw5OiAweCV4LCBwbGwxMDogMHgleCwgcGNz ZHcxMjogMHgleFxuIiwKQEAgLTE1Mzk5LDcgKzE1NDA0LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxf c2V0dXBfb3V0cHV0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChpbnRlbF9jcnRfcHJl c2VudChkZXYpKQogCQlpbnRlbF9jcnRfaW5pdChkZXYpOwogCi0JaWYgKElTX0JST1hUT04oZGV2 KSkgeworCWlmIChJU19CUk9YVE9OKGRldl9wcml2KSkgewogCQkvKgogCQkgKiBGSVhNRTogQnJv eHRvbiBkb2Vzbid0IHN1cHBvcnQgcG9ydCBkZXRlY3Rpb24gdmlhIHRoZQogCQkgKiBERElfQlVG X0NUTF9BIG9yIFNGVVNFX1NUUkFQIHJlZ2lzdGVycywgZmluZCBhbm90aGVyIHdheSB0bwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2RwLmMKaW5kZXggMDJlNzRjNDY3YTU1Li5iNmM4YjI1ZWUxZDQgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtNTcxLDcgKzU3MSw3IEBAIHZvaWQgaW50ZWxfcG93ZXJf c2VxdWVuY2VyX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlzdHJ1 Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKIAogCWlmIChXQVJOX09OKCFJU19WQUxMRVlWSUVX KGRldikgJiYgIUlTX0NIRVJSWVZJRVcoZGV2KSAmJgotCQkgICAgIUlTX0JST1hUT04oZGV2KSkp CisJCSAgICAhSVNfQlJPWFRPTihkZXZfcHJpdikpKQogCQlyZXR1cm47CiAKIAkvKgpAQCAtNTkx LDcgKzU5MSw3IEBAIHZvaWQgaW50ZWxfcG93ZXJfc2VxdWVuY2VyX3Jlc2V0KHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJCWNvbnRpbnVlOwogCiAJCWludGVsX2RwID0gZW5j X3RvX2ludGVsX2RwKCZlbmNvZGVyLT5iYXNlKTsKLQkJaWYgKElTX0JST1hUT04oZGV2KSkKKwkJ aWYgKElTX0JST1hUT04oZGV2X3ByaXYpKQogCQkJaW50ZWxfZHAtPnBwc19yZXNldCA9IHRydWU7 CiAJCWVsc2UKIAkJCWludGVsX2RwLT5wcHNfcGlwZSA9IElOVkFMSURfUElQRTsKQEAgLTI5ODEs NyArMjk4MSw3IEBAIGludGVsX2RwX3ZvbHRhZ2VfbWF4KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxf ZHApCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwog CWVudW0gcG9ydCBwb3J0ID0gZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApLT5wb3J0OwogCi0JaWYg KElTX0JST1hUT04oZGV2KSkKKwlpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpCiAJCXJldHVybiBE UF9UUkFJTl9WT0xUQUdFX1NXSU5HX0xFVkVMXzM7CiAJZWxzZSBpZiAoSU5URUxfSU5GTyhkZXYp LT5nZW4gPj0gOSkgewogCQlpZiAoZGV2X3ByaXYtPnZidC5lZHAubG93X3Zzd2luZyAmJiBwb3J0 ID09IFBPUlRfQSkKQEAgLTMzNDQsNyArMzM0NCw3IEBAIGludGVsX2RwX3NldF9zaWduYWxfbGV2 ZWxzKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJaWYgKEhBU19EREkoZGV2X3ByaXYpKSB7 CiAJCXNpZ25hbF9sZXZlbHMgPSBkZGlfc2lnbmFsX2xldmVscyhpbnRlbF9kcCk7CiAKLQkJaWYg KElTX0JST1hUT04oZGV2KSkKKwkJaWYgKElTX0JST1hUT04oZGV2X3ByaXYpKQogCQkJc2lnbmFs X2xldmVscyA9IDA7CiAJCWVsc2UKIAkJCW1hc2sgPSBERElfQlVGX0VNUF9NQVNLOwpAQCAtNTA3 Miw3ICs1MDcyLDcgQEAgaW50ZWxfZHBfaW5pdF9wYW5lbF9wb3dlcl9zZXF1ZW5jZXJfcmVnaXN0 ZXJzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCSAoc2VxLT50MTAgPDwgUEFORUxfUE9XRVJf RE9XTl9ERUxBWV9TSElGVCk7CiAJLyogQ29tcHV0ZSB0aGUgZGl2aXNvciBmb3IgdGhlIHBwIGNs b2NrLCBzaW1wbHkgbWF0Y2ggdGhlIEJzcGVjCiAJICogZm9ybXVsYS4gKi8KLQlpZiAoSVNfQlJP WFRPTihkZXYpKSB7CisJaWYgKElTX0JST1hUT04oZGV2X3ByaXYpKSB7CiAJCXBwX2RpdiA9IEk5 MTVfUkVBRChyZWdzLnBwX2N0cmwpOwogCQlwcF9kaXYgJj0gfkJYVF9QT1dFUl9DWUNMRV9ERUxB WV9NQVNLOwogCQlwcF9kaXYgfD0gKERJVl9ST1VORF9VUCgoc2VxLT50MTFfdDEyICsgMSksIDEw MDApCkBAIC01MDk4LDcgKzUwOTgsNyBAQCBpbnRlbF9kcF9pbml0X3BhbmVsX3Bvd2VyX3NlcXVl bmNlcl9yZWdpc3RlcnMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogCUk5MTVfV1JJVEUocmVn cy5wcF9vbiwgcHBfb24pOwogCUk5MTVfV1JJVEUocmVncy5wcF9vZmYsIHBwX29mZik7Ci0JaWYg KElTX0JST1hUT04oZGV2KSkKKwlpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpCiAJCUk5MTVfV1JJ VEUocmVncy5wcF9jdHJsLCBwcF9kaXYpOwogCWVsc2UKIAkJSTkxNV9XUklURShyZWdzLnBwX2Rp diwgcHBfZGl2KTsKQEAgLTUxMDYsNyArNTEwNiw3IEBAIGludGVsX2RwX2luaXRfcGFuZWxfcG93 ZXJfc2VxdWVuY2VyX3JlZ2lzdGVycyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCURSTV9ERUJV R19LTVMoInBhbmVsIHBvd2VyIHNlcXVlbmNlciByZWdpc3RlciBzZXR0aW5nczogUFBfT04gJSN4 LCBQUF9PRkYgJSN4LCBQUF9ESVYgJSN4XG4iLAogCQkgICAgICBJOTE1X1JFQUQocmVncy5wcF9v biksCiAJCSAgICAgIEk5MTVfUkVBRChyZWdzLnBwX29mZiksCi0JCSAgICAgIElTX0JST1hUT04o ZGV2KSA/CisJCSAgICAgIElTX0JST1hUT04oZGV2X3ByaXYpID8KIAkJICAgICAgKEk5MTVfUkVB RChyZWdzLnBwX2N0cmwpICYgQlhUX1BPV0VSX0NZQ0xFX0RFTEFZX01BU0spIDoKIAkJICAgICAg STkxNV9SRUFEKHJlZ3MucHBfZGl2KSk7CiB9CkBAIC01NzE1LDcgKzU3MTUsNyBAQCBpbnRlbF9k cF9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9y dCwKIAkJYnJlYWs7CiAJY2FzZSBQT1JUX0I6CiAJCWludGVsX2VuY29kZXItPmhwZF9waW4gPSBI UERfUE9SVF9COwotCQlpZiAoSVNfQlhUX1JFVklEKGRldiwgMCwgQlhUX1JFVklEX0ExKSkKKwkJ aWYgKElTX0JYVF9SRVZJRChkZXZfcHJpdiwgMCwgQlhUX1JFVklEX0ExKSkKIAkJCWludGVsX2Vu Y29kZXItPmhwZF9waW4gPSBIUERfUE9SVF9BOwogCQlicmVhazsKIAljYXNlIFBPUlRfQzoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5jCmluZGV4IDdjZjlkOTFjMDc0Ni4uNjA1ZDBi NTA5ZjI0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMKQEAgLTE4NTMsNyAr MTg1Myw3IEBAIHZvaWQgaW50ZWxfc2hhcmVkX2RwbGxfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogCiAJaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2 KSkKIAkJZHBsbF9tZ3IgPSAmc2tsX3BsbF9tZ3I7Ci0JZWxzZSBpZiAoSVNfQlJPWFRPTihkZXYp KQorCWVsc2UgaWYgKElTX0JST1hUT04oZGV2X3ByaXYpKQogCQlkcGxsX21nciA9ICZieHRfcGxs X21ncjsKIAllbHNlIGlmIChIQVNfRERJKGRldl9wcml2KSkKIAkJZHBsbF9tZ3IgPSAmaHN3X3Bs bF9tZ3I7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RzaS5jCmluZGV4IDViMWU0NDVhODBkMC4uNDhlOGRk MTA4ZjRmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYwpAQCAtNDM3LDExICs0MzcsMTEgQEAg c3RhdGljIHZvaWQgdmx2X2RzaV9kZXZpY2VfcmVhZHkoc3RydWN0IGludGVsX2VuY29kZXIgKmVu Y29kZXIpCiAKIHN0YXRpYyB2b2lkIGludGVsX2RzaV9kZXZpY2VfcmVhZHkoc3RydWN0IGludGVs X2VuY29kZXIgKmVuY29kZXIpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuY29kZXIt PmJhc2UuZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo ZW5jb2Rlci0+YmFzZS5kZXYpOwogCi0JaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVS UllWSUVXKGRldikpCisJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJ RVcoZGV2X3ByaXYpKQogCQl2bHZfZHNpX2RldmljZV9yZWFkeShlbmNvZGVyKTsKLQllbHNlIGlm IChJU19CUk9YVE9OKGRldikpCisJZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpCiAJCWJ4 dF9kc2lfZGV2aWNlX3JlYWR5KGVuY29kZXIpOwogfQogCkBAIC00NjQsNyArNDY0LDcgQEAgc3Rh dGljIHZvaWQgaW50ZWxfZHNpX3BvcnRfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNv ZGVyKQogCX0KIAogCWZvcl9lYWNoX2RzaV9wb3J0KHBvcnQsIGludGVsX2RzaS0+cG9ydHMpIHsK LQkJaTkxNV9yZWdfdCBwb3J0X2N0cmwgPSBJU19CUk9YVE9OKGRldikgPworCQlpOTE1X3JlZ190 IHBvcnRfY3RybCA9IElTX0JST1hUT04oZGV2X3ByaXYpID8KIAkJCUJYVF9NSVBJX1BPUlRfQ1RS TChwb3J0KSA6IE1JUElfUE9SVF9DVFJMKHBvcnQpOwogCQl1MzIgdGVtcDsKIApAQCAtNDk0LDcg KzQ5NCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2RzaV9wb3J0X2Rpc2FibGUoc3RydWN0IGludGVs X2VuY29kZXIgKmVuY29kZXIpCiAJZW51bSBwb3J0IHBvcnQ7CiAKIAlmb3JfZWFjaF9kc2lfcG9y dChwb3J0LCBpbnRlbF9kc2ktPnBvcnRzKSB7Ci0JCWk5MTVfcmVnX3QgcG9ydF9jdHJsID0gSVNf QlJPWFRPTihkZXYpID8KKwkJaTkxNV9yZWdfdCBwb3J0X2N0cmwgPSBJU19CUk9YVE9OKGRldl9w cml2KSA/CiAJCQlCWFRfTUlQSV9QT1JUX0NUUkwocG9ydCkgOiBNSVBJX1BPUlRfQ1RSTChwb3J0 KTsKIAkJdTMyIHRlbXA7CiAKQEAgLTY1Niw3ICs2NTYsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9k c2lfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIAogc3RhdGljIHZvaWQg aW50ZWxfZHNpX2NsZWFyX2RldmljZV9yZWFkeShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rl cikKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7CiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRl dik7CiAJc3RydWN0IGludGVsX2RzaSAqaW50ZWxfZHNpID0gZW5jX3RvX2ludGVsX2RzaSgmZW5j b2Rlci0+YmFzZSk7CiAJZW51bSBwb3J0IHBvcnQ7CkBAIC02NjQsNyArNjYzLDcgQEAgc3RhdGlj IHZvaWQgaW50ZWxfZHNpX2NsZWFyX2RldmljZV9yZWFkeShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAq ZW5jb2RlcikKIAlEUk1fREVCVUdfS01TKCJcbiIpOwogCWZvcl9lYWNoX2RzaV9wb3J0KHBvcnQs IGludGVsX2RzaS0+cG9ydHMpIHsKIAkJLyogQ29tbW9uIGJpdCBmb3IgYm90aCBNSVBJIFBvcnQg QSAmIE1JUEkgUG9ydCBDIG9uIFZMVi9DSFYgKi8KLQkJaTkxNV9yZWdfdCBwb3J0X2N0cmwgPSBJ U19CUk9YVE9OKGRldikgPworCQlpOTE1X3JlZ190IHBvcnRfY3RybCA9IElTX0JST1hUT04oZGV2 X3ByaXYpID8KIAkJCUJYVF9NSVBJX1BPUlRfQ1RSTChwb3J0KSA6IE1JUElfUE9SVF9DVFJMKFBP UlRfQSk7CiAJCXUzMiB2YWw7CiAKQEAgLTc2Miw3ICs3NjEsNyBAQCBzdGF0aWMgYm9vbCBpbnRl bF9kc2lfZ2V0X2h3X3N0YXRlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCiAJLyog WFhYOiB0aGlzIG9ubHkgd29ya3MgZm9yIG9uZSBEU0kgb3V0cHV0ICovCiAJZm9yX2VhY2hfZHNp X3BvcnQocG9ydCwgaW50ZWxfZHNpLT5wb3J0cykgewotCQlpOTE1X3JlZ190IGN0cmxfcmVnID0g SVNfQlJPWFRPTihkZXYpID8KKwkJaTkxNV9yZWdfdCBjdHJsX3JlZyA9IElTX0JST1hUT04oZGV2 X3ByaXYpID8KIAkJCUJYVF9NSVBJX1BPUlRfQ1RSTChwb3J0KSA6IE1JUElfUE9SVF9DVFJMKHBv cnQpOwogCQlib29sIGVuYWJsZWQgPSBJOTE1X1JFQUQoY3RybF9yZWcpICYgRFBJX0VOQUJMRTsK IApAQCAtOTcwLDExICs5NjksMTEgQEAgc3RhdGljIHZvaWQgYnh0X2RzaV9nZXRfcGlwZV9jb25m aWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiBzdGF0aWMgdm9pZCBpbnRlbF9kc2lf Z2V0X2NvbmZpZyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCQkgc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSBlbmNvZGVyLT5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsKIAl1MzIgcGNsazsKIAlEUk1fREVCVUdfS01T KCJcbiIpOwogCi0JaWYgKElTX0JST1hUT04oZGV2KSkKKwlpZiAoSVNfQlJPWFRPTihkZXZfcHJp dikpCiAJCWJ4dF9kc2lfZ2V0X3BpcGVfY29uZmlnKGVuY29kZXIsIHBpcGVfY29uZmlnKTsKIAog CXBjbGsgPSBpbnRlbF9kc2lfZ2V0X3BjbGsoZW5jb2RlciwgcGlwZV9jb25maWctPnBpcGVfYnBw LApAQCAtMTA2Niw3ICsxMDY1LDcgQEAgc3RhdGljIHZvaWQgc2V0X2RzaV90aW1pbmdzKHN0cnVj dCBkcm1fZW5jb2RlciAqZW5jb2RlciwKIAloYnAgPSB0eGJ5dGVjbGtocyhoYnAsIGJwcCwgbGFu ZV9jb3VudCwgaW50ZWxfZHNpLT5idXJzdF9tb2RlX3JhdGlvKTsKIAogCWZvcl9lYWNoX2RzaV9w b3J0KHBvcnQsIGludGVsX2RzaS0+cG9ydHMpIHsKLQkJaWYgKElTX0JST1hUT04oZGV2KSkgewor CQlpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpIHsKIAkJCS8qCiAJCQkgKiBQcm9ncmFtIGhkaXNw bGF5IGFuZCB2ZGlzcGxheSBvbiBNSVBJIHRyYW5zY29kZXIuCiAJCQkgKiBUaGlzIGlzIGRpZmZl cmVudCBmcm9tIGNhbGN1bGF0ZWQgaGFjdGl2ZSBhbmQKQEAgLTExNTMsNyArMTE1Miw3IEBAIHN0 YXRpYyB2b2lkIGludGVsX2RzaV9wcmVwYXJlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9l bmNvZGVyLAogCQkJdG1wICY9IH5SRUFEX1JFUVVFU1RfUFJJT1JJVFlfTUFTSzsKIAkJCUk5MTVf V1JJVEUoTUlQSV9DVFJMKHBvcnQpLCB0bXAgfAogCQkJCQlSRUFEX1JFUVVFU1RfUFJJT1JJVFlf SElHSCk7Ci0JCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXYpKSB7CisJCX0gZWxzZSBpZiAoSVNf QlJPWFRPTihkZXZfcHJpdikpIHsKIAkJCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlw ZTsKIAogCQkJdG1wID0gSTkxNV9SRUFEKE1JUElfQ1RSTChwb3J0KSk7CkBAIC0xMjQyLDcgKzEy NDEsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kc2lfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfZW5jb2Rl ciAqaW50ZWxfZW5jb2RlciwKIAkJSTkxNV9XUklURShNSVBJX0lOSVRfQ09VTlQocG9ydCksCiAJ CQkJdHhjbGtlc2MoaW50ZWxfZHNpLT5lc2NhcGVfY2xrX2RpdiwgMTAwKSk7CiAKLQkJaWYgKElT X0JST1hUT04oZGV2KSAmJiAoIWludGVsX2RzaS0+ZHVhbF9saW5rKSkgeworCQlpZiAoSVNfQlJP WFRPTihkZXZfcHJpdikgJiYgKCFpbnRlbF9kc2ktPmR1YWxfbGluaykpIHsKIAkJCS8qCiAJCQkg KiBCWFQgc3BlYyBzYXlzIHdyaXRlIE1JUElfSU5JVF9DT1VOVCBmb3IKIAkJCSAqIGJvdGggdGhl IHBvcnRzLCBldmVuIGlmIG9ubHkgb25lIGlzCkBAIC0xNDUyLDcgKzE0NTEsNyBAQCB2b2lkIGlu dGVsX2RzaV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlpZiAoSVNfVkFMTEVZVklF VyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkgewogCQlkZXZfcHJpdi0+bWlwaV9tbWlvX2Jh c2UgPSBWTFZfTUlQSV9CQVNFOwotCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXYpKSB7CisJfSBl bHNlIGlmIChJU19CUk9YVE9OKGRldl9wcml2KSkgewogCQlkZXZfcHJpdi0+bWlwaV9tbWlvX2Jh c2UgPSBCWFRfTUlQSV9CQVNFOwogCX0gZWxzZSB7CiAJCURSTV9FUlJPUigiVW5zdXBwb3J0ZWQg TWlwaSBkZXZpY2UgdG8gcmVnIGJhc2UiKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RzaV9wbGwuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RzaV9wbGwu YwppbmRleCA2YWI1OGEwMWIxOGUuLjU2ZWZmNjAwNGJjMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHNpX3BsbC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RzaV9wbGwuYwpAQCAtMzUxLDcgKzM1MSw3IEBAIHN0YXRpYyB1MzIgYnh0X2RzaV9nZXRf cGNsayhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwgaW50IHBpcGVfYnBwLAogdTMyIGlu dGVsX2RzaV9nZXRfcGNsayhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwgaW50IHBpcGVf YnBwLAogCQkgICAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNvbmZpZykKIHsKLQlpZiAo SVNfQlJPWFRPTihlbmNvZGVyLT5iYXNlLmRldikpCisJaWYgKElTX0JST1hUT04odG9faTkxNShl bmNvZGVyLT5iYXNlLmRldikpKQogCQlyZXR1cm4gYnh0X2RzaV9nZXRfcGNsayhlbmNvZGVyLCBw aXBlX2JwcCwgY29uZmlnKTsKIAllbHNlCiAJCXJldHVybiB2bHZfZHNpX2dldF9wY2xrKGVuY29k ZXIsIHBpcGVfYnBwLCBjb25maWcpOwpAQCAtNTE1LDExICs1MTUsMTEgQEAgYm9vbCBpbnRlbF9k c2lfcGxsX2lzX2VuYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogaW50 IGludGVsX2NvbXB1dGVfZHNpX3BsbChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJ CSAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNvbmZpZykKIHsKLQlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7CiAKLQlpZiAoSVNfVkFMTEVZVklF VyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkKKwlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJp dikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCXJldHVybiB2bHZfY29tcHV0ZV9kc2lf cGxsKGVuY29kZXIsIGNvbmZpZyk7Ci0JZWxzZSBpZiAoSVNfQlJPWFRPTihkZXYpKQorCWVsc2Ug aWYgKElTX0JST1hUT04oZGV2X3ByaXYpKQogCQlyZXR1cm4gYnh0X2NvbXB1dGVfZHNpX3BsbChl bmNvZGVyLCBjb25maWcpOwogCiAJcmV0dXJuIC1FTk9ERVY7CkBAIC01MjgsMjEgKzUyOCwyMSBA QCBpbnQgaW50ZWxfY29tcHV0ZV9kc2lfcGxsKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVy LAogdm9pZCBpbnRlbF9lbmFibGVfZHNpX3BsbChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rl ciwKIAkJCSAgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNvbmZpZykKIHsKLQlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7CisJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7CiAKLQlpZiAo SVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkKKwlpZiAoSVNfVkFMTEVZ VklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCXZsdl9lbmFibGVf ZHNpX3BsbChlbmNvZGVyLCBjb25maWcpOwotCWVsc2UgaWYgKElTX0JST1hUT04oZGV2KSkKKwll bHNlIGlmIChJU19CUk9YVE9OKGRldl9wcml2KSkKIAkJYnh0X2VuYWJsZV9kc2lfcGxsKGVuY29k ZXIsIGNvbmZpZyk7CiB9CiAKIHZvaWQgaW50ZWxfZGlzYWJsZV9kc2lfcGxsKHN0cnVjdCBpbnRl bF9lbmNvZGVyICplbmNvZGVyKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBlbmNvZGVy LT5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1 KGVuY29kZXItPmJhc2UuZGV2KTsKIAotCWlmIChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hF UlJZVklFVyhkZXYpKQorCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllW SUVXKGRldl9wcml2KSkKIAkJdmx2X2Rpc2FibGVfZHNpX3BsbChlbmNvZGVyKTsKLQllbHNlIGlm IChJU19CUk9YVE9OKGRldikpCisJZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpCiAJCWJ4 dF9kaXNhYmxlX2RzaV9wbGwoZW5jb2Rlcik7CiB9CiAKQEAgLTU2NCwxMCArNTY0LDEwIEBAIHN0 YXRpYyB2b2lkIGJ4dF9kc2lfcmVzZXRfY2xvY2tzKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNv ZGVyLCBlbnVtIHBvcnQgcG9ydCkKIAogdm9pZCBpbnRlbF9kc2lfcmVzZXRfY2xvY2tzKHN0cnVj dCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLCBlbnVtIHBvcnQgcG9ydCkKIHsKLQlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7CiAKLQlpZiAoSVNfQlJP WFRPTihkZXYpKQorCWlmIChJU19CUk9YVE9OKGRldl9wcml2KSkKIAkJYnh0X2RzaV9yZXNldF9j bG9ja3MoZW5jb2RlciwgcG9ydCk7Ci0JZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpIHx8IElT X0NIRVJSWVZJRVcoZGV2KSkKKwllbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJ U19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJdmx2X2RzaV9yZXNldF9jbG9ja3MoZW5jb2Rlciwg cG9ydCk7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9h ZGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKaW5kZXggMTgy MjA0MzczOTMxLi41ZDVkNjA5ZWQ1ZTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Y19sb2FkZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNf bG9hZGVyLmMKQEAgLTM3NiwxNiArMzc2LDE2IEBAIHN0YXRpYyBpbnQgZ3VjX3Vjb2RlX3hmZXIo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCUk5MTVfV1JJVEUoR1VDX1NISU1f Q09OVFJPTCwgR1VDX1NISU1fQ09OVFJPTF9WQUxVRSk7CiAKIAkvKiBXYURpc2FibGVNaW51dGVJ YUNsb2NrR2F0aW5nOmJ4dCAqLwotCWlmIChJU19CWFRfUkVWSUQoZGV2LCAwLCBCWFRfUkVWSURf QTEpKSB7CisJaWYgKElTX0JYVF9SRVZJRChkZXZfcHJpdiwgMCwgQlhUX1JFVklEX0ExKSkgewog CQlJOTE1X1dSSVRFKEdVQ19TSElNX0NPTlRST0wsIChJOTE1X1JFQUQoR1VDX1NISU1fQ09OVFJP TCkgJgogCQkJCQkgICAgICB+R1VDX0VOQUJMRV9NSUFfQ0xPQ0tfR0FUSU5HKSk7CiAJfQogCiAJ LyogV2FDNkRpc2FsbG93QnlHZnhQYXVzZTpieHQgKi8KLQlpZiAoSVNfQlhUX1JFVklEKGRldiwg MCwgQlhUX1JFVklEX0IwKSkKKwlpZiAoSVNfQlhUX1JFVklEKGRldl9wcml2LCAwLCBCWFRfUkVW SURfQjApKQogCQlJOTE1X1dSSVRFKEdFTjZfR0ZYUEFVU0UsIDB4MzBGRkYpOwogCi0JaWYgKElT X0JST1hUT04oZGV2KSkKKwlpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpCiAJCUk5MTVfV1JJVEUo R0VOOUxQX0dUX1BNX0NPTkZJRywgR1RfRE9PUkJFTExfRU5BQkxFKTsKIAllbHNlCiAJCUk5MTVf V1JJVEUoR0VOOV9HVF9QTV9DT05GSUcsIEdUX0RPT1JCRUxMX0VOQUJMRSk7CkBAIC03MzAsNyAr NzMwLDcgQEAgdm9pZCBpbnRlbF9ndWNfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlm d19wYXRoID0gSTkxNV9TS0xfR1VDX1VDT0RFOwogCQlndWNfZnctPmd1Y19md19tYWpvcl93YW50 ZWQgPSBTS0xfRldfTUFKT1I7CiAJCWd1Y19mdy0+Z3VjX2Z3X21pbm9yX3dhbnRlZCA9IFNLTF9G V19NSU5PUjsKLQl9IGVsc2UgaWYgKElTX0JST1hUT04oZGV2KSkgeworCX0gZWxzZSBpZiAoSVNf QlJPWFRPTihkZXZfcHJpdikpIHsKIAkJZndfcGF0aCA9IEk5MTVfQlhUX0dVQ19VQ09ERTsKIAkJ Z3VjX2Z3LT5ndWNfZndfbWFqb3Jfd2FudGVkID0gQlhUX0ZXX01BSk9SOwogCQlndWNfZnctPmd1 Y19md19taW5vcl93YW50ZWQgPSBCWFRfRldfTUlOT1I7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1p LmMKaW5kZXggNjYwN2M0ZTNjMzZjLi5mNjU2MjQ1MWM0N2UgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9oZG1pLmMKQEAgLTEyNDEsNyArMTI0MSw3IEBAIHN0YXRpYyBlbnVtIGRybV9tb2RlX3N0YXR1 cwogaGRtaV9wb3J0X2Nsb2NrX3ZhbGlkKHN0cnVjdCBpbnRlbF9oZG1pICpoZG1pLAogCQkgICAg ICBpbnQgY2xvY2ssIGJvb2wgcmVzcGVjdF9kb3duc3RyZWFtX2xpbWl0cykKIHsKLQlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfaGRtaV90b19kZXYoaGRtaSk7CisJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRlbF9oZG1pX3RvX2RldihoZG1pKSk7 CiAKIAlpZiAoY2xvY2sgPCAyNTAwMCkKIAkJcmV0dXJuIE1PREVfQ0xPQ0tfTE9XOwpAQCAtMTI0 OSwxMSArMTI0OSwxMSBAQCBoZG1pX3BvcnRfY2xvY2tfdmFsaWQoc3RydWN0IGludGVsX2hkbWkg KmhkbWksCiAJCXJldHVybiBNT0RFX0NMT0NLX0hJR0g7CiAKIAkvKiBCWFQgRFBMTCBjYW4ndCBn ZW5lcmF0ZSAyMjMtMjQwIE1IeiAqLwotCWlmIChJU19CUk9YVE9OKGRldikgJiYgY2xvY2sgPiAy MjMzMzMgJiYgY2xvY2sgPCAyNDAwMDApCisJaWYgKElTX0JST1hUT04oZGV2X3ByaXYpICYmIGNs b2NrID4gMjIzMzMzICYmIGNsb2NrIDwgMjQwMDAwKQogCQlyZXR1cm4gTU9ERV9DTE9DS19SQU5H RTsKIAogCS8qIENIViBEUExMIGNhbid0IGdlbmVyYXRlIDIxNi0yNDAgTUh6ICovCi0JaWYgKElT X0NIRVJSWVZJRVcoZGV2KSAmJiBjbG9jayA+IDIxNjAwMCAmJiBjbG9jayA8IDI0MDAwMCkKKwlp ZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikgJiYgY2xvY2sgPiAyMTYwMDAgJiYgY2xvY2sgPCAy NDAwMDApCiAJCXJldHVybiBNT0RFX0NMT0NLX1JBTkdFOwogCiAJcmV0dXJuIE1PREVfT0s7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKaW5kZXggMDI1ZmJkNTIyODE5Li5l NGJiODVjOWM2ZTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRp bWVfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKQEAg LTI1OTYsNyArMjU5Niw3IEBAIHZvaWQgaW50ZWxfcG93ZXJfZG9tYWluc19pbml0X2h3KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgYm9vbCByZXN1bWUpCiAKIAlpZiAoSVNfU0tZ TEFLRShkZXZfcHJpdikgfHwgSVNfS0FCWUxBS0UoZGV2X3ByaXYpKSB7CiAJCXNrbF9kaXNwbGF5 X2NvcmVfaW5pdChkZXZfcHJpdiwgcmVzdW1lKTsKLQl9IGVsc2UgaWYgKElTX0JST1hUT04oZGV2 KSkgeworCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpIHsKIAkJYnh0X2Rpc3BsYXlf Y29yZV9pbml0KGRldl9wcml2LCByZXN1bWUpOwogCX0gZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhk ZXYpKSB7CiAJCW11dGV4X2xvY2soJnBvd2VyX2RvbWFpbnMtPmxvY2spOwotLSAKMi43LjQKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=