From: Oscar Mateo Subject: [PATCH 10/12] drm/i915/guc: Refactor the concept "GuC context descriptor" into "GuC stage descriptor" Date: Tue, 21 Mar 2017 02:02:55 -0700 Message-ID: <1490086977-9282-11-git-send-email-oscar.mateo@intel.com> References: <1490086977-9282-1-git-send-email-oscar.mateo@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 85D1E6E710 for ; Tue, 21 Mar 2017 16:03:04 +0000 (UTC) In-Reply-To: <1490086977-9282-1-git-send-email-oscar.mateo@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 QSBHdUMgY29udGV4dCBhbmQgYSBIVyBjb250ZXh0IGFyZSBpbiBubyB3YXkgcmVsYXRlZCwgc28g dGhlIG5hbWUgIkd1QyBjb250ZXh0IGRlc2NyaXB0b3IiCmlzIHZlcnkgdW5mb3J0dW5hdGUsIGJl Y2F1c2UgYSBuZXcgcmVhZGVyIG9mIHRoZSBjb2RlIGdldHMgb3ZlcndoZWxtZWQgdmVyeSBxdWlj a2x5IHdpdGgKYSBsb3Qgb2YgdGhpbmdzIGNhbGxlZCAiY29udGV4dCIgdGhhdCByZWZlciB0byBk aWZmZXJlbnQgdGhpbmdzLiBXZSBjYW4gaW1wcm92ZSBsZWdpYmlsaXR5CmEgbG90IGJ5IHNpbXBs eSByZW5hbWluZyBhIGZldyBvYmplY3RzIGluIHRoZSBHdUMgY29kZS4KCnYyOgogIC0gUmViYXNl ZAogIC0gcy9jdHhfZGVzY19wb29sL3N0YWdlX2Rlc2NfcG9vbAogIC0gTW92ZSBzb21lIGV4cGxh bmF0aW9ucyB0byB0aGUgZGVmaW5pdGlvbiBvZiB0aGUgZ3VjX3N0YWdlX2Rlc2Mgc3RydWN0IChD aHJpcykKCkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IERh bmllbGUgQ2VyYW9sbyBTcHVyaW8gPGRhbmllbGUuY2VyYW9sb3NwdXJpb0BpbnRlbC5jb20+CkNj OiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+ClNpZ25l ZC1vZmYtYnk6IE9zY2FyIE1hdGVvIDxvc2Nhci5tYXRlb0BpbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgICAgICAgIHwgICA0ICstCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgfCAxMTUgKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19md2lmLmggICAgICB8 ICA0OCArKysrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIu YyAgICB8ICAgNCArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaCAgICAgICAgICAg IHwgICA4ICstCiA1IGZpbGVzIGNoYW5nZWQsIDk1IGluc2VydGlvbnMoKyksIDg0IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXggMDYxZjhhNS4uMjllZWZl MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTI0NzQsOCArMjQ3NCw4IEBA IHN0YXRpYyB2b2lkIGk5MTVfZ3VjX2NsaWVudF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwKIAll bnVtIGludGVsX2VuZ2luZV9pZCBpZDsKIAl1aW50NjRfdCB0b3QgPSAwOwogCi0Jc2VxX3ByaW50 ZihtLCAiXHRQcmlvcml0eSAlZCwgR3VDIGN0eCBpbmRleDogJXUsIFBEIG9mZnNldCAweCV4XG4i LAotCQljbGllbnQtPnByaW9yaXR5LCBjbGllbnQtPmN0eF9pbmRleCwgY2xpZW50LT5wcm9jX2Rl c2Nfb2Zmc2V0KTsKKwlzZXFfcHJpbnRmKG0sICJcdFByaW9yaXR5ICVkLCBHdUMgc3RhZ2UgaW5k ZXg6ICV1LCBQRCBvZmZzZXQgMHgleFxuIiwKKwkJY2xpZW50LT5wcmlvcml0eSwgY2xpZW50LT5z dGFnZV9pZCwgY2xpZW50LT5wcm9jX2Rlc2Nfb2Zmc2V0KTsKIAlzZXFfcHJpbnRmKG0sICJcdERv b3JiZWxsIGlkICVkLCBvZmZzZXQ6IDB4JWx4LCBjb29raWUgMHgleFxuIiwKIAkJY2xpZW50LT5k b29yYmVsbF9pZCwgY2xpZW50LT5kb29yYmVsbF9vZmZzZXQsIGNsaWVudC0+ZG9vcmJlbGxfY29v a2llKTsKIAlzZXFfcHJpbnRmKG0sICJcdFdRIHNpemUgJWQsIG9mZnNldDogMHgleCwgdGFpbCAl ZFxuIiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Np b24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCA2 NzA4NGU1Li41OTkwOTM5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1 Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlz c2lvbi5jCkBAIC0zNywxNiArMzcsMTYgQEAKICAqIGRlc2NyaXB0b3IgYW5kIGEgd29ya3F1ZXVl IChhbGwgb2YgdGhlbSBpbnNpZGUgYSBzaW5nbGUgZ2VtIG9iamVjdCB0aGF0CiAgKiBjb250YWlu cyBhbGwgcmVxdWlyZWQgcGFnZXMgZm9yIHRoZXNlIGVsZW1lbnRzKS4KICAqCi0gKiBHdUMgY29u dGV4dCBkZXNjcmlwdG9yOgorICogR3VDIHN0YWdlIGRlc2NyaXB0b3I6CiAgKiBEdXJpbmcgaW5p dGlhbGl6YXRpb24sIHRoZSBkcml2ZXIgYWxsb2NhdGVzIGEgc3RhdGljIHBvb2wgb2YgMTAyNCBz dWNoCiAgKiBkZXNjcmlwdG9ycywgYW5kIHNoYXJlcyB0aGVtIHdpdGggdGhlIEd1Qy4KICAqIEN1 cnJlbnRseSwgdGhlcmUgZXhpc3RzIGEgMToxIG1hcHBpbmcgYmV0d2VlbiBhIGk5MTVfZ3VjX2Ns aWVudCBhbmQgYQotICogZ3VjX2NvbnRleHRfZGVzYyAodmlhIHRoZSBjbGllbnQncyBjb250ZXh0 X2luZGV4KSwgc28gZWZmZWN0aXZlbHkgb25seQotICogb25lIGd1Y19jb250ZXh0X2Rlc2MgZ2V0 cyB1c2VkLiBUaGlzIGNvbnRleHQgZGVzY3JpcHRvciBsZXRzIHRoZSBHdUMga25vdwotICogYWJv dXQgdGhlIGRvb3JiZWxsLCB3b3JrcXVldWUgYW5kIHByb2Nlc3MgZGVzY3JpcHRvci4gVGhlb3Jl dGljYWxseSwgaXQgYWxzbwotICogbGV0cyB0aGUgR3VDIGtub3cgYWJvdXQgb3VyIEhXIGNvbnRl eHRzIChDb250ZXh0IElELCBldGMuLi4pLCBidXQgd2UgYWN0dWFsbHkKKyAqIGd1Y19zdGFnZV9k ZXNjICh2aWEgdGhlIGNsaWVudCdzIHN0YWdlX2lkKSwgc28gZWZmZWN0aXZlbHkgb25seSBvbmUK KyAqIGdldHMgdXNlZC4gVGhpcyBzdGFnZSBkZXNjcmlwdG9yIGxldHMgdGhlIEd1QyBrbm93IGFi b3V0IHRoZSBkb29yYmVsbCwKKyAqIHdvcmtxdWV1ZSBhbmQgcHJvY2VzcyBkZXNjcmlwdG9yLiBU aGVvcmV0aWNhbGx5LCBpdCBhbHNvIGxldHMgdGhlIEd1QworICoga25vdyBhYm91dCBvdXIgSFcg Y29udGV4dHMgKGNvbnRleHQgSUQsIGV0Yy4uLiksIGJ1dCB3ZSBhY3R1YWxseQogICogZW1wbG95 IGEga2luZCBvZiBzdWJtaXNzaW9uIHdoZXJlIHRoZSBHdUMgdXNlcyB0aGUgTFJDQSBzZW50IHZp YSB0aGUgd29yawotICogaXRlbSBpbnN0ZWFkICh0aGUgc2luZ2xlIGd1Y19jb250ZXh0X2Rlc2Mg YXNzb2NpYXRlZCB0byBleGVjYnVmIGNsaWVudAorICogaXRlbSBpbnN0ZWFkICh0aGUgc2luZ2xl IGd1Y19zdGFnZV9kZXNjIGFzc29jaWF0ZWQgdG8gZXhlY2J1ZiBjbGllbnQKICAqIGNvbnRhaW5z IGluZm9ybWF0aW9uIGFib3V0IHRoZSBkZWZhdWx0IGtlcm5lbCBjb250ZXh0IG9ubHksIGJ1dCB0 aGlzIGlzCiAgKiBlc3NlbnRpYWxseSB1bnVzZWQpLiBUaGlzIGlzIGNhbGxlZCBhICJwcm94eSIg c3VibWlzc2lvbi4KICAqCkBAIC04Miw3ICs4Miw3IEBACiAKIHN0YXRpYyBpbmxpbmUgYm9vbCBp c19oaWdoX3ByaW9yaXR5KHN0cnVjdCBpOTE1X2d1Y19jbGllbnQqIGNsaWVudCkKIHsKLQlyZXR1 cm4gY2xpZW50LT5wcmlvcml0eSA8PSBHVUNfQ1RYX1BSSU9SSVRZX0hJR0g7CisJcmV0dXJuIGNs aWVudC0+cHJpb3JpdHkgPD0gR1VDX0NMSUVOVF9QUklPUklUWV9ISUdIOwogfQogCiBzdGF0aWMg aW50IF9fcmVzZXJ2ZV9kb29yYmVsbChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQpCkBA IC0xMTIsNyArMTEyLDcgQEAgc3RhdGljIGludCBfX3Jlc2VydmVfZG9vcmJlbGwoc3RydWN0IGk5 MTVfZ3VjX2NsaWVudCAqY2xpZW50KQogCV9fc2V0X2JpdChpZCwgY2xpZW50LT5ndWMtPmRvb3Ji ZWxsX2JpdG1hcCk7CiAJY2xpZW50LT5kb29yYmVsbF9pZCA9IGlkOwogCURSTV9ERUJVR19EUklW RVIoImNsaWVudCAldSAoaGlnaCBwcmlvPSVzKSByZXNlcnZlZCBkb29yYmVsbDogJWRcbiIsCi0J CQkgY2xpZW50LT5jdHhfaW5kZXgsIHllc25vKGlzX2hpZ2hfcHJpb3JpdHkoY2xpZW50KSksCisJ CQkgY2xpZW50LT5zdGFnZV9pZCwgeWVzbm8oaXNfaGlnaF9wcmlvcml0eShjbGllbnQpKSwKIAkJ CSBpZCk7CiAJcmV0dXJuIDA7CiB9CkBAIC0xMjksMzAgKzEyOSwzMCBAQCBzdGF0aWMgdm9pZCBf X3VucmVzZXJ2ZV9kb29yYmVsbChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQpCiAgKiBU ZWxsIHRoZSBHdUMgdG8gYWxsb2NhdGUgb3IgZGVhbGxvY2F0ZSBhIHNwZWNpZmljIGRvb3JiZWxs CiAgKi8KIAotc3RhdGljIGludCBfX2d1Y19hbGxvY2F0ZV9kb29yYmVsbChzdHJ1Y3QgaW50ZWxf Z3VjICpndWMsIHUzMiBjdHhfaW5kZXgpCitzdGF0aWMgaW50IF9fZ3VjX2FsbG9jYXRlX2Rvb3Ji ZWxsKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywgdTMyIHN0YWdlX2lkKQogewogCXUzMiBhY3Rpb25b XSA9IHsKIAkJSU5URUxfR1VDX0FDVElPTl9BTExPQ0FURV9ET09SQkVMTCwKLQkJY3R4X2luZGV4 CisJCXN0YWdlX2lkCiAJfTsKIAogCXJldHVybiBpbnRlbF9ndWNfc2VuZChndWMsIGFjdGlvbiwg QVJSQVlfU0laRShhY3Rpb24pKTsKIH0KIAotc3RhdGljIGludCBfX2d1Y19kZWFsbG9jYXRlX2Rv b3JiZWxsKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywgdTMyIGN0eF9pbmRleCkKK3N0YXRpYyBpbnQg X19ndWNfZGVhbGxvY2F0ZV9kb29yYmVsbChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsIHUzMiBzdGFn ZV9pZCkKIHsKIAl1MzIgYWN0aW9uW10gPSB7CiAJCUlOVEVMX0dVQ19BQ1RJT05fREVBTExPQ0FU RV9ET09SQkVMTCwKLQkJY3R4X2luZGV4CisJCXN0YWdlX2lkCiAJfTsKIAogCXJldHVybiBpbnRl bF9ndWNfc2VuZChndWMsIGFjdGlvbiwgQVJSQVlfU0laRShhY3Rpb24pKTsKIH0KIAotc3RhdGlj IHN0cnVjdCBndWNfY29udGV4dF9kZXNjICpfX2dldF9jb250ZXh0X2Rlc2Moc3RydWN0IGk5MTVf Z3VjX2NsaWVudCAqY2xpZW50KQorc3RhdGljIHN0cnVjdCBndWNfc3RhZ2VfZGVzYyAqX19nZXRf c3RhZ2VfZGVzYyhzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQpCiB7Ci0JcmV0dXJuIChz dHJ1Y3QgZ3VjX2NvbnRleHRfZGVzYyAqKSgoY2hhciAqKWNsaWVudC0+Z3VjLT5jdHhfcG9vbF92 YWRkciArCi0JCXNpemVvZihzdHJ1Y3QgZ3VjX2NvbnRleHRfZGVzYykgKiBjbGllbnQtPmN0eF9p bmRleCk7CisJcmV0dXJuIChzdHJ1Y3QgZ3VjX3N0YWdlX2Rlc2MgKikoKGNoYXIgKiljbGllbnQt Pmd1Yy0+c3RhZ2VfZGVzY19wb29sX3ZhZGRyICsKKwkJc2l6ZW9mKHN0cnVjdCBndWNfc3RhZ2Vf ZGVzYykgKiBjbGllbnQtPnN0YWdlX2lkKTsKIH0KIAogLyoKQEAgLTE2NCwxMCArMTY0LDEwIEBA IHN0YXRpYyBzdHJ1Y3QgZ3VjX2NvbnRleHRfZGVzYyAqX19nZXRfY29udGV4dF9kZXNjKHN0cnVj dCBpOTE1X2d1Y19jbGllbnQgKmNsaWVuCiAKIHN0YXRpYyB2b2lkIF9fdXBkYXRlX2Rvb3JiZWxs X2Rlc2Moc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50LCB1MTYgbmV3X2lkKQogewotCXN0 cnVjdCBndWNfY29udGV4dF9kZXNjICpkZXNjOworCXN0cnVjdCBndWNfc3RhZ2VfZGVzYyAqZGVz YzsKIAogCS8qIFVwZGF0ZSB0aGUgR3VDJ3MgaWRlYSBvZiB0aGUgZG9vcmJlbGwgSUQgKi8KLQlk ZXNjID0gX19nZXRfY29udGV4dF9kZXNjKGNsaWVudCk7CisJZGVzYyA9IF9fZ2V0X3N0YWdlX2Rl c2MoY2xpZW50KTsKIAlkZXNjLT5kYl9pZCA9IG5ld19pZDsKIH0KIApAQCAtMTk0LDcgKzE5NCw3 IEBAIHN0YXRpYyBpbnQgX19jcmVhdGVfZG9vcmJlbGwoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAq Y2xpZW50KQogCWRvb3JiZWxsLT5kYl9zdGF0dXMgPSBHVUNfRE9PUkJFTExfRU5BQkxFRDsKIAlk b29yYmVsbC0+Y29va2llID0gY2xpZW50LT5kb29yYmVsbF9jb29raWU7CiAKLQllcnIgPSBfX2d1 Y19hbGxvY2F0ZV9kb29yYmVsbChjbGllbnQtPmd1YywgY2xpZW50LT5jdHhfaW5kZXgpOworCWVy ciA9IF9fZ3VjX2FsbG9jYXRlX2Rvb3JiZWxsKGNsaWVudC0+Z3VjLCBjbGllbnQtPnN0YWdlX2lk KTsKIAlpZiAoZXJyKSB7CiAJCWRvb3JiZWxsLT5kYl9zdGF0dXMgPSBHVUNfRE9PUkJFTExfRElT QUJMRUQ7CiAJCWRvb3JiZWxsLT5jb29raWUgPSAwOwpAQCAtMjIwLDcgKzIyMCw3IEBAIHN0YXRp YyBpbnQgX19kZXN0cm95X2Rvb3JiZWxsKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCkK IAlpZiAod2FpdF9mb3JfdXMoIShJOTE1X1JFQUQoR0VOOF9EUkJSRUdMKGRiX2lkKSkgJiBHRU44 X0RSQl9WQUxJRCksIDEwKSkKIAkJV0FSTl9PTkNFKHRydWUsICJEb29yYmVsbCBuZXZlciBiZWNh bWUgaW52YWxpZCBhZnRlciBkaXNhYmxlXG4iKTsKIAotCXJldHVybiBfX2d1Y19kZWFsbG9jYXRl X2Rvb3JiZWxsKGNsaWVudC0+Z3VjLCBjbGllbnQtPmN0eF9pbmRleCk7CisJcmV0dXJuIF9fZ3Vj X2RlYWxsb2NhdGVfZG9vcmJlbGwoY2xpZW50LT5ndWMsIGNsaWVudC0+c3RhZ2VfaWQpOwogfQog CiBzdGF0aWMgaW50IGNyZWF0ZV9kb29yYmVsbChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGll bnQpCkBAIC0zMDEsMzQgKzMwMSwzNCBAQCBzdGF0aWMgdm9pZCBndWNfcHJvY19kZXNjX2luaXQo c3RydWN0IGludGVsX2d1YyAqZ3VjLAogCWRlc2MtPndxX2Jhc2VfYWRkciA9IDA7CiAJZGVzYy0+ ZGJfYmFzZV9hZGRyID0gMDsKIAotCWRlc2MtPmNvbnRleHRfaWQgPSBjbGllbnQtPmN0eF9pbmRl eDsKKwlkZXNjLT5zdGFnZV9pZCA9IGNsaWVudC0+c3RhZ2VfaWQ7CiAJZGVzYy0+d3Ffc2l6ZV9i eXRlcyA9IGNsaWVudC0+d3Ffc2l6ZTsKIAlkZXNjLT53cV9zdGF0dXMgPSBXUV9TVEFUVVNfQUNU SVZFOwogCWRlc2MtPnByaW9yaXR5ID0gY2xpZW50LT5wcmlvcml0eTsKIH0KIAogLyoKLSAqIElu aXRpYWxpc2UvY2xlYXIgdGhlIGNvbnRleHQgZGVzY3JpcHRvciBzaGFyZWQgd2l0aCB0aGUgR3VD IGZpcm13YXJlLgorICogSW5pdGlhbGlzZS9jbGVhciB0aGUgc3RhZ2UgZGVzY3JpcHRvciBzaGFy ZWQgd2l0aCB0aGUgR3VDIGZpcm13YXJlLgogICoKICAqIFRoaXMgZGVzY3JpcHRvciB0ZWxscyB0 aGUgR3VDIHdoZXJlIChpbiBHR1RUIHNwYWNlKSB0byBmaW5kIHRoZSBpbXBvcnRhbnQKICAqIGRh dGEgc3RydWN0dXJlcyByZWxhdGluZyB0byB0aGlzIGNsaWVudCAoZG9vcmJlbGwsIHByb2Nlc3Mg ZGVzY3JpcHRvciwKICAqIHdyaXRlIHF1ZXVlLCBldGMpLgogICovCi1zdGF0aWMgdm9pZCBndWNf Y3R4X2Rlc2NfaW5pdChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCi0JCQkgICAgICBzdHJ1Y3QgaTkx NV9ndWNfY2xpZW50ICpjbGllbnQpCitzdGF0aWMgdm9pZCBndWNfc3RhZ2VfZGVzY19pbml0KHN0 cnVjdCBpbnRlbF9ndWMgKmd1YywKKwkJCQlzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQp CiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5MTUoZ3Vj KTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CiAJc3RydWN0IGk5MTVfZ2VtX2Nv bnRleHQgKmN0eCA9IGNsaWVudC0+b3duZXI7Ci0Jc3RydWN0IGd1Y19jb250ZXh0X2Rlc2MgKmRl c2M7CisJc3RydWN0IGd1Y19zdGFnZV9kZXNjICpkZXNjOwogCXVuc2lnbmVkIGludCB0bXA7CiAJ dTMyIGdmeF9hZGRyOwogCi0JZGVzYyA9IF9fZ2V0X2NvbnRleHRfZGVzYyhjbGllbnQpOworCWRl c2MgPSBfX2dldF9zdGFnZV9kZXNjKGNsaWVudCk7CiAJbWVtc2V0KGRlc2MsIDAsIHNpemVvZigq ZGVzYykpOwogCi0JZGVzYy0+YXR0cmlidXRlID0gR1VDX0NUWF9ERVNDX0FUVFJfQUNUSVZFIHwg R1VDX0NUWF9ERVNDX0FUVFJfS0VSTkVMOwotCWRlc2MtPmNvbnRleHRfaWQgPSBjbGllbnQtPmN0 eF9pbmRleDsKKwlkZXNjLT5hdHRyaWJ1dGUgPSBHVUNfU1RBR0VfREVTQ19BVFRSX0FDVElWRSB8 IEdVQ19TVEFHRV9ERVNDX0FUVFJfS0VSTkVMOworCWRlc2MtPnN0YWdlX2lkID0gY2xpZW50LT5z dGFnZV9pZDsKIAlkZXNjLT5wcmlvcml0eSA9IGNsaWVudC0+cHJpb3JpdHk7CiAJZGVzYy0+ZGJf aWQgPSBjbGllbnQtPmRvb3JiZWxsX2lkOwogCkBAIC0zNDgsNyArMzQ4LDcgQEAgc3RhdGljIHZv aWQgZ3VjX2N0eF9kZXNjX2luaXQoc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCQkJYnJlYWs7CS8q IFhYWDogY29udGludWU/ICovCiAKIAkJLyoKLQkJICogWFhYOiBXaGVuIHRoaXMgaXMgYSBHVUNf Q1RYX0RFU0NfQVRUUl9LRVJORUwgY2xpZW50IChwcm94eQorCQkgKiBYWFg6IFdoZW4gdGhpcyBp cyBhIEdVQ19TVEFHRV9ERVNDX0FUVFJfS0VSTkVMIGNsaWVudCAocHJveHkKIAkJICogc3VibWlz c2lvbiBvciwgaW4gb3RoZXIgd29yZHMsIG5vdCB1c2luZyBhIGRpcmVjdCBzdWJtaXNzaW9uCiAJ CSAqIG1vZGVsKSB0aGUgS01EJ3MgTFJDQSBpcyBub3QgdXNlZCBmb3IgYW55IHdvcmsgc3VibWlz c2lvbi4KIAkJICogSW5zdGVhZCwgdGhlIEd1QyB1c2VzIHRoZSBMUkNBIG9mIHRoZSB1c2VyIG1v ZGUgY29udGV4dCAoc2VlCkBAIC0zNTksNyArMzU5LDEwIEBAIHN0YXRpYyB2b2lkIGd1Y19jdHhf ZGVzY19pbml0KHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAkJLyogVGhlIHN0YXRlIHBhZ2UgaXMg YWZ0ZXIgUFBIV1NQICovCiAJCWxyYy0+cmluZ19scmNhID0KIAkJCWd1Y19nZ3R0X29mZnNldChj ZS0+c3RhdGUpICsgTFJDX1NUQVRFX1BOICogUEFHRV9TSVpFOwotCQlscmMtPmNvbnRleHRfaWQg PSAoY2xpZW50LT5jdHhfaW5kZXggPDwgR1VDX0VMQ19DVFhJRF9PRkZTRVQpIHwKKworCQkvKiBY WFg6IEluIGRpcmVjdCBzdWJtaXNzaW9uLCB0aGUgR3VDIHdhbnRzIHRoZSBIVyBjb250ZXh0IGlk CisJCSAqIGhlcmUuIEluIHByb3h5IHN1Ym1pc3Npb24sIGl0IHdhbnRzIHRoZSBzdGFnZSBpZCAq LworCQlscmMtPmNvbnRleHRfaWQgPSAoY2xpZW50LT5zdGFnZV9pZCA8PCBHVUNfRUxDX0NUWElE X09GRlNFVCkgfAogCQkJCShndWNfZW5naW5lX2lkIDw8IEdVQ19FTENfRU5HSU5FX09GRlNFVCk7 CiAKIAkJbHJjLT5yaW5nX2JlZ2luID0gZ3VjX2dndHRfb2Zmc2V0KGNlLT5yaW5nLT52bWEpOwpA QCAtMzkwLDEyICszOTMsMTIgQEAgc3RhdGljIHZvaWQgZ3VjX2N0eF9kZXNjX2luaXQoc3RydWN0 IGludGVsX2d1YyAqZ3VjLAogCWRlc2MtPmRlc2NfcHJpdmF0ZSA9ICh1aW50cHRyX3QpY2xpZW50 OwogfQogCi1zdGF0aWMgdm9pZCBndWNfY3R4X2Rlc2NfZmluaShzdHJ1Y3QgaW50ZWxfZ3VjICpn dWMsCi0JCQkgICAgICBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQpCitzdGF0aWMgdm9p ZCBndWNfc3RhZ2VfZGVzY19maW5pKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKKwkJCQlzdHJ1Y3Qg aTkxNV9ndWNfY2xpZW50ICpjbGllbnQpCiB7Ci0Jc3RydWN0IGd1Y19jb250ZXh0X2Rlc2MgKmRl c2M7CisJc3RydWN0IGd1Y19zdGFnZV9kZXNjICpkZXNjOwogCi0JZGVzYyA9IF9fZ2V0X2NvbnRl eHRfZGVzYyhjbGllbnQpOworCWRlc2MgPSBfX2dldF9zdGFnZV9kZXNjKGNsaWVudCk7CiAJbWVt c2V0KGRlc2MsIDAsIHNpemVvZigqZGVzYykpOwogfQogCkBAIC04NjQsNyArODY3LDcgQEAgc3Rh dGljIGludCBndWNfaW5pdF9kb29yYmVsbF9odyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJCXJl dCA9IF9fY3JlYXRlX2Rvb3JiZWxsKGNsaWVudCk7CiAJCWlmIChyZXQpIHsKIAkJCURSTV9FUlJP UigiQ291bGRuJ3QgcmVjcmVhdGUgY2xpZW50ICV1IGRvb3JiZWxsOiAlZFxuIiwKLQkJCQljbGll bnQtPmN0eF9pbmRleCwgcmV0KTsKKwkJCQljbGllbnQtPnN0YWdlX2lkLCByZXQpOwogCQkJcmV0 dXJuIHJldDsKIAkJfQogCX0KQEAgLTkxNCwxMiArOTE3LDEyIEBAIHN0YXRpYyBpbnQgZ3VjX2lu aXRfZG9vcmJlbGxfaHcoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCWNsaWVudC0+d3Ffc2l6ZSA9 IEdVQ19XUV9TSVpFOwogCXNwaW5fbG9ja19pbml0KCZjbGllbnQtPndxX2xvY2spOwogCi0JcmV0 ID0gaWRhX3NpbXBsZV9nZXQoJmd1Yy0+Y3R4X2lkcywgMCwgR1VDX01BWF9HUFVfQ09OVEVYVFMs CisJcmV0ID0gaWRhX3NpbXBsZV9nZXQoJmd1Yy0+c3RhZ2VfaWRzLCAwLCBHVUNfTUFYX1NUQUdF X0RFU0NSSVBUT1JTLAogCQkJCUdGUF9LRVJORUwpOwogCWlmIChyZXQgPCAwKQogCQlnb3RvIGVy cl9jbGllbnQ7CiAKLQljbGllbnQtPmN0eF9pbmRleCA9IHJldDsKKwljbGllbnQtPnN0YWdlX2lk ID0gcmV0OwogCiAJLyogVGhlIGZpcnN0IHBhZ2UgaXMgZG9vcmJlbGwvcHJvY19kZXNjLiBUd28g Zm9sbG93ZWQgcGFnZXMgYXJlIHdxLiAqLwogCXZtYSA9IGludGVsX2d1Y19hbGxvY2F0ZV92bWEo Z3VjLCBHVUNfREJfU0laRSArIEdVQ19XUV9TSVpFKTsKQEAgLTk1MSwxNCArOTU0LDE0IEBAIHN0 YXRpYyBpbnQgZ3VjX2luaXRfZG9vcmJlbGxfaHcoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCQlj bGllbnQtPnByb2NfZGVzY19vZmZzZXQgPSAoR1VDX0RCX1NJWkUgLyAyKTsKIAogCWd1Y19wcm9j X2Rlc2NfaW5pdChndWMsIGNsaWVudCk7Ci0JZ3VjX2N0eF9kZXNjX2luaXQoZ3VjLCBjbGllbnQp OworCWd1Y19zdGFnZV9kZXNjX2luaXQoZ3VjLCBjbGllbnQpOwogCiAJcmV0ID0gY3JlYXRlX2Rv b3JiZWxsKGNsaWVudCk7CiAJaWYgKHJldCkKIAkJZ290byBlcnJfdmFkZHI7CiAKLQlEUk1fREVC VUdfRFJJVkVSKCJuZXcgcHJpb3JpdHkgJXUgY2xpZW50ICVwIGZvciBlbmdpbmUocykgMHgleDog Y3R4X2luZGV4ICV1XG4iLAotCQkJIHByaW9yaXR5LCBjbGllbnQsIGNsaWVudC0+ZW5naW5lcywg Y2xpZW50LT5jdHhfaW5kZXgpOworCURSTV9ERUJVR19EUklWRVIoIm5ldyBwcmlvcml0eSAldSBj bGllbnQgJXAgZm9yIGVuZ2luZShzKSAweCV4OiBzdGFnZV9pZCAldVxuIiwKKwkJCSBwcmlvcml0 eSwgY2xpZW50LCBjbGllbnQtPmVuZ2luZXMsIGNsaWVudC0+c3RhZ2VfaWQpOwogCURSTV9ERUJV R19EUklWRVIoImRvb3JiZWxsIGlkICV1LCBjYWNoZWxpbmUgb2Zmc2V0IDB4JWx4XG4iLAogCQkJ IGNsaWVudC0+ZG9vcmJlbGxfaWQsIGNsaWVudC0+ZG9vcmJlbGxfb2Zmc2V0KTsKIApAQCAtOTY5 LDcgKzk3Miw3IEBAIHN0YXRpYyBpbnQgZ3VjX2luaXRfZG9vcmJlbGxfaHcoc3RydWN0IGludGVs X2d1YyAqZ3VjKQogZXJyX3ZtYToKIAlpOTE1X3ZtYV91bnBpbl9hbmRfcmVsZWFzZSgmY2xpZW50 LT52bWEpOwogZXJyX2lkOgotCWlkYV9zaW1wbGVfcmVtb3ZlKCZndWMtPmN0eF9pZHMsIGNsaWVu dC0+Y3R4X2luZGV4KTsKKwlpZGFfc2ltcGxlX3JlbW92ZSgmZ3VjLT5zdGFnZV9pZHMsIGNsaWVu dC0+c3RhZ2VfaWQpOwogZXJyX2NsaWVudDoKIAlrZnJlZShjbGllbnQpOwogCXJldHVybiBFUlJf UFRSKHJldCk7CkBAIC05ODYsMTAgKzk4OSwxMCBAQCBzdGF0aWMgdm9pZCBndWNfY2xpZW50X2Zy ZWUoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50KQogCSAqIHJlc2V0LCBzbyB3ZSBjYW5u b3QgZGVzdHJveSB0aGUgZG9vcmJlbGwgcHJvcGVybHkuIElnbm9yZSB0aGUKIAkgKiBlcnJvciBt ZXNzYWdlIGZvciBub3cgKi8KIAlkZXN0cm95X2Rvb3JiZWxsKGNsaWVudCk7Ci0JZ3VjX2N0eF9k ZXNjX2ZpbmkoY2xpZW50LT5ndWMsIGNsaWVudCk7CisJZ3VjX3N0YWdlX2Rlc2NfZmluaShjbGll bnQtPmd1YywgY2xpZW50KTsKIAlpOTE1X2dlbV9vYmplY3RfdW5waW5fbWFwKGNsaWVudC0+dm1h LT5vYmopOwogCWk5MTVfdm1hX3VucGluX2FuZF9yZWxlYXNlKCZjbGllbnQtPnZtYSk7Ci0JaWRh X3NpbXBsZV9yZW1vdmUoJmNsaWVudC0+Z3VjLT5jdHhfaWRzLCBjbGllbnQtPmN0eF9pbmRleCk7 CisJaWRhX3NpbXBsZV9yZW1vdmUoJmNsaWVudC0+Z3VjLT5zdGFnZV9pZHMsIGNsaWVudC0+c3Rh Z2VfaWQpOwogCWtmcmVlKGNsaWVudCk7CiB9CiAKQEAgLTEwMDEsNyArMTAwNCw3IEBAIHN0YXRp YyB2b2lkIGd1Y19wb2xpY2llc19pbml0KHN0cnVjdCBndWNfcG9saWNpZXMgKnBvbGljaWVzKQog CXBvbGljaWVzLT5kcGNfcHJvbW90ZV90aW1lID0gNTAwMDAwOwogCXBvbGljaWVzLT5tYXhfbnVt X3dvcmtfaXRlbXMgPSBQT0xJQ1lfTUFYX05VTV9XSTsKIAotCWZvciAocCA9IDA7IHAgPCBHVUNf Q1RYX1BSSU9SSVRZX05VTTsgcCsrKSB7CisJZm9yIChwID0gMDsgcCA8IEdVQ19DTElFTlRfUFJJ T1JJVFlfTlVNOyBwKyspIHsKIAkJZm9yIChpID0gR1VDX1JFTkRFUl9FTkdJTkU7IGkgPCBHVUNf TUFYX0VOR0lORVNfTlVNOyBpKyspIHsKIAkJCXBvbGljeSA9ICZwb2xpY2llcy0+cG9saWN5W3Bd W2ldOwogCkBAIC0xMDg5LDMwICsxMDkyLDMwIEBAIHN0YXRpYyB2b2lkIGd1Y19hZHNfZGVzdHJv eShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAgKi8KIGludCBpOTE1X2d1Y19zdWJtaXNzaW9uX2lu aXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCWNvbnN0IHNpemVfdCBj dHhzaXplID0gc2l6ZW9mKHN0cnVjdCBndWNfY29udGV4dF9kZXNjKTsKLQljb25zdCBzaXplX3Qg cG9vbHNpemUgPSBHVUNfTUFYX0dQVV9DT05URVhUUyAqIGN0eHNpemU7CisJY29uc3Qgc2l6ZV90 IGN0eHNpemUgPSBzaXplb2Yoc3RydWN0IGd1Y19zdGFnZV9kZXNjKTsKKwljb25zdCBzaXplX3Qg cG9vbHNpemUgPSBHVUNfTUFYX1NUQUdFX0RFU0NSSVBUT1JTICogY3R4c2l6ZTsKIAljb25zdCBz aXplX3QgZ2Vtc2l6ZSA9IHJvdW5kX3VwKHBvb2xzaXplLCBQQUdFX1NJWkUpOwogCXN0cnVjdCBp bnRlbF9ndWMgKmd1YyA9ICZkZXZfcHJpdi0+Z3VjOwogCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwog CXZvaWQgKnZhZGRyOwogCWludCByZXQ7CiAKLQlpZiAoZ3VjLT5jdHhfcG9vbCkKKwlpZiAoZ3Vj LT5zdGFnZV9kZXNjX3Bvb2wpCiAJCXJldHVybiAwOwogCiAJdm1hID0gaW50ZWxfZ3VjX2FsbG9j YXRlX3ZtYShndWMsIGdlbXNpemUpOwogCWlmIChJU19FUlIodm1hKSkKIAkJcmV0dXJuIFBUUl9F UlIodm1hKTsKIAotCWd1Yy0+Y3R4X3Bvb2wgPSB2bWE7CisJZ3VjLT5zdGFnZV9kZXNjX3Bvb2wg PSB2bWE7CiAKLQl2YWRkciA9IGk5MTVfZ2VtX29iamVjdF9waW5fbWFwKGd1Yy0+Y3R4X3Bvb2wt Pm9iaiwgSTkxNV9NQVBfV0IpOworCXZhZGRyID0gaTkxNV9nZW1fb2JqZWN0X3Bpbl9tYXAoZ3Vj LT5zdGFnZV9kZXNjX3Bvb2wtPm9iaiwgSTkxNV9NQVBfV0IpOwogCWlmIChJU19FUlIodmFkZHIp KSB7CiAJCXJldCA9IFBUUl9FUlIodmFkZHIpOwogCQlnb3RvIGVycl92bWE7CiAJfQogCi0JZ3Vj LT5jdHhfcG9vbF92YWRkciA9IHZhZGRyOworCWd1Yy0+c3RhZ2VfZGVzY19wb29sX3ZhZGRyID0g dmFkZHI7CiAKIAlyZXQgPSBpbnRlbF9ndWNfbG9nX2NyZWF0ZShndWMpOwogCWlmIChyZXQgPCAw KQpAQCAtMTEyMiwxNiArMTEyNSwxNiBAQCBpbnQgaTkxNV9ndWNfc3VibWlzc2lvbl9pbml0KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpZiAocmV0IDwgMCkKIAkJZ290byBl cnJfbG9nOwogCi0JaWRhX2luaXQoJmd1Yy0+Y3R4X2lkcyk7CisJaWRhX2luaXQoJmd1Yy0+c3Rh Z2VfaWRzKTsKIAogCXJldHVybiAwOwogCiBlcnJfbG9nOgogCWludGVsX2d1Y19sb2dfZGVzdHJv eShndWMpOwogZXJyX3ZhZGRyOgotCWk5MTVfZ2VtX29iamVjdF91bnBpbl9tYXAoZ3VjLT5jdHhf cG9vbC0+b2JqKTsKKwlpOTE1X2dlbV9vYmplY3RfdW5waW5fbWFwKGd1Yy0+c3RhZ2VfZGVzY19w b29sLT5vYmopOwogZXJyX3ZtYToKLQlpOTE1X3ZtYV91bnBpbl9hbmRfcmVsZWFzZSgmZ3VjLT5j dHhfcG9vbCk7CisJaTkxNV92bWFfdW5waW5fYW5kX3JlbGVhc2UoJmd1Yy0+c3RhZ2VfZGVzY19w b29sKTsKIAlyZXR1cm4gcmV0OwogfQogCkBAIC0xMTM5LDExICsxMTQyLDExIEBAIHZvaWQgaTkx NV9ndWNfc3VibWlzc2lvbl9maW5pKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IHsKIAlzdHJ1Y3QgaW50ZWxfZ3VjICpndWMgPSAmZGV2X3ByaXYtPmd1YzsKIAotCWlkYV9kZXN0 cm95KCZndWMtPmN0eF9pZHMpOworCWlkYV9kZXN0cm95KCZndWMtPnN0YWdlX2lkcyk7CiAJZ3Vj X2Fkc19kZXN0cm95KGd1Yyk7CiAJaW50ZWxfZ3VjX2xvZ19kZXN0cm95KGd1Yyk7Ci0JaTkxNV9n ZW1fb2JqZWN0X3VucGluX21hcChndWMtPmN0eF9wb29sLT5vYmopOwotCWk5MTVfdm1hX3VucGlu X2FuZF9yZWxlYXNlKCZndWMtPmN0eF9wb29sKTsKKwlpOTE1X2dlbV9vYmplY3RfdW5waW5fbWFw KGd1Yy0+c3RhZ2VfZGVzY19wb29sLT5vYmopOworCWk5MTVfdm1hX3VucGluX2FuZF9yZWxlYXNl KCZndWMtPnN0YWdlX2Rlc2NfcG9vbCk7CiB9CiAKIHN0YXRpYyB2b2lkIGd1Y19pbnRlcnJ1cHRz X2NhcHR1cmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQpAQCAtMTE5OSw3ICsx MjAyLDcgQEAgaW50IGk5MTVfZ3VjX3N1Ym1pc3Npb25fZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKIAlpZiAoIWNsaWVudCkgewogCQljbGllbnQgPSBndWNfY2xpZW50 X2FsbG9jKGRldl9wcml2LAogCQkJCQkgIElOVEVMX0lORk8oZGV2X3ByaXYpLT5yaW5nX21hc2ss Ci0JCQkJCSAgR1VDX0NUWF9QUklPUklUWV9LTURfTk9STUFMLAorCQkJCQkgIEdVQ19DTElFTlRf UFJJT1JJVFlfS01EX05PUk1BTCwKIAkJCQkJICBkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQpOwog CQlpZiAoSVNfRVJSKGNsaWVudCkpIHsKIAkJCURSTV9FUlJPUigiRmFpbGVkIHRvIGNyZWF0ZSBH dUMgY2xpZW50IGZvciBleGVjYnVmIVxuIik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWNfZndpZi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3 aWYuaAppbmRleCA0ZWRmNDBmLi5lYzI0MjBkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWNfZndpZi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Y19md2lmLmgKQEAgLTI2LDE0ICsyNiwxNCBAQAogI2RlZmluZSBHRlhDT1JFX0ZBTUlMWV9HRU45 CQkxMgogI2RlZmluZSBHRlhDT1JFX0ZBTUlMWV9VTktOT1dOCQkweDdmZmZmZmZmCiAKLSNkZWZp bmUgR1VDX0NUWF9QUklPUklUWV9LTURfSElHSAkwCi0jZGVmaW5lIEdVQ19DVFhfUFJJT1JJVFlf SElHSAkJMQotI2RlZmluZSBHVUNfQ1RYX1BSSU9SSVRZX0tNRF9OT1JNQUwJMgotI2RlZmluZSBH VUNfQ1RYX1BSSU9SSVRZX05PUk1BTAkJMwotI2RlZmluZSBHVUNfQ1RYX1BSSU9SSVRZX05VTQkJ NAorI2RlZmluZSBHVUNfQ0xJRU5UX1BSSU9SSVRZX0tNRF9ISUdICTAKKyNkZWZpbmUgR1VDX0NM SUVOVF9QUklPUklUWV9ISUdICTEKKyNkZWZpbmUgR1VDX0NMSUVOVF9QUklPUklUWV9LTURfTk9S TUFMCTIKKyNkZWZpbmUgR1VDX0NMSUVOVF9QUklPUklUWV9OT1JNQUwJMworI2RlZmluZSBHVUNf Q0xJRU5UX1BSSU9SSVRZX05VTQkJNAogCi0jZGVmaW5lIEdVQ19NQVhfR1BVX0NPTlRFWFRTCQkx MDI0Ci0jZGVmaW5lCUdVQ19JTlZBTElEX0NUWF9JRAkJR1VDX01BWF9HUFVfQ09OVEVYVFMKKyNk ZWZpbmUgR1VDX01BWF9TVEFHRV9ERVNDUklQVE9SUwkxMDI0CisjZGVmaW5lCUdVQ19JTlZBTElE X1NUQUdFX0lECQlHVUNfTUFYX1NUQUdFX0RFU0NSSVBUT1JTCiAKICNkZWZpbmUgR1VDX1JFTkRF Ul9FTkdJTkUJCTAKICNkZWZpbmUgR1VDX1ZJREVPX0VOR0lORQkJMQpAQCAtNjgsMTQgKzY4LDE0 IEBACiAjZGVmaW5lIEdVQ19ET09SQkVMTF9FTkFCTEVECQkxCiAjZGVmaW5lIEdVQ19ET09SQkVM TF9ESVNBQkxFRAkJMAogCi0jZGVmaW5lIEdVQ19DVFhfREVTQ19BVFRSX0FDVElWRQkoMSA8PCAw KQotI2RlZmluZSBHVUNfQ1RYX0RFU0NfQVRUUl9QRU5ESU5HX0RCCSgxIDw8IDEpCi0jZGVmaW5l IEdVQ19DVFhfREVTQ19BVFRSX0tFUk5FTAkoMSA8PCAyKQotI2RlZmluZSBHVUNfQ1RYX0RFU0Nf QVRUUl9QUkVFTVBUCSgxIDw8IDMpCi0jZGVmaW5lIEdVQ19DVFhfREVTQ19BVFRSX1JFU0VUCQko MSA8PCA0KQotI2RlZmluZSBHVUNfQ1RYX0RFU0NfQVRUUl9XUUxPQ0tFRAkoMSA8PCA1KQotI2Rl ZmluZSBHVUNfQ1RYX0RFU0NfQVRUUl9QQ0gJCSgxIDw8IDYpCi0jZGVmaW5lIEdVQ19DVFhfREVT Q19BVFRSX1RFUk1JTkFURUQJKDEgPDwgNykKKyNkZWZpbmUgR1VDX1NUQUdFX0RFU0NfQVRUUl9B Q1RJVkUJKDEgPDwgMCkKKyNkZWZpbmUgR1VDX1NUQUdFX0RFU0NfQVRUUl9QRU5ESU5HX0RCCSgx IDw8IDEpCisjZGVmaW5lIEdVQ19TVEFHRV9ERVNDX0FUVFJfS0VSTkVMCSgxIDw8IDIpCisjZGVm aW5lIEdVQ19TVEFHRV9ERVNDX0FUVFJfUFJFRU1QVAkoMSA8PCAzKQorI2RlZmluZSBHVUNfU1RB R0VfREVTQ19BVFRSX1JFU0VUCSgxIDw8IDQpCisjZGVmaW5lIEdVQ19TVEFHRV9ERVNDX0FUVFJf V1FMT0NLRUQJKDEgPDwgNSkKKyNkZWZpbmUgR1VDX1NUQUdFX0RFU0NfQVRUUl9QQ0gJCSgxIDw8 IDYpCisjZGVmaW5lIEdVQ19TVEFHRV9ERVNDX0FUVFJfVEVSTUlOQVRFRAkoMSA8PCA3KQogCiAv KiBUaGUgZ3VjIGNvbnRyb2wgZGF0YSBpcyAxMCBEV09SRHMgKi8KICNkZWZpbmUgR1VDX0NUTF9D VFhJTkZPCQkJMApAQCAtMjU2LDcgKzI1Niw3IEBAIHN0cnVjdCBndWNfd3FfaXRlbSB7CiB9IF9f cGFja2VkOwogCiBzdHJ1Y3QgZ3VjX3Byb2Nlc3NfZGVzYyB7Ci0JdTMyIGNvbnRleHRfaWQ7CisJ dTMyIHN0YWdlX2lkOwogCXU2NCBkYl9iYXNlX2FkZHI7CiAJdTMyIGhlYWQ7CiAJdTMyIHRhaWw7 CkBAIC0yODksMTAgKzI4OSwxOCBAQCBzdHJ1Y3QgZ3VjX2V4ZWNsaXN0X2NvbnRleHQgewogCXUx NiBlbmdpbmVfc3VibWl0X3F1ZXVlX2NvdW50OwogfSBfX3BhY2tlZDsKIAotLypDb250ZXh0IGRl c2NyaXB0b3IgZm9yIGNvbW11bmljYXRpbmcgYmV0d2VlbiB1S2VybmVsIGFuZCBEcml2ZXIqLwot c3RydWN0IGd1Y19jb250ZXh0X2Rlc2MgeworLyoKKyAqIFRoaXMgc3RydWN0dXJlIGRlc2NyaWJl cyBhIHN0YWdlIHNldCBhcnJhbmdlZCBmb3IgYSBwYXJ0aWN1bGFyIGNvbW11bmljYXRpb24KKyAq IGJldHdlZW4gdUtlcm5lbCAoR3VDKSBhbmQgRHJpdmVyIChLTUQpLiBUZWNobmljYWxseSwgdGhp cyBpcyBrbm93biBhcyBhCisgKiAiR3VDIENvbnRleHQgZGVzY3JpcHRvciIgaW4gdGhlIHNwZWNz LCBidXQgd2UgdXNlIHRoZSB0ZXJtICJzdGFnZSBkZXNjcmlwdG9yIgorICogdG8gYXZvaWQgY29u ZnVzaW9uIHdpdGggYWxsIHRoZSBvdGhlciB0aGluZ3MgYWxyZWFkeSBuYW1lZCAiY29udGV4dCIg aW4gdGhlCisgKiBkcml2ZXIuIEEgc3RhdGljIHBvb2wgb2YgdGhlc2UgZGVzY3JpcHRvcnMgYXJl IHN0b3JlZCBpbnNpZGUgYSBHRU0gb2JqZWN0CisgKiAoc3RhZ2VfZGVzY19wb29sKSB3aGljaCBp cyBoZWxkIGZvciB0aGUgZW50aXJlIGxpZmV0aW1lIG9mIG91ciBpbnRlcmFjdGlvbgorICogd2l0 aCB0aGUgR3VDLCBiZWluZyBhbGxvY2F0ZWQgYmVmb3JlIHRoZSBHdUMgaXMgbG9hZGVkIHdpdGgg aXRzIGZpcm13YXJlLgorICovCitzdHJ1Y3QgZ3VjX3N0YWdlX2Rlc2MgewogCXUzMiBzY2hlZF9j b21tb25fYXJlYTsKLQl1MzIgY29udGV4dF9pZDsKKwl1MzIgc3RhZ2VfaWQ7CiAJdTMyIHBhc19p ZDsKIAl1OCBlbmdpbmVzX3VzZWQ7CiAJdTY0IGRiX3RyaWdnZXJfY3B1OwpAQCAtMzU5LDcgKzM2 Nyw3IEBAIHN0cnVjdCBndWNfcG9saWN5IHsKIH0gX19wYWNrZWQ7CiAKIHN0cnVjdCBndWNfcG9s aWNpZXMgewotCXN0cnVjdCBndWNfcG9saWN5IHBvbGljeVtHVUNfQ1RYX1BSSU9SSVRZX05VTV1b R1VDX01BWF9FTkdJTkVTX05VTV07CisJc3RydWN0IGd1Y19wb2xpY3kgcG9saWN5W0dVQ19DTElF TlRfUFJJT1JJVFlfTlVNXVtHVUNfTUFYX0VOR0lORVNfTlVNXTsKIAogCS8qIEluIG1pY3JvIHNl Y29uZHMuIEhvdyBtdWNoIHRpbWUgdG8gYWxsb3cgYmVmb3JlIERQQyBwcm9jZXNzaW5nIGlzCiAJ ICogY2FsbGVkIGJhY2sgdmlhIGludGVycnVwdCAodG8gcHJldmVudCBEUEMgcXVldWUgZHJhaW4g c3RhcnZpbmcpLgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xv YWRlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IDYy ZWJmNTYuLjdkOTIzMjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Y19sb2FkZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMK QEAgLTE1MSw4ICsxNTEsOCBAQCBzdGF0aWMgdm9pZCBndWNfcGFyYW1zX2luaXQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCS8qIElmIEd1QyBzdWJtaXNzaW9uIGlzIGVuYWJs ZWQsIHNldCB1cCBhZGRpdGlvbmFsIHBhcmFtZXRlcnMgaGVyZSAqLwogCWlmIChpOTE1LmVuYWJs ZV9ndWNfc3VibWlzc2lvbikgewogCQl1MzIgYWRzID0gZ3VjX2dndHRfb2Zmc2V0KGd1Yy0+YWRz X3ZtYSkgPj4gUEFHRV9TSElGVDsKLQkJdTMyIHBncyA9IGd1Y19nZ3R0X29mZnNldChkZXZfcHJp di0+Z3VjLmN0eF9wb29sKTsKLQkJdTMyIGN0eF9pbl8xNiA9IEdVQ19NQVhfR1BVX0NPTlRFWFRT IC8gMTY7CisJCXUzMiBwZ3MgPSBndWNfZ2d0dF9vZmZzZXQoZGV2X3ByaXYtPmd1Yy5zdGFnZV9k ZXNjX3Bvb2wpOworCQl1MzIgY3R4X2luXzE2ID0gR1VDX01BWF9TVEFHRV9ERVNDUklQVE9SUyAv IDE2OwogCiAJCXBhcmFtc1tHVUNfQ1RMX0RFQlVHXSB8PSBhZHMgPDwgR1VDX0FEU19BRERSX1NI SUZUOwogCQlwYXJhbXNbR1VDX0NUTF9ERUJVR10gfD0gR1VDX0FEU19FTkFCTEVEOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3VjLmgKaW5kZXggNjVkMGI1OS4uNmNmMmQxNCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF91Yy5oCkBAIC03NCw3ICs3NCw3IEBAIHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgewogCiAJdWlu dDMyX3QgZW5naW5lczsJCS8qIGJpdG1hcCBvZiAoaG9zdCkgZW5naW5lIGlkcwkqLwogCXVpbnQz Ml90IHByaW9yaXR5OwotCXUzMiBjdHhfaW5kZXg7CisJdTMyIHN0YWdlX2lkOwogCXVpbnQzMl90 IHByb2NfZGVzY19vZmZzZXQ7CiAKIAl1MTYgZG9vcmJlbGxfaWQ7CkBAIC0xNTcsOSArMTU3LDkg QEAgc3RydWN0IGludGVsX2d1YyB7CiAJYm9vbCBpbnRlcnJ1cHRzX2VuYWJsZWQ7CiAKIAlzdHJ1 Y3QgaTkxNV92bWEgKmFkc192bWE7Ci0Jc3RydWN0IGk5MTVfdm1hICpjdHhfcG9vbDsKLQl2b2lk ICpjdHhfcG9vbF92YWRkcjsKLQlzdHJ1Y3QgaWRhIGN0eF9pZHM7CisJc3RydWN0IGk5MTVfdm1h ICpzdGFnZV9kZXNjX3Bvb2w7CisJdm9pZCAqc3RhZ2VfZGVzY19wb29sX3ZhZGRyOworCXN0cnVj dCBpZGEgc3RhZ2VfaWRzOwogCiAJc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZXhlY2J1Zl9jbGll bnQ7CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK