From: Ville Syrjala Subject: [PATCH 10/10] drm/i915: Clean up DP code local variables and calling conventions Date: Tue, 31 Oct 2017 22:51:23 +0200 Message-ID: <20171031205123.13123-11-ville.syrjala@linux.intel.com> References: <20171031205123.13123-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id C1C8B6E634 for ; Tue, 31 Oct 2017 20:52:02 +0000 (UTC) In-Reply-To: <20171031205123.13123-1-ville.syrjala@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkVs aW1pbmF0ZSBhIHRvbiBvZiBwb2ludGxlc3MgJ2RldicgdmFyaWFibGVzIGluIHRoZSBEUCBjb2Rl LCBhbmQgcGFzcwphcm91bmQgJ2Rldl9wcml2JyBpbnN0ZWFkIG9mICdkZXYnLgoKU2lnbmVkLW9m Zi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIHwgMTUxICsrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1NCBpbnNlcnRpb25zKCsp LCA5NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwppbmRleCBmODc1YmE3OGM0 MzUuLjMwYWMxODdiMmI5NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCkBAIC00MzgsMTAgKzQz OCw3IEBAIGludGVsX2RwX3Bwc19pbml0KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApOwogCiBz dGF0aWMgdm9pZCBwcHNfbG9jayhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogewotCXN0cnVj dCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0ID0gZHBfdG9fZGlnX3BvcnQoaW50 ZWxfZHApOwotCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyID0gJmludGVsX2RpZ19wb3J0 LT5iYXNlOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBlbmNvZGVyLT5iYXNlLmRldjsKLQlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRlbF9kcF90b19kZXYoaW50 ZWxfZHApKTsKIAogCS8qCiAJICogU2VlIHZsdl9wb3dlcl9zZXF1ZW5jZXJfcmVzZXQoKSB3aHkg d2UgbmVlZApAQCAtNDU0LDEwICs0NTEsNyBAQCBzdGF0aWMgdm9pZCBwcHNfbG9jayhzdHJ1Y3Qg aW50ZWxfZHAgKmludGVsX2RwKQogCiBzdGF0aWMgdm9pZCBwcHNfdW5sb2NrKHN0cnVjdCBpbnRl bF9kcCAqaW50ZWxfZHApCiB7Ci0Jc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGln X3BvcnQgPSBkcF90b19kaWdfcG9ydChpbnRlbF9kcCk7Ci0Jc3RydWN0IGludGVsX2VuY29kZXIg KmVuY29kZXIgPSAmaW50ZWxfZGlnX3BvcnQtPmJhc2U7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IGVuY29kZXItPmJhc2UuZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0 b19pOTE1KGludGVsX2RwX3RvX2RldihpbnRlbF9kcCkpOwogCiAJbXV0ZXhfdW5sb2NrKCZkZXZf cHJpdi0+cHBzX211dGV4KTsKIApAQCAtNDY3LDggKzQ2MSw4IEBAIHN0YXRpYyB2b2lkIHBwc191 bmxvY2soc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIHN0YXRpYyB2b2lkCiB2bHZfcG93ZXJf c2VxdWVuY2VyX2tpY2soc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIHsKKwlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGludGVsX2RwX3RvX2RldihpbnRlbF9k cCkpOwogCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0ID0gZHBfdG9f ZGlnX3BvcnQoaW50ZWxfZHApOwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoaW50ZWxfZGlnX3BvcnQtPmJhc2UuYmFzZS5kZXYpOwogCWVudW0gcGlwZSBwaXBl ID0gaW50ZWxfZHAtPnBwc19waXBlOwogCWJvb2wgcGxsX2VuYWJsZWQsIHJlbGVhc2VfY2xfb3Zl cnJpZGUgPSBmYWxzZTsKIAllbnVtIGRwaW9fcGh5IHBoeSA9IERQSU9fUEhZKHBpcGUpOwpAQCAt NzMzLDcgKzcyNyw2IEBAIHZsdl9pbml0aWFsX3Bvd2VyX3NlcXVlbmNlcl9zZXR1cChzdHJ1Y3Qg aW50ZWxfZHAgKmludGVsX2RwKQogCiB2b2lkIGludGVsX3Bvd2VyX3NlcXVlbmNlcl9yZXNldChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2Ug KmRldiA9ICZkZXZfcHJpdi0+ZHJtOwogCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyOwog CiAJaWYgKFdBUk5fT04oIUlTX1ZBTExFWVZJRVcoZGV2X3ByaXYpICYmICFJU19DSEVSUllWSUVX KGRldl9wcml2KSAmJgpAQCAtNzUwLDcgKzc0Myw3IEBAIHZvaWQgaW50ZWxfcG93ZXJfc2VxdWVu Y2VyX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkgKiBzaG91bGQg dXNlIHRoZW0gYWx3YXlzLgogCSAqLwogCi0JZm9yX2VhY2hfaW50ZWxfZW5jb2RlcihkZXYsIGVu Y29kZXIpIHsKKwlmb3JfZWFjaF9pbnRlbF9lbmNvZGVyKCZkZXZfcHJpdi0+ZHJtLCBlbmNvZGVy KSB7CiAJCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHA7CiAKIAkJaWYgKGVuY29kZXItPnR5cGUg IT0gSU5URUxfT1VUUFVUX0RQICYmCkBAIC04MzIsOCArODI1LDcgQEAgc3RhdGljIGludCBlZHBf bm90aWZ5X2hhbmRsZXIoc3RydWN0IG5vdGlmaWVyX2Jsb2NrICp0aGlzLCB1bnNpZ25lZCBsb25n IGNvZGUsCiB7CiAJc3RydWN0IGludGVsX2RwICppbnRlbF9kcCA9IGNvbnRhaW5lcl9vZih0aGlz LCB0eXBlb2YoKiBpbnRlbF9kcCksCiAJCQkJCQkgZWRwX25vdGlmaWVyKTsKLQlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gaW50ZWxfZHBfdG9fZGV2KGludGVsX2RwKTsKLQlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRlbF9kcF90b19kZXYoaW50ZWxfZHApKTsKIAog CWlmICghaW50ZWxfZHBfaXNfZWRwKGludGVsX2RwKSB8fCBjb2RlICE9IFNZU19SRVNUQVJUKQog CQlyZXR1cm4gMDsKQEAgLTg2Myw4ICs4NTUsNyBAQCBzdGF0aWMgaW50IGVkcF9ub3RpZnlfaGFu ZGxlcihzdHJ1Y3Qgbm90aWZpZXJfYmxvY2sgKnRoaXMsIHVuc2lnbmVkIGxvbmcgY29kZSwKIAog c3RhdGljIGJvb2wgZWRwX2hhdmVfcGFuZWxfcG93ZXIoc3RydWN0IGludGVsX2RwICppbnRlbF9k cCkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfZHBfdG9fZGV2KGludGVsX2Rw KTsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRlbF9kcF90b19k ZXYoaW50ZWxfZHApKTsKIAogCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmRldl9wcml2LT5wcHNfbXV0 ZXgpOwogCkBAIC04NzcsOCArODY4LDcgQEAgc3RhdGljIGJvb2wgZWRwX2hhdmVfcGFuZWxfcG93 ZXIoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAogc3RhdGljIGJvb2wgZWRwX2hhdmVfcGFu ZWxfdmRkKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2Ug KmRldiA9IGludGVsX2RwX3RvX2RldihpbnRlbF9kcCk7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxfZHBfdG9fZGV2KGludGVsX2RwKSk7CiAKIAlsb2NrZGVw X2Fzc2VydF9oZWxkKCZkZXZfcHJpdi0+cHBzX211dGV4KTsKIApAQCAtODkyLDggKzg4Miw3IEBA IHN0YXRpYyBib29sIGVkcF9oYXZlX3BhbmVsX3ZkZChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2Rw KQogc3RhdGljIHZvaWQKIGludGVsX2RwX2NoZWNrX2VkcChzdHJ1Y3QgaW50ZWxfZHAgKmludGVs X2RwKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9kcF90b19kZXYoaW50ZWxf ZHApOwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsK KwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGludGVsX2RwX3Rv X2RldihpbnRlbF9kcCkpOwogCiAJaWYgKCFpbnRlbF9kcF9pc19lZHAoaW50ZWxfZHApKQogCQly ZXR1cm47CkBAIC05MDksOSArODk4LDcgQEAgaW50ZWxfZHBfY2hlY2tfZWRwKHN0cnVjdCBpbnRl bF9kcCAqaW50ZWxfZHApCiBzdGF0aWMgdWludDMyX3QKIGludGVsX2RwX2F1eF93YWl0X2RvbmUo c3RydWN0IGludGVsX2RwICppbnRlbF9kcCwgYm9vbCBoYXNfYXV4X2lycSkKIHsKLQlzdHJ1Y3Qg aW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVs X2RwKTsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfZGlnX3BvcnQtPmJhc2UuYmFz ZS5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYp OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxfZHBf dG9fZGV2KGludGVsX2RwKSk7CiAJaTkxNV9yZWdfdCBjaF9jdGwgPSBpbnRlbF9kcC0+YXV4X2No X2N0bF9yZWc7CiAJdWludDMyX3Qgc3RhdHVzOwogCWJvb2wgZG9uZTsKQEAgLTE0NzgsOCArMTQ2 NSw3IEBAIHN0YXRpYyB2b2lkCiBpbnRlbF9kcF9zZXRfY2xvY2soc3RydWN0IGludGVsX2VuY29k ZXIgKmVuY29kZXIsCiAJCSAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZykK IHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7Ci0Jc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOwogCWNv bnN0IHN0cnVjdCBkcF9saW5rX2RwbGwgKmRpdmlzb3IgPSBOVUxMOwogCWludCBpLCBjb3VudCA9 IDA7CiAKQEAgLTE4NDgsOCArMTgzNCw3IEBAIHZvaWQgaW50ZWxfZHBfc2V0X2xpbmtfcGFyYW1z KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiBzdGF0aWMgdm9pZCBpbnRlbF9kcF9wcmVwYXJl KHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJICAgICBjb25zdCBzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IGVuY29kZXItPmJhc2UuZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19p OTE1KGVuY29kZXItPmJhc2UuZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gZW5j X3RvX2ludGVsX2RwKCZlbmNvZGVyLT5iYXNlKTsKIAllbnVtIHBvcnQgcG9ydCA9IGRwX3RvX2Rp Z19wb3J0KGludGVsX2RwKS0+YmFzZS5wb3J0OwogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0g dG9faW50ZWxfY3J0YyhwaXBlX2NvbmZpZy0+YmFzZS5jcnRjKTsKQEAgLTE5NDUsOCArMTkzMCw3 IEBAIHN0YXRpYyB2b2lkIHdhaXRfcGFuZWxfc3RhdHVzKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxf ZHAsCiAJCQkJICAgICAgIHUzMiBtYXNrLAogCQkJCSAgICAgICB1MzIgdmFsdWUpCiB7Ci0Jc3Ry dWN0IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2RwX3RvX2RldihpbnRlbF9kcCk7Ci0Jc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxfZHBfdG9fZGV2KGludGVsX2Rw KSk7CiAJaTkxNV9yZWdfdCBwcF9zdGF0X3JlZywgcHBfY3RybF9yZWc7CiAKIAlsb2NrZGVwX2Fz c2VydF9oZWxkKCZkZXZfcHJpdi0+cHBzX211dGV4KTsKQEAgLTIwMjIsOCArMjAwNiw3IEBAIHN0 YXRpYyB2b2lkIGVkcF93YWl0X2JhY2tsaWdodF9vZmYoc3RydWN0IGludGVsX2RwICppbnRlbF9k cCkKIAogc3RhdGljICB1MzIgaXJvbmxha2VfZ2V0X3BwX2NvbnRyb2woc3RydWN0IGludGVsX2Rw ICppbnRlbF9kcCkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfZHBfdG9fZGV2 KGludGVsX2RwKTsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1 KGRldik7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRl bF9kcF90b19kZXYoaW50ZWxfZHApKTsKIAl1MzIgY29udHJvbDsKIAogCWxvY2tkZXBfYXNzZXJ0 X2hlbGQoJmRldl9wcml2LT5wcHNfbXV0ZXgpOwpAQCAtMjA0NCw5ICsyMDI3LDggQEAgc3RhdGlj ICB1MzIgaXJvbmxha2VfZ2V0X3BwX2NvbnRyb2woc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkK ICAqLwogc3RhdGljIGJvb2wgZWRwX3BhbmVsX3ZkZF9vbihzdHJ1Y3QgaW50ZWxfZHAgKmludGVs X2RwKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9kcF90b19kZXYoaW50ZWxf ZHApOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxf ZHBfdG9fZGV2KGludGVsX2RwKSk7CiAJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxf ZGlnX3BvcnQgPSBkcF90b19kaWdfcG9ydChpbnRlbF9kcCk7Ci0Jc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXUzMiBwcDsKIAlpOTE1X3JlZ190IHBw X3N0YXRfcmVnLCBwcF9jdHJsX3JlZzsKIAlib29sIG5lZWRfdG9fZGlzYWJsZSA9ICFpbnRlbF9k cC0+d2FudF9wYW5lbF92ZGQ7CkBAIC0yMTE2LDggKzIwOTgsNyBAQCB2b2lkIGludGVsX2VkcF9w YW5lbF92ZGRfb24oc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAogc3RhdGljIHZvaWQgZWRw X3BhbmVsX3ZkZF9vZmZfc3luYyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogewotCXN0cnVj dCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9kcF90b19kZXYoaW50ZWxfZHApOwotCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGludGVsX2RwX3RvX2RldihpbnRlbF9kcCkp OwogCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0ID0KIAkJZHBfdG9f ZGlnX3BvcnQoaW50ZWxfZHApOwogCXUzMiBwcDsKQEAgLTIyMDMsOCArMjE4NCw3IEBAIHN0YXRp YyB2b2lkIGVkcF9wYW5lbF92ZGRfb2ZmKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsIGJvb2wg c3luYykKIAogc3RhdGljIHZvaWQgZWRwX3BhbmVsX29uKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxf ZHApCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2RwX3RvX2RldihpbnRlbF9k cCk7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwor CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxfZHBfdG9f ZGV2KGludGVsX2RwKSk7CiAJdTMyIHBwOwogCWk5MTVfcmVnX3QgcHBfY3RybF9yZWc7CiAKQEAg LTIyNjIsOCArMjI0Miw3IEBAIHZvaWQgaW50ZWxfZWRwX3BhbmVsX29uKHN0cnVjdCBpbnRlbF9k cCAqaW50ZWxfZHApCiAKIHN0YXRpYyB2b2lkIGVkcF9wYW5lbF9vZmYoc3RydWN0IGludGVsX2Rw ICppbnRlbF9kcCkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfZHBfdG9fZGV2 KGludGVsX2RwKTsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1 KGRldik7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRl bF9kcF90b19kZXYoaW50ZWxfZHApKTsKIAl1MzIgcHA7CiAJaTkxNV9yZWdfdCBwcF9jdHJsX3Jl ZzsKIApAQCAtMjMxMSw5ICsyMjkwLDcgQEAgdm9pZCBpbnRlbF9lZHBfcGFuZWxfb2ZmKHN0cnVj dCBpbnRlbF9kcCAqaW50ZWxfZHApCiAvKiBFbmFibGUgYmFja2xpZ2h0IGluIHRoZSBwYW5lbCBw b3dlciBjb250cm9sLiAqLwogc3RhdGljIHZvaWQgX2ludGVsX2VkcF9iYWNrbGlnaHRfb24oc3Ry dWN0IGludGVsX2RwICppbnRlbF9kcCkKIHsKLQlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICpp bnRlbF9kaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsKLQlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gaW50ZWxfZGlnX3BvcnQtPmJhc2UuYmFzZS5kZXY7Ci0Jc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxfZHBfdG9fZGV2KGludGVsX2RwKSk7CiAJ dTMyIHBwOwogCWk5MTVfcmVnX3QgcHBfY3RybF9yZWc7CiAKQEAgLTIzNTYsOCArMjMzMyw3IEBA IHZvaWQgaW50ZWxfZWRwX2JhY2tsaWdodF9vbihjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3J0Y19zdGF0ZSwKIC8qIERpc2FibGUgYmFja2xpZ2h0IGluIHRoZSBwYW5lbCBwb3dlciBj b250cm9sLiAqLwogc3RhdGljIHZvaWQgX2ludGVsX2VkcF9iYWNrbGlnaHRfb2ZmKHN0cnVjdCBp bnRlbF9kcCAqaW50ZWxfZHApCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2Rw X3RvX2RldihpbnRlbF9kcCk7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShkZXYpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoaW50ZWxfZHBfdG9fZGV2KGludGVsX2RwKSk7CiAJdTMyIHBwOwogCWk5MTVfcmVnX3QgcHBf Y3RybF9yZWc7CiAKQEAgLTI1NjAsMTAgKzI1MzYsOSBAQCB2b2lkIGludGVsX2RwX3NpbmtfZHBt cyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLCBpbnQgbW9kZSkKIHN0YXRpYyBib29sIGludGVs X2RwX2dldF9od19zdGF0ZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCQkgIGVu dW0gcGlwZSAqcGlwZSkKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0 b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0g ZW5jX3RvX2ludGVsX2RwKCZlbmNvZGVyLT5iYXNlKTsKIAllbnVtIHBvcnQgcG9ydCA9IGRwX3Rv X2RpZ19wb3J0KGludGVsX2RwKS0+YmFzZS5wb3J0OwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSBlbmNvZGVyLT5iYXNlLmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KGRldik7CiAJdTMyIHRtcDsKIAlib29sIHJldDsKIApAQCAtMjYxMiwxMCArMjU4 Nyw5IEBAIHN0YXRpYyBib29sIGludGVsX2RwX2dldF9od19zdGF0ZShzdHJ1Y3QgaW50ZWxfZW5j b2RlciAqZW5jb2RlciwKIHN0YXRpYyB2b2lkIGludGVsX2RwX2dldF9jb25maWcoc3RydWN0IGlu dGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVf Y29uZmlnKQogeworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo ZW5jb2Rlci0+YmFzZS5kZXYpOwogCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAgPSBlbmNfdG9f aW50ZWxfZHAoJmVuY29kZXItPmJhc2UpOwogCXUzMiB0bXAsIGZsYWdzID0gMDsKLQlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCWVudW0gcG9ydCBwb3J0ID0gZHBfdG9f ZGlnX3BvcnQoaW50ZWxfZHApLT5iYXNlLnBvcnQ7CiAJc3RydWN0IGludGVsX2NydGMgKmNydGMg PSB0b19pbnRlbF9jcnRjKHBpcGVfY29uZmlnLT5iYXNlLmNydGMpOwogCkBAIC0yNzgyLDkgKzI3 NTYsOCBAQCBfaW50ZWxfZHBfc2V0X2xpbmtfdHJhaW4oc3RydWN0IGludGVsX2RwICppbnRlbF9k cCwKIAkJCSB1aW50MzJfdCAqRFAsCiAJCQkgdWludDhfdCBkcF90cmFpbl9wYXQpCiB7CisJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRlbF9kcF90b19kZXYo aW50ZWxfZHApKTsKIAlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCA9 IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50 ZWxfZGlnX3BvcnQtPmJhc2UuYmFzZS5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gdG9faTkxNShkZXYpOwogCWVudW0gcG9ydCBwb3J0ID0gaW50ZWxfZGlnX3BvcnQt PmJhc2UucG9ydDsKIAogCWlmIChkcF90cmFpbl9wYXQgJiBEUF9UUkFJTklOR19QQVRURVJOX01B U0spCkBAIC0yODY4LDggKzI4NDEsNyBAQCBfaW50ZWxfZHBfc2V0X2xpbmtfdHJhaW4oc3RydWN0 IGludGVsX2RwICppbnRlbF9kcCwKIHN0YXRpYyB2b2lkIGludGVsX2RwX2VuYWJsZV9wb3J0KHN0 cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAJCQkJIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpvbGRfY3J0Y19zdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxf ZHBfdG9fZGV2KGludGVsX2RwKTsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KGRldik7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShpbnRlbF9kcF90b19kZXYoaW50ZWxfZHApKTsKIAogCS8qIGVuYWJsZSB3aXRoIHBhdHRl cm4gMSAoYXMgcGVyIHNwZWMpICovCiAKQEAgLTI4OTMsOSArMjg2NSw4IEBAIHN0YXRpYyB2b2lk IGludGVsX2VuYWJsZV9kcChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCSAgICBj b25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAJCQkgICAgY29uc3Qg c3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUpCiB7CisJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7CiAJc3Ry dWN0IGludGVsX2RwICppbnRlbF9kcCA9IGVuY190b19pbnRlbF9kcCgmZW5jb2Rlci0+YmFzZSk7 Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuY29kZXItPmJhc2UuZGV2OwotCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMocGlwZV9jb25maWctPmJhc2UuY3J0Yyk7CiAJdWlu dDMyX3QgZHBfcmVnID0gSTkxNV9SRUFEKGludGVsX2RwLT5vdXRwdXRfcmVnKTsKIAllbnVtIHBp cGUgcGlwZSA9IGNydGMtPnBpcGU7CkBAIC0zNTE5LDEwICszNDkwLDkgQEAgZ2VuN19lZHBfc2ln bmFsX2xldmVscyh1aW50OF90IHRyYWluX3NldCkKIHZvaWQKIGludGVsX2RwX3NldF9zaWduYWxf bGV2ZWxzKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiB7CisJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRlbF9kcF90b19kZXYoaW50ZWxfZHApKTsKIAlz dHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0 KGludGVsX2RwKTsKIAllbnVtIHBvcnQgcG9ydCA9IGludGVsX2RpZ19wb3J0LT5iYXNlLnBvcnQ7 Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2RpZ19wb3J0LT5iYXNlLmJhc2UuZGV2 OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAl1 aW50MzJfdCBzaWduYWxfbGV2ZWxzLCBtYXNrID0gMDsKIAl1aW50OF90IHRyYWluX3NldCA9IGlu dGVsX2RwLT50cmFpbl9zZXRbMF07CiAKQEAgLTM1NzcsOSArMzU0Nyw4IEBAIGludGVsX2RwX3By b2dyYW1fbGlua190cmFpbmluZ19wYXR0ZXJuKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAK IHZvaWQgaW50ZWxfZHBfc2V0X2lkbGVfbGlua190cmFpbihzdHJ1Y3QgaW50ZWxfZHAgKmludGVs X2RwKQogeworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50 ZWxfZHBfdG9fZGV2KGludGVsX2RwKSk7CiAJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50 ZWxfZGlnX3BvcnQgPSBkcF90b19kaWdfcG9ydChpbnRlbF9kcCk7Ci0Jc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IGludGVsX2RpZ19wb3J0LT5iYXNlLmJhc2UuZGV2OwotCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAllbnVtIHBvcnQgcG9ydCA9IGlu dGVsX2RpZ19wb3J0LT5iYXNlLnBvcnQ7CiAJdWludDMyX3QgdmFsOwogCkBAIC00MzAzLDExICs0 MjcyLDExIEBAIGludGVsX2RwX3JldHJhaW5fbGluayhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2Rw KQogc3RhdGljIHZvaWQKIGludGVsX2RwX2NoZWNrX2xpbmtfc3RhdHVzKHN0cnVjdCBpbnRlbF9k cCAqaW50ZWxfZHApCiB7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShpbnRlbF9kcF90b19kZXYoaW50ZWxfZHApKTsKIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAq aW50ZWxfZW5jb2RlciA9ICZkcF90b19kaWdfcG9ydChpbnRlbF9kcCktPmJhc2U7Ci0Jc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2RwX3RvX2RldihpbnRlbF9kcCk7CiAJdTggbGlua19z dGF0dXNbRFBfTElOS19TVEFUVVNfU0laRV07CiAKLQlXQVJOX09OKCFkcm1fbW9kZXNldF9pc19s b2NrZWQoJmRldi0+bW9kZV9jb25maWcuY29ubmVjdGlvbl9tdXRleCkpOworCVdBUk5fT04oIWRy bV9tb2Rlc2V0X2lzX2xvY2tlZCgmZGV2X3ByaXYtPmRybS5tb2RlX2NvbmZpZy5jb25uZWN0aW9u X211dGV4KSk7CiAKIAlpZiAoIWludGVsX2RwX2dldF9saW5rX3N0YXR1cyhpbnRlbF9kcCwgbGlu a19zdGF0dXMpKSB7CiAJCURSTV9FUlJPUigiRmFpbGVkIHRvIGdldCBsaW5rIHN0YXR1c1xuIik7 CkBAIC00MzUzLDggKzQzMjIsNyBAQCBpbnRlbF9kcF9jaGVja19saW5rX3N0YXR1cyhzdHJ1Y3Qg aW50ZWxfZHAgKmludGVsX2RwKQogc3RhdGljIGJvb2wKIGludGVsX2RwX3Nob3J0X3B1bHNlKHN0 cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGlu dGVsX2RwX3RvX2RldihpbnRlbF9kcCk7Ci0Jc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2Vu Y29kZXIgPSAmZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApLT5iYXNlOworCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxfZHBfdG9fZGV2KGludGVsX2RwKSk7 CiAJdTggc2lua19pcnFfdmVjdG9yID0gMDsKIAl1OCBvbGRfc2lua19jb3VudCA9IGludGVsX2Rw LT5zaW5rX2NvdW50OwogCWJvb2wgcmV0OwpAQCAtNDM5MywxMyArNDM2MSwxMyBAQCBpbnRlbF9k cF9zaG9ydF9wdWxzZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCQkJRFJNX0RFQlVHX0RS SVZFUigiQ1Agb3Igc2luayBzcGVjaWZpYyBpcnEgdW5oYW5kbGVkXG4iKTsKIAl9CiAKLQlkcm1f bW9kZXNldF9sb2NrKCZkZXYtPm1vZGVfY29uZmlnLmNvbm5lY3Rpb25fbXV0ZXgsIE5VTEwpOwor CWRybV9tb2Rlc2V0X2xvY2soJmRldl9wcml2LT5kcm0ubW9kZV9jb25maWcuY29ubmVjdGlvbl9t dXRleCwgTlVMTCk7CiAJaW50ZWxfZHBfY2hlY2tfbGlua19zdGF0dXMoaW50ZWxfZHApOwotCWRy bV9tb2Rlc2V0X3VubG9jaygmZGV2LT5tb2RlX2NvbmZpZy5jb25uZWN0aW9uX211dGV4KTsKKwlk cm1fbW9kZXNldF91bmxvY2soJmRldl9wcml2LT5kcm0ubW9kZV9jb25maWcuY29ubmVjdGlvbl9t dXRleCk7CiAJaWYgKGludGVsX2RwLT5jb21wbGlhbmNlLnRlc3RfdHlwZSA9PSBEUF9URVNUX0xJ TktfVFJBSU5JTkcpIHsKIAkJRFJNX0RFQlVHX0tNUygiTGluayBUcmFpbmluZyBDb21wbGlhbmNl IFRlc3QgcmVxdWVzdGVkXG4iKTsKIAkJLyogU2VuZCBhIEhvdHBsdWcgVWV2ZW50IHRvIHVzZXJz cGFjZSB0byBzdGFydCBtb2Rlc2V0ICovCi0JCWRybV9rbXNfaGVscGVyX2hvdHBsdWdfZXZlbnQo aW50ZWxfZW5jb2Rlci0+YmFzZS5kZXYpOworCQlkcm1fa21zX2hlbHBlcl9ob3RwbHVnX2V2ZW50 KCZkZXZfcHJpdi0+ZHJtKTsKIAl9CiAKIAlyZXR1cm4gdHJ1ZTsKQEAgLTQ0NjMsOCArNDQzMSw3 IEBAIGludGVsX2RwX2RldGVjdF9kcGNkKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiBzdGF0 aWMgZW51bSBkcm1fY29ubmVjdG9yX3N0YXR1cwogZWRwX2RldGVjdChzdHJ1Y3QgaW50ZWxfZHAg KmludGVsX2RwKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9kcF90b19kZXYo aW50ZWxfZHApOwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo ZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGludGVs X2RwX3RvX2RldihpbnRlbF9kcCkpOwogCWVudW0gZHJtX2Nvbm5lY3Rvcl9zdGF0dXMgc3RhdHVz OwogCiAJc3RhdHVzID0gaW50ZWxfcGFuZWxfZGV0ZWN0KGRldl9wcml2KTsKQEAgLTQ3MjAsMjIg KzQ2ODcsMjEgQEAgaW50ZWxfZHBfdW5zZXRfZWRpZChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2Rw KQogfQogCiBzdGF0aWMgaW50Ci1pbnRlbF9kcF9sb25nX3B1bHNlKHN0cnVjdCBpbnRlbF9jb25u ZWN0b3IgKmludGVsX2Nvbm5lY3RvcikKK2ludGVsX2RwX2xvbmdfcHVsc2Uoc3RydWN0IGludGVs X2Nvbm5lY3RvciAqY29ubmVjdG9yKQogewotCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0 b3IgPSAmaW50ZWxfY29ubmVjdG9yLT5iYXNlOwotCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAg PSBpbnRlbF9hdHRhY2hlZF9kcChjb25uZWN0b3IpOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSBjb25uZWN0b3ItPmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0 b19pOTE1KGNvbm5lY3Rvci0+YmFzZS5kZXYpOworCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAg PSBpbnRlbF9hdHRhY2hlZF9kcCgmY29ubmVjdG9yLT5iYXNlKTsKIAllbnVtIGRybV9jb25uZWN0 b3Jfc3RhdHVzIHN0YXR1czsKIAl1OCBzaW5rX2lycV92ZWN0b3IgPSAwOwogCi0JV0FSTl9PTigh ZHJtX21vZGVzZXRfaXNfbG9ja2VkKCZjb25uZWN0b3ItPmRldi0+bW9kZV9jb25maWcuY29ubmVj dGlvbl9tdXRleCkpOworCVdBUk5fT04oIWRybV9tb2Rlc2V0X2lzX2xvY2tlZCgmZGV2X3ByaXYt PmRybS5tb2RlX2NvbmZpZy5jb25uZWN0aW9uX211dGV4KSk7CiAKLQlpbnRlbF9kaXNwbGF5X3Bv d2VyX2dldCh0b19pOTE1KGRldiksIGludGVsX2RwLT5hdXhfcG93ZXJfZG9tYWluKTsKKwlpbnRl bF9kaXNwbGF5X3Bvd2VyX2dldChkZXZfcHJpdiwgaW50ZWxfZHAtPmF1eF9wb3dlcl9kb21haW4p OwogCiAJLyogQ2FuJ3QgZGlzY29ubmVjdCBlRFAsIGJ1dCB5b3UgY2FuIGNsb3NlIHRoZSBsaWQu Li4gKi8KIAlpZiAoaW50ZWxfZHBfaXNfZWRwKGludGVsX2RwKSkKIAkJc3RhdHVzID0gZWRwX2Rl dGVjdChpbnRlbF9kcCk7Ci0JZWxzZSBpZiAoaW50ZWxfZGlnaXRhbF9wb3J0X2Nvbm5lY3RlZCh0 b19pOTE1KGRldiksCisJZWxzZSBpZiAoaW50ZWxfZGlnaXRhbF9wb3J0X2Nvbm5lY3RlZChkZXZf cHJpdiwKIAkJCQkJICAgICAgZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApKSkKIAkJc3RhdHVzID0g aW50ZWxfZHBfZGV0ZWN0X2RwY2QoaW50ZWxfZHApOwogCWVsc2UKQEAgLTQ4MDYsNyArNDc3Miw3 IEBAIGludGVsX2RwX2xvbmdfcHVsc2Uoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqaW50ZWxfY29u bmVjdG9yKQogCWludGVsX2RwLT5hdXguaTJjX2RlZmVyX2NvdW50ID0gMDsKIAogCWludGVsX2Rw X3NldF9lZGlkKGludGVsX2RwKTsKLQlpZiAoaW50ZWxfZHBfaXNfZWRwKGludGVsX2RwKSB8fCBp bnRlbF9jb25uZWN0b3ItPmRldGVjdF9lZGlkKQorCWlmIChpbnRlbF9kcF9pc19lZHAoaW50ZWxf ZHApIHx8IGNvbm5lY3Rvci0+ZGV0ZWN0X2VkaWQpCiAJCXN0YXR1cyA9IGNvbm5lY3Rvcl9zdGF0 dXNfY29ubmVjdGVkOwogCWludGVsX2RwLT5kZXRlY3RfZG9uZSA9IHRydWU7CiAKQEAgLTQ4Mjks NyArNDc5NSw3IEBAIGludGVsX2RwX2xvbmdfcHVsc2Uoc3RydWN0IGludGVsX2Nvbm5lY3RvciAq aW50ZWxfY29ubmVjdG9yKQogCWlmIChzdGF0dXMgIT0gY29ubmVjdG9yX3N0YXR1c19jb25uZWN0 ZWQgJiYgIWludGVsX2RwLT5pc19tc3QpCiAJCWludGVsX2RwX3Vuc2V0X2VkaWQoaW50ZWxfZHAp OwogCi0JaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQodG9faTkxNShkZXYpLCBpbnRlbF9kcC0+YXV4 X3Bvd2VyX2RvbWFpbik7CisJaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQoZGV2X3ByaXYsIGludGVs X2RwLT5hdXhfcG93ZXJfZG9tYWluKTsKIAlyZXR1cm4gc3RhdHVzOwogfQogCkBAIC00OTk2LDkg KzQ5NjIsNyBAQCB2b2lkIGludGVsX2RwX2VuY29kZXJfc3VzcGVuZChzdHJ1Y3QgaW50ZWxfZW5j b2RlciAqaW50ZWxfZW5jb2RlcikKIAogc3RhdGljIHZvaWQgaW50ZWxfZWRwX3BhbmVsX3ZkZF9z YW5pdGl6ZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogewotCXN0cnVjdCBpbnRlbF9kaWdp dGFsX3BvcnQgKmludGVsX2RpZ19wb3J0ID0gZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApOwotCXN0 cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9kaWdfcG9ydC0+YmFzZS5iYXNlLmRldjsKLQlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRlbF9kcF90b19kZXYoaW50 ZWxfZHApKTsKIAogCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmRldl9wcml2LT5wcHNfbXV0ZXgpOwog CkBAIC01MDg2LDggKzUwNTAsNyBAQCBlbnVtIGlycXJldHVybgogaW50ZWxfZHBfaHBkX3B1bHNl KHN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0LCBib29sIGxvbmdfaHBk KQogewogCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAgPSAmaW50ZWxfZGlnX3BvcnQtPmRwOwot CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9kaWdfcG9ydC0+YmFzZS5iYXNlLmRldjsK LQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRlbF9kcF90b19kZXYo aW50ZWxfZHApKTsKIAllbnVtIGlycXJldHVybiByZXQgPSBJUlFfTk9ORTsKIAogCWlmIChsb25n X2hwZCAmJiBpbnRlbF9kaWdfcG9ydC0+YmFzZS50eXBlID09IElOVEVMX09VVFBVVF9FRFApIHsK QEAgLTU1NDYsOCArNTUwOSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2RwX3NldF9kcnJzX3N0YXRl KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIHZvaWQgaW50ZWxfZWRwX2RycnNf ZW5hYmxlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAJCQkgICBjb25zdCBzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g aW50ZWxfZHBfdG9fZGV2KGludGVsX2RwKTsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gdG9faTkxNShpbnRlbF9kcF90b19kZXYoaW50ZWxfZHApKTsKIAogCWlmICghY3J0Y19zdGF0 ZS0+aGFzX2RycnMpIHsKIAkJRFJNX0RFQlVHX0tNUygiUGFuZWwgZG9lc24ndCBzdXBwb3J0IERS UlNcbiIpOwpAQCAtNTU4Miw4ICs1NTQ0LDcgQEAgdm9pZCBpbnRlbF9lZHBfZHJyc19lbmFibGUo c3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIHZvaWQgaW50ZWxfZWRwX2RycnNfZGlzYWJsZShz dHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCQkJICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50 ZWxfZHBfdG9fZGV2KGludGVsX2RwKTsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShpbnRlbF9kcF90b19kZXYoaW50ZWxfZHApKTsKIAogCWlmICghb2xkX2NydGNfc3Rh dGUtPmhhc19kcnJzKQogCQlyZXR1cm47CkBAIC01NzY2LDcgKzU3MjcsNyBAQCB2b2lkIGludGVs X2VkcF9kcnJzX2ZsdXNoKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAogLyoq CiAgKiBpbnRlbF9kcF9kcnJzX2luaXQgLSBJbml0IGJhc2ljIERSUlMgd29yayBhbmQgbXV0ZXgu Ci0gKiBAaW50ZWxfY29ubmVjdG9yOiBlRFAgY29ubmVjdG9yCisgKiBAY29ubmVjdG9yOiBlRFAg Y29ubmVjdG9yCiAgKiBAZml4ZWRfbW9kZTogcHJlZmVycmVkIG1vZGUgb2YgcGFuZWwKICAqCiAg KiBUaGlzIGZ1bmN0aW9uIGlzICBjYWxsZWQgb25seSBvbmNlIGF0IGRyaXZlciBsb2FkIHRvIGlu aXRpYWxpemUgYmFzaWMKQEAgLTU3NzgsMTIgKzU3MzksMTAgQEAgdm9pZCBpbnRlbF9lZHBfZHJy c19mbHVzaChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAgKiBmcm9tIFZCVCBz ZXR0aW5nKS4KICAqLwogc3RhdGljIHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICoKLWludGVsX2Rw X2RycnNfaW5pdChzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9jb25uZWN0b3IsCi0JCXN0 cnVjdCBkcm1fZGlzcGxheV9tb2RlICpmaXhlZF9tb2RlKQoraW50ZWxfZHBfZHJyc19pbml0KHN0 cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvciwKKwkJICAgc3RydWN0IGRybV9kaXNwbGF5 X21vZGUgKmZpeGVkX21vZGUpCiB7Ci0Jc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciA9 ICZpbnRlbF9jb25uZWN0b3ItPmJhc2U7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNvbm5l Y3Rvci0+ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo ZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNvbm5l Y3Rvci0+YmFzZS5kZXYpOwogCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICpkb3duY2xvY2tfbW9k ZSA9IE5VTEw7CiAKIAlJTklUX0RFTEFZRURfV09SSygmZGV2X3ByaXYtPmRycnMud29yaywgaW50 ZWxfZWRwX2RycnNfZG93bmNsb2NrX3dvcmspOwpAQCAtNTc5OSw4ICs1NzU4LDggQEAgaW50ZWxf ZHBfZHJyc19pbml0KHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmludGVsX2Nvbm5lY3RvciwKIAkJ cmV0dXJuIE5VTEw7CiAJfQogCi0JZG93bmNsb2NrX21vZGUgPSBpbnRlbF9maW5kX3BhbmVsX2Rv d25jbG9jawotCQkJCQkoZGV2X3ByaXYsIGZpeGVkX21vZGUsIGNvbm5lY3Rvcik7CisJZG93bmNs b2NrX21vZGUgPSBpbnRlbF9maW5kX3BhbmVsX2Rvd25jbG9jayhkZXZfcHJpdiwgZml4ZWRfbW9k ZSwKKwkJCQkJCSAgICAmY29ubmVjdG9yLT5iYXNlKTsKIAogCWlmICghZG93bmNsb2NrX21vZGUp IHsKIAkJRFJNX0RFQlVHX0tNUygiRG93bmNsb2NrIG1vZGUgaXMgbm90IGZvdW5kLiBEUlJTIG5v dCBzdXBwb3J0ZWRcbiIpOwpAQCAtNTgxNywxMSArNTc3Niw5IEBAIGludGVsX2RwX2RycnNfaW5p dChzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9jb25uZWN0b3IsCiBzdGF0aWMgYm9vbCBp bnRlbF9lZHBfaW5pdF9jb25uZWN0b3Ioc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAkJCQkg ICAgIHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmludGVsX2Nvbm5lY3RvcikKIHsKLQlzdHJ1Y3Qg ZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yID0gJmludGVsX2Nvbm5lY3Rvci0+YmFzZTsKLQlzdHJ1 Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGlu dGVsX2RwKTsKLQlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlciA9ICZpbnRlbF9k aWdfcG9ydC0+YmFzZTsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfZW5jb2Rlci0+ YmFzZS5kZXY7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2RwX3RvX2RldihpbnRl bF9kcCk7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYp OworCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IgPSAmaW50ZWxfY29ubmVjdG9yLT5i YXNlOwogCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICpmaXhlZF9tb2RlID0gTlVMTDsKIAlzdHJ1 Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWx0X2ZpeGVkX21vZGUgPSBOVUxMOwogCXN0cnVjdCBkcm1f ZGlzcGxheV9tb2RlICpkb3duY2xvY2tfbW9kZSA9IE5VTEw7CkBAIC01ODM5LDcgKzU3OTYsNyBA QCBzdGF0aWMgYm9vbCBpbnRlbF9lZHBfaW5pdF9jb25uZWN0b3Ioc3RydWN0IGludGVsX2RwICpp bnRlbF9kcCwKIAkgKiBlRFAgYW5kIExWRFMgYmFpbCBvdXQgZWFybHkgaW4gdGhpcyBjYXNlIHRv IHByZXZlbnQgaW50ZXJmZXJpbmcKIAkgKiB3aXRoIGFuIGFscmVhZHkgcG93ZXJlZC1vbiBMVkRT IHBvd2VyIHNlcXVlbmNlci4KIAkgKi8KLQlpZiAoaW50ZWxfZ2V0X2x2ZHNfZW5jb2RlcihkZXYp KSB7CisJaWYgKGludGVsX2dldF9sdmRzX2VuY29kZXIoJmRldl9wcml2LT5kcm0pKSB7CiAJCVdB Uk5fT04oIShIQVNfUENIX0lCWChkZXZfcHJpdikgfHwgSEFTX1BDSF9DUFQoZGV2X3ByaXYpKSk7 CiAJCURSTV9JTkZPKCJMVkRTIHdhcyBkZXRlY3RlZCwgbm90IHJlZ2lzdGVyaW5nIGVEUFxuIik7 CiAKLS0gCjIuMTMuNgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==