From: Andres Rodriguez Subject: [PATCH 09/25] drm/amdgpu: allow split of queues with kfd at queue granularity v2 Date: Tue, 4 Apr 2017 18:05:35 -0400 Message-ID: <20170404220551.8669-10-andresx7@gmail.com> References: <20170404220551.8669-1-andresx7@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170404220551.8669-1-andresx7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: andresx7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org UHJldmlvdXNseSB0aGUgcXVldWUvcGlwZSBzcGxpdCB3aXRoIGtmZCBvcGVyYXRlZCB3aXRoIHBp cGUKZ3JhbnVsYXJpdHkuIFRoaXMgcGF0Y2ggYWxsb3dzIGFtZGdwdSB0byB0YWtlIG93bmVyc2hp cCBvZiBhbiBhcmJpdHJhcnkKc2V0IG9mIHF1ZXVlcy4KCkl0IGFsc28gY29uc29saWRhdGVzIHRo ZSBsYXN0IGZldyBtYWdpYyBudW1iZXJzIGluIHRoZSBjb21wdXRlCmluaXRpYWxpemF0aW9uIHBy b2Nlc3MgaW50byBtZWNfaW5pdC4KCnYyOiBzdXBwb3J0IGZvciBnZng5CgpSZXZpZXdlZC1ieTog RWR3YXJkIE8nQ2FsbGFnaGFuIDxmdW5mdW5jdG9yQGZvbGtsb3JlMTk4NC5uZXQ+CkFja2VkLWJ5 OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+ClNpZ25lZC1vZmYt Ynk6IEFuZHJlcyBSb2RyaWd1ZXogPGFuZHJlc3g3QGdtYWlsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaCAgICAgICAgICAgICB8ICA3ICsrKwogZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y3XzAuYyAgICAgICAgICAgfCA4MyArKysrKysrKysrKysr KysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMgICAgICAg ICAgIHwgODEgKysrKysrKysrKysrKysrKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9nZnhfdjlfMC5jICAgICAgICAgICB8IDg0ICsrKysrKysrKysrKysrKysrKysrKysrLS0K IGRyaXZlcnMvZ3B1L2RybS9hbWQvaW5jbHVkZS9rZ2Rfa2ZkX2ludGVyZmFjZS5oIHwgIDEgKwog NSBmaWxlcyBjaGFuZ2VkLCAyMTIgaW5zZXJ0aW9ucygrKSwgNDQgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAppbmRleCBiOTJmNmNiLi5lMmQ4MjQzIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaApAQCAtMzksMjAgKzM5LDIyIEBACiAjaW5jbHVkZSA8 dHRtL3R0bV9ib19hcGkuaD4KICNpbmNsdWRlIDx0dG0vdHRtX2JvX2RyaXZlci5oPgogI2luY2x1 ZGUgPHR0bS90dG1fcGxhY2VtZW50Lmg+CiAjaW5jbHVkZSA8dHRtL3R0bV9tb2R1bGUuaD4KICNp bmNsdWRlIDx0dG0vdHRtX2V4ZWNidWZfdXRpbC5oPgogCiAjaW5jbHVkZSA8ZHJtL2RybVAuaD4K ICNpbmNsdWRlIDxkcm0vZHJtX2dlbS5oPgogI2luY2x1ZGUgPGRybS9hbWRncHVfZHJtLmg+CiAK KyNpbmNsdWRlIDxrZ2Rfa2ZkX2ludGVyZmFjZS5oPgorCiAjaW5jbHVkZSAiYW1kX3NoYXJlZC5o IgogI2luY2x1ZGUgImFtZGdwdV9tb2RlLmgiCiAjaW5jbHVkZSAiYW1kZ3B1X2loLmgiCiAjaW5j bHVkZSAiYW1kZ3B1X2lycS5oIgogI2luY2x1ZGUgImFtZGdwdV91Y29kZS5oIgogI2luY2x1ZGUg ImFtZGdwdV90dG0uaCIKICNpbmNsdWRlICJhbWRncHVfcHNwLmgiCiAjaW5jbHVkZSAiYW1kZ3B1 X2dkcy5oIgogI2luY2x1ZGUgImFtZGdwdV9zeW5jLmgiCiAjaW5jbHVkZSAiYW1kZ3B1X3Jpbmcu aCIKQEAgLTg5OSwyOSArOTAxLDM0IEBAIHN0cnVjdCBhbWRncHVfcmxjIHsKIAl1MzIgcmVnX2xp c3RfZm9ybWF0X3N0YXJ0OwogCXUzMiByZWdfbGlzdF9mb3JtYXRfc2VwYXJhdGVfc3RhcnQ7CiAJ dTMyIHN0YXJ0aW5nX29mZnNldHNfc3RhcnQ7CiAJdTMyIHJlZ19saXN0X2Zvcm1hdF9zaXplX2J5 dGVzOwogCXUzMiByZWdfbGlzdF9zaXplX2J5dGVzOwogCiAJdTMyICpyZWdpc3Rlcl9saXN0X2Zv cm1hdDsKIAl1MzIgKnJlZ2lzdGVyX3Jlc3RvcmU7CiB9OwogCisjZGVmaW5lIEFNREdQVV9NQVhf UVVFVUVTIEtHRF9NQVhfUVVFVUVTCisKIHN0cnVjdCBhbWRncHVfbWVjIHsKIAlzdHJ1Y3QgYW1k Z3B1X2JvCSpocGRfZW9wX29iajsKIAl1NjQJCQlocGRfZW9wX2dwdV9hZGRyOwogCXN0cnVjdCBh bWRncHVfYm8JKm1lY19md19vYmo7CiAJdTY0CQkJbWVjX2Z3X2dwdV9hZGRyOwogCXUzMiBudW1f bWVjOwogCXUzMiBudW1fcGlwZV9wZXJfbWVjOwogCXUzMiBudW1fcXVldWVfcGVyX3BpcGU7CiAJ dm9pZAkJCSptcWRfYmFja3VwW0FNREdQVV9NQVhfQ09NUFVURV9SSU5HUyArIDFdOworCisJLyog VGhlc2UgYXJlIHRoZSByZXNvdXJjZXMgZm9yIHdoaWNoIGFtZGdwdSB0YWtlcyBvd25lcnNoaXAg Ki8KKwlERUNMQVJFX0JJVE1BUChxdWV1ZV9iaXRtYXAsIEFNREdQVV9NQVhfUVVFVUVTKTsKIH07 CiAKIHN0cnVjdCBhbWRncHVfa2lxIHsKIAl1NjQJCQllb3BfZ3B1X2FkZHI7CiAJc3RydWN0IGFt ZGdwdV9ibwkqZW9wX29iajsKIAlzdHJ1Y3QgYW1kZ3B1X3JpbmcJcmluZzsKIAlzdHJ1Y3QgYW1k Z3B1X2lycV9zcmMJaXJxOwogfTsKIAogLyoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2dmeF92N18wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjdf MC5jCmluZGV4IDMzNDAwMTIuLjA1ODZmMWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2dmeF92N18wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4 X3Y3XzAuYwpAQCAtNDIsMjEgKzQyLDIwIEBACiAjaW5jbHVkZSAiZ2NhL2dmeF83XzJfZW51bS5o IgogI2luY2x1ZGUgImdjYS9nZnhfN18yX3NoX21hc2suaCIKIAogI2luY2x1ZGUgImdtYy9nbWNf N18wX2QuaCIKICNpbmNsdWRlICJnbWMvZ21jXzdfMF9zaF9tYXNrLmgiCiAKICNpbmNsdWRlICJv c3Mvb3NzXzJfMF9kLmgiCiAjaW5jbHVkZSAib3NzL29zc18yXzBfc2hfbWFzay5oIgogCiAjZGVm aW5lIEdGWDdfTlVNX0dGWF9SSU5HUyAgICAgMQotI2RlZmluZSBHRlg3X05VTV9DT01QVVRFX1JJ TkdTIDgKICNkZWZpbmUgR0ZYN19NRUNfSFBEX1NJWkUgICAgICAyMDQ4CiAKIAogc3RhdGljIHZv aWQgZ2Z4X3Y3XzBfc2V0X3JpbmdfZnVuY3Moc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwog c3RhdGljIHZvaWQgZ2Z4X3Y3XzBfc2V0X2lycV9mdW5jcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldik7CiBzdGF0aWMgdm9pZCBnZnhfdjdfMF9zZXRfZ2RzX2luaXQoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYpOwogCiBNT0RVTEVfRklSTVdBUkUoInJhZGVvbi9ib25haXJlX3BmcC5iaW4i KTsKIE1PRFVMRV9GSVJNV0FSRSgicmFkZW9uL2JvbmFpcmVfbWUuYmluIik7CiBNT0RVTEVfRklS TVdBUkUoInJhZGVvbi9ib25haXJlX2NlLmJpbiIpOwpAQCAtMjgxNyw0NyArMjgxNiw3OSBAQCBz dGF0aWMgdm9pZCBnZnhfdjdfMF9tZWNfZmluaShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikK IAkJaWYgKHVubGlrZWx5KHIgIT0gMCkpCiAJCQlkZXZfd2FybihhZGV2LT5kZXYsICIoJWQpIHJl c2VydmUgSFBEIEVPUCBibyBmYWlsZWRcbiIsIHIpOwogCQlhbWRncHVfYm9fdW5waW4oYWRldi0+ Z2Z4Lm1lYy5ocGRfZW9wX29iaik7CiAJCWFtZGdwdV9ib191bnJlc2VydmUoYWRldi0+Z2Z4Lm1l Yy5ocGRfZW9wX29iaik7CiAKIAkJYW1kZ3B1X2JvX3VucmVmKCZhZGV2LT5nZngubWVjLmhwZF9l b3Bfb2JqKTsKIAkJYWRldi0+Z2Z4Lm1lYy5ocGRfZW9wX29iaiA9IE5VTEw7CiAJfQogfQogCitz dGF0aWMgdm9pZCBnZnhfdjdfMF9jb21wdXRlX3F1ZXVlX2FjcXVpcmUoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYpCit7CisJaW50IGksIHF1ZXVlLCBwaXBlLCBtZWM7CisKKwkvKiBwb2xpY3kg Zm9yIGFtZGdwdSBjb21wdXRlIHF1ZXVlIG93bmVyc2hpcCAqLworCWZvciAoaSA9IDA7IGkgPCBB TURHUFVfTUFYX1FVRVVFUzsgKytpKSB7CisJCXF1ZXVlID0gaSAlIGFkZXYtPmdmeC5tZWMubnVt X3F1ZXVlX3Blcl9waXBlOworCQlwaXBlID0gKGkgLyBhZGV2LT5nZngubWVjLm51bV9xdWV1ZV9w ZXJfcGlwZSkKKwkJCSUgYWRldi0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJfbWVjOworCQltZWMgPSAo aSAvIGFkZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9waXBlKQorCQkJLyBhZGV2LT5nZngubWVj Lm51bV9waXBlX3Blcl9tZWM7CisKKwkJLyogd2UndmUgcnVuIG91dCBvZiBIVyAqLworCQlpZiAo bWVjID4gYWRldi0+Z2Z4Lm1lYy5udW1fbWVjKQorCQkJYnJlYWs7CisKKwkJLyogcG9saWN5OiBh bWRncHUgb3ducyBhbGwgcXVldWVzIGluIHRoZSBmaXJzdCBwaXBlICovCisJCWlmIChtZWMgPT0g MCAmJiBwaXBlID09IDApCisJCQlzZXRfYml0KGksIGFkZXYtPmdmeC5tZWMucXVldWVfYml0bWFw KTsKKwl9CisKKwkvKiB1cGRhdGUgdGhlIG51bWJlciBvZiBhY3RpdmUgY29tcHV0ZSByaW5ncyAq LworCWFkZXYtPmdmeC5udW1fY29tcHV0ZV9yaW5ncyA9CisJCWJpdG1hcF93ZWlnaHQoYWRldi0+ Z2Z4Lm1lYy5xdWV1ZV9iaXRtYXAsIEFNREdQVV9NQVhfUVVFVUVTKTsKKworCS8qIElmIHlvdSBo aXQgdGhpcyBjYXNlIGFuZCBlZGl0ZWQgdGhlIHBvbGljeSwgeW91IHByb2JhYmx5IGp1c3QKKwkg KiBuZWVkIHRvIGluY3JlYXNlIEFNREdQVV9NQVhfQ09NUFVURV9SSU5HUyAqLworCVdBUk5fT04o YWRldi0+Z2Z4Lm51bV9jb21wdXRlX3JpbmdzID4gQU1ER1BVX01BWF9DT01QVVRFX1JJTkdTKTsK KwlpZiAoYWRldi0+Z2Z4Lm51bV9jb21wdXRlX3JpbmdzID4gQU1ER1BVX01BWF9DT01QVVRFX1JJ TkdTKQorCQlhZGV2LT5nZngubnVtX2NvbXB1dGVfcmluZ3MgPSBBTURHUFVfTUFYX0NPTVBVVEVf UklOR1M7Cit9CisKIHN0YXRpYyBpbnQgZ2Z4X3Y3XzBfbWVjX2luaXQoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYpCiB7CiAJaW50IHI7CiAJdTMyICpocGQ7CiAJc2l6ZV90IG1lY19ocGRfc2l6 ZTsKIAotCS8qCi0JICogS1Y6ICAgIDIgTUVDLCA0IFBpcGVzL01FQywgOCBRdWV1ZXMvUGlwZSAt IDY0IFF1ZXVlcyB0b3RhbAotCSAqIENJL0tCOiAxIE1FQywgNCBQaXBlcy9NRUMsIDggUXVldWVz L1BpcGUgLSAzMiBRdWV1ZXMgdG90YWwKLQkgKiBOb25ldGhlbGVzcywgd2UgYXNzaWduIG9ubHkg MSBwaXBlIGJlY2F1c2UgYWxsIG90aGVyIHBpcGVzIHdpbGwKLQkgKiBiZSBoYW5kbGVkIGJ5IEtG RAotCSAqLworCWJpdG1hcF96ZXJvKGFkZXYtPmdmeC5tZWMucXVldWVfYml0bWFwLCBBTURHUFVf TUFYX1FVRVVFUyk7CisKIAlzd2l0Y2ggKGFkZXYtPmFzaWNfdHlwZSkgewogCWNhc2UgQ0hJUF9L QVZFUkk6CiAJCWFkZXYtPmdmeC5tZWMubnVtX21lYyA9IDI7CiAJCWJyZWFrOwogCWNhc2UgQ0hJ UF9CT05BSVJFOgogCWNhc2UgQ0hJUF9IQVdBSUk6CiAJY2FzZSBDSElQX0tBQklOSToKIAljYXNl IENISVBfTVVMTElOUzoKIAlkZWZhdWx0OgogCQlhZGV2LT5nZngubWVjLm51bV9tZWMgPSAxOwog CQlicmVhazsKIAl9CiAJYWRldi0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJfbWVjID0gNDsKIAlhZGV2 LT5nZngubWVjLm51bV9xdWV1ZV9wZXJfcGlwZSA9IDg7CiAKKwkvKiB0YWtlIG93bmVyc2hpcCBv ZiB0aGUgcmVsZXZhbnQgY29tcHV0ZSBxdWV1ZXMgKi8KKwlnZnhfdjdfMF9jb21wdXRlX3F1ZXVl X2FjcXVpcmUoYWRldik7CisKKwkvKiBhbGxvY2F0ZSBzcGFjZSBmb3IgQUxMIHBpcGVzIChldmVu IHRoZSBvbmVzIHdlIGRvbid0IG93bikgKi8KIAltZWNfaHBkX3NpemUgPSBhZGV2LT5nZngubWVj Lm51bV9tZWMgKiBhZGV2LT5nZngubWVjLm51bV9waXBlX3Blcl9tZWMKIAkJKiBHRlg3X01FQ19I UERfU0laRSAqIDI7CiAJaWYgKGFkZXYtPmdmeC5tZWMuaHBkX2VvcF9vYmogPT0gTlVMTCkgewog CQlyID0gYW1kZ3B1X2JvX2NyZWF0ZShhZGV2LAogCQkJCSAgICAgbWVjX2hwZF9zaXplLAogCQkJ CSAgICAgUEFHRV9TSVpFLCB0cnVlLAogCQkJCSAgICAgQU1ER1BVX0dFTV9ET01BSU5fR1RULCAw LCBOVUxMLCBOVUxMLAogCQkJCSAgICAgJmFkZXYtPmdmeC5tZWMuaHBkX2VvcF9vYmopOwogCQlp ZiAocikgewogCQkJZGV2X3dhcm4oYWRldi0+ZGV2LCAiKCVkKSBjcmVhdGUgSERQIEVPUCBibyBm YWlsZWRcbiIsIHIpOwpAQCAtNDUyMiwyMSArNDU1MywyMSBAQCBzdGF0aWMgY29uc3Qgc3RydWN0 IGFtZGdwdV9nZnhfZnVuY3MgZ2Z4X3Y3XzBfZ2Z4X2Z1bmNzID0gewogc3RhdGljIGNvbnN0IHN0 cnVjdCBhbWRncHVfcmxjX2Z1bmNzIGdmeF92N18wX3JsY19mdW5jcyA9IHsKIAkuZW50ZXJfc2Fm ZV9tb2RlID0gZ2Z4X3Y3XzBfZW50ZXJfcmxjX3NhZmVfbW9kZSwKIAkuZXhpdF9zYWZlX21vZGUg PSBnZnhfdjdfMF9leGl0X3JsY19zYWZlX21vZGUKIH07CiAKIHN0YXRpYyBpbnQgZ2Z4X3Y3XzBf ZWFybHlfaW5pdCh2b2lkICpoYW5kbGUpCiB7CiAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYg PSAoc3RydWN0IGFtZGdwdV9kZXZpY2UgKiloYW5kbGU7CiAKIAlhZGV2LT5nZngubnVtX2dmeF9y aW5ncyA9IEdGWDdfTlVNX0dGWF9SSU5HUzsKLQlhZGV2LT5nZngubnVtX2NvbXB1dGVfcmluZ3Mg PSBHRlg3X05VTV9DT01QVVRFX1JJTkdTOworCWFkZXYtPmdmeC5udW1fY29tcHV0ZV9yaW5ncyA9 IEFNREdQVV9NQVhfQ09NUFVURV9SSU5HUzsKIAlhZGV2LT5nZnguZnVuY3MgPSAmZ2Z4X3Y3XzBf Z2Z4X2Z1bmNzOwogCWFkZXYtPmdmeC5ybGMuZnVuY3MgPSAmZ2Z4X3Y3XzBfcmxjX2Z1bmNzOwog CWdmeF92N18wX3NldF9yaW5nX2Z1bmNzKGFkZXYpOwogCWdmeF92N18wX3NldF9pcnFfZnVuY3Mo YWRldik7CiAJZ2Z4X3Y3XzBfc2V0X2dkc19pbml0KGFkZXYpOwogCiAJcmV0dXJuIDA7CiB9CiAK IHN0YXRpYyBpbnQgZ2Z4X3Y3XzBfbGF0ZV9pbml0KHZvaWQgKmhhbmRsZSkKQEAgLTQ3MTgsMjEg KzQ3NDksMjEgQEAgc3RhdGljIHZvaWQgZ2Z4X3Y3XzBfZ3B1X2Vhcmx5X2luaXQoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYpCiAJCWdiX2FkZHJfY29uZmlnIHw9ICgyIDw8IEdCX0FERFJfQ09O RklHX19ST1dfU0laRV9fU0hJRlQpOwogCQlicmVhazsKIAl9CiAJYWRldi0+Z2Z4LmNvbmZpZy5n Yl9hZGRyX2NvbmZpZyA9IGdiX2FkZHJfY29uZmlnOwogfQogCiBzdGF0aWMgaW50IGdmeF92N18w X3N3X2luaXQodm9pZCAqaGFuZGxlKQogewogCXN0cnVjdCBhbWRncHVfcmluZyAqcmluZzsKIAlz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqKWhhbmRs ZTsKLQlpbnQgaSwgcjsKKwlpbnQgaSwgciwgcmluZ19pZDsKIAogCS8qIEVPUCBFdmVudCAqLwog CXIgPSBhbWRncHVfaXJxX2FkZF9pZChhZGV2LCBBTURHUFVfSUhfQ0xJRU5USURfTEVHQUNZLCAx ODEsICZhZGV2LT5nZnguZW9wX2lycSk7CiAJaWYgKHIpCiAJCXJldHVybiByOwogCiAJLyogUHJp dmlsZWdlZCByZWcgKi8KIAlyID0gYW1kZ3B1X2lycV9hZGRfaWQoYWRldiwgQU1ER1BVX0lIX0NM SUVOVElEX0xFR0FDWSwgMTg0LAogCQkJICAgICAgJmFkZXYtPmdmeC5wcml2X3JlZ19pcnEpOwog CWlmIChyKQpAQCAtNDc2OSw0MiArNDgwMCw1MiBAQCBzdGF0aWMgaW50IGdmeF92N18wX3N3X2lu aXQodm9pZCAqaGFuZGxlKQogCQlyaW5nID0gJmFkZXYtPmdmeC5nZnhfcmluZ1tpXTsKIAkJcmlu Zy0+cmluZ19vYmogPSBOVUxMOwogCQlzcHJpbnRmKHJpbmctPm5hbWUsICJnZngiKTsKIAkJciA9 IGFtZGdwdV9yaW5nX2luaXQoYWRldiwgcmluZywgMTAyNCwKIAkJCQkgICAgICZhZGV2LT5nZngu ZW9wX2lycSwgQU1ER1BVX0NQX0lSUV9HRlhfRU9QKTsKIAkJaWYgKHIpCiAJCQlyZXR1cm4gcjsK IAl9CiAKIAkvKiBzZXQgdXAgdGhlIGNvbXB1dGUgcXVldWVzICovCi0JZm9yIChpID0gMDsgaSA8 IGFkZXYtPmdmeC5udW1fY29tcHV0ZV9yaW5nczsgaSsrKSB7CisJZm9yIChpID0gMCwgcmluZ19p ZCA9IDA7IGkgPCBBTURHUFVfTUFYX1FVRVVFUzsgaSsrKSB7CiAJCXVuc2lnbmVkIGlycV90eXBl OwogCi0JCS8qIG1heCAzMiBxdWV1ZXMgcGVyIE1FQyAqLwotCQlpZiAoKGkgPj0gMzIpIHx8IChp ID49IEFNREdQVV9NQVhfQ09NUFVURV9SSU5HUykpIHsKLQkJCURSTV9FUlJPUigiVG9vIG1hbnkg KCVkKSBjb21wdXRlIHJpbmdzIVxuIiwgaSk7Ci0JCQlicmVhazsKLQkJfQotCQlyaW5nID0gJmFk ZXYtPmdmeC5jb21wdXRlX3JpbmdbaV07CisJCWlmICghdGVzdF9iaXQoaSwgYWRldi0+Z2Z4Lm1l Yy5xdWV1ZV9iaXRtYXApKQorCQkJY29udGludWU7CisKKwkJcmluZyA9ICZhZGV2LT5nZnguY29t cHV0ZV9yaW5nW3JpbmdfaWRdOworCisJCS8qIG1lYzAgaXMgbWUxICovCisJCXJpbmctPm1lID0g KChpIC8gYWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3BpcGUpCisJCQkJLyBhZGV2LT5nZngu bWVjLm51bV9waXBlX3Blcl9tZWMpCisJCQkJKyAxOworCQlyaW5nLT5waXBlID0gKGkgLyBhZGV2 LT5nZngubWVjLm51bV9xdWV1ZV9wZXJfcGlwZSkKKwkJCQklIGFkZXYtPmdmeC5tZWMubnVtX3Bp cGVfcGVyX21lYzsKKwkJcmluZy0+cXVldWUgPSBpICUgYWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVf cGVyX3BpcGU7CisKIAkJcmluZy0+cmluZ19vYmogPSBOVUxMOwogCQlyaW5nLT51c2VfZG9vcmJl bGwgPSB0cnVlOwotCQlyaW5nLT5kb29yYmVsbF9pbmRleCA9IEFNREdQVV9ET09SQkVMTF9NRUNf UklORzAgKyBpOwotCQlyaW5nLT5tZSA9IDE7IC8qIGZpcnN0IE1FQyAqLwotCQlyaW5nLT5waXBl ID0gaSAvIDg7Ci0JCXJpbmctPnF1ZXVlID0gaSAlIDg7CisJCXJpbmctPmRvb3JiZWxsX2luZGV4 ID0gQU1ER1BVX0RPT1JCRUxMX01FQ19SSU5HMCArIHJpbmdfaWQ7CiAJCXNwcmludGYocmluZy0+ bmFtZSwgImNvbXBfJWQuJWQuJWQiLCByaW5nLT5tZSwgcmluZy0+cGlwZSwgcmluZy0+cXVldWUp OwotCQlpcnFfdHlwZSA9IEFNREdQVV9DUF9JUlFfQ09NUFVURV9NRUMxX1BJUEUwX0VPUCArIHJp bmctPnBpcGU7CisKKwkJaXJxX3R5cGUgPSBBTURHUFVfQ1BfSVJRX0NPTVBVVEVfTUVDMV9QSVBF MF9FT1AKKwkJCSsgKChyaW5nLT5tZSAtIDEpICogYWRldi0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJf bWVjKQorCQkJKyByaW5nLT5waXBlOworCiAJCS8qIHR5cGUtMiBwYWNrZXRzIGFyZSBkZXByZWNh dGVkIG9uIE1FQywgdXNlIHR5cGUtMyBpbnN0ZWFkICovCiAJCXIgPSBhbWRncHVfcmluZ19pbml0 KGFkZXYsIHJpbmcsIDEwMjQsCiAJCQkJICAgICAmYWRldi0+Z2Z4LmVvcF9pcnEsIGlycV90eXBl KTsKIAkJaWYgKHIpCiAJCQlyZXR1cm4gcjsKKworCQlyaW5nX2lkKys7CiAJfQogCiAJLyogcmVz ZXJ2ZSBHRFMsIEdXUyBhbmQgT0EgcmVzb3VyY2UgZm9yIGdmeCAqLwogCXIgPSBhbWRncHVfYm9f Y3JlYXRlX2tlcm5lbChhZGV2LCBhZGV2LT5nZHMubWVtLmdmeF9wYXJ0aXRpb25fc2l6ZSwKIAkJ CQkgICAgUEFHRV9TSVpFLCBBTURHUFVfR0VNX0RPTUFJTl9HRFMsCiAJCQkJICAgICZhZGV2LT5n ZHMuZ2RzX2dmeF9ibywgTlVMTCwgTlVMTCk7CiAJaWYgKHIpCiAJCXJldHVybiByOwogCiAJciA9 IGFtZGdwdV9ib19jcmVhdGVfa2VybmVsKGFkZXYsIGFkZXYtPmdkcy5nd3MuZ2Z4X3BhcnRpdGlv bl9zaXplLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAu YyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMKaW5kZXggODZjZGNiOC4u MTc3OTkyYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jCkBAIC00NSwyMSAr NDUsMjAgQEAKICNpbmNsdWRlICJnY2EvZ2Z4XzhfMF9lbnVtLmgiCiAjaW5jbHVkZSAiZ2NhL2dm eF84XzBfc2hfbWFzay5oIgogI2luY2x1ZGUgImdjYS9nZnhfOF8wX2VudW0uaCIKIAogI2luY2x1 ZGUgImRjZS9kY2VfMTBfMF9kLmgiCiAjaW5jbHVkZSAiZGNlL2RjZV8xMF8wX3NoX21hc2suaCIK IAogI2luY2x1ZGUgInNtdS9zbXVfN18xXzNfZC5oIgogCiAjZGVmaW5lIEdGWDhfTlVNX0dGWF9S SU5HUyAgICAgMQotI2RlZmluZSBHRlg4X05VTV9DT01QVVRFX1JJTkdTIDgKICNkZWZpbmUgR0ZY OF9NRUNfSFBEX1NJWkUgMjA0OAogCiAKICNkZWZpbmUgVE9QQVpfR0JfQUREUl9DT05GSUdfR09M REVOIDB4MjIwMTAwMDEKICNkZWZpbmUgQ0FSUklaT19HQl9BRERSX0NPTkZJR19HT0xERU4gMHgy MjAxMDAwMQogI2RlZmluZSBQT0xBUklTMTFfR0JfQUREUl9DT05GSUdfR09MREVOIDB4MjIwMTEw MDIKICNkZWZpbmUgVE9OR0FfR0JfQUREUl9DT05GSUdfR09MREVOIDB4MjIwMTEwMDMKIAogI2Rl ZmluZSBBUlJBWV9NT0RFKHgpCQkJCQkoKHgpIDw8IEdCX1RJTEVfTU9ERTBfX0FSUkFZX01PREVf X1NISUZUKQogI2RlZmluZSBQSVBFX0NPTkZJRyh4KQkJCQkJKCh4KSA8PCBHQl9USUxFX01PREUw X19QSVBFX0NPTkZJR19fU0hJRlQpCkBAIC0xNDEwLDQ3ICsxNDA5LDgyIEBAIHN0YXRpYyBpbnQg Z2Z4X3Y4XzBfa2lxX2luaXRfcmluZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIH0KIHN0 YXRpYyB2b2lkIGdmeF92OF8wX2tpcV9mcmVlX3Jpbmcoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5n LAogCQkJCSAgIHN0cnVjdCBhbWRncHVfaXJxX3NyYyAqaXJxKQogewogCWFtZGdwdV93Yl9mcmVl KHJpbmctPmFkZXYsIHJpbmctPmFkZXYtPnZpcnQucmVnX3ZhbF9vZmZzKTsKIAlhbWRncHVfcmlu Z19maW5pKHJpbmcpOwogfQogCiAjZGVmaW5lIEdGWDhfTUVDX0hQRF9TSVpFIDIwNDgKIAorc3Rh dGljIHZvaWQgZ2Z4X3Y4XzBfY29tcHV0ZV9xdWV1ZV9hY3F1aXJlKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KQoreworCWludCBpLCBxdWV1ZSwgcGlwZSwgbWVjOworCisJLyogcG9saWN5IGZv ciBhbWRncHUgY29tcHV0ZSBxdWV1ZSBvd25lcnNoaXAgKi8KKwlmb3IgKGkgPSAwOyBpIDwgQU1E R1BVX01BWF9RVUVVRVM7ICsraSkgeworCQlxdWV1ZSA9IGkgJSBhZGV2LT5nZngubWVjLm51bV9x dWV1ZV9wZXJfcGlwZTsKKwkJcGlwZSA9IChpIC8gYWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVy X3BpcGUpCisJCQklIGFkZXYtPmdmeC5tZWMubnVtX3BpcGVfcGVyX21lYzsKKwkJbWVjID0gKGkg LyBhZGV2LT5nZngubWVjLm51bV9xdWV1ZV9wZXJfcGlwZSkKKwkJCS8gYWRldi0+Z2Z4Lm1lYy5u dW1fcGlwZV9wZXJfbWVjOworCisJCS8qIHdlJ3ZlIHJ1biBvdXQgb2YgSFcgKi8KKwkJaWYgKG1l YyA+IGFkZXYtPmdmeC5tZWMubnVtX21lYykKKwkJCWJyZWFrOworCisJCS8qIHBvbGljeTogYW1k Z3B1IG93bnMgYWxsIHF1ZXVlcyBpbiB0aGUgZmlyc3QgcGlwZSAqLworCQlpZiAobWVjID09IDAg JiYgcGlwZSA9PSAwKQorCQkJc2V0X2JpdChpLCBhZGV2LT5nZngubWVjLnF1ZXVlX2JpdG1hcCk7 CisJfQorCisJLyogdXBkYXRlIHRoZSBudW1iZXIgb2YgYWN0aXZlIGNvbXB1dGUgcmluZ3MgKi8K KwlhZGV2LT5nZngubnVtX2NvbXB1dGVfcmluZ3MgPQorCQliaXRtYXBfd2VpZ2h0KGFkZXYtPmdm eC5tZWMucXVldWVfYml0bWFwLCBBTURHUFVfTUFYX1FVRVVFUyk7CisKKwkvKiBJZiB5b3UgaGl0 IHRoaXMgY2FzZSBhbmQgZWRpdGVkIHRoZSBwb2xpY3ksIHlvdSBwcm9iYWJseSBqdXN0CisJICog bmVlZCB0byBpbmNyZWFzZSBBTURHUFVfTUFYX0NPTVBVVEVfUklOR1MgKi8KKwlpZiAoV0FSTl9P TihhZGV2LT5nZngubnVtX2NvbXB1dGVfcmluZ3MgPiBBTURHUFVfTUFYX0NPTVBVVEVfUklOR1Mp KQorCQlhZGV2LT5nZngubnVtX2NvbXB1dGVfcmluZ3MgPSBBTURHUFVfTUFYX0NPTVBVVEVfUklO R1M7Cit9CisKIHN0YXRpYyBpbnQgZ2Z4X3Y4XzBfbWVjX2luaXQoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYpCiB7CiAJaW50IHI7CiAJdTMyICpocGQ7CiAJc2l6ZV90IG1lY19ocGRfc2l6ZTsK IAorCWJpdG1hcF96ZXJvKGFkZXYtPmdmeC5tZWMucXVldWVfYml0bWFwLCBBTURHUFVfTUFYX1FV RVVFUyk7CisKIAlzd2l0Y2ggKGFkZXYtPmFzaWNfdHlwZSkgewogCWNhc2UgQ0hJUF9GSUpJOgog CWNhc2UgQ0hJUF9UT05HQToKIAljYXNlIENISVBfUE9MQVJJUzExOgogCWNhc2UgQ0hJUF9QT0xB UklTMTI6CiAJY2FzZSBDSElQX1BPTEFSSVMxMDoKIAljYXNlIENISVBfQ0FSUklaTzoKIAkJYWRl di0+Z2Z4Lm1lYy5udW1fbWVjID0gMjsKIAkJYnJlYWs7CiAJY2FzZSBDSElQX1RPUEFaOgogCWNh c2UgQ0hJUF9TVE9ORVk6CiAJZGVmYXVsdDoKIAkJYWRldi0+Z2Z4Lm1lYy5udW1fbWVjID0gMTsK IAkJYnJlYWs7CiAJfQogCiAJYWRldi0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJfbWVjID0gNDsKIAlh ZGV2LT5nZngubWVjLm51bV9xdWV1ZV9wZXJfcGlwZSA9IDg7CiAKLQkvKiBvbmx5IDEgcGlwZSBv ZiB0aGUgZmlyc3QgTUVDIGlzIG93bmVkIGJ5IGFtZGdwdSAqLwotCW1lY19ocGRfc2l6ZSA9IDEg KiAxICogYWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3BpcGUgKiBHRlg4X01FQ19IUERfU0la RTsKKwkvKiB0YWtlIG93bmVyc2hpcCBvZiB0aGUgcmVsZXZhbnQgY29tcHV0ZSBxdWV1ZXMgKi8K KwlnZnhfdjhfMF9jb21wdXRlX3F1ZXVlX2FjcXVpcmUoYWRldik7CisKKwltZWNfaHBkX3NpemUg PSBhZGV2LT5nZngubnVtX2NvbXB1dGVfcmluZ3MgKiBHRlg4X01FQ19IUERfU0laRTsKIAogCWlm IChhZGV2LT5nZngubWVjLmhwZF9lb3Bfb2JqID09IE5VTEwpIHsKIAkJciA9IGFtZGdwdV9ib19j cmVhdGUoYWRldiwKIAkJCQkgICAgIG1lY19ocGRfc2l6ZSwKIAkJCQkgICAgIFBBR0VfU0laRSwg dHJ1ZSwKIAkJCQkgICAgIEFNREdQVV9HRU1fRE9NQUlOX0dUVCwgMCwgTlVMTCwgTlVMTCwKIAkJ CQkgICAgICZhZGV2LT5nZngubWVjLmhwZF9lb3Bfb2JqKTsKIAkJaWYgKHIpIHsKIAkJCWRldl93 YXJuKGFkZXYtPmRldiwgIiglZCkgY3JlYXRlIEhEUCBFT1AgYm8gZmFpbGVkXG4iLCByKTsKIAkJ CXJldHVybiByOwpAQCAtMjA4MywyMSArMjExNywyMSBAQCBzdGF0aWMgaW50IGdmeF92OF8wX2dw dV9lYXJseV9pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCQlnYl9hZGRyX2NvbmZp ZyA9IFJFR19TRVRfRklFTEQoZ2JfYWRkcl9jb25maWcsIEdCX0FERFJfQ09ORklHLCBST1dfU0la RSwgMik7CiAJCWJyZWFrOwogCX0KIAlhZGV2LT5nZnguY29uZmlnLmdiX2FkZHJfY29uZmlnID0g Z2JfYWRkcl9jb25maWc7CiAKIAlyZXR1cm4gMDsKIH0KIAogc3RhdGljIGludCBnZnhfdjhfMF9z d19pbml0KHZvaWQgKmhhbmRsZSkKIHsKLQlpbnQgaSwgcjsKKwlpbnQgaSwgciwgcmluZ19pZDsK IAlzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmc7CiAJc3RydWN0IGFtZGdwdV9raXEgKmtpcTsKIAlz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqKWhhbmRs ZTsKIAogCS8qIEtJUSBldmVudCAqLwogCXIgPSBhbWRncHVfaXJxX2FkZF9pZChhZGV2LCBBTURH UFVfSUhfQ0xJRU5USURfTEVHQUNZLCAxNzgsICZhZGV2LT5nZngua2lxLmlycSk7CiAJaWYgKHIp CiAJCXJldHVybiByOwogCiAJLyogRU9QIEV2ZW50ICovCkBAIC0yMTUwLDQzICsyMTg0LDU2IEBA IHN0YXRpYyBpbnQgZ2Z4X3Y4XzBfc3dfaW5pdCh2b2lkICpoYW5kbGUpCiAJCQlyaW5nLT5kb29y YmVsbF9pbmRleCA9IEFNREdQVV9ET09SQkVMTF9HRlhfUklORzA7CiAJCX0KIAogCQlyID0gYW1k Z3B1X3JpbmdfaW5pdChhZGV2LCByaW5nLCAxMDI0LCAmYWRldi0+Z2Z4LmVvcF9pcnEsCiAJCQkJ ICAgICBBTURHUFVfQ1BfSVJRX0dGWF9FT1ApOwogCQlpZiAocikKIAkJCXJldHVybiByOwogCX0K IAogCS8qIHNldCB1cCB0aGUgY29tcHV0ZSBxdWV1ZXMgKi8KLQlmb3IgKGkgPSAwOyBpIDwgYWRl di0+Z2Z4Lm51bV9jb21wdXRlX3JpbmdzOyBpKyspIHsKKwlmb3IgKGkgPSAwLCByaW5nX2lkID0g MDsgaSA8IEFNREdQVV9NQVhfUVVFVUVTOyBpKyspIHsKIAkJdW5zaWduZWQgaXJxX3R5cGU7CiAK LQkJLyogbWF4IDMyIHF1ZXVlcyBwZXIgTUVDICovCi0JCWlmICgoaSA+PSAzMikgfHwgKGkgPj0g QU1ER1BVX01BWF9DT01QVVRFX1JJTkdTKSkgewotCQkJRFJNX0VSUk9SKCJUb28gbWFueSAoJWQp IGNvbXB1dGUgcmluZ3MhXG4iLCBpKTsKKwkJaWYgKCF0ZXN0X2JpdChpLCBhZGV2LT5nZngubWVj LnF1ZXVlX2JpdG1hcCkpCisJCQljb250aW51ZTsKKworCQlpZiAoV0FSTl9PTihyaW5nX2lkID49 IEFNREdQVV9NQVhfQ09NUFVURV9SSU5HUykpCiAJCQlicmVhazsKLQkJfQotCQlyaW5nID0gJmFk ZXYtPmdmeC5jb21wdXRlX3JpbmdbaV07CisKKwkJcmluZyA9ICZhZGV2LT5nZnguY29tcHV0ZV9y aW5nW3JpbmdfaWRdOworCisJCS8qIG1lYzAgaXMgbWUxICovCisJCXJpbmctPm1lID0gKChpIC8g YWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3BpcGUpCisJCQkJLyBhZGV2LT5nZngubWVjLm51 bV9waXBlX3Blcl9tZWMpCisJCQkJKyAxOworCQlyaW5nLT5waXBlID0gKGkgLyBhZGV2LT5nZngu bWVjLm51bV9xdWV1ZV9wZXJfcGlwZSkKKwkJCQklIGFkZXYtPmdmeC5tZWMubnVtX3BpcGVfcGVy X21lYzsKKwkJcmluZy0+cXVldWUgPSBpICUgYWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3Bp cGU7CisKIAkJcmluZy0+cmluZ19vYmogPSBOVUxMOwogCQlyaW5nLT51c2VfZG9vcmJlbGwgPSB0 cnVlOwotCQlyaW5nLT5kb29yYmVsbF9pbmRleCA9IEFNREdQVV9ET09SQkVMTF9NRUNfUklORzAg KyBpOwotCQlyaW5nLT5tZSA9IDE7IC8qIGZpcnN0IE1FQyAqLwotCQlyaW5nLT5waXBlID0gaSAv IDg7Ci0JCXJpbmctPnF1ZXVlID0gaSAlIDg7Ci0JCXJpbmctPmVvcF9ncHVfYWRkciA9IGFkZXYt PmdmeC5tZWMuaHBkX2VvcF9ncHVfYWRkciArIChpICogR0ZYOF9NRUNfSFBEX1NJWkUpOworCQly aW5nLT5lb3BfZ3B1X2FkZHIgPSBhZGV2LT5nZngubWVjLmhwZF9lb3BfZ3B1X2FkZHIgKyAocmlu Z19pZCAqIEdGWDhfTUVDX0hQRF9TSVpFKTsKKwkJcmluZy0+ZG9vcmJlbGxfaW5kZXggPSBBTURH UFVfRE9PUkJFTExfTUVDX1JJTkcwICsgcmluZ19pZDsKIAkJc3ByaW50ZihyaW5nLT5uYW1lLCAi Y29tcF8lZC4lZC4lZCIsIHJpbmctPm1lLCByaW5nLT5waXBlLCByaW5nLT5xdWV1ZSk7Ci0JCWly cV90eXBlID0gQU1ER1BVX0NQX0lSUV9DT01QVVRFX01FQzFfUElQRTBfRU9QICsgcmluZy0+cGlw ZTsKKworCQlpcnFfdHlwZSA9IEFNREdQVV9DUF9JUlFfQ09NUFVURV9NRUMxX1BJUEUwX0VPUAor CQkJKyAoKHJpbmctPm1lIC0gMSkgKiBhZGV2LT5nZngubWVjLm51bV9waXBlX3Blcl9tZWMpCisJ CQkrIHJpbmctPnBpcGU7CisKIAkJLyogdHlwZS0yIHBhY2tldHMgYXJlIGRlcHJlY2F0ZWQgb24g TUVDLCB1c2UgdHlwZS0zIGluc3RlYWQgKi8KIAkJciA9IGFtZGdwdV9yaW5nX2luaXQoYWRldiwg cmluZywgMTAyNCwgJmFkZXYtPmdmeC5lb3BfaXJxLAogCQkJCSAgICAgaXJxX3R5cGUpOwogCQlp ZiAocikKIAkJCXJldHVybiByOworCisJCXJpbmdfaWQrKzsKIAl9CiAKIAlyID0gZ2Z4X3Y4XzBf a2lxX2luaXQoYWRldik7CiAJaWYgKHIpIHsKIAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gaW5pdCBL SVEgQk9zIVxuIik7CiAJCXJldHVybiByOwogCX0KIAogCWtpcSA9ICZhZGV2LT5nZngua2lxOwog CXIgPSBnZnhfdjhfMF9raXFfaW5pdF9yaW5nKGFkZXYsICZraXEtPnJpbmcsICZraXEtPmlycSk7 CkBAIC01Njg2LDIxICs1NzMzLDIxIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgYW1kZ3B1X2dmeF9m dW5jcyBnZnhfdjhfMF9nZnhfZnVuY3MgPSB7CiAJLnNlbGVjdF9zZV9zaCA9ICZnZnhfdjhfMF9z ZWxlY3Rfc2Vfc2gsCiAJLnJlYWRfd2F2ZV9kYXRhID0gJmdmeF92OF8wX3JlYWRfd2F2ZV9kYXRh LAogCS5yZWFkX3dhdmVfc2dwcnMgPSAmZ2Z4X3Y4XzBfcmVhZF93YXZlX3NncHJzLAogfTsKIAog c3RhdGljIGludCBnZnhfdjhfMF9lYXJseV9pbml0KHZvaWQgKmhhbmRsZSkKIHsKIAlzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldiA9IChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqKWhhbmRsZTsKIAog CWFkZXYtPmdmeC5udW1fZ2Z4X3JpbmdzID0gR0ZYOF9OVU1fR0ZYX1JJTkdTOwotCWFkZXYtPmdm eC5udW1fY29tcHV0ZV9yaW5ncyA9IEdGWDhfTlVNX0NPTVBVVEVfUklOR1M7CisJYWRldi0+Z2Z4 Lm51bV9jb21wdXRlX3JpbmdzID0gQU1ER1BVX01BWF9DT01QVVRFX1JJTkdTOwogCWFkZXYtPmdm eC5mdW5jcyA9ICZnZnhfdjhfMF9nZnhfZnVuY3M7CiAJZ2Z4X3Y4XzBfc2V0X3JpbmdfZnVuY3Mo YWRldik7CiAJZ2Z4X3Y4XzBfc2V0X2lycV9mdW5jcyhhZGV2KTsKIAlnZnhfdjhfMF9zZXRfZ2Rz X2luaXQoYWRldik7CiAJZ2Z4X3Y4XzBfc2V0X3JsY19mdW5jcyhhZGV2KTsKIAogCXJldHVybiAw OwogfQogCiBzdGF0aWMgaW50IGdmeF92OF8wX2xhdGVfaW5pdCh2b2lkICpoYW5kbGUpCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYwppbmRleCAxYTdiNzQzLi5kZTZlNTM3IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMKQEAgLTMxLDIxICszMSwyMCBAQAogI2lu Y2x1ZGUgInZlZ2ExMC9HQy9nY185XzBfb2Zmc2V0LmgiCiAjaW5jbHVkZSAidmVnYTEwL0dDL2dj XzlfMF9zaF9tYXNrLmgiCiAjaW5jbHVkZSAidmVnYTEwL3ZlZ2ExMF9lbnVtLmgiCiAjaW5jbHVk ZSAidmVnYTEwL0hEUC9oZHBfNF8wX29mZnNldC5oIgogCiAjaW5jbHVkZSAic29jMTVfY29tbW9u LmgiCiAjaW5jbHVkZSAiY2xlYXJzdGF0ZV9nZng5LmgiCiAjaW5jbHVkZSAidjlfc3RydWN0cy5o IgogCiAjZGVmaW5lIEdGWDlfTlVNX0dGWF9SSU5HUyAgICAgMQotI2RlZmluZSBHRlg5X05VTV9D T01QVVRFX1JJTkdTIDgKICNkZWZpbmUgR0ZYOV9OVU1fU0UJCTQKICNkZWZpbmUgUkxDR19VQ09E RV9MT0FESU5HX1NUQVJUX0FERFJFU1MgMHgyMDAwCiAKIE1PRFVMRV9GSVJNV0FSRSgiYW1kZ3B1 L3ZlZ2ExMF9jZS5iaW4iKTsKIE1PRFVMRV9GSVJNV0FSRSgiYW1kZ3B1L3ZlZ2ExMF9wZnAuYmlu Iik7CiBNT0RVTEVfRklSTVdBUkUoImFtZGdwdS92ZWdhMTBfbWUuYmluIik7CiBNT0RVTEVfRklS TVdBUkUoImFtZGdwdS92ZWdhMTBfbWVjLmJpbiIpOwogTU9EVUxFX0ZJUk1XQVJFKCJhbWRncHUv dmVnYTEwX21lYzIuYmluIik7CiBNT0RVTEVfRklSTVdBUkUoImFtZGdwdS92ZWdhMTBfcmxjLmJp biIpOwogCkBAIC00NjksNDUgKzQ2OCw3OSBAQCBzdGF0aWMgdm9pZCBnZnhfdjlfMF9tZWNfZmlu aShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJYW1kZ3B1X2JvX3VucGluKGFkZXYtPmdm eC5tZWMubWVjX2Z3X29iaik7CiAJCWFtZGdwdV9ib191bnJlc2VydmUoYWRldi0+Z2Z4Lm1lYy5t ZWNfZndfb2JqKTsKIAogCQlhbWRncHVfYm9fdW5yZWYoJmFkZXYtPmdmeC5tZWMubWVjX2Z3X29i aik7CiAJCWFkZXYtPmdmeC5tZWMubWVjX2Z3X29iaiA9IE5VTEw7CiAJfQogfQogCiAjZGVmaW5l IE1FQ19IUERfU0laRSAyMDQ4CiAKK3N0YXRpYyB2b2lkIGdmeF92OV8wX2NvbXB1dGVfcXVldWVf YWNxdWlyZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKK3sKKwlpbnQgaSwgcXVldWUsIHBp cGUsIG1lYzsKKworCS8qIHBvbGljeSBmb3IgYW1kZ3B1IGNvbXB1dGUgcXVldWUgb3duZXJzaGlw ICovCisJZm9yIChpID0gMDsgaSA8IEFNREdQVV9NQVhfUVVFVUVTOyArK2kpIHsKKwkJcXVldWUg PSBpICUgYWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3BpcGU7CisJCXBpcGUgPSAoaSAvIGFk ZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9waXBlKQorCQkJJSBhZGV2LT5nZngubWVjLm51bV9w aXBlX3Blcl9tZWM7CisJCW1lYyA9IChpIC8gYWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3Bp cGUpCisJCQkvIGFkZXYtPmdmeC5tZWMubnVtX3BpcGVfcGVyX21lYzsKKworCQkvKiB3ZSd2ZSBy dW4gb3V0IG9mIEhXICovCisJCWlmIChtZWMgPiBhZGV2LT5nZngubWVjLm51bV9tZWMpCisJCQli cmVhazsKKworCQkvKiBwb2xpY3k6IGFtZGdwdSBvd25zIGFsbCBxdWV1ZXMgaW4gdGhlIGZpcnN0 IHBpcGUgKi8KKwkJaWYgKG1lYyA9PSAwICYmIHBpcGUgPT0gMCkKKwkJCXNldF9iaXQoaSwgYWRl di0+Z2Z4Lm1lYy5xdWV1ZV9iaXRtYXApOworCX0KKworCS8qIHVwZGF0ZSB0aGUgbnVtYmVyIG9m IGFjdGl2ZSBjb21wdXRlIHJpbmdzICovCisJYWRldi0+Z2Z4Lm51bV9jb21wdXRlX3JpbmdzID0K KwkJYml0bWFwX3dlaWdodChhZGV2LT5nZngubWVjLnF1ZXVlX2JpdG1hcCwgQU1ER1BVX01BWF9R VUVVRVMpOworCisJLyogSWYgeW91IGhpdCB0aGlzIGNhc2UgYW5kIGVkaXRlZCB0aGUgcG9saWN5 LCB5b3UgcHJvYmFibHkganVzdAorCSAqIG5lZWQgdG8gaW5jcmVhc2UgQU1ER1BVX01BWF9DT01Q VVRFX1JJTkdTICovCisJaWYgKFdBUk5fT04oYWRldi0+Z2Z4Lm51bV9jb21wdXRlX3JpbmdzID4g QU1ER1BVX01BWF9DT01QVVRFX1JJTkdTKSkKKwkJYWRldi0+Z2Z4Lm51bV9jb21wdXRlX3Jpbmdz ID0gQU1ER1BVX01BWF9DT01QVVRFX1JJTkdTOworfQorCiBzdGF0aWMgaW50IGdmeF92OV8wX21l Y19pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewogCWludCByOwogCXUzMiAqaHBk OwogCWNvbnN0IF9fbGUzMiAqZndfZGF0YTsKIAl1bnNpZ25lZCBmd19zaXplOwogCXUzMiAqZnc7 CiAJc2l6ZV90IG1lY19ocGRfc2l6ZTsKIAogCWNvbnN0IHN0cnVjdCBnZnhfZmlybXdhcmVfaGVh ZGVyX3YxXzAgKm1lY19oZHI7CiAKKwliaXRtYXBfemVybyhhZGV2LT5nZngubWVjLnF1ZXVlX2Jp dG1hcCwgQU1ER1BVX01BWF9RVUVVRVMpOworCiAJc3dpdGNoIChhZGV2LT5hc2ljX3R5cGUpIHsK IAljYXNlIENISVBfVkVHQTEwOgogCQlhZGV2LT5nZngubWVjLm51bV9tZWMgPSAyOwogCQlicmVh azsKIAlkZWZhdWx0OgogCQlhZGV2LT5nZngubWVjLm51bV9tZWMgPSAxOwogCQlicmVhazsKIAl9 CiAKIAlhZGV2LT5nZngubWVjLm51bV9waXBlX3Blcl9tZWMgPSA0OwogCWFkZXYtPmdmeC5tZWMu bnVtX3F1ZXVlX3Blcl9waXBlID0gODsKIAotCS8qIG9ubHkgMSBwaXBlIG9mIHRoZSBmaXJzdCBN RUMgaXMgb3duZWQgYnkgYW1kZ3B1ICovCi0JbWVjX2hwZF9zaXplID0gMSAqIDEgKiBhZGV2LT5n ZngubWVjLm51bV9xdWV1ZV9wZXJfcGlwZSAqIE1FQ19IUERfU0laRTsKKwkvKiB0YWtlIG93bmVy c2hpcCBvZiB0aGUgcmVsZXZhbnQgY29tcHV0ZSBxdWV1ZXMgKi8KKwlnZnhfdjlfMF9jb21wdXRl X3F1ZXVlX2FjcXVpcmUoYWRldik7CisJbWVjX2hwZF9zaXplID0gYWRldi0+Z2Z4Lm51bV9jb21w dXRlX3JpbmdzICogTUVDX0hQRF9TSVpFOwogCiAJaWYgKGFkZXYtPmdmeC5tZWMuaHBkX2VvcF9v YmogPT0gTlVMTCkgewogCQlyID0gYW1kZ3B1X2JvX2NyZWF0ZShhZGV2LAogCQkJCSAgICAgbWVj X2hwZF9zaXplLAogCQkJCSAgICAgUEFHRV9TSVpFLCB0cnVlLAogCQkJCSAgICAgQU1ER1BVX0dF TV9ET01BSU5fR1RULCAwLCBOVUxMLCBOVUxMLAogCQkJCSAgICAgJmFkZXYtPmdmeC5tZWMuaHBk X2VvcF9vYmopOwogCQlpZiAocikgewogCQkJZGV2X3dhcm4oYWRldi0+ZGV2LCAiKCVkKSBjcmVh dGUgSERQIEVPUCBibyBmYWlsZWRcbiIsIHIpOwogCQkJcmV0dXJuIHI7CkBAIC0xMDI0LDIxICsx MDU3LDIxIEBAIHN0YXRpYyBpbnQgZ2Z4X3Y5XzBfbmdnX2VuKHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2KQogCWdmeF92OV8wX3dyaXRlX2RhdGFfdG9fcmVnKHJpbmcsIDAsIGZhbHNlLAogCQkJ CSAgIGFtZGdwdV9nZHNfcmVnX29mZnNldFswXS5tZW1fc2l6ZSwgMCk7CiAKIAlhbWRncHVfcmlu Z19jb21taXQocmluZyk7CiAKIAlyZXR1cm4gMDsKIH0KIAogc3RhdGljIGludCBnZnhfdjlfMF9z d19pbml0KHZvaWQgKmhhbmRsZSkKIHsKLQlpbnQgaSwgcjsKKwlpbnQgaSwgciwgcmluZ19pZDsK IAlzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmc7CiAJc3RydWN0IGFtZGdwdV9raXEgKmtpcTsKIAlz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqKWhhbmRs ZTsKIAogCS8qIEtJUSBldmVudCAqLwogCXIgPSBhbWRncHVfaXJxX2FkZF9pZChhZGV2LCBBTURH UFVfSUhfQ0xJRU5USURfR1JCTV9DUCwgMTc4LCAmYWRldi0+Z2Z4LmtpcS5pcnEpOwogCWlmIChy KQogCQlyZXR1cm4gcjsKIAogCS8qIEVPUCBFdmVudCAqLwpAQCAtMTA4MSwyMSArMTExNCw2MCBA QCBzdGF0aWMgaW50IGdmeF92OV8wX3N3X2luaXQodm9pZCAqaGFuZGxlKQogCQlzcHJpbnRmKHJp bmctPm5hbWUsICJnZngiKTsKIAkJcmluZy0+dXNlX2Rvb3JiZWxsID0gdHJ1ZTsKIAkJcmluZy0+ ZG9vcmJlbGxfaW5kZXggPSBBTURHUFVfRE9PUkJFTEw2NF9HRlhfUklORzAgPDwgMTsKIAkJciA9 IGFtZGdwdV9yaW5nX2luaXQoYWRldiwgcmluZywgMTAyNCwKIAkJCQkgICAgICZhZGV2LT5nZngu ZW9wX2lycSwgQU1ER1BVX0NQX0lSUV9HRlhfRU9QKTsKIAkJaWYgKHIpCiAJCQlyZXR1cm4gcjsK IAl9CiAKIAkvKiBzZXQgdXAgdGhlIGNvbXB1dGUgcXVldWVzICovCi0JZm9yIChpID0gMDsgaSA8 IGFkZXYtPmdmeC5udW1fY29tcHV0ZV9yaW5nczsgaSsrKSB7CisJZm9yIChpID0gMCwgcmluZ19p ZCA9IDA7IGkgPCBBTURHUFVfTUFYX1FVRVVFUzsgaSsrKSB7CisJCXVuc2lnbmVkIGlycV90eXBl OworCisJCWlmICghdGVzdF9iaXQoaSwgYWRldi0+Z2Z4Lm1lYy5xdWV1ZV9iaXRtYXApKQorCQkJ Y29udGludWU7CisKKwkJaWYgKFdBUk5fT04ocmluZ19pZCA+PSBBTURHUFVfTUFYX0NPTVBVVEVf UklOR1MpKQorCQkJYnJlYWs7CisKKwkJcmluZyA9ICZhZGV2LT5nZnguY29tcHV0ZV9yaW5nW3Jp bmdfaWRdOworCisJCS8qIG1lYzAgaXMgbWUxICovCisJCXJpbmctPm1lID0gKChpIC8gYWRldi0+ Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3BpcGUpCisJCQkJLyBhZGV2LT5nZngubWVjLm51bV9waXBl X3Blcl9tZWMpCisJCQkJKyAxOworCQlyaW5nLT5waXBlID0gKGkgLyBhZGV2LT5nZngubWVjLm51 bV9xdWV1ZV9wZXJfcGlwZSkKKwkJCQklIGFkZXYtPmdmeC5tZWMubnVtX3BpcGVfcGVyX21lYzsK KwkJcmluZy0+cXVldWUgPSBpICUgYWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3BpcGU7CisK KwkJcmluZy0+cmluZ19vYmogPSBOVUxMOworCQlyaW5nLT51c2VfZG9vcmJlbGwgPSB0cnVlOwor CQlyaW5nLT5lb3BfZ3B1X2FkZHIgPSBhZGV2LT5nZngubWVjLmhwZF9lb3BfZ3B1X2FkZHIgKyAo cmluZ19pZCAqIE1FQ19IUERfU0laRSk7CisJCXJpbmctPmRvb3JiZWxsX2luZGV4ID0gQU1ER1BV X0RPT1JCRUxMX01FQ19SSU5HMCArIHJpbmdfaWQ7CisJCXNwcmludGYocmluZy0+bmFtZSwgImNv bXBfJWQuJWQuJWQiLCByaW5nLT5tZSwgcmluZy0+cGlwZSwgcmluZy0+cXVldWUpOworCisJCWly cV90eXBlID0gQU1ER1BVX0NQX0lSUV9DT01QVVRFX01FQzFfUElQRTBfRU9QCisJCQkrICgocmlu Zy0+bWUgLSAxKSAqIGFkZXYtPmdmeC5tZWMubnVtX3BpcGVfcGVyX21lYykKKwkJCSsgcmluZy0+ cGlwZTsKKworCQkvKiB0eXBlLTIgcGFja2V0cyBhcmUgZGVwcmVjYXRlZCBvbiBNRUMsIHVzZSB0 eXBlLTMgaW5zdGVhZCAqLworCQlyID0gYW1kZ3B1X3JpbmdfaW5pdChhZGV2LCByaW5nLCAxMDI0 LCAmYWRldi0+Z2Z4LmVvcF9pcnEsCisJCQkJICAgICBpcnFfdHlwZSk7CisJCWlmIChyKQorCQkJ cmV0dXJuIHI7CisKKwkJcmluZ19pZCsrOworCX0KKworCS8qIHNldCB1cCB0aGUgY29tcHV0ZSBx dWV1ZXMgKi8KKwlmb3IgKGkgPSAwLCByaW5nX2lkID0gMDsgaSA8IEFNREdQVV9NQVhfUVVFVUVT OyBpKyspIHsKIAkJdW5zaWduZWQgaXJxX3R5cGU7CiAKIAkJLyogbWF4IDMyIHF1ZXVlcyBwZXIg TUVDICovCiAJCWlmICgoaSA+PSAzMikgfHwgKGkgPj0gQU1ER1BVX01BWF9DT01QVVRFX1JJTkdT KSkgewogCQkJRFJNX0VSUk9SKCJUb28gbWFueSAoJWQpIGNvbXB1dGUgcmluZ3MhXG4iLCBpKTsK IAkJCWJyZWFrOwogCQl9CiAJCXJpbmcgPSAmYWRldi0+Z2Z4LmNvbXB1dGVfcmluZ1tpXTsKIAkJ cmluZy0+cmluZ19vYmogPSBOVUxMOwogCQlyaW5nLT51c2VfZG9vcmJlbGwgPSB0cnVlOwpAQCAt MjY1NSwyMSArMjcyNywyMSBAQCBzdGF0aWMgdm9pZCBnZnhfdjlfMF9yaW5nX2VtaXRfZ2RzX3N3 aXRjaChzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCiAJZ2Z4X3Y5XzBfd3JpdGVfZGF0YV90b19y ZWcocmluZywgMCwgZmFsc2UsCiAJCQkJICAgYW1kZ3B1X2dkc19yZWdfb2Zmc2V0W3ZtaWRdLm9h LAogCQkJCSAgICgxIDw8IChvYV9zaXplICsgb2FfYmFzZSkpIC0gKDEgPDwgb2FfYmFzZSkpOwog fQogCiBzdGF0aWMgaW50IGdmeF92OV8wX2Vhcmx5X2luaXQodm9pZCAqaGFuZGxlKQogewogCXN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gKHN0cnVjdCBhbWRncHVfZGV2aWNlICopaGFuZGxl OwogCiAJYWRldi0+Z2Z4Lm51bV9nZnhfcmluZ3MgPSBHRlg5X05VTV9HRlhfUklOR1M7Ci0JYWRl di0+Z2Z4Lm51bV9jb21wdXRlX3JpbmdzID0gR0ZYOV9OVU1fQ09NUFVURV9SSU5HUzsKKwlhZGV2 LT5nZngubnVtX2NvbXB1dGVfcmluZ3MgPSBBTURHUFVfTUFYX0NPTVBVVEVfUklOR1M7CiAJZ2Z4 X3Y5XzBfc2V0X3JpbmdfZnVuY3MoYWRldik7CiAJZ2Z4X3Y5XzBfc2V0X2lycV9mdW5jcyhhZGV2 KTsKIAlnZnhfdjlfMF9zZXRfZ2RzX2luaXQoYWRldik7CiAJZ2Z4X3Y5XzBfc2V0X3JsY19mdW5j cyhhZGV2KTsKIAogCXJldHVybiAwOwogfQogCiBzdGF0aWMgaW50IGdmeF92OV8wX2xhdGVfaW5p dCh2b2lkICpoYW5kbGUpCiB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2luY2x1 ZGUva2dkX2tmZF9pbnRlcmZhY2UuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvaW5jbHVkZS9rZ2Rf a2ZkX2ludGVyZmFjZS5oCmluZGV4IGEwOWQ5ZjMuLjY3ZjZkMTkgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvaW5jbHVkZS9rZ2Rfa2ZkX2ludGVyZmFjZS5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvaW5jbHVkZS9rZ2Rfa2ZkX2ludGVyZmFjZS5oCkBAIC0yNiwyMCArMjYsMjEg QEAKICAqLwogCiAjaWZuZGVmIEtHRF9LRkRfSU5URVJGQUNFX0hfSU5DTFVERUQKICNkZWZpbmUg S0dEX0tGRF9JTlRFUkZBQ0VfSF9JTkNMVURFRAogCiAjaW5jbHVkZSA8bGludXgvdHlwZXMuaD4K IAogc3RydWN0IHBjaV9kZXY7CiAKICNkZWZpbmUgS0ZEX0lOVEVSRkFDRV9WRVJTSU9OIDEKKyNk ZWZpbmUgS0dEX01BWF9RVUVVRVMgMTI4CiAKIHN0cnVjdCBrZmRfZGV2Owogc3RydWN0IGtnZF9k ZXY7CiAKIHN0cnVjdCBrZ2RfbWVtOwogCiBlbnVtIGtnZF9tZW1vcnlfcG9vbCB7CiAJS0dEX1BP T0xfU1lTVEVNX0NBQ0hFQUJMRSA9IDEsCiAJS0dEX1BPT0xfU1lTVEVNX1dSSVRFQ09NQklORSA9 IDIsCiAJS0dEX1BPT0xfRlJBTUVCVUZGRVIgPSAzLAotLSAKMi45LjMKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFt ZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=