From: Tvrtko Ursulin Subject: [CI 01/19] drm/i915: Make HAS_DDI and HAS_PCH_LPT_LP only take dev_priv Date: Thu, 13 Oct 2016 11:02:52 +0100 Message-ID: <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-qk0-x243.google.com (mail-qk0-x243.google.com [IPv6:2607:f8b0:400d:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 99CEE6E9FB for ; Thu, 13 Oct 2016 10:03:19 +0000 (UTC) Received: by mail-qk0-x243.google.com with SMTP id z190so5480625qkc.3 for ; Thu, 13 Oct 2016 03:03:19 -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.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Oct 2016 03:03:17 -0700 (PDT) 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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRoaXMgc2F2 ZXMgMzI0OCBieXRlcyBvZiAucm9kYXRhIHN0cmluZ3MuCgp2MjogQWRkIHBhcmFudGhlc2VzIGFy b3VuZCBkZXZfcHJpdi4gKFZpbGxlIFN5cmphbGEpCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJz dWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogRGF2aWQgV2VpbmVo YWxsIDxkYXZpZC53ZWluZWhhbGxAbGludXguaW50ZWwuY29tPgpBY2tlZC1ieTogRGFuaWVsIFZl dHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQWNrZWQtYnk6IEphbmkgTmlrdWxhIDxqYW5p Lm5pa3VsYUBsaW51eC5pbnRlbC5jb20+CkFja2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNo cmlzLXdpbHNvbi5jby51az4KQWNrZWQtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxh bmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaCAgICAgICB8ICA4ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMg ICAgICB8IDEwICsrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAg fCA0OSArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHAuYyAgICAgICB8IDE2ICsrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHBsbF9tZ3IuYyB8ICA0ICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfaGRtaS5jICAgICB8IDEwICsrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMgICAgICAgfCAgNCArLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jICAgICAg fCAgOCArKystLS0KIDggZmlsZXMgY2hhbmdlZCwgNTYgaW5zZXJ0aW9ucygrKSwgNTMgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggYmYzOTdiNjQzY2MwLi4wNzc2YjRh ZmNjZmYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjgxOCw3ICsyODE4LDcgQEAgc3Ry dWN0IGRybV9pOTE1X2NtZF90YWJsZSB7CiAKICNkZWZpbmUgSEFTX0RQX01TVChkZXYpCShJTlRF TF9JTkZPKGRldiktPmhhc19kcF9tc3QpCiAKLSNkZWZpbmUgSEFTX0RESShkZXYpCQkoSU5URUxf SU5GTyhkZXYpLT5oYXNfZGRpKQorI2RlZmluZSBIQVNfRERJKGRldl9wcml2KQkoKGRldl9wcml2 KS0+aW5mby5oYXNfZGRpKQogI2RlZmluZSBIQVNfRlBHQV9EQkdfVU5DTEFJTUVEKGRldikJKElO VEVMX0lORk8oZGV2KS0+aGFzX2ZwZ2FfZGJnKQogI2RlZmluZSBIQVNfUFNSKGRldikJCShJTlRF TF9JTkZPKGRldiktPmhhc19wc3IpCiAjZGVmaW5lIEhBU19SVU5USU1FX1BNKGRldikJKElOVEVM X0lORk8oZGV2KS0+aGFzX3J1bnRpbWVfcG0pCkBAIC0yODU3LDggKzI4NTcsMTAgQEAgc3RydWN0 IGRybV9pOTE1X2NtZF90YWJsZSB7CiAjZGVmaW5lIEhBU19QQ0hfS0JQKGRldikgKElOVEVMX1BD SF9UWVBFKGRldikgPT0gUENIX0tCUCkKICNkZWZpbmUgSEFTX1BDSF9TUFQoZGV2KSAoSU5URUxf UENIX1RZUEUoZGV2KSA9PSBQQ0hfU1BUKQogI2RlZmluZSBIQVNfUENIX0xQVChkZXYpIChJTlRF TF9QQ0hfVFlQRShkZXYpID09IFBDSF9MUFQpCi0jZGVmaW5lIEhBU19QQ0hfTFBUX0xQKGRldikg KF9fSTkxNV9fKGRldiktPnBjaF9pZCA9PSBJTlRFTF9QQ0hfTFBUX0xQX0RFVklDRV9JRF9UWVBF KQotI2RlZmluZSBIQVNfUENIX0xQVF9IKGRldikgKF9fSTkxNV9fKGRldiktPnBjaF9pZCA9PSBJ TlRFTF9QQ0hfTFBUX0RFVklDRV9JRF9UWVBFKQorI2RlZmluZSBIQVNfUENIX0xQVF9MUChkZXZf cHJpdikgXAorCSgoZGV2X3ByaXYpLT5wY2hfaWQgPT0gSU5URUxfUENIX0xQVF9MUF9ERVZJQ0Vf SURfVFlQRSkKKyNkZWZpbmUgSEFTX1BDSF9MUFRfSChkZXZfcHJpdikgXAorCSgoZGV2X3ByaXYp LT5wY2hfaWQgPT0gSU5URUxfUENIX0xQVF9ERVZJQ0VfSURfVFlQRSkKICNkZWZpbmUgSEFTX1BD SF9DUFQoZGV2KSAoSU5URUxfUENIX1RZUEUoZGV2KSA9PSBQQ0hfQ1BUKQogI2RlZmluZSBIQVNf UENIX0lCWChkZXYpIChJTlRFTF9QQ0hfVFlQRShkZXYpID09IFBDSF9JQlgpCiAjZGVmaW5lIEhB U19QQ0hfTk9QKGRldikgKElOVEVMX1BDSF9UWVBFKGRldikgPT0gUENIX05PUCkKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfY3J0LmMKaW5kZXggNGE3YjZjNTk1ZWMyLi5kNGI5YjE2NmRlNWQgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2NydC5jCkBAIC0yODAsMTMgKzI4MCwxMyBAQCBzdGF0aWMgYm9vbCBpbnRl bF9jcnRfY29tcHV0ZV9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCQkJ ICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAJCQkJICAgICBzdHJ1 Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7CiAKLQlpZiAoSEFTX1BDSF9TUExJ VChkZXYpKQorCWlmIChIQVNfUENIX1NQTElUKGRldl9wcml2KSkKIAkJcGlwZV9jb25maWctPmhh c19wY2hfZW5jb2RlciA9IHRydWU7CiAKIAkvKiBMUFQgRkRJIFJYIG9ubHkgc3VwcG9ydHMgOGJw Yy4gKi8KLQlpZiAoSEFTX1BDSF9MUFQoZGV2KSkgeworCWlmIChIQVNfUENIX0xQVChkZXZfcHJp dikpIHsKIAkJaWYgKHBpcGVfY29uZmlnLT5id19jb25zdHJhaW5lZCAmJiBwaXBlX2NvbmZpZy0+ cGlwZV9icHAgPCAyNCkgewogCQkJRFJNX0RFQlVHX0tNUygiTFBUIG9ubHkgc3VwcG9ydHMgMjRi cHBcbiIpOwogCQkJcmV0dXJuIGZhbHNlOwpAQCAtMjk2LDcgKzI5Niw3IEBAIHN0YXRpYyBib29s IGludGVsX2NydF9jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwK IAl9CiAKIAkvKiBGREkgbXVzdCBhbHdheXMgYmUgMi43IEdIeiAqLwotCWlmIChIQVNfRERJKGRl dikpCisJaWYgKEhBU19EREkoZGV2X3ByaXYpKQogCQlwaXBlX2NvbmZpZy0+cG9ydF9jbG9jayA9 IDEzNTAwMCAqIDI7CiAKIAlyZXR1cm4gdHJ1ZTsKQEAgLTkxNyw3ICs5MTcsNyBAQCB2b2lkIGlu dGVsX2NydF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKEk5MTVfSEFTX0hPVFBM VUcoZGV2KSAmJgogCSAgICAhZG1pX2NoZWNrX3N5c3RlbShpbnRlbF9zcHVyaW91c19jcnRfZGV0 ZWN0KSkKIAkJY3J0LT5iYXNlLmhwZF9waW4gPSBIUERfQ1JUOwotCWlmIChIQVNfRERJKGRldikp IHsKKwlpZiAoSEFTX0RESShkZXZfcHJpdikpIHsKIAkJY3J0LT5iYXNlLnBvcnQgPSBQT1JUX0U7 CiAJCWNydC0+YmFzZS5nZXRfY29uZmlnID0gaHN3X2NydF9nZXRfY29uZmlnOwogCQljcnQtPmJh c2UuZ2V0X2h3X3N0YXRlID0gaW50ZWxfZGRpX2dldF9od19zdGF0ZTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYwppbmRleCBjZmNiMDNmODIwMTYuLjQ4NTc3ZTk1YmUxMiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTE4NywxOSArMTE4NywxNyBAQCB2b2lk IGFzc2VydF9mZGlfcnhfcGxsKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJ CW9ub2ZmKHN0YXRlKSwgb25vZmYoY3VyX3N0YXRlKSk7CiB9CiAKLXZvaWQgYXNzZXJ0X3BhbmVs X3VubG9ja2VkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCSAgIGVudW0g cGlwZSBwaXBlKQordm9pZCBhc3NlcnRfcGFuZWxfdW5sb2NrZWQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LCBlbnVtIHBpcGUgcGlwZSkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gJmRldl9wcml2LT5kcm07CiAJaTkxNV9yZWdfdCBwcF9yZWc7CiAJdTMyIHZhbDsKIAll bnVtIHBpcGUgcGFuZWxfcGlwZSA9IFBJUEVfQTsKIAlib29sIGxvY2tlZCA9IHRydWU7CiAKLQlp ZiAoV0FSTl9PTihIQVNfRERJKGRldikpKQorCWlmIChXQVJOX09OKEhBU19EREkoZGV2X3ByaXYp KSkKIAkJcmV0dXJuOwogCi0JaWYgKEhBU19QQ0hfU1BMSVQoZGV2KSkgeworCWlmIChIQVNfUENI X1NQTElUKGRldl9wcml2KSkgewogCQl1MzIgcG9ydF9zZWw7CiAKIAkJcHBfcmVnID0gUFBfQ09O VFJPTCgwKTsKQEAgLTEyMDksNyArMTIwNyw3IEBAIHZvaWQgYXNzZXJ0X3BhbmVsX3VubG9ja2Vk KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJICAgIEk5MTVfUkVBRChQQ0hf TFZEUykgJiBMVkRTX1BJUEVCX1NFTEVDVCkKIAkJCXBhbmVsX3BpcGUgPSBQSVBFX0I7CiAJCS8q IFhYWDogZWxzZSBmaXggZm9yIGVEUCAqLwotCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYp IHx8IElTX0NIRVJSWVZJRVcoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZf cHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJLyogcHJlc3VtYWJseSB3cml0 ZSBsb2NrIGRlcGVuZHMgb24gcGlwZSwgbm90IHBvcnQgc2VsZWN0ICovCiAJCXBwX3JlZyA9IFBQ X0NPTlRST0wocGlwZSk7CiAJCXBhbmVsX3BpcGUgPSBwaXBlOwpAQCAtNTY5NiwxMyArNTY5NCwx MyBAQCBzdGF0aWMgZW51bSBpbnRlbF9kaXNwbGF5X3Bvd2VyX2RvbWFpbiBwb3J0X3RvX2F1eF9w b3dlcl9kb21haW4oZW51bSBwb3J0IHBvcnQpCiBlbnVtIGludGVsX2Rpc3BsYXlfcG93ZXJfZG9t YWluCiBpbnRlbF9kaXNwbGF5X3BvcnRfcG93ZXJfZG9tYWluKHN0cnVjdCBpbnRlbF9lbmNvZGVy ICppbnRlbF9lbmNvZGVyKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9lbmNv ZGVyLT5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19p OTE1KGludGVsX2VuY29kZXItPmJhc2UuZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0 ICppbnRlbF9kaWdfcG9ydDsKIAogCXN3aXRjaCAoaW50ZWxfZW5jb2Rlci0+dHlwZSkgewogCWNh c2UgSU5URUxfT1VUUFVUX1VOS05PV046CiAJCS8qIE9ubHkgRERJIHBsYXRmb3JtcyBzaG91bGQg ZXZlciB1c2UgdGhpcyBvdXRwdXQgdHlwZSAqLwotCQlXQVJOX09OX09OQ0UoIUhBU19EREkoZGV2 KSk7CisJCVdBUk5fT05fT05DRSghSEFTX0RESShkZXZfcHJpdikpOwogCWNhc2UgSU5URUxfT1VU UFVUX0RQOgogCWNhc2UgSU5URUxfT1VUUFVUX0hETUk6CiAJY2FzZSBJTlRFTF9PVVRQVVRfRURQ OgpAQCAtNTcyMyw3ICs1NzIxLDcgQEAgaW50ZWxfZGlzcGxheV9wb3J0X3Bvd2VyX2RvbWFpbihz dHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlcikKIGVudW0gaW50ZWxfZGlzcGxheV9w b3dlcl9kb21haW4KIGludGVsX2Rpc3BsYXlfcG9ydF9hdXhfcG93ZXJfZG9tYWluKHN0cnVjdCBp bnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSBpbnRlbF9lbmNvZGVyLT5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KGludGVsX2VuY29kZXItPmJhc2UuZGV2KTsKIAlzdHJ1Y3QgaW50ZWxf ZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydDsKIAogCXN3aXRjaCAoaW50ZWxfZW5jb2Rlci0+ dHlwZSkgewpAQCAtNTczNiw3ICs1NzM0LDcgQEAgaW50ZWxfZGlzcGxheV9wb3J0X2F1eF9wb3dl cl9kb21haW4oc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIpCiAJCSAqIHdoYXQn cyB0aGUgc3RhdHVzIG9mIHRoZSBnaXZlbiBjb25uZWN0b3JzLCBwbGF5IHNhZmUgYW5kCiAJCSAq IHJ1biB0aGUgRFAgZGV0ZWN0aW9uIHRvby4KIAkJICovCi0JCVdBUk5fT05fT05DRSghSEFTX0RE SShkZXYpKTsKKwkJV0FSTl9PTl9PTkNFKCFIQVNfRERJKGRldl9wcml2KSk7CiAJY2FzZSBJTlRF TF9PVVRQVVRfRFA6CiAJY2FzZSBJTlRFTF9PVVRQVVRfRURQOgogCQlpbnRlbF9kaWdfcG9ydCA9 IGVuY190b19kaWdfcG9ydCgmaW50ZWxfZW5jb2Rlci0+YmFzZSk7CkBAIC05MTk2LDcgKzkxOTQs OCBAQCBzdGF0aWMgdm9pZCBscHRfZW5hYmxlX2Nsa291dF9kcChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCBib29sIHdpdGhfc3ByZWFkLAogCiAJaWYgKFdBUk4od2l0aF9mZGkgJiYgIXdpdGhfc3By ZWFkLCAiRkRJIHJlcXVpcmVzIGRvd25zcHJlYWRcbiIpKQogCQl3aXRoX3NwcmVhZCA9IHRydWU7 Ci0JaWYgKFdBUk4oSEFTX1BDSF9MUFRfTFAoZGV2KSAmJiB3aXRoX2ZkaSwgIkxQIFBDSCBkb2Vz bid0IGhhdmUgRkRJXG4iKSkKKwlpZiAoV0FSTihIQVNfUENIX0xQVF9MUChkZXZfcHJpdikgJiYK KwkgICAgd2l0aF9mZGksICJMUCBQQ0ggZG9lc24ndCBoYXZlIEZESVxuIikpCiAJCXdpdGhfZmRp ID0gZmFsc2U7CiAKIAltdXRleF9sb2NrKCZkZXZfcHJpdi0+c2JfbG9jayk7CkBAIC05MjE5LDcg KzkyMTgsNyBAQCBzdGF0aWMgdm9pZCBscHRfZW5hYmxlX2Nsa291dF9kcChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCBib29sIHdpdGhfc3ByZWFkLAogCQl9CiAJfQogCi0JcmVnID0gSEFTX1BDSF9M UFRfTFAoZGV2KSA/IFNCSV9HRU4wIDogU0JJX0RCVUZGMDsKKwlyZWcgPSBIQVNfUENIX0xQVF9M UChkZXZfcHJpdikgPyBTQklfR0VOMCA6IFNCSV9EQlVGRjA7CiAJdG1wID0gaW50ZWxfc2JpX3Jl YWQoZGV2X3ByaXYsIHJlZywgU0JJX0lDTEspOwogCXRtcCB8PSBTQklfR0VOMF9DRkdfQlVGRkVO QUJMRV9ESVNBQkxFOwogCWludGVsX3NiaV93cml0ZShkZXZfcHJpdiwgcmVnLCB0bXAsIFNCSV9J Q0xLKTsKQEAgLTkyMzUsNyArOTIzNCw3IEBAIHN0YXRpYyB2b2lkIGxwdF9kaXNhYmxlX2Nsa291 dF9kcChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPnNi X2xvY2spOwogCi0JcmVnID0gSEFTX1BDSF9MUFRfTFAoZGV2KSA/IFNCSV9HRU4wIDogU0JJX0RC VUZGMDsKKwlyZWcgPSBIQVNfUENIX0xQVF9MUChkZXZfcHJpdikgPyBTQklfR0VOMCA6IFNCSV9E QlVGRjA7CiAJdG1wID0gaW50ZWxfc2JpX3JlYWQoZGV2X3ByaXYsIHJlZywgU0JJX0lDTEspOwog CXRtcCAmPSB+U0JJX0dFTjBfQ0ZHX0JVRkZFTkFCTEVfRElTQUJMRTsKIAlpbnRlbF9zYmlfd3Jp dGUoZGV2X3ByaXYsIHJlZywgdG1wLCBTQklfSUNMSyk7CkBAIC0xMDIwMyw3ICsxMDIwMiw3IEBA IHZvaWQgaHN3X2VuYWJsZV9wYzgoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CiAJRFJNX0RFQlVHX0tNUygiRW5hYmxpbmcgcGFja2FnZSBDOCtcbiIpOwogCi0JaWYgKEhBU19Q Q0hfTFBUX0xQKGRldikpIHsKKwlpZiAoSEFTX1BDSF9MUFRfTFAoZGV2X3ByaXYpKSB7CiAJCXZh bCA9IEk5MTVfUkVBRChTT1VUSF9EU1BDTEtfR0FURV9EKTsKIAkJdmFsICY9IH5QQ0hfTFBfUEFS VElUSU9OX0xFVkVMX0RJU0FCTEU7CiAJCUk5MTVfV1JJVEUoU09VVEhfRFNQQ0xLX0dBVEVfRCwg dmFsKTsKQEAgLTEwMjIzLDcgKzEwMjIyLDcgQEAgdm9pZCBoc3dfZGlzYWJsZV9wYzgoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWhzd19yZXN0b3JlX2xjcGxsKGRldl9wcml2 KTsKIAlscHRfaW5pdF9wY2hfcmVmY2xrKGRldik7CiAKLQlpZiAoSEFTX1BDSF9MUFRfTFAoZGV2 KSkgeworCWlmIChIQVNfUENIX0xQVF9MUChkZXZfcHJpdikpIHsKIAkJdmFsID0gSTkxNV9SRUFE KFNPVVRIX0RTUENMS19HQVRFX0QpOwogCQl2YWwgfD0gUENIX0xQX1BBUlRJVElPTl9MRVZFTF9E SVNBQkxFOwogCQlJOTE1X1dSSVRFKFNPVVRIX0RTUENMS19HQVRFX0QsIHZhbCk7CkBAIC0xMDg0 NSw3ICsxMDg0NCw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX2N1cnNvcihzdHJ1Y3QgZHJt X2NydGMgKmNydGMsIHUzMiBiYXNlLAogCQl9CiAJCWNudGwgfD0gcGlwZSA8PCAyODsgLyogQ29u bmVjdCB0byBjb3JyZWN0IHBpcGUgKi8KIAotCQlpZiAoSEFTX0RESShkZXYpKQorCQlpZiAoSEFT X0RESShkZXZfcHJpdikpCiAJCQljbnRsIHw9IENVUlNPUl9QSVBFX0NTQ19FTkFCTEU7CiAKIAkJ aWYgKHBsYW5lX3N0YXRlLT5iYXNlLnJvdGF0aW9uID09IERSTV9ST1RBVEVfMTgwKQpAQCAtMTI3 NDUsNiArMTI3NDQsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kdW1wX3BpcGVfY29uZmlnKHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjLAogCQkJCSAgIGNvbnN0IGNoYXIgKmNvbnRleHQpCiB7CiAJc3Ry dWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OworCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lOwogCXN0cnVjdCBpbnRlbF9wbGFu ZV9zdGF0ZSAqc3RhdGU7CkBAIC0xMjgyNyw3ICsxMjgyNyw3IEBAIHN0YXRpYyB2b2lkIGludGVs X2R1bXBfcGlwZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJCQkgICAgICBwaXBl X2NvbmZpZy0+ZHBsbF9od19zdGF0ZS5jdHJsMSwKIAkJCSAgICAgIHBpcGVfY29uZmlnLT5kcGxs X2h3X3N0YXRlLmNmZ2NyMSwKIAkJCSAgICAgIHBpcGVfY29uZmlnLT5kcGxsX2h3X3N0YXRlLmNm Z2NyMik7Ci0JfSBlbHNlIGlmIChIQVNfRERJKGRldikpIHsKKwl9IGVsc2UgaWYgKEhBU19EREko ZGV2X3ByaXYpKSB7CiAJCURSTV9ERUJVR19LTVMoImRwbGxfaHdfc3RhdGU6IHdycGxsOiAweCV4 IHNwbGw6IDB4JXhcbiIsCiAJCQkgICAgICBwaXBlX2NvbmZpZy0+ZHBsbF9od19zdGF0ZS53cnBs bCwKIAkJCSAgICAgIHBpcGVfY29uZmlnLT5kcGxsX2h3X3N0YXRlLnNwbGwpOwpAQCAtMTI5MDUs NyArMTI5MDUsNyBAQCBzdGF0aWMgYm9vbCBjaGVja19kaWdpdGFsX3BvcnRfY29uZmxpY3RzKHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJc3dpdGNoIChlbmNvZGVyLT50eXBlKSB7 CiAJCQl1bnNpZ25lZCBpbnQgcG9ydF9tYXNrOwogCQljYXNlIElOVEVMX09VVFBVVF9VTktOT1dO OgotCQkJaWYgKFdBUk5fT04oIUhBU19EREkoZGV2KSkpCisJCQlpZiAoV0FSTl9PTighSEFTX0RE SSh0b19pOTE1KGRldikpKSkKIAkJCQlicmVhazsKIAkJY2FzZSBJTlRFTF9PVVRQVVRfRFA6CiAJ CWNhc2UgSU5URUxfT1VUUFVUX0hETUk6CkBAIC0xMzcyOSw3ICsxMzcyOSw3IEBAIGludGVsX21v ZGVzZXRfdmVyaWZ5X2Rpc2FibGVkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIHN0YXRpYyB2 b2lkIHVwZGF0ZV9zY2FubGluZV9vZmZzZXQoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7Ci0J c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OworCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwogCiAJLyoKIAkg KiBUaGUgc2NhbmxpbmUgY291bnRlciBpbmNyZW1lbnRzIGF0IHRoZSBsZWFkaW5nIGVkZ2Ugb2Yg aHN5bmMuCkBAIC0xMzc0OSw3ICsxMzc0OSw3IEBAIHN0YXRpYyB2b2lkIHVwZGF0ZV9zY2FubGlu ZV9vZmZzZXQoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJICogdGhlcmUncyBhbiBleHRyYSAx IGxpbmUgZGlmZmVyZW5jZS4gU28gd2UgbmVlZCB0byBhZGQgdHdvIGluc3RlYWQgb2YKIAkgKiBv bmUgdG8gdGhlIHZhbHVlLgogCSAqLwotCWlmIChJU19HRU4yKGRldikpIHsKKwlpZiAoSVNfR0VO MihkZXZfcHJpdikpIHsKIAkJY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVk X21vZGUgPSAmY3J0Yy0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGU7CiAJCWludCB2dG90YWw7 CiAKQEAgLTEzNzU4LDcgKzEzNzU4LDcgQEAgc3RhdGljIHZvaWQgdXBkYXRlX3NjYW5saW5lX29m ZnNldChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJCXZ0b3RhbCAvPSAyOwogCiAJCWNydGMt PnNjYW5saW5lX29mZnNldCA9IHZ0b3RhbCAtIDE7Ci0JfSBlbHNlIGlmIChIQVNfRERJKGRldikg JiYKKwl9IGVsc2UgaWYgKEhBU19EREkoZGV2X3ByaXYpICYmCiAJCSAgIGludGVsX2NydGNfaGFz X3R5cGUoY3J0Yy0+Y29uZmlnLCBJTlRFTF9PVVRQVVRfSERNSSkpIHsKIAkJY3J0Yy0+c2Nhbmxp bmVfb2Zmc2V0ID0gMjsKIAl9IGVsc2UKQEAgLTE1MzI3LDExICsxNTMyNywxMiBAQCBzdGF0aWMg Ym9vbCBpbnRlbF9jcnRfcHJlc2VudChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChJU19D SEVSUllWSUVXKGRldikpCiAJCXJldHVybiBmYWxzZTsKIAotCWlmIChIQVNfUENIX0xQVF9IKGRl dikgJiYgSTkxNV9SRUFEKFNGVVNFX1NUUkFQKSAmIFNGVVNFX1NUUkFQX0NSVF9ESVNBQkxFRCkK KwlpZiAoSEFTX1BDSF9MUFRfSChkZXZfcHJpdikgJiYKKwkgICAgSTkxNV9SRUFEKFNGVVNFX1NU UkFQKSAmIFNGVVNFX1NUUkFQX0NSVF9ESVNBQkxFRCkKIAkJcmV0dXJuIGZhbHNlOwogCiAJLyog RERJIEUgY2FuJ3QgYmUgdXNlZCBpZiBEREkgQSByZXF1aXJlcyA0IGxhbmVzICovCi0JaWYgKEhB U19EREkoZGV2KSAmJiBJOTE1X1JFQUQoRERJX0JVRl9DVEwoUE9SVF9BKSkgJiBERElfQV80X0xB TkVTKQorCWlmIChIQVNfRERJKGRldl9wcml2KSAmJiBJOTE1X1JFQUQoRERJX0JVRl9DVEwoUE9S VF9BKSkgJiBERElfQV80X0xBTkVTKQogCQlyZXR1cm4gZmFsc2U7CiAKIAlpZiAoIWRldl9wcml2 LT52YnQuaW50X2NydF9zdXBwb3J0KQpAQCAtMTU0MDUsNyArMTU0MDYsNyBAQCBzdGF0aWMgdm9p ZCBpbnRlbF9zZXR1cF9vdXRwdXRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWludGVsX2Rk aV9pbml0KGRldiwgUE9SVF9DKTsKIAogCQlpbnRlbF9kc2lfaW5pdChkZXYpOwotCX0gZWxzZSBp ZiAoSEFTX0RESShkZXYpKSB7CisJfSBlbHNlIGlmIChIQVNfRERJKGRldl9wcml2KSkgewogCQlp bnQgZm91bmQ7CiAKIAkJLyoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCmluZGV4IDU5OTIwOTNlMTgx NC4uZWRhZjM1Yjk3NWMwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKQEAgLTE1NjUsNyArMTU2 NSw3IEBAIGludGVsX2RwX2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNv ZGVyLAogCiAJbWF4X2Nsb2NrID0gY29tbW9uX2xlbiAtIDE7CiAKLQlpZiAoSEFTX1BDSF9TUExJ VChkZXYpICYmICFIQVNfRERJKGRldikgJiYgcG9ydCAhPSBQT1JUX0EpCisJaWYgKEhBU19QQ0hf U1BMSVQoZGV2X3ByaXYpICYmICFIQVNfRERJKGRldl9wcml2KSAmJiBwb3J0ICE9IFBPUlRfQSkK IAkJcGlwZV9jb25maWctPmhhc19wY2hfZW5jb2RlciA9IHRydWU7CiAKIAlwaXBlX2NvbmZpZy0+ aGFzX2RycnMgPSBmYWxzZTsKQEAgLTE3MDcsNyArMTcwNyw3IEBAIGZvdW5kOgogCQl0b19pbnRl bF9hdG9taWNfc3RhdGUocGlwZV9jb25maWctPmJhc2Uuc3RhdGUpLT5jZGNsa19wbGxfdmNvID0g dmNvOwogCX0KIAotCWlmICghSEFTX0RESShkZXYpKQorCWlmICghSEFTX0RESShkZXZfcHJpdikp CiAJCWludGVsX2RwX3NldF9jbG9jayhlbmNvZGVyLCBwaXBlX2NvbmZpZyk7CiAKIAlyZXR1cm4g dHJ1ZTsKQEAgLTI2MzIsNyArMjYzMiw3IEBAIF9pbnRlbF9kcF9zZXRfbGlua190cmFpbihzdHJ1 Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCQlEUk1fREVCVUdfS01TKCJVc2luZyBEUCB0cmFpbmlu ZyBwYXR0ZXJuIFRQUyVkXG4iLAogCQkJICAgICAgZHBfdHJhaW5fcGF0ICYgRFBfVFJBSU5JTkdf UEFUVEVSTl9NQVNLKTsKIAotCWlmIChIQVNfRERJKGRldikpIHsKKwlpZiAoSEFTX0RESShkZXZf cHJpdikpIHsKIAkJdWludDMyX3QgdGVtcCA9IEk5MTVfUkVBRChEUF9UUF9DVEwocG9ydCkpOwog CiAJCWlmIChkcF90cmFpbl9wYXQgJiBEUF9MSU5LX1NDUkFNQkxJTkdfRElTQUJMRSkKQEAgLTMz MzksNyArMzMzOSw3IEBAIGludGVsX2RwX3NldF9zaWduYWxfbGV2ZWxzKHN0cnVjdCBpbnRlbF9k cCAqaW50ZWxfZHApCiAJdWludDMyX3Qgc2lnbmFsX2xldmVscywgbWFzayA9IDA7CiAJdWludDhf dCB0cmFpbl9zZXQgPSBpbnRlbF9kcC0+dHJhaW5fc2V0WzBdOwogCi0JaWYgKEhBU19EREkoZGV2 KSkgeworCWlmIChIQVNfRERJKGRldl9wcml2KSkgewogCQlzaWduYWxfbGV2ZWxzID0gZGRpX3Np Z25hbF9sZXZlbHMoaW50ZWxfZHApOwogCiAJCWlmIChJU19CUk9YVE9OKGRldikpCkBAIC0zMzk4 LDcgKzMzOTgsNyBAQCB2b2lkIGludGVsX2RwX3NldF9pZGxlX2xpbmtfdHJhaW4oc3RydWN0IGlu dGVsX2RwICppbnRlbF9kcCkKIAllbnVtIHBvcnQgcG9ydCA9IGludGVsX2RpZ19wb3J0LT5wb3J0 OwogCXVpbnQzMl90IHZhbDsKIAotCWlmICghSEFTX0RESShkZXYpKQorCWlmICghSEFTX0RESShk ZXZfcHJpdikpCiAJCXJldHVybjsKIAogCXZhbCA9IEk5MTVfUkVBRChEUF9UUF9DVEwocG9ydCkp OwpAQCAtMzQzMyw3ICszNDMzLDcgQEAgaW50ZWxfZHBfbGlua19kb3duKHN0cnVjdCBpbnRlbF9k cCAqaW50ZWxfZHApCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkx NShkZXYpOwogCXVpbnQzMl90IERQID0gaW50ZWxfZHAtPkRQOwogCi0JaWYgKFdBUk5fT04oSEFT X0RESShkZXYpKSkKKwlpZiAoV0FSTl9PTihIQVNfRERJKGRldl9wcml2KSkpCiAJCXJldHVybjsK IAogCWlmIChXQVJOX09OKChJOTE1X1JFQUQoaW50ZWxfZHAtPm91dHB1dF9yZWcpICYgRFBfUE9S VF9FTikgPT0gMCkpCkBAIC01NjU5LDcgKzU2NTksNyBAQCBpbnRlbF9kcF9pbml0X2Nvbm5lY3Rv cihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwKIAllbHNlCiAJCWlu dGVsX2RwLT5nZXRfYXV4X3NlbmRfY3RsID0gZzR4X2dldF9hdXhfc2VuZF9jdGw7CiAKLQlpZiAo SEFTX0RESShkZXYpKQorCWlmIChIQVNfRERJKGRldl9wcml2KSkKIAkJaW50ZWxfZHAtPnByZXBh cmVfbGlua19yZXRyYWluID0gaW50ZWxfZGRpX3ByZXBhcmVfbGlua19yZXRyYWluOwogCiAJLyog UHJlc2VydmUgdGhlIGN1cnJlbnQgaHcgc3RhdGUuICovCkBAIC01NzAxLDcgKzU3MDEsNyBAQCBp bnRlbF9kcF9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9k aWdfcG9ydCwKIAogCWludGVsX2Nvbm5lY3Rvcl9hdHRhY2hfZW5jb2RlcihpbnRlbF9jb25uZWN0 b3IsIGludGVsX2VuY29kZXIpOwogCi0JaWYgKEhBU19EREkoZGV2KSkKKwlpZiAoSEFTX0RESShk ZXZfcHJpdikpCiAJCWludGVsX2Nvbm5lY3Rvci0+Z2V0X2h3X3N0YXRlID0gaW50ZWxfZGRpX2Nv bm5lY3Rvcl9nZXRfaHdfc3RhdGU7CiAJZWxzZQogCQlpbnRlbF9jb25uZWN0b3ItPmdldF9od19z dGF0ZSA9IGludGVsX2Nvbm5lY3Rvcl9nZXRfaHdfc3RhdGU7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHBsbF9tZ3IuYwppbmRleCAxYzU5Y2E1MGM0MzAuLmQwYzU5YzE3OTNlZiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5jCkBAIC0xODU1LDcgKzE4NTUsNyBAQCB2b2lkIGlu dGVsX3NoYXJlZF9kcGxsX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJZHBsbF9tZ3Ig PSAmc2tsX3BsbF9tZ3I7CiAJZWxzZSBpZiAoSVNfQlJPWFRPTihkZXYpKQogCQlkcGxsX21nciA9 ICZieHRfcGxsX21ncjsKLQllbHNlIGlmIChIQVNfRERJKGRldikpCisJZWxzZSBpZiAoSEFTX0RE SShkZXZfcHJpdikpCiAJCWRwbGxfbWdyID0gJmhzd19wbGxfbWdyOwogCWVsc2UgaWYgKEhBU19Q Q0hfSUJYKGRldikgfHwgSEFTX1BDSF9DUFQoZGV2KSkKIAkJZHBsbF9tZ3IgPSAmcGNoX3BsbF9t Z3I7CkBAIC0xODgzLDcgKzE4ODMsNyBAQCB2b2lkIGludGVsX3NoYXJlZF9kcGxsX2luaXQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAlCVUdfT04oZGV2X3ByaXYtPm51bV9zaGFyZWRfZHBsbCA+ IEk5MTVfTlVNX1BMTFMpOwogCiAJLyogRklYTUU6IE1vdmUgdGhpcyB0byBhIG1vcmUgc3VpdGFi bGUgcGxhY2UgKi8KLQlpZiAoSEFTX0RESShkZXYpKQorCWlmIChIQVNfRERJKGRldl9wcml2KSkK IAkJaW50ZWxfZGRpX3BsbF9pbml0KGRldik7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2hkbWkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWku YwppbmRleCA4ZDQ2ZjU4MzY3NDYuLjA5YjIxNDZmMTU3ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2hkbWkuYwpAQCAtNTAsNyArNTAsNyBAQCBhc3NlcnRfaGRtaV9wb3J0X2Rpc2FibGVkKHN0cnVj dCBpbnRlbF9oZG1pICppbnRlbF9oZG1pKQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoZGV2KTsKIAl1aW50MzJfdCBlbmFibGVkX2JpdHM7CiAKLQllbmFibGVk X2JpdHMgPSBIQVNfRERJKGRldikgPyBERElfQlVGX0NUTF9FTkFCTEUgOiBTRFZPX0VOQUJMRTsK KwllbmFibGVkX2JpdHMgPSBIQVNfRERJKGRldl9wcml2KSA/IERESV9CVUZfQ1RMX0VOQUJMRSA6 IFNEVk9fRU5BQkxFOwogCiAJV0FSTihJOTE1X1JFQUQoaW50ZWxfaGRtaS0+aGRtaV9yZWcpICYg ZW5hYmxlZF9iaXRzLAogCSAgICAgIkhETUkgcG9ydCBlbmFibGVkLCBleHBlY3RpbmcgZGlzYWJs ZWRcbiIpOwpAQCAtMTMxMiw3ICsxMzEyLDcgQEAgYm9vbCBpbnRlbF9oZG1pX2NvbXB1dGVfY29u ZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJICAgICAgIHN0cnVjdCBkcm1f Y29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlKQogewogCXN0cnVjdCBpbnRlbF9oZG1pICppbnRl bF9oZG1pID0gZW5jX3RvX2ludGVsX2hkbWkoJmVuY29kZXItPmJhc2UpOwotCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBlbmNvZGVyLT5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsKIAlzdHJ1Y3QgZHJtX2Rp c3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9ICZwaXBlX2NvbmZpZy0+YmFzZS5hZGp1c3RlZF9t b2RlOwogCWludCBjbG9ja184YnBjID0gcGlwZV9jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZS5j cnRjX2Nsb2NrOwogCWludCBjbG9ja18xMmJwYyA9IGNsb2NrXzhicGMgKiAzIC8gMjsKQEAgLTEz MzksNyArMTMzOSw3IEBAIGJvb2wgaW50ZWxfaGRtaV9jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50 ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJY2xvY2tfMTJicGMgKj0gMjsKIAl9CiAKLQlpZiAoSEFT X1BDSF9TUExJVChkZXYpICYmICFIQVNfRERJKGRldikpCisJaWYgKEhBU19QQ0hfU1BMSVQoZGV2 X3ByaXYpICYmICFIQVNfRERJKGRldl9wcml2KSkKIAkJcGlwZV9jb25maWctPmhhc19wY2hfZW5j b2RlciA9IHRydWU7CiAKIAlpZiAocGlwZV9jb25maWctPmhhc19oZG1pX3NpbmsgJiYgaW50ZWxf aGRtaS0+aGFzX2F1ZGlvKQpAQCAtMTg5Miw3ICsxODkyLDcgQEAgdm9pZCBpbnRlbF9oZG1pX2lu aXRfY29ubmVjdG9yKHN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0LAog CQlpbnRlbF9oZG1pLT53cml0ZV9pbmZvZnJhbWUgPSBnNHhfd3JpdGVfaW5mb2ZyYW1lOwogCQlp bnRlbF9oZG1pLT5zZXRfaW5mb2ZyYW1lcyA9IGc0eF9zZXRfaW5mb2ZyYW1lczsKIAkJaW50ZWxf aGRtaS0+aW5mb2ZyYW1lX2VuYWJsZWQgPSBnNHhfaW5mb2ZyYW1lX2VuYWJsZWQ7Ci0JfSBlbHNl IGlmIChIQVNfRERJKGRldikpIHsKKwl9IGVsc2UgaWYgKEhBU19EREkoZGV2X3ByaXYpKSB7CiAJ CWludGVsX2hkbWktPndyaXRlX2luZm9mcmFtZSA9IGhzd193cml0ZV9pbmZvZnJhbWU7CiAJCWlu dGVsX2hkbWktPnNldF9pbmZvZnJhbWVzID0gaHN3X3NldF9pbmZvZnJhbWVzOwogCQlpbnRlbF9o ZG1pLT5pbmZvZnJhbWVfZW5hYmxlZCA9IGhzd19pbmZvZnJhbWVfZW5hYmxlZDsKQEAgLTE5MDYs NyArMTkwNiw3IEBAIHZvaWQgaW50ZWxfaGRtaV9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxf ZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwKIAkJaW50ZWxfaGRtaS0+aW5mb2ZyYW1lX2Vu YWJsZWQgPSBjcHRfaW5mb2ZyYW1lX2VuYWJsZWQ7CiAJfQogCi0JaWYgKEhBU19EREkoZGV2KSkK KwlpZiAoSEFTX0RESShkZXZfcHJpdikpCiAJCWludGVsX2Nvbm5lY3Rvci0+Z2V0X2h3X3N0YXRl ID0gaW50ZWxfZGRpX2Nvbm5lY3Rvcl9nZXRfaHdfc3RhdGU7CiAJZWxzZQogCQlpbnRlbF9jb25u ZWN0b3ItPmdldF9od19zdGF0ZSA9IGludGVsX2Nvbm5lY3Rvcl9nZXRfaHdfc3RhdGU7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYwppbmRleCBmZTZjMWM2MWMzODguLjk4Nzk4Y2JjMjc5MiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jCkBAIC03MTQwLDcgKzcxNDAsNyBAQCBzdGF0aWMgdm9pZCBscHRf aW5pdF9jbG9ja19nYXRpbmcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkgKiBUT0RPOiB0aGlz IGJpdCBzaG91bGQgb25seSBiZSBlbmFibGVkIHdoZW4gcmVhbGx5IG5lZWRlZCwgdGhlbgogCSAq IGRpc2FibGVkIHdoZW4gbm90IG5lZWRlZCBhbnltb3JlIGluIG9yZGVyIHRvIHNhdmUgcG93ZXIu CiAJICovCi0JaWYgKEhBU19QQ0hfTFBUX0xQKGRldikpCisJaWYgKEhBU19QQ0hfTFBUX0xQKGRl dl9wcml2KSkKIAkJSTkxNV9XUklURShTT1VUSF9EU1BDTEtfR0FURV9ELAogCQkJICAgSTkxNV9S RUFEKFNPVVRIX0RTUENMS19HQVRFX0QpIHwKIAkJCSAgIFBDSF9MUF9QQVJUSVRJT05fTEVWRUxf RElTQUJMRSk7CkBAIC03MTU1LDcgKzcxNTUsNyBAQCBzdGF0aWMgdm9pZCBscHRfc3VzcGVuZF9o dyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAotCWlmIChIQVNfUENIX0xQVF9MUChkZXYpKSB7CisJ aWYgKEhBU19QQ0hfTFBUX0xQKGRldl9wcml2KSkgewogCQl1aW50MzJfdCB2YWwgPSBJOTE1X1JF QUQoU09VVEhfRFNQQ0xLX0dBVEVfRCk7CiAKIAkJdmFsICY9IH5QQ0hfTFBfUEFSVElUSU9OX0xF VkVMX0RJU0FCTEU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3Iu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCmluZGV4IDEwOGJhMWU1ZDY1OC4u OWUyZmJhYzk3NzZlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3Iu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYwpAQCAtMzQ0LDcgKzM0NCw3 IEBAIHN0YXRpYyBib29sIGludGVsX3Bzcl9tYXRjaF9jb25kaXRpb25zKHN0cnVjdCBpbnRlbF9k cCAqaW50ZWxfZHApCiAJICogb25lcy4gU2luY2UgYnkgRGlzcGxheSBkZXNpZ24gdHJhbnNjb2Rl ciBFRFAgaXMgdGllZCB0byBwb3J0IEEKIAkgKiB3ZSBjYW4gc2FmZWx5IGVzY2FwZSBiYXNlZCBv biB0aGUgcG9ydCBBLgogCSAqLwotCWlmIChIQVNfRERJKGRldikgJiYgZGlnX3BvcnQtPnBvcnQg IT0gUE9SVF9BKSB7CisJaWYgKEhBU19EREkoZGV2X3ByaXYpICYmIGRpZ19wb3J0LT5wb3J0ICE9 IFBPUlRfQSkgewogCQlEUk1fREVCVUdfS01TKCJQU1IgY29uZGl0aW9uIGZhaWxlZDogUG9ydCBu b3Qgc3VwcG9ydGVkXG4iKTsKIAkJcmV0dXJuIGZhbHNlOwogCX0KQEAgLTQwMiw3ICs0MDIsNyBA QCBzdGF0aWMgdm9pZCBpbnRlbF9wc3JfYWN0aXZhdGUoc3RydWN0IGludGVsX2RwICppbnRlbF9k cCkKIAlsb2NrZGVwX2Fzc2VydF9oZWxkKCZkZXZfcHJpdi0+cHNyLmxvY2spOwogCiAJLyogRW5h YmxlL1JlLWVuYWJsZSBQU1Igb24gdGhlIGhvc3QgKi8KLQlpZiAoSEFTX0RESShkZXYpKQorCWlm IChIQVNfRERJKGRldl9wcml2KSkKIAkJLyogT24gSFNXKyBhZnRlciB3ZSBlbmFibGUgUFNSIG9u IHNvdXJjZSBpdCB3aWxsIGFjdGl2YXRlIGl0CiAJCSAqIGFzIHNvb24gYXMgaXQgbWF0Y2ggY29u ZmlndXJlIGlkbGVfZnJhbWUgY291bnQuIFNvCiAJCSAqIHdlIGp1c3QgYWN0dWFsbHkgZW5hYmxl IGl0IGhlcmUgb24gYWN0aXZhdGlvbiB0aW1lLgpAQCAtNDQ4LDcgKzQ0OCw3IEBAIHZvaWQgaW50 ZWxfcHNyX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCiAJZGV2X3ByaXYtPnBz ci5idXN5X2Zyb250YnVmZmVyX2JpdHMgPSAwOwogCi0JaWYgKEhBU19EREkoZGV2KSkgeworCWlm IChIQVNfRERJKGRldl9wcml2KSkgewogCQloc3dfcHNyX3NldHVwX3ZzYyhpbnRlbF9kcCk7CiAK IAkJaWYgKGRldl9wcml2LT5wc3IucHNyMl9zdXBwb3J0KSB7CkBAIC01ODAsNyArNTgwLDcgQEAg dm9pZCBpbnRlbF9wc3JfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCX0KIAog CS8qIERpc2FibGUgUFNSIG9uIFNvdXJjZSAqLwotCWlmIChIQVNfRERJKGRldikpCisJaWYgKEhB U19EREkoZGV2X3ByaXYpKQogCQloc3dfcHNyX2Rpc2FibGUoaW50ZWxfZHApOwogCWVsc2UKIAkJ dmx2X3Bzcl9kaXNhYmxlKGludGVsX2RwKTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK