From: Matt Roper Subject: [PATCH] drm/i915: Refactor work that can sleep out of commit (v4) Date: Thu, 11 Dec 2014 15:53:43 -0800 Message-ID: <1418342023-1786-1-git-send-email-matthew.d.roper@intel.com> References: <1418154823-10819-3-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 CBE2B6E031 for ; Thu, 11 Dec 2014 15:53:44 -0800 (PST) In-Reply-To: <1418154823-10819-3-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 aGUgY3JpdGljYWwgc2VjdGlvbi4KClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcu ZC5yb3BlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIHwgMTgwICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMzEgKysrKysrCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9zcHJpdGUuYyAgfCAgNzggKysrKysrLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5n ZWQsIDE3OCBpbnNlcnRpb25zKCspLCAxMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCmluZGV4IDMwNDRhZjUuLjVkOTAxMTQgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKQEAgLTExNzM3LDcgKzExNzM3LDExIEBAIHN0YXRpYyBpbnQKIGlu dGVsX2NoZWNrX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkgIHN0 cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUpCiB7CisJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IHBsYW5lLT5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2 LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBzdGF0ZS0+YmFzZS5jcnRj OworCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsK KwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUp OwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gc3RhdGUtPmJhc2UuZmI7CiAJc3RydWN0 IGRybV9yZWN0ICpkZXN0ID0gJnN0YXRlLT5kc3Q7CiAJc3RydWN0IGRybV9yZWN0ICpzcmMgPSAm c3RhdGUtPnNyYzsKQEAgLTExNzU4LDYgKzExNzYyLDQwIEBAIGludGVsX2NoZWNrX3ByaW1hcnlf cGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCXJldHVybiAtRUJVU1k7CiAJfQogCisJ aWYgKGludGVsX2NydGMtPmFjdGl2ZSkgeworCQkvKgorCQkgKiBGQkMgZG9lcyBub3Qgd29yayBv biBzb21lIHBsYXRmb3JtcyBmb3Igcm90YXRlZAorCQkgKiBwbGFuZXMsIHNvIGRpc2FibGUgaXQg d2hlbiByb3RhdGlvbiBpcyBub3QgMCBhbmQKKwkJICogdXBkYXRlIGl0IHdoZW4gcm90YXRpb24g aXMgc2V0IGJhY2sgdG8gMC4KKwkJICoKKwkJICogRklYTUU6IFRoaXMgaXMgcmVkdW5kYW50IHdp dGggdGhlIGZiYyB1cGRhdGUgZG9uZSBpbgorCQkgKiB0aGUgcHJpbWFyeSBwbGFuZSBlbmFibGUg ZnVuY3Rpb24gZXhjZXB0IHRoYXQgdGhhdAorCQkgKiBvbmUgaXMgZG9uZSB0b28gbGF0ZS4gV2Ug ZXZlbnR1YWxseSBuZWVkIHRvIHVuaWZ5CisJCSAqIHRoaXMuCisJCSAqLworCQlpZiAoaW50ZWxf Y3J0Yy0+cHJpbWFyeV9lbmFibGVkICYmCisJCSAgICBJTlRFTF9JTkZPKGRldiktPmdlbiA8PSA0 ICYmICFJU19HNFgoZGV2KSAmJgorCQkgICAgZGV2X3ByaXYtPmZiYy5wbGFuZSA9PSBpbnRlbF9j cnRjLT5wbGFuZSAmJgorCQkgICAgaW50ZWxfcGxhbmUtPnJvdGF0aW9uICE9IEJJVChEUk1fUk9U QVRFXzApKSB7CisJCQlpbnRlbF9jcnRjLT5hdG9taWMuZGlzYWJsZV9mYmMgPSB0cnVlOworCQl9 CisKKwkJaWYgKHN0YXRlLT52aXNpYmxlKSB7CisJCQkvKgorCQkJICogQkRXIHNpZ25hbHMgZmxp cCBkb25lIGltbWVkaWF0ZWx5IGlmIHRoZSBwbGFuZQorCQkJICogaXMgZGlzYWJsZWQsIGV2ZW4g aWYgdGhlIHBsYW5lIGVuYWJsZSBpcyBhbHJlYWR5CisJCQkgKiBhcm1lZCB0byBvY2N1ciBhdCB0 aGUgbmV4dCB2YmxhbmsgOigKKwkJCSAqLworCQkJaWYgKElTX0JST0FEV0VMTChkZXYpICYmICFp bnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQpCisJCQkJaW50ZWxfY3J0Yy0+YXRvbWljLndhaXRf dmJsYW5rID0gdHJ1ZTsKKwkJfQorCisJCWludGVsX2NydGMtPmF0b21pYy5mYl9iaXRzIHw9CisJ CQlJTlRFTF9GUk9OVEJVRkZFUl9QUklNQVJZKGludGVsX2NydGMtPnBpcGUpOworCisJCWludGVs X2NydGMtPmF0b21pYy51cGRhdGVfZmJjID0gdHJ1ZTsKKwl9CisKIAlyZXR1cm4gMDsKIH0KIApA QCAtMTE3NzMsMTggKzExODExLDYgQEAgaW50ZWxfY29tbWl0X3ByaW1hcnlfcGxhbmUoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUsCiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGlu dGVsX2ZiX29iaihmYik7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2lu dGVsX3BsYW5lKHBsYW5lKTsKIAlzdHJ1Y3QgZHJtX3JlY3QgKnNyYyA9ICZzdGF0ZS0+c3JjOwot CWVudW0gcGlwZSBwaXBlID0gaW50ZWxfcGxhbmUtPnBpcGU7Ci0KLQlpZiAoIWZiKSB7Ci0JCS8q Ci0JCSAqICdwcmVwYXJlJyBpcyBuZXZlciBjYWxsZWQgd2hlbiBwbGFuZSBpcyBiZWluZyBkaXNh YmxlZCwgc28KLQkJICogd2UgbmVlZCB0byBoYW5kbGUgZnJvbnRidWZmZXIgdHJhY2tpbmcgaGVy ZQotCQkgKi8KLQkJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCQlpOTE1X2dlbV90 cmFja19mYihpbnRlbF9mYl9vYmoocGxhbmUtPmZiKSwgTlVMTCwKLQkJCQkgIElOVEVMX0ZST05U QlVGRkVSX1BSSU1BUlkocGlwZSkpOwotCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4 KTsKLQl9CiAKIAlwbGFuZS0+ZmIgPSBmYjsKIAljcnRjLT54ID0gc3JjLT54MSA+PiAxNjsKQEAg LTExODAxLDI2ICsxMTgyNyw3IEBAIGludGVsX2NvbW1pdF9wcmltYXJ5X3BsYW5lKHN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lLAogCWludGVsX3BsYW5lLT5vYmogPSBvYmo7CiAKIAlpZiAoaW50ZWxf Y3J0Yy0+YWN0aXZlKSB7Ci0JCS8qCi0JCSAqIEZCQyBkb2VzIG5vdCB3b3JrIG9uIHNvbWUgcGxh dGZvcm1zIGZvciByb3RhdGVkCi0JCSAqIHBsYW5lcywgc28gZGlzYWJsZSBpdCB3aGVuIHJvdGF0 aW9uIGlzIG5vdCAwIGFuZAotCQkgKiB1cGRhdGUgaXQgd2hlbiByb3RhdGlvbiBpcyBzZXQgYmFj ayB0byAwLgotCQkgKgotCQkgKiBGSVhNRTogVGhpcyBpcyByZWR1bmRhbnQgd2l0aCB0aGUgZmJj IHVwZGF0ZSBkb25lIGluCi0JCSAqIHRoZSBwcmltYXJ5IHBsYW5lIGVuYWJsZSBmdW5jdGlvbiBl eGNlcHQgdGhhdCB0aGF0Ci0JCSAqIG9uZSBpcyBkb25lIHRvbyBsYXRlLiBXZSBldmVudHVhbGx5 IG5lZWQgdG8gdW5pZnkKLQkJICogdGhpcy4KLQkJICovCi0JCWlmIChpbnRlbF9jcnRjLT5wcmlt YXJ5X2VuYWJsZWQgJiYKLQkJICAgIElOVEVMX0lORk8oZGV2KS0+Z2VuIDw9IDQgJiYgIUlTX0c0 WChkZXYpICYmCi0JCSAgICBkZXZfcHJpdi0+ZmJjLnBsYW5lID09IGludGVsX2NydGMtPnBsYW5l ICYmCi0JCSAgICBpbnRlbF9wbGFuZS0+cm90YXRpb24gIT0gQklUKERSTV9ST1RBVEVfMCkpIHsK LQkJCWludGVsX2ZiY19kaXNhYmxlKGRldik7Ci0JCX0KLQogCQlpZiAoc3RhdGUtPnZpc2libGUp IHsKLQkJCWJvb2wgd2FzX2VuYWJsZWQgPSBpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQ7Ci0K IAkJCS8qIEZJWE1FOiBraWxsIHRoaXMgZmFzdGJvb3QgaGFjayAqLwogCQkJaW50ZWxfdXBkYXRl X3BpcGVfc2l6ZShpbnRlbF9jcnRjKTsKIApAQCAtMTE4MjgsMTQgKzExODM1LDYgQEAgaW50ZWxf Y29tbWl0X3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAKIAkJCWRldl9w cml2LT5kaXNwbGF5LnVwZGF0ZV9wcmltYXJ5X3BsYW5lKGNydGMsIHBsYW5lLT5mYiwKIAkJCQkJ Y3J0Yy0+eCwgY3J0Yy0+eSk7Ci0KLQkJCS8qCi0JCQkgKiBCRFcgc2lnbmFscyBmbGlwIGRvbmUg aW1tZWRpYXRlbHkgaWYgdGhlIHBsYW5lCi0JCQkgKiBpcyBkaXNhYmxlZCwgZXZlbiBpZiB0aGUg cGxhbmUgZW5hYmxlIGlzIGFscmVhZHkKLQkJCSAqIGFybWVkIHRvIG9jY3VyIGF0IHRoZSBuZXh0 IHZibGFuayA6KAotCQkJICovCi0JCQlpZiAoSVNfQlJPQURXRUxMKGRldikgJiYgIXdhc19lbmFi bGVkKQotCQkJCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIGludGVsX2NydGMtPnBpcGUpOwog CQl9IGVsc2UgewogCQkJLyoKIAkJCSAqIElmIGNsaXBwaW5nIHJlc3VsdHMgaW4gYSBub24tdmlz aWJsZSBwcmltYXJ5IHBsYW5lLApAQCAtMTE4NDYsMTMgKzExODQ1LDUwIEBAIGludGVsX2NvbW1p dF9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJICovCiAJCQlpbnRl bF9kaXNhYmxlX3ByaW1hcnlfaHdfcGxhbmUocGxhbmUsIGNydGMpOwogCQl9CisJfQorfQogCi0J CWludGVsX2Zyb250YnVmZmVyX2ZsaXAoZGV2LCBJTlRFTF9GUk9OVEJVRkZFUl9QUklNQVJZKHBp cGUpKTsKK3N0YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0 YyAqY3J0YykKK3sKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OworCXN0cnVj dCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKKworCWlmIChp bnRlbF9jcnRjLT5hdG9taWMuZGlzYWJsZV9mYmMpCisJCWludGVsX2ZiY19kaXNhYmxlKGRldik7 CisKKwlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLnByZV9kaXNhYmxlX3ByaW1hcnkpCisJCWludGVs X3ByZV9kaXNhYmxlX3ByaW1hcnkoY3J0Yyk7CisKKwlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLnVw ZGF0ZV93bSkKKwkJaW50ZWxfdXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7Cit9CiAKK3N0YXRpYyB2 b2lkIGludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCit7CisJ c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAq aW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJc3RydWN0IGRybV9wbGFuZSAqcDsK KworCWlmIChpbnRlbF9jcnRjLT5hdG9taWMud2FpdF92YmxhbmspCisJCWludGVsX3dhaXRfZm9y X3ZibGFuayhkZXYsIGludGVsX2NydGMtPnBpcGUpOworCisJaW50ZWxfZnJvbnRidWZmZXJfZmxp cChkZXYsIGludGVsX2NydGMtPmF0b21pYy5mYl9iaXRzKTsKKworCWlmIChpbnRlbF9jcnRjLT5h dG9taWMudXBkYXRlX2ZiYykgewogCQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJ CWludGVsX2ZiY191cGRhdGUoZGV2KTsKIAkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRl eCk7CiAJfQorCisJaWYgKGludGVsX2NydGMtPmF0b21pYy5wb3N0X2VuYWJsZV9wcmltYXJ5KQor CQlpbnRlbF9wb3N0X2VuYWJsZV9wcmltYXJ5KGNydGMpOworCisJZHJtX2Zvcl9lYWNoX2xlZ2Fj eV9wbGFuZShwLCAmZGV2LT5tb2RlX2NvbmZpZy5wbGFuZV9saXN0KQorCQlpZiAoaW50ZWxfY3J0 Yy0+YXRvbWljLnVwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyAmIGRybV9wbGFuZV9pbmRleChwKSkK KwkJCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhwLCBjcnRjLCAwLCAwLCAwLAorCQkJ CQkJICAgICAgIGZhbHNlLCBmYWxzZSk7CisKKwltZW1zZXQoJmludGVsX2NydGMtPmF0b21pYywg MCwgc2l6ZW9mKGludGVsX2NydGMtPmF0b21pYykpOwogfQogCiBpbnQKQEAgLTExODY0LDcgKzEx OTAwLDcgQEAgaW50ZWxfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5k ZXY7CiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqb2xkX2ZiID0gcGxhbmUtPmZiOwotCXN0cnVj dCBpbnRlbF9wbGFuZV9zdGF0ZSBzdGF0ZTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgc3Rh dGUgPSB7eyAwIH19OwogCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRl bF9wbGFuZShwbGFuZSk7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRl bF9jcnRjKGNydGMpOwogCWludCByZXQ7CkBAIC0xMTkwMiw3ICsxMTkzOCwzMyBAQCBpbnRlbF91 cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0 YywKIAkJCXJldHVybiByZXQ7CiAJfQogCisJaWYgKCFzdGF0ZS5iYXNlLmZiKSB7CisJCXVuc2ln bmVkIGZiX2JpdHMgPSAwOworCisJCXN3aXRjaCAocGxhbmUtPnR5cGUpIHsKKwkJY2FzZSBEUk1f UExBTkVfVFlQRV9QUklNQVJZOgorCQkJZmJfYml0cyA9IElOVEVMX0ZST05UQlVGRkVSX1BSSU1B UlkoaW50ZWxfcGxhbmUtPnBpcGUpOworCQkJYnJlYWs7CisJCWNhc2UgRFJNX1BMQU5FX1RZUEVf Q1VSU09SOgorCQkJZmJfYml0cyA9IElOVEVMX0ZST05UQlVGRkVSX0NVUlNPUihpbnRlbF9wbGFu ZS0+cGlwZSk7CisJCQlicmVhazsKKwkJY2FzZSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZOgorCQkJ ZmJfYml0cyA9IElOVEVMX0ZST05UQlVGRkVSX1NQUklURShpbnRlbF9wbGFuZS0+cGlwZSk7CisJ CQlicmVhazsKKwkJfQorCisJCS8qCisJCSAqICdwcmVwYXJlJyBpcyBuZXZlciBjYWxsZWQgd2hl biBwbGFuZSBpcyBiZWluZyBkaXNhYmxlZCwgc28KKwkJICogd2UgbmVlZCB0byBoYW5kbGUgZnJv bnRidWZmZXIgdHJhY2tpbmcgaGVyZQorCQkgKi8KKwkJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3Rf bXV0ZXgpOworCQlpOTE1X2dlbV90cmFja19mYihpbnRlbF9mYl9vYmoocGxhbmUtPmZiKSwgTlVM TCwgZmJfYml0cyk7CisJCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCX0KKwor CWludGVsX2JlZ2luX2NydGNfY29tbWl0KGNydGMpOwogCWludGVsX3BsYW5lLT5jb21taXRfcGxh bmUocGxhbmUsICZzdGF0ZSk7CisJaW50ZWxfZmluaXNoX2NydGNfY29tbWl0KGNydGMpOwogCiAJ aWYgKGZiICE9IG9sZF9mYiAmJiBvbGRfZmIpIHsKIAkJaWYgKGludGVsX2NydGMtPmFjdGl2ZSkK QEAgLTEyMDA5LDYgKzEyMDcxLDcgQEAgaW50ZWxfY2hlY2tfY3Vyc29yX3BsYW5lKHN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lLAogCXN0cnVjdCBkcm1fcmVjdCAqc3JjID0gJnN0YXRlLT5zcmM7CiAJ Y29uc3Qgc3RydWN0IGRybV9yZWN0ICpjbGlwID0gJnN0YXRlLT5jbGlwOwogCXN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooZmIpOworCXN0cnVjdCBpbnRlbF9j cnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlpbnQgY3J0Y193LCBjcnRj X2g7CiAJdW5zaWduZWQgc3RyaWRlOwogCWludCByZXQ7CkBAIC0xMjAyNCw3ICsxMjA4Nyw3IEBA IGludGVsX2NoZWNrX2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAogCS8q IGlmIHdlIHdhbnQgdG8gdHVybiBvZmYgdGhlIGN1cnNvciBpZ25vcmUgd2lkdGggYW5kIGhlaWdo dCAqLwogCWlmICghb2JqKQotCQlyZXR1cm4gMDsKKwkJZ290byBmaW5pc2g7CiAKIAkvKiBDaGVj ayBmb3Igd2hpY2ggY3Vyc29yIHR5cGVzIHdlIHN1cHBvcnQgKi8KIAljcnRjX3cgPSBkcm1fcmVj dF93aWR0aCgmc3RhdGUtPm9yaWdfZHN0KTsKQEAgLTEyMDUxLDYgKzEyMTE0LDE2IEBAIGludGVs X2NoZWNrX2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAl9CiAJbXV0ZXhf dW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAKK2ZpbmlzaDoKKwlpZiAoaW50ZWxfY3J0Yy0+ YWN0aXZlKSB7CisJCWlmIChpbnRlbF9jcnRjLT5jdXJzb3Jfd2lkdGggIT0KKwkJICAgIGRybV9y ZWN0X3dpZHRoKCZzdGF0ZS0+b3JpZ19kc3QpKQorCQkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0 ZV93bSA9IHRydWU7CisKKwkJaW50ZWxfY3J0Yy0+YXRvbWljLmZiX2JpdHMgfD0KKwkJCUlOVEVM X0ZST05UQlVGRkVSX0NVUlNPUihpbnRlbF9jcnRjLT5waXBlKTsKKwl9CisKIAlyZXR1cm4gcmV0 OwogfQogCkBAIC0xMjA2Myw5ICsxMjEzNiw2IEBAIGludGVsX2NvbW1pdF9jdXJzb3JfcGxhbmUo c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMg PSB0b19pbnRlbF9jcnRjKGNydGMpOwogCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUg PSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9i aiA9IGludGVsX2ZiX29iaihzdGF0ZS0+YmFzZS5mYik7Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9sZF9vYmogPSBpbnRlbF9mYl9vYmoocGxhbmUtPmZiKTsKLQllbnVtIHBpcGUgcGlw ZSA9IGludGVsX2NydGMtPnBpcGU7Ci0JdW5zaWduZWQgb2xkX3dpZHRoOwogCXVpbnQzMl90IGFk ZHI7CiAKIAlwbGFuZS0+ZmIgPSBzdGF0ZS0+YmFzZS5mYjsKQEAgLTEyMDg1LDE3ICsxMjE1NSw2 IEBAIGludGVsX2NvbW1pdF9jdXJzb3JfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJ aWYgKGludGVsX2NydGMtPmN1cnNvcl9ibyA9PSBvYmopCiAJCWdvdG8gdXBkYXRlOwogCi0JLyoK LQkgKiAncHJlcGFyZScgaXMgb25seSBjYWxsZWQgd2hlbiBmYiAhPSBOVUxMOyB3ZSBzdGlsbCBu ZWVkIHRvIHVwZGF0ZQotCSAqIGZyb250YnVmZmVyIHRyYWNraW5nIGZvciB0aGUgJ2Rpc2FibGUn IGNhc2UgaGVyZS4KLQkgKi8KLQlpZiAoIW9iaikgewotCQltdXRleF9sb2NrKCZkZXYtPnN0cnVj dF9tdXRleCk7Ci0JCWk5MTVfZ2VtX3RyYWNrX2ZiKG9sZF9vYmosIE5VTEwsCi0JCQkJICBJTlRF TF9GUk9OVEJVRkZFUl9DVVJTT1IocGlwZSkpOwotCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0 X211dGV4KTsKLQl9Ci0KIAlpZiAoIW9iaikKIAkJYWRkciA9IDA7CiAJZWxzZSBpZiAoIUlOVEVM X0lORk8oZGV2KS0+Y3Vyc29yX25lZWRzX3BoeXNpY2FsKQpAQCAtMTIxMDYsMTggKzEyMTY1LDEx IEBAIGludGVsX2NvbW1pdF9jdXJzb3JfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJ aW50ZWxfY3J0Yy0+Y3Vyc29yX2FkZHIgPSBhZGRyOwogCWludGVsX2NydGMtPmN1cnNvcl9ibyA9 IG9iajsKIHVwZGF0ZToKLQlvbGRfd2lkdGggPSBpbnRlbF9jcnRjLT5jdXJzb3Jfd2lkdGg7Ci0K IAlpbnRlbF9jcnRjLT5jdXJzb3Jfd2lkdGggPSBkcm1fcmVjdF93aWR0aCgmc3RhdGUtPm9yaWdf ZHN0KTsKIAlpbnRlbF9jcnRjLT5jdXJzb3JfaGVpZ2h0ID0gZHJtX3JlY3RfaGVpZ2h0KCZzdGF0 ZS0+b3JpZ19kc3QpOwogCi0JaWYgKGludGVsX2NydGMtPmFjdGl2ZSkgewotCQlpZiAob2xkX3dp ZHRoICE9IGludGVsX2NydGMtPmN1cnNvcl93aWR0aCkKLQkJCWludGVsX3VwZGF0ZV93YXRlcm1h cmtzKGNydGMpOworCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpCiAJCWludGVsX2NydGNfdXBkYXRl X2N1cnNvcihjcnRjLCBzdGF0ZS0+dmlzaWJsZSk7Ci0KLQkJaW50ZWxfZnJvbnRidWZmZXJfZmxp cChkZXYsIElOVEVMX0ZST05UQlVGRkVSX0NVUlNPUihwaXBlKSk7Ci0JfQogfQogCiBzdGF0aWMg Y29uc3Qgc3RydWN0IGRybV9wbGFuZV9mdW5jcyBpbnRlbF9jdXJzb3JfcGxhbmVfZnVuY3MgPSB7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDU4OGI2MTguLmEwM2JkNzIgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oCkBAIC0yNTEsNiArMjUxLDEyIEBAIHN0cnVjdCBpbnRlbF9wbGFu ZV9zdGF0ZSB7CiAJc3RydWN0IGRybV9yZWN0IG9yaWdfc3JjOwogCXN0cnVjdCBkcm1fcmVjdCBv cmlnX2RzdDsKIAlib29sIHZpc2libGU7CisKKwkvKgorCSAqIHVzZWQgb25seSBmb3Igc3ByaXRl IHBsYW5lcyB0byBkZXRlcm1pbmUgd2hlbiB0byBpbXBsaWNpdGx5CisJICogZW5hYmxlL2Rpc2Fi bGUgdGhlIHByaW1hcnkgcGxhbmUKKwkgKi8KKwlib29sIGhpZGVzX3ByaW1hcnk7CiB9OwogCiBz dHJ1Y3QgaW50ZWxfcGxhbmVfY29uZmlnIHsKQEAgLTQxNSw2ICs0MjEsMjcgQEAgc3RydWN0IHNr bF9waXBlX3dtIHsKIAl1aW50MzJfdCBsaW5ldGltZTsKIH07CiAKKy8qCisgKiBUcmFja2luZyBv ZiBvcGVyYXRpb25zIHRoYXQgbmVlZCB0byBiZSBwZXJmb3JtZWQgYXQgdGhlIGJlZ2lubmluZy9l bmQgb2YgYW4KKyAqIGF0b21pYyBjb21taXQsIG91dHNpZGUgdGhlIGF0b21pYyBzZWN0aW9uIHdo ZXJlIGludGVycnVwdHMgYXJlIGRpc2FibGVkLgorICogVGhlc2UgYXJlIGdlbmVyYWxseSBvcGVy YXRpb25zIHRoYXQgZ3JhYiBtdXRleGVzIG9yIG1pZ2h0IG90aGVyd2lzZSBzbGVlcAorICogYW5k IHRodXMgY2FuJ3QgYmUgcnVuIHdpdGggaW50ZXJydXB0cyBkaXNhYmxlZC4KKyAqLworc3RydWN0 IGludGVsX2NydGNfYXRvbWljX2NvbW1pdCB7CisJLyogU2xlZXBhYmxlIG9wZXJhdGlvbnMgdG8g cGVyZm9ybSBiZWZvcmUgY29tbWl0ICovCisJYm9vbCB3YWl0X2Zvcl9mbGlwczsKKwlib29sIGRp c2FibGVfZmJjOworCWJvb2wgcHJlX2Rpc2FibGVfcHJpbWFyeTsKKwlib29sIHVwZGF0ZV93bTsK KworCS8qIFNsZWVwYWJsZSBvcGVyYXRpb25zIHRvIHBlcmZvcm0gYWZ0ZXIgY29tbWl0ICovCisJ dW5zaWduZWQgZmJfYml0czsKKwlib29sIHdhaXRfdmJsYW5rOworCWJvb2wgdXBkYXRlX2ZiYzsK Kwlib29sIHBvc3RfZW5hYmxlX3ByaW1hcnk7CisJdW5zaWduZWQgdXBkYXRlX3Nwcml0ZV93YXRl cm1hcmtzOworfTsKKwogc3RydWN0IGludGVsX2NydGMgewogCXN0cnVjdCBkcm1fY3J0YyBiYXNl OwogCWVudW0gcGlwZSBwaXBlOwpAQCAtNDY4LDYgKzQ5NSw4IEBAIHN0cnVjdCBpbnRlbF9jcnRj IHsKIAogCWludCBzY2FubGluZV9vZmZzZXQ7CiAJc3RydWN0IGludGVsX21taW9fZmxpcCBtbWlv X2ZsaXA7CisKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNfY29tbWl0IGF0b21pYzsKIH07CiAK IHN0cnVjdCBpbnRlbF9wbGFuZV93bV9wYXJhbWV0ZXJzIHsKQEAgLTEyMTMsNiArMTI0Miw4IEBA IGludCBpbnRlbF9zcHJpdGVfZ2V0X2NvbG9ya2V5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZv aWQgKmRhdGEsCiBib29sIGludGVsX3BpcGVfdXBkYXRlX3N0YXJ0KHN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjLAogCQkJICAgICB1aW50MzJfdCAqc3RhcnRfdmJsX2NvdW50KTsKIHZvaWQgaW50ZWxf cGlwZV91cGRhdGVfZW5kKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLCB1MzIgc3RhcnRfdmJsX2Nv dW50KTsKK3ZvaWQgaW50ZWxfcG9zdF9lbmFibGVfcHJpbWFyeShzdHJ1Y3QgZHJtX2NydGMgKmNy dGMpOwordm9pZCBpbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5KHN0cnVjdCBkcm1fY3J0YyAqY3J0 Yyk7CiAKIC8qIGludGVsX3R2LmMgKi8KIHZvaWQgaW50ZWxfdHZfaW5pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0 ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggYzE4ZTU3ZC4u ZjllMzc3NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTc3MSw5ICs3NzEs OCBAQCBpdmJfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRy bV9jcnRjICpjcnRjKQogCSAqIEF2b2lkIHVuZGVycnVucyB3aGVuIGRpc2FibGluZyB0aGUgc3By aXRlLgogCSAqIEZJWE1FIHJlbW92ZSBvbmNlIHdhdGVybWFyayB1cGRhdGVzIGFyZSBkb25lIHBy b3Blcmx5LgogCSAqLwotCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIHBpcGUpOwotCi0JaW50 ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKHBsYW5lLCBjcnRjLCAwLCAwLCAwLCBmYWxzZSwg ZmFsc2UpOworCWludGVsX2NydGMtPmF0b21pYy53YWl0X3ZibGFuayA9IHRydWU7CisJaW50ZWxf Y3J0Yy0+YXRvbWljLnVwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyB8PSAoMSA8PCBkcm1fcGxhbmVf aW5kZXgocGxhbmUpKTsKIH0KIAogc3RhdGljIGludApAQCAtOTc2LDEyICs5NzUsMTEgQEAgaWxr X2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAq Y3J0YykKIAkgKiBBdm9pZCB1bmRlcnJ1bnMgd2hlbiBkaXNhYmxpbmcgdGhlIHNwcml0ZS4KIAkg KiBGSVhNRSByZW1vdmUgb25jZSB3YXRlcm1hcmsgdXBkYXRlcyBhcmUgZG9uZSBwcm9wZXJseS4K IAkgKi8KLQlpbnRlbF93YWl0X2Zvcl92YmxhbmsoZGV2LCBwaXBlKTsKLQotCWludGVsX3VwZGF0 ZV9zcHJpdGVfd2F0ZXJtYXJrcyhwbGFuZSwgY3J0YywgMCwgMCwgMCwgZmFsc2UsIGZhbHNlKTsK KwlpbnRlbF9jcnRjLT5hdG9taWMud2FpdF92YmxhbmsgPSB0cnVlOworCWludGVsX2NydGMtPmF0 b21pYy51cGRhdGVfc3ByaXRlX3dhdGVybWFya3MgfD0gKDEgPDwgZHJtX3BsYW5lX2luZGV4KHBs YW5lKSk7CiB9CiAKLXN0YXRpYyB2b2lkCit2b2lkCiBpbnRlbF9wb3N0X2VuYWJsZV9wcmltYXJ5 KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0 Yy0+ZGV2OwpAQCAtMTAwOCw3ICsxMDA2LDcgQEAgaW50ZWxfcG9zdF9lbmFibGVfcHJpbWFyeShz dHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7 CiB9CiAKLXN0YXRpYyB2b2lkCit2b2lkCiBpbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5KHN0cnVj dCBkcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2 OwpAQCAtMTExMyw3ICsxMTExLDcgQEAgaW50ZWxfY2hlY2tfc3ByaXRlX3BsYW5lKHN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lLAogCiAJaWYgKCFmYikgewogCQlzdGF0ZS0+dmlzaWJsZSA9IGZhbHNl OwotCQlyZXR1cm4gMDsKKwkJZ290byBmaW5pc2g7CiAJfQogCiAJLyogRG9uJ3QgbW9kaWZ5IGFu b3RoZXIgcGlwZSdzIHBsYW5lICovCkBAIC0xMjYwLDYgKzEyNTgsMjkgQEAgaW50ZWxfY2hlY2tf c3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWRzdC0+eTEgPSBjcnRjX3k7 CiAJZHN0LT55MiA9IGNydGNfeSArIGNydGNfaDsKIAorZmluaXNoOgorCS8qCisJICogSWYgdGhl IHNwcml0ZSBpcyBjb21wbGV0ZWx5IGNvdmVyaW5nIHRoZSBwcmltYXJ5IHBsYW5lLAorCSAqIHdl IGNhbiBkaXNhYmxlIHRoZSBwcmltYXJ5IGFuZCBzYXZlIHBvd2VyLgorCSAqLworCXN0YXRlLT5o aWRlc19wcmltYXJ5ID0gZHJtX3JlY3RfZXF1YWxzKGRzdCwgY2xpcCkgJiYKKwkJIWNvbG9ya2V5 X2VuYWJsZWQoaW50ZWxfcGxhbmUpOworCVdBUk5fT04oc3RhdGUtPmhpZGVzX3ByaW1hcnkgJiYg IXN0YXRlLT52aXNpYmxlICYmIGludGVsX2NydGMtPmFjdGl2ZSk7CisKKwlpZiAoaW50ZWxfY3J0 Yy0+YWN0aXZlKSB7CisJCWlmIChpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgPT0gc3RhdGUt PmhpZGVzX3ByaW1hcnkpCisJCQlpbnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMoJmlu dGVsX2NydGMtPmJhc2UpOworCisJCWlmIChpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgJiYg c3RhdGUtPmhpZGVzX3ByaW1hcnkpCisJCQlpbnRlbF9jcnRjLT5hdG9taWMucHJlX2Rpc2FibGVf cHJpbWFyeSA9IHRydWU7CisKKwkJaW50ZWxfY3J0Yy0+YXRvbWljLmZiX2JpdHMgfD0KKwkJCUlO VEVMX0ZST05UQlVGRkVSX1NQUklURShpbnRlbF9jcnRjLT5waXBlKTsKKworCQlpZiAoIWludGVs X2NydGMtPnByaW1hcnlfZW5hYmxlZCAmJiAhc3RhdGUtPmhpZGVzX3ByaW1hcnkpCisJCQlpbnRl bF9jcnRjLT5hdG9taWMucG9zdF9lbmFibGVfcHJpbWFyeSA9IHRydWU7CisJfQorCiAJcmV0dXJu IDA7CiB9CiAKQEAgLTEyNjcsMzcgKzEyODgsMTQgQEAgc3RhdGljIHZvaWQKIGludGVsX2NvbW1p dF9zcHJpdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkgIHN0cnVjdCBpbnRl bF9wbGFuZV9zdGF0ZSAqc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5l LT5kZXY7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjID0gc3RhdGUtPmJhc2UuY3J0YzsKIAlzdHJ1 Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJc3RydWN0 IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKLQllbnVt IHBpcGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAq ZmIgPSBzdGF0ZS0+YmFzZS5mYjsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0g aW50ZWxfZmJfb2JqKGZiKTsKIAlpbnQgY3J0Y194LCBjcnRjX3k7CiAJdW5zaWduZWQgaW50IGNy dGNfdywgY3J0Y19oOwogCXVpbnQzMl90IHNyY194LCBzcmNfeSwgc3JjX3csIHNyY19oOwotCXN0 cnVjdCBkcm1fcmVjdCAqZHN0ID0gJnN0YXRlLT5kc3Q7Ci0JY29uc3Qgc3RydWN0IGRybV9yZWN0 ICpjbGlwID0gJnN0YXRlLT5jbGlwOwotCWJvb2wgcHJpbWFyeV9lbmFibGVkOwotCi0JLyoKLQkg KiAncHJlcGFyZScgaXMgbmV2ZXIgY2FsbGVkIHdoZW4gcGxhbmUgaXMgYmVpbmcgZGlzYWJsZWQs IHNvIHdlIG5lZWQKLQkgKiB0byBoYW5kbGUgZnJvbnRidWZmZXIgdHJhY2tpbmcgaGVyZQotCSAq LwotCWlmICghZmIpIHsKLQkJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCQlpOTE1 X2dlbV90cmFja19mYihpbnRlbF9mYl9vYmoocGxhbmUtPmZiKSwgTlVMTCwKLQkJCQkgIElOVEVM X0ZST05UQlVGRkVSX1NQUklURShwaXBlKSk7Ci0JCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3Rf bXV0ZXgpOwotCX0KLQotCS8qCi0JICogSWYgdGhlIHNwcml0ZSBpcyBjb21wbGV0ZWx5IGNvdmVy aW5nIHRoZSBwcmltYXJ5IHBsYW5lLAotCSAqIHdlIGNhbiBkaXNhYmxlIHRoZSBwcmltYXJ5IGFu ZCBzYXZlIHBvd2VyLgotCSAqLwotCXByaW1hcnlfZW5hYmxlZCA9ICFkcm1fcmVjdF9lcXVhbHMo ZHN0LCBjbGlwKSB8fCBjb2xvcmtleV9lbmFibGVkKGludGVsX3BsYW5lKTsKLQlXQVJOX09OKCFw cmltYXJ5X2VuYWJsZWQgJiYgIXN0YXRlLT52aXNpYmxlICYmIGludGVsX2NydGMtPmFjdGl2ZSk7 CiAKIAlpbnRlbF9wbGFuZS0+Y3J0Y194ID0gc3RhdGUtPm9yaWdfZHN0LngxOwogCWludGVsX3Bs YW5lLT5jcnRjX3kgPSBzdGF0ZS0+b3JpZ19kc3QueTE7CkBAIC0xMzEwLDE1ICsxMzA4LDcgQEAg aW50ZWxfY29tbWl0X3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlpbnRl bF9wbGFuZS0+b2JqID0gb2JqOwogCiAJaWYgKGludGVsX2NydGMtPmFjdGl2ZSkgewotCQlib29s IHByaW1hcnlfd2FzX2VuYWJsZWQgPSBpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQ7Ci0KLQkJ aW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkID0gcHJpbWFyeV9lbmFibGVkOwotCi0JCWlmIChw cmltYXJ5X3dhc19lbmFibGVkICE9IHByaW1hcnlfZW5hYmxlZCkKLQkJCWludGVsX2NydGNfd2Fp dF9mb3JfcGVuZGluZ19mbGlwcyhjcnRjKTsKLQotCQlpZiAocHJpbWFyeV93YXNfZW5hYmxlZCAm JiAhcHJpbWFyeV9lbmFibGVkKQotCQkJaW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeShjcnRjKTsK KwkJaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkID0gIXN0YXRlLT5oaWRlc19wcmltYXJ5Owog CiAJCWlmIChzdGF0ZS0+dmlzaWJsZSkgewogCQkJY3J0Y194ID0gc3RhdGUtPmRzdC54MTsKQEAg LTEzMzUsMTIgKzEzMjUsNiBAQCBpbnRlbF9jb21taXRfc3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1f cGxhbmUgKnBsYW5lLAogCQl9IGVsc2UgewogCQkJaW50ZWxfcGxhbmUtPmRpc2FibGVfcGxhbmUo cGxhbmUsIGNydGMpOwogCQl9Ci0KLQotCQlpbnRlbF9mcm9udGJ1ZmZlcl9mbGlwKGRldiwgSU5U RUxfRlJPTlRCVUZGRVJfU1BSSVRFKHBpcGUpKTsKLQotCQlpZiAoIXByaW1hcnlfd2FzX2VuYWJs ZWQgJiYgcHJpbWFyeV9lbmFibGVkKQotCQkJaW50ZWxfcG9zdF9lbmFibGVfcHJpbWFyeShjcnRj KTsKIAl9CiB9CiAKLS0gCjEuOC41LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==