From: Alex Deucher Subject: [PATCH 6/6] drm/amdgpu/gfx: consolidate mqd buffer setup code Date: Wed, 7 Jun 2017 15:34:57 -0400 Message-ID: <1496864097-4322-6-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 SXQgd2FzIGR1cGxpY2F0ZWQgYWNyb3NzIG11bHRpcGxlIGdlbmVyYXRpb25zLgoKU2lnbmVkLW9m Zi1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9nZnguYyB8IDY2ICsrKysrKysrKysrKysrKysr KysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2dmeC5oIHwg IDQgKysKIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMgICB8IDcxICstLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv Z2Z4X3Y5XzAuYyAgIHwgNjUgKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiA0IGZpbGVz IGNoYW5nZWQsIDc0IGluc2VydGlvbnMoKyksIDEzMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2Z4LmMgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfZ2Z4LmMKaW5kZXggYzVhYTQ2NS4uZGZiZjAyNyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2dmeC5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9nZnguYwpAQCAtMjQ4LDMgKzI0OCw2OSBAQCBp bnQgYW1kZ3B1X2dmeF9raXFfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAogCXJl dHVybiAwOwogfQorCisvKiBjcmVhdGUgTVFEIGZvciBlYWNoIGNvbXB1dGUgcXVldWUgKi8KK2lu dCBhbWRncHVfZ2Z4X2NvbXB1dGVfbXFkX3N3X2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYsCisJCQkJICAgdW5zaWduZWQgbXFkX3NpemUpCit7CisJc3RydWN0IGFtZGdwdV9yaW5nICpy aW5nID0gTlVMTDsKKwlpbnQgciwgaTsKKworCS8qIGNyZWF0ZSBNUUQgZm9yIEtJUSAqLworCXJp bmcgPSAmYWRldi0+Z2Z4LmtpcS5yaW5nOworCWlmICghcmluZy0+bXFkX29iaikgeworCQlyID0g YW1kZ3B1X2JvX2NyZWF0ZV9rZXJuZWwoYWRldiwgbXFkX3NpemUsIFBBR0VfU0laRSwKKwkJCQkJ ICAgIEFNREdQVV9HRU1fRE9NQUlOX0dUVCwgJnJpbmctPm1xZF9vYmosCisJCQkJCSAgICAmcmlu Zy0+bXFkX2dwdV9hZGRyLCAmcmluZy0+bXFkX3B0cik7CisJCWlmIChyKSB7CisJCQlkZXZfd2Fy bihhZGV2LT5kZXYsICJmYWlsZWQgdG8gY3JlYXRlIHJpbmcgbXFkIG9iICglZCkiLCByKTsKKwkJ CXJldHVybiByOworCQl9CisKKwkJLyogcHJlcGFyZSBNUUQgYmFja3VwICovCisJCWFkZXYtPmdm eC5tZWMubXFkX2JhY2t1cFtBTURHUFVfTUFYX0NPTVBVVEVfUklOR1NdID0ga21hbGxvYyhtcWRf c2l6ZSwgR0ZQX0tFUk5FTCk7CisJCWlmICghYWRldi0+Z2Z4Lm1lYy5tcWRfYmFja3VwW0FNREdQ VV9NQVhfQ09NUFVURV9SSU5HU10pCisJCQkJZGV2X3dhcm4oYWRldi0+ZGV2LCAibm8gbWVtb3J5 IHRvIGNyZWF0ZSBNUUQgYmFja3VwIGZvciByaW5nICVzXG4iLCByaW5nLT5uYW1lKTsKKwl9CisK KwkvKiBjcmVhdGUgTVFEIGZvciBlYWNoIEtDUSAqLworCWZvciAoaSA9IDA7IGkgPCBhZGV2LT5n ZngubnVtX2NvbXB1dGVfcmluZ3M7IGkrKykgeworCQlyaW5nID0gJmFkZXYtPmdmeC5jb21wdXRl X3JpbmdbaV07CisJCWlmICghcmluZy0+bXFkX29iaikgeworCQkJciA9IGFtZGdwdV9ib19jcmVh dGVfa2VybmVsKGFkZXYsIG1xZF9zaXplLCBQQUdFX1NJWkUsCisJCQkJCQkgICAgQU1ER1BVX0dF TV9ET01BSU5fR1RULCAmcmluZy0+bXFkX29iaiwKKwkJCQkJCSAgICAmcmluZy0+bXFkX2dwdV9h ZGRyLCAmcmluZy0+bXFkX3B0cik7CisJCQlpZiAocikgeworCQkJCWRldl93YXJuKGFkZXYtPmRl diwgImZhaWxlZCB0byBjcmVhdGUgcmluZyBtcWQgb2IgKCVkKSIsIHIpOworCQkJCXJldHVybiBy OworCQkJfQorCisJCQkvKiBwcmVwYXJlIE1RRCBiYWNrdXAgKi8KKwkJCWFkZXYtPmdmeC5tZWMu bXFkX2JhY2t1cFtpXSA9IGttYWxsb2MobXFkX3NpemUsIEdGUF9LRVJORUwpOworCQkJaWYgKCFh ZGV2LT5nZngubWVjLm1xZF9iYWNrdXBbaV0pCisJCQkJZGV2X3dhcm4oYWRldi0+ZGV2LCAibm8g bWVtb3J5IHRvIGNyZWF0ZSBNUUQgYmFja3VwIGZvciByaW5nICVzXG4iLCByaW5nLT5uYW1lKTsK KwkJfQorCX0KKworCXJldHVybiAwOworfQorCit2b2lkIGFtZGdwdV9nZnhfY29tcHV0ZV9tcWRf c3dfZmluaShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKK3sKKwlzdHJ1Y3QgYW1kZ3B1X3Jp bmcgKnJpbmcgPSBOVUxMOworCWludCBpOworCisJZm9yIChpID0gMDsgaSA8IGFkZXYtPmdmeC5u dW1fY29tcHV0ZV9yaW5nczsgaSsrKSB7CisJCXJpbmcgPSAmYWRldi0+Z2Z4LmNvbXB1dGVfcmlu Z1tpXTsKKwkJa2ZyZWUoYWRldi0+Z2Z4Lm1lYy5tcWRfYmFja3VwW2ldKTsKKwkJYW1kZ3B1X2Jv X2ZyZWVfa2VybmVsKCZyaW5nLT5tcWRfb2JqLAorCQkJCSAgICAgICZyaW5nLT5tcWRfZ3B1X2Fk ZHIsCisJCQkJICAgICAgJnJpbmctPm1xZF9wdHIpOworCX0KKworCXJpbmcgPSAmYWRldi0+Z2Z4 LmtpcS5yaW5nOworCWtmcmVlKGFkZXYtPmdmeC5tZWMubXFkX2JhY2t1cFtBTURHUFVfTUFYX0NP TVBVVEVfUklOR1NdKTsKKwlhbWRncHVfYm9fZnJlZV9rZXJuZWwoJnJpbmctPm1xZF9vYmosCisJ CQkgICAgICAmcmluZy0+bXFkX2dwdV9hZGRyLAorCQkJICAgICAgJnJpbmctPm1xZF9wdHIpOwor fQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2dmeC5oIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2dmeC5oCmluZGV4IGIxNzY2ZmEuLjFm Mjc5MDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9nZngu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2Z4LmgKQEAgLTQzLDYg KzQzLDEwIEBAIHZvaWQgYW1kZ3B1X2dmeF9raXFfZmluaShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldik7CiBpbnQgYW1kZ3B1X2dmeF9raXFfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl diwKIAkJCXVuc2lnbmVkIGhwZF9zaXplKTsKIAoraW50IGFtZGdwdV9nZnhfY29tcHV0ZV9tcWRf c3dfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKKwkJCQkgICB1bnNpZ25lZCBtcWRf c2l6ZSk7Cit2b2lkIGFtZGdwdV9nZnhfY29tcHV0ZV9tcWRfc3dfZmluaShzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldik7CisKIC8qKgogICogYW1kZ3B1X2dmeF9jcmVhdGVfYml0bWFzayAtIGNy ZWF0ZSBhIGJpdG1hc2sKICAqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9nZnhfdjhfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYwppbmRl eCA5N2QzOTM2OS4uNmU1NDFhZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvZ2Z4X3Y4XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5j CkBAIC02NTksOCArNjU5LDYgQEAgc3RhdGljIHUzMiBnZnhfdjhfMF9nZXRfY3NiX3NpemUoc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwogc3RhdGljIHZvaWQgZ2Z4X3Y4XzBfZ2V0X2N1X2lu Zm8oc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwogc3RhdGljIHZvaWQgZ2Z4X3Y4XzBfcmlu Z19lbWl0X2NlX21ldGEoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKTsKIHN0YXRpYyB2b2lkIGdm eF92OF8wX3JpbmdfZW1pdF9kZV9tZXRhKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZyk7Ci1zdGF0 aWMgaW50IGdmeF92OF8wX2NvbXB1dGVfbXFkX3N3X2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYpOwotc3RhdGljIHZvaWQgZ2Z4X3Y4XzBfY29tcHV0ZV9tcWRfc3dfZmluaShzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldik7CiAKIHN0YXRpYyB2b2lkIGdmeF92OF8wX2luaXRfZ29sZGVu X3JlZ2lzdGVycyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsKQEAgLTIxMDIsNyArMjEw MCw3IEBAIHN0YXRpYyBpbnQgZ2Z4X3Y4XzBfc3dfaW5pdCh2b2lkICpoYW5kbGUpCiAJCXJldHVy biByOwogCiAJLyogY3JlYXRlIE1RRCBmb3IgYWxsIGNvbXB1dGUgcXVldWVzIGFzIHdlbGwgYXMg S0lRIGZvciBTUklPViBjYXNlICovCi0JciA9IGdmeF92OF8wX2NvbXB1dGVfbXFkX3N3X2luaXQo YWRldik7CisJciA9IGFtZGdwdV9nZnhfY29tcHV0ZV9tcWRfc3dfaW5pdChhZGV2LCBzaXplb2Yo c3RydWN0IHZpX21xZCkpOwogCWlmIChyKQogCQlyZXR1cm4gcjsKIApAQCAtMjE0OCw3ICsyMTQ2 LDcgQEAgc3RhdGljIGludCBnZnhfdjhfMF9zd19maW5pKHZvaWQgKmhhbmRsZSkKIAlmb3IgKGkg PSAwOyBpIDwgYWRldi0+Z2Z4Lm51bV9jb21wdXRlX3JpbmdzOyBpKyspCiAJCWFtZGdwdV9yaW5n X2ZpbmkoJmFkZXYtPmdmeC5jb21wdXRlX3JpbmdbaV0pOwogCi0JZ2Z4X3Y4XzBfY29tcHV0ZV9t cWRfc3dfZmluaShhZGV2KTsKKwlhbWRncHVfZ2Z4X2NvbXB1dGVfbXFkX3N3X2ZpbmkoYWRldik7 CiAJYW1kZ3B1X2dmeF9raXFfZnJlZV9yaW5nKCZhZGV2LT5nZngua2lxLnJpbmcsICZhZGV2LT5n Zngua2lxLmlycSk7CiAJYW1kZ3B1X2dmeF9raXFfZmluaShhZGV2KTsKIApAQCAtNzE0Niw2OCAr NzE0NCwzIEBAIHN0YXRpYyB2b2lkIGdmeF92OF8wX3JpbmdfZW1pdF9kZV9tZXRhKHN0cnVjdCBh bWRncHVfcmluZyAqcmluZykKIAlhbWRncHVfcmluZ193cml0ZShyaW5nLCB1cHBlcl8zMl9iaXRz KGRlX3BheWxvYWRfYWRkcikpOwogCWFtZGdwdV9yaW5nX3dyaXRlX211bHRpcGxlKHJpbmcsICh2 b2lkICopJmRlX3BheWxvYWQsIGNudF9kZSAtIDIpOwogfQotCi0vKiBjcmVhdGUgTVFEIGZvciBl YWNoIGNvbXB1dGUgcXVldWUgKi8KLXN0YXRpYyBpbnQgZ2Z4X3Y4XzBfY29tcHV0ZV9tcWRfc3df aW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKLXsKLQlzdHJ1Y3QgYW1kZ3B1X3Jpbmcg KnJpbmcgPSBOVUxMOwotCWludCByLCBpOwotCi0JLyogY3JlYXRlIE1RRCBmb3IgS0lRICovCi0J cmluZyA9ICZhZGV2LT5nZngua2lxLnJpbmc7Ci0JaWYgKCFyaW5nLT5tcWRfb2JqKSB7Ci0JCXIg PSBhbWRncHVfYm9fY3JlYXRlX2tlcm5lbChhZGV2LCBzaXplb2Yoc3RydWN0IHZpX21xZCksIFBB R0VfU0laRSwKLQkJCQkJICAgIEFNREdQVV9HRU1fRE9NQUlOX0dUVCwgJnJpbmctPm1xZF9vYmos Ci0JCQkJCSAgICAmcmluZy0+bXFkX2dwdV9hZGRyLCAmcmluZy0+bXFkX3B0cik7Ci0JCWlmIChy KSB7Ci0JCQlkZXZfd2FybihhZGV2LT5kZXYsICJmYWlsZWQgdG8gY3JlYXRlIHJpbmcgbXFkIG9i ICglZCkiLCByKTsKLQkJCXJldHVybiByOwotCQl9Ci0KLQkJLyogcHJlcGFyZSBNUUQgYmFja3Vw ICovCi0JCWFkZXYtPmdmeC5tZWMubXFkX2JhY2t1cFtBTURHUFVfTUFYX0NPTVBVVEVfUklOR1Nd ID0ga21hbGxvYyhzaXplb2Yoc3RydWN0IHZpX21xZCksIEdGUF9LRVJORUwpOwotCQlpZiAoIWFk ZXYtPmdmeC5tZWMubXFkX2JhY2t1cFtBTURHUFVfTUFYX0NPTVBVVEVfUklOR1NdKQotCQkJCWRl dl93YXJuKGFkZXYtPmRldiwgIm5vIG1lbW9yeSB0byBjcmVhdGUgTVFEIGJhY2t1cCBmb3Igcmlu ZyAlc1xuIiwgcmluZy0+bmFtZSk7Ci0JfQotCi0JLyogY3JlYXRlIE1RRCBmb3IgZWFjaCBLQ1Eg Ki8KLQlmb3IgKGkgPSAwOyBpIDwgYWRldi0+Z2Z4Lm51bV9jb21wdXRlX3JpbmdzOyBpKyspIHsK LQkJcmluZyA9ICZhZGV2LT5nZnguY29tcHV0ZV9yaW5nW2ldOwotCQlpZiAoIXJpbmctPm1xZF9v YmopIHsKLQkJCXIgPSBhbWRncHVfYm9fY3JlYXRlX2tlcm5lbChhZGV2LCBzaXplb2Yoc3RydWN0 IHZpX21xZCksIFBBR0VfU0laRSwKLQkJCQkJCSAgICBBTURHUFVfR0VNX0RPTUFJTl9HVFQsICZy aW5nLT5tcWRfb2JqLAotCQkJCQkJICAgICZyaW5nLT5tcWRfZ3B1X2FkZHIsICZyaW5nLT5tcWRf cHRyKTsKLQkJCWlmIChyKSB7Ci0JCQkJZGV2X3dhcm4oYWRldi0+ZGV2LCAiZmFpbGVkIHRvIGNy ZWF0ZSByaW5nIG1xZCBvYiAoJWQpIiwgcik7Ci0JCQkJcmV0dXJuIHI7Ci0JCQl9Ci0KLQkJCS8q IHByZXBhcmUgTVFEIGJhY2t1cCAqLwotCQkJYWRldi0+Z2Z4Lm1lYy5tcWRfYmFja3VwW2ldID0g a21hbGxvYyhzaXplb2Yoc3RydWN0IHZpX21xZCksIEdGUF9LRVJORUwpOwotCQkJaWYgKCFhZGV2 LT5nZngubWVjLm1xZF9iYWNrdXBbaV0pCi0JCQkJZGV2X3dhcm4oYWRldi0+ZGV2LCAibm8gbWVt b3J5IHRvIGNyZWF0ZSBNUUQgYmFja3VwIGZvciByaW5nICVzXG4iLCByaW5nLT5uYW1lKTsKLQkJ fQotCX0KLQotCXJldHVybiAwOwotfQotCi1zdGF0aWMgdm9pZCBnZnhfdjhfMF9jb21wdXRlX21x ZF9zd19maW5pKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQotewotCXN0cnVjdCBhbWRncHVf cmluZyAqcmluZyA9IE5VTEw7Ci0JaW50IGk7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgYWRldi0+Z2Z4 Lm51bV9jb21wdXRlX3JpbmdzOyBpKyspIHsKLQkJcmluZyA9ICZhZGV2LT5nZnguY29tcHV0ZV9y aW5nW2ldOwotCQlrZnJlZShhZGV2LT5nZngubWVjLm1xZF9iYWNrdXBbaV0pOwotCQlhbWRncHVf Ym9fZnJlZV9rZXJuZWwoJnJpbmctPm1xZF9vYmosCi0JCQkJICAgICAgJnJpbmctPm1xZF9ncHVf YWRkciwKLQkJCQkgICAgICAmcmluZy0+bXFkX3B0cik7Ci0JfQotCi0JcmluZyA9ICZhZGV2LT5n Zngua2lxLnJpbmc7Ci0Ja2ZyZWUoYWRldi0+Z2Z4Lm1lYy5tcWRfYmFja3VwW0FNREdQVV9NQVhf Q09NUFVURV9SSU5HU10pOwotCWFtZGdwdV9ib19mcmVlX2tlcm5lbCgmcmluZy0+bXFkX29iaiwK LQkJCSAgICAgICZyaW5nLT5tcWRfZ3B1X2FkZHIsCi0JCQkgICAgICAmcmluZy0+bXFkX3B0cik7 Ci19CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYwppbmRleCBiNzA5NGMzLi4zNzU2 MjBhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMKQEAgLTk1Niw2NyArOTU2 LDYgQEAgc3RhdGljIGludCBnZnhfdjlfMF9tZWNfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldikKIAlyZXR1cm4gMDsKIH0KIAotLyogY3JlYXRlIE1RRCBmb3IgZWFjaCBjb21wdXRlIHF1 ZXVlICovCi1zdGF0aWMgaW50IGdmeF92OV8wX2NvbXB1dGVfbXFkX3N3X2luaXQoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYpCi17Ci0Jc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nID0gTlVMTDsK LQlpbnQgciwgaTsKLQotCS8qIGNyZWF0ZSBNUUQgZm9yIEtJUSAqLwotCXJpbmcgPSAmYWRldi0+ Z2Z4LmtpcS5yaW5nOwotCWlmICghcmluZy0+bXFkX29iaikgewotCQlyID0gYW1kZ3B1X2JvX2Ny ZWF0ZV9rZXJuZWwoYWRldiwgc2l6ZW9mKHN0cnVjdCB2OV9tcWQpLCBQQUdFX1NJWkUsCi0JCQkJ CSAgICBBTURHUFVfR0VNX0RPTUFJTl9HVFQsICZyaW5nLT5tcWRfb2JqLAotCQkJCQkgICAgJnJp bmctPm1xZF9ncHVfYWRkciwgKHZvaWQgKiopJnJpbmctPm1xZF9wdHIpOwotCQlpZiAocikgewot CQkJZGV2X3dhcm4oYWRldi0+ZGV2LCAiZmFpbGVkIHRvIGNyZWF0ZSByaW5nIG1xZCBvYiAoJWQp Iiwgcik7Ci0JCQlyZXR1cm4gcjsKLQkJfQotCi0JCS8qIHByZXBhcmUgTVFEIGJhY2t1cCAqLwot CQlhZGV2LT5nZngubWVjLm1xZF9iYWNrdXBbQU1ER1BVX01BWF9DT01QVVRFX1JJTkdTXSA9IGtt YWxsb2Moc2l6ZW9mKHN0cnVjdCB2OV9tcWQpLCBHRlBfS0VSTkVMKTsKLQkJaWYgKCFhZGV2LT5n ZngubWVjLm1xZF9iYWNrdXBbQU1ER1BVX01BWF9DT01QVVRFX1JJTkdTXSkKLQkJCWRldl93YXJu KGFkZXYtPmRldiwgIm5vIG1lbW9yeSB0byBjcmVhdGUgTVFEIGJhY2t1cCBmb3IgcmluZyAlc1xu IiwgcmluZy0+bmFtZSk7Ci0JfQotCi0JLyogY3JlYXRlIE1RRCBmb3IgZWFjaCBLQ1EgKi8KLQlm b3IgKGkgPSAwOyBpIDwgYWRldi0+Z2Z4Lm51bV9jb21wdXRlX3JpbmdzOyBpKyspIHsKLQkJcmlu ZyA9ICZhZGV2LT5nZnguY29tcHV0ZV9yaW5nW2ldOwotCQlpZiAoIXJpbmctPm1xZF9vYmopIHsK LQkJCXIgPSBhbWRncHVfYm9fY3JlYXRlX2tlcm5lbChhZGV2LCBzaXplb2Yoc3RydWN0IHY5X21x ZCksIFBBR0VfU0laRSwKLQkJCQkJCSAgICBBTURHUFVfR0VNX0RPTUFJTl9HVFQsICZyaW5nLT5t cWRfb2JqLAotCQkJCQkJICAgICZyaW5nLT5tcWRfZ3B1X2FkZHIsICh2b2lkICoqKSZyaW5nLT5t cWRfcHRyKTsKLQkJCWlmIChyKSB7Ci0JCQkJZGV2X3dhcm4oYWRldi0+ZGV2LCAiZmFpbGVkIHRv IGNyZWF0ZSByaW5nIG1xZCBvYiAoJWQpIiwgcik7Ci0JCQkJcmV0dXJuIHI7Ci0JCQl9Ci0KLQkJ CS8qIHByZXBhcmUgTVFEIGJhY2t1cCAqLwotCQkJYWRldi0+Z2Z4Lm1lYy5tcWRfYmFja3VwW2ld ID0ga21hbGxvYyhzaXplb2Yoc3RydWN0IHY5X21xZCksIEdGUF9LRVJORUwpOwotCQkJaWYgKCFh ZGV2LT5nZngubWVjLm1xZF9iYWNrdXBbaV0pCi0JCQkJZGV2X3dhcm4oYWRldi0+ZGV2LCAibm8g bWVtb3J5IHRvIGNyZWF0ZSBNUUQgYmFja3VwIGZvciByaW5nICVzXG4iLCByaW5nLT5uYW1lKTsK LQkJfQotCX0KLQotCXJldHVybiAwOwotfQotCi1zdGF0aWMgdm9pZCBnZnhfdjlfMF9jb21wdXRl X21xZF9zd19maW5pKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQotewotCXN0cnVjdCBhbWRn cHVfcmluZyAqcmluZyA9IE5VTEw7Ci0JaW50IGk7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgYWRldi0+ Z2Z4Lm51bV9jb21wdXRlX3JpbmdzOyBpKyspIHsKLQkJcmluZyA9ICZhZGV2LT5nZnguY29tcHV0 ZV9yaW5nW2ldOwotCQlrZnJlZShhZGV2LT5nZngubWVjLm1xZF9iYWNrdXBbaV0pOwotCQlhbWRn cHVfYm9fZnJlZV9rZXJuZWwoJnJpbmctPm1xZF9vYmosICZyaW5nLT5tcWRfZ3B1X2FkZHIsICh2 b2lkICoqKSZyaW5nLT5tcWRfcHRyKTsKLQl9Ci0KLQlyaW5nID0gJmFkZXYtPmdmeC5raXEucmlu ZzsKLQlrZnJlZShhZGV2LT5nZngubWVjLm1xZF9iYWNrdXBbQU1ER1BVX01BWF9DT01QVVRFX1JJ TkdTXSk7Ci0JYW1kZ3B1X2JvX2ZyZWVfa2VybmVsKCZyaW5nLT5tcWRfb2JqLCAmcmluZy0+bXFk X2dwdV9hZGRyLCAodm9pZCAqKikmcmluZy0+bXFkX3B0cik7Ci19Ci0KIHN0YXRpYyB1aW50MzJf dCB3YXZlX3JlYWRfaW5kKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1aW50MzJfdCBzaW1k LCB1aW50MzJfdCB3YXZlLCB1aW50MzJfdCBhZGRyZXNzKQogewogCVdSRUczMl9TT0MxNShHQywg MCwgbW1TUV9JTkRfSU5ERVgsCkBAIC0xNDgxLDcgKzE0MjAsNyBAQCBzdGF0aWMgaW50IGdmeF92 OV8wX3N3X2luaXQodm9pZCAqaGFuZGxlKQogCQlyZXR1cm4gcjsKIAogCS8qIGNyZWF0ZSBNUUQg Zm9yIGFsbCBjb21wdXRlIHF1ZXVlcyBhcyB3ZWwgYXMgS0lRIGZvciBTUklPViBjYXNlICovCi0J ciA9IGdmeF92OV8wX2NvbXB1dGVfbXFkX3N3X2luaXQoYWRldik7CisJciA9IGFtZGdwdV9nZnhf Y29tcHV0ZV9tcWRfc3dfaW5pdChhZGV2LCBzaXplb2Yoc3RydWN0IHY5X21xZCkpOwogCWlmIChy KQogCQlyZXR1cm4gcjsKIApAQCAtMTUzMCw3ICsxNDY5LDcgQEAgc3RhdGljIGludCBnZnhfdjlf MF9zd19maW5pKHZvaWQgKmhhbmRsZSkKIAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+Z2Z4Lm51bV9j b21wdXRlX3JpbmdzOyBpKyspCiAJCWFtZGdwdV9yaW5nX2ZpbmkoJmFkZXYtPmdmeC5jb21wdXRl X3JpbmdbaV0pOwogCi0JZ2Z4X3Y5XzBfY29tcHV0ZV9tcWRfc3dfZmluaShhZGV2KTsKKwlhbWRn cHVfZ2Z4X2NvbXB1dGVfbXFkX3N3X2ZpbmkoYWRldik7CiAJYW1kZ3B1X2dmeF9raXFfZnJlZV9y aW5nKCZhZGV2LT5nZngua2lxLnJpbmcsICZhZGV2LT5nZngua2lxLmlycSk7CiAJYW1kZ3B1X2dm eF9raXFfZmluaShhZGV2KTsKIAotLSAKMi41LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vYW1kLWdmeAo=