From: Matt Roper Subject: [PATCH 4/5] drm/i915: Move to atomic plane helpers (v9) Date: Tue, 23 Dec 2014 10:41:52 -0800 Message-ID: <1419360113-10972-5-git-send-email-matthew.d.roper@intel.com> References: <1419360113-10972-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id B4C0A6E51D for ; Tue, 23 Dec 2014 10:43:20 -0800 (PST) In-Reply-To: <1419360113-10972-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 ZWFybGllcgogICBpdGVyYXRpb25zLiAoQW5kZXIpCgp2OToKIC0gcy90cmFja19mYnMvZGlzYWJs ZWRfcGxhbmVzLyBpbiB0aGUgYXRvbWljIGNydGMgZmxhZ3MuICBUaGUgb25seSBmYidzCiAgIHdl IG5lZWQgdG8gdXBkYXRlIGZyb250YnVmZmVyIHRyYWNraW5nIGZvciBhcmUgdGhvc2Ugb24gYSBw bGFuZSBhYm91dAogICB0byBiZSBkaXNhYmxlZCAoc2luY2UgdGhlIGF0b21pYyBoZWxwZXJzIG5l dmVyIGNhbGwgcHJlcGFyZV9mYigpIHdoZW4KICAgZGlzYWJsaW5nIGEgcGxhbmUpLCBzbyB0aGUg bmV3IG5hbWUgbW9yZSBhY2N1cmF0ZWx5IGRlc2NyaWJlcyB3aGF0CiAgIHdlJ3JlIGFjdHVhbGx5 IHRyYWNraW5nLgoKVGVzdGNhc2U6IGlndC9rbXNfcGxhbmUKVGVzdGNhc2U6IGlndC9rbXNfdW5p dmVyc2FsX3BsYW5lClRlc3RjYXNlOiBpZ3Qva21zX2N1cnNvcl9jcmMKU2lnbmVkLW9mZi1ieTog TWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4KLS0tCiBEb2N1bWVudGF0aW9u L0RvY0Jvb2svZHJtLnRtcGwgICAgICAgICAgICB8ICAgNSArCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9NYWtlZmlsZSAgICAgICAgICAgICB8ICAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9hdG9taWNfcGxhbmUuYyB8IDE1MSArKysrKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICAgIHwgMjUxICsrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgICAgICAgfCAgMTAg Ky0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICAgICAgIHwgIDUwICsrKyst LQogNiBmaWxlcyBjaGFuZ2VkLCAzMDMgaW5zZXJ0aW9ucygrKSwgMTY1IGRlbGV0aW9ucygtKQog Y3JlYXRlIG1vZGUgMTAwNjQ0IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFu ZS5jCgpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9Eb2NCb29rL2RybS50bXBsIGIvRG9jdW1l bnRhdGlvbi9Eb2NCb29rL2RybS50bXBsCmluZGV4IDNiMjU3MWUuLjE2OWQyMDUgMTAwNjQ0Ci0t LSBhL0RvY3VtZW50YXRpb24vRG9jQm9vay9kcm0udG1wbAorKysgYi9Eb2N1bWVudGF0aW9uL0Rv Y0Jvb2svZHJtLnRtcGwKQEAgLTQwMTgsNiArNDAxOCwxMSBAQCBpbnQgbnVtX2lvY3Rsczs8L3N5 bm9wc2lzPgogICAgICAgICA8L3BhcmE+CiAgICAgICA8L3NlY3QyPgogICAgICAgPHNlY3QyPgor ICAgICAgICA8dGl0bGU+QXRvbWljIFBsYW5lIEhlbHBlcnM8L3RpdGxlPgorIVBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYyBhdG9taWMgcGxhbmUgaGVscGVycworIUlk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYworICAgICAgPC9zZWN0Mj4K KyAgICAgIDxzZWN0Mj4KICAgICAgICAgPHRpdGxlPk91dHB1dCBQcm9iaW5nPC90aXRsZT4KICAg ICAgICAgPHBhcmE+CiAJICBUaGlzIHNlY3Rpb24gY292ZXJzIG91dHB1dCBwcm9iaW5nIGFuZCBy ZWxhdGVkIGluZnJhc3RydWN0dXJlIGxpa2UgdGhlCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9NYWtlZmlsZSBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L01ha2VmaWxlCmluZGV4IDE4 NDlmZmEuLjE2ZTNkYzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L01ha2VmaWxl CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L01ha2VmaWxlCkBAIC02Niw2ICs2Niw3IEBAIGk5 MTUteSArPSBkdm9fY2g3MDE3Lm8gXAogCSAgZHZvX25zMjUwMS5vIFwKIAkgIGR2b19zaWwxNjQu byBcCiAJICBkdm9fdGZwNDEwLm8gXAorCSAgaW50ZWxfYXRvbWljX3BsYW5lLm8gXAogCSAgaW50 ZWxfY3J0Lm8gXAogCSAgaW50ZWxfZGRpLm8gXAogCSAgaW50ZWxfZHAubyBcCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFuZS5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLmU3NDI1ZDZjCi0tLSAvZGV2L251bGwKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKQEAgLTAsMCArMSwxNTEgQEAKKy8qCisgKiBDb3B5cmln aHQgwqkgMjAxNCBJbnRlbCBDb3Jwb3JhdGlvbgorICoKKyAqIFBlcm1pc3Npb24gaXMgaGVyZWJ5 IGdyYW50ZWQsIGZyZWUgb2YgY2hhcmdlLCB0byBhbnkgcGVyc29uIG9idGFpbmluZyBhCisgKiBj b3B5IG9mIHRoaXMgc29mdHdhcmUgYW5kIGFzc29jaWF0ZWQgZG9jdW1lbnRhdGlvbiBmaWxlcyAo dGhlICJTb2Z0d2FyZSIpLAorICogdG8gZGVhbCBpbiB0aGUgU29mdHdhcmUgd2l0aG91dCByZXN0 cmljdGlvbiwgaW5jbHVkaW5nIHdpdGhvdXQgbGltaXRhdGlvbgorICogdGhlIHJpZ2h0cyB0byB1 c2UsIGNvcHksIG1vZGlmeSwgbWVyZ2UsIHB1Ymxpc2gsIGRpc3RyaWJ1dGUsIHN1YmxpY2Vuc2Us CisgKiBhbmQvb3Igc2VsbCBjb3BpZXMgb2YgdGhlIFNvZnR3YXJlLCBhbmQgdG8gcGVybWl0IHBl cnNvbnMgdG8gd2hvbSB0aGUKKyAqIFNvZnR3YXJlIGlzIGZ1cm5pc2hlZCB0byBkbyBzbywgc3Vi amVjdCB0byB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnM6CisgKgorICogVGhlIGFib3ZlIGNvcHly aWdodCBub3RpY2UgYW5kIHRoaXMgcGVybWlzc2lvbiBub3RpY2UgKGluY2x1ZGluZyB0aGUgbmV4 dAorICogcGFyYWdyYXBoKSBzaGFsbCBiZSBpbmNsdWRlZCBpbiBhbGwgY29waWVzIG9yIHN1YnN0 YW50aWFsIHBvcnRpb25zIG9mIHRoZQorICogU29mdHdhcmUuCisgKgorICogVEhFIFNPRlRXQVJF IElTIFBST1ZJREVEICJBUyBJUyIsIFdJVEhPVVQgV0FSUkFOVFkgT0YgQU5ZIEtJTkQsIEVYUFJF U1MgT1IKKyAqIElNUExJRUQsIElOQ0xVRElORyBCVVQgTk9UIExJTUlURUQgVE8gVEhFIFdBUlJB TlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZLAorICogRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBV UlBPU0UgQU5EIE5PTklORlJJTkdFTUVOVC4gIElOIE5PIEVWRU5UIFNIQUxMCisgKiBUSEUgQVVU SE9SUyBPUiBDT1BZUklHSFQgSE9MREVSUyBCRSBMSUFCTEUgRk9SIEFOWSBDTEFJTSwgREFNQUdF UyBPUiBPVEhFUgorICogTElBQklMSVRZLCBXSEVUSEVSIElOIEFOIEFDVElPTiBPRiBDT05UUkFD VCwgVE9SVCBPUiBPVEhFUldJU0UsIEFSSVNJTkcKKyAqIEZST00sIE9VVCBPRiBPUiBJTiBDT05O RUNUSU9OIFdJVEggVEhFIFNPRlRXQVJFIE9SIFRIRSBVU0UgT1IgT1RIRVIKKyAqIERFQUxJTkdT IElOIFRIRSBTT0ZUV0FSRS4KKyAqLworCisvKioKKyAqIERPQzogYXRvbWljIHBsYW5lIGhlbHBl ciBzdXBwb3J0CisgKgorICogVGhlIGZ1bmN0aW9ucyBoZXJlIGFyZSB1c2VkIGJ5IHRoZSBhdG9t aWMgcGxhbmUgaGVscGVyIGZ1bmN0aW9ucyB0bworICogaW1wbGVtZW50IGxlZ2FjeSBwbGFuZSB1 cGRhdGVzIChpLmUuLCBkcm1fcGxhbmUtPnVwZGF0ZV9wbGFuZSgpIGFuZAorICogZHJtX3BsYW5l LT5kaXNhYmxlX3BsYW5lKCkpLiAgVGhpcyBhbGxvd3MgcGxhbmUgdXBkYXRlcyB0byB1c2UgdGhl CisgKiBhdG9taWMgc3RhdGUgaW5mcmFzdHJ1Y3R1cmUgYW5kIHBlcmZvcm0gcGxhbmUgdXBkYXRl cyBhcyBzZXBhcmF0ZQorICogcHJlcGFyZS9jaGVjay9jb21taXQvY2xlYW51cCBzdGVwcy4KKyAq LworCisjaW5jbHVkZSA8ZHJtL2RybVAuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX2F0b21pY19oZWxw ZXIuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX3BsYW5lX2hlbHBlci5oPgorI2luY2x1ZGUgImludGVs X2Rydi5oIgorCisvKioKKyAqIGludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZSAtIGR1cGxpY2F0 ZSBwbGFuZSBzdGF0ZQorICogQHBsYW5lOiBkcm0gcGxhbmUKKyAqCisgKiBBbGxvY2F0ZXMgYW5k IHJldHVybnMgYSBjb3B5IG9mIHRoZSBwbGFuZSBzdGF0ZSAoYm90aCBjb21tb24gYW5kCisgKiBJ bnRlbC1zcGVjaWZpYykgZm9yIHRoZSBzcGVjaWZpZWQgcGxhbmUuCisgKgorICogUmV0dXJuczog VGhlIG5ld2x5IGFsbG9jYXRlZCBwbGFuZSBzdGF0ZSwgb3IgTlVMTCBvciBmYWlsdXJlLgorICov CitzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICoKK2ludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZShz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKK3sKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0 YXRlOworCisJaWYgKHBsYW5lLT5zdGF0ZSkKKwkJc3RhdGUgPSBrbWVtZHVwKHBsYW5lLT5zdGF0 ZSwgc2l6ZW9mKCpzdGF0ZSksIEdGUF9LRVJORUwpOworCWVsc2UKKwkJc3RhdGUgPSBremFsbG9j KHNpemVvZigqc3RhdGUpLCBHRlBfS0VSTkVMKTsKKworCWlmICghc3RhdGUpCisJCXJldHVybiBO VUxMOworCisJaWYgKHN0YXRlLT5iYXNlLmZiKQorCQlkcm1fZnJhbWVidWZmZXJfcmVmZXJlbmNl KHN0YXRlLT5iYXNlLmZiKTsKKworCXJldHVybiAmc3RhdGUtPmJhc2U7Cit9CisKKy8qKgorICog aW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZSAtIGRlc3Ryb3kgcGxhbmUgc3RhdGUKKyAqIEBwbGFu ZTogZHJtIHBsYW5lCisgKgorICogRGVzdHJveXMgdGhlIHBsYW5lIHN0YXRlIChib3RoIGNvbW1v biBhbmQgSW50ZWwtc3BlY2lmaWMpIGZvciB0aGUKKyAqIHNwZWNpZmllZCBwbGFuZS4KKyAqLwor dm9pZAoraW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwK KwkJCSAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqc3RhdGUpCit7CisJZHJtX2F0b21pY19oZWxw ZXJfcGxhbmVfZGVzdHJveV9zdGF0ZShwbGFuZSwgc3RhdGUpOworfQorCitzdGF0aWMgaW50IGlu dGVsX3BsYW5lX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKKwkJCQkgICAg c3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqc3RhdGUpCit7CisJc3RydWN0IGRybV9jcnRjICpjcnRj ID0gc3RhdGUtPmNydGM7CisJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGM7CisJc3RydWN0 IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKKwlzdHJ1 Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3N0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUo c3RhdGUpOworCisJY3J0YyA9IGNydGMgPyBjcnRjIDogcGxhbmUtPmNydGM7CisJaW50ZWxfY3J0 YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisKKwkvKgorCSAqIFRoZSBvcmlnaW5hbCBzcmMvZGVz dCBjb29yZGluYXRlcyBhcmUgc3RvcmVkIGluIHN0YXRlLT5iYXNlLCBidXQKKwkgKiB3ZSB3YW50 IHRvIGtlZXAgYW5vdGhlciBjb3B5IGludGVybmFsIHRvIG91ciBkcml2ZXIgdGhhdCB3ZSBjYW4K KwkgKiBjbGlwL21vZGlmeSBvdXJzZWx2ZXMuCisJICovCisJaW50ZWxfc3RhdGUtPnNyYy54MSA9 IHN0YXRlLT5zcmNfeDsKKwlpbnRlbF9zdGF0ZS0+c3JjLnkxID0gc3RhdGUtPnNyY195OworCWlu dGVsX3N0YXRlLT5zcmMueDIgPSBzdGF0ZS0+c3JjX3ggKyBzdGF0ZS0+c3JjX3c7CisJaW50ZWxf c3RhdGUtPnNyYy55MiA9IHN0YXRlLT5zcmNfeSArIHN0YXRlLT5zcmNfaDsKKwlpbnRlbF9zdGF0 ZS0+ZHN0LngxID0gc3RhdGUtPmNydGNfeDsKKwlpbnRlbF9zdGF0ZS0+ZHN0LnkxID0gc3RhdGUt PmNydGNfeTsKKwlpbnRlbF9zdGF0ZS0+ZHN0LngyID0gc3RhdGUtPmNydGNfeCArIHN0YXRlLT5j cnRjX3c7CisJaW50ZWxfc3RhdGUtPmRzdC55MiA9IHN0YXRlLT5jcnRjX3kgKyBzdGF0ZS0+Y3J0 Y19oOworCisJLyogQ2xpcCBhbGwgcGxhbmVzIHRvIENSVEMgc2l6ZSwgb3IgMHgwIGlmIENSVEMg aXMgZGlzYWJsZWQgKi8KKwlpbnRlbF9zdGF0ZS0+Y2xpcC54MSA9IDA7CisJaW50ZWxfc3RhdGUt PmNsaXAueTEgPSAwOworCWludGVsX3N0YXRlLT5jbGlwLngyID0KKwkJaW50ZWxfY3J0Yy0+YWN0 aXZlID8gaW50ZWxfY3J0Yy0+Y29uZmlnLnBpcGVfc3JjX3cgOiAwOworCWludGVsX3N0YXRlLT5j bGlwLnkyID0KKwkJaW50ZWxfY3J0Yy0+YWN0aXZlID8gaW50ZWxfY3J0Yy0+Y29uZmlnLnBpcGVf c3JjX2ggOiAwOworCisJLyoKKwkgKiBEaXNhYmxpbmcgYSBwbGFuZSBpcyBhbHdheXMgb2theTsg d2UganVzdCBuZWVkIHRvIHVwZGF0ZQorCSAqIGZiIHRyYWNraW5nIGluIGEgc3BlY2lhbCB3YXkg c2luY2UgY2xlYW51cF9mYigpIHdvbid0CisJICogZ2V0IGNhbGxlZCBieSB0aGUgcGxhbmUgaGVs cGVycy4KKwkgKi8KKwlpZiAoc3RhdGUtPmZiID09IE5VTEwgJiYgcGxhbmUtPnN0YXRlLT5mYiAh PSBOVUxMKSB7CisJCS8qCisJCSAqICdwcmVwYXJlJyBpcyBuZXZlciBjYWxsZWQgd2hlbiBwbGFu ZSBpcyBiZWluZyBkaXNhYmxlZCwgc28KKwkJICogd2UgbmVlZCB0byBoYW5kbGUgZnJvbnRidWZm ZXIgdHJhY2tpbmcgYXMgYSBzcGVjaWFsIGNhc2UKKwkJICovCisJCWludGVsX2NydGMtPmF0b21p Yy5kaXNhYmxlZF9wbGFuZXMgfD0KKwkJCSgxIDw8IGRybV9wbGFuZV9pbmRleChwbGFuZSkpOwor CX0KKworCXJldHVybiBpbnRlbF9wbGFuZS0+Y2hlY2tfcGxhbmUocGxhbmUsIGludGVsX3N0YXRl KTsKK30KKworc3RhdGljIHZvaWQgaW50ZWxfcGxhbmVfYXRvbWljX3VwZGF0ZShzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSwKKwkJCQkgICAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRfc3Rh dGUpCit7CisJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5l KHBsYW5lKTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3N0YXRlID0KKwkJdG9f aW50ZWxfcGxhbmVfc3RhdGUocGxhbmUtPnN0YXRlKTsKKworCS8qIERvbid0IGRpc2FibGUgYW4g YWxyZWFkeSBkaXNhYmxlZCBwbGFuZSAqLworCWlmICghcGxhbmUtPnN0YXRlLT5mYiAmJiAhb2xk X3N0YXRlLT5mYikKKwkJcmV0dXJuOworCisJaW50ZWxfcGxhbmUtPmNvbW1pdF9wbGFuZShwbGFu ZSwgaW50ZWxfc3RhdGUpOworfQorCitjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2hlbHBlcl9mdW5j cyBpbnRlbF9wbGFuZV9oZWxwZXJfZnVuY3MgPSB7CisJLnByZXBhcmVfZmIgPSBpbnRlbF9wcmVw YXJlX3BsYW5lX2ZiLAorCS5jbGVhbnVwX2ZiID0gaW50ZWxfY2xlYW51cF9wbGFuZV9mYiwKKwku YXRvbWljX2NoZWNrID0gaW50ZWxfcGxhbmVfYXRvbWljX2NoZWNrLAorCS5hdG9taWNfdXBkYXRl ID0gaW50ZWxfcGxhbmVfYXRvbWljX3VwZGF0ZSwKK307CisKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwppbmRleCA0YmIxYTM3Li5lN2I1MWRiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCkBAIC05OCw2ICs5OCw4IEBAIHN0YXRpYyB2b2lkIHZsdl9wcmVwYXJlX3Bs bChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCSAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0 Y19jb25maWcgKnBpcGVfY29uZmlnKTsKIHN0YXRpYyB2b2lkIGNodl9wcmVwYXJlX3BsbChzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCSAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19jb25m aWcgKnBpcGVfY29uZmlnKTsKK3N0YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29tbWl0KHN0 cnVjdCBkcm1fY3J0YyAqY3J0Yyk7CitzdGF0aWMgdm9pZCBpbnRlbF9maW5pc2hfY3J0Y19jb21t aXQoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKIAogc3RhdGljIHN0cnVjdCBpbnRlbF9lbmNvZGVy ICppbnRlbF9maW5kX2VuY29kZXIoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yLCBp bnQgcGlwZSkKIHsKQEAgLTk3OTQsNiArOTc5Niw4IEBAIG91dF9oYW5nOgogc3RhdGljIHN0cnVj dCBkcm1fY3J0Y19oZWxwZXJfZnVuY3MgaW50ZWxfaGVscGVyX2Z1bmNzID0gewogCS5tb2RlX3Nl dF9iYXNlX2F0b21pYyA9IGludGVsX3BpcGVfc2V0X2Jhc2VfYXRvbWljLAogCS5sb2FkX2x1dCA9 IGludGVsX2NydGNfbG9hZF9sdXQsCisJLmF0b21pY19iZWdpbiA9IGludGVsX2JlZ2luX2NydGNf Y29tbWl0LAorCS5hdG9taWNfZmx1c2ggPSBpbnRlbF9maW5pc2hfY3J0Y19jb21taXQsCiB9Owog CiAvKioKQEAgLTExNjc0LDcgKzExNjc4LDcgQEAgaW50ZWxfcHJlcGFyZV9wbGFuZV9mYihzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAl1bnNpZ25lZCBmcm9udGJ1ZmZlcl9iaXRzID0gMDsKIAlp bnQgcmV0ID0gMDsKIAotCWlmIChXQVJOX09OKGZiID09IHBsYW5lLT5mYiB8fCAhb2JqKSkKKwlp ZiAoIW9iaikKIAkJcmV0dXJuIDA7CiAKIAlzd2l0Y2ggKHBsYW5lLT50eXBlKSB7CkBAIC0xMTc0 MSw3ICsxMTc0NSw3IEBAIGludGVsX2NoZWNrX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFu ZSAqcGxhbmUsCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMgPSBzdGF0ZS0+YmFzZS5jcnRjOwotCXN0cnVjdCBpbnRlbF9jcnRjICpp bnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50 ZWxfY3J0YzsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxh bmUocGxhbmUpOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gc3RhdGUtPmJhc2UuZmI7 CiAJc3RydWN0IGRybV9yZWN0ICpkZXN0ID0gJnN0YXRlLT5kc3Q7CkBAIC0xMTc0OSw2ICsxMTc1 Myw5IEBAIGludGVsX2NoZWNrX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUs CiAJY29uc3Qgc3RydWN0IGRybV9yZWN0ICpjbGlwID0gJnN0YXRlLT5jbGlwOwogCWludCByZXQ7 CiAKKwljcnRjID0gY3J0YyA/IGNydGMgOiBwbGFuZS0+Y3J0YzsKKwlpbnRlbF9jcnRjID0gdG9f aW50ZWxfY3J0YyhjcnRjKTsKKwogCXJldCA9IGRybV9wbGFuZV9oZWxwZXJfY2hlY2tfdXBkYXRl KHBsYW5lLCBjcnRjLCBmYiwKIAkJCQkJICAgIHNyYywgZGVzdCwgY2xpcCwKIAkJCQkJICAgIERS TV9QTEFORV9IRUxQRVJfTk9fU0NBTElORywKQEAgLTExODA0LDIzICsxMTgxMSwyNiBAQCBpbnRl bF9jb21taXRfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlzdHJ1Y3Qg ZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHN0YXRlLT5iYXNlLmZiOwogCXN0cnVjdCBkcm1fZGV2aWNl ICpkZXYgPSBwbGFuZS0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19p bnRlbF9jcnRjKGNydGMpOworCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjOwogCXN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooZmIpOwogCXN0cnVjdCBp bnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CiAJc3RydWN0 IGRybV9yZWN0ICpzcmMgPSAmc3RhdGUtPnNyYzsKIAorCWNydGMgPSBjcnRjID8gY3J0YyA6IHBs YW5lLT5jcnRjOworCWludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOworCiAJcGxhbmUt PmZiID0gZmI7CiAJY3J0Yy0+eCA9IHNyYy0+eDEgPj4gMTY7CiAJY3J0Yy0+eSA9IHNyYy0+eTEg Pj4gMTY7CiAKLQlpbnRlbF9wbGFuZS0+Y3J0Y194ID0gc3RhdGUtPm9yaWdfZHN0LngxOwotCWlu dGVsX3BsYW5lLT5jcnRjX3kgPSBzdGF0ZS0+b3JpZ19kc3QueTE7Ci0JaW50ZWxfcGxhbmUtPmNy dGNfdyA9IGRybV9yZWN0X3dpZHRoKCZzdGF0ZS0+b3JpZ19kc3QpOwotCWludGVsX3BsYW5lLT5j cnRjX2ggPSBkcm1fcmVjdF9oZWlnaHQoJnN0YXRlLT5vcmlnX2RzdCk7Ci0JaW50ZWxfcGxhbmUt PnNyY194ID0gc3RhdGUtPm9yaWdfc3JjLngxOwotCWludGVsX3BsYW5lLT5zcmNfeSA9IHN0YXRl LT5vcmlnX3NyYy55MTsKLQlpbnRlbF9wbGFuZS0+c3JjX3cgPSBkcm1fcmVjdF93aWR0aCgmc3Rh dGUtPm9yaWdfc3JjKTsKLQlpbnRlbF9wbGFuZS0+c3JjX2ggPSBkcm1fcmVjdF9oZWlnaHQoJnN0 YXRlLT5vcmlnX3NyYyk7CisJaW50ZWxfcGxhbmUtPmNydGNfeCA9IHN0YXRlLT5iYXNlLmNydGNf eDsKKwlpbnRlbF9wbGFuZS0+Y3J0Y195ID0gc3RhdGUtPmJhc2UuY3J0Y195OworCWludGVsX3Bs YW5lLT5jcnRjX3cgPSBzdGF0ZS0+YmFzZS5jcnRjX3c7CisJaW50ZWxfcGxhbmUtPmNydGNfaCA9 IHN0YXRlLT5iYXNlLmNydGNfaDsKKwlpbnRlbF9wbGFuZS0+c3JjX3ggPSBzdGF0ZS0+YmFzZS5z cmNfeDsKKwlpbnRlbF9wbGFuZS0+c3JjX3kgPSBzdGF0ZS0+YmFzZS5zcmNfeTsKKwlpbnRlbF9w bGFuZS0+c3JjX3cgPSBzdGF0ZS0+YmFzZS5zcmNfdzsKKwlpbnRlbF9wbGFuZS0+c3JjX2ggPSBz dGF0ZS0+YmFzZS5zcmNfaDsKIAlpbnRlbF9wbGFuZS0+b2JqID0gb2JqOwogCiAJaWYgKGludGVs X2NydGMtPmFjdGl2ZSkgewpAQCAtMTE4NTAsNiArMTE4NjAsMzMgQEAgc3RhdGljIHZvaWQgaW50 ZWxfYmVnaW5fY3J0Y19jb21taXQoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9 IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZTsK KwlzdHJ1Y3QgZHJtX3BsYW5lICpwOworCXVuc2lnbmVkIGZiX2JpdHMgPSAwOworCisJLyogVHJh Y2sgZmIncyBmb3IgYW55IHBsYW5lcyBiZWluZyBkaXNhYmxlZCAqLworCWxpc3RfZm9yX2VhY2hf ZW50cnkocCwgJmRldi0+bW9kZV9jb25maWcucGxhbmVfbGlzdCwgaGVhZCkgeworCQlpbnRlbF9w bGFuZSA9IHRvX2ludGVsX3BsYW5lKHApOworCisJCWlmIChpbnRlbF9jcnRjLT5hdG9taWMuZGlz YWJsZWRfcGxhbmVzICYKKwkJICAgICgxIDw8IGRybV9wbGFuZV9pbmRleChwKSkpIHsKKwkJCXN3 aXRjaCAocC0+dHlwZSkgeworCQkJY2FzZSBEUk1fUExBTkVfVFlQRV9QUklNQVJZOgorCQkJCWZi X2JpdHMgPSBJTlRFTF9GUk9OVEJVRkZFUl9QUklNQVJZKGludGVsX3BsYW5lLT5waXBlKTsKKwkJ CQlicmVhazsKKwkJCWNhc2UgRFJNX1BMQU5FX1RZUEVfQ1VSU09SOgorCQkJCWZiX2JpdHMgPSBJ TlRFTF9GUk9OVEJVRkZFUl9DVVJTT1IoaW50ZWxfcGxhbmUtPnBpcGUpOworCQkJCWJyZWFrOwor CQkJY2FzZSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZOgorCQkJCWZiX2JpdHMgPSBJTlRFTF9GUk9O VEJVRkZFUl9TUFJJVEUoaW50ZWxfcGxhbmUtPnBpcGUpOworCQkJCWJyZWFrOworCQkJfQorCisJ CQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CisJCQlpOTE1X2dlbV90cmFja19mYihp bnRlbF9mYl9vYmoocC0+ZmIpLCBOVUxMLCBmYl9iaXRzKTsKKwkJCW11dGV4X3VubG9jaygmZGV2 LT5zdHJ1Y3RfbXV0ZXgpOworCQl9CisJfQogCiAJaWYgKGludGVsX2NydGMtPmF0b21pYy53YWl0 X2Zvcl9mbGlwcykKIAkJaW50ZWxfY3J0Y193YWl0X2Zvcl9wZW5kaW5nX2ZsaXBzKGNydGMpOwpA QCAtMTE5MDcsMTExICsxMTk0NCw2IEBAIHN0YXRpYyB2b2lkIGludGVsX2ZpbmlzaF9jcnRjX2Nv bW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJbWVtc2V0KCZpbnRlbF9jcnRjLT5hdG9taWMs IDAsIHNpemVvZihpbnRlbF9jcnRjLT5hdG9taWMpKTsKIH0KIAotaW50Ci1pbnRlbF91cGRhdGVf cGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKLQkJ ICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsIGludCBjcnRjX3gsIGludCBjcnRjX3ksCi0J CSAgIHVuc2lnbmVkIGludCBjcnRjX3csIHVuc2lnbmVkIGludCBjcnRjX2gsCi0JCSAgIHVpbnQz Ml90IHNyY194LCB1aW50MzJfdCBzcmNfeSwKLQkJICAgdWludDMyX3Qgc3JjX3csIHVpbnQzMl90 IHNyY19oKQotewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2OwotCXN0cnVj dCBkcm1fZnJhbWVidWZmZXIgKm9sZF9mYiA9IHBsYW5lLT5mYjsKLQlzdHJ1Y3QgaW50ZWxfcGxh bmVfc3RhdGUgc3RhdGUgPSB7eyAwIH19OwotCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxh bmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2Ny dGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwotCWludCByZXQ7Ci0KLQlzdGF0ZS5iYXNlLmNydGMg PSBjcnRjID8gY3J0YyA6IHBsYW5lLT5jcnRjOwotCXN0YXRlLmJhc2UuZmIgPSBmYjsKLQotCS8q IHNhbXBsZSBjb29yZGluYXRlcyBpbiAxNi4xNiBmaXhlZCBwb2ludCAqLwotCXN0YXRlLnNyYy54 MSA9IHNyY194OwotCXN0YXRlLnNyYy54MiA9IHNyY194ICsgc3JjX3c7Ci0Jc3RhdGUuc3JjLnkx ID0gc3JjX3k7Ci0Jc3RhdGUuc3JjLnkyID0gc3JjX3kgKyBzcmNfaDsKLQotCS8qIGludGVnZXIg cGl4ZWxzICovCi0Jc3RhdGUuZHN0LngxID0gY3J0Y194OwotCXN0YXRlLmRzdC54MiA9IGNydGNf eCArIGNydGNfdzsKLQlzdGF0ZS5kc3QueTEgPSBjcnRjX3k7Ci0Jc3RhdGUuZHN0LnkyID0gY3J0 Y195ICsgY3J0Y19oOwotCi0Jc3RhdGUuY2xpcC54MSA9IDA7Ci0Jc3RhdGUuY2xpcC55MSA9IDA7 Ci0Jc3RhdGUuY2xpcC54MiA9IGludGVsX2NydGMtPmFjdGl2ZSA/IGludGVsX2NydGMtPmNvbmZp Zy5waXBlX3NyY193IDogMDsKLQlzdGF0ZS5jbGlwLnkyID0gaW50ZWxfY3J0Yy0+YWN0aXZlID8g aW50ZWxfY3J0Yy0+Y29uZmlnLnBpcGVfc3JjX2ggOiAwOwotCi0Jc3RhdGUub3JpZ19zcmMgPSBz dGF0ZS5zcmM7Ci0Jc3RhdGUub3JpZ19kc3QgPSBzdGF0ZS5kc3Q7Ci0KLQlyZXQgPSBpbnRlbF9w bGFuZS0+Y2hlY2tfcGxhbmUocGxhbmUsICZzdGF0ZSk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJl dDsKLQotCWlmIChmYiAhPSBvbGRfZmIgJiYgZmIpIHsKLQkJcmV0ID0gaW50ZWxfcHJlcGFyZV9w bGFuZV9mYihwbGFuZSwgZmIpOwotCQlpZiAocmV0KQotCQkJcmV0dXJuIHJldDsKLQl9Ci0KLQlp ZiAoIXN0YXRlLmJhc2UuZmIpIHsKLQkJdW5zaWduZWQgZmJfYml0cyA9IDA7Ci0KLQkJc3dpdGNo IChwbGFuZS0+dHlwZSkgewotCQljYXNlIERSTV9QTEFORV9UWVBFX1BSSU1BUlk6Ci0JCQlmYl9i aXRzID0gSU5URUxfRlJPTlRCVUZGRVJfUFJJTUFSWShpbnRlbF9wbGFuZS0+cGlwZSk7Ci0JCQli cmVhazsKLQkJY2FzZSBEUk1fUExBTkVfVFlQRV9DVVJTT1I6Ci0JCQlmYl9iaXRzID0gSU5URUxf RlJPTlRCVUZGRVJfQ1VSU09SKGludGVsX3BsYW5lLT5waXBlKTsKLQkJCWJyZWFrOwotCQljYXNl IERSTV9QTEFORV9UWVBFX09WRVJMQVk6Ci0JCQlmYl9iaXRzID0gSU5URUxfRlJPTlRCVUZGRVJf U1BSSVRFKGludGVsX3BsYW5lLT5waXBlKTsKLQkJCWJyZWFrOwotCQl9Ci0KLQkJLyoKLQkJICog J3ByZXBhcmUnIGlzIG5ldmVyIGNhbGxlZCB3aGVuIHBsYW5lIGlzIGJlaW5nIGRpc2FibGVkLCBz bwotCQkgKiB3ZSBuZWVkIHRvIGhhbmRsZSBmcm9udGJ1ZmZlciB0cmFja2luZyBoZXJlCi0JCSAq LwotCQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JCWk5MTVfZ2VtX3RyYWNrX2Zi KGludGVsX2ZiX29iaihwbGFuZS0+ZmIpLCBOVUxMLCBmYl9iaXRzKTsKLQkJbXV0ZXhfdW5sb2Nr KCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JfQotCi0JaW50ZWxfYmVnaW5fY3J0Y19jb21taXQoY3J0 Yyk7Ci0JaW50ZWxfcGxhbmUtPmNvbW1pdF9wbGFuZShwbGFuZSwgJnN0YXRlKTsKLQlpbnRlbF9m aW5pc2hfY3J0Y19jb21taXQoY3J0Yyk7Ci0KLQlpZiAoZmIgIT0gb2xkX2ZiICYmIG9sZF9mYikg ewotCQlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKQotCQkJaW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRl diwgaW50ZWxfY3J0Yy0+cGlwZSk7Ci0JCWludGVsX2NsZWFudXBfcGxhbmVfZmIocGxhbmUsIG9s ZF9mYik7Ci0JfQotCi0JcGxhbmUtPmZiID0gZmI7Ci0KLQlyZXR1cm4gMDsKLX0KLQotLyoqCi0g KiBpbnRlbF9kaXNhYmxlX3BsYW5lIC0gZGlzYWJsZSBhIHBsYW5lCi0gKiBAcGxhbmU6IHBsYW5l IHRvIGRpc2FibGUKLSAqCi0gKiBHZW5lcmFsIGRpc2FibGUgaGFuZGxlciBmb3IgYWxsIHBsYW5l IHR5cGVzLgotICovCi1pbnQKLWludGVsX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAq cGxhbmUpCi17Ci0JaWYgKCFwbGFuZS0+ZmIpCi0JCXJldHVybiAwOwotCi0JaWYgKFdBUk5fT04o IXBsYW5lLT5jcnRjKSkKLQkJcmV0dXJuIC1FSU5WQUw7Ci0KLQlyZXR1cm4gcGxhbmUtPmZ1bmNz LT51cGRhdGVfcGxhbmUocGxhbmUsIHBsYW5lLT5jcnRjLCBOVUxMLAotCQkJCQkgIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDApOwotfQotCiAvKioKICAqIGludGVsX3BsYW5lX2Rlc3Ryb3kgLSBkZXN0 cm95IGEgcGxhbmUKICAqIEBwbGFuZTogcGxhbmUgdG8gZGVzdHJveQpAQCAtMTIwMjIsMTUgKzEx OTU0LDE5IEBAIGludGVsX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCiB2 b2lkIGludGVsX3BsYW5lX2Rlc3Ryb3koc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCiB7CiAJc3Ry dWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKKwlp bnRlbF9wbGFuZV9kZXN0cm95X3N0YXRlKHBsYW5lLCBwbGFuZS0+c3RhdGUpOwogCWRybV9wbGFu ZV9jbGVhbnVwKHBsYW5lKTsKIAlrZnJlZShpbnRlbF9wbGFuZSk7CiB9CiAKIHN0YXRpYyBjb25z dCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGludGVsX3ByaW1hcnlfcGxhbmVfZnVuY3MgPSB7Ci0J LnVwZGF0ZV9wbGFuZSA9IGludGVsX3VwZGF0ZV9wbGFuZSwKLQkuZGlzYWJsZV9wbGFuZSA9IGlu dGVsX2Rpc2FibGVfcGxhbmUsCisJLnVwZGF0ZV9wbGFuZSA9IGRybV9wbGFuZV9oZWxwZXJfdXBk YXRlLAorCS5kaXNhYmxlX3BsYW5lID0gZHJtX3BsYW5lX2hlbHBlcl9kaXNhYmxlLAogCS5kZXN0 cm95ID0gaW50ZWxfcGxhbmVfZGVzdHJveSwKLQkuc2V0X3Byb3BlcnR5ID0gaW50ZWxfcGxhbmVf c2V0X3Byb3BlcnR5CisJLnNldF9wcm9wZXJ0eSA9IGludGVsX3BsYW5lX3NldF9wcm9wZXJ0eSwK KwkuYXRvbWljX2R1cGxpY2F0ZV9zdGF0ZSA9IGludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZSwK KwkuYXRvbWljX2Rlc3Ryb3lfc3RhdGUgPSBpbnRlbF9wbGFuZV9kZXN0cm95X3N0YXRlLAorCiB9 OwogCiBzdGF0aWMgc3RydWN0IGRybV9wbGFuZSAqaW50ZWxfcHJpbWFyeV9wbGFuZV9jcmVhdGUo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKQEAgLTEyMDQ0LDYgKzExOTgwLDEyIEBAIHN0YXRpYyBz dHJ1Y3QgZHJtX3BsYW5lICppbnRlbF9wcmltYXJ5X3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCWlmIChwcmltYXJ5ID09IE5VTEwpCiAJCXJldHVybiBOVUxMOwogCisJcHJp bWFyeS0+YmFzZS5zdGF0ZSA9IGludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZSgmcHJpbWFyeS0+ YmFzZSk7CisJaWYgKHByaW1hcnktPmJhc2Uuc3RhdGUgPT0gTlVMTCkgeworCQlrZnJlZShwcmlt YXJ5KTsKKwkJcmV0dXJuIE5VTEw7CisJfQorCiAJcHJpbWFyeS0+Y2FuX3NjYWxlID0gZmFsc2U7 CiAJcHJpbWFyeS0+bWF4X2Rvd25zY2FsZSA9IDE7CiAJcHJpbWFyeS0+cGlwZSA9IHBpcGU7CkBA IC0xMjA3OSw2ICsxMjAyMSw4IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICppbnRlbF9wcmlt YXJ5X3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCXByaW1hcnktPnJv dGF0aW9uKTsKIAl9CiAKKwlkcm1fcGxhbmVfaGVscGVyX2FkZCgmcHJpbWFyeS0+YmFzZSwgJmlu dGVsX3BsYW5lX2hlbHBlcl9mdW5jcyk7CisKIAlyZXR1cm4gJnByaW1hcnktPmJhc2U7CiB9CiAK QEAgLTEyMDg3LDE3ICsxMjAzMSwxOSBAQCBpbnRlbF9jaGVja19jdXJzb3JfcGxhbmUoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZSkK IHsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBzdGF0ZS0+YmFzZS5jcnRjOwotCXN0cnVjdCBk cm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBs YW5lLT5kZXY7CiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBzdGF0ZS0+YmFzZS5mYjsK IAlzdHJ1Y3QgZHJtX3JlY3QgKmRlc3QgPSAmc3RhdGUtPmRzdDsKIAlzdHJ1Y3QgZHJtX3JlY3Qg KnNyYyA9ICZzdGF0ZS0+c3JjOwogCWNvbnN0IHN0cnVjdCBkcm1fcmVjdCAqY2xpcCA9ICZzdGF0 ZS0+Y2xpcDsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJfb2Jq KGZiKTsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0 Yyk7Ci0JaW50IGNydGNfdywgY3J0Y19oOworCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRj OwogCXVuc2lnbmVkIHN0cmlkZTsKIAlpbnQgcmV0OwogCisJY3J0YyA9IGNydGMgPyBjcnRjIDog cGxhbmUtPmNydGM7CisJaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisKIAlyZXQg PSBkcm1fcGxhbmVfaGVscGVyX2NoZWNrX3VwZGF0ZShwbGFuZSwgY3J0YywgZmIsCiAJCQkJCSAg ICBzcmMsIGRlc3QsIGNsaXAsCiAJCQkJCSAgICBEUk1fUExBTkVfSEVMUEVSX05PX1NDQUxJTkcs CkBAIC0xMjExMiwxNSArMTIwNTgsMTQgQEAgaW50ZWxfY2hlY2tfY3Vyc29yX3BsYW5lKHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lLAogCQlnb3RvIGZpbmlzaDsKIAogCS8qIENoZWNrIGZvciB3aGlj aCBjdXJzb3IgdHlwZXMgd2Ugc3VwcG9ydCAqLwotCWNydGNfdyA9IGRybV9yZWN0X3dpZHRoKCZz dGF0ZS0+b3JpZ19kc3QpOwotCWNydGNfaCA9IGRybV9yZWN0X2hlaWdodCgmc3RhdGUtPm9yaWdf ZHN0KTsKLQlpZiAoIWN1cnNvcl9zaXplX29rKGRldiwgY3J0Y193LCBjcnRjX2gpKSB7Ci0JCURS TV9ERUJVRygiQ3Vyc29yIGRpbWVuc2lvbiBub3Qgc3VwcG9ydGVkXG4iKTsKKwlpZiAoIWN1cnNv cl9zaXplX29rKGRldiwgc3RhdGUtPmJhc2UuY3J0Y193LCBzdGF0ZS0+YmFzZS5jcnRjX2gpKSB7 CisJCURSTV9ERUJVRygiQ3Vyc29yIGRpbWVuc2lvbiAlZHglZCBub3Qgc3VwcG9ydGVkXG4iLAor CQkJICBzdGF0ZS0+YmFzZS5jcnRjX3csIHN0YXRlLT5iYXNlLmNydGNfaCk7CiAJCXJldHVybiAt RUlOVkFMOwogCX0KIAotCXN0cmlkZSA9IHJvdW5kdXBfcG93X29mX3R3byhjcnRjX3cpICogNDsK LQlpZiAob2JqLT5iYXNlLnNpemUgPCBzdHJpZGUgKiBjcnRjX2gpIHsKKwlzdHJpZGUgPSByb3Vu ZHVwX3Bvd19vZl90d28oc3RhdGUtPmJhc2UuY3J0Y193KSAqIDQ7CisJaWYgKG9iai0+YmFzZS5z aXplIDwgc3RyaWRlICogc3RhdGUtPmJhc2UuY3J0Y19oKSB7CiAJCURSTV9ERUJVR19LTVMoImJ1 ZmZlciBpcyB0b28gc21hbGxcbiIpOwogCQlyZXR1cm4gLUVOT01FTTsKIAl9CkBAIC0xMjEzOCw4 ICsxMjA4Myw3IEBAIGludGVsX2NoZWNrX2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSwKIAogZmluaXNoOgogCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpIHsKLQkJaWYgKGludGVs X2NydGMtPmN1cnNvcl93aWR0aCAhPQotCQkgICAgZHJtX3JlY3Rfd2lkdGgoJnN0YXRlLT5vcmln X2RzdCkpCisJCWlmIChpbnRlbF9jcnRjLT5jdXJzb3Jfd2lkdGggIT0gc3RhdGUtPmJhc2UuY3J0 Y193KQogCQkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bSA9IHRydWU7CiAKIAkJaW50ZWxf Y3J0Yy0+YXRvbWljLmZiX2JpdHMgfD0KQEAgLTEyMTU0LDI0ICsxMjA5OCwyNyBAQCBpbnRlbF9j b21taXRfY3Vyc29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJICBzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKQogewogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHN0 YXRlLT5iYXNlLmNydGM7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKLQlz dHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJc3Ry dWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7CisJc3RydWN0IGludGVsX2NydGMgKmlu dGVsX2NydGM7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3Bs YW5lKHBsYW5lKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJf b2JqKHN0YXRlLT5iYXNlLmZiKTsKIAl1aW50MzJfdCBhZGRyOwogCisJY3J0YyA9IGNydGMgPyBj cnRjIDogcGxhbmUtPmNydGM7CisJaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisK IAlwbGFuZS0+ZmIgPSBzdGF0ZS0+YmFzZS5mYjsKLQljcnRjLT5jdXJzb3JfeCA9IHN0YXRlLT5v cmlnX2RzdC54MTsKLQljcnRjLT5jdXJzb3JfeSA9IHN0YXRlLT5vcmlnX2RzdC55MTsKLQotCWlu dGVsX3BsYW5lLT5jcnRjX3ggPSBzdGF0ZS0+b3JpZ19kc3QueDE7Ci0JaW50ZWxfcGxhbmUtPmNy dGNfeSA9IHN0YXRlLT5vcmlnX2RzdC55MTsKLQlpbnRlbF9wbGFuZS0+Y3J0Y193ID0gZHJtX3Jl Y3Rfd2lkdGgoJnN0YXRlLT5vcmlnX2RzdCk7Ci0JaW50ZWxfcGxhbmUtPmNydGNfaCA9IGRybV9y ZWN0X2hlaWdodCgmc3RhdGUtPm9yaWdfZHN0KTsKLQlpbnRlbF9wbGFuZS0+c3JjX3ggPSBzdGF0 ZS0+b3JpZ19zcmMueDE7Ci0JaW50ZWxfcGxhbmUtPnNyY195ID0gc3RhdGUtPm9yaWdfc3JjLnkx OwotCWludGVsX3BsYW5lLT5zcmNfdyA9IGRybV9yZWN0X3dpZHRoKCZzdGF0ZS0+b3JpZ19zcmMp OwotCWludGVsX3BsYW5lLT5zcmNfaCA9IGRybV9yZWN0X2hlaWdodCgmc3RhdGUtPm9yaWdfc3Jj KTsKKwljcnRjLT5jdXJzb3JfeCA9IHN0YXRlLT5iYXNlLmNydGNfeDsKKwljcnRjLT5jdXJzb3Jf eSA9IHN0YXRlLT5iYXNlLmNydGNfeTsKKworCWludGVsX3BsYW5lLT5jcnRjX3ggPSBzdGF0ZS0+ YmFzZS5jcnRjX3g7CisJaW50ZWxfcGxhbmUtPmNydGNfeSA9IHN0YXRlLT5iYXNlLmNydGNfeTsK KwlpbnRlbF9wbGFuZS0+Y3J0Y193ID0gc3RhdGUtPmJhc2UuY3J0Y193OworCWludGVsX3BsYW5l LT5jcnRjX2ggPSBzdGF0ZS0+YmFzZS5jcnRjX2g7CisJaW50ZWxfcGxhbmUtPnNyY194ID0gc3Rh dGUtPmJhc2Uuc3JjX3g7CisJaW50ZWxfcGxhbmUtPnNyY195ID0gc3RhdGUtPmJhc2Uuc3JjX3k7 CisJaW50ZWxfcGxhbmUtPnNyY193ID0gc3RhdGUtPmJhc2Uuc3JjX3c7CisJaW50ZWxfcGxhbmUt PnNyY19oID0gc3RhdGUtPmJhc2Uuc3JjX2g7CiAJaW50ZWxfcGxhbmUtPm9iaiA9IG9iajsKIAog CWlmIChpbnRlbF9jcnRjLT5jdXJzb3JfYm8gPT0gb2JqKQpAQCAtMTIxODcsMTggKzEyMTM0LDIw IEBAIGludGVsX2NvbW1pdF9jdXJzb3JfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJ aW50ZWxfY3J0Yy0+Y3Vyc29yX2FkZHIgPSBhZGRyOwogCWludGVsX2NydGMtPmN1cnNvcl9ibyA9 IG9iajsKIHVwZGF0ZToKLQlpbnRlbF9jcnRjLT5jdXJzb3Jfd2lkdGggPSBkcm1fcmVjdF93aWR0 aCgmc3RhdGUtPm9yaWdfZHN0KTsKLQlpbnRlbF9jcnRjLT5jdXJzb3JfaGVpZ2h0ID0gZHJtX3Jl Y3RfaGVpZ2h0KCZzdGF0ZS0+b3JpZ19kc3QpOworCWludGVsX2NydGMtPmN1cnNvcl93aWR0aCA9 IHN0YXRlLT5iYXNlLmNydGNfdzsKKwlpbnRlbF9jcnRjLT5jdXJzb3JfaGVpZ2h0ID0gc3RhdGUt PmJhc2UuY3J0Y19oOwogCiAJaWYgKGludGVsX2NydGMtPmFjdGl2ZSkKIAkJaW50ZWxfY3J0Y191 cGRhdGVfY3Vyc29yKGNydGMsIHN0YXRlLT52aXNpYmxlKTsKIH0KIAogc3RhdGljIGNvbnN0IHN0 cnVjdCBkcm1fcGxhbmVfZnVuY3MgaW50ZWxfY3Vyc29yX3BsYW5lX2Z1bmNzID0gewotCS51cGRh dGVfcGxhbmUgPSBpbnRlbF91cGRhdGVfcGxhbmUsCi0JLmRpc2FibGVfcGxhbmUgPSBpbnRlbF9k aXNhYmxlX3BsYW5lLAorCS51cGRhdGVfcGxhbmUgPSBkcm1fcGxhbmVfaGVscGVyX3VwZGF0ZSwK KwkuZGlzYWJsZV9wbGFuZSA9IGRybV9wbGFuZV9oZWxwZXJfZGlzYWJsZSwKIAkuZGVzdHJveSA9 IGludGVsX3BsYW5lX2Rlc3Ryb3ksCiAJLnNldF9wcm9wZXJ0eSA9IGludGVsX3BsYW5lX3NldF9w cm9wZXJ0eSwKKwkuYXRvbWljX2R1cGxpY2F0ZV9zdGF0ZSA9IGludGVsX3BsYW5lX2R1cGxpY2F0 ZV9zdGF0ZSwKKwkuYXRvbWljX2Rlc3Ryb3lfc3RhdGUgPSBpbnRlbF9wbGFuZV9kZXN0cm95X3N0 YXRlLAogfTsKIAogc3RhdGljIHN0cnVjdCBkcm1fcGxhbmUgKmludGVsX2N1cnNvcl9wbGFuZV9j cmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKQEAgLTEyMjEwLDYgKzEyMTU5LDEyIEBAIHN0 YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICppbnRlbF9jdXJzb3JfcGxhbmVfY3JlYXRlKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCiAJaWYgKGN1cnNvciA9PSBOVUxMKQogCQlyZXR1cm4gTlVMTDsKIAor CWN1cnNvci0+YmFzZS5zdGF0ZSA9IGludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZSgmY3Vyc29y LT5iYXNlKTsKKwlpZiAoY3Vyc29yLT5iYXNlLnN0YXRlID09IE5VTEwpIHsKKwkJa2ZyZWUoY3Vy c29yKTsKKwkJcmV0dXJuIE5VTEw7CisJfQorCiAJY3Vyc29yLT5jYW5fc2NhbGUgPSBmYWxzZTsK IAljdXJzb3ItPm1heF9kb3duc2NhbGUgPSAxOwogCWN1cnNvci0+cGlwZSA9IHBpcGU7CkBAIC0x MjIzNiw2ICsxMjE5MSw4IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICppbnRlbF9jdXJzb3Jf cGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJY3Vyc29yLT5yb3RhdGlv bik7CiAJfQogCisJZHJtX3BsYW5lX2hlbHBlcl9hZGQoJmN1cnNvci0+YmFzZSwgJmludGVsX3Bs YW5lX2hlbHBlcl9mdW5jcyk7CisKIAlyZXR1cm4gJmN1cnNvci0+YmFzZTsKIH0KIApkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaAppbmRleCAyNTIzMzE1Li42MDRiZDIyIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaApAQCAtMjQ4LDggKzI0OCw2IEBAIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSB7 CiAJc3RydWN0IGRybV9yZWN0IHNyYzsKIAlzdHJ1Y3QgZHJtX3JlY3QgZHN0OwogCXN0cnVjdCBk cm1fcmVjdCBjbGlwOwotCXN0cnVjdCBkcm1fcmVjdCBvcmlnX3NyYzsKLQlzdHJ1Y3QgZHJtX3Jl Y3Qgb3JpZ19kc3Q7CiAJYm9vbCB2aXNpYmxlOwogCiAJLyoKQEAgLTQzNyw2ICs0MzUsNyBAQCBz dHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNfY29tbWl0IHsKIAlib29sIGRpc2FibGVfZmJjOwogCWJv b2wgcHJlX2Rpc2FibGVfcHJpbWFyeTsKIAlib29sIHVwZGF0ZV93bTsKKwl1bnNpZ25lZCBkaXNh YmxlZF9wbGFuZXM7CiAKIAkvKiBTbGVlcGFibGUgb3BlcmF0aW9ucyB0byBwZXJmb3JtIGFmdGVy IGNvbW1pdCAqLwogCXVuc2lnbmVkIGZiX2JpdHM7CkBAIC01NzUsNiArNTc0LDcgQEAgc3RydWN0 IGN4c3JfbGF0ZW5jeSB7CiAjZGVmaW5lIHRvX2ludGVsX2VuY29kZXIoeCkgY29udGFpbmVyX29m KHgsIHN0cnVjdCBpbnRlbF9lbmNvZGVyLCBiYXNlKQogI2RlZmluZSB0b19pbnRlbF9mcmFtZWJ1 ZmZlcih4KSBjb250YWluZXJfb2YoeCwgc3RydWN0IGludGVsX2ZyYW1lYnVmZmVyLCBiYXNlKQog I2RlZmluZSB0b19pbnRlbF9wbGFuZSh4KSBjb250YWluZXJfb2YoeCwgc3RydWN0IGludGVsX3Bs YW5lLCBiYXNlKQorI2RlZmluZSB0b19pbnRlbF9wbGFuZV9zdGF0ZSh4KSBjb250YWluZXJfb2Yo eCwgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlLCBiYXNlKQogI2RlZmluZSBpbnRlbF9mYl9vYmoo eCkgKHggPyB0b19pbnRlbF9mcmFtZWJ1ZmZlcih4KS0+b2JqIDogTlVMTCkKIAogc3RydWN0IGlu dGVsX2hkbWkgewpAQCAtMTI1Myw0ICsxMjUzLDEwIEBAIHZvaWQgaW50ZWxfcHJlX2Rpc2FibGVf cHJpbWFyeShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogLyogaW50ZWxfdHYuYyAqLwogdm9pZCBp bnRlbF90dl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogCisvKiBpbnRlbF9hdG9taWMu YyAqLworc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqaW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0YXRl KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKTsKK3ZvaWQgaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0 ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKKwkJCSAgICAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0 YXRlICpzdGF0ZSk7CitleHRlcm4gY29uc3Qgc3RydWN0IGRybV9wbGFuZV9oZWxwZXJfZnVuY3Mg aW50ZWxfcGxhbmVfaGVscGVyX2Z1bmNzOworCiAjZW5kaWYgLyogX19JTlRFTF9EUlZfSF9fICov CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDUzN2ZmZjI1Li4xNmU3Yzk2IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMzMsNiArMzMsNyBAQAogI2luY2x1 ZGUgPGRybS9kcm1fY3J0Yy5oPgogI2luY2x1ZGUgPGRybS9kcm1fZm91cmNjLmg+CiAjaW5jbHVk ZSA8ZHJtL2RybV9yZWN0Lmg+CisjaW5jbHVkZSA8ZHJtL2RybV9wbGFuZV9oZWxwZXIuaD4KICNp bmNsdWRlICJpbnRlbF9kcnYuaCIKICNpbmNsdWRlIDxkcm0vaTkxNV9kcm0uaD4KICNpbmNsdWRl ICJpOTE1X2Rydi5oIgpAQCAtMTA4MSwxMiArMTA4MiwxMyBAQCBpbnRlbF9jaGVja19zcHJpdGVf cGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJdWludDMyX3Qgc3JjX3gsIHNyY195LCBz cmNfdywgc3JjX2g7CiAJc3RydWN0IGRybV9yZWN0ICpzcmMgPSAmc3RhdGUtPnNyYzsKIAlzdHJ1 Y3QgZHJtX3JlY3QgKmRzdCA9ICZzdGF0ZS0+ZHN0OwotCXN0cnVjdCBkcm1fcmVjdCAqb3JpZ19z cmMgPSAmc3RhdGUtPm9yaWdfc3JjOwogCWNvbnN0IHN0cnVjdCBkcm1fcmVjdCAqY2xpcCA9ICZz dGF0ZS0+Y2xpcDsKIAlpbnQgaHNjYWxlLCB2c2NhbGU7CiAJaW50IG1heF9zY2FsZSwgbWluX3Nj YWxlOwogCWludCBwaXhlbF9zaXplOwogCisJaW50ZWxfY3J0YyA9IGludGVsX2NydGMgPyBpbnRl bF9jcnRjIDogdG9faW50ZWxfY3J0YyhwbGFuZS0+Y3J0Yyk7CisKIAlpZiAoIWZiKSB7CiAJCXN0 YXRlLT52aXNpYmxlID0gZmFsc2U7CiAJCWdvdG8gZmluaXNoOwpAQCAtMTE2NywxMCArMTE2OSwx MCBAQCBpbnRlbF9jaGVja19zcHJpdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJ CQkJICAgIGludGVsX3BsYW5lLT5yb3RhdGlvbik7CiAKIAkJLyogc2FuaXR5IGNoZWNrIHRvIG1h a2Ugc3VyZSB0aGUgc3JjIHZpZXdwb3J0IHdhc24ndCBlbmxhcmdlZCAqLwotCQlXQVJOX09OKHNy Yy0+eDEgPCAoaW50KSBvcmlnX3NyYy0+eDEgfHwKLQkJCXNyYy0+eTEgPCAoaW50KSBvcmlnX3Ny Yy0+eTEgfHwKLQkJCXNyYy0+eDIgPiAoaW50KSBvcmlnX3NyYy0+eDIgfHwKLQkJCXNyYy0+eTIg PiAoaW50KSBvcmlnX3NyYy0+eTIpOworCQlXQVJOX09OKHNyYy0+eDEgPCAoaW50KSBzdGF0ZS0+ YmFzZS5zcmNfeCB8fAorCQkJc3JjLT55MSA8IChpbnQpIHN0YXRlLT5iYXNlLnNyY195IHx8CisJ CQlzcmMtPngyID4gKGludCkgc3RhdGUtPmJhc2Uuc3JjX3ggKyBzdGF0ZS0+YmFzZS5zcmNfdyB8 fAorCQkJc3JjLT55MiA+IChpbnQpIHN0YXRlLT5iYXNlLnNyY195ICsgc3RhdGUtPmJhc2Uuc3Jj X2gpOwogCiAJCS8qCiAJCSAqIEhhcmR3YXJlIGRvZXNuJ3QgaGFuZGxlIHN1YnBpeGVsIGNvb3Jk aW5hdGVzLgpAQCAtMTI2Nyw3ICsxMjY5LDcgQEAgaW50ZWxfY29tbWl0X3Nwcml0ZV9wbGFuZShz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCSAgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpz dGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBzdGF0ZS0+YmFzZS5jcnRjOwotCXN0 cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKKwlzdHJ1 Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YzsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3Bs YW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZi ID0gc3RhdGUtPmJhc2UuZmI7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGlu dGVsX2ZiX29iaihmYik7CkBAIC0xMjc1LDE0ICsxMjc3LDE5IEBAIGludGVsX2NvbW1pdF9zcHJp dGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJdW5zaWduZWQgaW50IGNydGNfdywg Y3J0Y19oOwogCXVpbnQzMl90IHNyY194LCBzcmNfeSwgc3JjX3csIHNyY19oOwogCi0JaW50ZWxf cGxhbmUtPmNydGNfeCA9IHN0YXRlLT5vcmlnX2RzdC54MTsKLQlpbnRlbF9wbGFuZS0+Y3J0Y195 ID0gc3RhdGUtPm9yaWdfZHN0LnkxOwotCWludGVsX3BsYW5lLT5jcnRjX3cgPSBkcm1fcmVjdF93 aWR0aCgmc3RhdGUtPm9yaWdfZHN0KTsKLQlpbnRlbF9wbGFuZS0+Y3J0Y19oID0gZHJtX3JlY3Rf aGVpZ2h0KCZzdGF0ZS0+b3JpZ19kc3QpOwotCWludGVsX3BsYW5lLT5zcmNfeCA9IHN0YXRlLT5v cmlnX3NyYy54MTsKLQlpbnRlbF9wbGFuZS0+c3JjX3kgPSBzdGF0ZS0+b3JpZ19zcmMueTE7Ci0J aW50ZWxfcGxhbmUtPnNyY193ID0gZHJtX3JlY3Rfd2lkdGgoJnN0YXRlLT5vcmlnX3NyYyk7Ci0J aW50ZWxfcGxhbmUtPnNyY19oID0gZHJtX3JlY3RfaGVpZ2h0KCZzdGF0ZS0+b3JpZ19zcmMpOwor CWludGVsX3BsYW5lLT5jcnRjX3ggPSBzdGF0ZS0+YmFzZS5jcnRjX3g7CisJaW50ZWxfcGxhbmUt PmNydGNfeSA9IHN0YXRlLT5iYXNlLmNydGNfeTsKKwlpbnRlbF9wbGFuZS0+Y3J0Y193ID0gc3Rh dGUtPmJhc2UuY3J0Y193OworCWludGVsX3BsYW5lLT5jcnRjX2ggPSBzdGF0ZS0+YmFzZS5jcnRj X2g7CisJaW50ZWxfcGxhbmUtPnNyY194ID0gc3RhdGUtPmJhc2Uuc3JjX3g7CisJaW50ZWxfcGxh bmUtPnNyY195ID0gc3RhdGUtPmJhc2Uuc3JjX3k7CisJaW50ZWxfcGxhbmUtPnNyY193ID0gc3Rh dGUtPmJhc2Uuc3JjX3c7CisJaW50ZWxfcGxhbmUtPnNyY19oID0gc3RhdGUtPmJhc2Uuc3JjX2g7 CisKKwljcnRjID0gY3J0YyA/IGNydGMgOiBwbGFuZS0+Y3J0YzsKKwlpbnRlbF9jcnRjID0gdG9f aW50ZWxfY3J0YyhjcnRjKTsKKworCXBsYW5lLT5mYiA9IHN0YXRlLT5iYXNlLmZiOwogCWludGVs X3BsYW5lLT5vYmogPSBvYmo7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKSB7CkBAIC0xNDA2 LDEwICsxNDEzLDEyIEBAIGludCBpbnRlbF9wbGFuZV9yZXN0b3JlKHN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lKQogfQogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9mdW5jcyBpbnRlbF9z cHJpdGVfcGxhbmVfZnVuY3MgPSB7Ci0JLnVwZGF0ZV9wbGFuZSA9IGludGVsX3VwZGF0ZV9wbGFu ZSwKLQkuZGlzYWJsZV9wbGFuZSA9IGludGVsX2Rpc2FibGVfcGxhbmUsCisJLnVwZGF0ZV9wbGFu ZSA9IGRybV9wbGFuZV9oZWxwZXJfdXBkYXRlLAorCS5kaXNhYmxlX3BsYW5lID0gZHJtX3BsYW5l X2hlbHBlcl9kaXNhYmxlLAogCS5kZXN0cm95ID0gaW50ZWxfcGxhbmVfZGVzdHJveSwKIAkuc2V0 X3Byb3BlcnR5ID0gaW50ZWxfcGxhbmVfc2V0X3Byb3BlcnR5LAorCS5hdG9taWNfZHVwbGljYXRl X3N0YXRlID0gaW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0YXRlLAorCS5hdG9taWNfZGVzdHJveV9z dGF0ZSA9IGludGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUsCiB9OwogCiBzdGF0aWMgdWludDMyX3Qg aWxrX3BsYW5lX2Zvcm1hdHNbXSA9IHsKQEAgLTE0NzEsNiArMTQ4MCwxMyBAQCBpbnRlbF9wbGFu ZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVudW0gcGlwZSBwaXBlLCBpbnQgcGxhbmUp CiAJaWYgKCFpbnRlbF9wbGFuZSkKIAkJcmV0dXJuIC1FTk9NRU07CiAKKwlpbnRlbF9wbGFuZS0+ YmFzZS5zdGF0ZSA9CisJCWludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZSgmaW50ZWxfcGxhbmUt PmJhc2UpOworCWlmIChpbnRlbF9wbGFuZS0+YmFzZS5zdGF0ZSA9PSBOVUxMKSB7CisJCWtmcmVl KGludGVsX3BsYW5lKTsKKwkJcmV0dXJuIC1FTk9NRU07CisJfQorCiAJc3dpdGNoIChJTlRFTF9J TkZPKGRldiktPmdlbikgewogCWNhc2UgNToKIAljYXNlIDY6CkBAIC0xNTY0LDYgKzE1ODAsOCBA QCBpbnRlbF9wbGFuZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVudW0gcGlwZSBwaXBl LCBpbnQgcGxhbmUpCiAJCQkJCSAgIGRldi0+bW9kZV9jb25maWcucm90YXRpb25fcHJvcGVydHks CiAJCQkJCSAgIGludGVsX3BsYW5lLT5yb3RhdGlvbik7CiAKKwlkcm1fcGxhbmVfaGVscGVyX2Fk ZCgmaW50ZWxfcGxhbmUtPmJhc2UsICZpbnRlbF9wbGFuZV9oZWxwZXJfZnVuY3MpOworCiAgb3V0 OgogCXJldHVybiByZXQ7CiB9Ci0tIAoxLjguNS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=