From: Matt Roper Subject: [PATCH] drm/i915/skl: Eliminate usage of pipe_wm_parameters from SKL-style WM (v4) Date: Thu, 15 Oct 2015 15:42:51 -0700 Message-ID: <1444948971-2623-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id F15BB6E1FD for ; Thu, 15 Oct 2015 15:43:10 -0700 (PDT) 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 SnVzdCBwdWxsIHRoZSBpbmZvIG91dCBvZiB0aGUgc3RhdGUgc3RydWN0dXJlcyByYXRoZXIgdGhh biBzdGFnaW5nCml0IGluIGFuIGFkZGl0aW9uYWwgc2V0IG9mIHN0cnVjdHVyZXMuICBUbyBtYWtl IHRoaXMgbW9yZQpzdHJhaWdodGZvcndhcmQsIHdlIGNoYW5nZSB0aGUgc2lnbmF0dXJlIG9mIHNl dmVyYWwgaW50ZXJuYWwgV00KZnVuY3Rpb25zIHRvIHRha2UgdGhlIGNydGMgc3RhdGUgYXMgYSBw YXJhbWV0ZXIuCgp2MjoKIC0gRG9uJ3QgZm9yZ2V0IHRvIHNraXAgY3Vyc29yIHBsYW5lcyBvbiBh IGxvb3AgaW4gdGhlIEREQiBhbGxvY2F0aW9uCiAgIGZ1bmN0aW9uIHRvIG1hdGNoIG9yaWdpbmFs IGJlaGF2aW9yLiAgKEFuZGVyKQogLSBDaGFuZ2UgYSB1c2Ugb2YgaW50ZWxfY3J0Yy0+YWN0aXZl IHRvIGNzdGF0ZS0+YWN0aXZlLiAgVGhleSBzaG91bGQKICAgYmUgaWRlbnRpY2FsLCBidXQgaXQn cyBiZXR0ZXIgdG8gYmUgY29uc2lzdGVudC4gIChBbmRlcikKIC0gUmV3b3JrIG1vcmUgZnVuY3Rp b24gc2lnbmF0dXJlcyB0byBwYXNzIHN0YXRlcyByYXRoZXIgdGhhbiBjcnRjIGZvcgogICBjb25z aXN0ZW5jeS4gKEFuZGVyKQoKdjM6CiAgLSBBZGQgbWlzc2luZyAiKyAxIiB0byBza2xfd21fcGxh bmVfaWQoKSdzICdvdmVybGF5JyBjYXNlLiAoTWFhcnRlbikKICAtIFBhY2tlZCBmb3JtYXRzIHNo b3VsZCBwYXNzICcwJyB0byBkcm1fZm9ybWF0X3BsYW5lX2NwcCgpLCBub3QgMS4KICAgIChNYWFy dGVuKQogIC0gRHJvcCB1bndhbnRlZCBXQVJOX09OKCkgZm9yIGRpc2FibGVkIHBsYW5lcyB3aGVu IGNhbGN1bGF0aW5nIGRhdGEKICAgIHJhdGUgZm9yIFNLTC4gIChNYWFydGVuKQoKdjQ6CiAtIERv bid0IGluY2x1ZGUgY3Vyc29yIHBsYW5lIGluIHRvdGFsIHJlbGF0aXZlIGRhdGEgcmF0ZSBjYWxj dWxhdGlvbjsKICAgd2UndmUgYWxyZWFkeSBoYW5kbGVkIHRoZSBjdXJzb3IgYWxsb2NhdGlvbiBl YXJsaWVyLgogLSBGaXggJ2J5dGVzX3Blcl9waXhlbCcgY2FsY3VsYXRpb24gYnJhaW5kYW1hZ2Uu ICBTb21laG93IEkgaGFyZGNvZGVkCiAgIHRoZSBOVjEyIGZvcm1hdCBhcyBhIHBhcmFtZXRlciBy YXRoZXIgdGhhbiB0aGUgYWN0dWFsCiAgIGZiLT5waXhlbF9mb3JtYXQsIGFuZCBldmVuIHRoZW4g c3RpbGwgbWFuYWdlZCB0byBnZXQgdGhlIGZvcm1hdCBwbGFuZQogICB3cm9uZy4gIChWaWxsZSkK IC0gVXNlIHBsYW5lLT5zdGF0ZS0+ZmIgcmF0aGVyIHRoYW4gcGxhbmUtPmZiIGluCiAgIHNrbF9h bGxvY2F0ZV9waXBlX2RkYigpOyB0aGUgcGxhbmUtPmZiIHBvaW50ZXIgaXNuJ3QgdXBkYXRlZCB1 bnRpbAogICBhZnRlciB3ZSd2ZSBkb25lIG91ciB3YXRlcm1hcmsgcmVjYWxjdWxhdGlvbiwgc28g aXQgaGFzIHN0YWxlCiAgIHZhbHVlcy4gIChCb2IgUGFhdXdlKQoKU2lnbmVkLW9mZi1ieTogTWF0 dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4KUmV2aWV3ZWQtYnkodjMpOiBNYWFy dGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgpDYzogUGFh dXdlLCBCb2IgSiA8Ym9iLmoucGFhdXdlQGludGVsLmNvbT4KQ2M6IFZpbGxlIFN5cmrDpGzDpCA8 dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+CkNjOiBQYXVsbyBaYW5vbmkgPHBhdWxvLnIu emFub25pQGludGVsLmNvbT4KUmVmZXJlbmNlczogaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9hcmNoaXZlcy9pbnRlbC1nZngvMjAxNS1TZXB0ZW1iZXIvMDc3MDYwLmh0bWwKUmVmZXJlbmNl czogaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9hcmNoaXZlcy9pbnRlbC1nZngvMjAxNS1P Y3RvYmVyLzA3NzcyMS5odG1sCi0tLQpQYXVsbywgd291bGQgeW91IG1pbmQgdHJ5aW5nIHRoaXMg cGF0Y2ggb3V0IHdoZW4geW91IGhhdmUgc29tZSBmcmVlIHRpbWUgYW5kCnNlZSB3aGV0aGVyIHlv dSBzdGlsbCBleHBlcmllbmNlIHdhdGVybWFyayBwcm9ibGVtcz8gIFRoaXMgaXMgdGhlIHBhdGNo IHRoYXQKeW91IGJpc2VjdGVkIHlvdXIgcHJvYmxlbXMgdG8gYW5kIHRoZXJlIHdlcmUgYXQgbGVh c3QgdGhyZWUgYnVncyBpbiB0aGUgdmVyc2lvbgpvZiB0aGlzIHBhdGNoIHRoYXQgd2FzIG1lcmdl ZCBiZWZvcmU7IEknbSBob3BpbmcgdGhhdCB3aXRoIHRoZXNlIHRocmVlIGJ1Z2ZpeGVzCnlvdXIg cHJvYmxlbXMgd2lsbCBiZSBnb25lLgoKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMg fCAzMjcgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDE1MiBpbnNlcnRpb25zKCspLCAxNzUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMKaW5kZXggOWRkYTNlYS4uZGYyMmI5YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j CkBAIC0xNzA4LDEzICsxNzA4LDYgQEAgc3RhdGljIHVpbnQzMl90IGlsa193bV9mYmModWludDMy X3QgcHJpX3ZhbCwgdWludDMyX3QgaG9yaXpfcGl4ZWxzLAogCXJldHVybiBESVZfUk9VTkRfVVAo cHJpX3ZhbCAqIDY0LCBob3Jpel9waXhlbHMgKiBieXRlc19wZXJfcGl4ZWwpICsgMjsKIH0KIAot c3RydWN0IHNrbF9waXBlX3dtX3BhcmFtZXRlcnMgewotCWJvb2wgYWN0aXZlOwotCXVpbnQzMl90 IHBpcGVfaHRvdGFsOwotCXVpbnQzMl90IHBpeGVsX3JhdGU7IC8qIGluIEtIeiAqLwotCXN0cnVj dCBpbnRlbF9wbGFuZV93bV9wYXJhbWV0ZXJzIHBsYW5lW0k5MTVfTUFYX1BMQU5FU107Ci19Owot CiBzdHJ1Y3QgaWxrX3dtX21heGltdW1zIHsKIAl1aW50MTZfdCBwcmk7CiAJdWludDE2X3Qgc3By OwpAQCAtMjc1NSwxOCArMjc0OCw0MCBAQCBzdGF0aWMgYm9vbCBpbGtfZGlzYWJsZV9scF93bShz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogI2RlZmluZSBTS0xfRERCX1NJWkUJCTg5NgkvKiBpbiBi bG9ja3MgKi8KICNkZWZpbmUgQlhUX0REQl9TSVpFCQk1MTIKIAorLyoKKyAqIFJldHVybiB0aGUg aW5kZXggb2YgYSBwbGFuZSBpbiB0aGUgU0tMIEREQiBhbmQgd20gcmVzdWx0IGFycmF5cy4gIFBy aW1hcnkKKyAqIHBsYW5lIGlzIGFsd2F5cyBpbiBzbG90IDAsIGN1cnNvciBpcyBhbHdheXMgaW4g c2xvdCBJOTE1X01BWF9QTEFORVMtMSwgYW5kCisgKiBvdGhlciB1bml2ZXJzYWwgcGxhbmVzIGFy ZSBpbiBpbmRpY2VzIDEuLm4uICBOb3RlIHRoYXQgdGhpcyBtYXkgbGVhdmUgdW51c2VkCisgKiBp bmRpY2VzIGJldHdlZW4gdGhlIHRvcCAic3ByaXRlIiBwbGFuZSBhbmQgdGhlIGN1cnNvci4KKyAq Lworc3RhdGljIGludAorc2tsX3dtX3BsYW5lX2lkKGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZSAq cGxhbmUpCit7CisJc3dpdGNoIChwbGFuZS0+YmFzZS50eXBlKSB7CisJY2FzZSBEUk1fUExBTkVf VFlQRV9QUklNQVJZOgorCQlyZXR1cm4gMDsKKwljYXNlIERSTV9QTEFORV9UWVBFX0NVUlNPUjoK KwkJcmV0dXJuIFBMQU5FX0NVUlNPUjsKKwljYXNlIERSTV9QTEFORV9UWVBFX09WRVJMQVk6CisJ CXJldHVybiBwbGFuZS0+cGxhbmUgKyAxOworCWRlZmF1bHQ6CisJCU1JU1NJTkdfQ0FTRShwbGFu ZS0+YmFzZS50eXBlKTsKKwkJcmV0dXJuIHBsYW5lLT5wbGFuZTsKKwl9Cit9CisKIHN0YXRpYyB2 b2lkCiBza2xfZGRiX2dldF9waXBlX2FsbG9jYXRpb25fbGltaXRzKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCi0JCQkJICAgc3RydWN0IGRybV9jcnRjICpmb3JfY3J0YywKKwkJCQkgICBjb25zdCBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQkJCSAgIGNvbnN0IHN0cnVjdCBpbnRl bF93bV9jb25maWcgKmNvbmZpZywKLQkJCQkgICBjb25zdCBzdHJ1Y3Qgc2tsX3BpcGVfd21fcGFy YW1ldGVycyAqcGFyYW1zLAogCQkJCSAgIHN0cnVjdCBza2xfZGRiX2VudHJ5ICphbGxvYyAvKiBv dXQgKi8pCiB7CisJc3RydWN0IGRybV9jcnRjICpmb3JfY3J0YyA9IGNzdGF0ZS0+YmFzZS5jcnRj OwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKIAl1bnNpZ25lZCBpbnQgcGlwZV9zaXplLCBkZGJf c2l6ZTsKIAlpbnQgbnRoX2FjdGl2ZV9waXBlOwogCi0JaWYgKCFwYXJhbXMtPmFjdGl2ZSkgewor CWlmICghY3N0YXRlLT5iYXNlLmFjdGl2ZSkgewogCQlhbGxvYy0+c3RhcnQgPSAwOwogCQlhbGxv Yy0+ZW5kID0gMDsKIAkJcmV0dXJuOwpAQCAtMjgzMiwxOSArMjg0NywyOSBAQCB2b2lkIHNrbF9k ZGJfZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIH0KIAog c3RhdGljIHVuc2lnbmVkIGludAotc2tsX3BsYW5lX3JlbGF0aXZlX2RhdGFfcmF0ZShjb25zdCBz dHJ1Y3QgaW50ZWxfcGxhbmVfd21fcGFyYW1ldGVycyAqcCwgaW50IHkpCitza2xfcGxhbmVfcmVs YXRpdmVfZGF0YV9yYXRlKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCisJ CQkgICAgIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0ZSwKKwkJCSAgICAgaW50 IHkpCiB7CisJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNz dGF0ZS0+YmFzZS5jcnRjKTsKKwlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBzdGF0ZS0+ ZmI7CiAKIAkvKiBmb3IgcGxhbmFyIGZvcm1hdCAqLwotCWlmIChwLT55X2J5dGVzX3Blcl9waXhl bCkgeworCWlmIChmYi0+cGl4ZWxfZm9ybWF0ID09IERSTV9GT1JNQVRfTlYxMikgewogCQlpZiAo eSkgIC8qIHktcGxhbmUgZGF0YSByYXRlICovCi0JCQlyZXR1cm4gcC0+aG9yaXpfcGl4ZWxzICog cC0+dmVydF9waXhlbHMgKiBwLT55X2J5dGVzX3Blcl9waXhlbDsKKwkJCXJldHVybiBpbnRlbF9j cnRjLT5jb25maWctPnBpcGVfc3JjX3cgKgorCQkJCWludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9z cmNfaCAqCisJCQkJZHJtX2Zvcm1hdF9wbGFuZV9jcHAoZmItPnBpeGVsX2Zvcm1hdCwgMCk7CiAJ CWVsc2UgICAgLyogdXYtcGxhbmUgZGF0YSByYXRlICovCi0JCQlyZXR1cm4gKHAtPmhvcml6X3Bp eGVscy8yKSAqIChwLT52ZXJ0X3BpeGVscy8yKSAqIHAtPmJ5dGVzX3Blcl9waXhlbDsKKwkJCXJl dHVybiAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY193LzIpICoKKwkJCQkoaW50ZWxfY3J0 Yy0+Y29uZmlnLT5waXBlX3NyY19oLzIpICoKKwkJCQlkcm1fZm9ybWF0X3BsYW5lX2NwcChmYi0+ cGl4ZWxfZm9ybWF0LCAxKTsKIAl9CiAKIAkvKiBmb3IgcGFja2VkIGZvcm1hdHMgKi8KLQlyZXR1 cm4gcC0+aG9yaXpfcGl4ZWxzICogcC0+dmVydF9waXhlbHMgKiBwLT5ieXRlc19wZXJfcGl4ZWw7 CisJcmV0dXJuIGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfdyAqCisJCWludGVsX2NydGMt PmNvbmZpZy0+cGlwZV9zcmNfaCAqCisJCWRybV9mb3JtYXRfcGxhbmVfY3BwKGZiLT5waXhlbF9m b3JtYXQsIDApOwogfQogCiAvKgpAQCAtMjg1Myw0NiArMjg3OCw1NCBAQCBza2xfcGxhbmVfcmVs YXRpdmVfZGF0YV9yYXRlKGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV93bV9wYXJhbWV0ZXJzICpw LCBpbnQgeSkKICAqICAgMyAqIDQwOTYgKiA4MTkyICAqIDQgPCAyXjMyCiAgKi8KIHN0YXRpYyB1 bnNpZ25lZCBpbnQKLXNrbF9nZXRfdG90YWxfcmVsYXRpdmVfZGF0YV9yYXRlKHN0cnVjdCBpbnRl bF9jcnRjICppbnRlbF9jcnRjLAotCQkJCSBjb25zdCBzdHJ1Y3Qgc2tsX3BpcGVfd21fcGFyYW1l dGVycyAqcGFyYW1zKQorc2tsX2dldF90b3RhbF9yZWxhdGl2ZV9kYXRhX3JhdGUoY29uc3Qgc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSkKIHsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50 ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3N0YXRlLT5iYXNlLmNydGMpOworCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBpbnRlbF9jcnRjLT5iYXNlLmRldjsKKwljb25zdCBzdHJ1Y3QgaW50ZWxf cGxhbmUgKmludGVsX3BsYW5lOwogCXVuc2lnbmVkIGludCB0b3RhbF9kYXRhX3JhdGUgPSAwOwot CWludCBwbGFuZTsKIAotCWZvciAocGxhbmUgPSAwOyBwbGFuZSA8IGludGVsX251bV9wbGFuZXMo aW50ZWxfY3J0Yyk7IHBsYW5lKyspIHsKLQkJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3dtX3Bh cmFtZXRlcnMgKnA7CisJZm9yX2VhY2hfaW50ZWxfcGxhbmVfb25fY3J0YyhkZXYsIGludGVsX2Ny dGMsIGludGVsX3BsYW5lKSB7CisJCWNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0 ZSA9IGludGVsX3BsYW5lLT5iYXNlLnN0YXRlOwogCi0JCXAgPSAmcGFyYW1zLT5wbGFuZVtwbGFu ZV07Ci0JCWlmICghcC0+ZW5hYmxlZCkKKwkJaWYgKHBzdGF0ZS0+ZmIgPT0gTlVMTCkKIAkJCWNv bnRpbnVlOwogCi0JCXRvdGFsX2RhdGFfcmF0ZSArPSBza2xfcGxhbmVfcmVsYXRpdmVfZGF0YV9y YXRlKHAsIDApOyAvKiBwYWNrZWQvdXYgKi8KLQkJaWYgKHAtPnlfYnl0ZXNfcGVyX3BpeGVsKSB7 Ci0JCQl0b3RhbF9kYXRhX3JhdGUgKz0gc2tsX3BsYW5lX3JlbGF0aXZlX2RhdGFfcmF0ZShwLCAx KTsgLyogeS1wbGFuZSAqLwotCQl9CisJCWlmIChpbnRlbF9wbGFuZS0+YmFzZS50eXBlID09IERS TV9QTEFORV9UWVBFX0NVUlNPUikKKwkJCWNvbnRpbnVlOworCisJCS8qIHBhY2tlZC91diAqLwor CQl0b3RhbF9kYXRhX3JhdGUgKz0gc2tsX3BsYW5lX3JlbGF0aXZlX2RhdGFfcmF0ZShjc3RhdGUs CisJCQkJCQkJCXBzdGF0ZSwKKwkJCQkJCQkJMCk7CisKKwkJaWYgKHBzdGF0ZS0+ZmItPnBpeGVs X2Zvcm1hdCA9PSBEUk1fRk9STUFUX05WMTIpCisJCQkvKiB5LXBsYW5lICovCisJCQl0b3RhbF9k YXRhX3JhdGUgKz0gc2tsX3BsYW5lX3JlbGF0aXZlX2RhdGFfcmF0ZShjc3RhdGUsCisJCQkJCQkJ CQlwc3RhdGUsCisJCQkJCQkJCQkxKTsKIAl9CiAKIAlyZXR1cm4gdG90YWxfZGF0YV9yYXRlOwog fQogCiBzdGF0aWMgdm9pZAotc2tsX2FsbG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywKK3NrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0 YXRlLAogCQkgICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfd21fY29uZmlnICpjb25maWcsCi0JCSAg ICAgIGNvbnN0IHN0cnVjdCBza2xfcGlwZV93bV9wYXJhbWV0ZXJzICpwYXJhbXMsCiAJCSAgICAg IHN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKmRkYiAvKiBvdXQgKi8pCiB7CisJc3RydWN0IGRy bV9jcnRjICpjcnRjID0gY3N0YXRlLT5iYXNlLmNydGM7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IGNydGMtPmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxf Y3J0YyhjcnRjKTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lOwogCWVudW0gcGlw ZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAlzdHJ1Y3Qgc2tsX2RkYl9lbnRyeSAqYWxsb2Mg PSAmZGRiLT5waXBlW3BpcGVdOwogCXVpbnQxNl90IGFsbG9jX3NpemUsIHN0YXJ0LCBjdXJzb3Jf YmxvY2tzOwogCXVpbnQxNl90IG1pbmltdW1bSTkxNV9NQVhfUExBTkVTXTsKIAl1aW50MTZfdCB5 X21pbmltdW1bSTkxNV9NQVhfUExBTkVTXTsKIAl1bnNpZ25lZCBpbnQgdG90YWxfZGF0YV9yYXRl OwotCWludCBwbGFuZTsKIAotCXNrbF9kZGJfZ2V0X3BpcGVfYWxsb2NhdGlvbl9saW1pdHMoZGV2 LCBjcnRjLCBjb25maWcsIHBhcmFtcywgYWxsb2MpOworCXNrbF9kZGJfZ2V0X3BpcGVfYWxsb2Nh dGlvbl9saW1pdHMoZGV2LCBjc3RhdGUsIGNvbmZpZywgYWxsb2MpOwogCWFsbG9jX3NpemUgPSBz a2xfZGRiX2VudHJ5X3NpemUoYWxsb2MpOwogCWlmIChhbGxvY19zaXplID09IDApIHsKIAkJbWVt c2V0KGRkYi0+cGxhbmVbcGlwZV0sIDAsIHNpemVvZihkZGItPnBsYW5lW3BpcGVdKSk7CkBAIC0y OTA5LDE3ICsyOTQyLDIwIEBAIHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3QgZHJtX2NydGMg KmNydGMsCiAJYWxsb2MtPmVuZCAtPSBjdXJzb3JfYmxvY2tzOwogCiAJLyogMS4gQWxsb2NhdGUg dGhlIG1pbmludW0gcmVxdWlyZWQgYmxvY2tzIGZvciBlYWNoIGFjdGl2ZSBwbGFuZSAqLwotCWZv cl9lYWNoX3BsYW5lKGRldl9wcml2LCBwaXBlLCBwbGFuZSkgewotCQljb25zdCBzdHJ1Y3QgaW50 ZWxfcGxhbmVfd21fcGFyYW1ldGVycyAqcDsKKwlmb3JfZWFjaF9pbnRlbF9wbGFuZV9vbl9jcnRj KGRldiwgaW50ZWxfY3J0YywgaW50ZWxfcGxhbmUpIHsKKwkJc3RydWN0IGRybV9wbGFuZSAqcGxh bmUgPSAmaW50ZWxfcGxhbmUtPmJhc2U7CisJCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0g cGxhbmUtPnN0YXRlLT5mYjsKKwkJaW50IGlkID0gc2tsX3dtX3BsYW5lX2lkKGludGVsX3BsYW5l KTsKIAotCQlwID0gJnBhcmFtcy0+cGxhbmVbcGxhbmVdOwotCQlpZiAoIXAtPmVuYWJsZWQpCisJ CWlmIChmYiA9PSBOVUxMKQorCQkJY29udGludWU7CisJCWlmIChwbGFuZS0+dHlwZSA9PSBEUk1f UExBTkVfVFlQRV9DVVJTT1IpCiAJCQljb250aW51ZTsKIAotCQltaW5pbXVtW3BsYW5lXSA9IDg7 Ci0JCWFsbG9jX3NpemUgLT0gbWluaW11bVtwbGFuZV07Ci0JCXlfbWluaW11bVtwbGFuZV0gPSBw LT55X2J5dGVzX3Blcl9waXhlbCA/IDggOiAwOwotCQlhbGxvY19zaXplIC09IHlfbWluaW11bVtw bGFuZV07CisJCW1pbmltdW1baWRdID0gODsKKwkJYWxsb2Nfc2l6ZSAtPSBtaW5pbXVtW2lkXTsK KwkJeV9taW5pbXVtW2lkXSA9IChmYi0+cGl4ZWxfZm9ybWF0ID09IERSTV9GT1JNQVRfTlYxMikg PyA4IDogMDsKKwkJYWxsb2Nfc2l6ZSAtPSB5X21pbmltdW1baWRdOwogCX0KIAogCS8qCkBAIC0y OTI4LDQ1ICsyOTY0LDUwIEBAIHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3QgZHJtX2NydGMg KmNydGMsCiAJICoKIAkgKiBGSVhNRTogd2UgbWF5IG5vdCBhbGxvY2F0ZSBldmVyeSBzaW5nbGUg YmxvY2sgaGVyZS4KIAkgKi8KLQl0b3RhbF9kYXRhX3JhdGUgPSBza2xfZ2V0X3RvdGFsX3JlbGF0 aXZlX2RhdGFfcmF0ZShpbnRlbF9jcnRjLCBwYXJhbXMpOworCXRvdGFsX2RhdGFfcmF0ZSA9IHNr bF9nZXRfdG90YWxfcmVsYXRpdmVfZGF0YV9yYXRlKGNzdGF0ZSk7CiAKIAlzdGFydCA9IGFsbG9j LT5zdGFydDsKLQlmb3IgKHBsYW5lID0gMDsgcGxhbmUgPCBpbnRlbF9udW1fcGxhbmVzKGludGVs X2NydGMpOyBwbGFuZSsrKSB7Ci0JCWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV93bV9wYXJhbWV0 ZXJzICpwOworCWZvcl9lYWNoX2ludGVsX3BsYW5lX29uX2NydGMoZGV2LCBpbnRlbF9jcnRjLCBp bnRlbF9wbGFuZSkgeworCQlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSA9ICZpbnRlbF9wbGFuZS0+ YmFzZTsKKwkJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcHN0YXRlID0gaW50ZWxfcGxhbmUtPmJh c2Uuc3RhdGU7CiAJCXVuc2lnbmVkIGludCBkYXRhX3JhdGUsIHlfZGF0YV9yYXRlOwogCQl1aW50 MTZfdCBwbGFuZV9ibG9ja3MsIHlfcGxhbmVfYmxvY2tzID0gMDsKKwkJaW50IGlkID0gc2tsX3dt X3BsYW5lX2lkKGludGVsX3BsYW5lKTsKIAotCQlwID0gJnBhcmFtcy0+cGxhbmVbcGxhbmVdOwot CQlpZiAoIXAtPmVuYWJsZWQpCisJCWlmIChwc3RhdGUtPmZiID09IE5VTEwpCisJCQljb250aW51 ZTsKKwkJaWYgKHBsYW5lLT50eXBlID09IERSTV9QTEFORV9UWVBFX0NVUlNPUikKIAkJCWNvbnRp bnVlOwogCi0JCWRhdGFfcmF0ZSA9IHNrbF9wbGFuZV9yZWxhdGl2ZV9kYXRhX3JhdGUocCwgMCk7 CisJCWRhdGFfcmF0ZSA9IHNrbF9wbGFuZV9yZWxhdGl2ZV9kYXRhX3JhdGUoY3N0YXRlLCBwc3Rh dGUsIDApOwogCiAJCS8qCiAJCSAqIGFsbG9jYXRpb24gZm9yIChwYWNrZWQgZm9ybWF0cykgb3Ig KHV2LXBsYW5lIHBhcnQgb2YgcGxhbmFyIGZvcm1hdCk6CiAJCSAqIHByb21vdGUgdGhlIGV4cHJl c3Npb24gdG8gNjQgYml0cyB0byBhdm9pZCBvdmVyZmxvd2luZywgdGhlCiAJCSAqIHJlc3VsdCBp cyA8IGF2YWlsYWJsZSBhcyBkYXRhX3JhdGUgLyB0b3RhbF9kYXRhX3JhdGUgPCAxCiAJCSAqLwot CQlwbGFuZV9ibG9ja3MgPSBtaW5pbXVtW3BsYW5lXTsKKwkJcGxhbmVfYmxvY2tzID0gbWluaW11 bVtpZF07CiAJCXBsYW5lX2Jsb2NrcyArPSBkaXZfdTY0KCh1aW50NjRfdClhbGxvY19zaXplICog ZGF0YV9yYXRlLAogCQkJCQl0b3RhbF9kYXRhX3JhdGUpOwogCi0JCWRkYi0+cGxhbmVbcGlwZV1b cGxhbmVdLnN0YXJ0ID0gc3RhcnQ7Ci0JCWRkYi0+cGxhbmVbcGlwZV1bcGxhbmVdLmVuZCA9IHN0 YXJ0ICsgcGxhbmVfYmxvY2tzOworCQlkZGItPnBsYW5lW3BpcGVdW2lkXS5zdGFydCA9IHN0YXJ0 OworCQlkZGItPnBsYW5lW3BpcGVdW2lkXS5lbmQgPSBzdGFydCArIHBsYW5lX2Jsb2NrczsKIAog CQlzdGFydCArPSBwbGFuZV9ibG9ja3M7CiAKIAkJLyoKIAkJICogYWxsb2NhdGlvbiBmb3IgeV9w bGFuZSBwYXJ0IG9mIHBsYW5hciBmb3JtYXQ6CiAJCSAqLwotCQlpZiAocC0+eV9ieXRlc19wZXJf cGl4ZWwpIHsKLQkJCXlfZGF0YV9yYXRlID0gc2tsX3BsYW5lX3JlbGF0aXZlX2RhdGFfcmF0ZShw LCAxKTsKLQkJCXlfcGxhbmVfYmxvY2tzID0geV9taW5pbXVtW3BsYW5lXTsKKwkJaWYgKHBzdGF0 ZS0+ZmItPnBpeGVsX2Zvcm1hdCA9PSBEUk1fRk9STUFUX05WMTIpIHsKKwkJCXlfZGF0YV9yYXRl ID0gc2tsX3BsYW5lX3JlbGF0aXZlX2RhdGFfcmF0ZShjc3RhdGUsCisJCQkJCQkJCSAgIHBzdGF0 ZSwKKwkJCQkJCQkJICAgMSk7CisJCQl5X3BsYW5lX2Jsb2NrcyA9IHlfbWluaW11bVtpZF07CiAJ CQl5X3BsYW5lX2Jsb2NrcyArPSBkaXZfdTY0KCh1aW50NjRfdClhbGxvY19zaXplICogeV9kYXRh X3JhdGUsCiAJCQkJCQl0b3RhbF9kYXRhX3JhdGUpOwogCi0JCQlkZGItPnlfcGxhbmVbcGlwZV1b cGxhbmVdLnN0YXJ0ID0gc3RhcnQ7Ci0JCQlkZGItPnlfcGxhbmVbcGlwZV1bcGxhbmVdLmVuZCA9 IHN0YXJ0ICsgeV9wbGFuZV9ibG9ja3M7CisJCQlkZGItPnlfcGxhbmVbcGlwZV1baWRdLnN0YXJ0 ID0gc3RhcnQ7CisJCQlkZGItPnlfcGxhbmVbcGlwZV1baWRdLmVuZCA9IHN0YXJ0ICsgeV9wbGFu ZV9ibG9ja3M7CiAKIAkJCXN0YXJ0ICs9IHlfcGxhbmVfYmxvY2tzOwogCQl9CkBAIC0zMDY3LDcz ICszMTA4LDE2IEBAIHN0YXRpYyB2b2lkIHNrbF9jb21wdXRlX3dtX2dsb2JhbF9wYXJhbWV0ZXJz KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJfQogfQogCi1zdGF0aWMgdm9pZCBza2xfY29tcHV0 ZV93bV9waXBlX3BhcmFtZXRlcnMoc3RydWN0IGRybV9jcnRjICpjcnRjLAotCQkJCQkgICBzdHJ1 Y3Qgc2tsX3BpcGVfd21fcGFyYW1ldGVycyAqcCkKLXsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gY3J0Yy0+ZGV2OwotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxf Y3J0YyhjcnRjKTsKLQllbnVtIHBpcGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7Ci0Jc3RydWN0 IGRybV9wbGFuZSAqcGxhbmU7Ci0Jc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmI7Ci0JaW50IGkg PSAxOyAvKiBJbmRleCBmb3Igc3ByaXRlIHBsYW5lcyBzdGFydCAqLwotCi0JcC0+YWN0aXZlID0g aW50ZWxfY3J0Yy0+YWN0aXZlOwotCWlmIChwLT5hY3RpdmUpIHsKLQkJcC0+cGlwZV9odG90YWwg PSBpbnRlbF9jcnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZS5jcnRjX2h0b3RhbDsKLQkJ cC0+cGl4ZWxfcmF0ZSA9IHNrbF9waXBlX3BpeGVsX3JhdGUoaW50ZWxfY3J0Yy0+Y29uZmlnKTsK LQotCQlmYiA9IGNydGMtPnByaW1hcnktPnN0YXRlLT5mYjsKLQkJLyogRm9yIHBsYW5hcjogQnBw IGlzIGZvciB1diBwbGFuZSwgeV9CcHAgaXMgZm9yIHkgcGxhbmUgKi8KLQkJaWYgKGZiKSB7Ci0J CQlwLT5wbGFuZVswXS5lbmFibGVkID0gdHJ1ZTsKLQkJCXAtPnBsYW5lWzBdLmJ5dGVzX3Blcl9w aXhlbCA9IGZiLT5waXhlbF9mb3JtYXQgPT0gRFJNX0ZPUk1BVF9OVjEyID8KLQkJCQlkcm1fZm9y bWF0X3BsYW5lX2NwcChmYi0+cGl4ZWxfZm9ybWF0LCAxKSA6Ci0JCQkJZHJtX2Zvcm1hdF9wbGFu ZV9jcHAoZmItPnBpeGVsX2Zvcm1hdCwgMCk7Ci0JCQlwLT5wbGFuZVswXS55X2J5dGVzX3Blcl9w aXhlbCA9IGZiLT5waXhlbF9mb3JtYXQgPT0gRFJNX0ZPUk1BVF9OVjEyID8KLQkJCQlkcm1fZm9y bWF0X3BsYW5lX2NwcChmYi0+cGl4ZWxfZm9ybWF0LCAwKSA6IDA7Ci0JCQlwLT5wbGFuZVswXS50 aWxpbmcgPSBmYi0+bW9kaWZpZXJbMF07Ci0JCX0gZWxzZSB7Ci0JCQlwLT5wbGFuZVswXS5lbmFi bGVkID0gZmFsc2U7Ci0JCQlwLT5wbGFuZVswXS5ieXRlc19wZXJfcGl4ZWwgPSAwOwotCQkJcC0+ cGxhbmVbMF0ueV9ieXRlc19wZXJfcGl4ZWwgPSAwOwotCQkJcC0+cGxhbmVbMF0udGlsaW5nID0g RFJNX0ZPUk1BVF9NT0RfTk9ORTsKLQkJfQotCQlwLT5wbGFuZVswXS5ob3Jpel9waXhlbHMgPSBp bnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3JjX3c7Ci0JCXAtPnBsYW5lWzBdLnZlcnRfcGl4ZWxz ID0gaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY19oOwotCQlwLT5wbGFuZVswXS5yb3RhdGlv biA9IGNydGMtPnByaW1hcnktPnN0YXRlLT5yb3RhdGlvbjsKLQotCQlmYiA9IGNydGMtPmN1cnNv ci0+c3RhdGUtPmZiOwotCQlwLT5wbGFuZVtQTEFORV9DVVJTT1JdLnlfYnl0ZXNfcGVyX3BpeGVs ID0gMDsKLQkJaWYgKGZiKSB7Ci0JCQlwLT5wbGFuZVtQTEFORV9DVVJTT1JdLmVuYWJsZWQgPSB0 cnVlOwotCQkJcC0+cGxhbmVbUExBTkVfQ1VSU09SXS5ieXRlc19wZXJfcGl4ZWwgPSBmYi0+Yml0 c19wZXJfcGl4ZWwgLyA4OwotCQkJcC0+cGxhbmVbUExBTkVfQ1VSU09SXS5ob3Jpel9waXhlbHMg PSBjcnRjLT5jdXJzb3ItPnN0YXRlLT5jcnRjX3c7Ci0JCQlwLT5wbGFuZVtQTEFORV9DVVJTT1Jd LnZlcnRfcGl4ZWxzID0gY3J0Yy0+Y3Vyc29yLT5zdGF0ZS0+Y3J0Y19oOwotCQl9IGVsc2Ugewot CQkJcC0+cGxhbmVbUExBTkVfQ1VSU09SXS5lbmFibGVkID0gZmFsc2U7Ci0JCQlwLT5wbGFuZVtQ TEFORV9DVVJTT1JdLmJ5dGVzX3Blcl9waXhlbCA9IDA7Ci0JCQlwLT5wbGFuZVtQTEFORV9DVVJT T1JdLmhvcml6X3BpeGVscyA9IDY0OwotCQkJcC0+cGxhbmVbUExBTkVfQ1VSU09SXS52ZXJ0X3Bp eGVscyA9IDY0OwotCQl9Ci0JfQotCi0JbGlzdF9mb3JfZWFjaF9lbnRyeShwbGFuZSwgJmRldi0+ bW9kZV9jb25maWcucGxhbmVfbGlzdCwgaGVhZCkgewotCQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmlu dGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwotCi0JCWlmIChpbnRlbF9wbGFuZS0+ cGlwZSA9PSBwaXBlICYmCi0JCQlwbGFuZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZ KQotCQkJcC0+cGxhbmVbaSsrXSA9IGludGVsX3BsYW5lLT53bTsKLQl9Ci19Ci0KIHN0YXRpYyBi b29sIHNrbF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKLQkJCQkgc3RydWN0IHNrbF9waXBlX3dtX3BhcmFtZXRlcnMgKnAsCi0JCQkJIHN0 cnVjdCBpbnRlbF9wbGFuZV93bV9wYXJhbWV0ZXJzICpwX3BhcmFtcywKKwkJCQkgc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKKwkJCQkgc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9w bGFuZSwKIAkJCQkgdWludDE2X3QgZGRiX2FsbG9jYXRpb24sCiAJCQkJIGludCBsZXZlbCwKIAkJ CQkgdWludDE2X3QgKm91dF9ibG9ja3MsIC8qIG91dCAqLwogCQkJCSB1aW50OF90ICpvdXRfbGlu ZXMgLyogb3V0ICovKQogeworCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lID0gJmludGVsX3BsYW5l LT5iYXNlOworCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmUtPnN0YXRlLT5mYjsK IAl1aW50MzJfdCBsYXRlbmN5ID0gZGV2X3ByaXYtPndtLnNrbF9sYXRlbmN5W2xldmVsXTsKIAl1 aW50MzJfdCBtZXRob2QxLCBtZXRob2QyOwogCXVpbnQzMl90IHBsYW5lX2J5dGVzX3Blcl9saW5l LCBwbGFuZV9ibG9ja3NfcGVyX2xpbmU7CkBAIC0zMTQxLDMxICszMTI1LDMzIEBAIHN0YXRpYyBi b29sIHNrbF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKIAl1aW50MzJfdCBzZWxlY3RlZF9yZXN1bHQ7CiAJdWludDhfdCBieXRlc19wZXJf cGl4ZWw7CiAKLQlpZiAobGF0ZW5jeSA9PSAwIHx8ICFwLT5hY3RpdmUgfHwgIXBfcGFyYW1zLT5l bmFibGVkKQorCWlmIChsYXRlbmN5ID09IDAgfHwgIWNzdGF0ZS0+YmFzZS5hY3RpdmUgfHwgIWZi KQogCQlyZXR1cm4gZmFsc2U7CiAKLQlieXRlc19wZXJfcGl4ZWwgPSBwX3BhcmFtcy0+eV9ieXRl c19wZXJfcGl4ZWwgPwotCQlwX3BhcmFtcy0+eV9ieXRlc19wZXJfcGl4ZWwgOgotCQlwX3BhcmFt cy0+Ynl0ZXNfcGVyX3BpeGVsOwotCW1ldGhvZDEgPSBza2xfd21fbWV0aG9kMShwLT5waXhlbF9y YXRlLAorCWJ5dGVzX3Blcl9waXhlbCA9IGRybV9mb3JtYXRfcGxhbmVfY3BwKGZiLT5waXhlbF9m b3JtYXQsIDApOworCW1ldGhvZDEgPSBza2xfd21fbWV0aG9kMShza2xfcGlwZV9waXhlbF9yYXRl KGNzdGF0ZSksCiAJCQkJIGJ5dGVzX3Blcl9waXhlbCwKIAkJCQkgbGF0ZW5jeSk7Ci0JbWV0aG9k MiA9IHNrbF93bV9tZXRob2QyKHAtPnBpeGVsX3JhdGUsCi0JCQkJIHAtPnBpcGVfaHRvdGFsLAot CQkJCSBwX3BhcmFtcy0+aG9yaXpfcGl4ZWxzLAorCW1ldGhvZDIgPSBza2xfd21fbWV0aG9kMihz a2xfcGlwZV9waXhlbF9yYXRlKGNzdGF0ZSksCisJCQkJIGNzdGF0ZS0+YmFzZS5hZGp1c3RlZF9t b2RlLmNydGNfaHRvdGFsLAorCQkJCSBjc3RhdGUtPnBpcGVfc3JjX3csCiAJCQkJIGJ5dGVzX3Bl cl9waXhlbCwKLQkJCQkgcF9wYXJhbXMtPnRpbGluZywKKwkJCQkgZmItPm1vZGlmaWVyWzBdLAog CQkJCSBsYXRlbmN5KTsKIAotCXBsYW5lX2J5dGVzX3Blcl9saW5lID0gcF9wYXJhbXMtPmhvcml6 X3BpeGVscyAqIGJ5dGVzX3Blcl9waXhlbDsKKwlwbGFuZV9ieXRlc19wZXJfbGluZSA9IGNzdGF0 ZS0+cGlwZV9zcmNfdyAqIGJ5dGVzX3Blcl9waXhlbDsKIAlwbGFuZV9ibG9ja3NfcGVyX2xpbmUg PSBESVZfUk9VTkRfVVAocGxhbmVfYnl0ZXNfcGVyX2xpbmUsIDUxMik7CiAKLQlpZiAocF9wYXJh bXMtPnRpbGluZyA9PSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRCB8fAotCSAgICBwX3BhcmFtcy0+ dGlsaW5nID09IEk5MTVfRk9STUFUX01PRF9ZZl9USUxFRCkgeworCWlmIChmYi0+bW9kaWZpZXJb MF0gPT0gSTkxNV9GT1JNQVRfTU9EX1lfVElMRUQgfHwKKwkgICAgZmItPm1vZGlmaWVyWzBdID09 IEk5MTVfRk9STUFUX01PRF9ZZl9USUxFRCkgewogCQl1aW50MzJfdCBtaW5fc2NhbmxpbmVzID0g NDsKIAkJdWludDMyX3QgeV90aWxlX21pbmltdW07Ci0JCWlmIChpbnRlbF9yb3RhdGlvbl85MF9v cl8yNzAocF9wYXJhbXMtPnJvdGF0aW9uKSkgewotCQkJc3dpdGNoIChwX3BhcmFtcy0+Ynl0ZXNf cGVyX3BpeGVsKSB7CisJCWlmIChpbnRlbF9yb3RhdGlvbl85MF9vcl8yNzAocGxhbmUtPnN0YXRl LT5yb3RhdGlvbikpIHsKKwkJCWludCBicHAgPSAoZmItPnBpeGVsX2Zvcm1hdCA9PSBEUk1fRk9S TUFUX05WMTIpID8KKwkJCQlkcm1fZm9ybWF0X3BsYW5lX2NwcChmYi0+cGl4ZWxfZm9ybWF0LCAx KSA6CisJCQkJZHJtX2Zvcm1hdF9wbGFuZV9jcHAoZmItPnBpeGVsX2Zvcm1hdCwgMCk7CisKKwkJ CXN3aXRjaCAoYnBwKSB7CiAJCQljYXNlIDE6CiAJCQkJbWluX3NjYW5saW5lcyA9IDE2OwogCQkJ CWJyZWFrOwpAQCAtMzE4OSw4ICszMTc1LDggQEAgc3RhdGljIGJvb2wgc2tsX2NvbXB1dGVfcGxh bmVfd20oY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXJlc19saW5l cyA9IERJVl9ST1VORF9VUChzZWxlY3RlZF9yZXN1bHQsIHBsYW5lX2Jsb2Nrc19wZXJfbGluZSk7 CiAKIAlpZiAobGV2ZWwgPj0gMSAmJiBsZXZlbCA8PSA3KSB7Ci0JCWlmIChwX3BhcmFtcy0+dGls aW5nID09IEk5MTVfRk9STUFUX01PRF9ZX1RJTEVEIHx8Ci0JCSAgICBwX3BhcmFtcy0+dGlsaW5n ID09IEk5MTVfRk9STUFUX01PRF9ZZl9USUxFRCkKKwkJaWYgKGZiLT5tb2RpZmllclswXSA9PSBJ OTE1X0ZPUk1BVF9NT0RfWV9USUxFRCB8fAorCQkgICAgZmItPm1vZGlmaWVyWzBdID09IEk5MTVf Rk9STUFUX01PRF9ZZl9USUxFRCkKIAkJCXJlc19saW5lcyArPSA0OwogCQllbHNlCiAJCQlyZXNf YmxvY2tzKys7CkBAIC0zMjA3LDg0ICszMTkzLDgwIEBAIHN0YXRpYyBib29sIHNrbF9jb21wdXRl X3BsYW5lX3dtKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAogc3Rh dGljIHZvaWQgc2tsX2NvbXB1dGVfd21fbGV2ZWwoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAogCQkJCSBzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0aW9uICpkZGIsCi0JCQkJ IHN0cnVjdCBza2xfcGlwZV93bV9wYXJhbWV0ZXJzICpwLAotCQkJCSBlbnVtIHBpcGUgcGlwZSwK KwkJCQkgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJCQkgaW50IGxldmVsLAot CQkJCSBpbnQgbnVtX3BsYW5lcywKIAkJCQkgc3RydWN0IHNrbF93bV9sZXZlbCAqcmVzdWx0KQog eworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2OworCXN0cnVjdCBpbnRl bF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0Yyhjc3RhdGUtPmJhc2UuY3J0Yyk7CisJ c3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZTsKIAl1aW50MTZfdCBkZGJfYmxvY2tzOwot CWludCBpOworCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKKworCWZvcl9lYWNo X2ludGVsX3BsYW5lX29uX2NydGMoZGV2LCBpbnRlbF9jcnRjLCBpbnRlbF9wbGFuZSkgeworCQlp bnQgaSA9IHNrbF93bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7CiAKLQlmb3IgKGkgPSAwOyBpIDwg bnVtX3BsYW5lczsgaSsrKSB7CiAJCWRkYl9ibG9ja3MgPSBza2xfZGRiX2VudHJ5X3NpemUoJmRk Yi0+cGxhbmVbcGlwZV1baV0pOwogCiAJCXJlc3VsdC0+cGxhbmVfZW5baV0gPSBza2xfY29tcHV0 ZV9wbGFuZV93bShkZXZfcHJpdiwKLQkJCQkJCXAsICZwLT5wbGFuZVtpXSwKKwkJCQkJCWNzdGF0 ZSwKKwkJCQkJCWludGVsX3BsYW5lLAogCQkJCQkJZGRiX2Jsb2NrcywKIAkJCQkJCWxldmVsLAog CQkJCQkJJnJlc3VsdC0+cGxhbmVfcmVzX2JbaV0sCiAJCQkJCQkmcmVzdWx0LT5wbGFuZV9yZXNf bFtpXSk7CiAJfQotCi0JZGRiX2Jsb2NrcyA9IHNrbF9kZGJfZW50cnlfc2l6ZSgmZGRiLT5wbGFu ZVtwaXBlXVtQTEFORV9DVVJTT1JdKTsKLQlyZXN1bHQtPnBsYW5lX2VuW1BMQU5FX0NVUlNPUl0g PSBza2xfY29tcHV0ZV9wbGFuZV93bShkZXZfcHJpdiwgcCwKLQkJCQkJCSAmcC0+cGxhbmVbUExB TkVfQ1VSU09SXSwKLQkJCQkJCSBkZGJfYmxvY2tzLCBsZXZlbCwKLQkJCQkJCSAmcmVzdWx0LT5w bGFuZV9yZXNfYltQTEFORV9DVVJTT1JdLAotCQkJCQkJICZyZXN1bHQtPnBsYW5lX3Jlc19sW1BM QU5FX0NVUlNPUl0pOwogfQogCiBzdGF0aWMgdWludDMyX3QKLXNrbF9jb21wdXRlX2xpbmV0aW1l X3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yywgc3RydWN0IHNrbF9waXBlX3dtX3BhcmFtZXRlcnMg KnApCitza2xfY29tcHV0ZV9saW5ldGltZV93bShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0 YXRlKQogewotCWlmICghdG9faW50ZWxfY3J0YyhjcnRjKS0+YWN0aXZlKQorCWlmICghY3N0YXRl LT5iYXNlLmFjdGl2ZSkKIAkJcmV0dXJuIDA7CiAKLQlpZiAoV0FSTl9PTihwLT5waXhlbF9yYXRl ID09IDApKQorCWlmIChXQVJOX09OKHNrbF9waXBlX3BpeGVsX3JhdGUoY3N0YXRlKSA9PSAwKSkK IAkJcmV0dXJuIDA7CiAKLQlyZXR1cm4gRElWX1JPVU5EX1VQKDggKiBwLT5waXBlX2h0b3RhbCAq IDEwMDAsIHAtPnBpeGVsX3JhdGUpOworCXJldHVybiBESVZfUk9VTkRfVVAoOCAqIGNzdGF0ZS0+ YmFzZS5hZGp1c3RlZF9tb2RlLmNydGNfaHRvdGFsICogMTAwMCwKKwkJCSAgICBza2xfcGlwZV9w aXhlbF9yYXRlKGNzdGF0ZSkpOwogfQogCi1zdGF0aWMgdm9pZCBza2xfY29tcHV0ZV90cmFuc2l0 aW9uX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKLQkJCQkgICAgICBzdHJ1Y3Qgc2tsX3BpcGVf d21fcGFyYW1ldGVycyAqcGFyYW1zLAorc3RhdGljIHZvaWQgc2tsX2NvbXB1dGVfdHJhbnNpdGlv bl93bShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQkJCSAgICAgIHN0cnVjdCBz a2xfd21fbGV2ZWwgKnRyYW5zX3dtIC8qIG91dCAqLykKIHsKKwlzdHJ1Y3QgZHJtX2NydGMgKmNy dGMgPSBjc3RhdGUtPmJhc2UuY3J0YzsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9 IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0JaW50IGk7CisJc3RydWN0IGludGVsX3BsYW5lICppbnRl bF9wbGFuZTsKIAotCWlmICghcGFyYW1zLT5hY3RpdmUpCisJaWYgKCFjc3RhdGUtPmJhc2UuYWN0 aXZlKQogCQlyZXR1cm47CiAKIAkvKiBVbnRpbCB3ZSBrbm93IG1vcmUsIGp1c3QgZGlzYWJsZSB0 cmFuc2l0aW9uIFdNcyAqLwotCWZvciAoaSA9IDA7IGkgPCBpbnRlbF9udW1fcGxhbmVzKGludGVs X2NydGMpOyBpKyspCisJZm9yX2VhY2hfaW50ZWxfcGxhbmVfb25fY3J0YyhjcnRjLT5kZXYsIGlu dGVsX2NydGMsIGludGVsX3BsYW5lKSB7CisJCWludCBpID0gc2tsX3dtX3BsYW5lX2lkKGludGVs X3BsYW5lKTsKKwogCQl0cmFuc193bS0+cGxhbmVfZW5baV0gPSBmYWxzZTsKLQl0cmFuc193bS0+ cGxhbmVfZW5bUExBTkVfQ1VSU09SXSA9IGZhbHNlOworCX0KIH0KIAotc3RhdGljIHZvaWQgc2ts X2NvbXB1dGVfcGlwZV93bShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCitzdGF0aWMgdm9pZCBza2xf Y29tcHV0ZV9waXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJCQkJc3Ry dWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqZGRiLAotCQkJCXN0cnVjdCBza2xfcGlwZV93bV9wYXJh bWV0ZXJzICpwYXJhbXMsCiAJCQkJc3RydWN0IHNrbF9waXBlX3dtICpwaXBlX3dtKQogewotCXN0 cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CisJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IGNzdGF0ZS0+YmFzZS5jcnRjLT5kZXY7CiAJY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50 ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBp bGtfd21fbWF4X2xldmVsKGRldik7CiAKIAlmb3IgKGxldmVsID0gMDsgbGV2ZWwgPD0gbWF4X2xl dmVsOyBsZXZlbCsrKSB7Ci0JCXNrbF9jb21wdXRlX3dtX2xldmVsKGRldl9wcml2LCBkZGIsIHBh cmFtcywgaW50ZWxfY3J0Yy0+cGlwZSwKLQkJCQkgICAgIGxldmVsLCBpbnRlbF9udW1fcGxhbmVz KGludGVsX2NydGMpLAotCQkJCSAgICAgJnBpcGVfd20tPndtW2xldmVsXSk7CisJCXNrbF9jb21w dXRlX3dtX2xldmVsKGRldl9wcml2LCBkZGIsIGNzdGF0ZSwKKwkJCQkgICAgIGxldmVsLCAmcGlw ZV93bS0+d21bbGV2ZWxdKTsKIAl9Ci0JcGlwZV93bS0+bGluZXRpbWUgPSBza2xfY29tcHV0ZV9s aW5ldGltZV93bShjcnRjLCBwYXJhbXMpOworCXBpcGVfd20tPmxpbmV0aW1lID0gc2tsX2NvbXB1 dGVfbGluZXRpbWVfd20oY3N0YXRlKTsKIAotCXNrbF9jb21wdXRlX3RyYW5zaXRpb25fd20oY3J0 YywgcGFyYW1zLCAmcGlwZV93bS0+dHJhbnNfd20pOworCXNrbF9jb21wdXRlX3RyYW5zaXRpb25f d20oY3N0YXRlLCAmcGlwZV93bS0+dHJhbnNfd20pOwogfQogCiBzdGF0aWMgdm9pZCBza2xfY29t cHV0ZV93bV9yZXN1bHRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkJICAgc3RydWN0IHNr bF9waXBlX3dtX3BhcmFtZXRlcnMgKnAsCiAJCQkJICAgc3RydWN0IHNrbF9waXBlX3dtICpwX3dt LAogCQkJCSAgIHN0cnVjdCBza2xfd21fdmFsdWVzICpyLAogCQkJCSAgIHN0cnVjdCBpbnRlbF9j cnRjICppbnRlbF9jcnRjKQpAQCAtMzUyOCwxNiArMzUxMCwxNSBAQCBzdGF0aWMgdm9pZCBza2xf Zmx1c2hfd21fdmFsdWVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIH0KIAog c3RhdGljIGJvb2wgc2tsX3VwZGF0ZV9waXBlX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKLQkJ CSAgICAgICBzdHJ1Y3Qgc2tsX3BpcGVfd21fcGFyYW1ldGVycyAqcGFyYW1zLAogCQkJICAgICAg IHN0cnVjdCBpbnRlbF93bV9jb25maWcgKmNvbmZpZywKIAkJCSAgICAgICBzdHJ1Y3Qgc2tsX2Rk Yl9hbGxvY2F0aW9uICpkZGIsIC8qIG91dCAqLwogCQkJICAgICAgIHN0cnVjdCBza2xfcGlwZV93 bSAqcGlwZV93bSAvKiBvdXQgKi8pCiB7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMg PSB0b19pbnRlbF9jcnRjKGNydGMpOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUg PSB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKIAotCXNrbF9jb21wdXRlX3dtX3Bp cGVfcGFyYW1ldGVycyhjcnRjLCBwYXJhbXMpOwotCXNrbF9hbGxvY2F0ZV9waXBlX2RkYihjcnRj LCBjb25maWcsIHBhcmFtcywgZGRiKTsKLQlza2xfY29tcHV0ZV9waXBlX3dtKGNydGMsIGRkYiwg cGFyYW1zLCBwaXBlX3dtKTsKKwlza2xfYWxsb2NhdGVfcGlwZV9kZGIoY3N0YXRlLCBjb25maWcs IGRkYik7CisJc2tsX2NvbXB1dGVfcGlwZV93bShjc3RhdGUsIGRkYiwgcGlwZV93bSk7CiAKIAlp ZiAoIW1lbWNtcCgmaW50ZWxfY3J0Yy0+d20uc2tsX2FjdGl2ZSwgcGlwZV93bSwgc2l6ZW9mKCpw aXBlX3dtKSkpCiAJCXJldHVybiBmYWxzZTsKQEAgLTM1NzAsNyArMzU1MSw2IEBAIHN0YXRpYyB2 b2lkIHNrbF91cGRhdGVfb3RoZXJfcGlwZV93bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCSAq LwogCWxpc3RfZm9yX2VhY2hfZW50cnkoaW50ZWxfY3J0YywgJmRldi0+bW9kZV9jb25maWcuY3J0 Y19saXN0LAogCQkJCWJhc2UuaGVhZCkgewotCQlzdHJ1Y3Qgc2tsX3BpcGVfd21fcGFyYW1ldGVy cyBwYXJhbXMgPSB7fTsKIAkJc3RydWN0IHNrbF9waXBlX3dtIHBpcGVfd20gPSB7fTsKIAkJYm9v bCB3bV9jaGFuZ2VkOwogCkBAIC0zNTgwLDggKzM1NjAsNyBAQCBzdGF0aWMgdm9pZCBza2xfdXBk YXRlX290aGVyX3BpcGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJaWYgKCFpbnRlbF9j cnRjLT5hY3RpdmUpCiAJCQljb250aW51ZTsKIAotCQl3bV9jaGFuZ2VkID0gc2tsX3VwZGF0ZV9w aXBlX3dtKCZpbnRlbF9jcnRjLT5iYXNlLAotCQkJCQkJJnBhcmFtcywgY29uZmlnLAorCQl3bV9j aGFuZ2VkID0gc2tsX3VwZGF0ZV9waXBlX3dtKCZpbnRlbF9jcnRjLT5iYXNlLCBjb25maWcsCiAJ CQkJCQkmci0+ZGRiLCAmcGlwZV93bSk7CiAKIAkJLyoKQEAgLTM1OTEsNyArMzU3MCw3IEBAIHN0 YXRpYyB2b2lkIHNrbF91cGRhdGVfb3RoZXJfcGlwZV93bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAogCQkgKi8KIAkJV0FSTl9PTighd21fY2hhbmdlZCk7CiAKLQkJc2tsX2NvbXB1dGVfd21fcmVz dWx0cyhkZXYsICZwYXJhbXMsICZwaXBlX3dtLCByLCBpbnRlbF9jcnRjKTsKKwkJc2tsX2NvbXB1 dGVfd21fcmVzdWx0cyhkZXYsICZwaXBlX3dtLCByLCBpbnRlbF9jcnRjKTsKIAkJci0+ZGlydHlb aW50ZWxfY3J0Yy0+cGlwZV0gPSB0cnVlOwogCX0KIH0KQEAgLTM2MjEsNyArMzYwMCw2IEBAIHN0 YXRpYyB2b2lkIHNrbF91cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXN0cnVjdCBp bnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IHNrbF9waXBlX3dtX3BhcmFtZXRlcnMg cGFyYW1zID0ge307CiAJc3RydWN0IHNrbF93bV92YWx1ZXMgKnJlc3VsdHMgPSAmZGV2X3ByaXYt PndtLnNrbF9yZXN1bHRzOwogCXN0cnVjdCBza2xfcGlwZV93bSBwaXBlX3dtID0ge307CiAJc3Ry dWN0IGludGVsX3dtX2NvbmZpZyBjb25maWcgPSB7fTsKQEAgLTM2MzQsMTEgKzM2MTIsMTAgQEAg c3RhdGljIHZvaWQgc2tsX3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlza2xf Y29tcHV0ZV93bV9nbG9iYWxfcGFyYW1ldGVycyhkZXYsICZjb25maWcpOwogCi0JaWYgKCFza2xf dXBkYXRlX3BpcGVfd20oY3J0YywgJnBhcmFtcywgJmNvbmZpZywKLQkJCQkmcmVzdWx0cy0+ZGRi LCAmcGlwZV93bSkpCisJaWYgKCFza2xfdXBkYXRlX3BpcGVfd20oY3J0YywgJmNvbmZpZywgJnJl c3VsdHMtPmRkYiwgJnBpcGVfd20pKQogCQlyZXR1cm47CiAKLQlza2xfY29tcHV0ZV93bV9yZXN1 bHRzKGRldiwgJnBhcmFtcywgJnBpcGVfd20sIHJlc3VsdHMsIGludGVsX2NydGMpOworCXNrbF9j b21wdXRlX3dtX3Jlc3VsdHMoZGV2LCAmcGlwZV93bSwgcmVzdWx0cywgaW50ZWxfY3J0Yyk7CiAJ cmVzdWx0cy0+ZGlydHlbaW50ZWxfY3J0Yy0+cGlwZV0gPSB0cnVlOwogCiAJc2tsX3VwZGF0ZV9v dGhlcl9waXBlX3dtKGRldiwgY3J0YywgJmNvbmZpZywgcmVzdWx0cyk7Ci0tIAoyLjEuNAoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK