From: Jim Bride Subject: [PATCH IGT 11/11] lib: Add igt_psr_get_sink_crc() and change tests to use it. Date: Tue, 11 Jul 2017 15:48:36 -0700 Message-ID: <1499813316-15038-12-git-send-email-jim.bride@linux.intel.com> References: <1499813316-15038-1-git-send-email-jim.bride@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9CD156E327 for ; Tue, 11 Jul 2017 22:51:07 +0000 (UTC) In-Reply-To: <1499813316-15038-1-git-send-email-jim.bride@linux.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 T3VyIHRlc3RzIHdlcmUgc29tZXRpbWVzIHVzaW5nIHRoZSBzdHJpbmcgcmVwcmVzZW50YXRpb24g b2YgdGhlIHNpbmsgQ1JDCmFuZCBzb21ldGltZXMgYSBiaW5hcnkgdmVyc2lvbiwgc28gZm9yIGNv bnNpc3RlbmN5J3Mgc2FrZSwgYXMgd2VsbCBhcyB0bwptYWtlIHRoZSB1dGlsaXR5IGZ1bmN0aW9u IHJldHVybiBzb21ldGhpbmcgY2xvc2VyIHRvIHdoYXQgdGhlIGVEUCBzcGVjCnRhbGtzIGFib3V0 LCBhbGwgc2luayBDUkMgb3BlcmF0aW9ucyBhcmUgbm93IGFzc3VtaW5nIHRoYXQgdGhlIHNpbmsg Q1JDCmlzIHJldHJpZXZlZCBpbiBiaW5hcnkgZm9ybS4KClNpZ25lZC1vZmYtYnk6IEppbSBCcmlk ZSA8amltLmJyaWRlQGxpbnV4LmludGVsLmNvbT4KLS0tCiBsaWIvaWd0X3Bzci5jICAgICAgICAg ICAgICAgICAgICB8IDU5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBsaWIvaWd0 X3Bzci5oICAgICAgICAgICAgICAgICAgICB8ICAyICsrCiB0ZXN0cy9rbXNfZnJvbnRidWZmZXJf dHJhY2tpbmcuYyB8IDI1ICsrKysrKy0tLS0tLS0tCiB0ZXN0cy9rbXNfcHNyX3NpbmtfY3JjLmMg ICAgICAgICB8IDc0ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDQg ZmlsZXMgY2hhbmdlZCwgMTA1IGluc2VydGlvbnMoKyksIDU1IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2xpYi9pZ3RfcHNyLmMgYi9saWIvaWd0X3Bzci5jCmluZGV4IDJmZGE0NjcuLjllYTJi OTMgMTAwNjQ0Ci0tLSBhL2xpYi9pZ3RfcHNyLmMKKysrIGIvbGliL2lndF9wc3IuYwpAQCAtMTcy LDMgKzE3Miw2MiBAQCBib29sIGlndF9wc3JfZmluZF9nb29kX21vZGUoZHJtTW9kZUNvbm5lY3Rv clB0ciBjb25uZWN0b3IsCiAJfQogCXJldHVybiBmYWxzZTsKIH0KKworLyoqCisgKiBpZ3RfcHNy X29wZW5fc2lua19jcmM6CisgKiBAZHJtX2ZkOiBhIGZpbGUgZGVzY3JpcHRvciB0byB0aGUgZHJt IGRlYnVnZnMgdHJlZQorICoKKyAqIFJldHVybnMgYSB2YWxpZCBmaWxlIGRlc2NyaXB0b3IgdG8g dGhlIHNpbmsgQ1JDIGRlYnVnZnMgZmlsZQorICogaWYgc3VjY2Vzc2Z1bCBvciAtMSBvbiBhbiBl cnJvci4KKyAqLworaW50IGlndF9wc3Jfb3Blbl9zaW5rX2NyYyhpbnQgZHJtX2ZkKQoreworCWlu dCBjcmNfZmQ7CisKKwljcmNfZmQgPSBvcGVuYXQoZHJtX2ZkLCAiaTkxNV9zaW5rX2NyY19lRFAx IiwgT19SRE9OTFkpOworCWlndF9hc3NlcnRfbHRlKDAsIGNyY19mZCk7CisJcmV0dXJuIGNyY19m ZDsKK30KKworCisvKioKKyAqIGlndF9wc3JfZ2V0X3NpbmtfY3JjOgorICogQGZkOiBhIGZpbGUg ZGVzY3JpcHRvciB0byB0aGUgc2luayBDUkMgZGVidWdmcyBub2RlCisgKiBAZGF0YTogQSBzaXgg Ynl0ZSBhcnJheSBvZiBjaGFyYWN0ZXJzIHRoYXQgaG9sZHMgdGhlIHJlYWQgQ1JDIHZhbHVlcwor ICoKKyAqIFJldHVybnMgMCBvbiBzdWNjZXNzIG5vbi16ZXJvIG9uIGVycm9yLgorICovCitpbnQg aWd0X3Bzcl9nZXRfc2lua19jcmMoaW50IGZkLCBjaGFyICpkYXRhKQoreworCWludCByYywgZXJy bm9fOworCWNoYXIgYnVmWzEzXTsgLyogdHdvIGNoYXJzIHBlciBieXRlIHggNiBieXRlcyBwbHVz IGEgJ1wwJyAqLworCisJbWVtc2V0KGJ1ZiwgMCwgMTMpOworCWxzZWVrKGZkLCAwLCBTRUVLX1NF VCk7CisKKwlyYyA9IHJlYWQoZmQsIGJ1ZiwgMTIpOworCWVycm5vXyA9IGVycm5vOworCisJaWYg KHJjID09IC0xKSB7CisJCWlmIChlcnJub18gPT0gRU5PVFRZKQorCQkJaWd0X2luZm8oIlNpbmsg Q1JDIG5vdCBzdXBwb3J0ZWQ6IHBhbmVsIGRvZXNuJ3Qgc3VwcG9ydCBpdFxuIik7CisJCWVsc2Ug aWYgKGVycm5vXyAhPSBFVElNRURPVVQpCisJCQlpZ3RfYXNzZXJ0X2YocmMgIT0gLTEsICJVbmV4 cGVjdGVkIGVycm9yOiAlZFxuIiwKKwkJCQkgICAgIGVycm5vXyk7CisJCXJldHVybiBlcnJub187 CisJfSBlbHNlIHsKKwkJaW50IGk7CisJCXVuc2lnbmVkIGxvbmcgbG9uZyB2YWwgPSBzdHJ0b3Vs bChidWYsIE5VTEwsIDE2KTsKKworCQkvKgorCQkgKiBTdHVmZiB0aGUgc2l4IENSQyBieXRlcyBp bnRvIHRoZWlyIGluZGl2aWR1YWwgbG9jYXRpb25zLgorCQkgKiBXZSBzdGFydCBmcm9tIHRoZSBs ZWFzdCBzaWduaWZpY2FudCBieXRlIG9mIHRoZSByZWFkIHZhbHVlCisJCSAqIHRvIHNpbXBsaWZ5 IG1hc2tpbmcsIHNoaWZ0aW5nIGVhY2ggYnl0ZSBvZmYgYXMgd2Ugc2V0IHRoZQorCQkgKiBhcHBy b3ByaWF0ZSBlbGVtZW50IGluIHRoZSBhcnJheS4KKwkJICovCisJCWZvciAoaSA9IDU7IGkgPj0g MDsgaS0tLCB2YWwgPj49IDgpIHsKKwkJCWRhdGFbaV0gPSAodW5zaWduZWQgY2hhcikgKHZhbCAm IDB4ZmYpOworCQl9CisJCXJldHVybiAwOworCX0KK30KZGlmZiAtLWdpdCBhL2xpYi9pZ3RfcHNy LmggYi9saWIvaWd0X3Bzci5oCmluZGV4IGY0YzBhNmIuLjZmOTEzN2IgMTAwNjQ0Ci0tLSBhL2xp Yi9pZ3RfcHNyLmgKKysrIGIvbGliL2lndF9wc3IuaApAQCAtMzYsNSArMzYsNyBAQCB2b2lkIGln dF9wc3JfcHJpbnRfc3RhdHVzKGludCBmZCk7CiBib29sIGlndF9wc3JfdmFsaWRfY29ubmVjdG9y KGRybU1vZGVDb25uZWN0b3JQdHIgY29ubmVjdG9yKTsKIGJvb2wgaWd0X3Bzcl9maW5kX2dvb2Rf bW9kZShkcm1Nb2RlQ29ubmVjdG9yUHRyIGNvbm5lY3RvciwKIAkJCSAgICBkcm1Nb2RlTW9kZUlu Zm9QdHIgKm1vZGUpOworaW50IGlndF9wc3Jfb3Blbl9zaW5rX2NyYyhpbnQgZHJtX2ZkKTsKK2lu dCBpZ3RfcHNyX2dldF9zaW5rX2NyYyhpbnQgZmQsIGNoYXIgKmRhdGEpOwogCiAjZW5kaWYgLyog SUdUX1BTUl9IICovCmRpZmYgLS1naXQgYS90ZXN0cy9rbXNfZnJvbnRidWZmZXJfdHJhY2tpbmcu YyBiL3Rlc3RzL2ttc19mcm9udGJ1ZmZlcl90cmFja2luZy5jCmluZGV4IGZlNTBjYzcuLjA2YTFi OTkgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2ttc19mcm9udGJ1ZmZlcl90cmFja2luZy5jCisrKyBiL3Rl c3RzL2ttc19mcm9udGJ1ZmZlcl90cmFja2luZy5jCkBAIC0xODMsNyArMTgzLDcgQEAgc3RydWN0 IHsKIH07CiAKIAotI2RlZmluZSBTSU5LX0NSQ19TSVpFIDEyCisjZGVmaW5lIFNJTktfQ1JDX1NJ WkUgNgogdHlwZWRlZiBzdHJ1Y3QgewogCWNoYXIgZGF0YVtTSU5LX0NSQ19TSVpFXTsKIH0gc2lu a19jcmNfdDsKQEAgLTkxNiwzMiArOTE2LDI3IEBAIHN0YXRpYyBib29sIGZiY193YWl0X3VudGls X2VuYWJsZWQodm9pZCkKIAogc3RhdGljIHZvaWQgZ2V0X3NpbmtfY3JjKHNpbmtfY3JjX3QgKmNy YywgYm9vbCBtYW5kYXRvcnkpCiB7Ci0JaW50IHJjLCBlcnJub187CisJaW50IHJjOworCWNvbnN0 IGNoYXIgYmFkX2NyY1s2XSA9IHswLCAwLCAwLCAwLCAwLCAwfTsKIAogCWlmICghc2lua19jcmMu c3VwcG9ydGVkKSB7Ci0JCW1lbWNweShjcmMsICJ1bnN1cHBvcnRlZCEiLCBTSU5LX0NSQ19TSVpF KTsKKwkJbWVtY3B5KGNyYywgYmFkX2NyYywgU0lOS19DUkNfU0laRSk7CiAJCXJldHVybjsKIAl9 CiAKLQlsc2VlayhzaW5rX2NyYy5mZCwgMCwgU0VFS19TRVQpOwotCi0JcmMgPSByZWFkKHNpbmtf Y3JjLmZkLCBjcmMtPmRhdGEsIFNJTktfQ1JDX1NJWkUpOwotCWVycm5vXyA9IGVycm5vOworCXJj ID0gaWd0X3Bzcl9nZXRfc2lua19jcmMoc2lua19jcmMuZmQsIGNyYy0+ZGF0YSk7CiAKLQlpZiAo cmMgPT0gLTEgJiYgZXJybm9fID09IEVOT1RUWSkgeworCWlmIChyYyA9PSBFTk9UVFkpIHsKIAkJ aWd0X2luZm8oIlNpbmsgQ1JDIG5vdCBzdXBwb3J0ZWQ6IHBhbmVsIGRvZXNuJ3Qgc3VwcG9ydCBp dFxuIik7CiAJCXNpbmtfY3JjLnN1cHBvcnRlZCA9IGZhbHNlOwotCX0gZWxzZSBpZiAocmMgPT0g LTEgJiYgZXJybm9fID09IEVUSU1FRE9VVCkgewotCQlpZiAoc2lua19jcmMucmVsaWFibGUpIHsK LQkJCWlndF9pbmZvKCJTaW5rIENSQyBpcyB1bnJlbGlhYmxlIG9uIHRoaXMgbWFjaGluZS5cbiIp OworCX0gZWxzZSBpZiAocmMgPT0gRVRJTUVET1VUKSB7CisJCWlmIChzaW5rX2NyYy5yZWxpYWJs ZSkKIAkJCXNpbmtfY3JjLnJlbGlhYmxlID0gZmFsc2U7Ci0JCX0KIAogCQlpZiAobWFuZGF0b3J5 KQogCQkJaWd0X3NraXAoIlNpbmsgQ1JDIGlzIHVucmVsaWFibGUgb24gdGhpcyBtYWNoaW5lLlxu Iik7CiAJfSBlbHNlIHsKLQkJaWd0X2Fzc2VydF9mKHJjICE9IC0xLCAiVW5leHBlY3RlZCBlcnJv cjogJWRcbiIsIGVycm5vXyk7Ci0JCWlndF9hc3NlcnQocmMgPT0gU0lOS19DUkNfU0laRSk7CisJ CWlndF9hc3NlcnRfZihyYyA9PSAwLCAiVW5leHBlY3RlZCBlcnJvcjogJWRcbiIsIHJjKTsKIAl9 CiB9CiAKQEAgLTE0MTAsNyArMTQwNSw3IEBAIHN0YXRpYyB2b2lkIHNldHVwX3NpbmtfY3JjKHZv aWQpCiAJZmlsbF9mYl9yZWdpb24oJnByaW1fbW9kZV9wYXJhbXMuZmIsIENPTE9SX1BSSU1fQkcp OwogCXNldF9tb2RlX2Zvcl9wYXJhbXMoJnByaW1fbW9kZV9wYXJhbXMpOwogCi0Jc2lua19jcmMu ZmQgPSBvcGVuYXQoZHJtLmRlYnVnZnMsICJpOTE1X3NpbmtfY3JjX2VEUDEiLCBPX1JET05MWSk7 CisJc2lua19jcmMuZmQgPSBpZ3RfcHNyX29wZW5fc2lua19jcmMoZHJtLmRlYnVnZnMpOwogCWln dF9hc3NlcnRfbHRlKDAsIHNpbmtfY3JjLmZkKTsKIAogCS8qIERvIGEgZmlyc3QgcmVhZCB0byB0 cnkgdG8gZGV0ZWN0IGlmIGl0J3Mgc3VwcG9ydGVkLiAqLwpkaWZmIC0tZ2l0IGEvdGVzdHMva21z X3Bzcl9zaW5rX2NyYy5jIGIvdGVzdHMva21zX3Bzcl9zaW5rX2NyYy5jCmluZGV4IGViMWJiYjMu LjkwYTZiMzQgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2ttc19wc3Jfc2lua19jcmMuYworKysgYi90ZXN0 cy9rbXNfcHNyX3NpbmtfY3JjLmMKQEAgLTMzLDcgKzMzLDcgQEAKIAogYm9vbCBydW5uaW5nX3dp dGhfcHNyX2Rpc2FibGVkOwogCi0jZGVmaW5lIENSQ19CTEFDSyAiMDAwMDAwMDAwMDAwIgorI2Rl ZmluZSBTSU5LX0NSQ19TSVpFIDYKIAogZW51bSBvcGVyYXRpb25zIHsKIAlQQUdFX0ZMSVAsCkBA IC02NCw2ICs2NCw4IEBAIHN0YXRpYyBjb25zdCBjaGFyICpvcF9zdHIoZW51bSBvcGVyYXRpb25z IG9wKQogCiB0eXBlZGVmIHN0cnVjdCB7CiAJaW50IGRybV9mZDsKKwlpbnQgZGVidWdmc19mZDsK KwlpbnQgY3JjX2ZkOwogCWludCB0ZXN0X3BsYW5lOwogCWVudW0gb3BlcmF0aW9ucyBvcDsKIAl1 aW50MzJfdCBkZXZpZDsKQEAgLTEyNSw3ICsxMjcsNyBAQCBzdGF0aWMgdm9pZCBkaXNwbGF5X2lu aXQoZGF0YV90ICpkYXRhKQogCWlndF9kaXNwbGF5X2luaXQoJmRhdGEtPmRpc3BsYXksIGRhdGEt PmRybV9mZCk7CiAJc2V0dXBfb3V0cHV0KGRhdGEpOwogCi0JCS8qIFdlIG5lZWQgdG8gYmUgYWJs ZSB0byBkbyBhIG1vZGVzZXQgYmVmb3JlIHdlIGVuYWJsZSBQU1IgdG8KKwkvKiBXZSBuZWVkIHRv IGJlIGFibGUgdG8gZG8gYSBtb2Rlc2V0IGJlZm9yZSB3ZSBlbmFibGUgUFNSIHRvCiAJICogZW5z dXJlIHRoYXQgd2UgYXJlIHJ1bm5pbmcgYXQgYSBtb2RlIHN1Y2ggdGhhdCBQU1Igc2V0dXAgY2Fu CiAJICogY29tcGxldGUgd2l0aGluIGEgc2luZ2xlIHZibGFuayBpbnRlcnZhbC4KIAkgKi8KQEAg LTE1MCw2ICsxNTIsOCBAQCBzdGF0aWMgdm9pZCBkaXNwbGF5X2luaXQoZGF0YV90ICpkYXRhKQog CiBzdGF0aWMgdm9pZCBkaXNwbGF5X2ZpbmkoZGF0YV90ICpkYXRhKQogeworCWNsb3NlKGRhdGEt PmNyY19mZCk7CisJY2xvc2UoZGF0YS0+ZGVidWdmc19mZCk7CiAJaWd0X291dHB1dF9vdmVycmlk ZV9tb2RlKGRhdGEtPm91dHB1dCwgTlVMTCk7CiAJaWd0X2Rpc3BsYXlfZmluaSgmZGF0YS0+ZGlz cGxheSk7CiB9CkBAIC0yMzMsNTggKzIzNyw0MyBAQCBzdGF0aWMgYm9vbCB3YWl0X3Bzcl9lbnRy eShkYXRhX3QgKmRhdGEpCiB9CiAKIHN0YXRpYyB2b2lkIGdldF9zaW5rX2NyYyhkYXRhX3QgKmRh dGEsIGNoYXIgKmNyYykgewotCWludCBkaXI7CisJaW50IHJjLCB0cmllcyA9IDEwOwogCiAJaWYg KGlndF9pbnRlcmFjdGl2ZV9kZWJ1ZykKIAkJcmV0dXJuOwogCi0JZGlyID0gaWd0X2RlYnVnZnNf ZGlyKGRhdGEtPmRybV9mZCk7Ci0JaWd0X3JlcXVpcmVfZihpZ3Rfc3lzZnNfc2NhbmYoZGlyLCAi aTkxNV9zaW5rX2NyY19lRFAxIiwgIiVzXG4iLCBjcmMpLAotCQkgICAgICAiU2luayBDUkMgaXMg dW5yZWxpYWJsZSBvbiB0aGlzIG1hY2hpbmUuIFRyeSBtYW51YWwgZGVidWcgd2l0aCAtLWludGVy YWN0aXZlLWRlYnVnPW5vLWNyY1xuIik7Ci0JY2xvc2UoZGlyKTsKKwltZW1zZXQoY3JjLCAwLCBT SU5LX0NSQ19TSVpFKTsKKwlkbyB7CisJCXJjID0gaWd0X3Bzcl9nZXRfc2lua19jcmMoZGF0YS0+ Y3JjX2ZkLCBjcmMpOworCQlpZiAocmMpCisJCQl1c2xlZXAoNTAwMDApOworCX0gd2hpbGUgKHJj ICYmIC0tdHJpZXMpOwogCi0JaWd0X2RlYnVnKCIlc1xuIiwgY3JjKTsKKwlpZiAocmMpCisJCWln dF9za2lwKCJDb3VsZCBub3QgZ2V0IHNpbmsgQ1JDIGFmdGVyIHRlbiB0cmllcy5cbiIpOworCisJ aWd0X2RlYnVnKCJjcmMgdmFsdWVzOiAweCUwMmhoeCUwMmhoeCUwMmhoeCUwMmhoeCUwMmhoeCUw MmhoeFxuIiwKKwkJICBjcmNbMF0sIGNyY1sxXSwgY3JjWzJdLCBjcmNbM10sIGNyY1s0XSwgY3Jj WzVdKTsKIAlpZ3RfZGVidWdfd2FpdF9mb3Jfa2V5cHJlc3MoImNyYyIpOwogCiAJLyogVGhlIGlt cG9ydGFudCB2YWx1ZSB3YXMgYWxyZWFkeSB0YWtlbi4KIAkgKiBOb3cgZ2l2ZSBhIHRpbWUgZm9y IGh1bWFuIGV5ZXMKIAkgKi8KIAl1c2xlZXAoMzAwMDAwKTsKLQotCS8qIEJsYWNrIHNjcmVlbiBp cyBhbHdheXMgaW52YWxpZCAqLwotCWlndF9hc3NlcnQoc3RyY21wKGNyYywgQ1JDX0JMQUNLKSAh PSAwKTsKIH0KIAogc3RhdGljIGJvb2wgaXNfZ3JlZW4oY2hhciAqY3JjKQogewotCWNoYXIgY29s b3JfbWFza1s1XSA9ICJGRkZGXDAiOwotCWNoYXIgcnNbNV0sIGdzWzVdLCBic1s1XTsKLQl1bnNp Z25lZCBpbnQgcmgsIGdoLCBiaCwgbWFzazsKLQlpbnQgcmV0OworCXVuc2lnbmVkIGludCByaCwg Z2gsIGJoOwogCiAJaWYgKGlndF9pbnRlcmFjdGl2ZV9kZWJ1ZykKIAkJcmV0dXJuIGZhbHNlOwog Ci0Jc3NjYW5mKGNvbG9yX21hc2ssICIlNHgiLCAmbWFzayk7Ci0KLQltZW1jcHkocnMsICZjcmNb MF0sIDQpOwotCXJzWzRdID0gJ1wwJzsKLQlyZXQgPSBzc2NhbmYocnMsICIlNHgiLCAmcmgpOwot CWlndF9yZXF1aXJlKHJldCA+IDApOwotCi0JbWVtY3B5KGdzLCAmY3JjWzRdLCA0KTsKLQlnc1s0 XSA9ICdcMCc7Ci0JcmV0ID0gc3NjYW5mKGdzLCAiJTR4IiwgJmdoKTsKLQlpZ3RfcmVxdWlyZShy ZXQgPiAwKTsKLQotCW1lbWNweShicywgJmNyY1s4XSwgNCk7Ci0JYnNbNF0gPSAnXDAnOwotCXJl dCA9IHNzY2FuZihicywgIiU0eCIsICZiaCk7Ci0JaWd0X3JlcXVpcmUocmV0ID4gMCk7CisJcmgg PSAoY3JjWzFdIDw8IDgpIHwgY3JjWzBdOworCWdoID0gKGNyY1szXSA8PCA4KSB8IGNyY1syXTsK KwliaCA9IChjcmNbNV0gPDwgOCkgfCBjcmNbNF07CiAKLQlyZXR1cm4gKChyaCAmIG1hc2spID09 IDAgJiYKLQkJKGdoICYgbWFzaykgIT0gMCAmJgotCQkoYmggJiBtYXNrKSA9PSAwKTsKKwlyZXR1 cm4gKChyaCA9PSAwKSAmJiAoZ2ggIT0gMCkgJiYgKGJoID09IDApKTsKIH0KIAogI2RlZmluZSBh c3NlcnRfb3JfbWFudWFsKGNvbmRpdGlvbiwgZXhwZWN0ZWQpICAgICAgICAgICAgIFwKQEAgLTI5 OCw4ICsyODcsOCBAQCBzdGF0aWMgdm9pZCBydW5fdGVzdChkYXRhX3QgKmRhdGEpCiAJdWludDMy X3QgaGFuZGxlID0gZGF0YS0+ZmJfd2hpdGUuZ2VtX2hhbmRsZTsKIAlpZ3RfcGxhbmVfdCAqdGVz dF9wbGFuZTsKIAl2b2lkICpwdHI7Ci0JY2hhciByZWZfY3JjWzEyXTsKLQljaGFyIGNyY1sxMl07 CisJY2hhciByZWZfY3JjW1NJTktfQ1JDX1NJWkVdOworCWNoYXIgY3JjW1NJTktfQ1JDX1NJWkVd OwogCWNvbnN0IGNoYXIgKmV4cGVjdGVkID0gIiI7CiAKIAkvKiBDb25maXJtIHRoYXQgc2NyZWVu IGJlY2FtZSBHcmVlbiAqLwpAQCAtMzU2LDEwICszNDUsMTMgQEAgc3RhdGljIHZvaWQgcnVuX3Rl c3QoZGF0YV90ICpkYXRhKQogCQltZW1zZXQocHRyLCAweGZmLCBkYXRhLT5tb2Rfc2l6ZSk7CiAJ CWdldF9zaW5rX2NyYyhkYXRhLCBjcmMpOwogCQlpZiAoZGF0YS0+dGVzdF9wbGFuZSA9PSBEUk1f UExBTkVfVFlQRV9QUklNQVJZKQotCQkJYXNzZXJ0X29yX21hbnVhbChzdHJjbXAocmVmX2NyYywg Y3JjKSA9PSAwLCAic2NyZWVuIFdISVRFIik7CisJCQlhc3NlcnRfb3JfbWFudWFsKG1lbWNtcChy ZWZfY3JjLCBjcmMsCisJCQkJCQlTSU5LX0NSQ19TSVpFKSA9PSAwLAorCQkJCQkgInNjcmVlbiBX SElURSIpOwogCQllbHNlCi0JCQlhc3NlcnRfb3JfbWFudWFsKHN0cmNtcChyZWZfY3JjLCBjcmMp ID09IDAsCi0JCQkgICAgICAgIkdSRUVOIGJhY2tncm91bmQgd2l0aCBXSElURSBib3giKTsKKwkJ CWFzc2VydF9vcl9tYW51YWwobWVtY21wKHJlZl9jcmMsIGNyYywKKwkJCQkJCVNJTktfQ1JDX1NJ WkUpID09IDAsCisJCQkJCSAiR1JFRU4gYmFja2dyb3VuZCB3aXRoIFdISVRFIGJveCIpOwogCiAJ CWlndF9pbmZvKCJXYWl0aW5nIDEwcy4uLlxuIik7CiAJCXNsZWVwKDEwKTsKQEAgLTQwMSw3ICsz OTMsNyBAQCBzdGF0aWMgdm9pZCBydW5fdGVzdChkYXRhX3QgKmRhdGEpCiAJCWJyZWFrOwogCX0K IAlnZXRfc2lua19jcmMoZGF0YSwgY3JjKTsKLQlhc3NlcnRfb3JfbWFudWFsKHN0cmNtcChyZWZf Y3JjLCBjcmMpICE9IDAsIGV4cGVjdGVkKTsKKwlhc3NlcnRfb3JfbWFudWFsKG1lbWNtcChyZWZf Y3JjLCBjcmMsIFNJTktfQ1JDX1NJWkUpICE9IDAsIGV4cGVjdGVkKTsKIH0KIAogc3RhdGljIHZv aWQgdGVzdF9jbGVhbnVwKGRhdGFfdCAqZGF0YSkgewpAQCAtNTEzLDYgKzUwNSw4IEBAIGludCBt YWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAKIAlpZ3RfZml4dHVyZSB7CiAJCWRhdGEuZHJt X2ZkID0gZHJtX29wZW5fZHJpdmVyX21hc3RlcihEUklWRVJfSU5URUwpOworCQlkYXRhLmRlYnVn ZnNfZmQgPSBpZ3RfZGVidWdmc19kaXIoZGF0YS5kcm1fZmQpOworCQlkYXRhLmNyY19mZCA9IGln dF9wc3Jfb3Blbl9zaW5rX2NyYyhkYXRhLmRlYnVnZnNfZmQpOwogCQlrbXN0ZXN0X3NldF92dF9n cmFwaGljc19tb2RlKCk7CiAJCWRhdGEuZGV2aWQgPSBpbnRlbF9nZXRfZHJtX2RldmlkKGRhdGEu ZHJtX2ZkKTsKIAkJZGF0YS5idWZtZ3IgPSBkcm1faW50ZWxfYnVmbWdyX2dlbV9pbml0KGRhdGEu ZHJtX2ZkLCA0MDk2KTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK