From: Michael Hadley Subject: [PATCH v4 DDX] sna/video sprite patch: support for multiple xv ports Date: Thu, 31 Mar 2016 14:08:03 +0100 Message-ID: <1459429683-4850-1-git-send-email-michaelx.hadley@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 5A6D66EA76 for ; Thu, 31 Mar 2016 13:08:46 +0000 (UTC) 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: michaelx.hadley@intel.com List-Id: intel-gfx@lists.freedesktop.org VGhlIGN1cnJlbnQgZHJpdmVyIGV4cG9zZXMgb25seSBhIHNpbmdsZSBhZGFwdG9yIHBvcnQgc28g dGhhdCBvbmx5IG9uZQp4diB2aWRlbyBjYW4gYmUgcGxheWVkIG9uIHNwcml0ZSBhdCBhIHRpbWUu IFRoaXMgY2hhbmdlIHdpbGwgYWxsb3cKYXZhaWxhYmxlIGhhcmR3YXJlIHNwcml0ZXMgdG8gYmUg dXNlZC4KCnY0OiByZS1mb3JtYXR0ZWQgY29kZSwgcmVuYW1lZCBzcHJpdGVfZGlzYWJsZV91bmxv Y2soKSB0byBzcHJpdGVfdW5sb2NrKCkKICAgIHRvIGJlIGNsZWFyZXIuIEFsc28gbW92ZWQgdGhl IHNwcml0ZSBsb2NraW5nIG1lY2hhbmlzbSBmcm9tCiAgICBzcHJpdGVfZGlzYWJsZSgpIHRvIHNu YV9jcnRjX3Nwcml0ZV91bmxvY2soKSwgc2VwZXJhdGluZyB0aGUgbG9naWMKICAgIGJldHdlZW4g Ym90aCBmdW5jdGlvbnMgYW5kIGlzb2xhdGluZyB0aGVtIHRvIHRoZWlyIHNwZWNpZmljIHB1cnBv c2VzLgoKdjM6IHVwZGF0ZWQgcGF0Y2ggZnJvbSBsb3JuYXgubWNuZWlsbEBpbnRlbC5jb20uIHJl bW92ZWQvYWRkZWQKICAgIHdoaXRlc3BhY2UsIHJlLWZvcm1hdHRlZCBjb2RlLCByZW1vdmVkIHJl ZHVuZGVudCB2YXJpYWJsZSBhbGxvY2F0aW9uLgoKdjI6IHJlbW92ZWQvYWRkZWQgd2hpdGVzcGFj ZSwgY2hlY2sgZm9yIE5VTEwgcmV0dXJuIGZyb20gY2FsbG9jCiAgICBtYWRlIHJlcXVlc3RlZCBj aGFuZ2VzIHRvIHNpbXBsaWZ5IGNvZGUgKG5vdCBleGFjdGx5IGFzIHJlcXVlc3RlZAogICAgZHVl IHRvIHN0cnVjdCBzcHJpdGUgYmVpbmcgJ3ByaXZhdGUnIHRvIHNuYV9kaXNwbGF5LmMpLgoKU2ln bmVkLW9mZi1ieTogTWljaGFlbCBIYWRsZXkgPG1pY2hhZWx4LmhhZGxleUBpbnRlbC5jb20+ClJl dmlld2VkLS1ieTogQm9iIFBhYXV3ZSA8Ym9iLmoucGFhdXdlQGludGVsLmNvbT4KLS0tCiBzcmMv c25hL3NuYS5oICAgICAgICAgICAgICAgIHwgICA3ICstCiBzcmMvc25hL3NuYV9kaXNwbGF5LmMg ICAgICAgIHwgMjAxICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0K IHNyYy9zbmEvc25hX3ZpZGVvLmggICAgICAgICAgfCAgIDIgKwogc3JjL3NuYS9zbmFfdmlkZW9f c3ByaXRlLmMgICB8IDE0NiArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBzcmMvc25h L3NuYV92aWRlb190ZXh0dXJlZC5jIHwgICAyICstCiA1IGZpbGVzIGNoYW5nZWQsIDI2MCBpbnNl cnRpb25zKCspLCA5OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvc25hL3NuYS5oIGIv c3JjL3NuYS9zbmEuaAppbmRleCBlNWNhOTA2Li4wZmNlNjAyIDEwMDY0NAotLS0gYS9zcmMvc25h L3NuYS5oCisrKyBiL3NyYy9zbmEvc25hLmgKQEAgLTYwOCw4ICs2MDgsMTEgQEAgc3RhdGljIGlu bGluZSB2b2lkIHNuYV9wcmVzZW50X3ZibGFua19oYW5kbGVyKHN0cnVjdCBkcm1fZXZlbnRfdmJs YW5rICpldmVudCkgewogc3RhdGljIGlubGluZSB2b2lkIHNuYV9wcmVzZW50X2NhbmNlbF9mbGlw KHN0cnVjdCBzbmEgKnNuYSkgeyB9CiAjZW5kaWYKIAotZXh0ZXJuIGJvb2wgc25hX2NydGNfc2V0 X3Nwcml0ZV9yb3RhdGlvbih4Zjg2Q3J0Y1B0ciBjcnRjLCB1aW50MzJfdCByb3RhdGlvbik7Ci1l eHRlcm4gdWludDMyX3Qgc25hX2NydGNfdG9fc3ByaXRlKHhmODZDcnRjUHRyIGNydGMpOworZXh0 ZXJuIGJvb2wgc25hX2NydGNfc2V0X3Nwcml0ZV9yb3RhdGlvbih4Zjg2Q3J0Y1B0ciBjcnRjLCB1 aW50MzJfdCByb3RhdGlvbiwgRHJhd2FibGVQdHIgZHJhdyk7CitleHRlcm4gdWludDMyX3Qgc25h X2NydGNfbnVtX3Nwcml0ZXMoeGY4NkNydGNQdHIgY3J0Yyk7CitleHRlcm4gYm9vbCBzbmFfY3J0 Y19kcmF3YWJsZV90b19zcHJpdGVfaWQoeGY4NkNydGNQdHIgY3J0YywgRHJhd2FibGVQdHIgZHJh dywgdWludDMyX3QgKmlkKTsKK2V4dGVybiBib29sIHNuYV9jcnRjX3Nwcml0ZV9sb2NrKHhmODZD cnRjUHRyIGNydGMsIERyYXdhYmxlUHRyIGRyYXcpOworZXh0ZXJuIHZvaWQgc25hX2NydGNfc3By aXRlX3VubG9jayh4Zjg2Q3J0Y1B0ciBjcnRjLCBEcmF3YWJsZVB0ciBkcmF3KTsKIGV4dGVybiBi b29sIHNuYV9jcnRjX2lzX3RyYW5zZm9ybWVkKHhmODZDcnRjUHRyIGNydGMpOwogCiAjZGVmaW5l IENSVENfVkJMQU5LIDB4MwpkaWZmIC0tZ2l0IGEvc3JjL3NuYS9zbmFfZGlzcGxheS5jIGIvc3Jj L3NuYS9zbmFfZGlzcGxheS5jCmluZGV4IDZjZWI1MTUuLjk0OTU4NDUgMTAwNjQ0Ci0tLSBhL3Ny Yy9zbmEvc25hX2Rpc3BsYXkuYworKysgYi9zcmMvc25hL3NuYV9kaXNwbGF5LmMKQEAgLTIyMSw3 ICsyMjEsMTUgQEAgc3RydWN0IHNuYV9jcnRjIHsKIAkJCXVpbnQzMl90IHN1cHBvcnRlZDsKIAkJ CXVpbnQzMl90IGN1cnJlbnQ7CiAJCX0gcm90YXRpb247Ci0JfSBwcmltYXJ5LCBzcHJpdGU7CisJ fSBwcmltYXJ5OworCisJc3RydWN0IHNwcml0ZSB7CisJCXN0cnVjdCBwbGFuZSBwbGFuZTsKKwkJ RHJhd2FibGVQdHIgbG9ja2VkX3RvOyAvKiBkcmF3YWJsZSB0aGUgc3ByaXRlIHdhcyBncmFiYmVk IGZvciAqLworCQlzdHJ1Y3QgeG9yZ19saXN0IGxpbms7CisJfSBzcHJpdGU7IC8qIFRPRE8gd2F5 IHRvIHN1cHByZXNzIGFub255bW91cyBzdHJ1Y3Qgd2FybmluZyAiZGVjbGFyYXRpb24gZG9lcyBu b3QgZGVjbGFyZSBhbnl0aGluZyIgd2l0aG91dCBtaW5nPyAqLworCisJc3RydWN0IHhvcmdfbGlz dCBzcHJpdGVzOyAvKiBzcHJpdGVzIHRoYXQgY2FuIGJlIGRpc3BsYXllZCBvbiB0aGlzIGNydGMg Ki8KIAogCXVpbnQzMl90IG1vZGVfc2VyaWFsLCBmbGlwX3NlcmlhbDsKIApAQCAtNDM4LDEwICs0 NDYsMTExIEBAIHN0YXRpYyBpbmxpbmUgdWludDMyX3QgZmJfaWQoc3RydWN0IGtnZW1fYm8gKmJv KQogCXJldHVybiBiby0+ZGVsdGE7CiB9CiAKLXVpbnQzMl90IHNuYV9jcnRjX3RvX3Nwcml0ZSh4 Zjg2Q3J0Y1B0ciBjcnRjKQordWludDMyX3Qgc25hX2NydGNfbnVtX3Nwcml0ZXMoeGY4NkNydGNQ dHIgY3J0YykKK3sKKwlzdHJ1Y3Qgc25hX2NydGMgKnNuYV9jcnRjOworCXN0cnVjdCBzcHJpdGUg KnNwID0gTlVMTDsKKwl1aW50MzJfdCBudW1fc3ByaXRlcyA9IDA7CisKKwlzbmFfY3J0YyA9IHRv X3NuYV9jcnRjKGNydGMpOworCisJeG9yZ19saXN0X2Zvcl9lYWNoX2VudHJ5KHNwLCAmc25hX2Ny dGMtPnNwcml0ZXMsIGxpbmspIHsKKwkJbnVtX3Nwcml0ZXMrKzsKKwl9CisKKwlEQkcoKCIlczog JWQgc3ByaXRlc1xuIiwgX19GVU5DVElPTl9fLCBudW1fc3ByaXRlcykpOworCisJcmV0dXJuIG51 bV9zcHJpdGVzOworfQorCisvKgorICogcmV0dXJuIHRoZSBzcHJpdGUgYXR0YWNoZWQgdG8gdGhl IHNwZWNpZmllZCBjcnRjCisgKiBhbmQgbG9ja2VkIHRvIHRoZSBzcGVjaWZpZWQgZHJhd2FibGUg aWYgdGhlcmUgaXMgb25lLgorICovCitzdGF0aWMgc3RydWN0IHNwcml0ZSAqIHNuYV9jcnRjX2Ry YXdhYmxlX3RvX3Nwcml0ZSh4Zjg2Q3J0Y1B0ciBjcnRjLCBEcmF3YWJsZVB0ciBkcmF3KQogewor CXN0cnVjdCBzbmFfY3J0YyAqc25hX2NydGM7CisJc3RydWN0IHNwcml0ZSAqc3AgPSBOVUxMOwor CisJc25hX2NydGMgPSB0b19zbmFfY3J0YyhjcnRjKTsKKworCXhvcmdfbGlzdF9mb3JfZWFjaF9l bnRyeShzcCwgJnNuYV9jcnRjLT5zcHJpdGVzLCBsaW5rKSB7CisJCWlmIChzcC0+bG9ja2VkX3Rv ID09IGRyYXcpIHsKKwkJCXJldHVybiBzcDsKKwkJfQorCX0KKwlyZXR1cm4gTlVMTDsKK30KKwor LyoKKyAqIGdldHMgdGhlIHNwcml0ZSBpZCBmb3IgdGhlIHNwcml0ZSBhdHRhY2hlZCB0byB0aGUg c3BlY2lmaWVkIGNydGMKKyAqIGFuZCBsb2NrZWQgdG8gdGhlIHNwZWNpZmllZCBkcmF3YWJsZSBp ZiB0aGVyZSBpcyBvbmUuCisgKi8KK2Jvb2wgc25hX2NydGNfZHJhd2FibGVfdG9fc3ByaXRlX2lk KHhmODZDcnRjUHRyIGNydGMsIERyYXdhYmxlUHRyIGRyYXcsIHVpbnQzMl90ICpzcHJpdGVfaWQp Cit7CisJc3RydWN0IHNwcml0ZSAqc3AgPSBzbmFfY3J0Y19kcmF3YWJsZV90b19zcHJpdGUoY3J0 YywgZHJhdyk7CisKKwlpZiAoc3ApIHsKKwkJKnNwcml0ZV9pZCA9IHNwLT5wbGFuZS5pZDsKKwkJ cmV0dXJuIHRydWU7CisJfQorCXJldHVybiBmYWxzZTsKK30KKworc3RhdGljIHZvaWQgc3ByaXRl X2Rpc2FibGUoc3RydWN0IHNwcml0ZSAqc3AsIHN0cnVjdCBzbmEgKnNuYSkKK3sKKwlzdHJ1Y3Qg bG9jYWxfbW9kZV9zZXRfcGxhbmUgczsKKworCURCRygoIiVzOiB1bmxvY2tpbmcgc3ByaXRlICVk XG4iLCBfX0ZVTkNUSU9OX18sIHNwLT5wbGFuZS5pZCkpOworCW1lbXNldCgmcywgMCwgc2l6ZW9m KHMpKTsKKwlzLnBsYW5lX2lkID0gc3AtPnBsYW5lLmlkOworCWlmIChkcm1Jb2N0bChzbmEtPmtn ZW0uZmQsIExPQ0FMX0lPQ1RMX01PREVfU0VUUExBTkUsICZzKSkKKwkJeGY4NkRydk1zZyhzbmEt PnNjcm4tPnNjcm5JbmRleCwgWF9FUlJPUiwgImZhaWxlZCB0byBkaXNhYmxlIHBsYW5lXG4iKTsK K30KKworLyoKKyAqIElmIHRoZXJlJ3MgYSBzcHJpdGUgb24gdGhpcyBjcnRjIHVzaW5nIHRoZSBz cGVjaWZpZWQgZHJhd2FibGUsIHRoZW4gdW5sb2NrCisgKiBpdCBhbmQgZGlzYWJsZSB0aGUgc3By aXRlCisgKi8KK3ZvaWQgc25hX2NydGNfc3ByaXRlX3VubG9jayh4Zjg2Q3J0Y1B0ciBjcnRjLCBE cmF3YWJsZVB0ciBkcmF3KQoreworCXN0cnVjdCBzbmFfY3J0YyAqc25hX2NydGM7CisJc3RydWN0 IHNwcml0ZSAqc3AgPSBOVUxMOworCXN0cnVjdCBzbmEgKnNuYSA9IHRvX3NuYShjcnRjLT5zY3Ju KTsKKworCXNuYV9jcnRjID0gdG9fc25hX2NydGMoY3J0Yyk7CiAJYXNzZXJ0KHRvX3NuYV9jcnRj KGNydGMpKTsKLQlyZXR1cm4gdG9fc25hX2NydGMoY3J0YyktPnNwcml0ZS5pZDsKKworCWlmIChz cCA9IHNuYV9jcnRjX2RyYXdhYmxlX3RvX3Nwcml0ZShjcnRjLCBkcmF3KSkgeworCQlzcHJpdGVf ZGlzYWJsZShzcCwgc25hKTsKKwkJc3AtPmxvY2tlZF90byA9IE5VTEw7CisJfQorfQorCisvKgor ICogTG9jayBvbmUgb2YgdGhpcyBjcnRjJ3Mgc3ByaXRlcyB0byB0aGlzIGRyYXdhYmxlCisgKiBp ZiBoYXZlbid0IGFscmVhZHkgYW5kIHRoZXJlIGlzIG9uZSBhdmFpbGFibGUgICovCitib29sIHNu YV9jcnRjX3Nwcml0ZV9sb2NrKHhmODZDcnRjUHRyIGNydGMsIERyYXdhYmxlUHRyIGRyYXcpCit7 CisJc3RydWN0IHNuYV9jcnRjICpzbmFfY3J0YzsKKwlzdHJ1Y3Qgc3ByaXRlICpzcCA9IE5VTEw7 CisKKwlzbmFfY3J0YyA9IHRvX3NuYV9jcnRjKGNydGMpOworCWFzc2VydCh0b19zbmFfY3J0Yyhj cnRjKSk7CisKKwlzcCA9IHNuYV9jcnRjX2RyYXdhYmxlX3RvX3Nwcml0ZShjcnRjLCBkcmF3KTsK KwlpZiAoIXNwKSB7CisJCXhvcmdfbGlzdF9mb3JfZWFjaF9lbnRyeShzcCwgJnNuYV9jcnRjLT5z cHJpdGVzLCBsaW5rKSB7CisJCQlpZiAoIXNwLT5sb2NrZWRfdG8pIHsKKwkJCQlEQkcoKCIlczog bG9ja2luZyBzcHJpdGUgJWRcbiIsIF9fRlVOQ1RJT05fXywgc3AtPnBsYW5lLmlkKSk7CisJCQkJ c3AtPmxvY2tlZF90byA9IGRyYXc7CisJCQkJcmV0dXJuIHRydWU7CisJCQl9CisJCX0KKwkJREJH KCgiJXM6IE5vIGZyZWUgc3ByaXRlc1xuIiwgX19GVU5DVElPTl9fKSk7CisJCXJldHVybiBmYWxz ZTsKKwl9CisJcmV0dXJuIHRydWU7CiB9CiAKIGJvb2wgc25hX2NydGNfaXNfdHJhbnNmb3JtZWQo eGY4NkNydGNQdHIgY3J0YykKQEAgLTEyMzksMTcgKzEzNDgsMjAgQEAgcm90YXRpb25fcmVzZXQo c3RydWN0IHBsYW5lICpwKQogCXAtPnJvdGF0aW9uLmN1cnJlbnQgPSAwOwogfQogCi1ib29sIHNu YV9jcnRjX3NldF9zcHJpdGVfcm90YXRpb24oeGY4NkNydGNQdHIgY3J0YywgdWludDMyX3Qgcm90 YXRpb24pCitib29sIHNuYV9jcnRjX3NldF9zcHJpdGVfcm90YXRpb24oeGY4NkNydGNQdHIgY3J0 YywgdWludDMyX3Qgcm90YXRpb24sIERyYXdhYmxlUHRyIGRyYXcpCiB7Ci0JYXNzZXJ0KHRvX3Nu YV9jcnRjKGNydGMpKTsKLQlEQkcoKCIlczogQ1JUQzolZCBbcGlwZT0lZF0sIHNwcml0ZT0ldSBz ZXQtcm90YXRpb249JXhcbiIsCi0JICAgICBfX0ZVTkNUSU9OX18sCi0JICAgICBzbmFfY3J0Y19p ZChjcnRjKSwgc25hX2NydGNfcGlwZShjcnRjKSwKLQkgICAgIHRvX3NuYV9jcnRjKGNydGMpLT5z cHJpdGUuaWQsIHJvdGF0aW9uKSk7CisJc3RydWN0IHNwcml0ZSAqc3AgPSBOVUxMOwogCi0JcmV0 dXJuIHJvdGF0aW9uX3NldCh0b19zbmEoY3J0Yy0+c2NybiksCi0JCQkgICAgJnRvX3NuYV9jcnRj KGNydGMpLT5zcHJpdGUsCi0JCQkgICAgcm90YXRpb25fcmVkdWNlKCZ0b19zbmFfY3J0YyhjcnRj KS0+c3ByaXRlLCByb3RhdGlvbikpOworCXNwID0gc25hX2NydGNfZHJhd2FibGVfdG9fc3ByaXRl KGNydGMsIGRyYXcpOworCWlmIChzcCkgeworCQlEQkcoKCIlczogQ1JUQzolZCBbcGlwZT0lZF0s IHNwcml0ZT0ldSBzZXQtcm90YXRpb249JXhcbiIsCisJCQkJX19GVU5DVElPTl9fLCBzbmFfY3J0 Y19pZChjcnRjKSwgc25hX2NydGNfcGlwZShjcnRjKSwKKwkJCQlzcC0+cGxhbmUuaWQsIHJvdGF0 aW9uKSk7CisJCWlmICghcm90YXRpb25fc2V0KHRvX3NuYShjcnRjLT5zY3JuKSwKKwkJCQkmc3At PnBsYW5lLCByb3RhdGlvbl9yZWR1Y2UoJnNwLT5wbGFuZSwgcm90YXRpb24pKSkKKwkJCXJldHVy biBGQUxTRTsKKyAgICAgICB9CisJcmV0dXJuIHRydWU7CiB9CiAKICNpZiBIQVNfREVCVUdfRlVM TApAQCAtMTY0NSw3ICsxNzU3LDYgQEAgc3RhdGljIGJvb2wgd2FpdF9mb3Jfc2hhZG93KHN0cnVj dCBzbmEgKnNuYSwKIAkJCVJlZ2lvblN1YnRyYWN0KCZzbmEtPm1vZGUuc2hhZG93X3JlZ2lvbiwg JnNuYS0+bW9kZS5zaGFkb3dfcmVnaW9uLCAmcmVnaW9uKTsKIAkJfQogCi0JCWNydGMtPmNsaWVu dF9iby0+YWN0aXZlX3NjYW5vdXQtLTsKIAkJa2dlbV9ib19kZXN0cm95KCZzbmEtPmtnZW0sIGNy dGMtPmNsaWVudF9ibyk7CiAJCWNydGMtPmNsaWVudF9ibyA9IE5VTEw7CiAJCWxpc3RfZGVsKCZj cnRjLT5zaGFkb3dfbGluayk7CkBAIC0xODcxLDggKzE5ODIsNyBAQCBzdGF0aWMgdm9pZCBzbmFf Y3J0Y19kaXNhYmxlX292ZXJyaWRlKHN0cnVjdCBzbmEgKnNuYSwgc3RydWN0IHNuYV9jcnRjICpj cnRjKQogCWlmIChjcnRjLT5jbGllbnRfYm8gPT0gTlVMTCkKIAkJcmV0dXJuOwogCi0JYXNzZXJ0 KGNydGMtPmNsaWVudF9iby0+cmVmY250ID49IGNydGMtPmNsaWVudF9iby0+YWN0aXZlX3NjYW5v dXQpOwotCWNydGMtPmNsaWVudF9iby0+YWN0aXZlX3NjYW5vdXQtLTsKKwlhc3NlcnQoY3J0Yy0+ Y2xpZW50X2JvLT5yZWZjbnQgPiBjcnRjLT5jbGllbnRfYm8tPmFjdGl2ZV9zY2Fub3V0KTsKIAog CWlmICghY3J0Yy0+dHJhbnNmb3JtKSB7CiAJCURyYXdhYmxlUmVjIHRtcDsKQEAgLTI5ODUsMTAg KzMwOTUsMTUgQEAgc25hX2NydGNfZ2FtbWFfc2V0KHhmODZDcnRjUHRyIGNydGMsCiBzdGF0aWMg dm9pZAogc25hX2NydGNfZGVzdHJveSh4Zjg2Q3J0Y1B0ciBjcnRjKQogeworCXN0cnVjdCBzcHJp dGUgKnNwID0gTlVMTCwgKnRtcCA9IE5VTEw7CiAJc3RydWN0IHNuYV9jcnRjICpzbmFfY3J0YyA9 IHRvX3NuYV9jcnRjKGNydGMpOwogCiAJaWYgKHNuYV9jcnRjID09IE5VTEwpCiAJCXJldHVybjsK KwkKKwl4b3JnX2xpc3RfZm9yX2VhY2hfZW50cnlfc2FmZSggc3AsIHRtcCwgJnNuYV9jcnRjLT5z cHJpdGVzLCBsaW5rKSB7CisJCWZyZWUoc3ApOworCX0KIAogCWZyZWUoc25hX2NydGMpOwogCWNy dGMtPmRyaXZlcl9wcml2YXRlID0gTlVMTDsKQEAgLTMyMTIsOSArMzMyNywyMCBAQCBzbmFfY3J0 Y19maW5kX3BsYW5lcyhzdHJ1Y3Qgc25hICpzbmEsIHN0cnVjdCBzbmFfY3J0YyAqY3J0YykKIAkJ CWJyZWFrOwogCiAJCWNhc2UgRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWToKLQkJCWlmIChjcnRjLT5z cHJpdGUuaWQgPT0gMCkKLQkJCQljcnRjLT5zcHJpdGUgPSBkZXRhaWxzOwotCQkJYnJlYWs7CisJ CQl7CisJCQkJc3RydWN0IHNwcml0ZSAqcyA9IGNhbGxvYygxLCBzaXplb2YoIHN0cnVjdCBzcHJp dGUgKSk7CisKKwkJCQlpZiAocykgeworCQkJCQlzLT5sb2NrZWRfdG8gPSBOVUxMOworCQkJCQlz LT5wbGFuZSA9IGRldGFpbHM7CisJCQkJCXhvcmdfbGlzdF9hcHBlbmQoJnMtPmxpbmssICZjcnRj LT5zcHJpdGVzKTsKKwkJCQl9IGVsc2UgeworCQkJCQlEQkcoKCIlczogQ291bGQgbm90IGFsbG9j YXRlIG1lbW9yeSBmb3Igc3ByaXRlIFxuIiwKKwkJCQkJCQlfX0ZVTkNUSU9OX18pKTsKKwkJCQl9 CisKKwkJCQlicmVhazsKKwkJCX0KIAkJfQogCX0KIApAQCAtMzIyNSwxMCArMzM1MSwxNCBAQCBz bmFfY3J0Y19maW5kX3BsYW5lcyhzdHJ1Y3Qgc25hICpzbmEsIHN0cnVjdCBzbmFfY3J0YyAqY3J0 YykKIHN0YXRpYyB2b2lkCiBzbmFfY3J0Y19pbml0X19yb3RhdGlvbihzdHJ1Y3Qgc25hICpzbmEs IHN0cnVjdCBzbmFfY3J0YyAqY3J0YykKIHsKKwlzdHJ1Y3Qgc3ByaXRlICpzcCA9IE5VTEw7CisJ CiAJY3J0Yy0+cm90YXRpb24gPSBSUl9Sb3RhdGVfMDsKIAljcnRjLT5wcmltYXJ5LnJvdGF0aW9u LnN1cHBvcnRlZCA9IFJSX1JvdGF0ZV8wOwogCWNydGMtPnByaW1hcnkucm90YXRpb24uY3VycmVu dCA9IFJSX1JvdGF0ZV8wOwotCWNydGMtPnNwcml0ZS5yb3RhdGlvbiA9IGNydGMtPnByaW1hcnku cm90YXRpb247CisJeG9yZ19saXN0X2Zvcl9lYWNoX2VudHJ5KHNwLCAmY3J0Yy0+c3ByaXRlcywg bGluaykgeworCQlzcC0+cGxhbmUucm90YXRpb24gPSBjcnRjLT5wcmltYXJ5LnJvdGF0aW9uOwor CX0KIH0KIAogc3RhdGljIHZvaWQKQEAgLTMyODEsMTQgKzM0MTEsMTYgQEAgc25hX2NydGNfYWRk KFNjcm5JbmZvUHRyIHNjcm4sIHVuc2lnbmVkIGlkKQogCQlyZXR1cm4gdHJ1ZTsKIAl9CiAKKwl4 b3JnX2xpc3RfaW5pdCgmc25hX2NydGMtPnNwcml0ZXMpOworCiAJc25hX2NydGNfaW5pdF9fcm90 YXRpb24oc25hLCBzbmFfY3J0Yyk7CiAKIAlzbmFfY3J0Y19maW5kX3BsYW5lcyhzbmEsIHNuYV9j cnRjKTsKLQotCURCRygoIiVzOiBDUlRDOiVkIFtwaXBlPSVkXSwgcHJpbWFyeSBpZD0leDogc3Vw cG9ydGVkLXJvdGF0aW9ucz0leCwgY3VycmVudC1yb3RhdGlvbj0leCwgc3ByaXRlIGlkPSV4OiBz dXBwb3J0ZWQtcm90YXRpb25zPSV4LCBjdXJyZW50LXJvdGF0aW9uPSV4XG4iLAotCSAgICAgX19G VU5DVElPTl9fLCBpZCwgZ2V0X3BpcGUucGlwZSwKLQkgICAgIHNuYV9jcnRjLT5wcmltYXJ5Lmlk LCBzbmFfY3J0Yy0+cHJpbWFyeS5yb3RhdGlvbi5zdXBwb3J0ZWQsIHNuYV9jcnRjLT5wcmltYXJ5 LnJvdGF0aW9uLmN1cnJlbnQsCi0JICAgICBzbmFfY3J0Yy0+c3ByaXRlLmlkLCBzbmFfY3J0Yy0+ c3ByaXRlLnJvdGF0aW9uLnN1cHBvcnRlZCwgc25hX2NydGMtPnNwcml0ZS5yb3RhdGlvbi5jdXJy ZW50KSk7CisJCisJREJHKCgiJXM6IENSVEM6JWQgW3BpcGU9JWRdLCBwcmltYXJ5IGlkPSV4OiBz dXBwb3J0ZWQtcm90YXRpb25zPSV4LCIKKwkJCSIgY3VycmVudC1yb3RhdGlvbj0leFxuIiwgX19G VU5DVElPTl9fLCBpZCwgZ2V0X3BpcGUucGlwZSwKKwkJCXNuYV9jcnRjLT5wcmltYXJ5LmlkLCBz bmFfY3J0Yy0+cHJpbWFyeS5yb3RhdGlvbi5zdXBwb3J0ZWQsCisJCQlzbmFfY3J0Yy0+cHJpbWFy eS5yb3RhdGlvbi5jdXJyZW50KSk7CiAKIAlsaXN0X2luaXQoJnNuYV9jcnRjLT5zaGFkb3dfbGlu ayk7CiAKQEAgLTc5NzcsNiArODEwOSw3IEBAIHN0YXRpYyBib29sCiBzbmFfY3J0Y19oaWRlX3Bs YW5lcyhzdHJ1Y3Qgc25hICpzbmEsIHN0cnVjdCBzbmFfY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3Qg bG9jYWxfbW9kZV9zZXRfcGxhbmUgczsKKwlzdHJ1Y3Qgc3ByaXRlICpzcCA9IE5VTEw7CiAKIAlp ZiAoY3J0Yy0+cHJpbWFyeS5pZCA9PSAwKQogCQlyZXR1cm4gZmFsc2U7CkBAIC03OTg2LDggKzgx MTksOSBAQCBzbmFfY3J0Y19oaWRlX3BsYW5lcyhzdHJ1Y3Qgc25hICpzbmEsIHN0cnVjdCBzbmFf Y3J0YyAqY3J0YykKIAlpZiAoZHJtSW9jdGwoc25hLT5rZ2VtLmZkLCBMT0NBTF9JT0NUTF9NT0RF X1NFVFBMQU5FLCAmcykpCiAJCXJldHVybiBmYWxzZTsKIAotCXMucGxhbmVfaWQgPSBjcnRjLT5z cHJpdGUuaWQ7Ci0JKHZvaWQpZHJtSW9jdGwoc25hLT5rZ2VtLmZkLCBMT0NBTF9JT0NUTF9NT0RF X1NFVFBMQU5FLCAmcyk7CisJeG9yZ19saXN0X2Zvcl9lYWNoX2VudHJ5KHNwLCAmY3J0Yy0+c3By aXRlcywgbGluaykgeworCQlzcHJpdGVfZGlzYWJsZShzcCwgc25hKTsKKwl9CiAKIAlfX3NuYV9j cnRjX2Rpc2FibGUoc25hLCBjcnRjKTsKIAlyZXR1cm4gdHJ1ZTsKQEAgLTgwMTAsMTMgKzgxNDQs MTcgQEAgdm9pZCBzbmFfbW9kZV9yZXNldChzdHJ1Y3Qgc25hICpzbmEpCiAJYXNzZXJ0KHNuYS0+ bW9kZS5mcm9udF9hY3RpdmUgPT0gMCk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgc25hLT5tb2RlLm51 bV9yZWFsX2NydGM7IGkrKykgeworCQlzdHJ1Y3Qgc3ByaXRlICpzcCA9IE5VTEw7CiAJCXN0cnVj dCBzbmFfY3J0YyAqc25hX2NydGMgPSB0b19zbmFfY3J0Yyhjb25maWctPmNydGNbaV0pOwogCiAJ CWFzc2VydChzbmFfY3J0YyAhPSBOVUxMKTsKIAogCQkvKiBGb3JjZSB0aGUgcm90YXRpb24gcHJv cGVydHkgdG8gYmUgcmVzZXQgb24gbmV4dCB1c2UgKi8KIAkJcm90YXRpb25fcmVzZXQoJnNuYV9j cnRjLT5wcmltYXJ5KTsKLQkJcm90YXRpb25fcmVzZXQoJnNuYV9jcnRjLT5zcHJpdGUpOworCQkK KwkJeG9yZ19saXN0X2Zvcl9lYWNoX2VudHJ5KHNwLCAmc25hX2NydGMtPnNwcml0ZXMsIGxpbmsp IHsKKwkJCXJvdGF0aW9uX3Jlc2V0KCZzcC0+cGxhbmUpOworCQl9CiAJfQogCiAJLyogVlQgc3dp dGNoaW5nLCBsaWtlbHkgdG8gYmUgZmJjb24gc28gbWFrZSB0aGUgYmFja2xpZ2h0IHVzYWJsZSAq LwpAQCAtODQwMywxNCArODU0MSwxMiBAQCB2b2lkIHNuYV9zaGFkb3dfc2V0X2NydGMoc3RydWN0 IHNuYSAqc25hLAogCiAJaWYgKHNuYV9jcnRjLT5jbGllbnRfYm8gIT0gYm8pIHsKIAkJaWYgKHNu YV9jcnRjLT5jbGllbnRfYm8pIHsKLQkJCWFzc2VydChzbmFfY3J0Yy0+Y2xpZW50X2JvLT5yZWZj bnQgPj0gc25hX2NydGMtPmNsaWVudF9iby0+YWN0aXZlX3NjYW5vdXQpOwotCQkJc25hX2NydGMt PmNsaWVudF9iby0+YWN0aXZlX3NjYW5vdXQtLTsKKwkJCWFzc2VydChzbmFfY3J0Yy0+Y2xpZW50 X2JvLT5yZWZjbnQgPiBzbmFfY3J0Yy0+Y2xpZW50X2JvLT5hY3RpdmVfc2Nhbm91dCk7CiAJCQlr Z2VtX2JvX2Rlc3Ryb3koJnNuYS0+a2dlbSwgc25hX2NydGMtPmNsaWVudF9ibyk7CiAJCX0KIAog CQlzbmFfY3J0Yy0+Y2xpZW50X2JvID0ga2dlbV9ib19yZWZlcmVuY2UoYm8pOwotCQlzbmFfY3J0 Yy0+Y2xpZW50X2JvLT5hY3RpdmVfc2Nhbm91dCsrOwotCQlhc3NlcnQoc25hX2NydGMtPmNsaWVu dF9iby0+cmVmY250ID49IHNuYV9jcnRjLT5jbGllbnRfYm8tPmFjdGl2ZV9zY2Fub3V0KTsKKwkJ YXNzZXJ0KHNuYV9jcnRjLT5jbGllbnRfYm8tPnJlZmNudCA+IHNuYV9jcnRjLT5jbGllbnRfYm8t PmFjdGl2ZV9zY2Fub3V0KTsKIAkJc25hX2NydGNfZGFtYWdlKGNydGMpOwogCX0KIApAQCAtODQ2 NSw4ICs4NjAxLDcgQEAgdm9pZCBzbmFfc2hhZG93X3Vuc2V0X2NydGMoc3RydWN0IHNuYSAqc25h LAogCWlmIChzbmFfY3J0Yy0+Y2xpZW50X2JvID09IE5VTEwpCiAJCXJldHVybjsKIAotCWFzc2Vy dChzbmFfY3J0Yy0+Y2xpZW50X2JvLT5yZWZjbnQgPj0gc25hX2NydGMtPmNsaWVudF9iby0+YWN0 aXZlX3NjYW5vdXQpOwotCXNuYV9jcnRjLT5jbGllbnRfYm8tPmFjdGl2ZV9zY2Fub3V0LS07CisJ YXNzZXJ0KHNuYV9jcnRjLT5jbGllbnRfYm8tPnJlZmNudCA+IHNuYV9jcnRjLT5jbGllbnRfYm8t PmFjdGl2ZV9zY2Fub3V0KTsKIAlrZ2VtX2JvX2Rlc3Ryb3koJnNuYS0+a2dlbSwgc25hX2NydGMt PmNsaWVudF9ibyk7CiAJc25hX2NydGMtPmNsaWVudF9ibyA9IE5VTEw7CiAJbGlzdF9kZWwoJnNu YV9jcnRjLT5zaGFkb3dfbGluayk7CmRpZmYgLS1naXQgYS9zcmMvc25hL3NuYV92aWRlby5oIGIv c3JjL3NuYS9zbmFfdmlkZW8uaAppbmRleCBiMjc4OTkxLi4yNGNlNGZjIDEwMDY0NAotLS0gYS9z cmMvc25hL3NuYV92aWRlby5oCisrKyBiL3NyYy9zbmEvc25hX3ZpZGVvLmgKQEAgLTEzMyw2ICsx MzMsOCBAQCB2b2lkIHNuYV92aWRlb190ZXh0dXJlZF9zZXR1cChzdHJ1Y3Qgc25hICpzbmEsIFNj cmVlblB0ciBzY3JlZW4pOwogdm9pZCBzbmFfdmlkZW9fZGVzdHJveV93aW5kb3coV2luZG93UHRy IHdpbik7CiB2b2lkIHNuYV92aWRlb19jbG9zZShzdHJ1Y3Qgc25hICpzbmEpOwogCitpbnQgc25h X3ZpZGVvX3RleHR1cmVkX3B1dF9pbWFnZShkZFB1dEltYWdlX0FSR1MpOworCiBYdkFkYXB0b3JQ dHIgc25hX3h2X2FkYXB0b3JfYWxsb2Moc3RydWN0IHNuYSAqc25hKTsKIGludCBzbmFfeHZfZml4 dXBfZm9ybWF0cyhTY3JlZW5QdHIgc2NyZWVuLAogCQkJIFh2Rm9ybWF0UHRyIGZvcm1hdHMsCmRp ZmYgLS1naXQgYS9zcmMvc25hL3NuYV92aWRlb19zcHJpdGUuYyBiL3NyYy9zbmEvc25hX3ZpZGVv X3Nwcml0ZS5jCmluZGV4IGFlMDhlZjcuLmEzMDUyOGYgMTAwNjQ0Ci0tLSBhL3NyYy9zbmEvc25h X3ZpZGVvX3Nwcml0ZS5jCisrKyBiL3NyYy9zbmEvc25hX3ZpZGVvX3Nwcml0ZS5jCkBAIC03Nyw3 ICs3Nyw2IEBAIHN0YXRpYyBjb25zdCBYdkF0dHJpYnV0ZVJlYyBhdHRyaWJzW10gPSB7CiBzdGF0 aWMgaW50IHNuYV92aWRlb19zcHJpdGVfc3RvcChkZFN0b3BWaWRlb19BUkdTKQogewogCXN0cnVj dCBzbmFfdmlkZW8gKnZpZGVvID0gcG9ydC0+ZGV2UHJpdi5wdHI7Ci0Jc3RydWN0IGxvY2FsX21v ZGVfc2V0X3BsYW5lIHM7CiAJeGY4NkNydGNDb25maWdQdHIgY29uZmlnID0gWEY4Nl9DUlRDX0NP TkZJR19QVFIodmlkZW8tPnNuYS0+c2Nybik7CiAJaW50IGk7CiAKQEAgLTkwLDExICs4OSw3IEBA IHN0YXRpYyBpbnQgc25hX3ZpZGVvX3Nwcml0ZV9zdG9wKGRkU3RvcFZpZGVvX0FSR1MpCiAJCWlm ICh2aWRlby0+Ym9bcGlwZV0gPT0gTlVMTCkKIAkJCWNvbnRpbnVlOwogCi0JCW1lbXNldCgmcywg MCwgc2l6ZW9mKHMpKTsKLQkJcy5wbGFuZV9pZCA9IHNuYV9jcnRjX3RvX3Nwcml0ZShjcnRjKTsK LQkJaWYgKGRybUlvY3RsKHZpZGVvLT5zbmEtPmtnZW0uZmQsIExPQ0FMX0lPQ1RMX01PREVfU0VU UExBTkUsICZzKSkKLQkJCXhmODZEcnZNc2codmlkZW8tPnNuYS0+c2Nybi0+c2NybkluZGV4LCBY X0VSUk9SLAotCQkJCSAgICJmYWlsZWQgdG8gZGlzYWJsZSBwbGFuZVxuIik7CisJCXNuYV9jcnRj X3Nwcml0ZV91bmxvY2soY3J0YywgZHJhdyk7CiAKIAkJaWYgKHZpZGVvLT5ib1twaXBlXSkKIAkJ CWtnZW1fYm9fZGVzdHJveSgmdmlkZW8tPnNuYS0+a2dlbSwgdmlkZW8tPmJvW3BpcGVdKTsKQEAg LTIxNiw2ICsyMTEsNyBAQCBzbmFfdmlkZW9fc3ByaXRlX3Nob3coc3RydWN0IHNuYSAqc25hLAog CQkgICAgICBzdHJ1Y3Qgc25hX3ZpZGVvICp2aWRlbywKIAkJICAgICAgc3RydWN0IHNuYV92aWRl b19mcmFtZSAqZnJhbWUsCiAJCSAgICAgIHhmODZDcnRjUHRyIGNydGMsCisJCSAgICAgIERyYXdh YmxlUHRyIGRyYXcsCiAJCSAgICAgIEJveFB0ciBkc3RCb3gpCiB7CiAJc3RydWN0IGxvY2FsX21v ZGVfc2V0X3BsYW5lIHM7CkBAIC0yMjQsNyArMjIwLDEyIEBAIHNuYV92aWRlb19zcHJpdGVfc2hv dyhzdHJ1Y3Qgc25hICpzbmEsCiAJLyogWFhYIGhhbmRsZSB2aWRlbyBzcGFubmluZyBtdWx0aXBs ZSBDUlRDICovCiAKIAlWR19DTEVBUihzKTsKLQlzLnBsYW5lX2lkID0gc25hX2NydGNfdG9fc3By aXRlKGNydGMpOworCQorCWlmKCFzbmFfY3J0Y19kcmF3YWJsZV90b19zcHJpdGVfaWQoY3J0Yywg ZHJhdywgJnMucGxhbmVfaWQpKSB7CisJCUVSUigoIiVzOiBubyBzcHJpdGUgZm9yIHRoaXMgZHJh d2FibGVcbiIsIF9fRlVOQ1RJT05fXykpOworCQlyZXR1cm4gZmFsc2U7CisJfQorCiAKICNkZWZp bmUgRFJNX0k5MTVfU0VUX1NQUklURV9DT0xPUktFWSAweDJiCiAjZGVmaW5lIExPQ0FMX0lPQ1RM X0k5MTVfU0VUX1NQUklURV9DT0xPUktFWSBEUk1fSU9XUihEUk1fQ09NTUFORF9CQVNFICsgRFJN X0k5MTVfU0VUX1NQUklURV9DT0xPUktFWSwgc3RydWN0IGxvY2FsX2ludGVsX3Nwcml0ZV9jb2xv cmtleSkKQEAgLTQxNywxNCArNDE4LDExIEBAIHN0YXRpYyBpbnQgc25hX3ZpZGVvX3Nwcml0ZV9w dXRfaW1hZ2UoZGRQdXRJbWFnZV9BUkdTKQogCQlSZWdpb25JbnRlcnNlY3QoJnJlZywgJnJlZywg JmNsaXApOwogCQlpZiAoUmVnaW9uTmlsKCZyZWcpKSB7CiBvZmY6Ci0JCQlhc3NlcnQocGlwZSA8 IEFSUkFZX1NJWkUodmlkZW8tPmJvKSk7CiAJCQlpZiAodmlkZW8tPmJvW3BpcGVdKSB7Ci0JCQkJ c3RydWN0IGxvY2FsX21vZGVfc2V0X3BsYW5lIHM7Ci0JCQkJbWVtc2V0KCZzLCAwLCBzaXplb2Yo cykpOwotCQkJCXMucGxhbmVfaWQgPSBzbmFfY3J0Y190b19zcHJpdGUoY3J0Yyk7Ci0JCQkJaWYg KGRybUlvY3RsKHZpZGVvLT5zbmEtPmtnZW0uZmQsIExPQ0FMX0lPQ1RMX01PREVfU0VUUExBTkUs ICZzKSkKLQkJCQkJeGY4NkRydk1zZyh2aWRlby0+c25hLT5zY3JuLT5zY3JuSW5kZXgsIFhfRVJS T1IsCi0JCQkJCQkgICAiZmFpbGVkIHRvIGRpc2FibGUgcGxhbmVcbiIpOworCQkJCURCRygoIiVz OiB1bmxvY2sgc3ByaXRlIGFzIG5vIGxvbmdlciBpbnRlcnNlY3RzXG4iLAorCQkJCQkJX19GVU5D VElPTl9fKSk7CisJCQkJLyogaW1hZ2Ugbm8gbG9uZ2VyIG9uIHNwcml0ZSBwbGFuZSwgdW5sb2Nr IHNwcml0ZSAqLworCQkJCXNuYV9jcnRjX3Nwcml0ZV91bmxvY2soY3J0YywgZHJhdyk7CiAJCQkJ dmlkZW8tPmJvW3BpcGVdID0gTlVMTDsKIAkJCX0KIAkJCWNvbnRpbnVlOwpAQCAtNDQzLDYgKzQ0 MSwyNiBAQCBvZmY6CiAJCWlmICghcmV0KQogCQkJZ290byBvZmY7CiAKKwkJaWYgKCFzbmFfY3J0 Y19zcHJpdGVfbG9jayhjcnRjLCBkcmF3KSkgeworCQkJeGY4NkRydk1zZyhzbmEtPnNjcm4tPnNj cm5JbmRleCwKKwkJCQkJWF9FUlJPUiwgImZhaWxlZCB0byBnZXQgYSBzcHJpdGUgcGxhbmUsIgor CQkJCQkiIGZhbGxiYWNrIHRvIHRleHR1cmVkIFxuIik7CisJCQkjaWYgWE9SR19YVl9WRVJTSU9O IDwgMgorCQkJCSh2b2lkKXNuYV92aWRlb19zcHJpdGVfc3RvcChjbGllbnQsIHBvcnQsIGRyYXcp OworCQkJCXJldHVybiBzbmFfdmlkZW9fdGV4dHVyZWRfcHV0X2ltYWdlKGNsaWVudCwgZHJhdywg cG9ydCwKKwkJCQkJCQkJZ2MsIHNyY194LCBzcmNfeSwgc3JjX3csIHNyY19oLAorCQkJCQkJCQlk cndfeCwgZHJ3X3ksIGRyd193LCBkcndfaCwgZm9ybWF0LAorCQkJCQkJCQlidWYsIHN5bmMsIHdp ZHRoLCBoZWlnaHQpOworCQkJI2Vsc2UKKwkJCQkodm9pZClzbmFfdmlkZW9fc3ByaXRlX3N0b3Ao cG9ydCwgZHJhdyk7CisJCQkJcmV0dXJuIHNuYV92aWRlb190ZXh0dXJlZF9wdXRfaW1hZ2UoZHJh dywgcG9ydCwgZ2MsCisJCQkJCQkJCXNyY194LCBzcmNfeSwKKwkJCQkJCQkJc3JjX3csIHNyY19o LCBkcndfeCwgZHJ3X3ksIGRyd193LAorCQkJCQkJCQlkcndfaCwgZm9ybWF0LCBidWYsCisJCQkJ CQkJCXN5bmMsIHdpZHRoLCBoZWlnaHQpOworCQkJI2VuZGlmCisJCX0KKwogCQlmcmFtZS5zcmMu eDEgPSB4MSA+PiAxNjsKIAkJZnJhbWUuc3JjLnkxID0geTEgPj4gMTY7CiAJCWZyYW1lLnNyYy54 MiA9ICh4MiArIDB4ZmZmZikgPj4gMTY7CkBAIC00NjAsOCArNDc4LDggQEAgb2ZmOgogCiAJCS8q IGlmIHNwcml0ZSBjYW4ndCBoYW5kbGUgcm90YXRpb24gbmF0aXZlbHksIHN0b3JlIGl0IGZvciB0 aGUgY29weSBmdW5jICovCiAJCXJvdGF0aW9uID0gUlJfUm90YXRlXzA7Ci0JCWlmICghc25hX2Ny dGNfc2V0X3Nwcml0ZV9yb3RhdGlvbihjcnRjLCBjcnRjLT5yb3RhdGlvbikpIHsKLQkJCXNuYV9j cnRjX3NldF9zcHJpdGVfcm90YXRpb24oY3J0YywgUlJfUm90YXRlXzApOworCQlpZiAoIXNuYV9j cnRjX3NldF9zcHJpdGVfcm90YXRpb24oY3J0YywgY3J0Yy0+cm90YXRpb24sIGRyYXcpKSB7CisJ CQlzbmFfY3J0Y19zZXRfc3ByaXRlX3JvdGF0aW9uKGNydGMsIFJSX1JvdGF0ZV8wLCBkcmF3KTsK IAkJCXJvdGF0aW9uID0gY3J0Yy0+cm90YXRpb247CiAJCX0KIAkJc25hX3ZpZGVvX2ZyYW1lX3Nl dF9yb3RhdGlvbih2aWRlbywgJmZyYW1lLCByb3RhdGlvbik7CkBAIC01MDcsNyArNTI1LDcgQEAg b2ZmOgogCQl9CiAKIAkJcmV0ID0gU3VjY2VzczsKLQkJaWYgKCFzbmFfdmlkZW9fc3ByaXRlX3No b3coc25hLCB2aWRlbywgJmZyYW1lLCBjcnRjLCAmZHN0KSkgeworCQlpZiAoIXNuYV92aWRlb19z cHJpdGVfc2hvdyhzbmEsIHZpZGVvLCAmZnJhbWUsIGNydGMsIGRyYXcsICZkc3QpKSB7CiAJCQlE QkcoKCIlczogZmFpbGVkIHRvIHNob3cgdmlkZW8gZnJhbWVcbiIsIF9fRlVOQ1RJT05fXykpOwog CQkJcmV0ID0gQmFkQWxsb2M7CiAJCX0KQEAgLTU5NCw0NSArNjEyLDQ0IEBAIHN0YXRpYyBpbnQg c25hX3ZpZGVvX3Nwcml0ZV9jb2xvcl9rZXkoc3RydWN0IHNuYSAqc25hKQogCXJldHVybiBjb2xv cl9rZXkgJiAoKDEgPDwgc2Nybi0+ZGVwdGgpIC0gMSk7CiB9CiAKLXN0YXRpYyBib29sIHNuYV92 aWRlb19oYXNfc3ByaXRlcyhzdHJ1Y3Qgc25hICpzbmEpCitzdGF0aWMgdWludDMyX3Qgc25hX3Zp ZGVvX251bV9zcHJpdGVzKHN0cnVjdCBzbmEgKnNuYSkKIHsKIAl4Zjg2Q3J0Y0NvbmZpZ1B0ciBj b25maWcgPSBYRjg2X0NSVENfQ09ORklHX1BUUihzbmEtPnNjcm4pOwotCWludCBpOworCWludCBp LCBuID0gMDsKIAogCURCRygoIiVzOiBudW1fY3J0Yz0lZFxuIiwgX19GVU5DVElPTl9fLCBzbmEt Pm1vZGUubnVtX3JlYWxfY3J0YykpOwogCiAJaWYgKHNuYS0+bW9kZS5udW1fcmVhbF9jcnRjID09 IDApCi0JCXJldHVybiBmYWxzZTsKKwkJcmV0dXJuIDA7CiAKIAlmb3IgKGkgPSAwOyBpIDwgc25h LT5tb2RlLm51bV9yZWFsX2NydGM7IGkrKykgewotCQlpZiAoIXNuYV9jcnRjX3RvX3Nwcml0ZShj b25maWctPmNydGNbaV0pKSB7Ci0JCQlEQkcoKCIlczogbm8gc3ByaXRlIGZvdW5kIG9uIHBpcGUg JWRcbiIsIF9fRlVOQ1RJT05fXywgc25hX2NydGNfcGlwZShjb25maWctPmNydGNbaV0pKSk7Ci0J CQlyZXR1cm4gZmFsc2U7Ci0JCX0KKwkJbiArPSBzbmFfY3J0Y19udW1fc3ByaXRlcyhjb25maWct PmNydGNbaV0pOwogCX0KIAotCURCRygoIiVzOiB5ZXNcbiIsIF9fRlVOQ1RJT05fXykpOwotCXJl dHVybiB0cnVlOworCURCRygoIiVzOiAlZCBzcHJpdGVzXG4iLCBfX0ZVTkNUSU9OX18sIG4pKTsK KwlyZXR1cm4gbjsKIH0KIAogdm9pZCBzbmFfdmlkZW9fc3ByaXRlX3NldHVwKHN0cnVjdCBzbmEg KnNuYSwgU2NyZWVuUHRyIHNjcmVlbikKIHsKIAlYdkFkYXB0b3JQdHIgYWRhcHRvcjsKIAlzdHJ1 Y3Qgc25hX3ZpZGVvICp2aWRlbzsKLQlYdlBvcnRQdHIgcG9ydDsKKwl1aW50MzJfdCBpLCBucG9y dHMgPSAwOworCisJbnBvcnRzID0gc25hX3ZpZGVvX251bV9zcHJpdGVzKHNuYSk7CiAKLQlpZiAo IXNuYV92aWRlb19oYXNfc3ByaXRlcyhzbmEpKQorCWlmICghbnBvcnRzKQogCQlyZXR1cm47CiAK IAlhZGFwdG9yID0gc25hX3h2X2FkYXB0b3JfYWxsb2Moc25hKTsKIAlpZiAoIWFkYXB0b3IpCiAJ CXJldHVybjsKIAotCXZpZGVvID0gY2FsbG9jKDEsIHNpemVvZigqdmlkZW8pKTsKLQlwb3J0ID0g Y2FsbG9jKDEsIHNpemVvZigqcG9ydCkpOwotCWlmICh2aWRlbyA9PSBOVUxMIHx8IHBvcnQgPT0g TlVMTCkgeworCXZpZGVvID0gY2FsbG9jKG5wb3J0cywgc2l6ZW9mKCp2aWRlbykpOworCWFkYXB0 b3ItPnBQb3J0cyA9IGNhbGxvYyhucG9ydHMsIHNpemVvZihYdlBvcnRSZWMpKTsKKwlpZiAodmlk ZW8gPT0gTlVMTCB8fCBhZGFwdG9yLT5wUG9ydHMgPT0gTlVMTCkgewogCQlmcmVlKHZpZGVvKTsK LQkJZnJlZShwb3J0KTsKKwkJZnJlZShhZGFwdG9yLT5wUG9ydHMpOwogCQlzbmEtPnh2Lm51bV9h ZGFwdG9ycy0tOwogCQlyZXR1cm47CiAJfQpAQCAtNjc0LDM2ICs2OTEsNDEgQEAgdm9pZCBzbmFf dmlkZW9fc3ByaXRlX3NldHVwKHN0cnVjdCBzbmEgKnNuYSwgU2NyZWVuUHRyIHNjcmVlbikKIAlh ZGFwdG9yLT5kZFB1dEltYWdlID0gc25hX3ZpZGVvX3Nwcml0ZV9wdXRfaW1hZ2U7CiAJYWRhcHRv ci0+ZGRRdWVyeUltYWdlQXR0cmlidXRlcyA9IHNuYV92aWRlb19zcHJpdGVfcXVlcnk7CiAKLQlh ZGFwdG9yLT5uUG9ydHMgPSAxOwotCWFkYXB0b3ItPnBQb3J0cyA9IHBvcnQ7Ci0KLQlhZGFwdG9y LT5iYXNlX2lkID0gcG9ydC0+aWQgPSBGYWtlQ2xpZW50SUQoMCk7Ci0JQWRkUmVzb3VyY2UocG9y dC0+aWQsIFh2R2V0UlRQb3J0KCksIHBvcnQpOwotCXBvcnQtPnBBZGFwdG9yID0gYWRhcHRvcjsK LQlwb3J0LT5wTm90aWZ5ID0gIE5VTEw7Ci0JcG9ydC0+cERyYXcgPSAgTlVMTDsKLQlwb3J0LT5j bGllbnQgPSAgTlVMTDsKLQlwb3J0LT5ncmFiLmNsaWVudCA9ICBOVUxMOwotCXBvcnQtPnRpbWUg PSBjdXJyZW50VGltZTsKLQlwb3J0LT5kZXZQcml2LnB0ciA9IHZpZGVvOwotCi0JdmlkZW8tPnNu YSA9IHNuYTsKLQl2aWRlby0+YWxpZ25tZW50ID0gNjQ7Ci0JdmlkZW8tPmNvbG9yX2tleSA9IHNu YV92aWRlb19zcHJpdGVfY29sb3Jfa2V5KHNuYSk7Ci0JdmlkZW8tPmNvbG9yX2tleV9jaGFuZ2Vk ID0gfjA7Ci0JdmlkZW8tPmhhc19jb2xvcl9rZXkgPSB0cnVlOwotCXZpZGVvLT5icmlnaHRuZXNz ID0gLTE5OwkvKiAoMjU1LzIxOSkgKiAtMTYgKi8KLQl2aWRlby0+Y29udHJhc3QgPSA3NTsJLyog MjU1LzIxOSAqIDY0ICovCi0JdmlkZW8tPnNhdHVyYXRpb24gPSAxNDY7CS8qIDEyOC8xMTIgKiAx MjggKi8KLQl2aWRlby0+ZGVzaXJlZF9jcnRjID0gTlVMTDsKLQl2aWRlby0+Z2FtbWE1ID0gMHhj MGMwYzA7Ci0JdmlkZW8tPmdhbW1hNCA9IDB4ODA4MDgwOwotCXZpZGVvLT5nYW1tYTMgPSAweDQw NDA0MDsKLQl2aWRlby0+Z2FtbWEyID0gMHgyMDIwMjA7Ci0JdmlkZW8tPmdhbW1hMSA9IDB4MTAx MDEwOwotCXZpZGVvLT5nYW1tYTAgPSAweDA4MDgwODsKLQlSZWdpb25OdWxsKCZ2aWRlby0+Y2xp cCk7Ci0JdmlkZW8tPlN5bmNUb1ZibGFuayA9IDE7CisJZm9yIChpID0gMDsgaSA8IG5wb3J0czsg KytpKSB7CisJCXN0cnVjdCBzbmFfdmlkZW8gKnYgPSAmdmlkZW9baV07CisJCVh2UG9ydFB0ciBw b3J0ID0gJmFkYXB0b3ItPnBQb3J0c1tpXTsKKworCQlwb3J0LT5pZCA9IEZha2VDbGllbnRJRCgw KTsKKwkJQWRkUmVzb3VyY2UocG9ydC0+aWQsIFh2R2V0UlRQb3J0KCksIHBvcnQpOworCQlwb3J0 LT5wQWRhcHRvciA9IGFkYXB0b3I7CisJCXBvcnQtPnBOb3RpZnkgPSAgTlVMTDsKKwkJcG9ydC0+ cERyYXcgPSAgTlVMTDsKKwkJcG9ydC0+Y2xpZW50ID0gIE5VTEw7CisJCXBvcnQtPmdyYWIuY2xp ZW50ID0gIE5VTEw7CisJCXBvcnQtPnRpbWUgPSBjdXJyZW50VGltZTsKKwkJcG9ydC0+ZGV2UHJp di5wdHIgPSB2OworCisJCXYtPnNuYSA9IHNuYTsKKwkJdi0+YWxpZ25tZW50ID0gNjQ7CisJCXYt PmNvbG9yX2tleSA9IHNuYV92aWRlb19zcHJpdGVfY29sb3Jfa2V5KHNuYSk7CisJCXYtPmNvbG9y X2tleV9jaGFuZ2VkID0gfjA7CisJCXYtPmhhc19jb2xvcl9rZXkgPSB0cnVlOworCQl2LT5icmln aHRuZXNzID0gLTE5OyAgICAvKiAoMjU1LzIxOSkgKiAtMTYgKi8KKwkJdi0+Y29udHJhc3QgPSA3 NTsgICAgICAgLyogMjU1LzIxOSAqIDY0ICovCisJCXYtPnNhdHVyYXRpb24gPSAxNDY7ICAgIC8q IDEyOC8xMTIgKiAxMjggKi8KKwkJdi0+ZGVzaXJlZF9jcnRjID0gTlVMTDsKKwkJdi0+Z2FtbWE1 ID0gMHhjMGMwYzA7CisJCXYtPmdhbW1hNCA9IDB4ODA4MDgwOworCQl2LT5nYW1tYTMgPSAweDQw NDA0MDsKKwkJdi0+Z2FtbWEyID0gMHgyMDIwMjA7CisJCXYtPmdhbW1hMSA9IDB4MTAxMDEwOwor CQl2LT5nYW1tYTAgPSAweDA4MDgwODsKKwkJUmVnaW9uTnVsbCgmdi0+Y2xpcCk7CisJCXYtPlN5 bmNUb1ZibGFuayA9IDE7CisJfQorCisJYWRhcHRvci0+YmFzZV9pZCA9IGFkYXB0b3ItPnBQb3J0 c1swXS5pZDsKKwlhZGFwdG9yLT5uUG9ydHMgPSBucG9ydHM7CiAKIAl4dkNvbG9yS2V5ID0gTUFL RV9BVE9NKCJYVl9DT0xPUktFWSIpOwogCXh2QWx3YXlzT25Ub3AgPSBNQUtFX0FUT00oIlhWX0FM V0FZU19PTl9UT1AiKTsKZGlmZiAtLWdpdCBhL3NyYy9zbmEvc25hX3ZpZGVvX3RleHR1cmVkLmMg Yi9zcmMvc25hL3NuYV92aWRlb190ZXh0dXJlZC5jCmluZGV4IGY1YjdlOTguLmJhZjdjOTEgMTAw NjQ0Ci0tLSBhL3NyYy9zbmEvc25hX3ZpZGVvX3RleHR1cmVkLmMKKysrIGIvc3JjL3NuYS9zbmFf dmlkZW9fdGV4dHVyZWQuYwpAQCAtMTM4LDcgKzEzOCw3IEBAIHNuYV92aWRlb190ZXh0dXJlZF9i ZXN0X3NpemUoZGRRdWVyeUJlc3RTaXplX0FSR1MpCiAgKiBkcmF3YWJsZSBpcyBzb21lIERyYXdh YmxlLCB3aGljaCBtaWdodCBub3QgYmUgdGhlIHNjcmVlbiBpbiB0aGUgY2FzZSBvZgogICogY29t cG9zaXRpbmcuICBJdCdzIGEgbmV3IGFyZ3VtZW50IHRvIHRoZSBmdW5jdGlvbiBpbiB0aGUgMS4x IHNlcnZlci4KICAqLwotc3RhdGljIGludAoraW50CiBzbmFfdmlkZW9fdGV4dHVyZWRfcHV0X2lt YWdlKGRkUHV0SW1hZ2VfQVJHUykKIHsKIAlzdHJ1Y3Qgc25hX3ZpZGVvICp2aWRlbyA9IHBvcnQt PmRldlByaXYucHRyOwotLSAKMS45LjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=