From: Mahesh Kumar Subject: [PATCH 11/12] drm/i915/skl: New ddb allocation algorithm Date: Wed, 17 May 2017 17:28:30 +0530 Message-ID: <20170517115831.13830-12-mahesh1.kumar@intel.com> References: <20170517115831.13830-1-mahesh1.kumar@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 844026E3DF for ; Wed, 17 May 2017 11:58:03 +0000 (UTC) In-Reply-To: <20170517115831.13830-1-mahesh1.kumar@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 NjoKIC0gQWRkcmVzcyByZXZpZXcgY29tbWVudHMgZnJvbSBNYXR0CgpTaWduZWQtb2ZmLWJ5OiBN YWhlc2ggS3VtYXIgPG1haGVzaDEua3VtYXJAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogTWFhcnRl biBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgMjU1ICsrKysrKysrKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNTUgaW5zZXJ0aW9ucygrKSwgMTAw IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDkzNmVlZjE2MzRjNy4u YWRlMDZkM2Y2YmRjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTQwMzksMTMgKzQwMzks NDEgQEAgc2tsX2RkYl9jYWxjX21pbihjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0 YXRlLCBpbnQgbnVtX2FjdGl2ZSwKIAltaW5pbXVtW1BMQU5FX0NVUlNPUl0gPSBza2xfY3Vyc29y X2FsbG9jYXRpb24obnVtX2FjdGl2ZSk7CiB9CiAKK3N0YXRpYyB2b2lkCitza2xfZW5hYmxlX3Bs YW5lX3dtX2xldmVscyhjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJ CQkgICB1aW50MTZfdCBwbGFuZV9kZGIsCisJCQkgICB1aW50MTZfdCBtYXhfbGV2ZWwsCisJCQkg ICBzdHJ1Y3Qgc2tsX3BsYW5lX3dtICp3bSkKK3sKKwlpbnQgbGV2ZWw7CisJLyoKKwkgKiBOb3cg ZW5hYmxlIGFsbCBsZXZlbHMgaW4gV00gc3RydWN0dXJlIHdoaWNoIGNhbiBiZSBlbmFibGVkCisJ ICogdXNpbmcgY3VycmVudCBEREIgYWxsb2NhdGlvbgorCSAqLworCWZvciAobGV2ZWwgPSBpbGtf d21fbWF4X2xldmVsKGRldl9wcml2KTsgbGV2ZWwgPj0gMDsgbGV2ZWwtLSkgeworCQlzdHJ1Y3Qg c2tsX3dtX2xldmVsICpsZXZlbF93bSA9ICZ3bS0+d21bbGV2ZWxdOworCisJCWlmIChsZXZlbCA+ IG1heF9sZXZlbCB8fCBsZXZlbF93bS0+cGxhbmVfcmVzX2IgPT0gMAorCQkJCSAgICAgIHx8IGxl dmVsX3dtLT5wbGFuZV9yZXNfbCA+PSAzMQorCQkJCSAgICAgIHx8IGxldmVsX3dtLT5wbGFuZV9y ZXNfYiA+PSBwbGFuZV9kZGIpIHsKKwkJCWxldmVsX3dtLT5wbGFuZV9lbiA9IGZhbHNlOworCQkJ bGV2ZWxfd20tPnBsYW5lX3Jlc19iID0gMDsKKwkJCWxldmVsX3dtLT5wbGFuZV9yZXNfbCA9IDA7 CisJCX0gZWxzZSB7CisJCQlsZXZlbF93bS0+cGxhbmVfZW4gPSB0cnVlOworCQl9CisJfQorfQor CiBzdGF0aWMgaW50CiBza2xfYWxsb2NhdGVfcGlwZV9kZGIoc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmNzdGF0ZSwKKwkJICAgICAgc3RydWN0IHNrbF9waXBlX3dtICpwaXBlX3dtLAogCQkgICAg ICBzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0aW9uICpkZGIgLyogb3V0ICovKQogewogCXN0cnVjdCBk cm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IGNzdGF0ZS0+YmFzZS5zdGF0ZTsKIAlzdHJ1Y3QgZHJt X2NydGMgKmNydGMgPSBjc3RhdGUtPmJhc2UuY3J0YzsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gY3J0Yy0+ZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMo Y3J0Yyk7CiAJZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCXN0cnVjdCBza2xf ZGRiX2VudHJ5ICphbGxvYyA9ICZjc3RhdGUtPndtLnNrbC5kZGI7CkBAIC00MDU4LDYgKzQwODYs OCBAQCBza2xfYWxsb2NhdGVfcGlwZV9kZGIoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0 ZSwKIAl1bnNpZ25lZCBwbGFuZV9kYXRhX3JhdGVbSTkxNV9NQVhfUExBTkVTXSA9IHt9OwogCXVu c2lnbmVkIHBsYW5lX3lfZGF0YV9yYXRlW0k5MTVfTUFYX1BMQU5FU10gPSB7fTsKIAl1aW50MTZf dCB0b3RhbF9taW5fYmxvY2tzID0gMDsKKwl1aW50MTZfdCB0b3RhbF9sZXZlbF9kZGI7CisJaW50 IG1heF9sZXZlbCwgbGV2ZWw7CiAKIAkvKiBDbGVhciB0aGUgcGFydGl0aW9uaW5nIGZvciBkaXNh YmxlZCBwbGFuZXMuICovCiAJbWVtc2V0KGRkYi0+cGxhbmVbcGlwZV0sIDAsIHNpemVvZihkZGIt PnBsYW5lW3BpcGVdKSk7CkBAIC00MDk2LDEwICs0MTI2LDQ4IEBAIHNrbF9hbGxvY2F0ZV9waXBl X2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQlyZXR1cm4gLUVJTlZBTDsK IAl9CiAKLQlhbGxvY19zaXplIC09IHRvdGFsX21pbl9ibG9ja3M7Ci0JZGRiLT5wbGFuZVtwaXBl XVtQTEFORV9DVVJTT1JdLnN0YXJ0ID0gYWxsb2MtPmVuZCAtIG1pbmltdW1bUExBTkVfQ1VSU09S XTsKKwlhbGxvY19zaXplIC09IG1pbmltdW1bUExBTkVfQ1VSU09SXTsKKwlkZGItPnBsYW5lW3Bp cGVdW1BMQU5FX0NVUlNPUl0uc3RhcnQgPSBhbGxvYy0+ZW5kIC0KKwkJCQkJCQltaW5pbXVtW1BM QU5FX0NVUlNPUl07CiAJZGRiLT5wbGFuZVtwaXBlXVtQTEFORV9DVVJTT1JdLmVuZCA9IGFsbG9j LT5lbmQ7CiAKKwlmb3IgKGxldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXZfcHJpdik7IGxldmVs ID49IDA7IGxldmVsLS0pIHsKKwkJdG90YWxfbGV2ZWxfZGRiID0gMDsKKwkJZm9yX2VhY2hfcGxh bmVfaWRfb25fY3J0YyhpbnRlbF9jcnRjLCBwbGFuZV9pZCkgeworCQkJLyoKKwkJCSAqIFRPRE86 IFdlIHNob3VsZCBjYWxjdWxhdGUgd2F0ZXJtYXJrIHZhbHVlcyBmb3IgWS9VVgorCQkJICogcGxh bmUgYm90aCBpbiBjYXNlIG9mIE5WMTIgZm9ybWF0IGFuZCB1c2UgYm90aCB2YWx1ZXMKKwkJCSAq IGZvciBkZGIgY2FsY3VsYXRpb24uIE5WMTIgaXMgZGlzYWJsZWQgYXMgb2Ygbm93LCBTbworCQkJ ICogdXNpbmcgb25seSBzaW5nbGUvVVYgcGxhbmUgdmFsdWUgaGVyZS4KKwkJCSAqLworCQkJc3Ry dWN0IHNrbF9wbGFuZV93bSAqd20gPSAmcGlwZV93bS0+cGxhbmVzW3BsYW5lX2lkXTsKKwkJCXVp bnQxNl90IHBsYW5lX3Jlc19iID0gd20tPndtW2xldmVsXS5wbGFuZV9yZXNfYjsKKwkJCXVpbnQx Nl90IG1pbiA9IG1pbmltdW1bcGxhbmVfaWRdICsgeV9taW5pbXVtW3BsYW5lX2lkXTsKKworCQkJ aWYgKHBsYW5lX2lkID09IFBMQU5FX0NVUlNPUikKKwkJCQljb250aW51ZTsKKworCQkJdG90YWxf bGV2ZWxfZGRiICs9IG1heChwbGFuZV9yZXNfYiwgbWluKTsKKwkJfQorCisJCS8qCisJCSAqIElm IFRoaXMgdGhpcyBsZXZlbCBjYW4gc3VjY2Vzc2Z1bGx5IGJlIGVuYWJsZWQgd2l0aCB0aGUKKwkJ ICogcGlwZSdzIGN1cnJlbnQgRERCIGFsbG9jYXRpb24sIHRoZW4gYWxsIGxvd2VyIGxldmVscyBh cmUKKwkJICogZ3VhcmFudGVlZCB0byBzdWNjZWVkIGFzIHdlbGwuCisJCSAqLworCQlpZiAodG90 YWxfbGV2ZWxfZGRiIDw9IGFsbG9jX3NpemUpCisJCQlicmVhazsKKwl9CisKKwlpZiAoKGxldmVs IDwgMCkgfHwgKHRvdGFsX21pbl9ibG9ja3MgPiBhbGxvY19zaXplKSkgeworCQlEUk1fREVCVUdf S01TKCJSZXF1ZXN0ZWQgZGlzcGxheSBjb25maWd1cmF0aW9uIGV4Y2VlZHMgc3lzdGVtIEREQiBs aW1pdGF0aW9ucyIpOworCQlEUk1fREVCVUdfS01TKCJtaW5pbXVtIHJlcXVpcmVkICVkLyVkXG4i LCAobGV2ZWwgPCAwKSA/CisJCQkJdG90YWxfbGV2ZWxfZGRiIDogdG90YWxfbWluX2Jsb2Nrcywg YWxsb2Nfc2l6ZSk7CisJCXJldHVybiAtRUlOVkFMOworCX0KKwltYXhfbGV2ZWwgPSBsZXZlbDsK KwlhbGxvY19zaXplIC09IHRvdGFsX2xldmVsX2RkYjsKKwogCS8qCiAJICogMi4gRGlzdHJpYnV0 ZSB0aGUgcmVtYWluaW5nIHNwYWNlIGluIHByb3BvcnRpb24gdG8gdGhlIGFtb3VudCBvZgogCSAq IGRhdGEgZWFjaCBwbGFuZSBuZWVkcyB0byBmZXRjaCBmcm9tIG1lbW9yeS4KQEAgLTQxMTUsMTAg KzQxODMsMTcgQEAgc2tsX2FsbG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpjc3RhdGUsCiAJc3RhcnQgPSBhbGxvYy0+c3RhcnQ7CiAJZm9yX2VhY2hfcGxhbmVfaWRfb25f Y3J0YyhpbnRlbF9jcnRjLCBwbGFuZV9pZCkgewogCQl1bnNpZ25lZCBpbnQgZGF0YV9yYXRlLCB5 X2RhdGFfcmF0ZTsKLQkJdWludDE2X3QgcGxhbmVfYmxvY2tzLCB5X3BsYW5lX2Jsb2NrcyA9IDA7 Ci0KLQkJaWYgKHBsYW5lX2lkID09IFBMQU5FX0NVUlNPUikKKwkJdWludDE2X3QgcGxhbmVfYmxv Y2tzID0gMCwgeV9wbGFuZV9ibG9ja3MgPSAwOworCQlzdHJ1Y3Qgc2tsX3BsYW5lX3dtICp3bSA9 ICZwaXBlX3dtLT5wbGFuZXNbcGxhbmVfaWRdOworCQl1aW50MTZfdCBwbGFuZV9yZXNfYiA9IHdt LT53bVttYXhfbGV2ZWxdLnBsYW5lX3Jlc19iOworCisJCWlmIChwbGFuZV9pZCA9PSBQTEFORV9D VVJTT1IpIHsKKwkJCXBsYW5lX2Jsb2NrcyA9CisJCQkJc2tsX2RkYl9lbnRyeV9zaXplKCZkZGIt PnBsYW5lW3BpcGVdW3BsYW5lX2lkXSk7CisJCQlza2xfZW5hYmxlX3BsYW5lX3dtX2xldmVscyhk ZXZfcHJpdiwgcGxhbmVfYmxvY2tzLAorCQkJCQkJICAgbWF4X2xldmVsLCB3bSk7CiAJCQljb250 aW51ZTsKKwkJfQogCiAJCWRhdGFfcmF0ZSA9IHBsYW5lX2RhdGFfcmF0ZVtwbGFuZV9pZF07CiAK QEAgLTQxMjcsMzMgKzQyMDIsMzYgQEAgc2tsX2FsbG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJCSAqIHByb21vdGUgdGhlIGV4cHJlc3Npb24gdG8gNjQg Yml0cyB0byBhdm9pZCBvdmVyZmxvd2luZywgdGhlCiAJCSAqIHJlc3VsdCBpcyA8IGF2YWlsYWJs ZSBhcyBkYXRhX3JhdGUgLyB0b3RhbF9kYXRhX3JhdGUgPCAxCiAJCSAqLwotCQlwbGFuZV9ibG9j a3MgPSBtaW5pbXVtW3BsYW5lX2lkXTsKLQkJcGxhbmVfYmxvY2tzICs9IGRpdl91NjQoKHVpbnQ2 NF90KWFsbG9jX3NpemUgKiBkYXRhX3JhdGUsCi0JCQkJCXRvdGFsX2RhdGFfcmF0ZSk7CiAKIAkJ LyogTGVhdmUgZGlzYWJsZWQgcGxhbmVzIGF0ICgwLDApICovCiAJCWlmIChkYXRhX3JhdGUpIHsK KwkJCXBsYW5lX2Jsb2NrcyA9IG1heChtaW5pbXVtW3BsYW5lX2lkXSwgcGxhbmVfcmVzX2IpOwor CQkJcGxhbmVfYmxvY2tzICs9IGRpdl91NjQoKHVpbnQ2NF90KWFsbG9jX3NpemUgKgorCQkJCQlk YXRhX3JhdGUsIHRvdGFsX2RhdGFfcmF0ZSk7CiAJCQlkZGItPnBsYW5lW3BpcGVdW3BsYW5lX2lk XS5zdGFydCA9IHN0YXJ0OwogCQkJZGRiLT5wbGFuZVtwaXBlXVtwbGFuZV9pZF0uZW5kID0gc3Rh cnQgKyBwbGFuZV9ibG9ja3M7CisJCQlzdGFydCArPSBwbGFuZV9ibG9ja3M7CiAJCX0KIAotCQlz dGFydCArPSBwbGFuZV9ibG9ja3M7Ci0KIAkJLyoKIAkJICogYWxsb2NhdGlvbiBmb3IgeV9wbGFu ZSBwYXJ0IG9mIHBsYW5hciBmb3JtYXQ6CisJCSAqIFRPRE86IE9uY2Ugd2Ugc3RhcnQgY2FsY3Vs YXRpbmcgd2F0ZXJtYXJrIHZhbHVlcyBmb3IgWS9VVgorCQkgKiBwbGFuZSBib3RoIGNvbnNpZGVy IGl0IGZvciBpbml0aWFsIGFsbG93ZWQgd20gYmxvY2tzLgogCQkgKi8KIAkJeV9kYXRhX3JhdGUg PSBwbGFuZV95X2RhdGFfcmF0ZVtwbGFuZV9pZF07CiAKLQkJeV9wbGFuZV9ibG9ja3MgPSB5X21p bmltdW1bcGxhbmVfaWRdOwotCQl5X3BsYW5lX2Jsb2NrcyArPSBkaXZfdTY0KCh1aW50NjRfdClh bGxvY19zaXplICogeV9kYXRhX3JhdGUsCi0JCQkJCXRvdGFsX2RhdGFfcmF0ZSk7Ci0KIAkJaWYg KHlfZGF0YV9yYXRlKSB7CisJCQl5X3BsYW5lX2Jsb2NrcyA9IHlfbWluaW11bVtwbGFuZV9pZF07 CisJCQl5X3BsYW5lX2Jsb2NrcyArPSBkaXZfdTY0KCh1aW50NjRfdClhbGxvY19zaXplICoKKwkJ CQkJeV9kYXRhX3JhdGUsIHRvdGFsX2RhdGFfcmF0ZSk7CiAJCQlkZGItPnlfcGxhbmVbcGlwZV1b cGxhbmVfaWRdLnN0YXJ0ID0gc3RhcnQ7CiAJCQlkZGItPnlfcGxhbmVbcGlwZV1bcGxhbmVfaWRd LmVuZCA9IHN0YXJ0ICsgeV9wbGFuZV9ibG9ja3M7CisJCQlzdGFydCArPSB5X3BsYW5lX2Jsb2Nr czsKIAkJfQotCi0JCXN0YXJ0ICs9IHlfcGxhbmVfYmxvY2tzOworCQlza2xfZW5hYmxlX3BsYW5l X3dtX2xldmVscyhkZXZfcHJpdiwKKwkJCQkJICAgcGxhbmVfYmxvY2tzLAorCQkJCQkgICBtYXhf bGV2ZWwsCisJCQkJCSAgIHdtKTsKIAl9CiAKIAlyZXR1cm4gMDsKQEAgLTQyNDMsMTEgKzQzMjEs OSBAQCBza2xfYWRqdXN0ZWRfcGxhbmVfcGl4ZWxfcmF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqY3N0YXRlLAogc3RhdGljIGludCBza2xfY29tcHV0ZV9wbGFuZV93bShjb25zdCBz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNzdGF0ZSwKIAkJCQljb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVs X3BzdGF0ZSwKLQkJCQl1aW50MTZfdCBkZGJfYWxsb2NhdGlvbiwKIAkJCQlpbnQgbGV2ZWwsCiAJ CQkJdWludDE2X3QgKm91dF9ibG9ja3MsIC8qIG91dCAqLwotCQkJCXVpbnQ4X3QgKm91dF9saW5l cywgLyogb3V0ICovCi0JCQkJYm9vbCAqZW5hYmxlZCAvKiBvdXQgKi8pCisJCQkJdWludDhfdCAq b3V0X2xpbmVzIC8qIG91dCAqLykKIHsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0gdG9f aW50ZWxfcGxhbmUoaW50ZWxfcHN0YXRlLT5iYXNlLnBsYW5lKTsKIAljb25zdCBzdHJ1Y3QgZHJt X3BsYW5lX3N0YXRlICpwc3RhdGUgPSAmaW50ZWxfcHN0YXRlLT5iYXNlOwpAQCAtNDI3MCwxMCAr NDM0Niw4IEBAIHN0YXRpYyBpbnQgc2tsX2NvbXB1dGVfcGxhbmVfd20oY29uc3Qgc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWJvb2wgeV90aWxlZCwgeF90aWxlZDsKIAogCWlm IChsYXRlbmN5ID09IDAgfHwKLQkgICAgIWludGVsX3dtX3BsYW5lX3Zpc2libGUoY3N0YXRlLCBp bnRlbF9wc3RhdGUpKSB7Ci0JCSplbmFibGVkID0gZmFsc2U7CisJICAgICFpbnRlbF93bV9wbGFu ZV92aXNpYmxlKGNzdGF0ZSwgaW50ZWxfcHN0YXRlKSkKIAkJcmV0dXJuIDA7Ci0JfQogCiAJeV90 aWxlZCA9IGZiLT5tb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRCB8fAogCQkgIGZi LT5tb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWWZfVElMRUQ7CkBAIC00MzU5LDkgKzQ0MzMs NiBAQCBzdGF0aWMgaW50IHNrbF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0IHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAkJaWYgKChjcHAgKiBjc3RhdGUtPmJhc2UuYWRqdXN0ZWRf bW9kZS5jcnRjX2h0b3RhbCAvIDUxMiA8IDEpICYmCiAJCSAgICAocGxhbmVfYnl0ZXNfcGVyX2xp bmUgLyA1MTIgPCAxKSkKIAkJCXNlbGVjdGVkX3Jlc3VsdCA9IG1ldGhvZDI7Ci0JCWVsc2UgaWYg KChkZGJfYWxsb2NhdGlvbiAmJiBkZGJfYWxsb2NhdGlvbiAvCi0JCQlmaXhlZF8xNl8xNl90b191 MzJfcm91bmRfdXAocGxhbmVfYmxvY2tzX3Blcl9saW5lKSkgPj0gMSkKLQkJCXNlbGVjdGVkX3Jl c3VsdCA9IG1pbl9maXhlZF8xNl8xNihtZXRob2QxLCBtZXRob2QyKTsKIAkJZWxzZSBpZiAobGF0 ZW5jeSA+PSBsaW5ldGltZV91cykKIAkJCXNlbGVjdGVkX3Jlc3VsdCA9IG1pbl9maXhlZF8xNl8x NihtZXRob2QxLCBtZXRob2QyKTsKIAkJZWxzZQpAQCAtNDM4MSw2NCArNDQ1Miw0MSBAQCBzdGF0 aWMgaW50IHNrbF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAkJfQogCX0KIAotCWlmIChyZXNfYmxvY2tzID49IGRkYl9hbGxvY2F0aW9u IHx8IHJlc19saW5lcyA+IDMxKSB7Ci0JCSplbmFibGVkID0gZmFsc2U7CisJaWYgKHJlc19saW5l cyA+PSAzMSAmJiBsZXZlbCA9PSAwKSB7CisJCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lID0gcHN0 YXRlLT5wbGFuZTsKIAotCQkvKgotCQkgKiBJZiB0aGVyZSBhcmUgbm8gdmFsaWQgbGV2ZWwgMCB3 YXRlcm1hcmtzLCB0aGVuIHdlIGNhbid0Ci0JCSAqIHN1cHBvcnQgdGhpcyBkaXNwbGF5IGNvbmZp Z3VyYXRpb24uCi0JCSAqLwotCQlpZiAobGV2ZWwpIHsKLQkJCXJldHVybiAwOwotCQl9IGVsc2Ug ewotCQkJc3RydWN0IGRybV9wbGFuZSAqcGxhbmUgPSBwc3RhdGUtPnBsYW5lOwotCi0JCQlEUk1f REVCVUdfS01TKCJSZXF1ZXN0ZWQgZGlzcGxheSBjb25maWd1cmF0aW9uIGV4Y2VlZHMgc3lzdGVt IHdhdGVybWFyayBsaW1pdGF0aW9uc1xuIik7Ci0JCQlEUk1fREVCVUdfS01TKCJbUExBTkU6JWQ6 JXNdIGJsb2NrcyByZXF1aXJlZCA9ICV1LyV1LCBsaW5lcyByZXF1aXJlZCA9ICV1LzMxXG4iLAot CQkJCSAgICAgIHBsYW5lLT5iYXNlLmlkLCBwbGFuZS0+bmFtZSwKLQkJCQkgICAgICByZXNfYmxv Y2tzLCBkZGJfYWxsb2NhdGlvbiwgcmVzX2xpbmVzKTsKLQkJCXJldHVybiAtRUlOVkFMOwotCQl9 CisJCURSTV9ERUJVR19LTVMoIlJlcXVlc3RlZCBkaXNwbGF5IGNvbmZpZ3VyYXRpb24gZXhjZWVk cyBzeXN0ZW0gd2F0ZXJtYXJrIGxpbWl0YXRpb25zXG4iKTsKKwkJRFJNX0RFQlVHX0tNUygiW1BM QU5FOiVkOiVzXSBsaW5lcyByZXF1aXJlZCA9ICV1LzMxXG4iLAorCQkJCXBsYW5lLT5iYXNlLmlk LCBwbGFuZS0+bmFtZSwgcmVzX2xpbmVzKTsKIAl9CiAKIAkqb3V0X2Jsb2NrcyA9IHJlc19ibG9j a3M7CiAJKm91dF9saW5lcyA9IHJlc19saW5lczsKLQkqZW5hYmxlZCA9IHRydWU7CiAKIAlyZXR1 cm4gMDsKIH0KIAogc3RhdGljIGludAogc2tsX2NvbXB1dGVfd21fbGV2ZWxzKGNvbnN0IHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJICAgICAgc3RydWN0IHNrbF9kZGJfYWxs b2NhdGlvbiAqZGRiLAogCQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAog CQkgICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSwKIAkJ ICAgICAgc3RydWN0IHNrbF9wbGFuZV93bSAqd20pCiB7Ci0Jc3RydWN0IGludGVsX2NydGMgKmlu dGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNzdGF0ZS0+YmFzZS5jcnRjKTsKLQlzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSA9IGludGVsX3BzdGF0ZS0+YmFzZS5wbGFuZTsKLQlzdHJ1Y3QgaW50ZWxf cGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwotCXVpbnQxNl90IGRk Yl9ibG9ja3M7Ci0JZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCWludCBsZXZl bCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXZfcHJpdik7CiAJaW50IHJldDsKIAog CWlmIChXQVJOX09OKCFpbnRlbF9wc3RhdGUtPmJhc2UuZmIpKQogCQlyZXR1cm4gLUVJTlZBTDsK IAotCWRkYl9ibG9ja3MgPSBza2xfZGRiX2VudHJ5X3NpemUoJmRkYi0+cGxhbmVbcGlwZV1baW50 ZWxfcGxhbmUtPmlkXSk7Ci0KIAlmb3IgKGxldmVsID0gMDsgbGV2ZWwgPD0gbWF4X2xldmVsOyBs ZXZlbCsrKSB7CiAJCXN0cnVjdCBza2xfd21fbGV2ZWwgKnJlc3VsdCA9ICZ3bS0+d21bbGV2ZWxd OwogCiAJCXJldCA9IHNrbF9jb21wdXRlX3BsYW5lX3dtKGRldl9wcml2LAogCQkJCQkgICBjc3Rh dGUsCiAJCQkJCSAgIGludGVsX3BzdGF0ZSwKLQkJCQkJICAgZGRiX2Jsb2NrcywKIAkJCQkJICAg bGV2ZWwsCiAJCQkJCSAgICZyZXN1bHQtPnBsYW5lX3Jlc19iLAotCQkJCQkgICAmcmVzdWx0LT5w bGFuZV9yZXNfbCwKLQkJCQkJICAgJnJlc3VsdC0+cGxhbmVfZW4pOworCQkJCQkgICAmcmVzdWx0 LT5wbGFuZV9yZXNfbCk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCX0KQEAgLTQ1MDQs OCArNDU1Miw3IEBAIHN0YXRpYyBpbnQgc2tsX2J1aWxkX3BpcGVfd20oc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNzdGF0ZSwKIAogCQl3bSA9ICZwaXBlX3dtLT5wbGFuZXNbcGxhbmVfaWRdOwog Ci0JCXJldCA9IHNrbF9jb21wdXRlX3dtX2xldmVscyhkZXZfcHJpdiwgZGRiLCBjc3RhdGUsCi0J CQkJCSAgICBpbnRlbF9wc3RhdGUsIHdtKTsKKwkJcmV0ID0gc2tsX2NvbXB1dGVfd21fbGV2ZWxz KGRldl9wcml2LCBjc3RhdGUsIGludGVsX3BzdGF0ZSwgd20pOwogCQlpZiAocmV0KQogCQkJcmV0 dXJuIHJldDsKIAkJc2tsX2NvbXB1dGVfdHJhbnNpdGlvbl93bShjc3RhdGUsICZ3bS0+dHJhbnNf d20pOwpAQCAtNDYxOCw2ICs0NjY1LDQ1IEBAIGJvb2wgc2tsX2RkYl9hbGxvY2F0aW9uX292ZXJs YXBzKGNvbnN0IHN0cnVjdCBza2xfZGRiX2VudHJ5ICoqZW50cmllcywKIAlyZXR1cm4gZmFsc2U7 CiB9CiAKK3N0YXRpYyBpbnQKK3NrbF9kZGJfYWRkX2FmZmVjdGVkX3BsYW5lcyhzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAorCQkJICAgIGNvbnN0IHN0cnVjdCBza2xfcGlwZV93bSAq b2xkX3BpcGVfd20sCisJCQkgICAgY29uc3Qgc3RydWN0IHNrbF9waXBlX3dtICpwaXBlX3dtKQor eworCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IGNzdGF0ZS0+YmFzZS5zdGF0ZTsK KwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gc3RhdGUtPmRldjsKKwlzdHJ1Y3QgZHJtX2NydGMg KmNydGMgPSBjc3RhdGUtPmJhc2UuY3J0YzsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0 YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKmludGVsX3N0 YXRlID0gdG9faW50ZWxfYXRvbWljX3N0YXRlKHN0YXRlKTsKKwlzdHJ1Y3Qgc2tsX2RkYl9hbGxv Y2F0aW9uICpuZXdfZGRiID0gJmludGVsX3N0YXRlLT53bV9yZXN1bHRzLmRkYjsKKwlzdHJ1Y3Qg c2tsX2RkYl9hbGxvY2F0aW9uICpjdXJfZGRiID0gJmRldl9wcml2LT53bS5za2xfaHcuZGRiOwor CXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOworCXN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lOworCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKKworCVdBUk5fT04o IWRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3RhdGUoc3RhdGUsIGNydGMpKTsKKworCWRy bV9mb3JfZWFjaF9wbGFuZV9tYXNrKHBsYW5lLCBkZXYsIGNzdGF0ZS0+YmFzZS5wbGFuZV9tYXNr KSB7CisJCWVudW0gcGxhbmVfaWQgcGxhbmVfaWQgPSB0b19pbnRlbF9wbGFuZShwbGFuZSktPmlk OworCQljb25zdCBzdHJ1Y3Qgc2tsX3BsYW5lX3dtICp3bSA9ICZwaXBlX3dtLT5wbGFuZXNbcGxh bmVfaWRdOworCQljb25zdCBzdHJ1Y3Qgc2tsX3BsYW5lX3dtICpvbGRfd20gPSAmb2xkX3BpcGVf d20tPnBsYW5lc1twbGFuZV9pZF07CisKKwkJaWYgKChza2xfZGRiX2VudHJ5X2VxdWFsKCZjdXJf ZGRiLT5wbGFuZVtwaXBlXVtwbGFuZV9pZF0sCisJCQkJCSZuZXdfZGRiLT5wbGFuZVtwaXBlXVtw bGFuZV9pZF0pICYmCisJCSAgICBza2xfZGRiX2VudHJ5X2VxdWFsKCZjdXJfZGRiLT55X3BsYW5l W3BpcGVdW3BsYW5lX2lkXSwKKwkJCQkJJm5ld19kZGItPnlfcGxhbmVbcGlwZV1bcGxhbmVfaWRd KSkgJiYKKwkJICAgICFtZW1jbXAod20sIG9sZF93bSwgc2l6ZW9mKHN0cnVjdCBza2xfcGxhbmVf d20pKSkKKwkJCWNvbnRpbnVlOworCisJCXBsYW5lX3N0YXRlID0gZHJtX2F0b21pY19nZXRfcGxh bmVfc3RhdGUoc3RhdGUsIHBsYW5lKTsKKwkJaWYgKElTX0VSUihwbGFuZV9zdGF0ZSkpCisJCQly ZXR1cm4gUFRSX0VSUihwbGFuZV9zdGF0ZSk7CisJfQorCisJcmV0dXJuIDA7Cit9CisKIHN0YXRp YyBpbnQgc2tsX3VwZGF0ZV9waXBlX3dtKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3N0YXRlLAog CQkJICAgICAgY29uc3Qgc3RydWN0IHNrbF9waXBlX3dtICpvbGRfcGlwZV93bSwKIAkJCSAgICAg IHN0cnVjdCBza2xfcGlwZV93bSAqcGlwZV93bSwgLyogb3V0ICovCkBAIC00NjMxLDYgKzQ3MTcs MTcgQEAgc3RhdGljIGludCBza2xfdXBkYXRlX3BpcGVfd20oc3RydWN0IGRybV9jcnRjX3N0YXRl ICpjc3RhdGUsCiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAorCXJldCA9IHNrbF9hbGxvY2F0 ZV9waXBlX2RkYihpbnRlbF9jc3RhdGUsIHBpcGVfd20sIGRkYik7CisJaWYgKHJldCkKKwkJcmV0 dXJuIHJldDsKKwkvKgorCSAqIFRPRE86IFBsYW5lcyBhcmUgaW5jbHVkZWQgaW4gc3RhdGUgdG8g YXJtIFdNIHJlZ2lzdGVyLgorCSAqIFNjb3BlIHRvIG9wdGltaXplIGZ1cnRoZXIsIGJ5IGp1c3Qg cmV3cml0aW5nIHBsYW5lIHN1cmYgcmVnaXN0ZXIuCisJICovCisJcmV0ID0gc2tsX2RkYl9hZGRf YWZmZWN0ZWRfcGxhbmVzKGludGVsX2NzdGF0ZSwgb2xkX3BpcGVfd20sIHBpcGVfd20pOworCWlm IChyZXQpCisJCXJldHVybiByZXQ7CisKIAlpZiAoIW1lbWNtcChvbGRfcGlwZV93bSwgcGlwZV93 bSwgc2l6ZW9mKCpwaXBlX3dtKSkpCiAJCSpjaGFuZ2VkID0gZmFsc2U7CiAJZWxzZQpAQCAtNDY1 Myw0MSArNDc1MCw3IEBAIHBpcGVzX21vZGlmaWVkKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz dGF0ZSkKIH0KIAogc3RhdGljIGludAotc2tsX2RkYl9hZGRfYWZmZWN0ZWRfcGxhbmVzKHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUpCi17Ci0Jc3RydWN0IGRybV9hdG9taWNfc3RhdGUg KnN0YXRlID0gY3N0YXRlLT5iYXNlLnN0YXRlOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBz dGF0ZS0+ZGV2OwotCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IGNzdGF0ZS0+YmFzZS5jcnRjOwot CXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKLQlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0Jc3RydWN0 IGludGVsX2F0b21pY19zdGF0ZSAqaW50ZWxfc3RhdGUgPSB0b19pbnRlbF9hdG9taWNfc3RhdGUo c3RhdGUpOwotCXN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKm5ld19kZGIgPSAmaW50ZWxfc3Rh dGUtPndtX3Jlc3VsdHMuZGRiOwotCXN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKmN1cl9kZGIg PSAmZGV2X3ByaXYtPndtLnNrbF9ody5kZGI7Ci0Jc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxh bmVfc3RhdGU7Ci0Jc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7Ci0JZW51bSBwaXBlIHBpcGUgPSBp bnRlbF9jcnRjLT5waXBlOwotCi0JV0FSTl9PTighZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY3J0 Y19zdGF0ZShzdGF0ZSwgY3J0YykpOwotCi0JZHJtX2Zvcl9lYWNoX3BsYW5lX21hc2socGxhbmUs IGRldiwgY3N0YXRlLT5iYXNlLnBsYW5lX21hc2spIHsKLQkJZW51bSBwbGFuZV9pZCBwbGFuZV9p ZCA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKS0+aWQ7Ci0KLQkJaWYgKHNrbF9kZGJfZW50cnlfZXF1 YWwoJmN1cl9kZGItPnBsYW5lW3BpcGVdW3BsYW5lX2lkXSwKLQkJCQkJJm5ld19kZGItPnBsYW5l W3BpcGVdW3BsYW5lX2lkXSkgJiYKLQkJICAgIHNrbF9kZGJfZW50cnlfZXF1YWwoJmN1cl9kZGIt PnlfcGxhbmVbcGlwZV1bcGxhbmVfaWRdLAotCQkJCQkmbmV3X2RkYi0+eV9wbGFuZVtwaXBlXVtw bGFuZV9pZF0pKQotCQkJY29udGludWU7Ci0KLQkJcGxhbmVfc3RhdGUgPSBkcm1fYXRvbWljX2dl dF9wbGFuZV9zdGF0ZShzdGF0ZSwgcGxhbmUpOwotCQlpZiAoSVNfRVJSKHBsYW5lX3N0YXRlKSkK LQkJCXJldHVybiBQVFJfRVJSKHBsYW5lX3N0YXRlKTsKLQl9Ci0KLQlyZXR1cm4gMDsKLX0KLQot c3RhdGljIGludAotc2tsX2NvbXB1dGVfZGRiKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSkKK3NrbF9pbmNsdWRlX2FmZmVjdGVkX2NydGNzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz dGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gc3RhdGUtPmRldjsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CkBAIC00NzUxLDE0ICs0 ODE0LDYgQEAgc2tsX2NvbXB1dGVfZGRiKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkK IAkJY3N0YXRlID0gaW50ZWxfYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBpbnRlbF9jcnRj KTsKIAkJaWYgKElTX0VSUihjc3RhdGUpKQogCQkJcmV0dXJuIFBUUl9FUlIoY3N0YXRlKTsKLQot CQlyZXQgPSBza2xfYWxsb2NhdGVfcGlwZV9kZGIoY3N0YXRlLCBkZGIpOwotCQlpZiAocmV0KQot CQkJcmV0dXJuIHJldDsKLQotCQlyZXQgPSBza2xfZGRiX2FkZF9hZmZlY3RlZF9wbGFuZXMoY3N0 YXRlKTsKLQkJaWYgKHJldCkKLQkJCXJldHVybiByZXQ7CiAJfQogCiAJcmV0dXJuIDA7CkBAIC00 ODM5LDcgKzQ4OTQsNyBAQCBza2xfY29tcHV0ZV93bShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGUpCiAJLyogQ2xlYXIgYWxsIGRpcnR5IGZsYWdzICovCiAJcmVzdWx0cy0+ZGlydHlfcGlw ZXMgPSAwOwogCi0JcmV0ID0gc2tsX2NvbXB1dGVfZGRiKHN0YXRlKTsKKwlyZXQgPSBza2xfaW5j bHVkZV9hZmZlY3RlZF9jcnRjcyhzdGF0ZSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAot LSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK