From: Sagar Arun Kamble Subject: [PATCH 08/12] drm/i915: Add support for emitting execbuffer tags through OA counter reports Date: Mon, 31 Jul 2017 13:29:41 +0530 Message-ID: <1501487985-2017-9-git-send-email-sagar.a.kamble@intel.com> References: <1501487985-2017-1-git-send-email-sagar.a.kamble@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 67C1B6E524 for ; Mon, 31 Jul 2017 07:58:20 +0000 (UTC) In-Reply-To: <1501487985-2017-1-git-send-email-sagar.a.kamble@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 Cc: Sourab Gupta List-Id: intel-gfx@lists.freedesktop.org RnJvbTogU291cmFiIEd1cHRhIDxzb3VyYWIuZ3VwdGFAaW50ZWwuY29tPgoKVGhpcyBwYXRjaCBl bmFibGVzIHVzZXJzcGFjZSB0byBzcGVjaWZ5IHRhZ3MgKHBlciB3b3JrbG9hZCksIHByb3ZpZGVk IHZpYQpleGVjYnVmZmVyIGlvY3RsLCB3aGljaCBjb3VsZCBiZSBhZGRlZCB0byBPQSByZXBvcnRz LCB0byBoZWxwIGFzc29jaWF0ZQpyZXBvcnRzIHdpdGggdGhlIGNvcnJlc3BvbmRpbmcgd29ya2xv YWRzLgoKVGhlcmUgbWF5IGJlIG11bHRpcGxlIHN0YWdlcyB3aXRoaW4gYSBzaW5nbGUgY29udGV4 dCwgZnJvbSBhIHVzZXJzcGFjZQpwZXJzcGVjdGl2ZS4gQW4gYWJpbGl0eSBpcyBuZWVkZWQgdG8g aW5kaXZpZHVhbGx5IGFzc29jaWF0ZSB0aGUgT0EgcmVwb3J0cwp3aXRoIHRoZWlyIGNvcnJlc3Bv bmRpbmcgd29ya2xvYWRzKGV4ZWNidWZmZXJzKSwgd2hpY2ggbWF5IG5vdCBiZSBwb3NzaWJsZQpz b2xlbHkgd2l0aCBjdHhfaWQgb3IgcGlkIGluZm9ybWF0aW9uLiBUaGlzIHBhdGNoIGVuYWJsZXMg c3VjaCBhIG1lY2hhbmlzbS4KCkluIHRoaXMgcGF0Y2gsIHVwcGVyIDMyIGJpdHMgb2YgcnN2ZDEg ZmllbGQsIHdoaWNoIHdlcmUgcHJldmlvdXNseSB1bnVzZWQKYXJlIG5vdyBiZWluZyB1c2VkIHRv IHBhc3MgaW4gdGhlIHRhZy4KCnYyOiBVcGRhdGVkIGk5MTVfZXhlY2J1ZmZlcjJfZ2V0X3RhZyB0 byBnZXQgdGhlIHRhZyBwcm9wZXJseS4gKFNhZ2FyKQpDaGFuZ2VkIHRhZyBzaXplIHRvIDY0IGJp dCB0byBlbnN1cmUgYWxsIHNhbXBsZSBmaWVsZHMgYXJlIGFsaWduZWQgYXQgOApieXRlcy4gKExp b25lbCkKClNpZ25lZC1vZmYtYnk6IFNvdXJhYiBHdXB0YSA8c291cmFiLmd1cHRhQGludGVsLmNv bT4KU2lnbmVkLW9mZi1ieTogU2FnYXIgQXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxlQGludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAgfCAx OCArKysrKysrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVy LmMgfCAxMSArKysrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wZXJmLmMgICAgICAg ICAgIHwgNDEgKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tCiBpbmNsdWRlL3VhcGkvZHJt L2k5MTVfZHJtLmggICAgICAgICAgICAgICAgfCAxMiArKysrKysrKysKIDQgZmlsZXMgY2hhbmdl ZCwgNzEgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmgKaW5kZXggYjU2ZWEyMC4uYzRmNzQ2MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0x OTk2LDcgKzE5OTYsOCBAQCBzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbV9vcHMgewogCSAqLwogCXZv aWQgKCplbWl0X3NhbXBsZV9jYXB0dXJlKShzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFt LAogCQkJCSAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QsCi0JCQkJICAg IGJvb2wgcHJlYWxsb2NhdGUpOworCQkJCSAgICBib29sIHByZWFsbG9jYXRlLAorCQkJCSAgICB1 MzIgdGFnKTsKIH07CiAKIGVudW0gaTkxNV9wZXJmX3N0cmVhbV9zdGF0ZSB7CkBAIC0yMDgwLDYg KzIwODEsNyBAQCBzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSB7CiAKIAl1MzIgbGFzdF9jdHhfaWQ7 CiAJdTMyIGxhc3RfcGlkOworCXUzMiBsYXN0X3RhZzsKIH07CiAKIC8qKgpAQCAtMjE5Niw2ICsy MTk4LDE3IEBAIHN0cnVjdCBpOTE1X3BlcmZfY3Nfc2FtcGxlIHsKIAkgKiBzdWJtaXR0ZWQsIHBl cnRhaW5pbmcgdG8gdGhpcyBwZXJmIHNhbXBsZQogCSAqLwogCXUzMiBwaWQ7CisKKwkvKioKKwkg KiBAdGFnOiBUYWcgYXNzb2NpYXRlZCB3aXRoIHdvcmtsb2FkLCBmb3Igd2hpY2ggdGhlIHBlcmYg c2FtcGxlIGlzCisJICogYmVpbmcgY29sbGVjdGVkLgorCSAqCisJICogVXNlcnNwYWNlIGNhbiBz cGVjaWZ5IHRhZ3MgKHByb3ZpZGVkIHZpYSBleGVjYnVmZmVyIGlvY3RsKSwgd2hpY2gKKwkgKiBj YW4gYmUgYXNzb2NpYXRlZCB3aXRoIHRoZSBwZXJmIHNhbXBsZXMsIGFuZCBiZSB1c2VkIHRvIGZ1 bmN0aW9uYWxseQorCSAqIGRpc3Rpbmd1aXNoIGRpZmZlcmVudCB3b3JrbG9hZCBzdGFnZXMsIGFu ZCBhc3NvY2lhdGUgc2FtcGxlcyB3aXRoCisJICogdGhlc2UgZGlmZmVyZW50IHN0YWdlcy4KKwkg Ki8KKwl1MzIgdGFnOwogfTsKIAogc3RydWN0IGludGVsX2NkY2xrX3N0YXRlIHsKQEAgLTM3MjMs NyArMzczNiw4IEBAIHZvaWQgaTkxNV9vYV9pbml0X3JlZ19zdGF0ZShzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmUsCiAJCQkgICAgc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCwKIAkJ CSAgICB1aW50MzJfdCAqcmVnX3N0YXRlKTsKIHZvaWQgaTkxNV9wZXJmX2VtaXRfc2FtcGxlX2Nh cHR1cmUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCi0JCQkJICAgYm9vbCBwcmVh bGxvY2F0ZSk7CisJCQkJICAgYm9vbCBwcmVhbGxvY2F0ZSwKKwkJCQkgICB1MzIgdGFnKTsKIAog LyogaTkxNV9nZW1fZXZpY3QuYyAqLwogaW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9ldmljdF9z b21ldGhpbmcoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5kZXggYmZlNTQ2Yi4uOTI1ODVkZiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAtMjQyLDYgKzI0Miw3 IEBAIHN0cnVjdCBpOTE1X2V4ZWNidWZmZXIgewogCSAqLwogCWludCBsdXRfc2l6ZTsKIAlzdHJ1 Y3QgaGxpc3RfaGVhZCAqYnVja2V0czsgLyoqIGh0IGZvciByZWxvY2F0aW9uIGhhbmRsZXMgKi8K Kwl1aW50MzJfdCB0YWc7CiB9OwogCiAvKgpAQCAtMTE5NCw3ICsxMTk1LDcgQEAgc3RhdGljIGlu dCBfX3JlbG9jX2dwdV9hbGxvYyhzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyICplYiwKIAlpZiAoZXJy KQogCQlnb3RvIGVycl9yZXF1ZXN0OwogCi0JaTkxNV9wZXJmX2VtaXRfc2FtcGxlX2NhcHR1cmUo cnEsIHRydWUpOworCWk5MTVfcGVyZl9lbWl0X3NhbXBsZV9jYXB0dXJlKHJxLCB0cnVlLCBlYi0+ dGFnKTsKIAogCWVyciA9IGViLT5lbmdpbmUtPmVtaXRfYmJfc3RhcnQocnEsCiAJCQkJCWJhdGNo LT5ub2RlLnN0YXJ0LCBQQUdFX1NJWkUsCkBAIC0xMjAyLDcgKzEyMDMsNyBAQCBzdGF0aWMgaW50 IF9fcmVsb2NfZ3B1X2FsbG9jKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXIgKmViLAogCWlmIChlcnIp CiAJCWdvdG8gZXJyX3JlcXVlc3Q7CiAKLQlpOTE1X3BlcmZfZW1pdF9zYW1wbGVfY2FwdHVyZShy cSwgZmFsc2UpOworCWk5MTVfcGVyZl9lbWl0X3NhbXBsZV9jYXB0dXJlKHJxLCBmYWxzZSwgZWIt PnRhZyk7CiAKIAlHRU1fQlVHX09OKCFyZXNlcnZhdGlvbl9vYmplY3RfdGVzdF9zaWduYWxlZF9y Y3UoYmF0Y2gtPnJlc3YsIHRydWUpKTsKIAlpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShiYXRjaCwg cnEsIDApOwpAQCAtMjAzMyw3ICsyMDM0LDcgQEAgc3RhdGljIGludCBlYl9zdWJtaXQoc3RydWN0 IGk5MTVfZXhlY2J1ZmZlciAqZWIpCiAJCQlyZXR1cm4gZXJyOwogCX0KIAotCWk5MTVfcGVyZl9l bWl0X3NhbXBsZV9jYXB0dXJlKGViLT5yZXF1ZXN0LCB0cnVlKTsKKwlpOTE1X3BlcmZfZW1pdF9z YW1wbGVfY2FwdHVyZShlYi0+cmVxdWVzdCwgdHJ1ZSwgZWItPnRhZyk7CiAKIAllcnIgPSBlYi0+ ZW5naW5lLT5lbWl0X2JiX3N0YXJ0KGViLT5yZXF1ZXN0LAogCQkJCQllYi0+YmF0Y2gtPm5vZGUu c3RhcnQgKwpAQCAtMjA0Myw3ICsyMDQ0LDcgQEAgc3RhdGljIGludCBlYl9zdWJtaXQoc3RydWN0 IGk5MTVfZXhlY2J1ZmZlciAqZWIpCiAJaWYgKGVycikKIAkJcmV0dXJuIGVycjsKIAotCWk5MTVf cGVyZl9lbWl0X3NhbXBsZV9jYXB0dXJlKGViLT5yZXF1ZXN0LCBmYWxzZSk7CisJaTkxNV9wZXJm X2VtaXRfc2FtcGxlX2NhcHR1cmUoZWItPnJlcXVlc3QsIGZhbHNlLCBlYi0+dGFnKTsKIAogCXJl dHVybiAwOwogfQpAQCAtMjE2OCw2ICsyMTY5LDggQEAgc3RhdGljIGludCBlYl9zdWJtaXQoc3Ry dWN0IGk5MTVfZXhlY2J1ZmZlciAqZWIpCiAJaWYgKCFlYi5lbmdpbmUpCiAJCXJldHVybiAtRUlO VkFMOwogCisJZWIudGFnCT0gaTkxNV9leGVjYnVmZmVyMl9nZXRfdGFnKCphcmdzKTsKKwogCWlm IChhcmdzLT5mbGFncyAmIEk5MTVfRVhFQ19SRVNPVVJDRV9TVFJFQU1FUikgewogCQlpZiAoIUhB U19SRVNPVVJDRV9TVFJFQU1FUihlYi5pOTE1KSkgewogCQkJRFJNX0RFQlVHKCJSUyBpcyBvbmx5 IGFsbG93ZWQgZm9yIEhhc3dlbGwsIEdlbjggYW5kIGFib3ZlXG4iKTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9wZXJmLmMKaW5kZXggNWFjMWE0MS4uYzdmOGU3ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9wZXJmLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wZXJm LmMKQEAgLTI5NCw2ICsyOTQsNyBAQCBzdHJ1Y3QgaTkxNV9wZXJmX3NhbXBsZV9kYXRhIHsKIAl1 NjQgc291cmNlOwogCXU2NCBjdHhfaWQ7CiAJdTY0IHBpZDsKKwl1NjQgdGFnOwogCWNvbnN0IHU4 ICpyZXBvcnQ7CiB9OwogCkBAIC0zNTAsNiArMzUxLDcgQEAgc3RydWN0IGk5MTVfcGVyZl9zYW1w bGVfZGF0YSB7CiAjZGVmaW5lIFNBTVBMRV9PQV9TT1VSQ0UgICAgICAoMTw8MSkKICNkZWZpbmUg U0FNUExFX0NUWF9JRAkgICAgICAoMTw8MikKICNkZWZpbmUgU0FNUExFX1BJRAkgICAgICAoMTw8 MykKKyNkZWZpbmUgU0FNUExFX1RBRwkgICAgICAoMTw8NCkKIAogLyoqCiAgKiBzdHJ1Y3QgcGVy Zl9vcGVuX3Byb3BlcnRpZXMgLSBmb3IgdmFsaWRhdGVkIHByb3BlcnRpZXMgZ2l2ZW4gdG8gb3Bl biBhIHN0cmVhbQpAQCAtNDAyLDEyICs0MDQsMTQgQEAgc3RhdGljIHUzMiBnZW43X29hX2h3X3Rh aWxfcmVhZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAgKiB0aGUgY29tbWFu ZCBzdHJlYW0gb2YgYSBHUFUgZW5naW5lLgogICogQHJlcXVlc3Q6IHJlcXVlc3QgaW4gd2hvc2Ug Y29udGV4dCB0aGUgbWV0cmljcyBhcmUgYmVpbmcgY29sbGVjdGVkLgogICogQHByZWFsbG9jYXRl OiBhbGxvY2F0ZSBzcGFjZSBpbiByaW5nIGZvciByZWxhdGVkIHNhbXBsZS4KKyAqIEB0YWc6IHVz ZXJzcGFjZSBwcm92aWRlZCB0YWcgdG8gYmUgYXNzb2NpYXRlZCB3aXRoIHRoZSBwZXJmIHNhbXBs ZQogICoKICAqIFRoZSBmdW5jdGlvbiBwcm92aWRlcyBhIGhvb2sgdGhyb3VnaCB3aGljaCB0aGUg Y29tbWFuZHMgdG8gY2FwdHVyZSBwZXJmCiAgKiBtZXRyaWNzLCBhcmUgaW5zZXJ0ZWQgaW50byB0 aGUgY29tbWFuZCBzdHJlYW0gb2YgYSBHUFUgZW5naW5lLgogICovCiB2b2lkIGk5MTVfcGVyZl9l bWl0X3NhbXBsZV9jYXB0dXJlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCwK LQkJCQkgICBib29sIHByZWFsbG9jYXRlKQorCQkJCSAgIGJvb2wgcHJlYWxsb2NhdGUsCisJCQkJ ICAgdTMyIHRhZykKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUgPSByZXF1ZXN0 LT5lbmdpbmU7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5p OTE1OwpAQCAtNDIyLDcgKzQyNiw4IEBAIHZvaWQgaTkxNV9wZXJmX2VtaXRfc2FtcGxlX2NhcHR1 cmUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0LAogCWlmIChzdHJlYW0gJiYg KHN0cmVhbS0+c3RhdGUgPT0gSTkxNV9QRVJGX1NUUkVBTV9FTkFCTEVEKSAmJgogCQkJCXN0cmVh bS0+Y3NfbW9kZSkKIAkJc3RyZWFtLT5vcHMtPmVtaXRfc2FtcGxlX2NhcHR1cmUoc3RyZWFtLCBy ZXF1ZXN0LAotCQkJCQkJIHByZWFsbG9jYXRlKTsKKwkJCQkJCSBwcmVhbGxvY2F0ZSwgdGFnKTsK KwogCXNyY3VfcmVhZF91bmxvY2soJmVuZ2luZS0+cGVyZl9zcmN1LCBpZHgpOwogfQogCkBAIC01 OTEsMTEgKzU5NiwxMyBAQCBzdGF0aWMgaW50IGk5MTVfZW1pdF9vYV9yZXBvcnRfY2FwdHVyZSgK ICAqIEBzdHJlYW06IEFuIGk5MTUtcGVyZiBzdHJlYW0gb3BlbmVkIGZvciBHUFUgbWV0cmljcwog ICogQHJlcXVlc3Q6IHJlcXVlc3QgaW4gd2hvc2UgY29udGV4dCB0aGUgbWV0cmljcyBhcmUgYmVp bmcgY29sbGVjdGVkLgogICogQHByZWFsbG9jYXRlOiBhbGxvY2F0ZSBzcGFjZSBpbiByaW5nIGZv ciByZWxhdGVkIHNhbXBsZS4KKyAqIEB0YWc6IHVzZXJzcGFjZSBwcm92aWRlZCB0YWcgdG8gYmUg YXNzb2NpYXRlZCB3aXRoIHRoZSBwZXJmIHNhbXBsZQogICovCiBzdGF0aWMgdm9pZCBpOTE1X3Bl cmZfc3RyZWFtX2VtaXRfc2FtcGxlX2NhcHR1cmUoCiAJCQkJCXN0cnVjdCBpOTE1X3BlcmZfc3Ry ZWFtICpzdHJlYW0sCiAJCQkJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCwK LQkJCQkJYm9vbCBwcmVhbGxvY2F0ZSkKKwkJCQkJYm9vbCBwcmVhbGxvY2F0ZSwKKwkJCQkJdTMy IHRhZykKIHsKIAlzdHJ1Y3QgcmVzZXJ2YXRpb25fb2JqZWN0ICpyZXN2ID0gc3RyZWFtLT5jc19i dWZmZXIudm1hLT5yZXN2OwogCXN0cnVjdCBpOTE1X3BlcmZfY3Nfc2FtcGxlICpzYW1wbGU7CkBA IC02MTEsNiArNjE4LDcgQEAgc3RhdGljIHZvaWQgaTkxNV9wZXJmX3N0cmVhbV9lbWl0X3NhbXBs ZV9jYXB0dXJlKAogCXNhbXBsZS0+cmVxdWVzdCA9IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0KHJlcXVl c3QpOwogCXNhbXBsZS0+Y3R4X2lkID0gcmVxdWVzdC0+Y3R4LT5od19pZDsKIAlzYW1wbGUtPnBp ZCA9IGN1cnJlbnQtPnBpZDsKKwlzYW1wbGUtPnRhZyA9IHRhZzsKIAogCWluc2VydF9wZXJmX3Nh bXBsZShzdHJlYW0sIHNhbXBsZSk7CiAKQEAgLTkzMyw2ICs5NDEsMTIgQEAgc3RhdGljIGludCBh cHBlbmRfcGVyZl9zYW1wbGUoc3RydWN0IGk5MTVfcGVyZl9zdHJlYW0gKnN0cmVhbSwKIAkJYnVm ICs9IDg7CiAJfQogCisJaWYgKHNhbXBsZV9mbGFncyAmIFNBTVBMRV9UQUcpIHsKKwkJaWYgKGNv cHlfdG9fdXNlcihidWYsICZkYXRhLT50YWcsIDgpKQorCQkJcmV0dXJuIC1FRkFVTFQ7CisJCWJ1 ZiArPSA4OworCX0KKwogCWlmIChzYW1wbGVfZmxhZ3MgJiBTQU1QTEVfT0FfUkVQT1JUKSB7CiAJ CWlmIChjb3B5X3RvX3VzZXIoYnVmLCBkYXRhLT5yZXBvcnQsIHJlcG9ydF9zaXplKSkKIAkJCXJl dHVybiAtRUZBVUxUOwpAQCAtOTczLDYgKzk4Nyw5IEBAIHN0YXRpYyBpbnQgYXBwZW5kX29hX2J1 ZmZlcl9zYW1wbGUoc3RydWN0IGk5MTVfcGVyZl9zdHJlYW0gKnN0cmVhbSwKIAlpZiAoc2FtcGxl X2ZsYWdzICYgU0FNUExFX1BJRCkKIAkJZGF0YS5waWQgPSBzdHJlYW0tPmxhc3RfcGlkOwogCisJ aWYgKHNhbXBsZV9mbGFncyAmIFNBTVBMRV9UQUcpCisJCWRhdGEudGFnID0gc3RyZWFtLT5sYXN0 X3RhZzsKKwogCWlmIChzYW1wbGVfZmxhZ3MgJiBTQU1QTEVfT0FfUkVQT1JUKQogCQlkYXRhLnJl cG9ydCA9IHJlcG9ydDsKIApAQCAtMTU3NSw2ICsxNTkyLDExIEBAIHN0YXRpYyBpbnQgYXBwZW5k X2NzX2J1ZmZlcl9zYW1wbGUoc3RydWN0IGk5MTVfcGVyZl9zdHJlYW0gKnN0cmVhbSwKIAkJc3Ry ZWFtLT5sYXN0X3BpZCA9IG5vZGUtPnBpZDsKIAl9CiAKKwlpZiAoc2FtcGxlX2ZsYWdzICYgU0FN UExFX1RBRykgeworCQlkYXRhLnRhZyA9IG5vZGUtPnRhZzsKKwkJc3RyZWFtLT5sYXN0X3RhZyA9 IG5vZGUtPnRhZzsKKwl9CisKIAlyZXR1cm4gYXBwZW5kX3BlcmZfc2FtcGxlKHN0cmVhbSwgYnVm LCBjb3VudCwgb2Zmc2V0LCAmZGF0YSk7CiB9CiAKQEAgLTI3MzYsNyArMjc1OCw4IEBAIHN0YXRp YyBpbnQgaTkxNV9wZXJmX3N0cmVhbV9pbml0KHN0cnVjdCBpOTE1X3BlcmZfc3RyZWFtICpzdHJl YW0sCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gc3RyZWFtLT5kZXZfcHJp djsKIAlib29sIHJlcXVpcmVfb2FfdW5pdCA9IHByb3BzLT5zYW1wbGVfZmxhZ3MgJiAoU0FNUExF X09BX1JFUE9SVCB8CiAJCQkJCQkgICAgICBTQU1QTEVfT0FfU09VUkNFKTsKLQlib29sIHJlcXVp cmVfY3NfbW9kZSA9IHByb3BzLT5zYW1wbGVfZmxhZ3MgJiBTQU1QTEVfUElEOworCWJvb2wgcmVx dWlyZV9jc19tb2RlID0gcHJvcHMtPnNhbXBsZV9mbGFncyAmIChTQU1QTEVfUElEIHwKKwkJCQkJ CSAgICAgIFNBTVBMRV9UQUcpOwogCWJvb2wgY3Nfc2FtcGxlX2RhdGEgPSBwcm9wcy0+c2FtcGxl X2ZsYWdzICYgU0FNUExFX09BX1JFUE9SVDsKIAlzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqY3Vy cl9zdHJlYW07CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gTlVMTDsKQEAgLTI4 OTUsNyArMjkxOCw3IEBAIHN0YXRpYyBpbnQgaTkxNV9wZXJmX3N0cmVhbV9pbml0KHN0cnVjdCBp OTE1X3BlcmZfc3RyZWFtICpzdHJlYW0sCiAJfQogCiAJaWYgKHJlcXVpcmVfY3NfbW9kZSAmJiAh cHJvcHMtPmNzX21vZGUpIHsKLQkJRFJNX0VSUk9SKCJQSUQgc2FtcGxpbmcgcmVxdWlyZXMgYSBy aW5nIHRvIGJlIHNwZWNpZmllZCIpOworCQlEUk1fRVJST1IoIlBJRC9UQUcgc2FtcGxpbmcgcmVx dWlyZXMgYSByaW5nIHRvIGJlIHNwZWNpZmllZCIpOwogCQlyZXQgPSAtRUlOVkFMOwogCQlnb3Rv IGVycl9lbmFibGU7CiAJfQpAQCAtMjkyNCw2ICsyOTQ3LDExIEBAIHN0YXRpYyBpbnQgaTkxNV9w ZXJmX3N0cmVhbV9pbml0KHN0cnVjdCBpOTE1X3BlcmZfc3RyZWFtICpzdHJlYW0sCiAJCQlzdHJl YW0tPnNhbXBsZV9zaXplICs9IDg7CiAJCX0KIAorCQlpZiAocHJvcHMtPnNhbXBsZV9mbGFncyAm IFNBTVBMRV9UQUcpIHsKKwkJCXN0cmVhbS0+c2FtcGxlX2ZsYWdzIHw9IFNBTVBMRV9UQUc7CisJ CQlzdHJlYW0tPnNhbXBsZV9zaXplICs9IDg7CisJCX0KKwogCQllbmdpbmUgPSBkZXZfcHJpdi0+ ZW5naW5lW3Byb3BzLT5lbmdpbmVdOwogCiAJCWlkeCA9IHNyY3VfcmVhZF9sb2NrKCZlbmdpbmUt PnBlcmZfc3JjdSk7CkBAIC0zNjQxLDYgKzM2NjksOSBAQCBzdGF0aWMgaW50IHJlYWRfcHJvcGVy dGllc191bmxvY2tlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCWNhc2Ug RFJNX0k5MTVfUEVSRl9QUk9QX1NBTVBMRV9QSUQ6CiAJCQlwcm9wcy0+c2FtcGxlX2ZsYWdzIHw9 IFNBTVBMRV9QSUQ7CiAJCQlicmVhazsKKwkJY2FzZSBEUk1fSTkxNV9QRVJGX1BST1BfU0FNUExF X1RBRzoKKwkJCXByb3BzLT5zYW1wbGVfZmxhZ3MgfD0gU0FNUExFX1RBRzsKKwkJCWJyZWFrOwog CQljYXNlIERSTV9JOTE1X1BFUkZfUFJPUF9NQVg6CiAJCQlNSVNTSU5HX0NBU0UoaWQpOwogCQkJ cmV0dXJuIC1FSU5WQUw7CmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJtLmgg Yi9pbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJtLmgKaW5kZXggMzRkOGU0MS4uMGU1MjJkNCAxMDA2 NDQKLS0tIGEvaW5jbHVkZS91YXBpL2RybS9pOTE1X2RybS5oCisrKyBiL2luY2x1ZGUvdWFwaS9k cm0vaTkxNV9kcm0uaApAQCAtOTM1LDYgKzkzNSwxMSBAQCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4 ZWNidWZmZXIyIHsKICNkZWZpbmUgaTkxNV9leGVjYnVmZmVyMl9nZXRfY29udGV4dF9pZChlYjIp IFwKIAkoKGViMikucnN2ZDEgJiBJOTE1X0VYRUNfQ09OVEVYVF9JRF9NQVNLKQogCisvKiB1cHBl ciAzMiBiaXRzIG9mIHJzdmQxIGZpZWxkIGNvbnRhaW4gdGFnICovCisjZGVmaW5lIEk5MTVfRVhF Q19UQUdfTUFTSwkJKDB4ZmZmZmZmZmYwMDAwMDAwMFVMKQorI2RlZmluZSBpOTE1X2V4ZWNidWZm ZXIyX2dldF90YWcoZWIyKSBcCisJKCgoZWIyKS5yc3ZkMSAmIEk5MTVfRVhFQ19UQUdfTUFTSykg Pj4gMzIpCisKIHN0cnVjdCBkcm1faTkxNV9nZW1fcGluIHsKIAkvKiogSGFuZGxlIG9mIHRoZSBi dWZmZXIgdG8gYmUgcGlubmVkLiAqLwogCV9fdTMyIGhhbmRsZTsKQEAgLTE0MTQsNiArMTQxOSwx MiBAQCBlbnVtIGRybV9pOTE1X3BlcmZfcHJvcGVydHlfaWQgewogCSAqLwogCURSTV9JOTE1X1BF UkZfUFJPUF9TQU1QTEVfUElELAogCisJLyoqCisJICogVGhlIHZhbHVlIG9mIHRoaXMgcHJvcGVy dHkgc2V0IHRvIDEgcmVxdWVzdHMgaW5jbHVzaW9uIG9mIHRhZyBpbiB0aGUKKwkgKiBwZXJmIHNh bXBsZSBkYXRhLgorCSAqLworCURSTV9JOTE1X1BFUkZfUFJPUF9TQU1QTEVfVEFHLAorCiAJRFJN X0k5MTVfUEVSRl9QUk9QX01BWCAvKiBub24tQUJJICovCiB9OwogCkBAIC0xNDgyLDYgKzE0OTMs NyBAQCBlbnVtIGRybV9pOTE1X3BlcmZfcmVjb3JkX3R5cGUgewogCSAqICAgICB7IHU2NCBzb3Vy Y2U7IH0gJiYgRFJNX0k5MTVfUEVSRl9QUk9QX1NBTVBMRV9PQV9TT1VSQ0UKIAkgKiAgICAgeyB1 NjQgY3R4X2lkOyB9ICYmIERSTV9JOTE1X1BFUkZfUFJPUF9TQU1QTEVfQ1RYX0lECiAJICogICAg IHsgdTY0IHBpZDsgfSAmJiBEUk1fSTkxNV9QRVJGX1BST1BfU0FNUExFX1BJRAorCSAqICAgICB7 IHU2NCB0YWc7IH0gJiYgRFJNX0k5MTVfUEVSRl9QUk9QX1NBTVBMRV9UQUcKIAkgKiAgICAgeyB1 MzIgb2FfcmVwb3J0W107IH0gJiYgRFJNX0k5MTVfUEVSRl9QUk9QX1NBTVBMRV9PQQogCSAqIH07 CiAJICovCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==