From: Tvrtko Ursulin Subject: [PATCH v2 5/5] drm/i915: More renaming of rings to engines Date: Fri, 11 Mar 2016 11:38:13 +0000 Message-ID: <1457696293-5957-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1457619668-4685-6-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 70D536EA93 for ; Fri, 11 Mar 2016 11:38:16 +0000 (UTC) In-Reply-To: <1457619668-4685-6-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRoaXMgdGlt ZSB1c2luZyBvbmx5IHNlZCBhbmQgYSBmZXcgYnkgaGFuZC4KCnYyOiBSZW5hbWUgYWxzbyBpbnRl bF9yaW5nX2lkIGFuZCBpbnRlbF9yaW5nX2luaXRpYWxpemVkLgoKU2lnbmVkLW9mZi1ieTogVHZy dGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kbWEuYyAgICAgICAgICAgIHwgMTIgKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaCAgICAgICAgICAgIHwgMTQgKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jICAgICAgICAgICAgfCA1MCArKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2RlYnVnLmMgICAgICB8ICAyICst CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgfCAgNCArLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgICAgICAgICAgICB8ICAyICstCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAgOCArKy0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbW9jcy5jICAgICAgICAgIHwgIDYgKystLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jICAgIHwgMTYgKysrKystLS0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oICAgIHwgMTAgKysrLS0tCiAxMSBmaWxlcyBj aGFuZ2VkLCA2MyBpbnNlcnRpb25zKCspLCA2MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZGVidWdmcy5jCmluZGV4IGRhYmNlODQwM2Q1Ni4uMWQ4YzNlZjI5MzE4IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMjQ4Myw3ICsyNDgzLDcgQEAgc3RhdGljIGlu dCBpOTE1X2d1Y19pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAlzdHJ1Y3Qg aW50ZWxfZ3VjIGd1YzsKIAlzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50IGNsaWVudCA9IHt9OwogCXN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKLQllbnVtIGludGVsX3JpbmdfaWQgaTsKKwll bnVtIGludGVsX2VuZ2luZV9pZCBpOwogCXU2NCB0b3RhbCA9IDA7CiAKIAlpZiAoIUhBU19HVUNf U0NIRUQoZGV2X3ByaXYtPmRldikpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2RtYS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYwppbmRleCAxOWY2MDVi MGNkNmQuLjkzYjc3NGM5OTBjMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kbWEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCkBAIC04NywxNiAr ODcsMTYgQEAgc3RhdGljIGludCBpOTE1X2dldHBhcmFtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHZvaWQgKmRhdGEsCiAJCXZhbHVlID0gMTsKIAkJYnJlYWs7CiAJY2FzZSBJOTE1X1BBUkFNX0hB U19CU0Q6Ci0JCXZhbHVlID0gaW50ZWxfcmluZ19pbml0aWFsaXplZCgmZGV2X3ByaXYtPmVuZ2lu ZVtWQ1NdKTsKKwkJdmFsdWUgPSBpbnRlbF9lbmdpbmVfaW50aWFsaXplZCgmZGV2X3ByaXYtPmVu Z2luZVtWQ1NdKTsKIAkJYnJlYWs7CiAJY2FzZSBJOTE1X1BBUkFNX0hBU19CTFQ6Ci0JCXZhbHVl ID0gaW50ZWxfcmluZ19pbml0aWFsaXplZCgmZGV2X3ByaXYtPmVuZ2luZVtCQ1NdKTsKKwkJdmFs dWUgPSBpbnRlbF9lbmdpbmVfaW50aWFsaXplZCgmZGV2X3ByaXYtPmVuZ2luZVtCQ1NdKTsKIAkJ YnJlYWs7CiAJY2FzZSBJOTE1X1BBUkFNX0hBU19WRUJPWDoKLQkJdmFsdWUgPSBpbnRlbF9yaW5n X2luaXRpYWxpemVkKCZkZXZfcHJpdi0+ZW5naW5lW1ZFQ1NdKTsKKwkJdmFsdWUgPSBpbnRlbF9l bmdpbmVfaW50aWFsaXplZCgmZGV2X3ByaXYtPmVuZ2luZVtWRUNTXSk7CiAJCWJyZWFrOwogCWNh c2UgSTkxNV9QQVJBTV9IQVNfQlNEMjoKLQkJdmFsdWUgPSBpbnRlbF9yaW5nX2luaXRpYWxpemVk KCZkZXZfcHJpdi0+ZW5naW5lW1ZDUzJdKTsKKwkJdmFsdWUgPSBpbnRlbF9lbmdpbmVfaW50aWFs aXplZCgmZGV2X3ByaXYtPmVuZ2luZVtWQ1MyXSk7CiAJCWJyZWFrOwogCWNhc2UgSTkxNV9QQVJB TV9IQVNfUkVMQVhFRF9GRU5DSU5HOgogCQl2YWx1ZSA9IDE7CkBAIC00NDQsNyArNDQ0LDcgQEAg c3RhdGljIGludCBpOTE1X2xvYWRfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAKIGNsZWFudXBfZ2VtOgogCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQlpOTE1 X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKKwlpOTE1X2dlbV9jbGVhbnVwX2VuZ2luZXMo ZGV2KTsKIAlpOTE1X2dlbV9jb250ZXh0X2ZpbmkoZGV2KTsKIAltdXRleF91bmxvY2soJmRldi0+ c3RydWN0X211dGV4KTsKIGNsZWFudXBfaXJxOgpAQCAtMTI2MSw3ICsxMjYxLDcgQEAgaW50IGk5 MTVfZHJpdmVyX3VubG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJaW50ZWxfZ3VjX3Vj b2RlX2ZpbmkoZGV2KTsKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JaTkxNV9n ZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7CisJaTkxNV9nZW1fY2xlYW51cF9lbmdpbmVzKGRl dik7CiAJaTkxNV9nZW1fY29udGV4dF9maW5pKGRldik7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0 cnVjdF9tdXRleCk7CiAJaW50ZWxfZmJjX2NsZWFudXBfY2ZiKGRldl9wcml2KTsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCmluZGV4IGVhNmQ1ODUwMGViZi4uMzhmYjEyYWNhODAxIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKQEAgLTE5MzEsOSArMTkzMSw5IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlIHsKIAkJaW50ICgqZXhlY2J1Zl9zdWJtaXQpKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFy YW1zICpwYXJhbXMsCiAJCQkJICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9leGVjYnVmZmVyMiAq YXJncywKIAkJCQkgICAgICBzdHJ1Y3QgbGlzdF9oZWFkICp2bWFzKTsKLQkJaW50ICgqaW5pdF9y aW5ncykoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci0JCXZvaWQgKCpjbGVhbnVwX3JpbmcpKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwotCQl2b2lkICgqc3RvcF9yaW5nKShzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nKTsKKwkJaW50ICgqaW5pdF9lbmdpbmVzKShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KTsKKwkJdm9pZCAoKmNsZWFudXBfZW5naW5lKShzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmUpOworCQl2b2lkICgqc3RvcF9lbmdpbmUpKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSk7CiAJfSBndDsKIAogCXN0cnVjdCBpbnRlbF9jb250ZXh0ICprZXJuZWxf Y29udGV4dDsKQEAgLTE5NjksNyArMTk2OSw3IEBAIHN0YXRpYyBpbmxpbmUgc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmd1Y190b19pOTE1KHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIC8qIEl0ZXJh dGUgb3ZlciBpbml0aWFsaXNlZCByaW5ncyAqLwogI2RlZmluZSBmb3JfZWFjaF9lbmdpbmUocmlu Z19fLCBkZXZfcHJpdl9fLCBpX18pIFwKIAlmb3IgKChpX18pID0gMDsgKGlfXykgPCBJOTE1X05V TV9FTkdJTkVTOyAoaV9fKSsrKSBcCi0JCWZvcl9lYWNoX2lmICgoKChyaW5nX18pID0gJihkZXZf cHJpdl9fKS0+ZW5naW5lWyhpX18pXSksIGludGVsX3JpbmdfaW5pdGlhbGl6ZWQoKHJpbmdfXykp KSkKKwkJZm9yX2VhY2hfaWYgKCgoKHJpbmdfXykgPSAmKGRldl9wcml2X18pLT5lbmdpbmVbKGlf XyldKSwgaW50ZWxfZW5naW5lX2ludGlhbGl6ZWQoKHJpbmdfXykpKSkKIAogZW51bSBoZG1pX2Zv cmNlX2F1ZGlvIHsKIAlIRE1JX0FVRElPX09GRl9EVkkgPSAtMiwJLyogbm8gYXV4IGRhdGEgZm9y IEhETUktRFZJIGNvbnZlcnRlciAqLwpAQCAtMjAzOSw3ICsyMDM5LDcgQEAgc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgewogCXN0cnVjdCBkcm1fbW1fbm9kZSAqc3RvbGVuOwogCXN0cnVjdCBs aXN0X2hlYWQgZ2xvYmFsX2xpc3Q7CiAKLQlzdHJ1Y3QgbGlzdF9oZWFkIHJpbmdfbGlzdFtJOTE1 X05VTV9FTkdJTkVTXTsKKwlzdHJ1Y3QgbGlzdF9oZWFkIGVuZ2luZV9saXN0W0k5MTVfTlVNX0VO R0lORVNdOwogCS8qKiBVc2VkIGluIGV4ZWNidWYgdG8gdGVtcG9yYXJpbHkgaG9sZCBhIHJlZiAq LwogCXN0cnVjdCBsaXN0X2hlYWQgb2JqX2V4ZWNfbGluazsKIApAQCAtMzAwMiwxMSArMzAwMiwx MSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaTkxNV9zdG9wX3JpbmdfYWxsb3dfd2FybihzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB2b2lkIGk5MTVfZ2VtX3Jlc2V0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpOwogYm9vbCBpOTE1X2dlbV9jbGZsdXNoX29iamVjdChzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2JqLCBib29sIGZvcmNlKTsKIGludCBfX211c3RfY2hlY2sgaTkx NV9nZW1faW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKLWludCBpOTE1X2dlbV9pbml0X3Jp bmdzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOworaW50IGk5MTVfZ2VtX2luaXRfZW5naW5lcyhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1faW5pdF9o dyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCBpOTE1X2dlbV9sM19yZW1hcChzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwgaW50IHNsaWNlKTsKIHZvaWQgaTkxNV9nZW1faW5p dF9zd2l6emxpbmcoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci12b2lkIGk5MTVfZ2VtX2NsZWFu dXBfcmluZ2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKK3ZvaWQgaTkxNV9nZW1fY2xl YW51cF9lbmdpbmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50IF9fbXVzdF9jaGVjayBp OTE1X2dwdV9pZGxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50IF9fbXVzdF9jaGVjayBp OTE1X2dlbV9zdXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBfX2k5MTVfYWRk X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYwppbmRleCAwYWUxOTNmOWJjYmUuLjMxNjUyYzFkYTc2MSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jCkBAIC0yNDEzLDcgKzI0MTMsNyBAQCB2b2lkIGk5MTVfdm1hX21vdmVfdG9fYWN0 aXZlKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAogCQlkcm1fZ2VtX29iamVjdF9yZWZlcmVuY2UoJm9i ai0+YmFzZSk7CiAJb2JqLT5hY3RpdmUgfD0gaW50ZWxfZW5naW5lX2ZsYWcoZW5naW5lKTsKIAot CWxpc3RfbW92ZV90YWlsKCZvYmotPnJpbmdfbGlzdFtlbmdpbmUtPmlkXSwgJmVuZ2luZS0+YWN0 aXZlX2xpc3QpOworCWxpc3RfbW92ZV90YWlsKCZvYmotPmVuZ2luZV9saXN0W2VuZ2luZS0+aWRd LCAmZW5naW5lLT5hY3RpdmVfbGlzdCk7CiAJaTkxNV9nZW1fcmVxdWVzdF9hc3NpZ24oJm9iai0+ bGFzdF9yZWFkX3JlcVtlbmdpbmUtPmlkXSwgcmVxKTsKIAogCWxpc3RfbW92ZV90YWlsKCZ2bWEt PnZtX2xpbmssICZ2bWEtPnZtLT5hY3RpdmVfbGlzdCk7CkBAIC0yNDM3LDcgKzI0MzcsNyBAQCBp OTE1X2dlbV9vYmplY3RfcmV0aXJlX19yZWFkKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpv YmosIGludCByaW5nKQogCVJRX0JVR19PTihvYmotPmxhc3RfcmVhZF9yZXFbcmluZ10gPT0gTlVM TCk7CiAJUlFfQlVHX09OKCEob2JqLT5hY3RpdmUgJiAoMSA8PCByaW5nKSkpOwogCi0JbGlzdF9k ZWxfaW5pdCgmb2JqLT5yaW5nX2xpc3RbcmluZ10pOworCWxpc3RfZGVsX2luaXQoJm9iai0+ZW5n aW5lX2xpc3RbcmluZ10pOwogCWk5MTVfZ2VtX3JlcXVlc3RfYXNzaWduKCZvYmotPmxhc3RfcmVh ZF9yZXFbcmluZ10sIE5VTEwpOwogCiAJaWYgKG9iai0+bGFzdF93cml0ZV9yZXEgJiYgb2JqLT5s YXN0X3dyaXRlX3JlcS0+ZW5naW5lLT5pZCA9PSByaW5nKQpAQCAtMjgzMCw3ICsyODMwLDcgQEAg c3RhdGljIHZvaWQgaTkxNV9nZW1fcmVzZXRfZW5naW5lX2NsZWFudXAoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAogCiAJCW9iaiA9IGxpc3RfZmlyc3RfZW50cnkoJmVuZ2luZS0+ YWN0aXZlX2xpc3QsCiAJCQkJICAgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0LAotCQkJ CSAgICAgICByaW5nX2xpc3RbZW5naW5lLT5pZF0pOworCQkJCSAgICAgICBlbmdpbmVfbGlzdFtl bmdpbmUtPmlkXSk7CiAKIAkJaTkxNV9nZW1fb2JqZWN0X3JldGlyZV9fcmVhZChvYmosIGVuZ2lu ZS0+aWQpOwogCX0KQEAgLTI5NDEsNyArMjk0MSw3IEBAIGk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0 c19yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAogCQlvYmogPSBsaXN0X2Zp cnN0X2VudHJ5KCZlbmdpbmUtPmFjdGl2ZV9saXN0LAogCQkJCSAgICAgICBzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCwKLQkJCQkgICAgICAgcmluZ19saXN0W2VuZ2luZS0+aWRdKTsKKwkJCQkg ICAgICAgZW5naW5lX2xpc3RbZW5naW5lLT5pZF0pOwogCiAJCWlmICghbGlzdF9lbXB0eSgmb2Jq LT5sYXN0X3JlYWRfcmVxW2VuZ2luZS0+aWRdLT5saXN0KSkKIAkJCWJyZWFrOwpAQCAtNDQ0OCw3 ICs0NDQ4LDcgQEAgdm9pZCBpOTE1X2dlbV9vYmplY3RfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqb2JqLAogCiAJSU5JVF9MSVNUX0hFQUQoJm9iai0+Z2xvYmFsX2xpc3QpOwogCWZv ciAoaSA9IDA7IGkgPCBJOTE1X05VTV9FTkdJTkVTOyBpKyspCi0JCUlOSVRfTElTVF9IRUFEKCZv YmotPnJpbmdfbGlzdFtpXSk7CisJCUlOSVRfTElTVF9IRUFEKCZvYmotPmVuZ2luZV9saXN0W2ld KTsKIAlJTklUX0xJU1RfSEVBRCgmb2JqLT5vYmpfZXhlY19saW5rKTsKIAlJTklUX0xJU1RfSEVB RCgmb2JqLT52bWFfbGlzdCk7CiAJSU5JVF9MSVNUX0hFQUQoJm9iai0+YmF0Y2hfcG9vbF9saW5r KTsKQEAgLTQ2NTMsMTQgKzQ2NTMsMTQgQEAgdm9pZCBpOTE1X2dlbV92bWFfZGVzdHJveShzdHJ1 Y3QgaTkxNV92bWEgKnZtYSkKIH0KIAogc3RhdGljIHZvaWQKLWk5MTVfZ2VtX3N0b3BfcmluZ2J1 ZmZlcnMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK2k5MTVfZ2VtX3N0b3BfZW5naW5lcyhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwog CWludCBpOwogCiAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGkpCi0JCWRldl9w cml2LT5ndC5zdG9wX3JpbmcoZW5naW5lKTsKKwkJZGV2X3ByaXYtPmd0LnN0b3BfZW5naW5lKGVu Z2luZSk7CiB9CiAKIGludApAQCAtNDY3Niw3ICs0Njc2LDcgQEAgaTkxNV9nZW1fc3VzcGVuZChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzKGRldik7 CiAKLQlpOTE1X2dlbV9zdG9wX3JpbmdidWZmZXJzKGRldik7CisJaTkxNV9nZW1fc3RvcF9lbmdp bmVzKGRldik7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAKIAljYW5jZWxf ZGVsYXllZF93b3JrX3N5bmMoJmRldl9wcml2LT5ncHVfZXJyb3IuaGFuZ2NoZWNrX3dvcmspOwpA QCAtNDc3OCw3ICs0Nzc4LDcgQEAgc3RhdGljIHZvaWQgaW5pdF91bnVzZWRfcmluZ3Moc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAl9CiB9CiAKLWludCBpOTE1X2dlbV9pbml0X3JpbmdzKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCitpbnQgaTkxNV9nZW1faW5pdF9lbmdpbmVzKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2 LT5kZXZfcHJpdmF0ZTsKIAlpbnQgcmV0OwpAQCAtNDgxNCwxMyArNDgxNCwxMyBAQCBpbnQgaTkx NV9nZW1faW5pdF9yaW5ncyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXJldHVybiAwOwogCiBj bGVhbnVwX3ZlYm94X3Jpbmc6Ci0JaW50ZWxfY2xlYW51cF9yaW5nX2J1ZmZlcigmZGV2X3ByaXYt PmVuZ2luZVtWRUNTXSk7CisJaW50ZWxfY2xlYW51cF9lbmdpbmUoJmRldl9wcml2LT5lbmdpbmVb VkVDU10pOwogY2xlYW51cF9ibHRfcmluZzoKLQlpbnRlbF9jbGVhbnVwX3JpbmdfYnVmZmVyKCZk ZXZfcHJpdi0+ZW5naW5lW0JDU10pOworCWludGVsX2NsZWFudXBfZW5naW5lKCZkZXZfcHJpdi0+ ZW5naW5lW0JDU10pOwogY2xlYW51cF9ic2RfcmluZzoKLQlpbnRlbF9jbGVhbnVwX3JpbmdfYnVm ZmVyKCZkZXZfcHJpdi0+ZW5naW5lW1ZDU10pOworCWludGVsX2NsZWFudXBfZW5naW5lKCZkZXZf cHJpdi0+ZW5naW5lW1ZDU10pOwogY2xlYW51cF9yZW5kZXJfcmluZzoKLQlpbnRlbF9jbGVhbnVw X3JpbmdfYnVmZmVyKCZkZXZfcHJpdi0+ZW5naW5lW1JDU10pOworCWludGVsX2NsZWFudXBfZW5n aW5lKCZkZXZfcHJpdi0+ZW5naW5lW1JDU10pOwogCiAJcmV0dXJuIHJldDsKIH0KQEAgLTQ5MDcs NyArNDkwNyw3IEBAIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJ cmVxID0gaTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhlbmdpbmUsIE5VTEwpOwogCQlpZiAoSVNfRVJS KHJlcSkpIHsKIAkJCXJldCA9IFBUUl9FUlIocmVxKTsKLQkJCWk5MTVfZ2VtX2NsZWFudXBfcmlu Z2J1ZmZlcihkZXYpOworCQkJaTkxNV9nZW1fY2xlYW51cF9lbmdpbmVzKGRldik7CiAJCQlnb3Rv IG91dDsKIAkJfQogCkBAIC00OTIwLDcgKzQ5MjAsNyBAQCBpOTE1X2dlbV9pbml0X2h3KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAJCWlmIChyZXQgJiYgcmV0ICE9IC1FSU8pIHsKIAkJCURSTV9F UlJPUigiUFBHVFQgZW5hYmxlIHJpbmcgIyVkIGZhaWxlZCAlZFxuIiwgaSwgcmV0KTsKIAkJCWk5 MTVfZ2VtX3JlcXVlc3RfY2FuY2VsKHJlcSk7Ci0JCQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZm ZXIoZGV2KTsKKwkJCWk5MTVfZ2VtX2NsZWFudXBfZW5naW5lcyhkZXYpOwogCQkJZ290byBvdXQ7 CiAJCX0KIApAQCAtNDkyOCw3ICs0OTI4LDcgQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCQlpZiAocmV0ICYmIHJldCAhPSAtRUlPKSB7CiAJCQlEUk1fRVJST1Io IkNvbnRleHQgZW5hYmxlIHJpbmcgIyVkIGZhaWxlZCAlZFxuIiwgaSwgcmV0KTsKIAkJCWk5MTVf Z2VtX3JlcXVlc3RfY2FuY2VsKHJlcSk7Ci0JCQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIo ZGV2KTsKKwkJCWk5MTVfZ2VtX2NsZWFudXBfZW5naW5lcyhkZXYpOwogCQkJZ290byBvdXQ7CiAJ CX0KIApAQCAtNDk1MiwxNCArNDk1MiwxNCBAQCBpbnQgaTkxNV9nZW1faW5pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCiAJaWYgKCFpOTE1LmVuYWJsZV9leGVjbGlzdHMpIHsKIAkJZGV2X3By aXYtPmd0LmV4ZWNidWZfc3VibWl0ID0gaTkxNV9nZW1fcmluZ2J1ZmZlcl9zdWJtaXNzaW9uOwot CQlkZXZfcHJpdi0+Z3QuaW5pdF9yaW5ncyA9IGk5MTVfZ2VtX2luaXRfcmluZ3M7Ci0JCWRldl9w cml2LT5ndC5jbGVhbnVwX3JpbmcgPSBpbnRlbF9jbGVhbnVwX3JpbmdfYnVmZmVyOwotCQlkZXZf cHJpdi0+Z3Quc3RvcF9yaW5nID0gaW50ZWxfc3RvcF9yaW5nX2J1ZmZlcjsKKwkJZGV2X3ByaXYt Pmd0LmluaXRfZW5naW5lcyA9IGk5MTVfZ2VtX2luaXRfZW5naW5lczsKKwkJZGV2X3ByaXYtPmd0 LmNsZWFudXBfZW5naW5lID0gaW50ZWxfY2xlYW51cF9lbmdpbmU7CisJCWRldl9wcml2LT5ndC5z dG9wX2VuZ2luZSA9IGludGVsX3N0b3BfZW5naW5lOwogCX0gZWxzZSB7CiAJCWRldl9wcml2LT5n dC5leGVjYnVmX3N1Ym1pdCA9IGludGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uOwotCQlkZXZfcHJp di0+Z3QuaW5pdF9yaW5ncyA9IGludGVsX2xvZ2ljYWxfcmluZ3NfaW5pdDsKLQkJZGV2X3ByaXYt Pmd0LmNsZWFudXBfcmluZyA9IGludGVsX2xvZ2ljYWxfcmluZ19jbGVhbnVwOwotCQlkZXZfcHJp di0+Z3Quc3RvcF9yaW5nID0gaW50ZWxfbG9naWNhbF9yaW5nX3N0b3A7CisJCWRldl9wcml2LT5n dC5pbml0X2VuZ2luZXMgPSBpbnRlbF9sb2dpY2FsX3JpbmdzX2luaXQ7CisJCWRldl9wcml2LT5n dC5jbGVhbnVwX2VuZ2luZSA9IGludGVsX2xvZ2ljYWxfcmluZ19jbGVhbnVwOworCQlkZXZfcHJp di0+Z3Quc3RvcF9lbmdpbmUgPSBpbnRlbF9sb2dpY2FsX3Jpbmdfc3RvcDsKIAl9CiAKIAkvKiBU aGlzIGlzIGp1c3QgYSBzZWN1cml0eSBibGFua2V0IHRvIHBsYWNhdGUgZHJhZ29ucy4KQEAgLTQ5 ODAsNyArNDk4MCw3IEBAIGludCBpOTE1X2dlbV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJaWYgKHJldCkKIAkJZ290byBvdXRfdW5sb2NrOwogCi0JcmV0ID0gZGV2X3ByaXYtPmd0Lmlu aXRfcmluZ3MoZGV2KTsKKwlyZXQgPSBkZXZfcHJpdi0+Z3QuaW5pdF9lbmdpbmVzKGRldik7CiAJ aWYgKHJldCkKIAkJZ290byBvdXRfdW5sb2NrOwogCkBAIC01MDAzLDE0ICs1MDAzLDE0IEBAIG91 dF91bmxvY2s6CiB9CiAKIHZvaWQKLWk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQoraTkxNV9nZW1fY2xlYW51cF9lbmdpbmVzKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5k ZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CiAJaW50IGk7CiAK IAlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaSkKLQkJZGV2X3ByaXYtPmd0LmNs ZWFudXBfcmluZyhlbmdpbmUpOworCQlkZXZfcHJpdi0+Z3QuY2xlYW51cF9lbmdpbmUoZW5naW5l KTsKIAogICAgIGlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMpCiAgICAgICAgICAgICAvKgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZGVidWcuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2RlYnVnLmMKaW5kZXggZTBiY2E3ZDViMGQ2Li5lZjljZDcw MGYwMmYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2RlYnVnLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZGVidWcuYwpAQCAtNDUsNyArNDUs NyBAQCBpOTE1X3ZlcmlmeV9saXN0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJZm9yX2Vh Y2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGkpIHsKIAkJbGlzdF9mb3JfZWFjaF9lbnRyeShv YmosICZlbmdpbmUtPmFjdGl2ZV9saXN0LAotCQkJCSAgICByaW5nX2xpc3RbZW5naW5lLT5pZF0p IHsKKwkJCQkgICAgZW5naW5lX2xpc3RbZW5naW5lLT5pZF0pIHsKIAkJCWlmIChvYmotPmJhc2Uu ZGV2ICE9IGRldiB8fAogCQkJICAgICFhdG9taWNfcmVhZCgmb2JqLT5iYXNlLnJlZmNvdW50LnJl ZmNvdW50KSkgewogCQkJCURSTV9FUlJPUigiJXM6IGZyZWVkIGFjdGl2ZSBvYmogJXBcbiIsCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5kZXggYzA1NDVkYjg1 YThjLi40YjM2NDg4YmQ0YjAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2V4ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVj YnVmZmVyLmMKQEAgLTEzNjksNyArMTM2OSw3IEBAIGViX2dldF9iYXRjaChzdHJ1Y3QgZWJfdm1h cyAqZWIpCiAKICNkZWZpbmUgSTkxNV9VU0VSX1JJTkdTICg0KQogCi1zdGF0aWMgY29uc3QgZW51 bSBpbnRlbF9yaW5nX2lkIHVzZXJfcmluZ19tYXBbSTkxNV9VU0VSX1JJTkdTICsgMV0gPSB7Citz dGF0aWMgY29uc3QgZW51bSBpbnRlbF9lbmdpbmVfaWQgdXNlcl9yaW5nX21hcFtJOTE1X1VTRVJf UklOR1MgKyAxXSA9IHsKIAlbSTkxNV9FWEVDX0RFRkFVTFRdCT0gUkNTLAogCVtJOTE1X0VYRUNf UkVOREVSXQk9IFJDUywKIAlbSTkxNV9FWEVDX0JMVF0JCT0gQkNTLApAQCAtMTQxNyw3ICsxNDE3 LDcgQEAgZWJfc2VsZWN0X3Jpbmcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAog CQkqcmluZyA9ICZkZXZfcHJpdi0+ZW5naW5lW3VzZXJfcmluZ19tYXBbdXNlcl9yaW5nX2lkXV07 CiAJfQogCi0JaWYgKCFpbnRlbF9yaW5nX2luaXRpYWxpemVkKCpyaW5nKSkgeworCWlmICghaW50 ZWxfZW5naW5lX2ludGlhbGl6ZWQoKnJpbmcpKSB7CiAJCURSTV9ERUJVRygiZXhlY2J1ZiB3aXRo IGludmFsaWQgcmluZzogJXVcbiIsIHVzZXJfcmluZ19pZCk7CiAJCXJldHVybiAtRUlOVkFMOwog CX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCmluZGV4IDYzZWQ3N2ZlNmJjNC4uZWE5ZWEwZjUyYTkw IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTk5Niw3ICs5OTYsNyBAQCBzdGF0aWMgdm9p ZCBpcm9ubGFrZV9ycHNfY2hhbmdlX2lycV9oYW5kbGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAKIHN0YXRpYyB2b2lkIG5vdGlmeV9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZSkKIHsKLQlpZiAoIWludGVsX3JpbmdfaW5pdGlhbGl6ZWQoZW5naW5lKSkKKwlpZiAoIWludGVs X2VuZ2luZV9pbnRpYWxpemVkKGVuZ2luZSkpCiAJCXJldHVybjsKIAogCXRyYWNlX2k5MTVfZ2Vt X3JlcXVlc3Rfbm90aWZ5KGVuZ2luZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IGYy Y2YwZTE2ODE0MS4uYzI0NmM2YzkyYmYxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAt Nzk1LDcgKzc5NSw3IEBAIGludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlX2FuZF9zdWJtaXQoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogCWludGVsX2xvZ2ljYWxfcmluZ19l bWl0KHJpbmdidWYsIE1JX05PT1ApOwogCWludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlKHJpbmdi dWYpOwogCi0JaWYgKGludGVsX3Jpbmdfc3RvcHBlZChlbmdpbmUpKQorCWlmIChpbnRlbF9lbmdp bmVfc3RvcHBlZChlbmdpbmUpKQogCQlyZXR1cm4gMDsKIAogCWlmIChlbmdpbmUtPmxhc3RfY29u dGV4dCAhPSByZXF1ZXN0LT5jdHgpIHsKQEAgLTEwNTQsNyArMTA1NCw3IEBAIHZvaWQgaW50ZWxf bG9naWNhbF9yaW5nX3N0b3Aoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+ZGV2LT5kZXZfcHJpdmF0ZTsK IAlpbnQgcmV0OwogCi0JaWYgKCFpbnRlbF9yaW5nX2luaXRpYWxpemVkKGVuZ2luZSkpCisJaWYg KCFpbnRlbF9lbmdpbmVfaW50aWFsaXplZChlbmdpbmUpKQogCQlyZXR1cm47CiAKIAlyZXQgPSBp bnRlbF9lbmdpbmVfaWRsZShlbmdpbmUpOwpAQCAtMjAxMiw3ICsyMDEyLDcgQEAgdm9pZCBpbnRl bF9sb2dpY2FsX3JpbmdfY2xlYW51cChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7 CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2OwogCi0JaWYgKCFpbnRlbF9yaW5n X2luaXRpYWxpemVkKGVuZ2luZSkpCisJaWYgKCFpbnRlbF9lbmdpbmVfaW50aWFsaXplZChlbmdp bmUpKQogCQlyZXR1cm47CiAKIAlkZXZfcHJpdiA9IGVuZ2luZS0+ZGV2LT5kZXZfcHJpdmF0ZTsK QEAgLTIyNDAsNyArMjI0MCw3IEBAIHN0YXRpYyBpbnQgbG9naWNhbF92ZWJveF9yaW5nX2luaXQo c3RydWN0IGRybV9kZXZpY2UgKmRldikKICAqIEBkZXY6IERSTSBkZXZpY2UuCiAgKgogICogVGhp cyBmdW5jdGlvbiBpbml0cyB0aGUgZW5naW5lcyBmb3IgYW4gRXhlY2xpc3RzIHN1Ym1pc3Npb24g c3R5bGUgKHRoZSBlcXVpdmFsZW50IGluIHRoZQotICogbGVnYWN5IHJpbmdidWZmZXIgc3VibWlz c2lvbiB3b3JsZCB3b3VsZCBiZSBpOTE1X2dlbV9pbml0X3JpbmdzKS4gSXQgZG9lcyBpdCBvbmx5 IGZvcgorICogbGVnYWN5IHJpbmdidWZmZXIgc3VibWlzc2lvbiB3b3JsZCB3b3VsZCBiZSBpOTE1 X2dlbV9pbml0X2VuZ2luZXMpLiBJdCBkb2VzIGl0IG9ubHkgZm9yCiAgKiB0aG9zZSBlbmdpbmVz IHRoYXQgYXJlIHByZXNlbnQgaW4gdGhlIGhhcmR3YXJlLgogICoKICAqIFJldHVybjogbm9uLXpl cm8gaWYgdGhlIGluaXRpYWxpemF0aW9uIGZhaWxlZC4KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX21vY3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX21vY3Mu YwppbmRleCA2ZTkzNmM3ZTM4MmEuLjNjNzI1ZGRlMTZlZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbW9jcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X21vY3MuYwpAQCAtMTU5LDcgKzE1OSw3IEBAIHN0YXRpYyBib29sIGdldF9tb2NzX3NldHRpbmdz KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJcmV0dXJuIHJlc3VsdDsKIH0KIAotc3RhdGljIGk5 MTVfcmVnX3QgbW9jc19yZWdpc3RlcihlbnVtIGludGVsX3JpbmdfaWQgcmluZywgaW50IGluZGV4 KQorc3RhdGljIGk5MTVfcmVnX3QgbW9jc19yZWdpc3RlcihlbnVtIGludGVsX2VuZ2luZV9pZCBy aW5nLCBpbnQgaW5kZXgpCiB7CiAJc3dpdGNoIChyaW5nKSB7CiAJY2FzZSBSQ1M6CkBAIC0xOTEs NyArMTkxLDcgQEAgc3RhdGljIGk5MTVfcmVnX3QgbW9jc19yZWdpc3RlcihlbnVtIGludGVsX3Jp bmdfaWQgcmluZywgaW50IGluZGV4KQogICovCiBzdGF0aWMgaW50IGVtaXRfbW9jc19jb250cm9s X3RhYmxlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQkJCSAgIGNvbnN0IHN0 cnVjdCBkcm1faTkxNV9tb2NzX3RhYmxlICp0YWJsZSwKLQkJCQkgICBlbnVtIGludGVsX3Jpbmdf aWQgcmluZykKKwkJCQkgICBlbnVtIGludGVsX2VuZ2luZV9pZCByaW5nKQogewogCXN0cnVjdCBp bnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0gcmVxLT5yaW5nYnVmOwogCXVuc2lnbmVkIGludCBp bmRleDsKQEAgLTMyNSw3ICszMjUsNyBAQCBpbnQgaW50ZWxfcmNzX2NvbnRleHRfaW5pdF9tb2Nz KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogCWlmIChnZXRfbW9jc19zZXR0aW5n cyhyZXEtPmVuZ2luZS0+ZGV2LCAmdCkpIHsKIAkJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gcmVxLT5pOTE1OwogCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7Ci0J CWVudW0gaW50ZWxfcmluZ19pZCByaW5nX2lkOworCQllbnVtIGludGVsX2VuZ2luZV9pZCByaW5n X2lkOwogCiAJCS8qIFByb2dyYW0gdGhlIGNvbnRyb2wgcmVnaXN0ZXJzICovCiAJCWZvcl9lYWNo X2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCByaW5nX2lkKSB7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggZjc0OTNjNWJmZjA3Li5lMjczMGE0NzViMzggMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTU5LDcgKzU5LDcgQEAgaW50 IGludGVsX3Jpbmdfc3BhY2Uoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYpCiAJcmV0 dXJuIHJpbmdidWYtPnNwYWNlOwogfQogCi1ib29sIGludGVsX3Jpbmdfc3RvcHBlZChzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUpCitib29sIGludGVsX2VuZ2luZV9zdG9wcGVkKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSBlbmdpbmUtPmRldi0+ZGV2X3ByaXZhdGU7CiAJcmV0dXJuIGRldl9wcml2LT5n cHVfZXJyb3Iuc3RvcF9yaW5ncyAmIGludGVsX2VuZ2luZV9mbGFnKGVuZ2luZSk7CkBAIC02OSw3 ICs2OSw3IEBAIHN0YXRpYyB2b2lkIF9faW50ZWxfcmluZ19hZHZhbmNlKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9 IGVuZ2luZS0+YnVmZmVyOwogCXJpbmdidWYtPnRhaWwgJj0gcmluZ2J1Zi0+c2l6ZSAtIDE7Ci0J aWYgKGludGVsX3Jpbmdfc3RvcHBlZChlbmdpbmUpKQorCWlmIChpbnRlbF9lbmdpbmVfc3RvcHBl ZChlbmdpbmUpKQogCQlyZXR1cm47CiAJZW5naW5lLT53cml0ZV90YWlsKGVuZ2luZSwgcmluZ2J1 Zi0+dGFpbCk7CiB9CkBAIC0yMjc0LDIxICsyMjc0LDIxIEBAIHN0YXRpYyBpbnQgaW50ZWxfaW5p dF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXJldHVybiAwOwogCiBlcnJv cjoKLQlpbnRlbF9jbGVhbnVwX3JpbmdfYnVmZmVyKGVuZ2luZSk7CisJaW50ZWxfY2xlYW51cF9l bmdpbmUoZW5naW5lKTsKIAlyZXR1cm4gcmV0OwogfQogCi12b2lkIGludGVsX2NsZWFudXBfcmlu Z19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQordm9pZCBpbnRlbF9jbGVh bnVwX2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2OwogCi0JaWYgKCFpbnRlbF9yaW5nX2luaXRpYWxpemVk KGVuZ2luZSkpCisJaWYgKCFpbnRlbF9lbmdpbmVfaW50aWFsaXplZChlbmdpbmUpKQogCQlyZXR1 cm47CiAKIAlkZXZfcHJpdiA9IHRvX2k5MTUoZW5naW5lLT5kZXYpOwogCiAJaWYgKGVuZ2luZS0+ YnVmZmVyKSB7Ci0JCWludGVsX3N0b3BfcmluZ19idWZmZXIoZW5naW5lKTsKKwkJaW50ZWxfc3Rv cF9lbmdpbmUoZW5naW5lKTsKIAkJV0FSTl9PTighSVNfR0VOMihlbmdpbmUtPmRldikgJiYgKEk5 MTVfUkVBRF9NT0RFKGVuZ2luZSkgJiBNT0RFX0lETEUpID09IDApOwogCiAJCWludGVsX3VucGlu X3JpbmdidWZmZXJfb2JqKGVuZ2luZS0+YnVmZmVyKTsKQEAgLTMxNjMsMTEgKzMxNjMsMTEgQEAg aW50ZWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXEpCiB9CiAKIHZvaWQKLWludGVsX3N0b3BfcmluZ19idWZmZXIoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqZW5naW5lKQoraW50ZWxfc3RvcF9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lKQogewogCWludCByZXQ7CiAKLQlpZiAoIWludGVsX3JpbmdfaW5pdGlhbGl6 ZWQoZW5naW5lKSkKKwlpZiAoIWludGVsX2VuZ2luZV9pbnRpYWxpemVkKGVuZ2luZSkpCiAJCXJl dHVybjsKIAogCXJldCA9IGludGVsX2VuZ2luZV9pZGxlKGVuZ2luZSk7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggZWU0ZDlhOGRkYzA0Li45MTE3NTJhODY5ZjAg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTE0Niw3ICsxNDYs NyBAQCBzdHJ1Y3QgIGk5MTVfY3R4X3dvcmthcm91bmRzIHsKIAogc3RydWN0ICBpbnRlbF9lbmdp bmVfY3MgewogCWNvbnN0IGNoYXIJKm5hbWU7Ci0JZW51bSBpbnRlbF9yaW5nX2lkIHsKKwllbnVt IGludGVsX2VuZ2luZV9pZCB7CiAJCVJDUyA9IDAsCiAJCUJDUywKIAkJVkNTLApAQCAtMzU1LDcg KzM1NSw3IEBAIHN0cnVjdCAgaW50ZWxfZW5naW5lX2NzIHsKIH07CiAKIHN0YXRpYyBpbmxpbmUg Ym9vbAotaW50ZWxfcmluZ19pbml0aWFsaXplZChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpCitpbnRlbF9lbmdpbmVfaW50aWFsaXplZChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpCiB7CiAJcmV0dXJuIGVuZ2luZS0+ZGV2ICE9IE5VTEw7CiB9CkBAIC00MzgsOCArNDM4LDgg QEAgaW50IGludGVsX3Bpbl9hbmRfbWFwX3JpbmdidWZmZXJfb2JqKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCiB2b2lkIGludGVsX3VucGluX3JpbmdidWZmZXJfb2JqKHN0cnVjdCBpbnRlbF9yaW5n YnVmZmVyICpyaW5nYnVmKTsKIHZvaWQgaW50ZWxfcmluZ2J1ZmZlcl9mcmVlKHN0cnVjdCBpbnRl bF9yaW5nYnVmZmVyICpyaW5nKTsKIAotdm9pZCBpbnRlbF9zdG9wX3JpbmdfYnVmZmVyKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7Ci12b2lkIGludGVsX2NsZWFudXBfcmluZ19idWZm ZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKK3ZvaWQgaW50ZWxfc3RvcF9lbmdp bmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKK3ZvaWQgaW50ZWxfY2xlYW51cF9l bmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIAogaW50IGludGVsX3Jpbmdf YWxsb2NfcmVxdWVzdF9leHRyYXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0 KTsKIApAQCAtNDY1LDcgKzQ2NSw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBpbnRlbF9yaW5nX2Fk dmFuY2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogaW50IF9faW50ZWxfcmluZ19z cGFjZShpbnQgaGVhZCwgaW50IHRhaWwsIGludCBzaXplKTsKIHZvaWQgaW50ZWxfcmluZ191cGRh dGVfc3BhY2Uoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYpOwogaW50IGludGVsX3Jp bmdfc3BhY2Uoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYpOwotYm9vbCBpbnRlbF9y aW5nX3N0b3BwZWQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKK2Jvb2wgaW50ZWxf ZW5naW5lX3N0b3BwZWQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIAogaW50IF9f bXVzdF9jaGVjayBpbnRlbF9lbmdpbmVfaWRsZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpOwogdm9pZCBpbnRlbF9yaW5nX2luaXRfc2Vxbm8oc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lLCB1MzIgc2Vxbm8pOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=