From: Jani Nikula Subject: [PATCH v2 3/8] drm/i915/pm: switch to kernel types Date: Fri, 18 Jan 2019 14:01:20 +0200 Message-ID: <20190118120125.15484-3-jani.nikula@intel.com> References: <20190118120125.15484-1-jani.nikula@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 ESMTPS id 2CACE6F70C for ; Fri, 18 Jan 2019 11:59:52 +0000 (UTC) In-Reply-To: <20190118120125.15484-1-jani.nikula@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 Cc: Jani Nikula List-Id: intel-gfx@lists.freedesktop.org TWl4ZWQgQzk5IGFuZCBrZXJuZWwgdHlwZXMgdXNlIGlzIGdldHRpbmcgdWdseS4gUHJlZmVyIGtl cm5lbCB0eXBlcy4KCnNlZCAtaSAncy9cYnVpbnRcKDhcfDE2XHwzMlx8NjRcKV90XGIvdVwxL2cn CgpNaW5vciBjaGVja3BhdGNoIGZpeGVzIHNwcmlua2xlZCBvbiB0b3Agb2YgdGhlIGNoYW5nZWQg bGluZXMuCgpBY2tlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ CkFja2VkLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZp ZXdlZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4K UmV2aWV3ZWQtYnk6IEpvc8OpIFJvYmVydG8gZGUgU291emEgPGpvc2Uuc291emFAaW50ZWwuY29t PgpTaWduZWQtb2ZmLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgfCAyMTMgKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMDUgaW5zZXJ0aW9ucygrKSwgMTA4IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDc2MTNhZTcyZGYzZC4uOGI2 M2FmYTNhMjIxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTQ4MCw3ICs0ODAsNyBAQCBz dGF0aWMgdm9pZCB2bHZfZ2V0X2ZpZm9fc2l6ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0 Y19zdGF0ZSkKIAlpbnQgc3ByaXRlMF9zdGFydCwgc3ByaXRlMV9zdGFydDsKIAogCXN3aXRjaCAo cGlwZSkgewotCQl1aW50MzJfdCBkc3BhcmIsIGRzcGFyYjIsIGRzcGFyYjM7CisJCXUzMiBkc3Bh cmIsIGRzcGFyYjIsIGRzcGFyYjM7CiAJY2FzZSBQSVBFX0E6CiAJCWRzcGFyYiA9IEk5MTVfUkVB RChEU1BBUkIpOwogCQlkc3BhcmIyID0gSTkxNV9SRUFEKERTUEFSQjIpOwpAQCAtNTEzLDcgKzUx Myw3IEBAIHN0YXRpYyB2b2lkIHZsdl9nZXRfZmlmb19zaXplKHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlKQogc3RhdGljIGludCBpOXh4X2dldF9maWZvX3NpemUoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgICAgZW51bSBpOXh4X3BsYW5lX2lkIGk5 eHhfcGxhbmUpCiB7Ci0JdWludDMyX3QgZHNwYXJiID0gSTkxNV9SRUFEKERTUEFSQik7CisJdTMy IGRzcGFyYiA9IEk5MTVfUkVBRChEU1BBUkIpOwogCWludCBzaXplOwogCiAJc2l6ZSA9IGRzcGFy YiAmIDB4N2Y7CkBAIC01MjksNyArNTI5LDcgQEAgc3RhdGljIGludCBpOXh4X2dldF9maWZvX3Np emUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogc3RhdGljIGludCBpODMwX2dl dF9maWZvX3NpemUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgICAg ZW51bSBpOXh4X3BsYW5lX2lkIGk5eHhfcGxhbmUpCiB7Ci0JdWludDMyX3QgZHNwYXJiID0gSTkx NV9SRUFEKERTUEFSQik7CisJdTMyIGRzcGFyYiA9IEk5MTVfUkVBRChEU1BBUkIpOwogCWludCBz aXplOwogCiAJc2l6ZSA9IGRzcGFyYiAmIDB4MWZmOwpAQCAtNTQ2LDcgKzU0Niw3IEBAIHN0YXRp YyBpbnQgaTgzMF9nZXRfZmlmb19zaXplKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIHN0YXRpYyBpbnQgaTg0NV9nZXRfZmlmb19zaXplKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAkJCSAgICAgIGVudW0gaTl4eF9wbGFuZV9pZCBpOXh4X3BsYW5lKQogewot CXVpbnQzMl90IGRzcGFyYiA9IEk5MTVfUkVBRChEU1BBUkIpOworCXUzMiBkc3BhcmIgPSBJOTE1 X1JFQUQoRFNQQVJCKTsKIAlpbnQgc2l6ZTsKIAogCXNpemUgPSBkc3BhcmIgJiAweDdmOwpAQCAt NjY3LDkgKzY2Nyw5IEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgaW50ZWxfd21fbWV0aG9kMSh1bnNp Z25lZCBpbnQgcGl4ZWxfcmF0ZSwKIAkJCQkgICAgIHVuc2lnbmVkIGludCBjcHAsCiAJCQkJICAg ICB1bnNpZ25lZCBpbnQgbGF0ZW5jeSkKIHsKLQl1aW50NjRfdCByZXQ7CisJdTY0IHJldDsKIAot CXJldCA9ICh1aW50NjRfdCkgcGl4ZWxfcmF0ZSAqIGNwcCAqIGxhdGVuY3k7CisJcmV0ID0gKHU2 NClwaXhlbF9yYXRlICogY3BwICogbGF0ZW5jeTsKIAlyZXQgPSBESVZfUk9VTkRfVVBfVUxMKHJl dCwgMTAwMDApOwogCiAJcmV0dXJuIHJldDsKQEAgLTEwODksOSArMTA4OSw5IEBAIHN0YXRpYyBp bnQgZzR4X2ZiY19maWZvX3NpemUoaW50IGxldmVsKQogCX0KIH0KIAotc3RhdGljIHVpbnQxNl90 IGc0eF9jb21wdXRlX3dtKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRl LAotCQkJICAgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUs Ci0JCQkgICAgICAgaW50IGxldmVsKQorc3RhdGljIHUxNiBnNHhfY29tcHV0ZV93bShjb25zdCBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKKwkJCSAgY29uc3Qgc3RydWN0IGlu dGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSwKKwkJCSAgaW50IGxldmVsKQogewogCXN0cnVj dCBpbnRlbF9wbGFuZSAqcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZV9zdGF0ZS0+YmFzZS5w bGFuZSk7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShwbGFu ZS0+YmFzZS5kZXYpOwpAQCAtMTE4OCw5ICsxMTg4LDkgQEAgc3RhdGljIGJvb2wgZzR4X3Jhd19m YmNfd21fc2V0KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCXJldHVybiBk aXJ0eTsKIH0KIAotc3RhdGljIHVpbnQzMl90IGlsa19jb21wdXRlX2ZiY193bShjb25zdCBzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAotCQkJCSAgIGNvbnN0IHN0cnVjdCBpbnRlbF9w bGFuZV9zdGF0ZSAqcHN0YXRlLAotCQkJCSAgIHVpbnQzMl90IHByaV92YWwpOworc3RhdGljIHUz MiBpbGtfY29tcHV0ZV9mYmNfd20oY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0 ZSwKKwkJCSAgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHN0YXRlLAorCQkJ ICAgICAgdTMyIHByaV92YWwpOwogCiBzdGF0aWMgYm9vbCBnNHhfcmF3X3BsYW5lX3dtX2NvbXB1 dGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCQkJICAgICBjb25zdCBz dHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlKQpAQCAtMTU5OCw5ICsxNTk4LDkg QEAgc3RhdGljIHZvaWQgdmx2X3NldHVwX3dtX2xhdGVuY3koc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogCX0KIH0KIAotc3RhdGljIHVpbnQxNl90IHZsdl9jb21wdXRlX3dtX2xl dmVsKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAotCQkJCSAgICAg Y29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSwKLQkJCQkgICAgIGlu dCBsZXZlbCkKK3N0YXRpYyB1MTYgdmx2X2NvbXB1dGVfd21fbGV2ZWwoY29uc3Qgc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCisJCQkJY29uc3Qgc3RydWN0IGludGVsX3BsYW5l X3N0YXRlICpwbGFuZV9zdGF0ZSwKKwkJCQlpbnQgbGV2ZWwpCiB7CiAJc3RydWN0IGludGVsX3Bs YW5lICpwbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lX3N0YXRlLT5iYXNlLnBsYW5lKTsKIAlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KHBsYW5lLT5iYXNlLmRl dik7CkBAIC0xOTY4LDcgKzE5NjgsNyBAQCBzdGF0aWMgdm9pZCB2bHZfYXRvbWljX3VwZGF0ZV9m aWZvKHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlLAogCXNwaW5fbG9jaygmZGV2X3By aXYtPnVuY29yZS5sb2NrKTsKIAogCXN3aXRjaCAoY3J0Yy0+cGlwZSkgewotCQl1aW50MzJfdCBk c3BhcmIsIGRzcGFyYjIsIGRzcGFyYjM7CisJCXUzMiBkc3BhcmIsIGRzcGFyYjIsIGRzcGFyYjM7 CiAJY2FzZSBQSVBFX0E6CiAJCWRzcGFyYiA9IEk5MTVfUkVBRF9GVyhEU1BBUkIpOwogCQlkc3Bh cmIyID0gSTkxNV9SRUFEX0ZXKERTUEFSQjIpOwpAQCAtMjI2Miw4ICsyMjYyLDggQEAgc3RhdGlj IHZvaWQgaTl4eF91cGRhdGVfd20oc3RydWN0IGludGVsX2NydGMgKnVudXNlZF9jcnRjKQogewog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUodW51c2VkX2NydGMt PmJhc2UuZGV2KTsKIAljb25zdCBzdHJ1Y3QgaW50ZWxfd2F0ZXJtYXJrX3BhcmFtcyAqd21faW5m bzsKLQl1aW50MzJfdCBmd2F0ZXJfbG87Ci0JdWludDMyX3QgZndhdGVyX2hpOworCXUzMiBmd2F0 ZXJfbG87CisJdTMyIGZ3YXRlcl9oaTsKIAlpbnQgY3dtLCBzcndtID0gMTsKIAlpbnQgZmlmb19z aXplOwogCWludCBwbGFuZWFfd20sIHBsYW5lYl93bTsKQEAgLTI0MDYsNyArMjQwNiw3IEBAIHN0 YXRpYyB2b2lkIGk4NDVfdXBkYXRlX3dtKHN0cnVjdCBpbnRlbF9jcnRjICp1bnVzZWRfY3J0YykK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KHVudXNlZF9jcnRj LT5iYXNlLmRldik7CiAJc3RydWN0IGludGVsX2NydGMgKmNydGM7CiAJY29uc3Qgc3RydWN0IGRy bV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGU7Ci0JdWludDMyX3QgZndhdGVyX2xvOworCXUz MiBmd2F0ZXJfbG87CiAJaW50IHBsYW5lYV93bTsKIAogCWNydGMgPSBzaW5nbGVfZW5hYmxlZF9j cnRjKGRldl9wcml2KTsKQEAgLTI0NTUsOCArMjQ1NSw3IEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQg aWxrX3dtX21ldGhvZDIodW5zaWduZWQgaW50IHBpeGVsX3JhdGUsCiAJcmV0dXJuIHJldDsKIH0K IAotc3RhdGljIHVpbnQzMl90IGlsa193bV9mYmModWludDMyX3QgcHJpX3ZhbCwgdWludDMyX3Qg aG9yaXpfcGl4ZWxzLAotCQkJICAgdWludDhfdCBjcHApCitzdGF0aWMgdTMyIGlsa193bV9mYmMo dTMyIHByaV92YWwsIHUzMiBob3Jpel9waXhlbHMsIHU4IGNwcCkKIHsKIAkvKgogCSAqIE5laXRo ZXIgb2YgdGhlc2Ugc2hvdWxkIGJlIHBvc3NpYmxlIHNpbmNlIHRoaXMgZnVuY3Rpb24gc2hvdWxk bid0IGJlCkBAIC0yNDczLDIyICsyNDcyLDIxIEBAIHN0YXRpYyB1aW50MzJfdCBpbGtfd21fZmJj KHVpbnQzMl90IHByaV92YWwsIHVpbnQzMl90IGhvcml6X3BpeGVscywKIH0KIAogc3RydWN0IGls a193bV9tYXhpbXVtcyB7Ci0JdWludDE2X3QgcHJpOwotCXVpbnQxNl90IHNwcjsKLQl1aW50MTZf dCBjdXI7Ci0JdWludDE2X3QgZmJjOworCXUxNiBwcmk7CisJdTE2IHNwcjsKKwl1MTYgY3VyOwor CXUxNiBmYmM7CiB9OwogCiAvKgogICogRm9yIGJvdGggV01fUElQRSBhbmQgV01fTFAuCiAgKiBt ZW1fdmFsdWUgbXVzdCBiZSBpbiAwLjF1cyB1bml0cy4KICAqLwotc3RhdGljIHVpbnQzMl90IGls a19jb21wdXRlX3ByaV93bShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAot CQkJCSAgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHN0YXRlLAotCQkJCSAgIHVp bnQzMl90IG1lbV92YWx1ZSwKLQkJCQkgICBib29sIGlzX2xwKQorc3RhdGljIHUzMiBpbGtfY29t cHV0ZV9wcmlfd20oY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKKwkJCSAg ICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHN0YXRlLAorCQkJICAgICAgdTMy IG1lbV92YWx1ZSwgYm9vbCBpc19scCkKIHsKLQl1aW50MzJfdCBtZXRob2QxLCBtZXRob2QyOwor CXUzMiBtZXRob2QxLCBtZXRob2QyOwogCWludCBjcHA7CiAKIAlpZiAobWVtX3ZhbHVlID09IDAp CkBAIC0yNTE2LDExICsyNTE0LDExIEBAIHN0YXRpYyB1aW50MzJfdCBpbGtfY29tcHV0ZV9wcmlf d20oY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKICAqIEZvciBib3RoIFdN X1BJUEUgYW5kIFdNX0xQLgogICogbWVtX3ZhbHVlIG11c3QgYmUgaW4gMC4xdXMgdW5pdHMuCiAg Ki8KLXN0YXRpYyB1aW50MzJfdCBpbGtfY29tcHV0ZV9zcHJfd20oY29uc3Qgc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNzdGF0ZSwKLQkJCQkgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3Rh dGUgKnBzdGF0ZSwKLQkJCQkgICB1aW50MzJfdCBtZW1fdmFsdWUpCitzdGF0aWMgdTMyIGlsa19j b21wdXRlX3Nwcl93bShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAorCQkJ ICAgICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwc3RhdGUsCisJCQkgICAgICB1 MzIgbWVtX3ZhbHVlKQogewotCXVpbnQzMl90IG1ldGhvZDEsIG1ldGhvZDI7CisJdTMyIG1ldGhv ZDEsIG1ldGhvZDI7CiAJaW50IGNwcDsKIAogCWlmIChtZW1fdmFsdWUgPT0gMCkKQEAgLTI1NDMs OSArMjU0MSw5IEBAIHN0YXRpYyB1aW50MzJfdCBpbGtfY29tcHV0ZV9zcHJfd20oY29uc3Qgc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKICAqIEZvciBib3RoIFdNX1BJUEUgYW5kIFdN X0xQLgogICogbWVtX3ZhbHVlIG11c3QgYmUgaW4gMC4xdXMgdW5pdHMuCiAgKi8KLXN0YXRpYyB1 aW50MzJfdCBpbGtfY29tcHV0ZV9jdXJfd20oY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNzdGF0ZSwKLQkJCQkgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBzdGF0ZSwK LQkJCQkgICB1aW50MzJfdCBtZW1fdmFsdWUpCitzdGF0aWMgdTMyIGlsa19jb21wdXRlX2N1cl93 bShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAorCQkJICAgICAgY29uc3Qg c3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwc3RhdGUsCisJCQkgICAgICB1MzIgbWVtX3ZhbHVl KQogewogCWludCBjcHA7CiAKQEAgLTI1NjMsOSArMjU2MSw5IEBAIHN0YXRpYyB1aW50MzJfdCBp bGtfY29tcHV0ZV9jdXJfd20oY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwK IH0KIAogLyogT25seSBmb3IgV01fTFAuICovCi1zdGF0aWMgdWludDMyX3QgaWxrX2NvbXB1dGVf ZmJjX3dtKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCi0JCQkJICAgY29u c3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwc3RhdGUsCi0JCQkJICAgdWludDMyX3QgcHJp X3ZhbCkKK3N0YXRpYyB1MzIgaWxrX2NvbXB1dGVfZmJjX3dtKGNvbnN0IHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjc3RhdGUsCisJCQkgICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3Rh dGUgKnBzdGF0ZSwKKwkJCSAgICAgIHUzMiBwcmlfdmFsKQogewogCWludCBjcHA7CiAKQEAgLTI3 MzEsOSArMjcyOSw5IEBAIHN0YXRpYyBib29sIGlsa192YWxpZGF0ZV93bV9sZXZlbChpbnQgbGV2 ZWwsCiAJCQlEUk1fREVCVUdfS01TKCJDdXJzb3IgV00lZCB0b28gbGFyZ2UgJXUgKG1heCAldSlc biIsCiAJCQkJICAgICAgbGV2ZWwsIHJlc3VsdC0+Y3VyX3ZhbCwgbWF4LT5jdXIpOwogCi0JCXJl c3VsdC0+cHJpX3ZhbCA9IG1pbl90KHVpbnQzMl90LCByZXN1bHQtPnByaV92YWwsIG1heC0+cHJp KTsKLQkJcmVzdWx0LT5zcHJfdmFsID0gbWluX3QodWludDMyX3QsIHJlc3VsdC0+c3ByX3ZhbCwg bWF4LT5zcHIpOwotCQlyZXN1bHQtPmN1cl92YWwgPSBtaW5fdCh1aW50MzJfdCwgcmVzdWx0LT5j dXJfdmFsLCBtYXgtPmN1cik7CisJCXJlc3VsdC0+cHJpX3ZhbCA9IG1pbl90KHUzMiwgcmVzdWx0 LT5wcmlfdmFsLCBtYXgtPnByaSk7CisJCXJlc3VsdC0+c3ByX3ZhbCA9IG1pbl90KHUzMiwgcmVz dWx0LT5zcHJfdmFsLCBtYXgtPnNwcik7CisJCXJlc3VsdC0+Y3VyX3ZhbCA9IG1pbl90KHUzMiwg cmVzdWx0LT5jdXJfdmFsLCBtYXgtPmN1cik7CiAJCXJlc3VsdC0+ZW5hYmxlID0gdHJ1ZTsKIAl9 CiAKQEAgLTI3NDksOSArMjc0Nyw5IEBAIHN0YXRpYyB2b2lkIGlsa19jb21wdXRlX3dtX2xldmVs KGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkgY29uc3Qgc3Ry dWN0IGludGVsX3BsYW5lX3N0YXRlICpjdXJzdGF0ZSwKIAkJCQkgc3RydWN0IGludGVsX3dtX2xl dmVsICpyZXN1bHQpCiB7Ci0JdWludDE2X3QgcHJpX2xhdGVuY3kgPSBkZXZfcHJpdi0+d20ucHJp X2xhdGVuY3lbbGV2ZWxdOwotCXVpbnQxNl90IHNwcl9sYXRlbmN5ID0gZGV2X3ByaXYtPndtLnNw cl9sYXRlbmN5W2xldmVsXTsKLQl1aW50MTZfdCBjdXJfbGF0ZW5jeSA9IGRldl9wcml2LT53bS5j dXJfbGF0ZW5jeVtsZXZlbF07CisJdTE2IHByaV9sYXRlbmN5ID0gZGV2X3ByaXYtPndtLnByaV9s YXRlbmN5W2xldmVsXTsKKwl1MTYgc3ByX2xhdGVuY3kgPSBkZXZfcHJpdi0+d20uc3ByX2xhdGVu Y3lbbGV2ZWxdOworCXUxNiBjdXJfbGF0ZW5jeSA9IGRldl9wcml2LT53bS5jdXJfbGF0ZW5jeVts ZXZlbF07CiAKIAkvKiBXTTErIGxhdGVuY3kgdmFsdWVzIHN0b3JlZCBpbiAwLjV1cyB1bml0cyAq LwogCWlmIChsZXZlbCA+IDApIHsKQEAgLTI3NzUsNyArMjc3Myw3IEBAIHN0YXRpYyB2b2lkIGls a19jb21wdXRlX3dtX2xldmVsKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIAlyZXN1bHQtPmVuYWJsZSA9IHRydWU7CiB9CiAKLXN0YXRpYyB1aW50MzJfdAorc3RhdGlj IHUzMgogaHN3X2NvbXB1dGVfbGluZXRpbWVfd20oY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmNzdGF0ZSkKIHsKIAljb25zdCBzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICppbnRlbF9z dGF0ZSA9CkBAIC0yODA0LDEwICsyODAyLDEwIEBAIGhzd19jb21wdXRlX2xpbmV0aW1lX3dtKGNv bnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUpCiB9CiAKIHN0YXRpYyB2b2lkIGlu dGVsX3JlYWRfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0J CQkJICB1aW50MTZfdCB3bVs4XSkKKwkJCQkgIHUxNiB3bVs4XSkKIHsKIAlpZiAoSU5URUxfR0VO KGRldl9wcml2KSA+PSA5KSB7Ci0JCXVpbnQzMl90IHZhbDsKKwkJdTMyIHZhbDsKIAkJaW50IHJl dCwgaTsKIAkJaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtfd21fbWF4X2xldmVsKGRldl9wcml2 KTsKIApAQCAtMjg5MSw3ICsyODg5LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfcmVhZF93bV9sYXRl bmN5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCXdtWzBdICs9IDE7CiAK IAl9IGVsc2UgaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJp dikpIHsKLQkJdWludDY0X3Qgc3NrcGQgPSBJOTE1X1JFQUQ2NChNQ0hfU1NLUEQpOworCQl1NjQg c3NrcGQgPSBJOTE1X1JFQUQ2NChNQ0hfU1NLUEQpOwogCiAJCXdtWzBdID0gKHNza3BkID4+IDU2 KSAmIDB4RkY7CiAJCWlmICh3bVswXSA9PSAwKQpAQCAtMjkwMSwxNCArMjg5OSwxNCBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9yZWFkX3dtX2xhdGVuY3koc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAogCQl3bVszXSA9IChzc2twZCA+PiAyMCkgJiAweDFGRjsKIAkJd21bNF0gPSAoc3Nr cGQgPj4gMzIpICYgMHgxRkY7CiAJfSBlbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDYp IHsKLQkJdWludDMyX3Qgc3NrcGQgPSBJOTE1X1JFQUQoTUNIX1NTS1BEKTsKKwkJdTMyIHNza3Bk ID0gSTkxNV9SRUFEKE1DSF9TU0tQRCk7CiAKIAkJd21bMF0gPSAoc3NrcGQgPj4gU1NLUERfV00w X1NISUZUKSAmIFNTS1BEX1dNX01BU0s7CiAJCXdtWzFdID0gKHNza3BkID4+IFNTS1BEX1dNMV9T SElGVCkgJiBTU0tQRF9XTV9NQVNLOwogCQl3bVsyXSA9IChzc2twZCA+PiBTU0tQRF9XTTJfU0hJ RlQpICYgU1NLUERfV01fTUFTSzsKIAkJd21bM10gPSAoc3NrcGQgPj4gU1NLUERfV00zX1NISUZU KSAmIFNTS1BEX1dNX01BU0s7CiAJfSBlbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDUp IHsKLQkJdWludDMyX3QgbWx0ciA9IEk5MTVfUkVBRChNTFRSX0lMSyk7CisJCXUzMiBtbHRyID0g STkxNV9SRUFEKE1MVFJfSUxLKTsKIAogCQkvKiBJTEsgcHJpbWFyeSBMUDAgbGF0ZW5jeSBpcyA3 MDAgbnMgKi8KIAkJd21bMF0gPSA3OwpAQCAtMjkyMCw3ICsyOTE4LDcgQEAgc3RhdGljIHZvaWQg aW50ZWxfcmVhZF93bV9sYXRlbmN5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK IH0KIAogc3RhdGljIHZvaWQgaW50ZWxfZml4dXBfc3ByX3dtX2xhdGVuY3koc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJCSAgICAgICB1aW50MTZfdCB3bVs1XSkKKwkJCQkg ICAgICAgdTE2IHdtWzVdKQogewogCS8qIElMSyBzcHJpdGUgTFAwIGxhdGVuY3kgaXMgMTMwMCBu cyAqLwogCWlmIChJU19HRU4oZGV2X3ByaXYsIDUpKQpAQCAtMjkyOCw3ICsyOTI2LDcgQEAgc3Rh dGljIHZvaWQgaW50ZWxfZml4dXBfc3ByX3dtX2xhdGVuY3koc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF9maXh1cF9jdXJfd21fbGF0ZW5j eShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkJICAgICAgIHVpbnQxNl90 IHdtWzVdKQorCQkJCSAgICAgICB1MTYgd21bNV0pCiB7CiAJLyogSUxLIGN1cnNvciBMUDAgbGF0 ZW5jeSBpcyAxMzAwIG5zICovCiAJaWYgKElTX0dFTihkZXZfcHJpdiwgNSkpCkBAIC0yOTUwLDcg KzI5NDgsNyBAQCBpbnQgaWxrX3dtX21heF9sZXZlbChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiAKIHN0YXRpYyB2b2lkIGludGVsX3ByaW50X3dtX2xhdGVuY3koc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCSAgIGNvbnN0IGNoYXIgKm5hbWUs Ci0JCQkJICAgY29uc3QgdWludDE2X3Qgd21bOF0pCisJCQkJICAgY29uc3QgdTE2IHdtWzhdKQog ewogCWludCBsZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXZfcHJpdik7CiAK QEAgLTI5NzksNyArMjk3Nyw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3ByaW50X3dtX2xhdGVuY3ko c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogfQogCiBzdGF0aWMgYm9vbCBpbGtf aW5jcmVhc2Vfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0J CQkJICAgIHVpbnQxNl90IHdtWzVdLCB1aW50MTZfdCBtaW4pCisJCQkJICAgIHUxNiB3bVs1XSwg dTE2IG1pbikKIHsKIAlpbnQgbGV2ZWwsIG1heF9sZXZlbCA9IGlsa193bV9tYXhfbGV2ZWwoZGV2 X3ByaXYpOwogCkBAIC0yOTg4LDcgKzI5ODYsNyBAQCBzdGF0aWMgYm9vbCBpbGtfaW5jcmVhc2Vf d21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAKIAl3bVswXSA9 IG1heCh3bVswXSwgbWluKTsKIAlmb3IgKGxldmVsID0gMTsgbGV2ZWwgPD0gbWF4X2xldmVsOyBs ZXZlbCsrKQotCQl3bVtsZXZlbF0gPSBtYXhfdCh1aW50MTZfdCwgd21bbGV2ZWxdLCBESVZfUk9V TkRfVVAobWluLCA1KSk7CisJCXdtW2xldmVsXSA9IG1heF90KHUxNiwgd21bbGV2ZWxdLCBESVZf Uk9VTkRfVVAobWluLCA1KSk7CiAKIAlyZXR1cm4gdHJ1ZTsKIH0KQEAgLTM1MzUsNyArMzUzMyw3 IEBAIHN0YXRpYyB2b2lkIGlsa193cml0ZV93bV92YWx1ZXMoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAogewogCXN0cnVjdCBpbGtfd21fdmFsdWVzICpwcmV2aW91cyA9ICZkZXZf cHJpdi0+d20uaHc7CiAJdW5zaWduZWQgaW50IGRpcnR5OwotCXVpbnQzMl90IHZhbDsKKwl1MzIg dmFsOwogCiAJZGlydHkgPSBpbGtfY29tcHV0ZV93bV9kaXJ0eShkZXZfcHJpdiwgcHJldmlvdXMs IHJlc3VsdHMpOwogCWlmICghZGlydHkpCkBAIC00MDMzLDcgKzQwMzEsNyBAQCBza2xfcGxhbmVf ZG93bnNjYWxlX2Ftb3VudChjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAog CQkJICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwc3RhdGUpCiB7CiAJc3RydWN0 IGludGVsX3BsYW5lICpwbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBzdGF0ZS0+YmFzZS5wbGFuZSk7 Ci0JdWludDMyX3Qgc3JjX3csIHNyY19oLCBkc3RfdywgZHN0X2g7CisJdTMyIHNyY193LCBzcmNf aCwgZHN0X3csIGRzdF9oOwogCXVpbnRfZml4ZWRfMTZfMTZfdCBmcF93X3JhdGlvLCBmcF9oX3Jh dGlvOwogCXVpbnRfZml4ZWRfMTZfMTZfdCBkb3duc2NhbGVfaCwgZG93bnNjYWxlX3c7CiAKQEAg LTQwNzksOCArNDA3Nyw4IEBAIHNrbF9waXBlX2Rvd25zY2FsZV9hbW91bnQoY29uc3Qgc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJCXJldHVybiBwaXBlX2Rvd25zY2FsZTsK IAogCWlmIChjcnRjX3N0YXRlLT5wY2hfcGZpdC5lbmFibGVkKSB7Ci0JCXVpbnQzMl90IHNyY193 LCBzcmNfaCwgZHN0X3csIGRzdF9oOwotCQl1aW50MzJfdCBwZml0X3NpemUgPSBjcnRjX3N0YXRl LT5wY2hfcGZpdC5zaXplOworCQl1MzIgc3JjX3csIHNyY19oLCBkc3RfdywgZHN0X2g7CisJCXUz MiBwZml0X3NpemUgPSBjcnRjX3N0YXRlLT5wY2hfcGZpdC5zaXplOwogCQl1aW50X2ZpeGVkXzE2 XzE2X3QgZnBfd19yYXRpbywgZnBfaF9yYXRpbzsKIAkJdWludF9maXhlZF8xNl8xNl90IGRvd25z Y2FsZV9oLCBkb3duc2NhbGVfdzsKIApAQCAtNDExMyw3ICs0MTExLDcgQEAgaW50IHNrbF9jaGVj a19waXBlX21heF9waXhlbF9yYXRlKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCWNv bnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0ZTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVf c3RhdGUgKmludGVsX3BzdGF0ZTsKIAlpbnQgY3J0Y19jbG9jaywgZG90Y2xrOwotCXVpbnQzMl90 IHBpcGVfbWF4X3BpeGVsX3JhdGU7CisJdTMyIHBpcGVfbWF4X3BpeGVsX3JhdGU7CiAJdWludF9m aXhlZF8xNl8xNl90IHBpcGVfZG93bnNjYWxlOwogCXVpbnRfZml4ZWRfMTZfMTZfdCBtYXhfZG93 bnNjYWxlID0gdTMyX3RvX2ZpeGVkMTYoMSk7CiAKQEAgLTQxNjksOCArNDE2Nyw4IEBAIHNrbF9w bGFuZV9yZWxhdGl2ZV9kYXRhX3JhdGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNz dGF0ZSwKIHsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0KIAkJdG9faW50ZWxf cGxhbmUoaW50ZWxfcHN0YXRlLT5iYXNlLnBsYW5lKTsKLQl1aW50MzJfdCBkYXRhX3JhdGU7Ci0J dWludDMyX3Qgd2lkdGggPSAwLCBoZWlnaHQgPSAwOworCXUzMiBkYXRhX3JhdGU7CisJdTMyIHdp ZHRoID0gMCwgaGVpZ2h0ID0gMDsKIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYjsKIAl1MzIg Zm9ybWF0OwogCXVpbnRfZml4ZWRfMTZfMTZfdCBkb3duX3NjYWxlX2Ftb3VudDsKQEAgLTQzMTMs MTUgKzQzMTEsMTUgQEAgc2tsX2FsbG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjc3RhdGUsCiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9j cnRjKGNydGMpOwogCXN0cnVjdCBza2xfZGRiX2VudHJ5ICphbGxvYyA9ICZjc3RhdGUtPndtLnNr bC5kZGI7CiAJc3RydWN0IHNrbF9wbGFuZV93bSAqd207Ci0JdWludDE2X3QgYWxsb2Nfc2l6ZSwg c3RhcnQgPSAwOwotCXVpbnQxNl90IHRvdGFsW0k5MTVfTUFYX1BMQU5FU10gPSB7fTsKLQl1aW50 MTZfdCB1dl90b3RhbFtJOTE1X01BWF9QTEFORVNdID0ge307CisJdTE2IGFsbG9jX3NpemUsIHN0 YXJ0ID0gMDsKKwl1MTYgdG90YWxbSTkxNV9NQVhfUExBTkVTXSA9IHt9OworCXUxNiB1dl90b3Rh bFtJOTE1X01BWF9QTEFORVNdID0ge307CiAJdTY0IHRvdGFsX2RhdGFfcmF0ZTsKIAllbnVtIHBs YW5lX2lkIHBsYW5lX2lkOwogCWludCBudW1fYWN0aXZlOwogCXU2NCBwbGFuZV9kYXRhX3JhdGVb STkxNV9NQVhfUExBTkVTXSA9IHt9OwogCXU2NCB1dl9wbGFuZV9kYXRhX3JhdGVbSTkxNV9NQVhf UExBTkVTXSA9IHt9OwotCXVpbnQxNl90IGJsb2NrcyA9IDA7CisJdTE2IGJsb2NrcyA9IDA7CiAJ aW50IGxldmVsOwogCiAJLyogQ2xlYXIgdGhlIHBhcnRpdGlvbmluZyBmb3IgZGlzYWJsZWQgcGxh bmVzLiAqLwpAQCAtNDQ5MywxMCArNDQ5MSwxMCBAQCBza2xfYWxsb2NhdGVfcGlwZV9kZGIoc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKICAqIDJ4Y2RjbGsgaXMgMTM1MCBNSHogYW5k IHRoZSBwaXhlbCByYXRlIHNob3VsZCBuZXZlciBleGNlZWQgdGhhdC4KICovCiBzdGF0aWMgdWlu dF9maXhlZF8xNl8xNl90Ci1za2xfd21fbWV0aG9kMShjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsIHVpbnQzMl90IHBpeGVsX3JhdGUsCi0JICAgICAgIHVpbnQ4X3QgY3Bw LCB1aW50MzJfdCBsYXRlbmN5LCB1aW50MzJfdCBkYnVmX2Jsb2NrX3NpemUpCitza2xfd21fbWV0 aG9kMShjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHUzMiBwaXhlbF9y YXRlLAorCSAgICAgICB1OCBjcHAsIHUzMiBsYXRlbmN5LCB1MzIgZGJ1Zl9ibG9ja19zaXplKQog ewotCXVpbnQzMl90IHdtX2ludGVybWVkaWF0ZV92YWw7CisJdTMyIHdtX2ludGVybWVkaWF0ZV92 YWw7CiAJdWludF9maXhlZF8xNl8xNl90IHJldDsKIAogCWlmIChsYXRlbmN5ID09IDApCkBAIC00 NTExLDEyICs0NTA5LDExIEBAIHNrbF93bV9tZXRob2QxKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwgdWludDMyX3QgcGl4ZWxfcmF0ZSwKIAlyZXR1cm4gcmV0OwogfQog Ci1zdGF0aWMgdWludF9maXhlZF8xNl8xNl90IHNrbF93bV9tZXRob2QyKHVpbnQzMl90IHBpeGVs X3JhdGUsCi0JCQl1aW50MzJfdCBwaXBlX2h0b3RhbCwKLQkJCXVpbnQzMl90IGxhdGVuY3ksCi0J CQl1aW50X2ZpeGVkXzE2XzE2X3QgcGxhbmVfYmxvY2tzX3Blcl9saW5lKQorc3RhdGljIHVpbnRf Zml4ZWRfMTZfMTZfdAorc2tsX3dtX21ldGhvZDIodTMyIHBpeGVsX3JhdGUsIHUzMiBwaXBlX2h0 b3RhbCwgdTMyIGxhdGVuY3ksCisJICAgICAgIHVpbnRfZml4ZWRfMTZfMTZfdCBwbGFuZV9ibG9j a3NfcGVyX2xpbmUpCiB7Ci0JdWludDMyX3Qgd21faW50ZXJtZWRpYXRlX3ZhbDsKKwl1MzIgd21f aW50ZXJtZWRpYXRlX3ZhbDsKIAl1aW50X2ZpeGVkXzE2XzE2X3QgcmV0OwogCiAJaWYgKGxhdGVu Y3kgPT0gMCkKQEAgLTQ1MzIsOCArNDUyOSw4IEBAIHN0YXRpYyB1aW50X2ZpeGVkXzE2XzE2X3Qg c2tsX3dtX21ldGhvZDIodWludDMyX3QgcGl4ZWxfcmF0ZSwKIHN0YXRpYyB1aW50X2ZpeGVkXzE2 XzE2X3QKIGludGVsX2dldF9saW5ldGltZV91cyhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3N0YXRlKQogewotCXVpbnQzMl90IHBpeGVsX3JhdGU7Ci0JdWludDMyX3QgY3J0Y19odG90 YWw7CisJdTMyIHBpeGVsX3JhdGU7CisJdTMyIGNydGNfaHRvdGFsOwogCXVpbnRfZml4ZWRfMTZf MTZfdCBsaW5ldGltZV91czsKIAogCWlmICghY3N0YXRlLT5iYXNlLmFjdGl2ZSkKQEAgLTQ1NTAs MTEgKzQ1NDcsMTEgQEAgaW50ZWxfZ2V0X2xpbmV0aW1lX3VzKGNvbnN0IHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjc3RhdGUpCiAJcmV0dXJuIGxpbmV0aW1lX3VzOwogfQogCi1zdGF0aWMgdWlu dDMyX3QKK3N0YXRpYyB1MzIKIHNrbF9hZGp1c3RlZF9wbGFuZV9waXhlbF9yYXRlKGNvbnN0IHN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJCQkgICAgICBjb25zdCBzdHJ1Y3QgaW50 ZWxfcGxhbmVfc3RhdGUgKnBzdGF0ZSkKIHsKLQl1aW50NjRfdCBhZGp1c3RlZF9waXhlbF9yYXRl OworCXU2NCBhZGp1c3RlZF9waXhlbF9yYXRlOwogCXVpbnRfZml4ZWRfMTZfMTZfdCBkb3duc2Nh bGVfYW1vdW50OwogCiAJLyogU2hvdWxkbid0IHJlYWNoIGhlcmUgb24gZGlzYWJsZWQgcGxhbmVz Li4uICovCkBAIC00NTgxLDcgKzQ1NzgsNyBAQCBza2xfY29tcHV0ZV9wbGFuZV93bV9wYXJhbXMo Y29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KHBsYW5lLT5iYXNlLmRldik7CiAJY29uc3Qgc3Ry dWN0IGRybV9wbGFuZV9zdGF0ZSAqcHN0YXRlID0gJmludGVsX3BzdGF0ZS0+YmFzZTsKIAljb25z dCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBzdGF0ZS0+ZmI7Ci0JdWludDMyX3QgaW50 ZXJtX3BicGw7CisJdTMyIGludGVybV9wYnBsOwogCXN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUg KnN0YXRlID0KIAkJdG9faW50ZWxfYXRvbWljX3N0YXRlKGNzdGF0ZS0+YmFzZS5zdGF0ZSk7CiAJ Ym9vbCBhcHBseV9tZW1vcnlfYndfd2EgPSBza2xfbmVlZHNfbWVtb3J5X2J3X3dhKHN0YXRlKTsK QEAgLTQ2ODYsMTAgKzQ2ODMsMTAgQEAgc3RhdGljIHZvaWQgc2tsX2NvbXB1dGVfcGxhbmVfd20o Y29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIHsKIAlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPQogCQl0b19pOTE1KGludGVsX3BzdGF0ZS0+YmFzZS5wbGFu ZS0+ZGV2KTsKLQl1aW50MzJfdCBsYXRlbmN5ID0gZGV2X3ByaXYtPndtLnNrbF9sYXRlbmN5W2xl dmVsXTsKKwl1MzIgbGF0ZW5jeSA9IGRldl9wcml2LT53bS5za2xfbGF0ZW5jeVtsZXZlbF07CiAJ dWludF9maXhlZF8xNl8xNl90IG1ldGhvZDEsIG1ldGhvZDI7CiAJdWludF9maXhlZF8xNl8xNl90 IHNlbGVjdGVkX3Jlc3VsdDsKLQl1aW50MzJfdCByZXNfYmxvY2tzLCByZXNfbGluZXM7CisJdTMy IHJlc19ibG9ja3MsIHJlc19saW5lczsKIAlzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0 ZSA9CiAJCXRvX2ludGVsX2F0b21pY19zdGF0ZShjc3RhdGUtPmJhc2Uuc3RhdGUpOwogCWJvb2wg YXBwbHlfbWVtb3J5X2J3X3dhID0gc2tsX25lZWRzX21lbW9yeV9id193YShzdGF0ZSk7CkBAIC00 Nzk1LDEzICs0NzkyLDEzIEBAIHNrbF9jb21wdXRlX3dtX2xldmVscyhjb25zdCBzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCX0KIH0KIAotc3RhdGljIHVpbnQzMl90CitzdGF0aWMg dTMyCiBza2xfY29tcHV0ZV9saW5ldGltZV93bShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3N0YXRlKQogewogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IGNzdGF0ZS0+ YmFzZS5zdGF0ZTsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1 KHN0YXRlLT5kZXYpOwogCXVpbnRfZml4ZWRfMTZfMTZfdCBsaW5ldGltZV91czsKLQl1aW50MzJf dCBsaW5ldGltZV93bTsKKwl1MzIgbGluZXRpbWVfd207CiAKIAlsaW5ldGltZV91cyA9IGludGVs X2dldF9saW5ldGltZV91cyhjc3RhdGUpOwogCkBAIC00ODI0LDkgKzQ4MjEsOSBAQCBzdGF0aWMg dm9pZCBza2xfY29tcHV0ZV90cmFuc2l0aW9uX3dtKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjc3RhdGUsCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNzdGF0ZS0+YmFzZS5j cnRjLT5kZXY7CiAJY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShkZXYpOwotCXVpbnQxNl90IHRyYW5zX21pbiwgdHJhbnNfeV90aWxlX21pbjsKLQljb25z dCB1aW50MTZfdCB0cmFuc19hbW91bnQgPSAxMDsgLyogVGhpcyBpcyBjb25maWd1cmFibGUgYW1v dW50ICovCi0JdWludDE2X3Qgd20wX3NlbF9yZXNfYiwgdHJhbnNfb2Zmc2V0X2IsIHJlc19ibG9j a3M7CisJdTE2IHRyYW5zX21pbiwgdHJhbnNfeV90aWxlX21pbjsKKwljb25zdCB1MTYgdHJhbnNf YW1vdW50ID0gMTA7IC8qIFRoaXMgaXMgY29uZmlndXJhYmxlIGFtb3VudCAqLworCXUxNiB3bTBf c2VsX3Jlc19iLCB0cmFuc19vZmZzZXRfYiwgcmVzX2Jsb2NrczsKIAogCS8qIFRyYW5zaXRpb24g V00gYXJlIG5vdCByZWNvbW1lbmRlZCBieSBIVyB0ZWFtIGZvciBHRU45ICovCiAJaWYgKElOVEVM X0dFTihkZXZfcHJpdikgPD0gOSkKQEAgLTQ4NTUsOCArNDg1Miw4IEBAIHN0YXRpYyB2b2lkIHNr bF9jb21wdXRlX3RyYW5zaXRpb25fd20oY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNz dGF0ZSwKIAl3bTBfc2VsX3Jlc19iID0gd20tPndtWzBdLnBsYW5lX3Jlc19iIC0gMTsKIAogCWlm ICh3cC0+eV90aWxlZCkgewotCQl0cmFuc195X3RpbGVfbWluID0gKHVpbnQxNl90KSBtdWxfcm91 bmRfdXBfdTMyX2ZpeGVkMTYoMiwKLQkJCQkJCQl3cC0+eV90aWxlX21pbmltdW0pOworCQl0cmFu c195X3RpbGVfbWluID0KKwkJCSh1MTYpbXVsX3JvdW5kX3VwX3UzMl9maXhlZDE2KDIsIHdwLT55 X3RpbGVfbWluaW11bSk7CiAJCXJlc19ibG9ja3MgPSBtYXgod20wX3NlbF9yZXNfYiwgdHJhbnNf eV90aWxlX21pbikgKwogCQkJCXRyYW5zX29mZnNldF9iOwogCX0gZWxzZSB7CkBAIC01MDMwLDcg KzUwMjcsNyBAQCBzdGF0aWMgdm9pZCBza2xfd3JpdGVfd21fbGV2ZWwoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgICAgIGk5MTVfcmVnX3QgcmVnLAogCQkJICAgICAg IGNvbnN0IHN0cnVjdCBza2xfd21fbGV2ZWwgKmxldmVsKQogewotCXVpbnQzMl90IHZhbCA9IDA7 CisJdTMyIHZhbCA9IDA7CiAKIAlpZiAobGV2ZWwtPnBsYW5lX2VuKSB7CiAJCXZhbCB8PSBQTEFO RV9XTV9FTjsKQEAgLTUxNjEsMTIgKzUxNTgsMTIgQEAgc3RhdGljIGludCBza2xfdXBkYXRlX3Bp cGVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAlyZXR1cm4gMDsKIH0KIAot c3RhdGljIHVpbnQzMl90CitzdGF0aWMgdTMyCiBwaXBlc19tb2RpZmllZChzdHJ1Y3QgaW50ZWxf YXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YzsKIAlzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlOwotCXVpbnQzMl90IGksIHJldCA9IDA7CisJdTMy IGksIHJldCA9IDA7CiAKIAlmb3JfZWFjaF9uZXdfaW50ZWxfY3J0Y19pbl9zdGF0ZShzdGF0ZSwg Y3J0YywgY3N0YXRlLCBpKQogCQlyZXQgfD0gZHJtX2NydGNfbWFzaygmY3J0Yy0+YmFzZSk7CkBA IC01MjY3LDcgKzUyNjQsNyBAQCBza2xfZGRiX2FkZF9hZmZlY3RlZF9waXBlcyhzdHJ1Y3QgaW50 ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSwgYm9vbCAqY2hhbmdlZCkKIAljb25zdCBzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGludGVsX2Ny dGMgKmNydGM7CiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7Ci0JdWludDMy X3QgcmVhbGxvY19waXBlcyA9IHBpcGVzX21vZGlmaWVkKHN0YXRlKTsKKwl1MzIgcmVhbGxvY19w aXBlcyA9IHBpcGVzX21vZGlmaWVkKHN0YXRlKTsKIAlpbnQgcmV0LCBpOwogCiAJLyoKQEAgLTU1 NjYsNyArNTU2Myw3IEBAIHN0YXRpYyB2b2lkIGlsa19vcHRpbWl6ZV93YXRlcm1hcmtzKHN0cnVj dCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlLAogCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPndt LndtX211dGV4KTsKIH0KIAotc3RhdGljIGlubGluZSB2b2lkIHNrbF93bV9sZXZlbF9mcm9tX3Jl Z192YWwodWludDMyX3QgdmFsLAorc3RhdGljIGlubGluZSB2b2lkIHNrbF93bV9sZXZlbF9mcm9t X3JlZ192YWwodTMyIHZhbCwKIAkJCQkJICAgICBzdHJ1Y3Qgc2tsX3dtX2xldmVsICpsZXZlbCkK IHsKIAlsZXZlbC0+cGxhbmVfZW4gPSB2YWwgJiBQTEFORV9XTV9FTjsKQEAgLTU1ODIsNyArNTU3 OSw3IEBAIHZvaWQgc2tsX3BpcGVfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjICpj cnRjLAogCWVudW0gcGlwZSBwaXBlID0gY3J0Yy0+cGlwZTsKIAlpbnQgbGV2ZWwsIG1heF9sZXZl bDsKIAllbnVtIHBsYW5lX2lkIHBsYW5lX2lkOwotCXVpbnQzMl90IHZhbDsKKwl1MzIgdmFsOwog CiAJbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXZfcHJpdik7CiAKQEAgLTU2OTQsNyAr NTY5MSw3IEBAIHN0YXRpYyB2b2lkIGlsa19waXBlX3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YykKIHN0YXRpYyB2b2lkIGc0eF9yZWFkX3dtX3ZhbHVlcyhzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgICAgICAgc3RydWN0IGc0eF93bV92YWx1ZXMg KndtKQogewotCXVpbnQzMl90IHRtcDsKKwl1MzIgdG1wOwogCiAJdG1wID0gSTkxNV9SRUFEKERT UEZXMSk7CiAJd20tPnNyLnBsYW5lID0gX0ZXX1dNKHRtcCwgU1IpOwpAQCAtNTcyMSw3ICs1NzE4 LDcgQEAgc3RhdGljIHZvaWQgdmx2X3JlYWRfd21fdmFsdWVzKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKIAkJCSAgICAgICBzdHJ1Y3Qgdmx2X3dtX3ZhbHVlcyAqd20pCiB7CiAJ ZW51bSBwaXBlIHBpcGU7Ci0JdWludDMyX3QgdG1wOworCXUzMiB0bXA7CiAKIAlmb3JfZWFjaF9w aXBlKGRldl9wcml2LCBwaXBlKSB7CiAJCXRtcCA9IEk5MTVfUkVBRChWTFZfRERMKHBpcGUpKTsK QEAgLTg1MDUsNyArODUwMiw3IEBAIHN0YXRpYyB2b2lkIGc0eF9kaXNhYmxlX3RyaWNrbGVfZmVl ZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIHN0YXRpYyB2b2lkIGlsa19p bml0X2Nsb2NrX2dhdGluZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0J dWludDMyX3QgZHNwY2xrX2dhdGUgPSBJTEtfVlJIVU5JVF9DTE9DS19HQVRFX0RJU0FCTEU7CisJ dTMyIGRzcGNsa19nYXRlID0gSUxLX1ZSSFVOSVRfQ0xPQ0tfR0FURV9ESVNBQkxFOwogCiAJLyoK IAkgKiBSZXF1aXJlZCBmb3IgRkJDCkBAIC04NTc3LDcgKzg1NzQsNyBAQCBzdGF0aWMgdm9pZCBp bGtfaW5pdF9jbG9ja19nYXRpbmcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog c3RhdGljIHZvaWQgY3B0X2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIHsKIAlpbnQgcGlwZTsKLQl1aW50MzJfdCB2YWw7CisJdTMyIHZhbDsKIAog CS8qCiAJICogT24gSWJleCBQZWFrIGFuZCBDb3VnYXIgUG9pbnQsIHdlIG5lZWQgdG8gZGlzYWJs ZSBjbG9jawpAQCAtODYxMiw3ICs4NjA5LDcgQEAgc3RhdGljIHZvaWQgY3B0X2luaXRfY2xvY2tf Z2F0aW5nKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogc3RhdGljIHZvaWQg Z2VuNl9jaGVja19tY2hfc2V0dXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog ewotCXVpbnQzMl90IHRtcDsKKwl1MzIgdG1wOwogCiAJdG1wID0gSTkxNV9SRUFEKE1DSF9TU0tQ RCk7CiAJaWYgKCh0bXAgJiBNQ0hfU1NLUERfV00wX01BU0spICE9IE1DSF9TU0tQRF9XTTBfVkFM KQpAQCAtODYyMiw3ICs4NjE5LDcgQEAgc3RhdGljIHZvaWQgZ2VuNl9jaGVja19tY2hfc2V0dXAo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiBzdGF0aWMgdm9pZCBnZW42X2lu aXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQl1 aW50MzJfdCBkc3BjbGtfZ2F0ZSA9IElMS19WUkhVTklUX0NMT0NLX0dBVEVfRElTQUJMRTsKKwl1 MzIgZHNwY2xrX2dhdGUgPSBJTEtfVlJIVU5JVF9DTE9DS19HQVRFX0RJU0FCTEU7CiAKIAlJOTE1 X1dSSVRFKElMS19EU1BDTEtfR0FURV9ELCBkc3BjbGtfZ2F0ZSk7CiAKQEAgLTg3MTYsNyArODcx Myw3IEBAIHN0YXRpYyB2b2lkIGdlbjZfaW5pdF9jbG9ja19nYXRpbmcoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogCiBzdGF0aWMgdm9pZCBnZW43X3NldHVwX2ZpeGVkX2Z1bmNf c2NoZWR1bGVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQl1aW50MzJf dCByZWcgPSBJOTE1X1JFQUQoR0VON19GRl9USFJFQURfTU9ERSk7CisJdTMyIHJlZyA9IEk5MTVf UkVBRChHRU43X0ZGX1RIUkVBRF9NT0RFKTsKIAogCS8qCiAJICogV2FWU1RocmVhZERpc3BhdGNo T3ZlcnJpZGU6aXZiLHZsdgpAQCAtODc1Miw3ICs4NzQ5LDcgQEAgc3RhdGljIHZvaWQgbHB0X2lu aXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHN0YXRp YyB2b2lkIGxwdF9zdXNwZW5kX2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IHsKIAlpZiAoSEFTX1BDSF9MUFRfTFAoZGV2X3ByaXYpKSB7Ci0JCXVpbnQzMl90IHZhbCA9IEk5 MTVfUkVBRChTT1VUSF9EU1BDTEtfR0FURV9EKTsKKwkJdTMyIHZhbCA9IEk5MTVfUkVBRChTT1VU SF9EU1BDTEtfR0FURV9EKTsKIAogCQl2YWwgJj0gflBDSF9MUF9QQVJUSVRJT05fTEVWRUxfRElT QUJMRTsKIAkJSTkxNV9XUklURShTT1VUSF9EU1BDTEtfR0FURV9ELCB2YWwpOwpAQCAtODk5MCw3 ICs4OTg3LDcgQEAgc3RhdGljIHZvaWQgaHN3X2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogc3RhdGljIHZvaWQgaXZiX2luaXRfY2xvY2tfZ2F0 aW5nKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQl1aW50MzJfdCBzbnBj cjsKKwl1MzIgc25wY3I7CiAKIAlJOTE1X1dSSVRFKElMS19EU1BDTEtfR0FURV9ELCBJTEtfVlJI VU5JVF9DTE9DS19HQVRFX0RJU0FCTEUpOwogCkBAIC05MTk5LDcgKzkxOTYsNyBAQCBzdGF0aWMg dm9pZCBjaHZfaW5pdF9jbG9ja19nYXRpbmcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogCiBzdGF0aWMgdm9pZCBnNHhfaW5pdF9jbG9ja19nYXRpbmcoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogewotCXVpbnQzMl90IGRzcGNsa19nYXRlOworCXUzMiBkc3Bj bGtfZ2F0ZTsKIAogCUk5MTVfV1JJVEUoUkVOQ0xLX0dBVEVfRDEsIDApOwogCUk5MTVfV1JJVEUo UkVOQ0xLX0dBVEVfRDIsIFZGX1VOSVRfQ0xPQ0tfR0FURV9ESVNBQkxFIHwKQEAgLTk0NDksNyAr OTQ0Niw3IEBAIHZvaWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiAKIHN0YXRpYyBpbmxpbmUgaW50IGdlbjZfY2hlY2tfbWFpbGJveF9zdGF0dXMoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXVpbnQzMl90IGZsYWdzID0KKwl1 MzIgZmxhZ3MgPQogCQlJOTE1X1JFQURfRlcoR0VONl9QQ09ERV9NQUlMQk9YKSAmIEdFTjZfUENP REVfRVJST1JfTUFTSzsKIAogCXN3aXRjaCAoZmxhZ3MpIHsKQEAgLTk0NzIsNyArOTQ2OSw3IEBA IHN0YXRpYyBpbmxpbmUgaW50IGdlbjZfY2hlY2tfbWFpbGJveF9zdGF0dXMoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiBzdGF0aWMgaW5saW5lIGludCBnZW43X2NoZWNrX21h aWxib3hfc3RhdHVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQl1aW50 MzJfdCBmbGFncyA9CisJdTMyIGZsYWdzID0KIAkJSTkxNV9SRUFEX0ZXKEdFTjZfUENPREVfTUFJ TEJPWCkgJiBHRU42X1BDT0RFX0VSUk9SX01BU0s7CiAKIAlzd2l0Y2ggKGZsYWdzKSB7Ci0tIAoy LjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=