From: Tvrtko Ursulin Subject: [PATCH 04/22] drm/i915: Make HAS_DDI and HAS_PCH_LPT_LP only take dev_priv Date: Wed, 5 Oct 2016 13:33:31 +0100 Message-ID: <1475670829-14025-5-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1475670829-14025-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-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id A63626E830 for ; Wed, 5 Oct 2016 12:34:04 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id b184so24370095wma.3 for ; Wed, 05 Oct 2016 05:34:04 -0700 (PDT) In-Reply-To: <1475670829-14025-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 ZXMgMzI0OCBieXRlcyBvZiAucm9kYXRhIHN0cmluZ3MuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28g VXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmggICAgICAgfCAgOCArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2NydC5jICAgICAgfCAxMCArKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgIHwgNDkgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgICAgICAgfCAxNiArKysrKystLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMgfCAgNCArLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2hkbWkuYyAgICAgfCAxMCArKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jICAgICAgIHwgIDQgKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w c3IuYyAgICAgIHwgIDggKysrLS0tCiA4IGZpbGVzIGNoYW5nZWQsIDU2IGluc2VydGlvbnMoKyks IDUzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDQ2MTNmMDMxZDEy Ny4uNjFlMGNmNzM3NGVkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI4MTcsNyArMjgx Nyw3IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogCiAjZGVmaW5lIEhBU19EUF9NU1Qo ZGV2KQkoSU5URUxfSU5GTyhkZXYpLT5oYXNfZHBfbXN0KQogCi0jZGVmaW5lIEhBU19EREkoZGV2 KQkJKElOVEVMX0lORk8oZGV2KS0+aGFzX2RkaSkKKyNkZWZpbmUgSEFTX0RESShkZXZfcHJpdikJ KGRldl9wcml2LT5pbmZvLmhhc19kZGkpCiAjZGVmaW5lIEhBU19GUEdBX0RCR19VTkNMQUlNRUQo ZGV2KQkoSU5URUxfSU5GTyhkZXYpLT5oYXNfZnBnYV9kYmcpCiAjZGVmaW5lIEhBU19QU1IoZGV2 KQkJKElOVEVMX0lORk8oZGV2KS0+aGFzX3BzcikKICNkZWZpbmUgSEFTX1JVTlRJTUVfUE0oZGV2 KQkoSU5URUxfSU5GTyhkZXYpLT5oYXNfcnVudGltZV9wbSkKQEAgLTI4NTYsOCArMjg1NiwxMCBA QCBzdHJ1Y3QgZHJtX2k5MTVfY21kX3RhYmxlIHsKICNkZWZpbmUgSEFTX1BDSF9LQlAoZGV2KSAo SU5URUxfUENIX1RZUEUoZGV2KSA9PSBQQ0hfS0JQKQogI2RlZmluZSBIQVNfUENIX1NQVChkZXYp IChJTlRFTF9QQ0hfVFlQRShkZXYpID09IFBDSF9TUFQpCiAjZGVmaW5lIEhBU19QQ0hfTFBUKGRl dikgKElOVEVMX1BDSF9UWVBFKGRldikgPT0gUENIX0xQVCkKLSNkZWZpbmUgSEFTX1BDSF9MUFRf TFAoZGV2KSAoX19JOTE1X18oZGV2KS0+cGNoX2lkID09IElOVEVMX1BDSF9MUFRfTFBfREVWSUNF X0lEX1RZUEUpCi0jZGVmaW5lIEhBU19QQ0hfTFBUX0goZGV2KSAoX19JOTE1X18oZGV2KS0+cGNo X2lkID09IElOVEVMX1BDSF9MUFRfREVWSUNFX0lEX1RZUEUpCisjZGVmaW5lIEhBU19QQ0hfTFBU X0xQKGRldl9wcml2KSBcCisJKGRldl9wcml2LT5wY2hfaWQgPT0gSU5URUxfUENIX0xQVF9MUF9E RVZJQ0VfSURfVFlQRSkKKyNkZWZpbmUgSEFTX1BDSF9MUFRfSChkZXZfcHJpdikgXAorCShkZXZf cHJpdi0+cGNoX2lkID09IElOVEVMX1BDSF9MUFRfREVWSUNFX0lEX1RZUEUpCiAjZGVmaW5lIEhB U19QQ0hfQ1BUKGRldikgKElOVEVMX1BDSF9UWVBFKGRldikgPT0gUENIX0NQVCkKICNkZWZpbmUg SEFTX1BDSF9JQlgoZGV2KSAoSU5URUxfUENIX1RZUEUoZGV2KSA9PSBQQ0hfSUJYKQogI2RlZmlu ZSBIQVNfUENIX05PUChkZXYpIChJTlRFTF9QQ0hfVFlQRShkZXYpID09IFBDSF9OT1ApCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2NydC5jCmluZGV4IDg4ZWJiZGRlMTg1YS4uMjI3ZWFmMjcwMjI2IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9jcnQuYwpAQCAtMjgwLDEzICsyODAsMTMgQEAgc3RhdGljIGJvb2wg aW50ZWxfY3J0X2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAog CQkJCSAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnLAogCQkJCSAgICAg c3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IGVuY29kZXItPmJhc2UuZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOwogCi0JaWYgKEhBU19QQ0hf U1BMSVQoZGV2KSkKKwlpZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikpCiAJCXBpcGVfY29uZmln LT5oYXNfcGNoX2VuY29kZXIgPSB0cnVlOwogCiAJLyogTFBUIEZESSBSWCBvbmx5IHN1cHBvcnRz IDhicGMuICovCi0JaWYgKEhBU19QQ0hfTFBUKGRldikpIHsKKwlpZiAoSEFTX1BDSF9MUFQoZGV2 X3ByaXYpKSB7CiAJCWlmIChwaXBlX2NvbmZpZy0+YndfY29uc3RyYWluZWQgJiYgcGlwZV9jb25m aWctPnBpcGVfYnBwIDwgMjQpIHsKIAkJCURSTV9ERUJVR19LTVMoIkxQVCBvbmx5IHN1cHBvcnRz IDI0YnBwXG4iKTsKIAkJCXJldHVybiBmYWxzZTsKQEAgLTI5Niw3ICsyOTYsNyBAQCBzdGF0aWMg Ym9vbCBpbnRlbF9jcnRfY29tcHV0ZV9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29k ZXIsCiAJfQogCiAJLyogRkRJIG11c3QgYWx3YXlzIGJlIDIuNyBHSHogKi8KLQlpZiAoSEFTX0RE SShkZXYpKQorCWlmIChIQVNfRERJKGRldl9wcml2KSkKIAkJcGlwZV9jb25maWctPnBvcnRfY2xv Y2sgPSAxMzUwMDAgKiAyOwogCiAJcmV0dXJuIHRydWU7CkBAIC05MTYsNyArOTE2LDcgQEAgdm9p ZCBpbnRlbF9jcnRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWNydC0+YmFzZS5lbmFi bGUgPSBpbnRlbF9lbmFibGVfY3J0OwogCWlmIChJOTE1X0hBU19IT1RQTFVHKGRldikpCiAJCWNy dC0+YmFzZS5ocGRfcGluID0gSFBEX0NSVDsKLQlpZiAoSEFTX0RESShkZXYpKSB7CisJaWYgKEhB U19EREkoZGV2X3ByaXYpKSB7CiAJCWNydC0+YmFzZS5wb3J0ID0gUE9SVF9FOwogCQljcnQtPmJh c2UuZ2V0X2NvbmZpZyA9IGhzd19jcnRfZ2V0X2NvbmZpZzsKIAkJY3J0LT5iYXNlLmdldF9od19z dGF0ZSA9IGludGVsX2RkaV9nZXRfaHdfc3RhdGU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKaW5kZXggYTM2NjY1NmJjZWM1Li4yMzVkZjEyM2FjNTAgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKQEAgLTExODcsMTkgKzExODcsMTcgQEAgdm9pZCBhc3NlcnRfZmRp X3J4X3BsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQlvbm9mZihzdGF0 ZSksIG9ub2ZmKGN1cl9zdGF0ZSkpOwogfQogCi12b2lkIGFzc2VydF9wYW5lbF91bmxvY2tlZChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkgICBlbnVtIHBpcGUgcGlwZSkK K3ZvaWQgYXNzZXJ0X3BhbmVsX3VubG9ja2VkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwgZW51bSBwaXBlIHBpcGUpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9ICZkZXZf cHJpdi0+ZHJtOwogCWk5MTVfcmVnX3QgcHBfcmVnOwogCXUzMiB2YWw7CiAJZW51bSBwaXBlIHBh bmVsX3BpcGUgPSBQSVBFX0E7CiAJYm9vbCBsb2NrZWQgPSB0cnVlOwogCi0JaWYgKFdBUk5fT04o SEFTX0RESShkZXYpKSkKKwlpZiAoV0FSTl9PTihIQVNfRERJKGRldl9wcml2KSkpCiAJCXJldHVy bjsKIAotCWlmIChIQVNfUENIX1NQTElUKGRldikpIHsKKwlpZiAoSEFTX1BDSF9TUExJVChkZXZf cHJpdikpIHsKIAkJdTMyIHBvcnRfc2VsOwogCiAJCXBwX3JlZyA9IFBQX0NPTlRST0woMCk7CkBA IC0xMjA5LDcgKzEyMDcsNyBAQCB2b2lkIGFzc2VydF9wYW5lbF91bmxvY2tlZChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCSAgICBJOTE1X1JFQUQoUENIX0xWRFMpICYgTFZE U19QSVBFQl9TRUxFQ1QpCiAJCQlwYW5lbF9waXBlID0gUElQRV9COwogCQkvKiBYWFg6IGVsc2Ug Zml4IGZvciBlRFAgKi8KLQl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVS UllWSUVXKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElT X0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCS8qIHByZXN1bWFibHkgd3JpdGUgbG9jayBkZXBl bmRzIG9uIHBpcGUsIG5vdCBwb3J0IHNlbGVjdCAqLwogCQlwcF9yZWcgPSBQUF9DT05UUk9MKHBp cGUpOwogCQlwYW5lbF9waXBlID0gcGlwZTsKQEAgLTU2OTUsMTMgKzU2OTMsMTMgQEAgc3RhdGlj IGVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9kb21haW4gcG9ydF90b19hdXhfcG93ZXJfZG9tYWlu KGVudW0gcG9ydCBwb3J0KQogZW51bSBpbnRlbF9kaXNwbGF5X3Bvd2VyX2RvbWFpbgogaW50ZWxf ZGlzcGxheV9wb3J0X3Bvd2VyX2RvbWFpbihzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5j b2RlcikKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfZW5jb2Rlci0+YmFzZS5k ZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRlbF9l bmNvZGVyLT5iYXNlLmRldik7CiAJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGln X3BvcnQ7CiAKIAlzd2l0Y2ggKGludGVsX2VuY29kZXItPnR5cGUpIHsKIAljYXNlIElOVEVMX09V VFBVVF9VTktOT1dOOgogCQkvKiBPbmx5IERESSBwbGF0Zm9ybXMgc2hvdWxkIGV2ZXIgdXNlIHRo aXMgb3V0cHV0IHR5cGUgKi8KLQkJV0FSTl9PTl9PTkNFKCFIQVNfRERJKGRldikpOworCQlXQVJO X09OX09OQ0UoIUhBU19EREkoZGV2X3ByaXYpKTsKIAljYXNlIElOVEVMX09VVFBVVF9EUDoKIAlj YXNlIElOVEVMX09VVFBVVF9IRE1JOgogCWNhc2UgSU5URUxfT1VUUFVUX0VEUDoKQEAgLTU3MjIs NyArNTcyMCw3IEBAIGludGVsX2Rpc3BsYXlfcG9ydF9wb3dlcl9kb21haW4oc3RydWN0IGludGVs X2VuY29kZXIgKmludGVsX2VuY29kZXIpCiBlbnVtIGludGVsX2Rpc3BsYXlfcG93ZXJfZG9tYWlu CiBpbnRlbF9kaXNwbGF5X3BvcnRfYXV4X3Bvd2VyX2RvbWFpbihzdHJ1Y3QgaW50ZWxfZW5jb2Rl ciAqaW50ZWxfZW5jb2RlcikKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfZW5j b2Rlci0+YmFzZS5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShpbnRlbF9lbmNvZGVyLT5iYXNlLmRldik7CiAJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9y dCAqaW50ZWxfZGlnX3BvcnQ7CiAKIAlzd2l0Y2ggKGludGVsX2VuY29kZXItPnR5cGUpIHsKQEAg LTU3MzUsNyArNTczMyw3IEBAIGludGVsX2Rpc3BsYXlfcG9ydF9hdXhfcG93ZXJfZG9tYWluKHN0 cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyKQogCQkgKiB3aGF0J3MgdGhlIHN0YXR1 cyBvZiB0aGUgZ2l2ZW4gY29ubmVjdG9ycywgcGxheSBzYWZlIGFuZAogCQkgKiBydW4gdGhlIERQ IGRldGVjdGlvbiB0b28uCiAJCSAqLwotCQlXQVJOX09OX09OQ0UoIUhBU19EREkoZGV2KSk7CisJ CVdBUk5fT05fT05DRSghSEFTX0RESShkZXZfcHJpdikpOwogCWNhc2UgSU5URUxfT1VUUFVUX0RQ OgogCWNhc2UgSU5URUxfT1VUUFVUX0VEUDoKIAkJaW50ZWxfZGlnX3BvcnQgPSBlbmNfdG9fZGln X3BvcnQoJmludGVsX2VuY29kZXItPmJhc2UpOwpAQCAtOTE5NSw3ICs5MTkzLDggQEAgc3RhdGlj IHZvaWQgbHB0X2VuYWJsZV9jbGtvdXRfZHAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgYm9vbCB3 aXRoX3NwcmVhZCwKIAogCWlmIChXQVJOKHdpdGhfZmRpICYmICF3aXRoX3NwcmVhZCwgIkZESSBy ZXF1aXJlcyBkb3duc3ByZWFkXG4iKSkKIAkJd2l0aF9zcHJlYWQgPSB0cnVlOwotCWlmIChXQVJO KEhBU19QQ0hfTFBUX0xQKGRldikgJiYgd2l0aF9mZGksICJMUCBQQ0ggZG9lc24ndCBoYXZlIEZE SVxuIikpCisJaWYgKFdBUk4oSEFTX1BDSF9MUFRfTFAoZGV2X3ByaXYpICYmCisJICAgIHdpdGhf ZmRpLCAiTFAgUENIIGRvZXNuJ3QgaGF2ZSBGRElcbiIpKQogCQl3aXRoX2ZkaSA9IGZhbHNlOwog CiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPnNiX2xvY2spOwpAQCAtOTIxOCw3ICs5MjE3LDcgQEAg c3RhdGljIHZvaWQgbHB0X2VuYWJsZV9jbGtvdXRfZHAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg Ym9vbCB3aXRoX3NwcmVhZCwKIAkJfQogCX0KIAotCXJlZyA9IEhBU19QQ0hfTFBUX0xQKGRldikg PyBTQklfR0VOMCA6IFNCSV9EQlVGRjA7CisJcmVnID0gSEFTX1BDSF9MUFRfTFAoZGV2X3ByaXYp ID8gU0JJX0dFTjAgOiBTQklfREJVRkYwOwogCXRtcCA9IGludGVsX3NiaV9yZWFkKGRldl9wcml2 LCByZWcsIFNCSV9JQ0xLKTsKIAl0bXAgfD0gU0JJX0dFTjBfQ0ZHX0JVRkZFTkFCTEVfRElTQUJM RTsKIAlpbnRlbF9zYmlfd3JpdGUoZGV2X3ByaXYsIHJlZywgdG1wLCBTQklfSUNMSyk7CkBAIC05 MjM0LDcgKzkyMzMsNyBAQCBzdGF0aWMgdm9pZCBscHRfZGlzYWJsZV9jbGtvdXRfZHAoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAogCW11dGV4X2xvY2soJmRldl9wcml2LT5zYl9sb2NrKTsKIAot CXJlZyA9IEhBU19QQ0hfTFBUX0xQKGRldikgPyBTQklfR0VOMCA6IFNCSV9EQlVGRjA7CisJcmVn ID0gSEFTX1BDSF9MUFRfTFAoZGV2X3ByaXYpID8gU0JJX0dFTjAgOiBTQklfREJVRkYwOwogCXRt cCA9IGludGVsX3NiaV9yZWFkKGRldl9wcml2LCByZWcsIFNCSV9JQ0xLKTsKIAl0bXAgJj0gflNC SV9HRU4wX0NGR19CVUZGRU5BQkxFX0RJU0FCTEU7CiAJaW50ZWxfc2JpX3dyaXRlKGRldl9wcml2 LCByZWcsIHRtcCwgU0JJX0lDTEspOwpAQCAtMTAyMDIsNyArMTAyMDEsNyBAQCB2b2lkIGhzd19l bmFibGVfcGM4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogCURSTV9ERUJV R19LTVMoIkVuYWJsaW5nIHBhY2thZ2UgQzgrXG4iKTsKIAotCWlmIChIQVNfUENIX0xQVF9MUChk ZXYpKSB7CisJaWYgKEhBU19QQ0hfTFBUX0xQKGRldl9wcml2KSkgewogCQl2YWwgPSBJOTE1X1JF QUQoU09VVEhfRFNQQ0xLX0dBVEVfRCk7CiAJCXZhbCAmPSB+UENIX0xQX1BBUlRJVElPTl9MRVZF TF9ESVNBQkxFOwogCQlJOTE1X1dSSVRFKFNPVVRIX0RTUENMS19HQVRFX0QsIHZhbCk7CkBAIC0x MDIyMiw3ICsxMDIyMSw3IEBAIHZvaWQgaHN3X2Rpc2FibGVfcGM4KHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKIAloc3dfcmVzdG9yZV9sY3BsbChkZXZfcHJpdik7CiAJbHB0X2lu aXRfcGNoX3JlZmNsayhkZXYpOwogCi0JaWYgKEhBU19QQ0hfTFBUX0xQKGRldikpIHsKKwlpZiAo SEFTX1BDSF9MUFRfTFAoZGV2X3ByaXYpKSB7CiAJCXZhbCA9IEk5MTVfUkVBRChTT1VUSF9EU1BD TEtfR0FURV9EKTsKIAkJdmFsIHw9IFBDSF9MUF9QQVJUSVRJT05fTEVWRUxfRElTQUJMRTsKIAkJ STkxNV9XUklURShTT1VUSF9EU1BDTEtfR0FURV9ELCB2YWwpOwpAQCAtMTA4NDQsNyArMTA4NDMs NyBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV9jdXJzb3Ioc3RydWN0IGRybV9jcnRjICpjcnRj LCB1MzIgYmFzZSwKIAkJfQogCQljbnRsIHw9IHBpcGUgPDwgMjg7IC8qIENvbm5lY3QgdG8gY29y cmVjdCBwaXBlICovCiAKLQkJaWYgKEhBU19EREkoZGV2KSkKKwkJaWYgKEhBU19EREkoZGV2X3By aXYpKQogCQkJY250bCB8PSBDVVJTT1JfUElQRV9DU0NfRU5BQkxFOwogCiAJCWlmIChwbGFuZV9z dGF0ZS0+YmFzZS5yb3RhdGlvbiA9PSBEUk1fUk9UQVRFXzE4MCkKQEAgLTEyNzQ0LDYgKzEyNzQz LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZHVtcF9waXBlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YywKIAkJCQkgICBjb25zdCBjaGFyICpjb250ZXh0KQogewogCXN0cnVjdCBkcm1fZGV2 aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7CiAJc3RydWN0 IGludGVsX3BsYW5lICppbnRlbF9wbGFuZTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0 YXRlOwpAQCAtMTI4MjYsNyArMTI4MjYsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kdW1wX3BpcGVf Y29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJICAgICAgcGlwZV9jb25maWctPmRw bGxfaHdfc3RhdGUuY3RybDEsCiAJCQkgICAgICBwaXBlX2NvbmZpZy0+ZHBsbF9od19zdGF0ZS5j ZmdjcjEsCiAJCQkgICAgICBwaXBlX2NvbmZpZy0+ZHBsbF9od19zdGF0ZS5jZmdjcjIpOwotCX0g ZWxzZSBpZiAoSEFTX0RESShkZXYpKSB7CisJfSBlbHNlIGlmIChIQVNfRERJKGRldl9wcml2KSkg ewogCQlEUk1fREVCVUdfS01TKCJkcGxsX2h3X3N0YXRlOiB3cnBsbDogMHgleCBzcGxsOiAweCV4 XG4iLAogCQkJICAgICAgcGlwZV9jb25maWctPmRwbGxfaHdfc3RhdGUud3JwbGwsCiAJCQkgICAg ICBwaXBlX2NvbmZpZy0+ZHBsbF9od19zdGF0ZS5zcGxsKTsKQEAgLTEyOTA0LDcgKzEyOTA0LDcg QEAgc3RhdGljIGJvb2wgY2hlY2tfZGlnaXRhbF9wb3J0X2NvbmZsaWN0cyhzdHJ1Y3QgZHJtX2F0 b21pY19zdGF0ZSAqc3RhdGUpCiAJCXN3aXRjaCAoZW5jb2Rlci0+dHlwZSkgewogCQkJdW5zaWdu ZWQgaW50IHBvcnRfbWFzazsKIAkJY2FzZSBJTlRFTF9PVVRQVVRfVU5LTk9XTjoKLQkJCWlmIChX QVJOX09OKCFIQVNfRERJKGRldikpKQorCQkJaWYgKFdBUk5fT04oIUhBU19EREkodG9faTkxNShk ZXYpKSkpCiAJCQkJYnJlYWs7CiAJCWNhc2UgSU5URUxfT1VUUFVUX0RQOgogCQljYXNlIElOVEVM X09VVFBVVF9IRE1JOgpAQCAtMTM3MjgsNyArMTM3MjgsNyBAQCBpbnRlbF9tb2Rlc2V0X3Zlcmlm eV9kaXNhYmxlZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiBzdGF0aWMgdm9pZCB1cGRhdGVf c2NhbmxpbmVfb2Zmc2V0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewotCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKIAogCS8qCiAJICogVGhlIHNjYW5s aW5lIGNvdW50ZXIgaW5jcmVtZW50cyBhdCB0aGUgbGVhZGluZyBlZGdlIG9mIGhzeW5jLgpAQCAt MTM3NDgsNyArMTM3NDgsNyBAQCBzdGF0aWMgdm9pZCB1cGRhdGVfc2NhbmxpbmVfb2Zmc2V0KHN0 cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCSAqIHRoZXJlJ3MgYW4gZXh0cmEgMSBsaW5lIGRpZmZl cmVuY2UuIFNvIHdlIG5lZWQgdG8gYWRkIHR3byBpbnN0ZWFkIG9mCiAJICogb25lIHRvIHRoZSB2 YWx1ZS4KIAkgKi8KLQlpZiAoSVNfR0VOMihkZXYpKSB7CisJaWYgKElTX0dFTjIoZGV2X3ByaXYp KSB7CiAJCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlID0gJmNy dGMtPmNvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlOwogCQlpbnQgdnRvdGFsOwogCkBAIC0xMzc1 Nyw3ICsxMzc1Nyw3IEBAIHN0YXRpYyB2b2lkIHVwZGF0ZV9zY2FubGluZV9vZmZzZXQoc3RydWN0 IGludGVsX2NydGMgKmNydGMpCiAJCQl2dG90YWwgLz0gMjsKIAogCQljcnRjLT5zY2FubGluZV9v ZmZzZXQgPSB2dG90YWwgLSAxOwotCX0gZWxzZSBpZiAoSEFTX0RESShkZXYpICYmCisJfSBlbHNl IGlmIChIQVNfRERJKGRldl9wcml2KSAmJgogCQkgICBpbnRlbF9jcnRjX2hhc190eXBlKGNydGMt PmNvbmZpZywgSU5URUxfT1VUUFVUX0hETUkpKSB7CiAJCWNydGMtPnNjYW5saW5lX29mZnNldCA9 IDI7CiAJfSBlbHNlCkBAIC0xNTMyNiwxMSArMTUzMjYsMTIgQEAgc3RhdGljIGJvb2wgaW50ZWxf Y3J0X3ByZXNlbnQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAoSVNfQ0hFUlJZVklFVyhk ZXYpKQogCQlyZXR1cm4gZmFsc2U7CiAKLQlpZiAoSEFTX1BDSF9MUFRfSChkZXYpICYmIEk5MTVf UkVBRChTRlVTRV9TVFJBUCkgJiBTRlVTRV9TVFJBUF9DUlRfRElTQUJMRUQpCisJaWYgKEhBU19Q Q0hfTFBUX0goZGV2X3ByaXYpICYmCisJICAgIEk5MTVfUkVBRChTRlVTRV9TVFJBUCkgJiBTRlVT RV9TVFJBUF9DUlRfRElTQUJMRUQpCiAJCXJldHVybiBmYWxzZTsKIAogCS8qIERESSBFIGNhbid0 IGJlIHVzZWQgaWYgRERJIEEgcmVxdWlyZXMgNCBsYW5lcyAqLwotCWlmIChIQVNfRERJKGRldikg JiYgSTkxNV9SRUFEKERESV9CVUZfQ1RMKFBPUlRfQSkpICYgRERJX0FfNF9MQU5FUykKKwlpZiAo SEFTX0RESShkZXZfcHJpdikgJiYgSTkxNV9SRUFEKERESV9CVUZfQ1RMKFBPUlRfQSkpICYgRERJ X0FfNF9MQU5FUykKIAkJcmV0dXJuIGZhbHNlOwogCiAJaWYgKCFkZXZfcHJpdi0+dmJ0LmludF9j cnRfc3VwcG9ydCkKQEAgLTE1NDA0LDcgKzE1NDA1LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2V0 dXBfb3V0cHV0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlpbnRlbF9kZGlfaW5pdChkZXYs IFBPUlRfQyk7CiAKIAkJaW50ZWxfZHNpX2luaXQoZGV2KTsKLQl9IGVsc2UgaWYgKEhBU19EREko ZGV2KSkgeworCX0gZWxzZSBpZiAoSEFTX0RESShkZXZfcHJpdikpIHsKIAkJaW50IGZvdW5kOwog CiAJCS8qCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwppbmRleCA1OTkyMDkzZTE4MTQuLmVkYWYzNWI5 NzVjMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCkBAIC0xNTY1LDcgKzE1NjUsNyBAQCBpbnRl bF9kcF9jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAogCW1h eF9jbG9jayA9IGNvbW1vbl9sZW4gLSAxOwogCi0JaWYgKEhBU19QQ0hfU1BMSVQoZGV2KSAmJiAh SEFTX0RESShkZXYpICYmIHBvcnQgIT0gUE9SVF9BKQorCWlmIChIQVNfUENIX1NQTElUKGRldl9w cml2KSAmJiAhSEFTX0RESShkZXZfcHJpdikgJiYgcG9ydCAhPSBQT1JUX0EpCiAJCXBpcGVfY29u ZmlnLT5oYXNfcGNoX2VuY29kZXIgPSB0cnVlOwogCiAJcGlwZV9jb25maWctPmhhc19kcnJzID0g ZmFsc2U7CkBAIC0xNzA3LDcgKzE3MDcsNyBAQCBmb3VuZDoKIAkJdG9faW50ZWxfYXRvbWljX3N0 YXRlKHBpcGVfY29uZmlnLT5iYXNlLnN0YXRlKS0+Y2RjbGtfcGxsX3ZjbyA9IHZjbzsKIAl9CiAK LQlpZiAoIUhBU19EREkoZGV2KSkKKwlpZiAoIUhBU19EREkoZGV2X3ByaXYpKQogCQlpbnRlbF9k cF9zZXRfY2xvY2soZW5jb2RlciwgcGlwZV9jb25maWcpOwogCiAJcmV0dXJuIHRydWU7CkBAIC0y NjMyLDcgKzI2MzIsNyBAQCBfaW50ZWxfZHBfc2V0X2xpbmtfdHJhaW4oc3RydWN0IGludGVsX2Rw ICppbnRlbF9kcCwKIAkJRFJNX0RFQlVHX0tNUygiVXNpbmcgRFAgdHJhaW5pbmcgcGF0dGVybiBU UFMlZFxuIiwKIAkJCSAgICAgIGRwX3RyYWluX3BhdCAmIERQX1RSQUlOSU5HX1BBVFRFUk5fTUFT Syk7CiAKLQlpZiAoSEFTX0RESShkZXYpKSB7CisJaWYgKEhBU19EREkoZGV2X3ByaXYpKSB7CiAJ CXVpbnQzMl90IHRlbXAgPSBJOTE1X1JFQUQoRFBfVFBfQ1RMKHBvcnQpKTsKIAogCQlpZiAoZHBf dHJhaW5fcGF0ICYgRFBfTElOS19TQ1JBTUJMSU5HX0RJU0FCTEUpCkBAIC0zMzM5LDcgKzMzMzks NyBAQCBpbnRlbF9kcF9zZXRfc2lnbmFsX2xldmVscyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2Rw KQogCXVpbnQzMl90IHNpZ25hbF9sZXZlbHMsIG1hc2sgPSAwOwogCXVpbnQ4X3QgdHJhaW5fc2V0 ID0gaW50ZWxfZHAtPnRyYWluX3NldFswXTsKIAotCWlmIChIQVNfRERJKGRldikpIHsKKwlpZiAo SEFTX0RESShkZXZfcHJpdikpIHsKIAkJc2lnbmFsX2xldmVscyA9IGRkaV9zaWduYWxfbGV2ZWxz KGludGVsX2RwKTsKIAogCQlpZiAoSVNfQlJPWFRPTihkZXYpKQpAQCAtMzM5OCw3ICszMzk4LDcg QEAgdm9pZCBpbnRlbF9kcF9zZXRfaWRsZV9saW5rX3RyYWluKHN0cnVjdCBpbnRlbF9kcCAqaW50 ZWxfZHApCiAJZW51bSBwb3J0IHBvcnQgPSBpbnRlbF9kaWdfcG9ydC0+cG9ydDsKIAl1aW50MzJf dCB2YWw7CiAKLQlpZiAoIUhBU19EREkoZGV2KSkKKwlpZiAoIUhBU19EREkoZGV2X3ByaXYpKQog CQlyZXR1cm47CiAKIAl2YWwgPSBJOTE1X1JFQUQoRFBfVFBfQ1RMKHBvcnQpKTsKQEAgLTM0MzMs NyArMzQzMyw3IEBAIGludGVsX2RwX2xpbmtfZG93bihzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2Rw KQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAl1 aW50MzJfdCBEUCA9IGludGVsX2RwLT5EUDsKIAotCWlmIChXQVJOX09OKEhBU19EREkoZGV2KSkp CisJaWYgKFdBUk5fT04oSEFTX0RESShkZXZfcHJpdikpKQogCQlyZXR1cm47CiAKIAlpZiAoV0FS Tl9PTigoSTkxNV9SRUFEKGludGVsX2RwLT5vdXRwdXRfcmVnKSAmIERQX1BPUlRfRU4pID09IDAp KQpAQCAtNTY1OSw3ICs1NjU5LDcgQEAgaW50ZWxfZHBfaW5pdF9jb25uZWN0b3Ioc3RydWN0IGlu dGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQsCiAJZWxzZQogCQlpbnRlbF9kcC0+Z2V0 X2F1eF9zZW5kX2N0bCA9IGc0eF9nZXRfYXV4X3NlbmRfY3RsOwogCi0JaWYgKEhBU19EREkoZGV2 KSkKKwlpZiAoSEFTX0RESShkZXZfcHJpdikpCiAJCWludGVsX2RwLT5wcmVwYXJlX2xpbmtfcmV0 cmFpbiA9IGludGVsX2RkaV9wcmVwYXJlX2xpbmtfcmV0cmFpbjsKIAogCS8qIFByZXNlcnZlIHRo ZSBjdXJyZW50IGh3IHN0YXRlLiAqLwpAQCAtNTcwMSw3ICs1NzAxLDcgQEAgaW50ZWxfZHBfaW5p dF9jb25uZWN0b3Ioc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQsCiAK IAlpbnRlbF9jb25uZWN0b3JfYXR0YWNoX2VuY29kZXIoaW50ZWxfY29ubmVjdG9yLCBpbnRlbF9l bmNvZGVyKTsKIAotCWlmIChIQVNfRERJKGRldikpCisJaWYgKEhBU19EREkoZGV2X3ByaXYpKQog CQlpbnRlbF9jb25uZWN0b3ItPmdldF9od19zdGF0ZSA9IGludGVsX2RkaV9jb25uZWN0b3JfZ2V0 X2h3X3N0YXRlOwogCWVsc2UKIAkJaW50ZWxfY29ubmVjdG9yLT5nZXRfaHdfc3RhdGUgPSBpbnRl bF9jb25uZWN0b3JfZ2V0X2h3X3N0YXRlOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHBsbF9tZ3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdy LmMKaW5kZXggMWM1OWNhNTBjNDMwLi5kMGM1OWMxNzkzZWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHBsbF9tZ3IuYwpAQCAtMTg1NSw3ICsxODU1LDcgQEAgdm9pZCBpbnRlbF9zaGFyZWRf ZHBsbF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWRwbGxfbWdyID0gJnNrbF9wbGxf bWdyOwogCWVsc2UgaWYgKElTX0JST1hUT04oZGV2KSkKIAkJZHBsbF9tZ3IgPSAmYnh0X3BsbF9t Z3I7Ci0JZWxzZSBpZiAoSEFTX0RESShkZXYpKQorCWVsc2UgaWYgKEhBU19EREkoZGV2X3ByaXYp KQogCQlkcGxsX21nciA9ICZoc3dfcGxsX21ncjsKIAllbHNlIGlmIChIQVNfUENIX0lCWChkZXYp IHx8IEhBU19QQ0hfQ1BUKGRldikpCiAJCWRwbGxfbWdyID0gJnBjaF9wbGxfbWdyOwpAQCAtMTg4 Myw3ICsxODgzLDcgQEAgdm9pZCBpbnRlbF9zaGFyZWRfZHBsbF9pbml0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJQlVHX09OKGRldl9wcml2LT5udW1fc2hhcmVkX2RwbGwgPiBJOTE1X05VTV9Q TExTKTsKIAogCS8qIEZJWE1FOiBNb3ZlIHRoaXMgdG8gYSBtb3JlIHN1aXRhYmxlIHBsYWNlICov Ci0JaWYgKEhBU19EREkoZGV2KSkKKwlpZiAoSEFTX0RESShkZXZfcHJpdikpCiAJCWludGVsX2Rk aV9wbGxfaW5pdChkZXYpOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9oZG1pLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMKaW5kZXggOGQ0 NmY1ODM2NzQ2Li4wOWIyMTQ2ZjE1N2YgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2hkbWkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMKQEAg LTUwLDcgKzUwLDcgQEAgYXNzZXJ0X2hkbWlfcG9ydF9kaXNhYmxlZChzdHJ1Y3QgaW50ZWxfaGRt aSAqaW50ZWxfaGRtaSkKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19p OTE1KGRldik7CiAJdWludDMyX3QgZW5hYmxlZF9iaXRzOwogCi0JZW5hYmxlZF9iaXRzID0gSEFT X0RESShkZXYpID8gRERJX0JVRl9DVExfRU5BQkxFIDogU0RWT19FTkFCTEU7CisJZW5hYmxlZF9i aXRzID0gSEFTX0RESShkZXZfcHJpdikgPyBERElfQlVGX0NUTF9FTkFCTEUgOiBTRFZPX0VOQUJM RTsKIAogCVdBUk4oSTkxNV9SRUFEKGludGVsX2hkbWktPmhkbWlfcmVnKSAmIGVuYWJsZWRfYml0 cywKIAkgICAgICJIRE1JIHBvcnQgZW5hYmxlZCwgZXhwZWN0aW5nIGRpc2FibGVkXG4iKTsKQEAg LTEzMTIsNyArMTMxMiw3IEBAIGJvb2wgaW50ZWxfaGRtaV9jb21wdXRlX2NvbmZpZyhzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCSAgICAgICBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9z dGF0ZSAqY29ubl9zdGF0ZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfaGRtaSAqaW50ZWxfaGRtaSA9IGVu Y190b19pbnRlbF9oZG1pKCZlbmNvZGVyLT5iYXNlKTsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gZW5jb2Rlci0+YmFzZS5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7CiAJc3RydWN0IGRybV9kaXNwbGF5X21vZGUg KmFkanVzdGVkX21vZGUgPSAmcGlwZV9jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZTsKIAlpbnQg Y2xvY2tfOGJwYyA9IHBpcGVfY29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19jbG9jazsK IAlpbnQgY2xvY2tfMTJicGMgPSBjbG9ja184YnBjICogMyAvIDI7CkBAIC0xMzM5LDcgKzEzMzks NyBAQCBib29sIGludGVsX2hkbWlfY29tcHV0ZV9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIg KmVuY29kZXIsCiAJCWNsb2NrXzEyYnBjICo9IDI7CiAJfQogCi0JaWYgKEhBU19QQ0hfU1BMSVQo ZGV2KSAmJiAhSEFTX0RESShkZXYpKQorCWlmIChIQVNfUENIX1NQTElUKGRldl9wcml2KSAmJiAh SEFTX0RESShkZXZfcHJpdikpCiAJCXBpcGVfY29uZmlnLT5oYXNfcGNoX2VuY29kZXIgPSB0cnVl OwogCiAJaWYgKHBpcGVfY29uZmlnLT5oYXNfaGRtaV9zaW5rICYmIGludGVsX2hkbWktPmhhc19h dWRpbykKQEAgLTE4OTIsNyArMTg5Miw3IEBAIHZvaWQgaW50ZWxfaGRtaV9pbml0X2Nvbm5lY3Rv cihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwKIAkJaW50ZWxfaGRt aS0+d3JpdGVfaW5mb2ZyYW1lID0gZzR4X3dyaXRlX2luZm9mcmFtZTsKIAkJaW50ZWxfaGRtaS0+ c2V0X2luZm9mcmFtZXMgPSBnNHhfc2V0X2luZm9mcmFtZXM7CiAJCWludGVsX2hkbWktPmluZm9m cmFtZV9lbmFibGVkID0gZzR4X2luZm9mcmFtZV9lbmFibGVkOwotCX0gZWxzZSBpZiAoSEFTX0RE SShkZXYpKSB7CisJfSBlbHNlIGlmIChIQVNfRERJKGRldl9wcml2KSkgewogCQlpbnRlbF9oZG1p LT53cml0ZV9pbmZvZnJhbWUgPSBoc3dfd3JpdGVfaW5mb2ZyYW1lOwogCQlpbnRlbF9oZG1pLT5z ZXRfaW5mb2ZyYW1lcyA9IGhzd19zZXRfaW5mb2ZyYW1lczsKIAkJaW50ZWxfaGRtaS0+aW5mb2Zy YW1lX2VuYWJsZWQgPSBoc3dfaW5mb2ZyYW1lX2VuYWJsZWQ7CkBAIC0xOTA2LDcgKzE5MDYsNyBA QCB2b2lkIGludGVsX2hkbWlfaW5pdF9jb25uZWN0b3Ioc3RydWN0IGludGVsX2RpZ2l0YWxfcG9y dCAqaW50ZWxfZGlnX3BvcnQsCiAJCWludGVsX2hkbWktPmluZm9mcmFtZV9lbmFibGVkID0gY3B0 X2luZm9mcmFtZV9lbmFibGVkOwogCX0KIAotCWlmIChIQVNfRERJKGRldikpCisJaWYgKEhBU19E REkoZGV2X3ByaXYpKQogCQlpbnRlbF9jb25uZWN0b3ItPmdldF9od19zdGF0ZSA9IGludGVsX2Rk aV9jb25uZWN0b3JfZ2V0X2h3X3N0YXRlOwogCWVsc2UKIAkJaW50ZWxfY29ubmVjdG9yLT5nZXRf aHdfc3RhdGUgPSBpbnRlbF9jb25uZWN0b3JfZ2V0X2h3X3N0YXRlOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKaW5kZXggOTZkMGM1N2M4MTZjLi5mMjk0OTEwNzcyMzUgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYwpAQCAtNzEzMiw3ICs3MTMyLDcgQEAgc3RhdGljIHZvaWQgbHB0X2luaXRfY2xvY2tf Z2F0aW5nKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJICogVE9ETzogdGhpcyBiaXQgc2hvdWxk IG9ubHkgYmUgZW5hYmxlZCB3aGVuIHJlYWxseSBuZWVkZWQsIHRoZW4KIAkgKiBkaXNhYmxlZCB3 aGVuIG5vdCBuZWVkZWQgYW55bW9yZSBpbiBvcmRlciB0byBzYXZlIHBvd2VyLgogCSAqLwotCWlm IChIQVNfUENIX0xQVF9MUChkZXYpKQorCWlmIChIQVNfUENIX0xQVF9MUChkZXZfcHJpdikpCiAJ CUk5MTVfV1JJVEUoU09VVEhfRFNQQ0xLX0dBVEVfRCwKIAkJCSAgIEk5MTVfUkVBRChTT1VUSF9E U1BDTEtfR0FURV9EKSB8CiAJCQkgICBQQ0hfTFBfUEFSVElUSU9OX0xFVkVMX0RJU0FCTEUpOwpA QCAtNzE0Nyw3ICs3MTQ3LDcgQEAgc3RhdGljIHZvaWQgbHB0X3N1c3BlbmRfaHcoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0 b19pOTE1KGRldik7CiAKLQlpZiAoSEFTX1BDSF9MUFRfTFAoZGV2KSkgeworCWlmIChIQVNfUENI X0xQVF9MUChkZXZfcHJpdikpIHsKIAkJdWludDMyX3QgdmFsID0gSTkxNV9SRUFEKFNPVVRIX0RT UENMS19HQVRFX0QpOwogCiAJCXZhbCAmPSB+UENIX0xQX1BBUlRJVElPTl9MRVZFTF9ESVNBQkxF OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYwppbmRleCAxMDhiYTFlNWQ2NTguLjllMmZiYWM5Nzc2 ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKQEAgLTM0NCw3ICszNDQsNyBAQCBzdGF0aWMg Ym9vbCBpbnRlbF9wc3JfbWF0Y2hfY29uZGl0aW9ucyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2Rw KQogCSAqIG9uZXMuIFNpbmNlIGJ5IERpc3BsYXkgZGVzaWduIHRyYW5zY29kZXIgRURQIGlzIHRp ZWQgdG8gcG9ydCBBCiAJICogd2UgY2FuIHNhZmVseSBlc2NhcGUgYmFzZWQgb24gdGhlIHBvcnQg QS4KIAkgKi8KLQlpZiAoSEFTX0RESShkZXYpICYmIGRpZ19wb3J0LT5wb3J0ICE9IFBPUlRfQSkg eworCWlmIChIQVNfRERJKGRldl9wcml2KSAmJiBkaWdfcG9ydC0+cG9ydCAhPSBQT1JUX0EpIHsK IAkJRFJNX0RFQlVHX0tNUygiUFNSIGNvbmRpdGlvbiBmYWlsZWQ6IFBvcnQgbm90IHN1cHBvcnRl ZFxuIik7CiAJCXJldHVybiBmYWxzZTsKIAl9CkBAIC00MDIsNyArNDAyLDcgQEAgc3RhdGljIHZv aWQgaW50ZWxfcHNyX2FjdGl2YXRlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJbG9ja2Rl cF9hc3NlcnRfaGVsZCgmZGV2X3ByaXYtPnBzci5sb2NrKTsKIAogCS8qIEVuYWJsZS9SZS1lbmFi bGUgUFNSIG9uIHRoZSBob3N0ICovCi0JaWYgKEhBU19EREkoZGV2KSkKKwlpZiAoSEFTX0RESShk ZXZfcHJpdikpCiAJCS8qIE9uIEhTVysgYWZ0ZXIgd2UgZW5hYmxlIFBTUiBvbiBzb3VyY2UgaXQg d2lsbCBhY3RpdmF0ZSBpdAogCQkgKiBhcyBzb29uIGFzIGl0IG1hdGNoIGNvbmZpZ3VyZSBpZGxl X2ZyYW1lIGNvdW50LiBTbwogCQkgKiB3ZSBqdXN0IGFjdHVhbGx5IGVuYWJsZSBpdCBoZXJlIG9u IGFjdGl2YXRpb24gdGltZS4KQEAgLTQ0OCw3ICs0NDgsNyBAQCB2b2lkIGludGVsX3Bzcl9lbmFi bGUoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAogCWRldl9wcml2LT5wc3IuYnVzeV9mcm9u dGJ1ZmZlcl9iaXRzID0gMDsKIAotCWlmIChIQVNfRERJKGRldikpIHsKKwlpZiAoSEFTX0RESShk ZXZfcHJpdikpIHsKIAkJaHN3X3Bzcl9zZXR1cF92c2MoaW50ZWxfZHApOwogCiAJCWlmIChkZXZf cHJpdi0+cHNyLnBzcjJfc3VwcG9ydCkgewpAQCAtNTgwLDcgKzU4MCw3IEBAIHZvaWQgaW50ZWxf cHNyX2Rpc2FibGUoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAl9CiAKIAkvKiBEaXNhYmxl IFBTUiBvbiBTb3VyY2UgKi8KLQlpZiAoSEFTX0RESShkZXYpKQorCWlmIChIQVNfRERJKGRldl9w cml2KSkKIAkJaHN3X3Bzcl9kaXNhYmxlKGludGVsX2RwKTsKIAllbHNlCiAJCXZsdl9wc3JfZGlz YWJsZShpbnRlbF9kcCk7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==