From: Matt Roper Subject: [PATCH 4/5] drm/i915: Move to atomic plane helpers (v8) Date: Mon, 15 Dec 2014 16:23:20 -0800 Message-ID: <1418689401-22957-5-git-send-email-matthew.d.roper@intel.com> References: <1418689401-22957-1-git-send-email-matthew.d.roper@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 EA0876E664 for ; Mon, 15 Dec 2014 16:23:41 -0800 (PST) In-Reply-To: <1418689401-22957-1-git-send-email-matthew.d.roper@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 List-Id: intel-gfx@lists.freedesktop.org U3dpdGNoIHBsYW5lIGhhbmRsaW5nIHRvIHVzZSB0aGUgYXRvbWljIHBsYW5lIGhlbHBlcnMuICBU aGlzIG1lYW5zIHRoYXQKcmF0aGVyIHRoYW4gcHJvdmlkZSBvdXIgb3duIGltcGxlbWVudGF0aW9u cyBvZiAudXBkYXRlX3BsYW5lKCkgYW5kCi5kaXNhYmxlX3BsYW5lKCksIHdlIGV4cG9zZSB0aGUg bG93ZXItbGV2ZWwgY2hlY2svcHJlcGFyZS9jb21taXQvY2xlYW51cAplbnRyeXBvaW50cyBhbmQg bGV0IHRoZSBEUk0gY29yZSBpbXBsZW1lbnQgdXBkYXRlL2Rpc2FibGUgZm9yIHVzIHVzaW5nCnRo b3NlIGVudHJ5cG9pbnRzLgoKVGhlIG90aGVyIG1haW4gY2hhbmdlIHRoYXQgZmFsbHMgb3V0IG9m IHRoaXMgcGF0Y2ggaXMgdGhhdCBvdXIKZHJtX3BsYW5lJ3Mgd2lsbCBub3cgYWx3YXlzIGhhdmUg YSB2YWxpZCBwbGFuZS0+c3RhdGUgdGhhdCBjb250YWlucyB0aGUKcmVsZXZhbnQgcGxhbmUgc3Rh dGUgKGluaXRpYWwgc3RhdGUgaXMgYWxsb2NhdGVkIGF0IHBsYW5lIGNyZWF0aW9uKS4KVGhlIGJh c2UgZHJtX3BsYW5lX3N0YXRlIHBvaW50ZWQgdG8gaG9sZHMgdGhlIHJlcXVlc3RlZCBzb3VyY2Uv ZGVzdApjb29yZGluYXRlcywgYW5kIHRoZSBzdWJjbGFzc2VkIGludGVsX3BsYW5lX3N0YXRlIGhv bGRzIHRoZSBhZGp1c3RlZAp2YWx1ZXMgdGhhdCBvdXIgZHJpdmVyIGFjdHVhbGx5IHVzZXMuCgp2 MjoKIC0gUmVuYW1lZCBmaWxlIGZyb20gaW50ZWxfYXRvbWljLmMgdG8gaW50ZWxfYXRvbWljX3Bs YW5lLmMgKERhbmllbCkKIC0gRml4IGEgY29weS9wYXN0ZSBjb21tZW50IG1pc3Rha2UgKEJvYikK CnYzOgogLSBVc2UgcHJlcGFyZS9jbGVhbnVwIGZ1bmN0aW9ucyB0aGF0IHdlJ3ZlIGFscmVhZHkg ZmFjdG9yZWQgb3V0CiAtIFVzZSBuZXdseSByZWZhY3RvcmVkIHByZV9jb21taXQvY29tbWl0L3Bv c3RfY29tbWl0IHRvIGF2b2lkIHNsZWVwaW5nCiAgIGR1cmluZyB2YmxhbmsgZXZhc2lvbgoKdjQ6 CiAtIFJlYmFzZSB0byBsYXRlc3QgZGktbmlnaHRseSByZXF1aXJlcyBhZGRpbmcgYW4gJ29sZF9z dGF0ZScgcGFyYW1ldGVyCiAgIHRvIGF0b21pY191cGRhdGU7Cgp2NToKIC0gTXVzdCBoYXZlIGJv dGNoZWQgYSByZWJhc2Ugc29tZXdoZXJlIGFuZCBsb3N0IHNvbWUgd29yay4gIFJlc3RvcmUKICAg c3RhdGUgJ2RpcnR5JyBmbGFnIHRvIGxldCBiZWdpbi9lbmQgY29kZSBrbm93IHdoaWNoIHBsYW5l cyB0bwogICBydW4gdGhlIHByZV9jb21taXQvcG9zdF9jb21taXQgaG9va3MgZm9yLiAgVGhpcyB3 b3VsZCBoYXZlIGFjdHVhbGx5CiAgIHNob3duIHVwIGFzIGJyb2tlbiBpbiB0aGUgbmV4dCBjb21t aXQgcmF0aGVyIHRoYW4gdGhpcyBvbmUuCgp2NjoKIC0gU3F1YXNoIGtlcm5lbGRvYyBwYXRjaCBp bnRvIHRoaXMgb25lLgogLSBQcmV2aW91cyBwYXRjaGVzIGhhdmUgbm93IGFscmVhZHkgdGFrZW4g Y2FyZSBvZiBtb3N0IG9mIHRoZQogICBpbmZyYXN0cnVjdHVyZSB0aGF0IHVzZWQgdG8gYmUgaW4g dGhpcyBwYXRjaC4gIEFsbCB3ZSdyZSBhZGRpbmcgaGVyZQogICBub3cgaXMgc29tZSB0aGluIHdy YXBwZXJzLgoKdjc6CiAtIENoZWNrIHJldHVybiBvZiBpbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3Rh dGUoKSBmb3IgYWxsb2NhdGlvbgogICBmYWlsdXJlcy4KCnY4OgogLSBEcm9wIHVudXNlZCBkcm1f cGxhbmVfc3RhdGUgLT4gaW50ZWxfcGxhbmVfc3RhdGUgY2FzdC4gIChBbmRlcikKIC0gU3F1YXNo IGluIGFjdHVhbCB0cmFuc2l0aW9uIHRvIHBsYW5lIGhlbHBlcnMuICBTaWduaWZpY2FudAogICBy ZWZhY3RvcmluZyBlYXJsaWVyIGluIHRoZSBwYXRjaHNldCBoYXMgbWFkZSB0aGUgY29tYmluZWQK ICAgcHJlcCt0cmFuc2l0aW9uIG11Y2ggZWFzaWVyIHRvIHN3YWxsb3cgdGhhbiBpdCB3YXMgaW4g ZWFybGllcgogICBpdGVyYXRpb25zLiAoQW5kZXIpCgpUZXN0Y2FzZTogaWd0L2ttc19wbGFuZQpU ZXN0Y2FzZTogaWd0L2ttc191bml2ZXJzYWxfcGxhbmUKVGVzdGNhc2U6IGlndC9rbXNfY3Vyc29y X2NyYwpTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29t PgotLS0KIERvY3VtZW50YXRpb24vRG9jQm9vay9kcm0udG1wbCAgICAgICAgICAgIHwgICA1ICsK IGRyaXZlcnMvZ3B1L2RybS9pOTE1L01ha2VmaWxlICAgICAgICAgICAgIHwgICAxICsKIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFuZS5jIHwgMTUwICsrKysrKysrKysrKysr KysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jICAgICAgfCAyNTAgKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaCAgICAgICAgICB8ICAxMCArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRl LmMgICAgICAgfCAgNTAgKysrKy0tCiA2IGZpbGVzIGNoYW5nZWQsIDMwMSBpbnNlcnRpb25zKCsp LCAxNjUgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL0RvY0Jv b2svZHJtLnRtcGwgYi9Eb2N1bWVudGF0aW9uL0RvY0Jvb2svZHJtLnRtcGwKaW5kZXggOTk1ZGZi Mi4uYzAzM2EwZCAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9Eb2NCb29rL2RybS50bXBsCisr KyBiL0RvY3VtZW50YXRpb24vRG9jQm9vay9kcm0udG1wbApAQCAtMzkzMiw2ICszOTMyLDExIEBA IGludCBudW1faW9jdGxzOzwvc3lub3BzaXM+CiAgICAgICAgIDwvcGFyYT4KICAgICAgIDwvc2Vj dDI+CiAgICAgICA8c2VjdDI+CisgICAgICAgIDx0aXRsZT5BdG9taWMgUGxhbmUgSGVscGVyczwv dGl0bGU+CishUGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFuZS5jIGF0b21p YyBwbGFuZSBoZWxwZXJzCishSWRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFu ZS5jCisgICAgICA8L3NlY3QyPgorICAgICAgPHNlY3QyPgogICAgICAgICA8dGl0bGU+T3V0cHV0 IFByb2Jpbmc8L3RpdGxlPgogICAgICAgICA8cGFyYT4KIAkgIFRoaXMgc2VjdGlvbiBjb3ZlcnMg b3V0cHV0IHByb2JpbmcgYW5kIHJlbGF0ZWQgaW5mcmFzdHJ1Y3R1cmUgbGlrZSB0aGUKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L01ha2VmaWxlIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvTWFrZWZpbGUKaW5kZXggMTg0OWZmYS4uMTZlM2RjMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvTWFrZWZpbGUKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvTWFrZWZpbGUK QEAgLTY2LDYgKzY2LDcgQEAgaTkxNS15ICs9IGR2b19jaDcwMTcubyBcCiAJICBkdm9fbnMyNTAx Lm8gXAogCSAgZHZvX3NpbDE2NC5vIFwKIAkgIGR2b190ZnA0MTAubyBcCisJICBpbnRlbF9hdG9t aWNfcGxhbmUubyBcCiAJICBpbnRlbF9jcnQubyBcCiAJICBpbnRlbF9kZGkubyBcCiAJICBpbnRl bF9kcC5vIFwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19w bGFuZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMjg2ZmVjOAotLS0gL2Rldi9udWxsCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFuZS5jCkBAIC0wLDAgKzEsMTUw IEBACisvKgorICogQ29weXJpZ2h0IMKpIDIwMTQgSW50ZWwgQ29ycG9yYXRpb24KKyAqCisgKiBQ ZXJtaXNzaW9uIGlzIGhlcmVieSBncmFudGVkLCBmcmVlIG9mIGNoYXJnZSwgdG8gYW55IHBlcnNv biBvYnRhaW5pbmcgYQorICogY29weSBvZiB0aGlzIHNvZnR3YXJlIGFuZCBhc3NvY2lhdGVkIGRv Y3VtZW50YXRpb24gZmlsZXMgKHRoZSAiU29mdHdhcmUiKSwKKyAqIHRvIGRlYWwgaW4gdGhlIFNv ZnR3YXJlIHdpdGhvdXQgcmVzdHJpY3Rpb24sIGluY2x1ZGluZyB3aXRob3V0IGxpbWl0YXRpb24K KyAqIHRoZSByaWdodHMgdG8gdXNlLCBjb3B5LCBtb2RpZnksIG1lcmdlLCBwdWJsaXNoLCBkaXN0 cmlidXRlLCBzdWJsaWNlbnNlLAorICogYW5kL29yIHNlbGwgY29waWVzIG9mIHRoZSBTb2Z0d2Fy ZSwgYW5kIHRvIHBlcm1pdCBwZXJzb25zIHRvIHdob20gdGhlCisgKiBTb2Z0d2FyZSBpcyBmdXJu aXNoZWQgdG8gZG8gc28sIHN1YmplY3QgdG8gdGhlIGZvbGxvd2luZyBjb25kaXRpb25zOgorICoK KyAqIFRoZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlIGFuZCB0aGlzIHBlcm1pc3Npb24gbm90aWNl IChpbmNsdWRpbmcgdGhlIG5leHQKKyAqIHBhcmFncmFwaCkgc2hhbGwgYmUgaW5jbHVkZWQgaW4g YWxsIGNvcGllcyBvciBzdWJzdGFudGlhbCBwb3J0aW9ucyBvZiB0aGUKKyAqIFNvZnR3YXJlLgor ICoKKyAqIFRIRSBTT0ZUV0FSRSBJUyBQUk9WSURFRCAiQVMgSVMiLCBXSVRIT1VUIFdBUlJBTlRZ IE9GIEFOWSBLSU5ELCBFWFBSRVNTIE9SCisgKiBJTVBMSUVELCBJTkNMVURJTkcgQlVUIE5PVCBM SU1JVEVEIFRPIFRIRSBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSwKKyAqIEZJVE5FU1Mg Rk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFORCBOT05JTkZSSU5HRU1FTlQuICBJTiBOTyBFVkVO VCBTSEFMTAorICogVEhFIEFVVEhPUlMgT1IgQ09QWVJJR0hUIEhPTERFUlMgQkUgTElBQkxFIEZP UiBBTlkgQ0xBSU0sIERBTUFHRVMgT1IgT1RIRVIKKyAqIExJQUJJTElUWSwgV0hFVEhFUiBJTiBB TiBBQ1RJT04gT0YgQ09OVFJBQ1QsIFRPUlQgT1IgT1RIRVJXSVNFLCBBUklTSU5HCisgKiBGUk9N LCBPVVQgT0YgT1IgSU4gQ09OTkVDVElPTiBXSVRIIFRIRSBTT0ZUV0FSRSBPUiBUSEUgVVNFIE9S IE9USEVSCisgKiBERUFMSU5HUyBJTiBUSEUgU09GVFdBUkUuCisgKi8KKworLyoqCisgKiBET0M6 IGF0b21pYyBwbGFuZSBoZWxwZXIgc3VwcG9ydAorICoKKyAqIFRoZSBmdW5jdGlvbnMgaGVyZSBh cmUgdXNlZCBieSB0aGUgYXRvbWljIHBsYW5lIGhlbHBlciBmdW5jdGlvbnMgdG8KKyAqIGltcGxl bWVudCBsZWdhY3kgcGxhbmUgdXBkYXRlcyAoaS5lLiwgZHJtX3BsYW5lLT51cGRhdGVfcGxhbmUo KSBhbmQKKyAqIGRybV9wbGFuZS0+ZGlzYWJsZV9wbGFuZSgpKS4gIFRoaXMgYWxsb3dzIHBsYW5l IHVwZGF0ZXMgdG8gdXNlIHRoZQorICogYXRvbWljIHN0YXRlIGluZnJhc3RydWN0dXJlIGFuZCBw ZXJmb3JtIHBsYW5lIHVwZGF0ZXMgYXMgc2VwYXJhdGUKKyAqIHByZXBhcmUvY2hlY2svY29tbWl0 L2NsZWFudXAgc3RlcHMuCisgKi8KKworI2luY2x1ZGUgPGRybS9kcm1QLmg+CisjaW5jbHVkZSA8 ZHJtL2RybV9hdG9taWNfaGVscGVyLmg+CisjaW5jbHVkZSA8ZHJtL2RybV9wbGFuZV9oZWxwZXIu aD4KKyNpbmNsdWRlICJpbnRlbF9kcnYuaCIKKworLyoqCisgKiBpbnRlbF9wbGFuZV9kdXBsaWNh dGVfc3RhdGUgLSBkdXBsaWNhdGUgcGxhbmUgc3RhdGUKKyAqIEBwbGFuZTogZHJtIHBsYW5lCisg KgorICogQWxsb2NhdGVzIGFuZCByZXR1cm5zIGEgY29weSBvZiB0aGUgcGxhbmUgc3RhdGUgKGJv dGggY29tbW9uIGFuZAorICogSW50ZWwtc3BlY2lmaWMpIGZvciB0aGUgc3BlY2lmaWVkIHBsYW5l LgorICoKKyAqIFJldHVybnM6IFRoZSBuZXdseSBhbGxvY2F0ZWQgcGxhbmUgc3RhdGUsIG9yIE5V TEwgb3IgZmFpbHVyZS4KKyAqLworc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqCitpbnRlbF9wbGFu ZV9kdXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCit7CisJc3RydWN0IGlu dGVsX3BsYW5lX3N0YXRlICpzdGF0ZTsKKworCWlmIChwbGFuZS0+c3RhdGUpCisJCXN0YXRlID0g a21lbWR1cChwbGFuZS0+c3RhdGUsIHNpemVvZigqc3RhdGUpLCBHRlBfS0VSTkVMKTsKKwllbHNl CisJCXN0YXRlID0ga3phbGxvYyhzaXplb2YoKnN0YXRlKSwgR0ZQX0tFUk5FTCk7CisKKwlpZiAo IXN0YXRlKQorCQlyZXR1cm4gTlVMTDsKKworCWlmIChzdGF0ZS0+YmFzZS5mYikKKwkJZHJtX2Zy YW1lYnVmZmVyX3JlZmVyZW5jZShzdGF0ZS0+YmFzZS5mYik7CisKKwlyZXR1cm4gJnN0YXRlLT5i YXNlOworfQorCisvKioKKyAqIGludGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUgLSBkZXN0cm95IHBs YW5lIHN0YXRlCisgKiBAcGxhbmU6IGRybSBwbGFuZQorICoKKyAqIERlc3Ryb3lzIHRoZSBwbGFu ZSBzdGF0ZSAoYm90aCBjb21tb24gYW5kIEludGVsLXNwZWNpZmljKSBmb3IgdGhlCisgKiBzcGVj aWZpZWQgcGxhbmUuCisgKi8KK3ZvaWQKK2ludGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUsCisJCQkgIHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnN0YXRlKQor eworCWRybV9hdG9taWNfaGVscGVyX3BsYW5lX2Rlc3Ryb3lfc3RhdGUocGxhbmUsIHN0YXRlKTsK K30KKworc3RhdGljIGludCBpbnRlbF9wbGFuZV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9wbGFu ZSAqcGxhbmUsCisJCQkJICAgIHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnN0YXRlKQoreworCXN0 cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHN0YXRlLT5jcnRjOworCXN0cnVjdCBpbnRlbF9jcnRjICpp bnRlbF9jcnRjOworCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9w bGFuZShwbGFuZSk7CisJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICppbnRlbF9zdGF0ZSA9IHRv X2ludGVsX3BsYW5lX3N0YXRlKHN0YXRlKTsKKworCWNydGMgPSBjcnRjID8gY3J0YyA6IHBsYW5l LT5jcnRjOworCWludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOworCisJLyoKKwkgKiBU aGUgb3JpZ2luYWwgc3JjL2Rlc3QgY29vcmRpbmF0ZXMgYXJlIHN0b3JlZCBpbiBzdGF0ZS0+YmFz ZSwgYnV0CisJICogd2Ugd2FudCB0byBrZWVwIGFub3RoZXIgY29weSBpbnRlcm5hbCB0byBvdXIg ZHJpdmVyIHRoYXQgd2UgY2FuCisJICogY2xpcC9tb2RpZnkgb3Vyc2VsdmVzLgorCSAqLworCWlu dGVsX3N0YXRlLT5zcmMueDEgPSBzdGF0ZS0+c3JjX3g7CisJaW50ZWxfc3RhdGUtPnNyYy55MSA9 IHN0YXRlLT5zcmNfeTsKKwlpbnRlbF9zdGF0ZS0+c3JjLngyID0gc3RhdGUtPnNyY194ICsgc3Rh dGUtPnNyY193OworCWludGVsX3N0YXRlLT5zcmMueTIgPSBzdGF0ZS0+c3JjX3kgKyBzdGF0ZS0+ c3JjX2g7CisJaW50ZWxfc3RhdGUtPmRzdC54MSA9IHN0YXRlLT5jcnRjX3g7CisJaW50ZWxfc3Rh dGUtPmRzdC55MSA9IHN0YXRlLT5jcnRjX3k7CisJaW50ZWxfc3RhdGUtPmRzdC54MiA9IHN0YXRl LT5jcnRjX3ggKyBzdGF0ZS0+Y3J0Y193OworCWludGVsX3N0YXRlLT5kc3QueTIgPSBzdGF0ZS0+ Y3J0Y195ICsgc3RhdGUtPmNydGNfaDsKKworCS8qIENsaXAgYWxsIHBsYW5lcyB0byBDUlRDIHNp emUsIG9yIDB4MCBpZiBDUlRDIGlzIGRpc2FibGVkICovCisJaW50ZWxfc3RhdGUtPmNsaXAueDEg PSAwOworCWludGVsX3N0YXRlLT5jbGlwLnkxID0gMDsKKwlpbnRlbF9zdGF0ZS0+Y2xpcC54MiA9 CisJCWludGVsX2NydGMtPmFjdGl2ZSA/IGludGVsX2NydGMtPmNvbmZpZy5waXBlX3NyY193IDog MDsKKwlpbnRlbF9zdGF0ZS0+Y2xpcC55MiA9CisJCWludGVsX2NydGMtPmFjdGl2ZSA/IGludGVs X2NydGMtPmNvbmZpZy5waXBlX3NyY19oIDogMDsKKworCS8qCisJICogRGlzYWJsaW5nIGEgcGxh bmUgaXMgYWx3YXlzIG9rYXk7IHdlIGp1c3QgbmVlZCB0byB1cGRhdGUKKwkgKiBmYiB0cmFja2lu ZyBpbiBhIHNwZWNpYWwgd2F5IHNpbmNlIGNsZWFudXBfZmIoKSB3b24ndAorCSAqIGdldCBjYWxs ZWQgYnkgdGhlIHBsYW5lIGhlbHBlcnMuCisJICovCisJaWYgKHN0YXRlLT5mYiA9PSBOVUxMICYm IHBsYW5lLT5zdGF0ZS0+ZmIgIT0gTlVMTCkgeworCQkvKgorCQkgKiAncHJlcGFyZScgaXMgbmV2 ZXIgY2FsbGVkIHdoZW4gcGxhbmUgaXMgYmVpbmcgZGlzYWJsZWQsIHNvCisJCSAqIHdlIG5lZWQg dG8gaGFuZGxlIGZyb250YnVmZmVyIHRyYWNraW5nIGFzIGEgc3BlY2lhbCBjYXNlCisJCSAqLwor CQlpbnRlbF9jcnRjLT5hdG9taWMudHJhY2tfZmJzIHw9ICgxIDw8IGRybV9wbGFuZV9pbmRleChw bGFuZSkpOworCX0KKworCXJldHVybiBpbnRlbF9wbGFuZS0+Y2hlY2tfcGxhbmUocGxhbmUsIGlu dGVsX3N0YXRlKTsKK30KKworc3RhdGljIHZvaWQgaW50ZWxfcGxhbmVfYXRvbWljX3VwZGF0ZShz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKKwkJCQkgICAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRl ICpvbGRfc3RhdGUpCit7CisJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2lu dGVsX3BsYW5lKHBsYW5lKTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3N0YXRl ID0KKwkJdG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmUtPnN0YXRlKTsKKworCS8qIERvbid0IGRp c2FibGUgYW4gYWxyZWFkeSBkaXNhYmxlZCBwbGFuZSAqLworCWlmICghcGxhbmUtPnN0YXRlLT5m YiAmJiAhb2xkX3N0YXRlLT5mYikKKwkJcmV0dXJuOworCisJaW50ZWxfcGxhbmUtPmNvbW1pdF9w bGFuZShwbGFuZSwgaW50ZWxfc3RhdGUpOworfQorCitjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2hl bHBlcl9mdW5jcyBpbnRlbF9wbGFuZV9oZWxwZXJfZnVuY3MgPSB7CisJLnByZXBhcmVfZmIgPSBp bnRlbF9wcmVwYXJlX3BsYW5lX2ZiLAorCS5jbGVhbnVwX2ZiID0gaW50ZWxfY2xlYW51cF9wbGFu ZV9mYiwKKwkuYXRvbWljX2NoZWNrID0gaW50ZWxfcGxhbmVfYXRvbWljX2NoZWNrLAorCS5hdG9t aWNfdXBkYXRlID0gaW50ZWxfcGxhbmVfYXRvbWljX3VwZGF0ZSwKK307CisKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAwMzBjZjkzLi45MzRlNmE4IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC05OCw2ICs5OCw4IEBAIHN0YXRpYyB2b2lkIHZsdl9w cmVwYXJlX3BsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCSAgICBjb25zdCBzdHJ1Y3Qg aW50ZWxfY3J0Y19jb25maWcgKnBpcGVfY29uZmlnKTsKIHN0YXRpYyB2b2lkIGNodl9wcmVwYXJl X3BsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCSAgICBjb25zdCBzdHJ1Y3QgaW50ZWxf Y3J0Y19jb25maWcgKnBpcGVfY29uZmlnKTsKK3N0YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNf Y29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7CitzdGF0aWMgdm9pZCBpbnRlbF9maW5pc2hf Y3J0Y19jb21taXQoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKIAogc3RhdGljIHN0cnVjdCBpbnRl bF9lbmNvZGVyICppbnRlbF9maW5kX2VuY29kZXIoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29u bmVjdG9yLCBpbnQgcGlwZSkKIHsKQEAgLTk3OTQsNiArOTc5Niw4IEBAIG91dF9oYW5nOgogc3Rh dGljIHN0cnVjdCBkcm1fY3J0Y19oZWxwZXJfZnVuY3MgaW50ZWxfaGVscGVyX2Z1bmNzID0gewog CS5tb2RlX3NldF9iYXNlX2F0b21pYyA9IGludGVsX3BpcGVfc2V0X2Jhc2VfYXRvbWljLAogCS5s b2FkX2x1dCA9IGludGVsX2NydGNfbG9hZF9sdXQsCisJLmF0b21pY19iZWdpbiA9IGludGVsX2Jl Z2luX2NydGNfY29tbWl0LAorCS5hdG9taWNfZmx1c2ggPSBpbnRlbF9maW5pc2hfY3J0Y19jb21t aXQsCiB9OwogCiAvKioKQEAgLTExNjc0LDcgKzExNjc4LDcgQEAgaW50ZWxfcHJlcGFyZV9wbGFu ZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAl1bnNpZ25lZCBmcm9udGJ1ZmZlcl9iaXRz ID0gMDsKIAlpbnQgcmV0ID0gMDsKIAotCWlmIChXQVJOX09OKGZiID09IHBsYW5lLT5mYiB8fCAh b2JqKSkKKwlpZiAoIW9iaikKIAkJcmV0dXJuIDA7CiAKIAlzd2l0Y2ggKHBsYW5lLT50eXBlKSB7 CkBAIC0xMTc0MSw3ICsxMTc0NSw3IEBAIGludGVsX2NoZWNrX3ByaW1hcnlfcGxhbmUoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUsCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7 CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK IAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBzdGF0ZS0+YmFzZS5jcnRjOwotCXN0cnVjdCBpbnRl bF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKKwlzdHJ1Y3QgaW50ZWxf Y3J0YyAqaW50ZWxfY3J0YzsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9f aW50ZWxfcGxhbmUocGxhbmUpOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gc3RhdGUt PmJhc2UuZmI7CiAJc3RydWN0IGRybV9yZWN0ICpkZXN0ID0gJnN0YXRlLT5kc3Q7CkBAIC0xMTc0 OSw2ICsxMTc1Myw5IEBAIGludGVsX2NoZWNrX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFu ZSAqcGxhbmUsCiAJY29uc3Qgc3RydWN0IGRybV9yZWN0ICpjbGlwID0gJnN0YXRlLT5jbGlwOwog CWludCByZXQ7CiAKKwljcnRjID0gY3J0YyA/IGNydGMgOiBwbGFuZS0+Y3J0YzsKKwlpbnRlbF9j cnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKKwogCXJldCA9IGRybV9wbGFuZV9oZWxwZXJfY2hl Y2tfdXBkYXRlKHBsYW5lLCBjcnRjLCBmYiwKIAkJCQkJICAgIHNyYywgZGVzdCwgY2xpcCwKIAkJ CQkJICAgIERSTV9QTEFORV9IRUxQRVJfTk9fU0NBTElORywKQEAgLTExODA4LDIzICsxMTgxNSwy NiBAQCBpbnRlbF9jb21taXRfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwK IAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHN0YXRlLT5iYXNlLmZiOwogCXN0cnVjdCBk cm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2Ny dGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOworCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRj OwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooZmIpOwog CXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7 CiAJc3RydWN0IGRybV9yZWN0ICpzcmMgPSAmc3RhdGUtPnNyYzsKIAorCWNydGMgPSBjcnRjID8g Y3J0YyA6IHBsYW5lLT5jcnRjOworCWludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwor CiAJcGxhbmUtPmZiID0gZmI7CiAJY3J0Yy0+eCA9IHNyYy0+eDEgPj4gMTY7CiAJY3J0Yy0+eSA9 IHNyYy0+eTEgPj4gMTY7CiAKLQlpbnRlbF9wbGFuZS0+Y3J0Y194ID0gc3RhdGUtPm9yaWdfZHN0 LngxOwotCWludGVsX3BsYW5lLT5jcnRjX3kgPSBzdGF0ZS0+b3JpZ19kc3QueTE7Ci0JaW50ZWxf cGxhbmUtPmNydGNfdyA9IGRybV9yZWN0X3dpZHRoKCZzdGF0ZS0+b3JpZ19kc3QpOwotCWludGVs X3BsYW5lLT5jcnRjX2ggPSBkcm1fcmVjdF9oZWlnaHQoJnN0YXRlLT5vcmlnX2RzdCk7Ci0JaW50 ZWxfcGxhbmUtPnNyY194ID0gc3RhdGUtPm9yaWdfc3JjLngxOwotCWludGVsX3BsYW5lLT5zcmNf eSA9IHN0YXRlLT5vcmlnX3NyYy55MTsKLQlpbnRlbF9wbGFuZS0+c3JjX3cgPSBkcm1fcmVjdF93 aWR0aCgmc3RhdGUtPm9yaWdfc3JjKTsKLQlpbnRlbF9wbGFuZS0+c3JjX2ggPSBkcm1fcmVjdF9o ZWlnaHQoJnN0YXRlLT5vcmlnX3NyYyk7CisJaW50ZWxfcGxhbmUtPmNydGNfeCA9IHN0YXRlLT5i YXNlLmNydGNfeDsKKwlpbnRlbF9wbGFuZS0+Y3J0Y195ID0gc3RhdGUtPmJhc2UuY3J0Y195Owor CWludGVsX3BsYW5lLT5jcnRjX3cgPSBzdGF0ZS0+YmFzZS5jcnRjX3c7CisJaW50ZWxfcGxhbmUt PmNydGNfaCA9IHN0YXRlLT5iYXNlLmNydGNfaDsKKwlpbnRlbF9wbGFuZS0+c3JjX3ggPSBzdGF0 ZS0+YmFzZS5zcmNfeDsKKwlpbnRlbF9wbGFuZS0+c3JjX3kgPSBzdGF0ZS0+YmFzZS5zcmNfeTsK KwlpbnRlbF9wbGFuZS0+c3JjX3cgPSBzdGF0ZS0+YmFzZS5zcmNfdzsKKwlpbnRlbF9wbGFuZS0+ c3JjX2ggPSBzdGF0ZS0+YmFzZS5zcmNfaDsKIAlpbnRlbF9wbGFuZS0+b2JqID0gb2JqOwogCiAJ aWYgKGludGVsX2NydGMtPmFjdGl2ZSkgewpAQCAtMTE4NTMsNiArMTE4NjMsMzIgQEAgc3RhdGlj IHZvaWQgaW50ZWxfYmVnaW5fY3J0Y19jb21taXQoc3RydWN0IGRybV9jcnRjICpjcnRjKQogewog CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0IGludGVsX2NydGMg KmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOworCXN0cnVjdCBpbnRlbF9wbGFuZSAq aW50ZWxfcGxhbmU7CisJc3RydWN0IGRybV9wbGFuZSAqcDsKKwl1bnNpZ25lZCBmYl9iaXRzID0g MDsKKworCS8qIFRyYWNrIGZiJ3MgZm9yIGFueSBwbGFuZXMgYmVpbmcgZGlzYWJsZWQgKi8KKwls aXN0X2Zvcl9lYWNoX2VudHJ5KHAsICZkZXYtPm1vZGVfY29uZmlnLnBsYW5lX2xpc3QsIGhlYWQp IHsKKwkJaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwKTsKKworCQlpZiAoaW50ZWxfY3J0 Yy0+YXRvbWljLnRyYWNrX2ZicyAmICgxIDw8IGRybV9wbGFuZV9pbmRleChwKSkpIHsKKwkJCXN3 aXRjaCAocC0+dHlwZSkgeworCQkJY2FzZSBEUk1fUExBTkVfVFlQRV9QUklNQVJZOgorCQkJCWZi X2JpdHMgPSBJTlRFTF9GUk9OVEJVRkZFUl9QUklNQVJZKGludGVsX3BsYW5lLT5waXBlKTsKKwkJ CQlicmVhazsKKwkJCWNhc2UgRFJNX1BMQU5FX1RZUEVfQ1VSU09SOgorCQkJCWZiX2JpdHMgPSBJ TlRFTF9GUk9OVEJVRkZFUl9DVVJTT1IoaW50ZWxfcGxhbmUtPnBpcGUpOworCQkJCWJyZWFrOwor CQkJY2FzZSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZOgorCQkJCWZiX2JpdHMgPSBJTlRFTF9GUk9O VEJVRkZFUl9TUFJJVEUoaW50ZWxfcGxhbmUtPnBpcGUpOworCQkJCWJyZWFrOworCQkJfQorCisJ CQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CisJCQlpOTE1X2dlbV90cmFja19mYihp bnRlbF9mYl9vYmoocC0+ZmIpLCBOVUxMLCBmYl9iaXRzKTsKKwkJCW11dGV4X3VubG9jaygmZGV2 LT5zdHJ1Y3RfbXV0ZXgpOworCQl9CisJfQogCiAJaWYgKGludGVsX2NydGMtPmF0b21pYy5kaXNh YmxlX2ZiYykKIAkJaW50ZWxfZmJjX2Rpc2FibGUoZGV2KTsKQEAgLTExOTAyLDEyNCArMTE5Mzgs MjMgQEAgc3RhdGljIHZvaWQgaW50ZWxfZmluaXNoX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0 YyAqY3J0YykKIAltZW1zZXQoJmludGVsX2NydGMtPmF0b21pYywgMCwgc2l6ZW9mKGludGVsX2Ny dGMtPmF0b21pYykpOwogfQogCi1pbnQKLWludGVsX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAotCQkgICBzdHJ1Y3QgZHJtX2ZyYW1l YnVmZmVyICpmYiwgaW50IGNydGNfeCwgaW50IGNydGNfeSwKLQkJICAgdW5zaWduZWQgaW50IGNy dGNfdywgdW5zaWduZWQgaW50IGNydGNfaCwKLQkJICAgdWludDMyX3Qgc3JjX3gsIHVpbnQzMl90 IHNyY195LAotCQkgICB1aW50MzJfdCBzcmNfdywgdWludDMyX3Qgc3JjX2gpCi17Ci0Jc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7Ci0Jc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAq b2xkX2ZiID0gcGxhbmUtPmZiOwotCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSBzdGF0ZSA9IHt7 IDAgfX07Ci0Jc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5l KHBsYW5lKTsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMo Y3J0Yyk7Ci0JaW50IHJldDsKLQotCXN0YXRlLmJhc2UuY3J0YyA9IGNydGMgPyBjcnRjIDogcGxh bmUtPmNydGM7Ci0Jc3RhdGUuYmFzZS5mYiA9IGZiOwotCi0JLyogc2FtcGxlIGNvb3JkaW5hdGVz IGluIDE2LjE2IGZpeGVkIHBvaW50ICovCi0Jc3RhdGUuc3JjLngxID0gc3JjX3g7Ci0Jc3RhdGUu c3JjLngyID0gc3JjX3ggKyBzcmNfdzsKLQlzdGF0ZS5zcmMueTEgPSBzcmNfeTsKLQlzdGF0ZS5z cmMueTIgPSBzcmNfeSArIHNyY19oOwotCi0JLyogaW50ZWdlciBwaXhlbHMgKi8KLQlzdGF0ZS5k c3QueDEgPSBjcnRjX3g7Ci0Jc3RhdGUuZHN0LngyID0gY3J0Y194ICsgY3J0Y193OwotCXN0YXRl LmRzdC55MSA9IGNydGNfeTsKLQlzdGF0ZS5kc3QueTIgPSBjcnRjX3kgKyBjcnRjX2g7Ci0KLQlz dGF0ZS5jbGlwLngxID0gMDsKLQlzdGF0ZS5jbGlwLnkxID0gMDsKLQlzdGF0ZS5jbGlwLngyID0g aW50ZWxfY3J0Yy0+YWN0aXZlID8gaW50ZWxfY3J0Yy0+Y29uZmlnLnBpcGVfc3JjX3cgOiAwOwot CXN0YXRlLmNsaXAueTIgPSBpbnRlbF9jcnRjLT5hY3RpdmUgPyBpbnRlbF9jcnRjLT5jb25maWcu cGlwZV9zcmNfaCA6IDA7Ci0KLQlzdGF0ZS5vcmlnX3NyYyA9IHN0YXRlLnNyYzsKLQlzdGF0ZS5v cmlnX2RzdCA9IHN0YXRlLmRzdDsKLQotCXJldCA9IGludGVsX3BsYW5lLT5jaGVja19wbGFuZShw bGFuZSwgJnN0YXRlKTsKLQlpZiAocmV0KQotCQlyZXR1cm4gcmV0OwotCi0JaWYgKGZiICE9IG9s ZF9mYiAmJiBmYikgewotCQlyZXQgPSBpbnRlbF9wcmVwYXJlX3BsYW5lX2ZiKHBsYW5lLCBmYik7 Ci0JCWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OwotCX0KLQotCWlmICghc3RhdGUuYmFzZS5mYikg ewotCQl1bnNpZ25lZCBmYl9iaXRzID0gMDsKLQotCQlzd2l0Y2ggKHBsYW5lLT50eXBlKSB7Ci0J CWNhc2UgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWToKLQkJCWZiX2JpdHMgPSBJTlRFTF9GUk9OVEJV RkZFUl9QUklNQVJZKGludGVsX3BsYW5lLT5waXBlKTsKLQkJCWJyZWFrOwotCQljYXNlIERSTV9Q TEFORV9UWVBFX0NVUlNPUjoKLQkJCWZiX2JpdHMgPSBJTlRFTF9GUk9OVEJVRkZFUl9DVVJTT1Io aW50ZWxfcGxhbmUtPnBpcGUpOwotCQkJYnJlYWs7Ci0JCWNhc2UgRFJNX1BMQU5FX1RZUEVfT1ZF UkxBWToKLQkJCWZiX2JpdHMgPSBJTlRFTF9GUk9OVEJVRkZFUl9TUFJJVEUoaW50ZWxfcGxhbmUt PnBpcGUpOwotCQkJYnJlYWs7Ci0JCX0KLQotCQkvKgotCQkgKiAncHJlcGFyZScgaXMgbmV2ZXIg Y2FsbGVkIHdoZW4gcGxhbmUgaXMgYmVpbmcgZGlzYWJsZWQsIHNvCi0JCSAqIHdlIG5lZWQgdG8g aGFuZGxlIGZyb250YnVmZmVyIHRyYWNraW5nIGhlcmUKLQkJICovCi0JCW11dGV4X2xvY2soJmRl di0+c3RydWN0X211dGV4KTsKLQkJaTkxNV9nZW1fdHJhY2tfZmIoaW50ZWxfZmJfb2JqKHBsYW5l LT5mYiksIE5VTEwsIGZiX2JpdHMpOwotCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4 KTsKLQl9Ci0KLQlpbnRlbF9iZWdpbl9jcnRjX2NvbW1pdChjcnRjKTsKLQlpbnRlbF9wbGFuZS0+ Y29tbWl0X3BsYW5lKHBsYW5lLCAmc3RhdGUpOwotCWludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdChj cnRjKTsKLQotCWlmIChmYiAhPSBvbGRfZmIgJiYgb2xkX2ZiKSB7Ci0JCWlmIChpbnRlbF9jcnRj LT5hY3RpdmUpCi0JCQlpbnRlbF93YWl0X2Zvcl92YmxhbmsoZGV2LCBpbnRlbF9jcnRjLT5waXBl KTsKLQkJaW50ZWxfY2xlYW51cF9wbGFuZV9mYihwbGFuZSwgb2xkX2ZiKTsKLQl9Ci0KLQlwbGFu ZS0+ZmIgPSBmYjsKLQotCXJldHVybiAwOwotfQotCi0vKioKLSAqIGludGVsX2Rpc2FibGVfcGxh bmUgLSBkaXNhYmxlIGEgcGxhbmUKLSAqIEBwbGFuZTogcGxhbmUgdG8gZGlzYWJsZQotICoKLSAq IEdlbmVyYWwgZGlzYWJsZSBoYW5kbGVyIGZvciBhbGwgcGxhbmUgdHlwZXMuCi0gKi8KLWludAot aW50ZWxfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKLXsKLQlpZiAoIXBs YW5lLT5mYikKLQkJcmV0dXJuIDA7Ci0KLQlpZiAoV0FSTl9PTighcGxhbmUtPmNydGMpKQotCQly ZXR1cm4gLUVJTlZBTDsKLQotCXJldHVybiBwbGFuZS0+ZnVuY3MtPnVwZGF0ZV9wbGFuZShwbGFu ZSwgcGxhbmUtPmNydGMsIE5VTEwsCi0JCQkJCSAgMCwgMCwgMCwgMCwgMCwgMCwgMCwgMCk7Ci19 Ci0KIC8qIENvbW1vbiBkZXN0cnVjdGlvbiBmdW5jdGlvbiBmb3IgYm90aCBwcmltYXJ5IGFuZCBj dXJzb3IgcGxhbmVzICovCiB2b2lkIGludGVsX3BsYW5lX2Rlc3Ryb3koc3RydWN0IGRybV9wbGFu ZSAqcGxhbmUpCiB7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVs X3BsYW5lKHBsYW5lKTsKKwlpbnRlbF9wbGFuZV9kZXN0cm95X3N0YXRlKHBsYW5lLCBwbGFuZS0+ c3RhdGUpOwogCWRybV9wbGFuZV9jbGVhbnVwKHBsYW5lKTsKIAlrZnJlZShpbnRlbF9wbGFuZSk7 CiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGludGVsX3ByaW1hcnlf cGxhbmVfZnVuY3MgPSB7Ci0JLnVwZGF0ZV9wbGFuZSA9IGludGVsX3VwZGF0ZV9wbGFuZSwKLQku ZGlzYWJsZV9wbGFuZSA9IGludGVsX2Rpc2FibGVfcGxhbmUsCisJLnVwZGF0ZV9wbGFuZSA9IGRy bV9wbGFuZV9oZWxwZXJfdXBkYXRlLAorCS5kaXNhYmxlX3BsYW5lID0gZHJtX3BsYW5lX2hlbHBl cl9kaXNhYmxlLAogCS5kZXN0cm95ID0gaW50ZWxfcGxhbmVfZGVzdHJveSwKLQkuc2V0X3Byb3Bl cnR5ID0gaW50ZWxfcGxhbmVfc2V0X3Byb3BlcnR5CisJLnNldF9wcm9wZXJ0eSA9IGludGVsX3Bs YW5lX3NldF9wcm9wZXJ0eSwKKwkuYXRvbWljX2R1cGxpY2F0ZV9zdGF0ZSA9IGludGVsX3BsYW5l X2R1cGxpY2F0ZV9zdGF0ZSwKKwkuYXRvbWljX2Rlc3Ryb3lfc3RhdGUgPSBpbnRlbF9wbGFuZV9k ZXN0cm95X3N0YXRlLAorCiB9OwogCiBzdGF0aWMgc3RydWN0IGRybV9wbGFuZSAqaW50ZWxfcHJp bWFyeV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKQEAgLTEyMDMzLDYgKzEx OTY4LDEyIEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICppbnRlbF9wcmltYXJ5X3BsYW5lX2Ny ZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWlmIChwcmltYXJ5ID09IE5VTEwpCiAJCXJl dHVybiBOVUxMOwogCisJcHJpbWFyeS0+YmFzZS5zdGF0ZSA9IGludGVsX3BsYW5lX2R1cGxpY2F0 ZV9zdGF0ZSgmcHJpbWFyeS0+YmFzZSk7CisJaWYgKHByaW1hcnktPmJhc2Uuc3RhdGUgPT0gTlVM TCkgeworCQlrZnJlZShwcmltYXJ5KTsKKwkJcmV0dXJuIE5VTEw7CisJfQorCiAJcHJpbWFyeS0+ Y2FuX3NjYWxlID0gZmFsc2U7CiAJcHJpbWFyeS0+bWF4X2Rvd25zY2FsZSA9IDE7CiAJcHJpbWFy eS0+cGlwZSA9IHBpcGU7CkBAIC0xMjA2OCw2ICsxMjAwOSw4IEBAIHN0YXRpYyBzdHJ1Y3QgZHJt X3BsYW5lICppbnRlbF9wcmltYXJ5X3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAogCQkJCXByaW1hcnktPnJvdGF0aW9uKTsKIAl9CiAKKwlkcm1fcGxhbmVfaGVscGVyX2FkZCgm cHJpbWFyeS0+YmFzZSwgJmludGVsX3BsYW5lX2hlbHBlcl9mdW5jcyk7CisKIAlyZXR1cm4gJnBy aW1hcnktPmJhc2U7CiB9CiAKQEAgLTEyMDc2LDE3ICsxMjAxOSwxOSBAQCBpbnRlbF9jaGVja19j dXJzb3JfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkgc3RydWN0IGludGVsX3Bs YW5lX3N0YXRlICpzdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBzdGF0ZS0+YmFz ZS5jcnRjOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CisJc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7CiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIg PSBzdGF0ZS0+YmFzZS5mYjsKIAlzdHJ1Y3QgZHJtX3JlY3QgKmRlc3QgPSAmc3RhdGUtPmRzdDsK IAlzdHJ1Y3QgZHJtX3JlY3QgKnNyYyA9ICZzdGF0ZS0+c3JjOwogCWNvbnN0IHN0cnVjdCBkcm1f cmVjdCAqY2xpcCA9ICZzdGF0ZS0+Y2xpcDsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq b2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9 IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0JaW50IGNydGNfdywgY3J0Y19oOworCXN0cnVjdCBpbnRl bF9jcnRjICppbnRlbF9jcnRjOwogCXVuc2lnbmVkIHN0cmlkZTsKIAlpbnQgcmV0OwogCisJY3J0 YyA9IGNydGMgPyBjcnRjIDogcGxhbmUtPmNydGM7CisJaW50ZWxfY3J0YyA9IHRvX2ludGVsX2Ny dGMoY3J0Yyk7CisKIAlyZXQgPSBkcm1fcGxhbmVfaGVscGVyX2NoZWNrX3VwZGF0ZShwbGFuZSwg Y3J0YywgZmIsCiAJCQkJCSAgICBzcmMsIGRlc3QsIGNsaXAsCiAJCQkJCSAgICBEUk1fUExBTkVf SEVMUEVSX05PX1NDQUxJTkcsCkBAIC0xMjEwMSwxNSArMTIwNDYsMTQgQEAgaW50ZWxfY2hlY2tf Y3Vyc29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQlnb3RvIGZpbmlzaDsKIAog CS8qIENoZWNrIGZvciB3aGljaCBjdXJzb3IgdHlwZXMgd2Ugc3VwcG9ydCAqLwotCWNydGNfdyA9 IGRybV9yZWN0X3dpZHRoKCZzdGF0ZS0+b3JpZ19kc3QpOwotCWNydGNfaCA9IGRybV9yZWN0X2hl aWdodCgmc3RhdGUtPm9yaWdfZHN0KTsKLQlpZiAoIWN1cnNvcl9zaXplX29rKGRldiwgY3J0Y193 LCBjcnRjX2gpKSB7Ci0JCURSTV9ERUJVRygiQ3Vyc29yIGRpbWVuc2lvbiBub3Qgc3VwcG9ydGVk XG4iKTsKKwlpZiAoIWN1cnNvcl9zaXplX29rKGRldiwgc3RhdGUtPmJhc2UuY3J0Y193LCBzdGF0 ZS0+YmFzZS5jcnRjX2gpKSB7CisJCURSTV9ERUJVRygiQ3Vyc29yIGRpbWVuc2lvbiAlZHglZCBu b3Qgc3VwcG9ydGVkXG4iLAorCQkJICBzdGF0ZS0+YmFzZS5jcnRjX3csIHN0YXRlLT5iYXNlLmNy dGNfaCk7CiAJCXJldHVybiAtRUlOVkFMOwogCX0KIAotCXN0cmlkZSA9IHJvdW5kdXBfcG93X29m X3R3byhjcnRjX3cpICogNDsKLQlpZiAob2JqLT5iYXNlLnNpemUgPCBzdHJpZGUgKiBjcnRjX2gp IHsKKwlzdHJpZGUgPSByb3VuZHVwX3Bvd19vZl90d28oc3RhdGUtPmJhc2UuY3J0Y193KSAqIDQ7 CisJaWYgKG9iai0+YmFzZS5zaXplIDwgc3RyaWRlICogc3RhdGUtPmJhc2UuY3J0Y19oKSB7CiAJ CURSTV9ERUJVR19LTVMoImJ1ZmZlciBpcyB0b28gc21hbGxcbiIpOwogCQlyZXR1cm4gLUVOT01F TTsKIAl9CkBAIC0xMjEyNyw4ICsxMjA3MSw3IEBAIGludGVsX2NoZWNrX2N1cnNvcl9wbGFuZShz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAogZmluaXNoOgogCWlmIChpbnRlbF9jcnRjLT5hY3Rp dmUpIHsKLQkJaWYgKGludGVsX2NydGMtPmN1cnNvcl93aWR0aCAhPQotCQkgICAgZHJtX3JlY3Rf d2lkdGgoJnN0YXRlLT5vcmlnX2RzdCkpCisJCWlmIChpbnRlbF9jcnRjLT5jdXJzb3Jfd2lkdGgg IT0gc3RhdGUtPmJhc2UuY3J0Y193KQogCQkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bSA9 IHRydWU7CiAKIAkJaW50ZWxfY3J0Yy0+YXRvbWljLmZiX2JpdHMgfD0KQEAgLTEyMTQzLDI0ICsx MjA4NiwyNyBAQCBpbnRlbF9jb21taXRfY3Vyc29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBs YW5lLAogCQkJICBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKQogewogCXN0cnVjdCBk cm1fY3J0YyAqY3J0YyA9IHN0YXRlLT5iYXNlLmNydGM7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IGNydGMtPmRldjsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVs X2NydGMoY3J0Yyk7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7CisJc3Ry dWN0IGludGVsX2NydGMgKmludGVsX2NydGM7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9w bGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqb2JqID0gaW50ZWxfZmJfb2JqKHN0YXRlLT5iYXNlLmZiKTsKIAl1aW50MzJfdCBhZGRyOwog CisJY3J0YyA9IGNydGMgPyBjcnRjIDogcGxhbmUtPmNydGM7CisJaW50ZWxfY3J0YyA9IHRvX2lu dGVsX2NydGMoY3J0Yyk7CisKIAlwbGFuZS0+ZmIgPSBzdGF0ZS0+YmFzZS5mYjsKLQljcnRjLT5j dXJzb3JfeCA9IHN0YXRlLT5vcmlnX2RzdC54MTsKLQljcnRjLT5jdXJzb3JfeSA9IHN0YXRlLT5v cmlnX2RzdC55MTsKLQotCWludGVsX3BsYW5lLT5jcnRjX3ggPSBzdGF0ZS0+b3JpZ19kc3QueDE7 Ci0JaW50ZWxfcGxhbmUtPmNydGNfeSA9IHN0YXRlLT5vcmlnX2RzdC55MTsKLQlpbnRlbF9wbGFu ZS0+Y3J0Y193ID0gZHJtX3JlY3Rfd2lkdGgoJnN0YXRlLT5vcmlnX2RzdCk7Ci0JaW50ZWxfcGxh bmUtPmNydGNfaCA9IGRybV9yZWN0X2hlaWdodCgmc3RhdGUtPm9yaWdfZHN0KTsKLQlpbnRlbF9w bGFuZS0+c3JjX3ggPSBzdGF0ZS0+b3JpZ19zcmMueDE7Ci0JaW50ZWxfcGxhbmUtPnNyY195ID0g c3RhdGUtPm9yaWdfc3JjLnkxOwotCWludGVsX3BsYW5lLT5zcmNfdyA9IGRybV9yZWN0X3dpZHRo KCZzdGF0ZS0+b3JpZ19zcmMpOwotCWludGVsX3BsYW5lLT5zcmNfaCA9IGRybV9yZWN0X2hlaWdo dCgmc3RhdGUtPm9yaWdfc3JjKTsKKwljcnRjLT5jdXJzb3JfeCA9IHN0YXRlLT5iYXNlLmNydGNf eDsKKwljcnRjLT5jdXJzb3JfeSA9IHN0YXRlLT5iYXNlLmNydGNfeTsKKworCWludGVsX3BsYW5l LT5jcnRjX3ggPSBzdGF0ZS0+YmFzZS5jcnRjX3g7CisJaW50ZWxfcGxhbmUtPmNydGNfeSA9IHN0 YXRlLT5iYXNlLmNydGNfeTsKKwlpbnRlbF9wbGFuZS0+Y3J0Y193ID0gc3RhdGUtPmJhc2UuY3J0 Y193OworCWludGVsX3BsYW5lLT5jcnRjX2ggPSBzdGF0ZS0+YmFzZS5jcnRjX2g7CisJaW50ZWxf cGxhbmUtPnNyY194ID0gc3RhdGUtPmJhc2Uuc3JjX3g7CisJaW50ZWxfcGxhbmUtPnNyY195ID0g c3RhdGUtPmJhc2Uuc3JjX3k7CisJaW50ZWxfcGxhbmUtPnNyY193ID0gc3RhdGUtPmJhc2Uuc3Jj X3c7CisJaW50ZWxfcGxhbmUtPnNyY19oID0gc3RhdGUtPmJhc2Uuc3JjX2g7CiAJaW50ZWxfcGxh bmUtPm9iaiA9IG9iajsKIAogCWlmIChpbnRlbF9jcnRjLT5jdXJzb3JfYm8gPT0gb2JqKQpAQCAt MTIxNzYsMTggKzEyMTIyLDIwIEBAIGludGVsX2NvbW1pdF9jdXJzb3JfcGxhbmUoc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUsCiAJaW50ZWxfY3J0Yy0+Y3Vyc29yX2FkZHIgPSBhZGRyOwogCWludGVs X2NydGMtPmN1cnNvcl9ibyA9IG9iajsKIHVwZGF0ZToKLQlpbnRlbF9jcnRjLT5jdXJzb3Jfd2lk dGggPSBkcm1fcmVjdF93aWR0aCgmc3RhdGUtPm9yaWdfZHN0KTsKLQlpbnRlbF9jcnRjLT5jdXJz b3JfaGVpZ2h0ID0gZHJtX3JlY3RfaGVpZ2h0KCZzdGF0ZS0+b3JpZ19kc3QpOworCWludGVsX2Ny dGMtPmN1cnNvcl93aWR0aCA9IHN0YXRlLT5iYXNlLmNydGNfdzsKKwlpbnRlbF9jcnRjLT5jdXJz b3JfaGVpZ2h0ID0gc3RhdGUtPmJhc2UuY3J0Y19oOwogCiAJaWYgKGludGVsX2NydGMtPmFjdGl2 ZSkKIAkJaW50ZWxfY3J0Y191cGRhdGVfY3Vyc29yKGNydGMsIHN0YXRlLT52aXNpYmxlKTsKIH0K IAogc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3MgaW50ZWxfY3Vyc29yX3BsYW5l X2Z1bmNzID0gewotCS51cGRhdGVfcGxhbmUgPSBpbnRlbF91cGRhdGVfcGxhbmUsCi0JLmRpc2Fi bGVfcGxhbmUgPSBpbnRlbF9kaXNhYmxlX3BsYW5lLAorCS51cGRhdGVfcGxhbmUgPSBkcm1fcGxh bmVfaGVscGVyX3VwZGF0ZSwKKwkuZGlzYWJsZV9wbGFuZSA9IGRybV9wbGFuZV9oZWxwZXJfZGlz YWJsZSwKIAkuZGVzdHJveSA9IGludGVsX3BsYW5lX2Rlc3Ryb3ksCiAJLnNldF9wcm9wZXJ0eSA9 IGludGVsX3BsYW5lX3NldF9wcm9wZXJ0eSwKKwkuYXRvbWljX2R1cGxpY2F0ZV9zdGF0ZSA9IGlu dGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZSwKKwkuYXRvbWljX2Rlc3Ryb3lfc3RhdGUgPSBpbnRl bF9wbGFuZV9kZXN0cm95X3N0YXRlLAogfTsKIAogc3RhdGljIHN0cnVjdCBkcm1fcGxhbmUgKmlu dGVsX2N1cnNvcl9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKQEAgLTEyMTk5 LDYgKzEyMTQ3LDEyIEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICppbnRlbF9jdXJzb3JfcGxh bmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaWYgKGN1cnNvciA9PSBOVUxMKQog CQlyZXR1cm4gTlVMTDsKIAorCWN1cnNvci0+YmFzZS5zdGF0ZSA9IGludGVsX3BsYW5lX2R1cGxp Y2F0ZV9zdGF0ZSgmY3Vyc29yLT5iYXNlKTsKKwlpZiAoY3Vyc29yLT5iYXNlLnN0YXRlID09IE5V TEwpIHsKKwkJa2ZyZWUoY3Vyc29yKTsKKwkJcmV0dXJuIE5VTEw7CisJfQorCiAJY3Vyc29yLT5j YW5fc2NhbGUgPSBmYWxzZTsKIAljdXJzb3ItPm1heF9kb3duc2NhbGUgPSAxOwogCWN1cnNvci0+ cGlwZSA9IHBpcGU7CkBAIC0xMjIyNSw2ICsxMjE3OSw4IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX3Bs YW5lICppbnRlbF9jdXJzb3JfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ CQkJY3Vyc29yLT5yb3RhdGlvbik7CiAJfQogCisJZHJtX3BsYW5lX2hlbHBlcl9hZGQoJmN1cnNv ci0+YmFzZSwgJmludGVsX3BsYW5lX2hlbHBlcl9mdW5jcyk7CisKIAlyZXR1cm4gJmN1cnNvci0+ YmFzZTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCAyNTIzMzE1Li5hYjIzMTkw IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMjQ4LDggKzI0OCw2IEBAIHN0cnVjdCBp bnRlbF9wbGFuZV9zdGF0ZSB7CiAJc3RydWN0IGRybV9yZWN0IHNyYzsKIAlzdHJ1Y3QgZHJtX3Jl Y3QgZHN0OwogCXN0cnVjdCBkcm1fcmVjdCBjbGlwOwotCXN0cnVjdCBkcm1fcmVjdCBvcmlnX3Ny YzsKLQlzdHJ1Y3QgZHJtX3JlY3Qgb3JpZ19kc3Q7CiAJYm9vbCB2aXNpYmxlOwogCiAJLyoKQEAg LTQzNyw2ICs0MzUsNyBAQCBzdHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNfY29tbWl0IHsKIAlib29s IGRpc2FibGVfZmJjOwogCWJvb2wgcHJlX2Rpc2FibGVfcHJpbWFyeTsKIAlib29sIHVwZGF0ZV93 bTsKKwl1bnNpZ25lZCB0cmFja19mYnM7CiAKIAkvKiBTbGVlcGFibGUgb3BlcmF0aW9ucyB0byBw ZXJmb3JtIGFmdGVyIGNvbW1pdCAqLwogCXVuc2lnbmVkIGZiX2JpdHM7CkBAIC01NzUsNiArNTc0 LDcgQEAgc3RydWN0IGN4c3JfbGF0ZW5jeSB7CiAjZGVmaW5lIHRvX2ludGVsX2VuY29kZXIoeCkg Y29udGFpbmVyX29mKHgsIHN0cnVjdCBpbnRlbF9lbmNvZGVyLCBiYXNlKQogI2RlZmluZSB0b19p bnRlbF9mcmFtZWJ1ZmZlcih4KSBjb250YWluZXJfb2YoeCwgc3RydWN0IGludGVsX2ZyYW1lYnVm ZmVyLCBiYXNlKQogI2RlZmluZSB0b19pbnRlbF9wbGFuZSh4KSBjb250YWluZXJfb2YoeCwgc3Ry dWN0IGludGVsX3BsYW5lLCBiYXNlKQorI2RlZmluZSB0b19pbnRlbF9wbGFuZV9zdGF0ZSh4KSBj b250YWluZXJfb2YoeCwgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlLCBiYXNlKQogI2RlZmluZSBp bnRlbF9mYl9vYmooeCkgKHggPyB0b19pbnRlbF9mcmFtZWJ1ZmZlcih4KS0+b2JqIDogTlVMTCkK IAogc3RydWN0IGludGVsX2hkbWkgewpAQCAtMTI1Myw0ICsxMjUzLDEwIEBAIHZvaWQgaW50ZWxf cHJlX2Rpc2FibGVfcHJpbWFyeShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogLyogaW50ZWxfdHYu YyAqLwogdm9pZCBpbnRlbF90dl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogCisvKiBp bnRlbF9hdG9taWMuYyAqLworc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqaW50ZWxfcGxhbmVfZHVw bGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKTsKK3ZvaWQgaW50ZWxfcGxhbmVf ZGVzdHJveV9zdGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKKwkJCSAgICAgICBzdHJ1Y3Qg ZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSk7CitleHRlcm4gY29uc3Qgc3RydWN0IGRybV9wbGFuZV9o ZWxwZXJfZnVuY3MgaW50ZWxfcGxhbmVfaGVscGVyX2Z1bmNzOworCiAjZW5kaWYgLyogX19JTlRF TF9EUlZfSF9fICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJp dGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IGE2ODljNzMu LmY4ZWZjZmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0zMyw2ICszMyw3 IEBACiAjaW5jbHVkZSA8ZHJtL2RybV9jcnRjLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9mb3VyY2Mu aD4KICNpbmNsdWRlIDxkcm0vZHJtX3JlY3QuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX3BsYW5lX2hl bHBlci5oPgogI2luY2x1ZGUgImludGVsX2Rydi5oIgogI2luY2x1ZGUgPGRybS9pOTE1X2RybS5o PgogI2luY2x1ZGUgImk5MTVfZHJ2LmgiCkBAIC0xMDYxLDEyICsxMDYyLDEzIEBAIGludGVsX2No ZWNrX3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAl1aW50MzJfdCBzcmNf eCwgc3JjX3ksIHNyY193LCBzcmNfaDsKIAlzdHJ1Y3QgZHJtX3JlY3QgKnNyYyA9ICZzdGF0ZS0+ c3JjOwogCXN0cnVjdCBkcm1fcmVjdCAqZHN0ID0gJnN0YXRlLT5kc3Q7Ci0Jc3RydWN0IGRybV9y ZWN0ICpvcmlnX3NyYyA9ICZzdGF0ZS0+b3JpZ19zcmM7CiAJY29uc3Qgc3RydWN0IGRybV9yZWN0 ICpjbGlwID0gJnN0YXRlLT5jbGlwOwogCWludCBoc2NhbGUsIHZzY2FsZTsKIAlpbnQgbWF4X3Nj YWxlLCBtaW5fc2NhbGU7CiAJaW50IHBpeGVsX3NpemU7CiAKKwlpbnRlbF9jcnRjID0gaW50ZWxf Y3J0YyA/IGludGVsX2NydGMgOiB0b19pbnRlbF9jcnRjKHBsYW5lLT5jcnRjKTsKKwogCWlmICgh ZmIpIHsKIAkJc3RhdGUtPnZpc2libGUgPSBmYWxzZTsKIAkJZ290byBmaW5pc2g7CkBAIC0xMTQ3 LDEwICsxMTQ5LDEwIEBAIGludGVsX2NoZWNrX3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5l ICpwbGFuZSwKIAkJCQkgICAgaW50ZWxfcGxhbmUtPnJvdGF0aW9uKTsKIAogCQkvKiBzYW5pdHkg Y2hlY2sgdG8gbWFrZSBzdXJlIHRoZSBzcmMgdmlld3BvcnQgd2Fzbid0IGVubGFyZ2VkICovCi0J CVdBUk5fT04oc3JjLT54MSA8IChpbnQpIG9yaWdfc3JjLT54MSB8fAotCQkJc3JjLT55MSA8IChp bnQpIG9yaWdfc3JjLT55MSB8fAotCQkJc3JjLT54MiA+IChpbnQpIG9yaWdfc3JjLT54MiB8fAot CQkJc3JjLT55MiA+IChpbnQpIG9yaWdfc3JjLT55Mik7CisJCVdBUk5fT04oc3JjLT54MSA8IChp bnQpIHN0YXRlLT5iYXNlLnNyY194IHx8CisJCQlzcmMtPnkxIDwgKGludCkgc3RhdGUtPmJhc2Uu c3JjX3kgfHwKKwkJCXNyYy0+eDIgPiAoaW50KSBzdGF0ZS0+YmFzZS5zcmNfeCArIHN0YXRlLT5i YXNlLnNyY193IHx8CisJCQlzcmMtPnkyID4gKGludCkgc3RhdGUtPmJhc2Uuc3JjX3kgKyBzdGF0 ZS0+YmFzZS5zcmNfaCk7CiAKIAkJLyoKIAkJICogSGFyZHdhcmUgZG9lc24ndCBoYW5kbGUgc3Vi cGl4ZWwgY29vcmRpbmF0ZXMuCkBAIC0xMjQ3LDcgKzEyNDksNyBAQCBpbnRlbF9jb21taXRfc3By aXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJICBzdHJ1Y3QgaW50ZWxfcGxh bmVfc3RhdGUgKnN0YXRlKQogewogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHN0YXRlLT5iYXNl LmNydGM7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNy dGMpOworCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjOwogCXN0cnVjdCBpbnRlbF9wbGFu ZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CiAJc3RydWN0IGRybV9mcmFt ZWJ1ZmZlciAqZmIgPSBzdGF0ZS0+YmFzZS5mYjsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqb2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKQEAgLTEyNTUsMTQgKzEyNTcsMTkgQEAgaW50ZWxf Y29tbWl0X3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAl1bnNpZ25lZCBp bnQgY3J0Y193LCBjcnRjX2g7CiAJdWludDMyX3Qgc3JjX3gsIHNyY195LCBzcmNfdywgc3JjX2g7 CiAKLQlpbnRlbF9wbGFuZS0+Y3J0Y194ID0gc3RhdGUtPm9yaWdfZHN0LngxOwotCWludGVsX3Bs YW5lLT5jcnRjX3kgPSBzdGF0ZS0+b3JpZ19kc3QueTE7Ci0JaW50ZWxfcGxhbmUtPmNydGNfdyA9 IGRybV9yZWN0X3dpZHRoKCZzdGF0ZS0+b3JpZ19kc3QpOwotCWludGVsX3BsYW5lLT5jcnRjX2gg PSBkcm1fcmVjdF9oZWlnaHQoJnN0YXRlLT5vcmlnX2RzdCk7Ci0JaW50ZWxfcGxhbmUtPnNyY194 ID0gc3RhdGUtPm9yaWdfc3JjLngxOwotCWludGVsX3BsYW5lLT5zcmNfeSA9IHN0YXRlLT5vcmln X3NyYy55MTsKLQlpbnRlbF9wbGFuZS0+c3JjX3cgPSBkcm1fcmVjdF93aWR0aCgmc3RhdGUtPm9y aWdfc3JjKTsKLQlpbnRlbF9wbGFuZS0+c3JjX2ggPSBkcm1fcmVjdF9oZWlnaHQoJnN0YXRlLT5v cmlnX3NyYyk7CisJaW50ZWxfcGxhbmUtPmNydGNfeCA9IHN0YXRlLT5iYXNlLmNydGNfeDsKKwlp bnRlbF9wbGFuZS0+Y3J0Y195ID0gc3RhdGUtPmJhc2UuY3J0Y195OworCWludGVsX3BsYW5lLT5j cnRjX3cgPSBzdGF0ZS0+YmFzZS5jcnRjX3c7CisJaW50ZWxfcGxhbmUtPmNydGNfaCA9IHN0YXRl LT5iYXNlLmNydGNfaDsKKwlpbnRlbF9wbGFuZS0+c3JjX3ggPSBzdGF0ZS0+YmFzZS5zcmNfeDsK KwlpbnRlbF9wbGFuZS0+c3JjX3kgPSBzdGF0ZS0+YmFzZS5zcmNfeTsKKwlpbnRlbF9wbGFuZS0+ c3JjX3cgPSBzdGF0ZS0+YmFzZS5zcmNfdzsKKwlpbnRlbF9wbGFuZS0+c3JjX2ggPSBzdGF0ZS0+ YmFzZS5zcmNfaDsKKworCWNydGMgPSBjcnRjID8gY3J0YyA6IHBsYW5lLT5jcnRjOworCWludGVs X2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOworCisJcGxhbmUtPmZiID0gc3RhdGUtPmJhc2Uu ZmI7CiAJaW50ZWxfcGxhbmUtPm9iaiA9IG9iajsKIAogCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUp IHsKQEAgLTEzODYsMTAgKzEzOTMsMTIgQEAgaW50IGludGVsX3BsYW5lX3Jlc3RvcmUoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUpCiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1 bmNzIGludGVsX3Nwcml0ZV9wbGFuZV9mdW5jcyA9IHsKLQkudXBkYXRlX3BsYW5lID0gaW50ZWxf dXBkYXRlX3BsYW5lLAotCS5kaXNhYmxlX3BsYW5lID0gaW50ZWxfZGlzYWJsZV9wbGFuZSwKKwku dXBkYXRlX3BsYW5lID0gZHJtX3BsYW5lX2hlbHBlcl91cGRhdGUsCisJLmRpc2FibGVfcGxhbmUg PSBkcm1fcGxhbmVfaGVscGVyX2Rpc2FibGUsCiAJLmRlc3Ryb3kgPSBpbnRlbF9wbGFuZV9kZXN0 cm95LAogCS5zZXRfcHJvcGVydHkgPSBpbnRlbF9wbGFuZV9zZXRfcHJvcGVydHksCisJLmF0b21p Y19kdXBsaWNhdGVfc3RhdGUgPSBpbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUsCisJLmF0b21p Y19kZXN0cm95X3N0YXRlID0gaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZSwKIH07CiAKIHN0YXRp YyB1aW50MzJfdCBpbGtfcGxhbmVfZm9ybWF0c1tdID0gewpAQCAtMTQ1MSw2ICsxNDYwLDEzIEBA IGludGVsX3BsYW5lX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBwaXBlIHBpcGUs IGludCBwbGFuZSkKIAlpZiAoIWludGVsX3BsYW5lKQogCQlyZXR1cm4gLUVOT01FTTsKIAorCWlu dGVsX3BsYW5lLT5iYXNlLnN0YXRlID0KKwkJaW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0YXRlKCZp bnRlbF9wbGFuZS0+YmFzZSk7CisJaWYgKGludGVsX3BsYW5lLT5iYXNlLnN0YXRlID09IE5VTEwp IHsKKwkJa2ZyZWUoaW50ZWxfcGxhbmUpOworCQlyZXR1cm4gLUVOT01FTTsKKwl9CisKIAlzd2l0 Y2ggKElOVEVMX0lORk8oZGV2KS0+Z2VuKSB7CiAJY2FzZSA1OgogCWNhc2UgNjoKQEAgLTE1NDQs NiArMTU2MCw4IEBAIGludGVsX3BsYW5lX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51 bSBwaXBlIHBpcGUsIGludCBwbGFuZSkKIAkJCQkJICAgZGV2LT5tb2RlX2NvbmZpZy5yb3RhdGlv bl9wcm9wZXJ0eSwKIAkJCQkJICAgaW50ZWxfcGxhbmUtPnJvdGF0aW9uKTsKIAorCWRybV9wbGFu ZV9oZWxwZXJfYWRkKCZpbnRlbF9wbGFuZS0+YmFzZSwgJmludGVsX3BsYW5lX2hlbHBlcl9mdW5j cyk7CisKICBvdXQ6CiAJcmV0dXJuIHJldDsKIH0KLS0gCjEuOC41LjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==