From: Matt Roper Subject: [PATCH 1/5] drm/i915: Refactor work that can sleep out of commit (v7) Date: Wed, 24 Dec 2014 07:59:06 -0800 Message-ID: <1419436746-5928-1-git-send-email-matthew.d.roper@intel.com> References: <1419360113-10972-2-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 62E8189D7C for ; Wed, 24 Dec 2014 07:59:16 -0800 (PST) In-Reply-To: <1419360113-10972-2-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 bGVlcCwgd2hpY2ggd2UgY2FuJ3QgZG8gd2l0aCBpbnRlcnJ1cHRzCiAgIGRpc2FibGVkLgoKdjc6 CiAtIENoZWNrIGZvciBmYiAhPSBOVUxMIHdoZW4gZGVjaWRpbmcgd2hldGhlciB0aGUgc3ByaXRl IHBsYW5lIGhpZGVzIHRoZQogICBwcmltYXJ5IHBsYW5lIGR1cmluZyBhIHNwcml0ZSB1cGRhdGUu ICAoUFJUUykKClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRl bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTk5ICsr KysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaCAgICAgfCAgMzEgKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9z cHJpdGUuYyAgfCAgOTggKysrKysrKystLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjA5IGlu c2VydGlvbnMoKyksIDExOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKaW5kZXggYTAzOTU1ZC4uNmJkNDRmMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwpAQCAtMjE2NSw3ICsyMTY1LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfZGlzYWJsZV9w cmltYXJ5X2h3X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2Ny dGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCi0JYXNzZXJ0X3BpcGVfZW5h YmxlZChkZXZfcHJpdiwgaW50ZWxfY3J0Yy0+cGlwZSk7CisJaWYgKFdBUk5fT04oIWludGVsX2Ny dGMtPmFjdGl2ZSkpCisJCXJldHVybjsKIAogCWlmICghaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFi bGVkKQogCQlyZXR1cm47CkBAIC0xMTczNyw3ICsxMTczOCwxMSBAQCBzdGF0aWMgaW50CiBpbnRl bF9jaGVja19wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJICBzdHJ1 Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKQogeworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSBwbGFuZS0+ZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjID0gc3RhdGUtPmJhc2UuY3J0YzsK KwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJ c3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsK IAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHN0YXRlLT5iYXNlLmZiOwogCXN0cnVjdCBk cm1fcmVjdCAqZGVzdCA9ICZzdGF0ZS0+ZHN0OwogCXN0cnVjdCBkcm1fcmVjdCAqc3JjID0gJnN0 YXRlLT5zcmM7CkBAIC0xMTc1MiwxMCArMTE3NTcsNDAgQEAgaW50ZWxfY2hlY2tfcHJpbWFyeV9w bGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0Owog Ci0JaW50ZWxfY3J0Y193YWl0X2Zvcl9wZW5kaW5nX2ZsaXBzKGNydGMpOwotCWlmIChpbnRlbF9j cnRjX2hhc19wZW5kaW5nX2ZsaXAoY3J0YykpIHsKLQkJRFJNX0VSUk9SKCJwaXBlIGlzIHN0aWxs IGJ1c3kgd2l0aCBhbiBvbGQgcGFnZWZsaXBcbiIpOwotCQlyZXR1cm4gLUVCVVNZOworCWlmIChp bnRlbF9jcnRjLT5hY3RpdmUpIHsKKwkJaW50ZWxfY3J0Yy0+YXRvbWljLndhaXRfZm9yX2ZsaXBz ID0gdHJ1ZTsKKworCQkvKgorCQkgKiBGQkMgZG9lcyBub3Qgd29yayBvbiBzb21lIHBsYXRmb3Jt cyBmb3Igcm90YXRlZAorCQkgKiBwbGFuZXMsIHNvIGRpc2FibGUgaXQgd2hlbiByb3RhdGlvbiBp cyBub3QgMCBhbmQKKwkJICogdXBkYXRlIGl0IHdoZW4gcm90YXRpb24gaXMgc2V0IGJhY2sgdG8g MC4KKwkJICoKKwkJICogRklYTUU6IFRoaXMgaXMgcmVkdW5kYW50IHdpdGggdGhlIGZiYyB1cGRh dGUgZG9uZSBpbgorCQkgKiB0aGUgcHJpbWFyeSBwbGFuZSBlbmFibGUgZnVuY3Rpb24gZXhjZXB0 IHRoYXQgdGhhdAorCQkgKiBvbmUgaXMgZG9uZSB0b28gbGF0ZS4gV2UgZXZlbnR1YWxseSBuZWVk IHRvIHVuaWZ5CisJCSAqIHRoaXMuCisJCSAqLworCQlpZiAoaW50ZWxfY3J0Yy0+cHJpbWFyeV9l bmFibGVkICYmCisJCSAgICBJTlRFTF9JTkZPKGRldiktPmdlbiA8PSA0ICYmICFJU19HNFgoZGV2 KSAmJgorCQkgICAgZGV2X3ByaXYtPmZiYy5wbGFuZSA9PSBpbnRlbF9jcnRjLT5wbGFuZSAmJgor CQkgICAgaW50ZWxfcGxhbmUtPnJvdGF0aW9uICE9IEJJVChEUk1fUk9UQVRFXzApKSB7CisJCQlp bnRlbF9jcnRjLT5hdG9taWMuZGlzYWJsZV9mYmMgPSB0cnVlOworCQl9CisKKwkJaWYgKHN0YXRl LT52aXNpYmxlKSB7CisJCQkvKgorCQkJICogQkRXIHNpZ25hbHMgZmxpcCBkb25lIGltbWVkaWF0 ZWx5IGlmIHRoZSBwbGFuZQorCQkJICogaXMgZGlzYWJsZWQsIGV2ZW4gaWYgdGhlIHBsYW5lIGVu YWJsZSBpcyBhbHJlYWR5CisJCQkgKiBhcm1lZCB0byBvY2N1ciBhdCB0aGUgbmV4dCB2Ymxhbmsg OigKKwkJCSAqLworCQkJaWYgKElTX0JST0FEV0VMTChkZXYpICYmICFpbnRlbF9jcnRjLT5wcmlt YXJ5X2VuYWJsZWQpCisJCQkJaW50ZWxfY3J0Yy0+YXRvbWljLndhaXRfdmJsYW5rID0gdHJ1ZTsK KwkJfQorCisJCWludGVsX2NydGMtPmF0b21pYy5mYl9iaXRzIHw9CisJCQlJTlRFTF9GUk9OVEJV RkZFUl9QUklNQVJZKGludGVsX2NydGMtPnBpcGUpOworCisJCWludGVsX2NydGMtPmF0b21pYy51 cGRhdGVfZmJjID0gdHJ1ZTsKIAl9CiAKIAlyZXR1cm4gMDsKQEAgLTExNzczLDE4ICsxMTgwOCw2 IEBAIGludGVsX2NvbW1pdF9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAog CXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooZmIpOwogCXN0 cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CiAJ c3RydWN0IGRybV9yZWN0ICpzcmMgPSAmc3RhdGUtPnNyYzsKLQllbnVtIHBpcGUgcGlwZSA9IGlu dGVsX3BsYW5lLT5waXBlOwotCi0JaWYgKCFmYikgewotCQkvKgotCQkgKiAncHJlcGFyZScgaXMg bmV2ZXIgY2FsbGVkIHdoZW4gcGxhbmUgaXMgYmVpbmcgZGlzYWJsZWQsIHNvCi0JCSAqIHdlIG5l ZWQgdG8gaGFuZGxlIGZyb250YnVmZmVyIHRyYWNraW5nIGhlcmUKLQkJICovCi0JCW11dGV4X2xv Y2soJmRldi0+c3RydWN0X211dGV4KTsKLQkJaTkxNV9nZW1fdHJhY2tfZmIoaW50ZWxfZmJfb2Jq KHBsYW5lLT5mYiksIE5VTEwsCi0JCQkJICBJTlRFTF9GUk9OVEJVRkZFUl9QUklNQVJZKHBpcGUp KTsKLQkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JfQogCiAJcGxhbmUtPmZi ID0gZmI7CiAJY3J0Yy0+eCA9IHNyYy0+eDEgPj4gMTY7CkBAIC0xMTgwMSwyNiArMTE4MjQsNyBA QCBpbnRlbF9jb21taXRfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlp bnRlbF9wbGFuZS0+b2JqID0gb2JqOwogCiAJaWYgKGludGVsX2NydGMtPmFjdGl2ZSkgewotCQkv KgotCQkgKiBGQkMgZG9lcyBub3Qgd29yayBvbiBzb21lIHBsYXRmb3JtcyBmb3Igcm90YXRlZAot CQkgKiBwbGFuZXMsIHNvIGRpc2FibGUgaXQgd2hlbiByb3RhdGlvbiBpcyBub3QgMCBhbmQKLQkJ ICogdXBkYXRlIGl0IHdoZW4gcm90YXRpb24gaXMgc2V0IGJhY2sgdG8gMC4KLQkJICoKLQkJICog RklYTUU6IFRoaXMgaXMgcmVkdW5kYW50IHdpdGggdGhlIGZiYyB1cGRhdGUgZG9uZSBpbgotCQkg KiB0aGUgcHJpbWFyeSBwbGFuZSBlbmFibGUgZnVuY3Rpb24gZXhjZXB0IHRoYXQgdGhhdAotCQkg KiBvbmUgaXMgZG9uZSB0b28gbGF0ZS4gV2UgZXZlbnR1YWxseSBuZWVkIHRvIHVuaWZ5Ci0JCSAq IHRoaXMuCi0JCSAqLwotCQlpZiAoaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkICYmCi0JCSAg ICBJTlRFTF9JTkZPKGRldiktPmdlbiA8PSA0ICYmICFJU19HNFgoZGV2KSAmJgotCQkgICAgZGV2 X3ByaXYtPmZiYy5wbGFuZSA9PSBpbnRlbF9jcnRjLT5wbGFuZSAmJgotCQkgICAgaW50ZWxfcGxh bmUtPnJvdGF0aW9uICE9IEJJVChEUk1fUk9UQVRFXzApKSB7Ci0JCQlpbnRlbF9mYmNfZGlzYWJs ZShkZXYpOwotCQl9Ci0KIAkJaWYgKHN0YXRlLT52aXNpYmxlKSB7Ci0JCQlib29sIHdhc19lbmFi bGVkID0gaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkOwotCiAJCQkvKiBGSVhNRToga2lsbCB0 aGlzIGZhc3Rib290IGhhY2sgKi8KIAkJCWludGVsX3VwZGF0ZV9waXBlX3NpemUoaW50ZWxfY3J0 Yyk7CiAKQEAgLTExODI4LDE0ICsxMTgzMiw2IEBAIGludGVsX2NvbW1pdF9wcmltYXJ5X3BsYW5l KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCiAJCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVf cHJpbWFyeV9wbGFuZShjcnRjLCBwbGFuZS0+ZmIsCiAJCQkJCWNydGMtPngsIGNydGMtPnkpOwot Ci0JCQkvKgotCQkJICogQkRXIHNpZ25hbHMgZmxpcCBkb25lIGltbWVkaWF0ZWx5IGlmIHRoZSBw bGFuZQotCQkJICogaXMgZGlzYWJsZWQsIGV2ZW4gaWYgdGhlIHBsYW5lIGVuYWJsZSBpcyBhbHJl YWR5Ci0JCQkgKiBhcm1lZCB0byBvY2N1ciBhdCB0aGUgbmV4dCB2YmxhbmsgOigKLQkJCSAqLwot CQkJaWYgKElTX0JST0FEV0VMTChkZXYpICYmICF3YXNfZW5hYmxlZCkKLQkJCQlpbnRlbF93YWl0 X2Zvcl92YmxhbmsoZGV2LCBpbnRlbF9jcnRjLT5waXBlKTsKIAkJfSBlbHNlIHsKIAkJCS8qCiAJ CQkgKiBJZiBjbGlwcGluZyByZXN1bHRzIGluIGEgbm9uLXZpc2libGUgcHJpbWFyeSBwbGFuZSwK QEAgLTExODQ2LDEzICsxMTg0Miw1OSBAQCBpbnRlbF9jb21taXRfcHJpbWFyeV9wbGFuZShzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCSAqLwogCQkJaW50ZWxfZGlzYWJsZV9wcmltYXJ5X2h3 X3BsYW5lKHBsYW5lLCBjcnRjKTsKIAkJfQorCX0KK30KKworc3RhdGljIHZvaWQgaW50ZWxfYmVn aW5fY3J0Y19jb21taXQoc3RydWN0IGRybV9jcnRjICpjcnRjKQoreworCXN0cnVjdCBkcm1fZGV2 aWNlICpkZXYgPSBjcnRjLT5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRv X2ludGVsX2NydGMoY3J0Yyk7CiAKLQkJaW50ZWxfZnJvbnRidWZmZXJfZmxpcChkZXYsIElOVEVM X0ZST05UQlVGRkVSX1BSSU1BUlkocGlwZSkpOworCWlmIChpbnRlbF9jcnRjLT5hdG9taWMud2Fp dF9mb3JfZmxpcHMpCisJCWludGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcyhjcnRjKTsK IAorCWlmIChpbnRlbF9jcnRjLT5hdG9taWMuZGlzYWJsZV9mYmMpCisJCWludGVsX2ZiY19kaXNh YmxlKGRldik7CisKKwlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLnByZV9kaXNhYmxlX3ByaW1hcnkp CisJCWludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnkoY3J0Yyk7CisKKwlpZiAoaW50ZWxfY3J0Yy0+ YXRvbWljLnVwZGF0ZV93bSkKKwkJaW50ZWxfdXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7CisKKwlp bnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7Cit9CisKK3N0YXRpYyB2b2lkIGludGVsX2Zp bmlzaF9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCit7CisJc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IGNydGMtPmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSBkZXYtPmRldl9wcml2YXRlOworCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0g dG9faW50ZWxfY3J0YyhjcnRjKTsKKwlzdHJ1Y3QgZHJtX3BsYW5lICpwOworCisJaW50ZWxfcnVu dGltZV9wbV9wdXQoZGV2X3ByaXYpOworCisJaWYgKGludGVsX2NydGMtPmF0b21pYy53YWl0X3Zi bGFuaykKKwkJaW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRldiwgaW50ZWxfY3J0Yy0+cGlwZSk7CisK KwlpbnRlbF9mcm9udGJ1ZmZlcl9mbGlwKGRldiwgaW50ZWxfY3J0Yy0+YXRvbWljLmZiX2JpdHMp OworCisJaWYgKGludGVsX2NydGMtPmF0b21pYy51cGRhdGVfZmJjKSB7CiAJCW11dGV4X2xvY2so JmRldi0+c3RydWN0X211dGV4KTsKIAkJaW50ZWxfZmJjX3VwZGF0ZShkZXYpOwogCQltdXRleF91 bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAl9CisKKwlpZiAoaW50ZWxfY3J0Yy0+YXRvbWlj LnBvc3RfZW5hYmxlX3ByaW1hcnkpCisJCWludGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoY3J0Yyk7 CisKKwlkcm1fZm9yX2VhY2hfbGVnYWN5X3BsYW5lKHAsICZkZXYtPm1vZGVfY29uZmlnLnBsYW5l X2xpc3QpCisJCWlmIChpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtz ICYgZHJtX3BsYW5lX2luZGV4KHApKQorCQkJaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtz KHAsIGNydGMsIDAsIDAsIDAsCisJCQkJCQkgICAgICAgZmFsc2UsIGZhbHNlKTsKKworCW1lbXNl dCgmaW50ZWxfY3J0Yy0+YXRvbWljLCAwLCBzaXplb2YoaW50ZWxfY3J0Yy0+YXRvbWljKSk7CiB9 CiAKIGludApAQCAtMTE4NjMsOSArMTE5MDUsOCBAQCBpbnRlbF91cGRhdGVfcGxhbmUoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJICAgdWludDMyX3Qg c3JjX3csIHVpbnQzMl90IHNyY19oKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFu ZS0+ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3By aXZhdGU7CiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqb2xkX2ZiID0gcGxhbmUtPmZiOwotCXN0 cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSBzdGF0ZTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUg c3RhdGUgPSB7eyAwIH19OwogCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19p bnRlbF9wbGFuZShwbGFuZSk7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19p bnRlbF9jcnRjKGNydGMpOwogCWludCByZXQ7CkBAIC0xMTkwMyw5ICsxMTk0NCwzMyBAQCBpbnRl bF91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywKIAkJCXJldHVybiByZXQ7CiAJfQogCi0JaW50ZWxfcnVudGltZV9wbV9nZXQoZGV2X3By aXYpOworCWlmICghc3RhdGUuYmFzZS5mYikgeworCQl1bnNpZ25lZCBmYl9iaXRzID0gMDsKKwor CQlzd2l0Y2ggKHBsYW5lLT50eXBlKSB7CisJCWNhc2UgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWToK KwkJCWZiX2JpdHMgPSBJTlRFTF9GUk9OVEJVRkZFUl9QUklNQVJZKGludGVsX3BsYW5lLT5waXBl KTsKKwkJCWJyZWFrOworCQljYXNlIERSTV9QTEFORV9UWVBFX0NVUlNPUjoKKwkJCWZiX2JpdHMg PSBJTlRFTF9GUk9OVEJVRkZFUl9DVVJTT1IoaW50ZWxfcGxhbmUtPnBpcGUpOworCQkJYnJlYWs7 CisJCWNhc2UgRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWToKKwkJCWZiX2JpdHMgPSBJTlRFTF9GUk9O VEJVRkZFUl9TUFJJVEUoaW50ZWxfcGxhbmUtPnBpcGUpOworCQkJYnJlYWs7CisJCX0KKworCQkv KgorCQkgKiAncHJlcGFyZScgaXMgbmV2ZXIgY2FsbGVkIHdoZW4gcGxhbmUgaXMgYmVpbmcgZGlz YWJsZWQsIHNvCisJCSAqIHdlIG5lZWQgdG8gaGFuZGxlIGZyb250YnVmZmVyIHRyYWNraW5nIGhl cmUKKwkJICovCisJCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKKwkJaTkxNV9nZW1f dHJhY2tfZmIoaW50ZWxfZmJfb2JqKHBsYW5lLT5mYiksIE5VTEwsIGZiX2JpdHMpOworCQltdXRl eF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKKwl9CisKKwlpbnRlbF9iZWdpbl9jcnRjX2Nv bW1pdChjcnRjKTsKIAlpbnRlbF9wbGFuZS0+Y29tbWl0X3BsYW5lKHBsYW5lLCAmc3RhdGUpOwot CWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKKwlpbnRlbF9maW5pc2hfY3J0Y19jb21t aXQoY3J0Yyk7CiAKIAlpZiAoZmIgIT0gb2xkX2ZiICYmIG9sZF9mYikgewogCQlpZiAoaW50ZWxf Y3J0Yy0+YWN0aXZlKQpAQCAtMTIwMTIsNiArMTIwNzcsNyBAQCBpbnRlbF9jaGVja19jdXJzb3Jf cGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJc3RydWN0IGRybV9yZWN0ICpzcmMgPSAm c3RhdGUtPnNyYzsKIAljb25zdCBzdHJ1Y3QgZHJtX3JlY3QgKmNsaXAgPSAmc3RhdGUtPmNsaXA7 CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29iaihmYik7CisJ c3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCWlu dCBjcnRjX3csIGNydGNfaDsKIAl1bnNpZ25lZCBzdHJpZGU7CiAJaW50IHJldDsKQEAgLTEyMDI3 LDcgKzEyMDkzLDcgQEAgaW50ZWxfY2hlY2tfY3Vyc29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lLAogCiAJLyogaWYgd2Ugd2FudCB0byB0dXJuIG9mZiB0aGUgY3Vyc29yIGlnbm9yZSB3 aWR0aCBhbmQgaGVpZ2h0ICovCiAJaWYgKCFvYmopCi0JCXJldHVybiAwOworCQlnb3RvIGZpbmlz aDsKIAogCS8qIENoZWNrIGZvciB3aGljaCBjdXJzb3IgdHlwZXMgd2Ugc3VwcG9ydCAqLwogCWNy dGNfdyA9IGRybV9yZWN0X3dpZHRoKCZzdGF0ZS0+b3JpZ19kc3QpOwpAQCAtMTIwNTQsNiArMTIx MjAsMTYgQEAgaW50ZWxfY2hlY2tfY3Vyc29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5l LAogCX0KIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAorZmluaXNoOgorCWlm IChpbnRlbF9jcnRjLT5hY3RpdmUpIHsKKwkJaWYgKGludGVsX2NydGMtPmN1cnNvcl93aWR0aCAh PQorCQkgICAgZHJtX3JlY3Rfd2lkdGgoJnN0YXRlLT5vcmlnX2RzdCkpCisJCQlpbnRlbF9jcnRj LT5hdG9taWMudXBkYXRlX3dtID0gdHJ1ZTsKKworCQlpbnRlbF9jcnRjLT5hdG9taWMuZmJfYml0 cyB8PQorCQkJSU5URUxfRlJPTlRCVUZGRVJfQ1VSU09SKGludGVsX2NydGMtPnBpcGUpOworCX0K KwogCXJldHVybiByZXQ7CiB9CiAKQEAgLTEyMDY2LDkgKzEyMTQyLDYgQEAgaW50ZWxfY29tbWl0 X2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlzdHJ1Y3QgaW50ZWxfY3J0 YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJc3RydWN0IGludGVsX3BsYW5l ICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKIAlzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJfb2JqKHN0YXRlLT5iYXNlLmZiKTsKLQlzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqb2xkX29iaiA9IGludGVsX2ZiX29iaihwbGFuZS0+ZmIpOwot CWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKLQl1bnNpZ25lZCBvbGRfd2lkdGg7 CiAJdWludDMyX3QgYWRkcjsKIAogCXBsYW5lLT5mYiA9IHN0YXRlLT5iYXNlLmZiOwpAQCAtMTIw ODgsMTcgKzEyMTYxLDYgQEAgaW50ZWxfY29tbWl0X2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwKIAlpZiAoaW50ZWxfY3J0Yy0+Y3Vyc29yX2JvID09IG9iaikKIAkJZ290byB1 cGRhdGU7CiAKLQkvKgotCSAqICdwcmVwYXJlJyBpcyBvbmx5IGNhbGxlZCB3aGVuIGZiICE9IE5V TEw7IHdlIHN0aWxsIG5lZWQgdG8gdXBkYXRlCi0JICogZnJvbnRidWZmZXIgdHJhY2tpbmcgZm9y IHRoZSAnZGlzYWJsZScgY2FzZSBoZXJlLgotCSAqLwotCWlmICghb2JqKSB7Ci0JCW11dGV4X2xv Y2soJmRldi0+c3RydWN0X211dGV4KTsKLQkJaTkxNV9nZW1fdHJhY2tfZmIob2xkX29iaiwgTlVM TCwKLQkJCQkgIElOVEVMX0ZST05UQlVGRkVSX0NVUlNPUihwaXBlKSk7Ci0JCW11dGV4X3VubG9j aygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCX0KLQogCWlmICghb2JqKQogCQlhZGRyID0gMDsKIAll bHNlIGlmICghSU5URUxfSU5GTyhkZXYpLT5jdXJzb3JfbmVlZHNfcGh5c2ljYWwpCkBAIC0xMjEw OSwxOCArMTIxNzEsMTEgQEAgaW50ZWxfY29tbWl0X2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwKIAlpbnRlbF9jcnRjLT5jdXJzb3JfYWRkciA9IGFkZHI7CiAJaW50ZWxfY3J0 Yy0+Y3Vyc29yX2JvID0gb2JqOwogdXBkYXRlOgotCW9sZF93aWR0aCA9IGludGVsX2NydGMtPmN1 cnNvcl93aWR0aDsKLQogCWludGVsX2NydGMtPmN1cnNvcl93aWR0aCA9IGRybV9yZWN0X3dpZHRo KCZzdGF0ZS0+b3JpZ19kc3QpOwogCWludGVsX2NydGMtPmN1cnNvcl9oZWlnaHQgPSBkcm1fcmVj dF9oZWlnaHQoJnN0YXRlLT5vcmlnX2RzdCk7CiAKLQlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKSB7 Ci0JCWlmIChvbGRfd2lkdGggIT0gaW50ZWxfY3J0Yy0+Y3Vyc29yX3dpZHRoKQotCQkJaW50ZWxf dXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7CisJaWYgKGludGVsX2NydGMtPmFjdGl2ZSkKIAkJaW50 ZWxfY3J0Y191cGRhdGVfY3Vyc29yKGNydGMsIHN0YXRlLT52aXNpYmxlKTsKLQotCQlpbnRlbF9m cm9udGJ1ZmZlcl9mbGlwKGRldiwgSU5URUxfRlJPTlRCVUZGRVJfQ1VSU09SKHBpcGUpKTsKLQl9 CiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGludGVsX2N1cnNvcl9w bGFuZV9mdW5jcyA9IHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggNTg4YjYxOC4uYTAz YmQ3MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTI1MSw2ICsyNTEsMTIgQEAgc3Ry dWN0IGludGVsX3BsYW5lX3N0YXRlIHsKIAlzdHJ1Y3QgZHJtX3JlY3Qgb3JpZ19zcmM7CiAJc3Ry dWN0IGRybV9yZWN0IG9yaWdfZHN0OwogCWJvb2wgdmlzaWJsZTsKKworCS8qCisJICogdXNlZCBv bmx5IGZvciBzcHJpdGUgcGxhbmVzIHRvIGRldGVybWluZSB3aGVuIHRvIGltcGxpY2l0bHkKKwkg KiBlbmFibGUvZGlzYWJsZSB0aGUgcHJpbWFyeSBwbGFuZQorCSAqLworCWJvb2wgaGlkZXNfcHJp bWFyeTsKIH07CiAKIHN0cnVjdCBpbnRlbF9wbGFuZV9jb25maWcgewpAQCAtNDE1LDYgKzQyMSwy NyBAQCBzdHJ1Y3Qgc2tsX3BpcGVfd20gewogCXVpbnQzMl90IGxpbmV0aW1lOwogfTsKIAorLyoK KyAqIFRyYWNraW5nIG9mIG9wZXJhdGlvbnMgdGhhdCBuZWVkIHRvIGJlIHBlcmZvcm1lZCBhdCB0 aGUgYmVnaW5uaW5nL2VuZCBvZiBhbgorICogYXRvbWljIGNvbW1pdCwgb3V0c2lkZSB0aGUgYXRv bWljIHNlY3Rpb24gd2hlcmUgaW50ZXJydXB0cyBhcmUgZGlzYWJsZWQuCisgKiBUaGVzZSBhcmUg Z2VuZXJhbGx5IG9wZXJhdGlvbnMgdGhhdCBncmFiIG11dGV4ZXMgb3IgbWlnaHQgb3RoZXJ3aXNl IHNsZWVwCisgKiBhbmQgdGh1cyBjYW4ndCBiZSBydW4gd2l0aCBpbnRlcnJ1cHRzIGRpc2FibGVk LgorICovCitzdHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNfY29tbWl0IHsKKwkvKiBTbGVlcGFibGUg b3BlcmF0aW9ucyB0byBwZXJmb3JtIGJlZm9yZSBjb21taXQgKi8KKwlib29sIHdhaXRfZm9yX2Zs aXBzOworCWJvb2wgZGlzYWJsZV9mYmM7CisJYm9vbCBwcmVfZGlzYWJsZV9wcmltYXJ5OworCWJv b2wgdXBkYXRlX3dtOworCisJLyogU2xlZXBhYmxlIG9wZXJhdGlvbnMgdG8gcGVyZm9ybSBhZnRl ciBjb21taXQgKi8KKwl1bnNpZ25lZCBmYl9iaXRzOworCWJvb2wgd2FpdF92Ymxhbms7CisJYm9v bCB1cGRhdGVfZmJjOworCWJvb2wgcG9zdF9lbmFibGVfcHJpbWFyeTsKKwl1bnNpZ25lZCB1cGRh dGVfc3ByaXRlX3dhdGVybWFya3M7Cit9OworCiBzdHJ1Y3QgaW50ZWxfY3J0YyB7CiAJc3RydWN0 IGRybV9jcnRjIGJhc2U7CiAJZW51bSBwaXBlIHBpcGU7CkBAIC00NjgsNiArNDk1LDggQEAgc3Ry dWN0IGludGVsX2NydGMgewogCiAJaW50IHNjYW5saW5lX29mZnNldDsKIAlzdHJ1Y3QgaW50ZWxf bW1pb19mbGlwIG1taW9fZmxpcDsKKworCXN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQg YXRvbWljOwogfTsKIAogc3RydWN0IGludGVsX3BsYW5lX3dtX3BhcmFtZXRlcnMgewpAQCAtMTIx Myw2ICsxMjQyLDggQEAgaW50IGludGVsX3Nwcml0ZV9nZXRfY29sb3JrZXkoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIGJvb2wgaW50ZWxfcGlwZV91cGRhdGVfc3RhcnQoc3Ry dWN0IGludGVsX2NydGMgKmNydGMsCiAJCQkgICAgIHVpbnQzMl90ICpzdGFydF92YmxfY291bnQp Owogdm9pZCBpbnRlbF9waXBlX3VwZGF0ZV9lbmQoc3RydWN0IGludGVsX2NydGMgKmNydGMsIHUz MiBzdGFydF92YmxfY291bnQpOwordm9pZCBpbnRlbF9wb3N0X2VuYWJsZV9wcmltYXJ5KHN0cnVj dCBkcm1fY3J0YyAqY3J0Yyk7Cit2b2lkIGludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnkoc3RydWN0 IGRybV9jcnRjICpjcnRjKTsKIAogLyogaW50ZWxfdHYuYyAqLwogdm9pZCBpbnRlbF90dl9pbml0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpp bmRleCBjMThlNTdkLi4zZTZlOTVmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpA QCAtNzcxLDkgKzc3MSw4IEBAIGl2Yl9kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBs YW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJICogQXZvaWQgdW5kZXJydW5zIHdoZW4gZGlz YWJsaW5nIHRoZSBzcHJpdGUuCiAJICogRklYTUUgcmVtb3ZlIG9uY2Ugd2F0ZXJtYXJrIHVwZGF0 ZXMgYXJlIGRvbmUgcHJvcGVybHkuCiAJICovCi0JaW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRldiwg cGlwZSk7Ci0KLQlpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3MocGxhbmUsIGNydGMsIDAs IDAsIDAsIGZhbHNlLCBmYWxzZSk7CisJaW50ZWxfY3J0Yy0+YXRvbWljLndhaXRfdmJsYW5rID0g dHJ1ZTsKKwlpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzIHw9ICgx IDw8IGRybV9wbGFuZV9pbmRleChwbGFuZSkpOwogfQogCiBzdGF0aWMgaW50CkBAIC05NzYsMTIg Kzk3NSwyMSBAQCBpbGtfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3Ry dWN0IGRybV9jcnRjICpjcnRjKQogCSAqIEF2b2lkIHVuZGVycnVucyB3aGVuIGRpc2FibGluZyB0 aGUgc3ByaXRlLgogCSAqIEZJWE1FIHJlbW92ZSBvbmNlIHdhdGVybWFyayB1cGRhdGVzIGFyZSBk b25lIHByb3Blcmx5LgogCSAqLwotCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIHBpcGUpOwot Ci0JaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKHBsYW5lLCBjcnRjLCAwLCAwLCAwLCBm YWxzZSwgZmFsc2UpOworCWludGVsX2NydGMtPmF0b21pYy53YWl0X3ZibGFuayA9IHRydWU7CisJ aW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyB8PSAoMSA8PCBkcm1f cGxhbmVfaW5kZXgocGxhbmUpKTsKIH0KIAotc3RhdGljIHZvaWQKKy8qKgorICogaW50ZWxfcG9z dF9lbmFibGVfcHJpbWFyeSAtIFBlcmZvcm0gb3BlcmF0aW9ucyBhZnRlciBlbmFibGluZyBwcmlt YXJ5IHBsYW5lCisgKiBAY3J0YzogdGhlIENSVEMgd2hvc2UgcHJpbWFyeSBwbGFuZSB3YXMganVz dCBlbmFibGVkCisgKgorICogUGVyZm9ybXMgcG90ZW50aWFsbHkgc2xlZXBpbmcgb3BlcmF0aW9u cyB0aGF0IG11c3QgYmUgZG9uZSBhZnRlciB0aGUgcHJpbWFyeQorICogcGxhbmUgaXMgZW5hYmxl ZCwgc3VjaCBhcyB1cGRhdGluZyBGQkMgYW5kIElQUy4gIE5vdGUgdGhhdCB0aGlzIG1heSBiZQor ICogY2FsbGVkIGR1ZSB0byBhbiBleHBsaWNpdCBwcmltYXJ5IHBsYW5lIHVwZGF0ZSwgb3IgZHVl IHRvIGFuIGltcGxpY2l0CisgKiByZS1lbmFibGUgdGhhdCBpcyBjYXVzZWQgd2hlbiBhIHNwcml0 ZSBwbGFuZSBpcyB1cGRhdGVkIHRvIG5vIGxvbmdlcgorICogY29tcGxldGVseSBoaWRlIHRoZSBw cmltYXJ5IHBsYW5lLgorICovCit2b2lkCiBpbnRlbF9wb3N0X2VuYWJsZV9wcmltYXJ5KHN0cnVj dCBkcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2 OwpAQCAtMTAwOCw3ICsxMDE2LDE3IEBAIGludGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoc3RydWN0 IGRybV9jcnRjICpjcnRjKQogCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogfQog Ci1zdGF0aWMgdm9pZAorLyoqCisgKiBpbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5IC0gUGVyZm9y bSBvcGVyYXRpb25zIGJlZm9yZSBkaXNhYmxpbmcgcHJpbWFyeSBwbGFuZQorICogQGNydGM6IHRo ZSBDUlRDIHdob3NlIHByaW1hcnkgcGxhbmUgaXMgdG8gYmUgZGlzYWJsZWQKKyAqCisgKiBQZXJm b3JtcyBwb3RlbnRpYWxseSBzbGVlcGluZyBvcGVyYXRpb25zIHRoYXQgbXVzdCBiZSBkb25lIGJl Zm9yZSB0aGUKKyAqIHByaW1hcnkgcGxhbmUgaXMgZW5hYmxlZCwgc3VjaCBhcyB1cGRhdGluZyBG QkMgYW5kIElQUy4gIE5vdGUgdGhhdCB0aGlzIG1heQorICogYmUgY2FsbGVkIGR1ZSB0byBhbiBl eHBsaWNpdCBwcmltYXJ5IHBsYW5lIHVwZGF0ZSwgb3IgZHVlIHRvIGFuIGltcGxpY2l0CisgKiBk aXNhYmxlIHRoYXQgaXMgY2F1c2VkIHdoZW4gYSBzcHJpdGUgcGxhbmUgY29tcGxldGVseSBoaWRl cyB0aGUgcHJpbWFyeQorICogcGxhbmUuCisgKi8KK3ZvaWQKIGludGVsX3ByZV9kaXNhYmxlX3By aW1hcnkoc3RydWN0IGRybV9jcnRjICpjcnRjKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSBjcnRjLT5kZXY7CkBAIC0xMTEzLDcgKzExMzEsNyBAQCBpbnRlbF9jaGVja19zcHJpdGVfcGxh bmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAKIAlpZiAoIWZiKSB7CiAJCXN0YXRlLT52aXNp YmxlID0gZmFsc2U7Ci0JCXJldHVybiAwOworCQlnb3RvIGZpbmlzaDsKIAl9CiAKIAkvKiBEb24n dCBtb2RpZnkgYW5vdGhlciBwaXBlJ3MgcGxhbmUgKi8KQEAgLTEyNjAsNiArMTI3OCwyOSBAQCBp bnRlbF9jaGVja19zcHJpdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJZHN0LT55 MSA9IGNydGNfeTsKIAlkc3QtPnkyID0gY3J0Y195ICsgY3J0Y19oOwogCitmaW5pc2g6CisJLyoK KwkgKiBJZiB0aGUgc3ByaXRlIGlzIGNvbXBsZXRlbHkgY292ZXJpbmcgdGhlIHByaW1hcnkgcGxh bmUsCisJICogd2UgY2FuIGRpc2FibGUgdGhlIHByaW1hcnkgYW5kIHNhdmUgcG93ZXIuCisJICov CisJc3RhdGUtPmhpZGVzX3ByaW1hcnkgPSBmYiAhPSBOVUxMICYmIGRybV9yZWN0X2VxdWFscyhk c3QsIGNsaXApICYmCisJCSFjb2xvcmtleV9lbmFibGVkKGludGVsX3BsYW5lKTsKKwlXQVJOX09O KHN0YXRlLT5oaWRlc19wcmltYXJ5ICYmICFzdGF0ZS0+dmlzaWJsZSAmJiBpbnRlbF9jcnRjLT5h Y3RpdmUpOworCisJaWYgKGludGVsX2NydGMtPmFjdGl2ZSkgeworCQlpZiAoaW50ZWxfY3J0Yy0+ cHJpbWFyeV9lbmFibGVkID09IHN0YXRlLT5oaWRlc19wcmltYXJ5KQorCQkJaW50ZWxfY3J0Yy0+ YXRvbWljLndhaXRfZm9yX2ZsaXBzID0gdHJ1ZTsKKworCQlpZiAoaW50ZWxfY3J0Yy0+cHJpbWFy eV9lbmFibGVkICYmIHN0YXRlLT5oaWRlc19wcmltYXJ5KQorCQkJaW50ZWxfY3J0Yy0+YXRvbWlj LnByZV9kaXNhYmxlX3ByaW1hcnkgPSB0cnVlOworCisJCWludGVsX2NydGMtPmF0b21pYy5mYl9i aXRzIHw9CisJCQlJTlRFTF9GUk9OVEJVRkZFUl9TUFJJVEUoaW50ZWxfY3J0Yy0+cGlwZSk7CisK KwkJaWYgKCFpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgJiYgIXN0YXRlLT5oaWRlc19wcmlt YXJ5KQorCQkJaW50ZWxfY3J0Yy0+YXRvbWljLnBvc3RfZW5hYmxlX3ByaW1hcnkgPSB0cnVlOwor CX0KKwogCXJldHVybiAwOwogfQogCkBAIC0xMjY3LDM3ICsxMzA4LDE0IEBAIHN0YXRpYyB2b2lk CiBpbnRlbF9jb21taXRfc3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJ ICBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKQogewotCXN0cnVjdCBkcm1fZGV2aWNl ICpkZXYgPSBwbGFuZS0+ZGV2OwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHN0YXRlLT5iYXNl LmNydGM7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNy dGMpOwogCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShw bGFuZSk7Ci0JZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCXN0cnVjdCBkcm1f ZnJhbWVidWZmZXIgKmZiID0gc3RhdGUtPmJhc2UuZmI7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9iaiA9IGludGVsX2ZiX29iaihmYik7CiAJaW50IGNydGNfeCwgY3J0Y195OwogCXVu c2lnbmVkIGludCBjcnRjX3csIGNydGNfaDsKIAl1aW50MzJfdCBzcmNfeCwgc3JjX3ksIHNyY193 LCBzcmNfaDsKLQlzdHJ1Y3QgZHJtX3JlY3QgKmRzdCA9ICZzdGF0ZS0+ZHN0OwotCWNvbnN0IHN0 cnVjdCBkcm1fcmVjdCAqY2xpcCA9ICZzdGF0ZS0+Y2xpcDsKLQlib29sIHByaW1hcnlfZW5hYmxl ZDsKLQotCS8qCi0JICogJ3ByZXBhcmUnIGlzIG5ldmVyIGNhbGxlZCB3aGVuIHBsYW5lIGlzIGJl aW5nIGRpc2FibGVkLCBzbyB3ZSBuZWVkCi0JICogdG8gaGFuZGxlIGZyb250YnVmZmVyIHRyYWNr aW5nIGhlcmUKLQkgKi8KLQlpZiAoIWZiKSB7Ci0JCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211 dGV4KTsKLQkJaTkxNV9nZW1fdHJhY2tfZmIoaW50ZWxfZmJfb2JqKHBsYW5lLT5mYiksIE5VTEws Ci0JCQkJICBJTlRFTF9GUk9OVEJVRkZFUl9TUFJJVEUocGlwZSkpOwotCQltdXRleF91bmxvY2so JmRldi0+c3RydWN0X211dGV4KTsKLQl9Ci0KLQkvKgotCSAqIElmIHRoZSBzcHJpdGUgaXMgY29t cGxldGVseSBjb3ZlcmluZyB0aGUgcHJpbWFyeSBwbGFuZSwKLQkgKiB3ZSBjYW4gZGlzYWJsZSB0 aGUgcHJpbWFyeSBhbmQgc2F2ZSBwb3dlci4KLQkgKi8KLQlwcmltYXJ5X2VuYWJsZWQgPSAhZHJt X3JlY3RfZXF1YWxzKGRzdCwgY2xpcCkgfHwgY29sb3JrZXlfZW5hYmxlZChpbnRlbF9wbGFuZSk7 Ci0JV0FSTl9PTighcHJpbWFyeV9lbmFibGVkICYmICFzdGF0ZS0+dmlzaWJsZSAmJiBpbnRlbF9j cnRjLT5hY3RpdmUpOwogCiAJaW50ZWxfcGxhbmUtPmNydGNfeCA9IHN0YXRlLT5vcmlnX2RzdC54 MTsKIAlpbnRlbF9wbGFuZS0+Y3J0Y195ID0gc3RhdGUtPm9yaWdfZHN0LnkxOwpAQCAtMTMxMCwx NSArMTMyOCw3IEBAIGludGVsX2NvbW1pdF9zcHJpdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAq cGxhbmUsCiAJaW50ZWxfcGxhbmUtPm9iaiA9IG9iajsKIAogCWlmIChpbnRlbF9jcnRjLT5hY3Rp dmUpIHsKLQkJYm9vbCBwcmltYXJ5X3dhc19lbmFibGVkID0gaW50ZWxfY3J0Yy0+cHJpbWFyeV9l bmFibGVkOwotCi0JCWludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCA9IHByaW1hcnlfZW5hYmxl ZDsKLQotCQlpZiAocHJpbWFyeV93YXNfZW5hYmxlZCAhPSBwcmltYXJ5X2VuYWJsZWQpCi0JCQlp bnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMoY3J0Yyk7Ci0KLQkJaWYgKHByaW1hcnlf d2FzX2VuYWJsZWQgJiYgIXByaW1hcnlfZW5hYmxlZCkKLQkJCWludGVsX3ByZV9kaXNhYmxlX3By aW1hcnkoY3J0Yyk7CisJCWludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCA9ICFzdGF0ZS0+aGlk ZXNfcHJpbWFyeTsKIAogCQlpZiAoc3RhdGUtPnZpc2libGUpIHsKIAkJCWNydGNfeCA9IHN0YXRl LT5kc3QueDE7CkBAIC0xMzM1LDEyICsxMzQ1LDYgQEAgaW50ZWxfY29tbWl0X3Nwcml0ZV9wbGFu ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJfSBlbHNlIHsKIAkJCWludGVsX3BsYW5lLT5k aXNhYmxlX3BsYW5lKHBsYW5lLCBjcnRjKTsKIAkJfQotCi0KLQkJaW50ZWxfZnJvbnRidWZmZXJf ZmxpcChkZXYsIElOVEVMX0ZST05UQlVGRkVSX1NQUklURShwaXBlKSk7Ci0KLQkJaWYgKCFwcmlt YXJ5X3dhc19lbmFibGVkICYmIHByaW1hcnlfZW5hYmxlZCkKLQkJCWludGVsX3Bvc3RfZW5hYmxl X3ByaW1hcnkoY3J0Yyk7CiAJfQogfQogCi0tIAoxLjguNS4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=