From: Ander Conselvan de Oliveira Subject: [PATCH 07/11] drm/i915: Remove all *_pipes flags from modeset Date: Fri, 10 Apr 2015 11:38:36 +0300 Message-ID: <1428655120-22494-8-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1428655120-22494-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 1CB436E8DA for ; Fri, 10 Apr 2015 01:39:03 -0700 (PDT) In-Reply-To: <1428655120-22494-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 List-Id: intel-gfx@lists.freedesktop.org U2V0IHRoZSBtb2RlX2NoYW5nZWQgZmllbGQgb24gdGhlIGNydGNfc3RhdGVzIGFuZCB1c2UgdGhh dCBpbnN0ZWFkLgoKTm90ZSB0aGF0IGV2ZW4gdGhvdWdoIHRoaXMgcGF0Y2ggZG9lc24ndCBjb21w bGV0ZWx5IHJlcGxhY2UgdGhlIGxvZ2ljIGluCmludGVsX21vZGVzZXRfYWZmZWN0ZWRfcGlwZXMo KSwgdGhhdCBsb2dpYyB3YXMgbmV2ZXIgZnVsbHkgdXNlZCB0byBpdHMKZnVsbCBleHRlbnQuIFNp bmNlIHRoZSBjb21taXQgbWVudGlvbmVkIGJlbG93LCBtb2Rlc2V0X3BpcGVzIGFuZApwcmVwYXJl X3BpcGVzIHdvdWxkIG9ubHkgY29udGFpbiBhdCBtb3N0IHRoZSBwaXBlIGZvciB3aGljaCB0aGUg c2V0X2NydGMKaW9jdGwgd2FzIGNhbGxlZC4gV2UgY2FuIGdyb3cgYmFjayB0aGF0IGxvZ2ljIHdo ZW4gdGhlIHRpbWUgY29tZXMuCgpjb21taXQgYjZjNTE2NGQ3YmY2MjRmM2UxYjc1MDc4N2RkYjk4 MzE1MGM1MTE3YwpBdXRob3I6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+ CkRhdGU6ICAgRnJpIEFwciAxMiAxODo0ODo0MyAyMDEzICswMjAwCgogICAgZHJtL2k5MTU6IEZp eHVwIE9vcHMgaW4gdGhlIHBpcGUgY29uZmlnIGNvbXB1dGF0aW9uCi0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgICA4ICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyB8IDI4NyArKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQog MiBmaWxlcyBjaGFuZ2VkLCAxMjYgaW5zZXJ0aW9ucygrKSwgMTY5IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGUxMmJjNWEuLjA4ZWE2ZDAgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaApAQCAtMjcyLDYgKzI3MiwxNCBAQCBlbnVtIGhwZF9waW4gewogCSAgICAgKF9f aSkrKykJCQkJCQkJXAogCQlpZiAoY29ubmVjdG9yKQogCisjZGVmaW5lIGZvcl9lYWNoX2ludGVs X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIF9faSkJXAorCWZvciAoKF9f aSkgPSAwOwkJCQkJCQlcCisJICAgICAoY3J0YykgPSB0b19pbnRlbF9jcnRjKChzdGF0ZSktPmNy dGNzW19faV0pLAkJXAorCSAgICAgKGNydGNfc3RhdGUpID0gdG9faW50ZWxfY3J0Y19zdGF0ZSgo c3RhdGUpLT5jcnRjX3N0YXRlc1tfX2ldKSwgXAorCSAgICAgKF9faSkgPCAoc3RhdGUpLT5kZXYt Pm1vZGVfY29uZmlnLm51bV9jcnRjOwkJXAorCSAgICAgKF9faSkrKykJCQkJCQkJXAorCQlpZiAo Y3J0Y19zdGF0ZSkKKwogc3RydWN0IGRybV9pOTE1X3ByaXZhdGU7CiBzdHJ1Y3QgaTkxNV9tbV9z dHJ1Y3Q7CiBzdHJ1Y3QgaTkxNV9tbXVfb2JqZWN0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCmluZGV4IDIzMmVmNTYuLmEyNTViMjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKQEAgLTUxNzksMTIgKzUxNzksMTMgQEAgc3RhdGljIGludCBpbnRlbF9tb2RlX21h eF9waXhjbGsoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCXJldHVybiBtYXhfcGl4 Y2xrOwogfQogCi1zdGF0aWMgaW50IHZhbGxleXZpZXdfbW9kZXNldF9nbG9iYWxfcGlwZXMoc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAotCQkJCQkgICAgdW5zaWduZWQgKnByZXBhcmVf cGlwZXMpCitzdGF0aWMgaW50IHZhbGxleXZpZXdfbW9kZXNldF9nbG9iYWxfcGlwZXMoc3RydWN0 IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IHRvX2k5MTUoc3RhdGUtPmRldik7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVs X2NydGM7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CiAJaW50IG1heF9w aXhjbGsgPSBpbnRlbF9tb2RlX21heF9waXhjbGsoc3RhdGUpOworCWludCBpOwogCiAJaWYgKG1h eF9waXhjbGsgPCAwKQogCQlyZXR1cm4gbWF4X3BpeGNsazsKQEAgLTUxOTMsMTAgKzUxOTQsMjAg QEAgc3RhdGljIGludCB2YWxsZXl2aWV3X21vZGVzZXRfZ2xvYmFsX3BpcGVzKHN0cnVjdCBkcm1f YXRvbWljX3N0YXRlICpzdGF0ZSwKIAkgICAgZGV2X3ByaXYtPnZsdl9jZGNsa19mcmVxKQogCQly ZXR1cm4gMDsKIAorCS8qIGFkZCBhbGwgYWN0aXZlIHBpcGVzIHRvIHRoZSBzdGF0ZSAqLworCWZv cl9lYWNoX2ludGVsX2NydGMoc3RhdGUtPmRldiwgaW50ZWxfY3J0YykgeworCQlpZiAoIWludGVs X2NydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSkKKwkJCWNvbnRpbnVlOworCisJCWNydGNfc3RhdGUg PSBpbnRlbF9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIGludGVsX2NydGMpOworCQlpZiAo SVNfRVJSKGNydGNfc3RhdGUpKQorCQkJcmV0dXJuIFBUUl9FUlIoY3J0Y19zdGF0ZSk7CisJfQor CiAJLyogZGlzYWJsZS9lbmFibGUgYWxsIGN1cnJlbnRseSBhY3RpdmUgcGlwZXMgd2hpbGUgd2Ug Y2hhbmdlIGNkY2xrICovCi0JZm9yX2VhY2hfaW50ZWxfY3J0YyhzdGF0ZS0+ZGV2LCBpbnRlbF9j cnRjKQotCQlpZiAoaW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlKQotCQkJKnByZXBhcmVf cGlwZXMgfD0gKDEgPDwgaW50ZWxfY3J0Yy0+cGlwZSk7CisJZm9yX2VhY2hfaW50ZWxfY3J0Y19p bl9zdGF0ZShzdGF0ZSwgaW50ZWxfY3J0YywgY3J0Y19zdGF0ZSwgaSkKKwkJaWYgKGNydGNfc3Rh dGUtPmJhc2UuZW5hYmxlKQorCQkJY3J0Y19zdGF0ZS0+YmFzZS5tb2RlX2NoYW5nZWQgPSB0cnVl OwogCiAJcmV0dXJuIDA7CiB9CkBAIC0xMDg3OSw5NCArMTA4OTAsNiBAQCBmYWlsOgogCXJldHVy biBFUlJfUFRSKHJldCk7CiB9CiAKLS8qIENvbXB1dGVzIHdoaWNoIGNydGNzIGFyZSBhZmZlY3Rl ZCBhbmQgc2V0cyB0aGUgcmVsZXZhbnQgYml0cyBpbiB0aGUgbWFzay4gRm9yCi0gKiBzaW1wbGlj aXR5IHdlIHVzZSB0aGUgY3J0YydzIHBpcGUgbnVtYmVyIChiZWNhdXNlIGl0J3MgZWFzaWVyIHRv IG9idGFpbikuICovCi1zdGF0aWMgdm9pZAotaW50ZWxfbW9kZXNldF9hZmZlY3RlZF9waXBlcyhz dHJ1Y3QgZHJtX2NydGMgKmNydGMsIHVuc2lnbmVkICptb2Rlc2V0X3BpcGVzLAotCQkJICAgICB1 bnNpZ25lZCAqcHJlcGFyZV9waXBlcywgdW5zaWduZWQgKmRpc2FibGVfcGlwZXMpCi17Ci0Jc3Ry dWN0IGludGVsX2NydGMgKmludGVsX2NydGM7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNy dGMtPmRldjsKLQlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKLQlzdHJ1Y3QgaW50ZWxf Y29ubmVjdG9yICpjb25uZWN0b3I7Ci0Jc3RydWN0IGRybV9jcnRjICp0bXBfY3J0YzsKLQotCSpk aXNhYmxlX3BpcGVzID0gKm1vZGVzZXRfcGlwZXMgPSAqcHJlcGFyZV9waXBlcyA9IDA7Ci0KLQkv KiBDaGVjayB3aGljaCBjcnRjcyBoYXZlIGNoYW5nZWQgb3V0cHV0cyBjb25uZWN0ZWQgdG8gdGhl bSwgdGhlc2UgbmVlZAotCSAqIHRvIGJlIHBhcnQgb2YgdGhlIHByZXBhcmVfcGlwZXMgbWFzay4g V2UgZG9uJ3QgKHlldCkgc3VwcG9ydCBnbG9iYWwKLQkgKiBtb2Rlc2V0IGFjcm9zcyBtdWx0aXBs ZSBjcnRjcywgc28gbW9kZXNldF9waXBlcyB3aWxsIG9ubHkgaGF2ZSBvbmUKLQkgKiBiaXQgc2V0 IGF0IG1vc3QuICovCi0JZm9yX2VhY2hfaW50ZWxfY29ubmVjdG9yKGRldiwgY29ubmVjdG9yKSB7 Ci0JCWlmIChjb25uZWN0b3ItPmJhc2UuZW5jb2RlciA9PSAmY29ubmVjdG9yLT5uZXdfZW5jb2Rl ci0+YmFzZSkKLQkJCWNvbnRpbnVlOwotCi0JCWlmIChjb25uZWN0b3ItPmJhc2UuZW5jb2Rlcikg ewotCQkJdG1wX2NydGMgPSBjb25uZWN0b3ItPmJhc2UuZW5jb2Rlci0+Y3J0YzsKLQotCQkJKnBy ZXBhcmVfcGlwZXMgfD0gMSA8PCB0b19pbnRlbF9jcnRjKHRtcF9jcnRjKS0+cGlwZTsKLQkJfQot Ci0JCWlmIChjb25uZWN0b3ItPm5ld19lbmNvZGVyKQotCQkJKnByZXBhcmVfcGlwZXMgfD0KLQkJ CQkxIDw8IGNvbm5lY3Rvci0+bmV3X2VuY29kZXItPm5ld19jcnRjLT5waXBlOwotCX0KLQotCWZv cl9lYWNoX2ludGVsX2VuY29kZXIoZGV2LCBlbmNvZGVyKSB7Ci0JCWlmIChlbmNvZGVyLT5iYXNl LmNydGMgPT0gJmVuY29kZXItPm5ld19jcnRjLT5iYXNlKQotCQkJY29udGludWU7Ci0KLQkJaWYg KGVuY29kZXItPmJhc2UuY3J0YykgewotCQkJdG1wX2NydGMgPSBlbmNvZGVyLT5iYXNlLmNydGM7 Ci0KLQkJCSpwcmVwYXJlX3BpcGVzIHw9IDEgPDwgdG9faW50ZWxfY3J0Yyh0bXBfY3J0YyktPnBp cGU7Ci0JCX0KLQotCQlpZiAoZW5jb2Rlci0+bmV3X2NydGMpCi0JCQkqcHJlcGFyZV9waXBlcyB8 PSAxIDw8IGVuY29kZXItPm5ld19jcnRjLT5waXBlOwotCX0KLQotCS8qIENoZWNrIGZvciBwaXBl cyB0aGF0IHdpbGwgYmUgZW5hYmxlZC9kaXNhYmxlZCAuLi4gKi8KLQlmb3JfZWFjaF9pbnRlbF9j cnRjKGRldiwgaW50ZWxfY3J0YykgewotCQlpZiAoaW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5h YmxlID09IGludGVsX2NydGMtPm5ld19lbmFibGVkKQotCQkJY29udGludWU7Ci0KLQkJaWYgKCFp bnRlbF9jcnRjLT5uZXdfZW5hYmxlZCkKLQkJCSpkaXNhYmxlX3BpcGVzIHw9IDEgPDwgaW50ZWxf Y3J0Yy0+cGlwZTsKLQkJZWxzZQotCQkJKnByZXBhcmVfcGlwZXMgfD0gMSA8PCBpbnRlbF9jcnRj LT5waXBlOwotCX0KLQotCi0JLyogc2V0X21vZGUgaXMgYWxzbyB1c2VkIHRvIHVwZGF0ZSBwcm9w ZXJ0aWVzIG9uIGxpZmUgZGlzcGxheSBwaXBlcy4gKi8KLQlpbnRlbF9jcnRjID0gdG9faW50ZWxf Y3J0YyhjcnRjKTsKLQlpZiAoaW50ZWxfY3J0Yy0+bmV3X2VuYWJsZWQpCi0JCSpwcmVwYXJlX3Bp cGVzIHw9IDEgPDwgaW50ZWxfY3J0Yy0+cGlwZTsKLQotCS8qCi0JICogRm9yIHNpbXBsaWNpdHkg ZG8gYSBmdWxsIG1vZGVzZXQgb24gYW55IHBpcGUgd2hlcmUgdGhlIG91dHB1dCByb3V0aW5nCi0J ICogY2hhbmdlZC4gV2UgY291bGQgYmUgbW9yZSBjbGV2ZXIsIGJ1dCB0aGF0IHdvdWxkIHJlcXVp cmUgdXMgdG8gYmUKLQkgKiBtb3JlIGNhcmVmdWwgd2l0aCBjYWxsaW5nIHRoZSByZWxldmFudCBl bmNvZGVyLT5tb2RlX3NldCBmdW5jdGlvbnMuCi0JICovCi0JaWYgKCpwcmVwYXJlX3BpcGVzKQot CQkqbW9kZXNldF9waXBlcyA9ICpwcmVwYXJlX3BpcGVzOwotCi0JLyogLi4uIGFuZCBtYXNrIHRo ZXNlIG91dC4gKi8KLQkqbW9kZXNldF9waXBlcyAmPSB+KCpkaXNhYmxlX3BpcGVzKTsKLQkqcHJl cGFyZV9waXBlcyAmPSB+KCpkaXNhYmxlX3BpcGVzKTsKLQotCS8qCi0JICogSEFDSzogV2UgZG9u J3QgKHlldCkgZnVsbHkgc3VwcG9ydCBnbG9iYWwgbW9kZXNldHMuIGludGVsX3NldF9jb25maWcK LQkgKiBvYmllcyB0aGlzIHJ1bGUsIGJ1dCB0aGUgbW9kZXNldCByZXN0b3JlIG1vZGUgb2YKLQkg KiBpbnRlbF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRlIGRvZXMgbm90LgotCSAqLwotCSptb2Rlc2V0 X3BpcGVzICY9IDEgPDwgaW50ZWxfY3J0Yy0+cGlwZTsKLQkqcHJlcGFyZV9waXBlcyAmPSAxIDw8 IGludGVsX2NydGMtPnBpcGU7Ci0KLQlEUk1fREVCVUdfS01TKCJzZXQgbW9kZSBwaXBlIG1hc2tz OiBtb2Rlc2V0OiAleCwgcHJlcGFyZTogJXgsIGRpc2FibGU6ICV4XG4iLAotCQkgICAgICAqbW9k ZXNldF9waXBlcywgKnByZXBhcmVfcGlwZXMsICpkaXNhYmxlX3BpcGVzKTsKLX0KLQogc3RhdGlj IGJvb2wgaW50ZWxfY3J0Y19pbl91c2Uoc3RydWN0IGRybV9jcnRjICpjcnRjKQogewogCXN0cnVj dCBkcm1fZW5jb2RlciAqZW5jb2RlcjsKQEAgLTEwOTc5LDEzICsxMDkwMiwyMiBAQCBzdGF0aWMg Ym9vbCBpbnRlbF9jcnRjX2luX3VzZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJcmV0dXJuIGZh bHNlOwogfQogCitzdGF0aWMgYm9vbAorbmVlZHNfbW9kZXNldChzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqc3RhdGUpCit7CisJcmV0dXJuIHN0YXRlLT5iYXNlLm1vZGVfY2hhbmdlZCB8fCBzdGF0 ZS0+YmFzZS5hY3RpdmVfY2hhbmdlZDsKK30KKwogc3RhdGljIHZvaWQKLWludGVsX21vZGVzZXRf dXBkYXRlX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIHByZXBhcmVfcGlw ZXMpCitpbnRlbF9tb2Rlc2V0X3VwZGF0ZV9zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGUpCiB7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHN0YXRlLT5kZXY7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlcjsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxf Y3J0YzsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKIAlzdHJ1Y3QgZHJt X2Nvbm5lY3RvciAqY29ubmVjdG9yOworCWludCBpOwogCiAJaW50ZWxfc2hhcmVkX2RwbGxfY29t bWl0KGRldl9wcml2KTsKIApAQCAtMTA5OTMsOSArMTA5MjUsMTQgQEAgaW50ZWxfbW9kZXNldF91 cGRhdGVfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgcHJlcGFyZV9waXBl cykKIAkJaWYgKCFpbnRlbF9lbmNvZGVyLT5iYXNlLmNydGMpCiAJCQljb250aW51ZTsKIAotCQlp bnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhpbnRlbF9lbmNvZGVyLT5iYXNlLmNydGMpOworCQlm b3JfZWFjaF9pbnRlbF9jcnRjX2luX3N0YXRlKHN0YXRlLCBpbnRlbF9jcnRjLCBjcnRjX3N0YXRl LCBpKQorCQkJaWYgKCZpbnRlbF9jcnRjLT5iYXNlID09IGludGVsX2VuY29kZXItPmJhc2UuY3J0 YykKKwkJCQlicmVhazsKKworCQlpZiAoJmludGVsX2NydGMtPmJhc2UgIT0gaW50ZWxfZW5jb2Rl ci0+YmFzZS5jcnRjKQorCQkJY29udGludWU7CiAKLQkJaWYgKHByZXBhcmVfcGlwZXMgJiAoMSA8 PCBpbnRlbF9jcnRjLT5waXBlKSkKKwkJaWYgKGNydGNfc3RhdGUtPmJhc2UuZW5hYmxlICYmIG5l ZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkpCiAJCQlpbnRlbF9lbmNvZGVyLT5jb25uZWN0b3JzX2Fj dGl2ZSA9IGZhbHNlOwogCX0KIApAQCAtMTEwMTAsOSArMTA5NDcsMTQgQEAgaW50ZWxfbW9kZXNl dF91cGRhdGVfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgcHJlcGFyZV9w aXBlcykKIAkJaWYgKCFjb25uZWN0b3ItPmVuY29kZXIgfHwgIWNvbm5lY3Rvci0+ZW5jb2Rlci0+ Y3J0YykKIAkJCWNvbnRpbnVlOwogCi0JCWludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNvbm5l Y3Rvci0+ZW5jb2Rlci0+Y3J0Yyk7CisJCWZvcl9lYWNoX2ludGVsX2NydGNfaW5fc3RhdGUoc3Rh dGUsIGludGVsX2NydGMsIGNydGNfc3RhdGUsIGkpCisJCQlpZiAoJmludGVsX2NydGMtPmJhc2Ug PT0gY29ubmVjdG9yLT5lbmNvZGVyLT5jcnRjKQorCQkJCWJyZWFrOworCisJCWlmICgmaW50ZWxf Y3J0Yy0+YmFzZSAhPSBjb25uZWN0b3ItPmVuY29kZXItPmNydGMpCisJCQljb250aW51ZTsKIAot CQlpZiAocHJlcGFyZV9waXBlcyAmICgxIDw8IGludGVsX2NydGMtPnBpcGUpKSB7CisJCWlmIChj cnRjX3N0YXRlLT5iYXNlLmVuYWJsZSAmJiBuZWVkc19tb2Rlc2V0KGNydGNfc3RhdGUpKSB7CiAJ CQlzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpkcG1zX3Byb3BlcnR5ID0KIAkJCQlkZXYtPm1vZGVfY29u ZmlnLmRwbXNfcHJvcGVydHk7CiAKQEAgLTExNTQ3LDI2ICsxMTQ4OSw0MSBAQCBzdGF0aWMgdm9p ZCB1cGRhdGVfc2NhbmxpbmVfb2Zmc2V0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCQljcnRj LT5zY2FubGluZV9vZmZzZXQgPSAxOwogfQogCitzdGF0aWMgdm9pZAoraW50ZWxfYXRvbWljX21v ZGVzZXRfY29tcHV0ZV9jaGFuZ2VkX2ZsYWdzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSwKKwkJCQkJICAgc3RydWN0IGRybV9jcnRjICptb2Rlc2V0X2NydGMpCit7CisJc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CisJc3RydWN0IGludGVsX2NydGMgKmNydGM7CisJ aW50IGk7CisKKwlmb3JfZWFjaF9pbnRlbF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRj X3N0YXRlLCBpKSB7CisJCWlmIChjcnRjX3N0YXRlLT5iYXNlLmVuYWJsZSAhPSBjcnRjLT5iYXNl LnN0YXRlLT5lbmFibGUpCisJCQljcnRjX3N0YXRlLT5iYXNlLm1vZGVfY2hhbmdlZCA9IHRydWU7 CisKKwkJLyogRklYTUU6IG1vdmUgY29tbWVudCBhYm91dCBjaGFuZ2luZyBwcm9wZXJ0aWVzIGlu IGxpdmUgcGlwZXMKKwkJICogZnJvbSBhZmZlY3RlY19waXBlcygpIGhlcmUgKi8KKwkJaWYgKCZj cnRjLT5iYXNlID09IG1vZGVzZXRfY3J0YyAmJiBjcnRjX3N0YXRlLT5iYXNlLmVuYWJsZSkKKwkJ CWNydGNfc3RhdGUtPmJhc2UubW9kZV9jaGFuZ2VkID0gdHJ1ZTsKKwl9Cit9CisKIHN0YXRpYyBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqCiBpbnRlbF9tb2Rlc2V0X2NvbXB1dGVfY29uZmlnKHN0 cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCSAgICAgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1v ZGUsCiAJCQkgICAgIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAotCQkJICAgICBzdHJ1Y3Qg ZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCi0JCQkgICAgIHVuc2lnbmVkICptb2Rlc2V0X3BpcGVz LAotCQkJICAgICB1bnNpZ25lZCAqcHJlcGFyZV9waXBlcywKLQkJCSAgICAgdW5zaWduZWQgKmRp c2FibGVfcGlwZXMpCisJCQkgICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsK LQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwotCXN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpwaXBlX2NvbmZpZyA9IE5VTEw7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNy dGNfc3RhdGU7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGM7CiAJaW50IHJldCA9IDA7 CisJaW50IGk7CiAKIAlyZXQgPSBkcm1fYXRvbWljX2FkZF9hZmZlY3RlZF9jb25uZWN0b3JzKHN0 YXRlLCBjcnRjKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gRVJSX1BUUihyZXQpOwogCi0JaW50ZWxf bW9kZXNldF9hZmZlY3RlZF9waXBlcyhjcnRjLCBtb2Rlc2V0X3BpcGVzLAotCQkJCSAgICAgcHJl cGFyZV9waXBlcywgZGlzYWJsZV9waXBlcyk7CisJaW50ZWxfYXRvbWljX21vZGVzZXRfY29tcHV0 ZV9jaGFuZ2VkX2ZsYWdzKHN0YXRlLCBjcnRjKTsKIAogCS8qCiAJICogTm90ZSB0aGlzIG5lZWRz IGNoYW5nZXMgd2hlbiB3ZSBzdGFydCB0cmFja2luZyBtdWx0aXBsZSBtb2RlcwpAQCAtMTE1NzQs NDYgKzExNTMxLDQ5IEBAIGludGVsX21vZGVzZXRfY29tcHV0ZV9jb25maWcoc3RydWN0IGRybV9j cnRjICpjcnRjLAogCSAqIChpLmUuIG9uZSBwaXBlX2NvbmZpZyBmb3IgZWFjaCBjcnRjKSByYXRo ZXIgdGhhbiBqdXN0IHRoZSBvbmUKIAkgKiBmb3IgdGhpcyBjcnRjLgogCSAqLwotCWZvcl9lYWNo X2ludGVsX2NydGNfbWFza2VkKGRldiwgKm1vZGVzZXRfcGlwZXMsIGludGVsX2NydGMpIHsKLQkJ LyogRklYTUU6IEZvciBub3cgd2Ugc3RpbGwgZXhwZWN0IG1vZGVzZXRfcGlwZXMgaGFzIGF0IG1v c3QKLQkJICogb25lIGJpdCBzZXQuICovCisJZm9yX2VhY2hfaW50ZWxfY3J0Y19pbl9zdGF0ZShz dGF0ZSwgaW50ZWxfY3J0YywgY3J0Y19zdGF0ZSwgaSkgeworCQlpZiAoIWNydGNfc3RhdGUtPmJh c2UuZW5hYmxlIHx8ICFuZWVkc19tb2Rlc2V0KGNydGNfc3RhdGUpKQorCQkJY29udGludWU7CisK KwkJLyogRklYTUU6IEZvciBub3cgd2Ugc3RpbGwgZXhwZWN0IG1vZGVzZXQgb24gb25seSBvbmUg cGlwZS4gKi8KIAkJaWYgKFdBUk5fT04oJmludGVsX2NydGMtPmJhc2UgIT0gY3J0YykpCiAJCQlj b250aW51ZTsKIAotCQlwaXBlX2NvbmZpZyA9IGludGVsX21vZGVzZXRfcGlwZV9jb25maWcoY3J0 YywgZmIsIG1vZGUsIHN0YXRlKTsKLQkJaWYgKElTX0VSUihwaXBlX2NvbmZpZykpCi0JCQlyZXR1 cm4gcGlwZV9jb25maWc7CisJCWNydGNfc3RhdGUgPSBpbnRlbF9tb2Rlc2V0X3BpcGVfY29uZmln KGNydGMsIGZiLCBtb2RlLCBzdGF0ZSk7CisJCWlmIChJU19FUlIoY3J0Y19zdGF0ZSkpCisJCQly ZXR1cm4gY3J0Y19zdGF0ZTsKIAotCQlpbnRlbF9kdW1wX3BpcGVfY29uZmlnKHRvX2ludGVsX2Ny dGMoY3J0YyksIHBpcGVfY29uZmlnLAorCQlpbnRlbF9kdW1wX3BpcGVfY29uZmlnKHRvX2ludGVs X2NydGMoY3J0YyksIGNydGNfc3RhdGUsCiAJCQkJICAgICAgICJbbW9kZXNldF0iKTsKIAl9CiAK IAlyZXR1cm4gaW50ZWxfYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCB0b19pbnRlbF9jcnRj KGNydGMpKTs7CiB9CiAKLXN0YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9kZV9zZXR1cF9wbGxzKHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKLQkJCQkgICAgICAgdW5zaWduZWQgbW9kZXNl dF9waXBlcywKLQkJCQkgICAgICAgdW5zaWduZWQgZGlzYWJsZV9waXBlcykKK3N0YXRpYyBpbnQg X19pbnRlbF9zZXRfbW9kZV9zZXR1cF9wbGxzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gc3RhdGUtPmRldjsKIAlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0JdW5zaWduZWQgY2xlYXJf cGlwZXMgPSBtb2Rlc2V0X3BpcGVzIHwgZGlzYWJsZV9waXBlczsKKwl1bnNpZ25lZCBjbGVhcl9w aXBlcyA9IDA7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGM7CisJc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CiAJaW50IHJldCA9IDA7CisJaW50IGk7CiAKIAlpZiAo IWRldl9wcml2LT5kaXNwbGF5LmNydGNfY29tcHV0ZV9jbG9jaykKIAkJcmV0dXJuIDA7CiAKKwlm b3JfZWFjaF9pbnRlbF9jcnRjX2luX3N0YXRlKHN0YXRlLCBpbnRlbF9jcnRjLCBjcnRjX3N0YXRl LCBpKSB7CisJCWlmIChuZWVkc19tb2Rlc2V0KGNydGNfc3RhdGUpKQorCQkJY2xlYXJfcGlwZXMg fD0gMSA8PCBpbnRlbF9jcnRjLT5waXBlOworCX0KKwogCXJldCA9IGludGVsX3NoYXJlZF9kcGxs X3N0YXJ0X2NvbmZpZyhkZXZfcHJpdiwgY2xlYXJfcGlwZXMpOwogCWlmIChyZXQpCiAJCWdvdG8g ZG9uZTsKIAotCWZvcl9lYWNoX2ludGVsX2NydGNfbWFza2VkKGRldiwgbW9kZXNldF9waXBlcywg aW50ZWxfY3J0YykgewotCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSA9Ci0J CQlpbnRlbF9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIGludGVsX2NydGMpOwotCi0JCS8q IE1vZGVzZXQgcGlwZXMgc2hvdWxkIGhhdmUgYSBuZXcgc3RhdGUgYnkgbm93ICovCi0JCWlmIChX QVJOX09OKElTX0VSUihjcnRjX3N0YXRlKSkpCisJZm9yX2VhY2hfaW50ZWxfY3J0Y19pbl9zdGF0 ZShzdGF0ZSwgaW50ZWxfY3J0YywgY3J0Y19zdGF0ZSwgaSkgeworCQlpZiAoIWNydGNfc3RhdGUt PmJhc2UuZW5hYmxlKQogCQkJY29udGludWU7CiAKIAkJcmV0ID0gZGV2X3ByaXYtPmRpc3BsYXku Y3J0Y19jb21wdXRlX2Nsb2NrKGludGVsX2NydGMsCkBAIC0xMTYzMSwxMCArMTE1OTEsNyBAQCBk b25lOgogc3RhdGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywK IAkJCSAgICBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSwKIAkJCSAgICBpbnQgeCwgaW50 IHksIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAotCQkJICAgIHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpwaXBlX2NvbmZpZywKLQkJCSAgICB1bnNpZ25lZCBtb2Rlc2V0X3BpcGVzLAotCQkJ ICAgIHVuc2lnbmVkIHByZXBhcmVfcGlwZXMsCi0JCQkgICAgdW5zaWduZWQgZGlzYWJsZV9waXBl cykKKwkJCSAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcpCiB7CiAJc3Ry dWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwpAQCAtMTE2NDIsNyArMTE1OTksOSBAQCBz dGF0aWMgaW50IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IHBpcGVfY29uZmlnLT5iYXNlLnN0YXRlOwogCXN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlX2NvcHkgPSBOVUxMOwogCXN0cnVjdCBp bnRlbF9jcnRjICppbnRlbF9jcnRjOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlOwogCWludCByZXQgPSAwOworCWludCBpOwogCiAJc2F2ZWRfbW9kZSA9IGttYWxsb2Moc2l6 ZW9mKCpzYXZlZF9tb2RlKSwgR0ZQX0tFUk5FTCk7CiAJaWYgKCFzYXZlZF9tb2RlKQpAQCAtMTE2 NjQsMjMgKzExNjIzLDIyIEBAIHN0YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCiAJICogYWRqdXN0ZWRfbW9kZSBiaXRzIGluIHRoZSBjcnRjIGRpcmVjdGx5 LgogCSAqLwogCWlmIChJU19WQUxMRVlWSUVXKGRldikpIHsKLQkJcmV0ID0gdmFsbGV5dmlld19t b2Rlc2V0X2dsb2JhbF9waXBlcyhzdGF0ZSwgJnByZXBhcmVfcGlwZXMpOworCQlyZXQgPSB2YWxs ZXl2aWV3X21vZGVzZXRfZ2xvYmFsX3BpcGVzKHN0YXRlKTsKIAkJaWYgKHJldCkKIAkJCWdvdG8g ZG9uZTsKLQotCQkvKiBtYXkgaGF2ZSBhZGRlZCBtb3JlIHRvIHByZXBhcmVfcGlwZXMgdGhhbiB3 ZSBzaG91bGQgKi8KLQkJcHJlcGFyZV9waXBlcyAmPSB+ZGlzYWJsZV9waXBlczsKIAl9CiAKLQly ZXQgPSBfX2ludGVsX3NldF9tb2RlX3NldHVwX3BsbHMoc3RhdGUsIG1vZGVzZXRfcGlwZXMsIGRp c2FibGVfcGlwZXMpOworCXJldCA9IF9faW50ZWxfc2V0X21vZGVfc2V0dXBfcGxscyhzdGF0ZSk7 CiAJaWYgKHJldCkKIAkJZ290byBkb25lOwogCi0JZm9yX2VhY2hfaW50ZWxfY3J0Y19tYXNrZWQo ZGV2LCBkaXNhYmxlX3BpcGVzLCBpbnRlbF9jcnRjKQotCQlpbnRlbF9jcnRjX2Rpc2FibGUoJmlu dGVsX2NydGMtPmJhc2UpOworCWZvcl9lYWNoX2ludGVsX2NydGNfaW5fc3RhdGUoc3RhdGUsIGlu dGVsX2NydGMsIGNydGNfc3RhdGUsIGkpIHsKKwkJaWYgKCFuZWVkc19tb2Rlc2V0KGNydGNfc3Rh dGUpKQorCQkJY29udGludWU7CiAKLQlmb3JfZWFjaF9pbnRlbF9jcnRjX21hc2tlZChkZXYsIHBy ZXBhcmVfcGlwZXMsIGludGVsX2NydGMpIHsKLQkJaWYgKGludGVsX2NydGMtPmJhc2Uuc3RhdGUt PmVuYWJsZSkKKwkJaWYgKCFjcnRjX3N0YXRlLT5iYXNlLmVuYWJsZSkKKwkJCWludGVsX2NydGNf ZGlzYWJsZSgmaW50ZWxfY3J0Yy0+YmFzZSk7CisJCWVsc2UgaWYgKGludGVsX2NydGMtPmJhc2Uu c3RhdGUtPmVuYWJsZSkKIAkJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZGlzYWJsZSgmaW50ZWxf Y3J0Yy0+YmFzZSk7CiAJfQogCkBAIC0xMTY5MSw3ICsxMTY0OSw3IEBAIHN0YXRpYyBpbnQgX19p bnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJICogcGlwZXM7IGhlcmUgd2Ug YXNzdW1lIGEgc2luZ2xlIG1vZGVzZXRfcGlwZSBhbmQgb25seSB0cmFjayB0aGUKIAkgKiBzaW5n bGUgY3J0YyBhbmQgbW9kZS4KIAkgKi8KLQlpZiAobW9kZXNldF9waXBlcykgeworCWlmIChwaXBl X2NvbmZpZy0+YmFzZS5lbmFibGUgJiYgbmVlZHNfbW9kZXNldChwaXBlX2NvbmZpZykpIHsKIAkJ Y3J0Yy0+bW9kZSA9ICptb2RlOwogCQkvKiBtb2RlX3NldC9lbmFibGUvZGlzYWJsZSBmdW5jdGlv bnMgcmVseSBvbiBhIGNvcnJlY3QgcGlwZQogCQkgKiBjb25maWcuICovCkBAIC0xMTcwOCwxNiAr MTE2NjYsMjAgQEAgc3RhdGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywKIAogCS8qIE9ubHkgYWZ0ZXIgZGlzYWJsaW5nIGFsbCBvdXRwdXQgcGlwZWxpbmVzIHRo YXQgd2lsbCBiZSBjaGFuZ2VkIGNhbiB3ZQogCSAqIHVwZGF0ZSB0aGUgdGhlIG91dHB1dCBjb25m aWd1cmF0aW9uLiAqLwotCWludGVsX21vZGVzZXRfdXBkYXRlX3N0YXRlKGRldiwgcHJlcGFyZV9w aXBlcyk7CisJaW50ZWxfbW9kZXNldF91cGRhdGVfc3RhdGUoc3RhdGUpOwogCiAJbW9kZXNldF91 cGRhdGVfY3J0Y19wb3dlcl9kb21haW5zKHN0YXRlKTsKIAotCWZvcl9lYWNoX2ludGVsX2NydGNf bWFza2VkKGRldiwgbW9kZXNldF9waXBlcywgaW50ZWxfY3J0YykgewotCQlzdHJ1Y3QgZHJtX3Bs YW5lICpwcmltYXJ5ID0gaW50ZWxfY3J0Yy0+YmFzZS5wcmltYXJ5OworCWlmIChwaXBlX2NvbmZp Zy0+YmFzZS5lbmFibGUgJiYgbmVlZHNfbW9kZXNldChwaXBlX2NvbmZpZykpIHsKKwkJc3RydWN0 IGRybV9wbGFuZSAqcHJpbWFyeTsKIAkJaW50IHZkaXNwbGF5LCBoZGlzcGxheTsKIAorCQlpbnRl bF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKKwkJcHJpbWFyeSA9IGludGVsX2NydGMtPmJh c2UucHJpbWFyeTsKKwogCQlkcm1fY3J0Y19nZXRfaHZfdGltaW5nKG1vZGUsICZoZGlzcGxheSwg JnZkaXNwbGF5KTsKLQkJcmV0ID0gcHJpbWFyeS0+ZnVuY3MtPnVwZGF0ZV9wbGFuZShwcmltYXJ5 LCAmaW50ZWxfY3J0Yy0+YmFzZSwKKworCQlyZXQgPSBwcmltYXJ5LT5mdW5jcy0+dXBkYXRlX3Bs YW5lKHByaW1hcnksIGNydGMsCiAJCQkJCQkgICBmYiwgMCwgMCwKIAkJCQkJCSAgIGhkaXNwbGF5 LCB2ZGlzcGxheSwKIAkJCQkJCSAgIHggPDwgMTYsIHkgPDwgMTYsCkBAIC0xMTcyNSw3ICsxMTY4 NywxMCBAQCBzdGF0aWMgaW50IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRj LAogCX0KIAogCS8qIE5vdyBlbmFibGUgdGhlIGNsb2NrcywgcGxhbmUsIHBpcGUsIGFuZCBjb25u ZWN0b3JzIHRoYXQgd2Ugc2V0IHVwLiAqLwotCWZvcl9lYWNoX2ludGVsX2NydGNfbWFza2VkKGRl diwgcHJlcGFyZV9waXBlcywgaW50ZWxfY3J0YykgeworCWZvcl9lYWNoX2ludGVsX2NydGNfaW5f c3RhdGUoc3RhdGUsIGludGVsX2NydGMsIGNydGNfc3RhdGUsIGkpIHsKKwkJaWYgKCFjcnRjX3N0 YXRlLT5iYXNlLmVuYWJsZSkKKwkJCWNvbnRpbnVlOworCiAJCXVwZGF0ZV9zY2FubGluZV9vZmZz ZXQoaW50ZWxfY3J0Yyk7CiAKIAkJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19lbmFibGUoJmludGVs X2NydGMtPmJhc2UpOwpAQCAtMTE3NTMsMTggKzExNzE4LDE0IEBAIGRvbmU6CiAJcmV0dXJuIHJl dDsKIH0KIAotc3RhdGljIGludCBpbnRlbF9zZXRfbW9kZV9waXBlcyhzdHJ1Y3QgZHJtX2NydGMg KmNydGMsCi0JCQkJc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUsCi0JCQkJaW50IHgsIGlu dCB5LCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKLQkJCQlzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqcGlwZV9jb25maWcsCi0JCQkJdW5zaWduZWQgbW9kZXNldF9waXBlcywKLQkJCQl1bnNp Z25lZCBwcmVwYXJlX3BpcGVzLAotCQkJCXVuc2lnbmVkIGRpc2FibGVfcGlwZXMpCitzdGF0aWMg aW50IGludGVsX3NldF9tb2RlX3dpdGhfY29uZmlnKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKKwkJ CQkgICAgICBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSwKKwkJCQkgICAgICBpbnQgeCwg aW50IHksIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAorCQkJCSAgICAgIHN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZykKIHsKIAlpbnQgcmV0OwogCi0JcmV0ID0gX19pbnRl bF9zZXRfbW9kZShjcnRjLCBtb2RlLCB4LCB5LCBmYiwgcGlwZV9jb25maWcsIG1vZGVzZXRfcGlw ZXMsCi0JCQkgICAgICAgcHJlcGFyZV9waXBlcywgZGlzYWJsZV9waXBlcyk7CisJcmV0ID0gX19p bnRlbF9zZXRfbW9kZShjcnRjLCBtb2RlLCB4LCB5LCBmYiwgcGlwZV9jb25maWcpOwogCiAJaWYg KHJldCA9PSAwKQogCQlpbnRlbF9tb2Rlc2V0X2NoZWNrX3N0YXRlKGNydGMtPmRldik7CkBAIC0x MTc3OCwyMiArMTE3MzksMTUgQEAgc3RhdGljIGludCBpbnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCiAJCQkgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKIAlz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWc7Ci0JdW5zaWduZWQgbW9kZXNldF9w aXBlcywgcHJlcGFyZV9waXBlcywgZGlzYWJsZV9waXBlczsKIAlpbnQgcmV0ID0gMDsKIAotCXBp cGVfY29uZmlnID0gaW50ZWxfbW9kZXNldF9jb21wdXRlX2NvbmZpZyhjcnRjLCBtb2RlLCBmYiwg c3RhdGUsCi0JCQkJCQkgICAmbW9kZXNldF9waXBlcywKLQkJCQkJCSAgICZwcmVwYXJlX3BpcGVz LAotCQkJCQkJICAgJmRpc2FibGVfcGlwZXMpOwotCisJcGlwZV9jb25maWcgPSBpbnRlbF9tb2Rl c2V0X2NvbXB1dGVfY29uZmlnKGNydGMsIG1vZGUsIGZiLCBzdGF0ZSk7CiAJaWYgKElTX0VSUihw aXBlX2NvbmZpZykpIHsKIAkJcmV0ID0gUFRSX0VSUihwaXBlX2NvbmZpZyk7CiAJCWdvdG8gb3V0 OwogCX0KIAotCXJldCA9IGludGVsX3NldF9tb2RlX3BpcGVzKGNydGMsIG1vZGUsIHgsIHksIGZi LCBwaXBlX2NvbmZpZywKLQkJCQkgICBtb2Rlc2V0X3BpcGVzLCBwcmVwYXJlX3BpcGVzLAotCQkJ CSAgIGRpc2FibGVfcGlwZXMpOworCXJldCA9IGludGVsX3NldF9tb2RlX3dpdGhfY29uZmlnKGNy dGMsIG1vZGUsIHgsIHksIGZiLCBwaXBlX2NvbmZpZyk7CiAJaWYgKHJldCkKIAkJZ290byBvdXQ7 CiAKQEAgLTEyMjE3LDcgKzEyMTcxLDYgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3NldF9jb25m aWcoc3RydWN0IGRybV9tb2RlX3NldCAqc2V0KQogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz dGF0ZSA9IE5VTEw7CiAJc3RydWN0IGludGVsX3NldF9jb25maWcgKmNvbmZpZzsKIAlzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWc7Ci0JdW5zaWduZWQgbW9kZXNldF9waXBlcywg cHJlcGFyZV9waXBlcywgZGlzYWJsZV9waXBlczsKIAlpbnQgcmV0OwogCiAJQlVHX09OKCFzZXQp OwpAQCAtMTIyNzIsMTAgKzEyMjI1LDcgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3NldF9jb25m aWcoc3RydWN0IGRybV9tb2RlX3NldCAqc2V0KQogCWludGVsX3NldF9jb25maWdfY29tcHV0ZV9t b2RlX2NoYW5nZXMoc2V0LCBjb25maWcpOwogCiAJcGlwZV9jb25maWcgPSBpbnRlbF9tb2Rlc2V0 X2NvbXB1dGVfY29uZmlnKHNldC0+Y3J0Yywgc2V0LT5tb2RlLAotCQkJCQkJICAgc2V0LT5mYiwg c3RhdGUsCi0JCQkJCQkgICAmbW9kZXNldF9waXBlcywKLQkJCQkJCSAgICZwcmVwYXJlX3BpcGVz LAotCQkJCQkJICAgJmRpc2FibGVfcGlwZXMpOworCQkJCQkJICAgc2V0LT5mYiwgc3RhdGUpOwog CWlmIChJU19FUlIocGlwZV9jb25maWcpKSB7CiAJCXJldCA9IFBUUl9FUlIocGlwZV9jb25maWcp OwogCQlnb3RvIGZhaWw7CkBAIC0xMjI5NSwxMCArMTIyNDUsOSBAQCBzdGF0aWMgaW50IGludGVs X2NydGNfc2V0X2NvbmZpZyhzdHJ1Y3QgZHJtX21vZGVfc2V0ICpzZXQpCiAJaW50ZWxfdXBkYXRl X3BpcGVfc2l6ZSh0b19pbnRlbF9jcnRjKHNldC0+Y3J0YykpOwogCiAJaWYgKGNvbmZpZy0+bW9k ZV9jaGFuZ2VkKSB7Ci0JCXJldCA9IGludGVsX3NldF9tb2RlX3BpcGVzKHNldC0+Y3J0Yywgc2V0 LT5tb2RlLAotCQkJCQkgICBzZXQtPngsIHNldC0+eSwgc2V0LT5mYiwgcGlwZV9jb25maWcsCi0J CQkJCSAgIG1vZGVzZXRfcGlwZXMsIHByZXBhcmVfcGlwZXMsCi0JCQkJCSAgIGRpc2FibGVfcGlw ZXMpOworCQlyZXQgPSBpbnRlbF9zZXRfbW9kZV93aXRoX2NvbmZpZyhzZXQtPmNydGMsIHNldC0+ bW9kZSwKKwkJCQkJCSBzZXQtPngsIHNldC0+eSwgc2V0LT5mYiwKKwkJCQkJCSBwaXBlX2NvbmZp Zyk7CiAJfSBlbHNlIGlmIChjb25maWctPmZiX2NoYW5nZWQpIHsKIAkJc3RydWN0IGludGVsX2Ny dGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKHNldC0+Y3J0Yyk7CiAJCXN0cnVjdCBkcm1f cGxhbmUgKnByaW1hcnkgPSBzZXQtPmNydGMtPnByaW1hcnk7Ci0tIAoyLjEuMAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK