From: Mahesh Kumar Subject: [PATCH 11/12] drm/i915/skl: New ddb allocation algorithm Date: Thu, 18 May 2017 13:32:54 +0530 Message-ID: <20170518080254.17192-1-mahesh1.kumar@intel.com> References: <29b48ebe-abc7-9d6a-53a0-de98c48e3738@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 ESMTPS id CEFA36E51E for ; Thu, 18 May 2017 07:59:31 +0000 (UTC) In-Reply-To: <29b48ebe-abc7-9d6a-53a0-de98c48e3738@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: paulo.r.zanoni@intel.com, maarten.lankhorst@intel.com List-Id: intel-gfx@lists.freedesktop.org RnJvbTogIkt1bWFyLCBNYWhlc2giIDxtYWhlc2gxLmt1bWFyQGludGVsLmNvbT4KClRoaXMgcGF0 Y2ggaW1wbGVtZW50cyBuZXcgRERCIGFsbG9jYXRpb24gYWxnb3JpdGhtIGFzIHBlciBIVyB0ZWFt CnJlY29tbWVuZGF0aW9uLiBUaGlzIGFsZ28gdGFrZWNhcmUgb2Ygc2NlbmFyaW8gd2hlcmUgd2Ug YWxsb2NhdGUgbGVzcyBEREIKZm9yIHRoZSBwbGFuZXMgd2l0aCBsb3dlciByZWxhdGl2ZSBwaXhl bCByYXRlLCBidXQgdGhleSByZXF1aXJlIG1vcmUgRERCCnRvIHdvcmsuCkl0IGFsc28gdGFrZXMg Y2FyZSBvZiBlbmFibGluZyBzYW1lIHdhdGVybWFyayBsZXZlbCBmb3IgZWFjaApwbGFuZSBpbiBj cnRjLCBmb3IgZWZmaWNpZW50IHBvd2VyIHNhdmluZy4KCkNoYW5nZXMgc2luY2UgdjE6CiAtIFJl YmFzZSBvbiB0b3Agb2YgUGF1bG8ncyBwYXRjaCBzZXJpZXMKCkNoYW5nZXMgc2luY2UgdjI6CiAt IEZpeCB0aGUgZm9yIGxvb3AgY29uZGl0aW9uIHRvIGVuYWJsZSBXTQoKQ2hhbmdlcyBzaW5jZSB2 MzoKIC0gRml4IGNyYXNoIGluIGN1cnNvciBpLWctdCByZXBvcnRlZCBieSBNYWFydGVuCiAtIFJl YmFzZSBhZnRlciBhZGRyZXNzaW5nIFBhdWxvJ3MgY29tbWVudHMKIC0gRmV3IG90aGVyIFVMVCBm aXhlcwpDaGFuZ2VzIHNpbmNlIHY0OgogLSBSZWJhc2Ugb24gZHJtLXRpcAogLSBBZGRlZCBzZXBh cmF0ZSBmdW5jdGlvbiB0byBlbmFibGUgV00gbGV2ZWxzCkNoYW5nZXMgc2luY2UgdjU6CiAtIEZp eCBhIGNyYXNoIGlkZW50aWZpZWQgaW4gc2tsLTY3NzBIUSBzeXN0ZW0KQ2hhbmdlcyBzaW5jZSB2 NjoKIC0gQWRkcmVzcyByZXZpZXcgY29tbWVudHMgZnJvbSBNYXR0CkNoYW5nZXMgc2luY2Ugdjc6 CiAtIEZpeCBmYWlsdXJlIHJldHVybiBpbiBza2xfY29tcHV0ZV9wbGFuZV93bSAoTWF0dCkKIC0g Zml4IHR5cG8KClNpZ25lZC1vZmYtYnk6IE1haGVzaCBLdW1hciA8bWFoZXNoMS5rdW1hckBpbnRl bC5jb20+ClJldmlld2VkLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RA bGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgfCAy NTYgKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDE1NiBpbnNlcnRpb25zKCspLCAxMDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKaW5kZXggOTM2ZWVmMTYzNGM3Li5hNmE0ZTg3YzdjYTYgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYwpAQCAtNDAzOSwxMyArNDAzOSw0MSBAQCBza2xfZGRiX2NhbGNfbWluKGNvbnN0IHN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsIGludCBudW1fYWN0aXZlLAogCW1pbmltdW1b UExBTkVfQ1VSU09SXSA9IHNrbF9jdXJzb3JfYWxsb2NhdGlvbihudW1fYWN0aXZlKTsKIH0KIAor c3RhdGljIHZvaWQKK3NrbF9lbmFibGVfcGxhbmVfd21fbGV2ZWxzKGNvbnN0IHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCSAgIHVpbnQxNl90IHBsYW5lX2RkYiwKKwkJCSAg IHVpbnQxNl90IG1heF9sZXZlbCwKKwkJCSAgIHN0cnVjdCBza2xfcGxhbmVfd20gKndtKQorewor CWludCBsZXZlbDsKKwkvKgorCSAqIE5vdyBlbmFibGUgYWxsIGxldmVscyBpbiBXTSBzdHJ1Y3R1 cmUgd2hpY2ggY2FuIGJlIGVuYWJsZWQKKwkgKiB1c2luZyBjdXJyZW50IEREQiBhbGxvY2F0aW9u CisJICovCisJZm9yIChsZXZlbCA9IGlsa193bV9tYXhfbGV2ZWwoZGV2X3ByaXYpOyBsZXZlbCA+ PSAwOyBsZXZlbC0tKSB7CisJCXN0cnVjdCBza2xfd21fbGV2ZWwgKmxldmVsX3dtID0gJndtLT53 bVtsZXZlbF07CisKKwkJaWYgKGxldmVsID4gbWF4X2xldmVsIHx8IGxldmVsX3dtLT5wbGFuZV9y ZXNfYiA9PSAwCisJCQkJICAgICAgfHwgbGV2ZWxfd20tPnBsYW5lX3Jlc19sID49IDMxCisJCQkJ ICAgICAgfHwgbGV2ZWxfd20tPnBsYW5lX3Jlc19iID49IHBsYW5lX2RkYikgeworCQkJbGV2ZWxf d20tPnBsYW5lX2VuID0gZmFsc2U7CisJCQlsZXZlbF93bS0+cGxhbmVfcmVzX2IgPSAwOworCQkJ bGV2ZWxfd20tPnBsYW5lX3Jlc19sID0gMDsKKwkJfSBlbHNlIHsKKwkJCWxldmVsX3dtLT5wbGFu ZV9lbiA9IHRydWU7CisJCX0KKwl9Cit9CisKIHN0YXRpYyBpbnQKIHNrbF9hbGxvY2F0ZV9waXBl X2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAorCQkgICAgICBzdHJ1Y3Qgc2ts X3BpcGVfd20gKnBpcGVfd20sCiAJCSAgICAgIHN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKmRk YiAvKiBvdXQgKi8pCiB7CiAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0gY3N0YXRl LT5iYXNlLnN0YXRlOwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IGNzdGF0ZS0+YmFzZS5jcnRj OwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CisJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBpbnRlbF9jcnRjICpp bnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAllbnVtIHBpcGUgcGlwZSA9IGludGVs X2NydGMtPnBpcGU7CiAJc3RydWN0IHNrbF9kZGJfZW50cnkgKmFsbG9jID0gJmNzdGF0ZS0+d20u c2tsLmRkYjsKQEAgLTQwNTgsNiArNDA4Niw4IEBAIHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCXVuc2lnbmVkIHBsYW5lX2RhdGFfcmF0ZVtJ OTE1X01BWF9QTEFORVNdID0ge307CiAJdW5zaWduZWQgcGxhbmVfeV9kYXRhX3JhdGVbSTkxNV9N QVhfUExBTkVTXSA9IHt9OwogCXVpbnQxNl90IHRvdGFsX21pbl9ibG9ja3MgPSAwOworCXVpbnQx Nl90IHRvdGFsX2xldmVsX2RkYjsKKwlpbnQgbWF4X2xldmVsLCBsZXZlbDsKIAogCS8qIENsZWFy IHRoZSBwYXJ0aXRpb25pbmcgZm9yIGRpc2FibGVkIHBsYW5lcy4gKi8KIAltZW1zZXQoZGRiLT5w bGFuZVtwaXBlXSwgMCwgc2l6ZW9mKGRkYi0+cGxhbmVbcGlwZV0pKTsKQEAgLTQwOTYsMTAgKzQx MjYsNDggQEAgc2tsX2FsbG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj c3RhdGUsCiAJCXJldHVybiAtRUlOVkFMOwogCX0KIAotCWFsbG9jX3NpemUgLT0gdG90YWxfbWlu X2Jsb2NrczsKLQlkZGItPnBsYW5lW3BpcGVdW1BMQU5FX0NVUlNPUl0uc3RhcnQgPSBhbGxvYy0+ ZW5kIC0gbWluaW11bVtQTEFORV9DVVJTT1JdOworCWFsbG9jX3NpemUgLT0gbWluaW11bVtQTEFO RV9DVVJTT1JdOworCWRkYi0+cGxhbmVbcGlwZV1bUExBTkVfQ1VSU09SXS5zdGFydCA9IGFsbG9j LT5lbmQgLQorCQkJCQkJCW1pbmltdW1bUExBTkVfQ1VSU09SXTsKIAlkZGItPnBsYW5lW3BpcGVd W1BMQU5FX0NVUlNPUl0uZW5kID0gYWxsb2MtPmVuZDsKIAorCWZvciAobGV2ZWwgPSBpbGtfd21f bWF4X2xldmVsKGRldl9wcml2KTsgbGV2ZWwgPj0gMDsgbGV2ZWwtLSkgeworCQl0b3RhbF9sZXZl bF9kZGIgPSAwOworCQlmb3JfZWFjaF9wbGFuZV9pZF9vbl9jcnRjKGludGVsX2NydGMsIHBsYW5l X2lkKSB7CisJCQkvKgorCQkJICogVE9ETzogV2Ugc2hvdWxkIGNhbGN1bGF0ZSB3YXRlcm1hcmsg dmFsdWVzIGZvciBZL1VWCisJCQkgKiBwbGFuZSBib3RoIGluIGNhc2Ugb2YgTlYxMiBmb3JtYXQg YW5kIHVzZSBib3RoIHZhbHVlcworCQkJICogZm9yIGRkYiBjYWxjdWxhdGlvbi4gTlYxMiBpcyBk aXNhYmxlZCBhcyBvZiBub3csIFNvCisJCQkgKiB1c2luZyBvbmx5IHNpbmdsZS9VViBwbGFuZSB2 YWx1ZSBoZXJlLgorCQkJICovCisJCQlzdHJ1Y3Qgc2tsX3BsYW5lX3dtICp3bSA9ICZwaXBlX3dt LT5wbGFuZXNbcGxhbmVfaWRdOworCQkJdWludDE2X3QgcGxhbmVfcmVzX2IgPSB3bS0+d21bbGV2 ZWxdLnBsYW5lX3Jlc19iOworCQkJdWludDE2X3QgbWluID0gbWluaW11bVtwbGFuZV9pZF0gKyB5 X21pbmltdW1bcGxhbmVfaWRdOworCisJCQlpZiAocGxhbmVfaWQgPT0gUExBTkVfQ1VSU09SKQor CQkJCWNvbnRpbnVlOworCisJCQl0b3RhbF9sZXZlbF9kZGIgKz0gbWF4KHBsYW5lX3Jlc19iLCBt aW4pOworCQl9CisKKwkJLyoKKwkJICogSWYgVGhpcyBsZXZlbCBjYW4gc3VjY2Vzc2Z1bGx5IGJl IGVuYWJsZWQgd2l0aCB0aGUKKwkJICogcGlwZSdzIGN1cnJlbnQgRERCIGFsbG9jYXRpb24sIHRo ZW4gYWxsIGxvd2VyIGxldmVscyBhcmUKKwkJICogZ3VhcmFudGVlZCB0byBzdWNjZWVkIGFzIHdl bGwuCisJCSAqLworCQlpZiAodG90YWxfbGV2ZWxfZGRiIDw9IGFsbG9jX3NpemUpCisJCQlicmVh azsKKwl9CisKKwlpZiAoKGxldmVsIDwgMCkgfHwgKHRvdGFsX21pbl9ibG9ja3MgPiBhbGxvY19z aXplKSkgeworCQlEUk1fREVCVUdfS01TKCJSZXF1ZXN0ZWQgZGlzcGxheSBjb25maWd1cmF0aW9u IGV4Y2VlZHMgc3lzdGVtIEREQiBsaW1pdGF0aW9ucyIpOworCQlEUk1fREVCVUdfS01TKCJtaW5p bXVtIHJlcXVpcmVkICVkLyVkXG4iLCAobGV2ZWwgPCAwKSA/CisJCQkJdG90YWxfbGV2ZWxfZGRi IDogdG90YWxfbWluX2Jsb2NrcywgYWxsb2Nfc2l6ZSk7CisJCXJldHVybiAtRUlOVkFMOworCX0K KwltYXhfbGV2ZWwgPSBsZXZlbDsKKwlhbGxvY19zaXplIC09IHRvdGFsX2xldmVsX2RkYjsKKwog CS8qCiAJICogMi4gRGlzdHJpYnV0ZSB0aGUgcmVtYWluaW5nIHNwYWNlIGluIHByb3BvcnRpb24g dG8gdGhlIGFtb3VudCBvZgogCSAqIGRhdGEgZWFjaCBwbGFuZSBuZWVkcyB0byBmZXRjaCBmcm9t IG1lbW9yeS4KQEAgLTQxMTUsMTAgKzQxODMsMTcgQEAgc2tsX2FsbG9jYXRlX3BpcGVfZGRiKHN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJc3RhcnQgPSBhbGxvYy0+c3RhcnQ7CiAJ Zm9yX2VhY2hfcGxhbmVfaWRfb25fY3J0YyhpbnRlbF9jcnRjLCBwbGFuZV9pZCkgewogCQl1bnNp Z25lZCBpbnQgZGF0YV9yYXRlLCB5X2RhdGFfcmF0ZTsKLQkJdWludDE2X3QgcGxhbmVfYmxvY2tz LCB5X3BsYW5lX2Jsb2NrcyA9IDA7Ci0KLQkJaWYgKHBsYW5lX2lkID09IFBMQU5FX0NVUlNPUikK KwkJdWludDE2X3QgcGxhbmVfYmxvY2tzID0gMCwgeV9wbGFuZV9ibG9ja3MgPSAwOworCQlzdHJ1 Y3Qgc2tsX3BsYW5lX3dtICp3bSA9ICZwaXBlX3dtLT5wbGFuZXNbcGxhbmVfaWRdOworCQl1aW50 MTZfdCBwbGFuZV9yZXNfYiA9IHdtLT53bVttYXhfbGV2ZWxdLnBsYW5lX3Jlc19iOworCisJCWlm IChwbGFuZV9pZCA9PSBQTEFORV9DVVJTT1IpIHsKKwkJCXBsYW5lX2Jsb2NrcyA9CisJCQkJc2ts X2RkYl9lbnRyeV9zaXplKCZkZGItPnBsYW5lW3BpcGVdW3BsYW5lX2lkXSk7CisJCQlza2xfZW5h YmxlX3BsYW5lX3dtX2xldmVscyhkZXZfcHJpdiwgcGxhbmVfYmxvY2tzLAorCQkJCQkJICAgbWF4 X2xldmVsLCB3bSk7CiAJCQljb250aW51ZTsKKwkJfQogCiAJCWRhdGFfcmF0ZSA9IHBsYW5lX2Rh dGFfcmF0ZVtwbGFuZV9pZF07CiAKQEAgLTQxMjcsMzMgKzQyMDIsMzYgQEAgc2tsX2FsbG9jYXRl X3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJCSAqIHByb21vdGUg dGhlIGV4cHJlc3Npb24gdG8gNjQgYml0cyB0byBhdm9pZCBvdmVyZmxvd2luZywgdGhlCiAJCSAq IHJlc3VsdCBpcyA8IGF2YWlsYWJsZSBhcyBkYXRhX3JhdGUgLyB0b3RhbF9kYXRhX3JhdGUgPCAx CiAJCSAqLwotCQlwbGFuZV9ibG9ja3MgPSBtaW5pbXVtW3BsYW5lX2lkXTsKLQkJcGxhbmVfYmxv Y2tzICs9IGRpdl91NjQoKHVpbnQ2NF90KWFsbG9jX3NpemUgKiBkYXRhX3JhdGUsCi0JCQkJCXRv dGFsX2RhdGFfcmF0ZSk7CiAKIAkJLyogTGVhdmUgZGlzYWJsZWQgcGxhbmVzIGF0ICgwLDApICov CiAJCWlmIChkYXRhX3JhdGUpIHsKKwkJCXBsYW5lX2Jsb2NrcyA9IG1heChtaW5pbXVtW3BsYW5l X2lkXSwgcGxhbmVfcmVzX2IpOworCQkJcGxhbmVfYmxvY2tzICs9IGRpdl91NjQoKHVpbnQ2NF90 KWFsbG9jX3NpemUgKgorCQkJCQlkYXRhX3JhdGUsIHRvdGFsX2RhdGFfcmF0ZSk7CiAJCQlkZGIt PnBsYW5lW3BpcGVdW3BsYW5lX2lkXS5zdGFydCA9IHN0YXJ0OwogCQkJZGRiLT5wbGFuZVtwaXBl XVtwbGFuZV9pZF0uZW5kID0gc3RhcnQgKyBwbGFuZV9ibG9ja3M7CisJCQlzdGFydCArPSBwbGFu ZV9ibG9ja3M7CiAJCX0KIAotCQlzdGFydCArPSBwbGFuZV9ibG9ja3M7Ci0KIAkJLyoKIAkJICog YWxsb2NhdGlvbiBmb3IgeV9wbGFuZSBwYXJ0IG9mIHBsYW5hciBmb3JtYXQ6CisJCSAqIFRPRE86 IE9uY2Ugd2Ugc3RhcnQgY2FsY3VsYXRpbmcgd2F0ZXJtYXJrIHZhbHVlcyBmb3IgWS9VVgorCQkg KiBwbGFuZSBib3RoIGNvbnNpZGVyIGl0IGZvciBpbml0aWFsIGFsbG93ZWQgd20gYmxvY2tzLgog CQkgKi8KIAkJeV9kYXRhX3JhdGUgPSBwbGFuZV95X2RhdGFfcmF0ZVtwbGFuZV9pZF07CiAKLQkJ eV9wbGFuZV9ibG9ja3MgPSB5X21pbmltdW1bcGxhbmVfaWRdOwotCQl5X3BsYW5lX2Jsb2NrcyAr PSBkaXZfdTY0KCh1aW50NjRfdClhbGxvY19zaXplICogeV9kYXRhX3JhdGUsCi0JCQkJCXRvdGFs X2RhdGFfcmF0ZSk7Ci0KIAkJaWYgKHlfZGF0YV9yYXRlKSB7CisJCQl5X3BsYW5lX2Jsb2NrcyA9 IHlfbWluaW11bVtwbGFuZV9pZF07CisJCQl5X3BsYW5lX2Jsb2NrcyArPSBkaXZfdTY0KCh1aW50 NjRfdClhbGxvY19zaXplICoKKwkJCQkJeV9kYXRhX3JhdGUsIHRvdGFsX2RhdGFfcmF0ZSk7CiAJ CQlkZGItPnlfcGxhbmVbcGlwZV1bcGxhbmVfaWRdLnN0YXJ0ID0gc3RhcnQ7CiAJCQlkZGItPnlf cGxhbmVbcGlwZV1bcGxhbmVfaWRdLmVuZCA9IHN0YXJ0ICsgeV9wbGFuZV9ibG9ja3M7CisJCQlz dGFydCArPSB5X3BsYW5lX2Jsb2NrczsKIAkJfQotCi0JCXN0YXJ0ICs9IHlfcGxhbmVfYmxvY2tz OworCQlza2xfZW5hYmxlX3BsYW5lX3dtX2xldmVscyhkZXZfcHJpdiwKKwkJCQkJICAgcGxhbmVf YmxvY2tzLAorCQkJCQkgICBtYXhfbGV2ZWwsCisJCQkJCSAgIHdtKTsKIAl9CiAKIAlyZXR1cm4g MDsKQEAgLTQyNDMsMTEgKzQzMjEsOSBAQCBza2xfYWRqdXN0ZWRfcGxhbmVfcGl4ZWxfcmF0ZShj b25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogc3RhdGljIGludCBza2xfY29t cHV0ZV9wbGFuZV93bShjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJ CQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJCQljb25zdCBzdHJ1Y3QgaW50 ZWxfcGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSwKLQkJCQl1aW50MTZfdCBkZGJfYWxsb2NhdGlv biwKIAkJCQlpbnQgbGV2ZWwsCiAJCQkJdWludDE2X3QgKm91dF9ibG9ja3MsIC8qIG91dCAqLwot CQkJCXVpbnQ4X3QgKm91dF9saW5lcywgLyogb3V0ICovCi0JCQkJYm9vbCAqZW5hYmxlZCAvKiBv dXQgKi8pCisJCQkJdWludDhfdCAqb3V0X2xpbmVzIC8qIG91dCAqLykKIHsKIAlzdHJ1Y3QgaW50 ZWxfcGxhbmUgKnBsYW5lID0gdG9faW50ZWxfcGxhbmUoaW50ZWxfcHN0YXRlLT5iYXNlLnBsYW5l KTsKIAljb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGUgPSAmaW50ZWxfcHN0YXRl LT5iYXNlOwpAQCAtNDI3MCwxMCArNDM0Niw4IEBAIHN0YXRpYyBpbnQgc2tsX2NvbXB1dGVfcGxh bmVfd20oY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWJvb2wgeV90 aWxlZCwgeF90aWxlZDsKIAogCWlmIChsYXRlbmN5ID09IDAgfHwKLQkgICAgIWludGVsX3dtX3Bs YW5lX3Zpc2libGUoY3N0YXRlLCBpbnRlbF9wc3RhdGUpKSB7Ci0JCSplbmFibGVkID0gZmFsc2U7 CisJICAgICFpbnRlbF93bV9wbGFuZV92aXNpYmxlKGNzdGF0ZSwgaW50ZWxfcHN0YXRlKSkKIAkJ cmV0dXJuIDA7Ci0JfQogCiAJeV90aWxlZCA9IGZiLT5tb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9N T0RfWV9USUxFRCB8fAogCQkgIGZiLT5tb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWWZfVElM RUQ7CkBAIC00MzU5LDkgKzQ0MzMsNiBAQCBzdGF0aWMgaW50IHNrbF9jb21wdXRlX3BsYW5lX3dt KGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJaWYgKChjcHAgKiBj c3RhdGUtPmJhc2UuYWRqdXN0ZWRfbW9kZS5jcnRjX2h0b3RhbCAvIDUxMiA8IDEpICYmCiAJCSAg ICAocGxhbmVfYnl0ZXNfcGVyX2xpbmUgLyA1MTIgPCAxKSkKIAkJCXNlbGVjdGVkX3Jlc3VsdCA9 IG1ldGhvZDI7Ci0JCWVsc2UgaWYgKChkZGJfYWxsb2NhdGlvbiAmJiBkZGJfYWxsb2NhdGlvbiAv Ci0JCQlmaXhlZF8xNl8xNl90b191MzJfcm91bmRfdXAocGxhbmVfYmxvY2tzX3Blcl9saW5lKSkg Pj0gMSkKLQkJCXNlbGVjdGVkX3Jlc3VsdCA9IG1pbl9maXhlZF8xNl8xNihtZXRob2QxLCBtZXRo b2QyKTsKIAkJZWxzZSBpZiAobGF0ZW5jeSA+PSBsaW5ldGltZV91cykKIAkJCXNlbGVjdGVkX3Jl c3VsdCA9IG1pbl9maXhlZF8xNl8xNihtZXRob2QxLCBtZXRob2QyKTsKIAkJZWxzZQpAQCAtNDM4 MSw2NCArNDQ1Miw0MiBAQCBzdGF0aWMgaW50IHNrbF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0IHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJfQogCX0KIAotCWlmIChyZXNfYmxv Y2tzID49IGRkYl9hbGxvY2F0aW9uIHx8IHJlc19saW5lcyA+IDMxKSB7Ci0JCSplbmFibGVkID0g ZmFsc2U7CisJaWYgKHJlc19saW5lcyA+PSAzMSAmJiBsZXZlbCA9PSAwKSB7CisJCXN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lID0gcHN0YXRlLT5wbGFuZTsKIAotCQkvKgotCQkgKiBJZiB0aGVyZSBh cmUgbm8gdmFsaWQgbGV2ZWwgMCB3YXRlcm1hcmtzLCB0aGVuIHdlIGNhbid0Ci0JCSAqIHN1cHBv cnQgdGhpcyBkaXNwbGF5IGNvbmZpZ3VyYXRpb24uCi0JCSAqLwotCQlpZiAobGV2ZWwpIHsKLQkJ CXJldHVybiAwOwotCQl9IGVsc2UgewotCQkJc3RydWN0IGRybV9wbGFuZSAqcGxhbmUgPSBwc3Rh dGUtPnBsYW5lOwotCi0JCQlEUk1fREVCVUdfS01TKCJSZXF1ZXN0ZWQgZGlzcGxheSBjb25maWd1 cmF0aW9uIGV4Y2VlZHMgc3lzdGVtIHdhdGVybWFyayBsaW1pdGF0aW9uc1xuIik7Ci0JCQlEUk1f REVCVUdfS01TKCJbUExBTkU6JWQ6JXNdIGJsb2NrcyByZXF1aXJlZCA9ICV1LyV1LCBsaW5lcyBy ZXF1aXJlZCA9ICV1LzMxXG4iLAotCQkJCSAgICAgIHBsYW5lLT5iYXNlLmlkLCBwbGFuZS0+bmFt ZSwKLQkJCQkgICAgICByZXNfYmxvY2tzLCBkZGJfYWxsb2NhdGlvbiwgcmVzX2xpbmVzKTsKLQkJ CXJldHVybiAtRUlOVkFMOwotCQl9CisJCURSTV9ERUJVR19LTVMoIlJlcXVlc3RlZCBkaXNwbGF5 IGNvbmZpZ3VyYXRpb24gZXhjZWVkcyBzeXN0ZW0gd2F0ZXJtYXJrIGxpbWl0YXRpb25zXG4iKTsK KwkJRFJNX0RFQlVHX0tNUygiW1BMQU5FOiVkOiVzXSBsaW5lcyByZXF1aXJlZCA9ICV1LzMxXG4i LAorCQkJCXBsYW5lLT5iYXNlLmlkLCBwbGFuZS0+bmFtZSwgcmVzX2xpbmVzKTsKKwkJcmV0dXJu IC1FSU5WQUw7CiAJfQogCiAJKm91dF9ibG9ja3MgPSByZXNfYmxvY2tzOwogCSpvdXRfbGluZXMg PSByZXNfbGluZXM7Ci0JKmVuYWJsZWQgPSB0cnVlOwogCiAJcmV0dXJuIDA7CiB9CiAKIHN0YXRp YyBpbnQKIHNrbF9jb21wdXRlX3dtX2xldmVscyhjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCi0JCSAgICAgIHN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKmRkYiwKIAkJ ICAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJICAgICAgY29uc3Qgc3Ry dWN0IGludGVsX3BsYW5lX3N0YXRlICppbnRlbF9wc3RhdGUsCiAJCSAgICAgIHN0cnVjdCBza2xf cGxhbmVfd20gKndtKQogewotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50 ZWxfY3J0Yyhjc3RhdGUtPmJhc2UuY3J0Yyk7Ci0Jc3RydWN0IGRybV9wbGFuZSAqcGxhbmUgPSBp bnRlbF9wc3RhdGUtPmJhc2UucGxhbmU7Ci0Jc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFu ZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKLQl1aW50MTZfdCBkZGJfYmxvY2tzOwotCWVudW0g cGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAlpbnQgbGV2ZWwsIG1heF9sZXZlbCA9IGls a193bV9tYXhfbGV2ZWwoZGV2X3ByaXYpOwogCWludCByZXQ7CiAKIAlpZiAoV0FSTl9PTighaW50 ZWxfcHN0YXRlLT5iYXNlLmZiKSkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKLQlkZGJfYmxvY2tzID0g c2tsX2RkYl9lbnRyeV9zaXplKCZkZGItPnBsYW5lW3BpcGVdW2ludGVsX3BsYW5lLT5pZF0pOwot CiAJZm9yIChsZXZlbCA9IDA7IGxldmVsIDw9IG1heF9sZXZlbDsgbGV2ZWwrKykgewogCQlzdHJ1 Y3Qgc2tsX3dtX2xldmVsICpyZXN1bHQgPSAmd20tPndtW2xldmVsXTsKIAogCQlyZXQgPSBza2xf Y29tcHV0ZV9wbGFuZV93bShkZXZfcHJpdiwKIAkJCQkJICAgY3N0YXRlLAogCQkJCQkgICBpbnRl bF9wc3RhdGUsCi0JCQkJCSAgIGRkYl9ibG9ja3MsCiAJCQkJCSAgIGxldmVsLAogCQkJCQkgICAm cmVzdWx0LT5wbGFuZV9yZXNfYiwKLQkJCQkJICAgJnJlc3VsdC0+cGxhbmVfcmVzX2wsCi0JCQkJ CSAgICZyZXN1bHQtPnBsYW5lX2VuKTsKKwkJCQkJICAgJnJlc3VsdC0+cGxhbmVfcmVzX2wpOwog CQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIAl9CkBAIC00NTA0LDggKzQ1NTMsNyBAQCBzdGF0 aWMgaW50IHNrbF9idWlsZF9waXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUs CiAKIAkJd20gPSAmcGlwZV93bS0+cGxhbmVzW3BsYW5lX2lkXTsKIAotCQlyZXQgPSBza2xfY29t cHV0ZV93bV9sZXZlbHMoZGV2X3ByaXYsIGRkYiwgY3N0YXRlLAotCQkJCQkgICAgaW50ZWxfcHN0 YXRlLCB3bSk7CisJCXJldCA9IHNrbF9jb21wdXRlX3dtX2xldmVscyhkZXZfcHJpdiwgY3N0YXRl LCBpbnRlbF9wc3RhdGUsIHdtKTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAJCXNrbF9j b21wdXRlX3RyYW5zaXRpb25fd20oY3N0YXRlLCAmd20tPnRyYW5zX3dtKTsKQEAgLTQ2MTgsNiAr NDY2Niw0NSBAQCBib29sIHNrbF9kZGJfYWxsb2NhdGlvbl9vdmVybGFwcyhjb25zdCBzdHJ1Y3Qg c2tsX2RkYl9lbnRyeSAqKmVudHJpZXMsCiAJcmV0dXJuIGZhbHNlOwogfQogCitzdGF0aWMgaW50 Citza2xfZGRiX2FkZF9hZmZlY3RlZF9wbGFuZXMoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNz dGF0ZSwKKwkJCSAgICBjb25zdCBzdHJ1Y3Qgc2tsX3BpcGVfd20gKm9sZF9waXBlX3dtLAorCQkJ ICAgIGNvbnN0IHN0cnVjdCBza2xfcGlwZV93bSAqcGlwZV93bSkKK3sKKwlzdHJ1Y3QgZHJtX2F0 b21pY19zdGF0ZSAqc3RhdGUgPSBjc3RhdGUtPmJhc2Uuc3RhdGU7CisJc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IHN0YXRlLT5kZXY7CisJc3RydWN0IGRybV9jcnRjICpjcnRjID0gY3N0YXRlLT5i YXNlLmNydGM7CisJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRj KGNydGMpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2 KTsKKwlzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICppbnRlbF9zdGF0ZSA9IHRvX2ludGVsX2F0 b21pY19zdGF0ZShzdGF0ZSk7CisJc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqbmV3X2RkYiA9 ICZpbnRlbF9zdGF0ZS0+d21fcmVzdWx0cy5kZGI7CisJc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlv biAqY3VyX2RkYiA9ICZkZXZfcHJpdi0+d20uc2tsX2h3LmRkYjsKKwlzdHJ1Y3QgZHJtX3BsYW5l X3N0YXRlICpwbGFuZV9zdGF0ZTsKKwlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKKwllbnVtIHBp cGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CisKKwlXQVJOX09OKCFkcm1fYXRvbWljX2dldF9l eGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKSk7CisKKwlkcm1fZm9yX2VhY2hfcGxhbmVf bWFzayhwbGFuZSwgZGV2LCBjc3RhdGUtPmJhc2UucGxhbmVfbWFzaykgeworCQllbnVtIHBsYW5l X2lkIHBsYW5lX2lkID0gdG9faW50ZWxfcGxhbmUocGxhbmUpLT5pZDsKKwkJY29uc3Qgc3RydWN0 IHNrbF9wbGFuZV93bSAqd20gPSAmcGlwZV93bS0+cGxhbmVzW3BsYW5lX2lkXTsKKwkJY29uc3Qg c3RydWN0IHNrbF9wbGFuZV93bSAqb2xkX3dtID0gJm9sZF9waXBlX3dtLT5wbGFuZXNbcGxhbmVf aWRdOworCisJCWlmICgoc2tsX2RkYl9lbnRyeV9lcXVhbCgmY3VyX2RkYi0+cGxhbmVbcGlwZV1b cGxhbmVfaWRdLAorCQkJCQkmbmV3X2RkYi0+cGxhbmVbcGlwZV1bcGxhbmVfaWRdKSAmJgorCQkg ICAgc2tsX2RkYl9lbnRyeV9lcXVhbCgmY3VyX2RkYi0+eV9wbGFuZVtwaXBlXVtwbGFuZV9pZF0s CisJCQkJCSZuZXdfZGRiLT55X3BsYW5lW3BpcGVdW3BsYW5lX2lkXSkpICYmCisJCSAgICAhbWVt Y21wKHdtLCBvbGRfd20sIHNpemVvZihzdHJ1Y3Qgc2tsX3BsYW5lX3dtKSkpCisJCQljb250aW51 ZTsKKworCQlwbGFuZV9zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X3BsYW5lX3N0YXRlKHN0YXRlLCBw bGFuZSk7CisJCWlmIChJU19FUlIocGxhbmVfc3RhdGUpKQorCQkJcmV0dXJuIFBUUl9FUlIocGxh bmVfc3RhdGUpOworCX0KKworCXJldHVybiAwOworfQorCiBzdGF0aWMgaW50IHNrbF91cGRhdGVf cGlwZV93bShzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJCSAgICAgIGNvbnN0IHN0 cnVjdCBza2xfcGlwZV93bSAqb2xkX3BpcGVfd20sCiAJCQkgICAgICBzdHJ1Y3Qgc2tsX3BpcGVf d20gKnBpcGVfd20sIC8qIG91dCAqLwpAQCAtNDYzMSw2ICs0NzE4LDE3IEBAIHN0YXRpYyBpbnQg c2tsX3VwZGF0ZV9waXBlX3dtKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3N0YXRlLAogCWlmIChy ZXQpCiAJCXJldHVybiByZXQ7CiAKKwlyZXQgPSBza2xfYWxsb2NhdGVfcGlwZV9kZGIoaW50ZWxf Y3N0YXRlLCBwaXBlX3dtLCBkZGIpOworCWlmIChyZXQpCisJCXJldHVybiByZXQ7CisJLyoKKwkg KiBUT0RPOiBQbGFuZXMgYXJlIGluY2x1ZGVkIGluIHN0YXRlIHRvIGFybSBXTSByZWdpc3RlcnMu CisJICogU2NvcGUgdG8gb3B0aW1pemUgZnVydGhlciwgYnkganVzdCByZXdyaXRpbmcgcGxhbmUg c3VyZiByZWdpc3Rlci4KKwkgKi8KKwlyZXQgPSBza2xfZGRiX2FkZF9hZmZlY3RlZF9wbGFuZXMo aW50ZWxfY3N0YXRlLCBvbGRfcGlwZV93bSwgcGlwZV93bSk7CisJaWYgKHJldCkKKwkJcmV0dXJu IHJldDsKKwogCWlmICghbWVtY21wKG9sZF9waXBlX3dtLCBwaXBlX3dtLCBzaXplb2YoKnBpcGVf d20pKSkKIAkJKmNoYW5nZWQgPSBmYWxzZTsKIAllbHNlCkBAIC00NjUzLDQxICs0NzUxLDcgQEAg cGlwZXNfbW9kaWZpZWQoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogfQogCiBzdGF0 aWMgaW50Ci1za2xfZGRiX2FkZF9hZmZlY3RlZF9wbGFuZXMoc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmNzdGF0ZSkKLXsKLQlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUgPSBjc3RhdGUt PmJhc2Uuc3RhdGU7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHN0YXRlLT5kZXY7Ci0Jc3Ry dWN0IGRybV9jcnRjICpjcnRjID0gY3N0YXRlLT5iYXNlLmNydGM7Ci0Jc3RydWN0IGludGVsX2Ny dGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwotCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0 YXRlICppbnRlbF9zdGF0ZSA9IHRvX2ludGVsX2F0b21pY19zdGF0ZShzdGF0ZSk7Ci0Jc3RydWN0 IHNrbF9kZGJfYWxsb2NhdGlvbiAqbmV3X2RkYiA9ICZpbnRlbF9zdGF0ZS0+d21fcmVzdWx0cy5k ZGI7Ci0Jc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqY3VyX2RkYiA9ICZkZXZfcHJpdi0+d20u c2tsX2h3LmRkYjsKLQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZTsKLQlzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZTsKLQllbnVtIHBpcGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7 Ci0KLQlXQVJOX09OKCFkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCBj cnRjKSk7Ci0KLQlkcm1fZm9yX2VhY2hfcGxhbmVfbWFzayhwbGFuZSwgZGV2LCBjc3RhdGUtPmJh c2UucGxhbmVfbWFzaykgewotCQllbnVtIHBsYW5lX2lkIHBsYW5lX2lkID0gdG9faW50ZWxfcGxh bmUocGxhbmUpLT5pZDsKLQotCQlpZiAoc2tsX2RkYl9lbnRyeV9lcXVhbCgmY3VyX2RkYi0+cGxh bmVbcGlwZV1bcGxhbmVfaWRdLAotCQkJCQkmbmV3X2RkYi0+cGxhbmVbcGlwZV1bcGxhbmVfaWRd KSAmJgotCQkgICAgc2tsX2RkYl9lbnRyeV9lcXVhbCgmY3VyX2RkYi0+eV9wbGFuZVtwaXBlXVtw bGFuZV9pZF0sCi0JCQkJCSZuZXdfZGRiLT55X3BsYW5lW3BpcGVdW3BsYW5lX2lkXSkpCi0JCQlj b250aW51ZTsKLQotCQlwbGFuZV9zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X3BsYW5lX3N0YXRlKHN0 YXRlLCBwbGFuZSk7Ci0JCWlmIChJU19FUlIocGxhbmVfc3RhdGUpKQotCQkJcmV0dXJuIFBUUl9F UlIocGxhbmVfc3RhdGUpOwotCX0KLQotCXJldHVybiAwOwotfQotCi1zdGF0aWMgaW50Ci1za2xf Y29tcHV0ZV9kZGIoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQorc2tsX2luY2x1ZGVf YWZmZWN0ZWRfY3J0Y3Moc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogewogCXN0cnVj dCBkcm1fZGV2aWNlICpkZXYgPSBzdGF0ZS0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKQEAgLTQ3NTEsMTQgKzQ4MTUsNiBAQCBza2xfY29t cHV0ZV9kZGIoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQljc3RhdGUgPSBpbnRl bF9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIGludGVsX2NydGMpOwogCQlpZiAoSVNfRVJS KGNzdGF0ZSkpCiAJCQlyZXR1cm4gUFRSX0VSUihjc3RhdGUpOwotCi0JCXJldCA9IHNrbF9hbGxv Y2F0ZV9waXBlX2RkYihjc3RhdGUsIGRkYik7Ci0JCWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0Owot Ci0JCXJldCA9IHNrbF9kZGJfYWRkX2FmZmVjdGVkX3BsYW5lcyhjc3RhdGUpOwotCQlpZiAocmV0 KQotCQkJcmV0dXJuIHJldDsKIAl9CiAKIAlyZXR1cm4gMDsKQEAgLTQ4MzksNyArNDg5NSw3IEBA IHNrbF9jb21wdXRlX3dtKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkvKiBDbGVh ciBhbGwgZGlydHkgZmxhZ3MgKi8KIAlyZXN1bHRzLT5kaXJ0eV9waXBlcyA9IDA7CiAKLQlyZXQg PSBza2xfY29tcHV0ZV9kZGIoc3RhdGUpOworCXJldCA9IHNrbF9pbmNsdWRlX2FmZmVjdGVkX2Ny dGNzKHN0YXRlKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0tIAoyLjExLjAKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=