From: Tvrtko Ursulin Subject: [RFC 1/4] drm/i915/pmu: Make more struct i915_pmu centric Date: Thu, 1 Aug 2019 11:18:22 +0100 Message-ID: <20190801101825.2784-2-tvrtko.ursulin@linux.intel.com> References: <20190801101825.2784-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2D5786E464 for ; Thu, 1 Aug 2019 10:18:32 +0000 (UTC) In-Reply-To: <20190801101825.2784-1-tvrtko.ursulin@linux.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkp1c3QgdGlk eSB0aGUgY29kZSBhIGJpdCBieSByZW1vdmluZyBhIHNlYSBvZiBvdmVybHkgdmVyYm9zZSBpOTE1 LT5wbXUuKi4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBp bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYyB8IDE5NCArKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEwNCBpbnNlcnRp b25zKCspLCA5MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3BtdS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYwppbmRleCBlZmY4 NjQ4M2JlYzAuLjEyMDA4OTY2YjAwZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9wbXUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jCkBAIC03NCw4 ICs3NCw5IEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgZXZlbnRfZW5hYmxlZF9iaXQoc3RydWN0IHBl cmZfZXZlbnQgKmV2ZW50KQogCXJldHVybiBjb25maWdfZW5hYmxlZF9iaXQoZXZlbnQtPmF0dHIu Y29uZmlnKTsKIH0KIAotc3RhdGljIGJvb2wgcG11X25lZWRzX3RpbWVyKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICppOTE1LCBib29sIGdwdV9hY3RpdmUpCitzdGF0aWMgYm9vbCBwbXVfbmVlZHNf dGltZXIoc3RydWN0IGk5MTVfcG11ICpwbXUsIGJvb2wgZ3B1X2FjdGl2ZSkKIHsKKwlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9IGNvbnRhaW5lcl9vZihwbXUsIHR5cGVvZigqaTkxNSks IHBtdSk7CiAJdTY0IGVuYWJsZTsKIAogCS8qCkBAIC04Myw3ICs4NCw3IEBAIHN0YXRpYyBib29s IHBtdV9uZWVkc190aW1lcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgYm9vbCBncHVf YWN0aXZlKQogCSAqCiAJICogV2Ugc3RhcnQgd2l0aCBhIGJpdG1hc2sgb2YgYWxsIGN1cnJlbnRs eSBlbmFibGVkIGV2ZW50cy4KIAkgKi8KLQllbmFibGUgPSBpOTE1LT5wbXUuZW5hYmxlOworCWVu YWJsZSA9IHBtdS0+ZW5hYmxlOwogCiAJLyoKIAkgKiBNYXNrIG91dCBhbGwgdGhlIG9uZXMgd2hp Y2ggZG8gbm90IG5lZWQgdGhlIHRpbWVyLCBvciBpbgpAQCAtMTE0LDI0ICsxMTUsMjYgQEAgc3Rh dGljIGJvb2wgcG11X25lZWRzX3RpbWVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LCBi b29sIGdwdV9hY3RpdmUpCiAKIHZvaWQgaTkxNV9wbXVfZ3RfcGFya2VkKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICppOTE1KQogewotCWlmICghaTkxNS0+cG11LmJhc2UuZXZlbnRfaW5pdCkKKwlz dHJ1Y3QgaTkxNV9wbXUgKnBtdSA9ICZpOTE1LT5wbXU7CisKKwlpZiAoIXBtdS0+YmFzZS5ldmVu dF9pbml0KQogCQlyZXR1cm47CiAKLQlzcGluX2xvY2tfaXJxKCZpOTE1LT5wbXUubG9jayk7CisJ c3Bpbl9sb2NrX2lycSgmcG11LT5sb2NrKTsKIAkvKgogCSAqIFNpZ25hbCBzYW1wbGluZyB0aW1l ciB0byBzdG9wIGlmIG9ubHkgZW5naW5lIGV2ZW50cyBhcmUgZW5hYmxlZCBhbmQKIAkgKiBHUFUg d2VudCBpZGxlLgogCSAqLwotCWk5MTUtPnBtdS50aW1lcl9lbmFibGVkID0gcG11X25lZWRzX3Rp bWVyKGk5MTUsIGZhbHNlKTsKLQlzcGluX3VubG9ja19pcnEoJmk5MTUtPnBtdS5sb2NrKTsKKwlw bXUtPnRpbWVyX2VuYWJsZWQgPSBwbXVfbmVlZHNfdGltZXIocG11LCBmYWxzZSk7CisJc3Bpbl91 bmxvY2tfaXJxKCZwbXUtPmxvY2spOwogfQogCi1zdGF0aWMgdm9pZCBfX2k5MTVfcG11X21heWJl X3N0YXJ0X3RpbWVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQorc3RhdGljIHZvaWQg X19pOTE1X3BtdV9tYXliZV9zdGFydF90aW1lcihzdHJ1Y3QgaTkxNV9wbXUgKnBtdSkKIHsKLQlp ZiAoIWk5MTUtPnBtdS50aW1lcl9lbmFibGVkICYmIHBtdV9uZWVkc190aW1lcihpOTE1LCB0cnVl KSkgewotCQlpOTE1LT5wbXUudGltZXJfZW5hYmxlZCA9IHRydWU7Ci0JCWk5MTUtPnBtdS50aW1l cl9sYXN0ID0ga3RpbWVfZ2V0KCk7Ci0JCWhydGltZXJfc3RhcnRfcmFuZ2VfbnMoJmk5MTUtPnBt dS50aW1lciwKKwlpZiAoIXBtdS0+dGltZXJfZW5hYmxlZCAmJiBwbXVfbmVlZHNfdGltZXIocG11 LCB0cnVlKSkgeworCQlwbXUtPnRpbWVyX2VuYWJsZWQgPSB0cnVlOworCQlwbXUtPnRpbWVyX2xh c3QgPSBrdGltZV9nZXQoKTsKKwkJaHJ0aW1lcl9zdGFydF9yYW5nZV9ucygmcG11LT50aW1lciwK IAkJCQkgICAgICAgbnNfdG9fa3RpbWUoUEVSSU9EKSwgMCwKIAkJCQkgICAgICAgSFJUSU1FUl9N T0RFX1JFTF9QSU5ORUQpOwogCX0KQEAgLTEzOSwxNSArMTQyLDE3IEBAIHN0YXRpYyB2b2lkIF9f aTkxNV9wbXVfbWF5YmVfc3RhcnRfdGltZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUp CiAKIHZvaWQgaTkxNV9wbXVfZ3RfdW5wYXJrZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5 MTUpCiB7Ci0JaWYgKCFpOTE1LT5wbXUuYmFzZS5ldmVudF9pbml0KQorCXN0cnVjdCBpOTE1X3Bt dSAqcG11ID0gJmk5MTUtPnBtdTsKKworCWlmICghcG11LT5iYXNlLmV2ZW50X2luaXQpCiAJCXJl dHVybjsKIAotCXNwaW5fbG9ja19pcnEoJmk5MTUtPnBtdS5sb2NrKTsKKwlzcGluX2xvY2tfaXJx KCZwbXUtPmxvY2spOwogCS8qCiAJICogUmUtZW5hYmxlIHNhbXBsaW5nIHRpbWVyIHdoZW4gR1BV IGdvZXMgYWN0aXZlLgogCSAqLwotCV9faTkxNV9wbXVfbWF5YmVfc3RhcnRfdGltZXIoaTkxNSk7 Ci0Jc3Bpbl91bmxvY2tfaXJxKCZpOTE1LT5wbXUubG9jayk7CisJX19pOTE1X3BtdV9tYXliZV9z dGFydF90aW1lcihwbXUpOworCXNwaW5fdW5sb2NrX2lycSgmcG11LT5sb2NrKTsKIH0KIAogc3Rh dGljIHZvaWQKQEAgLTI1MSwxNSArMjU2LDE2IEBAIHN0YXRpYyBlbnVtIGhydGltZXJfcmVzdGFy dCBpOTE1X3NhbXBsZShzdHJ1Y3QgaHJ0aW1lciAqaHJ0aW1lcikKIHsKIAlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqaTkxNSA9CiAJCWNvbnRhaW5lcl9vZihocnRpbWVyLCBzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSwgcG11LnRpbWVyKTsKKwlzdHJ1Y3QgaTkxNV9wbXUgKnBtdSA9ICZpOTE1LT5w bXU7CiAJdW5zaWduZWQgaW50IHBlcmlvZF9uczsKIAlrdGltZV90IG5vdzsKIAotCWlmICghUkVB RF9PTkNFKGk5MTUtPnBtdS50aW1lcl9lbmFibGVkKSkKKwlpZiAoIVJFQURfT05DRShwbXUtPnRp bWVyX2VuYWJsZWQpKQogCQlyZXR1cm4gSFJUSU1FUl9OT1JFU1RBUlQ7CiAKIAlub3cgPSBrdGlt ZV9nZXQoKTsKLQlwZXJpb2RfbnMgPSBrdGltZV90b19ucyhrdGltZV9zdWIobm93LCBpOTE1LT5w bXUudGltZXJfbGFzdCkpOwotCWk5MTUtPnBtdS50aW1lcl9sYXN0ID0gbm93OworCXBlcmlvZF9u cyA9IGt0aW1lX3RvX25zKGt0aW1lX3N1Yihub3csIHBtdS0+dGltZXJfbGFzdCkpOworCXBtdS0+ dGltZXJfbGFzdCA9IG5vdzsKIAogCS8qCiAJICogU3RyaWN0bHkgc3BlYWtpbmcgdGhlIHBhc3Nl ZCBpbiBwZXJpb2QgbWF5IG5vdCBiZSAxMDAlIGFjY3VyYXRlIGZvcgpAQCAtNDQzLDYgKzQ0OSw3 IEBAIHN0YXRpYyB1NjQgZ2V0X3JjNihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIHsK ICNpZiBJU19FTkFCTEVEKENPTkZJR19QTSkKIAlzdHJ1Y3QgaW50ZWxfcnVudGltZV9wbSAqcnBt ID0gJmk5MTUtPnJ1bnRpbWVfcG07CisJc3RydWN0IGk5MTVfcG11ICpwbXUgPSAmaTkxNS0+cG11 OwogCWludGVsX3dha2VyZWZfdCB3YWtlcmVmOwogCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CiAJdTY0 IHZhbDsKQEAgLTQ1OCwxNiArNDY1LDE2IEBAIHN0YXRpYyB1NjQgZ2V0X3JjNihzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqaTkxNSkKIAkJICogcHJldmlvdXNseS4KIAkJICovCiAKLQkJc3Bpbl9s b2NrX2lycXNhdmUoJmk5MTUtPnBtdS5sb2NrLCBmbGFncyk7CisJCXNwaW5fbG9ja19pcnFzYXZl KCZwbXUtPmxvY2ssIGZsYWdzKTsKIAotCQlpZiAodmFsID49IGk5MTUtPnBtdS5zYW1wbGVbX19J OTE1X1NBTVBMRV9SQzZfRVNUSU1BVEVEXS5jdXIpIHsKLQkJCWk5MTUtPnBtdS5zYW1wbGVbX19J OTE1X1NBTVBMRV9SQzZfRVNUSU1BVEVEXS5jdXIgPSAwOwotCQkJaTkxNS0+cG11LnNhbXBsZVtf X0k5MTVfU0FNUExFX1JDNl0uY3VyID0gdmFsOworCQlpZiAodmFsID49IHBtdS0+c2FtcGxlW19f STkxNV9TQU1QTEVfUkM2X0VTVElNQVRFRF0uY3VyKSB7CisJCQlwbXUtPnNhbXBsZVtfX0k5MTVf U0FNUExFX1JDNl9FU1RJTUFURURdLmN1ciA9IDA7CisJCQlwbXUtPnNhbXBsZVtfX0k5MTVfU0FN UExFX1JDNl0uY3VyID0gdmFsOwogCQl9IGVsc2UgewotCQkJdmFsID0gaTkxNS0+cG11LnNhbXBs ZVtfX0k5MTVfU0FNUExFX1JDNl9FU1RJTUFURURdLmN1cjsKKwkJCXZhbCA9IHBtdS0+c2FtcGxl W19fSTkxNV9TQU1QTEVfUkM2X0VTVElNQVRFRF0uY3VyOwogCQl9CiAKLQkJc3Bpbl91bmxvY2tf aXJxcmVzdG9yZSgmaTkxNS0+cG11LmxvY2ssIGZsYWdzKTsKKwkJc3Bpbl91bmxvY2tfaXJxcmVz dG9yZSgmcG11LT5sb2NrLCBmbGFncyk7CiAJfSBlbHNlIHsKIAkJc3RydWN0IGRldmljZSAqa2Rl diA9IHJwbS0+a2RldjsKIApAQCAtNDc4LDcgKzQ4NSw3IEBAIHN0YXRpYyB1NjQgZ2V0X3JjNihz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIAkJICogb24gdG9wIG9mIHRoZSBsYXN0IGtu b3duIHJlYWwgdmFsdWUsIGFzIHRoZSBhcHByb3hpbWF0ZWQgUkM2CiAJCSAqIGNvdW50ZXIgdmFs dWUuCiAJCSAqLwotCQlzcGluX2xvY2tfaXJxc2F2ZSgmaTkxNS0+cG11LmxvY2ssIGZsYWdzKTsK KwkJc3Bpbl9sb2NrX2lycXNhdmUoJnBtdS0+bG9jaywgZmxhZ3MpOwogCiAJCS8qCiAJCSAqIEFm dGVyIHRoZSBhYm92ZSBicmFuY2ggaW50ZWxfcnVudGltZV9wbV9nZXRfaWZfaW5fdXNlIGZhaWxl ZApAQCAtNDk0LDIwICs1MDEsMjAgQEAgc3RhdGljIHU2NCBnZXRfcmM2KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICppOTE1KQogCQlpZiAocG1fcnVudGltZV9zdGF0dXNfc3VzcGVuZGVkKGtkZXYp KSB7CiAJCQl2YWwgPSBwbV9ydW50aW1lX3N1c3BlbmRlZF90aW1lKGtkZXYpOwogCi0JCQlpZiAo IWk5MTUtPnBtdS5zYW1wbGVbX19JOTE1X1NBTVBMRV9SQzZfRVNUSU1BVEVEXS5jdXIpCi0JCQkJ aTkxNS0+cG11LnN1c3BlbmRlZF90aW1lX2xhc3QgPSB2YWw7CisJCQlpZiAoIXBtdS0+c2FtcGxl W19fSTkxNV9TQU1QTEVfUkM2X0VTVElNQVRFRF0uY3VyKQorCQkJCXBtdS0+c3VzcGVuZGVkX3Rp bWVfbGFzdCA9IHZhbDsKIAotCQkJdmFsIC09IGk5MTUtPnBtdS5zdXNwZW5kZWRfdGltZV9sYXN0 OwotCQkJdmFsICs9IGk5MTUtPnBtdS5zYW1wbGVbX19JOTE1X1NBTVBMRV9SQzZdLmN1cjsKKwkJ CXZhbCAtPSBwbXUtPnN1c3BlbmRlZF90aW1lX2xhc3Q7CisJCQl2YWwgKz0gcG11LT5zYW1wbGVb X19JOTE1X1NBTVBMRV9SQzZdLmN1cjsKIAotCQkJaTkxNS0+cG11LnNhbXBsZVtfX0k5MTVfU0FN UExFX1JDNl9FU1RJTUFURURdLmN1ciA9IHZhbDsKLQkJfSBlbHNlIGlmIChpOTE1LT5wbXUuc2Ft cGxlW19fSTkxNV9TQU1QTEVfUkM2X0VTVElNQVRFRF0uY3VyKSB7Ci0JCQl2YWwgPSBpOTE1LT5w bXUuc2FtcGxlW19fSTkxNV9TQU1QTEVfUkM2X0VTVElNQVRFRF0uY3VyOworCQkJcG11LT5zYW1w bGVbX19JOTE1X1NBTVBMRV9SQzZfRVNUSU1BVEVEXS5jdXIgPSB2YWw7CisJCX0gZWxzZSBpZiAo cG11LT5zYW1wbGVbX19JOTE1X1NBTVBMRV9SQzZfRVNUSU1BVEVEXS5jdXIpIHsKKwkJCXZhbCA9 IHBtdS0+c2FtcGxlW19fSTkxNV9TQU1QTEVfUkM2X0VTVElNQVRFRF0uY3VyOwogCQl9IGVsc2Ug ewotCQkJdmFsID0gaTkxNS0+cG11LnNhbXBsZVtfX0k5MTVfU0FNUExFX1JDNl0uY3VyOworCQkJ dmFsID0gcG11LT5zYW1wbGVbX19JOTE1X1NBTVBMRV9SQzZdLmN1cjsKIAkJfQogCi0JCXNwaW5f dW5sb2NrX2lycXJlc3RvcmUoJmk5MTUtPnBtdS5sb2NrLCBmbGFncyk7CisJCXNwaW5fdW5sb2Nr X2lycXJlc3RvcmUoJnBtdS0+bG9jaywgZmxhZ3MpOwogCX0KIAogCXJldHVybiB2YWw7CkBAIC01 MjAsNiArNTI3LDcgQEAgc3RhdGljIHU2NCBfX2k5MTVfcG11X2V2ZW50X3JlYWQoc3RydWN0IHBl cmZfZXZlbnQgKmV2ZW50KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0KIAkJ Y29udGFpbmVyX29mKGV2ZW50LT5wbXUsIHR5cGVvZigqaTkxNSksIHBtdS5iYXNlKTsKKwlzdHJ1 Y3QgaTkxNV9wbXUgKnBtdSA9ICZpOTE1LT5wbXU7CiAJdTY0IHZhbCA9IDA7CiAKIAlpZiAoaXNf ZW5naW5lX2V2ZW50KGV2ZW50KSkgewpAQCAtNTQyLDEyICs1NTAsMTIgQEAgc3RhdGljIHU2NCBf X2k5MTVfcG11X2V2ZW50X3JlYWQoc3RydWN0IHBlcmZfZXZlbnQgKmV2ZW50KQogCQlzd2l0Y2gg KGV2ZW50LT5hdHRyLmNvbmZpZykgewogCQljYXNlIEk5MTVfUE1VX0FDVFVBTF9GUkVRVUVOQ1k6 CiAJCQl2YWwgPQotCQkJICAgZGl2X3U2NChpOTE1LT5wbXUuc2FtcGxlW19fSTkxNV9TQU1QTEVf RlJFUV9BQ1RdLmN1ciwKKwkJCSAgIGRpdl91NjQocG11LT5zYW1wbGVbX19JOTE1X1NBTVBMRV9G UkVRX0FDVF0uY3VyLAogCQkJCSAgIFVTRUNfUEVSX1NFQyAvKiB0byBNSHogKi8pOwogCQkJYnJl YWs7CiAJCWNhc2UgSTkxNV9QTVVfUkVRVUVTVEVEX0ZSRVFVRU5DWToKIAkJCXZhbCA9Ci0JCQkg ICBkaXZfdTY0KGk5MTUtPnBtdS5zYW1wbGVbX19JOTE1X1NBTVBMRV9GUkVRX1JFUV0uY3VyLAor CQkJICAgZGl2X3U2NChwbXUtPnNhbXBsZVtfX0k5MTVfU0FNUExFX0ZSRVFfUkVRXS5jdXIsCiAJ CQkJICAgVVNFQ19QRVJfU0VDIC8qIHRvIE1IeiAqLyk7CiAJCQlicmVhazsKIAkJY2FzZSBJOTE1 X1BNVV9JTlRFUlJVUFRTOgpAQCAtNTgyLDI0ICs1OTAsMjUgQEAgc3RhdGljIHZvaWQgaTkxNV9w bXVfZW5hYmxlKHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqaTkxNSA9CiAJCWNvbnRhaW5lcl9vZihldmVudC0+cG11LCB0eXBlb2YoKmk5MTUpLCBw bXUuYmFzZSk7CiAJdW5zaWduZWQgaW50IGJpdCA9IGV2ZW50X2VuYWJsZWRfYml0KGV2ZW50KTsK KwlzdHJ1Y3QgaTkxNV9wbXUgKnBtdSA9ICZpOTE1LT5wbXU7CiAJdW5zaWduZWQgbG9uZyBmbGFn czsKIAotCXNwaW5fbG9ja19pcnFzYXZlKCZpOTE1LT5wbXUubG9jaywgZmxhZ3MpOworCXNwaW5f bG9ja19pcnFzYXZlKCZwbXUtPmxvY2ssIGZsYWdzKTsKIAogCS8qCiAJICogVXBkYXRlIHRoZSBi aXRtYXNrIG9mIGVuYWJsZWQgZXZlbnRzIGFuZCBpbmNyZW1lbnQKIAkgKiB0aGUgZXZlbnQgcmVm ZXJlbmNlIGNvdW50ZXIuCiAJICovCi0JQlVJTERfQlVHX09OKEFSUkFZX1NJWkUoaTkxNS0+cG11 LmVuYWJsZV9jb3VudCkgIT0gSTkxNV9QTVVfTUFTS19CSVRTKTsKLQlHRU1fQlVHX09OKGJpdCA+ PSBBUlJBWV9TSVpFKGk5MTUtPnBtdS5lbmFibGVfY291bnQpKTsKLQlHRU1fQlVHX09OKGk5MTUt PnBtdS5lbmFibGVfY291bnRbYml0XSA9PSB+MCk7Ci0JaTkxNS0+cG11LmVuYWJsZSB8PSBCSVRf VUxMKGJpdCk7Ci0JaTkxNS0+cG11LmVuYWJsZV9jb3VudFtiaXRdKys7CisJQlVJTERfQlVHX09O KEFSUkFZX1NJWkUocG11LT5lbmFibGVfY291bnQpICE9IEk5MTVfUE1VX01BU0tfQklUUyk7CisJ R0VNX0JVR19PTihiaXQgPj0gQVJSQVlfU0laRShwbXUtPmVuYWJsZV9jb3VudCkpOworCUdFTV9C VUdfT04ocG11LT5lbmFibGVfY291bnRbYml0XSA9PSB+MCk7CisJcG11LT5lbmFibGUgfD0gQklU X1VMTChiaXQpOworCXBtdS0+ZW5hYmxlX2NvdW50W2JpdF0rKzsKIAogCS8qCiAJICogU3RhcnQg dGhlIHNhbXBsaW5nIHRpbWVyIGlmIG5lZWRlZCBhbmQgbm90IGFscmVhZHkgZW5hYmxlZC4KIAkg Ki8KLQlfX2k5MTVfcG11X21heWJlX3N0YXJ0X3RpbWVyKGk5MTUpOworCV9faTkxNV9wbXVfbWF5 YmVfc3RhcnRfdGltZXIocG11KTsKIAogCS8qCiAJICogRm9yIHBlci1lbmdpbmUgZXZlbnRzIHRo ZSBiaXRtYXNrIGFuZCByZWZlcmVuY2UgY291bnRpbmcKQEAgLTYyNSw3ICs2MzQsNyBAQCBzdGF0 aWMgdm9pZCBpOTE1X3BtdV9lbmFibGUoc3RydWN0IHBlcmZfZXZlbnQgKmV2ZW50KQogCQllbmdp bmUtPnBtdS5lbmFibGVfY291bnRbc2FtcGxlXSsrOwogCX0KIAotCXNwaW5fdW5sb2NrX2lycXJl c3RvcmUoJmk5MTUtPnBtdS5sb2NrLCBmbGFncyk7CisJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgm cG11LT5sb2NrLCBmbGFncyk7CiAKIAkvKgogCSAqIFN0b3JlIHRoZSBjdXJyZW50IGNvdW50ZXIg dmFsdWUgc28gd2UgY2FuIHJlcG9ydCB0aGUgY29ycmVjdCBkZWx0YQpAQCAtNjQwLDkgKzY0OSwx MCBAQCBzdGF0aWMgdm9pZCBpOTE1X3BtdV9kaXNhYmxlKHN0cnVjdCBwZXJmX2V2ZW50ICpldmVu dCkKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9CiAJCWNvbnRhaW5lcl9vZihldmVu dC0+cG11LCB0eXBlb2YoKmk5MTUpLCBwbXUuYmFzZSk7CiAJdW5zaWduZWQgaW50IGJpdCA9IGV2 ZW50X2VuYWJsZWRfYml0KGV2ZW50KTsKKwlzdHJ1Y3QgaTkxNV9wbXUgKnBtdSA9ICZpOTE1LT5w bXU7CiAJdW5zaWduZWQgbG9uZyBmbGFnczsKIAotCXNwaW5fbG9ja19pcnFzYXZlKCZpOTE1LT5w bXUubG9jaywgZmxhZ3MpOworCXNwaW5fbG9ja19pcnFzYXZlKCZwbXUtPmxvY2ssIGZsYWdzKTsK IAogCWlmIChpc19lbmdpbmVfZXZlbnQoZXZlbnQpKSB7CiAJCXU4IHNhbXBsZSA9IGVuZ2luZV9l dmVudF9zYW1wbGUoZXZlbnQpOwpAQCAtNjY0LDE4ICs2NzQsMTggQEAgc3RhdGljIHZvaWQgaTkx NV9wbXVfZGlzYWJsZShzdHJ1Y3QgcGVyZl9ldmVudCAqZXZlbnQpCiAJCQllbmdpbmUtPnBtdS5l bmFibGUgJj0gfkJJVChzYW1wbGUpOwogCX0KIAotCUdFTV9CVUdfT04oYml0ID49IEFSUkFZX1NJ WkUoaTkxNS0+cG11LmVuYWJsZV9jb3VudCkpOwotCUdFTV9CVUdfT04oaTkxNS0+cG11LmVuYWJs ZV9jb3VudFtiaXRdID09IDApOworCUdFTV9CVUdfT04oYml0ID49IEFSUkFZX1NJWkUocG11LT5l bmFibGVfY291bnQpKTsKKwlHRU1fQlVHX09OKHBtdS0+ZW5hYmxlX2NvdW50W2JpdF0gPT0gMCk7 CiAJLyoKIAkgKiBEZWNyZW1lbnQgdGhlIHJlZmVyZW5jZSBjb3VudCBhbmQgY2xlYXIgdGhlIGVu YWJsZWQKIAkgKiBiaXRtYXNrIHdoZW4gdGhlIGxhc3QgbGlzdGVuZXIgb24gYW4gZXZlbnQgZ29l cyBhd2F5LgogCSAqLwotCWlmICgtLWk5MTUtPnBtdS5lbmFibGVfY291bnRbYml0XSA9PSAwKSB7 Ci0JCWk5MTUtPnBtdS5lbmFibGUgJj0gfkJJVF9VTEwoYml0KTsKLQkJaTkxNS0+cG11LnRpbWVy X2VuYWJsZWQgJj0gcG11X25lZWRzX3RpbWVyKGk5MTUsIHRydWUpOworCWlmICgtLXBtdS0+ZW5h YmxlX2NvdW50W2JpdF0gPT0gMCkgeworCQlwbXUtPmVuYWJsZSAmPSB+QklUX1VMTChiaXQpOwor CQlwbXUtPnRpbWVyX2VuYWJsZWQgJj0gcG11X25lZWRzX3RpbWVyKHBtdSwgdHJ1ZSk7CiAJfQog Ci0Jc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmaTkxNS0+cG11LmxvY2ssIGZsYWdzKTsKKwlzcGlu X3VubG9ja19pcnFyZXN0b3JlKCZwbXUtPmxvY2ssIGZsYWdzKTsKIH0KIAogc3RhdGljIHZvaWQg aTkxNV9wbXVfZXZlbnRfc3RhcnQoc3RydWN0IHBlcmZfZXZlbnQgKmV2ZW50LCBpbnQgZmxhZ3Mp CkBAIC04MjQsOCArODM0LDkgQEAgYWRkX3BtdV9hdHRyKHN0cnVjdCBwZXJmX3BtdV9ldmVudHNf YXR0ciAqYXR0ciwgY29uc3QgY2hhciAqbmFtZSwKIH0KIAogc3RhdGljIHN0cnVjdCBhdHRyaWJ1 dGUgKioKLWNyZWF0ZV9ldmVudF9hdHRyaWJ1dGVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpp OTE1KQorY3JlYXRlX2V2ZW50X2F0dHJpYnV0ZXMoc3RydWN0IGk5MTVfcG11ICpwbXUpCiB7CisJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUgPSBjb250YWluZXJfb2YocG11LCB0eXBlb2Yo Kmk5MTUpLCBwbXUpOwogCXN0YXRpYyBjb25zdCBzdHJ1Y3QgewogCQl1NjQgY29uZmlnOwogCQlj b25zdCBjaGFyICpuYW1lOwpAQCAtOTM5LDggKzk1MCw4IEBAIGNyZWF0ZV9ldmVudF9hdHRyaWJ1 dGVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogCQl9CiAJfQogCi0JaTkxNS0+cG11 Lmk5MTVfYXR0ciA9IGk5MTVfYXR0cjsKLQlpOTE1LT5wbXUucG11X2F0dHIgPSBwbXVfYXR0cjsK KwlwbXUtPmk5MTVfYXR0ciA9IGk5MTVfYXR0cjsKKwlwbXUtPnBtdV9hdHRyID0gcG11X2F0dHI7 CiAKIAlyZXR1cm4gYXR0cjsKIApAQCAtOTU2LDcgKzk2Nyw3IEBAIGVycjo7CiAJcmV0dXJuIE5V TEw7CiB9CiAKLXN0YXRpYyB2b2lkIGZyZWVfZXZlbnRfYXR0cmlidXRlcyhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqaTkxNSkKK3N0YXRpYyB2b2lkIGZyZWVfZXZlbnRfYXR0cmlidXRlcyhzdHJ1 Y3QgaTkxNV9wbXUgKnBtdSkKIHsKIAlzdHJ1Y3QgYXR0cmlidXRlICoqYXR0cl9pdGVyID0gaTkx NV9wbXVfZXZlbnRzX2F0dHJfZ3JvdXAuYXR0cnM7CiAKQEAgLTk2NCwxMiArOTc1LDEyIEBAIHN0 YXRpYyB2b2lkIGZyZWVfZXZlbnRfYXR0cmlidXRlcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq aTkxNSkKIAkJa2ZyZWUoKCphdHRyX2l0ZXIpLT5uYW1lKTsKIAogCWtmcmVlKGk5MTVfcG11X2V2 ZW50c19hdHRyX2dyb3VwLmF0dHJzKTsKLQlrZnJlZShpOTE1LT5wbXUuaTkxNV9hdHRyKTsKLQlr ZnJlZShpOTE1LT5wbXUucG11X2F0dHIpOworCWtmcmVlKHBtdS0+aTkxNV9hdHRyKTsKKwlrZnJl ZShwbXUtPnBtdV9hdHRyKTsKIAogCWk5MTVfcG11X2V2ZW50c19hdHRyX2dyb3VwLmF0dHJzID0g TlVMTDsKLQlpOTE1LT5wbXUuaTkxNV9hdHRyID0gTlVMTDsKLQlpOTE1LT5wbXUucG11X2F0dHIg PSBOVUxMOworCXBtdS0+aTkxNV9hdHRyID0gTlVMTDsKKwlwbXUtPnBtdV9hdHRyID0gTlVMTDsK IH0KIAogc3RhdGljIGludCBpOTE1X3BtdV9jcHVfb25saW5lKHVuc2lnbmVkIGludCBjcHUsIHN0 cnVjdCBobGlzdF9ub2RlICpub2RlKQpAQCAtMTAwNiw3ICsxMDE3LDcgQEAgc3RhdGljIGludCBp OTE1X3BtdV9jcHVfb2ZmbGluZSh1bnNpZ25lZCBpbnQgY3B1LCBzdHJ1Y3QgaGxpc3Rfbm9kZSAq bm9kZSkKIAogc3RhdGljIGVudW0gY3B1aHBfc3RhdGUgY3B1aHBfc2xvdCA9IENQVUhQX0lOVkFM SUQ7CiAKLXN0YXRpYyBpbnQgaTkxNV9wbXVfcmVnaXN0ZXJfY3B1aHBfc3RhdGUoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmk5MTUpCitzdGF0aWMgaW50IGk5MTVfcG11X3JlZ2lzdGVyX2NwdWhw X3N0YXRlKHN0cnVjdCBpOTE1X3BtdSAqcG11KQogewogCWVudW0gY3B1aHBfc3RhdGUgc2xvdDsK IAlpbnQgcmV0OwpAQCAtMTAxOSw3ICsxMDMwLDcgQEAgc3RhdGljIGludCBpOTE1X3BtdV9yZWdp c3Rlcl9jcHVocF9zdGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIAkJcmV0dXJu IHJldDsKIAogCXNsb3QgPSByZXQ7Ci0JcmV0ID0gY3B1aHBfc3RhdGVfYWRkX2luc3RhbmNlKHNs b3QsICZpOTE1LT5wbXUubm9kZSk7CisJcmV0ID0gY3B1aHBfc3RhdGVfYWRkX2luc3RhbmNlKHNs b3QsICZwbXUtPm5vZGUpOwogCWlmIChyZXQpIHsKIAkJY3B1aHBfcmVtb3ZlX211bHRpX3N0YXRl KHNsb3QpOwogCQlyZXR1cm4gcmV0OwpAQCAtMTAyOSwxNSArMTA0MCwxNiBAQCBzdGF0aWMgaW50 IGk5MTVfcG11X3JlZ2lzdGVyX2NwdWhwX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpp OTE1KQogCXJldHVybiAwOwogfQogCi1zdGF0aWMgdm9pZCBpOTE1X3BtdV91bnJlZ2lzdGVyX2Nw dWhwX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQorc3RhdGljIHZvaWQgaTkx NV9wbXVfdW5yZWdpc3Rlcl9jcHVocF9zdGF0ZShzdHJ1Y3QgaTkxNV9wbXUgKnBtdSkKIHsKIAlX QVJOX09OKGNwdWhwX3Nsb3QgPT0gQ1BVSFBfSU5WQUxJRCk7Ci0JV0FSTl9PTihjcHVocF9zdGF0 ZV9yZW1vdmVfaW5zdGFuY2UoY3B1aHBfc2xvdCwgJmk5MTUtPnBtdS5ub2RlKSk7CisJV0FSTl9P TihjcHVocF9zdGF0ZV9yZW1vdmVfaW5zdGFuY2UoY3B1aHBfc2xvdCwgJnBtdS0+bm9kZSkpOwog CWNwdWhwX3JlbW92ZV9tdWx0aV9zdGF0ZShjcHVocF9zbG90KTsKIH0KIAogdm9pZCBpOTE1X3Bt dV9yZWdpc3RlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIHsKKwlzdHJ1Y3QgaTkx NV9wbXUgKnBtdSA9ICZpOTE1LT5wbXU7CiAJaW50IHJldDsKIAogCWlmIChJTlRFTF9HRU4oaTkx NSkgPD0gMikgewpAQCAtMTA0NSw1NiArMTA1Nyw1OCBAQCB2b2lkIGk5MTVfcG11X3JlZ2lzdGVy KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogCQlyZXR1cm47CiAJfQogCi0JaTkxNV9w bXVfZXZlbnRzX2F0dHJfZ3JvdXAuYXR0cnMgPSBjcmVhdGVfZXZlbnRfYXR0cmlidXRlcyhpOTE1 KTsKKwlpOTE1X3BtdV9ldmVudHNfYXR0cl9ncm91cC5hdHRycyA9IGNyZWF0ZV9ldmVudF9hdHRy aWJ1dGVzKHBtdSk7CiAJaWYgKCFpOTE1X3BtdV9ldmVudHNfYXR0cl9ncm91cC5hdHRycykgewog CQlyZXQgPSAtRU5PTUVNOwogCQlnb3RvIGVycjsKIAl9CiAKLQlpOTE1LT5wbXUuYmFzZS5hdHRy X2dyb3Vwcwk9IGk5MTVfcG11X2F0dHJfZ3JvdXBzOwotCWk5MTUtPnBtdS5iYXNlLnRhc2tfY3R4 X25yCT0gcGVyZl9pbnZhbGlkX2NvbnRleHQ7Ci0JaTkxNS0+cG11LmJhc2UuZXZlbnRfaW5pdAk9 IGk5MTVfcG11X2V2ZW50X2luaXQ7Ci0JaTkxNS0+cG11LmJhc2UuYWRkCQk9IGk5MTVfcG11X2V2 ZW50X2FkZDsKLQlpOTE1LT5wbXUuYmFzZS5kZWwJCT0gaTkxNV9wbXVfZXZlbnRfZGVsOwotCWk5 MTUtPnBtdS5iYXNlLnN0YXJ0CQk9IGk5MTVfcG11X2V2ZW50X3N0YXJ0OwotCWk5MTUtPnBtdS5i YXNlLnN0b3AJCT0gaTkxNV9wbXVfZXZlbnRfc3RvcDsKLQlpOTE1LT5wbXUuYmFzZS5yZWFkCQk9 IGk5MTVfcG11X2V2ZW50X3JlYWQ7Ci0JaTkxNS0+cG11LmJhc2UuZXZlbnRfaWR4CT0gaTkxNV9w bXVfZXZlbnRfZXZlbnRfaWR4OwotCi0Jc3Bpbl9sb2NrX2luaXQoJmk5MTUtPnBtdS5sb2NrKTsK LQlocnRpbWVyX2luaXQoJmk5MTUtPnBtdS50aW1lciwgQ0xPQ0tfTU9OT1RPTklDLCBIUlRJTUVS X01PREVfUkVMKTsKLQlpOTE1LT5wbXUudGltZXIuZnVuY3Rpb24gPSBpOTE1X3NhbXBsZTsKLQot CXJldCA9IHBlcmZfcG11X3JlZ2lzdGVyKCZpOTE1LT5wbXUuYmFzZSwgImk5MTUiLCAtMSk7CisJ cG11LT5iYXNlLmF0dHJfZ3JvdXBzCT0gaTkxNV9wbXVfYXR0cl9ncm91cHM7CisJcG11LT5iYXNl LnRhc2tfY3R4X25yCT0gcGVyZl9pbnZhbGlkX2NvbnRleHQ7CisJcG11LT5iYXNlLmV2ZW50X2lu aXQJPSBpOTE1X3BtdV9ldmVudF9pbml0OworCXBtdS0+YmFzZS5hZGQJCT0gaTkxNV9wbXVfZXZl bnRfYWRkOworCXBtdS0+YmFzZS5kZWwJCT0gaTkxNV9wbXVfZXZlbnRfZGVsOworCXBtdS0+YmFz ZS5zdGFydAkJPSBpOTE1X3BtdV9ldmVudF9zdGFydDsKKwlwbXUtPmJhc2Uuc3RvcAkJPSBpOTE1 X3BtdV9ldmVudF9zdG9wOworCXBtdS0+YmFzZS5yZWFkCQk9IGk5MTVfcG11X2V2ZW50X3JlYWQ7 CisJcG11LT5iYXNlLmV2ZW50X2lkeAk9IGk5MTVfcG11X2V2ZW50X2V2ZW50X2lkeDsKKworCXNw aW5fbG9ja19pbml0KCZwbXUtPmxvY2spOworCWhydGltZXJfaW5pdCgmcG11LT50aW1lciwgQ0xP Q0tfTU9OT1RPTklDLCBIUlRJTUVSX01PREVfUkVMKTsKKwlwbXUtPnRpbWVyLmZ1bmN0aW9uID0g aTkxNV9zYW1wbGU7CisKKwlyZXQgPSBwZXJmX3BtdV9yZWdpc3RlcigmcG11LT5iYXNlLCAiaTkx NSIsIC0xKTsKIAlpZiAocmV0KQogCQlnb3RvIGVycjsKIAotCXJldCA9IGk5MTVfcG11X3JlZ2lz dGVyX2NwdWhwX3N0YXRlKGk5MTUpOworCXJldCA9IGk5MTVfcG11X3JlZ2lzdGVyX2NwdWhwX3N0 YXRlKHBtdSk7CiAJaWYgKHJldCkKIAkJZ290byBlcnJfdW5yZWc7CiAKIAlyZXR1cm47CiAKIGVy cl91bnJlZzoKLQlwZXJmX3BtdV91bnJlZ2lzdGVyKCZpOTE1LT5wbXUuYmFzZSk7CisJcGVyZl9w bXVfdW5yZWdpc3RlcigmcG11LT5iYXNlKTsKIGVycjoKLQlpOTE1LT5wbXUuYmFzZS5ldmVudF9p bml0ID0gTlVMTDsKLQlmcmVlX2V2ZW50X2F0dHJpYnV0ZXMoaTkxNSk7CisJcG11LT5iYXNlLmV2 ZW50X2luaXQgPSBOVUxMOworCWZyZWVfZXZlbnRfYXR0cmlidXRlcyhwbXUpOwogCURSTV9OT1RF KCJGYWlsZWQgdG8gcmVnaXN0ZXIgUE1VISAoZXJyPSVkKVxuIiwgcmV0KTsKIH0KIAogdm9pZCBp OTE1X3BtdV91bnJlZ2lzdGVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogewotCWlm ICghaTkxNS0+cG11LmJhc2UuZXZlbnRfaW5pdCkKKwlzdHJ1Y3QgaTkxNV9wbXUgKnBtdSA9ICZp OTE1LT5wbXU7CisKKwlpZiAoIXBtdS0+YmFzZS5ldmVudF9pbml0KQogCQlyZXR1cm47CiAKLQlX QVJOX09OKGk5MTUtPnBtdS5lbmFibGUpOworCVdBUk5fT04ocG11LT5lbmFibGUpOwogCi0JaHJ0 aW1lcl9jYW5jZWwoJmk5MTUtPnBtdS50aW1lcik7CisJaHJ0aW1lcl9jYW5jZWwoJnBtdS0+dGlt ZXIpOwogCi0JaTkxNV9wbXVfdW5yZWdpc3Rlcl9jcHVocF9zdGF0ZShpOTE1KTsKKwlpOTE1X3Bt dV91bnJlZ2lzdGVyX2NwdWhwX3N0YXRlKHBtdSk7CiAKLQlwZXJmX3BtdV91bnJlZ2lzdGVyKCZp OTE1LT5wbXUuYmFzZSk7Ci0JaTkxNS0+cG11LmJhc2UuZXZlbnRfaW5pdCA9IE5VTEw7Ci0JZnJl ZV9ldmVudF9hdHRyaWJ1dGVzKGk5MTUpOworCXBlcmZfcG11X3VucmVnaXN0ZXIoJnBtdS0+YmFz ZSk7CisJcG11LT5iYXNlLmV2ZW50X2luaXQgPSBOVUxMOworCWZyZWVfZXZlbnRfYXR0cmlidXRl cyhwbXUpOwogfQotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZng=