From: Ander Conselvan de Oliveira Subject: [RFC][PATCH 3/8] drm/i915: Pass new_config down do crtc_compute_clock Date: Mon, 8 Dec 2014 17:21:04 +0200 Message-ID: <1418052069-14831-4-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1418052069-14831-1-git-send-email-ander.conselvan.de.oliveira@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id E1CFE6E706 for ; Mon, 8 Dec 2014 07:21:30 -0800 (PST) In-Reply-To: <1418052069-14831-1-git-send-email-ander.conselvan.de.oliveira@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Ander Conselvan de Oliveira , shuang.he@linux.intel.com List-Id: intel-gfx@lists.freedesktop.org VGhpcyByZWR1Y2VzIHRoZSBudW1iZXIgb2YgZGlyZWN0IHVzZXJzIG9mIGNydGMtPm5ld19jb25m aWcuIEF0IHNvbWUKcG9pbnQgd2UnbGwgYmUgYWJsZSB0byBnZXQgcmlkIG9mIHRoYXQgcG9pbnRl ciBhbHRvZ2V0aGVyLCBpbiBmYXZvcgpvZiBkcm0gY29yZSBzdGF0ZSBzdHJ1Y3RzLgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICB8ICAgMyArLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGRpLmMgICAgIHwgIDI5ICsrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAxMzEgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAgNiArLQogNCBm aWxlcyBjaGFuZ2VkLCA5NCBpbnNlcnRpb25zKCspLCA3NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaAppbmRleCA3ZDYwZDM4Li5jMWE5YWY5IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKQEAgLTUwMCw3ICs1MDAsOCBAQCBzdHJ1Y3QgZHJtX2k5MTVfZGlzcGxheV9mdW5jcyB7 CiAJCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKik7CiAJdm9pZCAoKmdldF9wbGFuZV9jb25m aWcpKHN0cnVjdCBpbnRlbF9jcnRjICosCiAJCQkJIHN0cnVjdCBpbnRlbF9wbGFuZV9jb25maWcg Kik7Ci0JaW50ICgqY3J0Y19jb21wdXRlX2Nsb2NrKShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7 CisJaW50ICgqY3J0Y19jb21wdXRlX2Nsb2NrKShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKKwkJ CQkgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKTsKIAl2b2lkICgqY3J0Y19l bmFibGUpKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7CiAJdm9pZCAoKmNydGNfZGlzYWJsZSkoc3Ry dWN0IGRybV9jcnRjICpjcnRjKTsKIAl2b2lkICgqb2ZmKShzdHJ1Y3QgZHJtX2NydGMgKmNydGMp OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYwppbmRleCA3OWM5Nzc2Li45NzBjYTMwIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kZGkuYwpAQCAtOTA0LDYgKzkwNCw3IEBAIGhzd19kZGlfY2FsY3VsYXRl X3dycGxsKGludCBjbG9jayAvKiBpbiBIeiAqLywKIAogc3RhdGljIGJvb2wKIGhzd19kZGlfcGxs X3NlbGVjdChzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKKwkJICAgc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCSAgIHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRl bF9lbmNvZGVyLAogCQkgICBpbnQgY2xvY2spCiB7CkBAIC05MTgsMTYgKzkxOSwxNiBAQCBoc3df ZGRpX3BsbF9zZWxlY3Qoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCiAJCSAgICAgIFdS UExMX0RJVklERVJfUkVGRVJFTkNFKHIyKSB8IFdSUExMX0RJVklERVJfRkVFREJBQ0sobjIpIHwK IAkJICAgICAgV1JQTExfRElWSURFUl9QT1NUKHApOwogCi0JCWludGVsX2NydGMtPm5ld19jb25m aWctPmRwbGxfaHdfc3RhdGUud3JwbGwgPSB2YWw7CisJCWNydGNfc3RhdGUtPmRwbGxfaHdfc3Rh dGUud3JwbGwgPSB2YWw7CiAKLQkJcGxsID0gaW50ZWxfZ2V0X3NoYXJlZF9kcGxsKGludGVsX2Ny dGMpOworCQlwbGwgPSBpbnRlbF9nZXRfc2hhcmVkX2RwbGwoaW50ZWxfY3J0YywgY3J0Y19zdGF0 ZSk7CiAJCWlmIChwbGwgPT0gTlVMTCkgewogCQkJRFJNX0RFQlVHX0RSSVZFUigiZmFpbGVkIHRv IGZpbmQgUExMIGZvciBwaXBlICVjXG4iLAogCQkJCQkgcGlwZV9uYW1lKGludGVsX2NydGMtPnBp cGUpKTsKIAkJCXJldHVybiBmYWxzZTsKIAkJfQogCi0JCWludGVsX2NydGMtPm5ld19jb25maWct PmRkaV9wbGxfc2VsID0gUE9SVF9DTEtfU0VMX1dSUExMKHBsbC0+aWQpOworCQljcnRjX3N0YXRl LT5kZGlfcGxsX3NlbCA9IFBPUlRfQ0xLX1NFTF9XUlBMTChwbGwtPmlkKTsKIAl9CiAKIAlyZXR1 cm4gdHJ1ZTsKQEAgLTEwOTAsNiArMTA5MSw3IEBAIGZvdW5kOgogCiBzdGF0aWMgYm9vbAogc2ts X2RkaV9wbGxfc2VsZWN0KHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAorCQkgICBzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJICAgc3RydWN0IGludGVsX2VuY29k ZXIgKmludGVsX2VuY29kZXIsCiAJCSAgIGludCBjbG9jaykKIHsKQEAgLTExMzksMTEgKzExNDEs MTEgQEAgc2tsX2RkaV9wbGxfc2VsZWN0KHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAog CX0gZWxzZSAvKiBlRFAgKi8KIAkJcmV0dXJuIHRydWU7CiAKLQlpbnRlbF9jcnRjLT5uZXdfY29u ZmlnLT5kcGxsX2h3X3N0YXRlLmN0cmwxID0gY3RybDE7Ci0JaW50ZWxfY3J0Yy0+bmV3X2NvbmZp Zy0+ZHBsbF9od19zdGF0ZS5jZmdjcjEgPSBjZmdjcjE7Ci0JaW50ZWxfY3J0Yy0+bmV3X2NvbmZp Zy0+ZHBsbF9od19zdGF0ZS5jZmdjcjIgPSBjZmdjcjI7CisJY3J0Y19zdGF0ZS0+ZHBsbF9od19z dGF0ZS5jdHJsMSA9IGN0cmwxOworCWNydGNfc3RhdGUtPmRwbGxfaHdfc3RhdGUuY2ZnY3IxID0g Y2ZnY3IxOworCWNydGNfc3RhdGUtPmRwbGxfaHdfc3RhdGUuY2ZnY3IyID0gY2ZnY3IyOwogCi0J cGxsID0gaW50ZWxfZ2V0X3NoYXJlZF9kcGxsKGludGVsX2NydGMpOworCXBsbCA9IGludGVsX2dl dF9zaGFyZWRfZHBsbChpbnRlbF9jcnRjLCBjcnRjX3N0YXRlKTsKIAlpZiAocGxsID09IE5VTEwp IHsKIAkJRFJNX0RFQlVHX0RSSVZFUigiZmFpbGVkIHRvIGZpbmQgUExMIGZvciBwaXBlICVjXG4i LAogCQkJCSBwaXBlX25hbWUoaW50ZWxfY3J0Yy0+cGlwZSkpOwpAQCAtMTE1MSw3ICsxMTUzLDcg QEAgc2tsX2RkaV9wbGxfc2VsZWN0KHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCX0K IAogCS8qIHNoYXJlZCBEUExMIGlkIDAgaXMgRFBMTCAxICovCi0JaW50ZWxfY3J0Yy0+bmV3X2Nv bmZpZy0+ZGRpX3BsbF9zZWwgPSBwbGwtPmlkICsgMTsKKwljcnRjX3N0YXRlLT5kZGlfcGxsX3Nl bCA9IHBsbC0+aWQgKyAxOwogCiAJcmV0dXJuIHRydWU7CiB9CkBAIC0xMTYzLDE3ICsxMTY1LDIw IEBAIHNrbF9kZGlfcGxsX3NlbGVjdChzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKICAq IEZvciBwcml2YXRlIERQTExzLCBjb21wdXRlX2NvbmZpZygpIHNob3VsZCBkbyB0aGUgc2VsZWN0 aW9uIGZvciB1cy4gVGhpcwogICogZnVuY3Rpb24gc2hvdWxkIGJlIGZvbGRlZCBpbnRvIGNvbXB1 dGVfY29uZmlnKCkgZXZlbnR1YWxseS4KICAqLwotYm9vbCBpbnRlbF9kZGlfcGxsX3NlbGVjdChz dHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YykKK2Jvb2wgaW50ZWxfZGRpX3BsbF9zZWxlY3Qo c3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCisJCQkgIHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9jcnRj LT5iYXNlLmRldjsKIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlciA9CiAJCWlu dGVsX2RkaV9nZXRfY3J0Y19uZXdfZW5jb2RlcihpbnRlbF9jcnRjKTsKLQlpbnQgY2xvY2sgPSBp bnRlbF9jcnRjLT5uZXdfY29uZmlnLT5wb3J0X2Nsb2NrOworCWludCBjbG9jayA9IGNydGNfc3Rh dGUtPnBvcnRfY2xvY2s7CiAKIAlpZiAoSVNfU0tZTEFLRShkZXYpKQotCQlyZXR1cm4gc2tsX2Rk aV9wbGxfc2VsZWN0KGludGVsX2NydGMsIGludGVsX2VuY29kZXIsIGNsb2NrKTsKKwkJcmV0dXJu IHNrbF9kZGlfcGxsX3NlbGVjdChpbnRlbF9jcnRjLCBjcnRjX3N0YXRlLAorCQkJCQkgIGludGVs X2VuY29kZXIsIGNsb2NrKTsKIAllbHNlCi0JCXJldHVybiBoc3dfZGRpX3BsbF9zZWxlY3QoaW50 ZWxfY3J0YywgaW50ZWxfZW5jb2RlciwgY2xvY2spOworCQlyZXR1cm4gaHN3X2RkaV9wbGxfc2Vs ZWN0KGludGVsX2NydGMsIGNydGNfc3RhdGUsCisJCQkJCSAgaW50ZWxfZW5jb2RlciwgY2xvY2sp OwogfQogCiB2b2lkIGludGVsX2RkaV9zZXRfcGlwZV9zZXR0aW5ncyhzdHJ1Y3QgZHJtX2NydGMg KmNydGMpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggZjgzNmY2Ny4uM2Jj ZWFjYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMzg1OCw3ICszODU4 LDggQEAgdm9pZCBpbnRlbF9wdXRfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMp CiAJY3J0Yy0+Y29uZmlnLnNoYXJlZF9kcGxsID0gRFBMTF9JRF9QUklWQVRFOwogfQogCi1zdHJ1 Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKmludGVsX2dldF9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YykKK3N0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqaW50ZWxfZ2V0X3NoYXJlZF9k cGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAorCQkJCQkJc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmNydGNfc3RhdGUpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g Y3J0Yy0+YmFzZS5kZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAq cGxsOwpAQCAtMzg4NCw3ICszODg1LDcgQEAgc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICppbnRl bF9nZXRfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJCWlmIChwbGwtPm5l d19jb25maWctPmNydGNfbWFzayA9PSAwKQogCQkJY29udGludWU7CiAKLQkJaWYgKG1lbWNtcCgm Y3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbF9od19zdGF0ZSwKKwkJaWYgKG1lbWNtcCgmY3J0Y19zdGF0 ZS0+ZHBsbF9od19zdGF0ZSwKIAkJCSAgICZwbGwtPm5ld19jb25maWctPmh3X3N0YXRlLAogCQkJ ICAgc2l6ZW9mKHBsbC0+bmV3X2NvbmZpZy0+aHdfc3RhdGUpKSA9PSAwKSB7CiAJCQlEUk1fREVC VUdfS01TKCJDUlRDOiVkIHNoYXJpbmcgZXhpc3RpbmcgJXMgKGNydGMgbWFzayAweCUwOHgsIGF0 aXZlICVkKVxuIiwKQEAgLTM5MDksOSArMzkxMCw5IEBAIHN0cnVjdCBpbnRlbF9zaGFyZWRfZHBs bCAqaW50ZWxfZ2V0X3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCiBmb3Vu ZDoKIAlpZiAocGxsLT5uZXdfY29uZmlnLT5jcnRjX21hc2sgPT0gMCkKLQkJcGxsLT5uZXdfY29u ZmlnLT5od19zdGF0ZSA9IGNydGMtPm5ld19jb25maWctPmRwbGxfaHdfc3RhdGU7CisJCXBsbC0+ bmV3X2NvbmZpZy0+aHdfc3RhdGUgPSBjcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlOwogCi0JY3J0 Yy0+bmV3X2NvbmZpZy0+c2hhcmVkX2RwbGwgPSBpOworCWNydGNfc3RhdGUtPnNoYXJlZF9kcGxs ID0gaTsKIAlEUk1fREVCVUdfRFJJVkVSKCJ1c2luZyAlcyBmb3IgcGlwZSAlY1xuIiwgcGxsLT5u YW1lLAogCQkJIHBpcGVfbmFtZShjcnRjLT5waXBlKSk7CiAKQEAgLTU3MjYsMzAgKzU3MjcsMzEg QEAgc3RhdGljIHVpbnQzMl90IGk5eHhfZHBsbF9jb21wdXRlX2ZwKHN0cnVjdCBkcGxsICpkcGxs KQogfQogCiBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV9wbGxfZGl2aWRlcnMoc3RydWN0IGludGVs X2NydGMgKmNydGMsCisJCQkJICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZSwKIAkJCQkgICAgIGludGVsX2Nsb2NrX3QgKnJlZHVjZWRfY2xvY2spCiB7CiAJc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwogCXUzMiBmcCwgZnAyID0gMDsKIAogCWlm IChJU19QSU5FVklFVyhkZXYpKSB7Ci0JCWZwID0gcG52X2RwbGxfY29tcHV0ZV9mcCgmY3J0Yy0+ bmV3X2NvbmZpZy0+ZHBsbCk7CisJCWZwID0gcG52X2RwbGxfY29tcHV0ZV9mcCgmY3J0Y19zdGF0 ZS0+ZHBsbCk7CiAJCWlmIChyZWR1Y2VkX2Nsb2NrKQogCQkJZnAyID0gcG52X2RwbGxfY29tcHV0 ZV9mcChyZWR1Y2VkX2Nsb2NrKTsKIAl9IGVsc2UgewotCQlmcCA9IGk5eHhfZHBsbF9jb21wdXRl X2ZwKCZjcnRjLT5uZXdfY29uZmlnLT5kcGxsKTsKKwkJZnAgPSBpOXh4X2RwbGxfY29tcHV0ZV9m cCgmY3J0Y19zdGF0ZS0+ZHBsbCk7CiAJCWlmIChyZWR1Y2VkX2Nsb2NrKQogCQkJZnAyID0gaTl4 eF9kcGxsX2NvbXB1dGVfZnAocmVkdWNlZF9jbG9jayk7CiAJfQogCi0JY3J0Yy0+bmV3X2NvbmZp Zy0+ZHBsbF9od19zdGF0ZS5mcDAgPSBmcDsKKwljcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlLmZw MCA9IGZwOwogCiAJY3J0Yy0+bG93ZnJlcV9hdmFpbCA9IGZhbHNlOwogCWlmIChpbnRlbF9waXBl X3dpbGxfaGF2ZV90eXBlKGNydGMsIElOVEVMX09VVFBVVF9MVkRTKSAmJgogCSAgICByZWR1Y2Vk X2Nsb2NrICYmIGk5MTUucG93ZXJzYXZlKSB7Ci0JCWNydGMtPm5ld19jb25maWctPmRwbGxfaHdf c3RhdGUuZnAxID0gZnAyOworCQljcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlLmZwMSA9IGZwMjsK IAkJY3J0Yy0+bG93ZnJlcV9hdmFpbCA9IHRydWU7CiAJfSBlbHNlIHsKLQkJY3J0Yy0+bmV3X2Nv bmZpZy0+ZHBsbF9od19zdGF0ZS5mcDEgPSBmcDsKKwkJY3J0Y19zdGF0ZS0+ZHBsbF9od19zdGF0 ZS5mcDEgPSBmcDsKIAl9CiB9CiAKQEAgLTYwODQsNiArNjA4Niw3IEBAIHZvaWQgdmx2X2ZvcmNl X3BsbF9vZmYoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBwaXBlIHBpcGUpCiB9CiAKIHN0 YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3BsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKKwkJCSAg ICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCSAgICBpbnRlbF9jbG9j a190ICpyZWR1Y2VkX2Nsb2NrLAogCQkJICAgIGludCBudW1fY29ubmVjdG9ycykKIHsKQEAgLTYw OTEsOSArNjA5NCw5IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3BsbChzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YywKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRl dl9wcml2YXRlOwogCXUzMiBkcGxsOwogCWJvb2wgaXNfc2R2bzsKLQlzdHJ1Y3QgZHBsbCAqY2xv Y2sgPSAmY3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbDsKKwlzdHJ1Y3QgZHBsbCAqY2xvY2sgPSAmY3J0 Y19zdGF0ZS0+ZHBsbDsKIAotCWk5eHhfdXBkYXRlX3BsbF9kaXZpZGVycyhjcnRjLCByZWR1Y2Vk X2Nsb2NrKTsKKwlpOXh4X3VwZGF0ZV9wbGxfZGl2aWRlcnMoY3J0YywgY3J0Y19zdGF0ZSwgcmVk dWNlZF9jbG9jayk7CiAKIAlpc19zZHZvID0gaW50ZWxfcGlwZV93aWxsX2hhdmVfdHlwZShjcnRj LCBJTlRFTF9PVVRQVVRfU0RWTykgfHwKIAkJaW50ZWxfcGlwZV93aWxsX2hhdmVfdHlwZShjcnRj LCBJTlRFTF9PVVRQVVRfSERNSSk7CkBAIC02MTA2LDE0ICs2MTA5LDE0IEBAIHN0YXRpYyB2b2lk IGk5eHhfdXBkYXRlX3BsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJZHBsbCB8PSBEUExM Ql9NT0RFX0RBQ19TRVJJQUw7CiAKIAlpZiAoSVNfSTk0NUcoZGV2KSB8fCBJU19JOTQ1R00oZGV2 KSB8fCBJU19HMzMoZGV2KSkgewotCQlkcGxsIHw9IChjcnRjLT5uZXdfY29uZmlnLT5waXhlbF9t dWx0aXBsaWVyIC0gMSkKKwkJZHBsbCB8PSAoY3J0Y19zdGF0ZS0+cGl4ZWxfbXVsdGlwbGllciAt IDEpCiAJCQk8PCBTRFZPX01VTFRJUExJRVJfU0hJRlRfSElSRVM7CiAJfQogCiAJaWYgKGlzX3Nk dm8pCiAJCWRwbGwgfD0gRFBMTF9TRFZPX0hJR0hfU1BFRUQ7CiAKLQlpZiAoY3J0Yy0+bmV3X2Nv bmZpZy0+aGFzX2RwX2VuY29kZXIpCisJaWYgKGNydGNfc3RhdGUtPmhhc19kcF9lbmNvZGVyKQog CQlkcGxsIHw9IERQTExfU0RWT19ISUdIX1NQRUVEOwogCiAJLyogY29tcHV0ZSBiaXRtYXNrIGZy b20gcDEgdmFsdWUgKi8KQEAgLTYxNDEsNyArNjE0NCw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBk YXRlX3BsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5n ZW4gPj0gNCkKIAkJZHBsbCB8PSAoNiA8PCBQTExfTE9BRF9QVUxTRV9QSEFTRV9TSElGVCk7CiAK LQlpZiAoY3J0Yy0+bmV3X2NvbmZpZy0+c2R2b190dl9jbG9jaykKKwlpZiAoY3J0Y19zdGF0ZS0+ c2R2b190dl9jbG9jaykKIAkJZHBsbCB8PSBQTExfUkVGX0lOUFVUX1RWQ0xLSU5CQzsKIAllbHNl IGlmIChpbnRlbF9waXBlX3dpbGxfaGF2ZV90eXBlKGNydGMsIElOVEVMX09VVFBVVF9MVkRTKSAm JgogCQkgaW50ZWxfcGFuZWxfdXNlX3NzYyhkZXZfcHJpdikgJiYgbnVtX2Nvbm5lY3RvcnMgPCAy KQpAQCAtNjE1MCwyNSArNjE1MywyNiBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV9wbGwoc3Ry dWN0IGludGVsX2NydGMgKmNydGMsCiAJCWRwbGwgfD0gUExMX1JFRl9JTlBVVF9EUkVGQ0xLOwog CiAJZHBsbCB8PSBEUExMX1ZDT19FTkFCTEU7Ci0JY3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbF9od19z dGF0ZS5kcGxsID0gZHBsbDsKKwljcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlLmRwbGwgPSBkcGxs OwogCiAJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDQpIHsKLQkJdTMyIGRwbGxfbWQgPSAo Y3J0Yy0+bmV3X2NvbmZpZy0+cGl4ZWxfbXVsdGlwbGllciAtIDEpCisJCXUzMiBkcGxsX21kID0g KGNydGNfc3RhdGUtPnBpeGVsX211bHRpcGxpZXIgLSAxKQogCQkJPDwgRFBMTF9NRF9VRElfTVVM VElQTElFUl9TSElGVDsKLQkJY3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbF9od19zdGF0ZS5kcGxsX21k ID0gZHBsbF9tZDsKKwkJY3J0Y19zdGF0ZS0+ZHBsbF9od19zdGF0ZS5kcGxsX21kID0gZHBsbF9t ZDsKIAl9CiB9CiAKIHN0YXRpYyB2b2lkIGk4eHhfdXBkYXRlX3BsbChzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YywKKwkJCSAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJ CSAgICBpbnRlbF9jbG9ja190ICpyZWR1Y2VkX2Nsb2NrLAogCQkJICAgIGludCBudW1fY29ubmVj dG9ycykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAl1MzIg ZHBsbDsKLQlzdHJ1Y3QgZHBsbCAqY2xvY2sgPSAmY3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbDsKKwlz dHJ1Y3QgZHBsbCAqY2xvY2sgPSAmY3J0Y19zdGF0ZS0+ZHBsbDsKIAotCWk5eHhfdXBkYXRlX3Bs bF9kaXZpZGVycyhjcnRjLCByZWR1Y2VkX2Nsb2NrKTsKKwlpOXh4X3VwZGF0ZV9wbGxfZGl2aWRl cnMoY3J0YywgY3J0Y19zdGF0ZSwgcmVkdWNlZF9jbG9jayk7CiAKIAlkcGxsID0gRFBMTF9WR0Ff TU9ERV9ESVM7CiAKQEAgLTYxOTMsNyArNjE5Nyw3IEBAIHN0YXRpYyB2b2lkIGk4eHhfdXBkYXRl X3BsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJZHBsbCB8PSBQTExfUkVGX0lOUFVUX0RS RUZDTEs7CiAKIAlkcGxsIHw9IERQTExfVkNPX0VOQUJMRTsKLQljcnRjLT5uZXdfY29uZmlnLT5k cGxsX2h3X3N0YXRlLmRwbGwgPSBkcGxsOworCWNydGNfc3RhdGUtPmRwbGxfaHdfc3RhdGUuZHBs bCA9IGRwbGw7CiB9CiAKIHN0YXRpYyB2b2lkIGludGVsX3NldF9waXBlX3RpbWluZ3Moc3RydWN0 IGludGVsX2NydGMgKmludGVsX2NydGMpCkBAIC02Mzg5LDcgKzYzOTMsOCBAQCBzdGF0aWMgdm9p ZCBpOXh4X3NldF9waXBlY29uZihzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YykKIAlQT1NU SU5HX1JFQUQoUElQRUNPTkYoaW50ZWxfY3J0Yy0+cGlwZSkpOwogfQogCi1zdGF0aWMgaW50IGk5 eHhfY3J0Y19jb21wdXRlX2Nsb2NrKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQorc3RhdGljIGlu dCBpOXh4X2NydGNfY29tcHV0ZV9jbG9jayhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKKwkJCQkg ICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTY0MjEsNyArNjQyNiw3IEBAIHN0YXRpYyBp bnQgaTl4eF9jcnRjX2NvbXB1dGVfY2xvY2soc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJaWYg KGlzX2RzaSkKIAkJcmV0dXJuIDA7CiAKLQlpZiAoIWNydGMtPm5ld19jb25maWctPmNsb2NrX3Nl dCkgeworCWlmICghY3J0Y19zdGF0ZS0+Y2xvY2tfc2V0KSB7CiAJCXJlZmNsayA9IGk5eHhfZ2V0 X3JlZmNsayhjcnRjLCBudW1fY29ubmVjdG9ycyk7CiAKIAkJLyoKQEAgLTY0MzIsNyArNjQzNyw3 IEBAIHN0YXRpYyBpbnQgaTl4eF9jcnRjX2NvbXB1dGVfY2xvY2soc3RydWN0IGludGVsX2NydGMg KmNydGMpCiAJCSAqLwogCQlsaW1pdCA9IGludGVsX2xpbWl0KGNydGMsIHJlZmNsayk7CiAJCW9r ID0gZGV2X3ByaXYtPmRpc3BsYXkuZmluZF9kcGxsKGxpbWl0LCBjcnRjLAotCQkJCQkJIGNydGMt Pm5ld19jb25maWctPnBvcnRfY2xvY2ssCisJCQkJCQkgY3J0Y19zdGF0ZS0+cG9ydF9jbG9jaywK IAkJCQkJCSByZWZjbGssIE5VTEwsICZjbG9jayk7CiAJCWlmICghb2spIHsKIAkJCURSTV9FUlJP UigiQ291bGRuJ3QgZmluZCBQTEwgc2V0dGluZ3MgZm9yIG1vZGUhXG4iKTsKQEAgLTY0NTMsMjMg KzY0NTgsMjMgQEAgc3RhdGljIGludCBpOXh4X2NydGNfY29tcHV0ZV9jbG9jayhzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YykKIAkJCQkJCQkgICAgJnJlZHVjZWRfY2xvY2spOwogCQl9CiAJCS8qIENv bXBhdC1jb2RlIGZvciB0cmFuc2l0aW9uLCB3aWxsIGRpc2FwcGVhci4gKi8KLQkJY3J0Yy0+bmV3 X2NvbmZpZy0+ZHBsbC5uID0gY2xvY2subjsKLQkJY3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbC5tMSA9 IGNsb2NrLm0xOwotCQljcnRjLT5uZXdfY29uZmlnLT5kcGxsLm0yID0gY2xvY2subTI7Ci0JCWNy dGMtPm5ld19jb25maWctPmRwbGwucDEgPSBjbG9jay5wMTsKLQkJY3J0Yy0+bmV3X2NvbmZpZy0+ ZHBsbC5wMiA9IGNsb2NrLnAyOworCQljcnRjX3N0YXRlLT5kcGxsLm4gPSBjbG9jay5uOworCQlj cnRjX3N0YXRlLT5kcGxsLm0xID0gY2xvY2subTE7CisJCWNydGNfc3RhdGUtPmRwbGwubTIgPSBj bG9jay5tMjsKKwkJY3J0Y19zdGF0ZS0+ZHBsbC5wMSA9IGNsb2NrLnAxOworCQljcnRjX3N0YXRl LT5kcGxsLnAyID0gY2xvY2sucDI7CiAJfQogCiAJaWYgKElTX0dFTjIoZGV2KSkgewotCQlpOHh4 X3VwZGF0ZV9wbGwoY3J0YywKKwkJaTh4eF91cGRhdGVfcGxsKGNydGMsIGNydGNfc3RhdGUsCiAJ CQkJaGFzX3JlZHVjZWRfY2xvY2sgPyAmcmVkdWNlZF9jbG9jayA6IE5VTEwsCiAJCQkJbnVtX2Nv bm5lY3RvcnMpOwogCX0gZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKSB7Ci0JCWNodl91cGRh dGVfcGxsKGNydGMsIGNydGMtPm5ld19jb25maWcpOworCQljaHZfdXBkYXRlX3BsbChjcnRjLCBj cnRjX3N0YXRlKTsKIAl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkgewotCQl2bHZfdXBk YXRlX3BsbChjcnRjLCBjcnRjLT5uZXdfY29uZmlnKTsKKwkJdmx2X3VwZGF0ZV9wbGwoY3J0Yywg Y3J0Y19zdGF0ZSk7CiAJfSBlbHNlIHsKLQkJaTl4eF91cGRhdGVfcGxsKGNydGMsCisJCWk5eHhf dXBkYXRlX3BsbChjcnRjLCBjcnRjX3N0YXRlLAogCQkJCWhhc19yZWR1Y2VkX2Nsb2NrID8gJnJl ZHVjZWRfY2xvY2sgOiBOVUxMLAogCQkJCW51bV9jb25uZWN0b3JzKTsKIAl9CkBAIC03MjYwLDYg KzcyNjUsNyBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxsX3NldF9waXBlY29uZihzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMpCiB9CiAKIHN0YXRpYyBib29sIGlyb25sYWtlX2NvbXB1dGVfY2xvY2tzKHN0cnVj dCBkcm1fY3J0YyAqY3J0YywKKwkJCQkgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNf c3RhdGUsCiAJCQkJICAgIGludGVsX2Nsb2NrX3QgKmNsb2NrLAogCQkJCSAgICBib29sICpoYXNf cmVkdWNlZF9jbG9jaywKIAkJCQkgICAgaW50ZWxfY2xvY2tfdCAqcmVkdWNlZF9jbG9jaykKQEAg LTcyODIsNyArNzI4OCw3IEBAIHN0YXRpYyBib29sIGlyb25sYWtlX2NvbXB1dGVfY2xvY2tzKHN0 cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkgKi8KIAlsaW1pdCA9IGludGVsX2xpbWl0KGludGVsX2Ny dGMsIHJlZmNsayk7CiAJcmV0ID0gZGV2X3ByaXYtPmRpc3BsYXkuZmluZF9kcGxsKGxpbWl0LCBp bnRlbF9jcnRjLAotCQkJCQkgIGludGVsX2NydGMtPm5ld19jb25maWctPnBvcnRfY2xvY2ssCisJ CQkJCSAgY3J0Y19zdGF0ZS0+cG9ydF9jbG9jaywKIAkJCQkJICByZWZjbGssIE5VTEwsIGNsb2Nr KTsKIAlpZiAoIXJldCkKIAkJcmV0dXJuIGZhbHNlOwpAQCAtNzMyMSw2ICs3MzI3LDcgQEAgc3Rh dGljIGJvb2wgaXJvbmxha2VfbmVlZHNfZmJfY2JfdHVuZShzdHJ1Y3QgZHBsbCAqZHBsbCwgaW50 IGZhY3RvcikKIH0KIAogc3RhdGljIHVpbnQzMl90IGlyb25sYWtlX2NvbXB1dGVfZHBsbChzdHJ1 Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKKwkJCQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCQkgICAgICB1MzIgKmZwLAogCQkJCSAgICAgIGludGVsX2Ns b2NrX3QgKnJlZHVjZWRfY2xvY2ssIHUzMiAqZnAyKQogewpAQCAtNzM1OCwxMCArNzM2NSwxMCBA QCBzdGF0aWMgdWludDMyX3QgaXJvbmxha2VfY29tcHV0ZV9kcGxsKHN0cnVjdCBpbnRlbF9jcnRj ICppbnRlbF9jcnRjLAogCQkgICAgIGRldl9wcml2LT52YnQubHZkc19zc2NfZnJlcSA9PSAxMDAw MDApIHx8CiAJCSAgICAoSEFTX1BDSF9JQlgoZGV2KSAmJiBpbnRlbF9pc19kdWFsX2xpbmtfbHZk cyhkZXYpKSkKIAkJCWZhY3RvciA9IDI1OwotCX0gZWxzZSBpZiAoaW50ZWxfY3J0Yy0+bmV3X2Nv bmZpZy0+c2R2b190dl9jbG9jaykKKwl9IGVsc2UgaWYgKGNydGNfc3RhdGUtPnNkdm9fdHZfY2xv Y2spCiAJCWZhY3RvciA9IDIwOwogCi0JaWYgKGlyb25sYWtlX25lZWRzX2ZiX2NiX3R1bmUoJmlu dGVsX2NydGMtPm5ld19jb25maWctPmRwbGwsIGZhY3RvcikpCisJaWYgKGlyb25sYWtlX25lZWRz X2ZiX2NiX3R1bmUoJmNydGNfc3RhdGUtPmRwbGwsIGZhY3RvcikpCiAJCSpmcCB8PSBGUF9DQl9U VU5FOwogCiAJaWYgKGZwMiAmJiAocmVkdWNlZF9jbG9jay0+bSA8IGZhY3RvciAqIHJlZHVjZWRf Y2xvY2stPm4pKQpAQCAtNzM3NCwyMCArNzM4MSwyMCBAQCBzdGF0aWMgdWludDMyX3QgaXJvbmxh a2VfY29tcHV0ZV9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCWVsc2UKIAkJ ZHBsbCB8PSBEUExMQl9NT0RFX0RBQ19TRVJJQUw7CiAKLQlkcGxsIHw9IChpbnRlbF9jcnRjLT5u ZXdfY29uZmlnLT5waXhlbF9tdWx0aXBsaWVyIC0gMSkKKwlkcGxsIHw9IChjcnRjX3N0YXRlLT5w aXhlbF9tdWx0aXBsaWVyIC0gMSkKIAkJPDwgUExMX1JFRl9TRFZPX0hETUlfTVVMVElQTElFUl9T SElGVDsKIAogCWlmIChpc19zZHZvKQogCQlkcGxsIHw9IERQTExfU0RWT19ISUdIX1NQRUVEOwot CWlmIChpbnRlbF9jcnRjLT5uZXdfY29uZmlnLT5oYXNfZHBfZW5jb2RlcikKKwlpZiAoY3J0Y19z dGF0ZS0+aGFzX2RwX2VuY29kZXIpCiAJCWRwbGwgfD0gRFBMTF9TRFZPX0hJR0hfU1BFRUQ7CiAK IAkvKiBjb21wdXRlIGJpdG1hc2sgZnJvbSBwMSB2YWx1ZSAqLwotCWRwbGwgfD0gKDEgPDwgKGlu dGVsX2NydGMtPm5ld19jb25maWctPmRwbGwucDEgLSAxKSkgPDwgRFBMTF9GUEEwMV9QMV9QT1NU X0RJVl9TSElGVDsKKwlkcGxsIHw9ICgxIDw8IChjcnRjX3N0YXRlLT5kcGxsLnAxIC0gMSkpIDw8 IERQTExfRlBBMDFfUDFfUE9TVF9ESVZfU0hJRlQ7CiAJLyogYWxzbyBGUEExICovCi0JZHBsbCB8 PSAoMSA8PCAoaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbC5wMSAtIDEpKSA8PCBEUExMX0ZQ QTFfUDFfUE9TVF9ESVZfU0hJRlQ7CisJZHBsbCB8PSAoMSA8PCAoY3J0Y19zdGF0ZS0+ZHBsbC5w MSAtIDEpKSA8PCBEUExMX0ZQQTFfUDFfUE9TVF9ESVZfU0hJRlQ7CiAKLQlzd2l0Y2ggKGludGVs X2NydGMtPm5ld19jb25maWctPmRwbGwucDIpIHsKKwlzd2l0Y2ggKGNydGNfc3RhdGUtPmRwbGwu cDIpIHsKIAljYXNlIDU6CiAJCWRwbGwgfD0gRFBMTF9EQUNfU0VSSUFMX1AyX0NMT0NLX0RJVl81 OwogCQlicmVhazsKQEAgLTc0MTAsNyArNzQxNyw4IEBAIHN0YXRpYyB1aW50MzJfdCBpcm9ubGFr ZV9jb21wdXRlX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCiAJcmV0dXJuIGRw bGwgfCBEUExMX1ZDT19FTkFCTEU7CiB9CiAKLXN0YXRpYyBpbnQgaXJvbmxha2VfY3J0Y19jb21w dXRlX2Nsb2NrKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQorc3RhdGljIGludCBpcm9ubGFrZV9j cnRjX2NvbXB1dGVfY2xvY2soc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkJICAgICAgIHN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogewogCXN0cnVjdCBkcm1fZGV2aWNl ICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlpbnRlbF9jbG9ja190IGNsb2NrLCByZWR1Y2VkX2Ns b2NrOwpAQCAtNzQyNCwzOSArNzQzMiwzOSBAQCBzdGF0aWMgaW50IGlyb25sYWtlX2NydGNfY29t cHV0ZV9jbG9jayhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAlXQVJOKCEoSEFTX1BDSF9JQlgo ZGV2KSB8fCBIQVNfUENIX0NQVChkZXYpKSwKIAkgICAgICJVbmV4cGVjdGVkIFBDSCB0eXBlICVk XG4iLCBJTlRFTF9QQ0hfVFlQRShkZXYpKTsKIAotCW9rID0gaXJvbmxha2VfY29tcHV0ZV9jbG9j a3MoJmNydGMtPmJhc2UsICZjbG9jaywKKwlvayA9IGlyb25sYWtlX2NvbXB1dGVfY2xvY2tzKCZj cnRjLT5iYXNlLCBjcnRjX3N0YXRlLCAmY2xvY2ssCiAJCQkJICAgICAmaGFzX3JlZHVjZWRfY2xv Y2ssICZyZWR1Y2VkX2Nsb2NrKTsKLQlpZiAoIW9rICYmICFjcnRjLT5uZXdfY29uZmlnLT5jbG9j a19zZXQpIHsKKwlpZiAoIW9rICYmICFjcnRjX3N0YXRlLT5jbG9ja19zZXQpIHsKIAkJRFJNX0VS Uk9SKCJDb3VsZG4ndCBmaW5kIFBMTCBzZXR0aW5ncyBmb3IgbW9kZSFcbiIpOwogCQlyZXR1cm4g LUVJTlZBTDsKIAl9CiAJLyogQ29tcGF0LWNvZGUgZm9yIHRyYW5zaXRpb24sIHdpbGwgZGlzYXBw ZWFyLiAqLwotCWlmICghY3J0Yy0+bmV3X2NvbmZpZy0+Y2xvY2tfc2V0KSB7Ci0JCWNydGMtPm5l d19jb25maWctPmRwbGwubiA9IGNsb2NrLm47Ci0JCWNydGMtPm5ld19jb25maWctPmRwbGwubTEg PSBjbG9jay5tMTsKLQkJY3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbC5tMiA9IGNsb2NrLm0yOwotCQlj cnRjLT5uZXdfY29uZmlnLT5kcGxsLnAxID0gY2xvY2sucDE7Ci0JCWNydGMtPm5ld19jb25maWct PmRwbGwucDIgPSBjbG9jay5wMjsKKwlpZiAoIWNydGNfc3RhdGUtPmNsb2NrX3NldCkgeworCQlj cnRjX3N0YXRlLT5kcGxsLm4gPSBjbG9jay5uOworCQljcnRjX3N0YXRlLT5kcGxsLm0xID0gY2xv Y2subTE7CisJCWNydGNfc3RhdGUtPmRwbGwubTIgPSBjbG9jay5tMjsKKwkJY3J0Y19zdGF0ZS0+ ZHBsbC5wMSA9IGNsb2NrLnAxOworCQljcnRjX3N0YXRlLT5kcGxsLnAyID0gY2xvY2sucDI7CiAJ fQogCiAJLyogQ1BVIGVEUCBpcyB0aGUgb25seSBvdXRwdXQgdGhhdCBkb2Vzbid0IG5lZWQgYSBQ Q0ggUExMIG9mIGl0cyBvd24uICovCi0JaWYgKGNydGMtPm5ld19jb25maWctPmhhc19wY2hfZW5j b2RlcikgewotCQlmcCA9IGk5eHhfZHBsbF9jb21wdXRlX2ZwKCZjcnRjLT5uZXdfY29uZmlnLT5k cGxsKTsKKwlpZiAoY3J0Y19zdGF0ZS0+aGFzX3BjaF9lbmNvZGVyKSB7CisJCWZwID0gaTl4eF9k cGxsX2NvbXB1dGVfZnAoJmNydGNfc3RhdGUtPmRwbGwpOwogCQlpZiAoaGFzX3JlZHVjZWRfY2xv Y2spCiAJCQlmcDIgPSBpOXh4X2RwbGxfY29tcHV0ZV9mcCgmcmVkdWNlZF9jbG9jayk7CiAKLQkJ ZHBsbCA9IGlyb25sYWtlX2NvbXB1dGVfZHBsbChjcnRjLAorCQlkcGxsID0gaXJvbmxha2VfY29t cHV0ZV9kcGxsKGNydGMsIGNydGNfc3RhdGUsCiAJCQkJCSAgICAgJmZwLCAmcmVkdWNlZF9jbG9j aywKIAkJCQkJICAgICBoYXNfcmVkdWNlZF9jbG9jayA/ICZmcDIgOiBOVUxMKTsKIAotCQljcnRj LT5uZXdfY29uZmlnLT5kcGxsX2h3X3N0YXRlLmRwbGwgPSBkcGxsOwotCQljcnRjLT5uZXdfY29u ZmlnLT5kcGxsX2h3X3N0YXRlLmZwMCA9IGZwOworCQljcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRl LmRwbGwgPSBkcGxsOworCQljcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlLmZwMCA9IGZwOwogCQlp ZiAoaGFzX3JlZHVjZWRfY2xvY2spCi0JCQljcnRjLT5uZXdfY29uZmlnLT5kcGxsX2h3X3N0YXRl LmZwMSA9IGZwMjsKKwkJCWNydGNfc3RhdGUtPmRwbGxfaHdfc3RhdGUuZnAxID0gZnAyOwogCQll bHNlCi0JCQljcnRjLT5uZXdfY29uZmlnLT5kcGxsX2h3X3N0YXRlLmZwMSA9IGZwOworCQkJY3J0 Y19zdGF0ZS0+ZHBsbF9od19zdGF0ZS5mcDEgPSBmcDsKIAotCQlwbGwgPSBpbnRlbF9nZXRfc2hh cmVkX2RwbGwoY3J0Yyk7CisJCXBsbCA9IGludGVsX2dldF9zaGFyZWRfZHBsbChjcnRjLCBjcnRj X3N0YXRlKTsKIAkJaWYgKHBsbCA9PSBOVUxMKSB7CiAJCQlEUk1fREVCVUdfRFJJVkVSKCJmYWls ZWQgdG8gZmluZCBQTEwgZm9yIHBpcGUgJWNcbiIsCiAJCQkJCSBwaXBlX25hbWUoY3J0Yy0+cGlw ZSkpOwpAQCAtNzk2Nyw5ICs3OTc1LDEwIEBAIHZvaWQgaHN3X2Rpc2FibGVfcGM4KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpbnRlbF9wcmVwYXJlX2RkaShkZXYpOwogfQog Ci1zdGF0aWMgaW50IGhhc3dlbGxfY3J0Y19jb21wdXRlX2Nsb2NrKHN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjKQorc3RhdGljIGludCBoYXN3ZWxsX2NydGNfY29tcHV0ZV9jbG9jayhzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YywKKwkJCQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19z dGF0ZSkKIHsKLQlpZiAoIWludGVsX2RkaV9wbGxfc2VsZWN0KGNydGMpKQorCWlmICghaW50ZWxf ZGRpX3BsbF9zZWxlY3QoY3J0YywgY3J0Y19zdGF0ZSkpCiAJCXJldHVybiAtRUlOVkFMOwogCiAJ Y3J0Yy0+bG93ZnJlcV9hdmFpbCA9IGZhbHNlOwpAQCAtMTA5NjEsNyArMTA5NzAsOSBAQCBzdGF0 aWMgaW50IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJZ290byBk b25lOwogCiAJCWZvcl9lYWNoX2ludGVsX2NydGNfbWFza2VkKGRldiwgbW9kZXNldF9waXBlcywg aW50ZWxfY3J0YykgewotCQkJcmV0ID0gZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19jb21wdXRlX2Ns b2NrKGludGVsX2NydGMpOworCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnN0YXRlID0gaW50 ZWxfY3J0Yy0+bmV3X2NvbmZpZzsKKwkJCXJldCA9IGRldl9wcml2LT5kaXNwbGF5LmNydGNfY29t cHV0ZV9jbG9jayhpbnRlbF9jcnRjLAorCQkJCQkJCQkgICBzdGF0ZSk7CiAJCQlpZiAocmV0KSB7 CiAJCQkJaW50ZWxfc2hhcmVkX2RwbGxfYWJvcnRfY29uZmlnKGRldl9wcml2KTsKIAkJCQlnb3Rv IGRvbmU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGM1NWM0NTQuLjBhODQ2NjcgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC04MTgsNyArODE4LDggQEAgdm9pZCBpbnRlbF9k ZGlfZGlzYWJsZV90cmFuc2NvZGVyX2Z1bmMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAogCQkJCSAgICAgICBlbnVtIHRyYW5zY29kZXIgY3B1X3RyYW5zY29kZXIpOwogdm9pZCBp bnRlbF9kZGlfZW5hYmxlX3BpcGVfY2xvY2soc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMp Owogdm9pZCBpbnRlbF9kZGlfZGlzYWJsZV9waXBlX2Nsb2NrKHN0cnVjdCBpbnRlbF9jcnRjICpp bnRlbF9jcnRjKTsKLWJvb2wgaW50ZWxfZGRpX3BsbF9zZWxlY3Qoc3RydWN0IGludGVsX2NydGMg KmNydGMpOworYm9vbCBpbnRlbF9kZGlfcGxsX3NlbGVjdChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0 YywKKwkJCSAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpOwogdm9pZCBpbnRl bF9kZGlfc2V0X3BpcGVfc2V0dGluZ3Moc3RydWN0IGRybV9jcnRjICpjcnRjKTsKIHZvaWQgaW50 ZWxfZGRpX3ByZXBhcmVfbGlua19yZXRyYWluKHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2Rlcik7 CiBib29sIGludGVsX2RkaV9jb25uZWN0b3JfZ2V0X2h3X3N0YXRlKHN0cnVjdCBpbnRlbF9jb25u ZWN0b3IgKmludGVsX2Nvbm5lY3Rvcik7CkBAIC05MjksNyArOTMwLDggQEAgdm9pZCBhc3NlcnRf c2hhcmVkX2RwbGwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJYm9vbCBz dGF0ZSk7CiAjZGVmaW5lIGFzc2VydF9zaGFyZWRfZHBsbF9lbmFibGVkKGQsIHApIGFzc2VydF9z aGFyZWRfZHBsbChkLCBwLCB0cnVlKQogI2RlZmluZSBhc3NlcnRfc2hhcmVkX2RwbGxfZGlzYWJs ZWQoZCwgcCkgYXNzZXJ0X3NoYXJlZF9kcGxsKGQsIHAsIGZhbHNlKQotc3RydWN0IGludGVsX3No YXJlZF9kcGxsICppbnRlbF9nZXRfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMp Oworc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICppbnRlbF9nZXRfc2hhcmVkX2RwbGwoc3RydWN0 IGludGVsX2NydGMgKmNydGMsCisJCQkJCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqc3RhdGUp Owogdm9pZCBpbnRlbF9wdXRfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpOwog CiB2b2lkIHZsdl9mb3JjZV9wbGxfb24oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBwaXBl IHBpcGUsCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK