From: Dmitry Rogozhkin Subject: [RFC v4 2/5] drm/i915/pmu: serve global events and support perf stat Date: Fri, 1 Sep 2017 09:02:36 -0700 Message-ID: <1504281759-9797-3-git-send-email-dmitry.v.rogozhkin@intel.com> References: <1504281759-9797-1-git-send-email-dmitry.v.rogozhkin@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id B0BAB6E8DF for ; Sat, 2 Sep 2017 00:04:48 +0000 (UTC) In-Reply-To: <1504281759-9797-1-git-send-email-dmitry.v.rogozhkin@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: Peter Zijlstra List-Id: intel-gfx@lists.freedesktop.org VGhpcyBwYXRjaCBzaG91bGQgcHJvYmFibHkgYmUgc3F1YXNoZWQgd2l0aCBUdnJ0a28ncyBQTVUg ZW5hYmxpbmcKcGF0Y2guLi4KCk1ha2luZyBwZXJmLXN0YXQgd29ya2FibGUgd2l0aCBpOTE1IFBN VS4gVGhlIG1ham9yIHBvaW50IGlzIHRoYXQKY3VycmVudCBpbXBsZW1lbnRhdGlvbiBvZiBpOTE1 IFBNVSBleHBvc2VzIGdsb2JhbCBjb3VudGVyIHJhdGhlcgp0aGF0biBwZXItdGFzayBjb3VudGVy cy4gVGh1cywgcmVxdWlyZWQgY2hhbmdlcyBhcmU6CiogUmVnaXN0ZXIgUE1VIHdpdGggLnRhc2tf Y3R4X25yPXBlcmZfaW52YWxpZF9jb250ZXh0CiogRXhwb3NlIGNwdW1hc2sgZm9yIHRoZSBQTVUg d2l0aCB0aGUgc2luZ2xlIENQVSBpbiB0aGUgbWFzawoqIFByb3Blcmx5IHN1cHBvcnQgcG11LT5z dG9wKCk6IGl0IHNob3VsZCBjYWxsIHBtdS0+cmVhZCgpCiogUHJvcGVybHkgc3VwcG9ydCBwbXUt PmRlbCgpOiBpdCBzaG91bGQgY2FsbCBzdG9wKGV2ZW50LCBQRVJGX0VGX1VQREFURSkKCkV4YW1w bGVzOgpwZXJmIHN0YXQgLWUgaTkxNS9yY3MwLWJ1c3kvIHdvcmtsb2FkLnNoCiAgIFRoaXMgc2hv dWxkIGVycm9yIG91dCB3aXRoICJmYWlsZWQgdG8gcmVhZCBjb3VudGVyIiBiZWNhdXNlIHRoZQpy ZXF1ZXN0ZWQgY291bnRlciBjYW4ndCBiZSBxdWVyaWVkIGluIHBlci10YXNrIG1vZGUgKHdoaWNo IGlzIHRoZSBjYXNlKS4KCnBlcmYgc3RhdCAtZSBpOTE1L3JjczAtYnVzeS8gLWEgd29ya2xvYWQu c2gKcGVyZiBzdGF0IC1lIGk5MTUvcmNzMC1idXN5LyAtYSAtQzAgd29ya2xvYWQuc2gKICAgVGhl c2UgMiBjb21tYW5kcyBzaG91bGQgZ2l2ZSB0aGUgc2FtZSByZXN1bHQgd2l0aCB0aGUgY29ycmVj dCBjb3VudGVyCnZhbHVlcy4gQ291bnRlciB2YWx1ZSB3aWxsIGJlIHF1ZXJpZWQgb25jZSBpbiB0 aGUgZW5kIG9mIHRoZSB3cm9rbG9hZC4KVGhlIGV4YW1wbGUgb3V0cHV0IHdvdWxkIGJlOgoKIFBl cmZvcm1hbmNlIGNvdW50ZXIgc3RhdHMgZm9yICdzeXN0ZW0gd2lkZSc6CiAgICAgICA2NDksNTQ3 LDk4NyAgICAgIGk5MTUvcmNzMC1idXN5LwoKICAgICAgIDEuODk1NTMwNjgwIHNlY29uZHMgdGlt ZSBlbGFwc2VkCgpwZXJmIHN0YXQgLWUgaTkxNS9yY3MwLWJ1c3kvIC1hIC1JIDEwMCB3b3JrbG9h ZC5zaAogICBUaGlzIHdpbGwgcXVlcnkgY291bnRlciBwZXJkaW9kaWNhbGx5IChlYWNoIDEwMG1z KSBhbmQgZHVtcCBvdXRwdXQ6CgogICAgIDAuMTAwMTA4MzY5ICAgICAgICAgIDQsMTM3LDQzOCAg ICAgIGk5MTUvcmNzMC1idXN5LwppOTE1L3JjczAtYnVzeS86IDM3MDM3NDE0IDEwMDE0OTA3MSAx MDAxNDkwNzEKICAgICAwLjIwMDI0OTAyNCAgICAgICAgIDM3LDAzNyw0MTQgICAgICBpOTE1L3Jj czAtYnVzeS8KaTkxNS9yY3MwLWJ1c3kvOiAzNjkzNTQyOSAxMDAxNDUwNzcgMTAwMTQ1MDc3CiAg ICAgMC4zMDAzOTE5MTYgICAgICAgICAzNiw5MzUsNDI5ICAgICAgaTkxNS9yY3MwLWJ1c3kvCmk5 MTUvcmNzMC1idXN5LzogMzQyNjIwMTcgMTAwMTI2MTM2IDEwMDEyNjEzNgogICAgIDAuNDAwNTE4 MDM3ICAgICAgICAgMzQsMjYyLDAxNyAgICAgIGk5MTUvcmNzMC1idXN5LwppOTE1L3JjczAtYnVz eS86IDM0NTM5OTYwIDEwMDEyNjIxNyAxMDAxMjYyMTcKCnYxOiBNYWtlIHBtdS5idXN5X3N0YXRz IGEgcmVmY291bnRlciB0byBhdm9pZCBidXN5IHN0YXRzIGdvaW5nIGF3YXkKICAgIHdpdGggc29t ZSBkZWxldGVkIGV2ZW50LgoKdjI6IEV4cG9zZSBjcHVtYXNrIGZvciBpOTE1IFBNVSB0byBhdm9p ZCBtdWx0aXBsZSBldmVudHMgY3JlYXRpb24gb2YKICAgIHRoZSBzYW1lIHR5cGUgZm9sbG93ZWQg YnkgY291bnRlciBhZ2dyZWdhdGlvbiBieSBwZXJmLXN0YXQuCgp2MzogVHJhY2sgQ1BVcyBnZXR0 aW5nIG9ubGluZS9vZmZsaW5lIHRvIG1pZ3JhdGUgcGVyZiBjb250ZXh0LiBJZiAobGlrZWx5KQog ICAgY3B1bWFzayB3aWxsIGluaXRpYWxseSBzZXQgQ1BVMCwgQ09ORklHX0JPT1RQQVJBTV9IT1RQ TFVHX0NQVTAgd2lsbCBiZQogICAgbmVlZGVkIHRvIHNlZSBlZmZlY3Qgb2YgQ1BVIHN0YXR1cyB0 cmFja2luZy4KCkNoYW5nZS1JZDogSTdkMWFiZTc0N2E0Mzk5MTk2ZTcyMjUzZjdiNjY0NDFhNjUy OGRiZWUKU2lnbmVkLW9mZi1ieTogRG1pdHJ5IFJvZ296aGtpbiA8ZG1pdHJ5LnYucm9nb3poa2lu QGludGVsLmNvbT4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ CkNjOiBQZXRlciBaaWpsc3RyYSA8cGV0ZXJ6QGluZnJhZGVhZC5vcmc+CgpjcHVtYXNrCgpDaGFu Z2UtSWQ6IEkxNDVmNTkyNDBiNzVmMmI3MDNlMDUzMWVjODFhZjZjZDA1YWFlOTVjClNpZ25lZC1v ZmYtYnk6IERtaXRyeSBSb2dvemhraW4gPGRtaXRyeS52LnJvZ296aGtpbkBpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgIHwgIDE5ICsrKy0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYyAgICAgICAgIHwgMTE1ICsrKysrKysrKysr KysrKysrKysrKysrKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmggfCAgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwgMTEwIGluc2VydGlvbnMoKyksIDI2IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGI1OWRhMmMuLmU2MjllNWUg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjE1Myw2ICsyMTUzLDE2IEBAIGVudW0gewog CV9fSTkxNV9OVU1fUE1VX1NBTVBMRVJTCiB9OwogCitzdHJ1Y3QgaTkxNV9wbXUgeworCXN0cnVj dCBobGlzdF9ub2RlIG5vZGU7CisJc3RydWN0IHBtdSBiYXNlOworCXNwaW5sb2NrX3QgbG9jazsK KwlzdHJ1Y3QgaHJ0aW1lciB0aW1lcjsKKwlib29sIHRpbWVyX2VuYWJsZWQ7CisJdTY0IGVuYWJs ZTsKKwl1NjQgc2FtcGxlW19fSTkxNV9OVU1fUE1VX1NBTVBMRVJTXTsKK307CisKIHN0cnVjdCBk cm1faTkxNV9wcml2YXRlIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSBkcm07CiAKQEAgLTI2NjAsMTQg KzI2NzAsNyBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7CiAJCWludAlpcnE7CiAJfSBscGVf YXVkaW87CiAKLQlzdHJ1Y3QgewotCQlzdHJ1Y3QgcG11IGJhc2U7Ci0JCXNwaW5sb2NrX3QgbG9j azsKLQkJc3RydWN0IGhydGltZXIgdGltZXI7Ci0JCWJvb2wgdGltZXJfZW5hYmxlZDsKLQkJdTY0 IGVuYWJsZTsKLQkJdTY0IHNhbXBsZVtfX0k5MTVfTlVNX1BNVV9TQU1QTEVSU107Ci0JfSBwbXU7 CisJc3RydWN0IGk5MTVfcG11IHBtdTsKIAogCS8qCiAJICogTk9URTogVGhpcyBpcyB0aGUgZHJp MS91bXMgZHVuZ2VvbiwgZG9uJ3QgYWRkIHN0dWZmIGhlcmUuIFlvdXIgcGF0Y2gKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3BtdS5jCmluZGV4IGJjZGYyYmMuLjdiZmVkYjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfcG11LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9w bXUuYwpAQCAtMTUsNiArMTUsOCBAQAogCiAjZGVmaW5lIEVOR0lORV9TQU1QTEVfQklUUyAoMTYp CiAKK3N0YXRpYyBjcHVtYXNrX3QgaTkxNV9wbXVfY3B1bWFzayA9IENQVV9NQVNLX05PTkU7CisK IHN0YXRpYyB1OCBlbmdpbmVfY29uZmlnX3NhbXBsZSh1NjQgY29uZmlnKQogewogCXJldHVybiBj b25maWcgJiBJOTE1X1BNVV9TQU1QTEVfTUFTSzsKQEAgLTI4NSwxNiArMjg3LDI0IEBAIHN0YXRp YyBpbnQgaTkxNV9wbXVfZXZlbnRfaW5pdChzdHJ1Y3QgcGVyZl9ldmVudCAqZXZlbnQpCiB7CiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUgPQogCQljb250YWluZXJfb2YoZXZlbnQtPnBt dSwgdHlwZW9mKCppOTE1KSwgcG11LmJhc2UpOworCWludCBjcHU7CiAJaW50IHJldDsKIAotCS8q IFhYWCBpZGVhbGx5IG9ubHkgd2FudCBwaWQgPT0gLTEgJiYgY3B1ID09IC0xICovCi0KIAlpZiAo ZXZlbnQtPmF0dHIudHlwZSAhPSBldmVudC0+cG11LT50eXBlKQogCQlyZXR1cm4gLUVOT0VOVDsK IAogCWlmIChoYXNfYnJhbmNoX3N0YWNrKGV2ZW50KSkKIAkJcmV0dXJuIC1FT1BOT1RTVVBQOwog CisJaWYgKGV2ZW50LT5jcHUgPCAwKQorCQlyZXR1cm4gLUVJTlZBTDsKKworCWNwdSA9IGNwdW1h c2tfYW55X2FuZCgmaTkxNV9wbXVfY3B1bWFzaywKKwkJdG9wb2xvZ3lfc2libGluZ19jcHVtYXNr KGV2ZW50LT5jcHUpKTsKKworCWlmIChjcHUgPj0gbnJfY3B1X2lkcykKKwkJcmV0dXJuIC1FTk9E RVY7CisKIAlyZXQgPSAwOwogCWlmIChpc19lbmdpbmVfZXZlbnQoZXZlbnQpKSB7CiAJCXJldCA9 IGVuZ2luZV9ldmVudF9pbml0KGV2ZW50KTsKQEAgLTMxNCw2ICszMjQsNyBAQCBzdGF0aWMgaW50 IGk5MTVfcG11X2V2ZW50X2luaXQoc3RydWN0IHBlcmZfZXZlbnQgKmV2ZW50KQogCWlmIChyZXQp CiAJCXJldHVybiByZXQ7CiAKKwlldmVudC0+Y3B1ID0gY3B1OwogCWlmICghZXZlbnQtPnBhcmVu dCkKIAkJZXZlbnQtPmRlc3Ryb3kgPSBpOTE1X3BtdV9ldmVudF9kZXN0cm95OwogCkBAIC00Njks MTEgKzQ4MCwxNiBAQCBzdGF0aWMgdm9pZCBpOTE1X3BtdV9lbmFibGUoc3RydWN0IHBlcmZfZXZl bnQgKmV2ZW50KQogCQkJCSAgICAgICBuc190b19rdGltZShQRVJJT0QpLCAwLAogCQkJCSAgICAg ICBIUlRJTUVSX01PREVfUkVMX1BJTk5FRCk7CiAJCWk5MTUtPnBtdS50aW1lcl9lbmFibGVkID0g dHJ1ZTsKLQl9IGVsc2UgaWYgKGlzX2VuZ2luZV9ldmVudChldmVudCkgJiYgZW5naW5lX25lZWRz X2J1c3lfc3RhdHMoZW5naW5lKSAmJgotCQkgICAhZW5naW5lLT5wbXUuYnVzeV9zdGF0cykgewot CQllbmdpbmUtPnBtdS5idXN5X3N0YXRzID0gdHJ1ZTsKLQkJaWYgKCFjYW5jZWxfZGVsYXllZF93 b3JrKCZlbmdpbmUtPnBtdS5kaXNhYmxlX2J1c3lfc3RhdHMpKQotCQkJcXVldWVfd29yayhpOTE1 LT53cSwgJmVuZ2luZS0+cG11LmVuYWJsZV9idXN5X3N0YXRzKTsKKwl9IGVsc2UgaWYgKGlzX2Vu Z2luZV9ldmVudChldmVudCkgJiYgZW5naW5lX25lZWRzX2J1c3lfc3RhdHMoZW5naW5lKSkgewor CQkvKiBFbmFibGUgYnVzeSBzdGF0cyBmb3IgdGhlIGZpcnN0IGV2ZW50IGRlbWFuZGluZyBpdCwg bmV4dAorCQkgKiBldmVudHMganVzdCByZWZlcmVuY2UgY291bnRlci4gU28sIGlmIHNvbWUgZXZl bnRzIHdpbGwgZ28KKwkJICogYXdheSwgd2Ugd2lsbCBzdGlsbCBoYXZlIGJ1c3kgc3RhdHMgZW5h YmxlZCB0aWxsIHJlbWFpbmluZworCQkgKiBldmVudHMgc3RpbGwgdXNlIHRoZW0uCisJCSAqLwor CQlpZiAoZW5naW5lLT5wbXUuYnVzeV9zdGF0cysrID09IDApIHsKKwkJCWlmICghY2FuY2VsX2Rl bGF5ZWRfd29yaygmZW5naW5lLT5wbXUuZGlzYWJsZV9idXN5X3N0YXRzKSkKKwkJCQlxdWV1ZV93 b3JrKGk5MTUtPndxLCAmZW5naW5lLT5wbXUuZW5hYmxlX2J1c3lfc3RhdHMpOworCQl9CiAJfQog CiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmaTkxNS0+cG11LmxvY2ssIGZsYWdzKTsKQEAgLTQ5 NSwxNiArNTExLDE2IEBAIHN0YXRpYyB2b2lkIGk5MTVfcG11X2Rpc2FibGUoc3RydWN0IHBlcmZf ZXZlbnQgKmV2ZW50KQogCQllbnVtIGludGVsX2VuZ2luZV9pZCBpZDsKIAogCQllbmdpbmUgPSBp bnRlbF9lbmdpbmVfbG9va3VwX3VzZXIoaTkxNSwKLQkJCQkJCSAgZW5naW5lX2V2ZW50X2NsYXNz KGV2ZW50KSwKLQkJCQkJCSAgZW5naW5lX2V2ZW50X2luc3RhbmNlKGV2ZW50KSk7CisJCQkJCQll bmdpbmVfZXZlbnRfY2xhc3MoZXZlbnQpLAorCQkJCQkJZW5naW5lX2V2ZW50X2luc3RhbmNlKGV2 ZW50KSk7CiAJCUdFTV9CVUdfT04oIWVuZ2luZSk7CiAJCWVuZ2luZS0+cG11LmVuYWJsZSAmPSB+ QklUKGVuZ2luZV9ldmVudF9zYW1wbGUoZXZlbnQpKTsKLQkJaWYgKGVuZ2luZS0+cG11LmJ1c3lf c3RhdHMgJiYKLQkJICAgICFlbmdpbmVfbmVlZHNfYnVzeV9zdGF0cyhlbmdpbmUpKSB7Ci0JCQll bmdpbmUtPnBtdS5idXN5X3N0YXRzID0gZmFsc2U7Ci0JCQlxdWV1ZV9kZWxheWVkX3dvcmsoaTkx NS0+d3EsCi0JCQkJCSAgICZlbmdpbmUtPnBtdS5kaXNhYmxlX2J1c3lfc3RhdHMsCi0JCQkJCSAg IHJvdW5kX2ppZmZpZXNfdXBfcmVsYXRpdmUoMiAqIEhaKSk7CisJCWlmICghZW5naW5lX25lZWRz X2J1c3lfc3RhdHMoZW5naW5lKSkgeworCQkJaWYgKGVuZ2luZS0+cG11LmJ1c3lfc3RhdHMgJiYg LS1lbmdpbmUtPnBtdS5idXN5X3N0YXRzID09IDApIHsKKwkJCQlxdWV1ZV9kZWxheWVkX3dvcmso aTkxNS0+d3EsCisJCQkJCQkmZW5naW5lLT5wbXUuZGlzYWJsZV9idXN5X3N0YXRzLAorCQkJCQkJ cm91bmRfamlmZmllc191cF9yZWxhdGl2ZSgyICogSFopKTsKKwkJCX0KIAkJfQogCQltYXNrID0g MDsKIAkJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgaTkxNSwgaWQpCkBAIC01MjksNiArNTQ1LDgg QEAgc3RhdGljIHZvaWQgaTkxNV9wbXVfZXZlbnRfc3RhcnQoc3RydWN0IHBlcmZfZXZlbnQgKmV2 ZW50LCBpbnQgZmxhZ3MpCiAKIHN0YXRpYyB2b2lkIGk5MTVfcG11X2V2ZW50X3N0b3Aoc3RydWN0 IHBlcmZfZXZlbnQgKmV2ZW50LCBpbnQgZmxhZ3MpCiB7CisJaWYgKGZsYWdzICYgUEVSRl9FRl9V UERBVEUpCisJCWk5MTVfcG11X2V2ZW50X3JlYWQoZXZlbnQpOwogCWk5MTVfcG11X2Rpc2FibGUo ZXZlbnQpOwogfQogCkBAIC01NDYsNyArNTY0LDcgQEAgc3RhdGljIGludCBpOTE1X3BtdV9ldmVu dF9hZGQoc3RydWN0IHBlcmZfZXZlbnQgKmV2ZW50LCBpbnQgZmxhZ3MpCiAKIHN0YXRpYyB2b2lk IGk5MTVfcG11X2V2ZW50X2RlbChzdHJ1Y3QgcGVyZl9ldmVudCAqZXZlbnQsIGludCBmbGFncykK IHsKLQlpOTE1X3BtdV9kaXNhYmxlKGV2ZW50KTsKKwlpOTE1X3BtdV9ldmVudF9zdG9wKGV2ZW50 LCBQRVJGX0VGX1VQREFURSk7CiB9CiAKIHN0YXRpYyBpbnQgaTkxNV9wbXVfZXZlbnRfZXZlbnRf aWR4KHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKQEAgLTY1Niw5ICs2NzQsMjggQEAgc3RhdGlj IHNzaXplX3QgaTkxNV9wbXVfZXZlbnRfc2hvdyhzdHJ1Y3QgZGV2aWNlICpkZXYsCiAgICAgICAg IC5hdHRycyA9IGk5MTVfcG11X2V2ZW50c19hdHRycywKIH07CiAKK3N0YXRpYyBzc2l6ZV90IGk5 MTVfcG11X2dldF9hdHRyX2NwdW1hc2soc3RydWN0IGRldmljZSAqZGV2LAorCQkJCSAgICAgICBz dHJ1Y3QgZGV2aWNlX2F0dHJpYnV0ZSAqYXR0ciwKKwkJCQkgICAgICAgY2hhciAqYnVmKQorewor CXJldHVybiBjcHVtYXBfcHJpbnRfdG9fcGFnZWJ1Zih0cnVlLCBidWYsICZpOTE1X3BtdV9jcHVt YXNrKTsKK30KKworc3RhdGljIERFVklDRV9BVFRSKGNwdW1hc2ssIFNfSVJVR08sIGk5MTVfcG11 X2dldF9hdHRyX2NwdW1hc2ssIE5VTEwpOworCitzdGF0aWMgc3RydWN0IGF0dHJpYnV0ZSAqaTkx NV9jcHVtYXNrX2F0dHJzW10gPSB7CisJJmRldl9hdHRyX2NwdW1hc2suYXR0ciwKKwlOVUxMLAor fTsKKworc3RhdGljIHN0cnVjdCBhdHRyaWJ1dGVfZ3JvdXAgaTkxNV9wbXVfY3B1bWFza19hdHRy X2dyb3VwID0geworCS5hdHRycyA9IGk5MTVfY3B1bWFza19hdHRycywKK307CisKIHN0YXRpYyBj b25zdCBzdHJ1Y3QgYXR0cmlidXRlX2dyb3VwICppOTE1X3BtdV9hdHRyX2dyb3Vwc1tdID0gewog ICAgICAgICAmaTkxNV9wbXVfZm9ybWF0X2F0dHJfZ3JvdXAsCiAgICAgICAgICZpOTE1X3BtdV9l dmVudHNfYXR0cl9ncm91cCwKKyAgICAgICAgJmk5MTVfcG11X2NwdW1hc2tfYXR0cl9ncm91cCwK ICAgICAgICAgTlVMTAogfTsKIApAQCAtNjc4LDE2ICs3MTUsNTcgQEAgc3RhdGljIHZvaWQgX19k aXNhYmxlX2J1c3lfc3RhdHMoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogCWludGVsX2Rpc2Fi bGVfZW5naW5lX3N0YXRzKGVuZ2luZSk7CiB9CiAKK3N0YXRpYyBpbnQgaTkxNV9wbXVfY3B1X29u bGluZSh1bnNpZ25lZCBpbnQgY3B1LCBzdHJ1Y3QgaGxpc3Rfbm9kZSAqbm9kZSkKK3sKKwl1bnNp Z25lZCBpbnQgdGFyZ2V0OworCisJdGFyZ2V0ID0gY3B1bWFza19hbnlfYW5kKCZpOTE1X3BtdV9j cHVtYXNrLCAmaTkxNV9wbXVfY3B1bWFzayk7CisJLyogU2VsZWN0IHRoZSBmaXJzdCBvbmxpbmUg Q1BVIGFzIGEgZGVzaWduYXRlZCByZWFkZXIuICovCisJaWYgKHRhcmdldCA+PSBucl9jcHVfaWRz KSB7CisJCWNwdW1hc2tfc2V0X2NwdShjcHUsICZpOTE1X3BtdV9jcHVtYXNrKTsKKwl9CisJcmV0 dXJuIDA7Cit9CisKK3N0YXRpYyBpbnQgaTkxNV9wbXVfY3B1X29mZmxpbmUodW5zaWduZWQgaW50 IGNwdSwgc3RydWN0IGhsaXN0X25vZGUgKm5vZGUpCit7CisJc3RydWN0IGk5MTVfcG11ICpwbXUg PSBobGlzdF9lbnRyeV9zYWZlKG5vZGUsIHR5cGVvZigqcG11KSwgbm9kZSk7CisJdW5zaWduZWQg aW50IHRhcmdldDsKKworCWlmIChjcHVtYXNrX3Rlc3RfYW5kX2NsZWFyX2NwdShjcHUsICZpOTE1 X3BtdV9jcHVtYXNrKSkgeworCQl0YXJnZXQgPSBjcHVtYXNrX2FueV9idXQodG9wb2xvZ3lfc2li bGluZ19jcHVtYXNrKGNwdSksIGNwdSk7CisJCS8qIE1pZ3JhdGUgZXZlbnRzIGlmIHRoZXJlIGlz IGEgdmFsaWQgdGFyZ2V0ICovCisJCWlmICh0YXJnZXQgPCBucl9jcHVfaWRzKSB7CisJCQljcHVt YXNrX3NldF9jcHUodGFyZ2V0LCAmaTkxNV9wbXVfY3B1bWFzayk7CisJCQlwZXJmX3BtdV9taWdy YXRlX2NvbnRleHQoJnBtdS0+YmFzZSwgY3B1LCB0YXJnZXQpOworCQl9CisJfQorCXJldHVybiAw OworfQorCiB2b2lkIGk5MTVfcG11X3JlZ2lzdGVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpp OTE1KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKIAllbnVtIGludGVsX2Vu Z2luZV9pZCBpZDsKKwlpbnQgZXJyOwogCiAJaWYgKElOVEVMX0dFTihpOTE1KSA8PSAyKQogCQly ZXR1cm47CiAKKwllcnIgPSBjcHVocF9zZXR1cF9zdGF0ZV9tdWx0aShDUFVIUF9BUF9QRVJGX1g4 Nl9VTkNPUkVfT05MSU5FLAorCQkicGVyZi94ODYvaW50ZWwvaTkxNTpvbmxpbmUiLAorCQlpOTE1 X3BtdV9jcHVfb25saW5lLAorCQlpOTE1X3BtdV9jcHVfb2ZmbGluZSk7CisJaWYgKGVycikKKwkJ cmV0dXJuOworCisJZXJyID0gY3B1aHBfc3RhdGVfYWRkX2luc3RhbmNlKENQVUhQX0FQX1BFUkZf WDg2X1VOQ09SRV9PTkxJTkUsCisJCSZpOTE1LT5wbXUubm9kZSk7CisJaWYgKGVycikKKwkJcmV0 dXJuOworCiAJaTkxNS0+cG11LmJhc2UuYXR0cl9ncm91cHMJPSBpOTE1X3BtdV9hdHRyX2dyb3Vw czsKLQlpOTE1LT5wbXUuYmFzZS50YXNrX2N0eF9ucgk9IHBlcmZfc3dfY29udGV4dDsKKwlpOTE1 LT5wbXUuYmFzZS50YXNrX2N0eF9ucgk9IHBlcmZfaW52YWxpZF9jb250ZXh0OwogCWk5MTUtPnBt dS5iYXNlLmV2ZW50X2luaXQJPSBpOTE1X3BtdV9ldmVudF9pbml0OwogCWk5MTUtPnBtdS5iYXNl LmFkZAkJPSBpOTE1X3BtdV9ldmVudF9hZGQ7CiAJaTkxNS0+cG11LmJhc2UuZGVsCQk9IGk5MTVf cG11X2V2ZW50X2RlbDsKQEAgLTczMSw0ICs4MDksNyBAQCB2b2lkIGk5MTVfcG11X3VucmVnaXN0 ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiAJCWZsdXNoX3dvcmsoJmVuZ2luZS0+ cG11LmVuYWJsZV9idXN5X3N0YXRzKTsKIAkJZmx1c2hfZGVsYXllZF93b3JrKCZlbmdpbmUtPnBt dS5kaXNhYmxlX2J1c3lfc3RhdHMpOwogCX0KKworCWNwdWhwX3N0YXRlX3JlbW92ZV9pbnN0YW5j ZShDUFVIUF9BUF9QRVJGX1g4Nl9VTkNPUkVfT05MSU5FLAorCQkmaTkxNS0+cG11Lm5vZGUpOwog fQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IGZkNWQ4MzguLjA1 MzBlNGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTI0OCw3 ICsyNDgsNyBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAlzdHJ1Y3QgewogCQl1MzIgZW5h YmxlOwogCQl1NjQgc2FtcGxlWzRdOwotCQlib29sIGJ1c3lfc3RhdHM7CisJCXVuc2lnbmVkIGlu dCBidXN5X3N0YXRzOwogCQlzdHJ1Y3Qgd29ya19zdHJ1Y3QgZW5hYmxlX2J1c3lfc3RhdHM7CiAJ CXN0cnVjdCBkZWxheWVkX3dvcmsgZGlzYWJsZV9idXN5X3N0YXRzOwogCX0gcG11OwotLSAKMS44 LjMuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==