From: Matt Roper Subject: [PATCH 2/5] drm/i915: Kill intel_crtc->active Date: Sun, 8 Mar 2015 14:00:42 -0700 Message-ID: <1425848445-19479-3-git-send-email-matthew.d.roper@intel.com> References: <1425848445-19479-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id CDBDE6E241 for ; Sun, 8 Mar 2015 14:04:17 -0700 (PDT) In-Reply-To: <1425848445-19479-1-git-send-email-matthew.d.roper@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 UmVwbGFjZSBhbGwgdXNlcyBvZiBpbnRlbF9jcnRjLT5hY3RpdmUgd2l0aCBjcnRjLT5zdGF0ZS0+ YWN0aXZlLiAgQXQgdGhlCm1vbWVudCB3ZSBkb24ndCBoYXZlIGF0b21pYyBzdGF0ZSBoYW5kbGlu ZyB3aXJlZCB1cCBmb3IgQ1JUQydzIHNvIHRoaXMKbWVhbnMgd2UganVzdCBkaXJlY3RseSBzZXQg dGhlIHN0YXRlIGFjdGl2ZSBmaWVsZCBhdCB2YXJpb3VzIHBvaW50cyBpbgpvdXIgKGxlZ2FjeSkg bW9kZXNldCBwaXBlbGluZS4gIE9uY2Ugd2UgaGF2ZSBDUlRDIGF0b21pYyBzdGF0ZXMgcHJvcGVy bHkKaG9va2VkIHVwLCBjcnRjX3N0YXRlLT5hY3RpdmUgd2lsbCBiZSBzZXQgZHVyaW5nIHRoZSBj aGVjayBwaGFzZS4KClBhdGNoIGdlbmVyYXRlZCB3aXRoIENvY2NpbmVsbGUgdmlhOgoKICAgICAg ICAvLyBJZiB3ZSBhbHJlYWR5IGhhdmUgdGhlIGJhc2UgcG9pbnRlciwgZG9uJ3QgYWNjZXNzIGl0 IHRocm91Z2gKICAgICAgICAvLyBpbnRlbF9jcnRjLT5iYXNlIG5lZWRsZXNzbHkuCiAgICAgICAg QEAKICAgICAgICBleHByZXNzaW9uIEU7CiAgICAgICAgc3RydWN0IGludGVsX2NydGMgKklDOwog ICAgICAgIEBACiAgICAgICAgSUMgPSB0b19pbnRlbF9jcnRjKEUpOwogICAgICAgIDwrLi4uCiAg ICAgICAgLSBJQy0+YWN0aXZlCiAgICAgICAgKyBFLT5zdGF0ZS0+YWN0aXZlCiAgICAgICAgLi4u Kz4KCiAgICAgICAgLy8gTm90IHN1cmUgd2h5IHRoZSBydWxlIGFib3ZlIGRvZXNuJ3QgY2F0Y2gg dGhlc2UsIGJ1dCB0aGlzIHNlZW1zCiAgICAgICAgLy8gdG8gbW9wIHVwIHRoZSByZW1haW5kZXJz LgogICAgICAgIEBACiAgICAgICAgaWRlbnRpZmllciBJOwogICAgICAgIGV4cHJlc3Npb24gRTsK ICAgICAgICBAQAogICAgICAgIHsKICAgICAgICBzdHJ1Y3QgaW50ZWxfY3J0YyAqSSA9IHRvX2lu dGVsX2NydGMoRSk7CiAgICAgICAgPCsuLi4KICAgICAgICAtIEktPmFjdGl2ZQogICAgICAgICsg RS0+c3RhdGUtPmFjdGl2ZQogICAgICAgIC4uLis+CiAgICAgICAgfQoKICAgICAgICAvLyBXZSBt aWdodCBoYXZlIGxlZnQgYW4gdW51c2VkIGludGVsX2NydGMgaW4gc29tZSBmdW5jdGlvbnM7IGNs ZWFuIHRoYXQgdXAuCiAgICAgICAgQEAKICAgICAgICBpZGVudGlmaWVyIElDOwogICAgICAgIGNv bnN0YW50IEM7CiAgICAgICAgQEAKICAgICAgICB7CiAgICAgICAgLi4uCiAgICAgICAgLSBzdHJ1 Y3QgaW50ZWxfY3J0YyAqSUM7CiAgICAgICAgLi4uIHdoZW4gIT0gSUMKICAgICAgICB9CgogICAg ICAgIC8vIENoYW5nZSBhbGwgb2YgdGhlIG90aGVyIHVzZXMgb2YgaW50ZWxfY3J0Yy0+YWN0aXZl CiAgICAgICAgQEAKICAgICAgICBzdHJ1Y3QgaW50ZWxfY3J0YyAqSUM7CiAgICAgICAgQEAKICAg ICAgICAtIElDLT5hY3RpdmUKICAgICAgICArIElDLT5iYXNlLnN0YXRlLT5hY3RpdmUKCiAgICAg ICAgLy8gRGl0dG8KICAgICAgICBAQAogICAgICAgIGV4cHJlc3Npb24gRTsKICAgICAgICBAQAog ICAgICAgIC0gdG9faW50ZWxfY3J0YyhFKS0+YWN0aXZlCiAgICAgICAgKyBFLT5zdGF0ZS0+YWN0 aXZlCgogICAgICAgIC8vIFJlbW92ZSB0aGUgYWN0aXZlIGZpZWxkIGZyb20gaW50ZWxfY3J0Ywog ICAgICAgIEBAIEBACiAgICAgICAgc3RydWN0IGludGVsX2NydGMgewogICAgICAgIC4uLgogICAg ICAgIC0gYm9vbCBhY3RpdmU7CiAgICAgICAgLi4uCiAgICAgICAgfTsKClNpZ25lZC1vZmYtYnk6 IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgICAgICAgfCAgIDkgKystCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2lycS5jICAgICAgICAgICB8ICAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfYXRvbWljX3BsYW5lLmMgfCAgIDQgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYyAgICAgIHwgMTI5ICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyAgICAgICAgICAgfCAgIDQgKy0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICAgICAgIHwgICA2IC0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9mYmRldi5jICAgICAgICB8ICAgNiArLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfb3ZlcmxheS5jICAgICAgfCAgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMgICAgICAgICAgIHwgIDEwICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf c3ByaXRlLmMgICAgICAgfCAgIDYgKy0KIDEwIGZpbGVzIGNoYW5nZWQsIDg2IGluc2VydGlvbnMo KyksIDkyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXgg M2Y2NDc4Ni4uMjgxNzZmZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTI2 NTYsOSArMjY1NiwxMCBAQCBzdGF0aWMgaW50IGk5MTVfZGlzcGxheV9pbmZvKHN0cnVjdCBzZXFf ZmlsZSAqbSwgdm9pZCAqdW51c2VkKQogCiAJCXNlcV9wcmludGYobSwgIkNSVEMgJWQ6IHBpcGU6 ICVjLCBhY3RpdmU9JXMgKHNpemU9JWR4JWQpXG4iLAogCQkJICAgY3J0Yy0+YmFzZS5iYXNlLmlk LCBwaXBlX25hbWUoY3J0Yy0+cGlwZSksCi0JCQkgICB5ZXNubyhjcnRjLT5hY3RpdmUpLCBjcnRj LT5jb25maWctPnBpcGVfc3JjX3csCisJCQkgICB5ZXNubyhjcnRjLT5iYXNlLnN0YXRlLT5hY3Rp dmUpLAorCQkJICAgY3J0Yy0+Y29uZmlnLT5waXBlX3NyY193LAogCQkJICAgY3J0Yy0+Y29uZmln LT5waXBlX3NyY19oKTsKLQkJaWYgKGNydGMtPmFjdGl2ZSkgeworCQlpZiAoY3J0Yy0+YmFzZS5z dGF0ZS0+YWN0aXZlKSB7CiAJCQlpbnRlbF9jcnRjX2luZm8obSwgY3J0Yyk7CiAKIAkJCWFjdGl2 ZSA9IGN1cnNvcl9wb3NpdGlvbihkZXYsIGNydGMtPnBpcGUsICZ4LCAmeSk7CkBAIC0yOTUxLDcg KzI5NTIsNyBAQCBzdGF0aWMgaW50IGk5MTVfZHJyc19zdGF0dXMoc3RydWN0IHNlcV9maWxlICpt LCB2b2lkICp1bnVzZWQpCiAJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGludGVsX2NydGMpIHsK IAkJZHJtX21vZGVzZXRfbG9jaygmaW50ZWxfY3J0Yy0+YmFzZS5tdXRleCwgTlVMTCk7CiAKLQkJ aWYgKGludGVsX2NydGMtPmFjdGl2ZSkgeworCQlpZiAoaW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZS0+ YWN0aXZlKSB7CiAJCQlhY3RpdmVfY3J0Y19jbnQrKzsKIAkJCXNlcV9wcmludGYobSwgIlxuQ1JU QyAlZDogICIsIGFjdGl2ZV9jcnRjX2NudCk7CiAKQEAgLTM2NTAsNyArMzY1MSw3IEBAIHN0YXRp YyBpbnQgcGlwZV9jcmNfc2V0X3NvdXJjZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBlbnVtIHBp cGUgcGlwZSwKIAkJCQkgcGlwZV9uYW1lKHBpcGUpKTsKIAogCQlkcm1fbW9kZXNldF9sb2NrKCZj cnRjLT5iYXNlLm11dGV4LCBOVUxMKTsKLQkJaWYgKGNydGMtPmFjdGl2ZSkKKwkJaWYgKGNydGMt PmJhc2Uuc3RhdGUtPmFjdGl2ZSkKIAkJCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIHBpcGUp OwogCQlkcm1fbW9kZXNldF91bmxvY2soJmNydGMtPmJhc2UubXV0ZXgpOwogCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9pcnEuYwppbmRleCA5YmFlY2I3Li5hYzgzNGRlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJx LmMKQEAgLTY0OSw3ICs2NDksNyBAQCBzdGF0aWMgaW50IGk5MTVfZ2V0X2NydGNfc2Nhbm91dHBv cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgcGlwZSwKIAlpbnQgcmV0ID0gMDsKIAl1bnNp Z25lZCBsb25nIGlycWZsYWdzOwogCi0JaWYgKCFpbnRlbF9jcnRjLT5hY3RpdmUpIHsKKwlpZiAo IWludGVsX2NydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSkgewogCQlEUk1fREVCVUdfRFJJVkVSKCJ0 cnlpbmcgdG8gZ2V0IHNjYW5vdXRwb3MgZm9yIGRpc2FibGVkICIKIAkJCQkgInBpcGUgJWNcbiIs IHBpcGVfbmFtZShwaXBlKSk7CiAJCXJldHVybiAwOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9hdG9taWNfcGxhbmUuYwppbmRleCA5NzZiODkxLi40M2NiMjFmIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYwpAQCAtMTQ0LDkgKzE0NCw5IEBAIHN0YXRpYyBp bnQgaW50ZWxfcGxhbmVfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWlu dGVsX3N0YXRlLT5jbGlwLngxID0gMDsKIAlpbnRlbF9zdGF0ZS0+Y2xpcC55MSA9IDA7CiAJaW50 ZWxfc3RhdGUtPmNsaXAueDIgPQotCQlpbnRlbF9jcnRjLT5hY3RpdmUgPyBpbnRlbF9jcnRjLT5j b25maWctPnBpcGVfc3JjX3cgOiAwOworCQljcnRjLT5zdGF0ZS0+YWN0aXZlID8gaW50ZWxfY3J0 Yy0+Y29uZmlnLT5waXBlX3NyY193IDogMDsKIAlpbnRlbF9zdGF0ZS0+Y2xpcC55MiA9Ci0JCWlu dGVsX2NydGMtPmFjdGl2ZSA/IGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfaCA6IDA7CisJ CWNydGMtPnN0YXRlLT5hY3RpdmUgPyBpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3JjX2ggOiAw OwogCiAJLyoKIAkgKiBEaXNhYmxpbmcgYSBwbGFuZSBpcyBhbHdheXMgb2theTsgd2UganVzdCBu ZWVkIHRvIHVwZGF0ZQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDE4OGY4 N2YuLmIxMTUyOGYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTg5Nyw3 ICs4OTcsNyBAQCBib29sIGludGVsX2NydGNfYWN0aXZlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykK IAkgKiBXZSBjYW4gZGl0Y2ggdGhlIGNydGMtPnByaW1hcnktPmZiIGNoZWNrIGFzIHNvb24gYXMg d2UgY2FuCiAJICogcHJvcGVybHkgcmVjb25zdHJ1Y3QgZnJhbWVidWZmZXJzLgogCSAqLwotCXJl dHVybiBpbnRlbF9jcnRjLT5hY3RpdmUgJiYgY3J0Yy0+cHJpbWFyeS0+ZmIgJiYKKwlyZXR1cm4g Y3J0Yy0+c3RhdGUtPmFjdGl2ZSAmJiBjcnRjLT5wcmltYXJ5LT5mYiAmJgogCQlpbnRlbF9jcnRj LT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZS5jcnRjX2Nsb2NrOwogfQogCkBAIC0xNTkxLDcg KzE1OTEsNyBAQCBzdGF0aWMgaW50IGludGVsX251bV9kdm9fcGlwZXMoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAlpbnQgY291bnQgPSAwOwogCiAJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGNy dGMpCi0JCWNvdW50ICs9IGNydGMtPmFjdGl2ZSAmJgorCQljb3VudCArPSBjcnRjLT5iYXNlLnN0 YXRlLT5hY3RpdmUgJiYKIAkJCWludGVsX3BpcGVfaGFzX3R5cGUoY3J0YywgSU5URUxfT1VUUFVU X0RWTyk7CiAKIAlyZXR1cm4gY291bnQ7CkBAIC0yMTY4LDcgKzIxNjgsNyBAQCBzdGF0aWMgdm9p ZCBpbnRlbF9kaXNhYmxlX3ByaW1hcnlfaHdfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUs CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK IAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAK LQlpZiAoV0FSTl9PTighaW50ZWxfY3J0Yy0+YWN0aXZlKSkKKwlpZiAoV0FSTl9PTighaW50ZWxf Y3J0Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlKSkKIAkJcmV0dXJuOwogCiAJaWYgKCFpbnRlbF9jcnRj LT5wcmltYXJ5X2VuYWJsZWQpCkBAIC0yNTEyLDcgKzI1MTIsNyBAQCBpbnRlbF9maW5kX3BsYW5l X29iaihzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAkJaWYgKGMgPT0gJmludGVsX2Ny dGMtPmJhc2UpCiAJCQljb250aW51ZTsKIAotCQlpZiAoIWktPmFjdGl2ZSkKKwkJaWYgKCFpLT5i YXNlLnN0YXRlLT5hY3RpdmUpCiAJCQljb250aW51ZTsKIAogCQlvYmogPSBpbnRlbF9mYl9vYmoo Yy0+cHJpbWFyeS0+ZmIpOwpAQCAtMjkzNywxNSArMjkzNywxMyBAQCBzdGF0aWMgdm9pZCBpbnRl bF91cGRhdGVfcHJpbWFyeV9wbGFuZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlzdHJ1Y3Qg ZHJtX2NydGMgKmNydGM7CiAKIAlmb3JfZWFjaF9jcnRjKGRldiwgY3J0YykgewotCQlzdHJ1Y3Qg aW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0KIAkJZHJtX21v ZGVzZXRfbG9jaygmY3J0Yy0+bXV0ZXgsIE5VTEwpOwogCQkvKgogCQkgKiBGSVhNRTogT25jZSB3 ZSBoYXZlIHByb3BlciBzdXBwb3J0IGZvciBwcmltYXJ5IHBsYW5lcyAoYW5kCiAJCSAqIGRpc2Fi bGluZyB0aGVtIHdpdGhvdXQgZGlzYWJsaW5nIHRoZSBlbnRpcmUgY3J0YykgYWxsb3cgYWdhaW4K IAkJICogYSBOVUxMIGNydGMtPnByaW1hcnktPmZiLgogCQkgKi8KLQkJaWYgKGludGVsX2NydGMt PmFjdGl2ZSAmJiBjcnRjLT5wcmltYXJ5LT5mYikKKwkJaWYgKGNydGMtPnN0YXRlLT5hY3RpdmUg JiYgY3J0Yy0+cHJpbWFyeS0+ZmIpCiAJCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfcHJpbWFy eV9wbGFuZShjcnRjLAogCQkJCQkJCSAgICAgICBjcnRjLT5wcmltYXJ5LT5mYiwKIAkJCQkJCQkg ICAgICAgY3J0Yy0+eCwKQEAgLTI5NzQsNyArMjk3Miw3IEBAIHZvaWQgaW50ZWxfcHJlcGFyZV9y ZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCSAqIGczMyBkb2NzIHNheSB3ZSBzaG91bGQg YXQgbGVhc3QgZGlzYWJsZSBhbGwgdGhlIHBsYW5lcy4KIAkgKi8KIAlmb3JfZWFjaF9pbnRlbF9j cnRjKGRldiwgY3J0YykgewotCQlpZiAoY3J0Yy0+YWN0aXZlKQorCQlpZiAoY3J0Yy0+YmFzZS5z dGF0ZS0+YWN0aXZlKQogCQkJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNhYmxlKCZjcnRjLT5i YXNlKTsKIAl9CiB9CkBAIC0zMTUwLDcgKzMxNDgsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9mZGlf bm9ybWFsX3RyYWluKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogc3RhdGljIGJvb2wgcGlwZV9o YXNfZW5hYmxlZF9wY2goc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7Ci0JcmV0dXJuIGNydGMt PmJhc2Uuc3RhdGUtPmVuYWJsZSAmJiBjcnRjLT5hY3RpdmUgJiYKKwlyZXR1cm4gY3J0Yy0+YmFz ZS5zdGF0ZS0+ZW5hYmxlICYmIGNydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSAmJgogCQljcnRjLT5j b25maWctPmhhc19wY2hfZW5jb2RlcjsKIH0KIApAQCAtNDMwNiw3ICs0MzA0LDcgQEAgc3RhdGlj IHZvaWQgaW50ZWxfY3J0Y19sb2FkX2x1dChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJYm9vbCBy ZWVuYWJsZV9pcHMgPSBmYWxzZTsKIAogCS8qIFRoZSBjbG9ja3MgaGF2ZSB0byBiZSBvbiB0byBs b2FkIHRoZSBwYWxldHRlLiAqLwotCWlmICghY3J0Yy0+c3RhdGUtPmVuYWJsZSB8fCAhaW50ZWxf Y3J0Yy0+YWN0aXZlKQorCWlmICghY3J0Yy0+c3RhdGUtPmVuYWJsZSB8fCAhaW50ZWxfY3J0Yy0+ YmFzZS5zdGF0ZS0+YWN0aXZlKQogCQlyZXR1cm47CiAKIAlpZiAoIUhBU19QQ0hfU1BMSVQoZGV2 X3ByaXYtPmRldikpIHsKQEAgLTQ0MjEsNyArNDQxOSw3IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtl X2NydGNfZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogCVdBUk5fT04oIWNydGMtPnN0 YXRlLT5lbmFibGUpOwogCi0JaWYgKGludGVsX2NydGMtPmFjdGl2ZSkKKwlpZiAoaW50ZWxfY3J0 Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlKQogCQlyZXR1cm47CiAKIAlpZiAoaW50ZWxfY3J0Yy0+Y29u ZmlnLT5oYXNfcGNoX2VuY29kZXIpCkBAIC00NDM5LDcgKzQ0MzcsNyBAQCBzdGF0aWMgdm9pZCBp cm9ubGFrZV9jcnRjX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlpcm9ubGFrZV9z ZXRfcGlwZWNvbmYoY3J0Yyk7CiAKLQlpbnRlbF9jcnRjLT5hY3RpdmUgPSB0cnVlOworCWludGVs X2NydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSA9IHRydWU7CiAKIAlpbnRlbF9zZXRfY3B1X2ZpZm9f dW5kZXJydW5fcmVwb3J0aW5nKGRldl9wcml2LCBwaXBlLCB0cnVlKTsKIAlpbnRlbF9zZXRfcGNo X2ZpZm9fdW5kZXJydW5fcmVwb3J0aW5nKGRldl9wcml2LCBwaXBlLCB0cnVlKTsKQEAgLTQ1MDQs NyArNDUwMiw3IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxfbW9kZV9zZXRfcGxhbmVzX3dvcmthcm91 bmQoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJLyogV2Ugd2FudCB0byBnZXQgdGhlIG90aGVy X2FjdGl2ZV9jcnRjIG9ubHkgaWYgdGhlcmUncyBvbmx5IDEgb3RoZXIKIAkgKiBhY3RpdmUgY3J0 Yy4gKi8KIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0Y19pdCkgewotCQlpZiAoIWNydGNf aXQtPmFjdGl2ZSB8fCBjcnRjX2l0ID09IGNydGMpCisJCWlmICghY3J0Y19pdC0+YmFzZS5zdGF0 ZS0+YWN0aXZlIHx8IGNydGNfaXQgPT0gY3J0YykKIAkJCWNvbnRpbnVlOwogCiAJCWlmIChvdGhl cl9hY3RpdmVfY3J0YykKQEAgLTQ1MjksNyArNDUyNyw3IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxf Y3J0Y19lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJV0FSTl9PTighY3J0Yy0+c3Rh dGUtPmVuYWJsZSk7CiAKLQlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKQorCWlmIChpbnRlbF9jcnRj LT5iYXNlLnN0YXRlLT5hY3RpdmUpCiAJCXJldHVybjsKIAogCWlmIChpbnRlbF9jcnRjX3RvX3No YXJlZF9kcGxsKGludGVsX2NydGMpKQpAQCAtNDU1NCw3ICs0NTUyLDcgQEAgc3RhdGljIHZvaWQg aGFzd2VsbF9jcnRjX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlpbnRlbF9zZXRf cGlwZV9jc2MoY3J0Yyk7CiAKLQlpbnRlbF9jcnRjLT5hY3RpdmUgPSB0cnVlOworCWludGVsX2Ny dGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSA9IHRydWU7CiAKIAlpbnRlbF9zZXRfY3B1X2ZpZm9fdW5k ZXJydW5fcmVwb3J0aW5nKGRldl9wcml2LCBwaXBlLCB0cnVlKTsKIAlmb3JfZWFjaF9lbmNvZGVy X29uX2NydGMoZGV2LCBjcnRjLCBlbmNvZGVyKQpAQCAtNDY0NSw3ICs0NjQzLDcgQEAgc3RhdGlj IHZvaWQgaXJvbmxha2VfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlpbnQg cGlwZSA9IGludGVsX2NydGMtPnBpcGU7CiAJdTMyIHJlZywgdGVtcDsKIAotCWlmICghaW50ZWxf Y3J0Yy0+YWN0aXZlKQorCWlmICghaW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlKQogCQly ZXR1cm47CiAKIAlpbnRlbF9jcnRjX2Rpc2FibGVfcGxhbmVzKGNydGMpOwpAQCAtNDY5Myw3ICs0 NjkxLDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0 YyAqY3J0YykKIAkJaXJvbmxha2VfZmRpX3BsbF9kaXNhYmxlKGludGVsX2NydGMpOwogCX0KIAot CWludGVsX2NydGMtPmFjdGl2ZSA9IGZhbHNlOworCWludGVsX2NydGMtPmJhc2Uuc3RhdGUtPmFj dGl2ZSA9IGZhbHNlOwogCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKGNydGMpOwogCiAJbXV0ZXhf bG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwpAQCAtNDcwOSw3ICs0NzA3LDcgQEAgc3RhdGljIHZv aWQgaGFzd2VsbF9jcnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXN0cnVjdCBp bnRlbF9lbmNvZGVyICplbmNvZGVyOwogCWVudW0gdHJhbnNjb2RlciBjcHVfdHJhbnNjb2RlciA9 IGludGVsX2NydGMtPmNvbmZpZy0+Y3B1X3RyYW5zY29kZXI7CiAKLQlpZiAoIWludGVsX2NydGMt PmFjdGl2ZSkKKwlpZiAoIWludGVsX2NydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSkKIAkJcmV0dXJu OwogCiAJaW50ZWxfY3J0Y19kaXNhYmxlX3BsYW5lcyhjcnRjKTsKQEAgLTQ3NDgsNyArNDc0Niw3 IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0 YykKIAkJaWYgKGVuY29kZXItPnBvc3RfZGlzYWJsZSkKIAkJCWVuY29kZXItPnBvc3RfZGlzYWJs ZShlbmNvZGVyKTsKIAotCWludGVsX2NydGMtPmFjdGl2ZSA9IGZhbHNlOworCWludGVsX2NydGMt PmJhc2Uuc3RhdGUtPmFjdGl2ZSA9IGZhbHNlOwogCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKGNy dGMpOwogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwpAQCAtNTEzNyw3ICs1MTM1 LDcgQEAgc3RhdGljIHZvaWQgdmFsbGV5dmlld19jcnRjX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMg KmNydGMpCiAKIAlXQVJOX09OKCFjcnRjLT5zdGF0ZS0+ZW5hYmxlKTsKIAotCWlmIChpbnRlbF9j cnRjLT5hY3RpdmUpCisJaWYgKGludGVsX2NydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSkKIAkJcmV0 dXJuOwogCiAJaXNfZHNpID0gaW50ZWxfcGlwZV9oYXNfdHlwZShpbnRlbF9jcnRjLCBJTlRFTF9P VVRQVVRfRFNJKTsKQEAgLTUxNjMsNyArNTE2MSw3IEBAIHN0YXRpYyB2b2lkIHZhbGxleXZpZXdf Y3J0Y19lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJaTl4eF9zZXRfcGlwZWNvbmYo aW50ZWxfY3J0Yyk7CiAKLQlpbnRlbF9jcnRjLT5hY3RpdmUgPSB0cnVlOworCWludGVsX2NydGMt PmJhc2Uuc3RhdGUtPmFjdGl2ZSA9IHRydWU7CiAKIAlpbnRlbF9zZXRfY3B1X2ZpZm9fdW5kZXJy dW5fcmVwb3J0aW5nKGRldl9wcml2LCBwaXBlLCB0cnVlKTsKIApAQCAtNTIyMCw3ICs1MjE4LDcg QEAgc3RhdGljIHZvaWQgaTl4eF9jcnRjX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAK IAlXQVJOX09OKCFjcnRjLT5zdGF0ZS0+ZW5hYmxlKTsKIAotCWlmIChpbnRlbF9jcnRjLT5hY3Rp dmUpCisJaWYgKGludGVsX2NydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSkKIAkJcmV0dXJuOwogCiAJ aTl4eF9zZXRfcGxsX2RpdmlkZXJzKGludGVsX2NydGMpOwpAQCAtNTIzMiw3ICs1MjMwLDcgQEAg c3RhdGljIHZvaWQgaTl4eF9jcnRjX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlp OXh4X3NldF9waXBlY29uZihpbnRlbF9jcnRjKTsKIAotCWludGVsX2NydGMtPmFjdGl2ZSA9IHRy dWU7CisJaW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlID0gdHJ1ZTsKIAogCWlmICghSVNf R0VOMihkZXYpKQogCQlpbnRlbF9zZXRfY3B1X2ZpZm9fdW5kZXJydW5fcmVwb3J0aW5nKGRldl9w cml2LCBwaXBlLCB0cnVlKTsKQEAgLTUyOTUsNyArNTI5Myw3IEBAIHN0YXRpYyB2b2lkIGk5eHhf Y3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlzdHJ1Y3QgaW50ZWxfZW5jb2Rl ciAqZW5jb2RlcjsKIAlpbnQgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CiAKLQlpZiAoIWludGVs X2NydGMtPmFjdGl2ZSkKKwlpZiAoIWludGVsX2NydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSkKIAkJ cmV0dXJuOwogCiAJLyoKQEAgLTUzNTMsNyArNTM1MSw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfY3J0 Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlpZiAoIUlTX0dFTjIoZGV2KSkKIAkJ aW50ZWxfc2V0X2NwdV9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXZfcHJpdiwgcGlwZSwgZmFs c2UpOwogCi0JaW50ZWxfY3J0Yy0+YWN0aXZlID0gZmFsc2U7CisJaW50ZWxfY3J0Yy0+YmFzZS5z dGF0ZS0+YWN0aXZlID0gZmFsc2U7CiAJaW50ZWxfdXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7CiAK IAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CkBAIC01Mzc1LDcgKzUzNzMsNyBAQCB2 b2lkIGludGVsX2NydGNfY29udHJvbChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIGJvb2wgZW5hYmxl KQogCXVuc2lnbmVkIGxvbmcgZG9tYWluczsKIAogCWlmIChlbmFibGUpIHsKLQkJaWYgKCFpbnRl bF9jcnRjLT5hY3RpdmUpIHsKKwkJaWYgKCFpbnRlbF9jcnRjLT5iYXNlLnN0YXRlLT5hY3RpdmUp IHsKIAkJCWRvbWFpbnMgPSBnZXRfY3J0Y19wb3dlcl9kb21haW5zKGNydGMpOwogCQkJZm9yX2Vh Y2hfcG93ZXJfZG9tYWluKGRvbWFpbiwgZG9tYWlucykKIAkJCQlpbnRlbF9kaXNwbGF5X3Bvd2Vy X2dldChkZXZfcHJpdiwgZG9tYWluKTsKQEAgLTUzODQsNyArNTM4Miw3IEBAIHZvaWQgaW50ZWxf Y3J0Y19jb250cm9sKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgYm9vbCBlbmFibGUpCiAJCQlkZXZf cHJpdi0+ZGlzcGxheS5jcnRjX2VuYWJsZShjcnRjKTsKIAkJfQogCX0gZWxzZSB7Ci0JCWlmIChp bnRlbF9jcnRjLT5hY3RpdmUpIHsKKwkJaWYgKGludGVsX2NydGMtPmJhc2Uuc3RhdGUtPmFjdGl2 ZSkgewogCQkJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNhYmxlKGNydGMpOwogCiAJCQlkb21h aW5zID0gaW50ZWxfY3J0Yy0+ZW5hYmxlZF9wb3dlcl9kb21haW5zOwpAQCAtNTQ5Nyw3ICs1NDk1 LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfY29ubmVjdG9yX2NoZWNrX3N0YXRlKHN0cnVjdCBpbnRl bF9jb25uZWN0b3IgKmNvbm5lY3RvcikKIAogCQkJSTkxNV9TVEFURV9XQVJOKCFjcnRjLT5zdGF0 ZS0+ZW5hYmxlLAogCQkJCQkiY3J0YyBub3QgZW5hYmxlZFxuIik7Ci0JCQlJOTE1X1NUQVRFX1dB Uk4oIXRvX2ludGVsX2NydGMoY3J0YyktPmFjdGl2ZSwgImNydGMgbm90IGFjdGl2ZVxuIik7CisJ CQlJOTE1X1NUQVRFX1dBUk4oIWNydGMtPnN0YXRlLT5hY3RpdmUsCisJCQkJCSJjcnRjIG5vdCBh Y3RpdmVcbiIpOwogCQkJSTkxNV9TVEFURV9XQVJOKHBpcGUgIT0gdG9faW50ZWxfY3J0YyhjcnRj KS0+cGlwZSwKIAkJCSAgICAgImVuY29kZXIgYWN0aXZlIG9uIHRoZSB3cm9uZyBwaXBlXG4iKTsK IAkJfQpAQCAtODAzMiw3ICs4MDMxLDggQEAgc3RhdGljIHZvaWQgYXNzZXJ0X2Nhbl9kaXNhYmxl X2xjcGxsKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YzsKIAogCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBjcnRjKQotCQlJOTE1X1NU QVRFX1dBUk4oY3J0Yy0+YWN0aXZlLCAiQ1JUQyBmb3IgcGlwZSAlYyBlbmFibGVkXG4iLAorCQlJ OTE1X1NUQVRFX1dBUk4oY3J0Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlLAorCQkJCSJDUlRDIGZvciBw aXBlICVjIGVuYWJsZWRcbiIsCiAJCSAgICAgcGlwZV9uYW1lKGNydGMtPnBpcGUpKTsKIAogCUk5 MTVfU1RBVEVfV0FSTihJOTE1X1JFQUQoSFNXX1BXUl9XRUxMX0RSSVZFUiksICJQb3dlciB3ZWxs IG9uXG4iKTsKQEAgLTEwODE2LDcgKzEwODE2LDcgQEAgc3RhdGljIHZvaWQgY2hlY2tfd21fc3Rh dGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJc3RydWN0IHNrbF9kZGJfZW50cnkgKmh3X2Vu dHJ5LCAqc3dfZW50cnk7CiAJCWNvbnN0IGVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlw ZTsKIAotCQlpZiAoIWludGVsX2NydGMtPmFjdGl2ZSkKKwkJaWYgKCFpbnRlbF9jcnRjLT5iYXNl LnN0YXRlLT5hY3RpdmUpCiAJCQljb250aW51ZTsKIAogCQkvKiBwbGFuZXMgKi8KQEAgLTEwOTQ1 LDcgKzEwOTQ1LDcgQEAgY2hlY2tfY3J0Y19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CQlEUk1fREVCVUdfS01TKCJbQ1JUQzolZF1cbiIsCiAJCQkgICAgICBjcnRjLT5iYXNlLmJhc2Uu aWQpOwogCi0JCUk5MTVfU1RBVEVfV0FSTihjcnRjLT5hY3RpdmUgJiYgIWNydGMtPmJhc2Uuc3Rh dGUtPmVuYWJsZSwKKwkJSTkxNV9TVEFURV9XQVJOKGNydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSAm JiAhY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlLAogCQkgICAgICJhY3RpdmUgY3J0YywgYnV0IG5v dCBlbmFibGVkIGluIHN3IHRyYWNraW5nXG4iKTsKIAogCQlmb3JfZWFjaF9pbnRlbF9lbmNvZGVy KGRldiwgZW5jb2RlcikgewpAQCAtMTA5NTYsOSArMTA5NTYsMTAgQEAgY2hlY2tfY3J0Y19zdGF0 ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJCWFjdGl2ZSA9IHRydWU7CiAJCX0KIAotCQlJ OTE1X1NUQVRFX1dBUk4oYWN0aXZlICE9IGNydGMtPmFjdGl2ZSwKKwkJSTkxNV9TVEFURV9XQVJO KGFjdGl2ZSAhPSBjcnRjLT5iYXNlLnN0YXRlLT5hY3RpdmUsCiAJCSAgICAgImNydGMncyBjb21w dXRlZCBhY3RpdmUgc3RhdGUgZG9lc24ndCBtYXRjaCB0cmFja2VkIGFjdGl2ZSBzdGF0ZSAiCi0J CSAgICAgIihleHBlY3RlZCAlaSwgZm91bmQgJWkpXG4iLCBhY3RpdmUsIGNydGMtPmFjdGl2ZSk7 CisJCSAgICAgIihleHBlY3RlZCAlaSwgZm91bmQgJWkpXG4iLCBhY3RpdmUsCisJCQkJY3J0Yy0+ YmFzZS5zdGF0ZS0+YWN0aXZlKTsKIAkJSTkxNV9TVEFURV9XQVJOKGVuYWJsZWQgIT0gY3J0Yy0+ YmFzZS5zdGF0ZS0+ZW5hYmxlLAogCQkgICAgICJjcnRjJ3MgY29tcHV0ZWQgZW5hYmxlZCBzdGF0 ZSBkb2Vzbid0IG1hdGNoIHRyYWNrZWQgZW5hYmxlZCBzdGF0ZSAiCiAJCSAgICAgIihleHBlY3Rl ZCAlaSwgZm91bmQgJWkpXG4iLCBlbmFibGVkLApAQCAtMTA5NzAsNyArMTA5NzEsNyBAQCBjaGVj a19jcnRjX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCS8qIGh3IHN0YXRlIGlzIGlu Y29uc2lzdGVudCB3aXRoIHRoZSBwaXBlIHF1aXJrICovCiAJCWlmICgoY3J0Yy0+cGlwZSA9PSBQ SVBFX0EgJiYgZGV2X3ByaXYtPnF1aXJrcyAmIFFVSVJLX1BJUEVBX0ZPUkNFKSB8fAogCQkgICAg KGNydGMtPnBpcGUgPT0gUElQRV9CICYmIGRldl9wcml2LT5xdWlya3MgJiBRVUlSS19QSVBFQl9G T1JDRSkpCi0JCQlhY3RpdmUgPSBjcnRjLT5hY3RpdmU7CisJCQlhY3RpdmUgPSBjcnRjLT5iYXNl LnN0YXRlLT5hY3RpdmU7CiAKIAkJZm9yX2VhY2hfaW50ZWxfZW5jb2RlcihkZXYsIGVuY29kZXIp IHsKIAkJCWVudW0gcGlwZSBwaXBlOwpAQCAtMTA5ODAsOSArMTA5ODEsMTAgQEAgY2hlY2tfY3J0 Y19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJCWVuY29kZXItPmdldF9jb25maWco ZW5jb2RlciwgJnBpcGVfY29uZmlnKTsKIAkJfQogCi0JCUk5MTVfU1RBVEVfV0FSTihjcnRjLT5h Y3RpdmUgIT0gYWN0aXZlLAorCQlJOTE1X1NUQVRFX1dBUk4oY3J0Yy0+YmFzZS5zdGF0ZS0+YWN0 aXZlICE9IGFjdGl2ZSwKIAkJICAgICAiY3J0YyBhY3RpdmUgc3RhdGUgZG9lc24ndCBtYXRjaCB3 aXRoIGh3IHN0YXRlICIKLQkJICAgICAiKGV4cGVjdGVkICVpLCBmb3VuZCAlaSlcbiIsIGNydGMt PmFjdGl2ZSwgYWN0aXZlKTsKKwkJICAgICAiKGV4cGVjdGVkICVpLCBmb3VuZCAlaSlcbiIsIGNy dGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSwKKwkJCQlhY3RpdmUpOwogCiAJCWlmIChhY3RpdmUgJiYK IAkJICAgICFpbnRlbF9waXBlX2NvbmZpZ19jb21wYXJlKGRldiwgY3J0Yy0+Y29uZmlnLCAmcGlw ZV9jb25maWcpKSB7CkBAIC0xMTAyOCw3ICsxMTAzMCw3IEBAIGNoZWNrX3NoYXJlZF9kcGxsX3N0 YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBj cnRjKSB7CiAJCQlpZiAoY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlICYmIGludGVsX2NydGNfdG9f c2hhcmVkX2RwbGwoY3J0YykgPT0gcGxsKQogCQkJCWVuYWJsZWRfY3J0Y3MrKzsKLQkJCWlmIChj cnRjLT5hY3RpdmUgJiYgaW50ZWxfY3J0Y190b19zaGFyZWRfZHBsbChjcnRjKSA9PSBwbGwpCisJ CQlpZiAoY3J0Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlICYmIGludGVsX2NydGNfdG9fc2hhcmVkX2Rw bGwoY3J0YykgPT0gcGxsKQogCQkJCWFjdGl2ZV9jcnRjcysrOwogCQl9CiAJCUk5MTVfU1RBVEVf V0FSTihwbGwtPmFjdGl2ZSAhPSBhY3RpdmVfY3J0Y3MsCkBAIC0xMTQ0OSwxMCArMTE0NTEsNyBA QCBpbnRlbF9zZXRfY29uZmlnX2NvbXB1dGVfbW9kZV9jaGFuZ2VzKHN0cnVjdCBkcm1fbW9kZV9z ZXQgKnNldCwKIAkJICogaW4gZmFzdGJvb3Qgc2l0dWF0aW9ucy4KIAkJICovCiAJCWlmIChzZXQt PmNydGMtPnByaW1hcnktPmZiID09IE5VTEwpIHsKLQkJCXN0cnVjdCBpbnRlbF9jcnRjICppbnRl bF9jcnRjID0KLQkJCQl0b19pbnRlbF9jcnRjKHNldC0+Y3J0Yyk7Ci0KLQkJCWlmIChpbnRlbF9j cnRjLT5hY3RpdmUpIHsKKwkJCWlmIChzZXQtPmNydGMtPnN0YXRlLT5hY3RpdmUpIHsKIAkJCQlE Uk1fREVCVUdfS01TKCJjcnRjIGhhcyBubyBmYiwgd2lsbCBmbGlwXG4iKTsKIAkJCQljb25maWct PmZiX2NoYW5nZWQgPSB0cnVlOwogCQkJfSBlbHNlIHsKQEAgLTExNzM4LDcgKzExNzM3LDcgQEAg c3RhdGljIGludCBpbnRlbF9jcnRjX3NldF9jb25maWcoc3RydWN0IGRybV9tb2RlX3NldCAqc2V0 KQogCQkgKiBoYXMgcHJldmlvdXNseSBiZWVuIHR1cm5lZCBvZmYuCiAJCSAqLwogCQlpZiAoIWlu dGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCAmJiByZXQgPT0gMCkgewotCQkJV0FSTl9PTighaW50 ZWxfY3J0Yy0+YWN0aXZlKTsKKwkJCVdBUk5fT04oIXNldC0+Y3J0Yy0+c3RhdGUtPmFjdGl2ZSk7 CiAJCQlpbnRlbF9lbmFibGVfcHJpbWFyeV9od19wbGFuZShzZXQtPmNydGMtPnByaW1hcnksIHNl dC0+Y3J0Yyk7CiAJCX0KIApAQCAtMTIwMDEsNyArMTIwMDAsNyBAQCBpbnRlbF9jaGVja19wcmlt YXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWlmIChyZXQpCiAJCXJldHVybiBy ZXQ7CiAKLQlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKSB7CisJaWYgKGNydGMtPnN0YXRlLT5hY3Rp dmUpIHsKIAkJaW50ZWxfY3J0Yy0+YXRvbWljLndhaXRfZm9yX2ZsaXBzID0gdHJ1ZTsKIAogCQkv KgpAQCAtMTIwNjgsNyArMTIwNjcsNyBAQCBpbnRlbF9jb21taXRfcHJpbWFyeV9wbGFuZShzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAogCWludGVsX3BsYW5lLT5vYmogPSBvYmo7CiAKLQlpZiAo aW50ZWxfY3J0Yy0+YWN0aXZlKSB7CisJaWYgKGNydGMtPnN0YXRlLT5hY3RpdmUpIHsKIAkJaWYg KHN0YXRlLT52aXNpYmxlKSB7CiAJCQkvKiBGSVhNRToga2lsbCB0aGlzIGZhc3Rib290IGhhY2sg Ki8KIAkJCWludGVsX3VwZGF0ZV9waXBlX3NpemUoaW50ZWxfY3J0Yyk7CkBAIC0xMjEzOCw3ICsx MjEzNyw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29tbWl0KHN0cnVjdCBkcm1f Y3J0YyAqY3J0YykKIAlpbnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7CiAKIAkvKiBQZXJm b3JtIHZibGFuayBldmFzaW9uIGFyb3VuZCBjb21taXQgb3BlcmF0aW9uICovCi0JaWYgKGludGVs X2NydGMtPmFjdGl2ZSkKKwlpZiAoaW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlKQogCQlp bnRlbF9jcnRjLT5hdG9taWMuZXZhZGUgPQogCQkJaW50ZWxfcGlwZV91cGRhdGVfc3RhcnQoaW50 ZWxfY3J0YywKIAkJCQkJCSZpbnRlbF9jcnRjLT5hdG9taWMuc3RhcnRfdmJsX2NvdW50KTsKQEAg LTEyMzEzLDcgKzEyMzEyLDcgQEAgaW50ZWxfY2hlY2tfY3Vyc29yX3BsYW5lKHN0cnVjdCBkcm1f cGxhbmUgKnBsYW5lLAogCX0KIAogZmluaXNoOgotCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpIHsK KwlpZiAoY3J0Yy0+c3RhdGUtPmFjdGl2ZSkgewogCQlpZiAoaW50ZWxfY3J0Yy0+YmFzZS5jdXJz b3ItPnN0YXRlLT5jcnRjX3cgIT0gc3RhdGUtPmJhc2UuY3J0Y193KQogCQkJaW50ZWxfY3J0Yy0+ YXRvbWljLnVwZGF0ZV93bSA9IHRydWU7CiAKQEAgLTEyMzU4LDcgKzEyMzU3LDcgQEAgaW50ZWxf Y29tbWl0X2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlpbnRlbF9jcnRj LT5jdXJzb3JfYm8gPSBvYmo7CiB1cGRhdGU6CiAKLQlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKQor CWlmIChjcnRjLT5zdGF0ZS0+YWN0aXZlKQogCQlpbnRlbF9jcnRjX3VwZGF0ZV9jdXJzb3IoY3J0 Yywgc3RhdGUtPnZpc2libGUpOwogfQogCkBAIC0xMzM5OSw3ICsxMzM5OCw3IEBAIHZvaWQgaW50 ZWxfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZHJtX21vZGVzZXRfdW5s b2NrX2FsbChkZXYpOwogCiAJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGNydGMpIHsKLQkJaWYg KCFjcnRjLT5hY3RpdmUpCisJCWlmICghY3J0Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlKQogCQkJY29u dGludWU7CiAKIAkJLyoKQEAgLTEzNDc3LDcgKzEzNDc2LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxf c2FuaXRpemVfY3J0YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAogCS8qIHJlc3RvcmUgdmJs YW5rIGludGVycnVwdHMgdG8gY29ycmVjdCBzdGF0ZSAqLwogCWRybV9jcnRjX3ZibGFua19yZXNl dCgmY3J0Yy0+YmFzZSk7Ci0JaWYgKGNydGMtPmFjdGl2ZSkgeworCWlmIChjcnRjLT5iYXNlLnN0 YXRlLT5hY3RpdmUpIHsKIAkJdXBkYXRlX3NjYW5saW5lX29mZnNldChjcnRjKTsKIAkJZHJtX2Ny dGNfdmJsYW5rX29uKCZjcnRjLT5iYXNlKTsKIAl9CkBAIC0xMzUxNywxMyArMTM1MTYsMTMgQEAg c3RhdGljIHZvaWQgaW50ZWxfc2FuaXRpemVfY3J0YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykK IAkJCQljb25uZWN0b3ItPmVuY29kZXItPmNvbm5lY3RvcnNfYWN0aXZlID0gZmFsc2U7CiAJCQl9 CiAKLQkJV0FSTl9PTihjcnRjLT5hY3RpdmUpOworCQlXQVJOX09OKGNydGMtPmJhc2Uuc3RhdGUt PmFjdGl2ZSk7CiAJCWNydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSA9IGZhbHNlOwogCQljcnRjLT5i YXNlLmVuYWJsZWQgPSBmYWxzZTsKIAl9CiAKIAlpZiAoZGV2X3ByaXYtPnF1aXJrcyAmIFFVSVJL X1BJUEVBX0ZPUkNFICYmCi0JICAgIGNydGMtPnBpcGUgPT0gUElQRV9BICYmICFjcnRjLT5hY3Rp dmUpIHsKKwkgICAgY3J0Yy0+cGlwZSA9PSBQSVBFX0EgJiYgIWNydGMtPmJhc2Uuc3RhdGUtPmFj dGl2ZSkgewogCQkvKiBCSU9TIGZvcmdvdCB0byBlbmFibGUgcGlwZSBBLCB0aGlzIG1vc3RseSBo YXBwZW5zIGFmdGVyCiAJCSAqIHJlc3VtZS4gRm9yY2UtZW5hYmxlIHRoZSBwaXBlIHRvIGZpeCB0 aGlzLCB0aGUgdXBkYXRlX2RwbXMKIAkJICogY2FsbCBiZWxvdyB3ZSByZXN0b3JlIHRoZSBwaXBl IHRvIHRoZSByaWdodCBzdGF0ZSwgYnV0IGxlYXZlCkBAIC0xMzUzNSw3ICsxMzUzNCw3IEBAIHN0 YXRpYyB2b2lkIGludGVsX3Nhbml0aXplX2NydGMoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJ ICogaGF2ZSBhY3RpdmUgY29ubmVjdG9ycy9lbmNvZGVycy4gKi8KIAlpbnRlbF9jcnRjX3VwZGF0 ZV9kcG1zKCZjcnRjLT5iYXNlKTsKIAotCWlmIChjcnRjLT5hY3RpdmUgIT0gY3J0Yy0+YmFzZS5z dGF0ZS0+ZW5hYmxlKSB7CisJaWYgKGNydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSAhPSBjcnRjLT5i YXNlLnN0YXRlLT5lbmFibGUpIHsKIAkJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXI7CiAK IAkJLyogVGhpcyBjYW4gaGFwcGVuIGVpdGhlciBkdWUgdG8gYnVncyBpbiB0aGUgZ2V0X2h3X3N0 YXRlCkBAIC0xMzU0NCwxNyArMTM1NDMsMTcgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2FuaXRpemVf Y3J0YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJRFJNX0RFQlVHX0tNUygiW0NSVEM6JWRd IGh3IHN0YXRlIGFkanVzdGVkLCB3YXMgJXMsIG5vdyAlc1xuIiwKIAkJCSAgICAgIGNydGMtPmJh c2UuYmFzZS5pZCwKIAkJCSAgICAgIGNydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSA/ICJlbmFibGVk IiA6ICJkaXNhYmxlZCIsCi0JCQkgICAgICBjcnRjLT5hY3RpdmUgPyAiZW5hYmxlZCIgOiAiZGlz YWJsZWQiKTsKKwkJCSAgICAgIGNydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSA/ICJlbmFibGVkIiA6 ICJkaXNhYmxlZCIpOwogCi0JCWNydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSA9IGNydGMtPmFjdGl2 ZTsKLQkJY3J0Yy0+YmFzZS5lbmFibGVkID0gY3J0Yy0+YWN0aXZlOworCQljcnRjLT5iYXNlLnN0 YXRlLT5lbmFibGUgPSBjcnRjLT5iYXNlLnN0YXRlLT5hY3RpdmU7CisJCWNydGMtPmJhc2UuZW5h YmxlZCA9IGNydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZTsKIAogCQkvKiBCZWNhdXNlIHdlIG9ubHkg ZXN0YWJsaXNoIHRoZSBjb25uZWN0b3IgLT4gZW5jb2RlciAtPgogCQkgKiBjcnRjIGxpbmtzIGlm IHNvbWV0aGluZyBpcyBhY3RpdmUsIHRoaXMgbWVhbnMgdGhlCiAJCSAqIGNydGMgaXMgbm93IGRl YWN0aXZhdGVkLiBCcmVhayB0aGUgbGlua3MuIGNvbm5lY3RvcgogCQkgKiAtPiBlbmNvZGVyIGxp bmtzIGFyZSBvbmx5IGVzdGFibGlzaCB3aGVuIHRoaW5ncyBhcmUKIAkJICogIGFjdHVhbGx5IHVw LCBoZW5jZSBubyBuZWVkIHRvIGJyZWFrIHRoZW0uICovCi0JCVdBUk5fT04oY3J0Yy0+YWN0aXZl KTsKKwkJV0FSTl9PTihjcnRjLT5iYXNlLnN0YXRlLT5hY3RpdmUpOwogCiAJCWZvcl9lYWNoX2Vu Y29kZXJfb25fY3J0YyhkZXYsICZjcnRjLT5iYXNlLCBlbmNvZGVyKSB7CiAJCQlXQVJOX09OKGVu Y29kZXItPmNvbm5lY3RvcnNfYWN0aXZlKTsKQEAgLTEzNTYyLDcgKzEzNTYxLDcgQEAgc3RhdGlj IHZvaWQgaW50ZWxfc2FuaXRpemVfY3J0YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJfQog CX0KIAotCWlmIChjcnRjLT5hY3RpdmUgfHwgSEFTX0dNQ0hfRElTUExBWShkZXYpKSB7CisJaWYg KGNydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSB8fCBIQVNfR01DSF9ESVNQTEFZKGRldikpIHsKIAkJ LyoKIAkJICogV2Ugc3RhcnQgb3V0IHdpdGggdW5kZXJydW4gcmVwb3J0aW5nIGRpc2FibGVkIHRv IGF2b2lkIHJhY2VzLgogCQkgKiBGb3IgY29ycmVjdCBib29ra2VlcGluZyBtYXJrIHRoaXMgb24g YWN0aXZlIGNydGNzLgpAQCAtMTM1OTAsNyArMTM1ODksNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9z YW5pdGl6ZV9lbmNvZGVyKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQogCSAqIGVuY29k ZXIgaXMgYWN0aXZlIGFuZCB0cnlpbmcgdG8gcmVhZCBmcm9tIGEgcGlwZSkgYW5kIHRoZQogCSAq IHBpcGUgaXRzZWxmIGJlaW5nIGFjdGl2ZS4gKi8KIAlib29sIGhhc19hY3RpdmVfY3J0YyA9IGVu Y29kZXItPmJhc2UuY3J0YyAmJgotCQl0b19pbnRlbF9jcnRjKGVuY29kZXItPmJhc2UuY3J0Yykt PmFjdGl2ZTsKKwkJZW5jb2Rlci0+YmFzZS5jcnRjLT5zdGF0ZS0+YWN0aXZlOwogCiAJaWYgKGVu Y29kZXItPmNvbm5lY3RvcnNfYWN0aXZlICYmICFoYXNfYWN0aXZlX2NydGMpIHsKIAkJRFJNX0RF QlVHX0tNUygiW0VOQ09ERVI6JWQ6JXNdIGhhcyBhY3RpdmUgY29ubmVjdG9ycyBidXQgbm8gYWN0 aXZlIHBpcGUhXG4iLApAQCAtMTM2NTgsNyArMTM2NTcsNyBAQCBzdGF0aWMgYm9vbCBwcmltYXJ5 X2dldF9od19zdGF0ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBjcnRjLT5iYXNlLmRldi0+ZGV2X3ByaXZhdGU7CiAKLQlp ZiAoIWNydGMtPmFjdGl2ZSkKKwlpZiAoIWNydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSkKIAkJcmV0 dXJuIGZhbHNlOwogCiAJcmV0dXJuIEk5MTVfUkVBRChEU1BDTlRSKGNydGMtPnBsYW5lKSkgJiBE SVNQTEFZX1BMQU5FX0VOQUJMRTsKQEAgLTEzNjc4LDE2ICsxMzY3NywxNiBAQCBzdGF0aWMgdm9p ZCBpbnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAogCQljcnRjLT5jb25maWctPnF1aXJrcyB8PSBQSVBFX0NPTkZJR19RVUlSS19JTkhFUklURURf TU9ERTsKIAotCQljcnRjLT5hY3RpdmUgPSBkZXZfcHJpdi0+ZGlzcGxheS5nZXRfcGlwZV9jb25m aWcoY3J0YywKKwkJY3J0Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlID0gZGV2X3ByaXYtPmRpc3BsYXku Z2V0X3BpcGVfY29uZmlnKGNydGMsCiAJCQkJCQkJCSBjcnRjLT5jb25maWcpOwogCi0JCWNydGMt PmJhc2Uuc3RhdGUtPmVuYWJsZSA9IGNydGMtPmFjdGl2ZTsKLQkJY3J0Yy0+YmFzZS5lbmFibGVk ID0gY3J0Yy0+YWN0aXZlOworCQljcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUgPSBjcnRjLT5iYXNl LnN0YXRlLT5hY3RpdmU7CisJCWNydGMtPmJhc2UuZW5hYmxlZCA9IGNydGMtPmJhc2Uuc3RhdGUt PmFjdGl2ZTsKIAkJY3J0Yy0+cHJpbWFyeV9lbmFibGVkID0gcHJpbWFyeV9nZXRfaHdfc3RhdGUo Y3J0Yyk7CiAKIAkJRFJNX0RFQlVHX0tNUygiW0NSVEM6JWRdIGh3IHN0YXRlIHJlYWRvdXQ6ICVz XG4iLAogCQkJICAgICAgY3J0Yy0+YmFzZS5iYXNlLmlkLAotCQkJICAgICAgY3J0Yy0+YWN0aXZl ID8gImVuYWJsZWQiIDogImRpc2FibGVkIik7CisJCQkgICAgICBjcnRjLT5iYXNlLnN0YXRlLT5h Y3RpdmUgPyAiZW5hYmxlZCIgOiAiZGlzYWJsZWQiKTsKIAl9CiAKIAlmb3IgKGkgPSAwOyBpIDwg ZGV2X3ByaXYtPm51bV9zaGFyZWRfZHBsbDsgaSsrKSB7CkBAIC0xMzY5OCw3ICsxMzY5Nyw3IEBA IHN0YXRpYyB2b2lkIGludGVsX21vZGVzZXRfcmVhZG91dF9od19zdGF0ZShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCQlwbGwtPmFjdGl2ZSA9IDA7CiAJCXBsbC0+Y29uZmlnLmNydGNfbWFzayA9 IDA7CiAJCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBjcnRjKSB7Ci0JCQlpZiAoY3J0Yy0+YWN0 aXZlICYmIGludGVsX2NydGNfdG9fc2hhcmVkX2RwbGwoY3J0YykgPT0gcGxsKSB7CisJCQlpZiAo Y3J0Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlICYmIGludGVsX2NydGNfdG9fc2hhcmVkX2RwbGwoY3J0 YykgPT0gcGxsKSB7CiAJCQkJcGxsLT5hY3RpdmUrKzsKIAkJCQlwbGwtPmNvbmZpZy5jcnRjX21h c2sgfD0gMSA8PCBjcnRjLT5waXBlOwogCQkJfQpAQCAtMTM3NjUsNyArMTM3NjQsNyBAQCB2b2lk IGludGVsX21vZGVzZXRfc2V0dXBfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkg KiBjaGVja2luZyBldmVyeXdoZXJlLgogCSAqLwogCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBj cnRjKSB7Ci0JCWlmIChjcnRjLT5hY3RpdmUgJiYgaTkxNS5mYXN0Ym9vdCkgeworCQlpZiAoY3J0 Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlICYmIGk5MTUuZmFzdGJvb3QpIHsKIAkJCWludGVsX21vZGVf ZnJvbV9waXBlX2NvbmZpZygmY3J0Yy0+YmFzZS5tb2RlLAogCQkJCQkJICAgIGNydGMtPmNvbmZp Zyk7CiAJCQlEUk1fREVCVUdfS01TKCJbQ1JUQzolZF0gZm91bmQgYWN0aXZlIG1vZGU6ICIsCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHAuYwppbmRleCAzM2Q1ODc3Li5lNGY0NDdmIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RwLmMKQEAgLTM5NzQsNyArMzk3NCw3IEBAIGludGVsX2RwX2NoZWNrX2xpbmtfc3Rh dHVzKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJaWYgKFdBUk5fT04oIWludGVsX2VuY29k ZXItPmJhc2UuY3J0YykpCiAJCXJldHVybjsKIAotCWlmICghdG9faW50ZWxfY3J0YyhpbnRlbF9l bmNvZGVyLT5iYXNlLmNydGMpLT5hY3RpdmUpCisJaWYgKCFpbnRlbF9lbmNvZGVyLT5iYXNlLmNy dGMtPnN0YXRlLT5hY3RpdmUpCiAJCXJldHVybjsKIAogCS8qIFRyeSB0byByZWFkIHJlY2VpdmVy IHN0YXR1cyBpZiB0aGUgbGluayBhcHBlYXJzIHRvIGJlIHVwICovCkBAIC00OTU1LDcgKzQ5NTUs NyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kcF9zZXRfZHJyc19zdGF0ZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCBpbnQgcmVmcmVzaF9yYXRlKQogCQlyZXR1cm47CiAJfQogCi0JaWYgKCFpbnRlbF9j cnRjLT5hY3RpdmUpIHsKKwlpZiAoIWludGVsX2NydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSkgewog CQlEUk1fREVCVUdfS01TKCJlRFAgZW5jb2RlciBkaXNhYmxlZC4gQ1JUQyBub3QgQWN0aXZlXG4i KTsKIAkJcmV0dXJuOwogCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggZmY3OWRjYS4u ZDE5NDk0OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTQ0MywxMiArNDQzLDYgQEAg c3RydWN0IGludGVsX2NydGMgewogCWVudW0gcGlwZSBwaXBlOwogCWVudW0gcGxhbmUgcGxhbmU7 CiAJdTggbHV0X3JbMjU2XSwgbHV0X2dbMjU2XSwgbHV0X2JbMjU2XTsKLQkvKgotCSAqIFdoZXRo ZXIgdGhlIGNydGMgYW5kIHRoZSBjb25uZWN0ZWQgb3V0cHV0IHBpcGVsaW5lIGlzIGFjdGl2ZS4g SW1wbGllcwotCSAqIHRoYXQgY3J0Yy0+ZW5hYmxlZCBpcyBzZXQsIGkuZS4gdGhlIGN1cnJlbnQg bW9kZSBjb25maWd1cmF0aW9uIGhhcwotCSAqIHNvbWUgb3V0cHV0cyBjb25uZWN0ZWQgdG8gdGhp cyBjcnRjLgotCSAqLwotCWJvb2wgYWN0aXZlOwogCXVuc2lnbmVkIGxvbmcgZW5hYmxlZF9wb3dl cl9kb21haW5zOwogCWJvb2wgcHJpbWFyeV9lbmFibGVkOyAvKiBpcyB0aGUgcHJpbWFyeSBwbGFu ZSAocGFydGlhbGx5KSB2aXNpYmxlPyAqLwogCWJvb2wgbG93ZnJlcV9hdmFpbDsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9mYmRldi5jCmluZGV4IDIzNGE2OTkuLjE5MmQyMjkgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZmJkZXYuYwpAQCAtNTQxLDcgKzU0MSw3IEBAIHN0YXRpYyBib29sIGludGVsX2Zi ZGV2X2luaXRfYmlvcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWZvcl9lYWNoX2NydGMoZGV2 LCBjcnRjKSB7CiAJCWludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCi0JCWlmICgh aW50ZWxfY3J0Yy0+YWN0aXZlIHx8ICFjcnRjLT5wcmltYXJ5LT5mYikgeworCQlpZiAoIWludGVs X2NydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSB8fCAhY3J0Yy0+cHJpbWFyeS0+ZmIpIHsKIAkJCURS TV9ERUJVR19LTVMoInBpcGUgJWMgbm90IGFjdGl2ZSBvciBubyBmYiwgc2tpcHBpbmdcbiIsCiAJ CQkJICAgICAgcGlwZV9uYW1lKGludGVsX2NydGMtPnBpcGUpKTsKIAkJCWNvbnRpbnVlOwpAQCAt NTY3LDcgKzU2Nyw3IEBAIHN0YXRpYyBib29sIGludGVsX2ZiZGV2X2luaXRfYmlvcyhzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogCiAJCWludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwog Ci0JCWlmICghaW50ZWxfY3J0Yy0+YWN0aXZlKSB7CisJCWlmICghaW50ZWxfY3J0Yy0+YmFzZS5z dGF0ZS0+YWN0aXZlKSB7CiAJCQlEUk1fREVCVUdfS01TKCJwaXBlICVjIG5vdCBhY3RpdmUsIHNr aXBwaW5nXG4iLAogCQkJCSAgICAgIHBpcGVfbmFtZShpbnRlbF9jcnRjLT5waXBlKSk7CiAJCQlj b250aW51ZTsKQEAgLTYzMiw3ICs2MzIsNyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9mYmRldl9pbml0 X2Jpb3Moc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlmb3JfZWFjaF9jcnRjKGRldiwgY3J0Yykg ewogCQlpbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAotCQlpZiAoIWludGVsX2Ny dGMtPmFjdGl2ZSkKKwkJaWYgKCFpbnRlbF9jcnRjLT5iYXNlLnN0YXRlLT5hY3RpdmUpCiAJCQlj b250aW51ZTsKIAogCQlXQVJOKCFjcnRjLT5wcmltYXJ5LT5mYiwKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX292ZXJsYXkuYwppbmRleCA4MjNkMWQ5Li4wNTBhNjhlIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9vdmVybGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfb3ZlcmxheS5jCkBAIC04NTIsNyArODUyLDcgQEAgaW50IGludGVsX292ZXJsYXlfc3dp dGNoX29mZihzdHJ1Y3QgaW50ZWxfb3ZlcmxheSAqb3ZlcmxheSkKIHN0YXRpYyBpbnQgY2hlY2tf b3ZlcmxheV9wb3NzaWJsZV9vbl9jcnRjKHN0cnVjdCBpbnRlbF9vdmVybGF5ICpvdmVybGF5LAog CQkJCQkgIHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewotCWlmICghY3J0Yy0+YWN0aXZlKQor CWlmICghY3J0Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlKQogCQlyZXR1cm4gLUVJTlZBTDsKIAogCS8q IGNhbid0IHVzZSB0aGUgb3ZlcmxheSB3aXRoIGRvdWJsZSB3aWRlIHBpcGUgKi8KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jCmluZGV4IDRmMDRmYWIuLmQ5YjExNWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cG0uYwpAQCAtODIyLDcgKzgyMiw3IEBAIHN0YXRpYyB1aW50OF90IHZsdl9jb21wdXRlX2RyYWlu X2xhdGVuY3koc3RydWN0IGRybV9jcnRjICpjcnRjLAogCSAqIEZJWE1FIHRoZSBwbGFuZSBtaWdo dCBoYXZlIGFuIGZiCiAJICogYnV0IGJlIGludmlzaWJsZSAoZWcuIGR1ZSB0byBjbGlwcGluZykK IAkgKi8KLQlpZiAoIWludGVsX2NydGMtPmFjdGl2ZSB8fCAhcGxhbmUtPnN0YXRlLT5mYikKKwlp ZiAoIWludGVsX2NydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSB8fCAhcGxhbmUtPnN0YXRlLT5mYikK IAkJcmV0dXJuIDA7CiAKIAlpZiAoV0FSTihjbG9jayA9PSAwLCAiUGl4ZWwgY2xvY2sgaXMgemVy byFcbiIpKQpAQCAtMzA4MCw3ICszMDgwLDcgQEAgc3RhdGljIHZvaWQgc2tsX2ZsdXNoX3dtX3Zh bHVlcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJICogcmUtYWxsb2NhdGUg dGhlIGZyZWVkIHNwYWNlIHdpdGhvdXQgdGhpcyBwaXBlIGZldGNoaW5nIGZyb20gaXQuCiAJICov CiAJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGNydGMpIHsKLQkJaWYgKCFjcnRjLT5hY3RpdmUp CisJCWlmICghY3J0Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlKQogCQkJY29udGludWU7CiAKIAkJcGlw ZSA9IGNydGMtPnBpcGU7CkBAIC0zMTAzLDcgKzMxMDMsNyBAQCBzdGF0aWMgdm9pZCBza2xfZmx1 c2hfd21fdmFsdWVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkgKiBzcGFj ZSBpcyBub3QgdXNlZCBhbnltb3JlLgogCSAqLwogCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBj cnRjKSB7Ci0JCWlmICghY3J0Yy0+YWN0aXZlKQorCQlpZiAoIWNydGMtPmJhc2Uuc3RhdGUtPmFj dGl2ZSkKIAkJCWNvbnRpbnVlOwogCiAJCXBpcGUgPSBjcnRjLT5waXBlOwpAQCAtMzEyNiw3ICsz MTI2LDcgQEAgc3RhdGljIHZvaWQgc2tsX2ZsdXNoX3dtX3ZhbHVlcyhzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCiAJICogd2lsbCBqdXN0IGdldCBtb3JlIEREQiBzcGFjZSB3aXRo IHRoZSBjb3JyZWN0IFdNIHZhbHVlcy4KIAkgKi8KIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwg Y3J0YykgewotCQlpZiAoIWNydGMtPmFjdGl2ZSkKKwkJaWYgKCFjcnRjLT5iYXNlLnN0YXRlLT5h Y3RpdmUpCiAJCQljb250aW51ZTsKIAogCQlwaXBlID0gY3J0Yy0+cGlwZTsKQEAgLTMxOTEsNyAr MzE5MSw3IEBAIHN0YXRpYyB2b2lkIHNrbF91cGRhdGVfb3RoZXJfcGlwZV93bShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCQlpZiAodGhpc19jcnRjLT5waXBlID09IGludGVsX2NydGMtPnBpcGUp CiAJCQljb250aW51ZTsKIAotCQlpZiAoIWludGVsX2NydGMtPmFjdGl2ZSkKKwkJaWYgKCFpbnRl bF9jcnRjLT5iYXNlLnN0YXRlLT5hY3RpdmUpCiAJCQljb250aW51ZTsKIAogCQl3bV9jaGFuZ2Vk ID0gc2tsX3VwZGF0ZV9waXBlX3dtKCZpbnRlbF9jcnRjLT5iYXNlLApkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9zcHJpdGUuYwppbmRleCA3MDUxZGE3Li43YWQ5YjdkIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9zcHJpdGUuYwpAQCAtMTI0Miw5ICsxMjQyLDkgQEAgZmluaXNoOgogCSAqLwogCXN0YXRl LT5oaWRlc19wcmltYXJ5ID0gZmIgIT0gTlVMTCAmJiBkcm1fcmVjdF9lcXVhbHMoZHN0LCBjbGlw KSAmJgogCQkhY29sb3JrZXlfZW5hYmxlZChpbnRlbF9wbGFuZSk7Ci0JV0FSTl9PTihzdGF0ZS0+ aGlkZXNfcHJpbWFyeSAmJiAhc3RhdGUtPnZpc2libGUgJiYgaW50ZWxfY3J0Yy0+YWN0aXZlKTsK KwlXQVJOX09OKHN0YXRlLT5oaWRlc19wcmltYXJ5ICYmICFzdGF0ZS0+dmlzaWJsZSAmJiBzdGF0 ZS0+YmFzZS5jcnRjLT5zdGF0ZS0+YWN0aXZlKTsKIAotCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUp IHsKKwlpZiAoaW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlKSB7CiAJCWlmIChpbnRlbF9j cnRjLT5wcmltYXJ5X2VuYWJsZWQgPT0gc3RhdGUtPmhpZGVzX3ByaW1hcnkpCiAJCQlpbnRlbF9j cnRjLT5hdG9taWMud2FpdF9mb3JfZmxpcHMgPSB0cnVlOwogCkBAIC0xMjg2LDcgKzEyODYsNyBA QCBpbnRlbF9jb21taXRfc3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXBs YW5lLT5mYiA9IHN0YXRlLT5iYXNlLmZiOwogCWludGVsX3BsYW5lLT5vYmogPSBvYmo7CiAKLQlp ZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKSB7CisJaWYgKGNydGMtPnN0YXRlLT5hY3RpdmUpIHsKIAkJ aW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkID0gIXN0YXRlLT5oaWRlc19wcmltYXJ5OwogCiAJ CWlmIChzdGF0ZS0+dmlzaWJsZSkgewotLSAKMS44LjUuMQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK