From: David Weinehall Subject: [PATCH 4/5] drm/i915: pdev cleanup Date: Mon, 8 Aug 2016 16:20:00 +0300 Message-ID: <1470662401-30347-5-git-send-email-david.weinehall@linux.intel.com> References: <1470662401-30347-1-git-send-email-david.weinehall@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id BC1A76E33C for ; Mon, 8 Aug 2016 13:20:06 +0000 (UTC) In-Reply-To: <1470662401-30347-1-git-send-email-david.weinehall@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 SW4gYW4gZWZmb3J0IHRvIHNpbXBsaWZ5IHRoaW5ncyBmb3IgYSBmdXR1cmUgcHVzaCBvZiBkZXZf cHJpdiBpbnN0ZWFkCm9mIGRldiB3aGVyZXZlciBwb3NzaWJsZSwgYWx3YXlzIHRha2UgcGRldiB2 aWEgZGV2X3ByaXYgd2hlcmUKZmVhc2libGUsIGVsaW1pbmF0aW5nIHRoZSBkaXJlY3QgYWNjZXNz IGZyb20gZGV2LiBSaWdodCBub3cgdGhpcwpvbmx5IGVsaW1pbmF0ZXMgYSBmZXcgY2FzZXMgb2Yg ZGV2LCBidXQgaXQgYWxzbyBvYnZpYXRlcyB0aGF0IHdlIHBhc3MKZGV2IGludG8gYSBsb3Qgb2Yg ZnVuY3Rpb25zIHdoZXJlIGRldl9wcml2IHdvdWxkIGJlIHRoZSBtb3JlIG9idmlvdXMKY2hvaWNl LgoKU2lnbmVkLW9mZi1ieTogRGF2aWQgV2VpbmVoYWxsIDxkYXZpZC53ZWluZWhhbGxAbGludXgu aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICAgICB8 ICA1ICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICAgIHwgNTkgKysr KysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuYyAgICAgfCAgNCArKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0 b2xlbi5jICB8IDE3ICsrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vy cm9yLmMgICB8ICA5ICsrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N1c3BlbmQuYyAg ICAgfCAgNiArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICAgfCAy NSArKysrKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYyAgICAg IHwgIDMgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyB8ICAzICst CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9pMmMuYyAgICAgICAgfCAgMyArLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIHwgMzAgKysrKysrKysrLS0tLS0tLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nkdm8uYyAgICAgICB8ICA0ICsrLQogMTIgZmls ZXMgY2hhbmdlZCwgOTkgaW5zZXJ0aW9ucygrKSwgNjkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCA5YmQ0MTU4MWI1OTIuLmFkNGY3MTc4NjY3YyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTI3ODcsNiArMjc4Nyw3IEBAIHN0YXRp YyBpbnQgaTkxNV9ydW50aW1lX3BtX3N0YXR1cyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVu dXNlZCkKIAlzdHJ1Y3QgZHJtX2luZm9fbm9kZSAqbm9kZSA9IG0tPnByaXZhdGU7CiAJc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9IG5vZGUtPm1pbm9yLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0g ZGV2X3ByaXYtPmRybS5wZGV2OwogCiAJaWYgKCFIQVNfUlVOVElNRV9QTShkZXZfcHJpdikpCiAJ CXNlcV9wdXRzKG0sICJSdW50aW1lIHBvd2VyIG1hbmFnZW1lbnQgbm90IHN1cHBvcnRlZFxuIik7 CkBAIC0yODAxLDggKzI4MDIsOCBAQCBzdGF0aWMgaW50IGk5MTVfcnVudGltZV9wbV9zdGF0dXMo c3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQpCiAJc2VxX3ByaW50ZihtLCAiRGV2aWNl IFBvd2VyIE1hbmFnZW1lbnQgKENPTkZJR19QTSkgZGlzYWJsZWRcbiIpOwogI2VuZGlmCiAJc2Vx X3ByaW50ZihtLCAiUENJIGRldmljZSBwb3dlciBzdGF0ZTogJXMgWyVkXVxuIiwKLQkJICAgcGNp X3Bvd2VyX25hbWUoZGV2X3ByaXYtPmRybS5wZGV2LT5jdXJyZW50X3N0YXRlKSwKLQkJICAgZGV2 X3ByaXYtPmRybS5wZGV2LT5jdXJyZW50X3N0YXRlKTsKKwkJICAgcGNpX3Bvd2VyX25hbWUocGRl di0+Y3VycmVudF9zdGF0ZSksCisJCSAgIHBkZXYtPmN1cnJlbnRfc3RhdGUpOwogCiAJcmV0dXJu IDA7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCA1ZTkzMjVlNGIxZTUuLjdlYTZiOGU2 NDY4MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC0yMzIsNiArMjMyLDcgQEAgc3RhdGlj IGludCBpOTE1X2dldHBhcmFtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJ CQkgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gZGV2 X3ByaXYtPmRybS5wZGV2OwogCWRybV9pOTE1X2dldHBhcmFtX3QgKnBhcmFtID0gZGF0YTsKIAlp bnQgdmFsdWU7CiAKQEAgLTI0MiwxMCArMjQzLDEwIEBAIHN0YXRpYyBpbnQgaTkxNV9nZXRwYXJh bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkvKiBSZWplY3QgYWxsIG9s ZCB1bXMvZHJpIHBhcmFtcy4gKi8KIAkJcmV0dXJuIC1FTk9ERVY7CiAJY2FzZSBJOTE1X1BBUkFN X0NISVBTRVRfSUQ6Ci0JCXZhbHVlID0gZGV2LT5wZGV2LT5kZXZpY2U7CisJCXZhbHVlID0gcGRl di0+ZGV2aWNlOwogCQlicmVhazsKIAljYXNlIEk5MTVfUEFSQU1fUkVWSVNJT046Ci0JCXZhbHVl ID0gZGV2LT5wZGV2LT5yZXZpc2lvbjsKKwkJdmFsdWUgPSBwZGV2LT5yZXZpc2lvbjsKIAkJYnJl YWs7CiAJY2FzZSBJOTE1X1BBUkFNX0hBU19HRU06CiAJCXZhbHVlID0gMTsKQEAgLTUxNiw3ICs1 MTcsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X3N3aXRjaGVyb29fc2V0X3N0YXRlKHN0cnVjdCBwY2lf ZGV2ICpwZGV2LCBlbnVtIHZnYV9zd2l0Y2hlcm9vXwogCQlwcl9pbmZvKCJzd2l0Y2hlZCBvblxu Iik7CiAJCWRldi0+c3dpdGNoX3Bvd2VyX3N0YXRlID0gRFJNX1NXSVRDSF9QT1dFUl9DSEFOR0lO RzsKIAkJLyogaTkxNSByZXN1bWUgaGFuZGxlciBkb2Vzbid0IHNldCB0byBEMCAqLwotCQlwY2lf c2V0X3Bvd2VyX3N0YXRlKGRldi0+cGRldiwgUENJX0QwKTsKKwkJcGNpX3NldF9wb3dlcl9zdGF0 ZShwZGV2LCBQQ0lfRDApOwogCQlpOTE1X3Jlc3VtZV9zd2l0Y2hlcm9vKGRldik7CiAJCWRldi0+ c3dpdGNoX3Bvd2VyX3N0YXRlID0gRFJNX1NXSVRDSF9QT1dFUl9PTjsKIAl9IGVsc2UgewpAQCAt NTg1LDYgKzU4Niw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2VtX2Zpbmkoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIHN0YXRpYyBpbnQgaTkxNV9sb2FkX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoZGV2KTsKKwlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IGRldl9wcml2LT5kcm0ucGRldjsKIAlp bnQgcmV0OwogCiAJaWYgKGk5MTVfaW5qZWN0X2xvYWRfZmFpbHVyZSgpKQpAQCAtNjAxLDEzICs2 MDMsMTMgQEAgc3RhdGljIGludCBpOTE1X2xvYWRfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJICogdGhlbiB3ZSBkbyBub3QgdGFrZSBwYXJ0IGluIFZHQSBhcmJpdHJhdGlv biBhbmQgdGhlCiAJICogdmdhX2NsaWVudF9yZWdpc3RlcigpIGZhaWxzIHdpdGggLUVOT0RFVi4K IAkgKi8KLQlyZXQgPSB2Z2FfY2xpZW50X3JlZ2lzdGVyKGRldi0+cGRldiwgZGV2LCBOVUxMLCBp OTE1X3ZnYV9zZXRfZGVjb2RlKTsKKwlyZXQgPSB2Z2FfY2xpZW50X3JlZ2lzdGVyKHBkZXYsIGRl diwgTlVMTCwgaTkxNV92Z2Ffc2V0X2RlY29kZSk7CiAJaWYgKHJldCAmJiByZXQgIT0gLUVOT0RF VikKIAkJZ290byBvdXQ7CiAKIAlpbnRlbF9yZWdpc3Rlcl9kc21faGFuZGxlcigpOwogCi0JcmV0 ID0gdmdhX3N3aXRjaGVyb29fcmVnaXN0ZXJfY2xpZW50KGRldi0+cGRldiwgJmk5MTVfc3dpdGNo ZXJvb19vcHMsIGZhbHNlKTsKKwlyZXQgPSB2Z2Ffc3dpdGNoZXJvb19yZWdpc3Rlcl9jbGllbnQo cGRldiwgJmk5MTVfc3dpdGNoZXJvb19vcHMsIGZhbHNlKTsKIAlpZiAocmV0KQogCQlnb3RvIGNs ZWFudXBfdmdhX2NsaWVudDsKIApAQCAtNjU5LDkgKzY2MSw5IEBAIGNsZWFudXBfaXJxOgogY2xl YW51cF9jc3I6CiAJaW50ZWxfY3NyX3Vjb2RlX2ZpbmkoZGV2X3ByaXYpOwogCWludGVsX3Bvd2Vy X2RvbWFpbnNfZmluaShkZXZfcHJpdik7Ci0JdmdhX3N3aXRjaGVyb29fdW5yZWdpc3Rlcl9jbGll bnQoZGV2LT5wZGV2KTsKKwl2Z2Ffc3dpdGNoZXJvb191bnJlZ2lzdGVyX2NsaWVudChwZGV2KTsK IGNsZWFudXBfdmdhX2NsaWVudDoKLQl2Z2FfY2xpZW50X3JlZ2lzdGVyKGRldi0+cGRldiwgTlVM TCwgTlVMTCwgTlVMTCk7CisJdmdhX2NsaWVudF9yZWdpc3RlcihwZGV2LCBOVUxMLCBOVUxMLCBO VUxMKTsKIG91dDoKIAlyZXR1cm4gcmV0OwogfQpAQCAtODc5LDYgKzg4MSw3IEBAIHN0YXRpYyB2 b2lkIGk5MTVfZHJpdmVyX2NsZWFudXBfZWFybHkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogc3RhdGljIGludCBpOTE1X21taW9fc2V0dXAoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7 CisJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSBkZXZfcHJpdi0+ZHJtLnBkZXY7CiAJaW50IG1taW9f YmFyOwogCWludCBtbWlvX3NpemU7CiAKQEAgLTg5NSw3ICs4OTgsNyBAQCBzdGF0aWMgaW50IGk5 MTVfbW1pb19zZXR1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQltbWlvX3NpemUgPSA1MTIg KiAxMDI0OwogCWVsc2UKIAkJbW1pb19zaXplID0gMiAqIDEwMjQgKiAxMDI0OwotCWRldl9wcml2 LT5yZWdzID0gcGNpX2lvbWFwKGRldi0+cGRldiwgbW1pb19iYXIsIG1taW9fc2l6ZSk7CisJZGV2 X3ByaXYtPnJlZ3MgPSBwY2lfaW9tYXAocGRldiwgbW1pb19iYXIsIG1taW9fc2l6ZSk7CiAJaWYg KGRldl9wcml2LT5yZWdzID09IE5VTEwpIHsKIAkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gbWFwIHJl Z2lzdGVyc1xuIik7CiAKQEAgLTkxMSw5ICs5MTQsMTAgQEAgc3RhdGljIGludCBpOTE1X21taW9f c2V0dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHN0YXRpYyB2b2lkIGk5MTVfbW1pb19jbGVh bnVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gZGV2X3By aXYtPmRybS5wZGV2OwogCiAJaW50ZWxfdGVhcmRvd25fbWNoYmFyKGRldik7Ci0JcGNpX2lvdW5t YXAoZGV2LT5wZGV2LCBkZXZfcHJpdi0+cmVncyk7CisJcGNpX2lvdW5tYXAocGRldiwgZGV2X3By aXYtPnJlZ3MpOwogfQogCiAvKioKQEAgLTk5Miw2ICs5OTYsNyBAQCBzdGF0aWMgdm9pZCBpbnRl bF9zYW5pdGl6ZV9vcHRpb25zKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKICAq Lwogc3RhdGljIGludCBpOTE1X2RyaXZlcl9pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIHsKKwlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IGRldl9wcml2LT5kcm0ucGRl djsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gJmRldl9wcml2LT5kcm07CiAJaW50IHJldDsK IApAQCAtMTAzMCwxMSArMTAzNSwxMSBAQCBzdGF0aWMgaW50IGk5MTVfZHJpdmVyX2luaXRfaHco c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQlnb3RvIG91dF9nZ3R0OwogCX0K IAotCXBjaV9zZXRfbWFzdGVyKGRldi0+cGRldik7CisJcGNpX3NldF9tYXN0ZXIocGRldik7CiAK IAkvKiBvdmVybGF5IG9uIGdlbjIgaXMgYnJva2VuIGFuZCBjYW4ndCBhZGRyZXNzIGFib3ZlIDFH ICovCiAJaWYgKElTX0dFTjIoZGV2KSkgewotCQlyZXQgPSBkbWFfc2V0X2NvaGVyZW50X21hc2so JmRldi0+cGRldi0+ZGV2LCBETUFfQklUX01BU0soMzApKTsKKwkJcmV0ID0gZG1hX3NldF9jb2hl cmVudF9tYXNrKCZwZGV2LT5kZXYsIERNQV9CSVRfTUFTSygzMCkpOwogCQlpZiAocmV0KSB7CiAJ CQlEUk1fRVJST1IoImZhaWxlZCB0byBzZXQgRE1BIG1hc2tcbiIpOwogCkBAIC0xMDUxLDcgKzEw NTYsNyBAQCBzdGF0aWMgaW50IGk5MTVfZHJpdmVyX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogCSAqIHdoaWNoIGFsc28gbmVlZHMgdG8gYmUgaGFuZGxlZCBjYXJl ZnVsbHkuCiAJICovCiAJaWYgKElTX0JST0FEV0FURVIoZGV2KSB8fCBJU19DUkVTVExJTkUoZGV2 KSkgewotCQlyZXQgPSBkbWFfc2V0X2NvaGVyZW50X21hc2soJmRldi0+cGRldi0+ZGV2LCBETUFf QklUX01BU0soMzIpKTsKKwkJcmV0ID0gZG1hX3NldF9jb2hlcmVudF9tYXNrKCZwZGV2LT5kZXYs IERNQV9CSVRfTUFTSygzMikpOwogCiAJCWlmIChyZXQpIHsKIAkJCURSTV9FUlJPUigiZmFpbGVk IHRvIHNldCBETUEgbWFza1xuIik7CkBAIC0xMDgxLDcgKzEwODYsNyBAQCBzdGF0aWMgaW50IGk5 MTVfZHJpdmVyX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCSAq IHN0dWNrIGludGVycnVwdHMgb24gc29tZSBtYWNoaW5lcy4KIAkgKi8KIAlpZiAoIUlTX0k5NDVH KGRldikgJiYgIUlTX0k5NDVHTShkZXYpKSB7Ci0JCWlmIChwY2lfZW5hYmxlX21zaShkZXYtPnBk ZXYpIDwgMCkKKwkJaWYgKHBjaV9lbmFibGVfbXNpKHBkZXYpIDwgMCkKIAkJCURSTV9ERUJVR19E UklWRVIoImNhbid0IGVuYWJsZSBNU0kiKTsKIAl9CiAKQEAgLTEwOTksMTAgKzExMDQsMTAgQEAg b3V0X2dndHQ6CiAgKi8KIHN0YXRpYyB2b2lkIGk5MTVfZHJpdmVyX2NsZWFudXBfaHcoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSAmZGV2X3ByaXYtPmRybTsKKwlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IGRldl9wcml2LT5kcm0u cGRldjsKIAotCWlmIChkZXYtPnBkZXYtPm1zaV9lbmFibGVkKQotCQlwY2lfZGlzYWJsZV9tc2ko ZGV2LT5wZGV2KTsKKwlpZiAocGRldi0+bXNpX2VuYWJsZWQpCisJCXBjaV9kaXNhYmxlX21zaShw ZGV2KTsKIAogCXBtX3Fvc19yZW1vdmVfcmVxdWVzdCgmZGV2X3ByaXYtPnBtX3Fvcyk7CiAJaTkx NV9nZ3R0X2NsZWFudXBfaHcoZGV2X3ByaXYpOwpAQCAtMTI3Miw2ICsxMjc3LDcgQEAgb3V0X2Zy ZWVfcHJpdjoKIHZvaWQgaTkxNV9kcml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwor CXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gZGV2X3ByaXYtPmRybS5wZGV2OwogCiAJaW50ZWxfZmJk ZXZfZmluaShkZXYpOwogCkBAIC0xMzAwLDggKzEzMDYsOCBAQCB2b2lkIGk5MTVfZHJpdmVyX3Vu bG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWtmcmVlKGRldl9wcml2LT52YnQubGZwX2x2 ZHNfdmJ0X21vZGUpOwogCWRldl9wcml2LT52YnQubGZwX2x2ZHNfdmJ0X21vZGUgPSBOVUxMOwog Ci0JdmdhX3N3aXRjaGVyb29fdW5yZWdpc3Rlcl9jbGllbnQoZGV2LT5wZGV2KTsKLQl2Z2FfY2xp ZW50X3JlZ2lzdGVyKGRldi0+cGRldiwgTlVMTCwgTlVMTCwgTlVMTCk7CisJdmdhX3N3aXRjaGVy b29fdW5yZWdpc3Rlcl9jbGllbnQocGRldik7CisJdmdhX2NsaWVudF9yZWdpc3RlcihwZGV2LCBO VUxMLCBOVUxMLCBOVUxMKTsKIAogCWludGVsX2Nzcl91Y29kZV9maW5pKGRldl9wcml2KTsKIApA QCAtMTM5OCw2ICsxNDA0LDcgQEAgc3RhdGljIGJvb2wgc3VzcGVuZF90b19pZGxlKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHN0YXRpYyBpbnQgaTkxNV9kcm1fc3VzcGVuZChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IGRldl9wcml2LT5k cm0ucGRldjsKIAlwY2lfcG93ZXJfdCBvcHJlZ2lvbl90YXJnZXRfc3RhdGU7CiAJaW50IGVycm9y OwogCkBAIC0xNDE0LDExICsxNDIxLDExIEBAIHN0YXRpYyBpbnQgaTkxNV9kcm1fc3VzcGVuZChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJZHJtX2ttc19oZWxwZXJfcG9sbF9kaXNhYmxlKGRl dik7CiAKLQlwY2lfc2F2ZV9zdGF0ZShkZXYtPnBkZXYpOworCXBjaV9zYXZlX3N0YXRlKHBkZXYp OwogCiAJZXJyb3IgPSBpOTE1X2dlbV9zdXNwZW5kKGRldik7CiAJaWYgKGVycm9yKSB7Ci0JCWRl dl9lcnIoJmRldi0+cGRldi0+ZGV2LAorCQlkZXZfZXJyKCZwZGV2LT5kZXYsCiAJCQkiR0VNIGlk bGUgZmFpbGVkLCByZXN1bWUgbWlnaHQgZmFpbFxuIik7CiAJCWdvdG8gb3V0OwogCX0KQEAgLTE0 NjMsNiArMTQ3MCw3IEBAIG91dDoKIHN0YXRpYyBpbnQgaTkxNV9kcm1fc3VzcGVuZF9sYXRlKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIGJvb2wgaGliZXJuYXRpb24pCiB7CiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBwY2lfZGV2ICpw ZGV2ID0gZGV2X3ByaXYtPmRybS5wZGV2OwogCWJvb2wgZndfY3NyOwogCWludCByZXQ7CiAKQEAg LTE0OTYsNyArMTUwNCw3IEBAIHN0YXRpYyBpbnQgaTkxNV9kcm1fc3VzcGVuZF9sYXRlKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIGJvb2wgaGliZXJuYXRpb24pCiAJCWdvdG8gb3V0OwogCX0KIAot CXBjaV9kaXNhYmxlX2RldmljZShkZXYtPnBkZXYpOworCXBjaV9kaXNhYmxlX2RldmljZShwZGV2 KTsKIAkvKgogCSAqIER1cmluZyBoaWJlcm5hdGlvbiBvbiBzb21lIHBsYXRmb3JtcyB0aGUgQklP UyBtYXkgdHJ5IHRvIGFjY2VzcwogCSAqIHRoZSBkZXZpY2UgZXZlbiB0aG91Z2ggaXQncyBhbHJl YWR5IGluIEQzIGFuZCBoYW5nIHRoZSBtYWNoaW5lLiBTbwpAQCAtMTUxMCw3ICsxNTE4LDcgQEAg c3RhdGljIGludCBpOTE1X2RybV9zdXNwZW5kX2xhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg Ym9vbCBoaWJlcm5hdGlvbikKIAkgKiBBY2VyIEFzcGlyZSAxODMwVAogCSAqLwogCWlmICghKGhp YmVybmF0aW9uICYmIElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPCA2KSkKLQkJcGNpX3NldF9w b3dlcl9zdGF0ZShkZXYtPnBkZXYsIFBDSV9EM2hvdCk7CisJCXBjaV9zZXRfcG93ZXJfc3RhdGUo cGRldiwgUENJX0QzaG90KTsKIAogCWRldl9wcml2LT5zdXNwZW5kZWRfdG9faWRsZSA9IHN1c3Bl bmRfdG9faWRsZShkZXZfcHJpdik7CiAKQEAgLTE2MjYsNiArMTYzNCw3IEBAIHN0YXRpYyBpbnQg aTkxNV9kcm1fcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiBzdGF0aWMgaW50IGk5MTVf ZHJtX3Jlc3VtZV9lYXJseShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgcGNpX2RldiAq cGRldiA9IGRldl9wcml2LT5kcm0ucGRldjsKIAlpbnQgcmV0OwogCiAJLyoKQEAgLTE2NDgsNyAr MTY1Nyw3IEBAIHN0YXRpYyBpbnQgaTkxNV9kcm1fcmVzdW1lX2Vhcmx5KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJICogdGhlIGRldmljZSBwb3dlcmVkIHdlIGNhbiBhbHNvIHJlbW92ZSB0aGUg Zm9sbG93aW5nIHNldCBwb3dlciBzdGF0ZQogCSAqIGNhbGwuCiAJICovCi0JcmV0ID0gcGNpX3Nl dF9wb3dlcl9zdGF0ZShkZXYtPnBkZXYsIFBDSV9EMCk7CisJcmV0ID0gcGNpX3NldF9wb3dlcl9z dGF0ZShwZGV2LCBQQ0lfRDApOwogCWlmIChyZXQpIHsKIAkJRFJNX0VSUk9SKCJmYWlsZWQgdG8g c2V0IFBDSSBEMCBwb3dlciBzdGF0ZSAoJWQpXG4iLCByZXQpOwogCQlnb3RvIG91dDsKQEAgLTE2 NjcsMTIgKzE2NzYsMTIgQEAgc3RhdGljIGludCBpOTE1X2RybV9yZXN1bWVfZWFybHkoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAkgKiBkZXBlbmQgb24gdGhlIGRldmljZSBlbmFibGUgcmVmY291 bnQgd2UgY2FuJ3QgYW55d2F5IGRlcGVuZCBvbiB0aGVtCiAJICogZGlzYWJsaW5nL2VuYWJsaW5n IHRoZSBkZXZpY2UuCiAJICovCi0JaWYgKHBjaV9lbmFibGVfZGV2aWNlKGRldi0+cGRldikpIHsK KwlpZiAocGNpX2VuYWJsZV9kZXZpY2UocGRldikpIHsKIAkJcmV0ID0gLUVJTzsKIAkJZ290byBv dXQ7CiAJfQogCi0JcGNpX3NldF9tYXN0ZXIoZGV2LT5wZGV2KTsKKwlwY2lfc2V0X21hc3Rlcihw ZGV2KTsKIAogCWRpc2FibGVfcnBtX3dha2VyZWZfYXNzZXJ0cyhkZXZfcHJpdik7CiAKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggNzJhYTMxNjQ1ZGEzLi42OGQ1ZDY3NzZkZTkg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0zNDgsMTAgKzM0OCwxMiBAQCBz dGF0aWMgaW50IHNldHVwX3BhZ2VfZG1hKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBp OTE1X3BhZ2VfZG1hICpwKQogCiBzdGF0aWMgdm9pZCBjbGVhbnVwX3BhZ2VfZG1hKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpOTE1X3BhZ2VfZG1hICpwKQogeworCXN0cnVjdCBwY2lf ZGV2ICpwZGV2ID0gZGV2LT5wZGV2OworCiAJaWYgKFdBUk5fT04oIXAtPnBhZ2UpKQogCQlyZXR1 cm47CiAKLQlkbWFfdW5tYXBfcGFnZSgmZGV2LT5wZGV2LT5kZXYsIHAtPmRhZGRyLCA0MDk2LCBQ Q0lfRE1BX0JJRElSRUNUSU9OQUwpOworCWRtYV91bm1hcF9wYWdlKCZwZGV2LT5kZXYsIHAtPmRh ZGRyLCA0MDk2LCBQQ0lfRE1BX0JJRElSRUNUSU9OQUwpOwogCV9fZnJlZV9wYWdlKHAtPnBhZ2Up OwogCW1lbXNldChwLCAwLCBzaXplb2YoKnApKTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fc3RvbGVuLmMKaW5kZXggMTMyNzk2MTBlZWVjLi5lMDYyYmQxNGFhODQgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCkBAIC05Miw2ICs5Miw3IEBAIHZvaWQgaTkxNV9n ZW1fc3RvbGVuX3JlbW92ZV9ub2RlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK IHN0YXRpYyB1bnNpZ25lZCBsb25nIGk5MTVfc3RvbGVuX3RvX3BoeXNpY2FsKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShkZXYpOworCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gZGV2X3ByaXYtPmRybS5wZGV2Owog CXN0cnVjdCBpOTE1X2dndHQgKmdndHQgPSAmZGV2X3ByaXYtPmdndHQ7CiAJc3RydWN0IHJlc291 cmNlICpyOwogCXUzMiBiYXNlOwpAQCAtMTExLDcgKzExMiw3IEBAIHN0YXRpYyB1bnNpZ25lZCBs b25nIGk5MTVfc3RvbGVuX3RvX3BoeXNpY2FsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYg KElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDMpIHsKIAkJdTMyIGJzbTsKIAotCQlwY2lfcmVhZF9j b25maWdfZHdvcmQoZGV2LT5wZGV2LCBJTlRFTF9CU00sICZic20pOworCQlwY2lfcmVhZF9jb25m aWdfZHdvcmQocGRldiwgSU5URUxfQlNNLCAmYnNtKTsKIAogCQliYXNlID0gYnNtICYgSU5URUxf QlNNX01BU0s7CiAJfSBlbHNlIGlmIChJU19JODY1RyhkZXYpKSB7CkBAIC0xMjIsNyArMTIzLDcg QEAgc3RhdGljIHVuc2lnbmVkIGxvbmcgaTkxNV9zdG9sZW5fdG9fcGh5c2ljYWwoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAkJICogYWx3YXlzIGF0IFRPVUQ/IEllLiBpcyBpdCBhbHdheXMgdGhl IGxhc3QKIAkJICogb25lIHRvIGJlIGFsbG9jYXRlZCBieSB0aGUgQklPUz8KIAkJICovCi0JCXBj aV9idXNfcmVhZF9jb25maWdfd29yZChkZXYtPnBkZXYtPmJ1cywgUENJX0RFVkZOKDAsIDApLAor CQlwY2lfYnVzX3JlYWRfY29uZmlnX3dvcmQocGRldi0+YnVzLCBQQ0lfREVWRk4oMCwgMCksCiAJ CQkJCSBJODY1X1RPVUQsICZ0b3VkKTsKIAogCQliYXNlID0gdG91ZCA8PCAxNjsKQEAgLTEzMSwx MyArMTMyLDEzIEBAIHN0YXRpYyB1bnNpZ25lZCBsb25nIGk5MTVfc3RvbGVuX3RvX3BoeXNpY2Fs KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCXUzMiB0b207CiAJCXU4IHRtcDsKIAotCQlwY2lf YnVzX3JlYWRfY29uZmlnX2J5dGUoZGV2LT5wZGV2LT5idXMsIFBDSV9ERVZGTigwLCAwKSwKKwkJ cGNpX2J1c19yZWFkX2NvbmZpZ19ieXRlKHBkZXYtPmJ1cywgUENJX0RFVkZOKDAsIDApLAogCQkJ CQkgSTg1WF9FU01SQU1DLCAmdG1wKTsKIAogCQlpZiAodG1wICYgVFNFR19FTkFCTEUpCiAJCQl0 c2VnX3NpemUgPSBNQigxKTsKIAotCQlwY2lfYnVzX3JlYWRfY29uZmlnX2J5dGUoZGV2LT5wZGV2 LT5idXMsIFBDSV9ERVZGTigwLCAxKSwKKwkJcGNpX2J1c19yZWFkX2NvbmZpZ19ieXRlKHBkZXYt PmJ1cywgUENJX0RFVkZOKDAsIDEpLAogCQkJCQkgSTg1WF9EUkIzLCAmdG1wKTsKIAkJdG9tID0g dG1wICogTUIoMzIpOwogCkBAIC0xNDcsNyArMTQ4LDcgQEAgc3RhdGljIHVuc2lnbmVkIGxvbmcg aTkxNV9zdG9sZW5fdG9fcGh5c2ljYWwoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJdTMyIHRv bTsKIAkJdTggdG1wOwogCi0JCXBjaV9idXNfcmVhZF9jb25maWdfYnl0ZShkZXYtPnBkZXYtPmJ1 cywgUENJX0RFVkZOKDAsIDApLAorCQlwY2lfYnVzX3JlYWRfY29uZmlnX2J5dGUocGRldi0+YnVz LCBQQ0lfREVWRk4oMCwgMCksCiAJCQkJCSBJODQ1X0VTTVJBTUMsICZ0bXApOwogCiAJCWlmICh0 bXAgJiBUU0VHX0VOQUJMRSkgewpAQCAtMTYxLDcgKzE2Miw3IEBAIHN0YXRpYyB1bnNpZ25lZCBs b25nIGk5MTVfc3RvbGVuX3RvX3BoeXNpY2FsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQl9 CiAJCX0KIAotCQlwY2lfYnVzX3JlYWRfY29uZmlnX2J5dGUoZGV2LT5wZGV2LT5idXMsIFBDSV9E RVZGTigwLCAwKSwKKwkJcGNpX2J1c19yZWFkX2NvbmZpZ19ieXRlKHBkZXYtPmJ1cywgUENJX0RF VkZOKDAsIDApLAogCQkJCQkgSTgzMF9EUkIzLCAmdG1wKTsKIAkJdG9tID0gdG1wICogTUIoMzIp OwogCkBAIC0xNzEsNyArMTcyLDcgQEAgc3RhdGljIHVuc2lnbmVkIGxvbmcgaTkxNV9zdG9sZW5f dG9fcGh5c2ljYWwoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJdTMyIHRvbTsKIAkJdTggdG1w OwogCi0JCXBjaV9idXNfcmVhZF9jb25maWdfYnl0ZShkZXYtPnBkZXYtPmJ1cywgUENJX0RFVkZO KDAsIDApLAorCQlwY2lfYnVzX3JlYWRfY29uZmlnX2J5dGUocGRldi0+YnVzLCBQQ0lfREVWRk4o MCwgMCksCiAJCQkJCSBJODMwX0VTTVJBTUMsICZ0bXApOwogCiAJCWlmICh0bXAgJiBUU0VHX0VO QUJMRSkgewpAQCAtMTgxLDcgKzE4Miw3IEBAIHN0YXRpYyB1bnNpZ25lZCBsb25nIGk5MTVfc3Rv bGVuX3RvX3BoeXNpY2FsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQkJdHNlZ19zaXplID0g S0IoNTEyKTsKIAkJfQogCi0JCXBjaV9idXNfcmVhZF9jb25maWdfYnl0ZShkZXYtPnBkZXYtPmJ1 cywgUENJX0RFVkZOKDAsIDApLAorCQlwY2lfYnVzX3JlYWRfY29uZmlnX2J5dGUocGRldi0+YnVz LCBQQ0lfREVWRk4oMCwgMCksCiAJCQkJCSBJODMwX0RSQjMsICZ0bXApOwogCQl0b20gPSB0bXAg KiBNQigzMik7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vy cm9yLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCmluZGV4IGVlY2I4 NzA2M2M4OC4uYjNmNzVmY2QxMDQ2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dwdV9lcnJvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9y LmMKQEAgLTMyOCw2ICszMjgsNyBAQCBpbnQgaTkxNV9lcnJvcl9zdGF0ZV90b19zdHIoc3RydWN0 IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gZXJyb3JfcHJpdi0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IGRldl9wcml2LT5kcm0ucGRl djsKIAlzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGUgKmVycm9yID0gZXJyb3JfcHJpdi0+ZXJy b3I7CiAJc3RydWN0IGRybV9pOTE1X2Vycm9yX29iamVjdCAqb2JqOwogCWludCBpLCBqLCBvZmZz ZXQsIGVsdDsKQEAgLTM1OCwxMSArMzU5LDExIEBAIGludCBpOTE1X2Vycm9yX3N0YXRlX3RvX3N0 cihzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptLAogCX0KIAllcnJfcHJpbnRmKG0s ICJSZXNldCBjb3VudDogJXVcbiIsIGVycm9yLT5yZXNldF9jb3VudCk7CiAJZXJyX3ByaW50Ziht LCAiU3VzcGVuZCBjb3VudDogJXVcbiIsIGVycm9yLT5zdXNwZW5kX2NvdW50KTsKLQllcnJfcHJp bnRmKG0sICJQQ0kgSUQ6IDB4JTA0eFxuIiwgZGV2LT5wZGV2LT5kZXZpY2UpOwotCWVycl9wcmlu dGYobSwgIlBDSSBSZXZpc2lvbjogMHglMDJ4XG4iLCBkZXYtPnBkZXYtPnJldmlzaW9uKTsKKwll cnJfcHJpbnRmKG0sICJQQ0kgSUQ6IDB4JTA0eFxuIiwgcGRldi0+ZGV2aWNlKTsKKwllcnJfcHJp bnRmKG0sICJQQ0kgUmV2aXNpb246IDB4JTAyeFxuIiwgcGRldi0+cmV2aXNpb24pOwogCWVycl9w cmludGYobSwgIlBDSSBTdWJzeXN0ZW06ICUwNHg6JTA0eFxuIiwKLQkJICAgZGV2LT5wZGV2LT5z dWJzeXN0ZW1fdmVuZG9yLAotCQkgICBkZXYtPnBkZXYtPnN1YnN5c3RlbV9kZXZpY2UpOworCQkg ICBwZGV2LT5zdWJzeXN0ZW1fdmVuZG9yLAorCQkgICBwZGV2LT5zdWJzeXN0ZW1fZGV2aWNlKTsK IAllcnJfcHJpbnRmKG0sICJJT01NVSBlbmFibGVkPzogJWRcbiIsIGVycm9yLT5pb21tdSk7CiAK IAlpZiAoSEFTX0NTUihkZXYpKSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3N1c3BlbmQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3VzcGVuZC5jCmluZGV4 IDVjZmU0Yzc3MTZiNC4uMzVlMzAzOTlkNGI5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3N1c3BlbmQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N1c3Bl bmQuYwpAQCAtMTA0LDYgKzEwNCw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfcmVzdG9yZV9kaXNwbGF5 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiBpbnQgaTkxNV9zYXZlX3N0YXRlKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShkZXYpOworCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gZGV2X3ByaXYtPmRybS5wZGV2Owog CWludCBpOwogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwpAQCAtMTExLDcgKzEx Miw3IEBAIGludCBpOTE1X3NhdmVfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpOTE1 X3NhdmVfZGlzcGxheShkZXYpOwogCiAJaWYgKElTX0dFTjQoZGV2KSkKLQkJcGNpX3JlYWRfY29u ZmlnX3dvcmQoZGV2LT5wZGV2LCBHQ0RHTUJVUywKKwkJcGNpX3JlYWRfY29uZmlnX3dvcmQocGRl diwgR0NER01CVVMsCiAJCQkJICAgICAmZGV2X3ByaXYtPnJlZ2ZpbGUuc2F2ZUdDREdNQlVTKTsK IAogCS8qIENhY2hlIG1vZGUgc3RhdGUgKi8KQEAgLTE0OSw2ICsxNTAsNyBAQCBpbnQgaTkxNV9z YXZlX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiBpbnQgaTkxNV9yZXN0b3JlX3N0YXRl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gZGV2X3ByaXYt PmRybS5wZGV2OwogCWludCBpOwogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwpA QCAtMTU2LDcgKzE1OCw3IEBAIGludCBpOTE1X3Jlc3RvcmVfc3RhdGUoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAlpOTE1X2dlbV9yZXN0b3JlX2ZlbmNlcyhkZXYpOwogCiAJaWYgKElTX0dFTjQo ZGV2KSkKLQkJcGNpX3dyaXRlX2NvbmZpZ193b3JkKGRldi0+cGRldiwgR0NER01CVVMsCisJCXBj aV93cml0ZV9jb25maWdfd29yZChwZGV2LCBHQ0RHTUJVUywKIAkJCQkgICAgICBkZXZfcHJpdi0+ cmVnZmlsZS5zYXZlR0NER01CVVMpOwogCWk5MTVfcmVzdG9yZV9kaXNwbGF5KGRldik7CiAKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA5Y2JmNTQzMWMxZTMuLmNjM2JkMDA1 ZjhjYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNjgxMyw5ICs2ODEz LDEwIEBAIHN0YXRpYyBpbnQgaTl4eF9taXNjX2dldF9kaXNwbGF5X2Nsb2NrX3NwZWVkKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAKIHN0YXRpYyBpbnQgcG52X2dldF9kaXNwbGF5X2Nsb2NrX3Nw ZWVkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CisJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSBk ZXYtPnBkZXY7CiAJdTE2IGdjZmdjID0gMDsKIAotCXBjaV9yZWFkX2NvbmZpZ193b3JkKGRldi0+ cGRldiwgR0NGR0MsICZnY2ZnYyk7CisJcGNpX3JlYWRfY29uZmlnX3dvcmQocGRldiwgR0NGR0Ms ICZnY2ZnYyk7CiAKIAlzd2l0Y2ggKGdjZmdjICYgR0NfRElTUExBWV9DTE9DS19NQVNLKSB7CiAJ Y2FzZSBHQ19ESVNQTEFZX0NMT0NLXzI2N19NSFpfUE5WOgpAQCAtNjgzNyw5ICs2ODM4LDEwIEBA IHN0YXRpYyBpbnQgcG52X2dldF9kaXNwbGF5X2Nsb2NrX3NwZWVkKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAKIHN0YXRpYyBpbnQgaTkxNWdtX2dldF9kaXNwbGF5X2Nsb2NrX3NwZWVkKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiB7CisJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSBkZXYtPnBkZXY7 CiAJdTE2IGdjZmdjID0gMDsKIAotCXBjaV9yZWFkX2NvbmZpZ193b3JkKGRldi0+cGRldiwgR0NG R0MsICZnY2ZnYyk7CisJcGNpX3JlYWRfY29uZmlnX3dvcmQocGRldiwgR0NGR0MsICZnY2ZnYyk7 CiAKIAlpZiAoZ2NmZ2MgJiBHQ19MT1dfRlJFUVVFTkNZX0VOQUJMRSkKIAkJcmV0dXJuIDEzMzMz MzsKQEAgLTY4NjEsNiArNjg2Myw3IEBAIHN0YXRpYyBpbnQgaTg2NV9nZXRfZGlzcGxheV9jbG9j a19zcGVlZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiBzdGF0aWMgaW50IGk4NXhfZ2V0X2Rp c3BsYXlfY2xvY2tfc3BlZWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKKwlzdHJ1Y3QgcGNp X2RldiAqcGRldiA9IGRldi0+cGRldjsKIAl1MTYgaHBsbGNjID0gMDsKIAogCS8qCkBAIC02ODY4 LDEwICs2ODcxLDEwIEBAIHN0YXRpYyBpbnQgaTg1eF9nZXRfZGlzcGxheV9jbG9ja19zcGVlZChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCSAqIGVuY29kaW5nIGlzIGRpZmZlcmVudCA6KAogCSAq IEZJWE1FIGlzIHRoaXMgdGhlIHJpZ2h0IHdheSB0byBkZXRlY3QgODUyR00vODUyR01WPwogCSAq LwotCWlmIChkZXYtPnBkZXYtPnJldmlzaW9uID09IDB4MSkKKwlpZiAocGRldi0+cmV2aXNpb24g PT0gMHgxKQogCQlyZXR1cm4gMTMzMzMzOwogCi0JcGNpX2J1c19yZWFkX2NvbmZpZ193b3JkKGRl di0+cGRldi0+YnVzLAorCXBjaV9idXNfcmVhZF9jb25maWdfd29yZChwZGV2LT5idXMsCiAJCQkJ IFBDSV9ERVZGTigwLCAzKSwgSFBMTENDLCAmaHBsbGNjKTsKIAogCS8qIEFzc3VtZSB0aGF0IHRo ZSBoYXJkd2FyZSBpcyBpbiB0aGUgaGlnaCBzcGVlZCBzdGF0ZS4gIFRoaXMKQEAgLTY5NzIsMTAg KzY5NzUsMTEgQEAgc3RhdGljIHVuc2lnbmVkIGludCBpbnRlbF9ocGxsX3ZjbyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCiBzdGF0aWMgaW50IGdtNDVfZ2V0X2Rpc3BsYXlfY2xvY2tfc3BlZWQo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKKwlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IGRldi0+ cGRldjsKIAl1bnNpZ25lZCBpbnQgY2RjbGtfc2VsLCB2Y28gPSBpbnRlbF9ocGxsX3ZjbyhkZXYp OwogCXVpbnQxNl90IHRtcCA9IDA7CiAKLQlwY2lfcmVhZF9jb25maWdfd29yZChkZXYtPnBkZXYs IEdDRkdDLCAmdG1wKTsKKwlwY2lfcmVhZF9jb25maWdfd29yZChwZGV2LCBHQ0ZHQywgJnRtcCk7 CiAKIAljZGNsa19zZWwgPSAodG1wID4+IDEyKSAmIDB4MTsKIApAQCAtNjk5NCw2ICs2OTk4LDcg QEAgc3RhdGljIGludCBnbTQ1X2dldF9kaXNwbGF5X2Nsb2NrX3NwZWVkKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAKIHN0YXRpYyBpbnQgaTk2NWdtX2dldF9kaXNwbGF5X2Nsb2NrX3NwZWVkKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CisJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSBkZXYtPnBk ZXY7CiAJc3RhdGljIGNvbnN0IHVpbnQ4X3QgZGl2XzMyMDBbXSA9IHsgMTYsIDEwLCAgOCB9Owog CXN0YXRpYyBjb25zdCB1aW50OF90IGRpdl80MDAwW10gPSB7IDIwLCAxMiwgMTAgfTsKIAlzdGF0 aWMgY29uc3QgdWludDhfdCBkaXZfNTMzM1tdID0geyAyNCwgMTYsIDE0IH07CkBAIC03MDAxLDcg KzcwMDYsNyBAQCBzdGF0aWMgaW50IGk5NjVnbV9nZXRfZGlzcGxheV9jbG9ja19zcGVlZChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCXVuc2lnbmVkIGludCBjZGNsa19zZWwsIHZjbyA9IGludGVs X2hwbGxfdmNvKGRldik7CiAJdWludDE2X3QgdG1wID0gMDsKIAotCXBjaV9yZWFkX2NvbmZpZ193 b3JkKGRldi0+cGRldiwgR0NGR0MsICZ0bXApOworCXBjaV9yZWFkX2NvbmZpZ193b3JkKHBkZXYs IEdDRkdDLCAmdG1wKTsKIAogCWNkY2xrX3NlbCA9ICgodG1wID4+IDgpICYgMHgxZikgLSAxOwog CkBAIC03MDMxLDYgKzcwMzYsNyBAQCBmYWlsOgogCiBzdGF0aWMgaW50IGczM19nZXRfZGlzcGxh eV9jbG9ja19zcGVlZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogeworCXN0cnVjdCBwY2lfZGV2 ICpwZGV2ID0gZGV2LT5wZGV2OwogCXN0YXRpYyBjb25zdCB1aW50OF90IGRpdl8zMjAwW10gPSB7 IDEyLCAxMCwgIDgsICA3LCA1LCAxNiB9OwogCXN0YXRpYyBjb25zdCB1aW50OF90IGRpdl80MDAw W10gPSB7IDE0LCAxMiwgMTAsICA4LCA2LCAyMCB9OwogCXN0YXRpYyBjb25zdCB1aW50OF90IGRp dl80ODAwW10gPSB7IDIwLCAxNCwgMTIsIDEwLCA4LCAyNCB9OwpAQCAtNzAzOSw3ICs3MDQ1LDcg QEAgc3RhdGljIGludCBnMzNfZ2V0X2Rpc3BsYXlfY2xvY2tfc3BlZWQoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAl1bnNpZ25lZCBpbnQgY2RjbGtfc2VsLCB2Y28gPSBpbnRlbF9ocGxsX3Zjbyhk ZXYpOwogCXVpbnQxNl90IHRtcCA9IDA7CiAKLQlwY2lfcmVhZF9jb25maWdfd29yZChkZXYtPnBk ZXYsIEdDRkdDLCAmdG1wKTsKKwlwY2lfcmVhZF9jb25maWdfd29yZChwZGV2LCBHQ0ZHQywgJnRt cCk7CiAKIAljZGNsa19zZWwgPSAodG1wID4+IDQpICYgMHg3OwogCkBAIC0xNTQ3MCwxNSArMTU0 NzYsMTYgQEAgc3RhdGljIHZvaWQgaW50ZWxfaW5pdF9xdWlya3Moc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIHN0YXRpYyB2b2lkIGk5MTVfZGlzYWJsZV92Z2Eoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7 CisJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSBkZXZfcHJpdi0+ZHJtLnBkZXY7CiAJdTggc3IxOwog CWk5MTVfcmVnX3QgdmdhX3JlZyA9IGk5MTVfdmdhY250cmxfcmVnKGRldik7CiAKIAkvKiBXYUVu YWJsZVZHQUFjY2Vzc1Rocm91Z2hJT1BvcnQ6Y3RnLGVsayxpbGssc25iLGl2Yix2bHYsaHN3ICov Ci0JdmdhX2dldF91bmludGVycnVwdGlibGUoZGV2LT5wZGV2LCBWR0FfUlNSQ19MRUdBQ1lfSU8p OworCXZnYV9nZXRfdW5pbnRlcnJ1cHRpYmxlKHBkZXYsIFZHQV9SU1JDX0xFR0FDWV9JTyk7CiAJ b3V0YihTUjAxLCBWR0FfU1JfSU5ERVgpOwogCXNyMSA9IGluYihWR0FfU1JfREFUQSk7CiAJb3V0 YihzcjEgfCAxPDw1LCBWR0FfU1JfREFUQSk7Ci0JdmdhX3B1dChkZXYtPnBkZXYsIFZHQV9SU1JD X0xFR0FDWV9JTyk7CisJdmdhX3B1dChwZGV2LCBWR0FfUlNSQ19MRUdBQ1lfSU8pOwogCXVkZWxh eSgzMDApOwogCiAJSTkxNV9XUklURSh2Z2FfcmVnLCBWR0FfRElTUF9ESVNBQkxFKTsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9mYmRldi5jCmluZGV4IDA0MzZiNDg2OWQ1Ny4uODg5YzhiODg0YTYyIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKQEAgLTE4NCw2ICsxODQsNyBAQCBzdGF0aWMg aW50IGludGVsZmJfY3JlYXRlKHN0cnVjdCBkcm1fZmJfaGVscGVyICpoZWxwZXIsCiAJc3RydWN0 IGludGVsX2ZyYW1lYnVmZmVyICppbnRlbF9mYiA9IGlmYmRldi0+ZmI7CiAJc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IGhlbHBlci0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IGRldl9wcml2LT5k cm0ucGRldjsKIAlzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0ID0gJmRldl9wcml2LT5nZ3R0OwogCXN0 cnVjdCBmYl9pbmZvICppbmZvOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiOwpAQCAtMjg0 LDcgKzI4NSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxmYl9jcmVhdGUoc3RydWN0IGRybV9mYl9oZWxw ZXIgKmhlbHBlciwKIAkJICAgICAgaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaiksIG9iaik7 CiAKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQl2Z2Ffc3dpdGNoZXJvb19j bGllbnRfZmJfc2V0KGRldi0+cGRldiwgaW5mbyk7CisJdmdhX3N3aXRjaGVyb29fY2xpZW50X2Zi X3NldChwZGV2LCBpbmZvKTsKIAlyZXR1cm4gMDsKIAogb3V0X2Rlc3Ryb3lfZmJpOgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IDM3NjNlMzBjYzE2NS4uZDU5OGE5 YTMxNzc4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVy LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCkBAIC01NTMs NiArNTUzLDcgQEAgZmFpbDoKIAogc3RhdGljIHZvaWQgZ3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHN0cnVjdCBpbnRlbF9ndWNfZncgKmd1Y19mdykKIHsKKwlzdHJ1Y3QgcGNp X2RldiAqcGRldiA9IGRldi0+cGRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2Jq OwogCWNvbnN0IHN0cnVjdCBmaXJtd2FyZSAqZnc7CiAJc3RydWN0IGd1Y19jc3NfaGVhZGVyICpj c3M7CkBAIC01NjIsNyArNTYzLDcgQEAgc3RhdGljIHZvaWQgZ3VjX2Z3X2ZldGNoKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpbnRlbF9ndWNfZncgKmd1Y19mdykKIAlEUk1fREVCVUdf RFJJVkVSKCJiZWZvcmUgcmVxdWVzdGluZyBmaXJtd2FyZTogR3VDIGZ3IGZldGNoIHN0YXR1cyAl c1xuIiwKIAkJaW50ZWxfZ3VjX2Z3X3N0YXR1c19yZXByKGd1Y19mdy0+Z3VjX2Z3X2ZldGNoX3N0 YXR1cykpOwogCi0JZXJyID0gcmVxdWVzdF9maXJtd2FyZSgmZncsIGd1Y19mdy0+Z3VjX2Z3X3Bh dGgsICZkZXYtPnBkZXYtPmRldik7CisJZXJyID0gcmVxdWVzdF9maXJtd2FyZSgmZncsIGd1Y19m dy0+Z3VjX2Z3X3BhdGgsICZwZGV2LT5kZXYpOwogCWlmIChlcnIpCiAJCWdvdG8gZmFpbDsKIAlp ZiAoIWZ3KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaTJjLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9pMmMuYwppbmRleCAxZjI2NmQ3ZGYyZWMuLmE0Y2Ey MDUyMzE1ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaTJjLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaTJjLmMKQEAgLTYzMyw2ICs2MzMsNyBAQCBz dGF0aWMgY29uc3Qgc3RydWN0IGkyY19hbGdvcml0aG0gZ21idXNfYWxnb3JpdGhtID0gewogaW50 IGludGVsX3NldHVwX2dtYnVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBwY2lfZGV2 ICpwZGV2ID0gZGV2X3ByaXYtPmRybS5wZGV2OwogCXN0cnVjdCBpbnRlbF9nbWJ1cyAqYnVzOwog CXVuc2lnbmVkIGludCBwaW47CiAJaW50IHJldDsKQEAgLTY2Myw3ICs2NjQsNyBAQCBpbnQgaW50 ZWxfc2V0dXBfZ21idXMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCSAiaTkxNSBnbWJ1cyAl cyIsCiAJCQkgZ2V0X2dtYnVzX3BpbihkZXZfcHJpdiwgcGluKS0+bmFtZSk7CiAKLQkJYnVzLT5h ZGFwdGVyLmRldi5wYXJlbnQgPSAmZGV2LT5wZGV2LT5kZXY7CisJCWJ1cy0+YWRhcHRlci5kZXYu cGFyZW50ID0gJnBkZXYtPmRldjsKIAkJYnVzLT5kZXZfcHJpdiA9IGRldl9wcml2OwogCiAJCWJ1 cy0+YWRhcHRlci5hbGdvID0gJmdtYnVzX2FsZ29yaXRobTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3J1bnRpbWVfcG0uYwppbmRleCA4ODZiMTNiMDhhYzQuLjczNDU5YjhjNDdkOCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYwpAQCAtMjg3LDYgKzI4Nyw3IEBAIHZv aWQgaW50ZWxfZGlzcGxheV9zZXRfaW5pdF9wb3dlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAgKi8KIHN0YXRpYyB2b2lkIGhzd19wb3dlcl93ZWxsX3Bvc3RfZW5hYmxlKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKKwlzdHJ1Y3QgcGNpX2RldiAqcGRl diA9IGRldl9wcml2LT5kcm0ucGRldjsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gJmRldl9w cml2LT5kcm07CiAKIAkvKgpAQCAtMjk5LDkgKzMwMCw5IEBAIHN0YXRpYyB2b2lkIGhzd19wb3dl cl93ZWxsX3Bvc3RfZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkg KiBzdXJlIHZnYWNvbiBjYW4ga2VlcCB3b3JraW5nIG5vcm1hbGx5IHdpdGhvdXQgdHJpZ2dlcmlu ZyBpbnRlcnJ1cHRzCiAJICogYW5kIGVycm9yIG1lc3NhZ2VzLgogCSAqLwotCXZnYV9nZXRfdW5p bnRlcnJ1cHRpYmxlKGRldi0+cGRldiwgVkdBX1JTUkNfTEVHQUNZX0lPKTsKKwl2Z2FfZ2V0X3Vu aW50ZXJydXB0aWJsZShwZGV2LCBWR0FfUlNSQ19MRUdBQ1lfSU8pOwogCW91dGIoaW5iKFZHQV9N U1JfUkVBRCksIFZHQV9NU1JfV1JJVEUpOwotCXZnYV9wdXQoZGV2LT5wZGV2LCBWR0FfUlNSQ19M RUdBQ1lfSU8pOworCXZnYV9wdXQocGRldiwgVkdBX1JTUkNfTEVHQUNZX0lPKTsKIAogCWlmIChJ U19CUk9BRFdFTEwoZGV2KSkKIAkJZ2VuOF9pcnFfcG93ZXJfd2VsbF9wb3N0X2VuYWJsZShkZXZf cHJpdiwKQEAgLTMxOCw3ICszMTksNyBAQCBzdGF0aWMgdm9pZCBoc3dfcG93ZXJfd2VsbF9wcmVf ZGlzYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiBzdGF0aWMgdm9pZCBz a2xfcG93ZXJfd2VsbF9wb3N0X2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCiAJCQkJICAgICAgIHN0cnVjdCBpOTE1X3Bvd2VyX3dlbGwgKnBvd2VyX3dlbGwpCiB7Ci0J c3RydWN0IGRybV9kZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ZHJtOworCXN0cnVjdCBwY2lfZGV2 ICpwZGV2ID0gZGV2X3ByaXYtPmRybS5wZGV2OwogCiAJLyoKIAkgKiBBZnRlciB3ZSByZS1lbmFi bGUgdGhlIHBvd2VyIHdlbGwsIGlmIHdlIHRvdWNoIFZHQSByZWdpc3RlciAweDNkNQpAQCAtMzMx LDkgKzMzMiw5IEBAIHN0YXRpYyB2b2lkIHNrbF9wb3dlcl93ZWxsX3Bvc3RfZW5hYmxlKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkgKiBhbmQgZXJyb3IgbWVzc2FnZXMuCiAJ ICovCiAJaWYgKHBvd2VyX3dlbGwtPmRhdGEgPT0gU0tMX0RJU1BfUFdfMikgewotCQl2Z2FfZ2V0 X3VuaW50ZXJydXB0aWJsZShkZXYtPnBkZXYsIFZHQV9SU1JDX0xFR0FDWV9JTyk7CisJCXZnYV9n ZXRfdW5pbnRlcnJ1cHRpYmxlKHBkZXYsIFZHQV9SU1JDX0xFR0FDWV9JTyk7CiAJCW91dGIoaW5i KFZHQV9NU1JfUkVBRCksIFZHQV9NU1JfV1JJVEUpOwotCQl2Z2FfcHV0KGRldi0+cGRldiwgVkdB X1JTUkNfTEVHQUNZX0lPKTsKKwkJdmdhX3B1dChwZGV2LCBWR0FfUlNSQ19MRUdBQ1lfSU8pOwog CiAJCWdlbjhfaXJxX3Bvd2VyX3dlbGxfcG9zdF9lbmFibGUoZGV2X3ByaXYsCiAJCQkJCQkxIDw8 IFBJUEVfQyB8IDEgPDwgUElQRV9CKTsKQEAgLTI2NDcsOCArMjY0OCw4IEBAIHZvaWQgaW50ZWxf cG93ZXJfZG9tYWluc19zdXNwZW5kKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK ICAqLwogdm9pZCBpbnRlbF9ydW50aW1lX3BtX2dldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ZHJtOwot CXN0cnVjdCBkZXZpY2UgKmtkZXYgPSAmZGV2LT5wZGV2LT5kZXY7CisJc3RydWN0IHBjaV9kZXYg KnBkZXYgPSBkZXZfcHJpdi0+ZHJtLnBkZXY7CisJc3RydWN0IGRldmljZSAqa2RldiA9ICZwZGV2 LT5kZXY7CiAKIAlwbV9ydW50aW1lX2dldF9zeW5jKGtkZXYpOwogCkBAIC0yNjY4LDggKzI2Njks OCBAQCB2b2lkIGludGVsX3J1bnRpbWVfcG1fZ2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKICAqLwogYm9vbCBpbnRlbF9ydW50aW1lX3BtX2dldF9pZl9pbl91c2Uoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSAmZGV2X3ByaXYtPmRybTsKLQlzdHJ1Y3QgZGV2aWNlICprZGV2ID0gJmRldi0+cGRldi0+ZGV2 OworCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gZGV2X3ByaXYtPmRybS5wZGV2OworCXN0cnVjdCBk ZXZpY2UgKmtkZXYgPSAmcGRldi0+ZGV2OwogCiAJaWYgKElTX0VOQUJMRUQoQ09ORklHX1BNKSkg ewogCQlpbnQgcmV0ID0gcG1fcnVudGltZV9nZXRfaWZfaW5fdXNlKGtkZXYpOwpAQCAtMjcxMCw4 ICsyNzExLDggQEAgYm9vbCBpbnRlbF9ydW50aW1lX3BtX2dldF9pZl9pbl91c2Uoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogICovCiB2b2lkIGludGVsX3J1bnRpbWVfcG1fZ2V0 X25vcmVzdW1lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2ID0gJmRldl9wcml2LT5kcm07Ci0Jc3RydWN0IGRldmljZSAqa2RldiA9 ICZkZXYtPnBkZXYtPmRldjsKKwlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IGRldl9wcml2LT5kcm0u cGRldjsKKwlzdHJ1Y3QgZGV2aWNlICprZGV2ID0gJnBkZXYtPmRldjsKIAogCWFzc2VydF9ycG1f d2FrZWxvY2tfaGVsZChkZXZfcHJpdik7CiAJcG1fcnVudGltZV9nZXRfbm9yZXN1bWUoa2Rldik7 CkBAIC0yNzI5LDggKzI3MzAsOCBAQCB2b2lkIGludGVsX3J1bnRpbWVfcG1fZ2V0X25vcmVzdW1l KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKICAqLwogdm9pZCBpbnRlbF9ydW50 aW1lX3BtX3B1dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ZHJtOwotCXN0cnVjdCBkZXZpY2UgKmtkZXYg PSAmZGV2LT5wZGV2LT5kZXY7CisJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSBkZXZfcHJpdi0+ZHJt LnBkZXY7CisJc3RydWN0IGRldmljZSAqa2RldiA9ICZwZGV2LT5kZXY7CiAKIAlhc3NlcnRfcnBt X3dha2Vsb2NrX2hlbGQoZGV2X3ByaXYpOwogCWlmIChhdG9taWNfZGVjX2FuZF90ZXN0KCZkZXZf cHJpdi0+cG0ud2FrZXJlZl9jb3VudCkpCkBAIC0yNzUyLDggKzI3NTMsOSBAQCB2b2lkIGludGVs X3J1bnRpbWVfcG1fcHV0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKICAqLwog dm9pZCBpbnRlbF9ydW50aW1lX3BtX2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiB7CisJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSBkZXZfcHJpdi0+ZHJtLnBkZXY7CiAJ c3RydWN0IGRybV9kZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ZHJtOwotCXN0cnVjdCBkZXZpY2Ug KmtkZXYgPSAmZGV2LT5wZGV2LT5kZXY7CisJc3RydWN0IGRldmljZSAqa2RldiA9ICZwZGV2LT5k ZXY7CiAKIAlwbV9ydW50aW1lX3NldF9hdXRvc3VzcGVuZF9kZWxheShrZGV2LCAxMDAwMCk7IC8q IDEwcyAqLwogCXBtX3J1bnRpbWVfbWFya19sYXN0X2J1c3koa2Rldik7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9zZHZvLmMKaW5kZXggZTM3OGYzNTM2NWEyLi5kZDc1NTEwZWJhNjcgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nkdm8uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9zZHZvLmMKQEAgLTI5MzAsMTAgKzI5MzAsMTIgQEAgc3RhdGljIGJvb2wKIGlu dGVsX3Nkdm9faW5pdF9kZGNfcHJveHkoc3RydWN0IGludGVsX3Nkdm8gKnNkdm8sCiAJCQkgIHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CisJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSBkZXYtPnBk ZXY7CisKIAlzZHZvLT5kZGMub3duZXIgPSBUSElTX01PRFVMRTsKIAlzZHZvLT5kZGMuY2xhc3Mg PSBJMkNfQ0xBU1NfRERDOwogCXNucHJpbnRmKHNkdm8tPmRkYy5uYW1lLCBJMkNfTkFNRV9TSVpF LCAiU0RWTyBEREMgcHJveHkiKTsKLQlzZHZvLT5kZGMuZGV2LnBhcmVudCA9ICZkZXYtPnBkZXYt PmRldjsKKwlzZHZvLT5kZGMuZGV2LnBhcmVudCA9ICZwZGV2LT5kZXY7CiAJc2R2by0+ZGRjLmFs Z29fZGF0YSA9IHNkdm87CiAJc2R2by0+ZGRjLmFsZ28gPSAmaW50ZWxfc2R2b19kZGNfcHJveHk7 CiAKLS0gCjIuOC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK