From: Matt Roper Subject: [PATCH 1/5] drm/i915: Refactor work that can sleep out of commit (v6) Date: Tue, 23 Dec 2014 10:41:49 -0800 Message-ID: <1419360113-10972-2-git-send-email-matthew.d.roper@intel.com> References: <1419360113-10972-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 8B2266E51C for ; Tue, 23 Dec 2014 10:43:20 -0800 (PST) In-Reply-To: <1419360113-10972-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 T25jZSB3ZSBpbnRlZ3JhdGUgb3VyIHdvcmsgaW50byB0aGUgYXRvbWljIHBpcGVsaW5lLCBwbGFu ZSBjb21taXQKb3BlcmF0aW9ucyB3aWxsIG5lZWQgdG8gaGFwcGVuIHdpdGggaW50ZXJydXB0cyBk aXNhYmxlZCwgZHVlIHRvIHZibGFuawpldmFzaW9uLiAgT3VyIGNvbW1pdCBmdW5jdGlvbnMgdG9k YXkgaW5jbHVkZSBzbGVlcGFibGUgd29yaywgc28gdGhvc2UKb3BlcmF0aW9ucyBuZWVkIHRvIGJl IHNwbGl0IG91dCBhbmQgcnVuIGVpdGhlciBiZWZvcmUgb3IgYWZ0ZXIgdGhlCmF0b21pYyByZWdp c3RlciBwcm9ncmFtbWluZy4KClRoZSBzb2x1dGlvbiBoZXJlIGNhbGN1bGF0ZXMgd2hpY2ggb2Yg dGhvc2Ugb3BlcmF0aW9ucyB3aWxsIG5lZWQgdG8gYmUKcGVyZm9ybWVkIGR1cmluZyB0aGUgJ2No ZWNrJyBwaGFzZSBhbmQgc2V0cyBmbGFncyBpbiBhbiBpbnRlbF9jcnRjCnN1Yi1zdHJ1Y3QuICBO ZXcgaW50ZWxfYmVnaW5fY3J0Y19jb21taXQoKSBhbmQKaW50ZWxfZmluaXNoX2NydGNfY29tbWl0 KCkgZnVuY3Rpb25zIGFyZSBhZGRlZCBiZWZvcmUgYW5kIGFmdGVyIHRoZQphY3R1YWwgcmVnaXN0 ZXIgcHJvZ3JhbW1pbmc7IHRoZXNlIHdpbGwgZXZlbnR1YWxseSBiZSBjYWxsZWQgZnJvbSB0aGUK YXRvbWljIHBsYW5lIGhlbHBlcidzIC5hdG9taWNfYmVnaW4oKSBhbmQgLmF0b21pY19lbmQoKSBl bnRyeXBvaW50cy4KCnYyOiBGaXggYnJva2VuIHNwcml0ZSBjb2RlIHNwbGl0Cgp2MzogTWFrZSB0 aGUgcHJlL3Bvc3QgY29tbWl0IHdvcmsgY3J0Yy1iYXNlZCB0byBtYXRjaCBob3cgd2UgZXZlbnR1 YWxseQogICAgd2FudCB0aGlzIHRvIGJlIGNhbGxlZCBmcm9tIHRoZSBhdG9taWMgcGxhbmUgaGVs cGVycy4KCnY0OiBTb21lIHBsYXRmb3JtcyB0aGF0IGhhdmVuJ3QgaGFkIHRoZWlyIHdhdGVybWFy ayBjb2RlIHJld29ya2VkIHdlcmUKICAgIHdhaXRpbmcgZm9yIHZibGFuaywgdGhlbiBjYWxsaW5n IHVwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyBpbiB0aGVpcgogICAgcGxhdGZvcm0tc3BlY2lmaWMg ZGlzYWJsZSBjb2RlLiAgVGhlc2UgYWxzbyBuZWVkIHRvIGJlIGZsYWdnZWQgb3V0CiAgICBvZiB0 aGUgY3JpdGljYWwgc2VjdGlvbi4KCnY1OiBTcHJpdGUgcGxhbmUgdGVzdCBmb3IgcHJpbWFyeSBz aG93L2hpZGUgc2hvdWxkIGp1c3Qgc2V0IHRoZSBmbGFnIHRvCiAgICB3YWl0IGZvciBwZW5kaW5n IGZsaXBzLCBub3QgYWN0dWFsbHkgcGVyZm9ybSB0aGUgd2FpdC4gIChBbmRlcikKCnY2OgogLSBS ZWJhc2Ugb250byBsYXRlc3QgZGktbmlnaHRseTsgcGlja3MgdXAgYW4gaW1wb3J0YW50IHJ1bnRp bWUgUE0gZml4LgogLSBIYW5kbGUgJ3dhaXRfZm9yX2ZsaXBzJyBmbGFnIGluIGludGVsX2JlZ2lu X2NydGNfY29tbWl0KCkuIChBbmRlcikKIC0gVXNlIHdhaXRfZm9yX2ZsaXBzIGZsYWcgZm9yIHBy aW1hcnkgcGxhbmUgdXBkYXRlIHJhdGhlciB0aGFuCiAgIHBlcmZvcm1pbmcgdGhlIHdhaXQgaW4g dGhlIGNoZWNrIHJvdXRpbmUuCiAtIEFkZGVkIGtlcm5lbGRvYyB0byBwcmVfZGlzYWJsZS9wb3N0 X2VuYWJsZSBmdW5jdGlvbnMgdGhhdCBhcmUgbm8KICAgbG9uZ2VyIHN0YXRpYy4gIChBbmRlcikK IC0gUmVwbGFjZSBhc3NlcnRfcGlwZV9lbmFibGVkKCkgaW4gaW50ZWxfZGlzYWJsZV9wcmltYXJ5 X2h3X3BsYW5lKCkKICAgd2l0aCBhbiBpbnRlbF9jcnRjLT5hY3RpdmUgdGVzdDsgaXQgdHVybnMg b3V0IGFzc2VydF9waXBlX2VuYWJsZWQoKQogICBncmFicyBzb21lIG11dGV4ZXMgYW5kIGNhbiBz bGVlcCwgd2hpY2ggd2UgY2FuJ3QgZG8gd2l0aCBpbnRlcnJ1cHRzCiAgIGRpc2FibGVkLgoKU2ln bmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAxOTkgKysrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAg ICB8ICAzMSArKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8ICA5 OCArKysrKysrKy0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAyMDkgaW5zZXJ0aW9ucygrKSwg MTE5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBh MDM5NTVkLi42YmQ0NGYzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0y MTY1LDcgKzIxNjUsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kaXNhYmxlX3ByaW1hcnlfaHdfcGxh bmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0 YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAKLQlhc3NlcnRfcGlwZV9lbmFibGVkKGRldl9wcml2 LCBpbnRlbF9jcnRjLT5waXBlKTsKKwlpZiAoV0FSTl9PTighaW50ZWxfY3J0Yy0+YWN0aXZlKSkK KwkJcmV0dXJuOwogCiAJaWYgKCFpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQpCiAJCXJldHVy bjsKQEAgLTExNzM3LDcgKzExNzM4LDExIEBAIHN0YXRpYyBpbnQKIGludGVsX2NoZWNrX3ByaW1h cnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkgIHN0cnVjdCBpbnRlbF9wbGFu ZV9zdGF0ZSAqc3RhdGUpCiB7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7 CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK IAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBzdGF0ZS0+YmFzZS5jcnRjOworCXN0cnVjdCBpbnRl bF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKKwlzdHJ1Y3QgaW50ZWxf cGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwogCXN0cnVjdCBkcm1f ZnJhbWVidWZmZXIgKmZiID0gc3RhdGUtPmJhc2UuZmI7CiAJc3RydWN0IGRybV9yZWN0ICpkZXN0 ID0gJnN0YXRlLT5kc3Q7CiAJc3RydWN0IGRybV9yZWN0ICpzcmMgPSAmc3RhdGUtPnNyYzsKQEAg LTExNzUyLDEwICsxMTc1Nyw0MCBAQCBpbnRlbF9jaGVja19wcmltYXJ5X3BsYW5lKHN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lLAogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlpbnRlbF9jcnRj X3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMoY3J0Yyk7Ci0JaWYgKGludGVsX2NydGNfaGFzX3BlbmRp bmdfZmxpcChjcnRjKSkgewotCQlEUk1fRVJST1IoInBpcGUgaXMgc3RpbGwgYnVzeSB3aXRoIGFu IG9sZCBwYWdlZmxpcFxuIik7Ci0JCXJldHVybiAtRUJVU1k7CisJaWYgKGludGVsX2NydGMtPmFj dGl2ZSkgeworCQlpbnRlbF9jcnRjLT5hdG9taWMud2FpdF9mb3JfZmxpcHMgPSB0cnVlOworCisJ CS8qCisJCSAqIEZCQyBkb2VzIG5vdCB3b3JrIG9uIHNvbWUgcGxhdGZvcm1zIGZvciByb3RhdGVk CisJCSAqIHBsYW5lcywgc28gZGlzYWJsZSBpdCB3aGVuIHJvdGF0aW9uIGlzIG5vdCAwIGFuZAor CQkgKiB1cGRhdGUgaXQgd2hlbiByb3RhdGlvbiBpcyBzZXQgYmFjayB0byAwLgorCQkgKgorCQkg KiBGSVhNRTogVGhpcyBpcyByZWR1bmRhbnQgd2l0aCB0aGUgZmJjIHVwZGF0ZSBkb25lIGluCisJ CSAqIHRoZSBwcmltYXJ5IHBsYW5lIGVuYWJsZSBmdW5jdGlvbiBleGNlcHQgdGhhdCB0aGF0CisJ CSAqIG9uZSBpcyBkb25lIHRvbyBsYXRlLiBXZSBldmVudHVhbGx5IG5lZWQgdG8gdW5pZnkKKwkJ ICogdGhpcy4KKwkJICovCisJCWlmIChpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgJiYKKwkJ ICAgIElOVEVMX0lORk8oZGV2KS0+Z2VuIDw9IDQgJiYgIUlTX0c0WChkZXYpICYmCisJCSAgICBk ZXZfcHJpdi0+ZmJjLnBsYW5lID09IGludGVsX2NydGMtPnBsYW5lICYmCisJCSAgICBpbnRlbF9w bGFuZS0+cm90YXRpb24gIT0gQklUKERSTV9ST1RBVEVfMCkpIHsKKwkJCWludGVsX2NydGMtPmF0 b21pYy5kaXNhYmxlX2ZiYyA9IHRydWU7CisJCX0KKworCQlpZiAoc3RhdGUtPnZpc2libGUpIHsK KwkJCS8qCisJCQkgKiBCRFcgc2lnbmFscyBmbGlwIGRvbmUgaW1tZWRpYXRlbHkgaWYgdGhlIHBs YW5lCisJCQkgKiBpcyBkaXNhYmxlZCwgZXZlbiBpZiB0aGUgcGxhbmUgZW5hYmxlIGlzIGFscmVh ZHkKKwkJCSAqIGFybWVkIHRvIG9jY3VyIGF0IHRoZSBuZXh0IHZibGFuayA6KAorCQkJICovCisJ CQlpZiAoSVNfQlJPQURXRUxMKGRldikgJiYgIWludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCkK KwkJCQlpbnRlbF9jcnRjLT5hdG9taWMud2FpdF92YmxhbmsgPSB0cnVlOworCQl9CisKKwkJaW50 ZWxfY3J0Yy0+YXRvbWljLmZiX2JpdHMgfD0KKwkJCUlOVEVMX0ZST05UQlVGRkVSX1BSSU1BUlko aW50ZWxfY3J0Yy0+cGlwZSk7CisKKwkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV9mYmMgPSB0 cnVlOwogCX0KIAogCXJldHVybiAwOwpAQCAtMTE3NzMsMTggKzExODA4LDYgQEAgaW50ZWxfY29t bWl0X3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29iaihmYik7CiAJc3RydWN0IGludGVsX3Bs YW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKIAlzdHJ1Y3QgZHJtX3Jl Y3QgKnNyYyA9ICZzdGF0ZS0+c3JjOwotCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfcGxhbmUtPnBp cGU7Ci0KLQlpZiAoIWZiKSB7Ci0JCS8qCi0JCSAqICdwcmVwYXJlJyBpcyBuZXZlciBjYWxsZWQg d2hlbiBwbGFuZSBpcyBiZWluZyBkaXNhYmxlZCwgc28KLQkJICogd2UgbmVlZCB0byBoYW5kbGUg ZnJvbnRidWZmZXIgdHJhY2tpbmcgaGVyZQotCQkgKi8KLQkJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1 Y3RfbXV0ZXgpOwotCQlpOTE1X2dlbV90cmFja19mYihpbnRlbF9mYl9vYmoocGxhbmUtPmZiKSwg TlVMTCwKLQkJCQkgIElOVEVMX0ZST05UQlVGRkVSX1BSSU1BUlkocGlwZSkpOwotCQltdXRleF91 bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQl9CiAKIAlwbGFuZS0+ZmIgPSBmYjsKIAljcnRj LT54ID0gc3JjLT54MSA+PiAxNjsKQEAgLTExODAxLDI2ICsxMTgyNCw3IEBAIGludGVsX2NvbW1p dF9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWludGVsX3BsYW5lLT5v YmogPSBvYmo7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKSB7Ci0JCS8qCi0JCSAqIEZCQyBk b2VzIG5vdCB3b3JrIG9uIHNvbWUgcGxhdGZvcm1zIGZvciByb3RhdGVkCi0JCSAqIHBsYW5lcywg c28gZGlzYWJsZSBpdCB3aGVuIHJvdGF0aW9uIGlzIG5vdCAwIGFuZAotCQkgKiB1cGRhdGUgaXQg d2hlbiByb3RhdGlvbiBpcyBzZXQgYmFjayB0byAwLgotCQkgKgotCQkgKiBGSVhNRTogVGhpcyBp cyByZWR1bmRhbnQgd2l0aCB0aGUgZmJjIHVwZGF0ZSBkb25lIGluCi0JCSAqIHRoZSBwcmltYXJ5 IHBsYW5lIGVuYWJsZSBmdW5jdGlvbiBleGNlcHQgdGhhdCB0aGF0Ci0JCSAqIG9uZSBpcyBkb25l IHRvbyBsYXRlLiBXZSBldmVudHVhbGx5IG5lZWQgdG8gdW5pZnkKLQkJICogdGhpcy4KLQkJICov Ci0JCWlmIChpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgJiYKLQkJICAgIElOVEVMX0lORk8o ZGV2KS0+Z2VuIDw9IDQgJiYgIUlTX0c0WChkZXYpICYmCi0JCSAgICBkZXZfcHJpdi0+ZmJjLnBs YW5lID09IGludGVsX2NydGMtPnBsYW5lICYmCi0JCSAgICBpbnRlbF9wbGFuZS0+cm90YXRpb24g IT0gQklUKERSTV9ST1RBVEVfMCkpIHsKLQkJCWludGVsX2ZiY19kaXNhYmxlKGRldik7Ci0JCX0K LQogCQlpZiAoc3RhdGUtPnZpc2libGUpIHsKLQkJCWJvb2wgd2FzX2VuYWJsZWQgPSBpbnRlbF9j cnRjLT5wcmltYXJ5X2VuYWJsZWQ7Ci0KIAkJCS8qIEZJWE1FOiBraWxsIHRoaXMgZmFzdGJvb3Qg aGFjayAqLwogCQkJaW50ZWxfdXBkYXRlX3BpcGVfc2l6ZShpbnRlbF9jcnRjKTsKIApAQCAtMTE4 MjgsMTQgKzExODMyLDYgQEAgaW50ZWxfY29tbWl0X3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9w bGFuZSAqcGxhbmUsCiAKIAkJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9wcmltYXJ5X3BsYW5l KGNydGMsIHBsYW5lLT5mYiwKIAkJCQkJY3J0Yy0+eCwgY3J0Yy0+eSk7Ci0KLQkJCS8qCi0JCQkg KiBCRFcgc2lnbmFscyBmbGlwIGRvbmUgaW1tZWRpYXRlbHkgaWYgdGhlIHBsYW5lCi0JCQkgKiBp cyBkaXNhYmxlZCwgZXZlbiBpZiB0aGUgcGxhbmUgZW5hYmxlIGlzIGFscmVhZHkKLQkJCSAqIGFy bWVkIHRvIG9jY3VyIGF0IHRoZSBuZXh0IHZibGFuayA6KAotCQkJICovCi0JCQlpZiAoSVNfQlJP QURXRUxMKGRldikgJiYgIXdhc19lbmFibGVkKQotCQkJCWludGVsX3dhaXRfZm9yX3ZibGFuayhk ZXYsIGludGVsX2NydGMtPnBpcGUpOwogCQl9IGVsc2UgewogCQkJLyoKIAkJCSAqIElmIGNsaXBw aW5nIHJlc3VsdHMgaW4gYSBub24tdmlzaWJsZSBwcmltYXJ5IHBsYW5lLApAQCAtMTE4NDYsMTMg KzExODQyLDU5IEBAIGludGVsX2NvbW1pdF9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lLAogCQkJICovCiAJCQlpbnRlbF9kaXNhYmxlX3ByaW1hcnlfaHdfcGxhbmUocGxhbmUs IGNydGMpOwogCQl9CisJfQorfQorCitzdGF0aWMgdm9pZCBpbnRlbF9iZWdpbl9jcnRjX2NvbW1p dChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCit7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNy dGMtPmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9w cml2YXRlOworCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0Yyhj cnRjKTsKIAotCQlpbnRlbF9mcm9udGJ1ZmZlcl9mbGlwKGRldiwgSU5URUxfRlJPTlRCVUZGRVJf UFJJTUFSWShwaXBlKSk7CisJaWYgKGludGVsX2NydGMtPmF0b21pYy53YWl0X2Zvcl9mbGlwcykK KwkJaW50ZWxfY3J0Y193YWl0X2Zvcl9wZW5kaW5nX2ZsaXBzKGNydGMpOwogCisJaWYgKGludGVs X2NydGMtPmF0b21pYy5kaXNhYmxlX2ZiYykKKwkJaW50ZWxfZmJjX2Rpc2FibGUoZGV2KTsKKwor CWlmIChpbnRlbF9jcnRjLT5hdG9taWMucHJlX2Rpc2FibGVfcHJpbWFyeSkKKwkJaW50ZWxfcHJl X2Rpc2FibGVfcHJpbWFyeShjcnRjKTsKKworCWlmIChpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRl X3dtKQorCQlpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhjcnRjKTsKKworCWludGVsX3J1bnRpbWVf cG1fZ2V0KGRldl9wcml2KTsKK30KKworc3RhdGljIHZvaWQgaW50ZWxfZmluaXNoX2NydGNfY29t bWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3sKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g Y3J0Yy0+ZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2 X3ByaXZhdGU7CisJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRj KGNydGMpOworCXN0cnVjdCBkcm1fcGxhbmUgKnA7CisKKwlpbnRlbF9ydW50aW1lX3BtX3B1dChk ZXZfcHJpdik7CisKKwlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLndhaXRfdmJsYW5rKQorCQlpbnRl bF93YWl0X2Zvcl92YmxhbmsoZGV2LCBpbnRlbF9jcnRjLT5waXBlKTsKKworCWludGVsX2Zyb250 YnVmZmVyX2ZsaXAoZGV2LCBpbnRlbF9jcnRjLT5hdG9taWMuZmJfYml0cyk7CisKKwlpZiAoaW50 ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV9mYmMpIHsKIAkJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3Rf bXV0ZXgpOwogCQlpbnRlbF9mYmNfdXBkYXRlKGRldik7CiAJCW11dGV4X3VubG9jaygmZGV2LT5z dHJ1Y3RfbXV0ZXgpOwogCX0KKworCWlmIChpbnRlbF9jcnRjLT5hdG9taWMucG9zdF9lbmFibGVf cHJpbWFyeSkKKwkJaW50ZWxfcG9zdF9lbmFibGVfcHJpbWFyeShjcnRjKTsKKworCWRybV9mb3Jf ZWFjaF9sZWdhY3lfcGxhbmUocCwgJmRldi0+bW9kZV9jb25maWcucGxhbmVfbGlzdCkKKwkJaWYg KGludGVsX2NydGMtPmF0b21pYy51cGRhdGVfc3ByaXRlX3dhdGVybWFya3MgJiBkcm1fcGxhbmVf aW5kZXgocCkpCisJCQlpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3MocCwgY3J0YywgMCwg MCwgMCwKKwkJCQkJCSAgICAgICBmYWxzZSwgZmFsc2UpOworCisJbWVtc2V0KCZpbnRlbF9jcnRj LT5hdG9taWMsIDAsIHNpemVvZihpbnRlbF9jcnRjLT5hdG9taWMpKTsKIH0KIAogaW50CkBAIC0x MTg2Myw5ICsxMTkwNSw4IEBAIGludGVsX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkgICB1aW50MzJfdCBzcmNfdywgdWludDMy X3Qgc3JjX2gpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7Ci0Jc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1 Y3QgZHJtX2ZyYW1lYnVmZmVyICpvbGRfZmIgPSBwbGFuZS0+ZmI7Ci0Jc3RydWN0IGludGVsX3Bs YW5lX3N0YXRlIHN0YXRlOworCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSBzdGF0ZSA9IHt7IDAg fX07CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBs YW5lKTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0 Yyk7CiAJaW50IHJldDsKQEAgLTExOTAzLDkgKzExOTQ0LDMzIEBAIGludGVsX3VwZGF0ZV9wbGFu ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJcmV0 dXJuIHJldDsKIAl9CiAKLQlpbnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7CisJaWYgKCFz dGF0ZS5iYXNlLmZiKSB7CisJCXVuc2lnbmVkIGZiX2JpdHMgPSAwOworCisJCXN3aXRjaCAocGxh bmUtPnR5cGUpIHsKKwkJY2FzZSBEUk1fUExBTkVfVFlQRV9QUklNQVJZOgorCQkJZmJfYml0cyA9 IElOVEVMX0ZST05UQlVGRkVSX1BSSU1BUlkoaW50ZWxfcGxhbmUtPnBpcGUpOworCQkJYnJlYWs7 CisJCWNhc2UgRFJNX1BMQU5FX1RZUEVfQ1VSU09SOgorCQkJZmJfYml0cyA9IElOVEVMX0ZST05U QlVGRkVSX0NVUlNPUihpbnRlbF9wbGFuZS0+cGlwZSk7CisJCQlicmVhazsKKwkJY2FzZSBEUk1f UExBTkVfVFlQRV9PVkVSTEFZOgorCQkJZmJfYml0cyA9IElOVEVMX0ZST05UQlVGRkVSX1NQUklU RShpbnRlbF9wbGFuZS0+cGlwZSk7CisJCQlicmVhazsKKwkJfQorCisJCS8qCisJCSAqICdwcmVw YXJlJyBpcyBuZXZlciBjYWxsZWQgd2hlbiBwbGFuZSBpcyBiZWluZyBkaXNhYmxlZCwgc28KKwkJ ICogd2UgbmVlZCB0byBoYW5kbGUgZnJvbnRidWZmZXIgdHJhY2tpbmcgaGVyZQorCQkgKi8KKwkJ bXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCQlpOTE1X2dlbV90cmFja19mYihpbnRl bF9mYl9vYmoocGxhbmUtPmZiKSwgTlVMTCwgZmJfYml0cyk7CisJCW11dGV4X3VubG9jaygmZGV2 LT5zdHJ1Y3RfbXV0ZXgpOworCX0KKworCWludGVsX2JlZ2luX2NydGNfY29tbWl0KGNydGMpOwog CWludGVsX3BsYW5lLT5jb21taXRfcGxhbmUocGxhbmUsICZzdGF0ZSk7Ci0JaW50ZWxfcnVudGlt ZV9wbV9wdXQoZGV2X3ByaXYpOworCWludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdChjcnRjKTsKIAog CWlmIChmYiAhPSBvbGRfZmIgJiYgb2xkX2ZiKSB7CiAJCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUp CkBAIC0xMjAxMiw2ICsxMjA3Nyw3IEBAIGludGVsX2NoZWNrX2N1cnNvcl9wbGFuZShzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwKIAlzdHJ1Y3QgZHJtX3JlY3QgKnNyYyA9ICZzdGF0ZS0+c3JjOwog CWNvbnN0IHN0cnVjdCBkcm1fcmVjdCAqY2xpcCA9ICZzdGF0ZS0+Y2xpcDsKIAlzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKKwlzdHJ1Y3QgaW50ZWxf Y3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJaW50IGNydGNfdywgY3J0 Y19oOwogCXVuc2lnbmVkIHN0cmlkZTsKIAlpbnQgcmV0OwpAQCAtMTIwMjcsNyArMTIwOTMsNyBA QCBpbnRlbF9jaGVja19jdXJzb3JfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAKIAkv KiBpZiB3ZSB3YW50IHRvIHR1cm4gb2ZmIHRoZSBjdXJzb3IgaWdub3JlIHdpZHRoIGFuZCBoZWln aHQgKi8KIAlpZiAoIW9iaikKLQkJcmV0dXJuIDA7CisJCWdvdG8gZmluaXNoOwogCiAJLyogQ2hl Y2sgZm9yIHdoaWNoIGN1cnNvciB0eXBlcyB3ZSBzdXBwb3J0ICovCiAJY3J0Y193ID0gZHJtX3Jl Y3Rfd2lkdGgoJnN0YXRlLT5vcmlnX2RzdCk7CkBAIC0xMjA1NCw2ICsxMjEyMCwxNiBAQCBpbnRl bF9jaGVja19jdXJzb3JfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJfQogCW11dGV4 X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCitmaW5pc2g6CisJaWYgKGludGVsX2NydGMt PmFjdGl2ZSkgeworCQlpZiAoaW50ZWxfY3J0Yy0+Y3Vyc29yX3dpZHRoICE9CisJCSAgICBkcm1f cmVjdF93aWR0aCgmc3RhdGUtPm9yaWdfZHN0KSkKKwkJCWludGVsX2NydGMtPmF0b21pYy51cGRh dGVfd20gPSB0cnVlOworCisJCWludGVsX2NydGMtPmF0b21pYy5mYl9iaXRzIHw9CisJCQlJTlRF TF9GUk9OVEJVRkZFUl9DVVJTT1IoaW50ZWxfY3J0Yy0+cGlwZSk7CisJfQorCiAJcmV0dXJuIHJl dDsKIH0KIApAQCAtMTIwNjYsOSArMTIxNDIsNiBAQCBpbnRlbF9jb21taXRfY3Vyc29yX3BsYW5l KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRj ID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5l ID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpv YmogPSBpbnRlbF9mYl9vYmooc3RhdGUtPmJhc2UuZmIpOwotCXN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvbGRfb2JqID0gaW50ZWxfZmJfb2JqKHBsYW5lLT5mYik7Ci0JZW51bSBwaXBlIHBp cGUgPSBpbnRlbF9jcnRjLT5waXBlOwotCXVuc2lnbmVkIG9sZF93aWR0aDsKIAl1aW50MzJfdCBh ZGRyOwogCiAJcGxhbmUtPmZiID0gc3RhdGUtPmJhc2UuZmI7CkBAIC0xMjA4OCwxNyArMTIxNjEs NiBAQCBpbnRlbF9jb21taXRfY3Vyc29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAog CWlmIChpbnRlbF9jcnRjLT5jdXJzb3JfYm8gPT0gb2JqKQogCQlnb3RvIHVwZGF0ZTsKIAotCS8q Ci0JICogJ3ByZXBhcmUnIGlzIG9ubHkgY2FsbGVkIHdoZW4gZmIgIT0gTlVMTDsgd2Ugc3RpbGwg bmVlZCB0byB1cGRhdGUKLQkgKiBmcm9udGJ1ZmZlciB0cmFja2luZyBmb3IgdGhlICdkaXNhYmxl JyBjYXNlIGhlcmUuCi0JICovCi0JaWYgKCFvYmopIHsKLQkJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1 Y3RfbXV0ZXgpOwotCQlpOTE1X2dlbV90cmFja19mYihvbGRfb2JqLCBOVUxMLAotCQkJCSAgSU5U RUxfRlJPTlRCVUZGRVJfQ1VSU09SKHBpcGUpKTsKLQkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVj dF9tdXRleCk7Ci0JfQotCiAJaWYgKCFvYmopCiAJCWFkZHIgPSAwOwogCWVsc2UgaWYgKCFJTlRF TF9JTkZPKGRldiktPmN1cnNvcl9uZWVkc19waHlzaWNhbCkKQEAgLTEyMTA5LDE4ICsxMjE3MSwx MSBAQCBpbnRlbF9jb21taXRfY3Vyc29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAog CWludGVsX2NydGMtPmN1cnNvcl9hZGRyID0gYWRkcjsKIAlpbnRlbF9jcnRjLT5jdXJzb3JfYm8g PSBvYmo7CiB1cGRhdGU6Ci0Jb2xkX3dpZHRoID0gaW50ZWxfY3J0Yy0+Y3Vyc29yX3dpZHRoOwot CiAJaW50ZWxfY3J0Yy0+Y3Vyc29yX3dpZHRoID0gZHJtX3JlY3Rfd2lkdGgoJnN0YXRlLT5vcmln X2RzdCk7CiAJaW50ZWxfY3J0Yy0+Y3Vyc29yX2hlaWdodCA9IGRybV9yZWN0X2hlaWdodCgmc3Rh dGUtPm9yaWdfZHN0KTsKIAotCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpIHsKLQkJaWYgKG9sZF93 aWR0aCAhPSBpbnRlbF9jcnRjLT5jdXJzb3Jfd2lkdGgpCi0JCQlpbnRlbF91cGRhdGVfd2F0ZXJt YXJrcyhjcnRjKTsKKwlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKQogCQlpbnRlbF9jcnRjX3VwZGF0 ZV9jdXJzb3IoY3J0Yywgc3RhdGUtPnZpc2libGUpOwotCi0JCWludGVsX2Zyb250YnVmZmVyX2Zs aXAoZGV2LCBJTlRFTF9GUk9OVEJVRkZFUl9DVVJTT1IocGlwZSkpOwotCX0KIH0KIAogc3RhdGlj IGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3MgaW50ZWxfY3Vyc29yX3BsYW5lX2Z1bmNzID0g ewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA1ODhiNjE4Li5hMDNiZDcyIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMjUxLDYgKzI1MSwxMiBAQCBzdHJ1Y3QgaW50ZWxfcGxh bmVfc3RhdGUgewogCXN0cnVjdCBkcm1fcmVjdCBvcmlnX3NyYzsKIAlzdHJ1Y3QgZHJtX3JlY3Qg b3JpZ19kc3Q7CiAJYm9vbCB2aXNpYmxlOworCisJLyoKKwkgKiB1c2VkIG9ubHkgZm9yIHNwcml0 ZSBwbGFuZXMgdG8gZGV0ZXJtaW5lIHdoZW4gdG8gaW1wbGljaXRseQorCSAqIGVuYWJsZS9kaXNh YmxlIHRoZSBwcmltYXJ5IHBsYW5lCisJICovCisJYm9vbCBoaWRlc19wcmltYXJ5OwogfTsKIAog c3RydWN0IGludGVsX3BsYW5lX2NvbmZpZyB7CkBAIC00MTUsNiArNDIxLDI3IEBAIHN0cnVjdCBz a2xfcGlwZV93bSB7CiAJdWludDMyX3QgbGluZXRpbWU7CiB9OwogCisvKgorICogVHJhY2tpbmcg b2Ygb3BlcmF0aW9ucyB0aGF0IG5lZWQgdG8gYmUgcGVyZm9ybWVkIGF0IHRoZSBiZWdpbm5pbmcv ZW5kIG9mIGFuCisgKiBhdG9taWMgY29tbWl0LCBvdXRzaWRlIHRoZSBhdG9taWMgc2VjdGlvbiB3 aGVyZSBpbnRlcnJ1cHRzIGFyZSBkaXNhYmxlZC4KKyAqIFRoZXNlIGFyZSBnZW5lcmFsbHkgb3Bl cmF0aW9ucyB0aGF0IGdyYWIgbXV0ZXhlcyBvciBtaWdodCBvdGhlcndpc2Ugc2xlZXAKKyAqIGFu ZCB0aHVzIGNhbid0IGJlIHJ1biB3aXRoIGludGVycnVwdHMgZGlzYWJsZWQuCisgKi8KK3N0cnVj dCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgeworCS8qIFNsZWVwYWJsZSBvcGVyYXRpb25zIHRv IHBlcmZvcm0gYmVmb3JlIGNvbW1pdCAqLworCWJvb2wgd2FpdF9mb3JfZmxpcHM7CisJYm9vbCBk aXNhYmxlX2ZiYzsKKwlib29sIHByZV9kaXNhYmxlX3ByaW1hcnk7CisJYm9vbCB1cGRhdGVfd207 CisKKwkvKiBTbGVlcGFibGUgb3BlcmF0aW9ucyB0byBwZXJmb3JtIGFmdGVyIGNvbW1pdCAqLwor CXVuc2lnbmVkIGZiX2JpdHM7CisJYm9vbCB3YWl0X3ZibGFuazsKKwlib29sIHVwZGF0ZV9mYmM7 CisJYm9vbCBwb3N0X2VuYWJsZV9wcmltYXJ5OworCXVuc2lnbmVkIHVwZGF0ZV9zcHJpdGVfd2F0 ZXJtYXJrczsKK307CisKIHN0cnVjdCBpbnRlbF9jcnRjIHsKIAlzdHJ1Y3QgZHJtX2NydGMgYmFz ZTsKIAllbnVtIHBpcGUgcGlwZTsKQEAgLTQ2OCw2ICs0OTUsOCBAQCBzdHJ1Y3QgaW50ZWxfY3J0 YyB7CiAKIAlpbnQgc2NhbmxpbmVfb2Zmc2V0OwogCXN0cnVjdCBpbnRlbF9tbWlvX2ZsaXAgbW1p b19mbGlwOworCisJc3RydWN0IGludGVsX2NydGNfYXRvbWljX2NvbW1pdCBhdG9taWM7CiB9Owog CiBzdHJ1Y3QgaW50ZWxfcGxhbmVfd21fcGFyYW1ldGVycyB7CkBAIC0xMjEzLDYgKzEyNDIsOCBA QCBpbnQgaW50ZWxfc3ByaXRlX2dldF9jb2xvcmtleShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2 b2lkICpkYXRhLAogYm9vbCBpbnRlbF9waXBlX3VwZGF0ZV9zdGFydChzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YywKIAkJCSAgICAgdWludDMyX3QgKnN0YXJ0X3ZibF9jb3VudCk7CiB2b2lkIGludGVs X3BpcGVfdXBkYXRlX2VuZChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywgdTMyIHN0YXJ0X3ZibF9j b3VudCk7Cit2b2lkIGludGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoc3RydWN0IGRybV9jcnRjICpj cnRjKTsKK3ZvaWQgaW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeShzdHJ1Y3QgZHJtX2NydGMgKmNy dGMpOwogCiAvKiBpbnRlbF90di5jICovCiB2b2lkIGludGVsX3R2X2luaXQoc3RydWN0IGRybV9k ZXZpY2UgKmRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJp dGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IGMxOGU1N2Qu LjZlNjQ5ZGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC03NzEsOSArNzcx LDggQEAgaXZiX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBk cm1fY3J0YyAqY3J0YykKIAkgKiBBdm9pZCB1bmRlcnJ1bnMgd2hlbiBkaXNhYmxpbmcgdGhlIHNw cml0ZS4KIAkgKiBGSVhNRSByZW1vdmUgb25jZSB3YXRlcm1hcmsgdXBkYXRlcyBhcmUgZG9uZSBw cm9wZXJseS4KIAkgKi8KLQlpbnRlbF93YWl0X2Zvcl92YmxhbmsoZGV2LCBwaXBlKTsKLQotCWlu dGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhwbGFuZSwgY3J0YywgMCwgMCwgMCwgZmFsc2Us IGZhbHNlKTsKKwlpbnRlbF9jcnRjLT5hdG9taWMud2FpdF92YmxhbmsgPSB0cnVlOworCWludGVs X2NydGMtPmF0b21pYy51cGRhdGVfc3ByaXRlX3dhdGVybWFya3MgfD0gKDEgPDwgZHJtX3BsYW5l X2luZGV4KHBsYW5lKSk7CiB9CiAKIHN0YXRpYyBpbnQKQEAgLTk3NiwxMiArOTc1LDIxIEBAIGls a19kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMg KmNydGMpCiAJICogQXZvaWQgdW5kZXJydW5zIHdoZW4gZGlzYWJsaW5nIHRoZSBzcHJpdGUuCiAJ ICogRklYTUUgcmVtb3ZlIG9uY2Ugd2F0ZXJtYXJrIHVwZGF0ZXMgYXJlIGRvbmUgcHJvcGVybHku CiAJICovCi0JaW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRldiwgcGlwZSk7Ci0KLQlpbnRlbF91cGRh dGVfc3ByaXRlX3dhdGVybWFya3MocGxhbmUsIGNydGMsIDAsIDAsIDAsIGZhbHNlLCBmYWxzZSk7 CisJaW50ZWxfY3J0Yy0+YXRvbWljLndhaXRfdmJsYW5rID0gdHJ1ZTsKKwlpbnRlbF9jcnRjLT5h dG9taWMudXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzIHw9ICgxIDw8IGRybV9wbGFuZV9pbmRleChw bGFuZSkpOwogfQogCi1zdGF0aWMgdm9pZAorLyoqCisgKiBpbnRlbF9wb3N0X2VuYWJsZV9wcmlt YXJ5IC0gUGVyZm9ybSBvcGVyYXRpb25zIGFmdGVyIGVuYWJsaW5nIHByaW1hcnkgcGxhbmUKKyAq IEBjcnRjOiB0aGUgQ1JUQyB3aG9zZSBwcmltYXJ5IHBsYW5lIHdhcyBqdXN0IGVuYWJsZWQKKyAq CisgKiBQZXJmb3JtcyBwb3RlbnRpYWxseSBzbGVlcGluZyBvcGVyYXRpb25zIHRoYXQgbXVzdCBi ZSBkb25lIGFmdGVyIHRoZSBwcmltYXJ5CisgKiBwbGFuZSBpcyBlbmFibGVkLCBzdWNoIGFzIHVw ZGF0aW5nIEZCQyBhbmQgSVBTLiAgTm90ZSB0aGF0IHRoaXMgbWF5IGJlCisgKiBjYWxsZWQgZHVl IHRvIGFuIGV4cGxpY2l0IHByaW1hcnkgcGxhbmUgdXBkYXRlLCBvciBkdWUgdG8gYW4gaW1wbGlj aXQKKyAqIHJlLWVuYWJsZSB0aGF0IGlzIGNhdXNlZCB3aGVuIGEgc3ByaXRlIHBsYW5lIGlzIHVw ZGF0ZWQgdG8gbm8gbG9uZ2VyCisgKiBjb21wbGV0ZWx5IGhpZGUgdGhlIHByaW1hcnkgcGxhbmUu CisgKi8KK3ZvaWQKIGludGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoc3RydWN0IGRybV9jcnRjICpj cnRjKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CkBAIC0xMDA4LDcg KzEwMTYsMTcgQEAgaW50ZWxfcG9zdF9lbmFibGVfcHJpbWFyeShzdHJ1Y3QgZHJtX2NydGMgKmNy dGMpCiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiB9CiAKLXN0YXRpYyB2b2lk CisvKioKKyAqIGludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnkgLSBQZXJmb3JtIG9wZXJhdGlvbnMg YmVmb3JlIGRpc2FibGluZyBwcmltYXJ5IHBsYW5lCisgKiBAY3J0YzogdGhlIENSVEMgd2hvc2Ug cHJpbWFyeSBwbGFuZSBpcyB0byBiZSBkaXNhYmxlZAorICoKKyAqIFBlcmZvcm1zIHBvdGVudGlh bGx5IHNsZWVwaW5nIG9wZXJhdGlvbnMgdGhhdCBtdXN0IGJlIGRvbmUgYmVmb3JlIHRoZQorICog cHJpbWFyeSBwbGFuZSBpcyBlbmFibGVkLCBzdWNoIGFzIHVwZGF0aW5nIEZCQyBhbmQgSVBTLiAg Tm90ZSB0aGF0IHRoaXMgbWF5CisgKiBiZSBjYWxsZWQgZHVlIHRvIGFuIGV4cGxpY2l0IHByaW1h cnkgcGxhbmUgdXBkYXRlLCBvciBkdWUgdG8gYW4gaW1wbGljaXQKKyAqIGRpc2FibGUgdGhhdCBp cyBjYXVzZWQgd2hlbiBhIHNwcml0ZSBwbGFuZSBjb21wbGV0ZWx5IGhpZGVzIHRoZSBwcmltYXJ5 CisgKiBwbGFuZS4KKyAqLwordm9pZAogaW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsK QEAgLTExMTMsNyArMTEzMSw3IEBAIGludGVsX2NoZWNrX3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSwKIAogCWlmICghZmIpIHsKIAkJc3RhdGUtPnZpc2libGUgPSBmYWxzZTsK LQkJcmV0dXJuIDA7CisJCWdvdG8gZmluaXNoOwogCX0KIAogCS8qIERvbid0IG1vZGlmeSBhbm90 aGVyIHBpcGUncyBwbGFuZSAqLwpAQCAtMTI2MCw2ICsxMjc4LDI5IEBAIGludGVsX2NoZWNrX3Nw cml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlkc3QtPnkxID0gY3J0Y195Owog CWRzdC0+eTIgPSBjcnRjX3kgKyBjcnRjX2g7CiAKK2ZpbmlzaDoKKwkvKgorCSAqIElmIHRoZSBz cHJpdGUgaXMgY29tcGxldGVseSBjb3ZlcmluZyB0aGUgcHJpbWFyeSBwbGFuZSwKKwkgKiB3ZSBj YW4gZGlzYWJsZSB0aGUgcHJpbWFyeSBhbmQgc2F2ZSBwb3dlci4KKwkgKi8KKwlzdGF0ZS0+aGlk ZXNfcHJpbWFyeSA9IGRybV9yZWN0X2VxdWFscyhkc3QsIGNsaXApICYmCisJCSFjb2xvcmtleV9l bmFibGVkKGludGVsX3BsYW5lKTsKKwlXQVJOX09OKHN0YXRlLT5oaWRlc19wcmltYXJ5ICYmICFz dGF0ZS0+dmlzaWJsZSAmJiBpbnRlbF9jcnRjLT5hY3RpdmUpOworCisJaWYgKGludGVsX2NydGMt PmFjdGl2ZSkgeworCQlpZiAoaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkID09IHN0YXRlLT5o aWRlc19wcmltYXJ5KQorCQkJaW50ZWxfY3J0Yy0+YXRvbWljLndhaXRfZm9yX2ZsaXBzID0gdHJ1 ZTsKKworCQlpZiAoaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkICYmIHN0YXRlLT5oaWRlc19w cmltYXJ5KQorCQkJaW50ZWxfY3J0Yy0+YXRvbWljLnByZV9kaXNhYmxlX3ByaW1hcnkgPSB0cnVl OworCisJCWludGVsX2NydGMtPmF0b21pYy5mYl9iaXRzIHw9CisJCQlJTlRFTF9GUk9OVEJVRkZF Ul9TUFJJVEUoaW50ZWxfY3J0Yy0+cGlwZSk7CisKKwkJaWYgKCFpbnRlbF9jcnRjLT5wcmltYXJ5 X2VuYWJsZWQgJiYgIXN0YXRlLT5oaWRlc19wcmltYXJ5KQorCQkJaW50ZWxfY3J0Yy0+YXRvbWlj LnBvc3RfZW5hYmxlX3ByaW1hcnkgPSB0cnVlOworCX0KKwogCXJldHVybiAwOwogfQogCkBAIC0x MjY3LDM3ICsxMzA4LDE0IEBAIHN0YXRpYyB2b2lkCiBpbnRlbF9jb21taXRfc3ByaXRlX3BsYW5l KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJICBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUg KnN0YXRlKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2OwogCXN0cnVj dCBkcm1fY3J0YyAqY3J0YyA9IHN0YXRlLT5iYXNlLmNydGM7CiAJc3RydWN0IGludGVsX2NydGMg KmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCXN0cnVjdCBpbnRlbF9wbGFuZSAq aW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7Ci0JZW51bSBwaXBlIHBpcGUgPSBp bnRlbF9jcnRjLT5waXBlOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gc3RhdGUtPmJh c2UuZmI7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29iaihm Yik7CiAJaW50IGNydGNfeCwgY3J0Y195OwogCXVuc2lnbmVkIGludCBjcnRjX3csIGNydGNfaDsK IAl1aW50MzJfdCBzcmNfeCwgc3JjX3ksIHNyY193LCBzcmNfaDsKLQlzdHJ1Y3QgZHJtX3JlY3Qg KmRzdCA9ICZzdGF0ZS0+ZHN0OwotCWNvbnN0IHN0cnVjdCBkcm1fcmVjdCAqY2xpcCA9ICZzdGF0 ZS0+Y2xpcDsKLQlib29sIHByaW1hcnlfZW5hYmxlZDsKLQotCS8qCi0JICogJ3ByZXBhcmUnIGlz IG5ldmVyIGNhbGxlZCB3aGVuIHBsYW5lIGlzIGJlaW5nIGRpc2FibGVkLCBzbyB3ZSBuZWVkCi0J ICogdG8gaGFuZGxlIGZyb250YnVmZmVyIHRyYWNraW5nIGhlcmUKLQkgKi8KLQlpZiAoIWZiKSB7 Ci0JCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQkJaTkxNV9nZW1fdHJhY2tfZmIo aW50ZWxfZmJfb2JqKHBsYW5lLT5mYiksIE5VTEwsCi0JCQkJICBJTlRFTF9GUk9OVEJVRkZFUl9T UFJJVEUocGlwZSkpOwotCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQl9Ci0K LQkvKgotCSAqIElmIHRoZSBzcHJpdGUgaXMgY29tcGxldGVseSBjb3ZlcmluZyB0aGUgcHJpbWFy eSBwbGFuZSwKLQkgKiB3ZSBjYW4gZGlzYWJsZSB0aGUgcHJpbWFyeSBhbmQgc2F2ZSBwb3dlci4K LQkgKi8KLQlwcmltYXJ5X2VuYWJsZWQgPSAhZHJtX3JlY3RfZXF1YWxzKGRzdCwgY2xpcCkgfHwg Y29sb3JrZXlfZW5hYmxlZChpbnRlbF9wbGFuZSk7Ci0JV0FSTl9PTighcHJpbWFyeV9lbmFibGVk ICYmICFzdGF0ZS0+dmlzaWJsZSAmJiBpbnRlbF9jcnRjLT5hY3RpdmUpOwogCiAJaW50ZWxfcGxh bmUtPmNydGNfeCA9IHN0YXRlLT5vcmlnX2RzdC54MTsKIAlpbnRlbF9wbGFuZS0+Y3J0Y195ID0g c3RhdGUtPm9yaWdfZHN0LnkxOwpAQCAtMTMxMCwxNSArMTMyOCw3IEBAIGludGVsX2NvbW1pdF9z cHJpdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJaW50ZWxfcGxhbmUtPm9iaiA9 IG9iajsKIAogCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpIHsKLQkJYm9vbCBwcmltYXJ5X3dhc19l bmFibGVkID0gaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkOwotCi0JCWludGVsX2NydGMtPnBy aW1hcnlfZW5hYmxlZCA9IHByaW1hcnlfZW5hYmxlZDsKLQotCQlpZiAocHJpbWFyeV93YXNfZW5h YmxlZCAhPSBwcmltYXJ5X2VuYWJsZWQpCi0JCQlpbnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdf ZmxpcHMoY3J0Yyk7Ci0KLQkJaWYgKHByaW1hcnlfd2FzX2VuYWJsZWQgJiYgIXByaW1hcnlfZW5h YmxlZCkKLQkJCWludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnkoY3J0Yyk7CisJCWludGVsX2NydGMt PnByaW1hcnlfZW5hYmxlZCA9ICFzdGF0ZS0+aGlkZXNfcHJpbWFyeTsKIAogCQlpZiAoc3RhdGUt PnZpc2libGUpIHsKIAkJCWNydGNfeCA9IHN0YXRlLT5kc3QueDE7CkBAIC0xMzM1LDEyICsxMzQ1 LDYgQEAgaW50ZWxfY29tbWl0X3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwK IAkJfSBlbHNlIHsKIAkJCWludGVsX3BsYW5lLT5kaXNhYmxlX3BsYW5lKHBsYW5lLCBjcnRjKTsK IAkJfQotCi0KLQkJaW50ZWxfZnJvbnRidWZmZXJfZmxpcChkZXYsIElOVEVMX0ZST05UQlVGRkVS X1NQUklURShwaXBlKSk7Ci0KLQkJaWYgKCFwcmltYXJ5X3dhc19lbmFibGVkICYmIHByaW1hcnlf ZW5hYmxlZCkKLQkJCWludGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoY3J0Yyk7CiAJfQogfQogCi0t IAoxLjguNS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=