From: Mahesh Kumar Subject: [PATCH 10/11] drm/i915/skl: New ddb allocation algorithm Date: Mon, 8 May 2017 17:19:01 +0530 Message-ID: <20170508114902.18965-11-mahesh1.kumar@intel.com> References: <20170508114902.18965-1-mahesh1.kumar@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5F9EF6E22F for ; Mon, 8 May 2017 11:46:01 +0000 (UTC) In-Reply-To: <20170508114902.18965-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 VGhpcyBwYXRjaCBpbXBsZW1lbnRzIG5ldyBEREIgYWxsb2NhdGlvbiBhbGdvcml0aG0gYXMgcGVy IEhXIHRlYW0KcmVjb21tZW5kYXRpb24uIFRoaXMgYWxnbyB0YWtlY2FyZSBvZiBzY2VuYXJpbyB3 aGVyZSB3ZSBhbGxvY2F0ZSBsZXNzIEREQgpmb3IgdGhlIHBsYW5lcyB3aXRoIGxvd2VyIHJlbGF0 aXZlIHBpeGVsIHJhdGUsIGJ1dCB0aGV5IHJlcXVpcmUgbW9yZSBEREIKdG8gd29yay4KSXQgYWxz byB0YWtlcyBjYXJlIG9mIGVuYWJsaW5nIHNhbWUgd2F0ZXJtYXJrIGxldmVsIGZvciBlYWNoCnBs YW5lIGluIGNydGMsIGZvciBlZmZpY2llbnQgcG93ZXIgc2F2aW5nLgoKQ2hhbmdlcyBzaW5jZSB2 MToKIC0gUmViYXNlIG9uIHRvcCBvZiBQYXVsbydzIHBhdGNoIHNlcmllcwoKQ2hhbmdlcyBzaW5j ZSB2MjoKIC0gRml4IHRoZSBmb3IgbG9vcCBjb25kaXRpb24gdG8gZW5hYmxlIFdNCgpDaGFuZ2Vz IHNpbmNlIHYzOgogLSBGaXggY3Jhc2ggaW4gY3Vyc29yIGktZy10IHJlcG9ydGVkIGJ5IE1hYXJ0 ZW4KIC0gUmViYXNlIGFmdGVyIGFkZHJlc3NpbmcgUGF1bG8ncyBjb21tZW50cwogLSBGZXcgb3Ro ZXIgVUxUIGZpeGVzCkNoYW5nZXMgc2luY2UgdjQ6CiAtIFJlYmFzZSBvbiBkcm0tdGlwCiAtIEFk ZGVkIHNlcGFyYXRlIGZ1bmN0aW9uIHRvIGVuYWJsZSBXTSBsZXZlbHMKQ2hhbmdlcyBzaW5jZSB2 NDoKIC0gRml4IGEgY3Jhc2ggaWRlbnRpZmllZCBpbiBza2wtNjc3MEhRIHN5c3RlbQoKU2lnbmVk LW9mZi1ieTogTWFoZXNoIEt1bWFyIDxtYWhlc2gxLmt1bWFyQGludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgMjUzICsrKysrKysrKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNTIgaW5zZXJ0aW9ucygrKSwgMTAx IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IGJjZjVkMjUyM2U0YS4u OTI2MDBjZjQyZTEyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTM1NzMsMTMgKzM1NzMs NDEgQEAgc2tsX2RkYl9jYWxjX21pbihjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0 YXRlLCBpbnQgbnVtX2FjdGl2ZSwKIAltaW5pbXVtW1BMQU5FX0NVUlNPUl0gPSBza2xfY3Vyc29y X2FsbG9jYXRpb24obnVtX2FjdGl2ZSk7CiB9CiAKK3N0YXRpYyB2b2lkCitza2xfZW5hYmxlX3Bs YW5lX3dtX2xldmVscyhjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJ CQkgICB1aW50MTZfdCBwbGFuZV9kZGIsCisJCQkgICB1aW50MTZfdCBtYXhfbGV2ZWwsCisJCQkg ICBzdHJ1Y3Qgc2tsX3BsYW5lX3dtICp3bSkKK3sKKwlpbnQgbGV2ZWw7CisJLyoKKwkgKiBOb3cg ZW5hYmxlIGFsbCBsZXZlbHMgaW4gV00gc3RydWN0dXJlIHdoaWNoIGNhbiBiZSBlbmFibGVkCisJ ICogdXNpbmcgY3VycmVudCBEREIgYWxsb2NhdGlvbgorCSAqLworCWZvciAobGV2ZWwgPSBpbGtf d21fbWF4X2xldmVsKGRldl9wcml2KTsgbGV2ZWwgPj0gMDsgbGV2ZWwtLSkgeworCQlzdHJ1Y3Qg c2tsX3dtX2xldmVsICpsZXZlbF93bSA9ICZ3bS0+d21bbGV2ZWxdOworCisJCWlmIChsZXZlbCA+ IG1heF9sZXZlbCB8fCBsZXZlbF93bS0+cGxhbmVfcmVzX2IgPT0gMAorCQkJCSAgICAgIHx8IGxl dmVsX3dtLT5wbGFuZV9yZXNfbCA+PSAzMQorCQkJCSAgICAgIHx8IGxldmVsX3dtLT5wbGFuZV9y ZXNfYiA+PSBwbGFuZV9kZGIpIHsKKwkJCWxldmVsX3dtLT5wbGFuZV9lbiA9IGZhbHNlOworCQkJ bGV2ZWxfd20tPnBsYW5lX3Jlc19iID0gMDsKKwkJCWxldmVsX3dtLT5wbGFuZV9yZXNfbCA9IDA7 CisJCX0gZWxzZSB7CisJCQlsZXZlbF93bS0+cGxhbmVfZW4gPSB0cnVlOworCQl9CisJfQorfQor CiBzdGF0aWMgaW50CiBza2xfYWxsb2NhdGVfcGlwZV9kZGIoc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmNzdGF0ZSwKLQkJICAgICAgc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqZGRiIC8qIG91 dCAqLykKKwkJICAgICAgc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqZGRiIC8qIG91dCAqLywK KwkJICAgICAgc3RydWN0IHNrbF9waXBlX3dtICpwaXBlX3dtKQogewogCXN0cnVjdCBkcm1fYXRv bWljX3N0YXRlICpzdGF0ZSA9IGNzdGF0ZS0+YmFzZS5zdGF0ZTsKIAlzdHJ1Y3QgZHJtX2NydGMg KmNydGMgPSBjc3RhdGUtPmJhc2UuY3J0YzsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0 Yy0+ZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2 KTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7 CiAJZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCXN0cnVjdCBza2xfZGRiX2Vu dHJ5ICphbGxvYyA9ICZjc3RhdGUtPndtLnNrbC5kZGI7CkBAIC0zNTkyLDYgKzM2MjAsOCBAQCBz a2xfYWxsb2NhdGVfcGlwZV9kZGIoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAl1 bnNpZ25lZCBwbGFuZV9kYXRhX3JhdGVbSTkxNV9NQVhfUExBTkVTXSA9IHt9OwogCXVuc2lnbmVk IHBsYW5lX3lfZGF0YV9yYXRlW0k5MTVfTUFYX1BMQU5FU10gPSB7fTsKIAl1aW50MTZfdCB0b3Rh bF9taW5fYmxvY2tzID0gMDsKKwl1aW50MTZfdCB0b3RhbF9sZXZlbF9kZGI7CisJaW50IG1heF9s ZXZlbCwgbGV2ZWw7CiAKIAkvKiBDbGVhciB0aGUgcGFydGl0aW9uaW5nIGZvciBkaXNhYmxlZCBw bGFuZXMuICovCiAJbWVtc2V0KGRkYi0+cGxhbmVbcGlwZV0sIDAsIHNpemVvZihkZGItPnBsYW5l W3BpcGVdKSk7CkBAIC0zNjMwLDEwICszNjYwLDQzIEBAIHNrbF9hbGxvY2F0ZV9waXBlX2RkYihz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQlyZXR1cm4tRUlOVkFMOwogCX0KIAot CWFsbG9jX3NpemUgLT0gdG90YWxfbWluX2Jsb2NrczsKLQlkZGItPnBsYW5lW3BpcGVdW1BMQU5F X0NVUlNPUl0uc3RhcnQgPSBhbGxvYy0+ZW5kIC0gbWluaW11bVtQTEFORV9DVVJTT1JdOworCWFs bG9jX3NpemUgLT0gbWluaW11bVtQTEFORV9DVVJTT1JdOworCWRkYi0+cGxhbmVbcGlwZV1bUExB TkVfQ1VSU09SXS5zdGFydCA9IGFsbG9jLT5lbmQgLQorCQkJCQkJCW1pbmltdW1bUExBTkVfQ1VS U09SXTsKIAlkZGItPnBsYW5lW3BpcGVdW1BMQU5FX0NVUlNPUl0uZW5kID0gYWxsb2MtPmVuZDsK IAorCWZvciAobGV2ZWwgPSBpbGtfd21fbWF4X2xldmVsKGRldl9wcml2KTsgbGV2ZWwgPj0gMDsg bGV2ZWwtLSkgeworCQl0b3RhbF9sZXZlbF9kZGIgPSAwOworCQlmb3JfZWFjaF9wbGFuZV9pZF9v bl9jcnRjKGludGVsX2NydGMsIHBsYW5lX2lkKSB7CisJCQkvKgorCQkJICogVE9ETzogV2Ugc2hv dWxkIGNhbGN1bGF0ZSB3YXRlcm1hcmsgdmFsdWVzIGZvciBZL1VWCisJCQkgKiBwbGFuZSBib3Ro IGluIGNhc2Ugb2YgTlYxMiBmb3JtYXQgYW5kIHVzZSBib3RoIHZhbHVlcworCQkJICogZm9yIGRk YiBjYWxjdWxhdGlvbi4gTlYxMiBpcyBkaXNhYmxlZCBhcyBvZiBub3csIFNvCisJCQkgKiB1c2lu ZyBvbmx5IHNpbmdsZS9VViBwbGFuZSB2YWx1ZSBoZXJlLgorCQkJICovCisJCQlzdHJ1Y3Qgc2ts X3BsYW5lX3dtICp3bSA9ICZwaXBlX3dtLT5wbGFuZXNbcGxhbmVfaWRdOworCQkJdWludDE2X3Qg cGxhbmVfcmVzX2IgPSB3bS0+d21bbGV2ZWxdLnBsYW5lX3Jlc19iOworCQkJdWludDE2X3QgbWlu ID0gbWluaW11bVtwbGFuZV9pZF0gKyB5X21pbmltdW1bcGxhbmVfaWRdOworCisJCQlpZiAocGxh bmVfaWQgPT0gUExBTkVfQ1VSU09SKQorCQkJCWNvbnRpbnVlOworCisJCQl0b3RhbF9sZXZlbF9k ZGIgKz0gbWF4KHBsYW5lX3Jlc19iLCBtaW4pOworCQl9CisKKwkJaWYgKHRvdGFsX2xldmVsX2Rk YiA8PSBhbGxvY19zaXplKQorCQkJYnJlYWs7CisJfQorCisJaWYgKChsZXZlbCA8IDApIHx8ICh0 b3RhbF9taW5fYmxvY2tzID4gYWxsb2Nfc2l6ZSkpIHsKKwkJRFJNX0RFQlVHX0tNUygiUmVxdWVz dGVkIGRpc3BsYXkgY29uZmlndXJhdGlvbiBleGNlZWRzIHN5c3RlbSBEREIgbGltaXRhdGlvbnMi KTsKKwkJRFJNX0RFQlVHX0tNUygibWluaW11bSByZXF1aXJlZCAlZC8lZFxuIiwgKGxldmVsIDwg MCkgPworCQkJCXRvdGFsX2xldmVsX2RkYiA6IHRvdGFsX21pbl9ibG9ja3MsIGFsbG9jX3NpemUp OworCQlyZXR1cm4gLUVJTlZBTDsKKwl9CisJbWF4X2xldmVsID0gbGV2ZWw7CisJYWxsb2Nfc2l6 ZSAtPSB0b3RhbF9sZXZlbF9kZGI7CisKIAkvKgogCSAqIDIuIERpc3RyaWJ1dGUgdGhlIHJlbWFp bmluZyBzcGFjZSBpbiBwcm9wb3J0aW9uIHRvIHRoZSBhbW91bnQgb2YKIAkgKiBkYXRhIGVhY2gg cGxhbmUgbmVlZHMgdG8gZmV0Y2ggZnJvbSBtZW1vcnkuCkBAIC0zNjQ5LDEwICszNzEyLDE3IEBA IHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAog CXN0YXJ0ID0gYWxsb2MtPnN0YXJ0OwogCWZvcl9lYWNoX3BsYW5lX2lkX29uX2NydGMoaW50ZWxf Y3J0YywgcGxhbmVfaWQpIHsKIAkJdW5zaWduZWQgaW50IGRhdGFfcmF0ZSwgeV9kYXRhX3JhdGU7 Ci0JCXVpbnQxNl90IHBsYW5lX2Jsb2NrcywgeV9wbGFuZV9ibG9ja3MgPSAwOwotCi0JCWlmIChw bGFuZV9pZCA9PSBQTEFORV9DVVJTT1IpCisJCXVpbnQxNl90IHBsYW5lX2Jsb2NrcyA9IDAsIHlf cGxhbmVfYmxvY2tzID0gMDsKKwkJc3RydWN0IHNrbF9wbGFuZV93bSAqd20gPSAmcGlwZV93bS0+ cGxhbmVzW3BsYW5lX2lkXTsKKwkJdWludDE2X3QgcGxhbmVfcmVzX2IgPSB3bS0+d21bbWF4X2xl dmVsXS5wbGFuZV9yZXNfYjsKKworCQlpZiAocGxhbmVfaWQgPT0gUExBTkVfQ1VSU09SKSB7CisJ CQlwbGFuZV9ibG9ja3MgPQorCQkJCXNrbF9kZGJfZW50cnlfc2l6ZSgmZGRiLT5wbGFuZVtwaXBl XVtwbGFuZV9pZF0pOworCQkJc2tsX2VuYWJsZV9wbGFuZV93bV9sZXZlbHMoZGV2X3ByaXYsIHBs YW5lX2Jsb2NrcywKKwkJCQkJCSAgIG1heF9sZXZlbCwgd20pOwogCQkJY29udGludWU7CisJCX0K IAogCQlkYXRhX3JhdGUgPSBwbGFuZV9kYXRhX3JhdGVbcGxhbmVfaWRdOwogCkBAIC0zNjYxLDMz ICszNzMxLDM2IEBAIHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3N0YXRlLAogCQkgKiBwcm9tb3RlIHRoZSBleHByZXNzaW9uIHRvIDY0IGJpdHMgdG8gYXZv aWQgb3ZlcmZsb3dpbmcsIHRoZQogCQkgKiByZXN1bHQgaXMgPCBhdmFpbGFibGUgYXMgZGF0YV9y YXRlIC8gdG90YWxfZGF0YV9yYXRlIDwgMQogCQkgKi8KLQkJcGxhbmVfYmxvY2tzID0gbWluaW11 bVtwbGFuZV9pZF07Ci0JCXBsYW5lX2Jsb2NrcyArPSBkaXZfdTY0KCh1aW50NjRfdClhbGxvY19z aXplICogZGF0YV9yYXRlLAotCQkJCQl0b3RhbF9kYXRhX3JhdGUpOwogCiAJCS8qIExlYXZlIGRp c2FibGVkIHBsYW5lcyBhdCAoMCwwKSAqLwogCQlpZiAoZGF0YV9yYXRlKSB7CisJCQlwbGFuZV9i bG9ja3MgPSBtYXgobWluaW11bVtwbGFuZV9pZF0sIHBsYW5lX3Jlc19iKTsKKwkJCXBsYW5lX2Js b2NrcyArPSBkaXZfdTY0KCh1aW50NjRfdClhbGxvY19zaXplICoKKwkJCQkJZGF0YV9yYXRlLCB0 b3RhbF9kYXRhX3JhdGUpOwogCQkJZGRiLT5wbGFuZVtwaXBlXVtwbGFuZV9pZF0uc3RhcnQgPSBz dGFydDsKIAkJCWRkYi0+cGxhbmVbcGlwZV1bcGxhbmVfaWRdLmVuZCA9IHN0YXJ0ICsgcGxhbmVf YmxvY2tzOworCQkJc3RhcnQgKz0gcGxhbmVfYmxvY2tzOwogCQl9CiAKLQkJc3RhcnQgKz0gcGxh bmVfYmxvY2tzOwotCiAJCS8qCiAJCSAqIGFsbG9jYXRpb24gZm9yIHlfcGxhbmUgcGFydCBvZiBw bGFuYXIgZm9ybWF0OgorCQkgKiBUT0RPOiBPbmNlIHdlIHN0YXJ0IGNhbGN1bGF0aW5nIHdhdGVy bWFyayB2YWx1ZXMgZm9yIFkvVVYKKwkJICogcGxhbmUgYm90aCBjb25zaWRlciBpdCBmb3IgaW5p dGlhbCBhbGxvd2VkIHdtIGJsb2Nrcy4KIAkJICovCiAJCXlfZGF0YV9yYXRlID0gcGxhbmVfeV9k YXRhX3JhdGVbcGxhbmVfaWRdOwogCi0JCXlfcGxhbmVfYmxvY2tzID0geV9taW5pbXVtW3BsYW5l X2lkXTsKLQkJeV9wbGFuZV9ibG9ja3MgKz0gZGl2X3U2NCgodWludDY0X3QpYWxsb2Nfc2l6ZSAq IHlfZGF0YV9yYXRlLAotCQkJCQl0b3RhbF9kYXRhX3JhdGUpOwotCiAJCWlmICh5X2RhdGFfcmF0 ZSkgeworCQkJeV9wbGFuZV9ibG9ja3MgPSB5X21pbmltdW1bcGxhbmVfaWRdOworCQkJeV9wbGFu ZV9ibG9ja3MgKz0gZGl2X3U2NCgodWludDY0X3QpYWxsb2Nfc2l6ZSAqCisJCQkJCXlfZGF0YV9y YXRlLCB0b3RhbF9kYXRhX3JhdGUpOwogCQkJZGRiLT55X3BsYW5lW3BpcGVdW3BsYW5lX2lkXS5z dGFydCA9IHN0YXJ0OwogCQkJZGRiLT55X3BsYW5lW3BpcGVdW3BsYW5lX2lkXS5lbmQgPSBzdGFy dCArIHlfcGxhbmVfYmxvY2tzOworCQkJc3RhcnQgKz0geV9wbGFuZV9ibG9ja3M7CiAJCX0KLQot CQlzdGFydCArPSB5X3BsYW5lX2Jsb2NrczsKKwkJc2tsX2VuYWJsZV9wbGFuZV93bV9sZXZlbHMo ZGV2X3ByaXYsCisJCQkJCSAgIHBsYW5lX2Jsb2NrcywKKwkJCQkJICAgbWF4X2xldmVsLAorCQkJ CQkgICB3bSk7CiAJfQogCiAJcmV0dXJuIDA7CkBAIC0zNzc2LDExICszODQ5LDkgQEAgc3RhdGlj IHVpbnQzMl90IHNrbF9hZGp1c3RlZF9wbGFuZV9waXhlbF9yYXRlKGNvbnN0IHN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpjc3QKIHN0YXRpYyBpbnQgc2tsX2NvbXB1dGVfcGxhbmVfd20oY29uc3Qg c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCXN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpjc3RhdGUsCiAJCQkJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICppbnRl bF9wc3RhdGUsCi0JCQkJdWludDE2X3QgZGRiX2FsbG9jYXRpb24sCiAJCQkJaW50IGxldmVsLAog CQkJCXVpbnQxNl90ICpvdXRfYmxvY2tzLCAvKiBvdXQgKi8KLQkJCQl1aW50OF90ICpvdXRfbGlu ZXMsIC8qIG91dCAqLwotCQkJCWJvb2wgKmVuYWJsZWQgLyogb3V0ICovKQorCQkJCXVpbnQ4X3Qg Km91dF9saW5lcyAvKiBvdXQgKi8pCiB7CiAJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSA9IHRv X2ludGVsX3BsYW5lKGludGVsX3BzdGF0ZS0+YmFzZS5wbGFuZSk7CiAJY29uc3Qgc3RydWN0IGRy bV9wbGFuZV9zdGF0ZSAqcHN0YXRlID0gJmludGVsX3BzdGF0ZS0+YmFzZTsKQEAgLTM4MDMsMTAg KzM4NzQsOCBAQCBzdGF0aWMgaW50IHNrbF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0IHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlib29sIHlfdGlsZWQsIHhfdGlsZWQ7CiAKIAlp ZiAobGF0ZW5jeSA9PSAwIHx8Ci0JICAgICFpbnRlbF93bV9wbGFuZV92aXNpYmxlKGNzdGF0ZSwg aW50ZWxfcHN0YXRlKSkgewotCQkqZW5hYmxlZCA9IGZhbHNlOworCSAgICAhaW50ZWxfd21fcGxh bmVfdmlzaWJsZShjc3RhdGUsIGludGVsX3BzdGF0ZSkpCiAJCXJldHVybiAwOwotCX0KIAogCXlf dGlsZWQgPSBmYi0+bW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1lfVElMRUQgfHwKIAkJICBm Yi0+bW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1lmX1RJTEVEOwpAQCAtMzg5Miw5ICszOTYx LDYgQEAgc3RhdGljIGludCBza2xfY29tcHV0ZV9wbGFuZV93bShjb25zdCBzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCWlmICgoY3BwICogY3N0YXRlLT5iYXNlLmFkanVzdGVk X21vZGUuY3J0Y19odG90YWwgLyA1MTIgPCAxKSAmJgogCQkgICAgKHBsYW5lX2J5dGVzX3Blcl9s aW5lIC8gNTEyIDwgMSkpCiAJCQlzZWxlY3RlZF9yZXN1bHQgPSBtZXRob2QyOwotCQllbHNlIGlm ICgoZGRiX2FsbG9jYXRpb24gJiYgZGRiX2FsbG9jYXRpb24gLwotCQkJZml4ZWRfMTZfMTZfdG9f dTMyX3JvdW5kX3VwKHBsYW5lX2Jsb2Nrc19wZXJfbGluZSkpID49IDEpCi0JCQlzZWxlY3RlZF9y ZXN1bHQgPSBtaW5fZml4ZWRfMTZfMTYobWV0aG9kMSwgbWV0aG9kMik7CiAJCWVsc2UgaWYgKGxh dGVuY3kgPj0gbGluZXRpbWVfdXMpCiAJCQlzZWxlY3RlZF9yZXN1bHQgPSBtZXRob2QyOwogCQll bHNlCkBAIC0zOTE0LDY0ICszOTgwLDQxIEBAIHN0YXRpYyBpbnQgc2tsX2NvbXB1dGVfcGxhbmVf d20oY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQl9CiAJfQogCi0J aWYgKHJlc19ibG9ja3MgPj0gZGRiX2FsbG9jYXRpb24gfHwgcmVzX2xpbmVzID4gMzEpIHsKLQkJ KmVuYWJsZWQgPSBmYWxzZTsKLQotCQkvKgotCQkgKiBJZiB0aGVyZSBhcmUgbm8gdmFsaWQgbGV2 ZWwgMCB3YXRlcm1hcmtzLCB0aGVuIHdlIGNhbid0Ci0JCSAqIHN1cHBvcnQgdGhpcyBkaXNwbGF5 IGNvbmZpZ3VyYXRpb24uCi0JCSAqLwotCQlpZiAobGV2ZWwpIHsKLQkJCXJldHVybiAwOwotCQl9 IGVsc2UgewotCQkJc3RydWN0IGRybV9wbGFuZSAqcGxhbmUgPSBwc3RhdGUtPnBsYW5lOworCWlm IChyZXNfbGluZXMgPj0gMzEgJiYgbGV2ZWwgPT0gMCkgeworCQlzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSA9IHBzdGF0ZS0+cGxhbmU7CiAKLQkJCURSTV9ERUJVR19LTVMoIlJlcXVlc3RlZCBkaXNw bGF5IGNvbmZpZ3VyYXRpb24gZXhjZWVkcyBzeXN0ZW0gd2F0ZXJtYXJrIGxpbWl0YXRpb25zXG4i KTsKLQkJCURSTV9ERUJVR19LTVMoIltQTEFORTolZDolc10gYmxvY2tzIHJlcXVpcmVkID0gJXUv JXUsIGxpbmVzIHJlcXVpcmVkID0gJXUvMzFcbiIsCi0JCQkJICAgICAgcGxhbmUtPmJhc2UuaWQs IHBsYW5lLT5uYW1lLAotCQkJCSAgICAgIHJlc19ibG9ja3MsIGRkYl9hbGxvY2F0aW9uLCByZXNf bGluZXMpOwotCQkJcmV0dXJuIC1FSU5WQUw7Ci0JCX0KKwkJRFJNX0RFQlVHX0tNUygiUmVxdWVz dGVkIGRpc3BsYXkgY29uZmlndXJhdGlvbiBleGNlZWRzIHN5c3RlbSB3YXRlcm1hcmsgbGltaXRh dGlvbnNcbiIpOworCQlEUk1fREVCVUdfS01TKCJbUExBTkU6JWQ6JXNdIGxpbmVzIHJlcXVpcmVk ID0gJXUvMzFcbiIsCisJCQkJcGxhbmUtPmJhc2UuaWQsIHBsYW5lLT5uYW1lLCByZXNfbGluZXMp OwogCX0KIAogCSpvdXRfYmxvY2tzID0gcmVzX2Jsb2NrczsKIAkqb3V0X2xpbmVzID0gcmVzX2xp bmVzOwotCSplbmFibGVkID0gdHJ1ZTsKIAogCXJldHVybiAwOwogfQogCiBzdGF0aWMgaW50CiBz a2xfY29tcHV0ZV93bV9sZXZlbChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCi0JCSAgICAgc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqZGRiLAogCQkgICAgIHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJCSAgICAgY29uc3Qgc3RydWN0IGludGVsX3Bs YW5lX3N0YXRlICppbnRlbF9wc3RhdGUsCiAJCSAgICAgc3RydWN0IHNrbF9wbGFuZV93bSAqd20p CiB7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNzdGF0 ZS0+YmFzZS5jcnRjKTsKLQlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSA9IGludGVsX3BzdGF0ZS0+ YmFzZS5wbGFuZTsKLQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxf cGxhbmUocGxhbmUpOwotCXVpbnQxNl90IGRkYl9ibG9ja3M7Ci0JZW51bSBwaXBlIHBpcGUgPSBp bnRlbF9jcnRjLT5waXBlOwogCWludCBsZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZl bChkZXZfcHJpdik7CiAJaW50IHJldDsKIAogCWlmIChXQVJOX09OKCFpbnRlbF9wc3RhdGUtPmJh c2UuZmIpKQogCQlyZXR1cm4gLUVJTlZBTDsKIAotCWRkYl9ibG9ja3MgPSBza2xfZGRiX2VudHJ5 X3NpemUoJmRkYi0+cGxhbmVbcGlwZV1baW50ZWxfcGxhbmUtPmlkXSk7Ci0KIAlmb3IgKGxldmVs ID0gMDsgbGV2ZWwgPD0gbWF4X2xldmVsOyBsZXZlbCsrKSB7CiAJCXN0cnVjdCBza2xfd21fbGV2 ZWwgKnJlc3VsdCA9ICZ3bS0+d21bbGV2ZWxdOwogCiAJCXJldCA9IHNrbF9jb21wdXRlX3BsYW5l X3dtKGRldl9wcml2LAogCQkJCQkgICBjc3RhdGUsCiAJCQkJCSAgIGludGVsX3BzdGF0ZSwKLQkJ CQkJICAgZGRiX2Jsb2NrcywKIAkJCQkJICAgbGV2ZWwsCiAJCQkJCSAgICZyZXN1bHQtPnBsYW5l X3Jlc19iLAotCQkJCQkgICAmcmVzdWx0LT5wbGFuZV9yZXNfbCwKLQkJCQkJICAgJnJlc3VsdC0+ cGxhbmVfZW4pOworCQkJCQkgICAmcmVzdWx0LT5wbGFuZV9yZXNfbCk7CiAJCWlmIChyZXQpCiAJ CQlyZXR1cm4gcmV0OwogCX0KQEAgLTQwMzcsOCArNDA4MCw3IEBAIHN0YXRpYyBpbnQgc2tsX2J1 aWxkX3BpcGVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAogCQl3bSA9ICZw aXBlX3dtLT5wbGFuZXNbcGxhbmVfaWRdOwogCi0JCXJldCA9IHNrbF9jb21wdXRlX3dtX2xldmVs KGRldl9wcml2LCBkZGIsIGNzdGF0ZSwKLQkJCQkJICAgaW50ZWxfcHN0YXRlLCB3bSk7CisJCXJl dCA9IHNrbF9jb21wdXRlX3dtX2xldmVsKGRldl9wcml2LCBjc3RhdGUsIGludGVsX3BzdGF0ZSwg d20pOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIApAQCAtNDE1Miw2ICs0MTk0LDQ1IEBA IGJvb2wgc2tsX2RkYl9hbGxvY2F0aW9uX292ZXJsYXBzKGNvbnN0IHN0cnVjdCBza2xfZGRiX2Vu dHJ5ICoqZW50cmllcywKIAlyZXR1cm4gZmFsc2U7CiB9CiAKK3N0YXRpYyBpbnQKK3NrbF9kZGJf YWRkX2FmZmVjdGVkX3BsYW5lcyhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAorCQkJ ICAgIGNvbnN0IHN0cnVjdCBza2xfcGlwZV93bSAqb2xkX3BpcGVfd20sCisJCQkgICAgY29uc3Qg c3RydWN0IHNrbF9waXBlX3dtICpwaXBlX3dtKQoreworCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRl ICpzdGF0ZSA9IGNzdGF0ZS0+YmFzZS5zdGF0ZTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g c3RhdGUtPmRldjsKKwlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBjc3RhdGUtPmJhc2UuY3J0YzsK KwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVj dCBpbnRlbF9hdG9taWNfc3RhdGUgKmludGVsX3N0YXRlID0gdG9faW50ZWxfYXRvbWljX3N0YXRl KHN0YXRlKTsKKwlzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0aW9uICpuZXdfZGRiID0gJmludGVsX3N0 YXRlLT53bV9yZXN1bHRzLmRkYjsKKwlzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0aW9uICpjdXJfZGRi ID0gJmRldl9wcml2LT53bS5za2xfaHcuZGRiOworCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBs YW5lX3N0YXRlOworCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOworCWVudW0gcGlwZSBwaXBlID0g aW50ZWxfY3J0Yy0+cGlwZTsKKworCVdBUk5fT04oIWRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2Ny dGNfc3RhdGUoc3RhdGUsIGNydGMpKTsKKworCWRybV9mb3JfZWFjaF9wbGFuZV9tYXNrKHBsYW5l LCBkZXYsIGNzdGF0ZS0+YmFzZS5wbGFuZV9tYXNrKSB7CisJCWVudW0gcGxhbmVfaWQgcGxhbmVf aWQgPSB0b19pbnRlbF9wbGFuZShwbGFuZSktPmlkOworCQljb25zdCBzdHJ1Y3Qgc2tsX3BsYW5l X3dtICp3bSA9ICZwaXBlX3dtLT5wbGFuZXNbcGxhbmVfaWRdOworCQljb25zdCBzdHJ1Y3Qgc2ts X3BsYW5lX3dtICpvbGRfd20gPSAmb2xkX3BpcGVfd20tPnBsYW5lc1twbGFuZV9pZF07CisKKwkJ aWYgKChza2xfZGRiX2VudHJ5X2VxdWFsKCZjdXJfZGRiLT5wbGFuZVtwaXBlXVtwbGFuZV9pZF0s CisJCQkJCSZuZXdfZGRiLT5wbGFuZVtwaXBlXVtwbGFuZV9pZF0pICYmCisJCSAgICBza2xfZGRi X2VudHJ5X2VxdWFsKCZjdXJfZGRiLT55X3BsYW5lW3BpcGVdW3BsYW5lX2lkXSwKKwkJCQkJJm5l d19kZGItPnlfcGxhbmVbcGlwZV1bcGxhbmVfaWRdKSkgJiYKKwkJICAgICFtZW1jbXAod20sIG9s ZF93bSwgc2l6ZW9mKHN0cnVjdCBza2xfcGxhbmVfd20pKSkKKwkJCWNvbnRpbnVlOworCisJCXBs YW5lX3N0YXRlID0gZHJtX2F0b21pY19nZXRfcGxhbmVfc3RhdGUoc3RhdGUsIHBsYW5lKTsKKwkJ aWYgKElTX0VSUihwbGFuZV9zdGF0ZSkpCisJCQlyZXR1cm4gUFRSX0VSUihwbGFuZV9zdGF0ZSk7 CisJfQorCisJcmV0dXJuIDA7Cit9CisKIHN0YXRpYyBpbnQgc2tsX3VwZGF0ZV9waXBlX3dtKHN0 cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQkJICAgICAgY29uc3Qgc3RydWN0IHNrbF9w aXBlX3dtICpvbGRfcGlwZV93bSwKIAkJCSAgICAgIHN0cnVjdCBza2xfcGlwZV93bSAqcGlwZV93 bSwgLyogb3V0ICovCkBAIC00MTY1LDYgKzQyNDYsMTggQEAgc3RhdGljIGludCBza2xfdXBkYXRl X3BpcGVfd20oc3RydWN0IGRybV9jcnRjX3N0YXRlICpjc3RhdGUsCiAJaWYgKHJldCkKIAkJcmV0 dXJuIHJldDsKIAorCXJldCA9IHNrbF9hbGxvY2F0ZV9waXBlX2RkYihpbnRlbF9jc3RhdGUsIGRk YiwgcGlwZV93bSk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKwkvKgorCSAqIFRPRE86IERv IHdlIHN0aWxsIG5lZWQgdG8gYWRkIHBsYW5lcyBpbiBzdGF0ZSwgQXMgV00gdXBkYXRlIGlzCisJ ICogbm90IHBhcnQgb2YgdXBkYXRlX3BsYW5lIGFueW1vcmUsIFNvIHdtIGZvciBwbGFuZXMgY2Fu IGJlIHVwZGF0ZWQKKwkgKiBpcnJlc3BlY3RpdmUgb2YgdXBkYWRlX3BsYW5lIGNhbGwuCisJICov CisJcmV0ID0gc2tsX2RkYl9hZGRfYWZmZWN0ZWRfcGxhbmVzKGludGVsX2NzdGF0ZSwgb2xkX3Bp cGVfd20sIHBpcGVfd20pOworCWlmIChyZXQpCisJCXJldHVybiByZXQ7CisKIAlpZiAoIW1lbWNt cChvbGRfcGlwZV93bSwgcGlwZV93bSwgc2l6ZW9mKCpwaXBlX3dtKSkpCiAJCSpjaGFuZ2VkID0g ZmFsc2U7CiAJZWxzZQpAQCAtNDE4Nyw0MSArNDI4MCw3IEBAIHBpcGVzX21vZGlmaWVkKHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIH0KIAogc3RhdGljIGludAotc2tsX2RkYl9hZGRf YWZmZWN0ZWRfcGxhbmVzKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUpCi17Ci0Jc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0gY3N0YXRlLT5iYXNlLnN0YXRlOwotCXN0cnVj dCBkcm1fZGV2aWNlICpkZXYgPSBzdGF0ZS0+ZGV2OwotCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9 IGNzdGF0ZS0+YmFzZS5jcnRjOwotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9f aW50ZWxfY3J0YyhjcnRjKTsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0 b19pOTE1KGRldik7Ci0Jc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqaW50ZWxfc3RhdGUgPSB0 b19pbnRlbF9hdG9taWNfc3RhdGUoc3RhdGUpOwotCXN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24g Km5ld19kZGIgPSAmaW50ZWxfc3RhdGUtPndtX3Jlc3VsdHMuZGRiOwotCXN0cnVjdCBza2xfZGRi X2FsbG9jYXRpb24gKmN1cl9kZGIgPSAmZGV2X3ByaXYtPndtLnNrbF9ody5kZGI7Ci0Jc3RydWN0 IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7Ci0Jc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7 Ci0JZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwotCi0JV0FSTl9PTighZHJtX2F0 b21pY19nZXRfZXhpc3RpbmdfY3J0Y19zdGF0ZShzdGF0ZSwgY3J0YykpOwotCi0JZHJtX2Zvcl9l YWNoX3BsYW5lX21hc2socGxhbmUsIGRldiwgY3N0YXRlLT5iYXNlLnBsYW5lX21hc2spIHsKLQkJ ZW51bSBwbGFuZV9pZCBwbGFuZV9pZCA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKS0+aWQ7Ci0KLQkJ aWYgKHNrbF9kZGJfZW50cnlfZXF1YWwoJmN1cl9kZGItPnBsYW5lW3BpcGVdW3BsYW5lX2lkXSwK LQkJCQkJJm5ld19kZGItPnBsYW5lW3BpcGVdW3BsYW5lX2lkXSkgJiYKLQkJICAgIHNrbF9kZGJf ZW50cnlfZXF1YWwoJmN1cl9kZGItPnlfcGxhbmVbcGlwZV1bcGxhbmVfaWRdLAotCQkJCQkmbmV3 X2RkYi0+eV9wbGFuZVtwaXBlXVtwbGFuZV9pZF0pKQotCQkJY29udGludWU7Ci0KLQkJcGxhbmVf c3RhdGUgPSBkcm1fYXRvbWljX2dldF9wbGFuZV9zdGF0ZShzdGF0ZSwgcGxhbmUpOwotCQlpZiAo SVNfRVJSKHBsYW5lX3N0YXRlKSkKLQkJCXJldHVybiBQVFJfRVJSKHBsYW5lX3N0YXRlKTsKLQl9 Ci0KLQlyZXR1cm4gMDsKLX0KLQotc3RhdGljIGludAotc2tsX2NvbXB1dGVfZGRiKHN0cnVjdCBk cm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKK3NrbF9pbmNsdWRlX2FmZmVjdGVkX2NydGMoc3RydWN0 IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBz dGF0ZS0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo ZGV2KTsKQEAgLTQyODUsMTQgKzQzNDQsNiBAQCBza2xfY29tcHV0ZV9kZGIoc3RydWN0IGRybV9h dG9taWNfc3RhdGUgKnN0YXRlKQogCQljc3RhdGUgPSBpbnRlbF9hdG9taWNfZ2V0X2NydGNfc3Rh dGUoc3RhdGUsIGludGVsX2NydGMpOwogCQlpZiAoSVNfRVJSKGNzdGF0ZSkpCiAJCQlyZXR1cm4g UFRSX0VSUihjc3RhdGUpOwotCi0JCXJldCA9IHNrbF9hbGxvY2F0ZV9waXBlX2RkYihjc3RhdGUs IGRkYik7Ci0JCWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OwotCi0JCXJldCA9IHNrbF9kZGJfYWRk X2FmZmVjdGVkX3BsYW5lcyhjc3RhdGUpOwotCQlpZiAocmV0KQotCQkJcmV0dXJuIHJldDsKIAl9 CiAKIAlyZXR1cm4gMDsKQEAgLTQzNzMsNyArNDQyNCw3IEBAIHNrbF9jb21wdXRlX3dtKHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkvKiBDbGVhciBhbGwgZGlydHkgZmxhZ3MgKi8K IAlyZXN1bHRzLT5kaXJ0eV9waXBlcyA9IDA7CiAKLQlyZXQgPSBza2xfY29tcHV0ZV9kZGIoc3Rh dGUpOworCXJldCA9IHNrbF9pbmNsdWRlX2FmZmVjdGVkX2NydGMoc3RhdGUpOwogCWlmIChyZXQp CiAJCXJldHVybiByZXQ7CiAKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==