From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [CI 09/21] drm/i915: Expand bool interruptible to pass flags to i915_wait_request() Date: Fri, 9 Sep 2016 12:00:49 +0100 Message-ID: <20160909110101.31967-9-chris@chris-wilson.co.uk> References: <20160909110101.31967-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6C6336E785 for ; Fri, 9 Sep 2016 11:01:16 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id b187so2222374wme.0 for ; Fri, 09 Sep 2016 04:01:16 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id kq2sm2786494wjc.41.2016.09.09.04.01.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Sep 2016 04:01:13 -0700 (PDT) In-Reply-To: <20160909110101.31967-1-chris@chris-wilson.co.uk> 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 V2UgbmVlZCBmaW5lciBjb250cm9sIG92ZXIgd2FrZXVwIGJlaGF2aW91ciBkdXJpbmcgaTkxNV93 YWl0X3JlcXVlc3QoKSwKc28gZXhwYW5kIHRoZSBjdXJyZW50IGJvb2wgaW50ZXJydXB0aWJsZSB0 byBhIGJpdG1hc2suCgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdp bHNvbi5jby51az4KUmV2aWV3ZWQtYnk6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVu QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMu YyAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICAg fCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgICB8IDE2ICsr KysrKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V2aWN0LmMgICAg fCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyAgICAgIHwgIDIg Ky0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYyAgfCAgOSArKysrKy0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuaCAgfCAxMyArKysrKysr LS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zaHJpbmtlci5jIHwgIDQgKyst LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fdXNlcnB0ci5jICB8ICAyICstCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICAgIHwgIDggKysrKy0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyAgfCAgMyArKy0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCAgfCAgNCArKy0tCiAxMiBmaWxlcyBjaGFuZ2Vk LCAzNyBpbnNlcnRpb25zKCspLCAzMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZGVidWdmcy5jCmluZGV4IDJhODBjZDFjOTM1MS4uNjIwZTdkYWExMzNiIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtNDgwMyw3ICs0ODAzLDcgQEAgaTkxNV9kcm9wX2NhY2hl c19zZXQodm9pZCAqZGF0YSwgdTY0IHZhbCkKIAkJcmV0dXJuIHJldDsKIAogCWlmICh2YWwgJiBE Uk9QX0FDVElWRSkgewotCQlyZXQgPSBpOTE1X2dlbV93YWl0X2Zvcl9pZGxlKGRldl9wcml2LCB0 cnVlKTsKKwkJcmV0ID0gaTkxNV9nZW1fd2FpdF9mb3JfaWRsZShkZXZfcHJpdiwgSTkxNV9XQUlU X0lOVEVSUlVQVElCTEUpOwogCQlpZiAocmV0KQogCQkJZ290byB1bmxvY2s7CiAJfQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKaW5kZXggZGNlZDdlNzJiNjI1Li4yMGI3NzQzZjhlYzUgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaApAQCAtMzI3MCw3ICszMjcwLDcgQEAgaW50IF9fbXVzdF9jaGVjayBp OTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBpOTE1X2dlbV9p bml0X3N3aXp6bGluZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgaTkxNV9nZW1fY2xl YW51cF9lbmdpbmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50IF9fbXVzdF9jaGVjayBp OTE1X2dlbV93YWl0X2Zvcl9pZGxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK LQkJCQkJYm9vbCBpbnRlcnJ1cHRpYmxlKTsKKwkJCQkJdW5zaWduZWQgaW50IGZsYWdzKTsKIGlu dCBfX211c3RfY2hlY2sgaTkxNV9nZW1fc3VzcGVuZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK IHZvaWQgaTkxNV9nZW1fcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50IGk5MTVf Z2VtX2ZhdWx0KHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hLCBzdHJ1Y3Qgdm1fZmF1bHQgKnZt Zik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA4N2E0ZjM1NDNmMGIuLjQ2MTcyNTBjMzAw MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0zODYsNyArMzg2LDggQEAgX191bnNhZmVf d2FpdF9yZW5kZXJpbmcoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJaW50IHJl dDsKIAogCQlyZXQgPSBpOTE1X2dlbV9hY3RpdmVfd2FpdF91bmxvY2tlZCgmYWN0aXZlW2lkeF0s Ci0JCQkJCQkgICAgdHJ1ZSwgTlVMTCwgcnBzKTsKKwkJCQkJCSAgICBJOTE1X1dBSVRfSU5URVJS VVBUSUJMRSwKKwkJCQkJCSAgICBOVUxMLCBycHMpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJl dDsKIAl9CkBAIC0yMDI2LDcgKzIwMjcsNyBAQCBzdGF0aWMgaW50IGk5MTVfZ2VtX29iamVjdF9j cmVhdGVfbW1hcF9vZmZzZXQoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAkgKiB0 byBjbGFpbSB0aGF0IHNwYWNlIGZvciBvdXJzZWx2ZXMsIHdlIG5lZWQgdG8gdGFrZSB0aGUgYmln CiAJICogc3RydWN0X211dGV4IHRvIGZyZWUgdGhlIHJlcXVlc3RzK29iamVjdHMgYW5kIGFsbG9j YXRlIG91ciBzbG90LgogCSAqLwotCWVyciA9IGk5MTVfZ2VtX3dhaXRfZm9yX2lkbGUoZGV2X3By aXYsIHRydWUpOworCWVyciA9IGk5MTVfZ2VtX3dhaXRfZm9yX2lkbGUoZGV2X3ByaXYsIEk5MTVf V0FJVF9JTlRFUlJVUFRJQkxFKTsKIAlpZiAoZXJyKQogCQlyZXR1cm4gZXJyOwogCkBAIC0yNzc5 LDcgKzI3ODAsOCBAQCBpOTE1X2dlbV93YWl0X2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHZvaWQgKmRhdGEsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKIAlhY3RpdmUgPSBfX0k5MTVfQk9f QUNUSVZFKG9iaik7CiAJZm9yX2VhY2hfYWN0aXZlKGFjdGl2ZSwgaWR4KSB7CiAJCXM2NCAqdGlt ZW91dCA9IGFyZ3MtPnRpbWVvdXRfbnMgPj0gMCA/ICZhcmdzLT50aW1lb3V0X25zIDogTlVMTDsK LQkJcmV0ID0gaTkxNV9nZW1fYWN0aXZlX3dhaXRfdW5sb2NrZWQoJm9iai0+bGFzdF9yZWFkW2lk eF0sIHRydWUsCisJCXJldCA9IGk5MTVfZ2VtX2FjdGl2ZV93YWl0X3VubG9ja2VkKCZvYmotPmxh c3RfcmVhZFtpZHhdLAorCQkJCQkJICAgIEk5MTVfV0FJVF9JTlRFUlJVUFRJQkxFLAogCQkJCQkJ ICAgIHRpbWVvdXQsIHJwcyk7CiAJCWlmIChyZXQpCiAJCQlicmVhazsKQEAgLTI5ODIsNyArMjk4 NCw3IEBAIGRlc3Ryb3k6CiB9CiAKIGludCBpOTE1X2dlbV93YWl0X2Zvcl9pZGxlKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCSAgIGJvb2wgaW50ZXJydXB0aWJsZSkKKwkJ CSAgIHVuc2lnbmVkIGludCBmbGFncykKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmU7CiAJaW50IHJldDsKQEAgLTI5OTEsNyArMjk5Myw3IEBAIGludCBpOTE1X2dlbV93YWl0X2Zv cl9pZGxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJaWYgKGVuZ2luZS0+ bGFzdF9jb250ZXh0ID09IE5VTEwpCiAJCQljb250aW51ZTsKIAotCQlyZXQgPSBpbnRlbF9lbmdp bmVfaWRsZShlbmdpbmUsIGludGVycnVwdGlibGUpOworCQlyZXQgPSBpbnRlbF9lbmdpbmVfaWRs ZShlbmdpbmUsIGZsYWdzKTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAJfQpAQCAtMzc0 Niw3ICszNzQ4LDcgQEAgaTkxNV9nZW1fcmluZ190aHJvdHRsZShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCiAJaWYgKHRhcmdldCA9PSBOVUxMKQogCQlyZXR1 cm4gMDsKIAotCXJldCA9IGk5MTVfd2FpdF9yZXF1ZXN0KHRhcmdldCwgdHJ1ZSwgTlVMTCwgTlVM TCk7CisJcmV0ID0gaTkxNV93YWl0X3JlcXVlc3QodGFyZ2V0LCBJOTE1X1dBSVRfSU5URVJSVVBU SUJMRSwgTlVMTCwgTlVMTCk7CiAJaTkxNV9nZW1fcmVxdWVzdF9wdXQodGFyZ2V0KTsKIAogCXJl dHVybiByZXQ7CkBAIC00MzAyLDcgKzQzMDQsNyBAQCBpbnQgaTkxNV9nZW1fc3VzcGVuZChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChyZXQpCiAJCWdvdG8gZXJyOwogCi0JcmV0ID0gaTkx NV9nZW1fd2FpdF9mb3JfaWRsZShkZXZfcHJpdiwgdHJ1ZSk7CisJcmV0ID0gaTkxNV9nZW1fd2Fp dF9mb3JfaWRsZShkZXZfcHJpdiwgSTkxNV9XQUlUX0lOVEVSUlVQVElCTEUpOwogCWlmIChyZXQp CiAJCWdvdG8gZXJyOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ldmljdC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXZpY3QuYwppbmRleCA4 MTVkNWZiZTA3YWMuLjEwMzA4NTI0Njk3NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZXZpY3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9l dmljdC5jCkBAIC0xNzAsNyArMTcwLDcgQEAgc2VhcmNoX2FnYWluOgogCWlmIChyZXQpCiAJCXJl dHVybiByZXQ7CiAKLQlyZXQgPSBpOTE1X2dlbV93YWl0X2Zvcl9pZGxlKGRldl9wcml2LCB0cnVl KTsKKwlyZXQgPSBpOTE1X2dlbV93YWl0X2Zvcl9pZGxlKGRldl9wcml2LCBJOTE1X1dBSVRfSU5U RVJSVVBUSUJMRSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMjc1LDcgKzI3NSw3 IEBAIGludCBpOTE1X2dlbV9ldmljdF92bShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwg Ym9vbCBkb19pZGxlKQogCQkJCXJldHVybiByZXQ7CiAJCX0KIAotCQlyZXQgPSBpOTE1X2dlbV93 YWl0X2Zvcl9pZGxlKGRldl9wcml2LCB0cnVlKTsKKwkJcmV0ID0gaTkxNV9nZW1fd2FpdF9mb3Jf aWRsZShkZXZfcHJpdiwgSTkxNV9XQUlUX0lOVEVSUlVQVElCTEUpOwogCQlpZiAocmV0KQogCQkJ cmV0dXJuIHJldDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCBlMTZjMzgw ODZhYmUuLjliY2FjNTJiODI2OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAg LTI2ODMsNyArMjY4Myw3IEBAIHZvaWQgaTkxNV9nZW1fZ3R0X2ZpbmlzaF9vYmplY3Qoc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAlzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0ID0gJmRl dl9wcml2LT5nZ3R0OwogCiAJaWYgKHVubGlrZWx5KGdndHQtPmRvX2lkbGVfbWFwcykpIHsKLQkJ aWYgKGk5MTVfZ2VtX3dhaXRfZm9yX2lkbGUoZGV2X3ByaXYsIGZhbHNlKSkgeworCQlpZiAoaTkx NV9nZW1fd2FpdF9mb3JfaWRsZShkZXZfcHJpdiwgMCkpIHsKIAkJCURSTV9FUlJPUigiRmFpbGVk IHRvIHdhaXQgZm9yIGlkbGU7IFZUJ2QgbWF5IGhhbmcuXG4iKTsKIAkJCS8qIFdhaXQgYSBiaXQs IGluIGhvcGVzIGl0IGF2b2lkcyB0aGUgaGFuZyAqLwogCQkJdWRlbGF5KDEwKTsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYwppbmRleCAyNGViNGIxYjc1NDAuLmY0YzE1ZjMx OWQwOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYwpAQCAtMjYwLDcg KzI2MCw3IEBAIHN0YXRpYyBpbnQgaTkxNV9nZW1faW5pdF9zZXFubyhzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsIHUzMiBzZXFubykKIAogCS8qIENhcmVmdWxseSByZXRpcmUgYWxs IHJlcXVlc3RzIHdpdGhvdXQgd3JpdGluZyB0byB0aGUgcmluZ3MgKi8KIAlmb3JfZWFjaF9lbmdp bmUoZW5naW5lLCBkZXZfcHJpdikgewotCQlyZXQgPSBpbnRlbF9lbmdpbmVfaWRsZShlbmdpbmUs IHRydWUpOworCQlyZXQgPSBpbnRlbF9lbmdpbmVfaWRsZShlbmdpbmUsIEk5MTVfV0FJVF9JTlRF UlJVUFRJQkxFKTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAJfQpAQCAtNTk4LDcgKzU5 OCw3IEBAIGJvb2wgX19pOTE1X3NwaW5fcmVxdWVzdChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJlcSwKIC8qKgogICogaTkxNV93YWl0X3JlcXVlc3QgLSB3YWl0IHVudGlsIGV4 ZWN1dGlvbiBvZiByZXF1ZXN0IGhhcyBmaW5pc2hlZAogICogQHJlcTogZHVoIQotICogQGludGVy cnVwdGlibGU6IGRvIGFuIGludGVycnVwdGlibGUgd2FpdCAobm9ybWFsbHkgeWVzKQorICogQGZs YWdzOiBob3cgdG8gd2FpdAogICogQHRpbWVvdXQ6IGluIC0gaG93IGxvbmcgdG8gd2FpdCAoTlVM TCBmb3JldmVyKTsgb3V0IC0gaG93IG11Y2ggdGltZSByZW1haW5pbmcKICAqIEBycHM6IGNsaWVu dCB0byBjaGFyZ2UgZm9yIFJQUyBib29zdGluZwogICoKQEAgLTYxMywxMSArNjEzLDEyIEBAIGJv b2wgX19pOTE1X3NwaW5fcmVxdWVzdChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcSwKICAqIGVycm5vIHdpdGggcmVtYWluaW5nIHRpbWUgZmlsbGVkIGluIHRpbWVvdXQgYXJn dW1lbnQuCiAgKi8KIGludCBpOTE1X3dhaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcSwKLQkJICAgICAgYm9vbCBpbnRlcnJ1cHRpYmxlLAorCQkgICAgICB1bnNpZ25l ZCBpbnQgZmxhZ3MsCiAJCSAgICAgIHM2NCAqdGltZW91dCwKIAkJICAgICAgc3RydWN0IGludGVs X3Jwc19jbGllbnQgKnJwcykKIHsKLQlpbnQgc3RhdGUgPSBpbnRlcnJ1cHRpYmxlID8gVEFTS19J TlRFUlJVUFRJQkxFIDogVEFTS19VTklOVEVSUlVQVElCTEU7CisJY29uc3QgaW50IHN0YXRlID0g ZmxhZ3MgJiBJOTE1X1dBSVRfSU5URVJSVVBUSUJMRSA/CisJCVRBU0tfSU5URVJSVVBUSUJMRSA6 IFRBU0tfVU5JTlRFUlJVUFRJQkxFOwogCURFRklORV9XQUlUKHJlc2V0KTsKIAlzdHJ1Y3QgaW50 ZWxfd2FpdCB3YWl0OwogCXVuc2lnbmVkIGxvbmcgdGltZW91dF9yZW1haW47CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmgKaW5kZXggYTIzMWJkMzE4ZWYwLi40Nzk4OTZlZjc5 MWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmgKQEAgLTIxOCwxMCAr MjE4LDExIEBAIHN0cnVjdCBpbnRlbF9ycHNfY2xpZW50OwogI2RlZmluZSBJU19SUFNfVVNFUihw KSAoIUlTX0VSUl9PUl9OVUxMKHApKQogCiBpbnQgaTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCi0JCSAgICAgIGJvb2wgaW50ZXJydXB0aWJsZSwKKwkJ ICAgICAgdW5zaWduZWQgaW50IGZsYWdzLAogCQkgICAgICBzNjQgKnRpbWVvdXQsCiAJCSAgICAg IHN0cnVjdCBpbnRlbF9ycHNfY2xpZW50ICpycHMpCiAJX19hdHRyaWJ1dGVfXygobm9ubnVsbCgx KSkpOworI2RlZmluZSBJOTE1X1dBSVRfSU5URVJSVVBUSUJMRSBCSVQoMCkKIAogc3RhdGljIGlu bGluZSB1MzIgaW50ZWxfZW5naW5lX2dldF9zZXFubyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmUpOwogCkBAIC01NzUsMTMgKzU3NiwxMyBAQCBpOTE1X2dlbV9hY3RpdmVfd2FpdChjb25z dCBzdHJ1Y3QgaTkxNV9nZW1fYWN0aXZlICphY3RpdmUsIHN0cnVjdCBtdXRleCAqbXV0ZXgpCiAJ aWYgKCFyZXF1ZXN0KQogCQlyZXR1cm4gMDsKIAotCXJldHVybiBpOTE1X3dhaXRfcmVxdWVzdChy ZXF1ZXN0LCB0cnVlLCBOVUxMLCBOVUxMKTsKKwlyZXR1cm4gaTkxNV93YWl0X3JlcXVlc3QocmVx dWVzdCwgSTkxNV9XQUlUX0lOVEVSUlVQVElCTEUsIE5VTEwsIE5VTEwpOwogfQogCiAvKioKICAq IGk5MTVfZ2VtX2FjdGl2ZV93YWl0X3VubG9ja2VkIC0gd2FpdHMgdW50aWwgdGhlIHJlcXVlc3Qg aXMgY29tcGxldGVkCiAgKiBAYWN0aXZlIC0gdGhlIGFjdGl2ZSByZXF1ZXN0IG9uIHdoaWNoIHRv IHdhaXQKLSAqIEBpbnRlcnJ1cHRpYmxlIC0gd2hldGhlciB0aGUgd2FpdCBjYW4gYmUgd29rZW4g YnkgYSB1c2Vyc3BhY2Ugc2lnbmFsCisgKiBAZmxhZ3MgLSBob3cgdG8gd2FpdAogICogQHRpbWVv dXQgLSBob3cgbG9uZyB0byB3YWl0IGF0IG1vc3QKICAqIEBycHMgLSB1c2Vyc3BhY2UgY2xpZW50 IHRvIGNoYXJnZSBmb3IgYSB3YWl0Ym9vc3QKICAqCkBAIC02MDIsNyArNjAzLDcgQEAgaTkxNV9n ZW1fYWN0aXZlX3dhaXQoY29uc3Qgc3RydWN0IGk5MTVfZ2VtX2FjdGl2ZSAqYWN0aXZlLCBzdHJ1 Y3QgbXV0ZXggKm11dGV4KQogICovCiBzdGF0aWMgaW5saW5lIGludAogaTkxNV9nZW1fYWN0aXZl X3dhaXRfdW5sb2NrZWQoY29uc3Qgc3RydWN0IGk5MTVfZ2VtX2FjdGl2ZSAqYWN0aXZlLAotCQkJ ICAgICAgYm9vbCBpbnRlcnJ1cHRpYmxlLAorCQkJICAgICAgdW5zaWduZWQgaW50IGZsYWdzLAog CQkJICAgICAgczY0ICp0aW1lb3V0LAogCQkJICAgICAgc3RydWN0IGludGVsX3Jwc19jbGllbnQg KnJwcykKIHsKQEAgLTYxMSw3ICs2MTIsNyBAQCBpOTE1X2dlbV9hY3RpdmVfd2FpdF91bmxvY2tl ZChjb25zdCBzdHJ1Y3QgaTkxNV9nZW1fYWN0aXZlICphY3RpdmUsCiAKIAlyZXF1ZXN0ID0gaTkx NV9nZW1fYWN0aXZlX2dldF91bmxvY2tlZChhY3RpdmUpOwogCWlmIChyZXF1ZXN0KSB7Ci0JCXJl dCA9IGk5MTVfd2FpdF9yZXF1ZXN0KHJlcXVlc3QsIGludGVycnVwdGlibGUsIHRpbWVvdXQsIHJw cyk7CisJCXJldCA9IGk5MTVfd2FpdF9yZXF1ZXN0KHJlcXVlc3QsIGZsYWdzLCB0aW1lb3V0LCBy cHMpOwogCQlpOTE1X2dlbV9yZXF1ZXN0X3B1dChyZXF1ZXN0KTsKIAl9CiAKQEAgLTYzOCw3ICs2 MzksNyBAQCBpOTE1X2dlbV9hY3RpdmVfcmV0aXJlKHN0cnVjdCBpOTE1X2dlbV9hY3RpdmUgKmFj dGl2ZSwKIAlpZiAoIXJlcXVlc3QpCiAJCXJldHVybiAwOwogCi0JcmV0ID0gaTkxNV93YWl0X3Jl cXVlc3QocmVxdWVzdCwgdHJ1ZSwgTlVMTCwgTlVMTCk7CisJcmV0ID0gaTkxNV93YWl0X3JlcXVl c3QocmVxdWVzdCwgSTkxNV9XQUlUX0lOVEVSUlVQVElCTEUsIE5VTEwsIE5VTEwpOwogCWlmIChy ZXQpCiAJCXJldHVybiByZXQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX3Nocmlua2VyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zaHJpbmtl ci5jCmluZGV4IGI4MDgwMmIzNTM1My4uMzVhMDVmNGM1MWMxIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zaHJpbmtlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX3Nocmlua2VyLmMKQEAgLTMyMyw3ICszMjMsNyBAQCBpOTE1X2dlbV9zaHJp bmtlcl9sb2NrX3VuaW50ZXJydXB0aWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCiAJdW5zaWduZWQgbG9uZyB0aW1lb3V0ID0gamlmZmllcyArIG1zZWNzX3RvX2ppZmZpZXNf dGltZW91dCh0aW1lb3V0X21zKTsKIAogCWRvIHsKLQkJaWYgKGk5MTVfZ2VtX3dhaXRfZm9yX2lk bGUoZGV2X3ByaXYsIGZhbHNlKSA9PSAwICYmCisJCWlmIChpOTE1X2dlbV93YWl0X2Zvcl9pZGxl KGRldl9wcml2LCAwKSA9PSAwICYmCiAJCSAgICBpOTE1X2dlbV9zaHJpbmtlcl9sb2NrKCZkZXZf cHJpdi0+ZHJtLCAmc2x1LT51bmxvY2spKQogCQkJYnJlYWs7CiAKQEAgLTQxNCw3ICs0MTQsNyBA QCBpOTE1X2dlbV9zaHJpbmtlcl92bWFwKHN0cnVjdCBub3RpZmllcl9ibG9jayAqbmIsIHVuc2ln bmVkIGxvbmcgZXZlbnQsIHZvaWQgKnB0cgogCQlyZXR1cm4gTk9USUZZX0RPTkU7CiAKIAkvKiBG b3JjZSBldmVyeXRoaW5nIG9udG8gdGhlIGluYWN0aXZlIGxpc3RzICovCi0JcmV0ID0gaTkxNV9n ZW1fd2FpdF9mb3JfaWRsZShkZXZfcHJpdiwgZmFsc2UpOworCXJldCA9IGk5MTVfZ2VtX3dhaXRf Zm9yX2lkbGUoZGV2X3ByaXYsIDApOwogCWlmIChyZXQpCiAJCWdvdG8gb3V0OwogCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV91c2VycHRyLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV91c2VycHRyLmMKaW5kZXggYmU1NDgyNWVmM2U4Li5lNTM3OTMw YzY0YjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3VzZXJwdHIu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV91c2VycHRyLmMKQEAgLTY4LDcg KzY4LDcgQEAgc3RhdGljIHZvaWQgd2FpdF9yZW5kZXJpbmcoc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9iaikKIAogCWZvcl9lYWNoX2FjdGl2ZShhY3RpdmUsIGlkeCkKIAkJaTkxNV9nZW1f YWN0aXZlX3dhaXRfdW5sb2NrZWQoJm9iai0+bGFzdF9yZWFkW2lkeF0sCi0JCQkJCSAgICAgIGZh bHNlLCBOVUxMLCBOVUxMKTsKKwkJCQkJICAgICAgMCwgTlVMTCwgTlVMTCk7CiB9CiAKIHN0YXRp YyB2b2lkIGNhbmNlbF91c2VycHRyKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBjYjg4ZTI5ZDgyOGQuLjU3NzFhZDgwMjQ5OCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTIwMjQsOCArMTIwMjQsNyBA QCBzdGF0aWMgdm9pZCBpbnRlbF9tbWlvX2ZsaXBfd29ya19mdW5jKHN0cnVjdCB3b3JrX3N0cnVj dCAqdykKIAogCWlmICh3b3JrLT5mbGlwX3F1ZXVlZF9yZXEpCiAJCVdBUk5fT04oaTkxNV93YWl0 X3JlcXVlc3Qod29yay0+ZmxpcF9xdWV1ZWRfcmVxLAotCQkJCQkgIGZhbHNlLCBOVUxMLAotCQkJ CQkgIE5PX1dBSVRCT09TVCkpOworCQkJCQkgIDAsIE5VTEwsIE5PX1dBSVRCT09TVCkpOwogCiAJ LyogRm9yIGZyYW1lYnVmZmVyIGJhY2tlZCBieSBkbWFidWYsIHdhaXQgZm9yIGZlbmNlICovCiAJ cmVzdiA9IGk5MTVfZ2VtX29iamVjdF9nZXRfZG1hYnVmX3Jlc3Yob2JqKTsKQEAgLTE0MDc3LDcg KzE0MDc2LDggQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfcHJlcGFyZV9jb21taXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKIAkJCQljb250aW51ZTsKIAogCQkJcmV0ID0gaTkxNV93YWl0X3Jl cXVlc3QoaW50ZWxfcGxhbmVfc3RhdGUtPndhaXRfcmVxLAotCQkJCQkJdHJ1ZSwgTlVMTCwgTlVM TCk7CisJCQkJCQlJOTE1X1dBSVRfSU5URVJSVVBUSUJMRSwKKwkJCQkJCU5VTEwsIE5VTEwpOwog CQkJaWYgKHJldCkgewogCQkJCS8qIEFueSBoYW5nIHNob3VsZCBiZSBzd2FsbG93ZWQgYnkgdGhl IHdhaXQgKi8KIAkJCQlXQVJOX09OKHJldCA9PSAtRUlPKTsKQEAgLTE0Mjk1LDcgKzE0Mjk1LDcg QEAgc3RhdGljIHZvaWQgaW50ZWxfYXRvbWljX2NvbW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpzdGF0ZSkKIAkJCWNvbnRpbnVlOwogCiAJCXJldCA9IGk5MTVfd2FpdF9yZXF1ZXN0 KGludGVsX3BsYW5lX3N0YXRlLT53YWl0X3JlcSwKLQkJCQkJdHJ1ZSwgTlVMTCwgTlVMTCk7CisJ CQkJCTAsIE5VTEwsIE5VTEwpOwogCQkvKiBFSU8gc2hvdWxkIGJlIGVhdGVuLCBhbmQgd2UgY2Fu J3QgZ2V0IGludGVycnVwdGVkIGluIHRoZQogCQkgKiB3b3JrZXIsIGFuZCBibG9ja2luZyBjb21t aXRzIGhhdmUgd2FpdGVkIGFscmVhZHkuICovCiAJCVdBUk5fT04ocmV0KTsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCBmZDhmY2M2ZWM5NzAuLmE1YmYxODg3NzA2 OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMjIyMyw3ICsy MjIzLDggQEAgc3RhdGljIGludCB3YWl0X2Zvcl9zcGFjZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcSwgaW50IGJ5dGVzKQogCWlmIChXQVJOX09OKCZ0YXJnZXQtPnJpbmdfbGluayA9 PSAmcmluZy0+cmVxdWVzdF9saXN0KSkKIAkJcmV0dXJuIC1FTk9TUEM7CiAKLQlyZXQgPSBpOTE1 X3dhaXRfcmVxdWVzdCh0YXJnZXQsIHRydWUsIE5VTEwsIE5PX1dBSVRCT09TVCk7CisJcmV0ID0g aTkxNV93YWl0X3JlcXVlc3QodGFyZ2V0LCBJOTE1X1dBSVRfSU5URVJSVVBUSUJMRSwKKwkJCQlO VUxMLCBOT19XQUlUQk9PU1QpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCAyMTgxZDBhNDFhOTYuLjE4ODQ4YWNm NWU3NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtNDg5LDEx ICs0ODksMTEgQEAgaW50IGludGVsX2VuZ2luZV9jcmVhdGVfc2NyYXRjaChzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUsIGludCBzaXplKTsKIHZvaWQgaW50ZWxfZW5naW5lX2NsZWFudXBf Y29tbW9uKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiAKIHN0YXRpYyBpbmxpbmUg aW50IGludGVsX2VuZ2luZV9pZGxlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKLQkJ CQkgICAgYm9vbCBpbnRlcnJ1cHRpYmxlKQorCQkJCSAgICB1bnNpZ25lZCBpbnQgZmxhZ3MpCiB7 CiAJLyogV2FpdCB1cG9uIHRoZSBsYXN0IHJlcXVlc3QgdG8gYmUgY29tcGxldGVkICovCiAJcmV0 dXJuIGk5MTVfZ2VtX2FjdGl2ZV93YWl0X3VubG9ja2VkKCZlbmdpbmUtPmxhc3RfcmVxdWVzdCwK LQkJCQkJICAgICBpbnRlcnJ1cHRpYmxlLCBOVUxMLCBOVUxMKTsKKwkJCQkJICAgICBmbGFncywg TlVMTCwgTlVMTCk7CiB9CiAKIGludCBpbnRlbF9pbml0X3JlbmRlcl9yaW5nX2J1ZmZlcihzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwotLSAKMi45LjMKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=