From: Andres Rodriguez Subject: [PATCH 3/8] drm/amdgpu: separate KIQ operations from amdgpu_virt Date: Fri, 5 May 2017 13:10:10 -0400 Message-ID: <20170505171015.4672-4-andresx7@gmail.com> References: <20170505171015.4672-1-andresx7@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170505171015.4672-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 S0lRIGlzIG5vdyB1c2VkIGZvciBiYXJlbWV0YWwgY29tcHV0ZSBpbml0aWFsaXphdGlvbi4gU2lu Y2UgaXQgaXMgbm8KbG9uZ2VyIGNvbXB1dGUgc3BlY2lmaWMsIG1vdmUgdGhlIEtJUSByZWcgb3B0 cyB0byBhIG1vcmUgZ2VuZXJhbApsb2NhdGlvbi4KClNpZ25lZC1vZmYtYnk6IEFuZHJlcyBSb2Ry aWd1ZXogPGFuZHJlc3g3QGdtYWlsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHUuaCAgICAgICAgfCAgNCArKysKIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV9kZXZpY2UuYyB8IDU1ICsrKysrKysrKysrKysrKysrKysrKysrKysrKystLQogZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZpcnQuYyAgIHwgNTAgLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdmlydC5oICAg fCAgNCAtLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMgICAgICB8ICA4 ICsrLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jICAgICAgfCAgOCAr Ky0tLQogNiBmaWxlcyBjaGFuZ2VkLCA2NSBpbnNlcnRpb25zKCspLCA2NCBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaCBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCmluZGV4IDhhZTg2NzEuLjQ5NmFkNjYgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCkBAIC05NDAsNiArOTQwLDggQEAgc3RydWN0 IGFtZGdwdV9raXEgewogCXN0cnVjdCBhbWRncHVfYm8JKmVvcF9vYmo7CiAJc3RydWN0IGFtZGdw dV9yaW5nCXJpbmc7CiAJc3RydWN0IGFtZGdwdV9pcnFfc3JjCWlycTsKKwl1aW50MzJfdAkJcmVn X3ZhbF9vZmZzOworCXN0cnVjdCBtdXRleAkJcmluZ19tdXRleDsKIH07CiAKIC8qCkBAIC0xNjY2 LDYgKzE2NjgsOCBAQCB2b2lkIGFtZGdwdV9tbV93cmVnKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2LCB1aW50MzJfdCByZWcsIHVpbnQzMl90IHYsCiAJCSAgICB1aW50MzJfdCBhY2NfZmxhZ3Mp OwogdTMyIGFtZGdwdV9pb19ycmVnKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1MzIgcmVn KTsKIHZvaWQgYW1kZ3B1X2lvX3dyZWcoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHUzMiBy ZWcsIHUzMiB2KTsKK3VpbnQzMl90IGFtZGdwdV9raXFfcnJlZyhzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldiwgdWludDMyX3QgcmVnKTsKK3ZvaWQgYW1kZ3B1X2tpcV93cmVnKHN0cnVjdCBhbWRn cHVfZGV2aWNlICphZGV2LCB1aW50MzJfdCByZWcsIHVpbnQzMl90IHYpOwogCiB1MzIgYW1kZ3B1 X21tX3Jkb29yYmVsbChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdTMyIGluZGV4KTsKIHZv aWQgYW1kZ3B1X21tX3dkb29yYmVsbChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdTMyIGlu ZGV4LCB1MzIgdik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfZGV2aWNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMK aW5kZXggYzkzNTE2YS4uZWYzYTQ2ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X2RldmljZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV9kZXZpY2UuYwpAQCAtOTksNyArOTksNyBAQCB1aW50MzJfdCBhbWRncHVfbW1fcnJlZyhz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdWludDMyX3QgcmVnLAogCiAJaWYgKCEoYWNjX2Zs YWdzICYgQU1ER1BVX1JFR1NfTk9fS0lRKSAmJiBhbWRncHVfc3Jpb3ZfcnVudGltZShhZGV2KSkg ewogCQlCVUdfT04oaW5faW50ZXJydXB0KCkpOwotCQlyZXR1cm4gYW1kZ3B1X3ZpcnRfa2lxX3Jy ZWcoYWRldiwgcmVnKTsKKwkJcmV0dXJuIGFtZGdwdV9raXFfcnJlZyhhZGV2LCByZWcpOwogCX0K IAogCWlmICgocmVnICogNCkgPCBhZGV2LT5ybW1pb19zaXplICYmICEoYWNjX2ZsYWdzICYgQU1E R1BVX1JFR1NfSURYKSkKQEAgLTEyMyw3ICsxMjMsNyBAQCB2b2lkIGFtZGdwdV9tbV93cmVnKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1aW50MzJfdCByZWcsIHVpbnQzMl90IHYsCiAKIAlp ZiAoIShhY2NfZmxhZ3MgJiBBTURHUFVfUkVHU19OT19LSVEpICYmIGFtZGdwdV9zcmlvdl9ydW50 aW1lKGFkZXYpKSB7CiAJCUJVR19PTihpbl9pbnRlcnJ1cHQoKSk7Ci0JCXJldHVybiBhbWRncHVf dmlydF9raXFfd3JlZyhhZGV2LCByZWcsIHYpOworCQlyZXR1cm4gYW1kZ3B1X2tpcV93cmVnKGFk ZXYsIHJlZywgdik7CiAJfQogCiAJaWYgKChyZWcgKiA0KSA8IGFkZXYtPnJtbWlvX3NpemUgJiYg IShhY2NfZmxhZ3MgJiBBTURHUFVfUkVHU19JRFgpKQpAQCAtMTU5LDYgKzE1OSw1NiBAQCB2b2lk IGFtZGdwdV9pb193cmVnKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1MzIgcmVnLCB1MzIg dikKIAl9CiB9CiAKK3VpbnQzMl90IGFtZGdwdV9raXFfcnJlZyhzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldiwgdWludDMyX3QgcmVnKQoreworCXNpZ25lZCBsb25nIHI7CisJdWludDMyX3QgdmFs OworCXN0cnVjdCBkbWFfZmVuY2UgKmY7CisJc3RydWN0IGFtZGdwdV9raXEgKmtpcSA9ICZhZGV2 LT5nZngua2lxOworCXN0cnVjdCBhbWRncHVfcmluZyAqcmluZyA9ICZraXEtPnJpbmc7CisKKwlC VUdfT04oIXJpbmctPmZ1bmNzLT5lbWl0X3JyZWcpOworCisJbXV0ZXhfbG9jaygma2lxLT5yaW5n X211dGV4KTsKKwlhbWRncHVfcmluZ19hbGxvYyhyaW5nLCAzMik7CisJYW1kZ3B1X3JpbmdfZW1p dF9ycmVnKHJpbmcsIHJlZyk7CisJYW1kZ3B1X2ZlbmNlX2VtaXQocmluZywgJmYpOworCWFtZGdw dV9yaW5nX2NvbW1pdChyaW5nKTsKKwltdXRleF91bmxvY2soJmtpcS0+cmluZ19tdXRleCk7CisK KwlyID0gZG1hX2ZlbmNlX3dhaXQoZiwgZmFsc2UpOworCWlmIChyKQorCQlEUk1fRVJST1IoIndh aXQgZm9yIGtpcSBmZW5jZSBlcnJvcjogJWxkLlxuIiwgcik7CisJZG1hX2ZlbmNlX3B1dChmKTsK KworCXZhbCA9IGFkZXYtPndiLndiW2tpcS0+cmVnX3ZhbF9vZmZzXTsKKworCXJldHVybiB2YWw7 Cit9CisKK3ZvaWQgYW1kZ3B1X2tpcV93cmVnKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1 aW50MzJfdCByZWcsIHVpbnQzMl90IHYpCit7CisJc2lnbmVkIGxvbmcgcjsKKwlzdHJ1Y3QgZG1h X2ZlbmNlICpmOworCXN0cnVjdCBhbWRncHVfa2lxICpraXEgPSAmYWRldi0+Z2Z4LmtpcTsKKwlz dHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcgPSAma2lxLT5yaW5nOworCisJQlVHX09OKCFyaW5nLT5m dW5jcy0+ZW1pdF93cmVnKTsKKworCW11dGV4X2xvY2soJmtpcS0+cmluZ19tdXRleCk7CisJYW1k Z3B1X3JpbmdfYWxsb2MocmluZywgMzIpOworCWFtZGdwdV9yaW5nX2VtaXRfd3JlZyhyaW5nLCBy ZWcsIHYpOworCWFtZGdwdV9mZW5jZV9lbWl0KHJpbmcsICZmKTsKKwlhbWRncHVfcmluZ19jb21t aXQocmluZyk7CisJbXV0ZXhfdW5sb2NrKCZraXEtPnJpbmdfbXV0ZXgpOworCisJciA9IGRtYV9m ZW5jZV93YWl0KGYsIGZhbHNlKTsKKwlpZiAocikKKwkJRFJNX0VSUk9SKCJ3YWl0IGZvciBraXEg ZmVuY2UgZXJyb3I6ICVsZC5cbiIsIHIpOworCWRtYV9mZW5jZV9wdXQoZik7Cit9CisKKwogLyoq CiAgKiBhbWRncHVfbW1fcmRvb3JiZWxsIC0gcmVhZCBhIGRvb3JiZWxsIGR3b3JkCiAgKgpAQCAt MTg1Myw2ICsxOTAzLDcgQEAgaW50IGFtZGdwdV9kZXZpY2VfaW5pdChzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldiwKIAltdXRleF9pbml0KCZhZGV2LT5maXJtd2FyZS5tdXRleCk7CiAJbXV0ZXhf aW5pdCgmYWRldi0+cG0ubXV0ZXgpOwogCW11dGV4X2luaXQoJmFkZXYtPmdmeC5ncHVfY2xvY2tf bXV0ZXgpOworCW11dGV4X2luaXQoJmFkZXYtPmdmeC5raXEucmluZ19tdXRleCk7CiAJbXV0ZXhf aW5pdCgmYWRldi0+c3JibV9tdXRleCk7CiAJbXV0ZXhfaW5pdCgmYWRldi0+Z3JibV9pZHhfbXV0 ZXgpOwogCW11dGV4X2luaXQoJmFkZXYtPm1uX2xvY2spOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZpcnQuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV92aXJ0LmMKaW5kZXggYmQ0MjJmMC4uNzY1ODUyMiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZpcnQuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfdmlydC5jCkBAIC0xMDgsNTkgKzEwOCw5IEBAIHZvaWQgYW1k Z3B1X3ZpcnRfaW5pdF9zZXR0aW5nKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCWFkZXYt PmNnX2ZsYWdzID0gMDsKIAlhZGV2LT5wZ19mbGFncyA9IDA7CiAKLQltdXRleF9pbml0KCZhZGV2 LT52aXJ0LmxvY2tfa2lxKTsKIAltdXRleF9pbml0KCZhZGV2LT52aXJ0LmxvY2tfcmVzZXQpOwog fQogCi11aW50MzJfdCBhbWRncHVfdmlydF9raXFfcnJlZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldiwgdWludDMyX3QgcmVnKQotewotCXNpZ25lZCBsb25nIHI7Ci0JdWludDMyX3QgdmFsOwot CXN0cnVjdCBkbWFfZmVuY2UgKmY7Ci0Jc3RydWN0IGFtZGdwdV9raXEgKmtpcSA9ICZhZGV2LT5n Zngua2lxOwotCXN0cnVjdCBhbWRncHVfcmluZyAqcmluZyA9ICZraXEtPnJpbmc7Ci0KLQlCVUdf T04oIXJpbmctPmZ1bmNzLT5lbWl0X3JyZWcpOwotCi0JbXV0ZXhfbG9jaygmYWRldi0+dmlydC5s b2NrX2tpcSk7Ci0JYW1kZ3B1X3JpbmdfYWxsb2MocmluZywgMzIpOwotCWFtZGdwdV9yaW5nX2Vt aXRfcnJlZyhyaW5nLCByZWcpOwotCWFtZGdwdV9mZW5jZV9lbWl0KHJpbmcsICZmKTsKLQlhbWRn cHVfcmluZ19jb21taXQocmluZyk7Ci0JbXV0ZXhfdW5sb2NrKCZhZGV2LT52aXJ0LmxvY2tfa2lx KTsKLQotCXIgPSBkbWFfZmVuY2Vfd2FpdChmLCBmYWxzZSk7Ci0JaWYgKHIpCi0JCURSTV9FUlJP Uigid2FpdCBmb3Iga2lxIGZlbmNlIGVycm9yOiAlbGQuXG4iLCByKTsKLQlkbWFfZmVuY2VfcHV0 KGYpOwotCi0JdmFsID0gYWRldi0+d2Iud2JbYWRldi0+dmlydC5yZWdfdmFsX29mZnNdOwotCi0J cmV0dXJuIHZhbDsKLX0KLQotdm9pZCBhbWRncHVfdmlydF9raXFfd3JlZyhzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldiwgdWludDMyX3QgcmVnLCB1aW50MzJfdCB2KQotewotCXNpZ25lZCBsb25n IHI7Ci0Jc3RydWN0IGRtYV9mZW5jZSAqZjsKLQlzdHJ1Y3QgYW1kZ3B1X2tpcSAqa2lxID0gJmFk ZXYtPmdmeC5raXE7Ci0Jc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nID0gJmtpcS0+cmluZzsKLQot CUJVR19PTighcmluZy0+ZnVuY3MtPmVtaXRfd3JlZyk7Ci0KLQltdXRleF9sb2NrKCZhZGV2LT52 aXJ0LmxvY2tfa2lxKTsKLQlhbWRncHVfcmluZ19hbGxvYyhyaW5nLCAzMik7Ci0JYW1kZ3B1X3Jp bmdfZW1pdF93cmVnKHJpbmcsIHJlZywgdik7Ci0JYW1kZ3B1X2ZlbmNlX2VtaXQocmluZywgJmYp OwotCWFtZGdwdV9yaW5nX2NvbW1pdChyaW5nKTsKLQltdXRleF91bmxvY2soJmFkZXYtPnZpcnQu bG9ja19raXEpOwotCi0JciA9IGRtYV9mZW5jZV93YWl0KGYsIGZhbHNlKTsKLQlpZiAocikKLQkJ RFJNX0VSUk9SKCJ3YWl0IGZvciBraXEgZmVuY2UgZXJyb3I6ICVsZC5cbiIsIHIpOwotCWRtYV9m ZW5jZV9wdXQoZik7Ci19Ci0KIC8qKgogICogYW1kZ3B1X3ZpcnRfcmVxdWVzdF9mdWxsX2dwdSgp IC0gcmVxdWVzdCBmdWxsIGdwdSBhY2Nlc3MKICAqIEBhbWRncHU6CWFtZGdwdSBkZXZpY2UuCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdmlydC5oIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZpcnQuaAppbmRleCBhOGVkMTYyLi4yZTY3 ZGI5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdmlydC5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92aXJ0LmgKQEAgLTUxLDgg KzUxLDYgQEAgc3RydWN0IGFtZGdwdV92aXJ0IHsKIAlzdHJ1Y3QgYW1kZ3B1X2JvCQkqY3NhX29i ajsKIAl1aW50NjRfdAkJCWNzYV92bWlkMF9hZGRyOwogCWJvb2wgY2hhaW5lZF9pYl9zdXBwb3J0 OwotCXVpbnQzMl90CQkJcmVnX3ZhbF9vZmZzOwotCXN0cnVjdCBtdXRleAkJCWxvY2tfa2lxOwog CXN0cnVjdCBtdXRleCAgICAgICAgICAgICAgICAgICAgbG9ja19yZXNldDsKIAlzdHJ1Y3QgYW1k Z3B1X2lycV9zcmMJCWFja19pcnE7CiAJc3RydWN0IGFtZGdwdV9pcnFfc3JjCQlyY3ZfaXJxOwpA QCAtOTIsOCArOTAsNiBAQCBzdHJ1Y3QgYW1kZ3B1X3ZtOwogaW50IGFtZGdwdV9hbGxvY2F0ZV9z dGF0aWNfY3NhKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KTsKIGludCBhbWRncHVfbWFwX3N0 YXRpY19jc2Eoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHN0cnVjdCBhbWRncHVfdm0gKnZt KTsKIHZvaWQgYW1kZ3B1X3ZpcnRfaW5pdF9zZXR0aW5nKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2KTsKLXVpbnQzMl90IGFtZGdwdV92aXJ0X2tpcV9ycmVnKHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2LCB1aW50MzJfdCByZWcpOwotdm9pZCBhbWRncHVfdmlydF9raXFfd3JlZyhzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldiwgdWludDMyX3QgcmVnLCB1aW50MzJfdCB2KTsKIGludCBhbWRn cHVfdmlydF9yZXF1ZXN0X2Z1bGxfZ3B1KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBib29s IGluaXQpOwogaW50IGFtZGdwdV92aXJ0X3JlbGVhc2VfZnVsbF9ncHUoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYsIGJvb2wgaW5pdCk7CiBpbnQgYW1kZ3B1X3ZpcnRfcmVzZXRfZ3B1KHN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2dmeF92OF8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5j CmluZGV4IDRiYTJhZWIuLjk3NmVlMGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2dmeF92OF8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4 XzAuYwpAQCAtMTQxNiw3ICsxNDE2LDcgQEAgc3RhdGljIGludCBnZnhfdjhfMF9raXFfaW5pdF9y aW5nKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCXN0cnVjdCBhbWRncHVfa2lxICpraXEg PSAmYWRldi0+Z2Z4LmtpcTsKIAlpbnQgciA9IDA7CiAKLQlyID0gYW1kZ3B1X3diX2dldChhZGV2 LCAmYWRldi0+dmlydC5yZWdfdmFsX29mZnMpOworCXIgPSBhbWRncHVfd2JfZ2V0KGFkZXYsICZr aXEtPnJlZ192YWxfb2Zmcyk7CiAJaWYgKHIpCiAJCXJldHVybiByOwogCkBAIC0xNDQyLDcgKzE0 NDIsNyBAQCBzdGF0aWMgaW50IGdmeF92OF8wX2tpcV9pbml0X3Jpbmcoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYsCiBzdGF0aWMgdm9pZCBnZnhfdjhfMF9raXFfZnJlZV9yaW5nKHN0cnVjdCBh bWRncHVfcmluZyAqcmluZywKIAkJCQkgICBzdHJ1Y3QgYW1kZ3B1X2lycV9zcmMgKmlycSkKIHsK LQlhbWRncHVfd2JfZnJlZShyaW5nLT5hZGV2LCByaW5nLT5hZGV2LT52aXJ0LnJlZ192YWxfb2Zm cyk7CisJYW1kZ3B1X3diX2ZyZWUocmluZy0+YWRldiwgcmluZy0+YWRldi0+Z2Z4LmtpcS5yZWdf dmFsX29mZnMpOwogCWFtZGdwdV9yaW5nX2ZpbmkocmluZyk7CiB9CiAKQEAgLTY3NzgsOSArNjc3 OCw5IEBAIHN0YXRpYyB2b2lkIGdmeF92OF8wX3JpbmdfZW1pdF9ycmVnKHN0cnVjdCBhbWRncHVf cmluZyAqcmluZywgdWludDMyX3QgcmVnKQogCWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIHJlZyk7 CiAJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgMCk7CiAJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywg bG93ZXJfMzJfYml0cyhhZGV2LT53Yi5ncHVfYWRkciArCi0JCQkJYWRldi0+dmlydC5yZWdfdmFs X29mZnMgKiA0KSk7CisJCQkJYWRldi0+Z2Z4LmtpcS5yZWdfdmFsX29mZnMgKiA0KSk7CiAJYW1k Z3B1X3Jpbmdfd3JpdGUocmluZywgdXBwZXJfMzJfYml0cyhhZGV2LT53Yi5ncHVfYWRkciArCi0J CQkJYWRldi0+dmlydC5yZWdfdmFsX29mZnMgKiA0KSk7CisJCQkJYWRldi0+Z2Z4LmtpcS5yZWdf dmFsX29mZnMgKiA0KSk7CiB9CiAKIHN0YXRpYyB2b2lkIGdmeF92OF8wX3JpbmdfZW1pdF93cmVn KHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywgdWludDMyX3QgcmVnLApkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2dmeF92OV8wLmMKaW5kZXggYTBjMDRiMGMuLmYyMDU0YzggMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYwpAQCAtNjg2LDcgKzY4Niw3IEBAIHN0YXRpYyBpbnQgZ2Z4 X3Y5XzBfa2lxX2luaXRfcmluZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAlzdHJ1Y3Qg YW1kZ3B1X2tpcSAqa2lxID0gJmFkZXYtPmdmeC5raXE7CiAJaW50IHIgPSAwOwogCi0JciA9IGFt ZGdwdV93Yl9nZXQoYWRldiwgJmFkZXYtPnZpcnQucmVnX3ZhbF9vZmZzKTsKKwlyID0gYW1kZ3B1 X3diX2dldChhZGV2LCAma2lxLT5yZWdfdmFsX29mZnMpOwogCWlmIChyKQogCQlyZXR1cm4gcjsK IApAQCAtNzEyLDcgKzcxMiw3IEBAIHN0YXRpYyBpbnQgZ2Z4X3Y5XzBfa2lxX2luaXRfcmluZyhz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIHN0YXRpYyB2b2lkIGdmeF92OV8wX2tpcV9mcmVl X3Jpbmcoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLAogCQkJCSAgIHN0cnVjdCBhbWRncHVfaXJx X3NyYyAqaXJxKQogewotCWFtZGdwdV93Yl9mcmVlKHJpbmctPmFkZXYsIHJpbmctPmFkZXYtPnZp cnQucmVnX3ZhbF9vZmZzKTsKKwlhbWRncHVfd2JfZnJlZShyaW5nLT5hZGV2LCByaW5nLT5hZGV2 LT5nZngua2lxLnJlZ192YWxfb2Zmcyk7CiAJYW1kZ3B1X3JpbmdfZmluaShyaW5nKTsKIH0KIApA QCAtMzI5MSw5ICszMjkxLDkgQEAgc3RhdGljIHZvaWQgZ2Z4X3Y5XzBfcmluZ19lbWl0X3JyZWco c3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLCB1aW50MzJfdCByZWcpCiAJYW1kZ3B1X3Jpbmdfd3Jp dGUocmluZywgcmVnKTsKIAlhbWRncHVfcmluZ193cml0ZShyaW5nLCAwKTsKIAlhbWRncHVfcmlu Z193cml0ZShyaW5nLCBsb3dlcl8zMl9iaXRzKGFkZXYtPndiLmdwdV9hZGRyICsKLQkJCQlhZGV2 LT52aXJ0LnJlZ192YWxfb2ZmcyAqIDQpKTsKKwkJCQlhZGV2LT5nZngua2lxLnJlZ192YWxfb2Zm cyAqIDQpKTsKIAlhbWRncHVfcmluZ193cml0ZShyaW5nLCB1cHBlcl8zMl9iaXRzKGFkZXYtPndi LmdwdV9hZGRyICsKLQkJCQlhZGV2LT52aXJ0LnJlZ192YWxfb2ZmcyAqIDQpKTsKKwkJCQlhZGV2 LT5nZngua2lxLnJlZ192YWxfb2ZmcyAqIDQpKTsKIH0KIAogc3RhdGljIHZvaWQgZ2Z4X3Y5XzBf cmluZ19lbWl0X3dyZWcoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLCB1aW50MzJfdCByZWcsCi0t IAoyLjkuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K YW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==