From: Arun Siluvery Subject: [PATCH v2 03/11] drm/i915: Update reset path to fix incomplete requests Date: Fri, 5 Aug 2016 17:29:59 +0100 Message-ID: <1470414607-32453-4-git-send-email-arun.siluvery@linux.intel.com> References: <1470414607-32453-1-git-send-email-arun.siluvery@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 96D2A6EBE2 for ; Fri, 5 Aug 2016 16:30:26 +0000 (UTC) In-Reply-To: <1470414607-32453-1-git-send-email-arun.siluvery@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 Cc: Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpVcGRhdGUgcmVz ZXQgcGF0aCBpbiBwcmVwYXJhdGlvbiBmb3IgZW5naW5lIHJlc2V0IHdoaWNoIHJlcXVpcmVzCmlk ZW50aWZpY2F0aW9uIG9mIGluY29tcGxldGUgcmVxdWVzdHMgYW5kIGFzc29jaWF0ZWQgY29udGV4 dCBhbmQgZml4aW5nCnRoZWlyIHN0YXRlIHNvIHRoYXQgZW5naW5lIGNhbiByZXN1bWUgY29ycmVj dGx5IGFmdGVyIHJlc2V0LgoKVGhlIHJlcXVlc3QgdGhhdCBjYXVzZWQgdGhlIGhhbmcgd2lsbCBi ZSBza2lwcGVkIGFuZCBoZWFkIGlzIHJlc2V0IHRvIHRoZQpzdGFydCBvZiBicmVhZGNydW1iLiBU aGlzIGFsbG93cyB1cyB0byByZXN1bWUgZnJvbSB3aGVyZSB3ZSBsZWZ0LW9mZi4KU2luY2UgdGhp cyByZXF1ZXN0IGRpZG4ndCBjb21wbGV0ZSBub3JtYWxseSB3ZSBhbHNvIG5lZWQgdG8gY2xlYW51 cCBlbHNwCnF1ZXVlIG1hbnVhbGx5LgoKQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxp bkBpbnRlbC5jb20+CkNjOiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGludGVsLmNvbT4K Q2M6IEFydW4gU2lsdXZlcnkgPGFydW4uc2lsdXZlcnlAbGludXguaW50ZWwuY29tPgpTaWduZWQt b2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jICAgICAgICAgfCAgNCArLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMgICAgICAgICB8IDY4ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIHwgMTYgLS0tLS0tLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICB8IDM0ICsrKysrKysrKysr KysrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgfCAzMiArKysr KysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAg MiArCiA3IGZpbGVzIGNoYW5nZWQsIDEwNCBpbnNlcnRpb25zKCspLCA1NCBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCA4Y2ZjMjY0Li4wOWY3MzcyIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmMKQEAgLTE1NzgsNyArMTU3OCw3IEBAIHN0YXRpYyBpbnQgaTkxNV9kcm1f cmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3Rf bXV0ZXgpOwogCWlmIChpOTE1X2dlbV9pbml0X2h3KGRldikpIHsKIAkJRFJNX0VSUk9SKCJmYWls ZWQgdG8gcmUtaW5pdGlhbGl6ZSBHUFUsIGRlY2xhcmluZyB3ZWRnZWQhXG4iKTsKLQkJYXRvbWlj X29yKEk5MTVfV0VER0VELCAmZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNldF9jb3VudGVyKTsKKwkJ aTkxNV9nZW1fc2V0X3dlZGdlZChkZXZfcHJpdik7CiAJfQogCW11dGV4X3VubG9jaygmZGV2LT5z dHJ1Y3RfbXV0ZXgpOwogCkBAIC0xODAyLDcgKzE4MDIsNyBAQCBpbnQgaTkxNV9yZXNldChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJcmV0dXJuIDA7CiAKIGVycm9yOgotCWF0 b21pY19vcihJOTE1X1dFREdFRCwgJmVycm9yLT5yZXNldF9jb3VudGVyKTsKKwlpOTE1X2dlbV9z ZXRfd2VkZ2VkKGRldl9wcml2KTsKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsK IAlyZXR1cm4gcmV0OwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMDQwYzNiNi4uZmEx YjZlNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0zMjQ1LDYgKzMyNDUsNyBAQCBzdGF0 aWMgaW5saW5lIHUzMiBpOTE1X3Jlc2V0X2NvdW50KHN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJy b3IpCiB9CiAKIHZvaWQgaTkxNV9nZW1fcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Cit2 b2lkIGk5MTVfZ2VtX3NldF93ZWRnZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KTsKIGJvb2wgaTkxNV9nZW1fY2xmbHVzaF9vYmplY3Qoc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKm9iaiwgYm9vbCBmb3JjZSk7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX2luaXQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX2luaXRfaHco c3RydWN0IGRybV9kZXZpY2UgKmRldik7CkBAIC0zMzY0LDcgKzMzNjUsNiBAQCB2b2lkIGk5MTVf Z2VtX29iamVjdF9zYXZlX2JpdF8xN19zd2l6emxlKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpvYmopOwogaW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9jb250ZXh0X2luaXQoc3RydWN0IGRy bV9kZXZpY2UgKmRldik7CiB2b2lkIGk5MTVfZ2VtX2NvbnRleHRfbG9zdChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpOTE1X2dlbV9jb250ZXh0X2Zpbmkoc3RydWN0 IGRybV9kZXZpY2UgKmRldik7Ci12b2lkIGk5MTVfZ2VtX2NvbnRleHRfcmVzZXQoc3RydWN0IGRy bV9kZXZpY2UgKmRldik7CiBpbnQgaTkxNV9nZW1fY29udGV4dF9vcGVuKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSk7CiB2b2lkIGk5MTVfZ2VtX2NvbnRleHRf Y2xvc2Uoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlKTsKIGlu dCBpOTE1X3N3aXRjaF9jb250ZXh0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDE5NzE1ZjUuLmQ0YmNmODggMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYwpAQCAtMjQwMiwyMyArMjQwMiw2MSBAQCBpOTE1X2dlbV9maW5kX2FjdGl2 ZV9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlyZXR1cm4gTlVMTDsK IH0KIAotc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVzZXRfZW5naW5lX3N0YXR1cyhzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUpCitzdGF0aWMgdm9pZCBpOTE1X2dlbV9yZXNldF9lbmdpbmUo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewogCXN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxdWVzdDsKKwlzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqaW5jb21wbGV0ZV9j dHg7CiAJYm9vbCByaW5nX2h1bmc7CiAKKwkvKiBFbnN1cmUgaXJxIGhhbmRsZXIgZmluaXNoZXMg b3IgaXMgY2FuY2VsbGVkLiAqLworCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMpCisJCXRhc2ts ZXRfa2lsbCgmZW5naW5lLT5pcnFfdGFza2xldCk7CisKIAlyZXF1ZXN0ID0gaTkxNV9nZW1fZmlu ZF9hY3RpdmVfcmVxdWVzdChlbmdpbmUpOwotCWlmIChyZXF1ZXN0ID09IE5VTEwpCisJaWYgKCFy ZXF1ZXN0KQogCQlyZXR1cm47CiAKIAlyaW5nX2h1bmcgPSBlbmdpbmUtPmhhbmdjaGVjay5zY29y ZSA+PSBIQU5HQ0hFQ0tfU0NPUkVfUklOR19IVU5HOwogCiAJaTkxNV9zZXRfcmVzZXRfc3RhdHVz KHJlcXVlc3QtPmN0eCwgcmluZ19odW5nKTsKLQlsaXN0X2Zvcl9lYWNoX2VudHJ5X2NvbnRpbnVl KHJlcXVlc3QsICZlbmdpbmUtPnJlcXVlc3RfbGlzdCwgbGluaykKKworCWVuZ2luZS0+cmVzZXRf aHcoZW5naW5lLCByZXF1ZXN0KTsKKworCWluY29tcGxldGVfY3R4ID0gcmVxdWVzdC0+Y3R4Owor CWlmIChpOTE1X2dlbV9jb250ZXh0X2lzX2RlZmF1bHQoaW5jb21wbGV0ZV9jdHgpKQorCQlpbmNv bXBsZXRlX2N0eCA9IE5VTEw7CisKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5X2NvbnRpbnVlKHJlcXVl c3QsICZlbmdpbmUtPnJlcXVlc3RfbGlzdCwgbGluaykgeworCQl2b2lkICp2YWRkciA9IHJlcXVl c3QtPnJpbmctPnZhZGRyOworCQl1MzIgaGVhZDsKKworCQlpZiAocmVxdWVzdC0+Y3R4ICE9IGlu Y29tcGxldGVfY3R4KQorCQkJY29udGludWU7CisKKwkJaGVhZCA9IHJlcXVlc3QtPmhlYWQ7CisJ CWlmIChyZXF1ZXN0LT5wb3N0Zml4IDwgaGVhZCkgeworCQkJbWVtc2V0KHZhZGRyICsgaGVhZCwg MCwgcmVxdWVzdC0+cmluZy0+c2l6ZSAtIGhlYWQpOworCQkJaGVhZCA9IDA7CisJCX0KKwkJbWVt c2V0KHZhZGRyICsgaGVhZCwgMCwgcmVxdWVzdC0+cG9zdGZpeCAtIGhlYWQpOworCiAJCWk5MTVf c2V0X3Jlc2V0X3N0YXR1cyhyZXF1ZXN0LT5jdHgsIGZhbHNlKTsKKwl9CiB9CiAKLXN0YXRpYyB2 b2lkIGk5MTVfZ2VtX3Jlc2V0X2VuZ2luZV9jbGVhbnVwKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSkKK3ZvaWQgaTkxNV9nZW1fcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sK KwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOworCisJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwg ZGV2X3ByaXYpCisJCWk5MTVfZ2VtX3Jlc2V0X2VuZ2luZShlbmdpbmUpOworCisJaTkxNV9nZW1f Y29udGV4dF9sb3N0KGRldl9wcml2KTsKKwlpOTE1X2dlbV9yZXN0b3JlX2ZlbmNlcyhkZXYpOwor fQorCitzdGF0aWMgdm9pZCBpOTE1X2dlbV9jbGVhbnVwX2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmUpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0 OwogCXN0cnVjdCBpbnRlbF9yaW5nICpyaW5nOwpAQCAtMjQ0MCw5ICsyNDc4LDYgQEAgc3RhdGlj IHZvaWQgaTkxNV9nZW1fcmVzZXRfZW5naW5lX2NsZWFudXAoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lKQogCSAqLwogCiAJaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cykgewotCQkvKiBF bnN1cmUgaXJxIGhhbmRsZXIgZmluaXNoZXMgb3IgaXMgY2FuY2VsbGVkLiAqLwotCQl0YXNrbGV0 X2tpbGwoJmVuZ2luZS0+aXJxX3Rhc2tsZXQpOwotCiAJCUlOSVRfTElTVF9IRUFEKCZlbmdpbmUt PmV4ZWNsaXN0X3F1ZXVlKTsKIAkJaTkxNV9nZW1fcmVxdWVzdF9hc3NpZ24oJmVuZ2luZS0+ZXhl Y2xpc3RfcG9ydFswXS5yZXF1ZXN0LAogCQkJCQlOVUxMKTsKQEAgLTI0NzYsMjYgKzI1MTEsMTUg QEAgc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVzZXRfZW5naW5lX2NsZWFudXAoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqZW5naW5lKQogCWVuZ2luZS0+aTkxNS0+Z3QuYWN0aXZlX2VuZ2luZXMgJj0g fmludGVsX2VuZ2luZV9mbGFnKGVuZ2luZSk7CiB9CiAKLXZvaWQgaTkxNV9nZW1fcmVzZXQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKK3ZvaWQgaTkxNV9nZW1fc2V0X3dlZGdlZChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsK IAotCS8qCi0JICogQmVmb3JlIHdlIGZyZWUgdGhlIG9iamVjdHMgZnJvbSB0aGUgcmVxdWVzdHMs IHdlIG5lZWQgdG8gaW5zcGVjdAotCSAqIHRoZW0gZm9yIGZpbmRpbmcgdGhlIGd1aWx0eSBwYXJ0 eS4gQXMgdGhlIHJlcXVlc3RzIG9ubHkgYm9ycm93Ci0JICogdGhlaXIgcmVmZXJlbmNlIHRvIHRo ZSBvYmplY3RzLCB0aGUgaW5zcGVjdGlvbiBtdXN0IGJlIGRvbmUgZmlyc3QuCi0JICovCi0JZm9y X2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYpCi0JCWk5MTVfZ2VtX3Jlc2V0X2VuZ2luZV9z dGF0dXMoZW5naW5lKTsKKwlhdG9taWNfb3IoSTkxNV9XRURHRUQsICZkZXZfcHJpdi0+Z3B1X2Vy cm9yLnJlc2V0X2NvdW50ZXIpOwogCiAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYp Ci0JCWk5MTVfZ2VtX3Jlc2V0X2VuZ2luZV9jbGVhbnVwKGVuZ2luZSk7CisJCWk5MTVfZ2VtX2Ns ZWFudXBfZW5naW5lKGVuZ2luZSk7CiAJbW9kX2RlbGF5ZWRfd29yayhkZXZfcHJpdi0+d3EsICZk ZXZfcHJpdi0+Z3QuaWRsZV93b3JrLCAwKTsKLQotCWk5MTVfZ2VtX2NvbnRleHRfcmVzZXQoZGV2 KTsKLQotCWk5MTVfZ2VtX3Jlc3RvcmVfZmVuY2VzKGRldik7CiB9CiAKIHN0YXRpYyB2b2lkCkBA IC00MzU2LDcgKzQzODAsNyBAQCBpbnQgaTkxNV9nZW1faW5pdChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogCQkgKiBmb3IgYWxsIG90aGVyIGZhaWx1cmUsIHN1Y2ggYXMgYW4gYWxsb2NhdGlvbiBm YWlsdXJlLCBiYWlsLgogCQkgKi8KIAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gaW5pdGlhbGl6ZSBH UFUsIGRlY2xhcmluZyBpdCB3ZWRnZWRcbiIpOwotCQlhdG9taWNfb3IoSTkxNV9XRURHRUQsICZk ZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIpOworCQlpOTE1X2dlbV9zZXRfd2VkZ2Vk KGRldl9wcml2KTsKIAkJcmV0ID0gMDsKIAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2NvbnRleHQuYwppbmRleCBiYjcyYWY1Li5hNWIzYmE0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fY29udGV4dC5jCkBAIC00MDUsMjIgKzQwNSw2IEBAIHN0YXRpYyB2b2lkIGk5MTVf Z2VtX2NvbnRleHRfdW5waW4oc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCwKIAl9CiB9CiAK LXZvaWQgaTkxNV9nZW1fY29udGV4dF9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQotewot CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQotCWxv Y2tkZXBfYXNzZXJ0X2hlbGQoJmRldi0+c3RydWN0X211dGV4KTsKLQotCWlmIChpOTE1LmVuYWJs ZV9leGVjbGlzdHMpIHsKLQkJc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eDsKLQotCQlsaXN0 X2Zvcl9lYWNoX2VudHJ5KGN0eCwgJmRldl9wcml2LT5jb250ZXh0X2xpc3QsIGxpbmspCi0JCQlp bnRlbF9scl9jb250ZXh0X3Jlc2V0KGRldl9wcml2LCBjdHgpOwotCX0KLQotCWk5MTVfZ2VtX2Nv bnRleHRfbG9zdChkZXZfcHJpdik7Ci19Ci0KIGludCBpOTE1X2dlbV9jb250ZXh0X2luaXQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IGUzNzZlZDMu LmVmZDM3NzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0xMTcxLDYgKzExNzEsNyBA QCBzdGF0aWMgaW50IGdlbjhfaW5pdF9jb21tb25fcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5l LT5pOTE1OwogCisJaW50ZWxfbW9jc19pbml0X2VuZ2luZShlbmdpbmUpOwogCWxyY19pbml0X2h3 cyhlbmdpbmUpOwogCiAJSTkxNV9XUklURV9JTVIoZW5naW5lLApAQCAtMTE4Niw3ICsxMTg3LDEw IEBAIHN0YXRpYyBpbnQgZ2VuOF9pbml0X2NvbW1vbl9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZSkKIAogCWludGVsX2VuZ2luZV9pbml0X2hhbmdjaGVjayhlbmdpbmUpOwogCi0J cmV0dXJuIGludGVsX21vY3NfaW5pdF9lbmdpbmUoZW5naW5lKTsKKwlpZiAoZW5naW5lLT5leGVj bGlzdF9wb3J0WzBdLnJlcXVlc3QpCisJCWV4ZWNsaXN0c19zdWJtaXRfcG9ydHMoZW5naW5lKTsK KworCXJldHVybiAwOwogfQogCiBzdGF0aWMgaW50IGdlbjhfaW5pdF9yZW5kZXJfcmluZyhzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCkBAIC0xMjIyLDYgKzEyMjYsMzMgQEAgc3RhdGlj IGludCBnZW45X2luaXRfcmVuZGVyX3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KQogCXJldHVybiBpbml0X3dvcmthcm91bmRzX3JpbmcoZW5naW5lKTsKIH0KIAorc3RhdGljIHZv aWQgcmVzZXRfY29tbW9uX3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAorCQkJ ICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQoreworCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+aTkxNTsKKwlzdHJ1Y3QgaTkxNV9n ZW1fY29udGV4dCAqY3R4ID0gcmVxdWVzdC0+Y3R4OworCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpj ZSA9ICZjdHgtPmVuZ2luZVtlbmdpbmUtPmlkXTsKKwl1MzIgKnJlZ19zdGF0ZTsKKworCXJlZ19z dGF0ZSA9IGNlLT5scmNfcmVnX3N0YXRlOworCXJlZ19zdGF0ZVtDVFhfUklOR19IRUFEKzFdID0g cmVxdWVzdC0+cG9zdGZpeDsKKworCXJlcXVlc3QtPnJpbmctPmhlYWQgPSByZXF1ZXN0LT5wb3N0 Zml4OworCXJlcXVlc3QtPnJpbmctPmxhc3RfcmV0aXJlZF9oZWFkID0gLTE7CisJaW50ZWxfcmlu Z191cGRhdGVfc3BhY2UocmVxdWVzdC0+cmluZyk7CisKKwlpZiAocmVxdWVzdCA9PSBlbmdpbmUt PmV4ZWNsaXN0X3BvcnRbMV0ucmVxdWVzdCkgeworCQlpOTE1X2dlbV9yZXF1ZXN0X3B1dChlbmdp bmUtPmV4ZWNsaXN0X3BvcnRbMF0ucmVxdWVzdCk7CisJCWVuZ2luZS0+ZXhlY2xpc3RfcG9ydFsw XSA9IGVuZ2luZS0+ZXhlY2xpc3RfcG9ydFsxXTsKKwkJbWVtc2V0KCZlbmdpbmUtPmV4ZWNsaXN0 X3BvcnRbMV0sIDAsCisJCSAgICAgICBzaXplb2YoZW5naW5lLT5leGVjbGlzdF9wb3J0WzFdKSk7 CisJfQorCisJZW5naW5lLT5leGVjbGlzdF9wb3J0WzBdLmNvdW50ID0gMDsKKworCUk5MTVfV1JJ VEUoUklOR19DT05URVhUX1NUQVRVU19QVFIoZW5naW5lKSwgX01BU0tFRF9GSUVMRCgweGZmZmYs IDApKTsKK30KKwogc3RhdGljIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfZW1pdF9wZHBzKHN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogewogCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpw cGd0dCA9IHJlcS0+Y3R4LT5wcGd0dDsKQEAgLTE1ODYsNiArMTYxNyw3IEBAIGxvZ2ljYWxfcmlu Z19kZWZhdWx0X3ZmdW5jcyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJLyog RGVmYXVsdCB2ZnVuY3Mgd2hpY2ggY2FuIGJlIG92ZXJyaWRlbiBieSBlYWNoIGVuZ2luZS4gKi8K IAllbmdpbmUtPmluaXRfaHcgPSBnZW44X2luaXRfY29tbW9uX3Jpbmc7CisJZW5naW5lLT5yZXNl dF9odyA9IHJlc2V0X2NvbW1vbl9yaW5nOwogCWVuZ2luZS0+ZW1pdF9mbHVzaCA9IGdlbjhfZW1p dF9mbHVzaDsKIAllbmdpbmUtPmVtaXRfcmVxdWVzdCA9IGdlbjhfZW1pdF9yZXF1ZXN0OwogCWVu Z2luZS0+c3VibWl0X3JlcXVlc3QgPSBleGVjbGlzdHNfc3VibWl0X3JlcXVlc3Q7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggZTA4YTFlMS4uY2Q2MGUxNSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtNTc3LDM0ICs1NzcsMzEg QEAgc3RhdGljIGludCBpbml0X3JpbmdfY29tbW9uKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSkKIAlpZiAoSTkxNV9SRUFEX0hFQUQoZW5naW5lKSkKIAkJRFJNX0RFQlVHKCIlcyBpbml0 aWFsaXphdGlvbiBmYWlsZWQgW2hlYWQ9JTA4eF0sIGZ1ZGdpbmdcbiIsCiAJCQkgIGVuZ2luZS0+ bmFtZSwgSTkxNV9SRUFEX0hFQUQoZW5naW5lKSk7Ci0JSTkxNV9XUklURV9IRUFEKGVuZ2luZSwg MCk7Ci0JKHZvaWQpSTkxNV9SRUFEX0hFQUQoZW5naW5lKTsKKwlJOTE1X1dSSVRFX0hFQUQoZW5n aW5lLCByaW5nLT5oZWFkKTsKKwlJOTE1X1dSSVRFX1RBSUwoZW5naW5lLCByaW5nLT50YWlsKTsK Kwkodm9pZClJOTE1X1JFQURfVEFJTChlbmdpbmUpOwogCiAJSTkxNV9XUklURV9DVEwoZW5naW5l LAogCQkJKChyaW5nLT5zaXplIC0gUEFHRV9TSVpFKSAmIFJJTkdfTlJfUEFHRVMpCiAJCQl8IFJJ TkdfVkFMSUQpOwogCiAJLyogSWYgdGhlIGhlYWQgaXMgc3RpbGwgbm90IHplcm8sIHRoZSByaW5n IGlzIGRlYWQgKi8KLQlpZiAod2FpdF9mb3IoKEk5MTVfUkVBRF9DVEwoZW5naW5lKSAmIFJJTkdf VkFMSUQpICE9IDAgJiYKLQkJICAgICBJOTE1X1JFQURfU1RBUlQoZW5naW5lKSA9PSBpOTE1X2dl bV9vYmpfZ2d0dF9vZmZzZXQob2JqKSAmJgotCQkgICAgIChJOTE1X1JFQURfSEVBRChlbmdpbmUp ICYgSEVBRF9BRERSKSA9PSAwLCA1MCkpIHsKKwlpZiAoaW50ZWxfd2FpdF9mb3JfcmVnaXN0ZXJf ZncoZGV2X3ByaXYsIFJJTkdfQ1RMKGVuZ2luZS0+bW1pb19iYXNlKSwKKwkJCQkgICAgICAgUklO R19WQUxJRCwgUklOR19WQUxJRCwKKwkJCQkgICAgICAgNTApKSB7CiAJCURSTV9FUlJPUigiJXMg aW5pdGlhbGl6YXRpb24gZmFpbGVkICIKLQkJCSAgImN0bCAlMDh4ICh2YWxpZD8gJWQpIGhlYWQg JTA4eCB0YWlsICUwOHggc3RhcnQgJTA4eCBbZXhwZWN0ZWQgJTA4bHhdXG4iLAorCQkJICAiY3Rs ICUwOHggKHZhbGlkPyAlZCkgaGVhZCAlMDh4IFslMDh4XSB0YWlsICUwOHggWyUwOHhdIHN0YXJ0 ICUwOHggW2V4cGVjdGVkICUwOGx4XVxuIiwKIAkJCSAgZW5naW5lLT5uYW1lLAogCQkJICBJOTE1 X1JFQURfQ1RMKGVuZ2luZSksCiAJCQkgIEk5MTVfUkVBRF9DVEwoZW5naW5lKSAmIFJJTkdfVkFM SUQsCi0JCQkgIEk5MTVfUkVBRF9IRUFEKGVuZ2luZSksIEk5MTVfUkVBRF9UQUlMKGVuZ2luZSks CisJCQkgIEk5MTVfUkVBRF9IRUFEKGVuZ2luZSksIHJpbmctPmhlYWQsCisJCQkgIEk5MTVfUkVB RF9UQUlMKGVuZ2luZSksIHJpbmctPnRhaWwsCiAJCQkgIEk5MTVfUkVBRF9TVEFSVChlbmdpbmUp LAogCQkJICAodW5zaWduZWQgbG9uZylpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQob2JqKSk7CiAJ CXJldCA9IC1FSU87CiAJCWdvdG8gb3V0OwogCX0KIAotCXJpbmctPmxhc3RfcmV0aXJlZF9oZWFk ID0gLTE7Ci0JcmluZy0+aGVhZCA9IEk5MTVfUkVBRF9IRUFEKGVuZ2luZSk7Ci0JcmluZy0+dGFp bCA9IEk5MTVfUkVBRF9UQUlMKGVuZ2luZSkgJiBUQUlMX0FERFI7Ci0JaW50ZWxfcmluZ191cGRh dGVfc3BhY2UocmluZyk7Ci0KIAlpbnRlbF9lbmdpbmVfaW5pdF9oYW5nY2hlY2soZW5naW5lKTsK IAogb3V0OgpAQCAtNjEzLDYgKzYxMCwxNiBAQCBvdXQ6CiAJcmV0dXJuIHJldDsKIH0KIAorc3Rh dGljIHZvaWQgcmVzZXRfcmluZ19jb21tb24oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l LAorCQkJICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQoreworCXN0 cnVjdCBpbnRlbF9yaW5nICpyaW5nID0gcmVxdWVzdC0+cmluZzsKKworCXJpbmctPmhlYWQgPSBy ZXF1ZXN0LT5wb3N0Zml4OworCXJpbmctPmxhc3RfcmV0aXJlZF9oZWFkID0gLTE7CisJaW50ZWxf cmluZ191cGRhdGVfc3BhY2UocmluZyk7Cit9CisKIHZvaWQgaW50ZWxfZmluaV9waXBlX2NvbnRy b2woc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewogCWlmIChlbmdpbmUtPnNjcmF0 Y2gub2JqID09IE5VTEwpCkBAIC0yNzQ4LDYgKzI3NTUsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9y aW5nX2RlZmF1bHRfdmZ1bmNzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlp bnRlbF9yaW5nX2luaXRfc2VtYXBob3JlcyhkZXZfcHJpdiwgZW5naW5lKTsKIAogCWVuZ2luZS0+ aW5pdF9odyA9IGluaXRfcmluZ19jb21tb247CisJZW5naW5lLT5yZXNldF9odyA9IHJlc2V0X3Jp bmdfY29tbW9uOwogCiAJZW5naW5lLT5lbWl0X3JlcXVlc3QgPSBpOXh4X2VtaXRfcmVxdWVzdDsK IAlpZiAoaTkxNS5zZW1hcGhvcmVzKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5oCmluZGV4IGRlM2NlYzguLjc4OWUwNGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmgKQEAgLTIwNCw2ICsyMDQsOCBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsK IAl2b2lkCQkoKmlycV9kaXNhYmxlKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwog CiAJaW50CQkoKmluaXRfaHcpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CisJdm9p ZAkJKCpyZXNldF9odykoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAorCQkJCSAgICBz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7CiAKIAlpbnQJCSgqaW5pdF9jb250ZXh0 KShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7CiAKLS0gCjEuOS4xCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK