From: ville.syrjala@linux.intel.com Subject: [PATCH 02/15] drm/i915: Pass intel_plane and intel_crtc to plane hooks Date: Mon, 27 Mar 2017 21:55:33 +0300 Message-ID: <20170327185546.2977-3-ville.syrjala@linux.intel.com> References: <20170327185546.2977-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 128066E320 for ; Mon, 27 Mar 2017 18:55:55 +0000 (UTC) In-Reply-To: <20170327185546.2977-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClN0 cmVhbWxpbmUgdGhpbmdzIGJ5IHBhc3NpbmcgaW50ZWxfcGxhbmUgYW5kIGludGVsX2NydGMgaW5z dGVhZCBvZgp0aGUgZHJtIHR5cGVzIHRvIG91ciBwbGFuZSBob29rcy4KClNpZ25lZC1vZmYtYnk6 IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ClJldmlld2Vk LWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYyB8ICAgNiArLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jICAgICAgfCAxMDkgKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICAgICAgIHwgICA4 ICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgICAgICAgfCAxMTAgKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDEwNCBpbnNlcnRp b25zKCspLCAxMjkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9t aWNfcGxhbmUuYwppbmRleCBjZmI0NzI5M2ZkNTMuLjE4MmRjMmEzNmVkMSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKQEAgLTE4NSw3ICsxODUsNyBAQCBpbnQg aW50ZWxfcGxhbmVfYXRvbWljX2NoZWNrX3dpdGhfc3RhdGUoc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmNydGNfc3RhdGUsCiAJfQogCiAJaW50ZWxfc3RhdGUtPmJhc2UudmlzaWJsZSA9IGZhbHNl OwotCXJldCA9IGludGVsX3BsYW5lLT5jaGVja19wbGFuZShwbGFuZSwgY3J0Y19zdGF0ZSwgaW50 ZWxfc3RhdGUpOworCXJldCA9IGludGVsX3BsYW5lLT5jaGVja19wbGFuZShpbnRlbF9wbGFuZSwg Y3J0Y19zdGF0ZSwgaW50ZWxfc3RhdGUpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAg LTIzNSwxNCArMjM1LDE0IEBAIHN0YXRpYyB2b2lkIGludGVsX3BsYW5lX2F0b21pY191cGRhdGUo c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCXRyYWNlX2ludGVsX3VwZGF0ZV9wbGFuZShwbGFu ZSwKIAkJCQkJIHRvX2ludGVsX2NydGMoY3J0YykpOwogCi0JCWludGVsX3BsYW5lLT51cGRhdGVf cGxhbmUocGxhbmUsCisJCWludGVsX3BsYW5lLT51cGRhdGVfcGxhbmUoaW50ZWxfcGxhbmUsCiAJ CQkJCSAgdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSksCiAJCQkJCSAgaW50ZWxfc3Rh dGUpOwogCX0gZWxzZSB7CiAJCXRyYWNlX2ludGVsX2Rpc2FibGVfcGxhbmUocGxhbmUsCiAJCQkJ CSAgdG9faW50ZWxfY3J0YyhjcnRjKSk7CiAKLQkJaW50ZWxfcGxhbmUtPmRpc2FibGVfcGxhbmUo cGxhbmUsIGNydGMpOworCQlpbnRlbF9wbGFuZS0+ZGlzYWJsZV9wbGFuZShpbnRlbF9wbGFuZSwg dG9faW50ZWxfY3J0YyhjcnRjKSk7CiAJfQogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKaW5kZXggNGQ3YmI1NWNlZWUzLi5mNzM3YTc0M2JkZjYgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKQEAgLTI3NTAsNyArMjc1MCw3IEBAIGludGVsX2ZpbmRfaW5pdGlh bF9wbGFuZV9vYmooc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCiAJCQkJZmFsc2UpOwog CWludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnlfbm9hdG9taWMoJmludGVsX2NydGMtPmJhc2UpOwog CXRyYWNlX2ludGVsX2Rpc2FibGVfcGxhbmUocHJpbWFyeSwgaW50ZWxfY3J0Yyk7Ci0JaW50ZWxf cGxhbmUtPmRpc2FibGVfcGxhbmUocHJpbWFyeSwgJmludGVsX2NydGMtPmJhc2UpOworCWludGVs X3BsYW5lLT5kaXNhYmxlX3BsYW5lKGludGVsX3BsYW5lLCBpbnRlbF9jcnRjKTsKIAogCXJldHVy bjsKIApAQCAtMzA2MSwxNCArMzA2MSwxNCBAQCBpbnQgaTl4eF9jaGVja19wbGFuZV9zdXJmYWNl KHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCiAJcmV0dXJuIDA7CiB9CiAK LXN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAq cHJpbWFyeSwKK3N0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGlu dGVsX3BsYW5lICpwcmltYXJ5LAogCQkJCSAgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlLAogCQkJCSAgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0 ZSAqcGxhbmVfc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShwcmltYXJ5LT5kZXYpOwotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0g dG9faW50ZWxfY3J0YyhjcnRjX3N0YXRlLT5iYXNlLmNydGMpOwotCXN0cnVjdCBkcm1fZnJhbWVi dWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmJhc2UuZmI7Ci0JaW50IHBsYW5lID0gaW50ZWxfY3J0 Yy0+cGxhbmU7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShw cmltYXJ5LT5iYXNlLmRldik7CisJc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9j cnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CisJY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZl ciAqZmIgPSBwbGFuZV9zdGF0ZS0+YmFzZS5mYjsKKwllbnVtIHBsYW5lIHBsYW5lID0gcHJpbWFy eS0+cGxhbmU7CiAJdTMyIGxpbmVhcl9vZmZzZXQ7CiAJdTMyIGRzcGNudHIgPSBwbGFuZV9zdGF0 ZS0+Y3RsOwogCWk5MTVfcmVnX3QgcmVnID0gRFNQQ05UUihwbGFuZSk7CkBAIC0zMDc5LDEyICsz MDc5LDEyIEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRy bV9wbGFuZSAqcHJpbWFyeSwKIAlsaW5lYXJfb2Zmc2V0ID0gaW50ZWxfZmJfeHlfdG9fbGluZWFy KHgsIHksIHBsYW5lX3N0YXRlLCAwKTsKIAogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDQp Ci0JCWludGVsX2NydGMtPmRzcGFkZHJfb2Zmc2V0ID0gcGxhbmVfc3RhdGUtPm1haW4ub2Zmc2V0 OworCQljcnRjLT5kc3BhZGRyX29mZnNldCA9IHBsYW5lX3N0YXRlLT5tYWluLm9mZnNldDsKIAll bHNlCi0JCWludGVsX2NydGMtPmRzcGFkZHJfb2Zmc2V0ID0gbGluZWFyX29mZnNldDsKKwkJY3J0 Yy0+ZHNwYWRkcl9vZmZzZXQgPSBsaW5lYXJfb2Zmc2V0OwogCi0JaW50ZWxfY3J0Yy0+YWRqdXN0 ZWRfeCA9IHg7Ci0JaW50ZWxfY3J0Yy0+YWRqdXN0ZWRfeSA9IHk7CisJY3J0Yy0+YWRqdXN0ZWRf eCA9IHg7CisJY3J0Yy0+YWRqdXN0ZWRfeSA9IHk7CiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2 X3ByaXYtPnVuY29yZS5sb2NrLCBpcnFmbGFncyk7CiAKQEAgLTMxMTAsMzEgKzMxMTAsMjkgQEAg c3RhdGljIHZvaWQgaTl4eF91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpw cmltYXJ5LAogCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3By aXYpKSB7CiAJCUk5MTVfV1JJVEVfRlcoRFNQU1VSRihwbGFuZSksCiAJCQkgICAgICBpbnRlbF9w bGFuZV9nZ3R0X29mZnNldChwbGFuZV9zdGF0ZSkgKwotCQkJICAgICAgaW50ZWxfY3J0Yy0+ZHNw YWRkcl9vZmZzZXQpOworCQkJICAgICAgY3J0Yy0+ZHNwYWRkcl9vZmZzZXQpOwogCQlJOTE1X1dS SVRFX0ZXKERTUE9GRlNFVChwbGFuZSksICh5IDw8IDE2KSB8IHgpOwogCX0gZWxzZSBpZiAoSU5U RUxfR0VOKGRldl9wcml2KSA+PSA0KSB7CiAJCUk5MTVfV1JJVEVfRlcoRFNQU1VSRihwbGFuZSks CiAJCQkgICAgICBpbnRlbF9wbGFuZV9nZ3R0X29mZnNldChwbGFuZV9zdGF0ZSkgKwotCQkJICAg ICAgaW50ZWxfY3J0Yy0+ZHNwYWRkcl9vZmZzZXQpOworCQkJICAgICAgY3J0Yy0+ZHNwYWRkcl9v ZmZzZXQpOwogCQlJOTE1X1dSSVRFX0ZXKERTUFRJTEVPRkYocGxhbmUpLCAoeSA8PCAxNikgfCB4 KTsKIAkJSTkxNV9XUklURV9GVyhEU1BMSU5PRkYocGxhbmUpLCBsaW5lYXJfb2Zmc2V0KTsKIAl9 IGVsc2UgewogCQlJOTE1X1dSSVRFX0ZXKERTUEFERFIocGxhbmUpLAogCQkJICAgICAgaW50ZWxf cGxhbmVfZ2d0dF9vZmZzZXQocGxhbmVfc3RhdGUpICsKLQkJCSAgICAgIGludGVsX2NydGMtPmRz cGFkZHJfb2Zmc2V0KTsKKwkJCSAgICAgIGNydGMtPmRzcGFkZHJfb2Zmc2V0KTsKIAl9CiAJUE9T VElOR19SRUFEX0ZXKHJlZyk7CiAKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkZXZfcHJpdi0+ dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKIH0KIAotc3RhdGljIHZvaWQgaTl4eF9kaXNhYmxlX3By aW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSwKLQkJCQkgICAgICAgc3RydWN0 IGRybV9jcnRjICpjcnRjKQorc3RhdGljIHZvaWQgaTl4eF9kaXNhYmxlX3ByaW1hcnlfcGxhbmUo c3RydWN0IGludGVsX3BsYW5lICpwcmltYXJ5LAorCQkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YykKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwotCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaW50 ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0JaW50IHBsYW5lID0g aW50ZWxfY3J0Yy0+cGxhbmU7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShwcmltYXJ5LT5iYXNlLmRldik7CisJZW51bSBwbGFuZSBwbGFuZSA9IHByaW1hcnkt PnBsYW5lOwogCXVuc2lnbmVkIGxvbmcgaXJxZmxhZ3M7CiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgm ZGV2X3ByaXYtPnVuY29yZS5sb2NrLCBpcnFmbGFncyk7CkBAIC0zMzE5LDE2ICszMzE3LDE1IEBA IHUzMiBza2xfcGxhbmVfY3RsKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlLAogCXJldHVybiBwbGFuZV9jdGw7CiB9CiAKLXN0YXRpYyB2b2lkIHNreWxha2VfdXBkYXRl X3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCitzdGF0aWMgdm9pZCBza3ls YWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAJCQkJ CSBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCQkJIGNvbnN0 IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShkZXYpOwotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9f aW50ZWxfY3J0YyhjcnRjX3N0YXRlLT5iYXNlLmNydGMpOwotCXN0cnVjdCBkcm1fZnJhbWVidWZm ZXIgKmZiID0gcGxhbmVfc3RhdGUtPmJhc2UuZmI7Ci0JZW51bSBwbGFuZV9pZCBwbGFuZV9pZCA9 IHRvX2ludGVsX3BsYW5lKHBsYW5lKS0+aWQ7Ci0JZW51bSBwaXBlIHBpcGUgPSB0b19pbnRlbF9w bGFuZShwbGFuZSktPnBpcGU7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShwbGFuZS0+YmFzZS5kZXYpOworCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9f aW50ZWxfY3J0YyhjcnRjX3N0YXRlLT5iYXNlLmNydGMpOworCWNvbnN0IHN0cnVjdCBkcm1fZnJh bWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmJhc2UuZmI7CisJZW51bSBwbGFuZV9pZCBwbGFu ZV9pZCA9IHBsYW5lLT5pZDsKKwllbnVtIHBpcGUgcGlwZSA9IHBsYW5lLT5waXBlOwogCXUzMiBw bGFuZV9jdGwgPSBwbGFuZV9zdGF0ZS0+Y3RsOwogCXVuc2lnbmVkIGludCByb3RhdGlvbiA9IHBs YW5lX3N0YXRlLT5iYXNlLnJvdGF0aW9uOwogCXUzMiBzdHJpZGUgPSBza2xfcGxhbmVfc3RyaWRl KGZiLCAwLCByb3RhdGlvbik7CkBAIC0zMzUwLDEwICszMzQ3LDEwIEBAIHN0YXRpYyB2b2lkIHNr eWxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJZHN0 X3ctLTsKIAlkc3RfaC0tOwogCi0JaW50ZWxfY3J0Yy0+ZHNwYWRkcl9vZmZzZXQgPSBzdXJmX2Fk ZHI7CisJY3J0Yy0+ZHNwYWRkcl9vZmZzZXQgPSBzdXJmX2FkZHI7CiAKLQlpbnRlbF9jcnRjLT5h ZGp1c3RlZF94ID0gc3JjX3g7Ci0JaW50ZWxfY3J0Yy0+YWRqdXN0ZWRfeSA9IHNyY195OworCWNy dGMtPmFkanVzdGVkX3ggPSBzcmNfeDsKKwljcnRjLT5hZGp1c3RlZF95ID0gc3JjX3k7CiAKIAlz cGluX2xvY2tfaXJxc2F2ZSgmZGV2X3ByaXYtPnVuY29yZS5sb2NrLCBpcnFmbGFncyk7CiAKQEAg LTMzOTIsMTMgKzMzODksMTIgQEAgc3RhdGljIHZvaWQgc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9w bGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZk ZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKIH0KIAotc3RhdGljIHZvaWQgc2t5bGFr ZV9kaXNhYmxlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSwKLQkJCQkJ ICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCitzdGF0aWMgdm9pZCBza3lsYWtlX2Rpc2FibGVfcHJp bWFyeV9wbGFuZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnByaW1hcnksCisJCQkJCSAgc3RydWN0IGlu dGVsX2NydGMgKmNydGMpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsK LQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0JZW51 bSBwbGFuZV9pZCBwbGFuZV9pZCA9IHRvX2ludGVsX3BsYW5lKHByaW1hcnkpLT5pZDsKLQllbnVt IHBpcGUgcGlwZSA9IHRvX2ludGVsX3BsYW5lKHByaW1hcnkpLT5waXBlOworCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUocHJpbWFyeS0+YmFzZS5kZXYpOworCWVu dW0gcGxhbmVfaWQgcGxhbmVfaWQgPSBwcmltYXJ5LT5pZDsKKwllbnVtIHBpcGUgcGlwZSA9IHBy aW1hcnktPnBpcGU7CiAJdW5zaWduZWQgbG9uZyBpcnFmbGFnczsKIAogCXNwaW5fbG9ja19pcnFz YXZlKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKQEAgLTM0NDIsNyArMzQzOCw3 IEBAIHN0YXRpYyB2b2lkIGludGVsX3VwZGF0ZV9wcmltYXJ5X3BsYW5lcyhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCQkJdHJhY2VfaW50ZWxfdXBkYXRlX3BsYW5lKCZwbGFuZS0+YmFzZSwKIAkJ CQkJCSB0b19pbnRlbF9jcnRjKGNydGMpKTsKIAotCQkJcGxhbmUtPnVwZGF0ZV9wbGFuZSgmcGxh bmUtPmJhc2UsCisJCQlwbGFuZS0+dXBkYXRlX3BsYW5lKHBsYW5lLAogCQkJCQkgICAgdG9faW50 ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSksCiAJCQkJCSAgICBwbGFuZV9zdGF0ZSk7CiAJCX0K QEAgLTUwOTUsNyArNTA5MSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydGNfZGlzYWJsZV9wbGFu ZXMoc3RydWN0IGRybV9jcnRjICpjcnRjLCB1bnNpZ25lZCBwbGFuZV9tYXNrCiAJaW50ZWxfY3J0 Y19kcG1zX292ZXJsYXlfZGlzYWJsZShpbnRlbF9jcnRjKTsKIAogCWRybV9mb3JfZWFjaF9wbGFu ZV9tYXNrKHAsIGRldiwgcGxhbmVfbWFzaykKLQkJdG9faW50ZWxfcGxhbmUocCktPmRpc2FibGVf cGxhbmUocCwgY3J0Yyk7CisJCXRvX2ludGVsX3BsYW5lKHApLT5kaXNhYmxlX3BsYW5lKHRvX2lu dGVsX3BsYW5lKHApLCBpbnRlbF9jcnRjKTsKIAogCS8qCiAJICogRklYTUU6IE9uY2Ugd2UgZ3Jv dyBwcm9wZXIgbnVjbGVhciBmbGlwIHN1cHBvcnQgb3V0IG9mIHRoaXMgd2UgbmVlZApAQCAtMTMz MDIsMTEgKzEzMjk4LDExIEBAIHNrbF9tYXhfc2NhbGUoc3RydWN0IGludGVsX2NydGMgKmludGVs X2NydGMsIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlCiB9CiAKIHN0YXRpYyBp bnQKLWludGVsX2NoZWNrX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCitp bnRlbF9jaGVja19wcmltYXJ5X3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAJCQkg IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkJICBzdHJ1Y3QgaW50ZWxf cGxhbmVfc3RhdGUgKnN0YXRlKQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHRvX2k5MTUocGxhbmUtPmRldik7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShwbGFuZS0+YmFzZS5kZXYpOwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9 IHN0YXRlLT5iYXNlLmNydGM7CiAJaW50IG1pbl9zY2FsZSA9IERSTV9QTEFORV9IRUxQRVJfTk9f U0NBTElORzsKIAlpbnQgbWF4X3NjYWxlID0gRFJNX1BMQU5FX0hFTFBFUl9OT19TQ0FMSU5HOwpA QCAtMTM1MjAsMTIgKzEzNTE2LDEyIEBAIGludGVsX2xlZ2FjeV9jdXJzb3JfdXBkYXRlKHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lLAogCiAJaWYgKHBsYW5lLT5zdGF0ZS0+dmlzaWJsZSkgewogCQl0 cmFjZV9pbnRlbF91cGRhdGVfcGxhbmUocGxhbmUsIHRvX2ludGVsX2NydGMoY3J0YykpOwotCQlp bnRlbF9wbGFuZS0+dXBkYXRlX3BsYW5lKHBsYW5lLAorCQlpbnRlbF9wbGFuZS0+dXBkYXRlX3Bs YW5lKGludGVsX3BsYW5lLAogCQkJCQkgIHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUp LAogCQkJCQkgIHRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5zdGF0ZSkpOwogCX0gZWxzZSB7 CiAJCXRyYWNlX2ludGVsX2Rpc2FibGVfcGxhbmUocGxhbmUsIHRvX2ludGVsX2NydGMoY3J0Yykp OwotCQlpbnRlbF9wbGFuZS0+ZGlzYWJsZV9wbGFuZShwbGFuZSwgY3J0Yyk7CisJCWludGVsX3Bs YW5lLT5kaXNhYmxlX3BsYW5lKGludGVsX3BsYW5lLCB0b19pbnRlbF9jcnRjKGNydGMpKTsKIAl9 CiAKIAlpbnRlbF9jbGVhbnVwX3BsYW5lX2ZiKHBsYW5lLCBuZXdfcGxhbmVfc3RhdGUpOwpAQCAt MTM2NjksMTQgKzEzNjY1LDE0IEBAIGludGVsX3ByaW1hcnlfcGxhbmVfY3JlYXRlKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUpCiB9CiAKIHN0YXRpYyBp bnQKLWludGVsX2NoZWNrX2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKK2lu dGVsX2NoZWNrX2N1cnNvcl9wbGFuZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAogCQkJIHN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkJIHN0cnVjdCBpbnRlbF9wbGFu ZV9zdGF0ZSAqc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShwbGFuZS0+ZGV2KTsKLQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHN0YXRl LT5iYXNlLmZiOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo cGxhbmUtPmJhc2UuZGV2KTsKKwljb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHN0 YXRlLT5iYXNlLmZiOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9m Yl9vYmooZmIpOwotCWVudW0gcGlwZSBwaXBlID0gdG9faW50ZWxfcGxhbmUocGxhbmUpLT5waXBl OworCWVudW0gcGlwZSBwaXBlID0gcGxhbmUtPnBpcGU7CiAJdW5zaWduZWQgc3RyaWRlOwogCWlu dCByZXQ7CiAKQEAgLTEzNzM2LDIzICsxMzczMiwyMCBAQCBpbnRlbF9jaGVja19jdXJzb3JfcGxh bmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiB9CiAKIHN0YXRpYyB2b2lkCi1pbnRlbF9kaXNh YmxlX2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKLQkJCSAgIHN0cnVjdCBk cm1fY3J0YyAqY3J0YykKK2ludGVsX2Rpc2FibGVfY3Vyc29yX3BsYW5lKHN0cnVjdCBpbnRlbF9w bGFuZSAqcGxhbmUsCisJCQkgICBzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIHsKLQlzdHJ1Y3Qg aW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0KLQlpbnRlbF9j cnRjLT5jdXJzb3JfYWRkciA9IDA7Ci0JaW50ZWxfY3J0Y191cGRhdGVfY3Vyc29yKGNydGMsIE5V TEwpOworCWNydGMtPmN1cnNvcl9hZGRyID0gMDsKKwlpbnRlbF9jcnRjX3VwZGF0ZV9jdXJzb3Io JmNydGMtPmJhc2UsIE5VTEwpOwogfQogCiBzdGF0aWMgdm9pZAotaW50ZWxfdXBkYXRlX2N1cnNv cl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKK2ludGVsX3VwZGF0ZV9jdXJzb3JfcGxh bmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwKIAkJCSAgY29uc3Qgc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCQkgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0 ZSAqc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9jcnRjICpjcnRjID0gY3J0Y19zdGF0ZS0+YmFzZS5j cnRjOwotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRj KTsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KHBsYW5lLT5k ZXYpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUocGxhbmUt PmJhc2UuZGV2KTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0 Y19zdGF0ZS0+YmFzZS5jcnRjKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0g aW50ZWxfZmJfb2JqKHN0YXRlLT5iYXNlLmZiKTsKIAl1aW50MzJfdCBhZGRyOwogCkBAIC0xMzc2 Myw4ICsxMzc1Niw4IEBAIGludGVsX3VwZGF0ZV9jdXJzb3JfcGxhbmUoc3RydWN0IGRybV9wbGFu ZSAqcGxhbmUsCiAJZWxzZQogCQlhZGRyID0gb2JqLT5waHlzX2hhbmRsZS0+YnVzYWRkcjsKIAot CWludGVsX2NydGMtPmN1cnNvcl9hZGRyID0gYWRkcjsKLQlpbnRlbF9jcnRjX3VwZGF0ZV9jdXJz b3IoY3J0Yywgc3RhdGUpOworCWNydGMtPmN1cnNvcl9hZGRyID0gYWRkcjsKKwlpbnRlbF9jcnRj X3VwZGF0ZV9jdXJzb3IoJmNydGMtPmJhc2UsIHN0YXRlKTsKIH0KIAogc3RhdGljIHN0cnVjdCBp bnRlbF9wbGFuZSAqCkBAIC0xNTE3Nyw3ICsxNTE3MCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3Nh bml0aXplX2NydGMoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJCQkJY29udGludWU7CiAKIAkJ CXRyYWNlX2ludGVsX2Rpc2FibGVfcGxhbmUoJnBsYW5lLT5iYXNlLCBjcnRjKTsKLQkJCXBsYW5l LT5kaXNhYmxlX3BsYW5lKCZwbGFuZS0+YmFzZSwgJmNydGMtPmJhc2UpOworCQkJcGxhbmUtPmRp c2FibGVfcGxhbmUocGxhbmUsIGNydGMpOwogCQl9CiAJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCmluZGV4IDE1ZTNlYjI4MjRlMy4uYTNkZTE3ZjMwNThiIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaApAQCAtODExLDEyICs4MTEsMTIgQEAgc3RydWN0IGludGVsX3BsYW5lIHsKIAkgKiB0 aGUgaW50ZWxfcGxhbmVfc3RhdGUgc3RydWN0dXJlIGFuZCBhY2Nlc3NlZCB2aWEgcGxhbmVfc3Rh dGUuCiAJICovCiAKLQl2b2lkICgqdXBkYXRlX3BsYW5lKShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZSwKKwl2b2lkICgqdXBkYXRlX3BsYW5lKShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAogCQkJ ICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCSAgICAg Y29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSk7Ci0Jdm9pZCAoKmRp c2FibGVfcGxhbmUpKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAotCQkJICAgICAgc3RydWN0IGRy bV9jcnRjICpjcnRjKTsKLQlpbnQgKCpjaGVja19wbGFuZSkoc3RydWN0IGRybV9wbGFuZSAqcGxh bmUsCisJdm9pZCAoKmRpc2FibGVfcGxhbmUpKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCisJ CQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7CisJaW50ICgqY2hlY2tfcGxhbmUpKHN0 cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAJCQkgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq Y3J0Y19zdGF0ZSwKIAkJCSAgIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUpOwogfTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggZjdkNDMxNDI3MTE1Li44YmYyNmIz NGUxOTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0yMDcsMTYgKzIwNywx NCBAQCB2b2lkIGludGVsX3BpcGVfdXBkYXRlX2VuZChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yywg c3RydWN0IGludGVsX2ZsaXBfd29yayAqd29yawogfQogCiBzdGF0aWMgdm9pZAotc2tsX3VwZGF0 ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcm1fcGxhbmUsCitza2xfdXBkYXRlX3BsYW5lKHN0 cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAJCSBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3J0Y19zdGF0ZSwKIAkJIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVf c3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGRybV9wbGFuZS0+ZGV2OwotCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3Qg aW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUoZHJtX3BsYW5lKTsKLQlz dHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBsYW5lX3N0YXRlLT5iYXNlLmZiOwotCWVudW0g cGxhbmVfaWQgcGxhbmVfaWQgPSBpbnRlbF9wbGFuZS0+aWQ7Ci0JZW51bSBwaXBlIHBpcGUgPSBp bnRlbF9wbGFuZS0+cGlwZTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0 b19pOTE1KHBsYW5lLT5iYXNlLmRldik7CisJY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAq ZmIgPSBwbGFuZV9zdGF0ZS0+YmFzZS5mYjsKKwllbnVtIHBsYW5lX2lkIHBsYW5lX2lkID0gcGxh bmUtPmlkOworCWVudW0gcGlwZSBwaXBlID0gcGxhbmUtPnBpcGU7CiAJdTMyIHBsYW5lX2N0bCA9 IHBsYW5lX3N0YXRlLT5jdGw7CiAJY29uc3Qgc3RydWN0IGRybV9pbnRlbF9zcHJpdGVfY29sb3Jr ZXkgKmtleSA9ICZwbGFuZV9zdGF0ZS0+Y2tleTsKIAl1MzIgc3VyZl9hZGRyID0gcGxhbmVfc3Rh dGUtPm1haW4ub2Zmc2V0OwpAQCAtMjg1LDEzICsyODMsMTEgQEAgc2tsX3VwZGF0ZV9wbGFuZShz dHJ1Y3QgZHJtX3BsYW5lICpkcm1fcGxhbmUsCiB9CiAKIHN0YXRpYyB2b2lkCi1za2xfZGlzYWJs ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YykK K3NrbF9kaXNhYmxlX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsIHN0cnVjdCBpbnRl bF9jcnRjICpjcnRjKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkcGxhbmUtPmRldjsK LQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0Jc3Ry dWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKGRwbGFuZSk7Ci0J ZW51bSBwbGFuZV9pZCBwbGFuZV9pZCA9IGludGVsX3BsYW5lLT5pZDsKLQllbnVtIHBpcGUgcGlw ZSA9IGludGVsX3BsYW5lLT5waXBlOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHRvX2k5MTUocGxhbmUtPmJhc2UuZGV2KTsKKwllbnVtIHBsYW5lX2lkIHBsYW5lX2lkID0g cGxhbmUtPmlkOworCWVudW0gcGlwZSBwaXBlID0gcGxhbmUtPnBpcGU7CiAJdW5zaWduZWQgbG9u ZyBpcnFmbGFnczsKIAogCXNwaW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2ss IGlycWZsYWdzKTsKQEAgLTMwNSwxMCArMzAxLDEwIEBAIHNrbF9kaXNhYmxlX3BsYW5lKHN0cnVj dCBkcm1fcGxhbmUgKmRwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjKQogfQogCiBzdGF0aWMg dm9pZAotY2h2X3VwZGF0ZV9jc2Moc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSwgdWlu dDMyX3QgZm9ybWF0KQorY2h2X3VwZGF0ZV9jc2Moc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwg dWludDMyX3QgZm9ybWF0KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoaW50ZWxfcGxhbmUtPmJhc2UuZGV2KTsKLQllbnVtIHBsYW5lX2lkIHBsYW5lX2lk ID0gaW50ZWxfcGxhbmUtPmlkOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUocGxhbmUtPmJhc2UuZGV2KTsKKwllbnVtIHBsYW5lX2lkIHBsYW5lX2lkID0gcGxh bmUtPmlkOwogCiAJLyogU2VlbXMgUkdCIGRhdGEgYnlwYXNzZXMgdGhlIENTQyBhbHdheXMgKi8K IAlpZiAoIWZvcm1hdF9pc195dXYoZm9ybWF0KSkKQEAgLTQwOCwxNiArNDA0LDE0IEBAIHN0YXRp YyB1MzIgdmx2X3Nwcml0ZV9jdGwoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNf c3RhdGUsCiB9CiAKIHN0YXRpYyB2b2lkCi12bHZfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxh bmUgKmRwbGFuZSwKK3Zsdl91cGRhdGVfcGxhbmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwK IAkJIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkgY29uc3Qg c3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gZHBsYW5lLT5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShkZXYpOwotCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0 b19pbnRlbF9wbGFuZShkcGxhbmUpOwotCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxh bmVfc3RhdGUtPmJhc2UuZmI7Ci0JZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9wbGFuZS0+cGlwZTsK LQllbnVtIHBsYW5lX2lkIHBsYW5lX2lkID0gaW50ZWxfcGxhbmUtPmlkOworCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUocGxhbmUtPmJhc2UuZGV2KTsKKwljb25z dCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBsYW5lX3N0YXRlLT5iYXNlLmZiOworCWVu dW0gcGlwZSBwaXBlID0gcGxhbmUtPnBpcGU7CisJZW51bSBwbGFuZV9pZCBwbGFuZV9pZCA9IHBs YW5lLT5pZDsKIAl1MzIgc3ByY3RsID0gcGxhbmVfc3RhdGUtPmN0bDsKIAl1MzIgc3Byc3VyZl9v ZmZzZXQgPSBwbGFuZV9zdGF0ZS0+bWFpbi5vZmZzZXQ7CiAJdTMyIGxpbmVhcl9vZmZzZXQ7CkBA IC00MzksNyArNDMzLDcgQEAgdmx2X3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxh bmUsCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmRldl9wcml2LT51bmNvcmUubG9jaywgaXJxZmxhZ3Mp OwogCiAJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpICYmIHBpcGUgPT0gUElQRV9CKQotCQlj aHZfdXBkYXRlX2NzYyhpbnRlbF9wbGFuZSwgZmItPmZvcm1hdC0+Zm9ybWF0KTsKKwkJY2h2X3Vw ZGF0ZV9jc2MocGxhbmUsIGZiLT5mb3JtYXQtPmZvcm1hdCk7CiAKIAlpZiAoa2V5LT5mbGFncykg ewogCQlJOTE1X1dSSVRFX0ZXKFNQS0VZTUlOVkFMKHBpcGUsIHBsYW5lX2lkKSwga2V5LT5taW5f dmFsdWUpOwpAQCAtNDY2LDEzICs0NjAsMTEgQEAgdmx2X3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJt X3BsYW5lICpkcGxhbmUsCiB9CiAKIHN0YXRpYyB2b2lkCi12bHZfZGlzYWJsZV9wbGFuZShzdHJ1 Y3QgZHJtX3BsYW5lICpkcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3Zsdl9kaXNhYmxl X3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsIHN0cnVjdCBpbnRlbF9jcnRjICpjcnRj KQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkcGxhbmUtPmRldjsKLQlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0Jc3RydWN0IGludGVsX3Bs YW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKGRwbGFuZSk7Ci0JZW51bSBwaXBlIHBp cGUgPSBpbnRlbF9wbGFuZS0+cGlwZTsKLQllbnVtIHBsYW5lX2lkIHBsYW5lX2lkID0gaW50ZWxf cGxhbmUtPmlkOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo cGxhbmUtPmJhc2UuZGV2KTsKKwllbnVtIHBpcGUgcGlwZSA9IHBsYW5lLT5waXBlOworCWVudW0g cGxhbmVfaWQgcGxhbmVfaWQgPSBwbGFuZS0+aWQ7CiAJdW5zaWduZWQgbG9uZyBpcnFmbGFnczsK IAogCXNwaW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsK QEAgLTU0MiwxNSArNTM0LDEzIEBAIHN0YXRpYyB1MzIgaXZiX3Nwcml0ZV9jdGwoY29uc3Qgc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiB9CiAKIHN0YXRpYyB2b2lkCi1pdmJf dXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAoraXZiX3VwZGF0ZV9wbGFuZShz dHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAogCQkgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmNydGNfc3RhdGUsCiAJCSBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5l X3N0YXRlKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2OwotCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaW50 ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwotCXN0cnVjdCBk cm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmJhc2UuZmI7Ci0JZW51bSBwaXBlIHBp cGUgPSBpbnRlbF9wbGFuZS0+cGlwZTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KHBsYW5lLT5iYXNlLmRldik7CisJY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1 ZmZlciAqZmIgPSBwbGFuZV9zdGF0ZS0+YmFzZS5mYjsKKwllbnVtIHBpcGUgcGlwZSA9IHBsYW5l LT5waXBlOwogCXUzMiBzcHJjdGwgPSBwbGFuZV9zdGF0ZS0+Y3RsLCBzcHJzY2FsZSA9IDA7CiAJ dTMyIHNwcnN1cmZfb2Zmc2V0ID0gcGxhbmVfc3RhdGUtPm1haW4ub2Zmc2V0OwogCXUzMiBsaW5l YXJfb2Zmc2V0OwpAQCAtNTk3LDcgKzU4Nyw3IEBAIGl2Yl91cGRhdGVfcGxhbmUoc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUsCiAJCUk5MTVfV1JJVEVfRlcoU1BSTElOT0ZGKHBpcGUpLCBsaW5lYXJf b2Zmc2V0KTsKIAogCUk5MTVfV1JJVEVfRlcoU1BSU0laRShwaXBlKSwgKGNydGNfaCA8PCAxNikg fCBjcnRjX3cpOwotCWlmIChpbnRlbF9wbGFuZS0+Y2FuX3NjYWxlKQorCWlmIChwbGFuZS0+Y2Fu X3NjYWxlKQogCQlJOTE1X1dSSVRFX0ZXKFNQUlNDQUxFKHBpcGUpLCBzcHJzY2FsZSk7CiAJSTkx NV9XUklURV9GVyhTUFJDVEwocGlwZSksIHNwcmN0bCk7CiAJSTkxNV9XUklURV9GVyhTUFJTVVJG KHBpcGUpLApAQCAtNjA4LDE5ICs1OTgsMTcgQEAgaXZiX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSwKIH0KIAogc3RhdGljIHZvaWQKLWl2Yl9kaXNhYmxlX3BsYW5lKHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCitpdmJfZGlzYWJsZV9w bGFuZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykK IHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcGxhbmUtPmRldjsKLQlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0Jc3RydWN0IGludGVsX3BsYW5l ICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKLQlpbnQgcGlwZSA9IGludGVs X3BsYW5lLT5waXBlOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUocGxhbmUtPmJhc2UuZGV2KTsKKwllbnVtIHBpcGUgcGlwZSA9IHBsYW5lLT5waXBlOwogCXVu c2lnbmVkIGxvbmcgaXJxZmxhZ3M7CiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2X3ByaXYtPnVu Y29yZS5sb2NrLCBpcnFmbGFncyk7CiAKIAlJOTE1X1dSSVRFX0ZXKFNQUkNUTChwaXBlKSwgMCk7 CiAJLyogQ2FuJ3QgbGVhdmUgdGhlIHNjYWxlciBlbmFibGVkLi4uICovCi0JaWYgKGludGVsX3Bs YW5lLT5jYW5fc2NhbGUpCisJaWYgKHBsYW5lLT5jYW5fc2NhbGUpCiAJCUk5MTVfV1JJVEVfRlco U1BSU0NBTEUocGlwZSksIDApOwogCiAJSTkxNV9XUklURV9GVyhTUFJTVVJGKHBpcGUpLCAwKTsK QEAgLTY4MywxNSArNjcxLDEzIEBAIHN0YXRpYyB1MzIgaWxrX3Nwcml0ZV9jdGwoY29uc3Qgc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiB9CiAKIHN0YXRpYyB2b2lkCi1pbGtf dXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAoraWxrX3VwZGF0ZV9wbGFuZShz dHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAogCQkgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmNydGNfc3RhdGUsCiAJCSBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5l X3N0YXRlKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2OwotCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaW50 ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwotCXN0cnVjdCBk cm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmJhc2UuZmI7Ci0JaW50IHBpcGUgPSBp bnRlbF9wbGFuZS0+cGlwZTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0 b19pOTE1KHBsYW5lLT5iYXNlLmRldik7CisJY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAq ZmIgPSBwbGFuZV9zdGF0ZS0+YmFzZS5mYjsKKwllbnVtIHBpcGUgcGlwZSA9IHBsYW5lLT5waXBl OwogCXUzMiBkdnNjbnRyID0gcGxhbmVfc3RhdGUtPmN0bCwgZHZzc2NhbGUgPSAwOwogCXUzMiBk dnNzdXJmX29mZnNldCA9IHBsYW5lX3N0YXRlLT5tYWluLm9mZnNldDsKIAl1MzIgbGluZWFyX29m ZnNldDsKQEAgLTc0NCwxMiArNzMwLDEwIEBAIGlsa191cGRhdGVfcGxhbmUoc3RydWN0IGRybV9w bGFuZSAqcGxhbmUsCiB9CiAKIHN0YXRpYyB2b2lkCi1pbGtfZGlzYWJsZV9wbGFuZShzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjKQoraWxrX2Rpc2FibGVfcGxh bmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwgc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7 Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwotCXN0cnVjdCBpbnRlbF9wbGFuZSAq aW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7Ci0JaW50IHBpcGUgPSBpbnRlbF9w bGFuZS0+cGlwZTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1 KHBsYW5lLT5iYXNlLmRldik7CisJZW51bSBwaXBlIHBpcGUgPSBwbGFuZS0+cGlwZTsKIAl1bnNp Z25lZCBsb25nIGlycWZsYWdzOwogCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmRldl9wcml2LT51bmNv cmUubG9jaywgaXJxZmxhZ3MpOwpAQCAtNzY1LDE0ICs3NDksMTIgQEAgaWxrX2Rpc2FibGVfcGxh bmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIH0KIAog c3RhdGljIGludAotaW50ZWxfY2hlY2tfc3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBs YW5lLAoraW50ZWxfY2hlY2tfc3ByaXRlX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUs CiAJCQkgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCQkgc3RydWN0IGlu dGVsX3BsYW5lX3N0YXRlICpzdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KHBsYW5lLT5kZXYpOwotCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHN0 YXRlLT5iYXNlLmNydGM7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRl bF9jcnRjKGNydGMpOwotCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRl bF9wbGFuZShwbGFuZSk7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShwbGFuZS0+YmFzZS5kZXYpOworCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50 ZWxfY3J0YyhjcnRjX3N0YXRlLT5iYXNlLmNydGMpOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIg KmZiID0gc3RhdGUtPmJhc2UuZmI7CiAJaW50IGNydGNfeCwgY3J0Y195OwogCXVuc2lnbmVkIGlu dCBjcnRjX3csIGNydGNfaDsKQEAgLTc5NCw3ICs3NzYsNyBAQCBpbnRlbF9jaGVja19zcHJpdGVf cGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJfQogCiAJLyogRG9uJ3QgbW9kaWZ5IGFu b3RoZXIgcGlwZSdzIHBsYW5lICovCi0JaWYgKGludGVsX3BsYW5lLT5waXBlICE9IGludGVsX2Ny dGMtPnBpcGUpIHsKKwlpZiAocGxhbmUtPnBpcGUgIT0gY3J0Yy0+cGlwZSkgewogCQlEUk1fREVC VUdfS01TKCJXcm9uZyBwbGFuZSA8LT4gY3J0YyBtYXBwaW5nXG4iKTsKIAkJcmV0dXJuIC1FSU5W QUw7CiAJfQpAQCAtODExLDE2ICs3OTMsMTYgQEAgaW50ZWxfY2hlY2tfc3ByaXRlX3BsYW5lKHN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQlpZiAoc3RhdGUtPmNrZXkuZmxhZ3MgPT0gSTkxNV9T RVRfQ09MT1JLRVlfTk9ORSkgewogCQkJY2FuX3NjYWxlID0gMTsKIAkJCW1pbl9zY2FsZSA9IDE7 Ci0JCQltYXhfc2NhbGUgPSBza2xfbWF4X3NjYWxlKGludGVsX2NydGMsIGNydGNfc3RhdGUpOwor CQkJbWF4X3NjYWxlID0gc2tsX21heF9zY2FsZShjcnRjLCBjcnRjX3N0YXRlKTsKIAkJfSBlbHNl IHsKIAkJCWNhbl9zY2FsZSA9IDA7CiAJCQltaW5fc2NhbGUgPSBEUk1fUExBTkVfSEVMUEVSX05P X1NDQUxJTkc7CiAJCQltYXhfc2NhbGUgPSBEUk1fUExBTkVfSEVMUEVSX05PX1NDQUxJTkc7CiAJ CX0KIAl9IGVsc2UgewotCQljYW5fc2NhbGUgPSBpbnRlbF9wbGFuZS0+Y2FuX3NjYWxlOwotCQlt YXhfc2NhbGUgPSBpbnRlbF9wbGFuZS0+bWF4X2Rvd25zY2FsZSA8PCAxNjsKLQkJbWluX3NjYWxl ID0gaW50ZWxfcGxhbmUtPmNhbl9zY2FsZSA/IDEgOiAoMSA8PCAxNik7CisJCWNhbl9zY2FsZSA9 IHBsYW5lLT5jYW5fc2NhbGU7CisJCW1heF9zY2FsZSA9IHBsYW5lLT5tYXhfZG93bnNjYWxlIDw8 IDE2OworCQltaW5fc2NhbGUgPSBwbGFuZS0+Y2FuX3NjYWxlID8gMSA6ICgxIDw8IDE2KTsKIAl9 CiAKIAkvKgotLSAKMi4xMC4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK