From: Monk Liu Subject: [PATCH 1/5] drm/amdgpu:implement new gpu recover(v2) Date: Tue, 24 Oct 2017 16:42:10 +0800 Message-ID: <1508834534-16471-1-git-send-email-Monk.Liu@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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: Monk Liu MSxuZXcgaW1wbGUgbmFtZXMgYW1kZ3B1X2dwdV9yZWNvdmVyIHdoaWNoIGdpdmVzIG1vcmUgaGlu dApvbiB3aGF0IGl0IGRvZXMgY29tcGFyZWQgd2l0aCBncHVfcmVzZXQKCjIsZ3B1X3JlY292ZXIg dW5pZnkgYmFyZS1tZXRhbCBhbmQgU1ItSU9WLCBvbmx5IHRoZSByZXNldCBwYXJ0CmlzIGltcGxl bWVudGVkIGRpZmZlcmVudGx5CgozLGdwdV9yZWNvdmVyIHdpbGwgaW5jcmVhc2UgaGFuZyBqb2Ig a2FybWEgYW5kIGl0cyBjb250ZXh0IGd1aWx0eQppZiBleGNlZWRzIGxpbWl0LCB3aGljaCB3aWxs IGJlIGNhbmNlbGVkIGluIHJ1bl9qb2IoKSByb3V0aW5lIG9mCmdwdSBzY2hlZHVsZXIgd2l0aCBh biBlcnJvciAiLUVDQU5DRUxFRCIgc2V0LgoKNCxncHVfcmVjb3ZlciBrbm93cyBpZiB0aGlzIHJl c2V0IGNvbWVzIHdpdGggVlJBTSBsb3N0IG9yIG5vdCBhbmQKYWxsIGpvYnMgd2lsbCBiZSBjYW5j ZWxlZCBpbiBydW5fam9iKCkgaW4gc2NoZWQgcmVjb3ZlcnkgaWYgVlJBTSBsb3N0IGhpdC4KCnYy Ogptb3ZlIGdwdV9zY2hlZHVsZXIuYyBjaGFuZ2UgaW50byBhbm90aGVyIHBhdGNoCmRvIFZSQU1f UkVDT1ZFUlkgaWYgVlJBTV9MT1NUIGZsYWcgYml0IHNldCBhZnRlciByZXNldAoKQ2hhbmdlLUlk OiBJNDc5ODE0YTg2OGE0NWM0NTk5NzI2MmUyZDVkZjQ5NTAwNmFjNWIzNwpTaWduZWQtb2ZmLWJ5 OiBNb25rIExpdSA8TW9uay5MaXVAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHUuaCAgICAgICAgfCAgIDQgKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X2RldmljZS5jIHwgMjUzICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBkcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfam9iLmMgICAgfCAgMTggKy0KIDMgZmlsZXMg Y2hhbmdlZCwgMjczIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHUuaAppbmRleCBiYTFhYjk3Li4wMDM2NjhmIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHUuaApAQCAtMTc4LDYgKzE3OCwxMCBAQCBleHRlcm4gaW50IGFtZGdwdV9j aWtfc3VwcG9ydDsKICNkZWZpbmUgQ0lLX0NVUlNPUl9XSURUSCAxMjgKICNkZWZpbmUgQ0lLX0NV UlNPUl9IRUlHSFQgMTI4CiAKKy8qIEdQVSBSRVNFVCBmbGFncyAqLworI2RlZmluZSBBTURHUFVf UkVTRVRfSU5GT19WUkFNX0xPU1QgICgxIDw8IDApCisjZGVmaW5lIEFNREdQVV9SRVNFVF9JTkZP X0ZVTExSRVNFVCAgKDEgPDwgMSkKKwogc3RydWN0IGFtZGdwdV9kZXZpY2U7CiBzdHJ1Y3QgYW1k Z3B1X2liOwogc3RydWN0IGFtZGdwdV9jc19wYXJzZXI7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfZGV2aWNlLmMKaW5kZXggYTA3NTQ0ZC4uMWYxYjkyZSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYwpAQCAtMzExNiw2ICszMTE2LDI1OSBA QCBpbnQgYW1kZ3B1X2dwdV9yZXNldChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlyZXR1 cm4gcjsKIH0KIAorc3RhdGljIGludCBhbWRncHVfcmVzZXQoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYsIHVpbnQ2NF90KiByZXNldF9mbGFncykKK3sKKwlpbnQgcjsKKwlib29sIG5lZWRfZnVs bF9yZXNldCwgdnJhbV9sb3N0ID0gMDsKKworCW5lZWRfZnVsbF9yZXNldCA9IGFtZGdwdV9uZWVk X2Z1bGxfcmVzZXQoYWRldik7CisKKwlpZiAoIW5lZWRfZnVsbF9yZXNldCkgeworCQlhbWRncHVf cHJlX3NvZnRfcmVzZXQoYWRldik7CisJCXIgPSBhbWRncHVfc29mdF9yZXNldChhZGV2KTsKKwkJ YW1kZ3B1X3Bvc3Rfc29mdF9yZXNldChhZGV2KTsKKwkJaWYgKHIgfHwgYW1kZ3B1X2NoZWNrX3Nv ZnRfcmVzZXQoYWRldikpIHsKKwkJCURSTV9JTkZPKCJzb2Z0IHJlc2V0IGZhaWxlZCwgd2lsbCBm YWxsYmFjayB0byBmdWxsIHJlc2V0IVxuIik7CisJCQluZWVkX2Z1bGxfcmVzZXQgPSB0cnVlOwor CQl9CisKKwl9CisKKwlpZiAobmVlZF9mdWxsX3Jlc2V0KSB7CisJCXIgPSBhbWRncHVfc3VzcGVu ZChhZGV2KTsKKworcmV0cnk6CisJCWFtZGdwdV9hdG9tYmlvc19zY3JhdGNoX3JlZ3Nfc2F2ZShh ZGV2KTsKKwkJciA9IGFtZGdwdV9hc2ljX3Jlc2V0KGFkZXYpOworCQlhbWRncHVfYXRvbWJpb3Nf c2NyYXRjaF9yZWdzX3Jlc3RvcmUoYWRldik7CisJCS8qIHBvc3QgY2FyZCAqLworCQlhbWRncHVf YXRvbV9hc2ljX2luaXQoYWRldi0+bW9kZV9pbmZvLmF0b21fY29udGV4dCk7CisKKwkJaWYgKCFy KSB7CisJCQlkZXZfaW5mbyhhZGV2LT5kZXYsICJHUFUgcmVzZXQgc3VjY2VlZGVkLCB0cnlpbmcg dG8gcmVzdW1lXG4iKTsKKwkJCXIgPSBhbWRncHVfcmVzdW1lX3BoYXNlMShhZGV2KTsKKwkJCWlm IChyKQorCQkJCWdvdG8gb3V0OworCisJCQl2cmFtX2xvc3QgPSBhbWRncHVfY2hlY2tfdnJhbV9s b3N0KGFkZXYpOworCQkJaWYgKHZyYW1fbG9zdCkgeworCQkJCURSTV9FUlJPUigiVlJBTSBpcyBs b3N0IVxuIik7CisJCQkJYXRvbWljX2luYygmYWRldi0+dnJhbV9sb3N0X2NvdW50ZXIpOworCQkJ fQorCisJCQlyID0gYW1kZ3B1X3R0bV9yZWNvdmVyX2dhcnQoYWRldik7CisJCQlpZiAocikKKwkJ CQlnb3RvIG91dDsKKworCQkJciA9IGFtZGdwdV9yZXN1bWVfcGhhc2UyKGFkZXYpOworCQkJaWYg KHIpCisJCQkJZ290byBvdXQ7CisKKwkJCWlmICh2cmFtX2xvc3QpCisJCQkJYW1kZ3B1X2ZpbGxf cmVzZXRfbWFnaWMoYWRldik7CisJCX0KKwl9CisKK291dDoKKwlpZiAoIXIpIHsKKwkJYW1kZ3B1 X2lycV9ncHVfcmVzZXRfcmVzdW1lX2hlbHBlcihhZGV2KTsKKwkJciA9IGFtZGdwdV9pYl9yaW5n X3Rlc3RzKGFkZXYpOworCQlpZiAocikgeworCQkJZGV2X2VycihhZGV2LT5kZXYsICJpYiByaW5n IHRlc3QgZmFpbGVkICglZCkuXG4iLCByKTsKKwkJCXIgPSBhbWRncHVfc3VzcGVuZChhZGV2KTsK KwkJCW5lZWRfZnVsbF9yZXNldCA9IHRydWU7CisJCQlnb3RvIHJldHJ5OworCQl9CisJfQorCisJ aWYgKHJlc2V0X2ZsYWdzKSB7CisJCWlmICh2cmFtX2xvc3QpCisJCQkoKnJlc2V0X2ZsYWdzKSB8 PSBBTURHUFVfUkVTRVRfSU5GT19WUkFNX0xPU1Q7CisKKwkJaWYgKG5lZWRfZnVsbF9yZXNldCkK KwkJCSgqcmVzZXRfZmxhZ3MpIHw9IEFNREdQVV9SRVNFVF9JTkZPX0ZVTExSRVNFVDsKKwl9CisK KwlyZXR1cm4gcjsKK30KKworc3RhdGljIGludCBhbWRncHVfcmVzZXRfc3Jpb3Yoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYsIHVpbnQ2NF90ICpyZXNldF9mbGFncywgYm9vbCBmcm9tX2h5cGVy dmlzb3IpCit7CisJaW50IHI7CisKKwlpZiAoZnJvbV9oeXBlcnZpc29yKQorCQlyID0gYW1kZ3B1 X3ZpcnRfcmVxdWVzdF9mdWxsX2dwdShhZGV2LCB0cnVlKTsKKwllbHNlCisJCXIgPSBhbWRncHVf dmlydF9yZXNldF9ncHUoYWRldik7CisJaWYgKHIpCisJCXJldHVybiByOworCisJLyogUmVzdW1l IElQIHByaW9yIHRvIFNNQyAqLworCXIgPSBhbWRncHVfc3Jpb3ZfcmVpbml0X2Vhcmx5KGFkZXYp OworCWlmIChyKQorCQlnb3RvIGVycm9yOworCisJLyogd2UgbmVlZCByZWNvdmVyIGdhcnQgcHJp b3IgdG8gcnVuIFNNQy9DUC9TRE1BIHJlc3VtZSAqLworCWFtZGdwdV90dG1fcmVjb3Zlcl9nYXJ0 KGFkZXYpOworCisJLyogbm93IHdlIGFyZSBva2F5IHRvIHJlc3VtZSBTTUMvQ1AvU0RNQSAqLwor CXIgPSBhbWRncHVfc3Jpb3ZfcmVpbml0X2xhdGUoYWRldik7CisJaWYgKHIpCisJCWdvdG8gZXJy b3I7CisKKwlhbWRncHVfaXJxX2dwdV9yZXNldF9yZXN1bWVfaGVscGVyKGFkZXYpOworCXIgPSBh bWRncHVfaWJfcmluZ190ZXN0cyhhZGV2KTsKKwlpZiAocikKKwkJZGV2X2VycihhZGV2LT5kZXYs ICJbR1BVX1JFU0VUXSBpYiByaW5nIHRlc3QgZmFpbGVkICglZCkuXG4iLCByKTsKKworZXJyb3I6 CisJLyogcmVsZWFzZSBmdWxsIGNvbnRyb2wgb2YgR1BVIGFmdGVyIGliIHRlc3QgKi8KKwlhbWRn cHVfdmlydF9yZWxlYXNlX2Z1bGxfZ3B1KGFkZXYsIHRydWUpOworCisJaWYgKHJlc2V0X2ZsYWdz KSB7CisJCS8qIHdpbGwgZ2V0IHZyYW1fbG9zdCBmcm9tIEdJTSBpbiBmdXR1cmUsIG5vdyBhbGwK KwkJICogcmVzZXQgcmVxdWVzdCBjb25zaWRlcmVkIFZSQU0gTE9TVAorCQkgKi8KKwkJKCpyZXNl dF9mbGFncykgfD0gfkFNREdQVV9SRVNFVF9JTkZPX1ZSQU1fTE9TVDsKKwkJYXRvbWljX2luYygm YWRldi0+dnJhbV9sb3N0X2NvdW50ZXIpOworCisJCS8qIFZGIEZMUiBvciBob3RsaW5rIHJlc2V0 IGlzIGFsd2F5cyBmdWxsLXJlc2V0ICovCisJCSgqcmVzZXRfZmxhZ3MpIHw9IEFNREdQVV9SRVNF VF9JTkZPX0ZVTExSRVNFVDsKKwl9CisKKwlyZXR1cm4gcjsKK30KKworaW50IGFtZGdwdV9ncHVf cmVjb3ZlcihzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgc3RydWN0IGFtZGdwdV9qb2IgKmpv YikKK3sKKwlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUgPSBOVUxMOworCXVpbnQ2NF90 IHJlc2V0X2ZsYWdzID0gMDsKKwlpbnQgaSwgciwgcmVzY2hlZDsKKworCWlmICghYW1kZ3B1X2No ZWNrX3NvZnRfcmVzZXQoYWRldikpIHsKKwkJRFJNX0lORk8oIk5vIGhhcmR3YXJlIGhhbmcgZGV0 ZWN0ZWQuIERpZCBzb21lIGJsb2NrcyBzdGFsbD9cbiIpOworCQlyZXR1cm4gMDsKKwl9CisKKwlk ZXZfaW5mbyhhZGV2LT5kZXYsICJHUFUgcmVzZXQgYmVnaW4hXG4iKTsKKworCW11dGV4X2xvY2so JmFkZXYtPnZpcnQubG9ja19yZXNldCk7CisJYXRvbWljX2luYygmYWRldi0+Z3B1X3Jlc2V0X2Nv dW50ZXIpOworCWFkZXYtPmluX3NyaW92X3Jlc2V0ID0gMTsKKworCS8qIGJsb2NrIFRUTSAqLwor CXJlc2NoZWQgPSB0dG1fYm9fbG9ja19kZWxheWVkX3dvcmtxdWV1ZSgmYWRldi0+bW1hbi5iZGV2 KTsKKwkvKiBzdG9yZSBtb2Rlc2V0dGluZyAqLworCWlmIChhbWRncHVfZGV2aWNlX2hhc19kY19z dXBwb3J0KGFkZXYpKQorCQlzdGF0ZSA9IGRybV9hdG9taWNfaGVscGVyX3N1c3BlbmQoYWRldi0+ ZGRldik7CisKKwkvKiBibG9jayBzY2hlZHVsZXIgKi8KKwlmb3IgKGkgPSAwOyBpIDwgQU1ER1BV X01BWF9SSU5HUzsgKytpKSB7CisJCXN0cnVjdCBhbWRncHVfcmluZyAqcmluZyA9IGFkZXYtPnJp bmdzW2ldOworCisJCWlmICghcmluZyB8fCAhcmluZy0+c2NoZWQudGhyZWFkKQorCQkJY29udGlu dWU7CisKKwkJLyogb25seSBmb2N1cyBvbiB0aGUgcmluZyBoaXQgdGltZW91dCBpZiAmam9iIG5v dCBOVUxMICovCisJCWlmIChqb2IgJiYgam9iLT5yaW5nLT5pZHggIT0gaSkKKwkJCWNvbnRpbnVl OworCisJCWt0aHJlYWRfcGFyayhyaW5nLT5zY2hlZC50aHJlYWQpOworCQlhbWRfc2NoZWRfaHdf am9iX3Jlc2V0KCZyaW5nLT5zY2hlZCwgJmpvYi0+YmFzZSk7CisKKwkJLyogYWZ0ZXIgYWxsIGh3 IGpvYnMgYXJlIHJlc2V0LCBodyBmZW5jZSBpcyBtZWFuaW5nbGVzcywgc28gZm9yY2VfY29tcGxl dGlvbiAqLworCQlhbWRncHVfZmVuY2VfZHJpdmVyX2ZvcmNlX2NvbXBsZXRpb24ocmluZyk7CisJ fQorCisJaWYgKGFtZGdwdV9zcmlvdl92ZihhZGV2KSkKKwkJciA9IGFtZGdwdV9yZXNldF9zcmlv dihhZGV2LCAmcmVzZXRfZmxhZ3MsIGpvYiA/IGZhbHNlIDogdHJ1ZSk7CisJZWxzZQorCQlyID0g YW1kZ3B1X3Jlc2V0KGFkZXYsICZyZXNldF9mbGFncyk7CisKKwlpZiAoIXIpIHsKKwkJaWYgKChy ZXNldF9mbGFncyAmIEFNREdQVV9SRVNFVF9JTkZPX1ZSQU1fTE9TVCkgfHwKKwkJCSgocmVzZXRf ZmxhZ3MgJiBBTURHUFVfUkVTRVRfSU5GT19GVUxMUkVTRVQpICYmICEoYWRldi0+ZmxhZ3MgJiBB TURfSVNfQVBVKSkpIHsKKwkJCXN0cnVjdCBhbWRncHVfcmluZyAqcmluZyA9IGFkZXYtPm1tYW4u YnVmZmVyX2Z1bmNzX3Jpbmc7CisJCQlzdHJ1Y3QgYW1kZ3B1X2JvICpibywgKnRtcDsKKwkJCXN0 cnVjdCBkbWFfZmVuY2UgKmZlbmNlID0gTlVMTCwgKm5leHQgPSBOVUxMOworCisJCQlEUk1fSU5G TygicmVjb3ZlciB2cmFtIGJvIGZyb20gc2hhZG93XG4iKTsKKwkJCW11dGV4X2xvY2soJmFkZXYt PnNoYWRvd19saXN0X2xvY2spOworCQkJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKGJvLCB0bXAs ICZhZGV2LT5zaGFkb3dfbGlzdCwgc2hhZG93X2xpc3QpIHsKKwkJCQluZXh0ID0gTlVMTDsKKwkJ CQlhbWRncHVfcmVjb3Zlcl92cmFtX2Zyb21fc2hhZG93KGFkZXYsIHJpbmcsIGJvLCAmbmV4dCk7 CisJCQkJaWYgKGZlbmNlKSB7CisJCQkJCXIgPSBkbWFfZmVuY2Vfd2FpdChmZW5jZSwgZmFsc2Up OworCQkJCQlpZiAocikgeworCQkJCQkJV0FSTihyLCAicmVjb3ZlcnkgZnJvbSBzaGFkb3cgaXNu J3QgY29tcGxldGVkXG4iKTsKKwkJCQkJCWJyZWFrOworCQkJCQl9CisJCQkJfQorCisJCQkJZG1h X2ZlbmNlX3B1dChmZW5jZSk7CisJCQkJZmVuY2UgPSBuZXh0OworCQkJfQorCQkJbXV0ZXhfdW5s b2NrKCZhZGV2LT5zaGFkb3dfbGlzdF9sb2NrKTsKKwkJCWlmIChmZW5jZSkgeworCQkJCXIgPSBk bWFfZmVuY2Vfd2FpdChmZW5jZSwgZmFsc2UpOworCQkJCWlmIChyKQorCQkJCQlXQVJOKHIsICJy ZWNvdmVyeSBmcm9tIHNoYWRvdyBpc24ndCBjb21wbGV0ZWRcbiIpOworCQkJfQorCQkJZG1hX2Zl bmNlX3B1dChmZW5jZSk7CisJCX0KKworCQlmb3IgKGkgPSAwOyBpIDwgQU1ER1BVX01BWF9SSU5H UzsgKytpKSB7CisJCQlzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcgPSBhZGV2LT5yaW5nc1tpXTsK KworCQkJaWYgKCFyaW5nIHx8ICFyaW5nLT5zY2hlZC50aHJlYWQpCisJCQkJY29udGludWU7CisK KwkJCS8qIG9ubHkgZm9jdXMgb24gdGhlIHJpbmcgaGl0IHRpbWVvdXQgaWYgJmpvYiBub3QgTlVM TCAqLworCQkJaWYgKGpvYiAmJiBqb2ItPnJpbmctPmlkeCAhPSBpKQorCQkJCWNvbnRpbnVlOwor CisJCQlhbWRfc2NoZWRfam9iX3JlY292ZXJ5KCZyaW5nLT5zY2hlZCk7CisJCQlrdGhyZWFkX3Vu cGFyayhyaW5nLT5zY2hlZC50aHJlYWQpOworCQl9CisJfSBlbHNlIHsKKwkJZm9yIChpID0gMDsg aSA8IEFNREdQVV9NQVhfUklOR1M7ICsraSkgeworCQkJc3RydWN0IGFtZGdwdV9yaW5nICpyaW5n ID0gYWRldi0+cmluZ3NbaV07CisKKwkJCWlmICghcmluZyB8fCAhcmluZy0+c2NoZWQudGhyZWFk KQorCQkJCWNvbnRpbnVlOworCisJCQkvKiBvbmx5IGZvY3VzIG9uIHRoZSByaW5nIGhpdCB0aW1l b3V0IGlmICZqb2Igbm90IE5VTEwgKi8KKwkJCWlmIChqb2IgJiYgam9iLT5yaW5nLT5pZHggIT0g aSkKKwkJCQljb250aW51ZTsKKworCQkJa3RocmVhZF91bnBhcmsoYWRldi0+cmluZ3NbaV0tPnNj aGVkLnRocmVhZCk7CisJCX0KKwl9CisKKwlpZiAoYW1kZ3B1X2RldmljZV9oYXNfZGNfc3VwcG9y dChhZGV2KSkgeworCQlpZiAoZHJtX2F0b21pY19oZWxwZXJfcmVzdW1lKGFkZXYtPmRkZXYsIHN0 YXRlKSkKKwkJCWRldl9pbmZvKGFkZXYtPmRldiwgImRybSByZXN1bWUgZmFpbGVkOiVkXG4iLCBy KTsKKwkJYW1kZ3B1X2RtX2Rpc3BsYXlfcmVzdW1lKGFkZXYpOworCX0gZWxzZSB7CisJCWRybV9o ZWxwZXJfcmVzdW1lX2ZvcmNlX21vZGUoYWRldi0+ZGRldik7CisJfQorCisJdHRtX2JvX3VubG9j a19kZWxheWVkX3dvcmtxdWV1ZSgmYWRldi0+bW1hbi5iZGV2LCByZXNjaGVkKTsKKworCWlmIChy KSB7CisJCS8qIGJhZCBuZXdzLCBob3cgdG8gdGVsbCBpdCB0byB1c2Vyc3BhY2UgPyAqLworCQlk ZXZfaW5mbyhhZGV2LT5kZXYsICJHUFUgcmVzZXQoJWQpIGZhaWxlZFxuIiwgYXRvbWljX3JlYWQo JmFkZXYtPmdwdV9yZXNldF9jb3VudGVyKSk7CisJCWFtZGdwdV92Zl9lcnJvcl9wdXQoYWRldiwg QU1ER0lNX0VSUk9SX1ZGX0dQVV9SRVNFVF9GQUlMLCAwLCByKTsKKwl9IGVsc2UgeworCQlkZXZf aW5mbyhhZGV2LT5kZXYsICJHUFUgcmVzZXQoJWQpIHN1Y2Nlc3NlZCFcbiIsYXRvbWljX3JlYWQo JmFkZXYtPmdwdV9yZXNldF9jb3VudGVyKSk7CisJfQorCisJYW1kZ3B1X3ZmX2Vycm9yX3RyYW5z X2FsbChhZGV2KTsKKwlhZGV2LT5pbl9zcmlvdl9yZXNldCA9IDA7CisJbXV0ZXhfdW5sb2NrKCZh ZGV2LT52aXJ0LmxvY2tfcmVzZXQpOworCXJldHVybiByOworfQorCiB2b2lkIGFtZGdwdV9nZXRf cGNpZV9pbmZvKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewogCXUzMiBtYXNrOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2pvYi5jIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2pvYi5jCmluZGV4IGE1OGUzYzUuLmEwOTRhOTIg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9qb2IuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfam9iLmMKQEAgLTE3Nyw2ICsxNzcs MTkgQEAgc3RhdGljIHN0cnVjdCBkbWFfZmVuY2UgKmFtZGdwdV9qb2JfZGVwZW5kZW5jeShzdHJ1 Y3QgYW1kX3NjaGVkX2pvYiAqc2NoZWRfam9iKQogCXJldHVybiBmZW5jZTsKIH0KIAorLyogR3Vp bHR5IGZvciBqb2JzIHdpdGggYSBndWlsdHkgdXNlciBjb250ZXh0LAorICogb3Igam9icyB3aG9z ZSBrYXJtYSBleGNlZWQgdGhlIGxpbWl0IGZyb20gYSBrZXJuZWwgY29udGV4dCwKKyAqIG9yIGpv YnMgdGhhdCBlbmNvdW50ZXJlZCBWUkFNIExPU1QgaXNzdWUKKyAqLworc3RhdGljIGJvb2wgYW1k Z3B1X2pvYl9uZWVkX2NhbmNlbGVkKHN0cnVjdCBhbWRncHVfam9iICpqb2IpIHsKKwlpZiAoam9i LT5iYXNlLnNfZW50aXR5LT5ndWlsdHkgJiYgYXRvbWljX3JlYWQoam9iLT5iYXNlLnNfZW50aXR5 LT5ndWlsdHkpID09IDEpCisJCXJldHVybiB0cnVlOworCWVsc2UgaWYgKGpvYi0+dnJhbV9sb3N0 X2NvdW50ZXIgIT0gYXRvbWljX3JlYWQoJmpvYi0+YWRldi0+dnJhbV9sb3N0X2NvdW50ZXIpKQor CQlyZXR1cm4gdHJ1ZTsKKworCXJldHVybiBmYWxzZTsKK30KKwogc3RhdGljIHN0cnVjdCBkbWFf ZmVuY2UgKmFtZGdwdV9qb2JfcnVuKHN0cnVjdCBhbWRfc2NoZWRfam9iICpzY2hlZF9qb2IpCiB7 CiAJc3RydWN0IGRtYV9mZW5jZSAqZmVuY2UgPSBOVUxMOwpAQCAtMTk0LDggKzIwNyw5IEBAIHN0 YXRpYyBzdHJ1Y3QgZG1hX2ZlbmNlICphbWRncHVfam9iX3J1bihzdHJ1Y3QgYW1kX3NjaGVkX2pv YiAqc2NoZWRfam9iKQogCUJVR19PTihhbWRncHVfc3luY19wZWVrX2ZlbmNlKCZqb2ItPnN5bmMs IE5VTEwpKTsKIAogCXRyYWNlX2FtZGdwdV9zY2hlZF9ydW5fam9iKGpvYik7Ci0JLyogc2tpcCBp YiBzY2hlZHVsZSB3aGVuIHZyYW0gaXMgbG9zdCAqLwotCWlmIChqb2ItPnZyYW1fbG9zdF9jb3Vu dGVyICE9IGF0b21pY19yZWFkKCZhZGV2LT52cmFtX2xvc3RfY291bnRlcikpIHsKKworCWlmIChh bWRncHVfam9iX25lZWRfY2FuY2VsZWQoam9iKSkgeworCQkvKiBza2lwIGliIHNjaGVkdWxlIGlm IGxvb2tzIG5lZWRlZCwgYW5kIHNldCBlcnJvciAqLwogCQlkbWFfZmVuY2Vfc2V0X2Vycm9yKCZq b2ItPmJhc2Uuc19mZW5jZS0+ZmluaXNoZWQsIC1FQ0FOQ0VMRUQpOwogCQlEUk1fRVJST1IoIlNr aXAgc2NoZWR1bGluZyBJQnMhXG4iKTsKIAl9IGVsc2UgewotLSAKMi43LjQKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0 CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=