From: Tvrtko Ursulin Subject: [CI 02/19] drm/i915: Make INTEL_PCH_TYPE & co only take dev_priv Date: Thu, 13 Oct 2016 11:02:53 +0100 Message-ID: <1476352990-2504-2-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 24ECD6EA02 for ; Thu, 13 Oct 2016 10:03:22 +0000 (UTC) Received: by mail-lf0-x243.google.com with SMTP id b75so11685904lfg.3 for ; Thu, 13 Oct 2016 03:03:22 -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.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Oct 2016 03:03:19 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRoaXMgc2F2 ZXMgMTg3MiBieXRlcyBvZiAucm9kYXRhIHN0cmluZ3MuCgp2MjoKICogUmViYXNlLgogKiBBZGQg cGFyYW50aGVzZXMgYXJvdW5kIGRldl9wcml2LiAoVmlsbGUgU3lyamFsYSkKClNpZ25lZC1vZmYt Ynk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ClJldmlld2VkLWJ5 OiBEYXZpZCBXZWluZWhhbGwgPGRhdmlkLndlaW5laGFsbEBsaW51eC5pbnRlbC5jb20+CkFja2Vk LWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpBY2tlZC1ieTogSmFu aSBOaWt1bGEgPGphbmkubmlrdWxhQGxpbnV4LmludGVsLmNvbT4KQWNrZWQtYnk6IENocmlzIFdp bHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpBY2tlZC1ieTogTWFhcnRlbiBMYW5raG9y c3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oICAgICAgIHwgMTYgKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ3B1X2Vycm9yLmMgfCAgNCArLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMg ICAgICAgfCAyMCArKysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F1 ZGlvLmMgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMgICAgICB8 IDI1ICsrKysrKysrKy0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jICB8IDQ4ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcC5jICAgICAgIHwgMjcgKysrKysrKysrKy0tLS0tLS0tLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMgfCAgMiArLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfaGRtaS5jICAgICB8IDE5ICsrKysrKystLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9pMmMuYyAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2x2ZHMuYyAgICAgfCAyMiArKysrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jICAgICAgIHwgIDYgKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Nkdm8uYyAgICAgfCAxMiArKysrLS0tLS0KIDE0IGZpbGVzIGNoYW5nZWQsIDEwNyBpbnNl cnRpb25zKCspLCAxMDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXgg MDc3NmI0YWZjY2ZmLi44Nzg5MjFiMDk3ZTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAt Mjg1MywxOCArMjg1MywxOCBAQCBzdHJ1Y3QgZHJtX2k5MTVfY21kX3RhYmxlIHsKICNkZWZpbmUg SU5URUxfUENIX1AzWF9ERVZJQ0VfSURfVFlQRQkJMHg3MDAwCiAjZGVmaW5lIElOVEVMX1BDSF9R RU1VX0RFVklDRV9JRF9UWVBFCQkweDI5MDAgLyogcWVtdSBxMzUgaGFzIDI5MTggKi8KIAotI2Rl ZmluZSBJTlRFTF9QQ0hfVFlQRShkZXYpIChfX0k5MTVfXyhkZXYpLT5wY2hfdHlwZSkKLSNkZWZp bmUgSEFTX1BDSF9LQlAoZGV2KSAoSU5URUxfUENIX1RZUEUoZGV2KSA9PSBQQ0hfS0JQKQotI2Rl ZmluZSBIQVNfUENIX1NQVChkZXYpIChJTlRFTF9QQ0hfVFlQRShkZXYpID09IFBDSF9TUFQpCi0j ZGVmaW5lIEhBU19QQ0hfTFBUKGRldikgKElOVEVMX1BDSF9UWVBFKGRldikgPT0gUENIX0xQVCkK KyNkZWZpbmUgSU5URUxfUENIX1RZUEUoZGV2X3ByaXYpICgoZGV2X3ByaXYpLT5wY2hfdHlwZSkK KyNkZWZpbmUgSEFTX1BDSF9LQlAoZGV2X3ByaXYpIChJTlRFTF9QQ0hfVFlQRShkZXZfcHJpdikg PT0gUENIX0tCUCkKKyNkZWZpbmUgSEFTX1BDSF9TUFQoZGV2X3ByaXYpIChJTlRFTF9QQ0hfVFlQ RShkZXZfcHJpdikgPT0gUENIX1NQVCkKKyNkZWZpbmUgSEFTX1BDSF9MUFQoZGV2X3ByaXYpIChJ TlRFTF9QQ0hfVFlQRShkZXZfcHJpdikgPT0gUENIX0xQVCkKICNkZWZpbmUgSEFTX1BDSF9MUFRf TFAoZGV2X3ByaXYpIFwKIAkoKGRldl9wcml2KS0+cGNoX2lkID09IElOVEVMX1BDSF9MUFRfTFBf REVWSUNFX0lEX1RZUEUpCiAjZGVmaW5lIEhBU19QQ0hfTFBUX0goZGV2X3ByaXYpIFwKIAkoKGRl dl9wcml2KS0+cGNoX2lkID09IElOVEVMX1BDSF9MUFRfREVWSUNFX0lEX1RZUEUpCi0jZGVmaW5l IEhBU19QQ0hfQ1BUKGRldikgKElOVEVMX1BDSF9UWVBFKGRldikgPT0gUENIX0NQVCkKLSNkZWZp bmUgSEFTX1BDSF9JQlgoZGV2KSAoSU5URUxfUENIX1RZUEUoZGV2KSA9PSBQQ0hfSUJYKQotI2Rl ZmluZSBIQVNfUENIX05PUChkZXYpIChJTlRFTF9QQ0hfVFlQRShkZXYpID09IFBDSF9OT1ApCi0j ZGVmaW5lIEhBU19QQ0hfU1BMSVQoZGV2KSAoSU5URUxfUENIX1RZUEUoZGV2KSAhPSBQQ0hfTk9O RSkKKyNkZWZpbmUgSEFTX1BDSF9DUFQoZGV2X3ByaXYpIChJTlRFTF9QQ0hfVFlQRShkZXZfcHJp dikgPT0gUENIX0NQVCkKKyNkZWZpbmUgSEFTX1BDSF9JQlgoZGV2X3ByaXYpIChJTlRFTF9QQ0hf VFlQRShkZXZfcHJpdikgPT0gUENIX0lCWCkKKyNkZWZpbmUgSEFTX1BDSF9OT1AoZGV2X3ByaXYp IChJTlRFTF9QQ0hfVFlQRShkZXZfcHJpdikgPT0gUENIX05PUCkKKyNkZWZpbmUgSEFTX1BDSF9T UExJVChkZXZfcHJpdikgKElOVEVMX1BDSF9UWVBFKGRldl9wcml2KSAhPSBQQ0hfTk9ORSkKIAog I2RlZmluZSBIQVNfR01DSF9ESVNQTEFZKGRldikgKElOVEVMX0lORk8oZGV2KS0+aGFzX2dtY2hf ZGlzcGxheSkKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggODMwZGYzNmNhMTRjLi4zY2Vl MDg1M2UwNmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDM4OSw3ICs0Mzg5LDcgQEAg aTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlJOTE1X1dSSVRFKE1J X1BSRURJQ0FURV9SRVNVTFRfMiwgSVNfSFNXX0dUMyhkZXYpID8KIAkJCSAgIExPV0VSX1NMSUNF X0VOQUJMRUQgOiBMT1dFUl9TTElDRV9ESVNBQkxFRCk7CiAKLQlpZiAoSEFTX1BDSF9OT1AoZGV2 KSkgeworCWlmIChIQVNfUENIX05PUChkZXZfcHJpdikpIHsKIAkJaWYgKElTX0lWWUJSSURHRShk ZXYpKSB7CiAJCQl1MzIgdGVtcCA9IEk5MTVfUkVBRChHRU43X01TR19DVEwpOwogCQkJdGVtcCAm PSB+KFdBSVRfRk9SX1BDSF9GTFJfQUNLIHwgV0FJVF9GT1JfUENIX1JFU0VUX0FDSyk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwppbmRleCA3OGNjMTNiOWIyYTUuLjFkZjMxODY5 YTQ5ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBAIC01NzMsNyArNTcz LDcgQEAgaW50IGk5MTVfZXJyb3Jfc3RhdGVfdG9fc3RyKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9z dGF0ZV9idWYgKm0sCiAJCWZvciAoaSA9IDA7IGkgPCA0OyBpKyspCiAJCQllcnJfcHJpbnRmKG0s ICJHVElFUiBndCAlZDogMHglMDh4XG4iLCBpLAogCQkJCSAgIGVycm9yLT5ndGllcltpXSk7Ci0J fSBlbHNlIGlmIChIQVNfUENIX1NQTElUKGRldikgfHwgSVNfVkFMTEVZVklFVyhkZXYpKQorCX0g ZWxzZSBpZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikgfHwgSVNfVkFMTEVZVklFVyhkZXZfcHJp dikpCiAJCWVycl9wcmludGYobSwgIkdUSUVSOiAweCUwOHhcbiIsIGVycm9yLT5ndGllclswXSk7 CiAJZXJyX3ByaW50ZihtLCAiUEdUQkxfRVI6IDB4JTA4eFxuIiwgZXJyb3ItPnBndGJsX2VyKTsK IAllcnJfcHJpbnRmKG0sICJGT1JDRVdBS0U6IDB4JTA4eFxuIiwgZXJyb3ItPmZvcmNld2FrZSk7 CkBAIC0xNDQyLDcgKzE0NDIsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2NhcHR1cmVfcmVnX3N0YXRl KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJZXJyb3ItPmllciA9IEk5MTVf UkVBRChHRU44X0RFX01JU0NfSUVSKTsKIAkJZm9yIChpID0gMDsgaSA8IDQ7IGkrKykKIAkJCWVy cm9yLT5ndGllcltpXSA9IEk5MTVfUkVBRChHRU44X0dUX0lFUihpKSk7Ci0JfSBlbHNlIGlmIChI QVNfUENIX1NQTElUKGRldikpIHsKKwl9IGVsc2UgaWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYp KSB7CiAJCWVycm9yLT5pZXIgPSBJOTE1X1JFQUQoREVJRVIpOwogCQllcnJvci0+Z3RpZXJbMF0g PSBJOTE1X1JFQUQoR1RJRVIpOwogCX0gZWxzZSBpZiAoSVNfR0VOMihkZXYpKSB7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9pcnEuYwppbmRleCBkZGZmNmY5Yjg2OWMuLjQ5ODJiNDIzMzFlMSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2lycS5jCkBAIC0zMjM3LDEyICszMjM3LDEyIEBAIHN0YXRpYyB2b2lkIGlieF9p cnFfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAKLQlpZiAoSEFTX1BDSF9OT1AoZGV2KSkK KwlpZiAoSEFTX1BDSF9OT1AoZGV2X3ByaXYpKQogCQlyZXR1cm47CiAKIAlHRU41X0lSUV9SRVNF VChTREUpOwogCi0JaWYgKEhBU19QQ0hfQ1BUKGRldikgfHwgSEFTX1BDSF9MUFQoZGV2KSkKKwlp ZiAoSEFTX1BDSF9DUFQoZGV2X3ByaXYpIHx8IEhBU19QQ0hfTFBUKGRldl9wcml2KSkKIAkJSTkx NV9XUklURShTRVJSX0lOVCwgMHhmZmZmZmZmZik7CiB9CiAKQEAgLTMyNTgsNyArMzI1OCw3IEBA IHN0YXRpYyB2b2lkIGlieF9pcnFfcHJlX3Bvc3RpbnN0YWxsKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYp OwogCi0JaWYgKEhBU19QQ0hfTk9QKGRldikpCisJaWYgKEhBU19QQ0hfTk9QKGRldl9wcml2KSkK IAkJcmV0dXJuOwogCiAJV0FSTl9PTihJOTE1X1JFQUQoU0RFSUVSKSAhPSAwKTsKQEAgLTMzODMs NyArMzM4Myw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfaXJxX3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJR0VONV9JUlFfUkVTRVQoR0VOOF9ERV9NSVNDXyk7CiAJR0VONV9JUlFfUkVTRVQo R0VOOF9QQ1VfKTsKIAotCWlmIChIQVNfUENIX1NQTElUKGRldikpCisJaWYgKEhBU19QQ0hfU1BM SVQoZGV2X3ByaXYpKQogCQlpYnhfaXJxX3Jlc2V0KGRldik7CiB9CiAKQEAgLTM1NzIsMTAgKzM1 NzIsMTAgQEAgc3RhdGljIHZvaWQgaWJ4X2lycV9wb3N0aW5zdGFsbChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2 KTsKIAl1MzIgbWFzazsKIAotCWlmIChIQVNfUENIX05PUChkZXYpKQorCWlmIChIQVNfUENIX05P UChkZXZfcHJpdikpCiAJCXJldHVybjsKIAotCWlmIChIQVNfUENIX0lCWChkZXYpKQorCWlmIChI QVNfUENIX0lCWChkZXZfcHJpdikpCiAJCW1hc2sgPSBTREVfR01CVVMgfCBTREVfQVVYX01BU0sg fCBTREVfUE9JU09OOwogCWVsc2UKIAkJbWFzayA9IFNERV9HTUJVU19DUFQgfCBTREVfQVVYX01B U0tfQ1BUOwpAQCAtMzc5NiwxMyArMzc5NiwxMyBAQCBzdGF0aWMgaW50IGdlbjhfaXJxX3Bvc3Rp bnN0YWxsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCi0JaWYgKEhBU19QQ0hfU1BMSVQoZGV2KSkK KwlpZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikpCiAJCWlieF9pcnFfcHJlX3Bvc3RpbnN0YWxs KGRldik7CiAKIAlnZW44X2d0X2lycV9wb3N0aW5zdGFsbChkZXZfcHJpdik7CiAJZ2VuOF9kZV9p cnFfcG9zdGluc3RhbGwoZGV2X3ByaXYpOwogCi0JaWYgKEhBU19QQ0hfU1BMSVQoZGV2KSkKKwlp ZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikpCiAJCWlieF9pcnFfcG9zdGluc3RhbGwoZGV2KTsK IAogCUk5MTVfV1JJVEUoR0VOOF9NQVNURVJfSVJRLCBHRU44X01BU1RFUl9JUlFfQ09OVFJPTCk7 CkBAIC00NTk5LDExICs0NTk5LDExIEBAIHZvaWQgaW50ZWxfaXJxX2luaXQoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQlkZXYtPmRyaXZlci0+ZGlzYWJsZV92YmxhbmsgPSBn ZW44X2Rpc2FibGVfdmJsYW5rOwogCQlpZiAoSVNfQlJPWFRPTihkZXYpKQogCQkJZGV2X3ByaXYt PmRpc3BsYXkuaHBkX2lycV9zZXR1cCA9IGJ4dF9ocGRfaXJxX3NldHVwOwotCQllbHNlIGlmIChI QVNfUENIX1NQVChkZXYpIHx8IEhBU19QQ0hfS0JQKGRldikpCisJCWVsc2UgaWYgKEhBU19QQ0hf U1BUKGRldl9wcml2KSB8fCBIQVNfUENIX0tCUChkZXZfcHJpdikpCiAJCQlkZXZfcHJpdi0+ZGlz cGxheS5ocGRfaXJxX3NldHVwID0gc3B0X2hwZF9pcnFfc2V0dXA7CiAJCWVsc2UKIAkJCWRldl9w cml2LT5kaXNwbGF5LmhwZF9pcnFfc2V0dXAgPSBpbGtfaHBkX2lycV9zZXR1cDsKLQl9IGVsc2Ug aWYgKEhBU19QQ0hfU1BMSVQoZGV2KSkgeworCX0gZWxzZSBpZiAoSEFTX1BDSF9TUExJVChkZXZf cHJpdikpIHsKIAkJZGV2LT5kcml2ZXItPmlycV9oYW5kbGVyID0gaXJvbmxha2VfaXJxX2hhbmRs ZXI7CiAJCWRldi0+ZHJpdmVyLT5pcnFfcHJlaW5zdGFsbCA9IGlyb25sYWtlX2lycV9yZXNldDsK IAkJZGV2LT5kcml2ZXItPmlycV9wb3N0aW5zdGFsbCA9IGlyb25sYWtlX2lycV9wb3N0aW5zdGFs bDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F1ZGlvLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5jCmluZGV4IDgxZGYyOWNhNDk0Ny4uZTIwZGE1 OWIxMDIwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F1ZGlvLmMKQEAgLTQzMCw3ICs0MzAsNyBA QCBzdGF0aWMgdm9pZCBpbGtfYXVkaW9fY29kZWNfZW5hYmxlKHN0cnVjdCBkcm1fY29ubmVjdG9y ICpjb25uZWN0b3IsCiAJICogaW5mcmFzdHJ1Y3R1cmUgaXMgbm90IHRoZXJlIHlldC4KIAkgKi8K IAotCWlmIChIQVNfUENIX0lCWChjb25uZWN0b3ItPmRldikpIHsKKwlpZiAoSEFTX1BDSF9JQlgo ZGV2X3ByaXYpKSB7CiAJCWhkbWl3X2hkbWllZGlkID0gSUJYX0hETUlXX0hETUlFRElEKHBpcGUp OwogCQlhdWRfY29uZmlnID0gSUJYX0FVRF9DRkcocGlwZSk7CiAJCWF1ZF9jbnRsX3N0ID0gSUJY X0FVRF9DTlRMX1NUKHBpcGUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfY3J0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYwppbmRleCBkNGI5YjE2 NmRlNWQuLmY4OTE5ZWYzYTdhZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfY3J0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMKQEAgLTg0LDcg Kzg0LDcgQEAgc3RhdGljIGJvb2wgaW50ZWxfY3J0X2dldF9od19zdGF0ZShzdHJ1Y3QgaW50ZWxf ZW5jb2RlciAqZW5jb2RlciwKIAlpZiAoISh0bXAgJiBBRFBBX0RBQ19FTkFCTEUpKQogCQlnb3Rv IG91dDsKIAotCWlmIChIQVNfUENIX0NQVChkZXYpKQorCWlmIChIQVNfUENIX0NQVChkZXZfcHJp dikpCiAJCSpwaXBlID0gUE9SVF9UT19QSVBFX0NQVCh0bXApOwogCWVsc2UKIAkJKnBpcGUgPSBQ T1JUX1RPX1BJUEUodG1wKTsKQEAgLTE2NSwxNiArMTY1LDE2IEBAIHN0YXRpYyB2b2lkIGludGVs X2NydF9zZXRfZHBtcyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJYWRwYSB8PSBB RFBBX1ZTWU5DX0FDVElWRV9ISUdIOwogCiAJLyogRm9yIENQVCBhbGxvdyAzIHBpcGUgY29uZmln LCBmb3Igb3RoZXJzIGp1c3QgdXNlIEEgb3IgQiAqLwotCWlmIChIQVNfUENIX0xQVChkZXYpKQor CWlmIChIQVNfUENIX0xQVChkZXZfcHJpdikpCiAJCTsgLyogVGhvc2UgYml0cyBkb24ndCBleGlz dCBoZXJlICovCi0JZWxzZSBpZiAoSEFTX1BDSF9DUFQoZGV2KSkKKwllbHNlIGlmIChIQVNfUENI X0NQVChkZXZfcHJpdikpCiAJCWFkcGEgfD0gUE9SVF9UUkFOU19TRUxfQ1BUKGNydGMtPnBpcGUp OwogCWVsc2UgaWYgKGNydGMtPnBpcGUgPT0gMCkKIAkJYWRwYSB8PSBBRFBBX1BJUEVfQV9TRUxF Q1Q7CiAJZWxzZQogCQlhZHBhIHw9IEFEUEFfUElQRV9CX1NFTEVDVDsKIAotCWlmICghSEFTX1BD SF9TUExJVChkZXYpKQorCWlmICghSEFTX1BDSF9TUExJVChkZXZfcHJpdikpCiAJCUk5MTVfV1JJ VEUoQkNMUlBBVChjcnRjLT5waXBlKSwgMCk7CiAKIAlzd2l0Y2ggKG1vZGUpIHsKQEAgLTI0MSw3 ICsyNDEsOCBAQCBpbnRlbF9jcnRfbW9kZV92YWxpZChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29u bmVjdG9yLAogCQkgICAgIHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlKQogewogCXN0cnVj dCBkcm1fZGV2aWNlICpkZXYgPSBjb25uZWN0b3ItPmRldjsKLQlpbnQgbWF4X2RvdGNsayA9IHRv X2k5MTUoZGV2KS0+bWF4X2RvdGNsa19mcmVxOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlpbnQgbWF4X2RvdGNsayA9IGRldl9wcml2LT5tYXhf ZG90Y2xrX2ZyZXE7CiAJaW50IG1heF9jbG9jazsKIAogCWlmIChtb2RlLT5mbGFncyAmIERSTV9N T0RFX0ZMQUdfREJMU0NBTikKQEAgLTI1MCw3ICsyNTEsNyBAQCBpbnRlbF9jcnRfbW9kZV92YWxp ZChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCWlmIChtb2RlLT5jbG9jayA8IDI1 MDAwKQogCQlyZXR1cm4gTU9ERV9DTE9DS19MT1c7CiAKLQlpZiAoSEFTX1BDSF9MUFQoZGV2KSkK KwlpZiAoSEFTX1BDSF9MUFQoZGV2X3ByaXYpKQogCQltYXhfY2xvY2sgPSAxODAwMDA7CiAJZWxz ZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKQogCQkvKgpAQCAtMjY5LDcgKzI3MCw3IEBAIGludGVs X2NydF9tb2RlX3ZhbGlkKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJCXJldHVy biBNT0RFX0NMT0NLX0hJR0g7CiAKIAkvKiBUaGUgRkRJIHJlY2VpdmVyIG9uIExQVCBvbmx5IHN1 cHBvcnRzIDhicGMgYW5kIG9ubHkgaGFzIDIgbGFuZXMuICovCi0JaWYgKEhBU19QQ0hfTFBUKGRl dikgJiYKKwlpZiAoSEFTX1BDSF9MUFQoZGV2X3ByaXYpICYmCiAJICAgIChpcm9ubGFrZV9nZXRf bGFuZXNfcmVxdWlyZWQobW9kZS0+Y2xvY2ssIDI3MDAwMCwgMjQpID4gMikpCiAJCXJldHVybiBN T0RFX0NMT0NLX0hJR0g7CiAKQEAgLTMxMiw3ICszMTMsNyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9p cm9ubGFrZV9jcnRfZGV0ZWN0X2hvdHBsdWcoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rv cikKIAogCS8qIFRoZSBmaXJzdCB0aW1lIHRocm91Z2gsIHRyaWdnZXIgYW4gZXhwbGljaXQgZGV0 ZWN0aW9uIGN5Y2xlICovCiAJaWYgKGNydC0+Zm9yY2VfaG90cGx1Z19yZXF1aXJlZCkgewotCQli b29sIHR1cm5fb2ZmX2RhYyA9IEhBU19QQ0hfU1BMSVQoZGV2KTsKKwkJYm9vbCB0dXJuX29mZl9k YWMgPSBIQVNfUENIX1NQTElUKGRldl9wcml2KTsKIAkJdTMyIHNhdmVfYWRwYTsKIAogCQljcnQt PmZvcmNlX2hvdHBsdWdfcmVxdWlyZWQgPSAwOwpAQCAtNDE5LDcgKzQyMCw3IEBAIHN0YXRpYyBi b29sIGludGVsX2NydF9kZXRlY3RfaG90cGx1ZyhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVj dG9yKQogCWJvb2wgcmV0ID0gZmFsc2U7CiAJaW50IGksIHRyaWVzID0gMDsKIAotCWlmIChIQVNf UENIX1NQTElUKGRldikpCisJaWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKQogCQlyZXR1cm4g aW50ZWxfaXJvbmxha2VfY3J0X2RldGVjdF9ob3RwbHVnKGNvbm5lY3Rvcik7CiAKIAlpZiAoSVNf VkFMTEVZVklFVyhkZXYpKQpAQCAtODQ3LDcgKzg0OCw3IEBAIHZvaWQgaW50ZWxfY3J0X2luaXQo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpOTE1X3JlZ190IGFkcGFfcmVnOwogCXUzMiBhZHBh OwogCi0JaWYgKEhBU19QQ0hfU1BMSVQoZGV2KSkKKwlpZiAoSEFTX1BDSF9TUExJVChkZXZfcHJp dikpCiAJCWFkcGFfcmVnID0gUENIX0FEUEE7CiAJZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYp KQogCQlhZHBhX3JlZyA9IFZMVl9BRFBBOwpAQCAtOTA3LDcgKzkwOCw3IEBAIHZvaWQgaW50ZWxf Y3J0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAljcnQtPmFkcGFfcmVnID0gYWRwYV9y ZWc7CiAKIAljcnQtPmJhc2UuY29tcHV0ZV9jb25maWcgPSBpbnRlbF9jcnRfY29tcHV0ZV9jb25m aWc7Ci0JaWYgKEhBU19QQ0hfU1BMSVQoZGV2KSkgeworCWlmIChIQVNfUENIX1NQTElUKGRldl9w cml2KSkgewogCQljcnQtPmJhc2UuZGlzYWJsZSA9IHBjaF9kaXNhYmxlX2NydDsKIAkJY3J0LT5i YXNlLnBvc3RfZGlzYWJsZSA9IHBjaF9wb3N0X2Rpc2FibGVfY3J0OwogCX0gZWxzZSB7CkBAIC05 NDQsNyArOTQ1LDcgQEAgdm9pZCBpbnRlbF9jcnRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCSAqIHBvbGFyaXR5IGFuZCBsaW5rIHJldmVyc2FsIGJpdHMgb3Igbm90LCBpbnN0ZWFkIG9m IHJlbHlpbmcgb24gdGhlCiAJICogQklPUy4KIAkgKi8KLQlpZiAoSEFTX1BDSF9MUFQoZGV2KSkg eworCWlmIChIQVNfUENIX0xQVChkZXZfcHJpdikpIHsKIAkJdTMyIGZkaV9jb25maWcgPSBGRElf UlhfUE9MQVJJVFlfUkVWRVJTRURfTFBUIHwKIAkJCQkgRkRJX1JYX0xJTktfUkVWRVJTQUxfT1ZF UlJJREU7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA0ODU3N2U5NWJl MTIuLjAwYjRiZmFhZWUxMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAt MTc4NCw3ICsxNzg0LDYgQEAgdm9pZCB2bHZfd2FpdF9wb3J0X3JlYWR5KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIHN0YXRpYyB2b2lkIGlyb25sYWtlX2VuYWJsZV9wY2hfdHJh bnNjb2RlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJCSAgIGVudW0g cGlwZSBwaXBlKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSAmZGV2X3ByaXYtPmRybTsK IAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBkZXZfcHJpdi0+cGlwZV90b19jcnRjX21hcHBpbmdb cGlwZV07CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNy dGMpOwogCWk5MTVfcmVnX3QgcmVnOwpAQCAtMTc5Nyw3ICsxNzk2LDcgQEAgc3RhdGljIHZvaWQg aXJvbmxha2VfZW5hYmxlX3BjaF90cmFuc2NvZGVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKIAlhc3NlcnRfZmRpX3R4X2VuYWJsZWQoZGV2X3ByaXYsIHBpcGUpOwogCWFzc2Vy dF9mZGlfcnhfZW5hYmxlZChkZXZfcHJpdiwgcGlwZSk7CiAKLQlpZiAoSEFTX1BDSF9DUFQoZGV2 KSkgeworCWlmIChIQVNfUENIX0NQVChkZXZfcHJpdikpIHsKIAkJLyogV29ya2Fyb3VuZDogU2V0 IHRoZSB0aW1pbmcgb3ZlcnJpZGUgYml0IGJlZm9yZSBlbmFibGluZyB0aGUKIAkJICogcGNoIHRy YW5zY29kZXIuICovCiAJCXJlZyA9IFRSQU5TX0NISUNLRU4yKHBpcGUpOwpAQCAtMTg3NSw3ICsx ODc0LDYgQEAgc3RhdGljIHZvaWQgbHB0X2VuYWJsZV9wY2hfdHJhbnNjb2RlcihzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiBzdGF0aWMgdm9pZCBpcm9ubGFrZV9kaXNhYmxlX3Bj aF90cmFuc2NvZGVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkJICAg IGVudW0gcGlwZSBwaXBlKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSAmZGV2X3ByaXYt PmRybTsKIAlpOTE1X3JlZ190IHJlZzsKIAl1aW50MzJfdCB2YWw7CiAKQEAgLTE4OTYsNyArMTg5 NCw3IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX2Rpc2FibGVfcGNoX3RyYW5zY29kZXIoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCSAgICA1MCkpCiAJCURSTV9FUlJPUigi ZmFpbGVkIHRvIGRpc2FibGUgdHJhbnNjb2RlciAlY1xuIiwgcGlwZV9uYW1lKHBpcGUpKTsKIAot CWlmIChIQVNfUENIX0NQVChkZXYpKSB7CisJaWYgKEhBU19QQ0hfQ1BUKGRldl9wcml2KSkgewog CQkvKiBXb3JrYXJvdW5kOiBDbGVhciB0aGUgdGltaW5nIG92ZXJyaWRlIGNoaWNrZW4gYml0IGFn YWluLiAqLwogCQlyZWcgPSBUUkFOU19DSElDS0VOMihwaXBlKTsKIAkJdmFsID0gSTkxNV9SRUFE KHJlZyk7CkBAIC0zNzEwLDcgKzM3MDgsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF91cGRhdGVfcGlw ZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAKIAkJaWYgKHBpcGVfY29uZmlnLT5w Y2hfcGZpdC5lbmFibGVkKQogCQkJc2t5bGFrZV9wZml0X2VuYWJsZShjcnRjKTsKLQl9IGVsc2Ug aWYgKEhBU19QQ0hfU1BMSVQoZGV2KSkgeworCX0gZWxzZSBpZiAoSEFTX1BDSF9TUExJVChkZXZf cHJpdikpIHsKIAkJaWYgKHBpcGVfY29uZmlnLT5wY2hfcGZpdC5lbmFibGVkKQogCQkJaXJvbmxh a2VfcGZpdF9lbmFibGUoY3J0Yyk7CiAJCWVsc2UgaWYgKG9sZF9jcnRjX3N0YXRlLT5wY2hfcGZp dC5lbmFibGVkKQpAQCAtMzc0MSw3ICszNzM5LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZmRpX25v cm1hbF90cmFpbihzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlyZWcgPSBGRElfUlhfQ1RMKHBp cGUpOwogCXRlbXAgPSBJOTE1X1JFQUQocmVnKTsKLQlpZiAoSEFTX1BDSF9DUFQoZGV2KSkgewor CWlmIChIQVNfUENIX0NQVChkZXZfcHJpdikpIHsKIAkJdGVtcCAmPSB+RkRJX0xJTktfVFJBSU5f UEFUVEVSTl9NQVNLX0NQVDsKIAkJdGVtcCB8PSBGRElfTElOS19UUkFJTl9OT1JNQUxfQ1BUOwog CX0gZWxzZSB7CkBAIC0zODk5LDcgKzM4OTcsNyBAQCBzdGF0aWMgdm9pZCBnZW42X2ZkaV9saW5r X3RyYWluKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogCXJlZyA9IEZESV9SWF9DVEwocGlwZSk7 CiAJdGVtcCA9IEk5MTVfUkVBRChyZWcpOwotCWlmIChIQVNfUENIX0NQVChkZXYpKSB7CisJaWYg KEhBU19QQ0hfQ1BUKGRldl9wcml2KSkgewogCQl0ZW1wICY9IH5GRElfTElOS19UUkFJTl9QQVRU RVJOX01BU0tfQ1BUOwogCQl0ZW1wIHw9IEZESV9MSU5LX1RSQUlOX1BBVFRFUk5fMV9DUFQ7CiAJ fSBlbHNlIHsKQEAgLTM5NTIsNyArMzk1MCw3IEBAIHN0YXRpYyB2b2lkIGdlbjZfZmRpX2xpbmtf dHJhaW4oc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJcmVnID0gRkRJX1JYX0NUTChwaXBlKTsK IAl0ZW1wID0gSTkxNV9SRUFEKHJlZyk7Ci0JaWYgKEhBU19QQ0hfQ1BUKGRldikpIHsKKwlpZiAo SEFTX1BDSF9DUFQoZGV2X3ByaXYpKSB7CiAJCXRlbXAgJj0gfkZESV9MSU5LX1RSQUlOX1BBVFRF Uk5fTUFTS19DUFQ7CiAJCXRlbXAgfD0gRkRJX0xJTktfVFJBSU5fUEFUVEVSTl8yX0NQVDsKIAl9 IGVsc2UgewpAQCAtNDIwNiw3ICs0MjA0LDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfZmRpX2Rp c2FibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXVkZWxheSgxMDApOwogCiAJLyogSXJvbmxh a2Ugd29ya2Fyb3VuZCwgZGlzYWJsZSBjbG9jayBwb2ludGVyIGFmdGVyIGRvd25pbmcgRkRJICov Ci0JaWYgKEhBU19QQ0hfSUJYKGRldikpCisJaWYgKEhBU19QQ0hfSUJYKGRldl9wcml2KSkKIAkJ STkxNV9XUklURShGRElfUlhfQ0hJQ0tFTihwaXBlKSwgRkRJX1JYX1BIQVNFX1NZTkNfUE9JTlRF Ul9PVlIpOwogCiAJLyogc3RpbGwgc2V0IHRyYWluIHBhdHRlcm4gMSAqLwpAQCAtNDIxOCw3ICs0 MjE2LDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfZmRpX2Rpc2FibGUoc3RydWN0IGRybV9jcnRj ICpjcnRjKQogCiAJcmVnID0gRkRJX1JYX0NUTChwaXBlKTsKIAl0ZW1wID0gSTkxNV9SRUFEKHJl Zyk7Ci0JaWYgKEhBU19QQ0hfQ1BUKGRldikpIHsKKwlpZiAoSEFTX1BDSF9DUFQoZGV2X3ByaXYp KSB7CiAJCXRlbXAgJj0gfkZESV9MSU5LX1RSQUlOX1BBVFRFUk5fTUFTS19DUFQ7CiAJCXRlbXAg fD0gRkRJX0xJTktfVFJBSU5fUEFUVEVSTl8xX0NQVDsKIAl9IGVsc2UgewpAQCAtNDU1NCw3ICs0 NTUyLDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfcGNoX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMg KmNydGMpCiAKIAkvKiBXZSBuZWVkIHRvIHByb2dyYW0gdGhlIHJpZ2h0IGNsb2NrIHNlbGVjdGlv biBiZWZvcmUgd3JpdGluZyB0aGUgcGl4ZWwKIAkgKiBtdXRsaXBsaWVyIGludG8gdGhlIERQTEwu ICovCi0JaWYgKEhBU19QQ0hfQ1BUKGRldikpIHsKKwlpZiAoSEFTX1BDSF9DUFQoZGV2X3ByaXYp KSB7CiAJCXUzMiBzZWw7CiAKIAkJdGVtcCA9IEk5MTVfUkVBRChQQ0hfRFBMTF9TRUwpOwpAQCAt NDU4NCw3ICs0NTgyLDggQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfcGNoX2VuYWJsZShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMpCiAJaW50ZWxfZmRpX25vcm1hbF90cmFpbihjcnRjKTsKIAogCS8qIEZv ciBQQ0ggRFAsIGVuYWJsZSBUUkFOU19EUF9DVEwgKi8KLQlpZiAoSEFTX1BDSF9DUFQoZGV2KSAm JiBpbnRlbF9jcnRjX2hhc19kcF9lbmNvZGVyKGludGVsX2NydGMtPmNvbmZpZykpIHsKKwlpZiAo SEFTX1BDSF9DUFQoZGV2X3ByaXYpICYmCisJICAgIGludGVsX2NydGNfaGFzX2RwX2VuY29kZXIo aW50ZWxfY3J0Yy0+Y29uZmlnKSkgewogCQljb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAq YWRqdXN0ZWRfbW9kZSA9CiAJCQkmaW50ZWxfY3J0Yy0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21v ZGU7CiAJCXUzMiBicGMgPSAoSTkxNV9SRUFEKFBJUEVDT05GKHBpcGUpKSAmIFBJUEVDT05GX0JQ Q19NQVNLKSA+PiA1OwpAQCAtNTM3OCw3ICs1Mzc3LDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2Vf Y3J0Y19lbmFibGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnLAogCiAJaW50 ZWxfZW5jb2RlcnNfZW5hYmxlKGNydGMsIHBpcGVfY29uZmlnLCBvbGRfc3RhdGUpOwogCi0JaWYg KEhBU19QQ0hfQ1BUKGRldikpCisJaWYgKEhBU19QQ0hfQ1BUKGRldl9wcml2KSkKIAkJY3B0X3Zl cmlmeV9tb2Rlc2V0KGRldiwgaW50ZWxfY3J0Yy0+cGlwZSk7CiAKIAkvKiBNdXN0IHdhaXQgZm9y IHZibGFuayB0byBhdm9pZCBzcHVyaW91cyBQQ0ggRklGTyB1bmRlcnJ1bnMgKi8KQEAgLTU1NjAs NyArNTU1OSw3IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX2NydGNfZGlzYWJsZShzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCiAJaWYgKGludGVsX2NydGMtPmNvbmZpZy0+ aGFzX3BjaF9lbmNvZGVyKSB7CiAJCWlyb25sYWtlX2Rpc2FibGVfcGNoX3RyYW5zY29kZXIoZGV2 X3ByaXYsIHBpcGUpOwogCi0JCWlmIChIQVNfUENIX0NQVChkZXYpKSB7CisJCWlmIChIQVNfUENI X0NQVChkZXZfcHJpdikpIHsKIAkJCWk5MTVfcmVnX3QgcmVnOwogCQkJdTMyIHRlbXA7CiAKQEAg LTg5NDYsNyArODk0NSw3IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX2luaXRfcGNoX3JlZmNsayhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQl9CiAJfQogCi0JaWYgKEhBU19QQ0hfSUJYKGRldikp IHsKKwlpZiAoSEFTX1BDSF9JQlgoZGV2X3ByaXYpKSB7CiAJCWhhc19jazUwNSA9IGRldl9wcml2 LT52YnQuZGlzcGxheV9jbG9ja19tb2RlOwogCQljYW5fc3NjID0gaGFzX2NrNTA1OwogCX0gZWxz ZSB7CkBAIC05MzQyLDkgKzkzNDEsMTEgQEAgc3RhdGljIHZvaWQgbHB0X2luaXRfcGNoX3JlZmNs ayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogICovCiB2b2lkIGludGVsX2luaXRfcGNoX3JlZmNs ayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewotCWlmIChIQVNfUENIX0lCWChkZXYpIHx8IEhB U19QQ0hfQ1BUKGRldikpCisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShkZXYpOworCisJaWYgKEhBU19QQ0hfSUJYKGRldl9wcml2KSB8fCBIQVNfUENIX0NQVChk ZXZfcHJpdikpCiAJCWlyb25sYWtlX2luaXRfcGNoX3JlZmNsayhkZXYpOwotCWVsc2UgaWYgKEhB U19QQ0hfTFBUKGRldikpCisJZWxzZSBpZiAoSEFTX1BDSF9MUFQoZGV2X3ByaXYpKQogCQlscHRf aW5pdF9wY2hfcmVmY2xrKGRldik7CiB9CiAKQEAgLTk0NzMsNyArOTQ3NCw3IEBAIHN0YXRpYyB2 b2lkIGlyb25sYWtlX2NvbXB1dGVfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywK IAlpZiAoaW50ZWxfY3J0Y19oYXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRfTFZEUykp IHsKIAkJaWYgKChpbnRlbF9wYW5lbF91c2Vfc3NjKGRldl9wcml2KSAmJgogCQkgICAgIGRldl9w cml2LT52YnQubHZkc19zc2NfZnJlcSA9PSAxMDAwMDApIHx8Ci0JCSAgICAoSEFTX1BDSF9JQlgo ZGV2KSAmJiBpbnRlbF9pc19kdWFsX2xpbmtfbHZkcyhkZXYpKSkKKwkJICAgIChIQVNfUENIX0lC WChkZXZfcHJpdikgJiYgaW50ZWxfaXNfZHVhbF9saW5rX2x2ZHMoZGV2KSkpCiAJCQlmYWN0b3Ig PSAyNTsKIAl9IGVsc2UgaWYgKGNydGNfc3RhdGUtPnNkdm9fdHZfY2xvY2spCiAJCWZhY3RvciA9 IDIwOwpAQCAtMTEzMTEsNyArMTEzMTIsNyBAQCBzdGF0aWMgaW50IGk5eHhfcGxsX3JlZmNsayhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJaWYgKChkcGxsICYgUExMX1JFRl9JTlBVVF9NQVNL KSA9PSBQTExCX1JFRl9JTlBVVF9TUFJFQURTUEVDVFJVTUlOKQogCQlyZXR1cm4gZGV2X3ByaXYt PnZidC5sdmRzX3NzY19mcmVxOwotCWVsc2UgaWYgKEhBU19QQ0hfU1BMSVQoZGV2KSkKKwllbHNl IGlmIChIQVNfUENIX1NQTElUKGRldl9wcml2KSkKIAkJcmV0dXJuIDEyMDAwMDsKIAllbHNlIGlm ICghSVNfR0VOMihkZXYpKQogCQlyZXR1cm4gOTYwMDA7CkBAIC0xNDg5Niw2ICsxNDg5Nyw3IEBA IGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3MgaW50ZWxfcGxhbmVfZnVuY3MgPSB7CiBzdGF0 aWMgc3RydWN0IGRybV9wbGFuZSAqaW50ZWxfcHJpbWFyeV9wbGFuZV9jcmVhdGUoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKIAkJCQkJCSAgICBpbnQgcGlwZSkKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGludGVsX3BsYW5lICpw cmltYXJ5ID0gTlVMTDsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlID0gTlVMTDsK IAljb25zdCB1aW50MzJfdCAqaW50ZWxfcHJpbWFyeV9mb3JtYXRzOwpAQCAtMTQ5MzAsNyArMTQ5 MzIsNyBAQCBzdGF0aWMgc3RydWN0IGRybV9wbGFuZSAqaW50ZWxfcHJpbWFyeV9wbGFuZV9jcmVh dGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogCQlwcmltYXJ5LT51cGRhdGVfcGxhbmUgPSBz a3lsYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lOwogCQlwcmltYXJ5LT5kaXNhYmxlX3BsYW5lID0g c2t5bGFrZV9kaXNhYmxlX3ByaW1hcnlfcGxhbmU7Ci0JfSBlbHNlIGlmIChIQVNfUENIX1NQTElU KGRldikpIHsKKwl9IGVsc2UgaWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKSB7CiAJCWludGVs X3ByaW1hcnlfZm9ybWF0cyA9IGk5NjVfcHJpbWFyeV9mb3JtYXRzOwogCQludW1fZm9ybWF0cyA9 IEFSUkFZX1NJWkUoaTk2NV9wcmltYXJ5X2Zvcm1hdHMpOwogCkBAIC0xNTQzOCw3ICsxNTQ0MCw3 IEBAIHN0YXRpYyB2b2lkIGludGVsX3NldHVwX291dHB1dHMoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAkJICAgICBkZXZfcHJpdi0+dmJ0LmRkaV9wb3J0X2luZm9bUE9SVF9FXS5zdXBwb3J0c19o ZG1pKSkKIAkJCWludGVsX2RkaV9pbml0KGRldiwgUE9SVF9FKTsKIAotCX0gZWxzZSBpZiAoSEFT X1BDSF9TUExJVChkZXYpKSB7CisJfSBlbHNlIGlmIChIQVNfUENIX1NQTElUKGRldl9wcml2KSkg ewogCQlpbnQgZm91bmQ7CiAJCWRwZF9pc19lZHAgPSBpbnRlbF9kcF9pc19lZHAoZGV2LCBQT1JU X0QpOwogCkBAIC0xNjM1Nyw3ICsxNjM1OSw3IEBAIHZvaWQgaW50ZWxfbW9kZXNldF9pbml0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJICogQklPUyBpc24ndCB1c2luZyBpdCwgZG9uJ3QgYXNz dW1lIGl0IHdpbGwgd29yayBldmVuIGlmIHRoZSBWQlQKIAkgKiBpbmRpY2F0ZXMgYXMgbXVjaC4K IAkgKi8KLQlpZiAoSEFTX1BDSF9JQlgoZGV2KSB8fCBIQVNfUENIX0NQVChkZXYpKSB7CisJaWYg KEhBU19QQ0hfSUJYKGRldl9wcml2KSB8fCBIQVNfUENIX0NQVChkZXZfcHJpdikpIHsKIAkJYm9v bCBiaW9zX2x2ZHNfdXNlX3NzYyA9ICEhKEk5MTVfUkVBRChQQ0hfRFJFRl9DT05UUk9MKSAmCiAJ CQkJCSAgICBEUkVGX1NTQzFfRU5BQkxFKTsKIApAQCAtMTY5MDYsNyArMTY5MDgsNyBAQCBpbnRl bF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCXZsdl93 bV9nZXRfaHdfc3RhdGUoZGV2KTsKIAllbHNlIGlmIChJU19HRU45KGRldikpCiAJCXNrbF93bV9n ZXRfaHdfc3RhdGUoZGV2KTsKLQllbHNlIGlmIChIQVNfUENIX1NQTElUKGRldikpCisJZWxzZSBp ZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikpCiAJCWlsa193bV9nZXRfaHdfc3RhdGUoZGV2KTsK IAogCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBjcnRjKSB7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YwppbmRleCBlZGFmMzViOTc1YzAuLjBiNmYxYmFiNjcxZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cC5jCkBAIC0xMzM2LDEzICsxMzM2LDE0IEBAIGludGVsX2RwX3NldF9jbG9jayhzdHJ1Y3QgaW50 ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVf Y29uZmlnKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBlbmNvZGVyLT5iYXNlLmRldjsK KwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJY29u c3Qgc3RydWN0IGRwX2xpbmtfZHBsbCAqZGl2aXNvciA9IE5VTEw7CiAJaW50IGksIGNvdW50ID0g MDsKIAogCWlmIChJU19HNFgoZGV2KSkgewogCQlkaXZpc29yID0gZ2VuNF9kcGxsOwogCQljb3Vu dCA9IEFSUkFZX1NJWkUoZ2VuNF9kcGxsKTsKLQl9IGVsc2UgaWYgKEhBU19QQ0hfU1BMSVQoZGV2 KSkgeworCX0gZWxzZSBpZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikpIHsKIAkJZGl2aXNvciA9 IHBjaF9kcGxsOwogCQljb3VudCA9IEFSUkFZX1NJWkUocGNoX2RwbGwpOwogCX0gZWxzZSBpZiAo SVNfQ0hFUlJZVklFVyhkZXYpKSB7CkBAIC0xNzc2LDcgKzE3NzcsNyBAQCBzdGF0aWMgdm9pZCBp bnRlbF9kcF9wcmVwYXJlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJaW50ZWxf ZHAtPkRQIHw9IERQX0VOSEFOQ0VEX0ZSQU1JTkc7CiAKIAkJaW50ZWxfZHAtPkRQIHw9IGNydGMt PnBpcGUgPDwgMjk7Ci0JfSBlbHNlIGlmIChIQVNfUENIX0NQVChkZXYpICYmIHBvcnQgIT0gUE9S VF9BKSB7CisJfSBlbHNlIGlmIChIQVNfUENIX0NQVChkZXZfcHJpdikgJiYgcG9ydCAhPSBQT1JU X0EpIHsKIAkJdTMyIHRyYW5zX2RwOwogCiAJCWludGVsX2RwLT5EUCB8PSBEUF9MSU5LX1RSQUlO X09GRl9DUFQ7CkBAIC0xNzg4LDcgKzE3ODksNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kcF9wcmVw YXJlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJdHJhbnNfZHAgJj0gflRSQU5T X0RQX0VOSF9GUkFNSU5HOwogCQlJOTE1X1dSSVRFKFRSQU5TX0RQX0NUTChjcnRjLT5waXBlKSwg dHJhbnNfZHApOwogCX0gZWxzZSB7Ci0JCWlmICghSEFTX1BDSF9TUExJVChkZXYpICYmICFJU19W QUxMRVlWSUVXKGRldikgJiYKKwkJaWYgKCFIQVNfUENIX1NQTElUKGRldl9wcml2KSAmJiAhSVNf VkFMTEVZVklFVyhkZXYpICYmCiAJCSAgICAhSVNfQ0hFUlJZVklFVyhkZXYpICYmIHBpcGVfY29u ZmlnLT5saW1pdGVkX2NvbG9yX3JhbmdlKQogCQkJaW50ZWxfZHAtPkRQIHw9IERQX0NPTE9SX1JB TkdFXzE2XzIzNTsKIApAQCAtMjQ0Miw3ICsyNDQzLDcgQEAgc3RhdGljIGJvb2wgaW50ZWxfZHBf Z2V0X2h3X3N0YXRlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCiAJaWYgKElTX0dF TjcoZGV2KSAmJiBwb3J0ID09IFBPUlRfQSkgewogCQkqcGlwZSA9IFBPUlRfVE9fUElQRV9DUFQo dG1wKTsKLQl9IGVsc2UgaWYgKEhBU19QQ0hfQ1BUKGRldikgJiYgcG9ydCAhPSBQT1JUX0EpIHsK Kwl9IGVsc2UgaWYgKEhBU19QQ0hfQ1BUKGRldl9wcml2KSAmJiBwb3J0ICE9IFBPUlRfQSkgewog CQllbnVtIHBpcGUgcDsKIAogCQlmb3JfZWFjaF9waXBlKGRldl9wcml2LCBwKSB7CkBAIC0yNDg1 LDcgKzI0ODYsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kcF9nZXRfY29uZmlnKHN0cnVjdCBpbnRl bF9lbmNvZGVyICplbmNvZGVyLAogCiAJcGlwZV9jb25maWctPmhhc19hdWRpbyA9IHRtcCAmIERQ X0FVRElPX09VVFBVVF9FTkFCTEUgJiYgcG9ydCAhPSBQT1JUX0E7CiAKLQlpZiAoSEFTX1BDSF9D UFQoZGV2KSAmJiBwb3J0ICE9IFBPUlRfQSkgeworCWlmIChIQVNfUENIX0NQVChkZXZfcHJpdikg JiYgcG9ydCAhPSBQT1JUX0EpIHsKIAkJdTMyIHRyYW5zX2RwID0gSTkxNV9SRUFEKFRSQU5TX0RQ X0NUTChjcnRjLT5waXBlKSk7CiAKIAkJaWYgKHRyYW5zX2RwICYgVFJBTlNfRFBfSFNZTkNfQUNU SVZFX0hJR0gpCkBAIC0yNTExLDggKzI1MTIsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kcF9nZXRf Y29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCiAJcGlwZV9jb25maWctPmJh c2UuYWRqdXN0ZWRfbW9kZS5mbGFncyB8PSBmbGFnczsKIAotCWlmICghSEFTX1BDSF9TUExJVChk ZXYpICYmICFJU19WQUxMRVlWSUVXKGRldikgJiYKLQkgICAgIUlTX0NIRVJSWVZJRVcoZGV2KSAm JiB0bXAgJiBEUF9DT0xPUl9SQU5HRV8xNl8yMzUpCisJaWYgKCFIQVNfUENIX1NQTElUKGRldl9w cml2KSAmJiAhSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgJiYKKwkgICAgIUlTX0NIRVJSWVZJRVco ZGV2X3ByaXYpICYmIHRtcCAmIERQX0NPTE9SX1JBTkdFXzE2XzIzNSkKIAkJcGlwZV9jb25maWct PmxpbWl0ZWRfY29sb3JfcmFuZ2UgPSB0cnVlOwogCiAJcGlwZV9jb25maWctPmxhbmVfY291bnQg PQpAQCAtMjY1OSw3ICsyNjYwLDcgQEAgX2ludGVsX2RwX3NldF9saW5rX3RyYWluKHN0cnVjdCBp bnRlbF9kcCAqaW50ZWxfZHAsCiAJCUk5MTVfV1JJVEUoRFBfVFBfQ1RMKHBvcnQpLCB0ZW1wKTsK IAogCX0gZWxzZSBpZiAoKElTX0dFTjcoZGV2KSAmJiBwb3J0ID09IFBPUlRfQSkgfHwKLQkJICAg KEhBU19QQ0hfQ1BUKGRldikgJiYgcG9ydCAhPSBQT1JUX0EpKSB7CisJCSAgIChIQVNfUENIX0NQ VChkZXZfcHJpdikgJiYgcG9ydCAhPSBQT1JUX0EpKSB7CiAJCSpEUCAmPSB+RFBfTElOS19UUkFJ Tl9NQVNLX0NQVDsKIAogCQlzd2l0Y2ggKGRwX3RyYWluX3BhdCAmIERQX1RSQUlOSU5HX1BBVFRF Uk5fTUFTSykgewpAQCAtMjk4OSw3ICsyOTkwLDcgQEAgaW50ZWxfZHBfdm9sdGFnZV9tYXgoc3Ry dWN0IGludGVsX2RwICppbnRlbF9kcCkKIAkJcmV0dXJuIERQX1RSQUlOX1ZPTFRBR0VfU1dJTkdf TEVWRUxfMzsKIAllbHNlIGlmIChJU19HRU43KGRldikgJiYgcG9ydCA9PSBQT1JUX0EpCiAJCXJl dHVybiBEUF9UUkFJTl9WT0xUQUdFX1NXSU5HX0xFVkVMXzI7Ci0JZWxzZSBpZiAoSEFTX1BDSF9D UFQoZGV2KSAmJiBwb3J0ICE9IFBPUlRfQSkKKwllbHNlIGlmIChIQVNfUENIX0NQVChkZXZfcHJp dikgJiYgcG9ydCAhPSBQT1JUX0EpCiAJCXJldHVybiBEUF9UUkFJTl9WT0xUQUdFX1NXSU5HX0xF VkVMXzM7CiAJZWxzZQogCQlyZXR1cm4gRFBfVFJBSU5fVk9MVEFHRV9TV0lOR19MRVZFTF8yOwpA QCAtMzQ0Miw3ICszNDQzLDcgQEAgaW50ZWxfZHBfbGlua19kb3duKHN0cnVjdCBpbnRlbF9kcCAq aW50ZWxfZHApCiAJRFJNX0RFQlVHX0tNUygiXG4iKTsKIAogCWlmICgoSVNfR0VONyhkZXYpICYm IHBvcnQgPT0gUE9SVF9BKSB8fAotCSAgICAoSEFTX1BDSF9DUFQoZGV2KSAmJiBwb3J0ICE9IFBP UlRfQSkpIHsKKwkgICAgKEhBU19QQ0hfQ1BUKGRldl9wcml2KSAmJiBwb3J0ICE9IFBPUlRfQSkp IHsKIAkJRFAgJj0gfkRQX0xJTktfVFJBSU5fTUFTS19DUFQ7CiAJCURQIHw9IERQX0xJTktfVFJB SU5fUEFUX0lETEVfQ1BUOwogCX0gZWxzZSB7CkBAIC0zNDY0LDcgKzM0NjUsNyBAQCBpbnRlbF9k cF9saW5rX2Rvd24oc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAkgKiB0byB0cmFuc2NvZGVy IEEgYWZ0ZXIgZGlzYWJsaW5nIGl0IHRvIGFsbG93IHRoZQogCSAqIG1hdGNoaW5nIEhETUkgcG9y dCB0byBiZSBlbmFibGVkIG9uIHRyYW5zY29kZXIgQS4KIAkgKi8KLQlpZiAoSEFTX1BDSF9JQlgo ZGV2KSAmJiBjcnRjLT5waXBlID09IFBJUEVfQiAmJiBwb3J0ICE9IFBPUlRfQSkgeworCWlmIChI QVNfUENIX0lCWChkZXZfcHJpdikgJiYgY3J0Yy0+cGlwZSA9PSBQSVBFX0IgJiYgcG9ydCAhPSBQ T1JUX0EpIHsKIAkJLyoKIAkJICogV2UgZ2V0IENQVS9QQ0ggRklGTyB1bmRlcnJ1bnMgb24gdGhl IG90aGVyIHBpcGUgd2hlbgogCQkgKiBkb2luZyB0aGUgd29ya2Fyb3VuZC4gU3dlZXAgdGhlbSB1 bmRlciB0aGUgcnVnLgpAQCAtNTA4NSw3ICs1MDg2LDcgQEAgaW50ZWxfZHBfaW5pdF9wYW5lbF9w b3dlcl9zZXF1ZW5jZXJfcmVnaXN0ZXJzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJICogcG93 ZXIgc2VxdWVuY2VyIGFueSBtb3JlLiAqLwogCWlmIChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNf Q0hFUlJZVklFVyhkZXYpKSB7CiAJCXBvcnRfc2VsID0gUEFORUxfUE9SVF9TRUxFQ1RfVkxWKHBv cnQpOwotCX0gZWxzZSBpZiAoSEFTX1BDSF9JQlgoZGV2KSB8fCBIQVNfUENIX0NQVChkZXYpKSB7 CisJfSBlbHNlIGlmIChIQVNfUENIX0lCWChkZXZfcHJpdikgfHwgSEFTX1BDSF9DUFQoZGV2X3By aXYpKSB7CiAJCWlmIChwb3J0ID09IFBPUlRfQSkKIAkJCXBvcnRfc2VsID0gUEFORUxfUE9SVF9T RUxFQ1RfRFBBOwogCQllbHNlCkBAIC01NjQ5LDcgKzU2NTAsNyBAQCBpbnRlbF9kcF9pbml0X2Nv bm5lY3RvcihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwKIAkJaW50 ZWxfZHAtPmdldF9hdXhfY2xvY2tfZGl2aWRlciA9IHNrbF9nZXRfYXV4X2Nsb2NrX2RpdmlkZXI7 CiAJZWxzZSBpZiAoSVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYpKQogCQlpbnRl bF9kcC0+Z2V0X2F1eF9jbG9ja19kaXZpZGVyID0gaHN3X2dldF9hdXhfY2xvY2tfZGl2aWRlcjsK LQllbHNlIGlmIChIQVNfUENIX1NQTElUKGRldikpCisJZWxzZSBpZiAoSEFTX1BDSF9TUExJVChk ZXZfcHJpdikpCiAJCWludGVsX2RwLT5nZXRfYXV4X2Nsb2NrX2RpdmlkZXIgPSBpbGtfZ2V0X2F1 eF9jbG9ja19kaXZpZGVyOwogCWVsc2UKIAkJaW50ZWxfZHAtPmdldF9hdXhfY2xvY2tfZGl2aWRl ciA9IGc0eF9nZXRfYXV4X2Nsb2NrX2RpdmlkZXI7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcGxsX21nci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBs bF9tZ3IuYwppbmRleCBkMGM1OWMxNzkzZWYuLmMzN2NlMTI2MzE0MiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcGxsX21nci5jCkBAIC0xODU3LDcgKzE4NTcsNyBAQCB2b2lkIGludGVsX3No YXJlZF9kcGxsX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJZHBsbF9tZ3IgPSAmYnh0 X3BsbF9tZ3I7CiAJZWxzZSBpZiAoSEFTX0RESShkZXZfcHJpdikpCiAJCWRwbGxfbWdyID0gJmhz d19wbGxfbWdyOwotCWVsc2UgaWYgKEhBU19QQ0hfSUJYKGRldikgfHwgSEFTX1BDSF9DUFQoZGV2 KSkKKwllbHNlIGlmIChIQVNfUENIX0lCWChkZXZfcHJpdikgfHwgSEFTX1BDSF9DUFQoZGV2X3By aXYpKQogCQlkcGxsX21nciA9ICZwY2hfcGxsX21ncjsKIAogCWlmICghZHBsbF9tZ3IpIHsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2hkbWkuYwppbmRleCAwOWIyMTQ2ZjE1N2YuLjM5N2UxMGY0YjZmMCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYwpAQCAtODY0LDcgKzg2NCw3IEBAIHN0YXRpYyB2 b2lkIGludGVsX2hkbWlfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIAlp bnRlbF9kcF9kdWFsX21vZGVfc2V0X3RtZHNfb3V0cHV0KGludGVsX2hkbWksIHRydWUpOwogCiAJ aGRtaV92YWwgPSBTRFZPX0VOQ09ESU5HX0hETUk7Ci0JaWYgKCFIQVNfUENIX1NQTElUKGRldikg JiYgY3J0Yy0+Y29uZmlnLT5saW1pdGVkX2NvbG9yX3JhbmdlKQorCWlmICghSEFTX1BDSF9TUExJ VChkZXZfcHJpdikgJiYgY3J0Yy0+Y29uZmlnLT5saW1pdGVkX2NvbG9yX3JhbmdlKQogCQloZG1p X3ZhbCB8PSBIRE1JX0NPTE9SX1JBTkdFXzE2XzIzNTsKIAlpZiAoYWRqdXN0ZWRfbW9kZS0+Zmxh Z3MgJiBEUk1fTU9ERV9GTEFHX1BWU1lOQykKIAkJaGRtaV92YWwgfD0gU0RWT19WU1lOQ19BQ1RJ VkVfSElHSDsKQEAgLTg3OSw3ICs4NzksNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9oZG1pX3ByZXBh cmUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpCiAJaWYgKGNydGMtPmNvbmZpZy0+aGFz X2hkbWlfc2luaykKIAkJaGRtaV92YWwgfD0gSERNSV9NT0RFX1NFTEVDVF9IRE1JOwogCi0JaWYg KEhBU19QQ0hfQ1BUKGRldikpCisJaWYgKEhBU19QQ0hfQ1BUKGRldl9wcml2KSkKIAkJaGRtaV92 YWwgfD0gU0RWT19QSVBFX1NFTF9DUFQoY3J0Yy0+cGlwZSk7CiAJZWxzZSBpZiAoSVNfQ0hFUlJZ VklFVyhkZXYpKQogCQloZG1pX3ZhbCB8PSBTRFZPX1BJUEVfU0VMX0NIVihjcnRjLT5waXBlKTsK QEAgLTkxMSw3ICs5MTEsNyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9oZG1pX2dldF9od19zdGF0ZShz dHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAlpZiAoISh0bXAgJiBTRFZPX0VOQUJMRSkp CiAJCWdvdG8gb3V0OwogCi0JaWYgKEhBU19QQ0hfQ1BUKGRldikpCisJaWYgKEhBU19QQ0hfQ1BU KGRldl9wcml2KSkKIAkJKnBpcGUgPSBQT1JUX1RPX1BJUEVfQ1BUKHRtcCk7CiAJZWxzZSBpZiAo SVNfQ0hFUlJZVklFVyhkZXYpKQogCQkqcGlwZSA9IFNEVk9fUE9SVF9UT19QSVBFX0NIVih0bXAp OwpAQCAtOTU2LDcgKzk1Niw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2hkbWlfZ2V0X2NvbmZpZyhz dHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAlpZiAodG1wICYgU0RWT19BVURJT19FTkFC TEUpCiAJCXBpcGVfY29uZmlnLT5oYXNfYXVkaW8gPSB0cnVlOwogCi0JaWYgKCFIQVNfUENIX1NQ TElUKGRldikgJiYKKwlpZiAoIUhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpICYmCiAJICAgIHRtcCAm IEhETUlfQ09MT1JfUkFOR0VfMTZfMjM1KQogCQlwaXBlX2NvbmZpZy0+bGltaXRlZF9jb2xvcl9y YW5nZSA9IHRydWU7CiAKQEAgLTExNDEsNyArMTE0MSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2Rp c2FibGVfaGRtaShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkgKiB0byB0cmFuc2Nv ZGVyIEEgYWZ0ZXIgZGlzYWJsaW5nIGl0IHRvIGFsbG93IHRoZQogCSAqIG1hdGNoaW5nIERQIHBv cnQgdG8gYmUgZW5hYmxlZCBvbiB0cmFuc2NvZGVyIEEuCiAJICovCi0JaWYgKEhBU19QQ0hfSUJY KGRldikgJiYgY3J0Yy0+cGlwZSA9PSBQSVBFX0IpIHsKKwlpZiAoSEFTX1BDSF9JQlgoZGV2X3By aXYpICYmIGNydGMtPnBpcGUgPT0gUElQRV9CKSB7CiAJCS8qCiAJCSAqIFdlIGdldCBDUFUvUENI IEZJRk8gdW5kZXJydW5zIG9uIHRoZSBvdGhlciBwaXBlIHdoZW4KIAkJICogZG9pbmcgdGhlIHdv cmthcm91bmQuIFN3ZWVwIHRoZW0gdW5kZXIgdGhlIHJ1Zy4KQEAgLTE4OTYsNyArMTg5Niw3IEBA IHZvaWQgaW50ZWxfaGRtaV9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0 ICppbnRlbF9kaWdfcG9ydCwKIAkJaW50ZWxfaGRtaS0+d3JpdGVfaW5mb2ZyYW1lID0gaHN3X3dy aXRlX2luZm9mcmFtZTsKIAkJaW50ZWxfaGRtaS0+c2V0X2luZm9mcmFtZXMgPSBoc3dfc2V0X2lu Zm9mcmFtZXM7CiAJCWludGVsX2hkbWktPmluZm9mcmFtZV9lbmFibGVkID0gaHN3X2luZm9mcmFt ZV9lbmFibGVkOwotCX0gZWxzZSBpZiAoSEFTX1BDSF9JQlgoZGV2KSkgeworCX0gZWxzZSBpZiAo SEFTX1BDSF9JQlgoZGV2X3ByaXYpKSB7CiAJCWludGVsX2hkbWktPndyaXRlX2luZm9mcmFtZSA9 IGlieF93cml0ZV9pbmZvZnJhbWU7CiAJCWludGVsX2hkbWktPnNldF9pbmZvZnJhbWVzID0gaWJ4 X3NldF9pbmZvZnJhbWVzOwogCQlpbnRlbF9oZG1pLT5pbmZvZnJhbWVfZW5hYmxlZCA9IGlieF9p bmZvZnJhbWVfZW5hYmxlZDsKQEAgLTE5MjksNiArMTkyOSw3IEBAIHZvaWQgaW50ZWxfaGRtaV9p bml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwK IHZvaWQgaW50ZWxfaGRtaV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCSAgICAgaTkx NV9yZWdfdCBoZG1pX3JlZywgZW51bSBwb3J0IHBvcnQpCiB7CisJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3Bv cnQgKmludGVsX2RpZ19wb3J0OwogCXN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVy OwogCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmludGVsX2Nvbm5lY3RvcjsKQEAgLTE5NDksNyAr MTk1MCw3IEBAIHZvaWQgaW50ZWxfaGRtaV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ CQkgRFJNX01PREVfRU5DT0RFUl9UTURTLCAiSERNSSAlYyIsIHBvcnRfbmFtZShwb3J0KSk7CiAK IAlpbnRlbF9lbmNvZGVyLT5jb21wdXRlX2NvbmZpZyA9IGludGVsX2hkbWlfY29tcHV0ZV9jb25m aWc7Ci0JaWYgKEhBU19QQ0hfU1BMSVQoZGV2KSkgeworCWlmIChIQVNfUENIX1NQTElUKGRldl9w cml2KSkgewogCQlpbnRlbF9lbmNvZGVyLT5kaXNhYmxlID0gcGNoX2Rpc2FibGVfaGRtaTsKIAkJ aW50ZWxfZW5jb2Rlci0+cG9zdF9kaXNhYmxlID0gcGNoX3Bvc3RfZGlzYWJsZV9oZG1pOwogCX0g ZWxzZSB7CkBAIC0xOTcwLDkgKzE5NzEsOSBAQCB2b2lkIGludGVsX2hkbWlfaW5pdChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogCQlpbnRlbF9lbmNvZGVyLT5wb3N0X2Rpc2FibGUgPSB2bHZfaGRt aV9wb3N0X2Rpc2FibGU7CiAJfSBlbHNlIHsKIAkJaW50ZWxfZW5jb2Rlci0+cHJlX2VuYWJsZSA9 IGludGVsX2hkbWlfcHJlX2VuYWJsZTsKLQkJaWYgKEhBU19QQ0hfQ1BUKGRldikpCisJCWlmIChI QVNfUENIX0NQVChkZXZfcHJpdikpCiAJCQlpbnRlbF9lbmNvZGVyLT5lbmFibGUgPSBjcHRfZW5h YmxlX2hkbWk7Ci0JCWVsc2UgaWYgKEhBU19QQ0hfSUJYKGRldikpCisJCWVsc2UgaWYgKEhBU19Q Q0hfSUJYKGRldl9wcml2KSkKIAkJCWludGVsX2VuY29kZXItPmVuYWJsZSA9IGlieF9lbmFibGVf aGRtaTsKIAkJZWxzZQogCQkJaW50ZWxfZW5jb2Rlci0+ZW5hYmxlID0gZzR4X2VuYWJsZV9oZG1p OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaTJjLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9pMmMuYwppbmRleCA3OWFhYjlhZDZmYWEuLjE0MTAzMzBlYzli YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaTJjLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaTJjLmMKQEAgLTYzMyw3ICs2MzMsNyBAQCBpbnQgaW50 ZWxfc2V0dXBfZ21idXMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAl1bnNpZ25lZCBpbnQgcGlu OwogCWludCByZXQ7CiAKLQlpZiAoSEFTX1BDSF9OT1AoZGV2KSkKKwlpZiAoSEFTX1BDSF9OT1Ao ZGV2X3ByaXYpKQogCQlyZXR1cm4gMDsKIAogCWlmIChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNf Q0hFUlJZVklFVyhkZXYpKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHZkcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jCmluZGV4IDJlOTQzYmQx YzNjZi4uYmFhZjJlZDg5N2VmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9sdmRzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jCkBAIC0xMDYs NyArMTA2LDcgQEAgc3RhdGljIGJvb2wgaW50ZWxfbHZkc19nZXRfaHdfc3RhdGUoc3RydWN0IGlu dGVsX2VuY29kZXIgKmVuY29kZXIsCiAJaWYgKCEodG1wICYgTFZEU19QT1JUX0VOKSkKIAkJZ290 byBvdXQ7CiAKLQlpZiAoSEFTX1BDSF9DUFQoZGV2KSkKKwlpZiAoSEFTX1BDSF9DUFQoZGV2X3By aXYpKQogCQkqcGlwZSA9IFBPUlRfVE9fUElQRV9DUFQodG1wKTsKIAllbHNlCiAJCSpwaXBlID0g UE9SVF9UT19QSVBFKHRtcCk7CkBAIC0zOTYsNyArMzk2LDcgQEAgc3RhdGljIGJvb2wgaW50ZWxf bHZkc19jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlciwK IAkJCQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAJCQkJICAg ICAgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUpCiB7Ci0Jc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IGludGVsX2VuY29kZXItPmJhc2UuZGV2OworCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxfZW5jb2Rlci0+YmFzZS5kZXYpOwog CXN0cnVjdCBpbnRlbF9sdmRzX2VuY29kZXIgKmx2ZHNfZW5jb2RlciA9CiAJCXRvX2x2ZHNfZW5j b2RlcigmaW50ZWxfZW5jb2Rlci0+YmFzZSk7CiAJc3RydWN0IGludGVsX2Nvbm5lY3RvciAqaW50 ZWxfY29ubmVjdG9yID0KQEAgLTQwNiw3ICs0MDYsNyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9sdmRz X2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyLAogCXVu c2lnbmVkIGludCBsdmRzX2JwcDsKIAogCS8qIFNob3VsZCBuZXZlciBoYXBwZW4hISAqLwotCWlm IChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDQgJiYgaW50ZWxfY3J0Yy0+cGlwZSA9PSAwKSB7CisJ aWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA0ICYmIGludGVsX2NydGMtPnBpcGUgPT0gMCkgewog CQlEUk1fRVJST1IoIkNhbid0IHN1cHBvcnQgTFZEUyBvbiBwaXBlIEFcbiIpOwogCQlyZXR1cm4g ZmFsc2U7CiAJfQpAQCAtNDMxLDcgKzQzMSw3IEBAIHN0YXRpYyBib29sIGludGVsX2x2ZHNfY29t cHV0ZV9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIsCiAJaW50ZWxf Zml4ZWRfcGFuZWxfbW9kZShpbnRlbF9jb25uZWN0b3ItPnBhbmVsLmZpeGVkX21vZGUsCiAJCQkg ICAgICAgYWRqdXN0ZWRfbW9kZSk7CiAKLQlpZiAoSEFTX1BDSF9TUExJVChkZXYpKSB7CisJaWYg KEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKSB7CiAJCXBpcGVfY29uZmlnLT5oYXNfcGNoX2VuY29k ZXIgPSB0cnVlOwogCiAJCWludGVsX3BjaF9wYW5lbF9maXR0aW5nKGludGVsX2NydGMsIHBpcGVf Y29uZmlnLApAQCAtNTY2LDcgKzU2Niw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfbGlkX25vdGlmeShz dHJ1Y3Qgbm90aWZpZXJfYmxvY2sgKm5iLCB1bnNpZ25lZCBsb25nIHZhbCwKIAkgKiBhbmQgYXMg cGFydCBvZiB0aGUgY2xlYW51cCBpbiB0aGUgaHcgc3RhdGUgcmVzdG9yZSB3ZSBhbHNvIHJlZGlz YWJsZQogCSAqIHRoZSB2Z2EgcGxhbmUuCiAJICovCi0JaWYgKCFIQVNfUENIX1NQTElUKGRldikp CisJaWYgKCFIQVNfUENIX1NQTElUKGRldl9wcml2KSkKIAkJaW50ZWxfZGlzcGxheV9yZXN1bWUo ZGV2KTsKIAogCWRldl9wcml2LT5tb2Rlc2V0X3Jlc3RvcmUgPSBNT0RFU0VUX0RPTkU7CkBAIC05 NTEsOSArOTUxLDExIEBAIHN0YXRpYyBib29sIGNvbXB1dGVfaXNfZHVhbF9saW5rX2x2ZHMoc3Ry dWN0IGludGVsX2x2ZHNfZW5jb2RlciAqbHZkc19lbmNvZGVyKQogCiBzdGF0aWMgYm9vbCBpbnRl bF9sdmRzX3N1cHBvcnRlZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogeworCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwogCS8qIFdpdGggdGhlIGlu dHJvZHVjdGlvbiBvZiB0aGUgUENIIHdlIGdhaW5lZCBhIGRlZGljYXRlZAogCSAqIExWRFMgcHJl c2VuY2UgcGluLCB1c2UgaXQuICovCi0JaWYgKEhBU19QQ0hfSUJYKGRldikgfHwgSEFTX1BDSF9D UFQoZGV2KSkKKwlpZiAoSEFTX1BDSF9JQlgoZGV2X3ByaXYpIHx8IEhBU19QQ0hfQ1BUKGRldl9w cml2KSkKIAkJcmV0dXJuIHRydWU7CiAKIAkvKiBPdGhlcndpc2UgTFZEUyB3YXMgb25seSBhdHRh Y2hlZCB0byBtb2JpbGUgcHJvZHVjdHMsCkBAIC05OTcsMTQgKzk5OSwxNCBAQCB2b2lkIGludGVs X2x2ZHNfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChkbWlfY2hlY2tfc3lzdGVt KGludGVsX25vX2x2ZHMpKQogCQlyZXR1cm47CiAKLQlpZiAoSEFTX1BDSF9TUExJVChkZXYpKQor CWlmIChIQVNfUENIX1NQTElUKGRldl9wcml2KSkKIAkJbHZkc19yZWcgPSBQQ0hfTFZEUzsKIAll bHNlCiAJCWx2ZHNfcmVnID0gTFZEUzsKIAogCWx2ZHMgPSBJOTE1X1JFQUQobHZkc19yZWcpOwog Ci0JaWYgKEhBU19QQ0hfU1BMSVQoZGV2KSkgeworCWlmIChIQVNfUENIX1NQTElUKGRldl9wcml2 KSkgewogCQlpZiAoKGx2ZHMgJiBMVkRTX0RFVEVDVEVEKSA9PSAwKQogCQkJcmV0dXJuOwogCQlp ZiAoZGV2X3ByaXYtPnZidC5lZHAuc3VwcG9ydCkgewpAQCAtMTA2OCw3ICsxMDcwLDcgQEAgdm9p ZCBpbnRlbF9sdmRzX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpbnRlbF9lbmNvZGVy LT50eXBlID0gSU5URUxfT1VUUFVUX0xWRFM7CiAJaW50ZWxfZW5jb2Rlci0+cG9ydCA9IFBPUlRf Tk9ORTsKIAlpbnRlbF9lbmNvZGVyLT5jbG9uZWFibGUgPSAwOwotCWlmIChIQVNfUENIX1NQTElU KGRldikpCisJaWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKQogCQlpbnRlbF9lbmNvZGVyLT5j cnRjX21hc2sgPSAoMSA8PCAwKSB8ICgxIDw8IDEpIHwgKDEgPDwgMik7CiAJZWxzZSBpZiAoSVNf R0VONChkZXYpKQogCQlpbnRlbF9lbmNvZGVyLT5jcnRjX21hc2sgPSAoMSA8PCAwKSB8ICgxIDw8 IDEpOwpAQCAtMTE1OCw3ICsxMTYwLDcgQEAgdm9pZCBpbnRlbF9sdmRzX2luaXQoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAkgKi8KIAogCS8qIElyb25sYWtlOiBGSVhNRSBpZiBzdGlsbCBmYWls LCBub3QgdHJ5IHBpcGUgbW9kZSBub3cgKi8KLQlpZiAoSEFTX1BDSF9TUExJVChkZXYpKQorCWlm IChIQVNfUENIX1NQTElUKGRldl9wcml2KSkKIAkJZ290byBmYWlsZWQ7CiAKIAlwaXBlID0gKGx2 ZHMgJiBMVkRTX1BJUEVCX1NFTEVDVCkgPyAxIDogMDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmlu ZGV4IDk4Nzk4Y2JjMjc5Mi4uN2FmYjBmOTM5OTUyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMK QEAgLTc0MjEsNyArNzQyMSw3IEBAIHN0YXRpYyB2b2lkIGl2eWJyaWRnZV9pbml0X2Nsb2NrX2dh dGluZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXNucGNyIHw9IEdFTjZfTUJDX1NOUENSX01F RDsKIAlJOTE1X1dSSVRFKEdFTjZfTUJDVU5JVF9TTlBDUiwgc25wY3IpOwogCi0JaWYgKCFIQVNf UENIX05PUChkZXYpKQorCWlmICghSEFTX1BDSF9OT1AoZGV2X3ByaXYpKQogCQljcHRfaW5pdF9j bG9ja19nYXRpbmcoZGV2KTsKIAogCWdlbjZfY2hlY2tfbWNoX3NldHVwKGRldik7CkBAIC03NjY0 LDcgKzc2NjQsNyBAQCB2b2lkIGludGVsX2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAKIHZvaWQgaW50ZWxfc3VzcGVuZF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogewotCWlmIChIQVNfUENIX0xQVChkZXYpKQorCWlmIChIQVNfUENIX0xQVCh0b19pOTE1KGRl dikpKQogCQlscHRfc3VzcGVuZF9odyhkZXYpOwogfQogCkBAIC03NzQwLDcgKzc3NDAsNyBAQCB2 b2lkIGludGVsX2luaXRfcG0oc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJc2tsX3NldHVwX3dt X2xhdGVuY3koZGV2KTsKIAkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtID0gc2tsX3VwZGF0 ZV93bTsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuY29tcHV0ZV9nbG9iYWxfd2F0ZXJtYXJrcyA9IHNr bF9jb21wdXRlX3dtOwotCX0gZWxzZSBpZiAoSEFTX1BDSF9TUExJVChkZXYpKSB7CisJfSBlbHNl IGlmIChIQVNfUENIX1NQTElUKGRldl9wcml2KSkgewogCQlpbGtfc2V0dXBfd21fbGF0ZW5jeShk ZXYpOwogCiAJCWlmICgoSVNfR0VONShkZXYpICYmIGRldl9wcml2LT53bS5wcmlfbGF0ZW5jeVsx XSAmJgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jCmluZGV4IGEwNjFiMDAyOTc5Ny4uMGQ5MTE0 ZjljZTI3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jCkBAIC0yNTEsNyArMjUxLDcgQEAg c3RhdGljIHZvaWQgaW50ZWxfc2R2b193cml0ZV9zZHZveChzdHJ1Y3QgaW50ZWxfc2R2byAqaW50 ZWxfc2R2bywgdTMyIHZhbCkKIAkJICogSFcgd29ya2Fyb3VuZCwgbmVlZCB0byB3cml0ZSB0aGlz IHR3aWNlIGZvciBpc3N1ZQogCQkgKiB0aGF0IG1heSByZXN1bHQgaW4gZmlyc3Qgd3JpdGUgZ2V0 dGluZyBtYXNrZWQuCiAJCSAqLwotCQlpZiAoSEFTX1BDSF9JQlgoZGV2KSkgeworCQlpZiAoSEFT X1BDSF9JQlgoZGV2X3ByaXYpKSB7CiAJCQlJOTE1X1dSSVRFKGludGVsX3Nkdm8tPnNkdm9fcmVn LCB2YWwpOwogCQkJUE9TVElOR19SRUFEKGludGVsX3Nkdm8tPnNkdm9fcmVnKTsKIAkJfQpAQCAt MTEzMyw3ICsxMTMzLDcgQEAgc3RhdGljIGJvb2wgaW50ZWxfc2R2b19jb21wdXRlX2NvbmZpZyhz dHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAlEUk1fREVCVUdfS01TKCJmb3JjaW5nIGJw YyB0byA4IGZvciBTRFZPXG4iKTsKIAlwaXBlX2NvbmZpZy0+cGlwZV9icHAgPSA4KjM7CiAKLQlp ZiAoSEFTX1BDSF9TUExJVChlbmNvZGVyLT5iYXNlLmRldikpCisJaWYgKEhBU19QQ0hfU1BMSVQo dG9faTkxNShlbmNvZGVyLT5iYXNlLmRldikpKQogCQlwaXBlX2NvbmZpZy0+aGFzX3BjaF9lbmNv ZGVyID0gdHJ1ZTsKIAogCS8qIFdlIG5lZWQgdG8gY29uc3RydWN0IHByZWZlcnJlZCBpbnB1dCB0 aW1pbmdzIGJhc2VkIG9uIG91cgpAQCAtMTI3Myw3ICsxMjczLDcgQEAgc3RhdGljIHZvaWQgaW50 ZWxfc2R2b19wcmVfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyLAog CQkvKiBUaGUgcmVhbCBtb2RlIHBvbGFyaXR5IGlzIHNldCBieSB0aGUgU0RWTyBjb21tYW5kcywg dXNpbmcKIAkJICogc3RydWN0IGludGVsX3Nkdm9fZHRkLiAqLwogCQlzZHZveCA9IFNEVk9fVlNZ TkNfQUNUSVZFX0hJR0ggfCBTRFZPX0hTWU5DX0FDVElWRV9ISUdIOwotCQlpZiAoIUhBU19QQ0hf U1BMSVQoZGV2KSAmJiBjcnRjX3N0YXRlLT5saW1pdGVkX2NvbG9yX3JhbmdlKQorCQlpZiAoIUhB U19QQ0hfU1BMSVQoZGV2X3ByaXYpICYmIGNydGNfc3RhdGUtPmxpbWl0ZWRfY29sb3JfcmFuZ2Up CiAJCQlzZHZveCB8PSBIRE1JX0NPTE9SX1JBTkdFXzE2XzIzNTsKIAkJaWYgKElOVEVMX0lORk8o ZGV2KS0+Z2VuIDwgNSkKIAkJCXNkdm94IHw9IFNEVk9fQk9SREVSX0VOQUJMRTsKQEAgLTEyODYs NyArMTI4Niw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3Nkdm9fcHJlX2VuYWJsZShzdHJ1Y3QgaW50 ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlciwKIAkJc2R2b3ggfD0gKDkgPDwgMTkpIHwgU0RWT19C T1JERVJfRU5BQkxFOwogCX0KIAotCWlmIChJTlRFTF9QQ0hfVFlQRShkZXYpID49IFBDSF9DUFQp CisJaWYgKElOVEVMX1BDSF9UWVBFKGRldl9wcml2KSA+PSBQQ0hfQ1BUKQogCQlzZHZveCB8PSBT RFZPX1BJUEVfU0VMX0NQVChjcnRjLT5waXBlKTsKIAllbHNlCiAJCXNkdm94IHw9IFNEVk9fUElQ RV9TRUwoY3J0Yy0+cGlwZSk7CkBAIC0xMzM5LDcgKzEzMzksNyBAQCBzdGF0aWMgYm9vbCBpbnRl bF9zZHZvX2dldF9od19zdGF0ZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAlpZiAo ISh0bXAgJiBTRFZPX0VOQUJMRSkgJiYgKGFjdGl2ZV9vdXRwdXRzID09IDApKQogCQlyZXR1cm4g ZmFsc2U7CiAKLQlpZiAoSEFTX1BDSF9DUFQoZGV2KSkKKwlpZiAoSEFTX1BDSF9DUFQoZGV2X3By aXYpKQogCQkqcGlwZSA9IFBPUlRfVE9fUElQRV9DUFQodG1wKTsKIAllbHNlCiAJCSpwaXBlID0g UE9SVF9UT19QSVBFKHRtcCk7CkBAIC0yOTk3LDcgKzI5OTcsNyBAQCBib29sIGludGVsX3Nkdm9f aW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCX0KIAogCWludGVsX2VuY29kZXItPmNvbXB1 dGVfY29uZmlnID0gaW50ZWxfc2R2b19jb21wdXRlX2NvbmZpZzsKLQlpZiAoSEFTX1BDSF9TUExJ VChkZXYpKSB7CisJaWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKSB7CiAJCWludGVsX2VuY29k ZXItPmRpc2FibGUgPSBwY2hfZGlzYWJsZV9zZHZvOwogCQlpbnRlbF9lbmNvZGVyLT5wb3N0X2Rp c2FibGUgPSBwY2hfcG9zdF9kaXNhYmxlX3Nkdm87CiAJfSBlbHNlIHsKLS0gCjIuNy40CgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK