From: Harry Wentland Subject: [PATCH 12/28] drm/amd/display: Unify amdgpu_dm state variable namings. Date: Thu, 19 Oct 2017 13:46:31 -0400 Message-ID: <20171019174647.21260-13-harry.wentland@amd.com> References: <20171019174647.21260-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171019174647.21260-1-harry.wentland-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: "Leo (Sunpeng) Li" RnJvbTogIkxlbyAoU3VucGVuZykgTGkiIDxzdW5wZW5nLmxpQGFtZC5jb20+CgpVc2UgZG1fbmV3 Xypfc3RhdGUgYW5kIGRtX29sZF8qX3N0YXRlIGZvciB0aGVpciByZXNwZWN0aXZlIGFtZGdwdV9k bSBuZXcKYW5kIG9sZCBvYmplY3Qgc3RhdGVzLiBIZWxwcyB3aXRoIHJlYWRhYmlsaXR5LCBhbmQg ZW5mb3JjZXMgdXNlIG9mIG5ldwpEUk0gYXBpIChjaG9vc2UgZWl0aGVyIG5ldywgb3Igb2xkKS4K ClNpZ25lZC1vZmYtYnk6IExlbyAoU3VucGVuZykgTGkgPHN1bnBlbmcubGlAYW1kLmNvbT4KUmV2 aWV3ZWQtYnk6IFN1biBwZW5nIExpIDxTdW5wZW5nLkxpQGFtZC5jb20+CkFja2VkLWJ5OiBIYXJy eSBXZW50bGFuZCA8SGFycnkuV2VudGxhbmRAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5jIHwgMTY4ICsrKysrKysrKysrLS0tLS0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA4NCBpbnNlcnRpb25zKCspLCA4NCBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdw dV9kbS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0u YwppbmRleCAxYjExZWEyM2YxMTIuLmNjNGNmM2RhYjFhZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYworKysgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5jCkBAIC02NDEsMTAgKzY0MSwx MCBAQCBpbnQgYW1kZ3B1X2RtX2Rpc3BsYXlfcmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2KQogCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7CiAJc3RydWN0IGRybV9jcnRj ICpjcnRjOwogCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGU7Ci0Jc3RydWN0 IGRtX2NydGNfc3RhdGUgKmRtX2NydGNfc3RhdGU7CisJc3RydWN0IGRtX2NydGNfc3RhdGUgKmRt X25ld19jcnRjX3N0YXRlOwogCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwogCXN0cnVjdCBkcm1f cGxhbmVfc3RhdGUgKm5ld19wbGFuZV9zdGF0ZTsKLQlzdHJ1Y3QgZG1fcGxhbmVfc3RhdGUgKmRt X3BsYW5lX3N0YXRlOworCXN0cnVjdCBkbV9wbGFuZV9zdGF0ZSAqZG1fbmV3X3BsYW5lX3N0YXRl OwogCXN0cnVjdCBkbV9hdG9taWNfc3RhdGUgKmNhY2hlZF9zdGF0ZTsKIAlpbnQgcmV0ID0gMDsK IAlpbnQgaTsKQEAgLTY5OSwyMCArNjk5LDIwIEBAIGludCBhbWRncHVfZG1fZGlzcGxheV9yZXN1 bWUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJZGNfcmVzb3VyY2Vfc3RhdGVfY29weV9j b25zdHJ1Y3RfY3VycmVudChhZGV2LT5kbS5kYywgY2FjaGVkX3N0YXRlLT5jb250ZXh0KTsKIAog CWZvcl9lYWNoX25ld19jcnRjX2luX3N0YXRlKGFkZXYtPmRtLmNhY2hlZF9zdGF0ZSwgY3J0Yywg bmV3X2NydGNfc3RhdGUsIGkpIHsKLQkJZG1fY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3RhdGUo bmV3X2NydGNfc3RhdGUpOwotCQlpZiAoZG1fY3J0Y19zdGF0ZS0+c3RyZWFtKSB7Ci0JCQlXQVJO X09OKGtyZWZfcmVhZCgmZG1fY3J0Y19zdGF0ZS0+c3RyZWFtLT5yZWZjb3VudCkgPiAxKTsKLQkJ CWRjX3N0cmVhbV9yZWxlYXNlKGRtX2NydGNfc3RhdGUtPnN0cmVhbSk7Ci0JCQlkbV9jcnRjX3N0 YXRlLT5zdHJlYW0gPSBOVUxMOworCQlkbV9uZXdfY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3Rh dGUobmV3X2NydGNfc3RhdGUpOworCQlpZiAoZG1fbmV3X2NydGNfc3RhdGUtPnN0cmVhbSkgewor CQkJV0FSTl9PTihrcmVmX3JlYWQoJmRtX25ld19jcnRjX3N0YXRlLT5zdHJlYW0tPnJlZmNvdW50 KSA+IDEpOworCQkJZGNfc3RyZWFtX3JlbGVhc2UoZG1fbmV3X2NydGNfc3RhdGUtPnN0cmVhbSk7 CisJCQlkbV9uZXdfY3J0Y19zdGF0ZS0+c3RyZWFtID0gTlVMTDsKIAkJfQogCX0KIAogCWZvcl9l YWNoX25ld19wbGFuZV9pbl9zdGF0ZShhZGV2LT5kbS5jYWNoZWRfc3RhdGUsIHBsYW5lLCBuZXdf cGxhbmVfc3RhdGUsIGkpIHsKLQkJZG1fcGxhbmVfc3RhdGUgPSB0b19kbV9wbGFuZV9zdGF0ZShu ZXdfcGxhbmVfc3RhdGUpOwotCQlpZiAoZG1fcGxhbmVfc3RhdGUtPmRjX3N0YXRlKSB7Ci0JCQlX QVJOX09OKGtyZWZfcmVhZCgmZG1fcGxhbmVfc3RhdGUtPmRjX3N0YXRlLT5yZWZjb3VudCkgPiAx KTsKLQkJCWRjX3BsYW5lX3N0YXRlX3JlbGVhc2UoZG1fcGxhbmVfc3RhdGUtPmRjX3N0YXRlKTsK LQkJCWRtX3BsYW5lX3N0YXRlLT5kY19zdGF0ZSA9IE5VTEw7CisJCWRtX25ld19wbGFuZV9zdGF0 ZSA9IHRvX2RtX3BsYW5lX3N0YXRlKG5ld19wbGFuZV9zdGF0ZSk7CisJCWlmIChkbV9uZXdfcGxh bmVfc3RhdGUtPmRjX3N0YXRlKSB7CisJCQlXQVJOX09OKGtyZWZfcmVhZCgmZG1fbmV3X3BsYW5l X3N0YXRlLT5kY19zdGF0ZS0+cmVmY291bnQpID4gMSk7CisJCQlkY19wbGFuZV9zdGF0ZV9yZWxl YXNlKGRtX25ld19wbGFuZV9zdGF0ZS0+ZGNfc3RhdGUpOworCQkJZG1fbmV3X3BsYW5lX3N0YXRl LT5kY19zdGF0ZSA9IE5VTEw7CiAJCX0KIAl9CiAKQEAgLTM5MzMsNyArMzkzMyw3IEBAIHN0YXRp YyB2b2lkIGFtZGdwdV9kbV9jb21taXRfcGxhbmVzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz dGF0ZSwKIAkJCQlkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShzdGF0ZSwgY3J0Yyk7CiAJ CXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gbmV3X3BsYW5lX3N0YXRlLT5mYjsKIAkJYm9v bCBwZmxpcF9uZWVkZWQ7Ci0JCXN0cnVjdCBkbV9wbGFuZV9zdGF0ZSAqZG1fcGxhbmVfc3RhdGUg PSB0b19kbV9wbGFuZV9zdGF0ZShuZXdfcGxhbmVfc3RhdGUpOworCQlzdHJ1Y3QgZG1fcGxhbmVf c3RhdGUgKmRtX25ld19wbGFuZV9zdGF0ZSA9IHRvX2RtX3BsYW5lX3N0YXRlKG5ld19wbGFuZV9z dGF0ZSk7CiAKIAkJaWYgKHBsYW5lLT50eXBlID09IERSTV9QTEFORV9UWVBFX0NVUlNPUikgewog CQkJaGFuZGxlX2N1cnNvcl91cGRhdGUocGxhbmUsIG9sZF9wbGFuZV9zdGF0ZSk7CkBAIC0zOTU3 LDkgKzM5NTcsOSBAQCBzdGF0aWMgdm9pZCBhbWRncHVfZG1fY29tbWl0X3BsYW5lcyhzdHJ1Y3Qg ZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmNydGMt PmRldi0+ZXZlbnRfbG9jaywgZmxhZ3MpOwogCiAJCWlmICghcGZsaXBfbmVlZGVkKSB7Ci0JCQlX QVJOX09OKCFkbV9wbGFuZV9zdGF0ZS0+ZGNfc3RhdGUpOworCQkJV0FSTl9PTighZG1fbmV3X3Bs YW5lX3N0YXRlLT5kY19zdGF0ZSk7CiAKLQkJCXBsYW5lX3N0YXRlc19jb25zdHJ1Y3RlZFtwbGFu ZXNfY291bnRdID0gZG1fcGxhbmVfc3RhdGUtPmRjX3N0YXRlOworCQkJcGxhbmVfc3RhdGVzX2Nv bnN0cnVjdGVkW3BsYW5lc19jb3VudF0gPSBkbV9uZXdfcGxhbmVfc3RhdGUtPmRjX3N0YXRlOwog CiAJCQlkY19zdHJlYW1fYXR0YWNoID0gYWNydGNfc3RhdGUtPnN0cmVhbTsKIAkJCXBsYW5lc19j b3VudCsrOwpAQCAtNDAyNywxMCArNDAyNywxMCBAQCBzdGF0aWMgaW50IGFtZGdwdV9kbV9hdG9t aWNfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJICogdGhlIElTUnMuCiAJICovCiAJ Zm9yX2VhY2hfb2xkbmV3X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRl LCBuZXdfY3J0Y19zdGF0ZSwgaSkgewotCQlzdHJ1Y3QgZG1fY3J0Y19zdGF0ZSAqb2xkX2FjcnRj X3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShvbGRfY3J0Y19zdGF0ZSk7CisJCXN0cnVjdCBkbV9j cnRjX3N0YXRlICpkbV9vbGRfY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3RhdGUob2xkX2NydGNf c3RhdGUpOwogCQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0gdG9fYW1kZ3B1X2NydGMoY3J0 Yyk7CiAKLQkJaWYgKGRybV9hdG9taWNfY3J0Y19uZWVkc19tb2Rlc2V0KG5ld19jcnRjX3N0YXRl KSAmJiBvbGRfYWNydGNfc3RhdGUtPnN0cmVhbSkKKwkJaWYgKGRybV9hdG9taWNfY3J0Y19uZWVk c19tb2Rlc2V0KG5ld19jcnRjX3N0YXRlKSAmJiBkbV9vbGRfY3J0Y19zdGF0ZS0+c3RyZWFtKQog CQkJbWFuYWdlX2RtX2ludGVycnVwdHMoYWRldiwgYWNydGMsIGZhbHNlKTsKIAl9CiAJLyogQWRk IGNoZWNrIGhlcmUgZm9yIFNvQydzIHRoYXQgc3VwcG9ydCBoYXJkd2FyZSBjdXJzb3IgcGxhbmUs IHRvCkBAIC00MDU3LDcgKzQwNTcsNyBAQCBzdGF0aWMgdm9pZCBhbWRncHVfZG1fYXRvbWljX2Nv bW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAlib29sIHdhaXRfZm9y X3ZibGFuayA9IHRydWU7CiAJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKIAlzdHJ1 Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqb2xkX2Nvbl9zdGF0ZSwgKm5ld19jb25fc3RhdGU7Ci0J c3RydWN0IGRtX2NydGNfc3RhdGUgKm9sZF9hY3J0Y19zdGF0ZSwgKm5ld19hY3J0Y19zdGF0ZTsK KwlzdHJ1Y3QgZG1fY3J0Y19zdGF0ZSAqZG1fb2xkX2NydGNfc3RhdGUsICpkbV9uZXdfY3J0Y19z dGF0ZTsKIAogCWRybV9hdG9taWNfaGVscGVyX3VwZGF0ZV9sZWdhY3lfbW9kZXNldF9zdGF0ZShk ZXYsIHN0YXRlKTsKIApAQCAtNDA2Nyw4ICs0MDY3LDggQEAgc3RhdGljIHZvaWQgYW1kZ3B1X2Rt X2F0b21pY19jb21taXRfdGFpbChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJZm9y X2VhY2hfb2xkbmV3X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRlLCBu ZXdfY3J0Y19zdGF0ZSwgaSkgewogCQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0gdG9fYW1k Z3B1X2NydGMoY3J0Yyk7CiAKLQkJbmV3X2FjcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShu ZXdfY3J0Y19zdGF0ZSk7Ci0JCW9sZF9hY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3RhdGUob2xk X2NydGNfc3RhdGUpOworCQlkbV9uZXdfY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3RhdGUobmV3 X2NydGNfc3RhdGUpOworCQlkbV9vbGRfY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3RhdGUob2xk X2NydGNfc3RhdGUpOwogCiAJCURSTV9ERUJVR19EUklWRVIoCiAJCQkiYW1kZ3B1X2NydGMgaWQ6 JWQgY3J0Y19zdGF0ZV9mbGFnczogZW5hYmxlOiVkLCBhY3RpdmU6JWQsICIKQEAgLTQwODYsMTEg KzQwODYsMTEgQEAgc3RhdGljIHZvaWQgYW1kZ3B1X2RtX2F0b21pY19jb21taXRfdGFpbChzdHJ1 Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJCSAqIGFjb25uZWN0b3IgYXMgbmVlZGVkCiAJ CSAqLwogCi0JCWlmIChtb2Rlc2V0X3JlcXVpcmVkKG5ld19jcnRjX3N0YXRlLCBuZXdfYWNydGNf c3RhdGUtPnN0cmVhbSwgb2xkX2FjcnRjX3N0YXRlLT5zdHJlYW0pKSB7CisJCWlmIChtb2Rlc2V0 X3JlcXVpcmVkKG5ld19jcnRjX3N0YXRlLCBkbV9uZXdfY3J0Y19zdGF0ZS0+c3RyZWFtLCBkbV9v bGRfY3J0Y19zdGF0ZS0+c3RyZWFtKSkgewogCiAJCQlEUk1fREVCVUdfRFJJVkVSKCJBdG9taWMg Y29tbWl0OiBTRVQgY3J0YyBpZCAlZDogWyVwXVxuIiwgYWNydGMtPmNydGNfaWQsIGFjcnRjKTsK IAotCQkJaWYgKCFuZXdfYWNydGNfc3RhdGUtPnN0cmVhbSkgeworCQkJaWYgKCFkbV9uZXdfY3J0 Y19zdGF0ZS0+c3RyZWFtKSB7CiAJCQkJLyoKIAkJCQkgKiB0aGlzIGNvdWxkIGhhcHBlbiBiZWNh dXNlIG9mIGlzc3VlcyB3aXRoCiAJCQkJICogdXNlcnNwYWNlIG5vdGlmaWNhdGlvbnMgZGVsaXZl cnkuCkBAIC00MTEyLDggKzQxMTIsOCBAQCBzdGF0aWMgdm9pZCBhbWRncHVfZG1fYXRvbWljX2Nv bW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJCX0KIAogCi0JCQlp ZiAob2xkX2FjcnRjX3N0YXRlLT5zdHJlYW0pCi0JCQkJcmVtb3ZlX3N0cmVhbShhZGV2LCBhY3J0 Yywgb2xkX2FjcnRjX3N0YXRlLT5zdHJlYW0pOworCQkJaWYgKGRtX29sZF9jcnRjX3N0YXRlLT5z dHJlYW0pCisJCQkJcmVtb3ZlX3N0cmVhbShhZGV2LCBhY3J0YywgZG1fb2xkX2NydGNfc3RhdGUt PnN0cmVhbSk7CiAKIAogCQkJLyoKQEAgLTQxMzcsOCArNDEzNyw4IEBAIHN0YXRpYyB2b2lkIGFt ZGdwdV9kbV9hdG9taWNfY29tbWl0X3RhaWwoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRl KQogCQkJRFJNX0RFQlVHX0RSSVZFUigiQXRvbWljIGNvbW1pdDogUkVTRVQuIGNydGMgaWQgJWQ6 WyVwXVxuIiwgYWNydGMtPmNydGNfaWQsIGFjcnRjKTsKIAogCQkJLyogaS5lLiByZXNldCBtb2Rl ICovCi0JCQlpZiAob2xkX2FjcnRjX3N0YXRlLT5zdHJlYW0pCi0JCQkJcmVtb3ZlX3N0cmVhbShh ZGV2LCBhY3J0Yywgb2xkX2FjcnRjX3N0YXRlLT5zdHJlYW0pOworCQkJaWYgKGRtX29sZF9jcnRj X3N0YXRlLT5zdHJlYW0pCisJCQkJcmVtb3ZlX3N0cmVhbShhZGV2LCBhY3J0YywgZG1fb2xkX2Ny dGNfc3RhdGUtPnN0cmVhbSk7CiAJCX0KIAl9IC8qIGZvcl9lYWNoX2NydGNfaW5fc3RhdGUoKSAq LwogCkBAIC00MTUyLDkgKzQxNTIsOSBAQCBzdGF0aWMgdm9pZCBhbWRncHVfZG1fYXRvbWljX2Nv bW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAogCQkJbmV3X2NydGNf c3RhdGUgPSBkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZSgKIAkJCQkJc3RhdGUsICZuZXdf Y3J0Y3NbaV0tPmJhc2UpOwotCQkJbmV3X2FjcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShu ZXdfY3J0Y19zdGF0ZSk7CisJCQlkbV9uZXdfY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3RhdGUo bmV3X2NydGNfc3RhdGUpOwogCi0JCQluZXdfc3RyZWFtID0gbmV3X2FjcnRjX3N0YXRlLT5zdHJl YW07CisJCQluZXdfc3RyZWFtID0gZG1fbmV3X2NydGNfc3RhdGUtPnN0cmVhbTsKIAkJCWFjb25u ZWN0b3IgPQogCQkJCWFtZGdwdV9kbV9maW5kX2ZpcnN0X2NydGNfbWF0Y2hpbmdfY29ubmVjdG9y KAogCQkJCQlzdGF0ZSwKQEAgLTQxNzQsNyArNDE3NCw3IEBAIHN0YXRpYyB2b2lkIGFtZGdwdV9k bV9hdG9taWNfY29tbWl0X3RhaWwoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCiAJ CQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0gdG9fYW1kZ3B1X2NydGMoY3J0Yyk7CiAJCQlz dHJ1Y3QgYW1kZ3B1X2RtX2Nvbm5lY3RvciAqYWNvbm5lY3RvciA9IE5VTEw7Ci0JCQlzdHJ1Y3Qg ZG1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlID0gTlVMTDsKKwkJCXN0cnVjdCBkbV9jb25u ZWN0b3Jfc3RhdGUgKmRtX25ld19jb25fc3RhdGUgPSBOVUxMOwogCQkJc3RydWN0IGRtX2NydGNf c3RhdGUgKmFjcnRjX3N0YXRlID0gTlVMTDsKIAogCQkJbmV3X2NydGNfc3RhdGUgPSBkcm1fYXRv bWljX2dldF9uZXdfY3J0Y19zdGF0ZSgKQEAgLTQxODksMTMgKzQxODksMTMgQEAgc3RhdGljIHZv aWQgYW1kZ3B1X2RtX2F0b21pY19jb21taXRfdGFpbChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGUpCiAJCQlpZiAoYWNvbm5lY3RvcikgewogCQkJCW5ld19jb25fc3RhdGUgPSBkcm1fYXRv bWljX2dldF9uZXdfY29ubmVjdG9yX3N0YXRlKAogCQkJCQkJc3RhdGUsICZhY29ubmVjdG9yLT5i YXNlKTsKLQkJCQljb25uX3N0YXRlID0gdG9fZG1fY29ubmVjdG9yX3N0YXRlKG5ld19jb25fc3Rh dGUpOworCQkJCWRtX25ld19jb25fc3RhdGUgPSB0b19kbV9jb25uZWN0b3Jfc3RhdGUobmV3X2Nv bl9zdGF0ZSk7CiAKIAkJCQlpZiAobmV3X3N0cmVhbSkgewogCQkJCQltb2RfZnJlZXN5bmNfc2V0 X3VzZXJfZW5hYmxlKGFkZXYtPmRtLmZyZWVzeW5jX21vZHVsZSwKIAkJCQkJCQkJICAgICAmYWNy dGNfc3RhdGUtPnN0cmVhbSwKIAkJCQkJCQkJICAgICAxLAotCQkJCQkJCQkgICAgICZjb25uX3N0 YXRlLT51c2VyX2VuYWJsZSk7CisJCQkJCQkJCSAgICAgJmRtX25ld19jb25fc3RhdGUtPnVzZXJf ZW5hYmxlKTsKIAkJCQl9CiAJCQl9CiAJCX0KQEAgLTQyMDcsMTQgKzQyMDcsMTQgQEAgc3RhdGlj IHZvaWQgYW1kZ3B1X2RtX2F0b21pY19jb21taXRfdGFpbChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0 ZSAqc3RhdGUpCiAJZm9yX2VhY2hfbmV3X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG5ld19j cnRjX3N0YXRlLCBpKSB7CiAJCXN0cnVjdCBhbWRncHVfY3J0YyAqYWNydGMgPSB0b19hbWRncHVf Y3J0YyhjcnRjKTsKIAotCQluZXdfYWNydGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRlKG5ld19j cnRjX3N0YXRlKTsKKwkJZG1fbmV3X2NydGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRlKG5ld19j cnRjX3N0YXRlKTsKIAotCQlpZiAobmV3X2FjcnRjX3N0YXRlLT5zdHJlYW0gIT0gTlVMTCkgewor CQlpZiAoZG1fbmV3X2NydGNfc3RhdGUtPnN0cmVhbSAhPSBOVUxMKSB7CiAJCQljb25zdCBzdHJ1 Y3QgZGNfc3RyZWFtX3N0YXR1cyAqc3RhdHVzID0KLQkJCQkJZGNfc3RyZWFtX2dldF9zdGF0dXMo bmV3X2FjcnRjX3N0YXRlLT5zdHJlYW0pOworCQkJCQlkY19zdHJlYW1fZ2V0X3N0YXR1cyhkbV9u ZXdfY3J0Y19zdGF0ZS0+c3RyZWFtKTsKIAogCQkJaWYgKCFzdGF0dXMpCi0JCQkJRENfRVJSKCJn b3Qgbm8gc3RhdHVzIGZvciBzdHJlYW0gJXAgb24gYWNydGMlcFxuIiwgbmV3X2FjcnRjX3N0YXRl LT5zdHJlYW0sIGFjcnRjKTsKKwkJCQlEQ19FUlIoImdvdCBubyBzdGF0dXMgZm9yIHN0cmVhbSAl cCBvbiBhY3J0YyVwXG4iLCBkbV9uZXdfY3J0Y19zdGF0ZS0+c3RyZWFtLCBhY3J0Yyk7CiAJCQll bHNlCiAJCQkJYWNydGMtPm90Z19pbnN0ID0gc3RhdHVzLT5wcmltYXJ5X290Z19pbnN0OwogCQl9 CkBAIC00MjIyLDkgKzQyMjIsOSBAQCBzdGF0aWMgdm9pZCBhbWRncHVfZG1fYXRvbWljX2NvbW1p dF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAogCS8qIEhhbmRsZSBzY2Fs aW5nIGFuZCB1bmRlcnNhY24gY2hhbmdlcyovCiAJZm9yX2VhY2hfb2xkbmV3X2Nvbm5lY3Rvcl9p bl9zdGF0ZShzdGF0ZSwgY29ubmVjdG9yLCBvbGRfY29uX3N0YXRlLCBuZXdfY29uX3N0YXRlLCBp KSB7Ci0JCXN0cnVjdCBkbV9jb25uZWN0b3Jfc3RhdGUgKmNvbl9uZXdfc3RhdGUgPSB0b19kbV9j b25uZWN0b3Jfc3RhdGUobmV3X2Nvbl9zdGF0ZSk7Ci0JCXN0cnVjdCBkbV9jb25uZWN0b3Jfc3Rh dGUgKmNvbl9vbGRfc3RhdGUgPSB0b19kbV9jb25uZWN0b3Jfc3RhdGUob2xkX2Nvbl9zdGF0ZSk7 Ci0JCXN0cnVjdCBhbWRncHVfY3J0YyAqYWNydGMgPSB0b19hbWRncHVfY3J0Yyhjb25fbmV3X3N0 YXRlLT5iYXNlLmNydGMpOworCQlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0YXRlICpkbV9uZXdfY29u X3N0YXRlID0gdG9fZG1fY29ubmVjdG9yX3N0YXRlKG5ld19jb25fc3RhdGUpOworCQlzdHJ1Y3Qg ZG1fY29ubmVjdG9yX3N0YXRlICpkbV9vbGRfY29uX3N0YXRlID0gdG9fZG1fY29ubmVjdG9yX3N0 YXRlKG9sZF9jb25fc3RhdGUpOworCQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0gdG9fYW1k Z3B1X2NydGMoZG1fbmV3X2Nvbl9zdGF0ZS0+YmFzZS5jcnRjKTsKIAkJc3RydWN0IGRjX3N0cmVh bV9zdGF0dXMgKnN0YXR1cyA9IE5VTEw7CiAKIAkJaWYgKGFjcnRjKQpAQCAtNDIzNSwxOSArNDIz NSwxOSBAQCBzdGF0aWMgdm9pZCBhbWRncHVfZG1fYXRvbWljX2NvbW1pdF90YWlsKHN0cnVjdCBk cm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJCWNvbnRpbnVlOwogCiAJCS8qIFNraXAgYW55IHRo aW5nIG5vdCBzY2FsZSBvciB1bmRlcnNjYW4gY2hhbmdlcyAqLwotCQlpZiAoIWlzX3NjYWxpbmdf c3RhdGVfZGlmZmVyZW50KGNvbl9uZXdfc3RhdGUsIGNvbl9vbGRfc3RhdGUpKQorCQlpZiAoIWlz X3NjYWxpbmdfc3RhdGVfZGlmZmVyZW50KGRtX25ld19jb25fc3RhdGUsIGRtX29sZF9jb25fc3Rh dGUpKQogCQkJY29udGludWU7CiAKLQkJbmV3X2FjcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0 ZShuZXdfY3J0Y19zdGF0ZSk7CisJCWRtX25ld19jcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0 ZShuZXdfY3J0Y19zdGF0ZSk7CiAKLQkJdXBkYXRlX3N0cmVhbV9zY2FsaW5nX3NldHRpbmdzKCZj b25fbmV3X3N0YXRlLT5iYXNlLmNydGMtPm1vZGUsCi0JCQkJY29uX25ld19zdGF0ZSwgKHN0cnVj dCBkY19zdHJlYW1fc3RhdGUgKiluZXdfYWNydGNfc3RhdGUtPnN0cmVhbSk7CisJCXVwZGF0ZV9z dHJlYW1fc2NhbGluZ19zZXR0aW5ncygmZG1fbmV3X2Nvbl9zdGF0ZS0+YmFzZS5jcnRjLT5tb2Rl LAorCQkJCWRtX25ld19jb25fc3RhdGUsIChzdHJ1Y3QgZGNfc3RyZWFtX3N0YXRlICopZG1fbmV3 X2NydGNfc3RhdGUtPnN0cmVhbSk7CiAKLQkJc3RhdHVzID0gZGNfc3RyZWFtX2dldF9zdGF0dXMo bmV3X2FjcnRjX3N0YXRlLT5zdHJlYW0pOworCQlzdGF0dXMgPSBkY19zdHJlYW1fZ2V0X3N0YXR1 cyhkbV9uZXdfY3J0Y19zdGF0ZS0+c3RyZWFtKTsKIAkJV0FSTl9PTighc3RhdHVzKTsKIAkJV0FS Tl9PTighc3RhdHVzLT5wbGFuZV9jb3VudCk7CiAKLQkJaWYgKCFuZXdfYWNydGNfc3RhdGUtPnN0 cmVhbSkKKwkJaWYgKCFkbV9uZXdfY3J0Y19zdGF0ZS0+c3RyZWFtKQogCQkJY29udGludWU7CiAK IAkJLypUT0RPIEhvdyBpdCB3b3JrcyB3aXRoIE1QTyA/Ki8KQEAgLTQyNTUsNyArNDI1NSw3IEBA IHN0YXRpYyB2b2lkIGFtZGdwdV9kbV9hdG9taWNfY29tbWl0X3RhaWwoc3RydWN0IGRybV9hdG9t aWNfc3RhdGUgKnN0YXRlKQogCQkJCWRtLT5kYywKIAkJCQlzdGF0dXMtPnBsYW5lX3N0YXRlcywK IAkJCQlzdGF0dXMtPnBsYW5lX2NvdW50LAotCQkJCW5ld19hY3J0Y19zdGF0ZS0+c3RyZWFtLAor CQkJCWRtX25ld19jcnRjX3N0YXRlLT5zdHJlYW0sCiAJCQkJZG1fc3RhdGUtPmNvbnRleHQpKQog CQkJZG1fZXJyb3IoIiVzOiBGYWlsZWQgdG8gdXBkYXRlIHN0cmVhbSBzY2FsaW5nIVxuIiwgX19m dW5jX18pOwogCX0KQEAgLTQyNjcsMjAgKzQyNjcsMjAgQEAgc3RhdGljIHZvaWQgYW1kZ3B1X2Rt X2F0b21pY19jb21taXRfdGFpbChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJCXN0 cnVjdCBhbWRncHVfY3J0YyAqYWNydGMgPSBuZXdfY3J0Y3NbaV07CiAKIAkJbmV3X2NydGNfc3Rh dGUgPSBkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShzdGF0ZSwgJmFjcnRjLT5iYXNlKTsK LQkJbmV3X2FjcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShuZXdfY3J0Y19zdGF0ZSk7CisJ CWRtX25ld19jcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShuZXdfY3J0Y19zdGF0ZSk7CiAK IAkJaWYgKGFkZXYtPmRtLmZyZWVzeW5jX21vZHVsZSkKIAkJCW1vZF9mcmVlc3luY19ub3RpZnlf bW9kZV9jaGFuZ2UoCi0JCQkJYWRldi0+ZG0uZnJlZXN5bmNfbW9kdWxlLCAmbmV3X2FjcnRjX3N0 YXRlLT5zdHJlYW0sIDEpOworCQkJCWFkZXYtPmRtLmZyZWVzeW5jX21vZHVsZSwgJmRtX25ld19j cnRjX3N0YXRlLT5zdHJlYW0sIDEpOwogCiAJCW1hbmFnZV9kbV9pbnRlcnJ1cHRzKGFkZXYsIGFj cnRjLCB0cnVlKTsKIAl9CiAKIAkvKiB1cGRhdGUgcGxhbmVzIHdoZW4gbmVlZGVkIHBlciBjcnRj Ki8KIAlmb3JfZWFjaF9uZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgcGNydGMsIG5ld19jcnRjX3N0 YXRlLCBqKSB7Ci0JCW5ld19hY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3RhdGUobmV3X2NydGNf c3RhdGUpOworCQlkbV9uZXdfY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3RhdGUobmV3X2NydGNf c3RhdGUpOwogCi0JCWlmIChuZXdfYWNydGNfc3RhdGUtPnN0cmVhbSkKKwkJaWYgKGRtX25ld19j cnRjX3N0YXRlLT5zdHJlYW0pCiAJCQlhbWRncHVfZG1fY29tbWl0X3BsYW5lcyhzdGF0ZSwgZGV2 LCBkbSwgcGNydGMsICZ3YWl0X2Zvcl92YmxhbmspOwogCX0KIApAQCAtNDQ1Myw3ICs0NDUzLDcg QEAgc3RhdGljIGludCBkbV91cGRhdGVfY3J0Y3Nfc3RhdGUoc3RydWN0IGRjICpkYywKIAlzdHJ1 Y3QgZHJtX2NydGMgKmNydGM7CiAJc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0 ZSwgKm5ld19jcnRjX3N0YXRlOwogCWludCBpOwotCXN0cnVjdCBkbV9jcnRjX3N0YXRlICpvbGRf YWNydGNfc3RhdGUsICpuZXdfYWNydGNfc3RhdGU7CisJc3RydWN0IGRtX2NydGNfc3RhdGUgKmRt X29sZF9jcnRjX3N0YXRlLCAqZG1fbmV3X2NydGNfc3RhdGU7CiAJc3RydWN0IGRtX2F0b21pY19z dGF0ZSAqZG1fc3RhdGUgPSB0b19kbV9hdG9taWNfc3RhdGUoc3RhdGUpOwogCXN0cnVjdCBkY19z dHJlYW1fc3RhdGUgKm5ld19zdHJlYW07CiAJaW50IHJldCA9IDA7CkBAIC00NDY4LDggKzQ0Njgs OCBAQCBzdGF0aWMgaW50IGRtX3VwZGF0ZV9jcnRjc19zdGF0ZShzdHJ1Y3QgZGMgKmRjLAogCiAJ CW5ld19zdHJlYW0gPSBOVUxMOwogCi0JCW9sZF9hY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3Rh dGUob2xkX2NydGNfc3RhdGUpOwotCQluZXdfYWNydGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRl KG5ld19jcnRjX3N0YXRlKTsKKwkJZG1fb2xkX2NydGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRl KG9sZF9jcnRjX3N0YXRlKTsKKwkJZG1fbmV3X2NydGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRl KG5ld19jcnRjX3N0YXRlKTsKIAkJYWNydGMgPSB0b19hbWRncHVfY3J0YyhjcnRjKTsKIAogCQlh Y29ubmVjdG9yID0gYW1kZ3B1X2RtX2ZpbmRfZmlyc3RfY3J0Y19tYXRjaGluZ19jb25uZWN0b3Io c3RhdGUsIGNydGMpOwpAQCAtNDUwNSw4ICs0NTA1LDggQEAgc3RhdGljIGludCBkbV91cGRhdGVf Y3J0Y3Nfc3RhdGUoc3RydWN0IGRjICpkYywKIAkJCX0KIAkJfQogCi0JCWlmIChkY19pc19zdHJl YW1fdW5jaGFuZ2VkKG5ld19zdHJlYW0sIG9sZF9hY3J0Y19zdGF0ZS0+c3RyZWFtKSAmJgotCQkJ CWRjX2lzX3N0cmVhbV9zY2FsaW5nX3VuY2hhbmdlZChuZXdfc3RyZWFtLCBvbGRfYWNydGNfc3Rh dGUtPnN0cmVhbSkpIHsKKwkJaWYgKGRjX2lzX3N0cmVhbV91bmNoYW5nZWQobmV3X3N0cmVhbSwg ZG1fb2xkX2NydGNfc3RhdGUtPnN0cmVhbSkgJiYKKwkJCQlkY19pc19zdHJlYW1fc2NhbGluZ191 bmNoYW5nZWQobmV3X3N0cmVhbSwgZG1fb2xkX2NydGNfc3RhdGUtPnN0cmVhbSkpIHsKIAogCQkJ bmV3X2NydGNfc3RhdGUtPm1vZGVfY2hhbmdlZCA9IGZhbHNlOwogCkBAIC00NTMzLDcgKzQ1MzMs NyBAQCBzdGF0aWMgaW50IGRtX3VwZGF0ZV9jcnRjc19zdGF0ZShzdHJ1Y3QgZGMgKmRjLAogCQkv KiBSZW1vdmUgc3RyZWFtIGZvciBhbnkgY2hhbmdlZC9kaXNhYmxlZCBDUlRDICovCiAJCWlmICgh ZW5hYmxlKSB7CiAKLQkJCWlmICghb2xkX2FjcnRjX3N0YXRlLT5zdHJlYW0pCisJCQlpZiAoIWRt X29sZF9jcnRjX3N0YXRlLT5zdHJlYW0pCiAJCQkJZ290byBuZXh0X2NydGM7CiAKIAkJCURSTV9E RUJVR19EUklWRVIoIkRpc2FibGluZyBEUk0gY3J0YzogJWRcbiIsCkBAIC00NTQzLDEzICs0NTQz LDEzIEBAIHN0YXRpYyBpbnQgZG1fdXBkYXRlX2NydGNzX3N0YXRlKHN0cnVjdCBkYyAqZGMsCiAJ CQlpZiAoZGNfcmVtb3ZlX3N0cmVhbV9mcm9tX2N0eCgKIAkJCQkJZGMsCiAJCQkJCWRtX3N0YXRl LT5jb250ZXh0LAotCQkJCQlvbGRfYWNydGNfc3RhdGUtPnN0cmVhbSkgIT0gRENfT0spIHsKKwkJ CQkJZG1fb2xkX2NydGNfc3RhdGUtPnN0cmVhbSkgIT0gRENfT0spIHsKIAkJCQlyZXQgPSAtRUlO VkFMOwogCQkJCWdvdG8gZmFpbDsKIAkJCX0KIAotCQkJZGNfc3RyZWFtX3JlbGVhc2Uob2xkX2Fj cnRjX3N0YXRlLT5zdHJlYW0pOwotCQkJbmV3X2FjcnRjX3N0YXRlLT5zdHJlYW0gPSBOVUxMOwor CQkJZGNfc3RyZWFtX3JlbGVhc2UoZG1fb2xkX2NydGNfc3RhdGUtPnN0cmVhbSk7CisJCQlkbV9u ZXdfY3J0Y19zdGF0ZS0+c3RyZWFtID0gTlVMTDsKIAogCQkJKmxvY2tfYW5kX3ZhbGlkYXRpb25f bmVlZGVkID0gdHJ1ZTsKIApAQCAtNDU2NiwxMSArNDU2NiwxMSBAQCBzdGF0aWMgaW50IGRtX3Vw ZGF0ZV9jcnRjc19zdGF0ZShzdHJ1Y3QgZGMgKmRjLAogCQkJCWdvdG8gbmV4dF9jcnRjOwogCiAJ CQlpZiAobW9kZXNldF9yZXF1aXJlZChuZXdfY3J0Y19zdGF0ZSwgbmV3X3N0cmVhbSwKLQkJCQkJ ICAgICBvbGRfYWNydGNfc3RhdGUtPnN0cmVhbSkpIHsKKwkJCQkJICAgICBkbV9vbGRfY3J0Y19z dGF0ZS0+c3RyZWFtKSkgewogCi0JCQkJV0FSTl9PTihuZXdfYWNydGNfc3RhdGUtPnN0cmVhbSk7 CisJCQkJV0FSTl9PTihkbV9uZXdfY3J0Y19zdGF0ZS0+c3RyZWFtKTsKIAotCQkJCW5ld19hY3J0 Y19zdGF0ZS0+c3RyZWFtID0gbmV3X3N0cmVhbTsKKwkJCQlkbV9uZXdfY3J0Y19zdGF0ZS0+c3Ry ZWFtID0gbmV3X3N0cmVhbTsKIAkJCQlkY19zdHJlYW1fcmV0YWluKG5ld19zdHJlYW0pOwogCiAJ CQkJRFJNX0RFQlVHX0RSSVZFUigiRW5hYmxpbmcgRFJNIGNydGM6ICVkXG4iLApAQCAtNDU3OSw3 ICs0NTc5LDcgQEAgc3RhdGljIGludCBkbV91cGRhdGVfY3J0Y3Nfc3RhdGUoc3RydWN0IGRjICpk YywKIAkJCQlpZiAoZGNfYWRkX3N0cmVhbV90b19jdHgoCiAJCQkJCQlkYywKIAkJCQkJCWRtX3N0 YXRlLT5jb250ZXh0LAotCQkJCQkJbmV3X2FjcnRjX3N0YXRlLT5zdHJlYW0pICE9IERDX09LKSB7 CisJCQkJCQlkbV9uZXdfY3J0Y19zdGF0ZS0+c3RyZWFtKSAhPSBEQ19PSykgewogCQkJCQlyZXQg PSAtRUlOVkFMOwogCQkJCQlnb3RvIGZhaWw7CiAJCQkJfQpAQCAtNDYxMSw5ICs0NjExLDkgQEAg c3RhdGljIGludCBkbV91cGRhdGVfcGxhbmVzX3N0YXRlKHN0cnVjdCBkYyAqZGMsCiAJc3RydWN0 IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwgKm5ld19jcnRjX3N0YXRlOwogCXN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lOwogCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm9sZF9wbGFuZV9z dGF0ZSwgKm5ld19wbGFuZV9zdGF0ZTsKLQlzdHJ1Y3QgZG1fY3J0Y19zdGF0ZSAqbmV3X2FjcnRj X3N0YXRlLCAqb2xkX2FjcnRjX3N0YXRlOworCXN0cnVjdCBkbV9jcnRjX3N0YXRlICpkbV9uZXdf Y3J0Y19zdGF0ZSwgKmRtX29sZF9jcnRjX3N0YXRlOwogCXN0cnVjdCBkbV9hdG9taWNfc3RhdGUg KmRtX3N0YXRlID0gdG9fZG1fYXRvbWljX3N0YXRlKHN0YXRlKTsKLQlzdHJ1Y3QgZG1fcGxhbmVf c3RhdGUgKm5ld19kbV9wbGFuZV9zdGF0ZSwgKm9sZF9kbV9wbGFuZV9zdGF0ZTsKKwlzdHJ1Y3Qg ZG1fcGxhbmVfc3RhdGUgKmRtX25ld19wbGFuZV9zdGF0ZSwgKmRtX29sZF9wbGFuZV9zdGF0ZTsK IAlpbnQgaSA7CiAJLyogVE9ETyByZXR1cm4gcGFnZV9mbGlwX25lZWRlZCgpIGZ1bmN0aW9uICov CiAJYm9vbCBwZmxpcF9uZWVkZWQgID0gIXN0YXRlLT5hbGxvd19tb2Rlc2V0OwpAQCAtNDYyNiw4 ICs0NjI2LDggQEAgc3RhdGljIGludCBkbV91cGRhdGVfcGxhbmVzX3N0YXRlKHN0cnVjdCBkYyAq ZGMsCiAJZm9yX2VhY2hfb2xkbmV3X3BsYW5lX2luX3N0YXRlKHN0YXRlLCBwbGFuZSwgb2xkX3Bs YW5lX3N0YXRlLCBuZXdfcGxhbmVfc3RhdGUsIGkpIHsKIAkJbmV3X3BsYW5lX2NydGMgPSBuZXdf cGxhbmVfc3RhdGUtPmNydGM7CiAJCW9sZF9wbGFuZV9jcnRjID0gb2xkX3BsYW5lX3N0YXRlLT5j cnRjOwotCQluZXdfZG1fcGxhbmVfc3RhdGUgPSB0b19kbV9wbGFuZV9zdGF0ZShuZXdfcGxhbmVf c3RhdGUpOwotCQlvbGRfZG1fcGxhbmVfc3RhdGUgPSB0b19kbV9wbGFuZV9zdGF0ZShvbGRfcGxh bmVfc3RhdGUpOworCQlkbV9uZXdfcGxhbmVfc3RhdGUgPSB0b19kbV9wbGFuZV9zdGF0ZShuZXdf cGxhbmVfc3RhdGUpOworCQlkbV9vbGRfcGxhbmVfc3RhdGUgPSB0b19kbV9wbGFuZV9zdGF0ZShv bGRfcGxhbmVfc3RhdGUpOwogCiAJCS8qVE9ETyBJbXBsZW1lbnQgYXRvbWljIGNoZWNrIGZvciBj dXJzb3IgcGxhbmUgKi8KIAkJaWYgKHBsYW5lLT50eXBlID09IERSTV9QTEFORV9UWVBFX0NVUlNP UikKQEAgLTQ2NDEsOSArNDY0MSw5IEBAIHN0YXRpYyBpbnQgZG1fdXBkYXRlX3BsYW5lc19zdGF0 ZShzdHJ1Y3QgZGMgKmRjLAogCiAJCQlvbGRfY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X29s ZF9jcnRjX3N0YXRlKAogCQkJCQlzdGF0ZSwgb2xkX3BsYW5lX2NydGMpOwotCQkJb2xkX2FjcnRj X3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShvbGRfY3J0Y19zdGF0ZSk7CisJCQlkbV9vbGRfY3J0 Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3RhdGUob2xkX2NydGNfc3RhdGUpOwogCi0JCQlpZiAoIW9s ZF9hY3J0Y19zdGF0ZS0+c3RyZWFtKQorCQkJaWYgKCFkbV9vbGRfY3J0Y19zdGF0ZS0+c3RyZWFt KQogCQkJCWNvbnRpbnVlOwogCiAJCQlEUk1fREVCVUdfRFJJVkVSKCJEaXNhYmxpbmcgRFJNIHBs YW5lOiAlZCBvbiBEUk0gY3J0YyAlZFxuIiwKQEAgLTQ2NTEsOCArNDY1MSw4IEBAIHN0YXRpYyBp bnQgZG1fdXBkYXRlX3BsYW5lc19zdGF0ZShzdHJ1Y3QgZGMgKmRjLAogCiAJCQlpZiAoIWRjX3Jl bW92ZV9wbGFuZV9mcm9tX2NvbnRleHQoCiAJCQkJCWRjLAotCQkJCQlvbGRfYWNydGNfc3RhdGUt PnN0cmVhbSwKLQkJCQkJb2xkX2RtX3BsYW5lX3N0YXRlLT5kY19zdGF0ZSwKKwkJCQkJZG1fb2xk X2NydGNfc3RhdGUtPnN0cmVhbSwKKwkJCQkJZG1fb2xkX3BsYW5lX3N0YXRlLT5kY19zdGF0ZSwK IAkJCQkJZG1fc3RhdGUtPmNvbnRleHQpKSB7CiAKIAkJCQlyZXQgPSBFSU5WQUw7CkBAIC00NjYw LDggKzQ2NjAsOCBAQCBzdGF0aWMgaW50IGRtX3VwZGF0ZV9wbGFuZXNfc3RhdGUoc3RydWN0IGRj ICpkYywKIAkJCX0KIAogCi0JCQlkY19wbGFuZV9zdGF0ZV9yZWxlYXNlKG9sZF9kbV9wbGFuZV9z dGF0ZS0+ZGNfc3RhdGUpOwotCQkJbmV3X2RtX3BsYW5lX3N0YXRlLT5kY19zdGF0ZSA9IE5VTEw7 CisJCQlkY19wbGFuZV9zdGF0ZV9yZWxlYXNlKGRtX29sZF9wbGFuZV9zdGF0ZS0+ZGNfc3RhdGUp OworCQkJZG1fbmV3X3BsYW5lX3N0YXRlLT5kY19zdGF0ZSA9IE5VTEw7CiAKIAkJCSpsb2NrX2Fu ZF92YWxpZGF0aW9uX25lZWRlZCA9IHRydWU7CiAKQEAgLTQ2NzQsMjcgKzQ2NzQsMjcgQEAgc3Rh dGljIGludCBkbV91cGRhdGVfcGxhbmVzX3N0YXRlKHN0cnVjdCBkYyAqZGMsCiAJCQkJY29udGlu dWU7CiAKIAkJCW5ld19jcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfbmV3X2NydGNfc3RhdGUo c3RhdGUsIG5ld19wbGFuZV9jcnRjKTsKLQkJCW5ld19hY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNf c3RhdGUobmV3X2NydGNfc3RhdGUpOworCQkJZG1fbmV3X2NydGNfc3RhdGUgPSB0b19kbV9jcnRj X3N0YXRlKG5ld19jcnRjX3N0YXRlKTsKIAotCQkJaWYgKCFuZXdfYWNydGNfc3RhdGUtPnN0cmVh bSkKKwkJCWlmICghZG1fbmV3X2NydGNfc3RhdGUtPnN0cmVhbSkKIAkJCQljb250aW51ZTsKIAog Ci0JCQlXQVJOX09OKG5ld19kbV9wbGFuZV9zdGF0ZS0+ZGNfc3RhdGUpOworCQkJV0FSTl9PTihk bV9uZXdfcGxhbmVfc3RhdGUtPmRjX3N0YXRlKTsKIAotCQkJbmV3X2RtX3BsYW5lX3N0YXRlLT5k Y19zdGF0ZSA9IGRjX2NyZWF0ZV9wbGFuZV9zdGF0ZShkYyk7CisJCQlkbV9uZXdfcGxhbmVfc3Rh dGUtPmRjX3N0YXRlID0gZGNfY3JlYXRlX3BsYW5lX3N0YXRlKGRjKTsKIAogCQkJRFJNX0RFQlVH X0RSSVZFUigiRW5hYmxpbmcgRFJNIHBsYW5lOiAlZCBvbiBEUk0gY3J0YyAlZFxuIiwKIAkJCQkJ cGxhbmUtPmJhc2UuaWQsIG5ld19wbGFuZV9jcnRjLT5iYXNlLmlkKTsKIAotCQkJaWYgKCFuZXdf ZG1fcGxhbmVfc3RhdGUtPmRjX3N0YXRlKSB7CisJCQlpZiAoIWRtX25ld19wbGFuZV9zdGF0ZS0+ ZGNfc3RhdGUpIHsKIAkJCQlyZXQgPSAtRUlOVkFMOwogCQkJCXJldHVybiByZXQ7CiAJCQl9CiAK IAkJCXJldCA9IGZpbGxfcGxhbmVfYXR0cmlidXRlcygKIAkJCQluZXdfcGxhbmVfY3J0Yy0+ZGV2 LT5kZXZfcHJpdmF0ZSwKLQkJCQluZXdfZG1fcGxhbmVfc3RhdGUtPmRjX3N0YXRlLAorCQkJCWRt X25ld19wbGFuZV9zdGF0ZS0+ZGNfc3RhdGUsCiAJCQkJbmV3X3BsYW5lX3N0YXRlLAogCQkJCW5l d19jcnRjX3N0YXRlLAogCQkJCWZhbHNlKTsKQEAgLTQ3MDQsOCArNDcwNCw4IEBAIHN0YXRpYyBp bnQgZG1fdXBkYXRlX3BsYW5lc19zdGF0ZShzdHJ1Y3QgZGMgKmRjLAogCiAJCQlpZiAoIWRjX2Fk ZF9wbGFuZV90b19jb250ZXh0KAogCQkJCQlkYywKLQkJCQkJbmV3X2FjcnRjX3N0YXRlLT5zdHJl YW0sCi0JCQkJCW5ld19kbV9wbGFuZV9zdGF0ZS0+ZGNfc3RhdGUsCisJCQkJCWRtX25ld19jcnRj X3N0YXRlLT5zdHJlYW0sCisJCQkJCWRtX25ld19wbGFuZV9zdGF0ZS0+ZGNfc3RhdGUsCiAJCQkJ CWRtX3N0YXRlLT5jb250ZXh0KSkgewogCiAJCQkJcmV0ID0gLUVJTlZBTDsKQEAgLTQ4MTMsOSAr NDgxMyw5IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2RtX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCSAqIGRlY2lkZSBob3cgdG8gaGFuZGxlLgogCSAqLwogCWZvcl9lYWNoX29s ZG5ld19jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3Rvciwgb2xkX2Nvbl9zdGF0ZSwg bmV3X2Nvbl9zdGF0ZSwgaSkgewotCQlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0YXRlICpjb25fb2xk X3N0YXRlID0gdG9fZG1fY29ubmVjdG9yX3N0YXRlKG9sZF9jb25fc3RhdGUpOwotCQlzdHJ1Y3Qg ZG1fY29ubmVjdG9yX3N0YXRlICpjb25fbmV3X3N0YXRlID0gdG9fZG1fY29ubmVjdG9yX3N0YXRl KG5ld19jb25fc3RhdGUpOwotCQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0gdG9fYW1kZ3B1 X2NydGMoY29uX25ld19zdGF0ZS0+YmFzZS5jcnRjKTsKKwkJc3RydWN0IGRtX2Nvbm5lY3Rvcl9z dGF0ZSAqZG1fb2xkX2Nvbl9zdGF0ZSA9IHRvX2RtX2Nvbm5lY3Rvcl9zdGF0ZShvbGRfY29uX3N0 YXRlKTsKKwkJc3RydWN0IGRtX2Nvbm5lY3Rvcl9zdGF0ZSAqZG1fbmV3X2Nvbl9zdGF0ZSA9IHRv X2RtX2Nvbm5lY3Rvcl9zdGF0ZShuZXdfY29uX3N0YXRlKTsKKwkJc3RydWN0IGFtZGdwdV9jcnRj ICphY3J0YyA9IHRvX2FtZGdwdV9jcnRjKGRtX25ld19jb25fc3RhdGUtPmJhc2UuY3J0Yyk7CiAK IAkJLyogU2tpcCBhbnkgbW9kZXNldHMvcmVzZXRzICovCiAJCWlmICghYWNydGMgfHwgZHJtX2F0 b21pY19jcnRjX25lZWRzX21vZGVzZXQoCkBAIC00ODIzLDcgKzQ4MjMsNyBAQCBzdGF0aWMgaW50 IGFtZGdwdV9kbV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCWNvbnRp bnVlOwogCiAJCS8qIFNraXAgYW55IHRoaW5nIG5vdCBzY2FsZSBvciB1bmRlcnNjYW4gY2hhbmdl cyAqLwotCQlpZiAoIWlzX3NjYWxpbmdfc3RhdGVfZGlmZmVyZW50KGNvbl9uZXdfc3RhdGUsIGNv bl9vbGRfc3RhdGUpKQorCQlpZiAoIWlzX3NjYWxpbmdfc3RhdGVfZGlmZmVyZW50KGRtX25ld19j b25fc3RhdGUsIGRtX29sZF9jb25fc3RhdGUpKQogCQkJY29udGludWU7CiAKIAkJbG9ja19hbmRf dmFsaWRhdGlvbl9uZWVkZWQgPSB0cnVlOwotLSAKMi4xNC4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2FtZC1nZngK