From: Andres Rodriguez Subject: [PATCH 16/17] drm/amdgpu: avoid KIQ clashing with compute or KFD queues v2 Date: Fri, 21 Apr 2017 16:02:41 -0400 Message-ID: <20170421200242.3072-17-andresx7@gmail.com> References: <20170421200242.3072-1-andresx7@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170421200242.3072-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 SW5zdGVhZCBvZiBwaWNraW5nIGFuIGFyYml0cmFyeSBxdWV1ZSBmb3IgS0lRLCBzZWFyY2ggZm9y IG9uZSBhY2NvcmRpbmcKdG8gcG9saWN5LiBUaGUgcXVldWUgbXVzdCBiZSB1bnVzZWQuCgpBbHNv IHJlcG9ydCB0aGUgS0lRIGFzIGFuIHVuYXZhaWxhYmxlIHJlc291cmNlIHRvIEtGRC4KCkluIHRl c3RpbmcgSSByYW4gaW50byBLQ1EgaW5pdGlhbGl6YXRpb24gaXNzdWVzIHdoZW4gdXNpbmcgcGlw ZXMgMi8zIG9mCk1FQzIgZm9yIHRoZSBLSVEuIFRoZXJlZm9yZSB0aGUgcG9saWN5IGRpc2FsbG93 cyBncmFiYmluZyBvbmUgb2YgdGhlc2UuCgp2MjogZml4IChyaW5nLm1lICsgMSkgdG8gKHJpbmcu bWUgLTEpIGluIGFtZGdwdV9hbWRrZmRfZGV2aWNlX2luaXQKClJldmlld2VkLWJ5OiBGZWxpeCBL dWVobGluZyA8RmVsaXguS3VlaGxpbmdAYW1kLmNvbT4KU2lnbmVkLW9mZi1ieTogQW5kcmVzIFJv ZHJpZ3VleiA8YW5kcmVzeDdAZ21haWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdS5oICAgICAgICB8IDIzICsrKysrKysrKysrKystLS0KIGRyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2FtZGdwdV9hbWRrZmQuYyB8ICA4ICsrKysrKwogZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYyAgICAgIHwgNDMgKysrKysrKysrKysrKysrKysrKysrKysr LS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jICAgICAgfCA0MiAr KysrKysrKysrKysrKysrKysrKysrKystLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCA5OCBpbnNlcnRp b25zKCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHUuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCmlu ZGV4IGYyOTI5MDQxYzg1Li5hMDJiMDhhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUu aApAQCAtMTc2MSw1MSArMTc2MSw2OCBAQCBzdGF0aWMgaW5saW5lIHZvaWQgYW1kZ3B1X3Jpbmdf d3JpdGVfbXVsdGlwbGUoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLCB2b2lkICpzcgogCQlyaW5n LT5jb3VudF9kdyAtPSBjb3VudF9kdzsKIAl9CiB9CiAKIHN0YXRpYyBpbmxpbmUgc3RydWN0IGFt ZGdwdV9zZG1hX2luc3RhbmNlICoKIGFtZGdwdV9nZXRfc2RtYV9pbnN0YW5jZShzdHJ1Y3QgYW1k Z3B1X3JpbmcgKnJpbmcpCiB7CiAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSByaW5nLT5h ZGV2OwogCWludCBpOwogCiAJZm9yIChpID0gMDsgaSA8IGFkZXYtPnNkbWEubnVtX2luc3RhbmNl czsgaSsrKQogCQlpZiAoJmFkZXYtPnNkbWEuaW5zdGFuY2VbaV0ucmluZyA9PSByaW5nKQogCQkJ YnJlYWs7CiAKIAlpZiAoaSA8IEFNREdQVV9NQVhfU0RNQV9JTlNUQU5DRVMpCiAJCXJldHVybiAm YWRldi0+c2RtYS5pbnN0YW5jZVtpXTsKIAllbHNlCiAJCXJldHVybiBOVUxMOwogfQogCi1zdGF0 aWMgaW5saW5lIGJvb2wgYW1kZ3B1X2lzX21lY19xdWV1ZV9lbmFibGVkKHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2LAotCQkJCQkJaW50IG1lYywgaW50IHBpcGUsIGludCBxdWV1ZSkKK3N0YXRp YyBpbmxpbmUgaW50IGFtZGdwdV9xdWV1ZV90b19iaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYsCisJCQkJICAgICAgaW50IG1lYywgaW50IHBpcGUsIGludCBxdWV1ZSkKIHsKIAlpbnQgYml0 ID0gMDsKIAogCWJpdCArPSBtZWMgKiBhZGV2LT5nZngubWVjLm51bV9waXBlX3Blcl9tZWMKIAkJ KiBhZGV2LT5nZngubWVjLm51bV9xdWV1ZV9wZXJfcGlwZTsKIAliaXQgKz0gcGlwZSAqIGFkZXYt PmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9waXBlOwogCWJpdCArPSBxdWV1ZTsKIAotCXJldHVybiB0 ZXN0X2JpdChiaXQsIGFkZXYtPmdmeC5tZWMucXVldWVfYml0bWFwKTsKKwlyZXR1cm4gYml0Owor fQorCitzdGF0aWMgaW5saW5lIHZvaWQgYW1kZ3B1X2JpdF90b19xdWV1ZShzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldiwgaW50IGJpdCwKKwkJCQkgICAgICAgaW50ICptZWMsIGludCAqcGlwZSwg aW50ICpxdWV1ZSkKK3sKKwkqcXVldWUgPSBiaXQgJSBhZGV2LT5nZngubWVjLm51bV9xdWV1ZV9w ZXJfcGlwZTsKKwkqcGlwZSA9IChiaXQgLyBhZGV2LT5nZngubWVjLm51bV9xdWV1ZV9wZXJfcGlw ZSkKKwkJJSBhZGV2LT5nZngubWVjLm51bV9waXBlX3Blcl9tZWM7CisJKm1lYyA9IChiaXQgLyBh ZGV2LT5nZngubWVjLm51bV9xdWV1ZV9wZXJfcGlwZSkKKwkgICAgICAgLyBhZGV2LT5nZngubWVj Lm51bV9waXBlX3Blcl9tZWM7CisKK30KK3N0YXRpYyBpbmxpbmUgYm9vbCBhbWRncHVfaXNfbWVj X3F1ZXVlX2VuYWJsZWQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCisJCQkJCSAgICAgICBp bnQgbWVjLCBpbnQgcGlwZSwgaW50IHF1ZXVlKQoreworCXJldHVybiB0ZXN0X2JpdChhbWRncHVf cXVldWVfdG9fYml0KGFkZXYsIG1lYywgcGlwZSwgcXVldWUpLAorCQkJYWRldi0+Z2Z4Lm1lYy5x dWV1ZV9iaXRtYXApOwogfQogCiAvKgogICogQVNJQ3MgbWFjcm8uCiAgKi8KICNkZWZpbmUgYW1k Z3B1X2FzaWNfc2V0X3ZnYV9zdGF0ZShhZGV2LCBzdGF0ZSkgKGFkZXYpLT5hc2ljX2Z1bmNzLT5z ZXRfdmdhX3N0YXRlKChhZGV2KSwgKHN0YXRlKSkKICNkZWZpbmUgYW1kZ3B1X2FzaWNfcmVzZXQo YWRldikgKGFkZXYpLT5hc2ljX2Z1bmNzLT5yZXNldCgoYWRldikpCiAjZGVmaW5lIGFtZGdwdV9h c2ljX2dldF94Y2xrKGFkZXYpIChhZGV2KS0+YXNpY19mdW5jcy0+Z2V0X3hjbGsoKGFkZXYpKQog I2RlZmluZSBhbWRncHVfYXNpY19zZXRfdXZkX2Nsb2NrcyhhZGV2LCB2LCBkKSAoYWRldiktPmFz aWNfZnVuY3MtPnNldF91dmRfY2xvY2tzKChhZGV2KSwgKHYpLCAoZCkpCiAjZGVmaW5lIGFtZGdw dV9hc2ljX3NldF92Y2VfY2xvY2tzKGFkZXYsIGV2LCBlYykgKGFkZXYpLT5hc2ljX2Z1bmNzLT5z ZXRfdmNlX2Nsb2NrcygoYWRldiksIChldiksIChlYykpCiAjZGVmaW5lIGFtZGdwdV9nZXRfcGNp ZV9sYW5lcyhhZGV2KSAoYWRldiktPmFzaWNfZnVuY3MtPmdldF9wY2llX2xhbmVzKChhZGV2KSkK ICNkZWZpbmUgYW1kZ3B1X3NldF9wY2llX2xhbmVzKGFkZXYsIGwpIChhZGV2KS0+YXNpY19mdW5j cy0+c2V0X3BjaWVfbGFuZXMoKGFkZXYpLCAobCkpCiAjZGVmaW5lIGFtZGdwdV9hc2ljX2dldF9n cHVfY2xvY2tfY291bnRlcihhZGV2KSAoYWRldiktPmFzaWNfZnVuY3MtPmdldF9ncHVfY2xvY2tf Y291bnRlcigoYWRldikpCiAjZGVmaW5lIGFtZGdwdV9hc2ljX3JlYWRfZGlzYWJsZWRfYmlvcyhh ZGV2KSAoYWRldiktPmFzaWNfZnVuY3MtPnJlYWRfZGlzYWJsZWRfYmlvcygoYWRldikpCiAjZGVm aW5lIGFtZGdwdV9hc2ljX3JlYWRfYmlvc19mcm9tX3JvbShhZGV2LCBiLCBsKSAoYWRldiktPmFz aWNfZnVuY3MtPnJlYWRfYmlvc19mcm9tX3JvbSgoYWRldiksIChiKSwgKGwpKQogI2RlZmluZSBh bWRncHVfYXNpY19yZWFkX3JlZ2lzdGVyKGFkZXYsIHNlLCBzaCwgb2Zmc2V0LCB2KSgoYWRldikt PmFzaWNfZnVuY3MtPnJlYWRfcmVnaXN0ZXIoKGFkZXYpLCAoc2UpLCAoc2gpLCAob2Zmc2V0KSwg KHYpKSkKICNkZWZpbmUgYW1kZ3B1X2FzaWNfZ2V0X2NvbmZpZ19tZW1zaXplKGFkZXYpIChhZGV2 KS0+YXNpY19mdW5jcy0+Z2V0X2NvbmZpZ19tZW1zaXplKChhZGV2KSkKICNkZWZpbmUgYW1kZ3B1 X2dhcnRfZmx1c2hfZ3B1X3RsYihhZGV2LCB2bWlkKSAoYWRldiktPmdhcnQuZ2FydF9mdW5jcy0+ Zmx1c2hfZ3B1X3RsYigoYWRldiksICh2bWlkKSkKICNkZWZpbmUgYW1kZ3B1X2dhcnRfc2V0X3B0 ZV9wZGUoYWRldiwgcHQsIGlkeCwgYWRkciwgZmxhZ3MpIChhZGV2KS0+Z2FydC5nYXJ0X2Z1bmNz LT5zZXRfcHRlX3BkZSgoYWRldiksIChwdCksIChpZHgpLCAoYWRkciksIChmbGFncykpCiAjZGVm aW5lIGFtZGdwdV92bV9jb3B5X3B0ZShhZGV2LCBpYiwgcGUsIHNyYywgY291bnQpICgoYWRldikt PnZtX21hbmFnZXIudm1fcHRlX2Z1bmNzLT5jb3B5X3B0ZSgoaWIpLCAocGUpLCAoc3JjKSwgKGNv dW50KSkpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYW1k a2ZkLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYW1ka2ZkLmMKaW5kZXgg OGZjNWFhMy4uMzM5ZThjZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X2FtZGtmZC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9h bWRrZmQuYwpAQCAtOTQsNDAgKzk0LDQ4IEBAIHZvaWQgYW1kZ3B1X2FtZGtmZF9kZXZpY2VfcHJv YmUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB9CiAKIHZvaWQgYW1kZ3B1X2FtZGtmZF9k ZXZpY2VfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsKIAlpbnQgaTsKIAlpbnQg bGFzdF92YWxpZF9iaXQ7CiAJaWYgKGFkZXYtPmtmZCkgewogCQlzdHJ1Y3Qga2dkMmtmZF9zaGFy ZWRfcmVzb3VyY2VzIGdwdV9yZXNvdXJjZXMgPSB7CiAJCQkuY29tcHV0ZV92bWlkX2JpdG1hcCA9 IDB4RkYwMCwKIAkJCS5udW1fbWVjID0gYWRldi0+Z2Z4Lm1lYy5udW1fbWVjLAogCQkJLm51bV9w aXBlX3Blcl9tZWMgPSBhZGV2LT5nZngubWVjLm51bV9waXBlX3Blcl9tZWMsCiAJCQkubnVtX3F1 ZXVlX3Blcl9waXBlID0gYWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3BpcGUKIAkJfTsKIAog CQkvKiB0aGlzIGlzIGdvaW5nIHRvIGhhdmUgYSBmZXcgb2YgdGhlIE1TQnMgc2V0IHRoYXQgd2Ug bmVlZCB0bwogCQkgKiBjbGVhciAqLwogCQliaXRtYXBfY29tcGxlbWVudChncHVfcmVzb3VyY2Vz LnF1ZXVlX2JpdG1hcCwKIAkJCQkgIGFkZXYtPmdmeC5tZWMucXVldWVfYml0bWFwLAogCQkJCSAg S0dEX01BWF9RVUVVRVMpOwogCisJCS8qIHJlbW92ZSB0aGUgS0lRIGJpdCBhcyB3ZWxsICovCisJ CWlmIChhZGV2LT5nZngua2lxLnJpbmcucmVhZHkpCisJCQljbGVhcl9iaXQoYW1kZ3B1X3F1ZXVl X3RvX2JpdChhZGV2LAorCQkJCQkJICAgICAgYWRldi0+Z2Z4LmtpcS5yaW5nLm1lIC0gMSwKKwkJ CQkJCSAgICAgIGFkZXYtPmdmeC5raXEucmluZy5waXBlLAorCQkJCQkJICAgICAgYWRldi0+Z2Z4 LmtpcS5yaW5nLnF1ZXVlKSwKKwkJCQkgIGdwdV9yZXNvdXJjZXMucXVldWVfYml0bWFwKTsKKwog CQkvKiBBY2NvcmRpbmcgdG8gbGludXgvYml0bWFwLmggd2Ugc2hvdWxkbid0IHVzZSBiaXRtYXBf Y2xlYXIgaWYKIAkJICogbmJpdHMgaXMgbm90IGNvbXBpbGUgdGltZSBjb25zdGFudCAqLwogCQls YXN0X3ZhbGlkX2JpdCA9IGFkZXYtPmdmeC5tZWMubnVtX21lYwogCQkJCSogYWRldi0+Z2Z4Lm1l Yy5udW1fcGlwZV9wZXJfbWVjCiAJCQkJKiBhZGV2LT5nZngubWVjLm51bV9xdWV1ZV9wZXJfcGlw ZTsKIAkJZm9yIChpID0gbGFzdF92YWxpZF9iaXQ7IGkgPCBLR0RfTUFYX1FVRVVFUzsgKytpKQog CQkJY2xlYXJfYml0KGksIGdwdV9yZXNvdXJjZXMucXVldWVfYml0bWFwKTsKIAogCQlhbWRncHVf ZG9vcmJlbGxfZ2V0X2tmZF9pbmZvKGFkZXYsCiAJCQkJJmdwdV9yZXNvdXJjZXMuZG9vcmJlbGxf cGh5c2ljYWxfYWRkcmVzcywKIAkJCQkmZ3B1X3Jlc291cmNlcy5kb29yYmVsbF9hcGVydHVyZV9z aXplLAogCQkJCSZncHVfcmVzb3VyY2VzLmRvb3JiZWxsX3N0YXJ0X29mZnNldCk7CiAKIAkJa2dk MmtmZC0+ZGV2aWNlX2luaXQoYWRldi0+a2ZkLCAmZ3B1X3Jlc291cmNlcyk7CiAJfQogfQogCiB2 b2lkIGFtZGdwdV9hbWRrZmRfZGV2aWNlX2Zpbmkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYp CiB7CiAJaWYgKGFkZXYtPmtmZCkgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvZ2Z4X3Y4XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMK aW5kZXggZDljNjg2Ny4uNDg3YTg0OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvZ2Z4X3Y4XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhf MC5jCkBAIC0xMzU2LDY0ICsxMzU2LDkxIEBAIHN0YXRpYyBpbnQgZ2Z4X3Y4XzBfcmxjX2luaXQo c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJfQogCiAJcmV0dXJuIDA7CiB9CiAKIHN0YXRp YyB2b2lkIGdmeF92OF8wX21lY19maW5pKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewog CWludCByOwogCiAJaWYgKGFkZXYtPmdmeC5tZWMuaHBkX2VvcF9vYmopIHsKIAkJciA9IGFtZGdw dV9ib19yZXNlcnZlKGFkZXYtPmdmeC5tZWMuaHBkX2VvcF9vYmosIGZhbHNlKTsKIAkJaWYgKHVu bGlrZWx5KHIgIT0gMCkpCiAJCQlkZXZfd2FybihhZGV2LT5kZXYsICIoJWQpIHJlc2VydmUgSFBE IEVPUCBibyBmYWlsZWRcbiIsIHIpOwogCQlhbWRncHVfYm9fdW5waW4oYWRldi0+Z2Z4Lm1lYy5o cGRfZW9wX29iaik7CiAJCWFtZGdwdV9ib191bnJlc2VydmUoYWRldi0+Z2Z4Lm1lYy5ocGRfZW9w X29iaik7CiAJCWFtZGdwdV9ib191bnJlZigmYWRldi0+Z2Z4Lm1lYy5ocGRfZW9wX29iaik7CiAJ CWFkZXYtPmdmeC5tZWMuaHBkX2VvcF9vYmogPSBOVUxMOwogCX0KIH0KIAorc3RhdGljIGludCBn ZnhfdjhfMF9raXFfYWNxdWlyZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKKwkJCQkgc3Ry dWN0IGFtZGdwdV9yaW5nICpyaW5nKQoreworCWludCBxdWV1ZV9iaXQ7CisJaW50IG1lYywgcGlw ZSwgcXVldWU7CisKKwlxdWV1ZV9iaXQgPSBhZGV2LT5nZngubWVjLm51bV9tZWMKKwkJICAgICog YWRldi0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJfbWVjCisJCSAgICAqIGFkZXYtPmdmeC5tZWMubnVt X3F1ZXVlX3Blcl9waXBlOworCisJd2hpbGUgKHF1ZXVlX2JpdC0tID49IDApIHsKKwkJaWYgKHRl c3RfYml0KHF1ZXVlX2JpdCwgYWRldi0+Z2Z4Lm1lYy5xdWV1ZV9iaXRtYXApKQorCQkJY29udGlu dWU7CisKKwkJYW1kZ3B1X2JpdF90b19xdWV1ZShhZGV2LCBxdWV1ZV9iaXQsICZtZWMsICZwaXBl LCAmcXVldWUpOworCisJCS8qIFVzaW5nIHBpcGVzIDIvMyBmcm9tIE1FQyAyIHNlZW1zIGNhdXNl IHByb2JsZW1zICovCisJCWlmIChtZWMgPT0gMSAmJiBwaXBlID4gMSkKKwkJCWNvbnRpbnVlOwor CisJCXJpbmctPm1lID0gbWVjICsgMTsKKwkJcmluZy0+cGlwZSA9IHBpcGU7CisJCXJpbmctPnF1 ZXVlID0gcXVldWU7CisKKwkJcmV0dXJuIDA7CisJfQorCisJZGV2X2VycihhZGV2LT5kZXYsICJG YWlsZWQgdG8gZmluZCBhIHF1ZXVlIGZvciBLSVFcbiIpOworCXJldHVybiAtRUlOVkFMOworfQor CiBzdGF0aWMgaW50IGdmeF92OF8wX2tpcV9pbml0X3Jpbmcoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYsCiAJCQkJICBzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCiAJCQkJICBzdHJ1Y3QgYW1k Z3B1X2lycV9zcmMgKmlycSkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2tpcSAqa2lxID0gJmFkZXYtPmdm eC5raXE7CiAJaW50IHIgPSAwOwogCiAJciA9IGFtZGdwdV93Yl9nZXQoYWRldiwgJmFkZXYtPnZp cnQucmVnX3ZhbF9vZmZzKTsKIAlpZiAocikKIAkJcmV0dXJuIHI7CiAKIAlyaW5nLT5hZGV2ID0g TlVMTDsKIAlyaW5nLT5yaW5nX29iaiA9IE5VTEw7CiAJcmluZy0+dXNlX2Rvb3JiZWxsID0gdHJ1 ZTsKIAlyaW5nLT5kb29yYmVsbF9pbmRleCA9IEFNREdQVV9ET09SQkVMTF9LSVE7Ci0JaWYgKGFk ZXYtPmdmeC5tZWMyX2Z3KSB7Ci0JCXJpbmctPm1lID0gMjsKLQkJcmluZy0+cGlwZSA9IDA7Ci0J fSBlbHNlIHsKLQkJcmluZy0+bWUgPSAxOwotCQlyaW5nLT5waXBlID0gMTsKLQl9CiAKLQlyaW5n LT5xdWV1ZSA9IDA7CisJciA9IGdmeF92OF8wX2tpcV9hY3F1aXJlKGFkZXYsIHJpbmcpOworCWlm IChyKQorCQlyZXR1cm4gcjsKKwogCXJpbmctPmVvcF9ncHVfYWRkciA9IGtpcS0+ZW9wX2dwdV9h ZGRyOwogCXNwcmludGYocmluZy0+bmFtZSwgImtpcSAlZC4lZC4lZCIsIHJpbmctPm1lLCByaW5n LT5waXBlLCByaW5nLT5xdWV1ZSk7CiAJciA9IGFtZGdwdV9yaW5nX2luaXQoYWRldiwgcmluZywg MTAyNCwKIAkJCSAgICAgaXJxLCBBTURHUFVfQ1BfS0lRX0lSUV9EUklWRVIwKTsKIAlpZiAocikK IAkJZGV2X3dhcm4oYWRldi0+ZGV2LCAiKCVkKSBmYWlsZWQgdG8gaW5pdCBraXEgcmluZ1xuIiwg cik7CiAKIAlyZXR1cm4gcjsKIH0KIAogc3RhdGljIHZvaWQgZ2Z4X3Y4XzBfa2lxX2ZyZWVfcmlu ZyhzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCiAJCQkJICAgc3RydWN0IGFtZGdwdV9pcnFfc3Jj ICppcnEpCiB7CiAJYW1kZ3B1X3diX2ZyZWUocmluZy0+YWRldiwgcmluZy0+YWRldi0+dmlydC5y ZWdfdmFsX29mZnMpOwogCWFtZGdwdV9yaW5nX2ZpbmkocmluZyk7CiB9CiAKIHN0YXRpYyB2b2lk IGdmeF92OF8wX2NvbXB1dGVfcXVldWVfYWNxdWlyZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl dikKIHsKIAlpbnQgaSwgcXVldWUsIHBpcGUsIG1lYzsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9n ZnhfdjlfMC5jCmluZGV4IDZmZjAwMmQuLmIxZDNjZTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvZ2Z4X3Y5XzAuYwpAQCAtNjMxLDYyICs2MzEsOTAgQEAgc3RhdGljIGludCBnZnhfdjlfMF9r aXFfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAogCXIgPSBhbWRncHVfYm9fY3Jl YXRlX2tlcm5lbChhZGV2LCBHRlg5X01FQ19IUERfU0laRSwgUEFHRV9TSVpFLAogCQkJCSAgICBB TURHUFVfR0VNX0RPTUFJTl9HVFQsICZraXEtPmVvcF9vYmosCiAJCQkJICAgICZraXEtPmVvcF9n cHVfYWRkciwgKHZvaWQgKiopJmhwZCk7CiAJaWYgKHIpIHsKIAkJZGV2X3dhcm4oYWRldi0+ZGV2 LCAiZmFpbGVkIHRvIGNyZWF0ZSBLSVEgYm8gKCVkKS5cbiIsIHIpOwogCQlyZXR1cm4gcjsKIAl9 CiAKIAltZW1zZXQoaHBkLCAwLCBHRlg5X01FQ19IUERfU0laRSk7CiAKIAlyID0gYW1kZ3B1X2Jv X3Jlc2VydmUoa2lxLT5lb3Bfb2JqLCBmYWxzZSk7CiAJaWYgKHVubGlrZWx5KHIgIT0gMCkpCiAJ CWRldl93YXJuKGFkZXYtPmRldiwgIiglZCkgcmVzZXJ2ZSBraXEgZW9wIGJvIGZhaWxlZFxuIiwg cik7CiAJYW1kZ3B1X2JvX2t1bm1hcChraXEtPmVvcF9vYmopOwogCWFtZGdwdV9ib191bnJlc2Vy dmUoa2lxLT5lb3Bfb2JqKTsKIAogCXJldHVybiAwOwogfQogCitzdGF0aWMgaW50IGdmeF92OV8w X2tpcV9hY3F1aXJlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAorCQkJCSBzdHJ1Y3QgYW1k Z3B1X3JpbmcgKnJpbmcpCit7CisJaW50IHF1ZXVlX2JpdDsKKwlpbnQgbWVjLCBwaXBlLCBxdWV1 ZTsKKworCXF1ZXVlX2JpdCA9IGFkZXYtPmdmeC5tZWMubnVtX21lYworCQkgICAgKiBhZGV2LT5n ZngubWVjLm51bV9waXBlX3Blcl9tZWMKKwkJICAgICogYWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVf cGVyX3BpcGU7CisKKwl3aGlsZSAocXVldWVfYml0LS0gPj0gMCkgeworCQlpZiAodGVzdF9iaXQo cXVldWVfYml0LCBhZGV2LT5nZngubWVjLnF1ZXVlX2JpdG1hcCkpCisJCQljb250aW51ZTsKKwor CQlhbWRncHVfYml0X3RvX3F1ZXVlKGFkZXYsIHF1ZXVlX2JpdCwgJm1lYywgJnBpcGUsICZxdWV1 ZSk7CisKKwkJLyogVXNpbmcgcGlwZXMgMi8zIGZyb20gTUVDIDIgc2VlbXMgY2F1c2UgcHJvYmxl bXMgKi8KKwkJaWYgKG1lYyA9PSAxICYmIHBpcGUgPiAxKQorCQkJY29udGludWU7CisKKwkJcmlu Zy0+bWUgPSBtZWMgKyAxOworCQlyaW5nLT5waXBlID0gcGlwZTsKKwkJcmluZy0+cXVldWUgPSBx dWV1ZTsKKworCQlyZXR1cm4gMDsKKwl9CisKKwlkZXZfZXJyKGFkZXYtPmRldiwgIkZhaWxlZCB0 byBmaW5kIGEgcXVldWUgZm9yIEtJUVxuIik7CisJcmV0dXJuIC1FSU5WQUw7Cit9CisKIHN0YXRp YyBpbnQgZ2Z4X3Y5XzBfa2lxX2luaXRfcmluZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwK IAkJCQkgIHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywKIAkJCQkgIHN0cnVjdCBhbWRncHVfaXJx X3NyYyAqaXJxKQogewogCXN0cnVjdCBhbWRncHVfa2lxICpraXEgPSAmYWRldi0+Z2Z4LmtpcTsK IAlpbnQgciA9IDA7CiAKIAlyID0gYW1kZ3B1X3diX2dldChhZGV2LCAmYWRldi0+dmlydC5yZWdf dmFsX29mZnMpOwogCWlmIChyKQogCQlyZXR1cm4gcjsKIAogCXJpbmctPmFkZXYgPSBOVUxMOwog CXJpbmctPnJpbmdfb2JqID0gTlVMTDsKIAlyaW5nLT51c2VfZG9vcmJlbGwgPSB0cnVlOwogCXJp bmctPmRvb3JiZWxsX2luZGV4ID0gQU1ER1BVX0RPT1JCRUxMX0tJUTsKLQlpZiAoYWRldi0+Z2Z4 Lm1lYzJfZncpIHsKLQkJcmluZy0+bWUgPSAyOwotCQlyaW5nLT5waXBlID0gMDsKLQl9IGVsc2Ug ewotCQlyaW5nLT5tZSA9IDE7Ci0JCXJpbmctPnBpcGUgPSAxOwotCX0KKworCXIgPSBnZnhfdjlf MF9raXFfYWNxdWlyZShhZGV2LCByaW5nKTsKKwlpZiAocikKKwkJcmV0dXJuIHI7CiAKIAlyaW5n LT5xdWV1ZSA9IDA7CiAJcmluZy0+ZW9wX2dwdV9hZGRyID0ga2lxLT5lb3BfZ3B1X2FkZHI7CiAJ c3ByaW50ZihyaW5nLT5uYW1lLCAia2lxICVkLiVkLiVkIiwgcmluZy0+bWUsIHJpbmctPnBpcGUs IHJpbmctPnF1ZXVlKTsKIAlyID0gYW1kZ3B1X3JpbmdfaW5pdChhZGV2LCByaW5nLCAxMDI0LAog CQkJICAgICBpcnEsIEFNREdQVV9DUF9LSVFfSVJRX0RSSVZFUjApOwogCWlmIChyKQogCQlkZXZf d2FybihhZGV2LT5kZXYsICIoJWQpIGZhaWxlZCB0byBpbml0IGtpcSByaW5nXG4iLCByKTsKIAog CXJldHVybiByOwogfQogc3RhdGljIHZvaWQgZ2Z4X3Y5XzBfa2lxX2ZyZWVfcmluZyhzdHJ1Y3Qg YW1kZ3B1X3JpbmcgKnJpbmcsCiAJCQkJICAgc3RydWN0IGFtZGdwdV9pcnFfc3JjICppcnEpCiB7 CiAJYW1kZ3B1X3diX2ZyZWUocmluZy0+YWRldiwgcmluZy0+YWRldi0+dmlydC5yZWdfdmFsX29m ZnMpOwogCWFtZGdwdV9yaW5nX2ZpbmkocmluZyk7CiB9CiAKIC8qIGNyZWF0ZSBNUUQgZm9yIGVh Y2ggY29tcHV0ZSBxdWV1ZSAqLwogc3RhdGljIGludCBnZnhfdjlfMF9jb21wdXRlX21xZF9zd19p bml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQotLSAKMi45LjMKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFt ZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=