From: Matt Roper Subject: [PATCH 1/5] drm/i915: Refactor work that can sleep out of commit (v5) Date: Mon, 15 Dec 2014 16:23:17 -0800 Message-ID: <1418689401-22957-2-git-send-email-matthew.d.roper@intel.com> References: <1418689401-22957-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 2E9C76E661 for ; Mon, 15 Dec 2014 16:23:41 -0800 (PST) In-Reply-To: <1418689401-22957-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 IGZsaXBzLCBub3QgYWN0dWFsbHkgcGVyZm9ybSB0aGUgd2FpdC4gIChBbmRlcikKClNpZ25lZC1v ZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTgwICsrKysrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAg MzEgKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgfCAgNzggKysr KysrLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDE3OCBpbnNlcnRpb25zKCspLCAxMTEgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDMwNDRhZjUu LjVkOTAxMTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTExNzM3LDcg KzExNzM3LDExIEBAIHN0YXRpYyBpbnQKIGludGVsX2NoZWNrX3ByaW1hcnlfcGxhbmUoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkgIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUp CiB7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7CisJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMgPSBzdGF0ZS0+YmFzZS5jcnRjOworCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9j cnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3Bs YW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZi ID0gc3RhdGUtPmJhc2UuZmI7CiAJc3RydWN0IGRybV9yZWN0ICpkZXN0ID0gJnN0YXRlLT5kc3Q7 CiAJc3RydWN0IGRybV9yZWN0ICpzcmMgPSAmc3RhdGUtPnNyYzsKQEAgLTExNzU4LDYgKzExNzYy LDQwIEBAIGludGVsX2NoZWNrX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUs CiAJCXJldHVybiAtRUJVU1k7CiAJfQogCisJaWYgKGludGVsX2NydGMtPmFjdGl2ZSkgeworCQkv KgorCQkgKiBGQkMgZG9lcyBub3Qgd29yayBvbiBzb21lIHBsYXRmb3JtcyBmb3Igcm90YXRlZAor CQkgKiBwbGFuZXMsIHNvIGRpc2FibGUgaXQgd2hlbiByb3RhdGlvbiBpcyBub3QgMCBhbmQKKwkJ ICogdXBkYXRlIGl0IHdoZW4gcm90YXRpb24gaXMgc2V0IGJhY2sgdG8gMC4KKwkJICoKKwkJICog RklYTUU6IFRoaXMgaXMgcmVkdW5kYW50IHdpdGggdGhlIGZiYyB1cGRhdGUgZG9uZSBpbgorCQkg KiB0aGUgcHJpbWFyeSBwbGFuZSBlbmFibGUgZnVuY3Rpb24gZXhjZXB0IHRoYXQgdGhhdAorCQkg KiBvbmUgaXMgZG9uZSB0b28gbGF0ZS4gV2UgZXZlbnR1YWxseSBuZWVkIHRvIHVuaWZ5CisJCSAq IHRoaXMuCisJCSAqLworCQlpZiAoaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkICYmCisJCSAg ICBJTlRFTF9JTkZPKGRldiktPmdlbiA8PSA0ICYmICFJU19HNFgoZGV2KSAmJgorCQkgICAgZGV2 X3ByaXYtPmZiYy5wbGFuZSA9PSBpbnRlbF9jcnRjLT5wbGFuZSAmJgorCQkgICAgaW50ZWxfcGxh bmUtPnJvdGF0aW9uICE9IEJJVChEUk1fUk9UQVRFXzApKSB7CisJCQlpbnRlbF9jcnRjLT5hdG9t aWMuZGlzYWJsZV9mYmMgPSB0cnVlOworCQl9CisKKwkJaWYgKHN0YXRlLT52aXNpYmxlKSB7CisJ CQkvKgorCQkJICogQkRXIHNpZ25hbHMgZmxpcCBkb25lIGltbWVkaWF0ZWx5IGlmIHRoZSBwbGFu ZQorCQkJICogaXMgZGlzYWJsZWQsIGV2ZW4gaWYgdGhlIHBsYW5lIGVuYWJsZSBpcyBhbHJlYWR5 CisJCQkgKiBhcm1lZCB0byBvY2N1ciBhdCB0aGUgbmV4dCB2YmxhbmsgOigKKwkJCSAqLworCQkJ aWYgKElTX0JST0FEV0VMTChkZXYpICYmICFpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQpCisJ CQkJaW50ZWxfY3J0Yy0+YXRvbWljLndhaXRfdmJsYW5rID0gdHJ1ZTsKKwkJfQorCisJCWludGVs X2NydGMtPmF0b21pYy5mYl9iaXRzIHw9CisJCQlJTlRFTF9GUk9OVEJVRkZFUl9QUklNQVJZKGlu dGVsX2NydGMtPnBpcGUpOworCisJCWludGVsX2NydGMtPmF0b21pYy51cGRhdGVfZmJjID0gdHJ1 ZTsKKwl9CisKIAlyZXR1cm4gMDsKIH0KIApAQCAtMTE3NzMsMTggKzExODExLDYgQEAgaW50ZWxf Y29tbWl0X3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29iaihmYik7CiAJc3RydWN0IGludGVs X3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKIAlzdHJ1Y3QgZHJt X3JlY3QgKnNyYyA9ICZzdGF0ZS0+c3JjOwotCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfcGxhbmUt PnBpcGU7Ci0KLQlpZiAoIWZiKSB7Ci0JCS8qCi0JCSAqICdwcmVwYXJlJyBpcyBuZXZlciBjYWxs ZWQgd2hlbiBwbGFuZSBpcyBiZWluZyBkaXNhYmxlZCwgc28KLQkJICogd2UgbmVlZCB0byBoYW5k bGUgZnJvbnRidWZmZXIgdHJhY2tpbmcgaGVyZQotCQkgKi8KLQkJbXV0ZXhfbG9jaygmZGV2LT5z dHJ1Y3RfbXV0ZXgpOwotCQlpOTE1X2dlbV90cmFja19mYihpbnRlbF9mYl9vYmoocGxhbmUtPmZi KSwgTlVMTCwKLQkJCQkgIElOVEVMX0ZST05UQlVGRkVSX1BSSU1BUlkocGlwZSkpOwotCQltdXRl eF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQl9CiAKIAlwbGFuZS0+ZmIgPSBmYjsKIAlj cnRjLT54ID0gc3JjLT54MSA+PiAxNjsKQEAgLTExODAxLDI2ICsxMTgyNyw3IEBAIGludGVsX2Nv bW1pdF9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWludGVsX3BsYW5l LT5vYmogPSBvYmo7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKSB7Ci0JCS8qCi0JCSAqIEZC QyBkb2VzIG5vdCB3b3JrIG9uIHNvbWUgcGxhdGZvcm1zIGZvciByb3RhdGVkCi0JCSAqIHBsYW5l cywgc28gZGlzYWJsZSBpdCB3aGVuIHJvdGF0aW9uIGlzIG5vdCAwIGFuZAotCQkgKiB1cGRhdGUg aXQgd2hlbiByb3RhdGlvbiBpcyBzZXQgYmFjayB0byAwLgotCQkgKgotCQkgKiBGSVhNRTogVGhp cyBpcyByZWR1bmRhbnQgd2l0aCB0aGUgZmJjIHVwZGF0ZSBkb25lIGluCi0JCSAqIHRoZSBwcmlt YXJ5IHBsYW5lIGVuYWJsZSBmdW5jdGlvbiBleGNlcHQgdGhhdCB0aGF0Ci0JCSAqIG9uZSBpcyBk b25lIHRvbyBsYXRlLiBXZSBldmVudHVhbGx5IG5lZWQgdG8gdW5pZnkKLQkJICogdGhpcy4KLQkJ ICovCi0JCWlmIChpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgJiYKLQkJICAgIElOVEVMX0lO Rk8oZGV2KS0+Z2VuIDw9IDQgJiYgIUlTX0c0WChkZXYpICYmCi0JCSAgICBkZXZfcHJpdi0+ZmJj LnBsYW5lID09IGludGVsX2NydGMtPnBsYW5lICYmCi0JCSAgICBpbnRlbF9wbGFuZS0+cm90YXRp b24gIT0gQklUKERSTV9ST1RBVEVfMCkpIHsKLQkJCWludGVsX2ZiY19kaXNhYmxlKGRldik7Ci0J CX0KLQogCQlpZiAoc3RhdGUtPnZpc2libGUpIHsKLQkJCWJvb2wgd2FzX2VuYWJsZWQgPSBpbnRl bF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQ7Ci0KIAkJCS8qIEZJWE1FOiBraWxsIHRoaXMgZmFzdGJv b3QgaGFjayAqLwogCQkJaW50ZWxfdXBkYXRlX3BpcGVfc2l6ZShpbnRlbF9jcnRjKTsKIApAQCAt MTE4MjgsMTQgKzExODM1LDYgQEAgaW50ZWxfY29tbWl0X3ByaW1hcnlfcGxhbmUoc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUsCiAKIAkJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9wcmltYXJ5X3Bs YW5lKGNydGMsIHBsYW5lLT5mYiwKIAkJCQkJY3J0Yy0+eCwgY3J0Yy0+eSk7Ci0KLQkJCS8qCi0J CQkgKiBCRFcgc2lnbmFscyBmbGlwIGRvbmUgaW1tZWRpYXRlbHkgaWYgdGhlIHBsYW5lCi0JCQkg KiBpcyBkaXNhYmxlZCwgZXZlbiBpZiB0aGUgcGxhbmUgZW5hYmxlIGlzIGFscmVhZHkKLQkJCSAq IGFybWVkIHRvIG9jY3VyIGF0IHRoZSBuZXh0IHZibGFuayA6KAotCQkJICovCi0JCQlpZiAoSVNf QlJPQURXRUxMKGRldikgJiYgIXdhc19lbmFibGVkKQotCQkJCWludGVsX3dhaXRfZm9yX3ZibGFu ayhkZXYsIGludGVsX2NydGMtPnBpcGUpOwogCQl9IGVsc2UgewogCQkJLyoKIAkJCSAqIElmIGNs aXBwaW5nIHJlc3VsdHMgaW4gYSBub24tdmlzaWJsZSBwcmltYXJ5IHBsYW5lLApAQCAtMTE4NDYs MTMgKzExODQ1LDUwIEBAIGludGVsX2NvbW1pdF9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxh bmUgKnBsYW5lLAogCQkJICovCiAJCQlpbnRlbF9kaXNhYmxlX3ByaW1hcnlfaHdfcGxhbmUocGxh bmUsIGNydGMpOwogCQl9CisJfQorfQogCi0JCWludGVsX2Zyb250YnVmZmVyX2ZsaXAoZGV2LCBJ TlRFTF9GUk9OVEJVRkZFUl9QUklNQVJZKHBpcGUpKTsKK3N0YXRpYyB2b2lkIGludGVsX2JlZ2lu X2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3sKKwlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gY3J0Yy0+ZGV2OworCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9f aW50ZWxfY3J0YyhjcnRjKTsKKworCWlmIChpbnRlbF9jcnRjLT5hdG9taWMuZGlzYWJsZV9mYmMp CisJCWludGVsX2ZiY19kaXNhYmxlKGRldik7CisKKwlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLnBy ZV9kaXNhYmxlX3ByaW1hcnkpCisJCWludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnkoY3J0Yyk7CisK KwlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bSkKKwkJaW50ZWxfdXBkYXRlX3dhdGVy bWFya3MoY3J0Yyk7Cit9CiAKK3N0YXRpYyB2b2lkIGludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdChz dHJ1Y3QgZHJtX2NydGMgKmNydGMpCit7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMt PmRldjsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0 Yyk7CisJc3RydWN0IGRybV9wbGFuZSAqcDsKKworCWlmIChpbnRlbF9jcnRjLT5hdG9taWMud2Fp dF92YmxhbmspCisJCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIGludGVsX2NydGMtPnBpcGUp OworCisJaW50ZWxfZnJvbnRidWZmZXJfZmxpcChkZXYsIGludGVsX2NydGMtPmF0b21pYy5mYl9i aXRzKTsKKworCWlmIChpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX2ZiYykgewogCQltdXRleF9s b2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJCWludGVsX2ZiY191cGRhdGUoZGV2KTsKIAkJbXV0 ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJfQorCisJaWYgKGludGVsX2NydGMtPmF0 b21pYy5wb3N0X2VuYWJsZV9wcmltYXJ5KQorCQlpbnRlbF9wb3N0X2VuYWJsZV9wcmltYXJ5KGNy dGMpOworCisJZHJtX2Zvcl9lYWNoX2xlZ2FjeV9wbGFuZShwLCAmZGV2LT5tb2RlX2NvbmZpZy5w bGFuZV9saXN0KQorCQlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV9zcHJpdGVfd2F0ZXJt YXJrcyAmIGRybV9wbGFuZV9pbmRleChwKSkKKwkJCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJt YXJrcyhwLCBjcnRjLCAwLCAwLCAwLAorCQkJCQkJICAgICAgIGZhbHNlLCBmYWxzZSk7CisKKwlt ZW1zZXQoJmludGVsX2NydGMtPmF0b21pYywgMCwgc2l6ZW9mKGludGVsX2NydGMtPmF0b21pYykp OwogfQogCiBpbnQKQEAgLTExODY0LDcgKzExOTAwLDcgQEAgaW50ZWxfdXBkYXRlX3BsYW5lKHN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiB7CiAJc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7CiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAq b2xkX2ZiID0gcGxhbmUtPmZiOwotCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSBzdGF0ZTsKKwlz dHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgc3RhdGUgPSB7eyAwIH19OwogCXN0cnVjdCBpbnRlbF9w bGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CiAJc3RydWN0IGludGVs X2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCWludCByZXQ7CkBAIC0x MTkwMiw3ICsxMTkzOCwzMyBAQCBpbnRlbF91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAq cGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCXJldHVybiByZXQ7CiAJfQogCisJaWYg KCFzdGF0ZS5iYXNlLmZiKSB7CisJCXVuc2lnbmVkIGZiX2JpdHMgPSAwOworCisJCXN3aXRjaCAo cGxhbmUtPnR5cGUpIHsKKwkJY2FzZSBEUk1fUExBTkVfVFlQRV9QUklNQVJZOgorCQkJZmJfYml0 cyA9IElOVEVMX0ZST05UQlVGRkVSX1BSSU1BUlkoaW50ZWxfcGxhbmUtPnBpcGUpOworCQkJYnJl YWs7CisJCWNhc2UgRFJNX1BMQU5FX1RZUEVfQ1VSU09SOgorCQkJZmJfYml0cyA9IElOVEVMX0ZS T05UQlVGRkVSX0NVUlNPUihpbnRlbF9wbGFuZS0+cGlwZSk7CisJCQlicmVhazsKKwkJY2FzZSBE Uk1fUExBTkVfVFlQRV9PVkVSTEFZOgorCQkJZmJfYml0cyA9IElOVEVMX0ZST05UQlVGRkVSX1NQ UklURShpbnRlbF9wbGFuZS0+cGlwZSk7CisJCQlicmVhazsKKwkJfQorCisJCS8qCisJCSAqICdw cmVwYXJlJyBpcyBuZXZlciBjYWxsZWQgd2hlbiBwbGFuZSBpcyBiZWluZyBkaXNhYmxlZCwgc28K KwkJICogd2UgbmVlZCB0byBoYW5kbGUgZnJvbnRidWZmZXIgdHJhY2tpbmcgaGVyZQorCQkgKi8K KwkJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCQlpOTE1X2dlbV90cmFja19mYihp bnRlbF9mYl9vYmoocGxhbmUtPmZiKSwgTlVMTCwgZmJfYml0cyk7CisJCW11dGV4X3VubG9jaygm ZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCX0KKworCWludGVsX2JlZ2luX2NydGNfY29tbWl0KGNydGMp OwogCWludGVsX3BsYW5lLT5jb21taXRfcGxhbmUocGxhbmUsICZzdGF0ZSk7CisJaW50ZWxfZmlu aXNoX2NydGNfY29tbWl0KGNydGMpOwogCiAJaWYgKGZiICE9IG9sZF9mYiAmJiBvbGRfZmIpIHsK IAkJaWYgKGludGVsX2NydGMtPmFjdGl2ZSkKQEAgLTEyMDA5LDYgKzEyMDcxLDcgQEAgaW50ZWxf Y2hlY2tfY3Vyc29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXN0cnVjdCBkcm1f cmVjdCAqc3JjID0gJnN0YXRlLT5zcmM7CiAJY29uc3Qgc3RydWN0IGRybV9yZWN0ICpjbGlwID0g JnN0YXRlLT5jbGlwOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9m Yl9vYmooZmIpOworCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0 YyhjcnRjKTsKIAlpbnQgY3J0Y193LCBjcnRjX2g7CiAJdW5zaWduZWQgc3RyaWRlOwogCWludCBy ZXQ7CkBAIC0xMjAyNCw3ICsxMjA4Nyw3IEBAIGludGVsX2NoZWNrX2N1cnNvcl9wbGFuZShzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAogCS8qIGlmIHdlIHdhbnQgdG8gdHVybiBvZmYgdGhlIGN1 cnNvciBpZ25vcmUgd2lkdGggYW5kIGhlaWdodCAqLwogCWlmICghb2JqKQotCQlyZXR1cm4gMDsK KwkJZ290byBmaW5pc2g7CiAKIAkvKiBDaGVjayBmb3Igd2hpY2ggY3Vyc29yIHR5cGVzIHdlIHN1 cHBvcnQgKi8KIAljcnRjX3cgPSBkcm1fcmVjdF93aWR0aCgmc3RhdGUtPm9yaWdfZHN0KTsKQEAg LTEyMDUxLDYgKzEyMTE0LDE2IEBAIGludGVsX2NoZWNrX2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSwKIAl9CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAK K2ZpbmlzaDoKKwlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKSB7CisJCWlmIChpbnRlbF9jcnRjLT5j dXJzb3Jfd2lkdGggIT0KKwkJICAgIGRybV9yZWN0X3dpZHRoKCZzdGF0ZS0+b3JpZ19kc3QpKQor CQkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bSA9IHRydWU7CisKKwkJaW50ZWxfY3J0Yy0+ YXRvbWljLmZiX2JpdHMgfD0KKwkJCUlOVEVMX0ZST05UQlVGRkVSX0NVUlNPUihpbnRlbF9jcnRj LT5waXBlKTsKKwl9CisKIAlyZXR1cm4gcmV0OwogfQogCkBAIC0xMjA2Myw5ICsxMjEzNiw2IEBA IGludGVsX2NvbW1pdF9jdXJzb3JfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJc3Ry dWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCXN0cnVj dCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CiAJc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29iaihzdGF0ZS0+YmFzZS5m Yik7Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9sZF9vYmogPSBpbnRlbF9mYl9vYmoo cGxhbmUtPmZiKTsKLQllbnVtIHBpcGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7Ci0JdW5zaWdu ZWQgb2xkX3dpZHRoOwogCXVpbnQzMl90IGFkZHI7CiAKIAlwbGFuZS0+ZmIgPSBzdGF0ZS0+YmFz ZS5mYjsKQEAgLTEyMDg1LDE3ICsxMjE1NSw2IEBAIGludGVsX2NvbW1pdF9jdXJzb3JfcGxhbmUo c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJaWYgKGludGVsX2NydGMtPmN1cnNvcl9ibyA9PSBv YmopCiAJCWdvdG8gdXBkYXRlOwogCi0JLyoKLQkgKiAncHJlcGFyZScgaXMgb25seSBjYWxsZWQg d2hlbiBmYiAhPSBOVUxMOyB3ZSBzdGlsbCBuZWVkIHRvIHVwZGF0ZQotCSAqIGZyb250YnVmZmVy IHRyYWNraW5nIGZvciB0aGUgJ2Rpc2FibGUnIGNhc2UgaGVyZS4KLQkgKi8KLQlpZiAoIW9iaikg ewotCQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JCWk5MTVfZ2VtX3RyYWNrX2Zi KG9sZF9vYmosIE5VTEwsCi0JCQkJICBJTlRFTF9GUk9OVEJVRkZFUl9DVVJTT1IocGlwZSkpOwot CQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQl9Ci0KIAlpZiAoIW9iaikKIAkJ YWRkciA9IDA7CiAJZWxzZSBpZiAoIUlOVEVMX0lORk8oZGV2KS0+Y3Vyc29yX25lZWRzX3BoeXNp Y2FsKQpAQCAtMTIxMDYsMTggKzEyMTY1LDExIEBAIGludGVsX2NvbW1pdF9jdXJzb3JfcGxhbmUo c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJaW50ZWxfY3J0Yy0+Y3Vyc29yX2FkZHIgPSBhZGRy OwogCWludGVsX2NydGMtPmN1cnNvcl9ibyA9IG9iajsKIHVwZGF0ZToKLQlvbGRfd2lkdGggPSBp bnRlbF9jcnRjLT5jdXJzb3Jfd2lkdGg7Ci0KIAlpbnRlbF9jcnRjLT5jdXJzb3Jfd2lkdGggPSBk cm1fcmVjdF93aWR0aCgmc3RhdGUtPm9yaWdfZHN0KTsKIAlpbnRlbF9jcnRjLT5jdXJzb3JfaGVp Z2h0ID0gZHJtX3JlY3RfaGVpZ2h0KCZzdGF0ZS0+b3JpZ19kc3QpOwogCi0JaWYgKGludGVsX2Ny dGMtPmFjdGl2ZSkgewotCQlpZiAob2xkX3dpZHRoICE9IGludGVsX2NydGMtPmN1cnNvcl93aWR0 aCkKLQkJCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKGNydGMpOworCWlmIChpbnRlbF9jcnRjLT5h Y3RpdmUpCiAJCWludGVsX2NydGNfdXBkYXRlX2N1cnNvcihjcnRjLCBzdGF0ZS0+dmlzaWJsZSk7 Ci0KLQkJaW50ZWxfZnJvbnRidWZmZXJfZmxpcChkZXYsIElOVEVMX0ZST05UQlVGRkVSX0NVUlNP UihwaXBlKSk7Ci0JfQogfQogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9mdW5jcyBp bnRlbF9jdXJzb3JfcGxhbmVfZnVuY3MgPSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4 IDU4OGI2MTguLmEwM2JkNzIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0yNTEsNiAr MjUxLDEyIEBAIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSB7CiAJc3RydWN0IGRybV9yZWN0IG9y aWdfc3JjOwogCXN0cnVjdCBkcm1fcmVjdCBvcmlnX2RzdDsKIAlib29sIHZpc2libGU7CisKKwkv KgorCSAqIHVzZWQgb25seSBmb3Igc3ByaXRlIHBsYW5lcyB0byBkZXRlcm1pbmUgd2hlbiB0byBp bXBsaWNpdGx5CisJICogZW5hYmxlL2Rpc2FibGUgdGhlIHByaW1hcnkgcGxhbmUKKwkgKi8KKwli b29sIGhpZGVzX3ByaW1hcnk7CiB9OwogCiBzdHJ1Y3QgaW50ZWxfcGxhbmVfY29uZmlnIHsKQEAg LTQxNSw2ICs0MjEsMjcgQEAgc3RydWN0IHNrbF9waXBlX3dtIHsKIAl1aW50MzJfdCBsaW5ldGlt ZTsKIH07CiAKKy8qCisgKiBUcmFja2luZyBvZiBvcGVyYXRpb25zIHRoYXQgbmVlZCB0byBiZSBw ZXJmb3JtZWQgYXQgdGhlIGJlZ2lubmluZy9lbmQgb2YgYW4KKyAqIGF0b21pYyBjb21taXQsIG91 dHNpZGUgdGhlIGF0b21pYyBzZWN0aW9uIHdoZXJlIGludGVycnVwdHMgYXJlIGRpc2FibGVkLgor ICogVGhlc2UgYXJlIGdlbmVyYWxseSBvcGVyYXRpb25zIHRoYXQgZ3JhYiBtdXRleGVzIG9yIG1p Z2h0IG90aGVyd2lzZSBzbGVlcAorICogYW5kIHRodXMgY2FuJ3QgYmUgcnVuIHdpdGggaW50ZXJy dXB0cyBkaXNhYmxlZC4KKyAqLworc3RydWN0IGludGVsX2NydGNfYXRvbWljX2NvbW1pdCB7CisJ LyogU2xlZXBhYmxlIG9wZXJhdGlvbnMgdG8gcGVyZm9ybSBiZWZvcmUgY29tbWl0ICovCisJYm9v bCB3YWl0X2Zvcl9mbGlwczsKKwlib29sIGRpc2FibGVfZmJjOworCWJvb2wgcHJlX2Rpc2FibGVf cHJpbWFyeTsKKwlib29sIHVwZGF0ZV93bTsKKworCS8qIFNsZWVwYWJsZSBvcGVyYXRpb25zIHRv IHBlcmZvcm0gYWZ0ZXIgY29tbWl0ICovCisJdW5zaWduZWQgZmJfYml0czsKKwlib29sIHdhaXRf dmJsYW5rOworCWJvb2wgdXBkYXRlX2ZiYzsKKwlib29sIHBvc3RfZW5hYmxlX3ByaW1hcnk7CisJ dW5zaWduZWQgdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzOworfTsKKwogc3RydWN0IGludGVsX2Ny dGMgewogCXN0cnVjdCBkcm1fY3J0YyBiYXNlOwogCWVudW0gcGlwZSBwaXBlOwpAQCAtNDY4LDYg KzQ5NSw4IEBAIHN0cnVjdCBpbnRlbF9jcnRjIHsKIAogCWludCBzY2FubGluZV9vZmZzZXQ7CiAJ c3RydWN0IGludGVsX21taW9fZmxpcCBtbWlvX2ZsaXA7CisKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19h dG9taWNfY29tbWl0IGF0b21pYzsKIH07CiAKIHN0cnVjdCBpbnRlbF9wbGFuZV93bV9wYXJhbWV0 ZXJzIHsKQEAgLTEyMTMsNiArMTI0Miw4IEBAIGludCBpbnRlbF9zcHJpdGVfZ2V0X2NvbG9ya2V5 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiBib29sIGludGVsX3BpcGVfdXBk YXRlX3N0YXJ0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJICAgICB1aW50MzJfdCAqc3Rh cnRfdmJsX2NvdW50KTsKIHZvaWQgaW50ZWxfcGlwZV91cGRhdGVfZW5kKHN0cnVjdCBpbnRlbF9j cnRjICpjcnRjLCB1MzIgc3RhcnRfdmJsX2NvdW50KTsKK3ZvaWQgaW50ZWxfcG9zdF9lbmFibGVf cHJpbWFyeShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwordm9pZCBpbnRlbF9wcmVfZGlzYWJsZV9w cmltYXJ5KHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7CiAKIC8qIGludGVsX3R2LmMgKi8KIHZvaWQg aW50ZWxfdHZfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfc3ByaXRlLmMKaW5kZXggYzE4ZTU3ZC4uZmY3ZDZhMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfc3ByaXRlLmMKQEAgLTc3MSw5ICs3NzEsOCBAQCBpdmJfZGlzYWJsZV9wbGFuZShzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjKQogCSAqIEF2b2lkIHVuZGVy cnVucyB3aGVuIGRpc2FibGluZyB0aGUgc3ByaXRlLgogCSAqIEZJWE1FIHJlbW92ZSBvbmNlIHdh dGVybWFyayB1cGRhdGVzIGFyZSBkb25lIHByb3Blcmx5LgogCSAqLwotCWludGVsX3dhaXRfZm9y X3ZibGFuayhkZXYsIHBpcGUpOwotCi0JaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKHBs YW5lLCBjcnRjLCAwLCAwLCAwLCBmYWxzZSwgZmFsc2UpOworCWludGVsX2NydGMtPmF0b21pYy53 YWl0X3ZibGFuayA9IHRydWU7CisJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV9zcHJpdGVfd2F0 ZXJtYXJrcyB8PSAoMSA8PCBkcm1fcGxhbmVfaW5kZXgocGxhbmUpKTsKIH0KIAogc3RhdGljIGlu dApAQCAtOTc2LDEyICs5NzUsMTEgQEAgaWxrX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFu ZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkgKiBBdm9pZCB1bmRlcnJ1bnMgd2hl biBkaXNhYmxpbmcgdGhlIHNwcml0ZS4KIAkgKiBGSVhNRSByZW1vdmUgb25jZSB3YXRlcm1hcmsg dXBkYXRlcyBhcmUgZG9uZSBwcm9wZXJseS4KIAkgKi8KLQlpbnRlbF93YWl0X2Zvcl92Ymxhbmso ZGV2LCBwaXBlKTsKLQotCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhwbGFuZSwgY3J0 YywgMCwgMCwgMCwgZmFsc2UsIGZhbHNlKTsKKwlpbnRlbF9jcnRjLT5hdG9taWMud2FpdF92Ymxh bmsgPSB0cnVlOworCWludGVsX2NydGMtPmF0b21pYy51cGRhdGVfc3ByaXRlX3dhdGVybWFya3Mg fD0gKDEgPDwgZHJtX3BsYW5lX2luZGV4KHBsYW5lKSk7CiB9CiAKLXN0YXRpYyB2b2lkCit2b2lk CiBpbnRlbF9wb3N0X2VuYWJsZV9wcmltYXJ5KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKIAlz dHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwpAQCAtMTAwOCw3ICsxMDA2LDcgQEAg aW50ZWxfcG9zdF9lbmFibGVfcHJpbWFyeShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJbXV0ZXhf dW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiB9CiAKLXN0YXRpYyB2b2lkCit2b2lkCiBpbnRl bF9wcmVfZGlzYWJsZV9wcmltYXJ5KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwpAQCAtMTExMyw3ICsxMTExLDcgQEAgaW50ZWxf Y2hlY2tfc3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCiAJaWYgKCFmYikg ewogCQlzdGF0ZS0+dmlzaWJsZSA9IGZhbHNlOwotCQlyZXR1cm4gMDsKKwkJZ290byBmaW5pc2g7 CiAJfQogCiAJLyogRG9uJ3QgbW9kaWZ5IGFub3RoZXIgcGlwZSdzIHBsYW5lICovCkBAIC0xMjYw LDYgKzEyNTgsMjkgQEAgaW50ZWxfY2hlY2tfc3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lLAogCWRzdC0+eTEgPSBjcnRjX3k7CiAJZHN0LT55MiA9IGNydGNfeSArIGNydGNfaDsK IAorZmluaXNoOgorCS8qCisJICogSWYgdGhlIHNwcml0ZSBpcyBjb21wbGV0ZWx5IGNvdmVyaW5n IHRoZSBwcmltYXJ5IHBsYW5lLAorCSAqIHdlIGNhbiBkaXNhYmxlIHRoZSBwcmltYXJ5IGFuZCBz YXZlIHBvd2VyLgorCSAqLworCXN0YXRlLT5oaWRlc19wcmltYXJ5ID0gZHJtX3JlY3RfZXF1YWxz KGRzdCwgY2xpcCkgJiYKKwkJIWNvbG9ya2V5X2VuYWJsZWQoaW50ZWxfcGxhbmUpOworCVdBUk5f T04oc3RhdGUtPmhpZGVzX3ByaW1hcnkgJiYgIXN0YXRlLT52aXNpYmxlICYmIGludGVsX2NydGMt PmFjdGl2ZSk7CisKKwlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKSB7CisJCWlmIChpbnRlbF9jcnRj LT5wcmltYXJ5X2VuYWJsZWQgPT0gc3RhdGUtPmhpZGVzX3ByaW1hcnkpCisJCQlpbnRlbF9jcnRj LT5hdG9taWMud2FpdF9mb3JfZmxpcHMgPSB0cnVlOworCisJCWlmIChpbnRlbF9jcnRjLT5wcmlt YXJ5X2VuYWJsZWQgJiYgc3RhdGUtPmhpZGVzX3ByaW1hcnkpCisJCQlpbnRlbF9jcnRjLT5hdG9t aWMucHJlX2Rpc2FibGVfcHJpbWFyeSA9IHRydWU7CisKKwkJaW50ZWxfY3J0Yy0+YXRvbWljLmZi X2JpdHMgfD0KKwkJCUlOVEVMX0ZST05UQlVGRkVSX1NQUklURShpbnRlbF9jcnRjLT5waXBlKTsK KworCQlpZiAoIWludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCAmJiAhc3RhdGUtPmhpZGVzX3By aW1hcnkpCisJCQlpbnRlbF9jcnRjLT5hdG9taWMucG9zdF9lbmFibGVfcHJpbWFyeSA9IHRydWU7 CisJfQorCiAJcmV0dXJuIDA7CiB9CiAKQEAgLTEyNjcsMzcgKzEyODgsMTQgQEAgc3RhdGljIHZv aWQKIGludGVsX2NvbW1pdF9zcHJpdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJ CQkgIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IHBsYW5lLT5kZXY7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjID0gc3RhdGUtPmJh c2UuY3J0YzsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMo Y3J0Yyk7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5l KHBsYW5lKTsKLQllbnVtIHBpcGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CiAJc3RydWN0IGRy bV9mcmFtZWJ1ZmZlciAqZmIgPSBzdGF0ZS0+YmFzZS5mYjsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqb2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKIAlpbnQgY3J0Y194LCBjcnRjX3k7CiAJ dW5zaWduZWQgaW50IGNydGNfdywgY3J0Y19oOwogCXVpbnQzMl90IHNyY194LCBzcmNfeSwgc3Jj X3csIHNyY19oOwotCXN0cnVjdCBkcm1fcmVjdCAqZHN0ID0gJnN0YXRlLT5kc3Q7Ci0JY29uc3Qg c3RydWN0IGRybV9yZWN0ICpjbGlwID0gJnN0YXRlLT5jbGlwOwotCWJvb2wgcHJpbWFyeV9lbmFi bGVkOwotCi0JLyoKLQkgKiAncHJlcGFyZScgaXMgbmV2ZXIgY2FsbGVkIHdoZW4gcGxhbmUgaXMg YmVpbmcgZGlzYWJsZWQsIHNvIHdlIG5lZWQKLQkgKiB0byBoYW5kbGUgZnJvbnRidWZmZXIgdHJh Y2tpbmcgaGVyZQotCSAqLwotCWlmICghZmIpIHsKLQkJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3Rf bXV0ZXgpOwotCQlpOTE1X2dlbV90cmFja19mYihpbnRlbF9mYl9vYmoocGxhbmUtPmZiKSwgTlVM TCwKLQkJCQkgIElOVEVMX0ZST05UQlVGRkVSX1NQUklURShwaXBlKSk7Ci0JCW11dGV4X3VubG9j aygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCX0KLQotCS8qCi0JICogSWYgdGhlIHNwcml0ZSBpcyBj b21wbGV0ZWx5IGNvdmVyaW5nIHRoZSBwcmltYXJ5IHBsYW5lLAotCSAqIHdlIGNhbiBkaXNhYmxl IHRoZSBwcmltYXJ5IGFuZCBzYXZlIHBvd2VyLgotCSAqLwotCXByaW1hcnlfZW5hYmxlZCA9ICFk cm1fcmVjdF9lcXVhbHMoZHN0LCBjbGlwKSB8fCBjb2xvcmtleV9lbmFibGVkKGludGVsX3BsYW5l KTsKLQlXQVJOX09OKCFwcmltYXJ5X2VuYWJsZWQgJiYgIXN0YXRlLT52aXNpYmxlICYmIGludGVs X2NydGMtPmFjdGl2ZSk7CiAKIAlpbnRlbF9wbGFuZS0+Y3J0Y194ID0gc3RhdGUtPm9yaWdfZHN0 LngxOwogCWludGVsX3BsYW5lLT5jcnRjX3kgPSBzdGF0ZS0+b3JpZ19kc3QueTE7CkBAIC0xMzEw LDE1ICsxMzA4LDcgQEAgaW50ZWxfY29tbWl0X3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5l ICpwbGFuZSwKIAlpbnRlbF9wbGFuZS0+b2JqID0gb2JqOwogCiAJaWYgKGludGVsX2NydGMtPmFj dGl2ZSkgewotCQlib29sIHByaW1hcnlfd2FzX2VuYWJsZWQgPSBpbnRlbF9jcnRjLT5wcmltYXJ5 X2VuYWJsZWQ7Ci0KLQkJaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkID0gcHJpbWFyeV9lbmFi bGVkOwotCi0JCWlmIChwcmltYXJ5X3dhc19lbmFibGVkICE9IHByaW1hcnlfZW5hYmxlZCkKLQkJ CWludGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcyhjcnRjKTsKLQotCQlpZiAocHJpbWFy eV93YXNfZW5hYmxlZCAmJiAhcHJpbWFyeV9lbmFibGVkKQotCQkJaW50ZWxfcHJlX2Rpc2FibGVf cHJpbWFyeShjcnRjKTsKKwkJaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkID0gIXN0YXRlLT5o aWRlc19wcmltYXJ5OwogCiAJCWlmIChzdGF0ZS0+dmlzaWJsZSkgewogCQkJY3J0Y194ID0gc3Rh dGUtPmRzdC54MTsKQEAgLTEzMzUsMTIgKzEzMjUsNiBAQCBpbnRlbF9jb21taXRfc3ByaXRlX3Bs YW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQl9IGVsc2UgewogCQkJaW50ZWxfcGxhbmUt PmRpc2FibGVfcGxhbmUocGxhbmUsIGNydGMpOwogCQl9Ci0KLQotCQlpbnRlbF9mcm9udGJ1ZmZl cl9mbGlwKGRldiwgSU5URUxfRlJPTlRCVUZGRVJfU1BSSVRFKHBpcGUpKTsKLQotCQlpZiAoIXBy aW1hcnlfd2FzX2VuYWJsZWQgJiYgcHJpbWFyeV9lbmFibGVkKQotCQkJaW50ZWxfcG9zdF9lbmFi bGVfcHJpbWFyeShjcnRjKTsKIAl9CiB9CiAKLS0gCjEuOC41LjEKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==