From: Andres Rodriguez Subject: [PATCH 16/17] drm/amdgpu: avoid KIQ clashing with compute or KFD queues v2 Date: Thu, 13 Apr 2017 17:35:41 -0400 Message-ID: <20170413213542.18802-17-andresx7@gmail.com> References: <20170413213542.18802-1-andresx7@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170413213542.18802-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 ZGV4IDA1ODMzOTYuLjBhNTg1NzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCkBA IC0xNzYyLDUxICsxNzYyLDY4IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBhbWRncHVfcmluZ193cml0 ZV9tdWx0aXBsZShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsIHZvaWQgKnNyCiAJCXJpbmctPmNv dW50X2R3IC09IGNvdW50X2R3OwogCX0KIH0KIAogc3RhdGljIGlubGluZSBzdHJ1Y3QgYW1kZ3B1 X3NkbWFfaW5zdGFuY2UgKgogYW1kZ3B1X2dldF9zZG1hX2luc3RhbmNlKHN0cnVjdCBhbWRncHVf cmluZyAqcmluZykKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IHJpbmctPmFkZXY7 CiAJaW50IGk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+c2RtYS5udW1faW5zdGFuY2VzOyBp KyspCiAJCWlmICgmYWRldi0+c2RtYS5pbnN0YW5jZVtpXS5yaW5nID09IHJpbmcpCiAJCQlicmVh azsKIAogCWlmIChpIDwgQU1ER1BVX01BWF9TRE1BX0lOU1RBTkNFUykKIAkJcmV0dXJuICZhZGV2 LT5zZG1hLmluc3RhbmNlW2ldOwogCWVsc2UKIAkJcmV0dXJuIE5VTEw7CiB9CiAKLXN0YXRpYyBp bmxpbmUgYm9vbCBhbWRncHVfaXNfbWVjX3F1ZXVlX2VuYWJsZWQoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYsCi0JCQkJCQlpbnQgbWVjLCBpbnQgcGlwZSwgaW50IHF1ZXVlKQorc3RhdGljIGlu bGluZSBpbnQgYW1kZ3B1X3F1ZXVlX3RvX2JpdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwK KwkJCQkgICAgICBpbnQgbWVjLCBpbnQgcGlwZSwgaW50IHF1ZXVlKQogewogCWludCBiaXQgPSAw OwogCiAJYml0ICs9IG1lYyAqIGFkZXYtPmdmeC5tZWMubnVtX3BpcGVfcGVyX21lYwogCQkqIGFk ZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9waXBlOwogCWJpdCArPSBwaXBlICogYWRldi0+Z2Z4 Lm1lYy5udW1fcXVldWVfcGVyX3BpcGU7CiAJYml0ICs9IHF1ZXVlOwogCi0JcmV0dXJuIHRlc3Rf Yml0KGJpdCwgYWRldi0+Z2Z4Lm1lYy5xdWV1ZV9iaXRtYXApOworCXJldHVybiBiaXQ7Cit9CisK K3N0YXRpYyBpbmxpbmUgdm9pZCBhbWRncHVfYml0X3RvX3F1ZXVlKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2LCBpbnQgYml0LAorCQkJCSAgICAgICBpbnQgKm1lYywgaW50ICpwaXBlLCBpbnQg KnF1ZXVlKQoreworCSpxdWV1ZSA9IGJpdCAlIGFkZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9w aXBlOworCSpwaXBlID0gKGJpdCAvIGFkZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9waXBlKQor CQklIGFkZXYtPmdmeC5tZWMubnVtX3BpcGVfcGVyX21lYzsKKwkqbWVjID0gKGJpdCAvIGFkZXYt PmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9waXBlKQorCSAgICAgICAvIGFkZXYtPmdmeC5tZWMubnVt X3BpcGVfcGVyX21lYzsKKworfQorc3RhdGljIGlubGluZSBib29sIGFtZGdwdV9pc19tZWNfcXVl dWVfZW5hYmxlZChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKKwkJCQkJICAgICAgIGludCBt ZWMsIGludCBwaXBlLCBpbnQgcXVldWUpCit7CisJcmV0dXJuIHRlc3RfYml0KGFtZGdwdV9xdWV1 ZV90b19iaXQoYWRldiwgbWVjLCBwaXBlLCBxdWV1ZSksCisJCQlhZGV2LT5nZngubWVjLnF1ZXVl X2JpdG1hcCk7CiB9CiAKIC8qCiAgKiBBU0lDcyBtYWNyby4KICAqLwogI2RlZmluZSBhbWRncHVf YXNpY19zZXRfdmdhX3N0YXRlKGFkZXYsIHN0YXRlKSAoYWRldiktPmFzaWNfZnVuY3MtPnNldF92 Z2Ffc3RhdGUoKGFkZXYpLCAoc3RhdGUpKQogI2RlZmluZSBhbWRncHVfYXNpY19yZXNldChhZGV2 KSAoYWRldiktPmFzaWNfZnVuY3MtPnJlc2V0KChhZGV2KSkKICNkZWZpbmUgYW1kZ3B1X2FzaWNf Z2V0X3hjbGsoYWRldikgKGFkZXYpLT5hc2ljX2Z1bmNzLT5nZXRfeGNsaygoYWRldikpCiAjZGVm aW5lIGFtZGdwdV9hc2ljX3NldF91dmRfY2xvY2tzKGFkZXYsIHYsIGQpIChhZGV2KS0+YXNpY19m dW5jcy0+c2V0X3V2ZF9jbG9ja3MoKGFkZXYpLCAodiksIChkKSkKICNkZWZpbmUgYW1kZ3B1X2Fz aWNfc2V0X3ZjZV9jbG9ja3MoYWRldiwgZXYsIGVjKSAoYWRldiktPmFzaWNfZnVuY3MtPnNldF92 Y2VfY2xvY2tzKChhZGV2KSwgKGV2KSwgKGVjKSkKICNkZWZpbmUgYW1kZ3B1X2dldF9wY2llX2xh bmVzKGFkZXYpIChhZGV2KS0+YXNpY19mdW5jcy0+Z2V0X3BjaWVfbGFuZXMoKGFkZXYpKQogI2Rl ZmluZSBhbWRncHVfc2V0X3BjaWVfbGFuZXMoYWRldiwgbCkgKGFkZXYpLT5hc2ljX2Z1bmNzLT5z ZXRfcGNpZV9sYW5lcygoYWRldiksIChsKSkKICNkZWZpbmUgYW1kZ3B1X2FzaWNfZ2V0X2dwdV9j bG9ja19jb3VudGVyKGFkZXYpIChhZGV2KS0+YXNpY19mdW5jcy0+Z2V0X2dwdV9jbG9ja19jb3Vu dGVyKChhZGV2KSkKICNkZWZpbmUgYW1kZ3B1X2FzaWNfcmVhZF9kaXNhYmxlZF9iaW9zKGFkZXYp IChhZGV2KS0+YXNpY19mdW5jcy0+cmVhZF9kaXNhYmxlZF9iaW9zKChhZGV2KSkKICNkZWZpbmUg YW1kZ3B1X2FzaWNfcmVhZF9iaW9zX2Zyb21fcm9tKGFkZXYsIGIsIGwpIChhZGV2KS0+YXNpY19m dW5jcy0+cmVhZF9iaW9zX2Zyb21fcm9tKChhZGV2KSwgKGIpLCAobCkpCiAjZGVmaW5lIGFtZGdw dV9hc2ljX3JlYWRfcmVnaXN0ZXIoYWRldiwgc2UsIHNoLCBvZmZzZXQsIHYpKChhZGV2KS0+YXNp Y19mdW5jcy0+cmVhZF9yZWdpc3RlcigoYWRldiksIChzZSksIChzaCksIChvZmZzZXQpLCAodikp KQogI2RlZmluZSBhbWRncHVfYXNpY19nZXRfY29uZmlnX21lbXNpemUoYWRldikgKGFkZXYpLT5h c2ljX2Z1bmNzLT5nZXRfY29uZmlnX21lbXNpemUoKGFkZXYpKQogI2RlZmluZSBhbWRncHVfZ2Fy dF9mbHVzaF9ncHVfdGxiKGFkZXYsIHZtaWQpIChhZGV2KS0+Z2FydC5nYXJ0X2Z1bmNzLT5mbHVz aF9ncHVfdGxiKChhZGV2KSwgKHZtaWQpKQogI2RlZmluZSBhbWRncHVfZ2FydF9zZXRfcHRlX3Bk ZShhZGV2LCBwdCwgaWR4LCBhZGRyLCBmbGFncykgKGFkZXYpLT5nYXJ0LmdhcnRfZnVuY3MtPnNl dF9wdGVfcGRlKChhZGV2KSwgKHB0KSwgKGlkeCksIChhZGRyKSwgKGZsYWdzKSkKICNkZWZpbmUg YW1kZ3B1X3ZtX2NvcHlfcHRlKGFkZXYsIGliLCBwZSwgc3JjLCBjb3VudCkgKChhZGV2KS0+dm1f bWFuYWdlci52bV9wdGVfZnVuY3MtPmNvcHlfcHRlKChpYiksIChwZSksIChzcmMpLCAoY291bnQp KSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hbWRrZmQu YyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hbWRrZmQuYwppbmRleCA4ZmM1 YWEzLi4zMzllOGNkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfYW1ka2ZkLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2FtZGtm ZC5jCkBAIC05NCw0MCArOTQsNDggQEAgdm9pZCBhbWRncHVfYW1ka2ZkX2RldmljZV9wcm9iZShz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIH0KIAogdm9pZCBhbWRncHVfYW1ka2ZkX2Rldmlj ZV9pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewogCWludCBpOwogCWludCBsYXN0 X3ZhbGlkX2JpdDsKIAlpZiAoYWRldi0+a2ZkKSB7CiAJCXN0cnVjdCBrZ2Qya2ZkX3NoYXJlZF9y ZXNvdXJjZXMgZ3B1X3Jlc291cmNlcyA9IHsKIAkJCS5jb21wdXRlX3ZtaWRfYml0bWFwID0gMHhG RjAwLAogCQkJLm51bV9tZWMgPSBhZGV2LT5nZngubWVjLm51bV9tZWMsCiAJCQkubnVtX3BpcGVf cGVyX21lYyA9IGFkZXYtPmdmeC5tZWMubnVtX3BpcGVfcGVyX21lYywKIAkJCS5udW1fcXVldWVf cGVyX3BpcGUgPSBhZGV2LT5nZngubWVjLm51bV9xdWV1ZV9wZXJfcGlwZQogCQl9OwogCiAJCS8q IHRoaXMgaXMgZ29pbmcgdG8gaGF2ZSBhIGZldyBvZiB0aGUgTVNCcyBzZXQgdGhhdCB3ZSBuZWVk IHRvCiAJCSAqIGNsZWFyICovCiAJCWJpdG1hcF9jb21wbGVtZW50KGdwdV9yZXNvdXJjZXMucXVl dWVfYml0bWFwLAogCQkJCSAgYWRldi0+Z2Z4Lm1lYy5xdWV1ZV9iaXRtYXAsCiAJCQkJICBLR0Rf TUFYX1FVRVVFUyk7CiAKKwkJLyogcmVtb3ZlIHRoZSBLSVEgYml0IGFzIHdlbGwgKi8KKwkJaWYg KGFkZXYtPmdmeC5raXEucmluZy5yZWFkeSkKKwkJCWNsZWFyX2JpdChhbWRncHVfcXVldWVfdG9f Yml0KGFkZXYsCisJCQkJCQkgICAgICBhZGV2LT5nZngua2lxLnJpbmcubWUgLSAxLAorCQkJCQkJ ICAgICAgYWRldi0+Z2Z4LmtpcS5yaW5nLnBpcGUsCisJCQkJCQkgICAgICBhZGV2LT5nZngua2lx LnJpbmcucXVldWUpLAorCQkJCSAgZ3B1X3Jlc291cmNlcy5xdWV1ZV9iaXRtYXApOworCiAJCS8q IEFjY29yZGluZyB0byBsaW51eC9iaXRtYXAuaCB3ZSBzaG91bGRuJ3QgdXNlIGJpdG1hcF9jbGVh ciBpZgogCQkgKiBuYml0cyBpcyBub3QgY29tcGlsZSB0aW1lIGNvbnN0YW50ICovCiAJCWxhc3Rf dmFsaWRfYml0ID0gYWRldi0+Z2Z4Lm1lYy5udW1fbWVjCiAJCQkJKiBhZGV2LT5nZngubWVjLm51 bV9waXBlX3Blcl9tZWMKIAkJCQkqIGFkZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9waXBlOwog CQlmb3IgKGkgPSBsYXN0X3ZhbGlkX2JpdDsgaSA8IEtHRF9NQVhfUVVFVUVTOyArK2kpCiAJCQlj bGVhcl9iaXQoaSwgZ3B1X3Jlc291cmNlcy5xdWV1ZV9iaXRtYXApOwogCiAJCWFtZGdwdV9kb29y YmVsbF9nZXRfa2ZkX2luZm8oYWRldiwKIAkJCQkmZ3B1X3Jlc291cmNlcy5kb29yYmVsbF9waHlz aWNhbF9hZGRyZXNzLAogCQkJCSZncHVfcmVzb3VyY2VzLmRvb3JiZWxsX2FwZXJ0dXJlX3NpemUs CiAJCQkJJmdwdV9yZXNvdXJjZXMuZG9vcmJlbGxfc3RhcnRfb2Zmc2V0KTsKIAogCQlrZ2Qya2Zk LT5kZXZpY2VfaW5pdChhZGV2LT5rZmQsICZncHVfcmVzb3VyY2VzKTsKIAl9CiB9CiAKIHZvaWQg YW1kZ3B1X2FtZGtmZF9kZXZpY2VfZmluaShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsK IAlpZiAoYWRldi0+a2ZkKSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9nZnhfdjhfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYwppbmRl eCBmZjc3MzUxLi4yMTc4NjExIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9nZnhfdjhfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMK QEAgLTEzNTYsNjQgKzEzNTYsOTEgQEAgc3RhdGljIGludCBnZnhfdjhfMF9ybGNfaW5pdChzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAl9CiAKIAlyZXR1cm4gMDsKIH0KIAogc3RhdGljIHZv aWQgZ2Z4X3Y4XzBfbWVjX2Zpbmkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7CiAJaW50 IHI7CiAKIAlpZiAoYWRldi0+Z2Z4Lm1lYy5ocGRfZW9wX29iaikgewogCQlyID0gYW1kZ3B1X2Jv X3Jlc2VydmUoYWRldi0+Z2Z4Lm1lYy5ocGRfZW9wX29iaiwgZmFsc2UpOwogCQlpZiAodW5saWtl bHkociAhPSAwKSkKIAkJCWRldl93YXJuKGFkZXYtPmRldiwgIiglZCkgcmVzZXJ2ZSBIUEQgRU9Q IGJvIGZhaWxlZFxuIiwgcik7CiAJCWFtZGdwdV9ib191bnBpbihhZGV2LT5nZngubWVjLmhwZF9l b3Bfb2JqKTsKIAkJYW1kZ3B1X2JvX3VucmVzZXJ2ZShhZGV2LT5nZngubWVjLmhwZF9lb3Bfb2Jq KTsKIAkJYW1kZ3B1X2JvX3VucmVmKCZhZGV2LT5nZngubWVjLmhwZF9lb3Bfb2JqKTsKIAkJYWRl di0+Z2Z4Lm1lYy5ocGRfZW9wX29iaiA9IE5VTEw7CiAJfQogfQogCitzdGF0aWMgaW50IGdmeF92 OF8wX2tpcV9hY3F1aXJlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAorCQkJCSBzdHJ1Y3Qg YW1kZ3B1X3JpbmcgKnJpbmcpCit7CisJaW50IHF1ZXVlX2JpdDsKKwlpbnQgbWVjLCBwaXBlLCBx dWV1ZTsKKworCXF1ZXVlX2JpdCA9IGFkZXYtPmdmeC5tZWMubnVtX21lYworCQkgICAgKiBhZGV2 LT5nZngubWVjLm51bV9waXBlX3Blcl9tZWMKKwkJICAgICogYWRldi0+Z2Z4Lm1lYy5udW1fcXVl dWVfcGVyX3BpcGU7CisKKwl3aGlsZSAocXVldWVfYml0LS0gPj0gMCkgeworCQlpZiAodGVzdF9i aXQocXVldWVfYml0LCBhZGV2LT5nZngubWVjLnF1ZXVlX2JpdG1hcCkpCisJCQljb250aW51ZTsK KworCQlhbWRncHVfYml0X3RvX3F1ZXVlKGFkZXYsIHF1ZXVlX2JpdCwgJm1lYywgJnBpcGUsICZx dWV1ZSk7CisKKwkJLyogVXNpbmcgcGlwZXMgMi8zIGZyb20gTUVDIDIgc2VlbXMgY2F1c2UgcHJv YmxlbXMgKi8KKwkJaWYgKG1lYyA9PSAxICYmIHBpcGUgPiAxKQorCQkJY29udGludWU7CisKKwkJ cmluZy0+bWUgPSBtZWMgKyAxOworCQlyaW5nLT5waXBlID0gcGlwZTsKKwkJcmluZy0+cXVldWUg PSBxdWV1ZTsKKworCQlyZXR1cm4gMDsKKwl9CisKKwlkZXZfZXJyKGFkZXYtPmRldiwgIkZhaWxl ZCB0byBmaW5kIGEgcXVldWUgZm9yIEtJUVxuIik7CisJcmV0dXJuIC1FSU5WQUw7Cit9CisKIHN0 YXRpYyBpbnQgZ2Z4X3Y4XzBfa2lxX2luaXRfcmluZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl diwKIAkJCQkgIHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywKIAkJCQkgIHN0cnVjdCBhbWRncHVf aXJxX3NyYyAqaXJxKQogewogCXN0cnVjdCBhbWRncHVfa2lxICpraXEgPSAmYWRldi0+Z2Z4Lmtp cTsKIAlpbnQgciA9IDA7CiAKIAlyID0gYW1kZ3B1X3diX2dldChhZGV2LCAmYWRldi0+dmlydC5y ZWdfdmFsX29mZnMpOwogCWlmIChyKQogCQlyZXR1cm4gcjsKIAogCXJpbmctPmFkZXYgPSBOVUxM OwogCXJpbmctPnJpbmdfb2JqID0gTlVMTDsKIAlyaW5nLT51c2VfZG9vcmJlbGwgPSB0cnVlOwog CXJpbmctPmRvb3JiZWxsX2luZGV4ID0gQU1ER1BVX0RPT1JCRUxMX0tJUTsKLQlpZiAoYWRldi0+ Z2Z4Lm1lYzJfZncpIHsKLQkJcmluZy0+bWUgPSAyOwotCQlyaW5nLT5waXBlID0gMDsKLQl9IGVs c2UgewotCQlyaW5nLT5tZSA9IDE7Ci0JCXJpbmctPnBpcGUgPSAxOwotCX0KIAotCXJpbmctPnF1 ZXVlID0gMDsKKwlyID0gZ2Z4X3Y4XzBfa2lxX2FjcXVpcmUoYWRldiwgcmluZyk7CisJaWYgKHIp CisJCXJldHVybiByOworCiAJcmluZy0+ZW9wX2dwdV9hZGRyID0ga2lxLT5lb3BfZ3B1X2FkZHI7 CiAJc3ByaW50ZihyaW5nLT5uYW1lLCAia2lxICVkLiVkLiVkIiwgcmluZy0+bWUsIHJpbmctPnBp cGUsIHJpbmctPnF1ZXVlKTsKIAlyID0gYW1kZ3B1X3JpbmdfaW5pdChhZGV2LCByaW5nLCAxMDI0 LAogCQkJICAgICBpcnEsIEFNREdQVV9DUF9LSVFfSVJRX0RSSVZFUjApOwogCWlmIChyKQogCQlk ZXZfd2FybihhZGV2LT5kZXYsICIoJWQpIGZhaWxlZCB0byBpbml0IGtpcSByaW5nXG4iLCByKTsK IAogCXJldHVybiByOwogfQogc3RhdGljIHZvaWQgZ2Z4X3Y4XzBfa2lxX2ZyZWVfcmluZyhzdHJ1 Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCiAJCQkJICAgc3RydWN0IGFtZGdwdV9pcnFfc3JjICppcnEp CiB7CiAJYW1kZ3B1X3diX2ZyZWUocmluZy0+YWRldiwgcmluZy0+YWRldi0+dmlydC5yZWdfdmFs X29mZnMpOwogCWFtZGdwdV9yaW5nX2ZpbmkocmluZyk7CiB9CiAKIHN0YXRpYyB2b2lkIGdmeF92 OF8wX2NvbXB1dGVfcXVldWVfYWNxdWlyZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsK IAlpbnQgaSwgcXVldWUsIHBpcGUsIG1lYzsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92 OV8wLmMKaW5kZXggNWE1ZmY0Ny4uNTc1MTFjYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9n ZnhfdjlfMC5jCkBAIC02MzEsNjIgKzYzMSw5MCBAQCBzdGF0aWMgaW50IGdmeF92OV8wX2tpcV9p bml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCiAJciA9IGFtZGdwdV9ib19jcmVhdGVf a2VybmVsKGFkZXYsIEdGWDlfTUVDX0hQRF9TSVpFLCBQQUdFX1NJWkUsCiAJCQkJICAgIEFNREdQ VV9HRU1fRE9NQUlOX0dUVCwgJmtpcS0+ZW9wX29iaiwKIAkJCQkgICAgJmtpcS0+ZW9wX2dwdV9h ZGRyLCAodm9pZCAqKikmaHBkKTsKIAlpZiAocikgewogCQlkZXZfd2FybihhZGV2LT5kZXYsICJm YWlsZWQgdG8gY3JlYXRlIEtJUSBibyAoJWQpLlxuIiwgcik7CiAJCXJldHVybiByOwogCX0KIAog CW1lbXNldChocGQsIDAsIEdGWDlfTUVDX0hQRF9TSVpFKTsKIAogCXIgPSBhbWRncHVfYm9fcmVz ZXJ2ZShraXEtPmVvcF9vYmosIGZhbHNlKTsKIAlpZiAodW5saWtlbHkociAhPSAwKSkKIAkJZGV2 X3dhcm4oYWRldi0+ZGV2LCAiKCVkKSByZXNlcnZlIGtpcSBlb3AgYm8gZmFpbGVkXG4iLCByKTsK IAlhbWRncHVfYm9fa3VubWFwKGtpcS0+ZW9wX29iaik7CiAJYW1kZ3B1X2JvX3VucmVzZXJ2ZShr aXEtPmVvcF9vYmopOwogCiAJcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyBpbnQgZ2Z4X3Y5XzBfa2lx X2FjcXVpcmUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCisJCQkJIHN0cnVjdCBhbWRncHVf cmluZyAqcmluZykKK3sKKwlpbnQgcXVldWVfYml0OworCWludCBtZWMsIHBpcGUsIHF1ZXVlOwor CisJcXVldWVfYml0ID0gYWRldi0+Z2Z4Lm1lYy5udW1fbWVjCisJCSAgICAqIGFkZXYtPmdmeC5t ZWMubnVtX3BpcGVfcGVyX21lYworCQkgICAgKiBhZGV2LT5nZngubWVjLm51bV9xdWV1ZV9wZXJf cGlwZTsKKworCXdoaWxlIChxdWV1ZV9iaXQtLSA+PSAwKSB7CisJCWlmICh0ZXN0X2JpdChxdWV1 ZV9iaXQsIGFkZXYtPmdmeC5tZWMucXVldWVfYml0bWFwKSkKKwkJCWNvbnRpbnVlOworCisJCWFt ZGdwdV9iaXRfdG9fcXVldWUoYWRldiwgcXVldWVfYml0LCAmbWVjLCAmcGlwZSwgJnF1ZXVlKTsK KworCQkvKiBVc2luZyBwaXBlcyAyLzMgZnJvbSBNRUMgMiBzZWVtcyBjYXVzZSBwcm9ibGVtcyAq LworCQlpZiAobWVjID09IDEgJiYgcGlwZSA+IDEpCisJCQljb250aW51ZTsKKworCQlyaW5nLT5t ZSA9IG1lYyArIDE7CisJCXJpbmctPnBpcGUgPSBwaXBlOworCQlyaW5nLT5xdWV1ZSA9IHF1ZXVl OworCisJCXJldHVybiAwOworCX0KKworCWRldl9lcnIoYWRldi0+ZGV2LCAiRmFpbGVkIHRvIGZp bmQgYSBxdWV1ZSBmb3IgS0lRXG4iKTsKKwlyZXR1cm4gLUVJTlZBTDsKK30KKwogc3RhdGljIGlu dCBnZnhfdjlfMF9raXFfaW5pdF9yaW5nKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCQkJ CSAgc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLAogCQkJCSAgc3RydWN0IGFtZGdwdV9pcnFfc3Jj ICppcnEpCiB7CiAJc3RydWN0IGFtZGdwdV9raXEgKmtpcSA9ICZhZGV2LT5nZngua2lxOwogCWlu dCByID0gMDsKIAogCXIgPSBhbWRncHVfd2JfZ2V0KGFkZXYsICZhZGV2LT52aXJ0LnJlZ192YWxf b2Zmcyk7CiAJaWYgKHIpCiAJCXJldHVybiByOwogCiAJcmluZy0+YWRldiA9IE5VTEw7CiAJcmlu Zy0+cmluZ19vYmogPSBOVUxMOwogCXJpbmctPnVzZV9kb29yYmVsbCA9IHRydWU7CiAJcmluZy0+ ZG9vcmJlbGxfaW5kZXggPSBBTURHUFVfRE9PUkJFTExfS0lROwotCWlmIChhZGV2LT5nZngubWVj Ml9mdykgewotCQlyaW5nLT5tZSA9IDI7Ci0JCXJpbmctPnBpcGUgPSAwOwotCX0gZWxzZSB7Ci0J CXJpbmctPm1lID0gMTsKLQkJcmluZy0+cGlwZSA9IDE7Ci0JfQorCisJciA9IGdmeF92OV8wX2tp cV9hY3F1aXJlKGFkZXYsIHJpbmcpOworCWlmIChyKQorCQlyZXR1cm4gcjsKIAogCWlycS0+ZGF0 YSA9IHJpbmc7CiAJcmluZy0+cXVldWUgPSAwOwogCXJpbmctPmVvcF9ncHVfYWRkciA9IGtpcS0+ ZW9wX2dwdV9hZGRyOwogCXNwcmludGYocmluZy0+bmFtZSwgImtpcSAlZC4lZC4lZCIsIHJpbmct Pm1lLCByaW5nLT5waXBlLCByaW5nLT5xdWV1ZSk7CiAJciA9IGFtZGdwdV9yaW5nX2luaXQoYWRl diwgcmluZywgMTAyNCwKIAkJCSAgICAgaXJxLCBBTURHUFVfQ1BfS0lRX0lSUV9EUklWRVIwKTsK IAlpZiAocikKIAkJZGV2X3dhcm4oYWRldi0+ZGV2LCAiKCVkKSBmYWlsZWQgdG8gaW5pdCBraXEg cmluZ1xuIiwgcik7CiAKIAlyZXR1cm4gcjsKIH0KIHN0YXRpYyB2b2lkIGdmeF92OV8wX2tpcV9m cmVlX3Jpbmcoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLAogCQkJCSAgIHN0cnVjdCBhbWRncHVf aXJxX3NyYyAqaXJxKQogewogCWFtZGdwdV93Yl9mcmVlKHJpbmctPmFkZXYsIHJpbmctPmFkZXYt PnZpcnQucmVnX3ZhbF9vZmZzKTsKIAlhbWRncHVfcmluZ19maW5pKHJpbmcpOwogCWlycS0+ZGF0 YSA9IE5VTEw7CiB9CiAKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2FtZC1nZngK