From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 10/15] drm/i915: Assorted INTEL_INFO(dev) cleanups Date: Wed, 16 Nov 2016 08:55:40 +0000 Message-ID: <1479286545-15020-11-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1479286545-15020-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 8E22D6E66A for ; Wed, 16 Nov 2016 08:56:02 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id a20so8782874wme.2 for ; Wed, 16 Nov 2016 00:56:02 -0800 (PST) In-Reply-To: <1479286545-15020-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkEgYnVuY2gg b2Ygc291cmNlIGZpbGVzIHdpdGgganVzdCBhIGZldyBpbnN0YW5jZXMgb2YgdGhlCmluY29ycmVj dCBJTlRFTF9JTkZPIHVzZS4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28u dXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY29sb3Iu YyAgICB8ICA1ICsrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYyAgICAgIHwg MTUgKysrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyAgICAg IHwgMTAgKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuYyB8 ICA1ICsrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMgICAgIHwgIDcgKysr LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcGFuZWwuYyAgICB8IDEwICsrKysrLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jICAgICAgfCAgNCArKy0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMgICAgIHwgMTEgKysrKystLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3R2LmMgICAgICAgfCAgNSArKy0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgICB8ICAyICstCiAxMCBmaWxlcyBjaGFuZ2VkLCAzMiBp bnNlcnRpb25zKCspLCA0MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9jb2xvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY29sb3Iu YwppbmRleCAzNzg0OTQwYTRlN2EuLmQ4MTIzMmI3OWYwMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfY29sb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9jb2xvci5jCkBAIC05NSw4ICs5NSw3IEBAIHN0YXRpYyB2b2lkIGN0bV9tdWx0X2J5X2xpbWl0 ZWQodWludDY0X3QgKnJlc3VsdCwgaW50NjRfdCAqaW5wdXQpCiBzdGF0aWMgdm9pZCBpOXh4X2xv YWRfY3NjX21hdHJpeChzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7CiAJc3Ry dWN0IGRybV9jcnRjICpjcnRjID0gY3J0Y19zdGF0ZS0+Y3J0YzsKLQlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gY3J0Yy0+ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19p OTE1KGNydGMtPmRldik7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRl bF9jcnRjKGNydGMpOwogCWludCBpLCBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAl1aW50MTZf dCBjb2VmZnNbOV0gPSB7IDAsIH07CkBAIC0xODAsNyArMTc5LDcgQEAgc3RhdGljIHZvaWQgaTl4 eF9sb2FkX2NzY19tYXRyaXgoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCUk5 MTVfV1JJVEUoUElQRV9DU0NfUFJFT0ZGX01FKHBpcGUpLCAwKTsKIAlJOTE1X1dSSVRFKFBJUEVf Q1NDX1BSRU9GRl9MTyhwaXBlKSwgMCk7CiAKLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPiA2 KSB7CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPiA2KSB7CiAJCXVpbnQxNl90IHBvc3RvZmYg PSAwOwogCiAJCWlmIChpbnRlbF9jcnRjX3N0YXRlLT5saW1pdGVkX2NvbG9yX3JhbmdlKQpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9jcnQuYwppbmRleCBmZWQ2MTk1OGZmZDQuLjg2ZWNlYzU2MDFkNCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMKQEAgLTE0NywxNCArMTQ3LDEzIEBAIHN0YXRpYyB2b2lk IGludGVsX2NydF9zZXRfZHBtcyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCSAg ICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCSAgICAgICBpbnQg bW9kZSkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7Ci0J c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYp OwogCXN0cnVjdCBpbnRlbF9jcnQgKmNydCA9IGludGVsX2VuY29kZXJfdG9fY3J0KGVuY29kZXIp OwogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjX3N0YXRlLT5i YXNlLmNydGMpOwogCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2Rl ID0gJmNydGNfc3RhdGUtPmJhc2UuYWRqdXN0ZWRfbW9kZTsKIAl1MzIgYWRwYTsKIAotCWlmIChJ TlRFTF9JTkZPKGRldiktPmdlbiA+PSA1KQorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDUp CiAJCWFkcGEgPSBBRFBBX0hPVFBMVUdfQklUUzsKIAllbHNlCiAJCWFkcGEgPSAwOwpAQCAtNjcz LDggKzY3Miw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZG1pX3N5c3RlbV9pZCBpbnRlbF9zcHVy aW91c19jcnRfZGV0ZWN0W10gPSB7CiBzdGF0aWMgZW51bSBkcm1fY29ubmVjdG9yX3N0YXR1cwog aW50ZWxfY3J0X2RldGVjdChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLCBib29sIGZv cmNlKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjb25uZWN0b3ItPmRldjsKLQlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjb25uZWN0b3ItPmRldik7CiAJc3Ry dWN0IGludGVsX2NydCAqY3J0ID0gaW50ZWxfYXR0YWNoZWRfY3J0KGNvbm5lY3Rvcik7CiAJc3Ry dWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIgPSAmY3J0LT5iYXNlOwogCWVudW0gaW50 ZWxfZGlzcGxheV9wb3dlcl9kb21haW4gcG93ZXJfZG9tYWluOwpAQCAtNzMxLDcgKzcyOSw3IEBA IGludGVsX2NydF9kZXRlY3Qoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwgYm9vbCBm b3JjZSkKIAlpZiAoaW50ZWxfZ2V0X2xvYWRfZGV0ZWN0X3BpcGUoY29ubmVjdG9yLCBOVUxMLCAm dG1wLCAmY3R4KSkgewogCQlpZiAoaW50ZWxfY3J0X2RldGVjdF9kZGMoY29ubmVjdG9yKSkKIAkJ CXN0YXR1cyA9IGNvbm5lY3Rvcl9zdGF0dXNfY29ubmVjdGVkOwotCQllbHNlIGlmIChJTlRFTF9J TkZPKGRldiktPmdlbiA8IDQpCisJCWVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA0KQog CQkJc3RhdHVzID0gaW50ZWxfY3J0X2xvYWRfZGV0ZWN0KGNydCwKIAkJCQl0b19pbnRlbF9jcnRj KGNvbm5lY3Rvci0+c3RhdGUtPmNydGMpLT5waXBlKTsKIAkJZWxzZSBpZiAoaTkxNS5sb2FkX2Rl dGVjdF90ZXN0KQpAQCAtNzkzLDExICs3OTEsMTAgQEAgc3RhdGljIGludCBpbnRlbF9jcnRfc2V0 X3Byb3BlcnR5KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAKIHZvaWQgaW50ZWxf Y3J0X3Jlc2V0KHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKIHsKLQlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gZW5jb2Rlci0+ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KGVuY29kZXItPmRldik7CiAJc3RydWN0IGludGVsX2NydCAqY3J0ID0gaW50ZWxf ZW5jb2Rlcl90b19jcnQodG9faW50ZWxfZW5jb2RlcihlbmNvZGVyKSk7CiAKLQlpZiAoSU5URUxf SU5GTyhkZXYpLT5nZW4gPj0gNSkgeworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDUpIHsK IAkJdTMyIGFkcGE7CiAKIAkJYWRwYSA9IEk5MTVfUkVBRChjcnQtPmFkcGFfcmVnKTsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGRpLmMKaW5kZXggMGFkNGUxNmE2MzlmLi4xMGVjOWQ0YjdkNDUgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RkaS5jCkBAIC0xNzUzLDggKzE3NTMsNyBAQCBzdGF0aWMgdm9pZCBp bnRlbF9kZGlfcG9zdF9kaXNhYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVy LAogCQkJCSAgIHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpvbGRfY29ubl9zdGF0ZSkKIHsK IAlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIgPSAmaW50ZWxfZW5jb2Rlci0+YmFzZTsKLQlz dHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5jb2Rlci0+ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGVuY29kZXItPmRldik7CiAJZW51bSBwb3J0IHBvcnQgPSBp bnRlbF9kZGlfZ2V0X2VuY29kZXJfcG9ydChpbnRlbF9lbmNvZGVyKTsKIAlpbnQgdHlwZSA9IGlu dGVsX2VuY29kZXItPnR5cGU7CiAJdWludDMyX3QgdmFsOwpAQCAtMTc4Nyw3ICsxNzg2LDcgQEAg c3RhdGljIHZvaWQgaW50ZWxfZGRpX3Bvc3RfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAq aW50ZWxfZW5jb2RlciwKIAlpZiAoSVNfU0tZTEFLRShkZXZfcHJpdikgfHwgSVNfS0FCWUxBS0Uo ZGV2X3ByaXYpKQogCQlJOTE1X1dSSVRFKERQTExfQ1RSTDIsIChJOTE1X1JFQUQoRFBMTF9DVFJM MikgfAogCQkJCQlEUExMX0NUUkwyX0RESV9DTEtfT0ZGKHBvcnQpKSk7Ci0JZWxzZSBpZiAoSU5U RUxfSU5GTyhkZXYpLT5nZW4gPCA5KQorCWVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA5 KQogCQlJOTE1X1dSSVRFKFBPUlRfQ0xLX1NFTChwb3J0KSwgUE9SVF9DTEtfU0VMX05PTkUpOwog CiAJaWYgKHR5cGUgPT0gSU5URUxfT1VUUFVUX0hETUkpIHsKQEAgLTE4MzcsOCArMTgzNiw3IEBA IHN0YXRpYyB2b2lkIGludGVsX2VuYWJsZV9kZGkoc3RydWN0IGludGVsX2VuY29kZXIgKmludGVs X2VuY29kZXIsCiAJc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyID0gJmludGVsX2VuY29kZXIt PmJhc2U7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjID0gZW5jb2Rlci0+Y3J0YzsKIAlzdHJ1Y3Qg aW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0Jc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IGVuY29kZXItPmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShlbmNvZGVyLT5kZXYpOwogCWVudW0gcG9ydCBwb3J0ID0gaW50ZWxfZGRp X2dldF9lbmNvZGVyX3BvcnQoaW50ZWxfZW5jb2Rlcik7CiAJaW50IHR5cGUgPSBpbnRlbF9lbmNv ZGVyLT50eXBlOwogCkBAIC0xODU2LDcgKzE4NTQsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9lbmFi bGVfZGRpKHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyLAogCX0gZWxzZSBpZiAo dHlwZSA9PSBJTlRFTF9PVVRQVVRfRURQKSB7CiAJCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAg PSBlbmNfdG9faW50ZWxfZHAoZW5jb2Rlcik7CiAKLQkJaWYgKHBvcnQgPT0gUE9SVF9BICYmIElO VEVMX0lORk8oZGV2KS0+Z2VuIDwgOSkKKwkJaWYgKHBvcnQgPT0gUE9SVF9BICYmIElOVEVMX0dF TihkZXZfcHJpdikgPCA5KQogCQkJaW50ZWxfZHBfc3RvcF9saW5rX3RyYWluKGludGVsX2RwKTsK IAogCQlpbnRlbF9lZHBfYmFja2xpZ2h0X29uKGludGVsX2RwKTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcGxsX21nci5jCmluZGV4IDIxODUzYTE3YjZkOS4uNThhNzU2ZjJmMjI0IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMKQEAgLTE4OCwxMyArMTg4LDEyIEBAIHZvaWQg aW50ZWxfZW5hYmxlX3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCiB2b2lk IGludGVsX2Rpc2FibGVfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7Ci0J c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwotCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKIAlzdHJ1Y3QgaW50ZWxf c2hhcmVkX2RwbGwgKnBsbCA9IGNydGMtPmNvbmZpZy0+c2hhcmVkX2RwbGw7CiAJdW5zaWduZWQg Y3J0Y19tYXNrID0gMSA8PCBkcm1fY3J0Y19pbmRleCgmY3J0Yy0+YmFzZSk7CiAKIAkvKiBQQ0gg b25seSBhdmFpbGFibGUgb24gSUxLKyAqLwotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDUp CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA1KQogCQlyZXR1cm47CiAKIAlpZiAocGxsID09 IE5VTEwpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMKaW5kZXggZGU3YjNlNmVkNDc3Li5kMTJl ZjAwNDdkNDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMKQEAgLTEyMiw4ICsxMjIsNyBA QCBzdGF0aWMgYm9vbCBpbnRlbF9sdmRzX2dldF9od19zdGF0ZShzdHJ1Y3QgaW50ZWxfZW5jb2Rl ciAqZW5jb2RlciwKIHN0YXRpYyB2b2lkIGludGVsX2x2ZHNfZ2V0X2NvbmZpZyhzdHJ1Y3QgaW50 ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCQkgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBl X2NvbmZpZykKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7 Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5k ZXYpOwogCXN0cnVjdCBpbnRlbF9sdmRzX2VuY29kZXIgKmx2ZHNfZW5jb2RlciA9IHRvX2x2ZHNf ZW5jb2RlcigmZW5jb2Rlci0+YmFzZSk7CiAJdTMyIHRtcCwgZmxhZ3MgPSAwOwogCkBAIC0xMzks MTIgKzEzOCwxMiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9sdmRzX2dldF9jb25maWcoc3RydWN0IGlu dGVsX2VuY29kZXIgKmVuY29kZXIsCiAKIAlwaXBlX2NvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2Rl LmZsYWdzIHw9IGZsYWdzOwogCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgNSkKKwlpZiAo SU5URUxfR0VOKGRldl9wcml2KSA8IDUpCiAJCXBpcGVfY29uZmlnLT5nbWNoX3BmaXQubHZkc19i b3JkZXJfYml0cyA9CiAJCQl0bXAgJiBMVkRTX0JPUkRFUl9FTkFCTEU7CiAKIAkvKiBnZW4yLzMg c3RvcmUgZGl0aGVyIHN0YXRlIGluIHBmaXQgY29udHJvbCwgbmVlZHMgdG8gbWF0Y2ggKi8KLQlp ZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA0KSB7CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikg PCA0KSB7CiAJCXRtcCA9IEk5MTVfUkVBRChQRklUX0NPTlRST0wpOwogCiAJCXBpcGVfY29uZmln LT5nbWNoX3BmaXQuY29udHJvbCB8PSB0bXAgJiBQQU5FTF84VE82X0RJVEhFUl9FTkFCTEU7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wYW5lbC5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcGFuZWwuYwppbmRleCBiZTRiNGQ1NDZmZDkuLjM3NGE3MzM4NjRk NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcGFuZWwuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wYW5lbC5jCkBAIC0zMDQsNyArMzA0LDcgQEAgdm9p ZCBpbnRlbF9nbWNoX3BhbmVsX2ZpdHRpbmcoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMs CiAJCQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAJCQkgICAg ICBpbnQgZml0dGluZ19tb2RlKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9j cnRjLT5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19p OTE1KGludGVsX2NydGMtPmJhc2UuZGV2KTsKIAl1MzIgcGZpdF9jb250cm9sID0gMCwgcGZpdF9w Z21fcmF0aW9zID0gMCwgYm9yZGVyID0gMDsKIAlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRq dXN0ZWRfbW9kZSA9ICZwaXBlX2NvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlOwogCkBAIC0zMjUs NyArMzI1LDcgQEAgdm9pZCBpbnRlbF9nbWNoX3BhbmVsX2ZpdHRpbmcoc3RydWN0IGludGVsX2Ny dGMgKmludGVsX2NydGMsCiAJCWJyZWFrOwogCWNhc2UgRFJNX01PREVfU0NBTEVfQVNQRUNUOgog CQkvKiBTY2FsZSBidXQgcHJlc2VydmUgdGhlIGFzcGVjdCByYXRpbyAqLwotCQlpZiAoSU5URUxf SU5GTyhkZXYpLT5nZW4gPj0gNCkKKwkJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNCkKIAkJ CWk5NjVfc2NhbGVfYXNwZWN0KHBpcGVfY29uZmlnLCAmcGZpdF9jb250cm9sKTsKIAkJZWxzZQog CQkJaTl4eF9zY2FsZV9hc3BlY3QocGlwZV9jb25maWcsICZwZml0X2NvbnRyb2wsCkBAIC0zMzks NyArMzM5LDcgQEAgdm9pZCBpbnRlbF9nbWNoX3BhbmVsX2ZpdHRpbmcoc3RydWN0IGludGVsX2Ny dGMgKmludGVsX2NydGMsCiAJCWlmIChwaXBlX2NvbmZpZy0+cGlwZV9zcmNfaCAhPSBhZGp1c3Rl ZF9tb2RlLT5jcnRjX3ZkaXNwbGF5IHx8CiAJCSAgICBwaXBlX2NvbmZpZy0+cGlwZV9zcmNfdyAh PSBhZGp1c3RlZF9tb2RlLT5jcnRjX2hkaXNwbGF5KSB7CiAJCQlwZml0X2NvbnRyb2wgfD0gUEZJ VF9FTkFCTEU7Ci0JCQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNCkKKwkJCWlmIChJTlRF TF9HRU4oZGV2X3ByaXYpID49IDQpCiAJCQkJcGZpdF9jb250cm9sIHw9IFBGSVRfU0NBTElOR19B VVRPOwogCQkJZWxzZQogCQkJCXBmaXRfY29udHJvbCB8PSAoVkVSVF9BVVRPX1NDQUxFIHwKQEAg LTM1NSw3ICszNTUsNyBAQCB2b2lkIGludGVsX2dtY2hfcGFuZWxfZml0dGluZyhzdHJ1Y3QgaW50 ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAogCS8qIDk2NSsgd2FudHMgZnV6enkgZml0dGluZyAqLwog CS8qIEZJWE1FOiBoYW5kbGUgbXVsdGlwbGUgcGFuZWxzIGJ5IGZhaWxpbmcgZ3JhY2VmdWxseSAq LwotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA0KQorCWlmIChJTlRFTF9HRU4oZGV2X3By aXYpID49IDQpCiAJCXBmaXRfY29udHJvbCB8PSAoKGludGVsX2NydGMtPnBpcGUgPDwgUEZJVF9Q SVBFX1NISUZUKSB8CiAJCQkJIFBGSVRfRklMVEVSX0ZVWlpZKTsKIApAQCAtMzY2LDcgKzM2Niw3 IEBAIHZvaWQgaW50ZWxfZ21jaF9wYW5lbF9maXR0aW5nKHN0cnVjdCBpbnRlbF9jcnRjICppbnRl bF9jcnRjLAogCX0KIAogCS8qIE1ha2Ugc3VyZSBwcmUtOTY1IHNldCBkaXRoZXIgY29ycmVjdGx5 IGZvciAxOGJwcCBwYW5lbHMuICovCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgNCAmJiBw aXBlX2NvbmZpZy0+cGlwZV9icHAgPT0gMTgpCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA0 ICYmIHBpcGVfY29uZmlnLT5waXBlX2JwcCA9PSAxOCkKIAkJcGZpdF9jb250cm9sIHw9IFBBTkVM XzhUTzZfRElUSEVSX0VOQUJMRTsKIAogCXBpcGVfY29uZmlnLT5nbWNoX3BmaXQuY29udHJvbCA9 IHBmaXRfY29udHJvbDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bz ci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKaW5kZXggNDFlNmU5MjBkOWQ3 Li43YjQ4OGUyNzkzZDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bz ci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCkBAIC00NzIsNyArNDcy LDcgQEAgdm9pZCBpbnRlbF9wc3JfZW5hYmxlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJ CS8qIEVuYWJsZSBQU1Igb24gdGhlIHBhbmVsICovCiAJCWhzd19wc3JfZW5hYmxlX3NpbmsoaW50 ZWxfZHApOwogCi0JCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KQorCQlpZiAoSU5URUxf R0VOKGRldl9wcml2KSA+PSA5KQogCQkJaW50ZWxfcHNyX2FjdGl2YXRlKGludGVsX2RwKTsKIAl9 IGVsc2UgewogCQl2bHZfcHNyX3NldHVwX3ZzYyhpbnRlbF9kcCk7CkBAIC00OTgsNyArNDk4LDcg QEAgdm9pZCBpbnRlbF9wc3JfZW5hYmxlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJICog ICAgIC0gT24gSFNXL0JEVyB3ZSBnZXQgYSByZWNvdmVyYWJsZSBmcm96ZW4gc2NyZWVuIHVudGls IG5leHQKIAkgKiAgICAgICBleGl0LWFjdGl2YXRlIHNlcXVlbmNlLgogCSAqLwotCWlmIChJTlRF TF9JTkZPKGRldiktPmdlbiA8IDkpCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA5KQogCQlz Y2hlZHVsZV9kZWxheWVkX3dvcmsoJmRldl9wcml2LT5wc3Iud29yaywKIAkJCQkgICAgICBtc2Vj c190b19qaWZmaWVzKGludGVsX2RwLT5wYW5lbF9wb3dlcl9jeWNsZV9kZWxheSAqIDUpKTsKIApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jCmluZGV4IDM5OTBjODA1YTViNS4uMjc4MDhlOTFjYjVh IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jCkBAIC0xMTk1LDggKzExOTUsNyBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9zZHZvX3ByZV9lbmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmludGVs X2VuY29kZXIsCiAJCQkJICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJ CQkgIHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlKQogewotCXN0cnVjdCBk cm1fZGV2aWNlICpkZXYgPSBpbnRlbF9lbmNvZGVyLT5iYXNlLmRldjsKLQlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRlbF9lbmNvZGVyLT5iYXNlLmRldik7CiAJc3Ry dWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0 Yyk7CiAJY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGUgPSAmY3J0 Y19zdGF0ZS0+YmFzZS5hZGp1c3RlZF9tb2RlOwogCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICpt b2RlID0gJmNydGNfc3RhdGUtPmJhc2UubW9kZTsKQEAgLTEyNjksMTMgKzEyNjgsMTMgQEAgc3Rh dGljIHZvaWQgaW50ZWxfc2R2b19wcmVfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRl bF9lbmNvZGVyLAogCQlyZXR1cm47CiAKIAkvKiBTZXQgdGhlIFNEVk8gY29udHJvbCByZWdzLiAq LwotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA0KSB7CisJaWYgKElOVEVMX0dFTihkZXZf cHJpdikgPj0gNCkgewogCQkvKiBUaGUgcmVhbCBtb2RlIHBvbGFyaXR5IGlzIHNldCBieSB0aGUg U0RWTyBjb21tYW5kcywgdXNpbmcKIAkJICogc3RydWN0IGludGVsX3Nkdm9fZHRkLiAqLwogCQlz ZHZveCA9IFNEVk9fVlNZTkNfQUNUSVZFX0hJR0ggfCBTRFZPX0hTWU5DX0FDVElWRV9ISUdIOwog CQlpZiAoIUhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpICYmIGNydGNfc3RhdGUtPmxpbWl0ZWRfY29s b3JfcmFuZ2UpCiAJCQlzZHZveCB8PSBIRE1JX0NPTE9SX1JBTkdFXzE2XzIzNTsKLQkJaWYgKElO VEVMX0lORk8oZGV2KS0+Z2VuIDwgNSkKKwkJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA1KQog CQkJc2R2b3ggfD0gU0RWT19CT1JERVJfRU5BQkxFOwogCX0gZWxzZSB7CiAJCXNkdm94ID0gSTkx NV9SRUFEKGludGVsX3Nkdm8tPnNkdm9fcmVnKTsKQEAgLTEyOTQsNyArMTI5Myw3IEBAIHN0YXRp YyB2b2lkIGludGVsX3Nkdm9fcHJlX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxf ZW5jb2RlciwKIAlpZiAoaW50ZWxfc2R2by0+aGFzX2hkbWlfYXVkaW8pCiAJCXNkdm94IHw9IFNE Vk9fQVVESU9fRU5BQkxFOwogCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDQpIHsKKwlp ZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA0KSB7CiAJCS8qIGRvbmUgaW4gY3J0Y19tb2RlX3Nl dCBhcyB0aGUgZHBsbF9tZCByZWcgbXVzdCBiZSB3cml0dGVuIGVhcmx5ICovCiAJfSBlbHNlIGlm IChJU19JOTQ1RyhkZXZfcHJpdikgfHwgSVNfSTk0NUdNKGRldl9wcml2KSB8fAogCQkgICBJU19H MzMoZGV2X3ByaXYpKSB7CkBAIC0xMzA1LDcgKzEzMDQsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9z ZHZvX3ByZV9lbmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIsCiAJfQog CiAJaWYgKGlucHV0X2R0ZC5wYXJ0Mi5zZHZvX2ZsYWdzICYgU0RWT19ORUVEX1RPX1NUQUxMICYm Ci0JICAgIElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgNSkKKwkgICAgSU5URUxfR0VOKGRldl9wcml2 KSA8IDUpCiAJCXNkdm94IHw9IFNEVk9fU1RBTExfU0VMRUNUOwogCWludGVsX3Nkdm9fd3JpdGVf c2R2b3goaW50ZWxfc2R2bywgc2R2b3gpOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfdHYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3R2LmMKaW5kZXgg OTIxMmYwMGQ1NzUyLi43OGNkZmM2ODMzZDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3R2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdHYuYwpAQCAt MTAyOSw4ICsxMDI5LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfdHZfcHJlX2VuYWJsZShzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlw ZV9jb25maWcsCiAJCQkJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUpCiB7 Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuY29kZXItPmJhc2UuZGV2OwotCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsKIAlzdHJ1 Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoZW5jb2Rlci0+YmFzZS5j cnRjKTsKIAlzdHJ1Y3QgaW50ZWxfdHYgKmludGVsX3R2ID0gZW5jX3RvX3R2KGVuY29kZXIpOwog CWNvbnN0IHN0cnVjdCB0dl9tb2RlICp0dl9tb2RlID0gaW50ZWxfdHZfbW9kZV9maW5kKGludGVs X3R2KTsKQEAgLTExMTYsNyArMTExNSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3R2X3ByZV9lbmFi bGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAKIAlzZXRfY29sb3JfY29udmVyc2lv bihkZXZfcHJpdiwgY29sb3JfY29udmVyc2lvbik7CiAKLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5n ZW4gPj0gNCkKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA0KQogCQlJOTE1X1dSSVRFKFRW X0NMUl9LTk9CUywgMHgwMDQwNDAwMCk7CiAJZWxzZQogCQlJOTE1X1dSSVRFKFRWX0NMUl9LTk9C UywgMHgwMDYwNjAwMCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91 bmNvcmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCmluZGV4IGUyYjE4 OGRjZjkwOC4uNzExMWU3ODYyZjVmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF91bmNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwpA QCAtMTM2OCw3ICsxMzY4LDcgQEAgaW50IGk5MTVfcmVnX3JlYWRfaW9jdGwoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAogCWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKHdoaXRlbGlzdCk7IGkr KywgZW50cnkrKykgewogCQlpZiAoaTkxNV9tbWlvX3JlZ19vZmZzZXQoZW50cnktPm9mZnNldF9s ZHcpID09IChyZWctPm9mZnNldCAmIC1lbnRyeS0+c2l6ZSkgJiYKLQkJICAgIChJTlRFTF9JTkZP KGRldiktPmdlbl9tYXNrICYgZW50cnktPmdlbl9iaXRtYXNrKSkKKwkJICAgIChJTlRFTF9JTkZP KGRldl9wcml2KS0+Z2VuX21hc2sgJiBlbnRyeS0+Z2VuX2JpdG1hc2spKQogCQkJYnJlYWs7CiAJ fQogCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==