From: Oscar Mateo Subject: [PATCH v5 01/13] drm/i915/guc: Sanitize GuC client initialization Date: Wed, 22 Mar 2017 10:39:44 -0700 Message-ID: <1490204396-3395-2-git-send-email-oscar.mateo@intel.com> References: <1490204396-3395-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 608236E9DC for ; Thu, 23 Mar 2017 00:39:53 +0000 (UTC) In-Reply-To: <1490204396-3395-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 RnJvbTogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgoK U3RhcnRlZCBhZGRpbmcgcHJvcGVyIHRlYXJkb3duIHRvIGd1Y19jbGllbnRfYWxsb2MsIGVuZGVk IHVwIHJlbW92aW5nCnF1aXRlIGEgZmV3IGRlYWQgZW5kcyB3aGVyZSBlcnJvcnMgY29tbXVuaWNh dGluZyB3aXRoIHRoZSBHdUMgd2VyZQpzaWxlbnRseSBpZ25vcmVkLiBUaGVyZSBhbHNvIHNlZW1l ZCB0byBiZSBxdWl0ZSBhIGZldyBlcnJvbm91cwp0ZWFyZG93biBhY3Rpb25zIHBlcmZvcm1lZCBp biBjYXNlIG9mIGFuIGVycm9yIChvcmRlcmluZyB3cm9uZykuCgp2MjoKICAtIEluY3JlYXNlIGZ1 bmN0aW9uIHN5bW1ldHJ5L3Byb3hpbWl0eSAoTWljaGFsL0RhbmllbGUpCiAgLSBGaXggX19yZXNl cnZlX2Rvb3JiZWxsIGFjY291bnRpbmcgZm9yIGhpZ2ggcHJpb3JpdHkgKERhbmllbGUpCiAgLSBD YWxsIF9fdXBkYXRlX2Rvb3JiZWxsX2Rlc2MhIChEYW5pZWxlKQogIC0gSXNvbGF0ZSBfX2d1Y197 LGRlfWFsbG9jYXRlX2Rvb3JiZWxsIChNaWNoYWwvRGFuaWVsZSkKCnYzOgogIC0gIlNlbGVjdCIg YSBjYWNoZWxpbmUgaXMgYSBtb3JlIGFjY3VyYXRlIHZlcmIgdGhhbiAicmVzZXJ2ZSIgKERhbmll bGUpLgogIC0gV2UgY2Fubm90IHVwZGF0ZSAmIGNyZWF0ZSB0aGUgZG9vcmJlbGwgd2l0aG91dCBy ZXNlcnZpbmcgaXQgZmlyc3QsIHNvCiAgICBtb3ZlIHRoZSB3aG9sZSBkb29yYmVsbCBjcmVhdGlv biBmb3IgZXhlY2J1Zl9jbGllbnQgdG8gdGhlIHN1Ym1pc3Npb24KICAgIGVuYWJsZSAoT3NjYXIp LmkKICAtIEFkZCBhIGZpeG1lIGZvciBpZ25vcmluZyBwb3NzaWJsZSBkb29yYmVsbCBkZXN0cm95 IGVycm9ycy4KCnY0OgogIC0gUmVtb3ZlIGNvbW1lbnQgYWJvdXQgaXNfaGlnaF9wcmlvcml0eSAo RGFuaWVsZSkKICAtIERlYnVnIG1lc3NhZ2UgdHlwbyAoRGFuaWVsZSkKICAtIFJldXNlIF9fZ2V0 X2Rvb3JiZWxsIGluIG1vcmUgcGxhY2VzIChEYW5pZWxlKQogIC0gRG8gbm90IGRvIGFyaXRobWV0 aWMgb24gdm9pZCBwb2ludGVycyAoRGFuaWVsZSkKICAtIEFkZCBjb21tZW50IHRvIF9fcmVzZXRf ZG9vcmJlbGwgKERhbmllbGUpCgp2NToKICAtIGdjY2lzbXMgbGlrZSBhcml0aG1ldGljIG9uIHZv aWQgcG9pbnRlcnMgYXJlIG5vdCBmcm93bmVkIHVwb24gKE9zY2FyKQoKU2lnbmVkLW9mZi1ieTog Sm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpDYzogTWlj aGFsIFdhamRlY3prbyA8bWljaGFsLndhamRlY3prb0BpbnRlbC5jb20+CkNjOiBBcmthZGl1c3og SGlsZXIgPGFya2FkaXVzei5oaWxlckBpbnRlbC5jb20+CkNjOiBUdnJ0a28gVXJzdWxpbiA8dHZy dGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxz b24uY28udWs+ClJldmlld2VkLWJ5OiBEYW5pZWxlIENlcmFvbG8gU3B1cmlvIDxkYW5pZWxlLmNl cmFvbG9zcHVyaW9AaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBPc2NhciBNYXRlbyA8b3NjYXIu bWF0ZW9AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5j ICAgICAgICB8ICAgNCArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lv bi5jIHwgMzk4ICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWNfZndpZi5oICAgICAgfCAgIDQgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3VjLmggICAgICAgICAgICB8ICAxMSArLQogNCBmaWxlcyBjaGFuZ2VkLCAyMzMgaW5z ZXJ0aW9ucygrKSwgMTg0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2Zz LmMKaW5kZXggNDdlNzA3ZC4uMDYxZjhhNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2Zz LmMKQEAgLTI0NzYsNyArMjQ3Niw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ3VjX2NsaWVudF9pbmZv KHN0cnVjdCBzZXFfZmlsZSAqbSwKIAogCXNlcV9wcmludGYobSwgIlx0UHJpb3JpdHkgJWQsIEd1 QyBjdHggaW5kZXg6ICV1LCBQRCBvZmZzZXQgMHgleFxuIiwKIAkJY2xpZW50LT5wcmlvcml0eSwg Y2xpZW50LT5jdHhfaW5kZXgsIGNsaWVudC0+cHJvY19kZXNjX29mZnNldCk7Ci0Jc2VxX3ByaW50 ZihtLCAiXHREb29yYmVsbCBpZCAlZCwgb2Zmc2V0OiAweCV4LCBjb29raWUgMHgleFxuIiwKKwlz ZXFfcHJpbnRmKG0sICJcdERvb3JiZWxsIGlkICVkLCBvZmZzZXQ6IDB4JWx4LCBjb29raWUgMHgl eFxuIiwKIAkJY2xpZW50LT5kb29yYmVsbF9pZCwgY2xpZW50LT5kb29yYmVsbF9vZmZzZXQsIGNs aWVudC0+ZG9vcmJlbGxfY29va2llKTsKIAlzZXFfcHJpbnRmKG0sICJcdFdRIHNpemUgJWQsIG9m ZnNldDogMHgleCwgdGFpbCAlZFxuIiwKIAkJY2xpZW50LT53cV9zaXplLCBjbGllbnQtPndxX29m ZnNldCwgY2xpZW50LT53cV90YWlsKTsKQEAgLTI1MTEsNyArMjUxMSw3IEBAIHN0YXRpYyBpbnQg aTkxNV9ndWNfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiAJfQogCiAJc2Vx X3ByaW50ZihtLCAiRG9vcmJlbGwgbWFwOlxuIik7Ci0Jc2VxX3ByaW50ZihtLCAiXHQlKnBiXG4i LCBHVUNfTUFYX0RPT1JCRUxMUywgZ3VjLT5kb29yYmVsbF9iaXRtYXApOworCXNlcV9wcmludGYo bSwgIlx0JSpwYlxuIiwgR1VDX05VTV9ET09SQkVMTFMsIGd1Yy0+ZG9vcmJlbGxfYml0bWFwKTsK IAlzZXFfcHJpbnRmKG0sICJEb29yYmVsbCBuZXh0IGNhY2hlbGluZTogMHgleFxuXG4iLCBndWMt PmRiX2NhY2hlbGluZSk7CiAKIAlzZXFfcHJpbnRmKG0sICJHdUMgdG90YWwgYWN0aW9uIGNvdW50 OiAlbGx1XG4iLCBndWMtPmFjdGlvbl9jb3VudCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggODMyYWM5ZS4uYjE5NzUzYyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpAQCAtNjQsMjcgKzY0LDcwIEBACiAgKgog ICovCiAKK3N0YXRpYyBpbmxpbmUgYm9vbCBpc19oaWdoX3ByaW9yaXR5KHN0cnVjdCBpOTE1X2d1 Y19jbGllbnQqIGNsaWVudCkKK3sKKwlyZXR1cm4gY2xpZW50LT5wcmlvcml0eSA8PSBHVUNfQ1RY X1BSSU9SSVRZX0hJR0g7Cit9CisKK3N0YXRpYyBpbnQgX19yZXNlcnZlX2Rvb3JiZWxsKHN0cnVj dCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCkKK3sKKwl1bnNpZ25lZCBsb25nIG9mZnNldDsKKwl1 bnNpZ25lZCBsb25nIGVuZDsKKwl1MTYgaWQ7CisKKwlHRU1fQlVHX09OKGNsaWVudC0+ZG9vcmJl bGxfaWQgIT0gR1VDX0RPT1JCRUxMX0lOVkFMSUQpOworCisJLyoKKwkgKiBUaGUgYml0bWFwIHRy YWNrcyB3aGljaCBkb29yYmVsbCByZWdpc3RlcnMgYXJlIGN1cnJlbnRseSBpbiB1c2UuCisJICog SXQgaXMgc3BsaXQgaW50byB0d28gaGFsdmVzOyB0aGUgZmlyc3QgaGFsZiBpcyB1c2VkIGZvciBu b3JtYWwKKwkgKiBwcmlvcml0eSBjb250ZXh0cywgdGhlIHNlY29uZCBoYWxmIGZvciBoaWdoLXBy aW9yaXR5IG9uZXMuCisJICovCisJb2Zmc2V0ID0gMDsKKwllbmQgPSBHVUNfTlVNX0RPT1JCRUxM Uy8yOworCWlmIChpc19oaWdoX3ByaW9yaXR5KGNsaWVudCkpIHsKKwkJb2Zmc2V0ID0gZW5kOwor CQllbmQgKz0gb2Zmc2V0OworCX0KKworCWlkID0gZmluZF9uZXh0X3plcm9fYml0KGNsaWVudC0+ Z3VjLT5kb29yYmVsbF9iaXRtYXAsIG9mZnNldCwgZW5kKTsKKwlpZiAoaWQgPT0gZW5kKQorCQly ZXR1cm4gLUVOT1NQQzsKKworCV9fc2V0X2JpdChpZCwgY2xpZW50LT5ndWMtPmRvb3JiZWxsX2Jp dG1hcCk7CisJY2xpZW50LT5kb29yYmVsbF9pZCA9IGlkOworCURSTV9ERUJVR19EUklWRVIoImNs aWVudCAldSAoaGlnaCBwcmlvPSVzKSByZXNlcnZlZCBkb29yYmVsbDogJWRcbiIsCisJCQkgY2xp ZW50LT5jdHhfaW5kZXgsIHllc25vKGlzX2hpZ2hfcHJpb3JpdHkoY2xpZW50KSksCisJCQkgaWQp OworCXJldHVybiAwOworfQorCitzdGF0aWMgdm9pZCBfX3VucmVzZXJ2ZV9kb29yYmVsbChzdHJ1 Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQpCit7CisJR0VNX0JVR19PTihjbGllbnQtPmRvb3Ji ZWxsX2lkID09IEdVQ19ET09SQkVMTF9JTlZBTElEKTsKKworCV9fY2xlYXJfYml0KGNsaWVudC0+ ZG9vcmJlbGxfaWQsIGNsaWVudC0+Z3VjLT5kb29yYmVsbF9iaXRtYXApOworCWNsaWVudC0+ZG9v cmJlbGxfaWQgPSBHVUNfRE9PUkJFTExfSU5WQUxJRDsKK30KKwogLyoKICAqIFRlbGwgdGhlIEd1 QyB0byBhbGxvY2F0ZSBvciBkZWFsbG9jYXRlIGEgc3BlY2lmaWMgZG9vcmJlbGwKICAqLwogCi1z dGF0aWMgaW50IGd1Y19hbGxvY2F0ZV9kb29yYmVsbChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCi0J CQkJIHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCkKK3N0YXRpYyBpbnQgX19ndWNfYWxs b2NhdGVfZG9vcmJlbGwoc3RydWN0IGludGVsX2d1YyAqZ3VjLCB1MzIgY3R4X2luZGV4KQogewog CXUzMiBhY3Rpb25bXSA9IHsKIAkJSU5URUxfR1VDX0FDVElPTl9BTExPQ0FURV9ET09SQkVMTCwK LQkJY2xpZW50LT5jdHhfaW5kZXgKKwkJY3R4X2luZGV4CiAJfTsKIAogCXJldHVybiBpbnRlbF9n dWNfc2VuZChndWMsIGFjdGlvbiwgQVJSQVlfU0laRShhY3Rpb24pKTsKIH0KIAotc3RhdGljIGlu dCBndWNfcmVsZWFzZV9kb29yYmVsbChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCi0JCQkJc3RydWN0 IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50KQorc3RhdGljIGludCBfX2d1Y19kZWFsbG9jYXRlX2Rv b3JiZWxsKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywgdTMyIGN0eF9pbmRleCkKIHsKIAl1MzIgYWN0 aW9uW10gPSB7CiAJCUlOVEVMX0dVQ19BQ1RJT05fREVBTExPQ0FURV9ET09SQkVMTCwKLQkJY2xp ZW50LT5jdHhfaW5kZXgKKwkJY3R4X2luZGV4CiAJfTsKIAogCXJldHVybiBpbnRlbF9ndWNfc2Vu ZChndWMsIGFjdGlvbiwgQVJSQVlfU0laRShhY3Rpb24pKTsKQEAgLTk3LDEwNCArMTQwLDEwMCBA QCBzdGF0aWMgaW50IGd1Y19yZWxlYXNlX2Rvb3JiZWxsKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywK ICAqIGNsaWVudCBvYmplY3Qgd2hpY2ggY29udGFpbnMgdGhlIHBhZ2UgYmVpbmcgdXNlZCBmb3Ig dGhlIGRvb3JiZWxsCiAgKi8KIAotc3RhdGljIGludCBndWNfdXBkYXRlX2Rvb3JiZWxsX2lkKHN0 cnVjdCBpbnRlbF9ndWMgKmd1YywKLQkJCQkgIHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVu dCwKLQkJCQkgIHUxNiBuZXdfaWQpCitzdGF0aWMgaW50IF9fdXBkYXRlX2Rvb3JiZWxsX2Rlc2Mo c3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50LCB1MTYgbmV3X2lkKQogewotCXN0cnVjdCBz Z190YWJsZSAqc2cgPSBndWMtPmN0eF9wb29sX3ZtYS0+cGFnZXM7Ci0Jdm9pZCAqZG9vcmJlbGxf Yml0bWFwID0gZ3VjLT5kb29yYmVsbF9iaXRtYXA7Ci0Jc3RydWN0IGd1Y19kb29yYmVsbF9pbmZv ICpkb29yYmVsbDsKKwlzdHJ1Y3Qgc2dfdGFibGUgKnNnID0gY2xpZW50LT5ndWMtPmN0eF9wb29s X3ZtYS0+cGFnZXM7CiAJc3RydWN0IGd1Y19jb250ZXh0X2Rlc2MgZGVzYzsKIAlzaXplX3QgbGVu OwogCi0JZG9vcmJlbGwgPSBjbGllbnQtPnZhZGRyICsgY2xpZW50LT5kb29yYmVsbF9vZmZzZXQ7 Ci0KLQlpZiAoY2xpZW50LT5kb29yYmVsbF9pZCAhPSBHVUNfSU5WQUxJRF9ET09SQkVMTF9JRCAm JgotCSAgICB0ZXN0X2JpdChjbGllbnQtPmRvb3JiZWxsX2lkLCBkb29yYmVsbF9iaXRtYXApKSB7 Ci0JCS8qIERlYWN0aXZhdGUgdGhlIG9sZCBkb29yYmVsbCAqLwotCQlkb29yYmVsbC0+ZGJfc3Rh dHVzID0gR1VDX0RPT1JCRUxMX0RJU0FCTEVEOwotCQkodm9pZClndWNfcmVsZWFzZV9kb29yYmVs bChndWMsIGNsaWVudCk7Ci0JCV9fY2xlYXJfYml0KGNsaWVudC0+ZG9vcmJlbGxfaWQsIGRvb3Ji ZWxsX2JpdG1hcCk7Ci0JfQotCiAJLyogVXBkYXRlIHRoZSBHdUMncyBpZGVhIG9mIHRoZSBkb29y YmVsbCBJRCAqLwogCWxlbiA9IHNnX3Bjb3B5X3RvX2J1ZmZlcihzZy0+c2dsLCBzZy0+bmVudHMs ICZkZXNjLCBzaXplb2YoZGVzYyksCi0JCQkgICAgIHNpemVvZihkZXNjKSAqIGNsaWVudC0+Y3R4 X2luZGV4KTsKKwkJCQkgc2l6ZW9mKGRlc2MpICogY2xpZW50LT5jdHhfaW5kZXgpOwogCWlmIChs ZW4gIT0gc2l6ZW9mKGRlc2MpKQogCQlyZXR1cm4gLUVGQVVMVDsKKwogCWRlc2MuZGJfaWQgPSBu ZXdfaWQ7CiAJbGVuID0gc2dfcGNvcHlfZnJvbV9idWZmZXIoc2ctPnNnbCwgc2ctPm5lbnRzLCAm ZGVzYywgc2l6ZW9mKGRlc2MpLAotCQkJICAgICBzaXplb2YoZGVzYykgKiBjbGllbnQtPmN0eF9p bmRleCk7CisJCQkJICAgc2l6ZW9mKGRlc2MpICogY2xpZW50LT5jdHhfaW5kZXgpOwogCWlmIChs ZW4gIT0gc2l6ZW9mKGRlc2MpKQogCQlyZXR1cm4gLUVGQVVMVDsKIAotCWNsaWVudC0+ZG9vcmJl bGxfaWQgPSBuZXdfaWQ7Ci0JaWYgKG5ld19pZCA9PSBHVUNfSU5WQUxJRF9ET09SQkVMTF9JRCkK LQkJcmV0dXJuIDA7CisJcmV0dXJuIDA7Cit9CiAKLQkvKiBBY3RpdmF0ZSB0aGUgbmV3IGRvb3Ji ZWxsICovCi0JX19zZXRfYml0KG5ld19pZCwgZG9vcmJlbGxfYml0bWFwKTsKK3N0YXRpYyBzdHJ1 Y3QgZ3VjX2Rvb3JiZWxsX2luZm8gKl9fZ2V0X2Rvb3JiZWxsKHN0cnVjdCBpOTE1X2d1Y19jbGll bnQgKmNsaWVudCkKK3sKKwlyZXR1cm4gY2xpZW50LT52YWRkciArIGNsaWVudC0+ZG9vcmJlbGxf b2Zmc2V0OworfQorCitzdGF0aWMgYm9vbCBoYXNfZG9vcmJlbGwoc3RydWN0IGk5MTVfZ3VjX2Ns aWVudCAqY2xpZW50KQoreworCWlmIChjbGllbnQtPmRvb3JiZWxsX2lkID09IEdVQ19ET09SQkVM TF9JTlZBTElEKQorCQlyZXR1cm4gZmFsc2U7CisKKwlyZXR1cm4gdGVzdF9iaXQoY2xpZW50LT5k b29yYmVsbF9pZCwgY2xpZW50LT5ndWMtPmRvb3JiZWxsX2JpdG1hcCk7Cit9CisKK3N0YXRpYyBp bnQgX19jcmVhdGVfZG9vcmJlbGwoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50KQorewor CXN0cnVjdCBndWNfZG9vcmJlbGxfaW5mbyAqZG9vcmJlbGw7CisJaW50IGVycjsKKworCWRvb3Ji ZWxsID0gX19nZXRfZG9vcmJlbGwoY2xpZW50KTsKIAlkb29yYmVsbC0+ZGJfc3RhdHVzID0gR1VD X0RPT1JCRUxMX0VOQUJMRUQ7CiAJZG9vcmJlbGwtPmNvb2tpZSA9IGNsaWVudC0+ZG9vcmJlbGxf Y29va2llOwotCXJldHVybiBndWNfYWxsb2NhdGVfZG9vcmJlbGwoZ3VjLCBjbGllbnQpOworCisJ ZXJyID0gX19ndWNfYWxsb2NhdGVfZG9vcmJlbGwoY2xpZW50LT5ndWMsIGNsaWVudC0+Y3R4X2lu ZGV4KTsKKwlpZiAoZXJyKSB7CisJCWRvb3JiZWxsLT5kYl9zdGF0dXMgPSBHVUNfRE9PUkJFTExf RElTQUJMRUQ7CisJCWRvb3JiZWxsLT5jb29raWUgPSAwOworCX0KKwlyZXR1cm4gZXJyOwogfQog Ci1zdGF0aWMgdm9pZCBndWNfZGlzYWJsZV9kb29yYmVsbChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMs Ci0JCQkJIHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCkKK3N0YXRpYyBpbnQgX19kZXN0 cm95X2Rvb3JiZWxsKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCkKIHsKLQkodm9pZCln dWNfdXBkYXRlX2Rvb3JiZWxsX2lkKGd1YywgY2xpZW50LCBHVUNfSU5WQUxJRF9ET09SQkVMTF9J RCk7CisJc3RydWN0IGd1Y19kb29yYmVsbF9pbmZvICpkb29yYmVsbDsKIAotCS8qIFhYWDogd2Fp dCBmb3IgYW55IGludGVycnVwdHMgKi8KLQkvKiBYWFg6IHdhaXQgZm9yIHdvcmtxdWV1ZSB0byBk cmFpbiAqLworCWRvb3JiZWxsID0gX19nZXRfZG9vcmJlbGwoY2xpZW50KTsKKwlkb29yYmVsbC0+ ZGJfc3RhdHVzID0gR1VDX0RPT1JCRUxMX0RJU0FCTEVEOworCWRvb3JiZWxsLT5jb29raWUgPSAw OworCisJcmV0dXJuIF9fZ3VjX2RlYWxsb2NhdGVfZG9vcmJlbGwoY2xpZW50LT5ndWMsIGNsaWVu dC0+Y3R4X2luZGV4KTsKIH0KIAotc3RhdGljIHVpbnQxNl90Ci1zZWxlY3RfZG9vcmJlbGxfcmVn aXN0ZXIoc3RydWN0IGludGVsX2d1YyAqZ3VjLCB1aW50MzJfdCBwcmlvcml0eSkKK3N0YXRpYyBp bnQgZGVzdHJveV9kb29yYmVsbChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQpCiB7Ci0J LyoKLQkgKiBUaGUgYml0bWFwIHRyYWNrcyB3aGljaCBkb29yYmVsbCByZWdpc3RlcnMgYXJlIGN1 cnJlbnRseSBpbiB1c2UuCi0JICogSXQgaXMgc3BsaXQgaW50byB0d28gaGFsdmVzOyB0aGUgZmly c3QgaGFsZiBpcyB1c2VkIGZvciBub3JtYWwKLQkgKiBwcmlvcml0eSBjb250ZXh0cywgdGhlIHNl Y29uZCBoYWxmIGZvciBoaWdoLXByaW9yaXR5IG9uZXMuCi0JICogTm90ZSB0aGF0IGxvZ2ljYWxs eSBoaWdoZXIgcHJpb3JpdGllcyBhcmUgbnVtZXJpY2FsbHkgbGVzcyB0aGFuCi0JICogbm9ybWFs IG9uZXMsIHNvIHRoZSB0ZXN0IGJlbG93IG1lYW5zICJpcyBpdCBoaWdoLXByaW9yaXR5PyIKLQkg Ki8KLQljb25zdCBib29sIGhpX3ByaSA9IChwcmlvcml0eSA8PSBHVUNfQ1RYX1BSSU9SSVRZX0hJ R0gpOwotCWNvbnN0IHVpbnQxNl90IGhhbGYgPSBHVUNfTUFYX0RPT1JCRUxMUyAvIDI7Ci0JY29u c3QgdWludDE2X3Qgc3RhcnQgPSBoaV9wcmkgPyBoYWxmIDogMDsKLQljb25zdCB1aW50MTZfdCBl bmQgPSBzdGFydCArIGhhbGY7Ci0JdWludDE2X3QgaWQ7CisJaW50IGVycjsKIAotCWlkID0gZmlu ZF9uZXh0X3plcm9fYml0KGd1Yy0+ZG9vcmJlbGxfYml0bWFwLCBlbmQsIHN0YXJ0KTsKLQlpZiAo aWQgPT0gZW5kKQotCQlpZCA9IEdVQ19JTlZBTElEX0RPT1JCRUxMX0lEOworCUdFTV9CVUdfT04o IWhhc19kb29yYmVsbChjbGllbnQpKTsKKworCS8qIFhYWDogd2FpdCBmb3IgYW55IGludGVycnVw dHMgKi8KKwkvKiBYWFg6IHdhaXQgZm9yIHdvcmtxdWV1ZSB0byBkcmFpbiAqLwogCi0JRFJNX0RF QlVHX0RSSVZFUigiYXNzaWduZWQgJXMgcHJpb3JpdHkgZG9vcmJlbGwgaWQgMHgleFxuIiwKLQkJ CWhpX3ByaSA/ICJoaWdoIiA6ICJub3JtYWwiLCBpZCk7CisJZXJyID0gX19kZXN0cm95X2Rvb3Ji ZWxsKGNsaWVudCk7CisJaWYgKGVycikKKwkJcmV0dXJuIGVycjsKIAotCXJldHVybiBpZDsKLX0K KwlfX3VwZGF0ZV9kb29yYmVsbF9kZXNjKGNsaWVudCwgR1VDX0RPT1JCRUxMX0lOVkFMSUQpOwog Ci0vKgotICogU2VsZWN0LCBhc3NpZ24gYW5kIHJlbGFzZSBkb29yYmVsbCBjYWNoZWxpbmVzCi0g KgotICogVGhlc2UgZnVuY3Rpb25zIHRyYWNrIHdoaWNoIGRvb3JiZWxsIGNhY2hlbGluZXMgYXJl IGluIHVzZS4KLSAqIFRoZSBkYXRhIHRoZXkgbWFuaXB1bGF0ZSBpcyBwcm90ZWN0ZWQgYnkgdGhl IGludGVsX2d1Y19zZW5kIGxvY2suCi0gKi8KKwlfX3VucmVzZXJ2ZV9kb29yYmVsbChjbGllbnQp OworCisJcmV0dXJuIDA7Cit9CiAKLXN0YXRpYyB1aW50MzJfdCBzZWxlY3RfZG9vcmJlbGxfY2Fj aGVsaW5lKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKK3N0YXRpYyB1bnNpZ25lZCBsb25nIF9fc2Vs ZWN0X2NhY2hlbGluZShzdHJ1Y3QgaW50ZWxfZ3VjKiBndWMpCiB7Ci0JY29uc3QgdWludDMyX3Qg Y2FjaGVsaW5lX3NpemUgPSBjYWNoZV9saW5lX3NpemUoKTsKLQl1aW50MzJfdCBvZmZzZXQ7CisJ dW5zaWduZWQgbG9uZyBvZmZzZXQ7CiAKIAkvKiBEb29yYmVsbCB1c2VzIGEgc2luZ2xlIGNhY2hl IGxpbmUgd2l0aGluIGEgcGFnZSAqLwogCW9mZnNldCA9IG9mZnNldF9pbl9wYWdlKGd1Yy0+ZGJf Y2FjaGVsaW5lKTsKIAogCS8qIE1vdmluZyB0byBuZXh0IGNhY2hlIGxpbmUgdG8gcmVkdWNlIGNv bnRlbnRpb24gKi8KLQlndWMtPmRiX2NhY2hlbGluZSArPSBjYWNoZWxpbmVfc2l6ZTsKLQotCURS TV9ERUJVR19EUklWRVIoInNlbGVjdGVkIGRvb3JiZWxsIGNhY2hlbGluZSAweCV4LCBuZXh0IDB4 JXgsIGxpbmVzaXplICV1XG4iLAotCQkJb2Zmc2V0LCBndWMtPmRiX2NhY2hlbGluZSwgY2FjaGVs aW5lX3NpemUpOworCWd1Yy0+ZGJfY2FjaGVsaW5lICs9IGNhY2hlX2xpbmVfc2l6ZSgpOwogCisJ RFJNX0RFQlVHX0RSSVZFUigicmVzZXJ2ZWQgY2FjaGVsaW5lIDB4JWx4LCBuZXh0IDB4JXgsIGxp bmVzaXplICV1XG4iLAorCQkJb2Zmc2V0LCBndWMtPmRiX2NhY2hlbGluZSwgY2FjaGVfbGluZV9z aXplKCkpOwogCXJldHVybiBvZmZzZXQ7CiB9CiAKQEAgLTI5Myw4ICszMzIsNyBAQCBzdGF0aWMg dm9pZCBndWNfY3R4X2Rlc2NfaW5pdChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJZ2Z4X2FkZHIg PSBndWNfZ2d0dF9vZmZzZXQoY2xpZW50LT52bWEpOwogCWRlc2MuZGJfdHJpZ2dlcl9waHkgPSBz Z19kbWFfYWRkcmVzcyhjbGllbnQtPnZtYS0+cGFnZXMtPnNnbCkgKwogCQkJCWNsaWVudC0+ZG9v cmJlbGxfb2Zmc2V0OwotCWRlc2MuZGJfdHJpZ2dlcl9jcHUgPQotCQkodWludHB0cl90KWNsaWVu dC0+dmFkZHIgKyBjbGllbnQtPmRvb3JiZWxsX29mZnNldDsKKwlkZXNjLmRiX3RyaWdnZXJfY3B1 ID0gKHVpbnRwdHJfdClfX2dldF9kb29yYmVsbChjbGllbnQpOwogCWRlc2MuZGJfdHJpZ2dlcl91 ayA9IGdmeF9hZGRyICsgY2xpZW50LT5kb29yYmVsbF9vZmZzZXQ7CiAJZGVzYy5wcm9jZXNzX2Rl c2MgPSBnZnhfYWRkciArIGNsaWVudC0+cHJvY19kZXNjX29mZnNldDsKIAlkZXNjLndxX2FkZHIg PSBnZnhfYWRkciArIGNsaWVudC0+d3Ffb2Zmc2V0OwpAQCAtNDYzLDcgKzUwMSw3IEBAIHN0YXRp YyBpbnQgZ3VjX3JpbmdfZG9vcmJlbGwoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50KQog CQlkYl9leGMuY29va2llID0gMTsKIAogCS8qIHBvaW50ZXIgb2YgY3VycmVudCBkb29yYmVsbCBj YWNoZWxpbmUgKi8KLQlkYiA9IGNsaWVudC0+dmFkZHIgKyBjbGllbnQtPmRvb3JiZWxsX29mZnNl dDsKKwlkYiA9ICh1bmlvbiBndWNfZG9vcmJlbGxfcXcgKilfX2dldF9kb29yYmVsbChjbGllbnQp OwogCiAJd2hpbGUgKGF0dGVtcHQtLSkgewogCQkvKiBsZXRzIHJpbmcgdGhlIGRvb3JiZWxsICov CkBAIC02OTUsOTMgKzczMywxMDEgQEAgc3RydWN0IGk5MTVfdm1hICppbnRlbF9ndWNfYWxsb2Nh dGVfdm1hKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywgdTMyIHNpemUpCiAJcmV0dXJuIHZtYTsKIH0K IAotc3RhdGljIHZvaWQKLWd1Y19jbGllbnRfZnJlZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCi0JCXN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCkKK3N0YXRpYyB2b2lk IGd1Y19jbGllbnRfZnJlZShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQpCiB7Ci0Jc3Ry dWN0IGludGVsX2d1YyAqZ3VjID0gJmRldl9wcml2LT5ndWM7Ci0KLQlpZiAoIWNsaWVudCkKLQkJ cmV0dXJuOwotCiAJLyoKIAkgKiBYWFg6IHdhaXQgZm9yIGFueSBvdXRzdGFuZGluZyBzdWJtaXNz aW9ucyBiZWZvcmUgZnJlZWluZyBtZW1vcnkuCiAJICogQmUgc3VyZSB0byBkcm9wIGFueSBsb2Nr cwogCSAqLwotCi0JaWYgKGNsaWVudC0+dmFkZHIpIHsKLQkJLyoKLQkJICogSWYgd2UgZ290IGFz IGZhciBhcyBzZXR0aW5nIHVwIGEgZG9vcmJlbGwsIG1ha2Ugc3VyZSB3ZQotCQkgKiBzaHV0IGl0 IGRvd24gYmVmb3JlIHVubWFwcGluZyAmIGRlYWxsb2NhdGluZyB0aGUgbWVtb3J5LgotCQkgKi8K LQkJZ3VjX2Rpc2FibGVfZG9vcmJlbGwoZ3VjLCBjbGllbnQpOwotCi0JCWk5MTVfZ2VtX29iamVj dF91bnBpbl9tYXAoY2xpZW50LT52bWEtPm9iaik7Ci0JfQotCisJZ3VjX2N0eF9kZXNjX2Zpbmko Y2xpZW50LT5ndWMsIGNsaWVudCk7CisJaTkxNV9nZW1fb2JqZWN0X3VucGluX21hcChjbGllbnQt PnZtYS0+b2JqKTsKIAlpOTE1X3ZtYV91bnBpbl9hbmRfcmVsZWFzZSgmY2xpZW50LT52bWEpOwot Ci0JaWYgKGNsaWVudC0+Y3R4X2luZGV4ICE9IEdVQ19JTlZBTElEX0NUWF9JRCkgewotCQlndWNf Y3R4X2Rlc2NfZmluaShndWMsIGNsaWVudCk7Ci0JCWlkYV9zaW1wbGVfcmVtb3ZlKCZndWMtPmN0 eF9pZHMsIGNsaWVudC0+Y3R4X2luZGV4KTsKLQl9Ci0KKwlpZGFfc2ltcGxlX3JlbW92ZSgmY2xp ZW50LT5ndWMtPmN0eF9pZHMsIGNsaWVudC0+Y3R4X2luZGV4KTsKIAlrZnJlZShjbGllbnQpOwog fQogCiAvKiBDaGVjayB0aGF0IGEgZG9vcmJlbGwgcmVnaXN0ZXIgaXMgaW4gdGhlIGV4cGVjdGVk IHN0YXRlICovCi1zdGF0aWMgYm9vbCBndWNfZG9vcmJlbGxfY2hlY2soc3RydWN0IGludGVsX2d1 YyAqZ3VjLCB1aW50MTZfdCBkYl9pZCkKK3N0YXRpYyBib29sIGRvb3JiZWxsX29rKHN0cnVjdCBp bnRlbF9ndWMgKmd1YywgdTE2IGRiX2lkKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IGd1Y190b19pOTE1KGd1Yyk7Ci0JaTkxNV9yZWdfdCBkcmJyZWcgPSBHRU44X0RS QlJFR0woZGJfaWQpOwotCXVpbnQzMl90IHZhbHVlID0gSTkxNV9SRUFEKGRyYnJlZyk7Ci0JYm9v bCBlbmFibGVkID0gKHZhbHVlICYgR1VDX0RPT1JCRUxMX0VOQUJMRUQpICE9IDA7Ci0JYm9vbCBl eHBlY3RlZCA9IHRlc3RfYml0KGRiX2lkLCBndWMtPmRvb3JiZWxsX2JpdG1hcCk7CisJdTMyIGRy YnJlZ2w7CisJYm9vbCB2YWxpZDsKKworCUdFTV9CVUdfT04oZGJfaWQgPj0gR1VDX0RPT1JCRUxM X0lOVkFMSUQpOworCisJZHJicmVnbCA9IEk5MTVfUkVBRChHRU44X0RSQlJFR0woZGJfaWQpKTsK Kwl2YWxpZCA9IGRyYnJlZ2wgJiBHRU44X0RSQl9WQUxJRDsKIAotCWlmIChlbmFibGVkID09IGV4 cGVjdGVkKQorCWlmICh0ZXN0X2JpdChkYl9pZCwgZ3VjLT5kb29yYmVsbF9iaXRtYXApID09IHZh bGlkKQogCQlyZXR1cm4gdHJ1ZTsKIAotCURSTV9ERUJVR19EUklWRVIoIkRvb3JiZWxsICVkIChy ZWcgMHgleCkgMHgleCwgc2hvdWxkIGJlICVzXG4iLAotCQkJIGRiX2lkLCBkcmJyZWcucmVnLCB2 YWx1ZSwKLQkJCSBleHBlY3RlZCA/ICJhY3RpdmUiIDogImluYWN0aXZlIik7CisJRFJNX0RFQlVH X0RSSVZFUigiRG9vcmJlbGwgJWQgaGFzIHVuZXhwZWN0ZWQgc3RhdGUgKDB4JXgpOiB2YWxpZD0l c1xuIiwKKwkJCSBkYl9pZCwgZHJicmVnbCwgeWVzbm8odmFsaWQpKTsKIAogCXJldHVybiBmYWxz ZTsKIH0KIAogLyoKKyAqIElmIHRoZSBHdUMgdGhpbmtzIHRoYXQgdGhlIGRvb3JiZWxsIGlzIHVu YXNzaWduZWQgKGUuZy4gYmVjYXVzZSB3ZSByZXNldCBhbmQKKyAqIHJlbG9hZGVkIHRoZSBHdUMg RlcpIHdlIGNhbiB1c2UgdGhpcyBmdW5jdGlvbiB0byB0ZWxsIHRoZSBHdUMgdG8gcmVhc3NpZ24g dGhlCisgKiBkb29yYmVsbCB0byB0aGUgcmlnaHRmdWwgb3duZXIuCisgKi8KK3N0YXRpYyBpbnQg X19yZXNldF9kb29yYmVsbChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50KiBjbGllbnQsIHUxNiBkYl9p ZCkKK3sKKwlpbnQgZXJyOworCisJZXJyID0gX191cGRhdGVfZG9vcmJlbGxfZGVzYyhjbGllbnQs IGRiX2lkKTsKKwlpZiAoIWVycikKKwkJZXJyID0gX19jcmVhdGVfZG9vcmJlbGwoY2xpZW50KTsK KwlpZiAoIWVycikKKwkJZXJyID0gX19kZXN0cm95X2Rvb3JiZWxsKGNsaWVudCk7CisKKwlyZXR1 cm4gZXJyOworfQorCisvKgogICogQm9ycm93IHRoZSBmaXJzdCBjbGllbnQgdG8gc2V0IHVwICYg dGVhciBkb3duIGVhY2ggdW51c2VkIGRvb3JiZWxsCiAgKiBpbiB0dXJuLCB0byBlbnN1cmUgdGhh dCBhbGwgZG9vcmJlbGwgaC93IGlzIChyZSlpbml0aWFsaXNlZC4KICAqLwotc3RhdGljIHZvaWQg Z3VjX2luaXRfZG9vcmJlbGxfaHcoc3RydWN0IGludGVsX2d1YyAqZ3VjKQorc3RhdGljIGludCBn dWNfaW5pdF9kb29yYmVsbF9odyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiB7CiAJc3RydWN0IGk5 MTVfZ3VjX2NsaWVudCAqY2xpZW50ID0gZ3VjLT5leGVjYnVmX2NsaWVudDsKLQl1aW50MTZfdCBk Yl9pZDsKLQlpbnQgaSwgZXJyOworCWludCBlcnI7CisJaW50IGk7CiAKLQlndWNfZGlzYWJsZV9k b29yYmVsbChndWMsIGNsaWVudCk7CisJaWYgKGhhc19kb29yYmVsbChjbGllbnQpKQorCQlkZXN0 cm95X2Rvb3JiZWxsKGNsaWVudCk7CiAKLQlmb3IgKGkgPSAwOyBpIDwgR1VDX01BWF9ET09SQkVM TFM7ICsraSkgewotCQkvKiBTa2lwIGlmIGRvb3JiZWxsIGlzIE9LICovCi0JCWlmIChndWNfZG9v cmJlbGxfY2hlY2soZ3VjLCBpKSkKKwlmb3IgKGkgPSAwOyBpIDwgR1VDX05VTV9ET09SQkVMTFM7 ICsraSkgeworCQlpZiAoZG9vcmJlbGxfb2soZ3VjLCBpKSkKIAkJCWNvbnRpbnVlOwogCi0JCWVy ciA9IGd1Y191cGRhdGVfZG9vcmJlbGxfaWQoZ3VjLCBjbGllbnQsIGkpOwotCQlpZiAoZXJyKQot CQkJRFJNX0RFQlVHX0RSSVZFUigiRG9vcmJlbGwgJWQgdXBkYXRlIGZhaWxlZCwgZXJyICVkXG4i LAotCQkJCQlpLCBlcnIpOworCQllcnIgPSBfX3Jlc2V0X2Rvb3JiZWxsKGNsaWVudCwgaSk7CisJ CVdBUk4oZXJyLCAiRG9vcmJlbGwgJWQgcmVzZXQgZmFpbGVkLCBlcnIgJWRcbiIsIGksIGVycik7 CiAJfQogCi0JZGJfaWQgPSBzZWxlY3RfZG9vcmJlbGxfcmVnaXN0ZXIoZ3VjLCBjbGllbnQtPnBy aW9yaXR5KTsKLQlXQVJOX09OKGRiX2lkID09IEdVQ19JTlZBTElEX0RPT1JCRUxMX0lEKTsKKwkv KiBSZWFkIGJhY2sgJiB2ZXJpZnkgYWxsIGRvb3JiZWxsIHJlZ2lzdGVycyAqLworCWZvciAoaSA9 IDA7IGkgPCBHVUNfTlVNX0RPT1JCRUxMUzsgKytpKQorCQlXQVJOX09OKCFkb29yYmVsbF9vayhn dWMsIGkpKTsKIAotCWVyciA9IGd1Y191cGRhdGVfZG9vcmJlbGxfaWQoZ3VjLCBjbGllbnQsIGRi X2lkKTsKKwllcnIgPSBfX3Jlc2VydmVfZG9vcmJlbGwoY2xpZW50KTsKIAlpZiAoZXJyKQotCQlE Uk1fV0FSTigiRmFpbGVkIHRvIHJlc3RvcmUgZG9vcmJlbGwgdG8gJWQsIGVyciAlZFxuIiwKLQkJ CSBkYl9pZCwgZXJyKTsKKwkJcmV0dXJuIGVycjsKIAotCS8qIFJlYWQgYmFjayAmIHZlcmlmeSBh bGwgZG9vcmJlbGwgcmVnaXN0ZXJzICovCi0JZm9yIChpID0gMDsgaSA8IEdVQ19NQVhfRE9PUkJF TExTOyArK2kpCi0JCSh2b2lkKWd1Y19kb29yYmVsbF9jaGVjayhndWMsIGkpOworCWVyciA9IF9f dXBkYXRlX2Rvb3JiZWxsX2Rlc2MoY2xpZW50LCBjbGllbnQtPmRvb3JiZWxsX2lkKTsKKwlpZiAo ZXJyKQorCQlnb3RvIGVycl9yZXNlcnZlOworCisJZXJyID0gX19jcmVhdGVfZG9vcmJlbGwoY2xp ZW50KTsKKwlpZiAoZXJyKQorCQlnb3RvIGVycl91cGRhdGU7CisKKwlyZXR1cm4gMDsKK2Vycl9y ZXNlcnZlOgorCV9fdW5yZXNlcnZlX2Rvb3JiZWxsKGNsaWVudCk7CitlcnJfdXBkYXRlOgorCV9f dXBkYXRlX2Rvb3JiZWxsX2Rlc2MoY2xpZW50LCBHVUNfRE9PUkJFTExfSU5WQUxJRCk7CisJcmV0 dXJuIGVycjsKIH0KIAogLyoqCkBAIC04MDcsNDkgKzg1Myw0NiBAQCBzdGF0aWMgdm9pZCBndWNf aW5pdF9kb29yYmVsbF9odyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJc3RydWN0IGludGVsX2d1 YyAqZ3VjID0gJmRldl9wcml2LT5ndWM7CiAJc3RydWN0IGk5MTVfdm1hICp2bWE7CiAJdm9pZCAq dmFkZHI7Ci0JdWludDE2X3QgZGJfaWQ7CisJaW50IHJldDsKIAogCWNsaWVudCA9IGt6YWxsb2Mo c2l6ZW9mKCpjbGllbnQpLCBHRlBfS0VSTkVMKTsKIAlpZiAoIWNsaWVudCkKLQkJcmV0dXJuIE5V TEw7CisJCXJldHVybiBFUlJfUFRSKC1FTk9NRU0pOwogCi0JY2xpZW50LT5vd25lciA9IGN0eDsK IAljbGllbnQtPmd1YyA9IGd1YzsKKwljbGllbnQtPm93bmVyID0gY3R4OwogCWNsaWVudC0+ZW5n aW5lcyA9IGVuZ2luZXM7CiAJY2xpZW50LT5wcmlvcml0eSA9IHByaW9yaXR5OwotCWNsaWVudC0+ ZG9vcmJlbGxfaWQgPSBHVUNfSU5WQUxJRF9ET09SQkVMTF9JRDsKKwljbGllbnQtPmRvb3JiZWxs X2lkID0gR1VDX0RPT1JCRUxMX0lOVkFMSUQ7CisJY2xpZW50LT53cV9vZmZzZXQgPSBHVUNfREJf U0laRTsKKwljbGllbnQtPndxX3NpemUgPSBHVUNfV1FfU0laRTsKKwlzcGluX2xvY2tfaW5pdCgm Y2xpZW50LT53cV9sb2NrKTsKIAotCWNsaWVudC0+Y3R4X2luZGV4ID0gKHVpbnQzMl90KWlkYV9z aW1wbGVfZ2V0KCZndWMtPmN0eF9pZHMsIDAsCi0JCQlHVUNfTUFYX0dQVV9DT05URVhUUywgR0ZQ X0tFUk5FTCk7Ci0JaWYgKGNsaWVudC0+Y3R4X2luZGV4ID49IEdVQ19NQVhfR1BVX0NPTlRFWFRT KSB7Ci0JCWNsaWVudC0+Y3R4X2luZGV4ID0gR1VDX0lOVkFMSURfQ1RYX0lEOwotCQlnb3RvIGVy cjsKLQl9CisJcmV0ID0gaWRhX3NpbXBsZV9nZXQoJmd1Yy0+Y3R4X2lkcywgMCwgR1VDX01BWF9H UFVfQ09OVEVYVFMsCisJCQkJR0ZQX0tFUk5FTCk7CisJaWYgKHJldCA8IDApCisJCWdvdG8gZXJy X2NsaWVudDsKKworCWNsaWVudC0+Y3R4X2luZGV4ID0gcmV0OwogCiAJLyogVGhlIGZpcnN0IHBh Z2UgaXMgZG9vcmJlbGwvcHJvY19kZXNjLiBUd28gZm9sbG93ZWQgcGFnZXMgYXJlIHdxLiAqLwog CXZtYSA9IGludGVsX2d1Y19hbGxvY2F0ZV92bWEoZ3VjLCBHVUNfREJfU0laRSArIEdVQ19XUV9T SVpFKTsKLQlpZiAoSVNfRVJSKHZtYSkpCi0JCWdvdG8gZXJyOworCWlmIChJU19FUlIodm1hKSkg eworCQlyZXQgPSBQVFJfRVJSKHZtYSk7CisJCWdvdG8gZXJyX2lkOworCX0KIAogCS8qIFdlJ2xs IGtlZXAganVzdCB0aGUgZmlyc3QgKGRvb3JiZWxsL3Byb2MpIHBhZ2UgcGVybWFuZW50bHkga21h cCdkLiAqLwogCWNsaWVudC0+dm1hID0gdm1hOwogCiAJdmFkZHIgPSBpOTE1X2dlbV9vYmplY3Rf cGluX21hcCh2bWEtPm9iaiwgSTkxNV9NQVBfV0IpOwotCWlmIChJU19FUlIodmFkZHIpKQotCQln b3RvIGVycjsKLQorCWlmIChJU19FUlIodmFkZHIpKSB7CisJCXJldCA9IFBUUl9FUlIodmFkZHIp OworCQlnb3RvIGVycl92bWE7CisJfQogCWNsaWVudC0+dmFkZHIgPSB2YWRkcjsKIAotCXNwaW5f bG9ja19pbml0KCZjbGllbnQtPndxX2xvY2spOwotCWNsaWVudC0+d3Ffb2Zmc2V0ID0gR1VDX0RC X1NJWkU7Ci0JY2xpZW50LT53cV9zaXplID0gR1VDX1dRX1NJWkU7Ci0KLQlkYl9pZCA9IHNlbGVj dF9kb29yYmVsbF9yZWdpc3RlcihndWMsIGNsaWVudC0+cHJpb3JpdHkpOwotCWlmIChkYl9pZCA9 PSBHVUNfSU5WQUxJRF9ET09SQkVMTF9JRCkKLQkJLyogWFhYOiBldmljdCBhIGRvb3JiZWxsIGlu c3RlYWQ/ICovCi0JCWdvdG8gZXJyOwotCi0JY2xpZW50LT5kb29yYmVsbF9vZmZzZXQgPSBzZWxl Y3RfZG9vcmJlbGxfY2FjaGVsaW5lKGd1Yyk7CisJY2xpZW50LT5kb29yYmVsbF9vZmZzZXQgPSBf X3NlbGVjdF9jYWNoZWxpbmUoZ3VjKTsKIAogCS8qCiAJICogU2luY2UgdGhlIGRvb3JiZWxsIG9u bHkgcmVxdWlyZXMgYSBzaW5nbGUgY2FjaGVsaW5lLCB3ZSBjYW4gc2F2ZQpAQCAtODY0LDI3ICs5 MDcsMjggQEAgc3RhdGljIHZvaWQgZ3VjX2luaXRfZG9vcmJlbGxfaHcoc3RydWN0IGludGVsX2d1 YyAqZ3VjKQogCWd1Y19wcm9jX2Rlc2NfaW5pdChndWMsIGNsaWVudCk7CiAJZ3VjX2N0eF9kZXNj X2luaXQoZ3VjLCBjbGllbnQpOwogCi0JLyogRm9yIHJ1bnRpbWUgY2xpZW50IGFsbG9jYXRpb24g d2UgbmVlZCB0byBlbmFibGUgdGhlIGRvb3JiZWxsLiBOb3QKLQkgKiByZXF1aXJlZCB5ZXQgZm9y IHRoZSBzdGF0aWMgZXhlY2J1Zl9jbGllbnQgYXMgdGhpcyBzcGVjaWFsIGtlcm5lbAotCSAqIGNs aWVudCBpcyBlbmFibGVkIGZyb20gaTkxNV9ndWNfc3VibWlzc2lvbl9lbmFibGUoKS4KLQkgKgot CSAqIGd1Y191cGRhdGVfZG9vcmJlbGxfaWQoZ3VjLCBjbGllbnQsIGRiX2lkKTsKLQkgKi8KKwkv KiBGSVhNRTogUnVudGltZSBjbGllbnQgYWxsb2NhdGlvbiAod2hpY2ggY3VycmVudGx5IHdlIGRv bid0IGRvKSB3aWxsCisJICogcmVxdWlyZSB0aGF0IHRoZSBkb29yYmVsbCBnZXRzIGNyZWF0ZWQg bm93LiBUaGUgc3RhdGljIGV4ZWNidWZfY2xpZW50CisJICogaXMgbm93IGdldHRpbmcgaXRzIGRv b3JiZWxsIGxhdGVyIChvbiBzdWJtaXNzaW9uIGVuYWJsZSkgYnV0IG1heWJlIHdlCisJICogYWxz byB3YW50IHRvIHJlb3JkZXIgdGhpbmdzIGluIHRoZSBmdXR1cmUgc28gdGhhdCB3ZSBkb24ndCBo YXZlIHRvCisJICogc3BlY2lhbCBjYXNlIHRoZSBkb29yYmVsbCBjcmVhdGlvbiAqLwogCiAJRFJN X0RFQlVHX0RSSVZFUigibmV3IHByaW9yaXR5ICV1IGNsaWVudCAlcCBmb3IgZW5naW5lKHMpIDB4 JXg6IGN0eF9pbmRleCAldVxuIiwKLQkJcHJpb3JpdHksIGNsaWVudCwgY2xpZW50LT5lbmdpbmVz LCBjbGllbnQtPmN0eF9pbmRleCk7Ci0JRFJNX0RFQlVHX0RSSVZFUigiZG9vcmJlbGwgaWQgJXUs IGNhY2hlbGluZSBvZmZzZXQgMHgleFxuIiwKLQkJY2xpZW50LT5kb29yYmVsbF9pZCwgY2xpZW50 LT5kb29yYmVsbF9vZmZzZXQpOworCQkJIHByaW9yaXR5LCBjbGllbnQsIGNsaWVudC0+ZW5naW5l cywgY2xpZW50LT5jdHhfaW5kZXgpOworCURSTV9ERUJVR19EUklWRVIoImRvb3JiZWxsIGlkICV1 LCBjYWNoZWxpbmUgb2Zmc2V0IDB4JWx4XG4iLAorCQkJIGNsaWVudC0+ZG9vcmJlbGxfaWQsIGNs aWVudC0+ZG9vcmJlbGxfb2Zmc2V0KTsKIAogCXJldHVybiBjbGllbnQ7CitlcnJfdm1hOgorCWk5 MTVfdm1hX3VucGluX2FuZF9yZWxlYXNlKCZjbGllbnQtPnZtYSk7CitlcnJfaWQ6CisJaWRhX3Np bXBsZV9yZW1vdmUoJmd1Yy0+Y3R4X2lkcywgY2xpZW50LT5jdHhfaW5kZXgpOworZXJyX2NsaWVu dDoKKwlrZnJlZShjbGllbnQpOwogCi1lcnI6Ci0JZ3VjX2NsaWVudF9mcmVlKGRldl9wcml2LCBj bGllbnQpOwotCXJldHVybiBOVUxMOworCXJldHVybiBFUlJfUFRSKHJldCk7CiB9CiAKLQotCiBz dGF0aWMgdm9pZCBndWNfcG9saWNpZXNfaW5pdChzdHJ1Y3QgZ3VjX3BvbGljaWVzICpwb2xpY2ll cykKIHsKIAlzdHJ1Y3QgZ3VjX3BvbGljeSAqcG9saWN5OwpAQCAtOTg1LDcgKzEwMjksNyBAQCBp bnQgaTkxNV9ndWNfc3VibWlzc2lvbl9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIAkJcmV0dXJuIDA7CiAKIAkvKiBXaXBlIGJpdG1hcCAmIGRlbGV0ZSBjbGllbnQgaW4g Y2FzZSBvZiByZWluaXRpYWxpc2F0aW9uICovCi0JYml0bWFwX2NsZWFyKGd1Yy0+ZG9vcmJlbGxf Yml0bWFwLCAwLCBHVUNfTUFYX0RPT1JCRUxMUyk7CisJYml0bWFwX2NsZWFyKGd1Yy0+ZG9vcmJl bGxfYml0bWFwLCAwLCBHVUNfTlVNX0RPT1JCRUxMUyk7CiAJaTkxNV9ndWNfc3VibWlzc2lvbl9k aXNhYmxlKGRldl9wcml2KTsKIAogCWlmICghaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pCkBA IC0xMDA3LDcgKzEwNTEsNyBAQCBpbnQgaTkxNV9ndWNfc3VibWlzc2lvbl9pbml0KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJCQkJICAgICAgIElOVEVMX0lORk8oZGV2X3By aXYpLT5yaW5nX21hc2ssCiAJCQkJCSAgICAgICBHVUNfQ1RYX1BSSU9SSVRZX0tNRF9OT1JNQUws CiAJCQkJCSAgICAgICBkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQpOwotCWlmICghZ3VjLT5leGVj YnVmX2NsaWVudCkgeworCWlmIChJU19FUlIoZ3VjLT5leGVjYnVmX2NsaWVudCkpIHsKIAkJRFJN X0VSUk9SKCJGYWlsZWQgdG8gY3JlYXRlIEd1QyBjbGllbnQgZm9yIGV4ZWNidWYhXG4iKTsKIAkJ Z290byBlcnI7CiAJfQpAQCAtMTA3OCwxNCArMTEyMiwxOSBAQCBpbnQgaTkxNV9ndWNfc3VibWlz c2lvbl9lbmFibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCXN0cnVjdCBp OTE1X2d1Y19jbGllbnQgKmNsaWVudCA9IGd1Yy0+ZXhlY2J1Zl9jbGllbnQ7CiAJc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOworCWludCBl cnI7CiAKIAlpZiAoIWNsaWVudCkKIAkJcmV0dXJuIC1FTk9ERVY7CiAKLQlpbnRlbF9ndWNfc2Ft cGxlX2ZvcmNld2FrZShndWMpOworCWVyciA9IGludGVsX2d1Y19zYW1wbGVfZm9yY2V3YWtlKGd1 Yyk7CisJaWYgKGVycikKKwkJcmV0dXJuIGVycjsKIAogCWd1Y19yZXNldF93cShjbGllbnQpOwot CWd1Y19pbml0X2Rvb3JiZWxsX2h3KGd1Yyk7CisJZXJyID0gZ3VjX2luaXRfZG9vcmJlbGxfaHco Z3VjKTsKKwlpZiAoZXJyKQorCQlyZXR1cm4gZXJyOwogCiAJLyogVGFrZSBvdmVyIGZyb20gbWFu dWFsIGNvbnRyb2wgb2YgRUxTUCAoZXhlY2xpc3RzKSAqLwogCWd1Y19pbnRlcnJ1cHRzX2NhcHR1 cmUoZGV2X3ByaXYpOwpAQCAtMTE0Nyw2ICsxMTk2LDExIEBAIHZvaWQgaTkxNV9ndWNfc3VibWlz c2lvbl9kaXNhYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpZiAoIWd1 Yy0+ZXhlY2J1Zl9jbGllbnQpCiAJCXJldHVybjsKIAorCS8qIEZJWE1FOiBpbiBtYW55IGNhc2Vz LCBieSB0aGUgdGltZSB3ZSBnZXQgaGVyZSB0aGUgR3VDIGhhcyBiZWVuCisJICogcmVzZXQsIHNv IHdlIGNhbm5vdCBkZXN0cm95IHRoZSBkb29yYmVsbCBwcm9wZXJseS4gSWdub3JlIHRoZQorCSAq IGVycm9yIG1lc3NhZ2UgZm9yIG5vdyAqLworCWRlc3Ryb3lfZG9vcmJlbGwoZ3VjLT5leGVjYnVm X2NsaWVudCk7CisKIAkvKiBSZXZlcnQgYmFjayB0byBtYW51YWwgRUxTUCBzdWJtaXNzaW9uICov CiAJaW50ZWxfZW5naW5lc19yZXNldF9kZWZhdWx0X3N1Ym1pc3Npb24oZGV2X3ByaXYpOwogfQpA QCAtMTE1NywxMCArMTIxMSw4IEBAIHZvaWQgaTkxNV9ndWNfc3VibWlzc2lvbl9maW5pKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpj bGllbnQ7CiAKIAljbGllbnQgPSBmZXRjaF9hbmRfemVybygmZ3VjLT5leGVjYnVmX2NsaWVudCk7 Ci0JaWYgKCFjbGllbnQpCi0JCXJldHVybjsKLQotCWd1Y19jbGllbnRfZnJlZShkZXZfcHJpdiwg Y2xpZW50KTsKKwlpZiAoY2xpZW50ICYmICFJU19FUlIoY2xpZW50KSkKKwkJZ3VjX2NsaWVudF9m cmVlKGNsaWVudCk7CiAKIAlpOTE1X3ZtYV91bnBpbl9hbmRfcmVsZWFzZSgmZ3VjLT5hZHNfdm1h KTsKIAlpOTE1X3ZtYV91bnBpbl9hbmRfcmVsZWFzZSgmZ3VjLT5sb2cudm1hKTsKQEAgLTEyMjIs NSArMTI3NCwzIEBAIGludCBpbnRlbF9ndWNfcmVzdW1lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIAogCXJldHVybiBpbnRlbF9ndWNfc2VuZChndWMsIGRhdGEsIEFSUkFZX1NJ WkUoZGF0YSkpOwogfQotCi0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2d1Y19md2lmLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oCmluZGV4 IDI1NjkxZjAuLjNhZThjZWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2d1Y19md2lmLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3aWYuaApA QCAtMjQxLDggKzI0MSw4IEBAIHN0cnVjdCBndWNfZG9vcmJlbGxfaW5mbyB7CiAJdTY0IHZhbHVl X3F3OwogfSBfX3BhY2tlZDsKIAotI2RlZmluZSBHVUNfTUFYX0RPT1JCRUxMUwkJMjU2Ci0jZGVm aW5lIEdVQ19JTlZBTElEX0RPT1JCRUxMX0lECQkoR1VDX01BWF9ET09SQkVMTFMpCisjZGVmaW5l IEdVQ19OVU1fRE9PUkJFTExTCTI1NgorI2RlZmluZSBHVUNfRE9PUkJFTExfSU5WQUxJRAkoR1VD X05VTV9ET09SQkVMTFMpCiAKICNkZWZpbmUgR1VDX0RCX1NJWkUJCQkoUEFHRV9TSVpFKQogI2Rl ZmluZSBHVUNfV1FfU0laRQkJCShQQUdFX1NJWkUgKiAyKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfdWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmgK aW5kZXggYTM1ZWRlZC4uYzNhMzg0MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfdWMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5oCkBAIC03Miwx MyArNzIsMTIgQEAgc3RydWN0IGk5MTVfZ3VjX2NsaWVudCB7CiAKIAl1aW50MzJfdCBlbmdpbmVz OwkJLyogYml0bWFwIG9mIChob3N0KSBlbmdpbmUgaWRzCSovCiAJdWludDMyX3QgcHJpb3JpdHk7 Ci0JdWludDMyX3QgY3R4X2luZGV4OworCXUzMiBjdHhfaW5kZXg7CiAJdWludDMyX3QgcHJvY19k ZXNjX29mZnNldDsKIAotCXVpbnQzMl90IGRvb3JiZWxsX29mZnNldDsKLQl1aW50MzJfdCBkb29y YmVsbF9jb29raWU7Ci0JdWludDE2X3QgZG9vcmJlbGxfaWQ7Ci0JdWludDE2X3QgcGFkZGluZ1sz XTsJCS8qIE1haW50YWluIGFsaWdubWVudAkJKi8KKwl1MTYgZG9vcmJlbGxfaWQ7CisJdW5zaWdu ZWQgbG9uZyBkb29yYmVsbF9vZmZzZXQ7CisJdTMyIGRvb3JiZWxsX2Nvb2tpZTsKIAogCXNwaW5s b2NrX3Qgd3FfbG9jazsKIAl1aW50MzJfdCB3cV9vZmZzZXQ7CkBAIC0xNTksNyArMTU4LDcgQEAg c3RydWN0IGludGVsX2d1YyB7CiAKIAlzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpleGVjYnVmX2Ns aWVudDsKIAotCURFQ0xBUkVfQklUTUFQKGRvb3JiZWxsX2JpdG1hcCwgR1VDX01BWF9ET09SQkVM TFMpOworCURFQ0xBUkVfQklUTUFQKGRvb3JiZWxsX2JpdG1hcCwgR1VDX05VTV9ET09SQkVMTFMp OwogCXVpbnQzMl90IGRiX2NhY2hlbGluZTsJCS8qIEN5Y2xpYyBjb3VudGVyIG1vZCBwYWdlc2l6 ZQkqLwogCiAJLyogQWN0aW9uIHN0YXR1cyAmIHN0YXRpc3RpY3MgKi8KLS0gCjEuOS4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK