From: Maarten Lankhorst Subject: [PATCH] drm/i915: Keep IPS disabled during CRC collection Date: Thu, 10 Aug 2017 11:54:38 +0200 Message-ID: <20170810095438.18581-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2B2D989C84 for ; Thu, 10 Aug 2017 09:54:47 +0000 (UTC) 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 V2UgbmVlZCB0byBsb29rIGF0IGNydGMtPnN0YXRlLT5hY3RpdmUgZm9yIHRoZSBsZWdhY3kgY3Jj IHRvIG1hdGNoCnRoZSBkcm0gY3JjIGFwaS4gRXZlbiB0aG91Z2ggdGhlIGRybSBhcGkgZXhwbGlj dGlseSBjaGVja3MgaXQsIHRoZXJlJ3MKbm8gaGFybSBpbiBkb2luZyB0aGUgc2FtZSB0aGVyZSBz byBrZWVwIGl0IGZvciBib3RoLgoKSW50cm9kdWNlIGEgaW50ZWxfY3J0Yy0+aXBzX2Rpc2FibGVk IGZsYWcgZm9yIENSQywgd2hpY2ggaXMgcHJvdGVjdGVkCmJ5IGNydGMtPm11dGV4IGFuZCBzZXQg aXQgdG8gdHJ1ZSB3aGlsZSBjb2xsZWN0aW5nLiBUaGlzIHdheSBDUkMgd2lsbApub3QgaW50ZXJm ZXJlIHdpdGggaXBzLCByZWdhcmRsZXNzIG9mIHZpc2liaWxpdHkuCgpCdWd6aWxsYTogaHR0cHM6 Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxNjY0ClNpZ25lZC1vZmYt Ynk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jICB8IDQ1ICsrKysrKysr KysrKystLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAg ICB8ICAzICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9waXBlX2NyYy5jIHwgNTggKysr KysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgNzEgaW5z ZXJ0aW9ucygrKSwgMzUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCmluZGV4IGE4Nzc1ZWQ4MTdkMS4uODhkZmI0YmQ4ZGIwIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCkBAIC0xMTcsNyArMTE3LDggQEAgc3RhdGljIHZvaWQgaXJvbmxha2Vf cGZpdF9kaXNhYmxlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLCBib29sIGZvcmNlKTsKIHN0YXRp YyB2b2lkIGlyb25sYWtlX3BmaXRfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKTsKIHN0 YXRpYyB2b2lkIGludGVsX21vZGVzZXRfc2V0dXBfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKIAkJCQkJIHN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCAqY3R4KTsKLXN0YXRp YyB2b2lkIGludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnlfbm9hdG9taWMoc3RydWN0IGRybV9jcnRj ICpjcnRjKTsKK3N0YXRpYyB2b2lkIGludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnlfbm9hdG9taWMo c3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJCQkgICAgICAgc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKnBpcGVfY29uZmlnKTsKIAogc3RydWN0IGludGVsX2xpbWl0IHsKIAlzdHJ1Y3QgewpAQCAt MjcyMyw3ICsyNzI0LDggQEAgaW50ZWxfZmluZF9pbml0aWFsX3BsYW5lX29iaihzdHJ1Y3QgaW50 ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAlpbnRlbF9zZXRfcGxhbmVfdmlzaWJsZSh0b19pbnRlbF9j cnRjX3N0YXRlKGNydGNfc3RhdGUpLAogCQkJCXRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lX3N0 YXRlKSwKIAkJCQlmYWxzZSk7Ci0JaW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeV9ub2F0b21pYygm aW50ZWxfY3J0Yy0+YmFzZSk7CisJaW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeV9ub2F0b21pYygm aW50ZWxfY3J0Yy0+YmFzZSwKKwkJCQkJICAgdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjX3N0YXRl KSk7CiAJdHJhY2VfaW50ZWxfZGlzYWJsZV9wbGFuZShwcmltYXJ5LCBpbnRlbF9jcnRjKTsKIAlp bnRlbF9wbGFuZS0+ZGlzYWJsZV9wbGFuZShpbnRlbF9wbGFuZSwgaW50ZWxfY3J0Yyk7CiAKQEAg LTQ2NjgsOSArNDY3MCw2IEBAIHZvaWQgaHN3X2VuYWJsZV9pcHMoc3RydWN0IGludGVsX2NydGMg KmNydGMpCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAotCWlmICghY3J0 Yy0+Y29uZmlnLT5pcHNfZW5hYmxlZCkKLQkJcmV0dXJuOwotCiAJLyoKIAkgKiBXZSBjYW4gb25s eSBlbmFibGUgSVBTIGFmdGVyIHdlIGVuYWJsZSBhIHBsYW5lIGFuZCB3YWl0IGZvciBhIHZibGFu awogCSAqIFRoaXMgZnVuY3Rpb24gaXMgY2FsbGVkIGZyb20gcG9zdF9wbGFuZV91cGRhdGUsIHdo aWNoIGlzIHJ1biBhZnRlcgpAQCAtNDcwNiw5ICs0NzA1LDYgQEAgdm9pZCBoc3dfZGlzYWJsZV9p cHMoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNy dGMtPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoZGV2KTsKIAotCWlmICghY3J0Yy0+Y29uZmlnLT5pcHNfZW5hYmxlZCkKLQkJcmV0dXJuOwot CiAJYXNzZXJ0X3BsYW5lX2VuYWJsZWQoZGV2X3ByaXYsIGNydGMtPnBsYW5lKTsKIAlpZiAoSVNf QlJPQURXRUxMKGRldl9wcml2KSkgewogCQltdXRleF9sb2NrKCZkZXZfcHJpdi0+cnBzLmh3X2xv Y2spOwpAQCAtNDc1NCw3ICs0NzUwLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kcG1zX292 ZXJsYXlfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YykKICAqIGNvbXBsZXRl bHkgaGlkZSB0aGUgcHJpbWFyeSBwbGFuZS4KICAqLwogc3RhdGljIHZvaWQKLWludGVsX3Bvc3Rf ZW5hYmxlX3ByaW1hcnkoc3RydWN0IGRybV9jcnRjICpjcnRjKQoraW50ZWxfcG9zdF9lbmFibGVf cHJpbWFyeShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpw aXBlX2NvbmZpZykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKQEAgLTQ3Njcs NyArNDc2Myw4IEBAIGludGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoc3RydWN0IGRybV9jcnRjICpj cnRjKQogCSAqIHdoZW4gZ29pbmcgZnJvbSBwcmltYXJ5IG9ubHkgdG8gc3ByaXRlIG9ubHkgYW5k IHZpY2UKIAkgKiB2ZXJzYS4KIAkgKi8KLQloc3dfZW5hYmxlX2lwcyhpbnRlbF9jcnRjKTsKKwlp ZiAocGlwZV9jb25maWctPmlwc19lbmFibGVkICYmICFpbnRlbF9jcnRjLT5pcHNfZGlzYWJsZWQp CisJCWhzd19lbmFibGVfaXBzKGludGVsX2NydGMpOwogCiAJLyoKIAkgKiBHZW4yIHJlcG9ydHMg cGlwZSB1bmRlcnJ1bnMgd2hlbmV2ZXIgYWxsIHBsYW5lcyBhcmUgZGlzYWJsZWQuCkBAIC00Nzg2 LDcgKzQ3ODMsNyBAQCBpbnRlbF9wb3N0X2VuYWJsZV9wcmltYXJ5KHN0cnVjdCBkcm1fY3J0YyAq Y3J0YykKIAogLyogRklYTUUgbW92ZSBhbGwgdGhpcyB0byBwcmVfcGxhbmVfdXBkYXRlKCkgd2l0 aCBwcm9wZXIgc3RhdGUgdHJhY2tpbmcgKi8KIHN0YXRpYyB2b2lkCi1pbnRlbF9wcmVfZGlzYWJs ZV9wcmltYXJ5KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK2ludGVsX3ByZV9kaXNhYmxlX3ByaW1h cnkoc3RydWN0IGRybV9jcnRjICpjcnRjLCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9j b25maWcpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CkBAIC00ODA4LDE5ICs0 ODA1LDIwIEBAIGludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnkoc3RydWN0IGRybV9jcnRjICpjcnRj KQogCSAqIHdoZW4gZ29pbmcgZnJvbSBwcmltYXJ5IG9ubHkgdG8gc3ByaXRlIG9ubHkgYW5kIHZp Y2UKIAkgKiB2ZXJzYS4KIAkgKi8KLQloc3dfZGlzYWJsZV9pcHMoaW50ZWxfY3J0Yyk7CisJaWYg KHBpcGVfY29uZmlnLT5pcHNfZW5hYmxlZCkKKwkJaHN3X2Rpc2FibGVfaXBzKGludGVsX2NydGMp OwogfQogCiAvKiBGSVhNRSBnZXQgcmlkIG9mIHRoaXMgYW5kIHVzZSBwcmVfcGxhbmVfdXBkYXRl ICovCiBzdGF0aWMgdm9pZAotaW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeV9ub2F0b21pYyhzdHJ1 Y3QgZHJtX2NydGMgKmNydGMpCitpbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5X25vYXRvbWljKHN0 cnVjdCBkcm1fY3J0YyAqY3J0Yywgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmln KQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBpbnRlbF9jcnRj ICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlpbnQgcGlwZSA9IGludGVsX2Ny dGMtPnBpcGU7CiAKLQlpbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5KGNydGMpOworCWludGVsX3By ZV9kaXNhYmxlX3ByaW1hcnkoY3J0YywgcGlwZV9jb25maWcpOwogCiAJLyoKIAkgKiBWYmxhbmsg dGltZSB1cGRhdGVzIGZyb20gdGhlIHNoYWRvdyB0byBsaXZlIHBsYW5lIGNvbnRyb2wgcmVnaXN0 ZXIKQEAgLTQ4NTgsNyArNDg1Niw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3Bvc3RfcGxhbmVfdXBk YXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIAkJaWYgKG5ld19w cmltYXJ5X3N0YXRlLT52aXNpYmxlICYmCiAJCSAgICAobmVlZHNfbW9kZXNldCgmcGlwZV9jb25m aWctPmJhc2UpIHx8CiAJCSAgICAgIW9sZF9wcmltYXJ5X3N0YXRlLT52aXNpYmxlKSkKLQkJCWlu dGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoJmNydGMtPmJhc2UpOworCQkJaW50ZWxfcG9zdF9lbmFi bGVfcHJpbWFyeSgmY3J0Yy0+YmFzZSwgcGlwZV9jb25maWcpOwogCX0KIH0KIApAQCAtNDg4NSw3 ICs0ODgzLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCiAKIAkJaWYgKG9sZF9wcmltYXJ5X3N0YXRl LT52aXNpYmxlICYmCiAJCSAgICAobW9kZXNldCB8fCAhbmV3X3ByaW1hcnlfc3RhdGUtPnZpc2li bGUpKQotCQkJaW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeSgmY3J0Yy0+YmFzZSk7CisJCQlpbnRl bF9wcmVfZGlzYWJsZV9wcmltYXJ5KCZjcnRjLT5iYXNlLCBwaXBlX2NvbmZpZyk7CiAJfQogCiAJ LyoKQEAgLTU3MDAsMTMgKzU2OTgsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9jcnRjX2Rpc2FibGVf bm9hdG9taWMoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCWlmICghaW50ZWxfY3J0Yy0+YWN0aXZl KQogCQlyZXR1cm47CiAKLQlpZiAoY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPnZpc2libGUpIHsKLQkJ aW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeV9ub2F0b21pYyhjcnRjKTsKLQotCQlpbnRlbF9jcnRj X2Rpc2FibGVfcGxhbmVzKGNydGMsIDEgPDwgZHJtX3BsYW5lX2luZGV4KGNydGMtPnByaW1hcnkp KTsKLQkJY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPnZpc2libGUgPSBmYWxzZTsKLQl9Ci0KIAlzdGF0 ZSA9IGRybV9hdG9taWNfc3RhdGVfYWxsb2MoY3J0Yy0+ZGV2KTsKIAlpZiAoIXN0YXRlKSB7CiAJ CURSTV9ERUJVR19LTVMoImZhaWxlZCB0byBkaXNhYmxlIFtDUlRDOiVkOiVzXSwgb3V0IG9mIG1l bW9yeSIsCkBAIC01NzIyLDYgKzU3MTMsMTQgQEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kaXNh YmxlX25vYXRvbWljKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAogCVdBUk5fT04oSVNfRVJSKGNy dGNfc3RhdGUpIHx8IHJldCk7CiAKKwlpZiAoY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPnZpc2libGUp IHsKKwkJaW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeV9ub2F0b21pYyhjcnRjLCBjcnRjX3N0YXRl KTsKKworCQlpbnRlbF9jcnRjX2Rpc2FibGVfcGxhbmVzKGNydGMsIDEgPDwgZHJtX3BsYW5lX2lu ZGV4KGNydGMtPnByaW1hcnkpKTsKKwkJY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPnZpc2libGUgPSBm YWxzZTsKKwl9CisKKwogCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZGlzYWJsZShjcnRjX3N0YXRl LCBzdGF0ZSk7CiAKIAlkcm1fYXRvbWljX3N0YXRlX3B1dChzdGF0ZSk7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oCmluZGV4IGEwN2QwNmZiYzRiNC4uODcyYjFmY2UxZDBlIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaApAQCAtODI4LDYgKzgyOCw5IEBAIHN0cnVjdCBpbnRlbF9jcnRjIHsKIAli b29sIGNwdV9maWZvX3VuZGVycnVuX2Rpc2FibGVkOwogCWJvb2wgcGNoX2ZpZm9fdW5kZXJydW5f ZGlzYWJsZWQ7CiAKKwkvKiBXaGV0aGVyIGlwcyBpcyBmb3JjZS1kaXNhYmxlZCBmb3IgY29sbGVj dGluZyBDUkMgKi8KKwlib29sIGlwc19kaXNhYmxlZDsKKwogCS8qIHBlci1waXBlIHdhdGVybWFy ayBzdGF0ZSAqLwogCXN0cnVjdCB7CiAJCS8qIHdhdGVybWFya3MgY3VycmVudGx5IGJlaW5nIHVz ZWQgICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9waXBlX2NyYy5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcGlwZV9jcmMuYwppbmRleCA4ZmJkMmJkMDg3 N2YuLmZjMzY4MmM0YzA1NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cGlwZV9jcmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9waXBlX2NyYy5jCkBA IC02MDEsNiArNjAxLDMzIEBAIHN0YXRpYyBpbnQgZ2V0X25ld19jcmNfY3RsX3JlZyhzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCXJldHVybiBpdmJfcGlwZV9jcmNfY3RsX3Jl ZyhkZXZfcHJpdiwgcGlwZSwgc291cmNlLCB2YWwpOwogfQogCitzdGF0aWMgaW50IHRvZ2dsZV9p cHNfYW5kX3Rlc3RfYWN0aXZlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAorCQkJCQkgICAgICBi b29sIGhhc19zb3VyY2UpCit7CisJYm9vbCBoYXNfaXBzID0gZmFsc2U7CisJaW50IHJldDsKKwor CisJcmV0ID0gZHJtX21vZGVzZXRfbG9ja19pbnRlcnJ1cHRpYmxlKCZjcnRjLT5iYXNlLm11dGV4 LCBOVUxMKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJaWYgKHRvX2ludGVsX2NydGNf c3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSktPmlwc19lbmFibGVkICYmCisJICAgIGNydGMtPmJhc2Uu c3RhdGUtPnBsYW5lX21hc2sgJiBCSVQoZHJtX3BsYW5lX2luZGV4KGNydGMtPmJhc2UucHJpbWFy eSkpKQorCQloYXNfaXBzID0gY3J0Yy0+YmFzZS5wcmltYXJ5LT5zdGF0ZS0+dmlzaWJsZTsKKwor CWlmICghY3J0Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlICYmIGhhc19zb3VyY2UpIHsKKwkJRFJNX0RF QlVHX0tNUygiVHJ5aW5nIHRvIGNhcHR1cmUgQ1JDIHdoaWxlIHBpcGUgaXMgb2ZmXG4iKTsKKwkJ cmV0ID0gLUVJTzsKKwl9CisKKwljcnRjLT5pcHNfZGlzYWJsZWQgPSBoYXNfc291cmNlOworCisJ ZHJtX21vZGVzZXRfdW5sb2NrKCZjcnRjLT5iYXNlLm11dGV4KTsKKworCXJldHVybiByZXQgPzog aGFzX2lwczsKK30KKwogc3RhdGljIGludCBwaXBlX2NyY19zZXRfc291cmNlKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgICAgICBlbnVtIHBpcGUgcGlwZSwKIAkJCSAg ICAgICBlbnVtIGludGVsX3BpcGVfY3JjX3NvdXJjZSBzb3VyY2UpCkBAIC02MTAsNiArNjM3LDcg QEAgc3RhdGljIGludCBwaXBlX2NyY19zZXRfc291cmNlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAllbnVtIGludGVsX2Rpc3BsYXlfcG93ZXJfZG9tYWluIHBvd2VyX2RvbWFp bjsKIAl1MzIgdmFsID0gMDsgLyogc2h1dCB1cCBnY2MgKi8KIAlpbnQgcmV0OworCWludCBoYXNf aXBzOwogCiAJaWYgKHBpcGVfY3JjLT5zb3VyY2UgPT0gc291cmNlKQogCQlyZXR1cm4gMDsKQEAg LTYxOCwxMSArNjQ2LDEyIEBAIHN0YXRpYyBpbnQgcGlwZV9jcmNfc2V0X3NvdXJjZShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJaWYgKHBpcGVfY3JjLT5zb3VyY2UgJiYgc291 cmNlKQogCQlyZXR1cm4gLUVJTlZBTDsKIAorCWhhc19pcHMgPSB0b2dnbGVfaXBzX2FuZF90ZXN0 X2FjdGl2ZShjcnRjLCBzb3VyY2UpOworCWlmIChoYXNfaXBzIDwgMCkKKwkJcmV0dXJuIGhhc19p cHM7CisKIAlwb3dlcl9kb21haW4gPSBQT1dFUl9ET01BSU5fUElQRShwaXBlKTsKLQlpZiAoIWlu dGVsX2Rpc3BsYXlfcG93ZXJfZ2V0X2lmX2VuYWJsZWQoZGV2X3ByaXYsIHBvd2VyX2RvbWFpbikp IHsKLQkJRFJNX0RFQlVHX0tNUygiVHJ5aW5nIHRvIGNhcHR1cmUgQ1JDIHdoaWxlIHBpcGUgaXMg b2ZmXG4iKTsKLQkJcmV0dXJuIC1FSU87Ci0JfQorCWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KGRl dl9wcml2LCBwb3dlcl9kb21haW4pOwogCiAJcmV0ID0gZ2V0X25ld19jcmNfY3RsX3JlZyhkZXZf cHJpdiwgcGlwZSwgJnNvdXJjZSwgJnZhbCk7CiAJaWYgKHJldCAhPSAwKQpAQCAtNjQ5LDcgKzY3 OCw4IEBAIHN0YXRpYyBpbnQgcGlwZV9jcmNfc2V0X3NvdXJjZShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCiAJCSAqIHVzZXIgc3BhY2UgY2FuJ3QgbWFrZSByZWxpYWJsZSB1c2Ug b2YgdGhlIENSQ3MsIHNvIGxldCdzIGp1c3QKIAkJICogY29tcGxldGVseSBkaXNhYmxlIGl0Lgog CQkgKi8KLQkJaHN3X2Rpc2FibGVfaXBzKGNydGMpOworCQlpZiAoaGFzX2lwcykKKwkJCWhzd19k aXNhYmxlX2lwcyhjcnRjKTsKIAogCQlzcGluX2xvY2tfaXJxKCZwaXBlX2NyYy0+bG9jayk7CiAJ CWtmcmVlKHBpcGVfY3JjLT5lbnRyaWVzKTsKQEAgLTY5NCw3ICs3MjQsOCBAQCBzdGF0aWMgaW50 IHBpcGVfY3JjX3NldF9zb3VyY2Uoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAog CQllbHNlIGlmIChJU19IQVNXRUxMKGRldl9wcml2KSAmJiBwaXBlID09IFBJUEVfQSkKIAkJCWhz d190cmFuc19lZHBfcGlwZV9BX2NyY193YShkZXZfcHJpdiwgZmFsc2UpOwogCi0JCWhzd19lbmFi bGVfaXBzKGNydGMpOworCQlpZiAoaGFzX2lwcykKKwkJCWhzd19lbmFibGVfaXBzKGNydGMpOwog CX0KIAogCXJldCA9IDA7CkBAIC05MTksMjMgKzk1MCwyNSBAQCBpbnQgaW50ZWxfY3J0Y19zZXRf Y3JjX3NvdXJjZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIGNvbnN0IGNoYXIgKnNvdXJjZV9uYW1l LAogCWVudW0gaW50ZWxfcGlwZV9jcmNfc291cmNlIHNvdXJjZTsKIAl1MzIgdmFsID0gMDsgLyog c2h1dCB1cCBnY2MgKi8KIAlpbnQgcmV0ID0gMDsKKwlpbnQgaGFzX2lwczsKIAogCWlmIChkaXNw bGF5X2NyY19jdGxfcGFyc2Vfc291cmNlKHNvdXJjZV9uYW1lLCAmc291cmNlKSA8IDApIHsKIAkJ RFJNX0RFQlVHX0RSSVZFUigidW5rbm93biBzb3VyY2UgJXNcbiIsIHNvdXJjZV9uYW1lKTsKIAkJ cmV0dXJuIC1FSU5WQUw7CiAJfQogCisJaGFzX2lwcyA9IHRvZ2dsZV9pcHNfYW5kX3Rlc3RfYWN0 aXZlKGludGVsX2NydGMsIHNvdXJjZSk7CisJaWYgKGhhc19pcHMgPCAwKQorCQlyZXR1cm4gaGFz X2lwczsKKwogCXBvd2VyX2RvbWFpbiA9IFBPV0VSX0RPTUFJTl9QSVBFKGNydGMtPmluZGV4KTsK LQlpZiAoIWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0X2lmX2VuYWJsZWQoZGV2X3ByaXYsIHBvd2Vy X2RvbWFpbikpIHsKLQkJRFJNX0RFQlVHX0tNUygiVHJ5aW5nIHRvIGNhcHR1cmUgQ1JDIHdoaWxl IHBpcGUgaXMgb2ZmXG4iKTsKLQkJcmV0dXJuIC1FSU87Ci0JfQorCWludGVsX2Rpc3BsYXlfcG93 ZXJfZ2V0KGRldl9wcml2LCBwb3dlcl9kb21haW4pOwogCiAJcmV0ID0gZ2V0X25ld19jcmNfY3Rs X3JlZyhkZXZfcHJpdiwgY3J0Yy0+aW5kZXgsICZzb3VyY2UsICZ2YWwpOwogCWlmIChyZXQgIT0g MCkKIAkJZ290byBvdXQ7CiAKLQlpZiAoc291cmNlKSB7CisJaWYgKHNvdXJjZSAmJiBoYXNfaXBz KSB7CiAJCS8qCiAJCSAqIFdoZW4gSVBTIGdldHMgZW5hYmxlZCwgdGhlIHBpcGUgQ1JDIGNoYW5n ZXMuIFNpbmNlIElQUyBnZXRzCiAJCSAqIGVuYWJsZWQgYW5kIGRpc2FibGVkIGR5bmFtaWNhbGx5 IGJhc2VkIG9uIHBhY2thZ2UgQyBzdGF0ZXMsCkBAIC05NTYsNyArOTg5LDggQEAgaW50IGludGVs X2NydGNfc2V0X2NyY19zb3VyY2Uoc3RydWN0IGRybV9jcnRjICpjcnRjLCBjb25zdCBjaGFyICpz b3VyY2VfbmFtZSwKIAkJZWxzZSBpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgJiYgY3J0Yy0+aW5k ZXggPT0gUElQRV9BKQogCQkJaHN3X3RyYW5zX2VkcF9waXBlX0FfY3JjX3dhKGRldl9wcml2LCBm YWxzZSk7CiAKLQkJaHN3X2VuYWJsZV9pcHMoaW50ZWxfY3J0Yyk7CisJCWlmIChoYXNfaXBzKQor CQkJaHN3X2VuYWJsZV9pcHMoaW50ZWxfY3J0Yyk7CiAJfQogCiAJcGlwZV9jcmMtPnNraXBwZWQg PSAwOwotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK