From: Tvrtko Ursulin Subject: [PATCH 22/22] drm/i915: Make IS_GEN macros only take dev_priv Date: Wed, 5 Oct 2016 13:33:49 +0100 Message-ID: <1475670829-14025-23-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1475670829-14025-1-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 mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id F03546E843 for ; Wed, 5 Oct 2016 12:34:23 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id p138so24361919wmb.0 for ; Wed, 05 Oct 2016 05:34:23 -0700 (PDT) In-Reply-To: <1475670829-14025-1-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDE0 MTYgYnl0ZXMgb2YgLnJvZGF0YSBzdHJpbmdzLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3Vs aW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2RlYnVnZnMuYyAgICAgICAgfCAgNCArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuYyAgICAgICAgICAgIHwgIDYgKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o ICAgICAgICAgICAgfCAxNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg ICAgICAgICAgICB8ICA4ICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1 ZmZlci5jIHwgIDQgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2ZlbmNlLmMgICAg ICB8ICA5ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jICAgICAgICB8 IDEwICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jICAgICB8ICA0 ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV90aWxpbmcuYyAgICAgfCAgNCArLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyAgICAgIHwgMTAgKystLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyAgICAgICAgICAgIHwgIDQgKy0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfc3VzcGVuZC5jICAgICAgICB8ICA0ICstCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9jcnQuYyAgICAgICAgICAgfCAgNiArLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYyAgICAgICB8IDQxICsrKysrKysrLS0tLS0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHAuYyAgICAgICAgICAgIHwgMjAgKysrLS0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2ZpZm9fdW5kZXJydW4uYyB8ICA2ICstLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZ3VjX2xvYWRlci5jICAgIHwgIDMgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2x2ZHMuYyAgICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jICAgICAgICAgICAgfCA4MyArKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICAgICAgICB8ICA0ICstCiAyMSBmaWxlcyBj aGFuZ2VkLCAxMjYgaW5zZXJ0aW9ucygrKSwgMTI0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXggZGQ2MzQ4Y2I0M2IzLi4yYTQ2ZDBkMWIwZDQgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC00NTU0LDcgKzQ1NTQsNyBAQCBzdGF0aWMg dm9pZCB3bV9sYXRlbmN5X3Nob3coc3RydWN0IHNlcV9maWxlICptLCBjb25zdCB1aW50MTZfdCB3 bVs4XSkKIAllbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSkKIAkJbnVtX2xldmVscyA9 IDE7CiAJZWxzZQotCQludW1fbGV2ZWxzID0gaWxrX3dtX21heF9sZXZlbChkZXYpICsgMTsKKwkJ bnVtX2xldmVscyA9IGlsa193bV9tYXhfbGV2ZWwoZGV2X3ByaXYpICsgMTsKIAogCWRybV9tb2Rl c2V0X2xvY2tfYWxsKGRldik7CiAKQEAgLTQ2NzAsNyArNDY3MCw3IEBAIHN0YXRpYyBzc2l6ZV90 IHdtX2xhdGVuY3lfd3JpdGUoc3RydWN0IGZpbGUgKmZpbGUsIGNvbnN0IGNoYXIgX191c2VyICp1 YnVmLAogCWVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpKQogCQludW1fbGV2ZWxzID0g MTsKIAllbHNlCi0JCW51bV9sZXZlbHMgPSBpbGtfd21fbWF4X2xldmVsKGRldikgKyAxOworCQlu dW1fbGV2ZWxzID0gaWxrX3dtX21heF9sZXZlbChkZXZfcHJpdikgKyAxOwogCiAJaWYgKGxlbiA+ PSBzaXplb2YodG1wKSkKIAkJcmV0dXJuIC1FSU5WQUw7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpp bmRleCA1ZTdiNmExY2IyYzguLmMxOTU2ODU1ZmViNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5j CkBAIC0xNzQsNyArMTc0LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZGV0ZWN0X3BjaChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogCQkJaWYgKGlkID09IElOVEVMX1BDSF9JQlhfREVWSUNFX0lEX1RZ UEUpIHsKIAkJCQlkZXZfcHJpdi0+cGNoX3R5cGUgPSBQQ0hfSUJYOwogCQkJCURSTV9ERUJVR19L TVMoIkZvdW5kIEliZXggUGVhayBQQ0hcbiIpOwotCQkJCVdBUk5fT04oIUlTX0dFTjUoZGV2KSk7 CisJCQkJV0FSTl9PTighSVNfR0VONShkZXZfcHJpdikpOwogCQkJfSBlbHNlIGlmIChpZCA9PSBJ TlRFTF9QQ0hfQ1BUX0RFVklDRV9JRF9UWVBFKSB7CiAJCQkJZGV2X3ByaXYtPnBjaF90eXBlID0g UENIX0NQVDsKIAkJCQlEUk1fREVCVUdfS01TKCJGb3VuZCBDb3VnYXJQb2ludCBQQ0hcbiIpOwpA QCAtODg0LDcgKzg4NCw3IEBAIHN0YXRpYyBpbnQgaTkxNV9tbWlvX3NldHVwKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJaW50IG1taW9fYmFyOwogCWludCBtbWlvX3NpemU7CiAKLQltbWlvX2Jh ciA9IElTX0dFTjIoZGV2KSA/IDEgOiAwOworCW1taW9fYmFyID0gSVNfR0VOMihkZXZfcHJpdikg PyAxIDogMDsKIAkvKgogCSAqIEJlZm9yZSBnZW40LCB0aGUgcmVnaXN0ZXJzIGFuZCB0aGUgR1RU IGFyZSBiZWhpbmQgZGlmZmVyZW50IEJBUnMuCiAJICogSG93ZXZlciwgZnJvbSBnZW40IG9ud2Fy ZHMsIHRoZSByZWdpc3RlcnMgYW5kIHRoZSBHVFQgYXJlIHNoYXJlZApAQCAtMTAzNyw3ICsxMDM3 LDcgQEAgc3RhdGljIGludCBpOTE1X2RyaXZlcl9pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIAlwY2lfc2V0X21hc3RlcihwZGV2KTsKIAogCS8qIG92ZXJsYXkgb24g Z2VuMiBpcyBicm9rZW4gYW5kIGNhbid0IGFkZHJlc3MgYWJvdmUgMUcgKi8KLQlpZiAoSVNfR0VO MihkZXYpKSB7CisJaWYgKElTX0dFTjIoZGV2X3ByaXYpKSB7CiAJCXJldCA9IGRtYV9zZXRfY29o ZXJlbnRfbWFzaygmcGRldi0+ZGV2LCBETUFfQklUX01BU0soMzApKTsKIAkJaWYgKHJldCkgewog CQkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gc2V0IERNQSBtYXNrXG4iKTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCmluZGV4IGE3ZTY4YmVhYzU3MC4uZTAxYzgxOGY5Y2E1IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKQEAgLTI3NDQsMTQgKzI3NDQsMTQgQEAgc3RydWN0IGRybV9pOTE1X2NtZF90YWJs ZSB7CiAgKiBoYXZlIHRoZWlyIG93biAoZS5nLiBIQVNfUENIX1NQTElUIGZvciBJTEsrIGRpc3Bs YXksIElTX2ZvbyBmb3IgcGFydGljdWxhcgogICogY2hpcHMsIGV0Yy4pLgogICovCi0jZGVmaW5l IElTX0dFTjIoZGV2KQkoISEoSU5URUxfSU5GTyhkZXYpLT5nZW5fbWFzayAmIEJJVCgxKSkpCi0j ZGVmaW5lIElTX0dFTjMoZGV2KQkoISEoSU5URUxfSU5GTyhkZXYpLT5nZW5fbWFzayAmIEJJVCgy KSkpCi0jZGVmaW5lIElTX0dFTjQoZGV2KQkoISEoSU5URUxfSU5GTyhkZXYpLT5nZW5fbWFzayAm IEJJVCgzKSkpCi0jZGVmaW5lIElTX0dFTjUoZGV2KQkoISEoSU5URUxfSU5GTyhkZXYpLT5nZW5f bWFzayAmIEJJVCg0KSkpCi0jZGVmaW5lIElTX0dFTjYoZGV2KQkoISEoSU5URUxfSU5GTyhkZXYp LT5nZW5fbWFzayAmIEJJVCg1KSkpCi0jZGVmaW5lIElTX0dFTjcoZGV2KQkoISEoSU5URUxfSU5G TyhkZXYpLT5nZW5fbWFzayAmIEJJVCg2KSkpCi0jZGVmaW5lIElTX0dFTjgoZGV2KQkoISEoSU5U RUxfSU5GTyhkZXYpLT5nZW5fbWFzayAmIEJJVCg3KSkpCi0jZGVmaW5lIElTX0dFTjkoZGV2KQko ISEoSU5URUxfSU5GTyhkZXYpLT5nZW5fbWFzayAmIEJJVCg4KSkpCisjZGVmaW5lIElTX0dFTjIo ZGV2X3ByaXYpCSghIShkZXZfcHJpdi0+aW5mby5nZW5fbWFzayAmIEJJVCgxKSkpCisjZGVmaW5l IElTX0dFTjMoZGV2X3ByaXYpCSghIShkZXZfcHJpdi0+aW5mby5nZW5fbWFzayAmIEJJVCgyKSkp CisjZGVmaW5lIElTX0dFTjQoZGV2X3ByaXYpCSghIShkZXZfcHJpdi0+aW5mby5nZW5fbWFzayAm IEJJVCgzKSkpCisjZGVmaW5lIElTX0dFTjUoZGV2X3ByaXYpCSghIShkZXZfcHJpdi0+aW5mby5n ZW5fbWFzayAmIEJJVCg0KSkpCisjZGVmaW5lIElTX0dFTjYoZGV2X3ByaXYpCSghIShkZXZfcHJp di0+aW5mby5nZW5fbWFzayAmIEJJVCg1KSkpCisjZGVmaW5lIElTX0dFTjcoZGV2X3ByaXYpCSgh IShkZXZfcHJpdi0+aW5mby5nZW5fbWFzayAmIEJJVCg2KSkpCisjZGVmaW5lIElTX0dFTjgoZGV2 X3ByaXYpCSghIShkZXZfcHJpdi0+aW5mby5nZW5fbWFzayAmIEJJVCg3KSkpCisjZGVmaW5lIElT X0dFTjkoZGV2X3ByaXYpCSghIShkZXZfcHJpdi0+aW5mby5nZW5fbWFzayAmIEJJVCg4KSkpCiAK ICNkZWZpbmUgRU5HSU5FX01BU0soaWQpCUJJVChpZCkKICNkZWZpbmUgUkVOREVSX1JJTkcJRU5H SU5FX01BU0soUkNTKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggZjExYTY4MTg5Nzc0Li40 ZWZhOTM5Yzk1ZDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDMwNCwxNSArNDMwNCwx NSBAQCB2b2lkIGk5MTVfZ2VtX2luaXRfc3dpenpsaW5nKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJSTkxNV9XUklURShESVNQX0FSQl9DVEwsIEk5MTVfUkVBRChESVNQX0FSQl9DVEwpIHwKIAkJ CQkgRElTUF9USUxFX1NVUkZBQ0VfU1dJWlpMSU5HKTsKIAotCWlmIChJU19HRU41KGRldikpCisJ aWYgKElTX0dFTjUoZGV2X3ByaXYpKQogCQlyZXR1cm47CiAKIAlJOTE1X1dSSVRFKFRJTEVDVEws IEk5MTVfUkVBRChUSUxFQ1RMKSB8IFRJTEVDVExfU1daQ1RMKTsKLQlpZiAoSVNfR0VONihkZXYp KQorCWlmIChJU19HRU42KGRldl9wcml2KSkKIAkJSTkxNV9XUklURShBUkJfTU9ERSwgX01BU0tF RF9CSVRfRU5BQkxFKEFSQl9NT0RFX1NXSVpaTEVfU05CKSk7Ci0JZWxzZSBpZiAoSVNfR0VONyhk ZXYpKQorCWVsc2UgaWYgKElTX0dFTjcoZGV2X3ByaXYpKQogCQlJOTE1X1dSSVRFKEFSQl9NT0RF LCBfTUFTS0VEX0JJVF9FTkFCTEUoQVJCX01PREVfU1dJWlpMRV9JVkIpKTsKLQllbHNlIGlmIChJ U19HRU44KGRldikpCisJZWxzZSBpZiAoSVNfR0VOOChkZXZfcHJpdikpCiAJCUk5MTVfV1JJVEUo R0FNVEFSQk1PREUsIF9NQVNLRURfQklUX0VOQUJMRShBUkJfTU9ERV9TV0laWkxFX0JEVykpOwog CWVsc2UKIAkJQlVHKCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9leGVjYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVy LmMKaW5kZXggZTg4Nzg2ZWExMjE5Li5kODIwZjY0YjViN2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKQEAgLTU3Miw3ICs1NzIsNyBAQCBpOTE1X2dlbV9l eGVjYnVmZmVyX3JlbG9jYXRlX2VudHJ5KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmos CiAJCQkJICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZWxvY2F0aW9uX2VudHJ5ICpyZWxvYywKIAkJ CQkgICBzdHJ1Y3QgcmVsb2NfY2FjaGUgKmNhY2hlKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpk ZXYgPSBvYmotPmJhc2UuZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUob2JqLT5iYXNlLmRldik7CiAJc3RydWN0IGRybV9nZW1fb2JqZWN0ICp0YXJnZXRf b2JqOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICp0YXJnZXRfaTkxNV9vYmo7CiAJc3Ry dWN0IGk5MTVfdm1hICp0YXJnZXRfdm1hOwpAQCAtNTkxLDcgKzU5MSw3IEBAIGk5MTVfZ2VtX2V4 ZWNidWZmZXJfcmVsb2NhdGVfZW50cnkoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwK IAkvKiBTYW5keWJyaWRnZSBQUEdUVCBlcnJhdGE6IFdlIG5lZWQgYSBnbG9iYWwgZ3R0IG1hcHBp bmcgZm9yIE1JIGFuZAogCSAqIHBpcGVfY29udHJvbCB3cml0ZXMgYmVjYXVzZSB0aGUgZ3B1IGRv ZXNuJ3QgcHJvcGVybHkgcmVkaXJlY3QgdGhlbQogCSAqIHRocm91Z2ggdGhlIHBwZ3R0IGZvciBu b25fc2VjdXJlIGJhdGNoYnVmZmVycy4gKi8KLQlpZiAodW5saWtlbHkoSVNfR0VONihkZXYpICYm CisJaWYgKHVubGlrZWx5KElTX0dFTjYoZGV2X3ByaXYpICYmCiAJICAgIHJlbG9jLT53cml0ZV9k b21haW4gPT0gSTkxNV9HRU1fRE9NQUlOX0lOU1RSVUNUSU9OKSkgewogCQlyZXQgPSBpOTE1X3Zt YV9iaW5kKHRhcmdldF92bWEsIHRhcmdldF9pOTE1X29iai0+Y2FjaGVfbGV2ZWwsCiAJCQkJICAg IFBJTl9HTE9CQUwpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f ZmVuY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2ZlbmNlLmMKaW5kZXggZDI2 NzY4NTY3MjUyLi5iZWRmMjI3OGRmMTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2ZlbmNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZmVu Y2UuYwpAQCAtNDg3LDE5ICs0ODcsMjAgQEAgaTkxNV9nZW1fZGV0ZWN0X2JpdF82X3N3aXp6bGUo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCQlzd2l6emxlX3kgPSBJOTE1X0JJVF82X1NXSVpa TEVfTk9ORTsKIAkJCX0KIAkJfQotCX0gZWxzZSBpZiAoSVNfR0VONShkZXYpKSB7CisJfSBlbHNl IGlmIChJU19HRU41KGRldl9wcml2KSkgewogCQkvKiBPbiBJcm9ubGFrZSB3aGF0ZXZlciBEUkFN IGNvbmZpZywgR1BVIGFsd2F5cyBkbwogCQkgKiBzYW1lIHN3aXp6bGluZyBzZXR1cC4KIAkJICov CiAJCXN3aXp6bGVfeCA9IEk5MTVfQklUXzZfU1dJWlpMRV85XzEwOwogCQlzd2l6emxlX3kgPSBJ OTE1X0JJVF82X1NXSVpaTEVfOTsKLQl9IGVsc2UgaWYgKElTX0dFTjIoZGV2KSkgeworCX0gZWxz ZSBpZiAoSVNfR0VOMihkZXZfcHJpdikpIHsKIAkJLyogQXMgZmFyIGFzIHdlIGtub3csIHRoZSA4 NjUgZG9lc24ndCBoYXZlIHRoZXNlIGJpdCA2CiAJCSAqIHN3aXp6bGluZyBpc3N1ZXMuCiAJCSAq LwogCQlzd2l6emxlX3ggPSBJOTE1X0JJVF82X1NXSVpaTEVfTk9ORTsKIAkJc3dpenpsZV95ID0g STkxNV9CSVRfNl9TV0laWkxFX05PTkU7Ci0JfSBlbHNlIGlmIChJU19NT0JJTEUoZGV2KSB8fCAo SVNfR0VOMyhkZXYpICYmICFJU19HMzMoZGV2KSkpIHsKKwl9IGVsc2UgaWYgKElTX01PQklMRShk ZXZfcHJpdikgfHwgKElTX0dFTjMoZGV2X3ByaXYpICYmCisJCSAgICFJU19HMzMoZGV2X3ByaXYp KSkgewogCQl1aW50MzJfdCBkY2M7CiAKIAkJLyogT24gOXh4IGNoaXBzZXRzLCBjaGFubmVsIGlu dGVybGVhdmUgYnkgdGhlIENQVSBpcwpAQCAtNTM3LDcgKzUzOCw3IEBAIGk5MTVfZ2VtX2RldGVj dF9iaXRfNl9zd2l6emxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCX0KIAogCQkvKiBjaGVj ayBmb3IgTC1zaGFwZWQgbWVtb3J5IGFrYSBtb2RpZmllZCBlbmhhbmNlZCBhZGRyZXNzaW5nICov Ci0JCWlmIChJU19HRU40KGRldikgJiYKKwkJaWYgKElTX0dFTjQoZGV2X3ByaXYpICYmCiAJCSAg ICAhKEk5MTVfUkVBRChEQ0MyKSAmIERDQzJfTU9ESUZJRURfRU5IQU5DRURfRElTQUJMRSkpIHsK IAkJCXN3aXp6bGVfeCA9IEk5MTVfQklUXzZfU1dJWlpMRV9VTktOT1dOOwogCQkJc3dpenpsZV95 ID0gSTkxNV9CSVRfNl9TV0laWkxFX1VOS05PV047CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5jCmluZGV4IDQyMTFiOWE0YTkxOC4uYzM1YmE2N2QxYTVkIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuYwpAQCAtMjA1OCwxMSArMjA1OCwxMSBAQCBzdGF0aWMgaW50IGdlbjZfcHBn dHRfaW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJaW50IHJldDsKIAogCXBwZ3R0 LT5iYXNlLnB0ZV9lbmNvZGUgPSBnZ3R0LT5iYXNlLnB0ZV9lbmNvZGU7Ci0JaWYgKGludGVsX3Zn cHVfYWN0aXZlKGRldl9wcml2KSB8fCBJU19HRU42KGRldikpCisJaWYgKGludGVsX3ZncHVfYWN0 aXZlKGRldl9wcml2KSB8fCBJU19HRU42KGRldl9wcml2KSkKIAkJcHBndHQtPnN3aXRjaF9tbSA9 IGdlbjZfbW1fc3dpdGNoOwogCWVsc2UgaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKQogCQlwcGd0 dC0+c3dpdGNoX21tID0gaHN3X21tX3N3aXRjaDsKLQllbHNlIGlmIChJU19HRU43KGRldikpCisJ ZWxzZSBpZiAoSVNfR0VONyhkZXZfcHJpdikpCiAJCXBwZ3R0LT5zd2l0Y2hfbW0gPSBnZW43X21t X3N3aXRjaDsKIAllbHNlCiAJCUJVRygpOwpAQCAtMjE1OSw2ICsyMTU5LDggQEAgc3RhdGljIGlu dCBpOTE1X3BwZ3R0X2luaXQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogCiBpbnQgaTkx NV9wcGd0dF9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CisJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCiAJZ3R0X3dyaXRlX3dvcmth cm91bmRzKGRldik7CiAKIAkvKiBJbiB0aGUgY2FzZSBvZiBleGVjbGlzdHMsIFBQR1RUIGlzIGVu YWJsZWQgYnkgdGhlIGNvbnRleHQgZGVzY3JpcHRvcgpAQCAtMjE3MCw5ICsyMTcyLDkgQEAgaW50 IGk5MTVfcHBndHRfaW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmICghVVNFU19Q UEdUVChkZXYpKQogCQlyZXR1cm4gMDsKIAotCWlmIChJU19HRU42KGRldikpCisJaWYgKElTX0dF TjYoZGV2X3ByaXYpKQogCQlnZW42X3BwZ3R0X2VuYWJsZShkZXYpOwotCWVsc2UgaWYgKElTX0dF TjcoZGV2KSkKKwllbHNlIGlmIChJU19HRU43KGRldl9wcml2KSkKIAkJZ2VuN19wcGd0dF9lbmFi bGUoZGV2KTsKIAllbHNlIGlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA4KQogCQlnZW44X3Bw Z3R0X2VuYWJsZShkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fc3RvbGVuLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYwppbmRl eCBkMWI0MGJjZTAyNDkuLmY0ZjZkM2E0OGIwNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fc3RvbGVuLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fc3RvbGVuLmMKQEAgLTIxNSw3ICsyMTUsNyBAQCBzdGF0aWMgdW5zaWduZWQgbG9uZyBpOTE1 X3N0b2xlbl90b19waHlzaWNhbChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQl1NjQgZ2d0dF9z dGFydCwgZ2d0dF9lbmQ7CiAKIAkJZ2d0dF9zdGFydCA9IEk5MTVfUkVBRChQR1RCTF9DVEwpOwot CQlpZiAoSVNfR0VONChkZXYpKQorCQlpZiAoSVNfR0VONChkZXZfcHJpdikpCiAJCQlnZ3R0X3N0 YXJ0ID0gKGdndHRfc3RhcnQgJiBQR1RCTF9BRERSRVNTX0xPX01BU0spIHwKIAkJCQkgICAgIChn Z3R0X3N0YXJ0ICYgUEdUQkxfQUREUkVTU19ISV9NQVNLKSA8PCAyODsKIAkJZWxzZQpAQCAtMjcx LDcgKzI3MSw3IEBAIHN0YXRpYyB1bnNpZ25lZCBsb25nIGk5MTVfc3RvbGVuX3RvX3BoeXNpY2Fs KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCSAqIEdFTjMgZmlybXdhcmUgbGlrZXMgdG8gc21h c2ggcGNpIGJyaWRnZXMgaW50byB0aGUgc3RvbGVuCiAJCSAqIHJhbmdlLiBBcHBhcmVudGx5IHRo aXMgd29ya3MuCiAJCSAqLwotCQlpZiAociA9PSBOVUxMICYmICFJU19HRU4zKGRldikpIHsKKwkJ aWYgKHIgPT0gTlVMTCAmJiAhSVNfR0VOMyhkZXZfcHJpdikpIHsKIAkJCURSTV9FUlJPUigiY29u ZmxpY3QgZGV0ZWN0ZWQgd2l0aCBzdG9sZW4gcmVnaW9uOiBbMHglMDh4IC0gMHglMDh4XVxuIiwK IAkJCQkgIGJhc2UsIGJhc2UgKyAodWludDMyX3QpZ2d0dC0+c3RvbGVuX3NpemUpOwogCQkJYmFz ZSA9IDA7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV90aWxpbmcu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3RpbGluZy5jCmluZGV4IDg5ZDFkMjM0 YTFiNC4uYzIxYmMwMDY4ZDIwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV90aWxpbmcuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV90aWxpbmcu YwpAQCAtNzIsNyArNzIsNyBAQCBpOTE1X3RpbGluZ19vayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCBpbnQgc3RyaWRlLCBpbnQgc2l6ZSwgaW50IHRpbGluZ19tb2RlKQogCWlmICh0aWxpbmdfbW9k ZSA+IEk5MTVfVElMSU5HX0xBU1QpCiAJCXJldHVybiBmYWxzZTsKIAotCWlmIChJU19HRU4yKGRl dikgfHwKKwlpZiAoSVNfR0VOMihkZXZfcHJpdikgfHwKIAkgICAgKHRpbGluZ19tb2RlID09IEk5 MTVfVElMSU5HX1kgJiYgSEFTXzEyOF9CWVRFX1lfVElMSU5HKGRldl9wcml2KSkpCiAJCXRpbGVf d2lkdGggPSAxMjg7CiAJZWxzZQpAQCAtOTEsNyArOTEsNyBAQCBpOTE1X3RpbGluZ19vayhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgc3RyaWRlLCBpbnQgc2l6ZSwgaW50IHRpbGluZ19tb2Rl KQogCQlpZiAoc3RyaWRlID4gODE5MikKIAkJCXJldHVybiBmYWxzZTsKIAotCQlpZiAoSVNfR0VO MyhkZXYpKSB7CisJCWlmIChJU19HRU4zKGRldl9wcml2KSkgewogCQkJaWYgKHNpemUgPiBJODMw X0ZFTkNFX01BWF9TSVpFX1ZBTCA8PCAyMCkKIAkJCQlyZXR1cm4gZmFsc2U7CiAJCX0gZWxzZSB7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwppbmRleCBkODA3YjNmOWE0M2IuLjZm MjVkMDQ5ZmZjMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJy b3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBAIC00NDQs NyArNDQ0LDcgQEAgaW50IGk5MTVfZXJyb3Jfc3RhdGVfdG9fc3RyKHN0cnVjdCBkcm1faTkxNV9l cnJvcl9zdGF0ZV9idWYgKm0sCiAJCWVycl9wcmludGYobSwgIkRPTkVfUkVHOiAweCUwOHhcbiIs IGVycm9yLT5kb25lX3JlZyk7CiAJfQogCi0JaWYgKElTX0dFTjcoZGV2KSkKKwlpZiAoSVNfR0VO NyhkZXZfcHJpdikpCiAJCWVycl9wcmludGYobSwgIkVSUl9JTlQ6IDB4JTA4eFxuIiwgZXJyb3It PmVycl9pbnQpOwogCiAJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoZXJyb3ItPmVuZ2luZSk7 IGkrKykgewpAQCAtMTM1Nyw3ICsxMzU3LDcgQEAgc3RhdGljIHZvaWQgaTkxNV9jYXB0dXJlX3Jl Z19zdGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCWVycm9yLT5mb3Jj ZXdha2UgPSBJOTE1X1JFQURfRlcoRk9SQ0VXQUtFX1ZMVik7CiAJfQogCi0JaWYgKElTX0dFTjco ZGV2KSkKKwlpZiAoSVNfR0VONyhkZXZfcHJpdikpCiAJCWVycm9yLT5lcnJfaW50ID0gSTkxNV9S RUFEKEdFTjdfRVJSX0lOVCk7CiAKIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOCkgewpA QCAtMTM2NSw3ICsxMzY1LDcgQEAgc3RhdGljIHZvaWQgaTkxNV9jYXB0dXJlX3JlZ19zdGF0ZShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCWVycm9yLT5mYXVsdF9kYXRhMSA9 IEk5MTVfUkVBRChHRU44X0ZBVUxUX1RMQl9EQVRBMSk7CiAJfQogCi0JaWYgKElTX0dFTjYoZGV2 KSkgeworCWlmIChJU19HRU42KGRldl9wcml2KSkgewogCQllcnJvci0+Zm9yY2V3YWtlID0gSTkx NV9SRUFEX0ZXKEZPUkNFV0FLRSk7CiAJCWVycm9yLT5nYWJfY3RsID0gSTkxNV9SRUFEKEdBQl9D VEwpOwogCQllcnJvci0+Z2Z4X21vZGUgPSBJOTE1X1JFQUQoR0ZYX01PREUpOwpAQCAtMTM4Miw3 ICsxMzgyLDcgQEAgc3RhdGljIHZvaWQgaTkxNV9jYXB0dXJlX3JlZ19zdGF0ZShzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJfQogCiAJLyogMzogRmVhdHVyZSBzcGVjaWZpYyBy ZWdpc3RlcnMgKi8KLQlpZiAoSVNfR0VONihkZXYpIHx8IElTX0dFTjcoZGV2KSkgeworCWlmIChJ U19HRU42KGRldl9wcml2KSB8fCBJU19HRU43KGRldl9wcml2KSkgewogCQllcnJvci0+Z2FtX2Vj b2NoayA9IEk5MTVfUkVBRChHQU1fRUNPQ0hLKTsKIAkJZXJyb3ItPmdhY19lY28gPSBJOTE1X1JF QUQoR0FDX0VDT19CSVRTKTsKIAl9CkBAIC0xMzk4LDcgKzEzOTgsNyBAQCBzdGF0aWMgdm9pZCBp OTE1X2NhcHR1cmVfcmVnX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK IAl9IGVsc2UgaWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKSB7CiAJCWVycm9yLT5pZXIgPSBJ OTE1X1JFQUQoREVJRVIpOwogCQllcnJvci0+Z3RpZXJbMF0gPSBJOTE1X1JFQUQoR1RJRVIpOwot CX0gZWxzZSBpZiAoSVNfR0VOMihkZXYpKSB7CisJfSBlbHNlIGlmIChJU19HRU4yKGRldl9wcml2 KSkgewogCQllcnJvci0+aWVyID0gSTkxNV9SRUFEMTYoSUVSKTsKIAl9IGVsc2UgaWYgKCFJU19W QUxMRVlWSUVXKGRldl9wcml2KSkgewogCQllcnJvci0+aWVyID0gSTkxNV9SRUFEKElFUik7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCAwNzliYTdjZmM5NzEuLmQ2MTBkZjkyYWQxZiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC0zMzMzLDcgKzMzMzMsNyBAQCBzdGF0aWMgdm9pZCBp cm9ubGFrZV9pcnFfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlJOTE1X1dSSVRFKEhX U1RBTSwgMHhmZmZmZmZmZik7CiAKIAlHRU41X0lSUV9SRVNFVChERSk7Ci0JaWYgKElTX0dFTjco ZGV2KSkKKwlpZiAoSVNfR0VONyhkZXZfcHJpdikpCiAJCUk5MTVfV1JJVEUoR0VON19FUlJfSU5U LCAweGZmZmZmZmZmKTsKIAogCWdlbjVfZ3RfaXJxX3Jlc2V0KGRldik7CkBAIC0zNTk5LDcgKzM1 OTksNyBAQCBzdGF0aWMgdm9pZCBnZW41X2d0X2lycV9wb3N0aW5zdGFsbChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCX0KIAogCWd0X2lycXMgfD0gR1RfUkVOREVSX1VTRVJfSU5URVJSVVBUOwot CWlmIChJU19HRU41KGRldikpIHsKKwlpZiAoSVNfR0VONShkZXZfcHJpdikpIHsKIAkJZ3RfaXJx cyB8PSBJTEtfQlNEX1VTRVJfSU5URVJSVVBUOwogCX0gZWxzZSB7CiAJCWd0X2lycXMgfD0gR1Rf QkxUX1VTRVJfSU5URVJSVVBUIHwgR1RfQlNEX1VTRVJfSU5URVJSVVBUOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zdXNwZW5kLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3N1c3BlbmQuYwppbmRleCA3ODcwODU2ZmNjZDAuLjM0NGNiZjM5Y2ZhOSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zdXNwZW5kLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9zdXNwZW5kLmMKQEAgLTcwLDcgKzcwLDcgQEAgaW50IGk5MTVfc2F2 ZV9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJaTkxNV9zYXZlX2Rpc3BsYXkoZGV2 KTsKIAotCWlmIChJU19HRU40KGRldikpCisJaWYgKElTX0dFTjQoZGV2X3ByaXYpKQogCQlwY2lf cmVhZF9jb25maWdfd29yZChwZGV2LCBHQ0RHTUJVUywKIAkJCQkgICAgICZkZXZfcHJpdi0+cmVn ZmlsZS5zYXZlR0NER01CVVMpOwogCkBAIC0xMTYsNyArMTE2LDcgQEAgaW50IGk5MTVfcmVzdG9y ZV9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJaTkxNV9nZW1fcmVzdG9yZV9mZW5j ZXMoZGV2KTsKIAotCWlmIChJU19HRU40KGRldikpCisJaWYgKElTX0dFTjQoZGV2X3ByaXYpKQog CQlwY2lfd3JpdGVfY29uZmlnX3dvcmQocGRldiwgR0NER01CVVMsCiAJCQkJICAgICAgZGV2X3By aXYtPnJlZ2ZpbGUuc2F2ZUdDREdNQlVTKTsKIAlpOTE1X3Jlc3RvcmVfZGlzcGxheShkZXYpOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9jcnQuYwppbmRleCBkZjc1YTM0M2U4MjUuLjcxMDYyNmQ1MGM4OCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMKQEAgLTI1OSw3ICsyNTksNyBAQCBpbnRlbF9jcnRf bW9kZV92YWxpZChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCQkgKiBEQUMgbGlt aXQgc3VwcG9zZWRseSAzNTUgTUh6LgogCQkgKi8KIAkJbWF4X2Nsb2NrID0gMjcwMDAwOwotCWVs c2UgaWYgKElTX0dFTjMoZGV2KSB8fCBJU19HRU40KGRldikpCisJZWxzZSBpZiAoSVNfR0VOMyhk ZXZfcHJpdikgfHwgSVNfR0VONChkZXZfcHJpdikpCiAJCW1heF9jbG9jayA9IDQwMDAwMDsKIAll bHNlCiAJCW1heF9jbG9jayA9IDM1MDAwMDsKQEAgLTU2Nyw3ICs1NjcsNyBAQCBpbnRlbF9jcnRf bG9hZF9kZXRlY3Qoc3RydWN0IGludGVsX2NydCAqY3J0LCB1aW50MzJfdCBwaXBlKQogCS8qIFNl dCB0aGUgYm9yZGVyIGNvbG9yIHRvIHB1cnBsZS4gKi8KIAlJOTE1X1dSSVRFKGJjbHJwYXRfcmVn LCAweDUwMDA1MCk7CiAKLQlpZiAoIUlTX0dFTjIoZGV2KSkgeworCWlmICghSVNfR0VOMihkZXZf cHJpdikpIHsKIAkJdWludDMyX3QgcGlwZWNvbmYgPSBJOTE1X1JFQUQocGlwZWNvbmZfcmVnKTsK IAkJSTkxNV9XUklURShwaXBlY29uZl9yZWcsIHBpcGVjb25mIHwgUElQRUNPTkZfRk9SQ0VfQk9S REVSKTsKIAkJUE9TVElOR19SRUFEKHBpcGVjb25mX3JlZyk7CkBAIC04OTksNyArODk5LDcgQEAg dm9pZCBpbnRlbF9jcnRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWVsc2UKIAkJY3J0 LT5iYXNlLmNydGNfbWFzayA9ICgxIDw8IDApIHwgKDEgPDwgMSkgfCAoMSA8PCAyKTsKIAotCWlm IChJU19HRU4yKGRldikpCisJaWYgKElTX0dFTjIoZGV2X3ByaXYpKQogCQljb25uZWN0b3ItPmlu dGVybGFjZV9hbGxvd2VkID0gMDsKIAllbHNlCiAJCWNvbm5lY3Rvci0+aW50ZXJsYWNlX2FsbG93 ZWQgPSAxOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDQzMzQzYTlhMDdl Zi4uMGNkNjY5NzBkYjYwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0x MDQ1LDcgKzEwNDUsNyBAQCBzdGF0aWMgYm9vbCBwaXBlX2RzbF9zdG9wcGVkKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIGVudW0gcGlwZSBwaXBlKQogCXUzMiBsaW5lMSwgbGluZTI7CiAJdTMyIGxp bmVfbWFzazsKIAotCWlmIChJU19HRU4yKGRldikpCisJaWYgKElTX0dFTjIoZGV2X3ByaXYpKQog CQlsaW5lX21hc2sgPSBEU0xfTElORU1BU0tfR0VOMjsKIAllbHNlCiAJCWxpbmVfbWFzayA9IERT TF9MSU5FTUFTS19HRU4zOwpAQCAtMzk0NCw3ICszOTQ0LDcgQEAgc3RhdGljIHZvaWQgZ2VuNl9m ZGlfbGlua190cmFpbihzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJdGVtcCA9IEk5MTVfUkVBRChy ZWcpOwogCXRlbXAgJj0gfkZESV9MSU5LX1RSQUlOX05PTkU7CiAJdGVtcCB8PSBGRElfTElOS19U UkFJTl9QQVRURVJOXzI7Ci0JaWYgKElTX0dFTjYoZGV2KSkgeworCWlmIChJU19HRU42KGRldl9w cml2KSkgewogCQl0ZW1wICY9IH5GRElfTElOS19UUkFJTl9WT0xfRU1QX01BU0s7CiAJCS8qIFNO Qi1CICovCiAJCXRlbXAgfD0gRkRJX0xJTktfVFJBSU5fNDAwTVZfMERCX1NOQl9COwpAQCAtNDk4 Miw3ICs0OTgyLDcgQEAgaW50ZWxfcG9zdF9lbmFibGVfcHJpbWFyeShzdHJ1Y3QgZHJtX2NydGMg KmNydGMpCiAJICogRklYTUU6IE5lZWQgdG8gZml4IHRoZSBsb2dpYyB0byB3b3JrIHdoZW4gd2Ug dHVybiBvZmYgYWxsIHBsYW5lcwogCSAqIGJ1dCBsZWF2ZSB0aGUgcGlwZSBydW5uaW5nLgogCSAq LwotCWlmIChJU19HRU4yKGRldikpCisJaWYgKElTX0dFTjIoZGV2X3ByaXYpKQogCQlpbnRlbF9z ZXRfY3B1X2ZpZm9fdW5kZXJydW5fcmVwb3J0aW5nKGRldl9wcml2LCBwaXBlLCB0cnVlKTsKIAog CS8qIFVuZGVycnVucyBkb24ndCBhbHdheXMgcmFpc2UgaW50ZXJydXB0cywgc28gY2hlY2sgbWFu dWFsbHkuICovCkBAIC01MDA1LDcgKzUwMDUsNyBAQCBpbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5 KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkgKiBGSVhNRTogTmVlZCB0byBmaXggdGhlIGxvZ2lj IHRvIHdvcmsgd2hlbiB3ZSB0dXJuIG9mZiBhbGwgcGxhbmVzCiAJICogYnV0IGxlYXZlIHRoZSBw aXBlIHJ1bm5pbmcuCiAJICovCi0JaWYgKElTX0dFTjIoZGV2KSkKKwlpZiAoSVNfR0VOMihkZXZf cHJpdikpCiAJCWludGVsX3NldF9jcHVfZmlmb191bmRlcnJ1bl9yZXBvcnRpbmcoZGV2X3ByaXYs IHBpcGUsIGZhbHNlKTsKIAogCS8qCkBAIC02NzcyLDcgKzY3NzIsNyBAQCBzdGF0aWMgdm9pZCBp OXh4X2NydGNfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKIAog CWludGVsX2NydGMtPmFjdGl2ZSA9IHRydWU7CiAKLQlpZiAoIUlTX0dFTjIoZGV2KSkKKwlpZiAo IUlTX0dFTjIoZGV2X3ByaXYpKQogCQlpbnRlbF9zZXRfY3B1X2ZpZm9fdW5kZXJydW5fcmVwb3J0 aW5nKGRldl9wcml2LCBwaXBlLCB0cnVlKTsKIAogCWludGVsX2VuY29kZXJzX3ByZV9lbmFibGUo Y3J0YywgcGlwZV9jb25maWcsIG9sZF9zdGF0ZSk7CkBAIC02ODIwLDcgKzY4MjAsNyBAQCBzdGF0 aWMgdm9pZCBpOXh4X2NydGNfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2Ny dGNfc3RhdGUsCiAJICogT24gZ2VuMiBwbGFuZXMgYXJlIGRvdWJsZSBidWZmZXJlZCBidXQgdGhl IHBpcGUgaXNuJ3QsIHNvIHdlIG11c3QKIAkgKiB3YWl0IGZvciBwbGFuZXMgdG8gZnVsbHkgdHVy biBvZmYgYmVmb3JlIGRpc2FibGluZyB0aGUgcGlwZS4KIAkgKi8KLQlpZiAoSVNfR0VOMihkZXYp KQorCWlmIChJU19HRU4yKGRldl9wcml2KSkKIAkJaW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRldiwg cGlwZSk7CiAKIAlpbnRlbF9lbmNvZGVyc19kaXNhYmxlKGNydGMsIG9sZF9jcnRjX3N0YXRlLCBv bGRfc3RhdGUpOwpAQCAtNjg0NSw3ICs2ODQ1LDcgQEAgc3RhdGljIHZvaWQgaTl4eF9jcnRjX2Rp c2FibGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAogCiAJaW50ZWxf ZW5jb2RlcnNfcG9zdF9wbGxfZGlzYWJsZShjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgb2xkX3N0YXRl KTsKIAotCWlmICghSVNfR0VOMihkZXYpKQorCWlmICghSVNfR0VOMihkZXZfcHJpdikpCiAJCWlu dGVsX3NldF9jcHVfZmlmb191bmRlcnJ1bl9yZXBvcnRpbmcoZGV2X3ByaXYsIHBpcGUsIGZhbHNl KTsKIH0KIApAQCAtOTg0Myw3ICs5ODQzLDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfZ2V0X3Bm aXRfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkvKiBXZSBjdXJyZW50bHkgZG8g bm90IGZyZWUgYXNzaWduZW1lbnRzIG9mIHBhbmVsIGZpdHRlcnMgb24KIAkJICogaXZiL2hzdyAo c2luY2Ugd2UgZG9uJ3QgdXNlIHRoZSBoaWdoZXIgdXBzY2FsaW5nIG1vZGVzIHdoaWNoCiAJCSAq IGRpZmZlcmVudGlhdGVzIHRoZW0pIHNvIGp1c3QgV0FSTiBhYm91dCB0aGlzIGNhc2UgZm9yIG5v dy4gKi8KLQkJaWYgKElTX0dFTjcoZGV2KSkgeworCQlpZiAoSVNfR0VONyhkZXZfcHJpdikpIHsK IAkJCVdBUk5fT04oKHRtcCAmIFBGX1BJUEVfU0VMX01BU0tfSVZCKSAhPQogCQkJCVBGX1BJUEVf U0VMX0lWQihjcnRjLT5waXBlKSk7CiAJCX0KQEAgLTExMzE5LDcgKzExMzE5LDcgQEAgc3RhdGlj IGludCBpOXh4X3BsbF9yZWZjbGsoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJcmV0dXJuIGRl dl9wcml2LT52YnQubHZkc19zc2NfZnJlcTsKIAllbHNlIGlmIChIQVNfUENIX1NQTElUKGRldl9w cml2KSkKIAkJcmV0dXJuIDEyMDAwMDsKLQllbHNlIGlmICghSVNfR0VOMihkZXYpKQorCWVsc2Ug aWYgKCFJU19HRU4yKGRldl9wcml2KSkKIAkJcmV0dXJuIDk2MDAwOwogCWVsc2UKIAkJcmV0dXJu IDQ4MDAwOwpAQCAtMTEzNTIsNyArMTEzNTIsNyBAQCBzdGF0aWMgdm9pZCBpOXh4X2NydGNfY2xv Y2tfZ2V0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQljbG9jay5tMiA9IChmcCAmIEZQX00y X0RJVl9NQVNLKSA+PiBGUF9NMl9ESVZfU0hJRlQ7CiAJfQogCi0JaWYgKCFJU19HRU4yKGRldikp IHsKKwlpZiAoIUlTX0dFTjIoZGV2X3ByaXYpKSB7CiAJCWlmIChJU19QSU5FVklFVyhkZXYpKQog CQkJY2xvY2sucDEgPSBmZnMoKGRwbGwgJiBEUExMX0ZQQTAxX1AxX1BPU1RfRElWX01BU0tfUElO RVZJRVcpID4+CiAJCQkJRFBMTF9GUEEwMV9QMV9QT1NUX0RJVl9TSElGVF9QSU5FVklFVyk7CkBA IC0xMTg1MSw2ICsxMTg1MSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfZ2VuN19xdWV1ZV9mbGlwKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxLAogCQkJCSB1aW50MzJfdCBmbGFncykKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGludGVsX3JpbmcgKnJpbmcgPSByZXEt PnJpbmc7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNy dGMpOwogCXVpbnQzMl90IHBsYW5lX2JpdCA9IDA7CkBAIC0xMTg3OSw3ICsxMTg4MCw3IEBAIHN0 YXRpYyBpbnQgaW50ZWxfZ2VuN19xdWV1ZV9mbGlwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ CSAqIDQ4Yml0cyBhZGRyZXNzZXMsIGFuZCB3ZSBuZWVkIGEgTk9PUCBmb3IgdGhlIGJhdGNoIHNp emUgdG8KIAkJICogc3RheSBldmVuLgogCQkgKi8KLQkJaWYgKElTX0dFTjgoZGV2KSkKKwkJaWYg KElTX0dFTjgoZGV2X3ByaXYpKQogCQkJbGVuICs9IDI7CiAJfQogCkBAIC0xMTkxNiw3ICsxMTkx Nyw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfZ2VuN19xdWV1ZV9mbGlwKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCiAJCWludGVsX3JpbmdfZW1pdChyaW5nLCB+KERFUlJNUl9QSVBFQV9QUklfRkxJUF9E T05FIHwKIAkJCQkJICBERVJSTVJfUElQRUJfUFJJX0ZMSVBfRE9ORSB8CiAJCQkJCSAgREVSUk1S X1BJUEVDX1BSSV9GTElQX0RPTkUpKTsKLQkJaWYgKElTX0dFTjgoZGV2KSkKKwkJaWYgKElTX0dF TjgoZGV2X3ByaXYpKQogCQkJaW50ZWxfcmluZ19lbWl0KHJpbmcsIE1JX1NUT1JFX1JFR0lTVEVS X01FTV9HRU44IHwKIAkJCQkJICAgICAgTUlfU1JNX0xSTV9HTE9CQUxfR1RUKTsKIAkJZWxzZQpA QCAtMTE5MjUsNyArMTE5MjYsNyBAQCBzdGF0aWMgaW50IGludGVsX2dlbjdfcXVldWVfZmxpcChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpbnRlbF9yaW5nX2VtaXRfcmVnKHJpbmcsIERFUlJN Uik7CiAJCWludGVsX3JpbmdfZW1pdChyaW5nLAogCQkJCWk5MTVfZ2d0dF9vZmZzZXQocmVxLT5l bmdpbmUtPnNjcmF0Y2gpICsgMjU2KTsKLQkJaWYgKElTX0dFTjgoZGV2KSkgeworCQlpZiAoSVNf R0VOOChkZXZfcHJpdikpIHsKIAkJCWludGVsX3JpbmdfZW1pdChyaW5nLCAwKTsKIAkJCWludGVs X3JpbmdfZW1pdChyaW5nLCBNSV9OT09QKTsKIAkJfQpAQCAtMTUzMTksNyArMTUzMjAsNyBAQCBz dGF0aWMgYm9vbCBoYXNfZWRwX2Eoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAoKEk5MTVf UkVBRChEUF9BKSAmIERQX0RFVEVDVEVEKSA9PSAwKQogCQlyZXR1cm4gZmFsc2U7CiAKLQlpZiAo SVNfR0VONShkZXYpICYmIChJOTE1X1JFQUQoRlVTRV9TVFJBUCkgJiBJTEtfZURQX0FfRElTQUJM RSkpCisJaWYgKElTX0dFTjUoZGV2X3ByaXYpICYmIChJOTE1X1JFQUQoRlVTRV9TVFJBUCkgJiBJ TEtfZURQX0FfRElTQUJMRSkpCiAJCXJldHVybiBmYWxzZTsKIAogCXJldHVybiB0cnVlOwpAQCAt MTU1MjEsNyArMTU1MjIsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zZXR1cF9vdXRwdXRzKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAJCX0KIAogCQlpbnRlbF9kc2lfaW5pdChkZXYpOwotCX0gZWxz ZSBpZiAoIUlTX0dFTjIoZGV2KSAmJiAhSVNfUElORVZJRVcoZGV2KSkgeworCX0gZWxzZSBpZiAo IUlTX0dFTjIoZGV2X3ByaXYpICYmICFJU19QSU5FVklFVyhkZXZfcHJpdikpIHsKIAkJYm9vbCBm b3VuZCA9IGZhbHNlOwogCiAJCWlmIChJOTE1X1JFQUQoR0VOM19TRFZPQikgJiBTRFZPX0RFVEVD VEVEKSB7CkBAIC0xNTU1NSw3ICsxNTU1Niw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3NldHVwX291 dHB1dHMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCQlpZiAoSVNfRzRYKGRldl9wcml2KSAm JiAoSTkxNV9SRUFEKERQX0QpICYgRFBfREVURUNURUQpKQogCQkJaW50ZWxfZHBfaW5pdChkZXYs IERQX0QsIFBPUlRfRCk7Ci0JfSBlbHNlIGlmIChJU19HRU4yKGRldikpCisJfSBlbHNlIGlmIChJ U19HRU4yKGRldl9wcml2KSkKIAkJaW50ZWxfZHZvX2luaXQoZGV2KTsKIAogCWlmIChTVVBQT1JU U19UVihkZXYpKQpAQCAtMTYzODAsMTAgKzE2MzgxLDEwIEBAIHZvaWQgaW50ZWxfbW9kZXNldF9p bml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCX0KIAl9CiAKLQlpZiAoSVNfR0VOMihkZXYp KSB7CisJaWYgKElTX0dFTjIoZGV2X3ByaXYpKSB7CiAJCWRldi0+bW9kZV9jb25maWcubWF4X3dp ZHRoID0gMjA0ODsKIAkJZGV2LT5tb2RlX2NvbmZpZy5tYXhfaGVpZ2h0ID0gMjA0ODsKLQl9IGVs c2UgaWYgKElTX0dFTjMoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfR0VOMyhkZXZfcHJpdikpIHsK IAkJZGV2LT5tb2RlX2NvbmZpZy5tYXhfd2lkdGggPSA0MDk2OwogCQlkZXYtPm1vZGVfY29uZmln Lm1heF9oZWlnaHQgPSA0MDk2OwogCX0gZWxzZSB7CkBAIC0xNjM5NCw3ICsxNjM5NSw3IEBAIHZv aWQgaW50ZWxfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKElTXzg0 NUcoZGV2X3ByaXYpIHx8IElTX0k4NjVHKGRldl9wcml2KSkgewogCQlkZXYtPm1vZGVfY29uZmln LmN1cnNvcl93aWR0aCA9IElTXzg0NUcoZGV2X3ByaXYpID8gNjQgOiA1MTI7CiAJCWRldi0+bW9k ZV9jb25maWcuY3Vyc29yX2hlaWdodCA9IDEwMjM7Ci0JfSBlbHNlIGlmIChJU19HRU4yKGRldikp IHsKKwl9IGVsc2UgaWYgKElTX0dFTjIoZGV2X3ByaXYpKSB7CiAJCWRldi0+bW9kZV9jb25maWcu Y3Vyc29yX3dpZHRoID0gR0VOMl9DVVJTT1JfV0lEVEg7CiAJCWRldi0+bW9kZV9jb25maWcuY3Vy c29yX2hlaWdodCA9IEdFTjJfQ1VSU09SX0hFSUdIVDsKIAl9IGVsc2UgewpAQCAtMTY5MTUsNyAr MTY5MTYsNyBAQCBpbnRlbF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAKIAlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhk ZXZfcHJpdikpCiAJCXZsdl93bV9nZXRfaHdfc3RhdGUoZGV2KTsKLQllbHNlIGlmIChJU19HRU45 KGRldikpCisJZWxzZSBpZiAoSVNfR0VOOShkZXZfcHJpdikpCiAJCXNrbF93bV9nZXRfaHdfc3Rh dGUoZGV2KTsKIAllbHNlIGlmIChIQVNfUENIX1NQTElUKGRldl9wcml2KSkKIAkJaWxrX3dtX2dl dF9od19zdGF0ZShkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXggYTJjNGQ1YTBiNzA0 Li5iYTNhYzI2NjE2MjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rw LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtMTc2Nyw3ICsxNzY3 LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZHBfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAq ZW5jb2RlciwKIAogCS8qIFNwbGl0IG91dCB0aGUgSUJYL0NQVSB2cyBDUFQgc2V0dGluZ3MgKi8K IAotCWlmIChJU19HRU43KGRldikgJiYgcG9ydCA9PSBQT1JUX0EpIHsKKwlpZiAoSVNfR0VONyhk ZXZfcHJpdikgJiYgcG9ydCA9PSBQT1JUX0EpIHsKIAkJaWYgKGFkanVzdGVkX21vZGUtPmZsYWdz ICYgRFJNX01PREVfRkxBR19QSFNZTkMpCiAJCQlpbnRlbF9kcC0+RFAgfD0gRFBfU1lOQ19IU19I SUdIOwogCQlpZiAoYWRqdXN0ZWRfbW9kZS0+ZmxhZ3MgJiBEUk1fTU9ERV9GTEFHX1BWU1lOQykK QEAgLTIxMTMsNyArMjExMyw3IEBAIHN0YXRpYyB2b2lkIGVkcF9wYW5lbF9vbihzdHJ1Y3QgaW50 ZWxfZHAgKmludGVsX2RwKQogCiAJcHBfY3RybF9yZWcgPSBfcHBfY3RybF9yZWcoaW50ZWxfZHAp OwogCXBwID0gaXJvbmxha2VfZ2V0X3BwX2NvbnRyb2woaW50ZWxfZHApOwotCWlmIChJU19HRU41 KGRldikpIHsKKwlpZiAoSVNfR0VONShkZXZfcHJpdikpIHsKIAkJLyogSUxLIHdvcmthcm91bmQ6 IGRpc2FibGUgcmVzZXQgYXJvdW5kIHBvd2VyIHNlcXVlbmNlICovCiAJCXBwICY9IH5QQU5FTF9Q T1dFUl9SRVNFVDsKIAkJSTkxNV9XUklURShwcF9jdHJsX3JlZywgcHApOwpAQCAtMjEyMSw3ICsy MTIxLDcgQEAgc3RhdGljIHZvaWQgZWRwX3BhbmVsX29uKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxf ZHApCiAJfQogCiAJcHAgfD0gUEFORUxfUE9XRVJfT047Ci0JaWYgKCFJU19HRU41KGRldikpCisJ aWYgKCFJU19HRU41KGRldl9wcml2KSkKIAkJcHAgfD0gUEFORUxfUE9XRVJfUkVTRVQ7CiAKIAlJ OTE1X1dSSVRFKHBwX2N0cmxfcmVnLCBwcCk7CkBAIC0yMTMwLDcgKzIxMzAsNyBAQCBzdGF0aWMg dm9pZCBlZHBfcGFuZWxfb24oc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAl3YWl0X3BhbmVs X29uKGludGVsX2RwKTsKIAlpbnRlbF9kcC0+bGFzdF9wb3dlcl9vbiA9IGppZmZpZXM7CiAKLQlp ZiAoSVNfR0VONShkZXYpKSB7CisJaWYgKElTX0dFTjUoZGV2X3ByaXYpKSB7CiAJCXBwIHw9IFBB TkVMX1BPV0VSX1JFU0VUOyAvKiByZXN0b3JlIHBhbmVsIHJlc2V0IGJpdCAqLwogCQlJOTE1X1dS SVRFKHBwX2N0cmxfcmVnLCBwcCk7CiAJCVBPU1RJTkdfUkVBRChwcF9jdHJsX3JlZyk7CkBAIC0y NDQzLDcgKzI0NDMsNyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9kcF9nZXRfaHdfc3RhdGUoc3RydWN0 IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJaWYgKCEodG1wICYgRFBfUE9SVF9FTikpCiAJCWdv dG8gb3V0OwogCi0JaWYgKElTX0dFTjcoZGV2KSAmJiBwb3J0ID09IFBPUlRfQSkgeworCWlmIChJ U19HRU43KGRldl9wcml2KSAmJiBwb3J0ID09IFBPUlRfQSkgewogCQkqcGlwZSA9IFBPUlRfVE9f UElQRV9DUFQodG1wKTsKIAl9IGVsc2UgaWYgKEhBU19QQ0hfQ1BUKGRldl9wcml2KSAmJiBwb3J0 ICE9IFBPUlRfQSkgewogCQllbnVtIHBpcGUgcDsKQEAgLTI2NjEsNyArMjY2MSw3IEBAIF9pbnRl bF9kcF9zZXRfbGlua190cmFpbihzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCQl9CiAJCUk5 MTVfV1JJVEUoRFBfVFBfQ1RMKHBvcnQpLCB0ZW1wKTsKIAotCX0gZWxzZSBpZiAoKElTX0dFTjco ZGV2KSAmJiBwb3J0ID09IFBPUlRfQSkgfHwKKwl9IGVsc2UgaWYgKChJU19HRU43KGRldl9wcml2 KSAmJiBwb3J0ID09IFBPUlRfQSkgfHwKIAkJICAgKEhBU19QQ0hfQ1BUKGRldl9wcml2KSAmJiBw b3J0ICE9IFBPUlRfQSkpIHsKIAkJKkRQICY9IH5EUF9MSU5LX1RSQUlOX01BU0tfQ1BUOwogCkBA IC0yOTkwLDcgKzI5OTAsNyBAQCBpbnRlbF9kcF92b2x0YWdlX21heChzdHJ1Y3QgaW50ZWxfZHAg KmludGVsX2RwKQogCQlyZXR1cm4gRFBfVFJBSU5fVk9MVEFHRV9TV0lOR19MRVZFTF8yOwogCX0g ZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJp dikpCiAJCXJldHVybiBEUF9UUkFJTl9WT0xUQUdFX1NXSU5HX0xFVkVMXzM7Ci0JZWxzZSBpZiAo SVNfR0VONyhkZXYpICYmIHBvcnQgPT0gUE9SVF9BKQorCWVsc2UgaWYgKElTX0dFTjcoZGV2X3By aXYpICYmIHBvcnQgPT0gUE9SVF9BKQogCQlyZXR1cm4gRFBfVFJBSU5fVk9MVEFHRV9TV0lOR19M RVZFTF8yOwogCWVsc2UgaWYgKEhBU19QQ0hfQ1BUKGRldl9wcml2KSAmJiBwb3J0ICE9IFBPUlRf QSkKIAkJcmV0dXJuIERQX1RSQUlOX1ZPTFRBR0VfU1dJTkdfTEVWRUxfMzsKQEAgLTMzNTMsMTAg KzMzNTMsMTAgQEAgaW50ZWxfZHBfc2V0X3NpZ25hbF9sZXZlbHMoc3RydWN0IGludGVsX2RwICpp bnRlbF9kcCkKIAkJc2lnbmFsX2xldmVscyA9IGNodl9zaWduYWxfbGV2ZWxzKGludGVsX2RwKTsK IAl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpKSB7CiAJCXNpZ25hbF9sZXZlbHMg PSB2bHZfc2lnbmFsX2xldmVscyhpbnRlbF9kcCk7Ci0JfSBlbHNlIGlmIChJU19HRU43KGRldikg JiYgcG9ydCA9PSBQT1JUX0EpIHsKKwl9IGVsc2UgaWYgKElTX0dFTjcoZGV2X3ByaXYpICYmIHBv cnQgPT0gUE9SVF9BKSB7CiAJCXNpZ25hbF9sZXZlbHMgPSBnZW43X2VkcF9zaWduYWxfbGV2ZWxz KHRyYWluX3NldCk7CiAJCW1hc2sgPSBFRFBfTElOS19UUkFJTl9WT0xfRU1QX01BU0tfSVZCOwot CX0gZWxzZSBpZiAoSVNfR0VONihkZXYpICYmIHBvcnQgPT0gUE9SVF9BKSB7CisJfSBlbHNlIGlm IChJU19HRU42KGRldl9wcml2KSAmJiBwb3J0ID09IFBPUlRfQSkgewogCQlzaWduYWxfbGV2ZWxz ID0gZ2VuNl9lZHBfc2lnbmFsX2xldmVscyh0cmFpbl9zZXQpOwogCQltYXNrID0gRURQX0xJTktf VFJBSU5fVk9MX0VNUF9NQVNLX1NOQjsKIAl9IGVsc2UgewpAQCAtMzQ0NCw3ICszNDQ0LDcgQEAg aW50ZWxfZHBfbGlua19kb3duKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAKIAlEUk1fREVC VUdfS01TKCJcbiIpOwogCi0JaWYgKChJU19HRU43KGRldikgJiYgcG9ydCA9PSBQT1JUX0EpIHx8 CisJaWYgKChJU19HRU43KGRldl9wcml2KSAmJiBwb3J0ID09IFBPUlRfQSkgfHwKIAkgICAgKEhB U19QQ0hfQ1BUKGRldl9wcml2KSAmJiBwb3J0ICE9IFBPUlRfQSkpIHsKIAkJRFAgJj0gfkRQX0xJ TktfVFJBSU5fTUFTS19DUFQ7CiAJCURQIHw9IERQX0xJTktfVFJBSU5fUEFUX0lETEVfQ1BUOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA1OWE3M2Y4Y2E3YWYuLjcyMDk1OGI1ZjVmMiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTE3MjIsNyArMTcyMiw3IEBAIGJvb2wgY2h2 X3BoeV9wb3dlcmdhdGVfY2goc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVt IGRwaW9fcGh5IHBoeSwKIC8qIGludGVsX3BtLmMgKi8KIHZvaWQgaW50ZWxfaW5pdF9jbG9ja19n YXRpbmcoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGludGVsX3N1c3BlbmRfaHcoc3Ry dWN0IGRybV9kZXZpY2UgKmRldik7Ci1pbnQgaWxrX3dtX21heF9sZXZlbChjb25zdCBzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KTsKK2ludCBpbGtfd21fbWF4X2xldmVsKGNvbnN0IHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGludGVsX3VwZGF0ZV93YXRlcm1hcmtzKHN0 cnVjdCBkcm1fY3J0YyAqY3J0Yyk7CiB2b2lkIGludGVsX2luaXRfcG0oc3RydWN0IGRybV9kZXZp Y2UgKmRldik7CiB2b2lkIGludGVsX2luaXRfY2xvY2tfZ2F0aW5nX2hvb2tzKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9maWZvX3VuZGVycnVuLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9maWZv X3VuZGVycnVuLmMKaW5kZXggMDc2ODkzY2MzODkwLi4zMDE4ZjRmNTg5YzggMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZpZm9fdW5kZXJydW4uYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9maWZvX3VuZGVycnVuLmMKQEAgLTI1NiwxMSArMjU2LDExIEBA IHN0YXRpYyBib29sIF9faW50ZWxfc2V0X2NwdV9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJaWYgKEhBU19HTUNIX0RJU1BMQVkoZGV2X3ByaXYpKQog CQlpOXh4X3NldF9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXYsIHBpcGUsIGVuYWJsZSwgb2xk KTsKLQllbHNlIGlmIChJU19HRU41KGRldikgfHwgSVNfR0VONihkZXYpKQorCWVsc2UgaWYgKElT X0dFTjUoZGV2X3ByaXYpIHx8IElTX0dFTjYoZGV2X3ByaXYpKQogCQlpcm9ubGFrZV9zZXRfZmlm b191bmRlcnJ1bl9yZXBvcnRpbmcoZGV2LCBwaXBlLCBlbmFibGUpOwotCWVsc2UgaWYgKElTX0dF TjcoZGV2KSkKKwllbHNlIGlmIChJU19HRU43KGRldl9wcml2KSkKIAkJaXZ5YnJpZGdlX3NldF9m aWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXYsIHBpcGUsIGVuYWJsZSwgb2xkKTsKLQllbHNlIGlm IChJU19HRU44KGRldikgfHwgSVNfR0VOOShkZXYpKQorCWVsc2UgaWYgKElTX0dFTjgoZGV2X3By aXYpIHx8IElTX0dFTjkoZGV2X3ByaXYpKQogCQlicm9hZHdlbGxfc2V0X2ZpZm9fdW5kZXJydW5f cmVwb3J0aW5nKGRldiwgcGlwZSwgZW5hYmxlKTsKIAogCXJldHVybiBvbGQ7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKaW5kZXggNWQ1ZDYwOWVkNWU5Li5jYzdkZjBjNTc5 ODIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKQEAgLTM0Nyw3ICsz NDcsNiBAQCBzdGF0aWMgdTMyIGd1Y193b3BjbV9zaXplKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIHN0YXRpYyBpbnQgZ3VjX3Vjb2RlX3hmZXIoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogewogCXN0cnVjdCBpbnRlbF9ndWNfZncgKmd1Y19mdyA9ICZkZXZf cHJpdi0+Z3VjLmd1Y19mdzsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gJmRldl9wcml2LT5k cm07CiAJc3RydWN0IGk5MTVfdm1hICp2bWE7CiAJaW50IHJldDsKIApAQCAtMzkwLDcgKzM4OSw3 IEBAIHN0YXRpYyBpbnQgZ3VjX3Vjb2RlX3hmZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogCWVsc2UKIAkJSTkxNV9XUklURShHRU45X0dUX1BNX0NPTkZJRywgR1RfRE9PUkJF TExfRU5BQkxFKTsKIAotCWlmIChJU19HRU45KGRldikpIHsKKwlpZiAoSVNfR0VOOShkZXZfcHJp dikpIHsKIAkJLyogRE9QIENsb2NrIEdhdGluZyBFbmFibGUgZm9yIEd1QyBjbG9ja3MgKi8KIAkJ STkxNV9XUklURShHRU43X01JU0NDUENUTCwgKEdFTjhfRE9QX0NMT0NLX0dBVEVfR1VDX0VOQUJM RSB8CiAJCQkJCSAgICBJOTE1X1JFQUQoR0VON19NSVNDQ1BDVEwpKSk7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9sdmRzLmMKaW5kZXggMWM0N2Y5OTkxN2U2Li4xOTliOTBjNzkwN2EgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9sdmRzLmMKQEAgLTEwNzEsNyArMTA3MSw3IEBAIHZvaWQgaW50ZWxfbHZkc19p bml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaW50ZWxfZW5jb2Rlci0+Y2xvbmVhYmxlID0g MDsKIAlpZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikpCiAJCWludGVsX2VuY29kZXItPmNydGNf bWFzayA9ICgxIDw8IDApIHwgKDEgPDwgMSkgfCAoMSA8PCAyKTsKLQllbHNlIGlmIChJU19HRU40 KGRldikpCisJZWxzZSBpZiAoSVNfR0VONChkZXZfcHJpdikpCiAJCWludGVsX2VuY29kZXItPmNy dGNfbWFzayA9ICgxIDw8IDApIHwgKDEgPDwgMSk7CiAJZWxzZQogCQlpbnRlbF9lbmNvZGVyLT5j cnRjX21hc2sgPSAoMSA8PCAxKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDU0ZTZlZDA2 NThjZC4uYjdhODk2MTg2Y2M0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTE1MzAsNyAr MTUzMCw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqdW51 c2VkX2NydGMpCiAKIAlpZiAoSVNfSTk0NUdNKGRldikpCiAJCXdtX2luZm8gPSAmaTk0NV93bV9p bmZvOwotCWVsc2UgaWYgKCFJU19HRU4yKGRldikpCisJZWxzZSBpZiAoIUlTX0dFTjIoZGV2X3By aXYpKQogCQl3bV9pbmZvID0gJmk5MTVfd21faW5mbzsKIAllbHNlCiAJCXdtX2luZm8gPSAmaTgz MF9hX3dtX2luZm87CkBAIC0xNTQwLDcgKzE1NDAsNyBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0 ZV93bShzdHJ1Y3QgZHJtX2NydGMgKnVudXNlZF9jcnRjKQogCWlmIChpbnRlbF9jcnRjX2FjdGl2 ZShjcnRjKSkgewogCQljb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9k ZTsKIAkJaW50IGNwcCA9IGRybV9mb3JtYXRfcGxhbmVfY3BwKGNydGMtPnByaW1hcnktPnN0YXRl LT5mYi0+cGl4ZWxfZm9ybWF0LCAwKTsKLQkJaWYgKElTX0dFTjIoZGV2KSkKKwkJaWYgKElTX0dF TjIoZGV2X3ByaXYpKQogCQkJY3BwID0gNDsKIAogCQlhZGp1c3RlZF9tb2RlID0gJnRvX2ludGVs X2NydGMoY3J0YyktPmNvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlOwpAQCAtMTU1NCw3ICsxNTU0 LDcgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICp1bnVzZWRf Y3J0YykKIAkJCXBsYW5lYV93bSA9IHdtX2luZm8tPm1heF93bTsKIAl9CiAKLQlpZiAoSVNfR0VO MihkZXYpKQorCWlmIChJU19HRU4yKGRldl9wcml2KSkKIAkJd21faW5mbyA9ICZpODMwX2JjX3dt X2luZm87CiAKIAlmaWZvX3NpemUgPSBkZXZfcHJpdi0+ZGlzcGxheS5nZXRfZmlmb19zaXplKGRl diwgMSk7CkBAIC0xNTYyLDcgKzE1NjIsNyBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV93bShz dHJ1Y3QgZHJtX2NydGMgKnVudXNlZF9jcnRjKQogCWlmIChpbnRlbF9jcnRjX2FjdGl2ZShjcnRj KSkgewogCQljb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZTsKIAkJ aW50IGNwcCA9IGRybV9mb3JtYXRfcGxhbmVfY3BwKGNydGMtPnByaW1hcnktPnN0YXRlLT5mYi0+ cGl4ZWxfZm9ybWF0LCAwKTsKLQkJaWYgKElTX0dFTjIoZGV2KSkKKwkJaWYgKElTX0dFTjIoZGV2 X3ByaXYpKQogCQkJY3BwID0gNDsKIAogCQlhZGp1c3RlZF9tb2RlID0gJnRvX2ludGVsX2NydGMo Y3J0YyktPmNvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlOwpAQCAtMjA4MiwxMCArMjA4MiwxMCBA QCBzdGF0aWMgdm9pZCBpbnRlbF9yZWFkX3dtX2xhdGVuY3koc3RydWN0IGRybV9kZXZpY2UgKmRl diwgdWludDE2X3Qgd21bOF0pCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gdG9faTkxNShkZXYpOwogCi0JaWYgKElTX0dFTjkoZGV2KSkgeworCWlmIChJU19HRU45KGRl dl9wcml2KSkgewogCQl1aW50MzJfdCB2YWw7CiAJCWludCByZXQsIGk7Ci0JCWludCBsZXZlbCwg bWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXYpOworCQlpbnQgbGV2ZWwsIG1heF9sZXZl bCA9IGlsa193bV9tYXhfbGV2ZWwoZGV2X3ByaXYpOwogCiAJCS8qIHJlYWQgdGhlIGZpcnN0IHNl dCBvZiBtZW1vcnkgbGF0ZW5jaWVzWzA6M10gKi8KIAkJdmFsID0gMDsgLyogZGF0YTAgdG8gYmUg cHJvZ3JhbW1lZCB0byAwIGZvciBmaXJzdCBzZXQgKi8KQEAgLTIxODQsMTAgKzIxODQsMTEgQEAg c3RhdGljIHZvaWQgaW50ZWxfcmVhZF93bV9sYXRlbmN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHVpbnQxNl90IHdtWzhdKQogCX0KIH0KIAotc3RhdGljIHZvaWQgaW50ZWxfZml4dXBfc3ByX3dt X2xhdGVuY3koc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdWludDE2X3Qgd21bNV0pCitzdGF0aWMg dm9pZCBpbnRlbF9maXh1cF9zcHJfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCisJCQkJICAgICAgIHVpbnQxNl90IHdtWzVdKQogewogCS8qIElMSyBzcHJpdGUg TFAwIGxhdGVuY3kgaXMgMTMwMCBucyAqLwotCWlmIChJU19HRU41KGRldikpCisJaWYgKElTX0dF TjUoZGV2X3ByaXYpKQogCQl3bVswXSA9IDEzOwogfQogCkBAIC0yMjAzLDEwICsyMjA0LDggQEAg c3RhdGljIHZvaWQgaW50ZWxfZml4dXBfY3VyX3dtX2xhdGVuY3koc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAogCQl3bVszXSAqPSAyOwogfQogCi1pbnQgaWxrX3dtX21heF9sZXZl bChjb25zdCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQoraW50IGlsa193bV9tYXhfbGV2ZWwoY29u c3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQogCS8qIGhvdyBtYW55IFdNIGxl dmVscyBhcmUgd2UgZXhwZWN0aW5nICovCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkK IAkJcmV0dXJuIDc7CkBAIC0yMjE4LDExICsyMjE3LDExIEBAIGludCBpbGtfd21fbWF4X2xldmVs KGNvbnN0IHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCXJldHVybiAyOwogfQogCi1zdGF0aWMg dm9pZCBpbnRlbF9wcmludF93bV9sYXRlbmN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCitzdGF0 aWMgdm9pZCBpbnRlbF9wcmludF93bV9sYXRlbmN5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKIAkJCQkgICBjb25zdCBjaGFyICpuYW1lLAogCQkJCSAgIGNvbnN0IHVpbnQxNl90 IHdtWzhdKQogewotCWludCBsZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXYp OworCWludCBsZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXZfcHJpdik7CiAK IAlmb3IgKGxldmVsID0gMDsgbGV2ZWwgPD0gbWF4X2xldmVsOyBsZXZlbCsrKSB7CiAJCXVuc2ln bmVkIGludCBsYXRlbmN5ID0gd21bbGV2ZWxdOwpAQCAtMjIzNyw3ICsyMjM2LDcgQEAgc3RhdGlj IHZvaWQgaW50ZWxfcHJpbnRfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkg KiAtIGxhdGVuY2llcyBhcmUgaW4gdXMgb24gZ2VuOS4KIAkJICogLSBiZWZvcmUgdGhlbiwgV00x KyBsYXRlbmN5IHZhbHVlcyBhcmUgaW4gMC41dXMgdW5pdHMKIAkJICovCi0JCWlmIChJU19HRU45 KGRldikpCisJCWlmIChJU19HRU45KGRldl9wcml2KSkKIAkJCWxhdGVuY3kgKj0gMTA7CiAJCWVs c2UgaWYgKGxldmVsID4gMCkKIAkJCWxhdGVuY3kgKj0gNTsKQEAgLTIyNTEsNyArMjI1MCw3IEBA IHN0YXRpYyB2b2lkIGludGVsX3ByaW50X3dtX2xhdGVuY3koc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIHN0YXRpYyBib29sIGlsa19pbmNyZWFzZV93bV9sYXRlbmN5KHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKIAkJCQkgICAgdWludDE2X3Qgd21bNV0sIHVpbnQxNl90IG1pbikK IHsKLQlpbnQgbGV2ZWwsIG1heF9sZXZlbCA9IGlsa193bV9tYXhfbGV2ZWwoJmRldl9wcml2LT5k cm0pOworCWludCBsZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXZfcHJpdik7 CiAKIAlpZiAod21bMF0gPj0gbWluKQogCQlyZXR1cm4gZmFsc2U7CkBAIC0yMjgwLDkgKzIyNzks OSBAQCBzdGF0aWMgdm9pZCBzbmJfd21fbGF0ZW5jeV9xdWlyayhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogCQlyZXR1cm47CiAKIAlEUk1fREVCVUdfS01TKCJXTSBsYXRlbmN5IHZhbHVlcyBpbmNy ZWFzZWQgdG8gYXZvaWQgcG90ZW50aWFsIHVuZGVycnVuc1xuIik7Ci0JaW50ZWxfcHJpbnRfd21f bGF0ZW5jeShkZXYsICJQcmltYXJ5IiwgZGV2X3ByaXYtPndtLnByaV9sYXRlbmN5KTsKLQlpbnRl bF9wcmludF93bV9sYXRlbmN5KGRldiwgIlNwcml0ZSIsIGRldl9wcml2LT53bS5zcHJfbGF0ZW5j eSk7Ci0JaW50ZWxfcHJpbnRfd21fbGF0ZW5jeShkZXYsICJDdXJzb3IiLCBkZXZfcHJpdi0+d20u Y3VyX2xhdGVuY3kpOworCWludGVsX3ByaW50X3dtX2xhdGVuY3koZGV2X3ByaXYsICJQcmltYXJ5 IiwgZGV2X3ByaXYtPndtLnByaV9sYXRlbmN5KTsKKwlpbnRlbF9wcmludF93bV9sYXRlbmN5KGRl dl9wcml2LCAiU3ByaXRlIiwgZGV2X3ByaXYtPndtLnNwcl9sYXRlbmN5KTsKKwlpbnRlbF9wcmlu dF93bV9sYXRlbmN5KGRldl9wcml2LCAiQ3Vyc29yIiwgZGV2X3ByaXYtPndtLmN1cl9sYXRlbmN5 KTsKIH0KIAogc3RhdGljIHZvaWQgaWxrX3NldHVwX3dtX2xhdGVuY3koc3RydWN0IGRybV9kZXZp Y2UgKmRldikKQEAgLTIyOTYsMTQgKzIyOTUsMTQgQEAgc3RhdGljIHZvaWQgaWxrX3NldHVwX3dt X2xhdGVuY3koc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAltZW1jcHkoZGV2X3ByaXYtPndtLmN1 cl9sYXRlbmN5LCBkZXZfcHJpdi0+d20ucHJpX2xhdGVuY3ksCiAJICAgICAgIHNpemVvZihkZXZf cHJpdi0+d20ucHJpX2xhdGVuY3kpKTsKIAotCWludGVsX2ZpeHVwX3Nwcl93bV9sYXRlbmN5KGRl diwgZGV2X3ByaXYtPndtLnNwcl9sYXRlbmN5KTsKKwlpbnRlbF9maXh1cF9zcHJfd21fbGF0ZW5j eShkZXZfcHJpdiwgZGV2X3ByaXYtPndtLnNwcl9sYXRlbmN5KTsKIAlpbnRlbF9maXh1cF9jdXJf d21fbGF0ZW5jeShkZXZfcHJpdiwgZGV2X3ByaXYtPndtLmN1cl9sYXRlbmN5KTsKIAotCWludGVs X3ByaW50X3dtX2xhdGVuY3koZGV2LCAiUHJpbWFyeSIsIGRldl9wcml2LT53bS5wcmlfbGF0ZW5j eSk7Ci0JaW50ZWxfcHJpbnRfd21fbGF0ZW5jeShkZXYsICJTcHJpdGUiLCBkZXZfcHJpdi0+d20u c3ByX2xhdGVuY3kpOwotCWludGVsX3ByaW50X3dtX2xhdGVuY3koZGV2LCAiQ3Vyc29yIiwgZGV2 X3ByaXYtPndtLmN1cl9sYXRlbmN5KTsKKwlpbnRlbF9wcmludF93bV9sYXRlbmN5KGRldl9wcml2 LCAiUHJpbWFyeSIsIGRldl9wcml2LT53bS5wcmlfbGF0ZW5jeSk7CisJaW50ZWxfcHJpbnRfd21f bGF0ZW5jeShkZXZfcHJpdiwgIlNwcml0ZSIsIGRldl9wcml2LT53bS5zcHJfbGF0ZW5jeSk7CisJ aW50ZWxfcHJpbnRfd21fbGF0ZW5jeShkZXZfcHJpdiwgIkN1cnNvciIsIGRldl9wcml2LT53bS5j dXJfbGF0ZW5jeSk7CiAKLQlpZiAoSVNfR0VONihkZXYpKQorCWlmIChJU19HRU42KGRldl9wcml2 KSkKIAkJc25iX3dtX2xhdGVuY3lfcXVpcmsoZGV2KTsKIH0KIApAQCAtMjMxMiw3ICsyMzExLDcg QEAgc3RhdGljIHZvaWQgc2tsX3NldHVwX3dtX2xhdGVuY3koc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAK IAlpbnRlbF9yZWFkX3dtX2xhdGVuY3koZGV2LCBkZXZfcHJpdi0+d20uc2tsX2xhdGVuY3kpOwot CWludGVsX3ByaW50X3dtX2xhdGVuY3koZGV2LCAiR2VuOSBQbGFuZSIsIGRldl9wcml2LT53bS5z a2xfbGF0ZW5jeSk7CisJaW50ZWxfcHJpbnRfd21fbGF0ZW5jeShkZXZfcHJpdiwgIkdlbjkgUGxh bmUiLCBkZXZfcHJpdi0+d20uc2tsX2xhdGVuY3kpOwogfQogCiBzdGF0aWMgYm9vbCBpbGtfdmFs aWRhdGVfcGlwZV93bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LApAQCAtMjM1MCw3ICsyMzQ5LDcg QEAgc3RhdGljIGludCBpbGtfY29tcHV0ZV9waXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpjc3RhdGUpCiAJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwcmlzdGF0ZSA9IE5VTEw7CiAJ c3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzcHJzdGF0ZSA9IE5VTEw7CiAJc3RydWN0IGludGVs X3BsYW5lX3N0YXRlICpjdXJzdGF0ZSA9IE5VTEw7Ci0JaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBp bGtfd21fbWF4X2xldmVsKGRldiksIHVzYWJsZV9sZXZlbDsKKwlpbnQgbGV2ZWwsIG1heF9sZXZl bCA9IGlsa193bV9tYXhfbGV2ZWwoZGV2X3ByaXYpLCB1c2FibGVfbGV2ZWw7CiAJc3RydWN0IGls a193bV9tYXhpbXVtcyBtYXg7CiAKIAlwaXBlX3dtID0gJmNzdGF0ZS0+d20uaWxrLm9wdGltYWw7 CkBAIC0yNDM3LDcgKzI0MzYsNyBAQCBzdGF0aWMgaW50IGlsa19jb21wdXRlX2ludGVybWVkaWF0 ZV93bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogewogCXN0cnVjdCBpbnRlbF9waXBlX3dtICph ID0gJm5ld3N0YXRlLT53bS5pbGsuaW50ZXJtZWRpYXRlOwogCXN0cnVjdCBpbnRlbF9waXBlX3dt ICpiID0gJmludGVsX2NydGMtPndtLmFjdGl2ZS5pbGs7Ci0JaW50IGxldmVsLCBtYXhfbGV2ZWwg PSBpbGtfd21fbWF4X2xldmVsKGRldik7CisJaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtfd21f bWF4X2xldmVsKHRvX2k5MTUoZGV2KSk7CiAKIAkvKgogCSAqIFN0YXJ0IHdpdGggdGhlIGZpbmFs LCB0YXJnZXQgd2F0ZXJtYXJrcywgdGhlbiBjb21iaW5lIHdpdGggdGhlCkBAIC0yNTIxLDcgKzI1 MjAsNyBAQCBzdGF0aWMgdm9pZCBpbGtfd21fbWVyZ2Uoc3RydWN0IGRybV9kZXZpY2UgKmRldiwK IAkJCSBzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqbWVyZ2VkKQogewogCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlpbnQgbGV2ZWwsIG1heF9sZXZlbCA9 IGlsa193bV9tYXhfbGV2ZWwoZGV2KTsKKwlpbnQgbGV2ZWwsIG1heF9sZXZlbCA9IGlsa193bV9t YXhfbGV2ZWwoZGV2X3ByaXYpOwogCWludCBsYXN0X2VuYWJsZWRfbGV2ZWwgPSBtYXhfbGV2ZWw7 CiAKIAkvKiBJTEsvU05CL0lWQjogTFAxKyB3YXRlcm1hcmtzIG9ubHkgdy8gc2luZ2xlIHBpcGUg Ki8KQEAgLTI1NjEsNyArMjU2MCw3IEBAIHN0YXRpYyB2b2lkIGlsa193bV9tZXJnZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogCSAqIFdoYXQgd2Ugc2hvdWxkIGNoZWNrIGhlcmUgaXMgd2hldGhl ciBGQkMgY2FuIGJlCiAJICogZW5hYmxlZCBzb21ldGltZSBsYXRlci4KIAkgKi8KLQlpZiAoSVNf R0VONShkZXYpICYmICFtZXJnZWQtPmZiY193bV9lbmFibGVkICYmCisJaWYgKElTX0dFTjUoZGV2 X3ByaXYpICYmICFtZXJnZWQtPmZiY193bV9lbmFibGVkICYmCiAJICAgIGludGVsX2ZiY19pc19h Y3RpdmUoZGV2X3ByaXYpKSB7CiAJCWZvciAobGV2ZWwgPSAyOyBsZXZlbCA8PSBtYXhfbGV2ZWw7 IGxldmVsKyspIHsKIAkJCXN0cnVjdCBpbnRlbF93bV9sZXZlbCAqd20gPSAmbWVyZ2VkLT53bVts ZXZlbF07CkBAIC0yNjYxLDcgKzI2NjAsNyBAQCBzdGF0aWMgc3RydWN0IGludGVsX3BpcGVfd20g Kmlsa19maW5kX2Jlc3RfcmVzdWx0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJCQkgIHN0 cnVjdCBpbnRlbF9waXBlX3dtICpyMSwKIAkJCQkJCSAgc3RydWN0IGludGVsX3BpcGVfd20gKnIy KQogewotCWludCBsZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXYpOworCWlu dCBsZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbCh0b19pOTE1KGRldikpOwogCWlu dCBsZXZlbDEgPSAwLCBsZXZlbDIgPSAwOwogCiAJZm9yIChsZXZlbCA9IDE7IGxldmVsIDw9IG1h eF9sZXZlbDsgbGV2ZWwrKykgewpAQCAtMzAzNSw3ICszMDM0LDcgQEAgYm9vbCBpbnRlbF9jYW5f ZW5hYmxlX3NhZ3Yoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQkJY29udGludWU7 CiAKIAkJLyogRmluZCB0aGUgaGlnaGVzdCBlbmFibGVkIHdtIGxldmVsIGZvciB0aGlzIHBsYW5l ICovCi0JCWZvciAobGV2ZWwgPSBpbGtfd21fbWF4X2xldmVsKGRldik7CisJCWZvciAobGV2ZWwg PSBpbGtfd21fbWF4X2xldmVsKGRldl9wcml2KTsKIAkJICAgICBpbnRlbF9zdGF0ZS0+d21fcmVz dWx0cy5wbGFuZVtwaXBlXVtwbGFuZV1bbGV2ZWxdID09IDA7IC0tbGV2ZWwpCiAJCSAgICAgeyB9 CiAKQEAgLTM3NzYsNyArMzc3NSw3IEBAIHN0YXRpYyBpbnQgc2tsX2J1aWxkX3BpcGVfd20oc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gY3N0YXRlLT5iYXNlLmNydGMtPmRldjsKIAljb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0JaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtf d21fbWF4X2xldmVsKGRldik7CisJaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtfd21fbWF4X2xl dmVsKGRldl9wcml2KTsKIAlpbnQgcmV0OwogCiAJZm9yIChsZXZlbCA9IDA7IGxldmVsIDw9IG1h eF9sZXZlbDsgbGV2ZWwrKykgewpAQCAtMzc5Nyw3ICszNzk2LDcgQEAgc3RhdGljIHZvaWQgc2ts X2NvbXB1dGVfd21fcmVzdWx0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCSAgIHN0cnVj dCBza2xfd21fdmFsdWVzICpyLAogCQkJCSAgIHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRj KQogewotCWludCBsZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXYpOworCWlu dCBsZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbCh0b19pOTE1KGRldikpOwogCWVu dW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAl1aW50MzJfdCB0ZW1wOwogCWludCBp OwpAQCAtMzg2Niw3ICszODY1LDcgQEAgdm9pZCBza2xfd3JpdGVfcGxhbmVfd20oc3RydWN0IGlu dGVsX2NydGMgKmludGVsX2NydGMsCiAJc3RydWN0IGRybV9jcnRjICpjcnRjID0gJmludGVsX2Ny dGMtPmJhc2U7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0JaW50IGxldmVsLCBt YXhfbGV2ZWwgPSBpbGtfd21fbWF4X2xldmVsKGRldik7CisJaW50IGxldmVsLCBtYXhfbGV2ZWwg PSBpbGtfd21fbWF4X2xldmVsKGRldl9wcml2KTsKIAllbnVtIHBpcGUgcGlwZSA9IGludGVsX2Ny dGMtPnBpcGU7CiAKIAlmb3IgKGxldmVsID0gMDsgbGV2ZWwgPD0gbWF4X2xldmVsOyBsZXZlbCsr KSB7CkBAIC0zODg3LDcgKzM4ODYsNyBAQCB2b2lkIHNrbF93cml0ZV9jdXJzb3Jfd20oc3RydWN0 IGludGVsX2NydGMgKmludGVsX2NydGMsCiAJc3RydWN0IGRybV9jcnRjICpjcnRjID0gJmludGVs X2NydGMtPmJhc2U7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0JaW50IGxldmVs LCBtYXhfbGV2ZWwgPSBpbGtfd21fbWF4X2xldmVsKGRldik7CisJaW50IGxldmVsLCBtYXhfbGV2 ZWwgPSBpbGtfd21fbWF4X2xldmVsKGRldl9wcml2KTsKIAllbnVtIHBpcGUgcGlwZSA9IGludGVs X2NydGMtPnBpcGU7CiAKIAlmb3IgKGxldmVsID0gMDsgbGV2ZWwgPD0gbWF4X2xldmVsOyBsZXZl bCsrKSB7CkBAIC00MzMxLDcgKzQzMzAsNyBAQCBzdGF0aWMgdm9pZCBza2xfcGlwZV93bV9nZXRf aHdfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWludCBsZXZlbCwgaSwgbWF4X2xldmVs OwogCXVpbnQzMl90IHRlbXA7CiAKLQltYXhfbGV2ZWwgPSBpbGtfd21fbWF4X2xldmVsKGRldik7 CisJbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXZfcHJpdik7CiAKIAlody0+d21fbGlu ZXRpbWVbcGlwZV0gPSBJOTE1X1JFQUQoUElQRV9XTV9MSU5FVElNRShwaXBlKSk7CiAKQEAgLTQ0 MzEsNyArNDQzMCw3IEBAIHN0YXRpYyB2b2lkIGlsa19waXBlX3dtX2dldF9od19zdGF0ZShzdHJ1 Y3QgZHJtX2NydGMgKmNydGMpCiAJCWFjdGl2ZS0+d21bMF0uY3VyX3ZhbCA9IHRtcCAmIFdNMF9Q SVBFX0NVUlNPUl9NQVNLOwogCQlhY3RpdmUtPmxpbmV0aW1lID0gaHctPndtX2xpbmV0aW1lW3Bp cGVdOwogCX0gZWxzZSB7Ci0JCWludCBsZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZl bChkZXYpOworCQlpbnQgbGV2ZWwsIG1heF9sZXZlbCA9IGlsa193bV9tYXhfbGV2ZWwoZGV2X3By aXYpOwogCiAJCS8qCiAJCSAqIEZvciBpbmFjdGl2ZSBwaXBlcywgYWxsIHdhdGVybWFyayBsZXZl bHMKQEAgLTc3MjksNyArNzcyOCw3IEBAIHZvaWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCS8qIEZvciBjeHNyICovCiAJaWYgKElTX1BJTkVWSUVXKGRldikpCiAJCWk5 MTVfcGluZXZpZXdfZ2V0X21lbV9mcmVxKGRldik7Ci0JZWxzZSBpZiAoSVNfR0VONShkZXYpKQor CWVsc2UgaWYgKElTX0dFTjUoZGV2X3ByaXYpKQogCQlpOTE1X2lyb25sYWtlX2dldF9tZW1fZnJl cShkZXYpOwogCiAJLyogRm9yIEZJRk8gd2F0ZXJtYXJrIHVwZGF0ZXMgKi8KQEAgLTc3NDAsOSAr NzczOSw5IEBAIHZvaWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCX0g ZWxzZSBpZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikpIHsKIAkJaWxrX3NldHVwX3dtX2xhdGVu Y3koZGV2KTsKIAotCQlpZiAoKElTX0dFTjUoZGV2KSAmJiBkZXZfcHJpdi0+d20ucHJpX2xhdGVu Y3lbMV0gJiYKKwkJaWYgKChJU19HRU41KGRldl9wcml2KSAmJiBkZXZfcHJpdi0+d20ucHJpX2xh dGVuY3lbMV0gJiYKIAkJICAgICBkZXZfcHJpdi0+d20uc3ByX2xhdGVuY3lbMV0gJiYgZGV2X3By aXYtPndtLmN1cl9sYXRlbmN5WzFdKSB8fAotCQkgICAgKCFJU19HRU41KGRldikgJiYgZGV2X3By aXYtPndtLnByaV9sYXRlbmN5WzBdICYmCisJCSAgICAoIUlTX0dFTjUoZGV2X3ByaXYpICYmIGRl dl9wcml2LT53bS5wcmlfbGF0ZW5jeVswXSAmJgogCQkgICAgIGRldl9wcml2LT53bS5zcHJfbGF0 ZW5jeVswXSAmJiBkZXZfcHJpdi0+d20uY3VyX2xhdGVuY3lbMF0pKSB7CiAJCQlkZXZfcHJpdi0+ ZGlzcGxheS5jb21wdXRlX3BpcGVfd20gPSBpbGtfY29tcHV0ZV9waXBlX3dtOwogCQkJZGV2X3By aXYtPmRpc3BsYXkuY29tcHV0ZV9pbnRlcm1lZGlhdGVfd20gPQpAQCAtNzc3OCwxMiArNzc3Nywx MiBAQCB2b2lkIGludGVsX2luaXRfcG0oc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCWRldl9w cml2LT5kaXNwbGF5LnVwZGF0ZV93bSA9IHBpbmV2aWV3X3VwZGF0ZV93bTsKIAl9IGVsc2UgaWYg KElTX0c0WChkZXZfcHJpdikpIHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtID0gZzR4 X3VwZGF0ZV93bTsKLQl9IGVsc2UgaWYgKElTX0dFTjQoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNf R0VONChkZXZfcHJpdikpIHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtID0gaTk2NV91 cGRhdGVfd207Ci0JfSBlbHNlIGlmIChJU19HRU4zKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX0dF TjMoZGV2X3ByaXYpKSB7CiAJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV93bSA9IGk5eHhfdXBk YXRlX3dtOwogCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfZmlmb19zaXplID0gaTl4eF9nZXRfZmlm b19zaXplOwotCX0gZWxzZSBpZiAoSVNfR0VOMihkZXYpKSB7CisJfSBlbHNlIGlmIChJU19HRU4y KGRldl9wcml2KSkgewogCQlpZiAoSU5URUxfSU5GTyhkZXYpLT5udW1fcGlwZXMgPT0gMSkgewog CQkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtID0gaTg0NV91cGRhdGVfd207CiAJCQlkZXZf cHJpdi0+ZGlzcGxheS5nZXRfZmlmb19zaXplID0gaTg0NV9nZXRfZmlmb19zaXplOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCA4YjQ3NDg4MzljMDcuLmM3ZDlhMjBlMzcwZCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTY4MCw3ICs2ODAsNyBAQCBpbGtf dXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWlmIChmYi0+bW9kaWZpZXJb MF0gPT0gSTkxNV9GT1JNQVRfTU9EX1hfVElMRUQpCiAJCWR2c2NudHIgfD0gRFZTX1RJTEVEOwog Ci0JaWYgKElTX0dFTjYoZGV2KSkKKwlpZiAoSVNfR0VONihkZXZfcHJpdikpCiAJCWR2c2NudHIg fD0gRFZTX1RSSUNLTEVfRkVFRF9ESVNBQkxFOyAvKiBtdXN0IGRpc2FibGUgKi8KIAogCS8qIFNp emVzIGFyZSAwIGJhc2VkICovCkBAIC0xMDc1LDcgKzEwNzUsNyBAQCBpbnRlbF9wbGFuZV9pbml0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVudW0gcGlwZSBwaXBlLCBpbnQgcGxhbmUpCiAJCWlu dGVsX3BsYW5lLT51cGRhdGVfcGxhbmUgPSBpbGtfdXBkYXRlX3BsYW5lOwogCQlpbnRlbF9wbGFu ZS0+ZGlzYWJsZV9wbGFuZSA9IGlsa19kaXNhYmxlX3BsYW5lOwogCi0JCWlmIChJU19HRU42KGRl dikpIHsKKwkJaWYgKElTX0dFTjYoZGV2X3ByaXYpKSB7CiAJCQlwbGFuZV9mb3JtYXRzID0gc25i X3BsYW5lX2Zvcm1hdHM7CiAJCQludW1fcGxhbmVfZm9ybWF0cyA9IEFSUkFZX1NJWkUoc25iX3Bs YW5lX2Zvcm1hdHMpOwogCQl9IGVsc2UgewotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=