From: John.C.Harrison@Intel.com Subject: [PATCH 18/39] drm/i915: Added scheduler support to __wait_request() calls Date: Mon, 23 Nov 2015 11:39:13 +0000 Message-ID: <1448278774-31376-19-git-send-email-John.C.Harrison@Intel.com> References: <1448278774-31376-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id C89CF72203 for ; Mon, 23 Nov 2015 03:39:53 -0800 (PST) In-Reply-To: <1448278774-31376-1-git-send-email-John.C.Harrison@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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBzY2hl ZHVsZXIgY2FuIGNhdXNlIGJhdGNoIGJ1ZmZlcnMsIGFuZCBoZW5jZSByZXF1ZXN0cywgdG8gYmUK c3VibWl0dGVkIHRvIHRoZSByaW5nIG91dCBvZiBvcmRlciBhbmQgYXN5bmNocm9ub3VzbHkgdG8g dGhlaXIKc3VibWlzc2lvbiB0byB0aGUgZHJpdmVyLiBUaHVzIGF0IHRoZSBwb2ludCBvZiB3YWl0 aW5nIGZvciB0aGUKY29tcGxldGlvbiBvZiBhIGdpdmVuIHJlcXVlc3QsIGl0IGlzIG5vdCBldmVu IGd1YXJhbnRlZWQgdGhhdCB0aGUKcmVxdWVzdCBoYXMgYWN0dWFsbHkgYmVlbiBzZW50IHRvIHRo ZSBoYXJkd2FyZSB5ZXQuIEV2ZW4gaXQgaXMgaGFzCmJlZW4gc2VudCwgaXQgaXMgcG9zc2libGUg dGhhdCBpdCBjb3VsZCBiZSBwcmUtZW1wdGVkIGFuZCB0aHVzCid1bnNlbnQnLgoKVGhpcyBtZWFu cyB0aGF0IGl0IGlzIG5lY2Vzc2FyeSB0byBiZSBhYmxlIHRvIHN1Ym1pdCByZXF1ZXN0cyB0byB0 aGUKaGFyZHdhcmUgZHVyaW5nIHRoZSB3YWl0IGNhbGwgaXRzZWxmLiBVbmZvcnR1bmF0ZWx5LCB3 aGlsZSBzb21lCmNhbGxlcnMgb2YgX193YWl0X3JlcXVlc3QoKSByZWxlYXNlIHRoZSBtdXRleCBs b2NrIGZpcnN0LCBvdGhlcnMgZG8Kbm90IChhbmQgYXBwYXJlbnRseSBjYW4gbm90KS4gSGVuY2Ug dGhlcmUgaXMgdGhlIGFiaWxpdHkgdG8gZGVhZGxvY2sKYXMgdGhlIHdhaXQgc3RhbGxzIGZvciBz dWJtaXNzaW9uIGJ1dCB0aGUgYXN5bmNocm9ub3VzIHN1Ym1pc3Npb24gaXMKc3RhbGxlZCBmb3Ig dGhlIG11dGV4IGxvY2suCgpUaGlzIGNoYW5nZSBob29rcyB0aGUgc2NoZWR1bGVyIGluIHRvIHRo ZSBfX3dhaXRfcmVxdWVzdCgpIGNvZGUgdG8KZW5zdXJlIGNvcnJlY3QgYmVoYXZpb3VyLiBUaGF0 IGlzLCBmbHVzaCB0aGUgdGFyZ2V0IGJhdGNoIGJ1ZmZlcgp0aHJvdWdoIHRvIHRoZSBoYXJkd2Fy ZSBhbmQgZG8gbm90IGRlYWRsb2NrIHdhaXRpbmcgZm9yIHNvbWV0aGluZyB0aGF0CmNhbm5vdCBj dXJyZW50bHkgYmUgc3VibWl0dGVkLiBJbnN0ZWFkLCB0aGUgd2FpdCBjYWxsIG11c3QgcmV0dXJu CkVBR0FJTiBhdCBsZWFzdCBhcyBmYXIgYmFjayBhcyBuZWNlc3NhcnkgdG8gcmVsZWFzZSB0aGUg bXV0ZXggbG9jayBhbmQKYWxsb3cgdGhlIHNjaGVkdWxlcidzIGFzeW5jaHJvbm91cyBwcm9jZXNz aW5nIHRvIGdldCBpbiBhbmQgaGFuZGxlIHRoZQpwcmUtZW1wdGlvbiBvcGVyYXRpb24gYW5kIGV2 ZW50dWFsbHkgKHJlLSlzdWJtaXQgdGhlIHdvcmsuCgpDaGFuZ2UtSWQ6IEkzMWZlNmJjN2UzOGY2 ZmZkZDg0M2ZjYWUxNmU3Y2M4YjFlNTJhOTMxCkZvcjogVklaLTE1ODcKU2lnbmVkLW9mZi1ieTog Sm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgfCAgIDMgKy0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMgICAgICAgICB8ICAzNyArKysrKysrKystLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9zY2hlZHVsZXIuYyAgIHwgMTExICsrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5oICAgfCAgIDQgKysK IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICB8ICAgNSArLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgICAyICstCiA2IGZpbGVzIGNoYW5n ZWQsIDE1MSBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaAppbmRleCA5YTY3ZjdjLi41ZWQ2MDBjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAg LTMwMjksNyArMzAyOSw4IEBAIGludCBfX2k5MTVfd2FpdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkx NV9nZW1fcmVxdWVzdCAqcmVxLAogCQkJdW5zaWduZWQgcmVzZXRfY291bnRlciwKIAkJCWJvb2wg aW50ZXJydXB0aWJsZSwKIAkJCXM2NCAqdGltZW91dCwKLQkJCXN0cnVjdCBpbnRlbF9ycHNfY2xp ZW50ICpycHMpOworCQkJc3RydWN0IGludGVsX3Jwc19jbGllbnQgKnJwcywKKwkJCWJvb2wgaXNf bG9ja2VkKTsKIGludCBfX211c3RfY2hlY2sgaTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwogaW50IGk5MTVfZ2VtX2ZhdWx0KHN0cnVjdCB2bV9hcmVh X3N0cnVjdCAqdm1hLCBzdHJ1Y3Qgdm1fZmF1bHQgKnZtZik7CiBpbnQgX19tdXN0X2NoZWNrCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA0NTFhZTZkLi4zOTk0YjQ3IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMKQEAgLTEyMDcsNyArMTIwNyw4IEBAIGludCBfX2k5MTVfd2FpdF9yZXF1ZXN0 KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQkJdW5zaWduZWQgcmVzZXRfY291 bnRlciwKIAkJCWJvb2wgaW50ZXJydXB0aWJsZSwKIAkJCXM2NCAqdGltZW91dCwKLQkJCXN0cnVj dCBpbnRlbF9ycHNfY2xpZW50ICpycHMpCisJCQlzdHJ1Y3QgaW50ZWxfcnBzX2NsaWVudCAqcnBz LAorCQkJYm9vbCBpc19sb2NrZWQpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9 IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3JpbmcocmVxKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gcmluZy0+ZGV2OwpAQCAtMTIxNyw4ICsxMjE4LDEwIEBAIGludCBfX2k5MTVfd2FpdF9yZXF1 ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCURFRklORV9XQUlUKHdhaXQp OwogCXVuc2lnbmVkIGxvbmcgdGltZW91dF9leHBpcmU7CiAJczY0IGJlZm9yZSwgbm93OwotCWlu dCByZXQ7CisJaW50IHJldCA9IDA7CisJYm9vbCAgICBidXN5OwogCisJbWlnaHRfc2xlZXAoKTsK IAlXQVJOKCFpbnRlbF9pcnFzX2VuYWJsZWQoZGV2X3ByaXYpLCAiSVJRcyBkaXNhYmxlZCIpOwog CiAJaWYgKGk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkKHJlcSkpCkBAIC0xMjY5LDYgKzEyNzIs MjIgQEAgaW50IF9faTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXEsCiAJCQlicmVhazsKIAkJfQogCisJCWlmIChpc19sb2NrZWQpIHsKKwkJCS8qIElmIHRo aXMgcmVxdWVzdCBpcyBiZWluZyBwcm9jZXNzZWQgYnkgdGhlIHNjaGVkdWxlcgorCQkJICogdGhl biBpdCBpcyB1bnNhZmUgdG8gc2xlZXAgd2l0aCB0aGUgbXV0ZXggbG9jayBoZWxkCisJCQkgKiBh cyB0aGUgc2NoZWR1bGVyIG1heSByZXF1aXJlIHRoZSBsb2NrIGluIG9yZGVyIHRvCisJCQkgKiBw cm9ncmVzcyB0aGUgcmVxdWVzdC4gKi8KKwkJCWlmIChpOTE1X3NjaGVkdWxlcl9pc19yZXF1ZXN0 X3RyYWNrZWQocmVxLCBOVUxMLCAmYnVzeSkpIHsKKwkJCQlpZiAoYnVzeSkgeworCQkJCQlyZXQg PSAtRUFHQUlOOworCQkJCQlicmVhazsKKwkJCQl9CisJCQl9CisKKwkJCS8qIElmIHRoZSByZXF1 ZXN0IGlzIG5vdCB0cmFja2VkIGJ5IHRoZSBzY2hlZHVsZXIgdGhlbiB0aGUKKwkJCSAqIHJlZ3Vs YXIgdGVzdCBjYW4gYmUgZG9uZS4gKi8KKwkJfQorCiAJCWlmIChpOTE1X2dlbV9yZXF1ZXN0X2Nv bXBsZXRlZChyZXEpKSB7CiAJCQlyZXQgPSAwOwogCQkJYnJlYWs7CkBAIC0xNDQ5LDEzICsxNDY4 LDE3IEBAIGk5MTVfd2FpdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx KQogCiAJQlVHX09OKCFtdXRleF9pc19sb2NrZWQoJmRldi0+c3RydWN0X211dGV4KSk7CiAKKwly ZXQgPSBpOTE1X3NjaGVkdWxlcl9mbHVzaF9yZXF1ZXN0KHJlcSwgdHJ1ZSk7CisJaWYgKHJldCA8 IDApCisJCXJldHVybiByZXQ7CisKIAlyZXQgPSBpOTE1X2dlbV9jaGVja193ZWRnZSgmZGV2X3By aXYtPmdwdV9lcnJvciwgaW50ZXJydXB0aWJsZSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsK IAogCXJldCA9IF9faTkxNV93YWl0X3JlcXVlc3QocmVxLAogCQkJCSAgYXRvbWljX3JlYWQoJmRl dl9wcml2LT5ncHVfZXJyb3IucmVzZXRfY291bnRlciksCi0JCQkJICBpbnRlcnJ1cHRpYmxlLCBO VUxMLCBOVUxMKTsKKwkJCQkgIGludGVycnVwdGlibGUsIE5VTEwsIE5VTEwsIHRydWUpOwogCWlm IChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTE1NjgsNyArMTU5MSw3IEBAIGk5MTVfZ2VtX29i amVjdF93YWl0X3JlbmRlcmluZ19fbm9uYmxvY2tpbmcoc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKm9iaiwKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAlmb3IgKGkgPSAw OyByZXQgPT0gMCAmJiBpIDwgbjsgaSsrKQogCQlyZXQgPSBfX2k5MTVfd2FpdF9yZXF1ZXN0KHJl cXVlc3RzW2ldLCByZXNldF9jb3VudGVyLCB0cnVlLAotCQkJCQkgIE5VTEwsIHJwcyk7CisJCQkJ CSAgTlVMTCwgcnBzLCBmYWxzZSk7CiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwog CiAJZm9yIChpID0gMDsgaSA8IG47IGkrKykgewpAQCAtMzQ5Myw3ICszNTE2LDcgQEAgaTkxNV9n ZW1fd2FpdF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3Qg ZHJtX2ZpbGUgKmZpbGUpCiAJCWlmIChyZXQgPT0gMCkKIAkJCXJldCA9IF9faTkxNV93YWl0X3Jl cXVlc3QocmVxW2ldLCByZXNldF9jb3VudGVyLCB0cnVlLAogCQkJCQkJICBhcmdzLT50aW1lb3V0 X25zID4gMCA/ICZhcmdzLT50aW1lb3V0X25zIDogTlVMTCwKLQkJCQkJCSAgZmlsZS0+ZHJpdmVy X3ByaXYpOworCQkJCQkJICBmaWxlLT5kcml2ZXJfcHJpdiwgZmFsc2UpOwogCQlpOTE1X2dlbV9y ZXF1ZXN0X3VucmVmZXJlbmNlKHJlcVtpXSk7CiAJfQogCXJldHVybiByZXQ7CkBAIC0zNTI2LDcg KzM1NDksNyBAQCBfX2k5MTVfZ2VtX29iamVjdF9zeW5jKHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmosCiAJCQkJCSAgYXRvbWljX3JlYWQoJmk5MTUtPmdwdV9lcnJvci5yZXNldF9jb3Vu dGVyKSwKIAkJCQkJICBpOTE1LT5tbS5pbnRlcnJ1cHRpYmxlLAogCQkJCQkgIE5VTEwsCi0JCQkJ CSAgJmk5MTUtPnJwcy5zZW1hcGhvcmVzKTsKKwkJCQkJICAmaTkxNS0+cnBzLnNlbWFwaG9yZXMs IHRydWUpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIApAQCAtNDQ4NSw3ICs0NTA4LDcg QEAgaTkxNV9nZW1fcmluZ190aHJvdHRsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3Qg ZHJtX2ZpbGUgKmZpbGUpCiAJaWYgKHRhcmdldCA9PSBOVUxMKQogCQlyZXR1cm4gMDsKIAotCXJl dCA9IF9faTkxNV93YWl0X3JlcXVlc3QodGFyZ2V0LCByZXNldF9jb3VudGVyLCB0cnVlLCBOVUxM LCBOVUxMKTsKKwlyZXQgPSBfX2k5MTVfd2FpdF9yZXF1ZXN0KHRhcmdldCwgcmVzZXRfY291bnRl ciwgdHJ1ZSwgTlVMTCwgTlVMTCwgZmFsc2UpOwogCWlmIChyZXQgPT0gMCkKIAkJcXVldWVfZGVs YXllZF93b3JrKGRldl9wcml2LT53cSwgJmRldl9wcml2LT5tbS5yZXRpcmVfd29yaywgMCk7CiAK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5jCmluZGV4IDVkYzM0OTcuLmI4Yjg0YTYg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYwpAQCAtMzEsNiArMzEsOCBAQCBz dGF0aWMgaW50ICAgICAgICAgaTkxNV9zY2hlZHVsZXJfcmVtb3ZlX2RlcGVuZGVudChzdHJ1Y3Qg aTkxNV9zY2hlZHVsZXIgKnNjaGVkdQogCQkJCQkJICAgc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1 ZXVlX2VudHJ5ICpyZW1vdmUpOwogc3RhdGljIGludCAgICAgICAgIGk5MTVfc2NoZWR1bGVyX3N1 Ym1pdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJCQkgYm9vbCBpc19sb2NrZWQp Oworc3RhdGljIGludCAgICAgICAgIGk5MTVfc2NoZWR1bGVyX3N1Ym1pdF9tYXhfcHJpb3JpdHko c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKKwkJCQkJCSAgICAgIGJvb2wgaXNfbG9ja2Vk KTsKIHN0YXRpYyB1aW50MzJfdCAgICBpOTE1X3NjaGVkdWxlcl9jb3VudF9mbHlpbmcoc3RydWN0 IGk5MTVfc2NoZWR1bGVyICpzY2hlZHVsZXIsCiAJCQkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICpyaW5nKTsKIHN0YXRpYyB2b2lkICAgICAgICBpOTE1X3NjaGVkdWxlcl9wcmlvcml0 eV9idW1wX2NsZWFyKHN0cnVjdCBpOTE1X3NjaGVkdWxlciAqc2NoZWR1bGVyKTsKQEAgLTU1NCw2 ICs1NTYsNTcgQEAgdm9pZCBpOTE1X2dlbV9zY2hlZHVsZXJfd29ya19oYW5kbGVyKHN0cnVjdCB3 b3JrX3N0cnVjdCAqd29yaykKIAl9CiB9CiAKK2ludCBpOTE1X3NjaGVkdWxlcl9mbHVzaF9yZXF1 ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAorCQkJCSBib29sIGlzX2xvY2tl ZCkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXY7CisJc3RydWN0IGk5MTVf c2NoZWR1bGVyICAgKnNjaGVkdWxlcjsKKwl1bnNpZ25lZCBsb25nICAgICAgIGZsYWdzOworCWlu dCAgICAgICAgICAgICAgICAgZmx1c2hfY291bnQ7CisJdWludDMyX3QgICAgICAgICAgICByaW5n X2lkOworCisJaWYgKCFyZXEpCisJCXJldHVybiAtRUlOVkFMOworCisJZGV2X3ByaXYgID0gcmVx LT5yaW5nLT5kZXYtPmRldl9wcml2YXRlOworCXNjaGVkdWxlciA9IGRldl9wcml2LT5zY2hlZHVs ZXI7CisKKwlpZiAoIXNjaGVkdWxlcikKKwkJcmV0dXJuIDA7CisKKwlpZiAoIXJlcS0+c2NoZWR1 bGVyX3FlKQorCQlyZXR1cm4gMDsKKworCWlmICghSTkxNV9TUVNfSVNfUVVFVUVEKHJlcS0+c2No ZWR1bGVyX3FlKSkKKwkJcmV0dXJuIDA7CisKKwlyaW5nX2lkID0gcmVxLT5yaW5nLT5pZDsKKwlp ZiAoaXNfbG9ja2VkICYmIChzY2hlZHVsZXItPmZsYWdzW3JpbmdfaWRdICYgaTkxNV9zZl9zdWJt aXR0aW5nKSkgeworCQkvKiBTY2hlZHVsZXIgaXMgYnVzeSBhbHJlYWR5IHN1Ym1pdHRpbmcgYW5v dGhlciBiYXRjaCwKKwkJICogY29tZSBiYWNrIGxhdGVyIHJhdGhlciB0aGFuIGdvaW5nIHJlY3Vy c2l2ZS4uLiAqLworCQlyZXR1cm4gLUVBR0FJTjsKKwl9CisKKwlpZiAobGlzdF9lbXB0eSgmc2No ZWR1bGVyLT5ub2RlX3F1ZXVlW3JpbmdfaWRdKSkKKwkJcmV0dXJuIDA7CisKKwlzcGluX2xvY2tf aXJxc2F2ZSgmc2NoZWR1bGVyLT5sb2NrLCBmbGFncyk7CisKKwlpOTE1X3NjaGVkdWxlcl9wcmlv cml0eV9idW1wX2NsZWFyKHNjaGVkdWxlcik7CisKKwlmbHVzaF9jb3VudCA9IGk5MTVfc2NoZWR1 bGVyX3ByaW9yaXR5X2J1bXAoc2NoZWR1bGVyLAorCQkJICAgIHJlcS0+c2NoZWR1bGVyX3FlLCBz Y2hlZHVsZXItPnByaW9yaXR5X2xldmVsX21heCk7CisKKwlzcGluX3VubG9ja19pcnFyZXN0b3Jl KCZzY2hlZHVsZXItPmxvY2ssIGZsYWdzKTsKKworCWlmIChmbHVzaF9jb3VudCkgeworCQlEUk1f REVCVUdfRFJJVkVSKCI8JXM+IEJ1bXBlZCAlZCBlbnRyaWVzXG4iLCByZXEtPnJpbmctPm5hbWUs IGZsdXNoX2NvdW50KTsKKwkJZmx1c2hfY291bnQgPSBpOTE1X3NjaGVkdWxlcl9zdWJtaXRfbWF4 X3ByaW9yaXR5KHJlcS0+cmluZywgaXNfbG9ja2VkKTsKKwl9CisKKwlyZXR1cm4gZmx1c2hfY291 bnQ7Cit9CisKIHN0YXRpYyB2b2lkIGk5MTVfc2NoZWR1bGVyX3ByaW9yaXR5X2J1bXBfY2xlYXIo c3RydWN0IGk5MTVfc2NoZWR1bGVyICpzY2hlZHVsZXIpCiB7CiAJc3RydWN0IGk5MTVfc2NoZWR1 bGVyX3F1ZXVlX2VudHJ5ICpub2RlOwpAQCAtNjA3LDYgKzY2MCw0NCBAQCBzdGF0aWMgaW50IGk5 MTVfc2NoZWR1bGVyX3ByaW9yaXR5X2J1bXAoc3RydWN0IGk5MTVfc2NoZWR1bGVyICpzY2hlZHVs ZXIsCiAJcmV0dXJuIGNvdW50OwogfQogCitzdGF0aWMgaW50IGk5MTVfc2NoZWR1bGVyX3N1Ym1p dF9tYXhfcHJpb3JpdHkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKKwkJCQkJICAgICAg Ym9vbCBpc19sb2NrZWQpCit7CisJc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICAq bm9kZTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAgICAgICAgICAgICpkZXZfcHJpdiA9IHJp bmctPmRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGk5MTVfc2NoZWR1bGVyICAgICAgICAgICAg ICAqc2NoZWR1bGVyID0gZGV2X3ByaXYtPnNjaGVkdWxlcjsKKwl1bnNpZ25lZCBsb25nCWZsYWdz OworCWludCAgICAgICAgICAgICByZXQsIGNvdW50ID0gMDsKKwlib29sICAgICAgICAgICAgZm91 bmQ7CisKKwlkbyB7CisJCWZvdW5kID0gZmFsc2U7CisJCXNwaW5fbG9ja19pcnFzYXZlKCZzY2hl ZHVsZXItPmxvY2ssIGZsYWdzKTsKKwkJbGlzdF9mb3JfZWFjaF9lbnRyeShub2RlLCAmc2NoZWR1 bGVyLT5ub2RlX3F1ZXVlW3JpbmctPmlkXSwgbGluaykgeworCQkJaWYgKCFJOTE1X1NRU19JU19R VUVVRUQobm9kZSkpCisJCQkJY29udGludWU7CisKKwkJCWlmIChub2RlLT5wcmlvcml0eSA8IHNj aGVkdWxlci0+cHJpb3JpdHlfbGV2ZWxfbWF4KQorCQkJCWNvbnRpbnVlOworCisJCQlmb3VuZCA9 IHRydWU7CisJCQlicmVhazsKKwkJfQorCQlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZzY2hlZHVs ZXItPmxvY2ssIGZsYWdzKTsKKworCQlpZiAoIWZvdW5kKQorCQkJYnJlYWs7CisKKwkJcmV0ID0g aTkxNV9zY2hlZHVsZXJfc3VibWl0KHJpbmcsIGlzX2xvY2tlZCk7CisJCWlmIChyZXQgPCAwKQor CQkJcmV0dXJuIHJldDsKKworCQljb3VudCArPSByZXQ7CisJfSB3aGlsZSAoZm91bmQpOworCisJ cmV0dXJuIGNvdW50OworfQorCiBzdGF0aWMgaW50IGk5MTVfc2NoZWR1bGVyX3BvcF9mcm9tX3F1 ZXVlX2xvY2tlZChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJCSAgICBzdHJ1Y3Qg aTkxNV9zY2hlZHVsZXJfcXVldWVfZW50cnkgKipwb3Bfbm9kZSwKIAkJCQkgICAgdW5zaWduZWQg bG9uZyAqZmxhZ3MpCkBAIC04MjEsNiArOTEyLDI2IEBAIHN0YXRpYyBpbnQgaTkxNV9zY2hlZHVs ZXJfcmVtb3ZlX2RlcGVuZGVudChzdHJ1Y3QgaTkxNV9zY2hlZHVsZXIgKnNjaGVkdWxlciwKIAly ZXR1cm4gMDsKIH0KIAorYm9vbCBpOTE1X3NjaGVkdWxlcl9pc19yZXF1ZXN0X3RyYWNrZWQoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCisJCQkJICAgICAgIGJvb2wgKmNvbXBsZXRl ZCwgYm9vbCAqYnVzeSkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBy ZXEtPnJpbmctPmRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGk5MTVfc2NoZWR1bGVyICAgKnNj aGVkdWxlciA9IGRldl9wcml2LT5zY2hlZHVsZXI7CisKKwlpZiAoIXNjaGVkdWxlcikKKwkJcmV0 dXJuIGZhbHNlOworCisJaWYgKHJlcS0+c2NoZWR1bGVyX3FlID09IE5VTEwpCisJCXJldHVybiBm YWxzZTsKKworCWlmIChjb21wbGV0ZWQpCisJCSpjb21wbGV0ZWQgPSBJOTE1X1NRU19JU19DT01Q TEVURShyZXEtPnNjaGVkdWxlcl9xZSk7CisJaWYgKGJ1c3kpCisJCSpidXN5ICAgICAgPSBJOTE1 X1NRU19JU19RVUVVRUQocmVxLT5zY2hlZHVsZXJfcWUpOworCisJcmV0dXJuIHRydWU7Cit9CisK IGludCBpOTE1X3NjaGVkdWxlcl9jbG9zZWZpbGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3Ry dWN0IGRybV9maWxlICpmaWxlKQogewogCXN0cnVjdCBpOTE1X3NjaGVkdWxlcl9xdWV1ZV9lbnRy eSAgKm5vZGU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxl ci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuaAppbmRleCA4NDY5Mjcw Li40MjM3MWIzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxl ci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmgKQEAgLTkyLDUg KzkyLDkgQEAgaW50ICAgICAgICAgaTkxNV9zY2hlZHVsZXJfcXVldWVfZXhlY2J1ZmZlcihzdHJ1 Y3QgaTkxNV9zY2hlZHVsZXJfcXVldWVfZW50cnkgKnEKIGJvb2wgICAgICAgIGk5MTVfc2NoZWR1 bGVyX25vdGlmeV9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKTsKIHZv aWQgICAgICAgIGk5MTVfc2NoZWR1bGVyX3dha2V1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK IHZvaWQgICAgICAgIGk5MTVfZ2VtX3NjaGVkdWxlcl93b3JrX2hhbmRsZXIoc3RydWN0IHdvcmtf c3RydWN0ICp3b3JrKTsKK2ludCAgICAgICAgIGk5MTVfc2NoZWR1bGVyX2ZsdXNoX3JlcXVlc3Qo c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCisJCQkJCSBib29sIGlzX2xvY2tlZCk7 Citib29sICAgICAgICBpOTE1X3NjaGVkdWxlcl9pc19yZXF1ZXN0X3RyYWNrZWQoc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCisJCQkJCSAgICAgIGJvb2wgKmNvbXBsZXRlZCwgYm9v bCAqYnVzeSk7CiAKICNlbmRpZiAgLyogX0k5MTVfU0NIRURVTEVSX0hfICovCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYzAwYmM1MC4uNThjNDY0ZiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTEyNTgsNyArMTEyNTgsOCBAQCBzdGF0aWMgdm9p ZCBpbnRlbF9tbWlvX2ZsaXBfd29ya19mdW5jKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAkJ V0FSTl9PTihfX2k5MTVfd2FpdF9yZXF1ZXN0KG1taW9fZmxpcC0+cmVxLAogCQkJCQkgICAgbW1p b19mbGlwLT5jcnRjLT5yZXNldF9jb3VudGVyLAogCQkJCQkgICAgZmFsc2UsIE5VTEwsCi0JCQkJ CSAgICAmbW1pb19mbGlwLT5pOTE1LT5ycHMubW1pb2ZsaXBzKSk7CisJCQkJCSAgICAmbW1pb19m bGlwLT5pOTE1LT5ycHMubW1pb2ZsaXBzLAorCQkJCQkgICAgZmFsc2UpKTsKIAkJaTkxNV9nZW1f cmVxdWVzdF91bnJlZmVyZW5jZShtbWlvX2ZsaXAtPnJlcSk7CiAJfQogCkBAIC0xMzI1OCw3ICsx MzI1OSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX3ByZXBhcmVfY29tbWl0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCiAKIAkJCXJldCA9IF9faTkxNV93YWl0X3JlcXVlc3QoaW50ZWxfcGxh bmVfc3RhdGUtPndhaXRfcmVxLAogCQkJCQkJICByZXNldF9jb3VudGVyLCB0cnVlLAotCQkJCQkJ ICBOVUxMLCBOVUxMKTsKKwkJCQkJCSAgTlVMTCwgTlVMTCwgZmFsc2UpOwogCiAJCQkvKiBTd2Fs bG93IC1FSU8gZXJyb3JzIHRvIGFsbG93IHVwZGF0ZXMgZHVyaW5nIGh3IGxvY2t1cC4gKi8KIAkJ CWlmIChyZXQgPT0gLUVJTykKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpp bmRleCAzNGZiZTY4Li40ZDc3ODg2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5jCkBAIC0yMjk0LDcgKzIyOTQsNyBAQCBpbnQgaW50ZWxfcmluZ19pZGxlKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJcmV0dXJuIF9faTkxNV93YWl0X3JlcXVlc3QocmVxLAog CQkJCSAgIGF0b21pY19yZWFkKCZ0b19pOTE1KHJpbmctPmRldiktPmdwdV9lcnJvci5yZXNldF9j b3VudGVyKSwKIAkJCQkgICB0b19pOTE1KHJpbmctPmRldiktPm1tLmludGVycnVwdGlibGUsCi0J CQkJICAgTlVMTCwgTlVMTCk7CisJCQkJICAgTlVMTCwgTlVMTCwgdHJ1ZSk7CiB9CiAKIGludCBp bnRlbF9yaW5nX2FsbG9jX3JlcXVlc3RfZXh0cmFzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxdWVzdCkKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=