From: Oscar Mateo Subject: [09/11] drm/i915/guc: A little bit more of doorbell sanitization Date: Fri, 10 Mar 2017 08:28:56 -0800 Message-ID: <1489163337-36080-10-git-send-email-oscar.mateo@intel.com> References: <1489163337-36080-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id C91E26E2FB for ; Sat, 11 Mar 2017 00:28:49 +0000 (UTC) In-Reply-To: <1489163337-36080-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 U29tZSByZWNlbnQgcmVmYWN0b3JpbmcgcGF0Y2hlcyBoYXZlIGxlZnQgdGhlIGRvb3JiZWxsIGNy ZWF0aW9uIG91dHNpZGUKdGhlIEd1QyBjbGllbnQgYWxsb2NhdGlvbiwgd2hpY2ggZG9lcyBub3Qg bWFrZSBhIGxvdCBvZiBzZW5zZSAoYSBjbGllbnQKd2l0aG91dCBhIGRvb3JiZWxsIGlzIHNvbWV0 aGluZyB1c2VsZXNzKS4gTW92ZSBpdCBiYWNrIHRoZXJlLCBhbmQKcmVmYWN0b3IgdGhlIGluaXRf ZG9vcmJlbGxfaHcgY29uc2VxdWVudGx5LgoKVGhhbmtzIHRvIHRoaXMsIHdlIGNhbiBkbyBzb21l IG90aGVyIGltcHJvdmVtZW50cywgbGlrZSBob2lzdGluZyB0aGUKY2hlY2sgZm9yIEd1QyBzdWJt aXNzaW9uIGVuYWJsZWQgb3V0IG9mIHRoZSBlbmFibGUgZnVuY3Rpb24uCgpDYzogSm9vbmFzIExh aHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpDYzogTWljaGFsIFdhamRl Y3prbyA8bWljaGFsLndhamRlY3prb0BpbnRlbC5jb20+CkNjOiBBcmthZGl1c3ogSGlsZXIgPGFy a2FkaXVzei5oaWxlckBpbnRlbC5jb20+CkNjOiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3Vs aW5AaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ CkNjOiBEYW5pZWxlIENlcmFvbG8gU3B1cmlvIDxkYW5pZWxlLmNlcmFvbG9zcHVyaW9AaW50ZWwu Y29tPgpTaWduZWQtb2ZmLWJ5OiBPc2NhciBNYXRlbyA8b3NjYXIubWF0ZW9AaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgICAgICAgICAgICB8ICAgMyArLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIHwgMjI4ICsrKysrKysr KysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9h ZGVyLmMgICAgfCAgMjIgKystCiAzIGZpbGVzIGNoYW5nZWQsIDE0MyBpbnNlcnRpb25zKCspLCAx MTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggMzMyOTUwNy4uOGYw ZTU2OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC01NDksOCArNTQ5LDcgQEAgc3RhdGlj IGJvb2wgaTkxNV9zd2l0Y2hlcm9vX2Nhbl9zd2l0Y2goc3RydWN0IHBjaV9kZXYgKnBkZXYpCiBz dGF0aWMgdm9pZCBpOTE1X2dlbV9maW5pKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIHsKIAltdXRleF9sb2NrKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7Ci0JaWYgKGk5 MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uKQotCQlpbnRlbF9ndWNfY2xlYW51cChkZXZfcHJpdik7 CisJaW50ZWxfZ3VjX2NsZWFudXAoZGV2X3ByaXYpOwogCWk5MTVfZ2VtX2NsZWFudXBfZW5naW5l cyhkZXZfcHJpdik7CiAJaTkxNV9nZW1fY29udGV4dF9maW5pKGRldl9wcml2KTsKIAltdXRleF91 bmxvY2soJmRldl9wcml2LT5kcm0uc3RydWN0X211dGV4KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCBlYjY3N2Q1Li5hOTEyZWM0IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC0xNjMsMTUgKzE2MywxMyBA QCBzdGF0aWMgc3RydWN0IGd1Y19jb250ZXh0X2Rlc2MgKl9fZ2V0X2NvbnRleHRfZGVzYyhzdHJ1 Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbgogICogY2xpZW50IG9iamVjdCB3aGljaCBjb250YWlu cyB0aGUgcGFnZSBiZWluZyB1c2VkIGZvciB0aGUgZG9vcmJlbGwKICAqLwogCi1zdGF0aWMgaW50 IF9fdXBkYXRlX2Rvb3JiZWxsX2Rlc2Moc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50LCB1 MTYgbmV3X2lkKQorc3RhdGljIHZvaWQgX191cGRhdGVfZG9vcmJlbGxfZGVzYyhzdHJ1Y3QgaTkx NV9ndWNfY2xpZW50ICpjbGllbnQsIHUxNiBuZXdfaWQpCiB7CiAJc3RydWN0IGd1Y19jb250ZXh0 X2Rlc2MgKmRlc2M7CiAKIAkvKiBVcGRhdGUgdGhlIEd1QydzIGlkZWEgb2YgdGhlIGRvb3JiZWxs IElEICovCiAJZGVzYyA9IF9fZ2V0X2NvbnRleHRfZGVzYyhjbGllbnQpOwogCWRlc2MtPmRiX2lk ID0gbmV3X2lkOwotCi0JcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyBzdHJ1Y3QgZ3VjX2Rvb3JiZWxs X2luZm8gKl9fZ2V0X2Rvb3JiZWxsKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCkKQEAg LTIyNSw2ICsyMjMsMjggQEAgc3RhdGljIGludCBfX2Rlc3Ryb3lfZG9vcmJlbGwoc3RydWN0IGk5 MTVfZ3VjX2NsaWVudCAqY2xpZW50KQogCXJldHVybiBfX2d1Y19kZWFsbG9jYXRlX2Rvb3JiZWxs KGNsaWVudC0+Z3VjLCBjbGllbnQtPmN0eF9pbmRleCk7CiB9CiAKK3N0YXRpYyBpbnQgY3JlYXRl X2Rvb3JiZWxsKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCkKK3sKKwlpbnQgcmV0Owor CisJcmV0ID0gX19yZXNlcnZlX2Rvb3JiZWxsKGNsaWVudCk7CisJaWYgKHJldCkKKwkJcmV0dXJu IHJldDsKKworCV9fdXBkYXRlX2Rvb3JiZWxsX2Rlc2MoY2xpZW50LCBjbGllbnQtPmRvb3JiZWxs X2lkKTsKKworCXJldCA9IF9fY3JlYXRlX2Rvb3JiZWxsKGNsaWVudCk7CisJaWYgKHJldCkKKwkJ Z290byBlcnI7CisKKwlyZXR1cm4gMDsKKworZXJyOgorCV9fdXBkYXRlX2Rvb3JiZWxsX2Rlc2Mo Y2xpZW50LCBHVUNfRE9PUkJFTExfSU5WQUxJRCk7CisJX191bnJlc2VydmVfZG9vcmJlbGwoY2xp ZW50KTsKKwlyZXR1cm4gcmV0OworfQorCiBzdGF0aWMgaW50IGRlc3Ryb3lfZG9vcmJlbGwoc3Ry dWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50KQogewogCWludCBlcnI7CkBAIC00OTUsNiArNTE1 LDE3IEBAIHN0YXRpYyB2b2lkIGd1Y193cV9pdGVtX2FwcGVuZChzdHJ1Y3QgaTkxNV9ndWNfY2xp ZW50ICpjbGllbnQsCiAJd3FpLT5mZW5jZV9pZCA9IHJxLT5nbG9iYWxfc2Vxbm87CiB9CiAKK3N0 YXRpYyB2b2lkIGd1Y19yZXNldF93cShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQpCit7 CisJc3RydWN0IGd1Y19wcm9jZXNzX2Rlc2MgKmRlc2MgPSBjbGllbnQtPnZhZGRyICsKKwkJCQkJ Y2xpZW50LT5wcm9jX2Rlc2Nfb2Zmc2V0OworCisJZGVzYy0+aGVhZCA9IDA7CisJZGVzYy0+dGFp bCA9IDA7CisKKwljbGllbnQtPndxX3RhaWwgPSAwOworfQorCiBzdGF0aWMgaW50IGd1Y19yaW5n X2Rvb3JiZWxsKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCkKIHsKIAlzdHJ1Y3QgZ3Vj X3Byb2Nlc3NfZGVzYyAqZGVzYzsKQEAgLTY1MSwxOSArNjgyLDYgQEAgc3RydWN0IGk5MTVfdm1h ICppbnRlbF9ndWNfYWxsb2NhdGVfdm1hKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywgdTMyIHNpemUp CiAJcmV0dXJuIHZtYTsKIH0KIAotc3RhdGljIHZvaWQgZ3VjX2NsaWVudF9mcmVlKHN0cnVjdCBp OTE1X2d1Y19jbGllbnQgKmNsaWVudCkKLXsKLQkvKgotCSAqIFhYWDogd2FpdCBmb3IgYW55IG91 dHN0YW5kaW5nIHN1Ym1pc3Npb25zIGJlZm9yZSBmcmVlaW5nIG1lbW9yeS4KLQkgKiBCZSBzdXJl IHRvIGRyb3AgYW55IGxvY2tzCi0JICovCi0JZ3VjX2N0eF9kZXNjX2ZpbmkoY2xpZW50LT5ndWMs IGNsaWVudCk7Ci0JaTkxNV9nZW1fb2JqZWN0X3VucGluX21hcChjbGllbnQtPnZtYS0+b2JqKTsK LQlpOTE1X3ZtYV91bnBpbl9hbmRfcmVsZWFzZSgmY2xpZW50LT52bWEpOwotCWlkYV9zaW1wbGVf cmVtb3ZlKCZjbGllbnQtPmd1Yy0+Y3R4X2lkcywgY2xpZW50LT5jdHhfaW5kZXgpOwotCWtmcmVl KGNsaWVudCk7Ci19Ci0KIC8qIENoZWNrIHRoYXQgYSBkb29yYmVsbCByZWdpc3RlciBpcyBpbiB0 aGUgZXhwZWN0ZWQgc3RhdGUgKi8KIHN0YXRpYyBib29sIGRvb3JiZWxsX29rKHN0cnVjdCBpbnRl bF9ndWMgKmd1YywgdTE2IGRiX2lkKQogewpAQCAtNjg5LDkgKzcwNyw4IEBAIHN0YXRpYyBpbnQg X19yZXNldF9kb29yYmVsbChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50KiBjbGllbnQsIHUxNiBkYl9p ZCkKIHsKIAlpbnQgZXJyOwogCi0JZXJyID0gX191cGRhdGVfZG9vcmJlbGxfZGVzYyhjbGllbnQs IGRiX2lkKTsKLQlpZiAoIWVycikKLQkJZXJyID0gX19jcmVhdGVfZG9vcmJlbGwoY2xpZW50KTsK KwlfX3VwZGF0ZV9kb29yYmVsbF9kZXNjKGNsaWVudCwgZGJfaWQpOworCWVyciA9IF9fY3JlYXRl X2Rvb3JiZWxsKGNsaWVudCk7CiAJaWYgKCFlcnIpCiAJCWVyciA9IF9fZGVzdHJveV9kb29yYmVs bChjbGllbnQpOwogCkBAIC02OTksNDggKzcxNiw2MSBAQCBzdGF0aWMgaW50IF9fcmVzZXRfZG9v cmJlbGwoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCogY2xpZW50LCB1MTYgZGJfaWQpCiB9CiAKIC8q Ci0gKiBCb3Jyb3cgdGhlIGZpcnN0IGNsaWVudCB0byBzZXQgdXAgJiB0ZWFyIGRvd24gZWFjaCB1 bnVzZWQgZG9vcmJlbGwKLSAqIGluIHR1cm4sIHRvIGVuc3VyZSB0aGF0IGFsbCBkb29yYmVsbCBo L3cgaXMgKHJlKWluaXRpYWxpc2VkLgorICogU2V0IHVwICYgdGVhciBkb3duIGVhY2ggdW51c2Vk IGRvb3JiZWxsIGluIHR1cm4sIHRvIGVuc3VyZSB0aGF0IGFsbCBkb29yYmVsbAorICogSFcgaXMg KHJlKWluaXRpYWxpc2VkLiBGb3IgdGhhdCBlbmQsIHdlIG1pZ2h0IGhhdmUgdG8gYm9ycm93IHRo ZSBmaXJzdAorICogY2xpZW50LiBBbHNvLCB0ZWxsIEd1QyBhYm91dCBhbGwgdGhlIGRvb3JiZWxs cyBpbiB1c2UgYnkgYWxsIGNsaWVudHMuCisgKiBXZSBkbyB0aGlzIGJlY2F1c2UgdGhlIEtNRCwg dGhlIEd1QyBhbmQgdGhlIGRvb3JiZWxsIEhXIGNhbiBlYXNpbHkgZ28gb3V0IG9mCisgKiBzeW5j IChlLmcuIHdlIGNhbiByZXNldCB0aGUgR3VDLCBidXQgbm90IHRoZSBkb29yYmVsIEhXKS4KICAq Lwogc3RhdGljIGludCBndWNfaW5pdF9kb29yYmVsbF9odyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMp CiB7CiAJc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50ID0gZ3VjLT5leGVjYnVmX2NsaWVu dDsKLQlpbnQgZXJyOwotCWludCBpOwotCi0JaWYgKGhhc19kb29yYmVsbChjbGllbnQpKQotCQlk ZXN0cm95X2Rvb3JiZWxsKGNsaWVudCk7CisJYm9vbCByZWNyZWF0ZV9maXJzdF9jbGllbnQgPSBm YWxzZTsKKwl1MTYgZGJfaWQ7CisJaW50IHJldDsKIAotCWZvciAoaSA9IDA7IGkgPCBHVUNfTlVN X0RPT1JCRUxMUzsgKytpKSB7Ci0JCWlmIChkb29yYmVsbF9vayhndWMsIGkpKQorCS8qIEZvciB1 bnVzZWQgZG9vcmJlbGxzLCBtYWtlIHN1cmUgdGhleSBhcmUgZGlzYWJsZWQgKi8KKwlmb3JfZWFj aF9jbGVhcl9iaXQoZGJfaWQsIGd1Yy0+ZG9vcmJlbGxfYml0bWFwLCBHVUNfTlVNX0RPT1JCRUxM UykgeworCQlpZiAoZG9vcmJlbGxfb2soZ3VjLCBkYl9pZCkpCiAJCQljb250aW51ZTsKIAotCQll cnIgPSBfX3Jlc2V0X2Rvb3JiZWxsKGNsaWVudCwgaSk7Ci0JCVdBUk4oZXJyLCAiRG9vcmJlbGwg JWQgcmVzZXQgZmFpbGVkLCBlcnIgJWRcbiIsIGksIGVycik7CisJCWlmIChoYXNfZG9vcmJlbGwo Y2xpZW50KSkgeworCQkJLyogQm9ycm93IGV4ZWNidWZfY2xpZW50ICh3ZSB3aWxsIHJlY3JlYXRl IGl0IGxhdGVyKSAqLworCQkJZGVzdHJveV9kb29yYmVsbChjbGllbnQpOworCQkJcmVjcmVhdGVf Zmlyc3RfY2xpZW50ID0gdHJ1ZTsKKwkJfQorCisJCXJldCA9IF9fcmVzZXRfZG9vcmJlbGwoY2xp ZW50LCBkYl9pZCk7CisJCVdBUk4ocmV0LCAiRG9vcmJlbGwgJXUgcmVzZXQgZmFpbGVkLCBlcnIg JWRcbiIsIGRiX2lkLCByZXQpOwogCX0KIAotCS8qIFJlYWQgYmFjayAmIHZlcmlmeSBhbGwgZG9v cmJlbGwgcmVnaXN0ZXJzICovCi0JZm9yIChpID0gMDsgaSA8IEdVQ19OVU1fRE9PUkJFTExTOyAr K2kpCi0JCVdBUk5fT04oIWRvb3JiZWxsX29rKGd1YywgaSkpOworCWlmIChyZWNyZWF0ZV9maXJz dF9jbGllbnQpIHsKKwkJcmV0ID0gX19yZXNlcnZlX2Rvb3JiZWxsKGNsaWVudCk7CisJCWlmICh1 bmxpa2VseShyZXQpKSB7CisJCQlEUk1fRVJST1IoIkNvdWxkbid0IHJlLXJlc2VydmUgZmlyc3Qg Y2xpZW50IGRiOiAlZFxuIiwgcmV0KTsKKwkJCXJldHVybiByZXQ7CisJCX0KIAotCWVyciA9IF9f cmVzZXJ2ZV9kb29yYmVsbChjbGllbnQpOwotCWlmIChlcnIpCi0JCXJldHVybiBlcnI7CisJCV9f dXBkYXRlX2Rvb3JiZWxsX2Rlc2MoY2xpZW50LCBjbGllbnQtPmRvb3JiZWxsX2lkKTsKKwl9CiAK LQllcnIgPSBfX3VwZGF0ZV9kb29yYmVsbF9kZXNjKGNsaWVudCwgY2xpZW50LT5kb29yYmVsbF9p ZCk7Ci0JaWYgKGVycikKLQkJZ290byBlcnJfcmVzZXJ2ZTsKKwkvKiBOb3cgZm9yIGV2ZXJ5IGNs aWVudCAoYW5kIG5vdCBvbmx5IGV4ZWNidWZfY2xpZW50KSBtYWtlIHN1cmUgdGhlaXIKKwkgKiBk b29yYmVsbHMgYXJlIGtub3duIGJ5IHRoZSBHdUMgKi8KKwkvL2ZvciAoY2xpZW50ID0gY2xpZW50 X2xpc3Q7IGNsaWVudCAhPSBOVUxMOyBjbGllbnQgPSBjbGllbnQtPm5leHQpCisJeworCQlyZXQg PSBfX2NyZWF0ZV9kb29yYmVsbChjbGllbnQpOworCQlpZiAocmV0KSB7CisJCQlEUk1fRVJST1Io IkNvdWxkbid0IHJlY3JlYXRlIGNsaWVudCAldSBkb29yYmVsbDogJWRcbiIsCisJCQkJY2xpZW50 LT5jdHhfaW5kZXgsIHJldCk7CisJCQlyZXR1cm4gcmV0OworCQl9CisJfQogCi0JZXJyID0gX19j cmVhdGVfZG9vcmJlbGwoY2xpZW50KTsKLQlpZiAoZXJyKQotCQlnb3RvIGVycl91cGRhdGU7CisJ LyogUmVhZCBiYWNrICYgdmVyaWZ5IGFsbCAodXNlZCAmIHVudXNlZCkgZG9vcmJlbGwgcmVnaXN0 ZXJzICovCisJZm9yIChkYl9pZCA9IDA7IGRiX2lkIDwgR1VDX05VTV9ET09SQkVMTFM7ICsrZGJf aWQpCisJCVdBUk5fT04oIWRvb3JiZWxsX29rKGd1YywgZGJfaWQpKTsKIAogCXJldHVybiAwOwot ZXJyX3Jlc2VydmU6Ci0JX191bnJlc2VydmVfZG9vcmJlbGwoY2xpZW50KTsKLWVycl91cGRhdGU6 Ci0JX191cGRhdGVfZG9vcmJlbGxfZGVzYyhjbGllbnQsIEdVQ19ET09SQkVMTF9JTlZBTElEKTsK LQlyZXR1cm4gZXJyOwogfQogCiAvKioKQEAgLTgyMCwxMSArODUwLDkgQEAgc3RhdGljIGludCBn dWNfaW5pdF9kb29yYmVsbF9odyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJZ3VjX3Byb2NfZGVz Y19pbml0KGd1YywgY2xpZW50KTsKIAlndWNfY3R4X2Rlc2NfaW5pdChndWMsIGNsaWVudCk7CiAK LQkvKiBGSVhNRTogUnVudGltZSBjbGllbnQgYWxsb2NhdGlvbiAod2hpY2ggY3VycmVudGx5IHdl IGRvbid0IGRvKSB3aWxsCi0JICogcmVxdWlyZSB0aGF0IHRoZSBkb29yYmVsbCBnZXRzIGNyZWF0 ZWQgbm93LiBUaGUgc3RhdGljIGV4ZWNidWZfY2xpZW50Ci0JICogaXMgbm93IGdldHRpbmcgaXRz IGRvb3JiZWxsIGxhdGVyIChvbiBzdWJtaXNzaW9uIGVuYWJsZSkgYnV0IG1heWJlIHdlCi0JICog YWxzbyB3YW50IHRvIHJlb3JkZXIgdGhpbmdzIGluIHRoZSBmdXR1cmUgc28gdGhhdCB3ZSBkb24n dCBoYXZlIHRvCi0JICogc3BlY2lhbCBjYXNlIHRoZSBkb29yYmVsbCBjcmVhdGlvbiAqLworCXJl dCA9IGNyZWF0ZV9kb29yYmVsbChjbGllbnQpOworCWlmIChyZXQpCisJCWdvdG8gZXJyX3ZhZGRy OwogCiAJRFJNX0RFQlVHX0RSSVZFUigibmV3IHByaW9yaXR5ICV1IGNsaWVudCAlcCBmb3IgZW5n aW5lKHMpIDB4JXg6IGN0eF9pbmRleCAldVxuIiwKIAkJCSBwcmlvcml0eSwgY2xpZW50LCBjbGll bnQtPmVuZ2luZXMsIGNsaWVudC0+Y3R4X2luZGV4KTsKQEAgLTgzMiw2ICs4NjAsOSBAQCBzdGF0 aWMgaW50IGd1Y19pbml0X2Rvb3JiZWxsX2h3KHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAkJCSBj bGllbnQtPmRvb3JiZWxsX2lkLCBjbGllbnQtPmRvb3JiZWxsX29mZnNldCk7CiAKIAlyZXR1cm4g Y2xpZW50OworCitlcnJfdmFkZHI6CisJaTkxNV9nZW1fb2JqZWN0X3VucGluX21hcChjbGllbnQt PnZtYS0+b2JqKTsKIGVycl92bWE6CiAJaTkxNV92bWFfdW5waW5fYW5kX3JlbGVhc2UoJmNsaWVu dC0+dm1hKTsKIGVycl9pZDoKQEAgLTg0MSw2ICs4NzIsMjQgQEAgc3RhdGljIGludCBndWNfaW5p dF9kb29yYmVsbF9odyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJcmV0dXJuIEVSUl9QVFIocmV0 KTsKIH0KIAorc3RhdGljIHZvaWQgZ3VjX2NsaWVudF9mcmVlKHN0cnVjdCBpOTE1X2d1Y19jbGll bnQgKmNsaWVudCkKK3sKKwkvKgorCSAqIFhYWDogd2FpdCBmb3IgYW55IG91dHN0YW5kaW5nIHN1 Ym1pc3Npb25zIGJlZm9yZSBmcmVlaW5nIG1lbW9yeS4KKwkgKiBCZSBzdXJlIHRvIGRyb3AgYW55 IGxvY2tzCisJICovCisKKwkvKiBGSVhNRTogaW4gbWFueSBjYXNlcywgYnkgdGhlIHRpbWUgd2Ug Z2V0IGhlcmUgdGhlIEd1QyBoYXMgYmVlbgorCSAqIHJlc2V0LCBzbyB3ZSBjYW5ub3QgZGVzdHJv eSB0aGUgZG9vcmJlbGwgcHJvcGVybHkuIElnbm9yZSB0aGUKKwkgKiBlcnJvciBtZXNzYWdlIGZv ciBub3cgKi8KKwlkZXN0cm95X2Rvb3JiZWxsKGNsaWVudCk7CisJZ3VjX2N0eF9kZXNjX2Zpbmko Y2xpZW50LT5ndWMsIGNsaWVudCk7CisJaTkxNV9nZW1fb2JqZWN0X3VucGluX21hcChjbGllbnQt PnZtYS0+b2JqKTsKKwlpOTE1X3ZtYV91bnBpbl9hbmRfcmVsZWFzZSgmY2xpZW50LT52bWEpOwor CWlkYV9zaW1wbGVfcmVtb3ZlKCZjbGllbnQtPmd1Yy0+Y3R4X2lkcywgY2xpZW50LT5jdHhfaW5k ZXgpOworCWtmcmVlKGNsaWVudCk7Cit9CisKIHN0YXRpYyB2b2lkIGd1Y19wb2xpY2llc19pbml0 KHN0cnVjdCBndWNfcG9saWNpZXMgKnBvbGljaWVzKQogewogCXN0cnVjdCBndWNfcG9saWN5ICpw b2xpY3k7CkBAIC05MzgsOCArOTg3LDggQEAgc3RhdGljIHZvaWQgZ3VjX2FkZG9uX2Rlc3Ryb3ko c3RydWN0IGludGVsX2d1YyAqZ3VjKQogfQogCiAvKgotICogU2V0IHVwIHRoZSBtZW1vcnkgcmVz b3VyY2VzIHRvIGJlIHNoYXJlZCB3aXRoIHRoZSBHdUMuICBBdCB0aGlzIHBvaW50LAotICogd2Ug cmVxdWlyZSBqdXN0IG9uZSBvYmplY3QgdGhhdCBjYW4gYmUgbWFwcGVkIHRocm91Z2ggdGhlIEdH VFQuCisgKiBTZXQgdXAgdGhlIG1lbW9yeSByZXNvdXJjZXMgdG8gYmUgc2hhcmVkIHdpdGggdGhl IEd1QyAodmlhIHRoZSBHR1RUKQorICogYXQgZmlybXdhcmUgbG9hZGluZyB0aW1lLgogICovCiBp bnQgaTkxNV9ndWNfc3VibWlzc2lvbl9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIHsKQEAgLTk1MSwxNiArMTAwMCw2IEBAIGludCBpOTE1X2d1Y19zdWJtaXNzaW9uX2lu aXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCXZvaWQgKnZhZGRyOwogCWlu dCByZXQ7CiAKLQlpZiAoIUhBU19HVUNfU0NIRUQoZGV2X3ByaXYpKQotCQlyZXR1cm4gMDsKLQot CS8qIFdpcGUgYml0bWFwICYgZGVsZXRlIGNsaWVudCBpbiBjYXNlIG9mIHJlaW5pdGlhbGlzYXRp b24gKi8KLQliaXRtYXBfY2xlYXIoZ3VjLT5kb29yYmVsbF9iaXRtYXAsIDAsIEdVQ19OVU1fRE9P UkJFTExTKTsKLQlpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoZGV2X3ByaXYpOwotCi0JaWYg KCFpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbikKLQkJcmV0dXJuIDA7Ci0KIAlpZiAoZ3VjLT5j dHhfcG9vbCkKIAkJcmV0dXJuIDA7CiAKQEAgLTk4OCwyMCArMTAyNyw4IEBAIGludCBpOTE1X2d1 Y19zdWJtaXNzaW9uX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJ aWRhX2luaXQoJmd1Yy0+Y3R4X2lkcyk7CiAKLQlndWMtPmV4ZWNidWZfY2xpZW50ID0gZ3VjX2Ns aWVudF9hbGxvYyhkZXZfcHJpdiwKLQkJCQkJICAgICAgIElOVEVMX0lORk8oZGV2X3ByaXYpLT5y aW5nX21hc2ssCi0JCQkJCSAgICAgICBHVUNfQ1RYX1BSSU9SSVRZX0tNRF9OT1JNQUwsCi0JCQkJ CSAgICAgICBkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQpOwotCWlmIChJU19FUlIoZ3VjLT5leGVj YnVmX2NsaWVudCkpIHsKLQkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gY3JlYXRlIEd1QyBjbGllbnQg Zm9yIGV4ZWNidWYhXG4iKTsKLQkJcmV0ID0gUFRSX0VSUihndWMtPmV4ZWNidWZfY2xpZW50KTsK LQkJZ290byBlcnJfYWRzOwotCX0KLQogCXJldHVybiAwOwogCi1lcnJfYWRzOgotCWd1Y19hZGRv bl9kZXN0cm95KGd1Yyk7CiBlcnJfbG9nOgogCWludGVsX2d1Y19sb2dfZGVzdHJveShndWMpOwog ZXJyX3ZhZGRyOgpAQCAtMTAxNSw4ICsxMDQyLDYgQEAgdm9pZCBpOTE1X2d1Y19zdWJtaXNzaW9u X2Zpbmkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXN0cnVjdCBpbnRl bF9ndWMgKmd1YyA9ICZkZXZfcHJpdi0+Z3VjOwogCi0JZ3VjX2NsaWVudF9mcmVlKGd1Yy0+ZXhl Y2J1Zl9jbGllbnQpOwotCWd1Yy0+ZXhlY2J1Zl9jbGllbnQgPSBOVUxMOwogCWlkYV9kZXN0cm95 KCZndWMtPmN0eF9pZHMpOwogCWd1Y19hZGRvbl9kZXN0cm95KGd1Yyk7CiAJaW50ZWxfZ3VjX2xv Z19kZXN0cm95KGd1Yyk7CkBAIC0xMDI0LDE3ICsxMDQ5LDYgQEAgdm9pZCBpOTE1X2d1Y19zdWJt aXNzaW9uX2Zpbmkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWk5MTVfdm1h X3VucGluX2FuZF9yZWxlYXNlKCZndWMtPmN0eF9wb29sKTsKIH0KIAotc3RhdGljIHZvaWQgZ3Vj X3Jlc2V0X3dxKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCkKLXsKLQlzdHJ1Y3QgZ3Vj X3Byb2Nlc3NfZGVzYyAqZGVzYyA9IGNsaWVudC0+dmFkZHIgKwotCQkJCQljbGllbnQtPnByb2Nf ZGVzY19vZmZzZXQ7Ci0KLQlkZXNjLT5oZWFkID0gMDsKLQlkZXNjLT50YWlsID0gMDsKLQotCWNs aWVudC0+d3FfdGFpbCA9IDA7Ci19Ci0KIHN0YXRpYyB2b2lkIGd1Y19pbnRlcnJ1cHRzX2NhcHR1 cmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZTsKQEAgLTEwNjMsMTcgKzEwNzcsMjggQEAgaW50IGk5MTVfZ3VjX3N1 Ym1pc3Npb25fZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAllbnVt IGludGVsX2VuZ2luZV9pZCBpZDsKIAlpbnQgZXJyOwogCi0JaWYgKCFjbGllbnQpCi0JCXJldHVy biAtRU5PREVWOworCWlmICghY2xpZW50KSB7CisJCWNsaWVudCA9IGd1Y19jbGllbnRfYWxsb2Mo ZGV2X3ByaXYsCisJCQkJCSAgSU5URUxfSU5GTyhkZXZfcHJpdiktPnJpbmdfbWFzaywKKwkJCQkJ ICBHVUNfQ1RYX1BSSU9SSVRZX0tNRF9OT1JNQUwsCisJCQkJCSAgZGV2X3ByaXYtPmtlcm5lbF9j b250ZXh0KTsKKwkJaWYgKElTX0VSUihjbGllbnQpKSB7CisJCQlEUk1fRVJST1IoIkZhaWxlZCB0 byBjcmVhdGUgR3VDIGNsaWVudCBmb3IgZXhlY2J1ZiFcbiIpOworCQkJcmV0dXJuIFBUUl9FUlIo Y2xpZW50KTsKKwkJfQorCisJCWd1Yy0+ZXhlY2J1Zl9jbGllbnQgPSBjbGllbnQ7CisJfQogCiAJ ZXJyID0gaW50ZWxfZ3VjX3NhbXBsZV9mb3JjZXdha2UoZ3VjKTsKIAlpZiAoZXJyKQotCQlyZXR1 cm4gZXJyOworCQlnb3RvIGVycl9leGVjYnVmX2NsaWVudDsKIAogCWd1Y19yZXNldF93cShjbGll bnQpOworCiAJZXJyID0gZ3VjX2luaXRfZG9vcmJlbGxfaHcoZ3VjKTsKIAlpZiAoZXJyKQotCQly ZXR1cm4gZXJyOworCQlnb3RvIGVycl9leGVjYnVmX2NsaWVudDsKIAogCS8qIFRha2Ugb3ZlciBm cm9tIG1hbnVhbCBjb250cm9sIG9mIEVMU1AgKGV4ZWNsaXN0cykgKi8KIAlmb3JfZWFjaF9lbmdp bmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpIHsKQEAgLTEwOTcsMjIgKzExMjIsMjIgQEAgaW50IGk5 MTVfZ3VjX3N1Ym1pc3Npb25fZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIAl9CiAKIAlyZXR1cm4gMDsKKworZXJyX2V4ZWNidWZfY2xpZW50OgorCWd1Y19jbGllbnRf ZnJlZShndWMtPmV4ZWNidWZfY2xpZW50KTsKKwlndWMtPmV4ZWNidWZfY2xpZW50ID0gTlVMTDsK KwlyZXR1cm4gZXJyOwogfQogCiB2b2lkIGk5MTVfZ3VjX3N1Ym1pc3Npb25fZGlzYWJsZShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0IGludGVsX2d1YyAqZ3Vj ID0gJmRldl9wcml2LT5ndWM7CiAKLQlpZiAoIWd1Yy0+ZXhlY2J1Zl9jbGllbnQpCi0JCXJldHVy bjsKLQotCS8qIEZJWE1FOiBpbiBtYW55IGNhc2VzLCBieSB0aGUgdGltZSB3ZSBnZXQgaGVyZSB0 aGUgR3VDIGhhcyBiZWVuCi0JICogcmVzZXQsIHNvIHdlIGNhbm5vdCBkZXN0cm95IHRoZSBkb29y YmVsbCBwcm9wZXJseS4gSWdub3JlIHRoZQotCSAqIGVycm9yIG1lc3NhZ2UgZm9yIG5vdyAqLwot CWRlc3Ryb3lfZG9vcmJlbGwoZ3VjLT5leGVjYnVmX2NsaWVudCk7Ci0KIAkvKiBSZXZlcnQgYmFj ayB0byBtYW51YWwgRUxTUCBzdWJtaXNzaW9uICovCiAJaW50ZWxfZXhlY2xpc3RzX2VuYWJsZV9z dWJtaXNzaW9uKGRldl9wcml2KTsKKworCWd1Y19jbGllbnRfZnJlZShndWMtPmV4ZWNidWZfY2xp ZW50KTsKKwlndWMtPmV4ZWNidWZfY2xpZW50ID0gTlVMTDsKIH0KIAogLyoqCkBAIC0xMTQxLDcg KzExNjYsNiBAQCBpbnQgaW50ZWxfZ3VjX3N1c3BlbmQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQogCXJldHVybiBpbnRlbF9ndWNfc2VuZChndWMsIGRhdGEsIEFSUkFZX1NJWkUo ZGF0YSkpOwogfQogCi0KIC8qKgogICogaW50ZWxfZ3VjX3Jlc3VtZSgpIC0gbm90aWZ5IEd1QyBy ZXN1bWluZyBmcm9tIHN1c3BlbmQgc3RhdGUKICAqIEBkZXZfcHJpdjoJaTkxNSBkZXZpY2UgcHJp dmF0ZQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IDNjNTk1Mjgu LjY0OWM0ZGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2Fk ZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKQEAgLTQ0 MSw5ICs0NDEsMTMgQEAgaW50IGludGVsX2d1Y19zZXR1cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiAJCWludGVsX3VjX2Z3X3N0YXR1c19yZXByKGd1Y19mdy0+ZmV0Y2hfc3Rh dHVzKSwKIAkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5sb2FkX3N0YXR1cykpOwog Ci0JZXJyID0gaTkxNV9ndWNfc3VibWlzc2lvbl9pbml0KGRldl9wcml2KTsKLQlpZiAoZXJyKQot CQlnb3RvIGVycl9ndWM7CisJaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uKSB7CisJCS8q IFRoaXMgaXMgc3R1ZmYgd2UgbmVlZCB0byBoYXZlIGF2YWlsYWJsZSBhdCBmdyBsb2FkIHRpbWUK KwkJICogaWYgd2UgYXJlIHBsYW5uaW5nIHRvIGVuYWJsZSBzdWJtaXNzaW9uIGxhdGVyICovCisJ CWVyciA9IGk5MTVfZ3VjX3N1Ym1pc3Npb25faW5pdChkZXZfcHJpdik7CisJCWlmIChlcnIpCisJ CQlnb3RvIGVycl9ndWM7CisJfQogCiAJLyoKIAkgKiBXYUVuYWJsZXVLZXJuZWxIZWFkZXJWYWxp ZEZpeDpza2wsYnh0CkBAIC00OTUsNyArNDk5LDggQEAgaW50IGludGVsX2d1Y19zZXR1cChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiBlcnJfaW50ZXJydXB0czoKIAlnZW45X2Rp c2FibGVfZ3VjX2ludGVycnVwdHMoZGV2X3ByaXYpOwogZXJyX3N1Ym1pc3Npb246Ci0JaTkxNV9n dWNfc3VibWlzc2lvbl9maW5pKGRldl9wcml2KTsKKwlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1p c3Npb24pCisJCWk5MTVfZ3VjX3N1Ym1pc3Npb25fZmluaShkZXZfcHJpdik7CiBlcnJfZ3VjOgog CWk5MTVfZ2d0dF9kaXNhYmxlX2d1YyhkZXZfcHJpdik7CiBmYWlsOgpAQCAtNTQzLDggKzU0OCwx MyBAQCBpbnQgaW50ZWxfZ3VjX3NldHVwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIAogdm9pZCBpbnRlbF9ndWNfY2xlYW51cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiB7Ci0JZ2VuOV9kaXNhYmxlX2d1Y19pbnRlcnJ1cHRzKGRldl9wcml2KTsKLQlpOTE1 X2d1Y19zdWJtaXNzaW9uX2ZpbmkoZGV2X3ByaXYpOworCWlmIChpOTE1LmVuYWJsZV9ndWNfc3Vi bWlzc2lvbikgeworCQlndWNfaW50ZXJydXB0c19yZWxlYXNlKGRldl9wcml2KTsKKwkJaTkxNV9n dWNfc3VibWlzc2lvbl9kaXNhYmxlKGRldl9wcml2KTsKKwkJZ2VuOV9kaXNhYmxlX2d1Y19pbnRl cnJ1cHRzKGRldl9wcml2KTsKKwkJaTkxNV9ndWNfc3VibWlzc2lvbl9maW5pKGRldl9wcml2KTsK Kwl9CisKIAlpOTE1X2dndHRfZGlzYWJsZV9ndWMoZGV2X3ByaXYpOwogfQogCi0tIAoxLjkuMQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==