From: Subject: [PATCH 34/81] drm/amd/display: Remove acrtc->stream Date: Tue, 25 Jul 2017 09:53:54 -0400 Message-ID: <1500990881-6100-35-git-send-email-sunpeng.li@amd.com> References: <1500990881-6100-1-git-send-email-sunpeng.li@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1500990881-6100-1-git-send-email-sunpeng.li-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: Andrey Grodzovsky RnJvbTogQW5kcmV5IEdyb2R6b3Zza3kgPEFuZHJleS5Hcm9kem92c2t5QGFtZC5jb20+CgpSZW1v dmUgYWNydGMtPnN0cmVhbSBhbmQgbW92ZSBpdCBpbnRvIGRtX2NydGNfc3RhdGUuClRoaXMgYWxs b3dzIHRvIGdldCByaWQgb2YgZG1fYXRvbWljX3N0YXRlLT5kbV9zZXQuCkFsc28gcmV1c2Ugc3Ry ZWFtcyBjcmVhdGVkIGluIGF0b21pY19jaGVjayBkdXJpbmcKY29tbWl0LgoKQ2hhbmdlLUlkOiBJ OGQ5ODY4Njk1YTNhNTMwYzU1ZTdmYTkzNGY5ZDVlYTM4MDBkZmI4YgpTaWduZWQtb2ZmLWJ5OiBB bmRyZXkgR3JvZHpvdnNreSA8QW5kcmV5Lkdyb2R6b3Zza3lAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6 IFRvbnkgQ2hlbmcgPFRvbnkuQ2hlbmdAYW1kLmNvbT4KQWNrZWQtYnk6IEhhcnJ5IFdlbnRsYW5k IDxIYXJyeS5XZW50bGFuZEBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxh eS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMgIHwgIDMzICstCiAuLi4vZHJtL2FtZC9kaXNwbGF5L2Ft ZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMuYyAgICB8IDQxMSArKysrKysrKysrKy0tLS0tLS0tLS0K IC4uLi9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5oICAgIHwgICA5 ICstCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGMuaCAgICAgICAgICAgICAgICB8 ICAgMiAtCiA0IGZpbGVzIGNoYW5nZWQsIDIzMiBpbnNlcnRpb25zKCspLCAyMjMgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9h bWRncHVfZG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1 X2RtLmMKaW5kZXggZDA2NTFiNi4uZTVhMjdhYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5jCkBAIC0xMDAsMTMgKzEwMCwxNiBAQCBz dGF0aWMgdTMyIGRtX3ZibGFua19nZXRfY291bnRlcihzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl diwgaW50IGNydGMpCiAJCXJldHVybiAwOwogCWVsc2UgewogCQlzdHJ1Y3QgYW1kZ3B1X2NydGMg KmFjcnRjID0gYWRldi0+bW9kZV9pbmZvLmNydGNzW2NydGNdOworCQlzdHJ1Y3QgZG1fY3J0Y19z dGF0ZSAqYWNydGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRlKAorCQkJCWFjcnRjLT5iYXNlLnN0 YXRlKTsKIAotCQlpZiAoTlVMTCA9PSBhY3J0Yy0+c3RyZWFtKSB7CisKKwkJaWYgKGFjcnRjX3N0 YXRlLT5zdHJlYW0gPT0gTlVMTCkgewogCQkJRFJNX0VSUk9SKCJkY19zdHJlYW0gaXMgTlVMTCBm b3IgY3J0YyAnJWQnIVxuIiwgY3J0Yyk7CiAJCQlyZXR1cm4gMDsKIAkJfQogCi0JCXJldHVybiBk Y19zdHJlYW1fZ2V0X3ZibGFua19jb3VudGVyKGFjcnRjLT5zdHJlYW0pOworCQlyZXR1cm4gZGNf c3RyZWFtX2dldF92YmxhbmtfY291bnRlcihhY3J0Y19zdGF0ZS0+c3RyZWFtKTsKIAl9CiB9CiAK QEAgLTExOSw4ICsxMjIsMTAgQEAgc3RhdGljIGludCBkbV9jcnRjX2dldF9zY2Fub3V0cG9zKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBpbnQgY3J0YywKIAkJcmV0dXJuIC1FSU5WQUw7CiAJ ZWxzZSB7CiAJCXN0cnVjdCBhbWRncHVfY3J0YyAqYWNydGMgPSBhZGV2LT5tb2RlX2luZm8uY3J0 Y3NbY3J0Y107CisJCXN0cnVjdCBkbV9jcnRjX3N0YXRlICphY3J0Y19zdGF0ZSA9IHRvX2RtX2Ny dGNfc3RhdGUoCisJCQkJCQlhY3J0Yy0+YmFzZS5zdGF0ZSk7CiAKLQkJaWYgKE5VTEwgPT0gYWNy dGMtPnN0cmVhbSkgeworCQlpZiAoYWNydGNfc3RhdGUtPnN0cmVhbSA9PSAgTlVMTCkgewogCQkJ RFJNX0VSUk9SKCJkY19zdHJlYW0gaXMgTlVMTCBmb3IgY3J0YyAnJWQnIVxuIiwgY3J0Yyk7CiAJ CQlyZXR1cm4gMDsKIAkJfQpAQCAtMTI5LDcgKzEzNCw3IEBAIHN0YXRpYyBpbnQgZG1fY3J0Y19n ZXRfc2Nhbm91dHBvcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgaW50IGNydGMsCiAJCSAq IFRPRE8gcmV3b3JrIGJhc2UgZHJpdmVyIHRvIHVzZSB2YWx1ZXMgZGlyZWN0bHkuCiAJCSAqIGZv ciBub3cgcGFyc2UgaXQgYmFjayBpbnRvIHJlZy1mb3JtYXQKIAkJICovCi0JCWRjX3N0cmVhbV9n ZXRfc2Nhbm91dHBvcyhhY3J0Yy0+c3RyZWFtLAorCQlkY19zdHJlYW1fZ2V0X3NjYW5vdXRwb3Mo YWNydGNfc3RhdGUtPnN0cmVhbSwKIAkJCQkJICZ2X2JsYW5rX3N0YXJ0LAogCQkJCQkgJnZfYmxh bmtfZW5kLAogCQkJCQkgJmhfcG9zaXRpb24sCkBAIC02NTIsMjIgKzY1NywxMiBAQCBkbV9hdG9t aWNfc3RhdGVfYWxsb2Moc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHZvaWQgZG1fYXRvbWljX3N0 YXRlX2NsZWFyKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKIAlzdHJ1Y3QgZG1f YXRvbWljX3N0YXRlICpkbV9zdGF0ZSA9IHRvX2RtX2F0b21pY19zdGF0ZShzdGF0ZSk7Ci0JaW50 IGksIGo7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgZG1fc3RhdGUtPnNldF9jb3VudDsgaSsrKSB7Ci0J CWZvciAoaiA9IDA7IGogPCBkbV9zdGF0ZS0+c2V0W2ldLnN1cmZhY2VfY291bnQ7IGorKykgewot CQkJZGNfc3VyZmFjZV9yZWxlYXNlKGRtX3N0YXRlLT5zZXRbaV0uc3VyZmFjZXNbal0pOwotCQkJ ZG1fc3RhdGUtPnNldFtpXS5zdXJmYWNlc1tqXSA9IE5VTEw7Ci0JCX0KIAotCQlkY19zdHJlYW1f cmVsZWFzZShkbV9zdGF0ZS0+c2V0W2ldLnN0cmVhbSk7Ci0JCWRtX3N0YXRlLT5zZXRbaV0uc3Ry ZWFtID0gTlVMTDsKKwlpZiAoZG1fc3RhdGUtPmNvbnRleHQpIHsKKwkJZGNfcmVzb3VyY2VfdmFs aWRhdGVfY3R4X2Rlc3RydWN0KGRtX3N0YXRlLT5jb250ZXh0KTsKKwkJZG1fZnJlZShkbV9zdGF0 ZS0+Y29udGV4dCk7CisJCWRtX3N0YXRlLT5jb250ZXh0ID0gTlVMTDsKIAl9Ci0JZG1fc3RhdGUt PnNldF9jb3VudCA9IDA7Ci0KLQlkY19yZXNvdXJjZV92YWxpZGF0ZV9jdHhfZGVzdHJ1Y3QoZG1f c3RhdGUtPmNvbnRleHQpOwotCWRtX2ZyZWUoZG1fc3RhdGUtPmNvbnRleHQpOwotCWRtX3N0YXRl LT5jb250ZXh0ID0gTlVMTDsKIAogCWRybV9hdG9taWNfc3RhdGVfZGVmYXVsdF9jbGVhcihzdGF0 ZSk7CiB9CkBAIC02NzYsNyArNjcxLDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fbW9kZV9j b25maWdfZnVuY3MgYW1kZ3B1X2RtX21vZGVfZnVuY3MgPSB7CiAJLmZiX2NyZWF0ZSA9IGFtZGdw dV91c2VyX2ZyYW1lYnVmZmVyX2NyZWF0ZSwKIAkub3V0cHV0X3BvbGxfY2hhbmdlZCA9IGFtZGdw dV9vdXRwdXRfcG9sbF9jaGFuZ2VkLAogCS5hdG9taWNfY2hlY2sgPSBhbWRncHVfZG1fYXRvbWlj X2NoZWNrLAotCS5hdG9taWNfY29tbWl0ID0gZHJtX2F0b21pY19oZWxwZXJfY29tbWl0LAorCS5h dG9taWNfY29tbWl0ID0gYW1kZ3B1X2RtX2F0b21pY19jb21taXQsCiAJLmF0b21pY19zdGF0ZV9h bGxvYyA9IGRtX2F0b21pY19zdGF0ZV9hbGxvYywKIAkuYXRvbWljX3N0YXRlX2NsZWFyID0gZG1f YXRvbWljX3N0YXRlX2NsZWFyLAogfTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv ZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX3R5cGVzLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5jCmluZGV4IDJhNWM3YjEuLjc1MGUw OTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1k Z3B1X2RtX3R5cGVzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9k bS9hbWRncHVfZG1fdHlwZXMuYwpAQCAtODcsNiArODcsNyBAQCBzdGF0aWMgdm9pZCBkbV9zZXRf Y3Vyc29yKAogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9ICZhbWRncHVfY3J0Yy0+YmFzZTsKIAlp bnQgeCwgeTsKIAlpbnQgeG9yaWdpbiA9IDAsIHlvcmlnaW4gPSAwOworCXN0cnVjdCBkbV9jcnRj X3N0YXRlICphY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpOwogCiAJ YW1kZ3B1X2NydGMtPmN1cnNvcl93aWR0aCA9IHdpZHRoOwogCWFtZGdwdV9jcnRjLT5jdXJzb3Jf aGVpZ2h0ID0gaGVpZ2h0OwpAQCAtMTI1LDEzICsxMjYsMTMgQEAgc3RhdGljIHZvaWQgZG1fc2V0 X2N1cnNvcigKIAlwb3NpdGlvbi55X2hvdHNwb3QgPSB5b3JpZ2luOwogCiAJaWYgKCFkY19zdHJl YW1fc2V0X2N1cnNvcl9hdHRyaWJ1dGVzKAotCQkJCWFtZGdwdV9jcnRjLT5zdHJlYW0sCisJCQkJ YWNydGNfc3RhdGUtPnN0cmVhbSwKIAkJCQkmYXR0cmlidXRlcykpIHsKIAkJRFJNX0VSUk9SKCJE QyBmYWlsZWQgdG8gc2V0IGN1cnNvciBhdHRyaWJ1dGVzXG4iKTsKIAl9CiAKIAlpZiAoIWRjX3N0 cmVhbV9zZXRfY3Vyc29yX3Bvc2l0aW9uKAotCQkJCWFtZGdwdV9jcnRjLT5zdHJlYW0sCisJCQkJ YWNydGNfc3RhdGUtPnN0cmVhbSwKIAkJCQkmcG9zaXRpb24pKSB7CiAJCURSTV9FUlJPUigiREMg ZmFpbGVkIHRvIHNldCBjdXJzb3IgcG9zaXRpb25cbiIpOwogCX0KQEAgLTE0NCw2ICsxNDUsNyBA QCBzdGF0aWMgaW50IGRtX2NydGNfY3Vyc29yX3NldCgKIAl1aW50MzJfdCBoZWlnaHQpCiB7CiAJ c3RydWN0IGRjX2N1cnNvcl9wb3NpdGlvbiBwb3NpdGlvbjsKKwlzdHJ1Y3QgZG1fY3J0Y19zdGF0 ZSAqYWNydGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKIAogCWludCBy ZXQ7CiAKQEAgLTE2MywxMCArMTY1LDEwIEBAIHN0YXRpYyBpbnQgZG1fY3J0Y19jdXJzb3Jfc2V0 KAogCQlwb3NpdGlvbi54ID0gMDsKIAkJcG9zaXRpb24ueSA9IDA7CiAKLQkJaWYgKGFtZGdwdV9j cnRjLT5zdHJlYW0pIHsKKwkJaWYgKGFjcnRjX3N0YXRlLT5zdHJlYW0pIHsKIAkJCS8qc2V0IGN1 cnNvciB2aXNpYmxlIGZhbHNlKi8KIAkJCWRjX3N0cmVhbV9zZXRfY3Vyc29yX3Bvc2l0aW9uKAot CQkJCWFtZGdwdV9jcnRjLT5zdHJlYW0sCisJCQkJYWNydGNfc3RhdGUtPnN0cmVhbSwKIAkJCQkm cG9zaXRpb24pOwogCQl9CiAJCWdvdG8gcmVsZWFzZTsKQEAgLTE5Nyw2ICsxOTksNyBAQCBzdGF0 aWMgaW50IGRtX2NydGNfY3Vyc29yX21vdmUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXN0cnVj dCBhbWRncHVfY3J0YyAqYW1kZ3B1X2NydGMgPSB0b19hbWRncHVfY3J0YyhjcnRjKTsKIAlpbnQg eG9yaWdpbiA9IDAsIHlvcmlnaW4gPSAwOwogCXN0cnVjdCBkY19jdXJzb3JfcG9zaXRpb24gcG9z aXRpb247CisJc3RydWN0IGRtX2NydGNfc3RhdGUgKmFjcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19z dGF0ZShjcnRjLT5zdGF0ZSk7CiAKIAlhbWRncHVfY3J0Yy0+Y3Vyc29yX3ggPSB4OwogCWFtZGdw dV9jcnRjLT5jdXJzb3JfeSA9IHk7CkBAIC0yMzQsOSArMjM3LDkgQEAgc3RhdGljIGludCBkbV9j cnRjX2N1cnNvcl9tb3ZlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlwb3NpdGlvbi54X2hvdHNw b3QgPSB4b3JpZ2luOwogCXBvc2l0aW9uLnlfaG90c3BvdCA9IHlvcmlnaW47CiAKLQlpZiAoYW1k Z3B1X2NydGMtPnN0cmVhbSkgeworCWlmIChhY3J0Y19zdGF0ZS0+c3RyZWFtKSB7CiAJCWlmICgh ZGNfc3RyZWFtX3NldF9jdXJzb3JfcG9zaXRpb24oCi0JCQkJCWFtZGdwdV9jcnRjLT5zdHJlYW0s CisJCQkJCWFjcnRjX3N0YXRlLT5zdHJlYW0sCiAJCQkJCSZwb3NpdGlvbikpIHsKIAkJCURSTV9F UlJPUigiREMgZmFpbGVkIHRvIHNldCBjdXJzb3IgcG9zaXRpb25cbiIpOwogCQkJcmV0dXJuIC1F SU5WQUw7CkBAIC02MTIsNyArNjE1LDggQEAgc3RhdGljIHZvaWQgYWRkX3N1cmZhY2Uoc3RydWN0 IGRjICpkYywKIHsKIAlzdHJ1Y3QgZGNfc3VyZmFjZSAqZGNfc3VyZmFjZTsKIAlzdHJ1Y3QgYW1k Z3B1X2NydGMgKmFjcnRjID0gdG9fYW1kZ3B1X2NydGMoY3J0Yyk7Ci0JY29uc3Qgc3RydWN0IGRj X3N0cmVhbSAqZGNfc3RyZWFtID0gYWNydGMtPnN0cmVhbTsKKwlzdHJ1Y3QgZG1fY3J0Y19zdGF0 ZSAqYWNydGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKKwljb25zdCBz dHJ1Y3QgZGNfc3RyZWFtICpkY19zdHJlYW0gPSBhY3J0Y19zdGF0ZS0+c3RyZWFtOwogCXVuc2ln bmVkIGxvbmcgZmxhZ3M7CiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgmY3J0Yy0+ZGV2LT5ldmVudF9s b2NrLCBmbGFncyk7CkBAIC0xMDM4LDExICsxMDQyLDEwIEBAIHN0YXRpYyB2b2lkIGRtX2NydGNf ZGVzdHJveV9zdGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiB7CiAJc3RydWN0IGRtX2NydGNf c3RhdGUgKmN1ciA9IHRvX2RtX2NydGNfc3RhdGUoc3RhdGUpOwogCi0JaWYgKGN1ci0+ZGNfc3Ry ZWFtKSB7Ci0JCS8qIFRPRE8gRGVzdHJveSBkY19zdHJlYW0gb2JqZWN0cyBhcmUgc3RyZWFtIG9i amVjdCBpcyBmbGF0dGVuZWQgKi8KLQkJZG1fZnJlZShjdXItPmRjX3N0cmVhbSk7Ci0JfSBlbHNl Ci0JCVdBUk5fT04oMSk7CisJLyogVE9ETyBEZXN0cm95IGRjX3N0cmVhbSBvYmplY3RzIGFyZSBz dHJlYW0gb2JqZWN0IGlzIGZsYXR0ZW5lZCAqLworCWlmIChjdXItPnN0cmVhbSkKKwkJZGNfc3Ry ZWFtX3JlbGVhc2UoY3VyLT5zdHJlYW0pOworCiAKIAlfX2RybV9hdG9taWNfaGVscGVyX2NydGNf ZGVzdHJveV9zdGF0ZShzdGF0ZSk7CiAKQEAgLTEwNjEsNDAgKzEwNjQsMjkgQEAgc3RhdGljIHZv aWQgZG1fY3J0Y19yZXNldF9zdGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJaWYgKFdBUk5f T04oIXN0YXRlKSkKIAkJcmV0dXJuOwogCi0KIAljcnRjLT5zdGF0ZSA9ICZzdGF0ZS0+YmFzZTsK IAljcnRjLT5zdGF0ZS0+Y3J0YyA9IGNydGM7CiAKLQlzdGF0ZS0+ZGNfc3RyZWFtID0gZG1fYWxs b2Moc2l6ZW9mKCpzdGF0ZS0+ZGNfc3RyZWFtKSk7Ci0JV0FSTl9PTighc3RhdGUtPmRjX3N0cmVh bSk7CiB9CiAKIHN0YXRpYyBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKgogZG1fY3J0Y19kdXBsaWNh dGVfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogewogCXN0cnVjdCBkbV9jcnRjX3N0YXRl ICpzdGF0ZSwgKmN1cjsKLQlzdHJ1Y3QgZGNfc3RyZWFtICpkY19zdHJlYW07Ci0KLQlpZiAoV0FS Tl9PTighY3J0Yy0+c3RhdGUpKQotCQlyZXR1cm4gTlVMTDsKIAogCWN1ciA9IHRvX2RtX2NydGNf c3RhdGUoY3J0Yy0+c3RhdGUpOwotCWlmIChXQVJOX09OKCFjdXItPmRjX3N0cmVhbSkpCi0JCXJl dHVybiBOVUxMOwogCi0JZGNfc3RyZWFtID0gZG1fYWxsb2Moc2l6ZW9mKCpkY19zdHJlYW0pKTsK LQlpZiAoV0FSTl9PTighZGNfc3RyZWFtKSkKKwlpZiAoV0FSTl9PTighY3J0Yy0+c3RhdGUpKQog CQlyZXR1cm4gTlVMTDsKIAogCXN0YXRlID0gZG1fYWxsb2Moc2l6ZW9mKCpzdGF0ZSkpOwotCWlm IChXQVJOX09OKCFzdGF0ZSkpIHsKLQkJZG1fZnJlZShkY19zdHJlYW0pOwotCQlyZXR1cm4gTlVM TDsKLQl9CiAKIAlfX2RybV9hdG9taWNfaGVscGVyX2NydGNfZHVwbGljYXRlX3N0YXRlKGNydGMs ICZzdGF0ZS0+YmFzZSk7CiAKLQlzdGF0ZS0+ZGNfc3RyZWFtID0gZGNfc3RyZWFtOworCWlmIChj dXItPnN0cmVhbSkgeworCQlzdGF0ZS0+c3RyZWFtID0gY3VyLT5zdHJlYW07CisJCWRjX3N0cmVh bV9yZXRhaW4oc3RhdGUtPnN0cmVhbSk7CisJfQogCiAJLyogVE9ETyBEdXBsaWNhdGUgZGNfc3Ry ZWFtIGFmdGVyIG9iamVjdHMgYXJlIHN0cmVhbSBvYmplY3QgaXMgZmxhdHRlbmVkICovCiAKQEAg LTExNjEsNiArMTE1Myw3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2ZyZWVzeW5jX3NldF9wcm9wZXJ0 eV9hdG9taWMoCiAJc3RydWN0IGFtZGdwdV9jcnRjICphY3J0YzsKIAlpbnQgcmV0OwogCXVpbnQ2 NF90IHZhbF9jYXBhYmxlOworCXN0cnVjdCBkbV9jcnRjX3N0YXRlICphY3J0Y19zdGF0ZTsKIAog CWRldiAgPSBjb25uZWN0b3ItPmRldjsKIAlhZGV2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTEx ODQsOSArMTE3NywxMiBAQCBzdGF0aWMgaW50IGFtZGdwdV9mcmVlc3luY19zZXRfcHJvcGVydHlf YXRvbWljKAogCQl1c2VyX2VuYWJsZS5lbmFibGVfZm9yX3ZpZGVvICA9IHVzZXJfZW5hYmxlLmVu YWJsZV9mb3JfZ2FtaW5nOwogCQlyZXQgID0gLUVJTlZBTDsKIAkJYWNydGMgPSB0b19hbWRncHVf Y3J0Yyhjb25uZWN0b3Jfc3RhdGUtPmNydGMpOwotCQlpZiAoY29ubmVjdG9yX3N0YXRlLT5jb25u ZWN0b3IgPT0gY29ubmVjdG9yICYmIGFjcnRjLT5zdHJlYW0pIHsKKwkJYWNydGNfc3RhdGUgPSB0 b19kbV9jcnRjX3N0YXRlKGNvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yy0+c3RhdGUpOworCisKKwkJaWYg KGNvbm5lY3Rvcl9zdGF0ZS0+Y29ubmVjdG9yID09IGNvbm5lY3RvciAmJiBhY3J0Y19zdGF0ZS0+ c3RyZWFtKSB7CiAJCQltb2RfZnJlZXN5bmNfc2V0X3VzZXJfZW5hYmxlKGFkZXYtPmRtLmZyZWVz eW5jX21vZHVsZSwKLQkJCQkJCSAgICAgJmFjcnRjLT5zdHJlYW0sIDEsCisJCQkJCQkgICAgICZh Y3J0Y19zdGF0ZS0+c3RyZWFtLCAxLAogCQkJCQkJICAgICAmdXNlcl9lbmFibGUpOwogCQkJcmV0 ID0gMDsKIAkJfQpAQCAtMjQwMSwyMSArMjM5NywxNSBAQCBzdGF0aWMgYm9vbCBpc19zY2FsaW5n X3N0YXRlX2RpZmZlcmVudCgKIAlyZXR1cm4gZmFsc2U7CiB9CiAKLXN0YXRpYyB2b2lkIHJlbW92 ZV9zdHJlYW0oc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHN0cnVjdCBhbWRncHVfY3J0YyAq YWNydGMpCitzdGF0aWMgdm9pZCByZW1vdmVfc3RyZWFtKAorCQlzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldiwKKwkJc3RydWN0IGFtZGdwdV9jcnRjICphY3J0YywKKwkJY29uc3Qgc3RydWN0IGRj X3N0cmVhbSAqc3RyZWFtKQogewotCS8qCi0JICogd2UgZXZhZGUgdmJsYW5rcyBhbmQgcGZsaXBz IG9uIGNydGMgdGhhdAotCSAqIHNob3VsZCBiZSBjaGFuZ2VkCi0JICovCi0JbWFuYWdlX2RtX2lu dGVycnVwdHMoYWRldiwgYWNydGMsIGZhbHNlKTsKLQogCS8qIHRoaXMgaXMgdGhlIHVwZGF0ZSBt b2RlIGNhc2UgKi8KIAlpZiAoYWRldi0+ZG0uZnJlZXN5bmNfbW9kdWxlKQotCQltb2RfZnJlZXN5 bmNfcmVtb3ZlX3N0cmVhbShhZGV2LT5kbS5mcmVlc3luY19tb2R1bGUsCi0JCQkJCSAgIGFjcnRj LT5zdHJlYW0pOworCQltb2RfZnJlZXN5bmNfcmVtb3ZlX3N0cmVhbShhZGV2LT5kbS5mcmVlc3lu Y19tb2R1bGUsIHN0cmVhbSk7CiAKLQlkY19zdHJlYW1fcmVsZWFzZShhY3J0Yy0+c3RyZWFtKTsK LQlhY3J0Yy0+c3RyZWFtID0gTlVMTDsKIAlhY3J0Yy0+b3RnX2luc3QgPSAtMTsKIAlhY3J0Yy0+ ZW5hYmxlZCA9IGZhbHNlOwogfQpAQCAtMjQ4Nyw2ICsyNDc3LDggQEAgc3RhdGljIHZvaWQgYW1k Z3B1X2RtX2RvX2ZsaXAoCiAJYm9vbCBhc3luY19mbGlwID0gKGFjcnRjLT5mbGlwX2ZsYWdzICYg RFJNX01PREVfUEFHRV9GTElQX0FTWU5DKSAhPSAwOwogCXN0cnVjdCBkY19mbGlwX2FkZHJzIGFk ZHIgPSB7IHswfSB9OwogCXN0cnVjdCBkY19zdXJmYWNlX3VwZGF0ZSBzdXJmYWNlX3VwZGF0ZXNb MV0gPSB7IHswfSB9OworCXN0cnVjdCBkbV9jcnRjX3N0YXRlICphY3J0Y19zdGF0ZSA9IHRvX2Rt X2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpOworCiAKIAkvKiBQcmVwYXJlIHdhaXQgZm9yIHRhcmdl dCB2YmxhbmsgZWFybHkgLSBiZWZvcmUgdGhlIGZlbmNlLXdhaXRzICovCiAJdGFyZ2V0X3ZibGFu ayA9IHRhcmdldCAtIGRybV9jcnRjX3ZibGFua19jb3VudChjcnRjKSArCkBAIC0yNTI5LDcgKzI1 MjEsNyBAQCBzdGF0aWMgdm9pZCBhbWRncHVfZG1fZG9fZmxpcCgKIAljcnRjLT5wcmltYXJ5LT5m YiA9IGZiOwogCiAJV0FSTl9PTihhY3J0Yy0+cGZsaXBfc3RhdHVzICE9IEFNREdQVV9GTElQX05P TkUpOwotCVdBUk5fT04oIWFjcnRjLT5zdHJlYW0pOworCVdBUk5fT04oIWFjcnRjX3N0YXRlLT5z dHJlYW0pOwogCiAJYWRkci5hZGRyZXNzLmdycGguYWRkci5sb3dfcGFydCA9IGxvd2VyXzMyX2Jp dHMoYWZiLT5hZGRyZXNzKTsKIAlhZGRyLmFkZHJlc3MuZ3JwaC5hZGRyLmhpZ2hfcGFydCA9IHVw cGVyXzMyX2JpdHMoYWZiLT5hZGRyZXNzKTsKQEAgLTI1MzksMTEgKzI1MzEsMTEgQEAgc3RhdGlj IHZvaWQgYW1kZ3B1X2RtX2RvX2ZsaXAoCiAJaWYgKGFjcnRjLT5iYXNlLnN0YXRlLT5ldmVudCkK IAkJcHJlcGFyZV9mbGlwX2lzcihhY3J0Yyk7CiAKLQlzdXJmYWNlX3VwZGF0ZXMtPnN1cmZhY2Ug PSBkY19zdHJlYW1fZ2V0X3N0YXR1cyhhY3J0Yy0+c3RyZWFtKS0+c3VyZmFjZXNbMF07CisJc3Vy ZmFjZV91cGRhdGVzLT5zdXJmYWNlID0gZGNfc3RyZWFtX2dldF9zdGF0dXMoYWNydGNfc3RhdGUt PnN0cmVhbSktPnN1cmZhY2VzWzBdOwogCXN1cmZhY2VfdXBkYXRlcy0+ZmxpcF9hZGRyID0gJmFk ZHI7CiAKIAotCWRjX3VwZGF0ZV9zdXJmYWNlc19hbmRfc3RyZWFtKGFkZXYtPmRtLmRjLCBzdXJm YWNlX3VwZGF0ZXMsIDEsIGFjcnRjLT5zdHJlYW0sIE5VTEwpOworCWRjX3VwZGF0ZV9zdXJmYWNl c19hbmRfc3RyZWFtKGFkZXYtPmRtLmRjLCBzdXJmYWNlX3VwZGF0ZXMsIDEsIGFjcnRjX3N0YXRl LT5zdHJlYW0sIE5VTEwpOwogCiAJRFJNX0RFQlVHX0RSSVZFUigiJXMgRmxpcHBpbmcgdG8gaGk6 IDB4JXgsIGxvdzogMHgleCBcbiIsCiAJCQkgX19mdW5jX18sCkBAIC0yNTY2LDYgKzI1NTgsNyBA QCBzdGF0aWMgdm9pZCBhbWRncHVfZG1fY29tbWl0X3N1cmZhY2VzKHN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpzdGF0ZSwKIAljb25zdCBzdHJ1Y3QgZGNfc3RyZWFtICpkY19zdHJlYW1fYXR0YWNo OwogCWNvbnN0IHN0cnVjdCBkY19zdXJmYWNlICpkY19zdXJmYWNlc19jb25zdHJ1Y3RlZFtNQVhf U1VSRkFDRVNdOwogCXN0cnVjdCBhbWRncHVfY3J0YyAqYWNydGNfYXR0YWNoID0gdG9fYW1kZ3B1 X2NydGMocGNydGMpOworCXN0cnVjdCBkbV9jcnRjX3N0YXRlICphY3J0Y19zdGF0ZSA9IHRvX2Rt X2NydGNfc3RhdGUocGNydGMtPnN0YXRlKTsKIAlpbnQgcGxhbmVzX2NvdW50ID0gMDsKIAogCS8q IHVwZGF0ZSBwbGFuZXMgd2hlbiBuZWVkZWQgKi8KQEAgLTI2MjAsNyArMjYxMyw3IEBAIHN0YXRp YyB2b2lkIGFtZGdwdV9kbV9jb21taXRfc3VyZmFjZXMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUg KnN0YXRlLAogCQkJCWRtX2Vycm9yKCIlczogRmFpbGVkIHRvIGFkZCBzdXJmYWNlIVxuIiwgX19m dW5jX18pOwogCQkJCWNvbnRpbnVlOwogCQkJfQotCQkJZGNfc3RyZWFtX2F0dGFjaCA9IGFjcnRj X2F0dGFjaC0+c3RyZWFtOworCQkJZGNfc3RyZWFtX2F0dGFjaCA9IGFjcnRjX3N0YXRlLT5zdHJl YW07CiAJCQlwbGFuZXNfY291bnQrKzsKIAogCQl9IGVsc2UgaWYgKGNydGMtPnN0YXRlLT5wbGFu ZXNfY2hhbmdlZCkgewpAQCAtMjY3NSw2ICsyNjY4LDM3IEBAIHN0YXRpYyB2b2lkIGFtZGdwdV9k bV9jb21taXRfc3VyZmFjZXMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCX0KIH0K IAorCitpbnQgYW1kZ3B1X2RtX2F0b21pY19jb21taXQoCisJCXN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsCisJCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKKwkJYm9vbCBub25ibG9jaykK K3sKKwlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpuZXdf c3RhdGU7CisJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBkZXYtPmRldl9wcml2YXRlOwor CWludCBpOworCisJLyoKKwkgKiBXZSBldmFkZSB2YmxhbmtzIGFuZCBwZmxpcHMgb24gY3J0YyB0 aGF0CisJICogc2hvdWxkIGJlIGNoYW5nZWQuIFdlIGRvIGl0IGhlcmUgdG8gZmx1c2ggJiBkaXNh YmxlCisJICogaW50ZXJydXB0cyBiZWZvcmUgZHJtX3N3YXBfc3RhdGUgaXMgY2FsbGVkIGluIGRy bV9hdG9taWNfaGVscGVyX2NvbW1pdAorCSAqIGl0IHdpbGwgdXBkYXRlIGNydGMtPmRtX2NydGNf c3RhdGUtPnN0cmVhbSBwb2ludGVyIHdoaWNoIGlzIHVzZWQgaW4KKwkgKiB0aGUgSVNScy4KKwkg Ki8KKwlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBuZXdfc3RhdGUsIGkpIHsK KwkJc3RydWN0IGRtX2NydGNfc3RhdGUgKm9sZF9hY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3Rh dGUoY3J0Yy0+c3RhdGUpOworCQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0gdG9fYW1kZ3B1 X2NydGMoY3J0Yyk7CisKKwkJaWYgKGRybV9hdG9taWNfY3J0Y19uZWVkc19tb2Rlc2V0KG5ld19z dGF0ZSkgJiYgb2xkX2FjcnRjX3N0YXRlLT5zdHJlYW0pCisJCQltYW5hZ2VfZG1faW50ZXJydXB0 cyhhZGV2LCBhY3J0YywgZmFsc2UpOworCX0KKworCXJldHVybiBkcm1fYXRvbWljX2hlbHBlcl9j b21taXQoZGV2LCBzdGF0ZSwgbm9uYmxvY2spOworCisJLypUT0RPIEhhbmRsZSBFSU5UUiwgcmVl bmFibGUgSVJRKi8KK30KKwogdm9pZCBhbWRncHVfZG1fYXRvbWljX2NvbW1pdF90YWlsKAogCXN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKQEAgLTI2OTIsNiArMjcxNiw3IEBAIHZv aWQgYW1kZ3B1X2RtX2F0b21pY19jb21taXRfdGFpbCgKIAlib29sIHdhaXRfZm9yX3ZibGFuayA9 IHRydWU7CiAJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKIAlzdHJ1Y3QgZHJtX2Nv bm5lY3Rvcl9zdGF0ZSAqb2xkX2Nvbm5fc3RhdGU7CisJc3RydWN0IGRtX2NydGNfc3RhdGUgKm9s ZF9hY3J0Y19zdGF0ZSwgKm5ld19hY3J0Y19zdGF0ZTsKIAogCWRybV9hdG9taWNfaGVscGVyX3Vw ZGF0ZV9sZWdhY3lfbW9kZXNldF9zdGF0ZShkZXYsIHN0YXRlKTsKIApAQCAtMjY5OSwxNiArMjcy NCwxMCBAQCB2b2lkIGFtZGdwdV9kbV9hdG9taWNfY29tbWl0X3RhaWwoCiAKIAkvKiB1cGRhdGUg Y2hhbmdlZCBpdGVtcyAqLwogCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG9s ZF9jcnRjX3N0YXRlLCBpKSB7Ci0JCXN0cnVjdCBhbWRncHVfY3J0YyAqYWNydGM7Ci0JCXN0cnVj dCBhbWRncHVfY29ubmVjdG9yICphY29ubmVjdG9yID0gTlVMTDsKKwkJc3RydWN0IGFtZGdwdV9j cnRjICphY3J0YyA9IHRvX2FtZGdwdV9jcnRjKGNydGMpOwogCQlzdHJ1Y3QgZHJtX2NydGNfc3Rh dGUgKm5ld19zdGF0ZSA9IGNydGMtPnN0YXRlOwotCi0JCWFjcnRjID0gdG9fYW1kZ3B1X2NydGMo Y3J0Yyk7Ci0JCWFjb25uZWN0b3IgPQotCQkJYW1kZ3B1X2RtX2ZpbmRfZmlyc3RfY3JjdF9tYXRj aGluZ19jb25uZWN0b3IoCi0JCQkJc3RhdGUsCi0JCQkJY3J0YywKLQkJCQlmYWxzZSk7CisJCW5l d19hY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3RhdGUobmV3X3N0YXRlKTsKKwkJb2xkX2FjcnRj X3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShvbGRfY3J0Y19zdGF0ZSk7CiAKIAkJRFJNX0RFQlVH X0tNUygKIAkJCSJhbWRncHVfY3J0YyBpZDolZCBjcnRjX3N0YXRlX2ZsYWdzOiBlbmFibGU6JWQs IGFjdGl2ZTolZCwgIgpAQCAtMjcyNywxMDkgKzI3NDYsNjAgQEAgdm9pZCBhbWRncHVfZG1fYXRv bWljX2NvbW1pdF90YWlsKAogCQkgKi8KIAogCQlpZiAobW9kZXNldF9yZXF1aXJlZChuZXdfc3Rh dGUpKSB7Ci0JCQlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0YXRlICpkbV9jb25uX3N0YXRlID0gTlVM TDsKLQkJCW5ld19zdHJlYW0gPSBOVUxMOwotCi0JCQlpZiAoYWNvbm5lY3RvcikKLQkJCQlkbV9j b25uX3N0YXRlID0gdG9fZG1fY29ubmVjdG9yX3N0YXRlKGFjb25uZWN0b3ItPmJhc2Uuc3RhdGUp OwotCi0JCQluZXdfc3RyZWFtID0gY3JlYXRlX3N0cmVhbV9mb3Jfc2luaygKLQkJCQkJYWNvbm5l Y3RvciwKLQkJCQkJJmNydGMtPnN0YXRlLT5tb2RlLAotCQkJCQlkbV9jb25uX3N0YXRlKTsKIAog CQkJRFJNX0lORk8oIkF0b21pYyBjb21taXQ6IFNFVCBjcnRjIGlkICVkOiBbJXBdXG4iLCBhY3J0 Yy0+Y3J0Y19pZCwgYWNydGMpOwogCi0JCQlpZiAoIW5ld19zdHJlYW0pIHsKKwkJCWlmICghbmV3 X2FjcnRjX3N0YXRlLT5zdHJlYW0pIHsKIAkJCQkvKgotCQkJCSAqIHRoaXMgY291bGQgaGFwcGVu IGJlY2F1c2Ugb2YgaXNzdWVzIHdpdGgKLQkJCQkgKiB1c2Vyc3BhY2Ugbm90aWZpY2F0aW9ucyBk ZWxpdmVyeS4KLQkJCQkgKiBJbiB0aGlzIGNhc2UgdXNlcnNwYWNlIHRyaWVzIHRvIHNldCBtb2Rl IG9uCi0JCQkJICogZGlzcGxheSB3aGljaCBpcyBkaXNjb25uZWN0IGluIGZhY3QuCi0JCQkJICog ZGNfc2luayBpbiBOVUxMIGluIHRoaXMgY2FzZSBvbiBhY29ubmVjdG9yLgotCQkJCSAqIFdlIGV4 cGVjdCByZXNldCBtb2RlIHdpbGwgY29tZSBzb29uLgotCQkJCSAqCi0JCQkJICogVGhpcyBjYW4g YWxzbyBoYXBwZW4gd2hlbiB1bnBsdWcgaXMgZG9uZQotCQkJCSAqIGR1cmluZyByZXN1bWUgc2Vx dWVuY2UgZW5kZWQKLQkJCQkgKgotCQkJCSAqIEluIHRoaXMgY2FzZSwgd2Ugd2FudCB0byBwcmV0 ZW5kIHdlIHN0aWxsCi0JCQkJICogaGF2ZSBhIHNpbmsgdG8ga2VlcCB0aGUgcGlwZSBydW5uaW5n IHNvIHRoYXQKLQkJCQkgKiBodyBzdGF0ZSBpcyBjb25zaXN0ZW50IHdpdGggdGhlIHN3IHN0YXRl Ci0JCQkJICovCisJCQkJKiB0aGlzIGNvdWxkIGhhcHBlbiBiZWNhdXNlIG9mIGlzc3VlcyB3aXRo CisJCQkJKiB1c2Vyc3BhY2Ugbm90aWZpY2F0aW9ucyBkZWxpdmVyeS4KKwkJCQkqIEluIHRoaXMg Y2FzZSB1c2Vyc3BhY2UgdHJpZXMgdG8gc2V0IG1vZGUgb24KKwkJCQkqIGRpc3BsYXkgd2hpY2gg aXMgZGlzY29ubmVjdCBpbiBmYWN0LgorCQkJCSogZGNfc2luayBpbiBOVUxMIGluIHRoaXMgY2Fz ZSBvbiBhY29ubmVjdG9yLgorCQkJCSogV2UgZXhwZWN0IHJlc2V0IG1vZGUgd2lsbCBjb21lIHNv b24uCisJCQkJKgorCQkJCSogVGhpcyBjYW4gYWxzbyBoYXBwZW4gd2hlbiB1bnBsdWcgaXMgZG9u ZQorCQkJCSogZHVyaW5nIHJlc3VtZSBzZXF1ZW5jZSBlbmRlZAorCQkJCSoKKwkJCQkqIEluIHRo aXMgY2FzZSwgd2Ugd2FudCB0byBwcmV0ZW5kIHdlIHN0aWxsCisJCQkJKiBoYXZlIGEgc2luayB0 byBrZWVwIHRoZSBwaXBlIHJ1bm5pbmcgc28gdGhhdAorCQkJCSogaHcgc3RhdGUgaXMgY29uc2lz dGVudCB3aXRoIHRoZSBzdyBzdGF0ZQorCQkJCSovCiAJCQkJRFJNX0RFQlVHX0tNUygiJXM6IEZh aWxlZCB0byBjcmVhdGUgbmV3IHN0cmVhbSBmb3IgY3J0YyAlZFxuIiwKIAkJCQkJCV9fZnVuY19f LCBhY3J0Yy0+YmFzZS5iYXNlLmlkKTsKLQkJCQlicmVhazsKKwkJCQljb250aW51ZTsKIAkJCX0K IAotCQkJaWYgKGFjcnRjLT5zdHJlYW0pCi0JCQkJcmVtb3ZlX3N0cmVhbShhZGV2LCBhY3J0Yyk7 CiAKLQkJCS8qIFRPRE8gY2xlYW4gdGhpcyBzdHVwaWQgaGFjayAqLwotCQkJZm9yIChqID0gMDsg aiA8IGRtX3N0YXRlLT5zZXRfY291bnQ7IGorKykKLQkJCQlpZiAoZG1fc3RhdGUtPnNldFtqXS5z dHJlYW0tPnByaXYgPT0gYWNydGMpIHsKLQkJCQkJQVNTRVJUKGFjcnRjLT5zdHJlYW0gPT0gTlVM TCk7Ci0JCQkJCW5ld19zdHJlYW0gPSBkbV9zdGF0ZS0+c2V0W2pdLnN0cmVhbTsKLQkJCQkJYnJl YWs7Ci0JCQkJfQorCQkJaWYgKG9sZF9hY3J0Y19zdGF0ZS0+c3RyZWFtKQorCQkJCXJlbW92ZV9z dHJlYW0oYWRldiwgYWNydGMsIG9sZF9hY3J0Y19zdGF0ZS0+c3RyZWFtKTsKKwogCiAJCQkvKgog CQkJICogdGhpcyBsb29wIHNhdmVzIHNldCBtb2RlIGNydGNzCiAJCQkgKiB3ZSBuZWVkZWQgdG8g ZW5hYmxlIHZibGFua3Mgb25jZSBhbGwKIAkJCSAqIHJlc291cmNlcyBhY3F1aXJlZCBpbiBkYyBh ZnRlciBkY19jb21taXRfc3RyZWFtcwogCQkJICovCisKKwkJCS8qVE9ETyBtb3ZlIGFsbCB0aGlz IGludG8gZG1fY3J0Y19zdGF0ZSwgZ2V0IHJpZCBvZgorCQkJICogbmV3X2NydGNzIGFycmF5IGFu ZCB1c2Ugb2xkIGFuZCBuZXcgYXRvbWljIHN0YXRlcworCQkJICogaW5zdGVhZAorCQkJICovCiAJ CQluZXdfY3J0Y3NbbmV3X2NydGNzX2NvdW50XSA9IGFjcnRjOwogCQkJbmV3X2NydGNzX2NvdW50 Kys7CiAKLQkJCWFjcnRjLT5zdHJlYW0gPSBuZXdfc3RyZWFtOwogCQkJYWNydGMtPmVuYWJsZWQg PSB0cnVlOwogCQkJYWNydGMtPmh3X21vZGUgPSBjcnRjLT5zdGF0ZS0+bW9kZTsKIAkJCWNydGMt Pmh3bW9kZSA9IGNydGMtPnN0YXRlLT5tb2RlOwogCQl9IGVsc2UgaWYgKG1vZGVyZXNldF9yZXF1 aXJlZChuZXdfc3RhdGUpKSB7Ci0KIAkJCURSTV9JTkZPKCJBdG9taWMgY29tbWl0OiBSRVNFVC4g Y3J0YyBpZCAlZDpbJXBdXG4iLCBhY3J0Yy0+Y3J0Y19pZCwgYWNydGMpOworCiAJCQkvKiBpLmUu IHJlc2V0IG1vZGUgKi8KLQkJCWlmIChhY3J0Yy0+c3RyZWFtKQotCQkJCXJlbW92ZV9zdHJlYW0o YWRldiwgYWNydGMpOworCQkJaWYgKG9sZF9hY3J0Y19zdGF0ZS0+c3RyZWFtKQorCQkJCXJlbW92 ZV9zdHJlYW0oYWRldiwgYWNydGMsIG9sZF9hY3J0Y19zdGF0ZS0+c3RyZWFtKTsKIAkJfQogCX0g LyogZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZSgpICovCiAKLQkvKiBIYW5kbGUgc2NhbGluZyBhbmQg dW5kZXJzYWNuIGNoYW5nZXMqLwotCWZvcl9lYWNoX2Nvbm5lY3Rvcl9pbl9zdGF0ZShzdGF0ZSwg Y29ubmVjdG9yLCBvbGRfY29ubl9zdGF0ZSwgaSkgewotCQlzdHJ1Y3QgYW1kZ3B1X2Nvbm5lY3Rv ciAqYWNvbm5lY3RvciA9IHRvX2FtZGdwdV9jb25uZWN0b3IoY29ubmVjdG9yKTsKLQkJc3RydWN0 IGRtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29uX25ld19zdGF0ZSA9Ci0JCQkJdG9fZG1fY29ubmVjdG9y X3N0YXRlKGFjb25uZWN0b3ItPmJhc2Uuc3RhdGUpOwotCQlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0 YXRlICpjb25fb2xkX3N0YXRlID0KLQkJCQl0b19kbV9jb25uZWN0b3Jfc3RhdGUob2xkX2Nvbm5f c3RhdGUpOwotCQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0gdG9fYW1kZ3B1X2NydGMoY29u X25ld19zdGF0ZS0+YmFzZS5jcnRjKTsKLQkJY29uc3Qgc3RydWN0IGRjX3N0cmVhbV9zdGF0dXMg KnN0YXR1cyA9IE5VTEw7Ci0KLQkJLyogU2tpcCBhbnkgbW9kZXNldHMvcmVzZXRzICovCi0JCWlm ICghYWNydGMgfHwgZHJtX2F0b21pY19jcnRjX25lZWRzX21vZGVzZXQoYWNydGMtPmJhc2Uuc3Rh dGUpKQotCQkJY29udGludWU7Ci0KLQkJLyogU2tpcCBhbnkgdGhpbmcgbm90IHNjYWxlIG9yIHVu ZGVyc2NhbiBjaG5hZ2VzICovCi0JCWlmICghaXNfc2NhbGluZ19zdGF0ZV9kaWZmZXJlbnQoY29u X25ld19zdGF0ZSwgY29uX29sZF9zdGF0ZSkpCi0JCQljb250aW51ZTsKLQotCQl1cGRhdGVfc3Ry ZWFtX3NjYWxpbmdfc2V0dGluZ3MoJmNvbl9uZXdfc3RhdGUtPmJhc2UuY3J0Yy0+bW9kZSwKLQkJ CQljb25fbmV3X3N0YXRlLCAoc3RydWN0IGRjX3N0cmVhbSAqKWFjcnRjLT5zdHJlYW0pOwotCi0J CXN0YXR1cyA9IGRjX3N0cmVhbV9nZXRfc3RhdHVzKGFjcnRjLT5zdHJlYW0pOwotCQlXQVJOX09O KCFzdGF0dXMpOwotCQlXQVJOX09OKCFzdGF0dXMtPnN1cmZhY2VfY291bnQpOwotCi0JCWlmICgh YWNydGMtPnN0cmVhbSkKLQkJCWNvbnRpbnVlOwotCi0JCS8qVE9ETyBIb3cgaXQgd29ya3Mgd2l0 aCBNUE8gPyovCi0JCWlmICghZGNfY29tbWl0X3N1cmZhY2VzX3RvX3N0cmVhbSgKLQkJCQlkbS0+ ZGMsCi0JCQkJKGNvbnN0IHN0cnVjdCBkY19zdXJmYWNlICoqKXN0YXR1cy0+c3VyZmFjZXMsCi0J CQkJc3RhdHVzLT5zdXJmYWNlX2NvdW50LAotCQkJCWFjcnRjLT5zdHJlYW0pKQotCQkJZG1fZXJy b3IoIiVzOiBGYWlsZWQgdG8gdXBkYXRlIHN0cmVhbSBzY2FsaW5nIVxuIiwgX19mdW5jX18pOwot CX0KLQogCS8qCiAJICogQWRkIHN0cmVhbXMgYWZ0ZXIgcmVxdWlyZWQgc3RyZWFtcyBmcm9tIG5l dyBhbmQgcmVwbGFjZWQgc3RyZWFtcwogCSAqIGFyZSByZW1vdmVkIGZyb20gZnJlZXN5bmMgbW9k dWxlCkBAIC0yODM3LDcgKzI4MDcsOSBAQCB2b2lkIGFtZGdwdV9kbV9hdG9taWNfY29tbWl0X3Rh aWwoCiAJaWYgKGFkZXYtPmRtLmZyZWVzeW5jX21vZHVsZSkgewogCQlmb3IgKGkgPSAwOyBpIDwg bmV3X2NydGNzX2NvdW50OyBpKyspIHsKIAkJCXN0cnVjdCBhbWRncHVfY29ubmVjdG9yICphY29u bmVjdG9yID0gTlVMTDsKLQkJCW5ld19zdHJlYW0gPSBuZXdfY3J0Y3NbaV0tPnN0cmVhbTsKKwkJ CW5ld19hY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3RhdGUobmV3X2NydGNzW2ldLT5iYXNlLnN0 YXRlKTsKKworCQkJbmV3X3N0cmVhbSA9IG5ld19hY3J0Y19zdGF0ZS0+c3RyZWFtOwogCQkJYWNv bm5lY3RvciA9CiAJCQkJYW1kZ3B1X2RtX2ZpbmRfZmlyc3RfY3JjdF9tYXRjaGluZ19jb25uZWN0 b3IoCiAJCQkJCXN0YXRlLApAQCAtMjg2MiwzNSArMjgzNCw3NyBAQCB2b2lkIGFtZGdwdV9kbV9h dG9taWNfY29tbWl0X3RhaWwoCiAKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNydGMsICZkZXYtPm1v ZGVfY29uZmlnLmNydGNfbGlzdCwgaGVhZCkgewogCQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRj ID0gdG9fYW1kZ3B1X2NydGMoY3J0Yyk7CisJCW5ld19hY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNf c3RhdGUoY3J0Yy0+c3RhdGUpOwogCi0JCWlmIChhY3J0Yy0+c3RyZWFtICE9IE5VTEwpIHsKLQkJ CWNvbnN0IHN0cnVjdCBkY19zdHJlYW1fc3RhdHVzICpzdGF0dXMgPSBkY19zdHJlYW1fZ2V0X3N0 YXR1cyhhY3J0Yy0+c3RyZWFtKTsKKwkJaWYgKG5ld19hY3J0Y19zdGF0ZS0+c3RyZWFtICE9IE5V TEwpIHsKKwkJCWNvbnN0IHN0cnVjdCBkY19zdHJlYW1fc3RhdHVzICpzdGF0dXMgPQorCQkJCQlk Y19zdHJlYW1fZ2V0X3N0YXR1cyhuZXdfYWNydGNfc3RhdGUtPnN0cmVhbSk7CiAKIAkJCWlmICgh c3RhdHVzKQotCQkJCURDX0VSUigiZ290IG5vIHN0YXR1cyBmb3Igc3RyZWFtICVwIG9uIGFjcnRj JXBcbiIsIGFjcnRjLT5zdHJlYW0sIGFjcnRjKTsKKwkJCQlEQ19FUlIoImdvdCBubyBzdGF0dXMg Zm9yIHN0cmVhbSAlcCBvbiBhY3J0YyVwXG4iLCBuZXdfYWNydGNfc3RhdGUtPnN0cmVhbSwgYWNy dGMpOwogCQkJZWxzZQogCQkJCWFjcnRjLT5vdGdfaW5zdCA9IHN0YXR1cy0+cHJpbWFyeV9vdGdf aW5zdDsKIAkJfQogCX0KIAorCS8qIEhhbmRsZSBzY2FsaW5nIGFuZCB1bmRlcnNhY24gY2hhbmdl cyovCisJZm9yX2VhY2hfY29ubmVjdG9yX2luX3N0YXRlKHN0YXRlLCBjb25uZWN0b3IsIG9sZF9j b25uX3N0YXRlLCBpKSB7CisJCXN0cnVjdCBhbWRncHVfY29ubmVjdG9yICphY29ubmVjdG9yID0g dG9fYW1kZ3B1X2Nvbm5lY3Rvcihjb25uZWN0b3IpOworCQlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0 YXRlICpjb25fbmV3X3N0YXRlID0KKwkJCQl0b19kbV9jb25uZWN0b3Jfc3RhdGUoYWNvbm5lY3Rv ci0+YmFzZS5zdGF0ZSk7CisJCXN0cnVjdCBkbV9jb25uZWN0b3Jfc3RhdGUgKmNvbl9vbGRfc3Rh dGUgPQorCQkJCXRvX2RtX2Nvbm5lY3Rvcl9zdGF0ZShvbGRfY29ubl9zdGF0ZSk7CisJCXN0cnVj dCBhbWRncHVfY3J0YyAqYWNydGMgPSB0b19hbWRncHVfY3J0Yyhjb25fbmV3X3N0YXRlLT5iYXNl LmNydGMpOworCQljb25zdCBzdHJ1Y3QgZGNfc3RyZWFtX3N0YXR1cyAqc3RhdHVzID0gTlVMTDsK KworCQkvKiBTa2lwIGFueSBtb2Rlc2V0cy9yZXNldHMgKi8KKwkJaWYgKCFhY3J0YyB8fCBkcm1f YXRvbWljX2NydGNfbmVlZHNfbW9kZXNldChhY3J0Yy0+YmFzZS5zdGF0ZSkpCisJCQljb250aW51 ZTsKKworCQkvKiBTa2lwIGFueSB0aGluZyBub3Qgc2NhbGUgb3IgdW5kZXJzY2FuIGNoYW5nZXMg Ki8KKwkJaWYgKCFpc19zY2FsaW5nX3N0YXRlX2RpZmZlcmVudChjb25fbmV3X3N0YXRlLCBjb25f b2xkX3N0YXRlKSkKKwkJCWNvbnRpbnVlOworCisJCW5ld19hY3J0Y19zdGF0ZSA9IHRvX2RtX2Ny dGNfc3RhdGUoYWNydGMtPmJhc2Uuc3RhdGUpOworCisJCXVwZGF0ZV9zdHJlYW1fc2NhbGluZ19z ZXR0aW5ncygmY29uX25ld19zdGF0ZS0+YmFzZS5jcnRjLT5tb2RlLAorCQkJCWNvbl9uZXdfc3Rh dGUsIChzdHJ1Y3QgZGNfc3RyZWFtICopbmV3X2FjcnRjX3N0YXRlLT5zdHJlYW0pOworCisJCXN0 YXR1cyA9IGRjX3N0cmVhbV9nZXRfc3RhdHVzKG5ld19hY3J0Y19zdGF0ZS0+c3RyZWFtKTsKKwkJ V0FSTl9PTighc3RhdHVzKTsKKwkJV0FSTl9PTighc3RhdHVzLT5zdXJmYWNlX2NvdW50KTsKKwor CQlpZiAoIW5ld19hY3J0Y19zdGF0ZS0+c3RyZWFtKQorCQkJY29udGludWU7CisKKwkJLypUT0RP IEhvdyBpdCB3b3JrcyB3aXRoIE1QTyA/Ki8KKwkJaWYgKCFkY19jb21taXRfc3VyZmFjZXNfdG9f c3RyZWFtKAorCQkJCWRtLT5kYywKKwkJCQkoY29uc3Qgc3RydWN0IGRjX3N1cmZhY2UgKiopc3Rh dHVzLT5zdXJmYWNlcywKKwkJCQlzdGF0dXMtPnN1cmZhY2VfY291bnQsCisJCQkJbmV3X2FjcnRj X3N0YXRlLT5zdHJlYW0pKQorCQkJZG1fZXJyb3IoIiVzOiBGYWlsZWQgdG8gdXBkYXRlIHN0cmVh bSBzY2FsaW5nIVxuIiwgX19mdW5jX18pOworCX0KKwogCWZvciAoaSA9IDA7IGkgPCBuZXdfY3J0 Y3NfY291bnQ7IGkrKykgewogCQkvKgogCQkgKiBsb29wIHRvIGVuYWJsZSBpbnRlcnJ1cHRzIG9u IG5ld2x5IGFycml2ZWQgY3J0YwogCQkgKi8KIAkJc3RydWN0IGFtZGdwdV9jcnRjICphY3J0YyA9 IG5ld19jcnRjc1tpXTsKKwkJbmV3X2FjcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShhY3J0 Yy0+YmFzZS5zdGF0ZSk7CiAKIAkJaWYgKGFkZXYtPmRtLmZyZWVzeW5jX21vZHVsZSkKIAkJCW1v ZF9mcmVlc3luY19ub3RpZnlfbW9kZV9jaGFuZ2UoCi0JCQkJYWRldi0+ZG0uZnJlZXN5bmNfbW9k dWxlLCAmYWNydGMtPnN0cmVhbSwgMSk7CisJCQkJYWRldi0+ZG0uZnJlZXN5bmNfbW9kdWxlLCAm bmV3X2FjcnRjX3N0YXRlLT5zdHJlYW0sIDEpOwogCiAJCW1hbmFnZV9kbV9pbnRlcnJ1cHRzKGFk ZXYsIGFjcnRjLCB0cnVlKTsKIAl9CiAKIAkvKiB1cGRhdGUgcGxhbmVzIHdoZW4gbmVlZGVkIHBl ciBjcnRjKi8KIAlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBwY3J0Yywgb2xkX2NydGNf c3RhdGUsIGopIHsKLQkJc3RydWN0IGFtZGdwdV9jcnRjICphY3J0YyA9IHRvX2FtZGdwdV9jcnRj KHBjcnRjKTsKKwkJbmV3X2FjcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShwY3J0Yy0+c3Rh dGUpOwogCi0JCWlmIChhY3J0Yy0+c3RyZWFtKQorCQlpZiAobmV3X2FjcnRjX3N0YXRlLT5zdHJl YW0pCiAJCQlhbWRncHVfZG1fY29tbWl0X3N1cmZhY2VzKHN0YXRlLCBkZXYsIGRtLCBwY3J0Yywg JndhaXRfZm9yX3ZibGFuayk7CiAJfQogCkBAIC0yOTg2LDEzICszMDAwLDE1IEBAIHZvaWQgZG1f cmVzdG9yZV9kcm1fY29ubmVjdG9yX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVj dCBkcm1fY29ubmVjdG9yCiB7CiAJc3RydWN0IGFtZGdwdV9jb25uZWN0b3IgKmFjb25uZWN0b3Ig PSB0b19hbWRncHVfY29ubmVjdG9yKGNvbm5lY3Rvcik7CiAJc3RydWN0IGFtZGdwdV9jcnRjICpk aXNjb25uZWN0ZWRfYWNydGM7CisJc3RydWN0IGRtX2NydGNfc3RhdGUgKmFjcnRjX3N0YXRlOwog CiAJaWYgKCFhY29ubmVjdG9yLT5kY19zaW5rIHx8ICFjb25uZWN0b3ItPnN0YXRlIHx8ICFjb25u ZWN0b3ItPmVuY29kZXIpCiAJCXJldHVybjsKIAogCWRpc2Nvbm5lY3RlZF9hY3J0YyA9IHRvX2Ft ZGdwdV9jcnRjKGNvbm5lY3Rvci0+ZW5jb2Rlci0+Y3J0Yyk7CisJYWNydGNfc3RhdGUgPSB0b19k bV9jcnRjX3N0YXRlKGRpc2Nvbm5lY3RlZF9hY3J0Yy0+YmFzZS5zdGF0ZSk7CiAKLQlpZiAoIWRp c2Nvbm5lY3RlZF9hY3J0YyB8fCAhZGlzY29ubmVjdGVkX2FjcnRjLT5zdHJlYW0pCisJaWYgKCFk aXNjb25uZWN0ZWRfYWNydGMgfHwgIWFjcnRjX3N0YXRlLT5zdHJlYW0pCiAJCXJldHVybjsKIAog CS8qCkBAIC0zMDAwLDcgKzMwMTYsNyBAQCB2b2lkIGRtX3Jlc3RvcmVfZHJtX2Nvbm5lY3Rvcl9z dGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2Nvbm5lY3RvcgogCSAqIHdl IGRlZHVjZSB3ZSBhcmUgaW4gYSBzdGF0ZSB3aGVyZSB3ZSBjYW4gbm90IHJlbHkgb24gdXNlcm1v ZGUgY2FsbAogCSAqIHRvIHR1cm4gb24gdGhlIGRpc3BsYXksIHNvIHdlIGRvIGl0IGhlcmUKIAkg Ki8KLQlpZiAoZGlzY29ubmVjdGVkX2FjcnRjLT5zdHJlYW0tPnNpbmsgIT0gYWNvbm5lY3Rvci0+ ZGNfc2luaykKKwlpZiAoYWNydGNfc3RhdGUtPnN0cmVhbS0+c2luayAhPSBhY29ubmVjdG9yLT5k Y19zaW5rKQogCQlkbV9mb3JjZV9hdG9taWNfY29tbWl0KCZhY29ubmVjdG9yLT5iYXNlKTsKIH0K IApAQCAtMzA0NCwxNyArMzA2MCwxMSBAQCBzdGF0aWMgdWludDMyX3QgdXBkYXRlX2luX3ZhbF9z ZXRzX3N0cmVhbSgKIAl9CiAKIAl2YWxfc2V0c1tpXS5zdHJlYW0gPSBuZXdfc3RyZWFtOwotCWRj X3N0cmVhbV9yZXRhaW4obmV3X3N0cmVhbSk7CiAJY3J0Y3NbaV0gPSBjcnRjOwogCi0JaWYgKGkg PT0gc2V0X2NvdW50KSB7CisJaWYgKGkgPT0gc2V0X2NvdW50KQogCQkvKiBub3RoaW5nIGZvdW5k LiBhZGQgbmV3IG9uZSB0byB0aGUgZW5kICovCiAJCXJldHVybiBzZXRfY291bnQgKyAxOwotCX0g ZWxzZSB7Ci0JCS8qIHVwZGF0ZS4gcmVsYXNlIG9sZCBzdHJlYW0gKi8KLQkJZGNfc3RyZWFtX3Jl bGVhc2Uob2xkX3N0cmVhbSk7Ci0KLQl9CiAKIAlyZXR1cm4gc2V0X2NvdW50OwogfQpAQCAtMzA3 NSw3ICszMDg1LDYgQEAgc3RhdGljIHVpbnQzMl90IHJlbW92ZV9mcm9tX3ZhbF9zZXRzKAogCQly ZXR1cm4gc2V0X2NvdW50OwogCX0KIAotCWRjX3N0cmVhbV9yZWxlYXNlKHN0cmVhbSk7CiAJc2V0 X2NvdW50LS07CiAKIAlmb3IgKDsgaSA8IHNldF9jb3VudDsgaSsrKSB7CkBAIC0zMTQ1LDE0ICsz MTU0LDE2IEBAIGludCBhbWRncHVfZG1fYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsCiAJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7CiAJaW50IGksIGo7CiAJ aW50IHJldDsKLQlpbnQgbmV3X3N0cmVhbV9jb3VudDsKLQlzdHJ1Y3QgZGNfc3RyZWFtICpuZXdf c3RyZWFtc1tNQVhfU1RSRUFNU10gPSB7IDAgfTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGNfc2V0 W01BWF9TVFJFQU1TXSA9IHsgMCB9OwogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gZGV2 LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZGMgKmRjID0gYWRldi0+ZG0uZGM7CiAJYm9vbCBuZWVk X3RvX3ZhbGlkYXRlID0gZmFsc2U7CiAJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsK IAlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZTsKKwlpbnQgc2V0X2NvdW50 OworCXN0cnVjdCBkY192YWxpZGF0aW9uX3NldCBzZXRbTUFYX1NUUkVBTVNdID0geyB7IDAgfSB9 OworCXN0cnVjdCBkbV9jcnRjX3N0YXRlICpvbGRfYWNydGNfc3RhdGUsICpuZXdfYWNydGNfc3Rh dGU7CisKIAkvKgogCSAqIFRoaXMgYm9vbCB3aWxsIGJlIHNldCBmb3IgdHJ1ZSBmb3IgYW55IG1v ZGVzZXQvcmVzZXQKIAkgKiBvciBzdXJmYWNlIHVwZGF0ZSB3aGljaCBpbXBsaWVzIG5vbiBmYXN0 IHN1cmZhZSB1cGRhdGUuCkBAIC0zMTcyLDE3ICszMTgzLDE2IEBAIGludCBhbWRncHVfZG1fYXRv bWljX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJZG1fc3RhdGUgPSB0b19kbV9hdG9t aWNfc3RhdGUoc3RhdGUpOwogCiAJLyogY29weSBleGlzdGluZyBjb25maWd1cmF0aW9uICovCi0J bmV3X3N0cmVhbV9jb3VudCA9IDA7Ci0JZG1fc3RhdGUtPnNldF9jb3VudCA9IDA7CisJc2V0X2Nv dW50ID0gMDsKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNydGMsICZkZXYtPm1vZGVfY29uZmlnLmNy dGNfbGlzdCwgaGVhZCkgewogCi0JCXN0cnVjdCBhbWRncHVfY3J0YyAqYWNydGMgPSB0b19hbWRn cHVfY3J0YyhjcnRjKTsKKwkJb2xkX2FjcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShjcnRj LT5zdGF0ZSk7CiAKLQkJaWYgKGFjcnRjLT5zdHJlYW0pIHsKLQkJCWRjX3N0cmVhbV9yZXRhaW4o YWNydGMtPnN0cmVhbSk7Ci0JCQlkbV9zdGF0ZS0+c2V0W2RtX3N0YXRlLT5zZXRfY291bnRdLnN0 cmVhbSA9IGFjcnRjLT5zdHJlYW07Ci0JCQljcnRjX3NldFtkbV9zdGF0ZS0+c2V0X2NvdW50XSA9 IGNydGM7Ci0JCQkrK2RtX3N0YXRlLT5zZXRfY291bnQ7CisJCWlmIChvbGRfYWNydGNfc3RhdGUt PnN0cmVhbSkgeworCQkJZGNfc3RyZWFtX3JldGFpbihvbGRfYWNydGNfc3RhdGUtPnN0cmVhbSk7 CisJCQlzZXRbc2V0X2NvdW50XS5zdHJlYW0gPSBvbGRfYWNydGNfc3RhdGUtPnN0cmVhbTsKKwkJ CWNydGNfc2V0W3NldF9jb3VudF0gPSBjcnRjOworCQkJKytzZXRfY291bnQ7CiAJCX0KIAl9CiAK QEAgLTMxOTAsNyArMzIwMCw4IEBAIGludCBhbWRncHVfZG1fYXRvbWljX2NoZWNrKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCiAJZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0 Y19zdGF0ZSwgaSkgewogCQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0gTlVMTDsKIAkJc3Ry dWN0IGFtZGdwdV9jb25uZWN0b3IgKmFjb25uZWN0b3IgPSBOVUxMOwotCisJCW9sZF9hY3J0Y19z dGF0ZSA9IHRvX2RtX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpOworCQluZXdfYWNydGNfc3RhdGUg PSB0b19kbV9jcnRjX3N0YXRlKGNydGNfc3RhdGUpOwogCQlhY3J0YyA9IHRvX2FtZGdwdV9jcnRj KGNydGMpOwogCiAJCWFjb25uZWN0b3IgPSBhbWRncHVfZG1fZmluZF9maXJzdF9jcmN0X21hdGNo aW5nX2Nvbm5lY3RvcihzdGF0ZSwgY3J0YywgdHJ1ZSk7CkBAIC0zMjIxLDcgKzMyMzIsNiBAQCBp bnQgYW1kZ3B1X2RtX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJfQog CiAJCQluZXdfc3RyZWFtID0gY3JlYXRlX3N0cmVhbV9mb3Jfc2luayhhY29ubmVjdG9yLCAmY3J0 Y19zdGF0ZS0+bW9kZSwgZG1fY29ubl9zdGF0ZSk7Ci0JCQluZXdfc3RyZWFtLT5wcml2ID0gYWNy dGM7CiAKIAkJCS8qCiAJCQkgKiB3ZSBjYW4gaGF2ZSBubyBzdHJlYW0gb24gQUNUSU9OX1NFVCBp ZiBhIGRpc3BsYXkKQEAgLTMyMzUsMjcgKzMyNDUsMzMgQEAgaW50IGFtZGdwdV9kbV9hdG9taWNf Y2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQlicmVhazsKIAkJCX0KIAotCQkJbmV3 X3N0cmVhbXNbbmV3X3N0cmVhbV9jb3VudF0gPSBuZXdfc3RyZWFtOwotCQkJZG1fc3RhdGUtPnNl dF9jb3VudCA9IHVwZGF0ZV9pbl92YWxfc2V0c19zdHJlYW0oCi0JCQkJCWRtX3N0YXRlLT5zZXQs CisJCQlpZiAobmV3X2FjcnRjX3N0YXRlLT5zdHJlYW0pCisJCQkJZGNfc3RyZWFtX3JlbGVhc2Uo bmV3X2FjcnRjX3N0YXRlLT5zdHJlYW0pOworCQkJbmV3X2FjcnRjX3N0YXRlLT5zdHJlYW0gPSBu ZXdfc3RyZWFtOworCisJCQlzZXRfY291bnQgPSB1cGRhdGVfaW5fdmFsX3NldHNfc3RyZWFtKAor CQkJCQlzZXQsCiAJCQkJCWNydGNfc2V0LAotCQkJCQlkbV9zdGF0ZS0+c2V0X2NvdW50LAotCQkJ CQlhY3J0Yy0+c3RyZWFtLAotCQkJCQluZXdfc3RyZWFtLAorCQkJCQlzZXRfY291bnQsCisJCQkJ CW9sZF9hY3J0Y19zdGF0ZS0+c3RyZWFtLAorCQkJCQluZXdfYWNydGNfc3RhdGUtPnN0cmVhbSwK IAkJCQkJY3J0Yyk7CiAKLQkJCW5ld19zdHJlYW1fY291bnQrKzsKIAkJCW5lZWRfdG9fdmFsaWRh dGUgPSB0cnVlOwogCQkJYXF1aXJlX2dsb2JhbF9sb2NrID0gdHJ1ZTsKIAogCQl9IGVsc2UgaWYg KG1vZGVyZXNldF9yZXF1aXJlZChjcnRjX3N0YXRlKSkgewogCiAJCQkvKiBpLmUuIHJlc2V0IG1v ZGUgKi8KLQkJCWlmIChhY3J0Yy0+c3RyZWFtKSB7Ci0JCQkJZG1fc3RhdGUtPnNldF9jb3VudCA9 IHJlbW92ZV9mcm9tX3ZhbF9zZXRzKAotCQkJCQkJZG1fc3RhdGUtPnNldCwKLQkJCQkJCWRtX3N0 YXRlLT5zZXRfY291bnQsCi0JCQkJCQlhY3J0Yy0+c3RyZWFtKTsKKwkJCWlmIChuZXdfYWNydGNf c3RhdGUtPnN0cmVhbSkgeworCQkJCXNldF9jb3VudCA9IHJlbW92ZV9mcm9tX3ZhbF9zZXRzKAor CQkJCQkJc2V0LAorCQkJCQkJc2V0X2NvdW50LAorCQkJCQkJbmV3X2FjcnRjX3N0YXRlLT5zdHJl YW0pOworCisJCQkJZGNfc3RyZWFtX3JlbGVhc2UobmV3X2FjcnRjX3N0YXRlLT5zdHJlYW0pOwor CQkJCW5ld19hY3J0Y19zdGF0ZS0+c3RyZWFtID0gTlVMTDsKKwogCQkJCWFxdWlyZV9nbG9iYWxf bG9jayA9IHRydWU7CiAJCQl9CiAJCX0KQEAgLTMyNzYsNiArMzI5MiwxMCBAQCBpbnQgYW1kZ3B1 X2RtX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCX0KIAogCS8qIENoZWNr IHNjYWxpbmcgYW5kIHVuZGVyc2FjbiBjaGFuZ2VzKi8KKwkvKlRPRE8gUmVtb3ZlZCBzY2FsaW5n IGNoYW5nZXMgdmFsaWRhdGlvbiBkdWUgdG8gaW5hYmlsaXR5IHRvIGNvbW1pdAorCSAqIG5ldyBz dHJlYW0gaW50byBjb250ZXh0IHdcbyBjYXVzaW5nIGZ1bGwgcmVzZXQuIE5lZWQgdG8KKwkgKiBk ZWNpZGUgaG93IHRvIGhhbmRsZS4KKwkgKi8KIAlmb3JfZWFjaF9jb25uZWN0b3JfaW5fc3RhdGUo c3RhdGUsIGNvbm5lY3RvciwgY29ubl9zdGF0ZSwgaSkgewogCQlzdHJ1Y3QgYW1kZ3B1X2Nvbm5l Y3RvciAqYWNvbm5lY3RvciA9IHRvX2FtZGdwdV9jb25uZWN0b3IoY29ubmVjdG9yKTsKIAkJc3Ry dWN0IGRtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29uX29sZF9zdGF0ZSA9CkBAIC0zMjgzLDcgKzMzMDMs NiBAQCBpbnQgYW1kZ3B1X2RtX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAog CQlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0YXRlICpjb25fbmV3X3N0YXRlID0KIAkJCQkJCXRvX2Rt X2Nvbm5lY3Rvcl9zdGF0ZShjb25uX3N0YXRlKTsKIAkJc3RydWN0IGFtZGdwdV9jcnRjICphY3J0 YyA9IHRvX2FtZGdwdV9jcnRjKGNvbl9uZXdfc3RhdGUtPmJhc2UuY3J0Yyk7Ci0JCXN0cnVjdCBk Y19zdHJlYW0gKm5ld19zdHJlYW07CiAKIAkJLyogU2tpcCBhbnkgbW9kZXNldHMvcmVzZXRzICov CiAJCWlmICghYWNydGMgfHwgZHJtX2F0b21pY19jcnRjX25lZWRzX21vZGVzZXQoYWNydGMtPmJh c2Uuc3RhdGUpKQpAQCAtMzI5MywzMiArMzMxMiwxMSBAQCBpbnQgYW1kZ3B1X2RtX2F0b21pY19j aGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpZiAoIWlzX3NjYWxpbmdfc3RhdGVfZGlm ZmVyZW50KGNvbl9uZXdfc3RhdGUsIGNvbl9vbGRfc3RhdGUpKQogCQkJY29udGludWU7CiAKLQkJ bmV3X3N0cmVhbSA9IGNyZWF0ZV9zdHJlYW1fZm9yX3NpbmsoCi0JCQkJYWNvbm5lY3RvciwKLQkJ CQkmYWNydGMtPmJhc2Uuc3RhdGUtPm1vZGUsCi0JCQkJY29uX25ld19zdGF0ZSk7Ci0KLQkJaWYg KCFuZXdfc3RyZWFtKSB7Ci0JCQlEUk1fRVJST1IoIiVzOiBGYWlsZWQgdG8gY3JlYXRlIG5ldyBz dHJlYW0gZm9yIGNydGMgJWRcbiIsCi0JCQkJCV9fZnVuY19fLCBhY3J0Yy0+YmFzZS5iYXNlLmlk KTsKLQkJCWNvbnRpbnVlOwotCQl9Ci0KLQkJbmV3X3N0cmVhbXNbbmV3X3N0cmVhbV9jb3VudF0g PSBuZXdfc3RyZWFtOwotCQlkbV9zdGF0ZS0+c2V0X2NvdW50ID0gdXBkYXRlX2luX3ZhbF9zZXRz X3N0cmVhbSgKLQkJCQlkbV9zdGF0ZS0+c2V0LAotCQkJCWNydGNfc2V0LAotCQkJCWRtX3N0YXRl LT5zZXRfY291bnQsCi0JCQkJYWNydGMtPnN0cmVhbSwKLQkJCQluZXdfc3RyZWFtLAotCQkJCSZh Y3J0Yy0+YmFzZSk7Ci0KLQkJbmV3X3N0cmVhbV9jb3VudCsrOwogCQluZWVkX3RvX3ZhbGlkYXRl ID0gdHJ1ZTsKIAkJYXF1aXJlX2dsb2JhbF9sb2NrID0gdHJ1ZTsKIAl9CiAKLQlmb3IgKGkgPSAw OyBpIDwgZG1fc3RhdGUtPnNldF9jb3VudDsgaSsrKSB7CisJZm9yIChpID0gMDsgaSA8IHNldF9j b3VudDsgaSsrKSB7CiAJCWZvcl9lYWNoX3BsYW5lX2luX3N0YXRlKHN0YXRlLCBwbGFuZSwgcGxh bmVfc3RhdGUsIGopIHsKIAkJCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHBsYW5lX3N0YXRlLT5j cnRjOwogCQkJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBwbGFuZV9zdGF0ZS0+ZmI7CkBA IC0zMzc0LDkgKzMzNzIsOSBAQCBpbnQgYW1kZ3B1X2RtX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCQkJCQlwbGFuZV9zdGF0ZSwKIAkJCQkJZmFsc2UpOwogCi0JCQkJYWRk X3ZhbF9zZXRzX3N1cmZhY2UoZG1fc3RhdGUtPnNldCwKLQkJCQkJCSAgICAgZG1fc3RhdGUtPnNl dF9jb3VudCwKLQkJCQkJCSAgICAgZG1fc3RhdGUtPnNldFtpXS5zdHJlYW0sCisJCQkJYWRkX3Zh bF9zZXRzX3N1cmZhY2Uoc2V0LAorCQkJCQkJICAgICBzZXRfY291bnQsCisJCQkJCQkgICAgIHNl dFtpXS5zdHJlYW0sCiAJCQkJCQkgICAgIHN1cmZhY2UpOwogCiAJCQkJbmVlZF90b192YWxpZGF0 ZSA9IHRydWU7CkBAIC0zMzg1LDkgKzMzODMsOSBAQCBpbnQgYW1kZ3B1X2RtX2F0b21pY19jaGVj ayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQl9CiAJfQogCi0JZG1fc3RhdGUtPmNvbnRleHQg PSBkY19nZXRfdmFsaWRhdGVfY29udGV4dChkYywgZG1fc3RhdGUtPnNldCwgZG1fc3RhdGUtPnNl dF9jb3VudCk7CisJZG1fc3RhdGUtPmNvbnRleHQgPSBkY19nZXRfdmFsaWRhdGVfY29udGV4dChk Yywgc2V0LCBzZXRfY291bnQpOwogCi0JaWYgKG5lZWRfdG9fdmFsaWRhdGUgPT0gZmFsc2UgfHwg ZG1fc3RhdGUtPnNldF9jb3VudCA9PSAwIHx8IGRtX3N0YXRlLT5jb250ZXh0KSB7CisJaWYgKG5l ZWRfdG9fdmFsaWRhdGUgPT0gZmFsc2UgfHwgc2V0X2NvdW50ID09IDAgfHwgZG1fc3RhdGUtPmNv bnRleHQpIHsKIAkJcmV0ID0gMDsKIAkJLyoKIAkJICogRm9yIGZ1bGwgdXBkYXRlcyBjYXNlIHdo ZW4KQEAgLTM0MDMsNiArMzQwMSwyMSBAQCBpbnQgYW1kZ3B1X2RtX2F0b21pY19jaGVjayhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJfQogCisJLyogVE9ETyB1bnRpbCBzdXJmYWNlcyBhcmUg bW92ZWQgaW50byBkbV9wbGFuZV9zdGF0ZSByZWxlYXNlIHRoZW0KKwkgKiBoZXJlCisJICovCisJ Zm9yIChpID0gMDsgaSA8IHNldF9jb3VudDsgaSsrKQorCQlmb3IgKGogPSAwOyBqIDwgc2V0W2ld LnN1cmZhY2VfY291bnQ7IGorKykKKwkJCWRjX3N1cmZhY2VfcmVsZWFzZShzZXRbaV0uc3VyZmFj ZXNbal0pOworCisJbGlzdF9mb3JfZWFjaF9lbnRyeShjcnRjLCAmZGV2LT5tb2RlX2NvbmZpZy5j cnRjX2xpc3QsIGhlYWQpIHsKKwkJb2xkX2FjcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShj cnRjLT5zdGF0ZSk7CisKKwkJaWYgKG9sZF9hY3J0Y19zdGF0ZS0+c3RyZWFtKQorCQkJZGNfc3Ry ZWFtX3JlbGVhc2Uob2xkX2FjcnRjX3N0YXRlLT5zdHJlYW0pOworCX0KKworCiAJaWYgKHJldCAh PSAwKSB7CiAJCWlmIChyZXQgPT0gLUVERUFETEspCiAJCQlEUk1fREVCVUdfS01TKCJBdG9taWMg Y2hlY2sgc3RvcHBlZCBkdWUgdG8gdG8gZGVhZGxvY2suXG4iKTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX3R5cGVzLmggYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5oCmluZGV4 IDFlNDQ0Y2IuLjM2Y2IxYzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxh eS9hbWRncHVfZG0vYW1kZ3B1X2RtX3R5cGVzLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMuaApAQCAtNDUsNyArNDUsNyBAQCBzdHJ1 Y3QgZG1fcGxhbmVfc3RhdGUgewogCiBzdHJ1Y3QgZG1fY3J0Y19zdGF0ZSB7CiAJc3RydWN0IGRy bV9jcnRjX3N0YXRlIGJhc2U7Ci0Jc3RydWN0IGRjX3N0cmVhbSAqZGNfc3RyZWFtOworCWNvbnN0 IHN0cnVjdCBkY19zdHJlYW0gKnN0cmVhbTsKIH07CiAKICNkZWZpbmUgdG9fZG1fY3J0Y19zdGF0 ZSh4KSAgICBjb250YWluZXJfb2YoeCwgc3RydWN0IGRtX2NydGNfc3RhdGUsIGJhc2UpCkBAIC01 Myw4ICs1Myw2IEBAIHN0cnVjdCBkbV9jcnRjX3N0YXRlIHsKIHN0cnVjdCBkbV9hdG9taWNfc3Rh dGUgewogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlIGJhc2U7CiAKLQlzdHJ1Y3QgZGNfdmFsaWRh dGlvbl9zZXQgc2V0W01BWF9TVFJFQU1TXTsKLQlpbnQgc2V0X2NvdW50OwogCXN0cnVjdCB2YWxp ZGF0ZV9jb250ZXh0ICpjb250ZXh0OwogfTsKIApAQCAtODMsNiArODEsMTEgQEAgdm9pZCBhbWRn cHVfZG1fZW5jb2Rlcl9kZXN0cm95KHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2Rlcik7CiAKIGlu dCBhbWRncHVfZG1fY29ubmVjdG9yX2dldF9tb2RlcyhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29u bmVjdG9yKTsKIAoraW50IGFtZGdwdV9kbV9hdG9taWNfY29tbWl0KAorCQlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAorCQlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCisJCWJvb2wgbm9u YmxvY2spOworCiB2b2lkIGFtZGdwdV9kbV9hdG9taWNfY29tbWl0X3RhaWwoCiAJc3RydWN0IGRy bV9hdG9taWNfc3RhdGUgKnN0YXRlKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2RjLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGMuaApp bmRleCA1ZDY1NDE2Li40MmMxYWE4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rp c3BsYXkvZGMvZGMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGMuaApA QCAtNDgxLDggKzQ4MSw2IEBAIHN0cnVjdCBkY19zdHJlYW0gewogCS8qIFRPRE86IEFCTSBpbmZv IChETUNVKSAqLwogCS8qIFRPRE86IFBTUiBpbmZvICovCiAJLyogVE9ETzogQ0VBIFZJQyAqLwot Ci0Jdm9pZCAqcHJpdjsKIH07CiAKIHN0cnVjdCBkY19zdHJlYW1fdXBkYXRlIHsKLS0gCjIuNy40 CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4 IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK