From: Alex Deucher Subject: [PATCH 4/6] drm/amdgpu/gfx: move more common KIQ code to amdgpu_gfx.c Date: Wed, 7 Jun 2017 15:34:55 -0400 Message-ID: <1496864097-4322-4-git-send-email-alexander.deucher@amd.com> References: <1496864097-4322-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1496864097-4322-1-git-send-email-alexander.deucher-5C7GfCeVMHo@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: Alex Deucher TG90cyBtb3JlIGNvbW1vbiBzdHVmZi4KClNpZ25lZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxl eGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfZ2Z4LmMgfCAxMDMgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBkcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2Z4LmggfCAgMTEgKysrKwogZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYyAgIHwgMTEwICsrLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jICAgfCAxMDkg KystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCAxMjIgaW5z ZXJ0aW9ucygrKSwgMjExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2FtZGdwdV9nZnguYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV9nZnguYwppbmRleCA1MWE5NzA4Li5jNWFhNDY1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2Z4LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X2dmeC5jCkBAIC0xNDUsMyArMTQ1LDEwNiBAQCB2b2lkIGFtZGdwdV9nZnhf Y29tcHV0ZV9xdWV1ZV9hY3F1aXJlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCWlmIChX QVJOX09OKGFkZXYtPmdmeC5udW1fY29tcHV0ZV9yaW5ncyA+IEFNREdQVV9NQVhfQ09NUFVURV9S SU5HUykpCiAJCWFkZXYtPmdmeC5udW1fY29tcHV0ZV9yaW5ncyA9IEFNREdQVV9NQVhfQ09NUFVU RV9SSU5HUzsKIH0KKworc3RhdGljIGludCBhbWRncHVfZ2Z4X2tpcV9hY3F1aXJlKHN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2LAorCQkJCSAgc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQorewor CWludCBxdWV1ZV9iaXQ7CisJaW50IG1lYywgcGlwZSwgcXVldWU7CisKKwlxdWV1ZV9iaXQgPSBh ZGV2LT5nZngubWVjLm51bV9tZWMKKwkJICAgICogYWRldi0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJf bWVjCisJCSAgICAqIGFkZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9waXBlOworCisJd2hpbGUg KHF1ZXVlX2JpdC0tID49IDApIHsKKwkJaWYgKHRlc3RfYml0KHF1ZXVlX2JpdCwgYWRldi0+Z2Z4 Lm1lYy5xdWV1ZV9iaXRtYXApKQorCQkJY29udGludWU7CisKKwkJYW1kZ3B1X2dmeF9iaXRfdG9f cXVldWUoYWRldiwgcXVldWVfYml0LCAmbWVjLCAmcGlwZSwgJnF1ZXVlKTsKKworCQkvKiBVc2lu ZyBwaXBlcyAyLzMgZnJvbSBNRUMgMiBzZWVtcyBjYXVzZSBwcm9ibGVtcyAqLworCQlpZiAobWVj ID09IDEgJiYgcGlwZSA+IDEpCisJCQljb250aW51ZTsKKworCQlyaW5nLT5tZSA9IG1lYyArIDE7 CisJCXJpbmctPnBpcGUgPSBwaXBlOworCQlyaW5nLT5xdWV1ZSA9IHF1ZXVlOworCisJCXJldHVy biAwOworCX0KKworCWRldl9lcnIoYWRldi0+ZGV2LCAiRmFpbGVkIHRvIGZpbmQgYSBxdWV1ZSBm b3IgS0lRXG4iKTsKKwlyZXR1cm4gLUVJTlZBTDsKK30KKworaW50IGFtZGdwdV9nZnhfa2lxX2lu aXRfcmluZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKKwkJCSAgICAgc3RydWN0IGFtZGdw dV9yaW5nICpyaW5nLAorCQkJICAgICBzdHJ1Y3QgYW1kZ3B1X2lycV9zcmMgKmlycSkKK3sKKwlz dHJ1Y3QgYW1kZ3B1X2tpcSAqa2lxID0gJmFkZXYtPmdmeC5raXE7CisJaW50IHIgPSAwOworCisJ bXV0ZXhfaW5pdCgma2lxLT5yaW5nX211dGV4KTsKKworCXIgPSBhbWRncHVfd2JfZ2V0KGFkZXYs ICZhZGV2LT52aXJ0LnJlZ192YWxfb2Zmcyk7CisJaWYgKHIpCisJCXJldHVybiByOworCisJcmlu Zy0+YWRldiA9IE5VTEw7CisJcmluZy0+cmluZ19vYmogPSBOVUxMOworCXJpbmctPnVzZV9kb29y YmVsbCA9IHRydWU7CisJcmluZy0+ZG9vcmJlbGxfaW5kZXggPSBBTURHUFVfRE9PUkJFTExfS0lR OworCisJciA9IGFtZGdwdV9nZnhfa2lxX2FjcXVpcmUoYWRldiwgcmluZyk7CisJaWYgKHIpCisJ CXJldHVybiByOworCisJcmluZy0+ZW9wX2dwdV9hZGRyID0ga2lxLT5lb3BfZ3B1X2FkZHI7CisJ c3ByaW50ZihyaW5nLT5uYW1lLCAia2lxICVkLiVkLiVkIiwgcmluZy0+bWUsIHJpbmctPnBpcGUs IHJpbmctPnF1ZXVlKTsKKwlyID0gYW1kZ3B1X3JpbmdfaW5pdChhZGV2LCByaW5nLCAxMDI0LAor CQkJICAgICBpcnEsIEFNREdQVV9DUF9LSVFfSVJRX0RSSVZFUjApOworCWlmIChyKQorCQlkZXZf d2FybihhZGV2LT5kZXYsICIoJWQpIGZhaWxlZCB0byBpbml0IGtpcSByaW5nXG4iLCByKTsKKwor CXJldHVybiByOworfQorCit2b2lkIGFtZGdwdV9nZnhfa2lxX2ZyZWVfcmluZyhzdHJ1Y3QgYW1k Z3B1X3JpbmcgKnJpbmcsCisJCQkgICAgICBzdHJ1Y3QgYW1kZ3B1X2lycV9zcmMgKmlycSkKK3sK KwlhbWRncHVfd2JfZnJlZShyaW5nLT5hZGV2LCByaW5nLT5hZGV2LT52aXJ0LnJlZ192YWxfb2Zm cyk7CisJYW1kZ3B1X3JpbmdfZmluaShyaW5nKTsKK30KKwordm9pZCBhbWRncHVfZ2Z4X2tpcV9m aW5pKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQoreworCXN0cnVjdCBhbWRncHVfa2lxICpr aXEgPSAmYWRldi0+Z2Z4LmtpcTsKKworCWFtZGdwdV9ib19mcmVlX2tlcm5lbCgma2lxLT5lb3Bf b2JqLCAma2lxLT5lb3BfZ3B1X2FkZHIsIE5VTEwpOworfQorCitpbnQgYW1kZ3B1X2dmeF9raXFf aW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKKwkJCXVuc2lnbmVkIGhwZF9zaXplKQor eworCWludCByOworCXUzMiAqaHBkOworCXN0cnVjdCBhbWRncHVfa2lxICpraXEgPSAmYWRldi0+ Z2Z4LmtpcTsKKworCXIgPSBhbWRncHVfYm9fY3JlYXRlX2tlcm5lbChhZGV2LCBocGRfc2l6ZSwg UEFHRV9TSVpFLAorCQkJCSAgICBBTURHUFVfR0VNX0RPTUFJTl9HVFQsICZraXEtPmVvcF9vYmos CisJCQkJICAgICZraXEtPmVvcF9ncHVfYWRkciwgKHZvaWQgKiopJmhwZCk7CisJaWYgKHIpIHsK KwkJZGV2X3dhcm4oYWRldi0+ZGV2LCAiZmFpbGVkIHRvIGNyZWF0ZSBLSVEgYm8gKCVkKS5cbiIs IHIpOworCQlyZXR1cm4gcjsKKwl9CisKKwltZW1zZXQoaHBkLCAwLCBocGRfc2l6ZSk7CisKKwly ID0gYW1kZ3B1X2JvX3Jlc2VydmUoa2lxLT5lb3Bfb2JqLCB0cnVlKTsKKwlpZiAodW5saWtlbHko ciAhPSAwKSkKKwkJZGV2X3dhcm4oYWRldi0+ZGV2LCAiKCVkKSByZXNlcnZlIGtpcSBlb3AgYm8g ZmFpbGVkXG4iLCByKTsKKwlhbWRncHVfYm9fa3VubWFwKGtpcS0+ZW9wX29iaik7CisJYW1kZ3B1 X2JvX3VucmVzZXJ2ZShraXEtPmVvcF9vYmopOworCisJcmV0dXJuIDA7Cit9CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2Z4LmggYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfZ2Z4LmgKaW5kZXggZmEyMDQzOC4uYjE3NjZmYSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2dmeC5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9nZnguaApAQCAtMzIsNiArMzIsMTcgQEAgdm9p ZCBhbWRncHVfZ2Z4X3BhcnNlX2Rpc2FibGVfY3UodW5zaWduZWQgKm1hc2ssIHVuc2lnbmVkIG1h eF9zZSwKIAogdm9pZCBhbWRncHVfZ2Z4X2NvbXB1dGVfcXVldWVfYWNxdWlyZShzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqYWRldik7CiAKK2ludCBhbWRncHVfZ2Z4X2tpcV9pbml0X3Jpbmcoc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYsCisJCQkgICAgIHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywK KwkJCSAgICAgc3RydWN0IGFtZGdwdV9pcnFfc3JjICppcnEpOworCit2b2lkIGFtZGdwdV9nZnhf a2lxX2ZyZWVfcmluZyhzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCisJCQkgICAgICBzdHJ1Y3Qg YW1kZ3B1X2lycV9zcmMgKmlycSk7CisKK3ZvaWQgYW1kZ3B1X2dmeF9raXFfZmluaShzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldik7CitpbnQgYW1kZ3B1X2dmeF9raXFfaW5pdChzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqYWRldiwKKwkJCXVuc2lnbmVkIGhwZF9zaXplKTsKKwogLyoqCiAgKiBhbWRn cHVfZ2Z4X2NyZWF0ZV9iaXRtYXNrIC0gY3JlYXRlIGEgYml0bWFzawogICoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9nZnhfdjhfMC5jCmluZGV4IGZjOGUwM2IuLjhhOWQzNWEgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYwpAQCAtMTM3OSw3NiArMTM3OSw2IEBAIHN0YXRpYyB2 b2lkIGdmeF92OF8wX21lY19maW5pKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCX0KIH0K IAotc3RhdGljIGludCBnZnhfdjhfMF9raXFfYWNxdWlyZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldiwKLQkJCQkgc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQotewotCWludCBxdWV1ZV9iaXQ7 Ci0JaW50IG1lYywgcGlwZSwgcXVldWU7Ci0KLQlxdWV1ZV9iaXQgPSBhZGV2LT5nZngubWVjLm51 bV9tZWMKLQkJICAgICogYWRldi0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJfbWVjCi0JCSAgICAqIGFk ZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9waXBlOwotCi0Jd2hpbGUgKHF1ZXVlX2JpdC0tID49 IDApIHsKLQkJaWYgKHRlc3RfYml0KHF1ZXVlX2JpdCwgYWRldi0+Z2Z4Lm1lYy5xdWV1ZV9iaXRt YXApKQotCQkJY29udGludWU7Ci0KLQkJYW1kZ3B1X2dmeF9iaXRfdG9fcXVldWUoYWRldiwgcXVl dWVfYml0LCAmbWVjLCAmcGlwZSwgJnF1ZXVlKTsKLQotCQkvKiBVc2luZyBwaXBlcyAyLzMgZnJv bSBNRUMgMiBzZWVtcyBjYXVzZSBwcm9ibGVtcyAqLwotCQlpZiAobWVjID09IDEgJiYgcGlwZSA+ IDEpCi0JCQljb250aW51ZTsKLQotCQlyaW5nLT5tZSA9IG1lYyArIDE7Ci0JCXJpbmctPnBpcGUg PSBwaXBlOwotCQlyaW5nLT5xdWV1ZSA9IHF1ZXVlOwotCi0JCXJldHVybiAwOwotCX0KLQotCWRl dl9lcnIoYWRldi0+ZGV2LCAiRmFpbGVkIHRvIGZpbmQgYSBxdWV1ZSBmb3IgS0lRXG4iKTsKLQly ZXR1cm4gLUVJTlZBTDsKLX0KLQotc3RhdGljIGludCBnZnhfdjhfMF9raXFfaW5pdF9yaW5nKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAotCQkJCSAgc3RydWN0IGFtZGdwdV9yaW5nICpyaW5n LAotCQkJCSAgc3RydWN0IGFtZGdwdV9pcnFfc3JjICppcnEpCi17Ci0Jc3RydWN0IGFtZGdwdV9r aXEgKmtpcSA9ICZhZGV2LT5nZngua2lxOwotCWludCByID0gMDsKLQotCW11dGV4X2luaXQoJmtp cS0+cmluZ19tdXRleCk7Ci0KLQlyID0gYW1kZ3B1X3diX2dldChhZGV2LCAmYWRldi0+dmlydC5y ZWdfdmFsX29mZnMpOwotCWlmIChyKQotCQlyZXR1cm4gcjsKLQotCXJpbmctPmFkZXYgPSBOVUxM OwotCXJpbmctPnJpbmdfb2JqID0gTlVMTDsKLQlyaW5nLT51c2VfZG9vcmJlbGwgPSB0cnVlOwot CXJpbmctPmRvb3JiZWxsX2luZGV4ID0gQU1ER1BVX0RPT1JCRUxMX0tJUTsKLQotCXIgPSBnZnhf djhfMF9raXFfYWNxdWlyZShhZGV2LCByaW5nKTsKLQlpZiAocikKLQkJcmV0dXJuIHI7Ci0KLQly aW5nLT5lb3BfZ3B1X2FkZHIgPSBraXEtPmVvcF9ncHVfYWRkcjsKLQlzcHJpbnRmKHJpbmctPm5h bWUsICJraXEgJWQuJWQuJWQiLCByaW5nLT5tZSwgcmluZy0+cGlwZSwgcmluZy0+cXVldWUpOwot CXIgPSBhbWRncHVfcmluZ19pbml0KGFkZXYsIHJpbmcsIDEwMjQsCi0JCQkgICAgIGlycSwgQU1E R1BVX0NQX0tJUV9JUlFfRFJJVkVSMCk7Ci0JaWYgKHIpCi0JCWRldl93YXJuKGFkZXYtPmRldiwg IiglZCkgZmFpbGVkIHRvIGluaXQga2lxIHJpbmdcbiIsIHIpOwotCi0JcmV0dXJuIHI7Ci19Ci0K LXN0YXRpYyB2b2lkIGdmeF92OF8wX2tpcV9mcmVlX3Jpbmcoc3RydWN0IGFtZGdwdV9yaW5nICpy aW5nLAotCQkJCSAgIHN0cnVjdCBhbWRncHVfaXJxX3NyYyAqaXJxKQotewotCWFtZGdwdV93Yl9m cmVlKHJpbmctPmFkZXYsIHJpbmctPmFkZXYtPnZpcnQucmVnX3ZhbF9vZmZzKTsKLQlhbWRncHVf cmluZ19maW5pKHJpbmcpOwotfQotCiBzdGF0aWMgaW50IGdmeF92OF8wX21lY19pbml0KHN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2KQogewogCWludCByOwpAQCAtMTUyMCwzOCArMTQ1MCw2IEBA IHN0YXRpYyBpbnQgZ2Z4X3Y4XzBfbWVjX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYp CiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyB2b2lkIGdmeF92OF8wX2tpcV9maW5pKHN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2KQotewotCXN0cnVjdCBhbWRncHVfa2lxICpraXEgPSAmYWRldi0+ Z2Z4LmtpcTsKLQotCWFtZGdwdV9ib19mcmVlX2tlcm5lbCgma2lxLT5lb3Bfb2JqLCAma2lxLT5l b3BfZ3B1X2FkZHIsIE5VTEwpOwotfQotCi1zdGF0aWMgaW50IGdmeF92OF8wX2tpcV9pbml0KHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQotewotCWludCByOwotCXUzMiAqaHBkOwotCXN0cnVj dCBhbWRncHVfa2lxICpraXEgPSAmYWRldi0+Z2Z4LmtpcTsKLQotCXIgPSBhbWRncHVfYm9fY3Jl YXRlX2tlcm5lbChhZGV2LCBHRlg4X01FQ19IUERfU0laRSwgUEFHRV9TSVpFLAotCQkJCSAgICBB TURHUFVfR0VNX0RPTUFJTl9HVFQsICZraXEtPmVvcF9vYmosCi0JCQkJICAgICZraXEtPmVvcF9n cHVfYWRkciwgKHZvaWQgKiopJmhwZCk7Ci0JaWYgKHIpIHsKLQkJZGV2X3dhcm4oYWRldi0+ZGV2 LCAiZmFpbGVkIHRvIGNyZWF0ZSBLSVEgYm8gKCVkKS5cbiIsIHIpOwotCQlyZXR1cm4gcjsKLQl9 Ci0KLQltZW1zZXQoaHBkLCAwLCBHRlg4X01FQ19IUERfU0laRSk7Ci0KLQlyID0gYW1kZ3B1X2Jv X3Jlc2VydmUoa2lxLT5lb3Bfb2JqLCB0cnVlKTsKLQlpZiAodW5saWtlbHkociAhPSAwKSkKLQkJ ZGV2X3dhcm4oYWRldi0+ZGV2LCAiKCVkKSByZXNlcnZlIGtpcSBlb3AgYm8gZmFpbGVkXG4iLCBy KTsKLQlhbWRncHVfYm9fa3VubWFwKGtpcS0+ZW9wX29iaik7Ci0JYW1kZ3B1X2JvX3VucmVzZXJ2 ZShraXEtPmVvcF9vYmopOwotCi0JcmV0dXJuIDA7Ci19Ci0KIHN0YXRpYyBjb25zdCB1MzIgdmdw cl9pbml0X2NvbXB1dGVfc2hhZGVyW10gPQogewogCTB4N2UwMDAyMDksIDB4N2UwMjAyMDgsCkBA IC0yMTkyLDE0ICsyMDkwLDE0IEBAIHN0YXRpYyBpbnQgZ2Z4X3Y4XzBfc3dfaW5pdCh2b2lkICpo YW5kbGUpCiAJCX0KIAl9CiAKLQlyID0gZ2Z4X3Y4XzBfa2lxX2luaXQoYWRldik7CisJciA9IGFt ZGdwdV9nZnhfa2lxX2luaXQoYWRldiwgR0ZYOF9NRUNfSFBEX1NJWkUpOwogCWlmIChyKSB7CiAJ CURSTV9FUlJPUigiRmFpbGVkIHRvIGluaXQgS0lRIEJPcyFcbiIpOwogCQlyZXR1cm4gcjsKIAl9 CiAKIAlraXEgPSAmYWRldi0+Z2Z4LmtpcTsKLQlyID0gZ2Z4X3Y4XzBfa2lxX2luaXRfcmluZyhh ZGV2LCAma2lxLT5yaW5nLCAma2lxLT5pcnEpOworCXIgPSBhbWRncHVfZ2Z4X2tpcV9pbml0X3Jp bmcoYWRldiwgJmtpcS0+cmluZywgJmtpcS0+aXJxKTsKIAlpZiAocikKIAkJcmV0dXJuIHI7CiAK QEAgLTIyNTEsOCArMjE0OSw4IEBAIHN0YXRpYyBpbnQgZ2Z4X3Y4XzBfc3dfZmluaSh2b2lkICpo YW5kbGUpCiAJCWFtZGdwdV9yaW5nX2ZpbmkoJmFkZXYtPmdmeC5jb21wdXRlX3JpbmdbaV0pOwog CiAJZ2Z4X3Y4XzBfY29tcHV0ZV9tcWRfc3dfZmluaShhZGV2KTsKLQlnZnhfdjhfMF9raXFfZnJl ZV9yaW5nKCZhZGV2LT5nZngua2lxLnJpbmcsICZhZGV2LT5nZngua2lxLmlycSk7Ci0JZ2Z4X3Y4 XzBfa2lxX2ZpbmkoYWRldik7CisJYW1kZ3B1X2dmeF9raXFfZnJlZV9yaW5nKCZhZGV2LT5nZngu a2lxLnJpbmcsICZhZGV2LT5nZngua2lxLmlycSk7CisJYW1kZ3B1X2dmeF9raXFfZmluaShhZGV2 KTsKIAogCWdmeF92OF8wX21lY19maW5pKGFkZXYpOwogCWdmeF92OF8wX3JsY19maW5pKGFkZXYp OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMKaW5kZXggNmQzMDQ3Ni4uZmJiOWQy MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jCkBAIC05NjksMTA3ICs5Njks NiBAQCBzdGF0aWMgaW50IGdmeF92OV8wX21lY19pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2KQogCXJldHVybiAwOwogfQogCi1zdGF0aWMgdm9pZCBnZnhfdjlfMF9raXFfZmluaShzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKLXsKLQlzdHJ1Y3QgYW1kZ3B1X2tpcSAqa2lxID0gJmFk ZXYtPmdmeC5raXE7Ci0KLQlhbWRncHVfYm9fZnJlZV9rZXJuZWwoJmtpcS0+ZW9wX29iaiwgJmtp cS0+ZW9wX2dwdV9hZGRyLCBOVUxMKTsKLX0KLQotc3RhdGljIGludCBnZnhfdjlfMF9raXFfaW5p dChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKLXsKLQlpbnQgcjsKLQl1MzIgKmhwZDsKLQlz dHJ1Y3QgYW1kZ3B1X2tpcSAqa2lxID0gJmFkZXYtPmdmeC5raXE7Ci0KLQlyID0gYW1kZ3B1X2Jv X2NyZWF0ZV9rZXJuZWwoYWRldiwgR0ZYOV9NRUNfSFBEX1NJWkUsIFBBR0VfU0laRSwKLQkJCQkg ICAgQU1ER1BVX0dFTV9ET01BSU5fR1RULCAma2lxLT5lb3Bfb2JqLAotCQkJCSAgICAma2lxLT5l b3BfZ3B1X2FkZHIsICh2b2lkICoqKSZocGQpOwotCWlmIChyKSB7Ci0JCWRldl93YXJuKGFkZXYt PmRldiwgImZhaWxlZCB0byBjcmVhdGUgS0lRIGJvICglZCkuXG4iLCByKTsKLQkJcmV0dXJuIHI7 Ci0JfQotCi0JbWVtc2V0KGhwZCwgMCwgR0ZYOV9NRUNfSFBEX1NJWkUpOwotCi0JciA9IGFtZGdw dV9ib19yZXNlcnZlKGtpcS0+ZW9wX29iaiwgdHJ1ZSk7Ci0JaWYgKHVubGlrZWx5KHIgIT0gMCkp Ci0JCWRldl93YXJuKGFkZXYtPmRldiwgIiglZCkgcmVzZXJ2ZSBraXEgZW9wIGJvIGZhaWxlZFxu Iiwgcik7Ci0JYW1kZ3B1X2JvX2t1bm1hcChraXEtPmVvcF9vYmopOwotCWFtZGdwdV9ib191bnJl c2VydmUoa2lxLT5lb3Bfb2JqKTsKLQotCXJldHVybiAwOwotfQotCi1zdGF0aWMgaW50IGdmeF92 OV8wX2tpcV9hY3F1aXJlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAotCQkJCSBzdHJ1Y3Qg YW1kZ3B1X3JpbmcgKnJpbmcpCi17Ci0JaW50IHF1ZXVlX2JpdDsKLQlpbnQgbWVjLCBwaXBlLCBx dWV1ZTsKLQotCXF1ZXVlX2JpdCA9IGFkZXYtPmdmeC5tZWMubnVtX21lYwotCQkgICAgKiBhZGV2 LT5nZngubWVjLm51bV9waXBlX3Blcl9tZWMKLQkJICAgICogYWRldi0+Z2Z4Lm1lYy5udW1fcXVl dWVfcGVyX3BpcGU7Ci0KLQl3aGlsZSAocXVldWVfYml0LS0gPj0gMCkgewotCQlpZiAodGVzdF9i aXQocXVldWVfYml0LCBhZGV2LT5nZngubWVjLnF1ZXVlX2JpdG1hcCkpCi0JCQljb250aW51ZTsK LQotCQlhbWRncHVfZ2Z4X2JpdF90b19xdWV1ZShhZGV2LCBxdWV1ZV9iaXQsICZtZWMsICZwaXBl LCAmcXVldWUpOwotCi0JCS8qIFVzaW5nIHBpcGVzIDIvMyBmcm9tIE1FQyAyIHNlZW1zIGNhdXNl IHByb2JsZW1zICovCi0JCWlmIChtZWMgPT0gMSAmJiBwaXBlID4gMSkKLQkJCWNvbnRpbnVlOwot Ci0JCXJpbmctPm1lID0gbWVjICsgMTsKLQkJcmluZy0+cGlwZSA9IHBpcGU7Ci0JCXJpbmctPnF1 ZXVlID0gcXVldWU7Ci0KLQkJcmV0dXJuIDA7Ci0JfQotCi0JZGV2X2VycihhZGV2LT5kZXYsICJG YWlsZWQgdG8gZmluZCBhIHF1ZXVlIGZvciBLSVFcbiIpOwotCXJldHVybiAtRUlOVkFMOwotfQot Ci1zdGF0aWMgaW50IGdmeF92OV8wX2tpcV9pbml0X3Jpbmcoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYsCi0JCQkJICBzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCi0JCQkJICBzdHJ1Y3QgYW1k Z3B1X2lycV9zcmMgKmlycSkKLXsKLQlzdHJ1Y3QgYW1kZ3B1X2tpcSAqa2lxID0gJmFkZXYtPmdm eC5raXE7Ci0JaW50IHIgPSAwOwotCi0JbXV0ZXhfaW5pdCgma2lxLT5yaW5nX211dGV4KTsKLQot CXIgPSBhbWRncHVfd2JfZ2V0KGFkZXYsICZhZGV2LT52aXJ0LnJlZ192YWxfb2Zmcyk7Ci0JaWYg KHIpCi0JCXJldHVybiByOwotCi0JcmluZy0+YWRldiA9IE5VTEw7Ci0JcmluZy0+cmluZ19vYmog PSBOVUxMOwotCXJpbmctPnVzZV9kb29yYmVsbCA9IHRydWU7Ci0JcmluZy0+ZG9vcmJlbGxfaW5k ZXggPSBBTURHUFVfRE9PUkJFTExfS0lROwotCi0JciA9IGdmeF92OV8wX2tpcV9hY3F1aXJlKGFk ZXYsIHJpbmcpOwotCWlmIChyKQotCQlyZXR1cm4gcjsKLQotCXJpbmctPmVvcF9ncHVfYWRkciA9 IGtpcS0+ZW9wX2dwdV9hZGRyOwotCXNwcmludGYocmluZy0+bmFtZSwgImtpcSAlZC4lZC4lZCIs IHJpbmctPm1lLCByaW5nLT5waXBlLCByaW5nLT5xdWV1ZSk7Ci0JciA9IGFtZGdwdV9yaW5nX2lu aXQoYWRldiwgcmluZywgMTAyNCwKLQkJCSAgICAgaXJxLCBBTURHUFVfQ1BfS0lRX0lSUV9EUklW RVIwKTsKLQlpZiAocikKLQkJZGV2X3dhcm4oYWRldi0+ZGV2LCAiKCVkKSBmYWlsZWQgdG8gaW5p dCBraXEgcmluZ1xuIiwgcik7Ci0KLQlyZXR1cm4gcjsKLX0KLXN0YXRpYyB2b2lkIGdmeF92OV8w X2tpcV9mcmVlX3Jpbmcoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLAotCQkJCSAgIHN0cnVjdCBh bWRncHVfaXJxX3NyYyAqaXJxKQotewotCWFtZGdwdV93Yl9mcmVlKHJpbmctPmFkZXYsIHJpbmct PmFkZXYtPnZpcnQucmVnX3ZhbF9vZmZzKTsKLQlhbWRncHVfcmluZ19maW5pKHJpbmcpOwotfQot CiAvKiBjcmVhdGUgTVFEIGZvciBlYWNoIGNvbXB1dGUgcXVldWUgKi8KIHN0YXRpYyBpbnQgZ2Z4 X3Y5XzBfY29tcHV0ZV9tcWRfc3dfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsK QEAgLTE1NzAsMTQgKzE0NjksMTQgQEAgc3RhdGljIGludCBnZnhfdjlfMF9zd19pbml0KHZvaWQg KmhhbmRsZSkKIAkJfQogCX0KIAotCXIgPSBnZnhfdjlfMF9raXFfaW5pdChhZGV2KTsKKwlyID0g YW1kZ3B1X2dmeF9raXFfaW5pdChhZGV2LCBHRlg5X01FQ19IUERfU0laRSk7CiAJaWYgKHIpIHsK IAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gaW5pdCBLSVEgQk9zIVxuIik7CiAJCXJldHVybiByOwog CX0KIAogCWtpcSA9ICZhZGV2LT5nZngua2lxOwotCXIgPSBnZnhfdjlfMF9raXFfaW5pdF9yaW5n KGFkZXYsICZraXEtPnJpbmcsICZraXEtPmlycSk7CisJciA9IGFtZGdwdV9nZnhfa2lxX2luaXRf cmluZyhhZGV2LCAma2lxLT5yaW5nLCAma2lxLT5pcnEpOwogCWlmIChyKQogCQlyZXR1cm4gcjsK IApAQCAtMTYzMiw4ICsxNTMxLDggQEAgc3RhdGljIGludCBnZnhfdjlfMF9zd19maW5pKHZvaWQg KmhhbmRsZSkKIAkJYW1kZ3B1X3JpbmdfZmluaSgmYWRldi0+Z2Z4LmNvbXB1dGVfcmluZ1tpXSk7 CiAKIAlnZnhfdjlfMF9jb21wdXRlX21xZF9zd19maW5pKGFkZXYpOwotCWdmeF92OV8wX2tpcV9m cmVlX3JpbmcoJmFkZXYtPmdmeC5raXEucmluZywgJmFkZXYtPmdmeC5raXEuaXJxKTsKLQlnZnhf djlfMF9raXFfZmluaShhZGV2KTsKKwlhbWRncHVfZ2Z4X2tpcV9mcmVlX3JpbmcoJmFkZXYtPmdm eC5raXEucmluZywgJmFkZXYtPmdmeC5raXEuaXJxKTsKKwlhbWRncHVfZ2Z4X2tpcV9maW5pKGFk ZXYpOwogCiAJZ2Z4X3Y5XzBfbWVjX2ZpbmkoYWRldik7CiAJZ2Z4X3Y5XzBfbmdnX2ZpbmkoYWRl dik7Ci0tIAoyLjUuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==