From: Ander Conselvan de Oliveira Subject: [PATCH 3/8] drm/i915: Pass new_config down do crtc_compute_clock Date: Thu, 11 Dec 2014 14:38:06 +0200 Message-ID: <1418301491-23020-4-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1418301491-23020-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 914876E7D8 for ; Thu, 11 Dec 2014 04:38:46 -0800 (PST) In-Reply-To: <1418301491-23020-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 ciBhbHRvZ2V0aGVyLCBpbiBmYXZvcgpvZiBkcm0gY29yZSBzdGF0ZSBzdHJ1Y3RzLgoKU2lnbmVk LW9mZi1ieTogQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJhIDxhbmRlci5jb25zZWx2YW4uZGUu b2xpdmVpcmFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg ICAgICB8ICAgMyArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgICAgIHwgIDI5 ICsrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAxMzEgKysr KysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oICAgICB8ICAgNiArLQogNCBmaWxlcyBjaGFuZ2VkLCA5NCBpbnNlcnRpb25zKCsp LCA3NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA3ZDYwZDM4Li5j MWE5YWY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTUwMCw3ICs1MDAsOCBAQCBzdHJ1 Y3QgZHJtX2k5MTVfZGlzcGxheV9mdW5jcyB7CiAJCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUg Kik7CiAJdm9pZCAoKmdldF9wbGFuZV9jb25maWcpKHN0cnVjdCBpbnRlbF9jcnRjICosCiAJCQkJ IHN0cnVjdCBpbnRlbF9wbGFuZV9jb25maWcgKik7Ci0JaW50ICgqY3J0Y19jb21wdXRlX2Nsb2Nr KShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7CisJaW50ICgqY3J0Y19jb21wdXRlX2Nsb2NrKShz dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKKwkJCQkgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj cnRjX3N0YXRlKTsKIAl2b2lkICgqY3J0Y19lbmFibGUpKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7 CiAJdm9pZCAoKmNydGNfZGlzYWJsZSkoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKIAl2b2lkICgq b2ZmKShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGRpLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYwppbmRl eCA3OWM5Nzc2Li45NzBjYTMwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kZGkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYwpAQCAtOTA0LDYg KzkwNCw3IEBAIGhzd19kZGlfY2FsY3VsYXRlX3dycGxsKGludCBjbG9jayAvKiBpbiBIeiAqLywK IAogc3RhdGljIGJvb2wKIGhzd19kZGlfcGxsX3NlbGVjdChzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50 ZWxfY3J0YywKKwkJICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCSAg IHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyLAogCQkgICBpbnQgY2xvY2spCiB7 CkBAIC05MTgsMTYgKzkxOSwxNiBAQCBoc3dfZGRpX3BsbF9zZWxlY3Qoc3RydWN0IGludGVsX2Ny dGMgKmludGVsX2NydGMsCiAJCSAgICAgIFdSUExMX0RJVklERVJfUkVGRVJFTkNFKHIyKSB8IFdS UExMX0RJVklERVJfRkVFREJBQ0sobjIpIHwKIAkJICAgICAgV1JQTExfRElWSURFUl9QT1NUKHAp OwogCi0JCWludGVsX2NydGMtPm5ld19jb25maWctPmRwbGxfaHdfc3RhdGUud3JwbGwgPSB2YWw7 CisJCWNydGNfc3RhdGUtPmRwbGxfaHdfc3RhdGUud3JwbGwgPSB2YWw7CiAKLQkJcGxsID0gaW50 ZWxfZ2V0X3NoYXJlZF9kcGxsKGludGVsX2NydGMpOworCQlwbGwgPSBpbnRlbF9nZXRfc2hhcmVk X2RwbGwoaW50ZWxfY3J0YywgY3J0Y19zdGF0ZSk7CiAJCWlmIChwbGwgPT0gTlVMTCkgewogCQkJ RFJNX0RFQlVHX0RSSVZFUigiZmFpbGVkIHRvIGZpbmQgUExMIGZvciBwaXBlICVjXG4iLAogCQkJ CQkgcGlwZV9uYW1lKGludGVsX2NydGMtPnBpcGUpKTsKIAkJCXJldHVybiBmYWxzZTsKIAkJfQog Ci0JCWludGVsX2NydGMtPm5ld19jb25maWctPmRkaV9wbGxfc2VsID0gUE9SVF9DTEtfU0VMX1dS UExMKHBsbC0+aWQpOworCQljcnRjX3N0YXRlLT5kZGlfcGxsX3NlbCA9IFBPUlRfQ0xLX1NFTF9X UlBMTChwbGwtPmlkKTsKIAl9CiAKIAlyZXR1cm4gdHJ1ZTsKQEAgLTEwOTAsNiArMTA5MSw3IEBA IGZvdW5kOgogCiBzdGF0aWMgYm9vbAogc2tsX2RkaV9wbGxfc2VsZWN0KHN0cnVjdCBpbnRlbF9j cnRjICppbnRlbF9jcnRjLAorCQkgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZSwKIAkJICAgc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIsCiAJCSAgIGludCBj bG9jaykKIHsKQEAgLTExMzksMTEgKzExNDEsMTEgQEAgc2tsX2RkaV9wbGxfc2VsZWN0KHN0cnVj dCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCX0gZWxzZSAvKiBlRFAgKi8KIAkJcmV0dXJuIHRy dWU7CiAKLQlpbnRlbF9jcnRjLT5uZXdfY29uZmlnLT5kcGxsX2h3X3N0YXRlLmN0cmwxID0gY3Ry bDE7Ci0JaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbF9od19zdGF0ZS5jZmdjcjEgPSBjZmdj cjE7Ci0JaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbF9od19zdGF0ZS5jZmdjcjIgPSBjZmdj cjI7CisJY3J0Y19zdGF0ZS0+ZHBsbF9od19zdGF0ZS5jdHJsMSA9IGN0cmwxOworCWNydGNfc3Rh dGUtPmRwbGxfaHdfc3RhdGUuY2ZnY3IxID0gY2ZnY3IxOworCWNydGNfc3RhdGUtPmRwbGxfaHdf c3RhdGUuY2ZnY3IyID0gY2ZnY3IyOwogCi0JcGxsID0gaW50ZWxfZ2V0X3NoYXJlZF9kcGxsKGlu dGVsX2NydGMpOworCXBsbCA9IGludGVsX2dldF9zaGFyZWRfZHBsbChpbnRlbF9jcnRjLCBjcnRj X3N0YXRlKTsKIAlpZiAocGxsID09IE5VTEwpIHsKIAkJRFJNX0RFQlVHX0RSSVZFUigiZmFpbGVk IHRvIGZpbmQgUExMIGZvciBwaXBlICVjXG4iLAogCQkJCSBwaXBlX25hbWUoaW50ZWxfY3J0Yy0+ cGlwZSkpOwpAQCAtMTE1MSw3ICsxMTUzLDcgQEAgc2tsX2RkaV9wbGxfc2VsZWN0KHN0cnVjdCBp bnRlbF9jcnRjICppbnRlbF9jcnRjLAogCX0KIAogCS8qIHNoYXJlZCBEUExMIGlkIDAgaXMgRFBM TCAxICovCi0JaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZy0+ZGRpX3BsbF9zZWwgPSBwbGwtPmlkICsg MTsKKwljcnRjX3N0YXRlLT5kZGlfcGxsX3NlbCA9IHBsbC0+aWQgKyAxOwogCiAJcmV0dXJuIHRy dWU7CiB9CkBAIC0xMTYzLDE3ICsxMTY1LDIwIEBAIHNrbF9kZGlfcGxsX3NlbGVjdChzdHJ1Y3Qg aW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKICAqIEZvciBwcml2YXRlIERQTExzLCBjb21wdXRlX2Nv bmZpZygpIHNob3VsZCBkbyB0aGUgc2VsZWN0aW9uIGZvciB1cy4gVGhpcwogICogZnVuY3Rpb24g c2hvdWxkIGJlIGZvbGRlZCBpbnRvIGNvbXB1dGVfY29uZmlnKCkgZXZlbnR1YWxseS4KICAqLwot Ym9vbCBpbnRlbF9kZGlfcGxsX3NlbGVjdChzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YykK K2Jvb2wgaW50ZWxfZGRpX3BsbF9zZWxlY3Qoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMs CisJCQkgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogewogCXN0cnVjdCBk cm1fZGV2aWNlICpkZXYgPSBpbnRlbF9jcnRjLT5iYXNlLmRldjsKIAlzdHJ1Y3QgaW50ZWxfZW5j b2RlciAqaW50ZWxfZW5jb2RlciA9CiAJCWludGVsX2RkaV9nZXRfY3J0Y19uZXdfZW5jb2Rlcihp bnRlbF9jcnRjKTsKLQlpbnQgY2xvY2sgPSBpbnRlbF9jcnRjLT5uZXdfY29uZmlnLT5wb3J0X2Ns b2NrOworCWludCBjbG9jayA9IGNydGNfc3RhdGUtPnBvcnRfY2xvY2s7CiAKIAlpZiAoSVNfU0tZ TEFLRShkZXYpKQotCQlyZXR1cm4gc2tsX2RkaV9wbGxfc2VsZWN0KGludGVsX2NydGMsIGludGVs X2VuY29kZXIsIGNsb2NrKTsKKwkJcmV0dXJuIHNrbF9kZGlfcGxsX3NlbGVjdChpbnRlbF9jcnRj LCBjcnRjX3N0YXRlLAorCQkJCQkgIGludGVsX2VuY29kZXIsIGNsb2NrKTsKIAllbHNlCi0JCXJl dHVybiBoc3dfZGRpX3BsbF9zZWxlY3QoaW50ZWxfY3J0YywgaW50ZWxfZW5jb2RlciwgY2xvY2sp OworCQlyZXR1cm4gaHN3X2RkaV9wbGxfc2VsZWN0KGludGVsX2NydGMsIGNydGNfc3RhdGUsCisJ CQkJCSAgaW50ZWxfZW5jb2RlciwgY2xvY2spOwogfQogCiB2b2lkIGludGVsX2RkaV9zZXRfcGlw ZV9zZXR0aW5ncyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKaW5kZXggZjgzNmY2Ny4uM2JjZWFjYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwpAQCAtMzg1OCw3ICszODU4LDggQEAgdm9pZCBpbnRlbF9wdXRfc2hhcmVkX2Rw bGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJY3J0Yy0+Y29uZmlnLnNoYXJlZF9kcGxsID0g RFBMTF9JRF9QUklWQVRFOwogfQogCi1zdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKmludGVsX2dl dF9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKK3N0cnVjdCBpbnRlbF9zaGFy ZWRfZHBsbCAqaW50ZWxfZ2V0X3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAor CQkJCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7CiAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gY3J0Yy0+YmFzZS5kZXYtPmRldl9wcml2YXRlOwog CXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqcGxsOwpAQCAtMzg4NCw3ICszODg1LDcgQEAgc3Ry dWN0IGludGVsX3NoYXJlZF9kcGxsICppbnRlbF9nZXRfc2hhcmVkX2RwbGwoc3RydWN0IGludGVs X2NydGMgKmNydGMpCiAJCWlmIChwbGwtPm5ld19jb25maWctPmNydGNfbWFzayA9PSAwKQogCQkJ Y29udGludWU7CiAKLQkJaWYgKG1lbWNtcCgmY3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbF9od19zdGF0 ZSwKKwkJaWYgKG1lbWNtcCgmY3J0Y19zdGF0ZS0+ZHBsbF9od19zdGF0ZSwKIAkJCSAgICZwbGwt Pm5ld19jb25maWctPmh3X3N0YXRlLAogCQkJICAgc2l6ZW9mKHBsbC0+bmV3X2NvbmZpZy0+aHdf c3RhdGUpKSA9PSAwKSB7CiAJCQlEUk1fREVCVUdfS01TKCJDUlRDOiVkIHNoYXJpbmcgZXhpc3Rp bmcgJXMgKGNydGMgbWFzayAweCUwOHgsIGF0aXZlICVkKVxuIiwKQEAgLTM5MDksOSArMzkxMCw5 IEBAIHN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqaW50ZWxfZ2V0X3NoYXJlZF9kcGxsKHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjKQogCiBmb3VuZDoKIAlpZiAocGxsLT5uZXdfY29uZmlnLT5jcnRj X21hc2sgPT0gMCkKLQkJcGxsLT5uZXdfY29uZmlnLT5od19zdGF0ZSA9IGNydGMtPm5ld19jb25m aWctPmRwbGxfaHdfc3RhdGU7CisJCXBsbC0+bmV3X2NvbmZpZy0+aHdfc3RhdGUgPSBjcnRjX3N0 YXRlLT5kcGxsX2h3X3N0YXRlOwogCi0JY3J0Yy0+bmV3X2NvbmZpZy0+c2hhcmVkX2RwbGwgPSBp OworCWNydGNfc3RhdGUtPnNoYXJlZF9kcGxsID0gaTsKIAlEUk1fREVCVUdfRFJJVkVSKCJ1c2lu ZyAlcyBmb3IgcGlwZSAlY1xuIiwgcGxsLT5uYW1lLAogCQkJIHBpcGVfbmFtZShjcnRjLT5waXBl KSk7CiAKQEAgLTU3MjYsMzAgKzU3MjcsMzEgQEAgc3RhdGljIHVpbnQzMl90IGk5eHhfZHBsbF9j b21wdXRlX2ZwKHN0cnVjdCBkcGxsICpkcGxsKQogfQogCiBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0 ZV9wbGxfZGl2aWRlcnMoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkJICAgICBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCQkgICAgIGludGVsX2Nsb2NrX3QgKnJl ZHVjZWRfY2xvY2spCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2 OwogCXUzMiBmcCwgZnAyID0gMDsKIAogCWlmIChJU19QSU5FVklFVyhkZXYpKSB7Ci0JCWZwID0g cG52X2RwbGxfY29tcHV0ZV9mcCgmY3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbCk7CisJCWZwID0gcG52 X2RwbGxfY29tcHV0ZV9mcCgmY3J0Y19zdGF0ZS0+ZHBsbCk7CiAJCWlmIChyZWR1Y2VkX2Nsb2Nr KQogCQkJZnAyID0gcG52X2RwbGxfY29tcHV0ZV9mcChyZWR1Y2VkX2Nsb2NrKTsKIAl9IGVsc2Ug ewotCQlmcCA9IGk5eHhfZHBsbF9jb21wdXRlX2ZwKCZjcnRjLT5uZXdfY29uZmlnLT5kcGxsKTsK KwkJZnAgPSBpOXh4X2RwbGxfY29tcHV0ZV9mcCgmY3J0Y19zdGF0ZS0+ZHBsbCk7CiAJCWlmIChy ZWR1Y2VkX2Nsb2NrKQogCQkJZnAyID0gaTl4eF9kcGxsX2NvbXB1dGVfZnAocmVkdWNlZF9jbG9j ayk7CiAJfQogCi0JY3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbF9od19zdGF0ZS5mcDAgPSBmcDsKKwlj cnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlLmZwMCA9IGZwOwogCiAJY3J0Yy0+bG93ZnJlcV9hdmFp bCA9IGZhbHNlOwogCWlmIChpbnRlbF9waXBlX3dpbGxfaGF2ZV90eXBlKGNydGMsIElOVEVMX09V VFBVVF9MVkRTKSAmJgogCSAgICByZWR1Y2VkX2Nsb2NrICYmIGk5MTUucG93ZXJzYXZlKSB7Ci0J CWNydGMtPm5ld19jb25maWctPmRwbGxfaHdfc3RhdGUuZnAxID0gZnAyOworCQljcnRjX3N0YXRl LT5kcGxsX2h3X3N0YXRlLmZwMSA9IGZwMjsKIAkJY3J0Yy0+bG93ZnJlcV9hdmFpbCA9IHRydWU7 CiAJfSBlbHNlIHsKLQkJY3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbF9od19zdGF0ZS5mcDEgPSBmcDsK KwkJY3J0Y19zdGF0ZS0+ZHBsbF9od19zdGF0ZS5mcDEgPSBmcDsKIAl9CiB9CiAKQEAgLTYwODQs NiArNjA4Niw3IEBAIHZvaWQgdmx2X2ZvcmNlX3BsbF9vZmYoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgZW51bSBwaXBlIHBpcGUpCiB9CiAKIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3BsbChzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YywKKwkJCSAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0 Y19zdGF0ZSwKIAkJCSAgICBpbnRlbF9jbG9ja190ICpyZWR1Y2VkX2Nsb2NrLAogCQkJICAgIGlu dCBudW1fY29ubmVjdG9ycykKIHsKQEAgLTYwOTEsOSArNjA5NCw5IEBAIHN0YXRpYyB2b2lkIGk5 eHhfdXBkYXRlX3BsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXUzMiBkcGxsOwogCWJvb2wg aXNfc2R2bzsKLQlzdHJ1Y3QgZHBsbCAqY2xvY2sgPSAmY3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbDsK KwlzdHJ1Y3QgZHBsbCAqY2xvY2sgPSAmY3J0Y19zdGF0ZS0+ZHBsbDsKIAotCWk5eHhfdXBkYXRl X3BsbF9kaXZpZGVycyhjcnRjLCByZWR1Y2VkX2Nsb2NrKTsKKwlpOXh4X3VwZGF0ZV9wbGxfZGl2 aWRlcnMoY3J0YywgY3J0Y19zdGF0ZSwgcmVkdWNlZF9jbG9jayk7CiAKIAlpc19zZHZvID0gaW50 ZWxfcGlwZV93aWxsX2hhdmVfdHlwZShjcnRjLCBJTlRFTF9PVVRQVVRfU0RWTykgfHwKIAkJaW50 ZWxfcGlwZV93aWxsX2hhdmVfdHlwZShjcnRjLCBJTlRFTF9PVVRQVVRfSERNSSk7CkBAIC02MTA2 LDE0ICs2MTA5LDE0IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3BsbChzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YywKIAkJZHBsbCB8PSBEUExMQl9NT0RFX0RBQ19TRVJJQUw7CiAKIAlpZiAoSVNf STk0NUcoZGV2KSB8fCBJU19JOTQ1R00oZGV2KSB8fCBJU19HMzMoZGV2KSkgewotCQlkcGxsIHw9 IChjcnRjLT5uZXdfY29uZmlnLT5waXhlbF9tdWx0aXBsaWVyIC0gMSkKKwkJZHBsbCB8PSAoY3J0 Y19zdGF0ZS0+cGl4ZWxfbXVsdGlwbGllciAtIDEpCiAJCQk8PCBTRFZPX01VTFRJUExJRVJfU0hJ RlRfSElSRVM7CiAJfQogCiAJaWYgKGlzX3Nkdm8pCiAJCWRwbGwgfD0gRFBMTF9TRFZPX0hJR0hf U1BFRUQ7CiAKLQlpZiAoY3J0Yy0+bmV3X2NvbmZpZy0+aGFzX2RwX2VuY29kZXIpCisJaWYgKGNy dGNfc3RhdGUtPmhhc19kcF9lbmNvZGVyKQogCQlkcGxsIHw9IERQTExfU0RWT19ISUdIX1NQRUVE OwogCiAJLyogY29tcHV0ZSBiaXRtYXNrIGZyb20gcDEgdmFsdWUgKi8KQEAgLTYxNDEsNyArNjE0 NCw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3BsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0 YywKIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNCkKIAkJZHBsbCB8PSAoNiA8PCBQTExf TE9BRF9QVUxTRV9QSEFTRV9TSElGVCk7CiAKLQlpZiAoY3J0Yy0+bmV3X2NvbmZpZy0+c2R2b190 dl9jbG9jaykKKwlpZiAoY3J0Y19zdGF0ZS0+c2R2b190dl9jbG9jaykKIAkJZHBsbCB8PSBQTExf UkVGX0lOUFVUX1RWQ0xLSU5CQzsKIAllbHNlIGlmIChpbnRlbF9waXBlX3dpbGxfaGF2ZV90eXBl KGNydGMsIElOVEVMX09VVFBVVF9MVkRTKSAmJgogCQkgaW50ZWxfcGFuZWxfdXNlX3NzYyhkZXZf cHJpdikgJiYgbnVtX2Nvbm5lY3RvcnMgPCAyKQpAQCAtNjE1MCwyNSArNjE1MywyNiBAQCBzdGF0 aWMgdm9pZCBpOXh4X3VwZGF0ZV9wbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJCWRwbGwg fD0gUExMX1JFRl9JTlBVVF9EUkVGQ0xLOwogCiAJZHBsbCB8PSBEUExMX1ZDT19FTkFCTEU7Ci0J Y3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbF9od19zdGF0ZS5kcGxsID0gZHBsbDsKKwljcnRjX3N0YXRl LT5kcGxsX2h3X3N0YXRlLmRwbGwgPSBkcGxsOwogCiAJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2Vu ID49IDQpIHsKLQkJdTMyIGRwbGxfbWQgPSAoY3J0Yy0+bmV3X2NvbmZpZy0+cGl4ZWxfbXVsdGlw bGllciAtIDEpCisJCXUzMiBkcGxsX21kID0gKGNydGNfc3RhdGUtPnBpeGVsX211bHRpcGxpZXIg LSAxKQogCQkJPDwgRFBMTF9NRF9VRElfTVVMVElQTElFUl9TSElGVDsKLQkJY3J0Yy0+bmV3X2Nv bmZpZy0+ZHBsbF9od19zdGF0ZS5kcGxsX21kID0gZHBsbF9tZDsKKwkJY3J0Y19zdGF0ZS0+ZHBs bF9od19zdGF0ZS5kcGxsX21kID0gZHBsbF9tZDsKIAl9CiB9CiAKIHN0YXRpYyB2b2lkIGk4eHhf dXBkYXRlX3BsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKKwkJCSAgICBzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCSAgICBpbnRlbF9jbG9ja190ICpyZWR1Y2VkX2Ns b2NrLAogCQkJICAgIGludCBudW1fY29ubmVjdG9ycykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAl1MzIgZHBsbDsKLQlzdHJ1Y3QgZHBsbCAqY2xvY2sgPSAm Y3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbDsKKwlzdHJ1Y3QgZHBsbCAqY2xvY2sgPSAmY3J0Y19zdGF0 ZS0+ZHBsbDsKIAotCWk5eHhfdXBkYXRlX3BsbF9kaXZpZGVycyhjcnRjLCByZWR1Y2VkX2Nsb2Nr KTsKKwlpOXh4X3VwZGF0ZV9wbGxfZGl2aWRlcnMoY3J0YywgY3J0Y19zdGF0ZSwgcmVkdWNlZF9j bG9jayk7CiAKIAlkcGxsID0gRFBMTF9WR0FfTU9ERV9ESVM7CiAKQEAgLTYxOTMsNyArNjE5Nyw3 IEBAIHN0YXRpYyB2b2lkIGk4eHhfdXBkYXRlX3BsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywK IAkJZHBsbCB8PSBQTExfUkVGX0lOUFVUX0RSRUZDTEs7CiAKIAlkcGxsIHw9IERQTExfVkNPX0VO QUJMRTsKLQljcnRjLT5uZXdfY29uZmlnLT5kcGxsX2h3X3N0YXRlLmRwbGwgPSBkcGxsOworCWNy dGNfc3RhdGUtPmRwbGxfaHdfc3RhdGUuZHBsbCA9IGRwbGw7CiB9CiAKIHN0YXRpYyB2b2lkIGlu dGVsX3NldF9waXBlX3RpbWluZ3Moc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMpCkBAIC02 Mzg5LDcgKzYzOTMsOCBAQCBzdGF0aWMgdm9pZCBpOXh4X3NldF9waXBlY29uZihzdHJ1Y3QgaW50 ZWxfY3J0YyAqaW50ZWxfY3J0YykKIAlQT1NUSU5HX1JFQUQoUElQRUNPTkYoaW50ZWxfY3J0Yy0+ cGlwZSkpOwogfQogCi1zdGF0aWMgaW50IGk5eHhfY3J0Y19jb21wdXRlX2Nsb2NrKHN0cnVjdCBp bnRlbF9jcnRjICpjcnRjKQorc3RhdGljIGludCBpOXh4X2NydGNfY29tcHV0ZV9jbG9jayhzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YywKKwkJCQkgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0 Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKQEAg LTY0MjEsNyArNjQyNiw3IEBAIHN0YXRpYyBpbnQgaTl4eF9jcnRjX2NvbXB1dGVfY2xvY2soc3Ry dWN0IGludGVsX2NydGMgKmNydGMpCiAJaWYgKGlzX2RzaSkKIAkJcmV0dXJuIDA7CiAKLQlpZiAo IWNydGMtPm5ld19jb25maWctPmNsb2NrX3NldCkgeworCWlmICghY3J0Y19zdGF0ZS0+Y2xvY2tf c2V0KSB7CiAJCXJlZmNsayA9IGk5eHhfZ2V0X3JlZmNsayhjcnRjLCBudW1fY29ubmVjdG9ycyk7 CiAKIAkJLyoKQEAgLTY0MzIsNyArNjQzNyw3IEBAIHN0YXRpYyBpbnQgaTl4eF9jcnRjX2NvbXB1 dGVfY2xvY2soc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJCSAqLwogCQlsaW1pdCA9IGludGVs X2xpbWl0KGNydGMsIHJlZmNsayk7CiAJCW9rID0gZGV2X3ByaXYtPmRpc3BsYXkuZmluZF9kcGxs KGxpbWl0LCBjcnRjLAotCQkJCQkJIGNydGMtPm5ld19jb25maWctPnBvcnRfY2xvY2ssCisJCQkJ CQkgY3J0Y19zdGF0ZS0+cG9ydF9jbG9jaywKIAkJCQkJCSByZWZjbGssIE5VTEwsICZjbG9jayk7 CiAJCWlmICghb2spIHsKIAkJCURSTV9FUlJPUigiQ291bGRuJ3QgZmluZCBQTEwgc2V0dGluZ3Mg Zm9yIG1vZGUhXG4iKTsKQEAgLTY0NTMsMjMgKzY0NTgsMjMgQEAgc3RhdGljIGludCBpOXh4X2Ny dGNfY29tcHV0ZV9jbG9jayhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJCQkJCQkgICAgJnJl ZHVjZWRfY2xvY2spOwogCQl9CiAJCS8qIENvbXBhdC1jb2RlIGZvciB0cmFuc2l0aW9uLCB3aWxs IGRpc2FwcGVhci4gKi8KLQkJY3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbC5uID0gY2xvY2subjsKLQkJ Y3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbC5tMSA9IGNsb2NrLm0xOwotCQljcnRjLT5uZXdfY29uZmln LT5kcGxsLm0yID0gY2xvY2subTI7Ci0JCWNydGMtPm5ld19jb25maWctPmRwbGwucDEgPSBjbG9j ay5wMTsKLQkJY3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbC5wMiA9IGNsb2NrLnAyOworCQljcnRjX3N0 YXRlLT5kcGxsLm4gPSBjbG9jay5uOworCQljcnRjX3N0YXRlLT5kcGxsLm0xID0gY2xvY2subTE7 CisJCWNydGNfc3RhdGUtPmRwbGwubTIgPSBjbG9jay5tMjsKKwkJY3J0Y19zdGF0ZS0+ZHBsbC5w MSA9IGNsb2NrLnAxOworCQljcnRjX3N0YXRlLT5kcGxsLnAyID0gY2xvY2sucDI7CiAJfQogCiAJ aWYgKElTX0dFTjIoZGV2KSkgewotCQlpOHh4X3VwZGF0ZV9wbGwoY3J0YywKKwkJaTh4eF91cGRh dGVfcGxsKGNydGMsIGNydGNfc3RhdGUsCiAJCQkJaGFzX3JlZHVjZWRfY2xvY2sgPyAmcmVkdWNl ZF9jbG9jayA6IE5VTEwsCiAJCQkJbnVtX2Nvbm5lY3RvcnMpOwogCX0gZWxzZSBpZiAoSVNfQ0hF UlJZVklFVyhkZXYpKSB7Ci0JCWNodl91cGRhdGVfcGxsKGNydGMsIGNydGMtPm5ld19jb25maWcp OworCQljaHZfdXBkYXRlX3BsbChjcnRjLCBjcnRjX3N0YXRlKTsKIAl9IGVsc2UgaWYgKElTX1ZB TExFWVZJRVcoZGV2KSkgewotCQl2bHZfdXBkYXRlX3BsbChjcnRjLCBjcnRjLT5uZXdfY29uZmln KTsKKwkJdmx2X3VwZGF0ZV9wbGwoY3J0YywgY3J0Y19zdGF0ZSk7CiAJfSBlbHNlIHsKLQkJaTl4 eF91cGRhdGVfcGxsKGNydGMsCisJCWk5eHhfdXBkYXRlX3BsbChjcnRjLCBjcnRjX3N0YXRlLAog CQkJCWhhc19yZWR1Y2VkX2Nsb2NrID8gJnJlZHVjZWRfY2xvY2sgOiBOVUxMLAogCQkJCW51bV9j b25uZWN0b3JzKTsKIAl9CkBAIC03MjYwLDYgKzcyNjUsNyBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxs X3NldF9waXBlY29uZihzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB9CiAKIHN0YXRpYyBib29sIGly b25sYWtlX2NvbXB1dGVfY2xvY2tzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKKwkJCQkgICAgc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCQkJICAgIGludGVsX2Nsb2NrX3Qg KmNsb2NrLAogCQkJCSAgICBib29sICpoYXNfcmVkdWNlZF9jbG9jaywKIAkJCQkgICAgaW50ZWxf Y2xvY2tfdCAqcmVkdWNlZF9jbG9jaykKQEAgLTcyODIsNyArNzI4OCw3IEBAIHN0YXRpYyBib29s IGlyb25sYWtlX2NvbXB1dGVfY2xvY2tzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkgKi8KIAls aW1pdCA9IGludGVsX2xpbWl0KGludGVsX2NydGMsIHJlZmNsayk7CiAJcmV0ID0gZGV2X3ByaXYt PmRpc3BsYXkuZmluZF9kcGxsKGxpbWl0LCBpbnRlbF9jcnRjLAotCQkJCQkgIGludGVsX2NydGMt Pm5ld19jb25maWctPnBvcnRfY2xvY2ssCisJCQkJCSAgY3J0Y19zdGF0ZS0+cG9ydF9jbG9jaywK IAkJCQkJICByZWZjbGssIE5VTEwsIGNsb2NrKTsKIAlpZiAoIXJldCkKIAkJcmV0dXJuIGZhbHNl OwpAQCAtNzMyMSw2ICs3MzI3LDcgQEAgc3RhdGljIGJvb2wgaXJvbmxha2VfbmVlZHNfZmJfY2Jf dHVuZShzdHJ1Y3QgZHBsbCAqZHBsbCwgaW50IGZhY3RvcikKIH0KIAogc3RhdGljIHVpbnQzMl90 IGlyb25sYWtlX2NvbXB1dGVfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKKwkJ CQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCQkgICAgICB1 MzIgKmZwLAogCQkJCSAgICAgIGludGVsX2Nsb2NrX3QgKnJlZHVjZWRfY2xvY2ssIHUzMiAqZnAy KQogewpAQCAtNzM1OCwxMCArNzM2NSwxMCBAQCBzdGF0aWMgdWludDMyX3QgaXJvbmxha2VfY29t cHV0ZV9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCQkgICAgIGRldl9wcml2 LT52YnQubHZkc19zc2NfZnJlcSA9PSAxMDAwMDApIHx8CiAJCSAgICAoSEFTX1BDSF9JQlgoZGV2 KSAmJiBpbnRlbF9pc19kdWFsX2xpbmtfbHZkcyhkZXYpKSkKIAkJCWZhY3RvciA9IDI1OwotCX0g ZWxzZSBpZiAoaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZy0+c2R2b190dl9jbG9jaykKKwl9IGVsc2Ug aWYgKGNydGNfc3RhdGUtPnNkdm9fdHZfY2xvY2spCiAJCWZhY3RvciA9IDIwOwogCi0JaWYgKGly b25sYWtlX25lZWRzX2ZiX2NiX3R1bmUoJmludGVsX2NydGMtPm5ld19jb25maWctPmRwbGwsIGZh Y3RvcikpCisJaWYgKGlyb25sYWtlX25lZWRzX2ZiX2NiX3R1bmUoJmNydGNfc3RhdGUtPmRwbGws IGZhY3RvcikpCiAJCSpmcCB8PSBGUF9DQl9UVU5FOwogCiAJaWYgKGZwMiAmJiAocmVkdWNlZF9j bG9jay0+bSA8IGZhY3RvciAqIHJlZHVjZWRfY2xvY2stPm4pKQpAQCAtNzM3NCwyMCArNzM4MSwy MCBAQCBzdGF0aWMgdWludDMyX3QgaXJvbmxha2VfY29tcHV0ZV9kcGxsKHN0cnVjdCBpbnRlbF9j cnRjICppbnRlbF9jcnRjLAogCWVsc2UKIAkJZHBsbCB8PSBEUExMQl9NT0RFX0RBQ19TRVJJQUw7 CiAKLQlkcGxsIHw9IChpbnRlbF9jcnRjLT5uZXdfY29uZmlnLT5waXhlbF9tdWx0aXBsaWVyIC0g MSkKKwlkcGxsIHw9IChjcnRjX3N0YXRlLT5waXhlbF9tdWx0aXBsaWVyIC0gMSkKIAkJPDwgUExM X1JFRl9TRFZPX0hETUlfTVVMVElQTElFUl9TSElGVDsKIAogCWlmIChpc19zZHZvKQogCQlkcGxs IHw9IERQTExfU0RWT19ISUdIX1NQRUVEOwotCWlmIChpbnRlbF9jcnRjLT5uZXdfY29uZmlnLT5o YXNfZHBfZW5jb2RlcikKKwlpZiAoY3J0Y19zdGF0ZS0+aGFzX2RwX2VuY29kZXIpCiAJCWRwbGwg fD0gRFBMTF9TRFZPX0hJR0hfU1BFRUQ7CiAKIAkvKiBjb21wdXRlIGJpdG1hc2sgZnJvbSBwMSB2 YWx1ZSAqLwotCWRwbGwgfD0gKDEgPDwgKGludGVsX2NydGMtPm5ld19jb25maWctPmRwbGwucDEg LSAxKSkgPDwgRFBMTF9GUEEwMV9QMV9QT1NUX0RJVl9TSElGVDsKKwlkcGxsIHw9ICgxIDw8IChj cnRjX3N0YXRlLT5kcGxsLnAxIC0gMSkpIDw8IERQTExfRlBBMDFfUDFfUE9TVF9ESVZfU0hJRlQ7 CiAJLyogYWxzbyBGUEExICovCi0JZHBsbCB8PSAoMSA8PCAoaW50ZWxfY3J0Yy0+bmV3X2NvbmZp Zy0+ZHBsbC5wMSAtIDEpKSA8PCBEUExMX0ZQQTFfUDFfUE9TVF9ESVZfU0hJRlQ7CisJZHBsbCB8 PSAoMSA8PCAoY3J0Y19zdGF0ZS0+ZHBsbC5wMSAtIDEpKSA8PCBEUExMX0ZQQTFfUDFfUE9TVF9E SVZfU0hJRlQ7CiAKLQlzd2l0Y2ggKGludGVsX2NydGMtPm5ld19jb25maWctPmRwbGwucDIpIHsK Kwlzd2l0Y2ggKGNydGNfc3RhdGUtPmRwbGwucDIpIHsKIAljYXNlIDU6CiAJCWRwbGwgfD0gRFBM TF9EQUNfU0VSSUFMX1AyX0NMT0NLX0RJVl81OwogCQlicmVhazsKQEAgLTc0MTAsNyArNzQxNyw4 IEBAIHN0YXRpYyB1aW50MzJfdCBpcm9ubGFrZV9jb21wdXRlX2RwbGwoc3RydWN0IGludGVsX2Ny dGMgKmludGVsX2NydGMsCiAJcmV0dXJuIGRwbGwgfCBEUExMX1ZDT19FTkFCTEU7CiB9CiAKLXN0 YXRpYyBpbnQgaXJvbmxha2VfY3J0Y19jb21wdXRlX2Nsb2NrKHN0cnVjdCBpbnRlbF9jcnRjICpj cnRjKQorc3RhdGljIGludCBpcm9ubGFrZV9jcnRjX2NvbXB1dGVfY2xvY2soc3RydWN0IGludGVs X2NydGMgKmNydGMsCisJCQkJICAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlpbnRl bF9jbG9ja190IGNsb2NrLCByZWR1Y2VkX2Nsb2NrOwpAQCAtNzQyNCwzOSArNzQzMiwzOSBAQCBz dGF0aWMgaW50IGlyb25sYWtlX2NydGNfY29tcHV0ZV9jbG9jayhzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0YykKIAlXQVJOKCEoSEFTX1BDSF9JQlgoZGV2KSB8fCBIQVNfUENIX0NQVChkZXYpKSwKIAkg ICAgICJVbmV4cGVjdGVkIFBDSCB0eXBlICVkXG4iLCBJTlRFTF9QQ0hfVFlQRShkZXYpKTsKIAot CW9rID0gaXJvbmxha2VfY29tcHV0ZV9jbG9ja3MoJmNydGMtPmJhc2UsICZjbG9jaywKKwlvayA9 IGlyb25sYWtlX2NvbXB1dGVfY2xvY2tzKCZjcnRjLT5iYXNlLCBjcnRjX3N0YXRlLCAmY2xvY2ss CiAJCQkJICAgICAmaGFzX3JlZHVjZWRfY2xvY2ssICZyZWR1Y2VkX2Nsb2NrKTsKLQlpZiAoIW9r ICYmICFjcnRjLT5uZXdfY29uZmlnLT5jbG9ja19zZXQpIHsKKwlpZiAoIW9rICYmICFjcnRjX3N0 YXRlLT5jbG9ja19zZXQpIHsKIAkJRFJNX0VSUk9SKCJDb3VsZG4ndCBmaW5kIFBMTCBzZXR0aW5n cyBmb3IgbW9kZSFcbiIpOwogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAJLyogQ29tcGF0LWNvZGUg Zm9yIHRyYW5zaXRpb24sIHdpbGwgZGlzYXBwZWFyLiAqLwotCWlmICghY3J0Yy0+bmV3X2NvbmZp Zy0+Y2xvY2tfc2V0KSB7Ci0JCWNydGMtPm5ld19jb25maWctPmRwbGwubiA9IGNsb2NrLm47Ci0J CWNydGMtPm5ld19jb25maWctPmRwbGwubTEgPSBjbG9jay5tMTsKLQkJY3J0Yy0+bmV3X2NvbmZp Zy0+ZHBsbC5tMiA9IGNsb2NrLm0yOwotCQljcnRjLT5uZXdfY29uZmlnLT5kcGxsLnAxID0gY2xv Y2sucDE7Ci0JCWNydGMtPm5ld19jb25maWctPmRwbGwucDIgPSBjbG9jay5wMjsKKwlpZiAoIWNy dGNfc3RhdGUtPmNsb2NrX3NldCkgeworCQljcnRjX3N0YXRlLT5kcGxsLm4gPSBjbG9jay5uOwor CQljcnRjX3N0YXRlLT5kcGxsLm0xID0gY2xvY2subTE7CisJCWNydGNfc3RhdGUtPmRwbGwubTIg PSBjbG9jay5tMjsKKwkJY3J0Y19zdGF0ZS0+ZHBsbC5wMSA9IGNsb2NrLnAxOworCQljcnRjX3N0 YXRlLT5kcGxsLnAyID0gY2xvY2sucDI7CiAJfQogCiAJLyogQ1BVIGVEUCBpcyB0aGUgb25seSBv dXRwdXQgdGhhdCBkb2Vzbid0IG5lZWQgYSBQQ0ggUExMIG9mIGl0cyBvd24uICovCi0JaWYgKGNy dGMtPm5ld19jb25maWctPmhhc19wY2hfZW5jb2RlcikgewotCQlmcCA9IGk5eHhfZHBsbF9jb21w dXRlX2ZwKCZjcnRjLT5uZXdfY29uZmlnLT5kcGxsKTsKKwlpZiAoY3J0Y19zdGF0ZS0+aGFzX3Bj aF9lbmNvZGVyKSB7CisJCWZwID0gaTl4eF9kcGxsX2NvbXB1dGVfZnAoJmNydGNfc3RhdGUtPmRw bGwpOwogCQlpZiAoaGFzX3JlZHVjZWRfY2xvY2spCiAJCQlmcDIgPSBpOXh4X2RwbGxfY29tcHV0 ZV9mcCgmcmVkdWNlZF9jbG9jayk7CiAKLQkJZHBsbCA9IGlyb25sYWtlX2NvbXB1dGVfZHBsbChj cnRjLAorCQlkcGxsID0gaXJvbmxha2VfY29tcHV0ZV9kcGxsKGNydGMsIGNydGNfc3RhdGUsCiAJ CQkJCSAgICAgJmZwLCAmcmVkdWNlZF9jbG9jaywKIAkJCQkJICAgICBoYXNfcmVkdWNlZF9jbG9j ayA/ICZmcDIgOiBOVUxMKTsKIAotCQljcnRjLT5uZXdfY29uZmlnLT5kcGxsX2h3X3N0YXRlLmRw bGwgPSBkcGxsOwotCQljcnRjLT5uZXdfY29uZmlnLT5kcGxsX2h3X3N0YXRlLmZwMCA9IGZwOwor CQljcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlLmRwbGwgPSBkcGxsOworCQljcnRjX3N0YXRlLT5k cGxsX2h3X3N0YXRlLmZwMCA9IGZwOwogCQlpZiAoaGFzX3JlZHVjZWRfY2xvY2spCi0JCQljcnRj LT5uZXdfY29uZmlnLT5kcGxsX2h3X3N0YXRlLmZwMSA9IGZwMjsKKwkJCWNydGNfc3RhdGUtPmRw bGxfaHdfc3RhdGUuZnAxID0gZnAyOwogCQllbHNlCi0JCQljcnRjLT5uZXdfY29uZmlnLT5kcGxs X2h3X3N0YXRlLmZwMSA9IGZwOworCQkJY3J0Y19zdGF0ZS0+ZHBsbF9od19zdGF0ZS5mcDEgPSBm cDsKIAotCQlwbGwgPSBpbnRlbF9nZXRfc2hhcmVkX2RwbGwoY3J0Yyk7CisJCXBsbCA9IGludGVs X2dldF9zaGFyZWRfZHBsbChjcnRjLCBjcnRjX3N0YXRlKTsKIAkJaWYgKHBsbCA9PSBOVUxMKSB7 CiAJCQlEUk1fREVCVUdfRFJJVkVSKCJmYWlsZWQgdG8gZmluZCBQTEwgZm9yIHBpcGUgJWNcbiIs CiAJCQkJCSBwaXBlX25hbWUoY3J0Yy0+cGlwZSkpOwpAQCAtNzk2Nyw5ICs3OTc1LDEwIEBAIHZv aWQgaHN3X2Rpc2FibGVfcGM4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlp bnRlbF9wcmVwYXJlX2RkaShkZXYpOwogfQogCi1zdGF0aWMgaW50IGhhc3dlbGxfY3J0Y19jb21w dXRlX2Nsb2NrKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQorc3RhdGljIGludCBoYXN3ZWxsX2Ny dGNfY29tcHV0ZV9jbG9jayhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKKwkJCQkgICAgICBzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsKLQlpZiAoIWludGVsX2RkaV9wbGxf c2VsZWN0KGNydGMpKQorCWlmICghaW50ZWxfZGRpX3BsbF9zZWxlY3QoY3J0YywgY3J0Y19zdGF0 ZSkpCiAJCXJldHVybiAtRUlOVkFMOwogCiAJY3J0Yy0+bG93ZnJlcV9hdmFpbCA9IGZhbHNlOwpA QCAtMTA5NjEsNyArMTA5NzAsOSBAQCBzdGF0aWMgaW50IF9faW50ZWxfc2V0X21vZGUoc3RydWN0 IGRybV9jcnRjICpjcnRjLAogCQkJZ290byBkb25lOwogCiAJCWZvcl9lYWNoX2ludGVsX2NydGNf bWFza2VkKGRldiwgbW9kZXNldF9waXBlcywgaW50ZWxfY3J0YykgewotCQkJcmV0ID0gZGV2X3By aXYtPmRpc3BsYXkuY3J0Y19jb21wdXRlX2Nsb2NrKGludGVsX2NydGMpOworCQkJc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKnN0YXRlID0gaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZzsKKwkJCXJldCA9 IGRldl9wcml2LT5kaXNwbGF5LmNydGNfY29tcHV0ZV9jbG9jayhpbnRlbF9jcnRjLAorCQkJCQkJ CQkgICBzdGF0ZSk7CiAJCQlpZiAocmV0KSB7CiAJCQkJaW50ZWxfc2hhcmVkX2RwbGxfYWJvcnRf Y29uZmlnKGRldl9wcml2KTsKIAkJCQlnb3RvIGRvbmU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o CmluZGV4IGM1NWM0NTQuLjBhODQ2NjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC04 MTgsNyArODE4LDggQEAgdm9pZCBpbnRlbF9kZGlfZGlzYWJsZV90cmFuc2NvZGVyX2Z1bmMoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCSAgICAgICBlbnVtIHRyYW5zY29k ZXIgY3B1X3RyYW5zY29kZXIpOwogdm9pZCBpbnRlbF9kZGlfZW5hYmxlX3BpcGVfY2xvY2soc3Ry dWN0IGludGVsX2NydGMgKmludGVsX2NydGMpOwogdm9pZCBpbnRlbF9kZGlfZGlzYWJsZV9waXBl X2Nsb2NrKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjKTsKLWJvb2wgaW50ZWxfZGRpX3Bs bF9zZWxlY3Qoc3RydWN0IGludGVsX2NydGMgKmNydGMpOworYm9vbCBpbnRlbF9kZGlfcGxsX3Nl bGVjdChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKKwkJCSAgc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmNydGNfc3RhdGUpOwogdm9pZCBpbnRlbF9kZGlfc2V0X3BpcGVfc2V0dGluZ3Moc3RydWN0 IGRybV9jcnRjICpjcnRjKTsKIHZvaWQgaW50ZWxfZGRpX3ByZXBhcmVfbGlua19yZXRyYWluKHN0 cnVjdCBkcm1fZW5jb2RlciAqZW5jb2Rlcik7CiBib29sIGludGVsX2RkaV9jb25uZWN0b3JfZ2V0 X2h3X3N0YXRlKHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmludGVsX2Nvbm5lY3Rvcik7CkBAIC05 MjksNyArOTMwLDggQEAgdm9pZCBhc3NlcnRfc2hhcmVkX2RwbGwoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAogCQkJYm9vbCBzdGF0ZSk7CiAjZGVmaW5lIGFzc2VydF9zaGFyZWRf ZHBsbF9lbmFibGVkKGQsIHApIGFzc2VydF9zaGFyZWRfZHBsbChkLCBwLCB0cnVlKQogI2RlZmlu ZSBhc3NlcnRfc2hhcmVkX2RwbGxfZGlzYWJsZWQoZCwgcCkgYXNzZXJ0X3NoYXJlZF9kcGxsKGQs IHAsIGZhbHNlKQotc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICppbnRlbF9nZXRfc2hhcmVkX2Rw bGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpOworc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICpp bnRlbF9nZXRfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkJCQlzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqc3RhdGUpOwogdm9pZCBpbnRlbF9wdXRfc2hhcmVkX2RwbGwo c3RydWN0IGludGVsX2NydGMgKmNydGMpOwogCiB2b2lkIHZsdl9mb3JjZV9wbGxfb24oc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgZW51bSBwaXBlIHBpcGUsCi0tIAoxLjkuMQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK