From: Mahesh Kumar Subject: [PATCH 11/12] drm/i915/skl: New ddb allocation algorithm Date: Mon, 15 May 2017 14:04:36 +0530 Message-ID: <20170515083437.31394-12-mahesh1.kumar@intel.com> References: <20170515083437.31394-1-mahesh1.kumar@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id AD6376E197 for ; Mon, 15 May 2017 08:33:26 +0000 (UTC) In-Reply-To: <20170515083437.31394-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 eCBhIGNyYXNoIGlkZW50aWZpZWQgaW4gc2tsLTY3NzBIUSBzeXN0ZW0KClNpZ25lZC1vZmYtYnk6 IE1haGVzaCBLdW1hciA8bWFoZXNoMS5rdW1hckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDI1MyArKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTUyIGluc2VydGlvbnMoKyksIDEwMSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCBkNzMzNjljMmMyZDkuLmQ2YjBhZTBl ZjdhMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC00MDM5LDEzICs0MDM5LDQxIEBAIHNr bF9kZGJfY2FsY19taW4oY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwgaW50 IG51bV9hY3RpdmUsCiAJbWluaW11bVtQTEFORV9DVVJTT1JdID0gc2tsX2N1cnNvcl9hbGxvY2F0 aW9uKG51bV9hY3RpdmUpOwogfQogCitzdGF0aWMgdm9pZAorc2tsX2VuYWJsZV9wbGFuZV93bV9s ZXZlbHMoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJICAgdWlu dDE2X3QgcGxhbmVfZGRiLAorCQkJICAgdWludDE2X3QgbWF4X2xldmVsLAorCQkJICAgc3RydWN0 IHNrbF9wbGFuZV93bSAqd20pCit7CisJaW50IGxldmVsOworCS8qCisJICogTm93IGVuYWJsZSBh bGwgbGV2ZWxzIGluIFdNIHN0cnVjdHVyZSB3aGljaCBjYW4gYmUgZW5hYmxlZAorCSAqIHVzaW5n IGN1cnJlbnQgRERCIGFsbG9jYXRpb24KKwkgKi8KKwlmb3IgKGxldmVsID0gaWxrX3dtX21heF9s ZXZlbChkZXZfcHJpdik7IGxldmVsID49IDA7IGxldmVsLS0pIHsKKwkJc3RydWN0IHNrbF93bV9s ZXZlbCAqbGV2ZWxfd20gPSAmd20tPndtW2xldmVsXTsKKworCQlpZiAobGV2ZWwgPiBtYXhfbGV2 ZWwgfHwgbGV2ZWxfd20tPnBsYW5lX3Jlc19iID09IDAKKwkJCQkgICAgICB8fCBsZXZlbF93bS0+ cGxhbmVfcmVzX2wgPj0gMzEKKwkJCQkgICAgICB8fCBsZXZlbF93bS0+cGxhbmVfcmVzX2IgPj0g cGxhbmVfZGRiKSB7CisJCQlsZXZlbF93bS0+cGxhbmVfZW4gPSBmYWxzZTsKKwkJCWxldmVsX3dt LT5wbGFuZV9yZXNfYiA9IDA7CisJCQlsZXZlbF93bS0+cGxhbmVfcmVzX2wgPSAwOworCQl9IGVs c2UgeworCQkJbGV2ZWxfd20tPnBsYW5lX2VuID0gdHJ1ZTsKKwkJfQorCX0KK30KKwogc3RhdGlj IGludAogc2tsX2FsbG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3Rh dGUsCi0JCSAgICAgIHN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKmRkYiAvKiBvdXQgKi8pCisJ CSAgICAgIHN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKmRkYiAvKiBvdXQgKi8sCisJCSAgICAg IHN0cnVjdCBza2xfcGlwZV93bSAqcGlwZV93bSkKIHsKIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0 ZSAqc3RhdGUgPSBjc3RhdGUtPmJhc2Uuc3RhdGU7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjID0g Y3N0YXRlLT5iYXNlLmNydGM7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsK KwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3Ry dWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCWVudW0g cGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAlzdHJ1Y3Qgc2tsX2RkYl9lbnRyeSAqYWxs b2MgPSAmY3N0YXRlLT53bS5za2wuZGRiOwpAQCAtNDA1OCw2ICs0MDg2LDggQEAgc2tsX2FsbG9j YXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJdW5zaWduZWQg cGxhbmVfZGF0YV9yYXRlW0k5MTVfTUFYX1BMQU5FU10gPSB7fTsKIAl1bnNpZ25lZCBwbGFuZV95 X2RhdGFfcmF0ZVtJOTE1X01BWF9QTEFORVNdID0ge307CiAJdWludDE2X3QgdG90YWxfbWluX2Js b2NrcyA9IDA7CisJdWludDE2X3QgdG90YWxfbGV2ZWxfZGRiOworCWludCBtYXhfbGV2ZWwsIGxl dmVsOwogCiAJLyogQ2xlYXIgdGhlIHBhcnRpdGlvbmluZyBmb3IgZGlzYWJsZWQgcGxhbmVzLiAq LwogCW1lbXNldChkZGItPnBsYW5lW3BpcGVdLCAwLCBzaXplb2YoZGRiLT5wbGFuZVtwaXBlXSkp OwpAQCAtNDA5NiwxMCArNDEyNiw0MyBAQCBza2xfYWxsb2NhdGVfcGlwZV9kZGIoc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCi0JYWxsb2Nf c2l6ZSAtPSB0b3RhbF9taW5fYmxvY2tzOwotCWRkYi0+cGxhbmVbcGlwZV1bUExBTkVfQ1VSU09S XS5zdGFydCA9IGFsbG9jLT5lbmQgLSBtaW5pbXVtW1BMQU5FX0NVUlNPUl07CisJYWxsb2Nfc2l6 ZSAtPSBtaW5pbXVtW1BMQU5FX0NVUlNPUl07CisJZGRiLT5wbGFuZVtwaXBlXVtQTEFORV9DVVJT T1JdLnN0YXJ0ID0gYWxsb2MtPmVuZCAtCisJCQkJCQkJbWluaW11bVtQTEFORV9DVVJTT1JdOwog CWRkYi0+cGxhbmVbcGlwZV1bUExBTkVfQ1VSU09SXS5lbmQgPSBhbGxvYy0+ZW5kOwogCisJZm9y IChsZXZlbCA9IGlsa193bV9tYXhfbGV2ZWwoZGV2X3ByaXYpOyBsZXZlbCA+PSAwOyBsZXZlbC0t KSB7CisJCXRvdGFsX2xldmVsX2RkYiA9IDA7CisJCWZvcl9lYWNoX3BsYW5lX2lkX29uX2NydGMo aW50ZWxfY3J0YywgcGxhbmVfaWQpIHsKKwkJCS8qCisJCQkgKiBUT0RPOiBXZSBzaG91bGQgY2Fs Y3VsYXRlIHdhdGVybWFyayB2YWx1ZXMgZm9yIFkvVVYKKwkJCSAqIHBsYW5lIGJvdGggaW4gY2Fz ZSBvZiBOVjEyIGZvcm1hdCBhbmQgdXNlIGJvdGggdmFsdWVzCisJCQkgKiBmb3IgZGRiIGNhbGN1 bGF0aW9uLiBOVjEyIGlzIGRpc2FibGVkIGFzIG9mIG5vdywgU28KKwkJCSAqIHVzaW5nIG9ubHkg c2luZ2xlL1VWIHBsYW5lIHZhbHVlIGhlcmUuCisJCQkgKi8KKwkJCXN0cnVjdCBza2xfcGxhbmVf d20gKndtID0gJnBpcGVfd20tPnBsYW5lc1twbGFuZV9pZF07CisJCQl1aW50MTZfdCBwbGFuZV9y ZXNfYiA9IHdtLT53bVtsZXZlbF0ucGxhbmVfcmVzX2I7CisJCQl1aW50MTZfdCBtaW4gPSBtaW5p bXVtW3BsYW5lX2lkXSArIHlfbWluaW11bVtwbGFuZV9pZF07CisKKwkJCWlmIChwbGFuZV9pZCA9 PSBQTEFORV9DVVJTT1IpCisJCQkJY29udGludWU7CisKKwkJCXRvdGFsX2xldmVsX2RkYiArPSBt YXgocGxhbmVfcmVzX2IsIG1pbik7CisJCX0KKworCQlpZiAodG90YWxfbGV2ZWxfZGRiIDw9IGFs bG9jX3NpemUpCisJCQlicmVhazsKKwl9CisKKwlpZiAoKGxldmVsIDwgMCkgfHwgKHRvdGFsX21p bl9ibG9ja3MgPiBhbGxvY19zaXplKSkgeworCQlEUk1fREVCVUdfS01TKCJSZXF1ZXN0ZWQgZGlz cGxheSBjb25maWd1cmF0aW9uIGV4Y2VlZHMgc3lzdGVtIEREQiBsaW1pdGF0aW9ucyIpOworCQlE Uk1fREVCVUdfS01TKCJtaW5pbXVtIHJlcXVpcmVkICVkLyVkXG4iLCAobGV2ZWwgPCAwKSA/CisJ CQkJdG90YWxfbGV2ZWxfZGRiIDogdG90YWxfbWluX2Jsb2NrcywgYWxsb2Nfc2l6ZSk7CisJCXJl dHVybiAtRUlOVkFMOworCX0KKwltYXhfbGV2ZWwgPSBsZXZlbDsKKwlhbGxvY19zaXplIC09IHRv dGFsX2xldmVsX2RkYjsKKwogCS8qCiAJICogMi4gRGlzdHJpYnV0ZSB0aGUgcmVtYWluaW5nIHNw YWNlIGluIHByb3BvcnRpb24gdG8gdGhlIGFtb3VudCBvZgogCSAqIGRhdGEgZWFjaCBwbGFuZSBu ZWVkcyB0byBmZXRjaCBmcm9tIG1lbW9yeS4KQEAgLTQxMTUsMTAgKzQxNzgsMTcgQEAgc2tsX2Fs bG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJc3RhcnQg PSBhbGxvYy0+c3RhcnQ7CiAJZm9yX2VhY2hfcGxhbmVfaWRfb25fY3J0YyhpbnRlbF9jcnRjLCBw bGFuZV9pZCkgewogCQl1bnNpZ25lZCBpbnQgZGF0YV9yYXRlLCB5X2RhdGFfcmF0ZTsKLQkJdWlu dDE2X3QgcGxhbmVfYmxvY2tzLCB5X3BsYW5lX2Jsb2NrcyA9IDA7Ci0KLQkJaWYgKHBsYW5lX2lk ID09IFBMQU5FX0NVUlNPUikKKwkJdWludDE2X3QgcGxhbmVfYmxvY2tzID0gMCwgeV9wbGFuZV9i bG9ja3MgPSAwOworCQlzdHJ1Y3Qgc2tsX3BsYW5lX3dtICp3bSA9ICZwaXBlX3dtLT5wbGFuZXNb cGxhbmVfaWRdOworCQl1aW50MTZfdCBwbGFuZV9yZXNfYiA9IHdtLT53bVttYXhfbGV2ZWxdLnBs YW5lX3Jlc19iOworCisJCWlmIChwbGFuZV9pZCA9PSBQTEFORV9DVVJTT1IpIHsKKwkJCXBsYW5l X2Jsb2NrcyA9CisJCQkJc2tsX2RkYl9lbnRyeV9zaXplKCZkZGItPnBsYW5lW3BpcGVdW3BsYW5l X2lkXSk7CisJCQlza2xfZW5hYmxlX3BsYW5lX3dtX2xldmVscyhkZXZfcHJpdiwgcGxhbmVfYmxv Y2tzLAorCQkJCQkJICAgbWF4X2xldmVsLCB3bSk7CiAJCQljb250aW51ZTsKKwkJfQogCiAJCWRh dGFfcmF0ZSA9IHBsYW5lX2RhdGFfcmF0ZVtwbGFuZV9pZF07CiAKQEAgLTQxMjcsMzMgKzQxOTcs MzYgQEAgc2tsX2FsbG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3Rh dGUsCiAJCSAqIHByb21vdGUgdGhlIGV4cHJlc3Npb24gdG8gNjQgYml0cyB0byBhdm9pZCBvdmVy Zmxvd2luZywgdGhlCiAJCSAqIHJlc3VsdCBpcyA8IGF2YWlsYWJsZSBhcyBkYXRhX3JhdGUgLyB0 b3RhbF9kYXRhX3JhdGUgPCAxCiAJCSAqLwotCQlwbGFuZV9ibG9ja3MgPSBtaW5pbXVtW3BsYW5l X2lkXTsKLQkJcGxhbmVfYmxvY2tzICs9IGRpdl91NjQoKHVpbnQ2NF90KWFsbG9jX3NpemUgKiBk YXRhX3JhdGUsCi0JCQkJCXRvdGFsX2RhdGFfcmF0ZSk7CiAKIAkJLyogTGVhdmUgZGlzYWJsZWQg cGxhbmVzIGF0ICgwLDApICovCiAJCWlmIChkYXRhX3JhdGUpIHsKKwkJCXBsYW5lX2Jsb2NrcyA9 IG1heChtaW5pbXVtW3BsYW5lX2lkXSwgcGxhbmVfcmVzX2IpOworCQkJcGxhbmVfYmxvY2tzICs9 IGRpdl91NjQoKHVpbnQ2NF90KWFsbG9jX3NpemUgKgorCQkJCQlkYXRhX3JhdGUsIHRvdGFsX2Rh dGFfcmF0ZSk7CiAJCQlkZGItPnBsYW5lW3BpcGVdW3BsYW5lX2lkXS5zdGFydCA9IHN0YXJ0Owog CQkJZGRiLT5wbGFuZVtwaXBlXVtwbGFuZV9pZF0uZW5kID0gc3RhcnQgKyBwbGFuZV9ibG9ja3M7 CisJCQlzdGFydCArPSBwbGFuZV9ibG9ja3M7CiAJCX0KIAotCQlzdGFydCArPSBwbGFuZV9ibG9j a3M7Ci0KIAkJLyoKIAkJICogYWxsb2NhdGlvbiBmb3IgeV9wbGFuZSBwYXJ0IG9mIHBsYW5hciBm b3JtYXQ6CisJCSAqIFRPRE86IE9uY2Ugd2Ugc3RhcnQgY2FsY3VsYXRpbmcgd2F0ZXJtYXJrIHZh bHVlcyBmb3IgWS9VVgorCQkgKiBwbGFuZSBib3RoIGNvbnNpZGVyIGl0IGZvciBpbml0aWFsIGFs bG93ZWQgd20gYmxvY2tzLgogCQkgKi8KIAkJeV9kYXRhX3JhdGUgPSBwbGFuZV95X2RhdGFfcmF0 ZVtwbGFuZV9pZF07CiAKLQkJeV9wbGFuZV9ibG9ja3MgPSB5X21pbmltdW1bcGxhbmVfaWRdOwot CQl5X3BsYW5lX2Jsb2NrcyArPSBkaXZfdTY0KCh1aW50NjRfdClhbGxvY19zaXplICogeV9kYXRh X3JhdGUsCi0JCQkJCXRvdGFsX2RhdGFfcmF0ZSk7Ci0KIAkJaWYgKHlfZGF0YV9yYXRlKSB7CisJ CQl5X3BsYW5lX2Jsb2NrcyA9IHlfbWluaW11bVtwbGFuZV9pZF07CisJCQl5X3BsYW5lX2Jsb2Nr cyArPSBkaXZfdTY0KCh1aW50NjRfdClhbGxvY19zaXplICoKKwkJCQkJeV9kYXRhX3JhdGUsIHRv dGFsX2RhdGFfcmF0ZSk7CiAJCQlkZGItPnlfcGxhbmVbcGlwZV1bcGxhbmVfaWRdLnN0YXJ0ID0g c3RhcnQ7CiAJCQlkZGItPnlfcGxhbmVbcGlwZV1bcGxhbmVfaWRdLmVuZCA9IHN0YXJ0ICsgeV9w bGFuZV9ibG9ja3M7CisJCQlzdGFydCArPSB5X3BsYW5lX2Jsb2NrczsKIAkJfQotCi0JCXN0YXJ0 ICs9IHlfcGxhbmVfYmxvY2tzOworCQlza2xfZW5hYmxlX3BsYW5lX3dtX2xldmVscyhkZXZfcHJp diwKKwkJCQkJICAgcGxhbmVfYmxvY2tzLAorCQkJCQkgICBtYXhfbGV2ZWwsCisJCQkJCSAgIHdt KTsKIAl9CiAKIAlyZXR1cm4gMDsKQEAgLTQyNDMsMTEgKzQzMTYsOSBAQCBza2xfYWRqdXN0ZWRf cGxhbmVfcGl4ZWxfcmF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAog c3RhdGljIGludCBza2xfY29tcHV0ZV9wbGFuZV93bShjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCiAJCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJ CQljb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSwKLQkJCQl1aW50 MTZfdCBkZGJfYWxsb2NhdGlvbiwKIAkJCQlpbnQgbGV2ZWwsCiAJCQkJdWludDE2X3QgKm91dF9i bG9ja3MsIC8qIG91dCAqLwotCQkJCXVpbnQ4X3QgKm91dF9saW5lcywgLyogb3V0ICovCi0JCQkJ Ym9vbCAqZW5hYmxlZCAvKiBvdXQgKi8pCisJCQkJdWludDhfdCAqb3V0X2xpbmVzIC8qIG91dCAq LykKIHsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0gdG9faW50ZWxfcGxhbmUoaW50ZWxf cHN0YXRlLT5iYXNlLnBsYW5lKTsKIAljb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3Rh dGUgPSAmaW50ZWxfcHN0YXRlLT5iYXNlOwpAQCAtNDI3MCwxMCArNDM0MSw4IEBAIHN0YXRpYyBp bnQgc2tsX2NvbXB1dGVfcGxhbmVfd20oY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAogCWJvb2wgeV90aWxlZCwgeF90aWxlZDsKIAogCWlmIChsYXRlbmN5ID09IDAgfHwK LQkgICAgIWludGVsX3dtX3BsYW5lX3Zpc2libGUoY3N0YXRlLCBpbnRlbF9wc3RhdGUpKSB7Ci0J CSplbmFibGVkID0gZmFsc2U7CisJICAgICFpbnRlbF93bV9wbGFuZV92aXNpYmxlKGNzdGF0ZSwg aW50ZWxfcHN0YXRlKSkKIAkJcmV0dXJuIDA7Ci0JfQogCiAJeV90aWxlZCA9IGZiLT5tb2RpZmll ciA9PSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRCB8fAogCQkgIGZiLT5tb2RpZmllciA9PSBJOTE1 X0ZPUk1BVF9NT0RfWWZfVElMRUQ7CkBAIC00MzU5LDkgKzQ0MjgsNiBAQCBzdGF0aWMgaW50IHNr bF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIAkJaWYgKChjcHAgKiBjc3RhdGUtPmJhc2UuYWRqdXN0ZWRfbW9kZS5jcnRjX2h0b3RhbCAv IDUxMiA8IDEpICYmCiAJCSAgICAocGxhbmVfYnl0ZXNfcGVyX2xpbmUgLyA1MTIgPCAxKSkKIAkJ CXNlbGVjdGVkX3Jlc3VsdCA9IG1ldGhvZDI7Ci0JCWVsc2UgaWYgKChkZGJfYWxsb2NhdGlvbiAm JiBkZGJfYWxsb2NhdGlvbiAvCi0JCQlmaXhlZF8xNl8xNl90b191MzJfcm91bmRfdXAocGxhbmVf YmxvY2tzX3Blcl9saW5lKSkgPj0gMSkKLQkJCXNlbGVjdGVkX3Jlc3VsdCA9IG1pbl9maXhlZF8x Nl8xNihtZXRob2QxLCBtZXRob2QyKTsKIAkJZWxzZSBpZiAobGF0ZW5jeSA+PSBsaW5ldGltZV91 cykKIAkJCXNlbGVjdGVkX3Jlc3VsdCA9IG1ldGhvZDI7CiAJCWVsc2UKQEAgLTQzODEsNjQgKzQ0 NDcsNDEgQEAgc3RhdGljIGludCBza2xfY29tcHV0ZV9wbGFuZV93bShjb25zdCBzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCX0KIAl9CiAKLQlpZiAocmVzX2Jsb2NrcyA+PSBk ZGJfYWxsb2NhdGlvbiB8fCByZXNfbGluZXMgPiAzMSkgewotCQkqZW5hYmxlZCA9IGZhbHNlOwot Ci0JCS8qCi0JCSAqIElmIHRoZXJlIGFyZSBubyB2YWxpZCBsZXZlbCAwIHdhdGVybWFya3MsIHRo ZW4gd2UgY2FuJ3QKLQkJICogc3VwcG9ydCB0aGlzIGRpc3BsYXkgY29uZmlndXJhdGlvbi4KLQkJ ICovCi0JCWlmIChsZXZlbCkgewotCQkJcmV0dXJuIDA7Ci0JCX0gZWxzZSB7Ci0JCQlzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSA9IHBzdGF0ZS0+cGxhbmU7CisJaWYgKHJlc19saW5lcyA+PSAzMSAm JiBsZXZlbCA9PSAwKSB7CisJCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lID0gcHN0YXRlLT5wbGFu ZTsKIAotCQkJRFJNX0RFQlVHX0tNUygiUmVxdWVzdGVkIGRpc3BsYXkgY29uZmlndXJhdGlvbiBl eGNlZWRzIHN5c3RlbSB3YXRlcm1hcmsgbGltaXRhdGlvbnNcbiIpOwotCQkJRFJNX0RFQlVHX0tN UygiW1BMQU5FOiVkOiVzXSBibG9ja3MgcmVxdWlyZWQgPSAldS8ldSwgbGluZXMgcmVxdWlyZWQg PSAldS8zMVxuIiwKLQkJCQkgICAgICBwbGFuZS0+YmFzZS5pZCwgcGxhbmUtPm5hbWUsCi0JCQkJ ICAgICAgcmVzX2Jsb2NrcywgZGRiX2FsbG9jYXRpb24sIHJlc19saW5lcyk7Ci0JCQlyZXR1cm4g LUVJTlZBTDsKLQkJfQorCQlEUk1fREVCVUdfS01TKCJSZXF1ZXN0ZWQgZGlzcGxheSBjb25maWd1 cmF0aW9uIGV4Y2VlZHMgc3lzdGVtIHdhdGVybWFyayBsaW1pdGF0aW9uc1xuIik7CisJCURSTV9E RUJVR19LTVMoIltQTEFORTolZDolc10gbGluZXMgcmVxdWlyZWQgPSAldS8zMVxuIiwKKwkJCQlw bGFuZS0+YmFzZS5pZCwgcGxhbmUtPm5hbWUsIHJlc19saW5lcyk7CiAJfQogCiAJKm91dF9ibG9j a3MgPSByZXNfYmxvY2tzOwogCSpvdXRfbGluZXMgPSByZXNfbGluZXM7Ci0JKmVuYWJsZWQgPSB0 cnVlOwogCiAJcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyBpbnQKIHNrbF9jb21wdXRlX3dtX2xldmVs cyhjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCSAgICAgIHN0cnVj dCBza2xfZGRiX2FsbG9jYXRpb24gKmRkYiwKIAkJICAgICAgc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmNzdGF0ZSwKIAkJICAgICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICppbnRl bF9wc3RhdGUsCiAJCSAgICAgIHN0cnVjdCBza2xfcGxhbmVfd20gKndtKQogewotCXN0cnVjdCBp bnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0Yyhjc3RhdGUtPmJhc2UuY3J0Yyk7 Ci0Jc3RydWN0IGRybV9wbGFuZSAqcGxhbmUgPSBpbnRlbF9wc3RhdGUtPmJhc2UucGxhbmU7Ci0J c3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsK LQl1aW50MTZfdCBkZGJfYmxvY2tzOwotCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlw ZTsKIAlpbnQgbGV2ZWwsIG1heF9sZXZlbCA9IGlsa193bV9tYXhfbGV2ZWwoZGV2X3ByaXYpOwog CWludCByZXQ7CiAKIAlpZiAoV0FSTl9PTighaW50ZWxfcHN0YXRlLT5iYXNlLmZiKSkKIAkJcmV0 dXJuIC1FSU5WQUw7CiAKLQlkZGJfYmxvY2tzID0gc2tsX2RkYl9lbnRyeV9zaXplKCZkZGItPnBs YW5lW3BpcGVdW2ludGVsX3BsYW5lLT5pZF0pOwotCiAJZm9yIChsZXZlbCA9IDA7IGxldmVsIDw9 IG1heF9sZXZlbDsgbGV2ZWwrKykgewogCQlzdHJ1Y3Qgc2tsX3dtX2xldmVsICpyZXN1bHQgPSAm d20tPndtW2xldmVsXTsKIAogCQlyZXQgPSBza2xfY29tcHV0ZV9wbGFuZV93bShkZXZfcHJpdiwK IAkJCQkJICAgY3N0YXRlLAogCQkJCQkgICBpbnRlbF9wc3RhdGUsCi0JCQkJCSAgIGRkYl9ibG9j a3MsCiAJCQkJCSAgIGxldmVsLAogCQkJCQkgICAmcmVzdWx0LT5wbGFuZV9yZXNfYiwKLQkJCQkJ ICAgJnJlc3VsdC0+cGxhbmVfcmVzX2wsCi0JCQkJCSAgICZyZXN1bHQtPnBsYW5lX2VuKTsKKwkJ CQkJICAgJnJlc3VsdC0+cGxhbmVfcmVzX2wpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsK IAl9CkBAIC00NTA0LDggKzQ1NDcsNyBAQCBzdGF0aWMgaW50IHNrbF9idWlsZF9waXBlX3dtKHN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAKIAkJd20gPSAmcGlwZV93bS0+cGxhbmVz W3BsYW5lX2lkXTsKIAotCQlyZXQgPSBza2xfY29tcHV0ZV93bV9sZXZlbHMoZGV2X3ByaXYsIGRk YiwgY3N0YXRlLAotCQkJCQkgICAgaW50ZWxfcHN0YXRlLCB3bSk7CisJCXJldCA9IHNrbF9jb21w dXRlX3dtX2xldmVscyhkZXZfcHJpdiwgY3N0YXRlLCBpbnRlbF9wc3RhdGUsIHdtKTsKIAkJaWYg KHJldCkKIAkJCXJldHVybiByZXQ7CiAJCXNrbF9jb21wdXRlX3RyYW5zaXRpb25fd20oY3N0YXRl LCAmd20tPnRyYW5zX3dtKTsKQEAgLTQ2MTgsNiArNDY2MCw0NSBAQCBib29sIHNrbF9kZGJfYWxs b2NhdGlvbl9vdmVybGFwcyhjb25zdCBzdHJ1Y3Qgc2tsX2RkYl9lbnRyeSAqKmVudHJpZXMsCiAJ cmV0dXJuIGZhbHNlOwogfQogCitzdGF0aWMgaW50Citza2xfZGRiX2FkZF9hZmZlY3RlZF9wbGFu ZXMoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKKwkJCSAgICBjb25zdCBzdHJ1Y3Qg c2tsX3BpcGVfd20gKm9sZF9waXBlX3dtLAorCQkJICAgIGNvbnN0IHN0cnVjdCBza2xfcGlwZV93 bSAqcGlwZV93bSkKK3sKKwlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUgPSBjc3RhdGUt PmJhc2Uuc3RhdGU7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHN0YXRlLT5kZXY7CisJc3Ry dWN0IGRybV9jcnRjICpjcnRjID0gY3N0YXRlLT5iYXNlLmNydGM7CisJc3RydWN0IGludGVsX2Ny dGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOworCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0 YXRlICppbnRlbF9zdGF0ZSA9IHRvX2ludGVsX2F0b21pY19zdGF0ZShzdGF0ZSk7CisJc3RydWN0 IHNrbF9kZGJfYWxsb2NhdGlvbiAqbmV3X2RkYiA9ICZpbnRlbF9zdGF0ZS0+d21fcmVzdWx0cy5k ZGI7CisJc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqY3VyX2RkYiA9ICZkZXZfcHJpdi0+d20u c2tsX2h3LmRkYjsKKwlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZTsKKwlzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZTsKKwllbnVtIHBpcGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7 CisKKwlXQVJOX09OKCFkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCBj cnRjKSk7CisKKwlkcm1fZm9yX2VhY2hfcGxhbmVfbWFzayhwbGFuZSwgZGV2LCBjc3RhdGUtPmJh c2UucGxhbmVfbWFzaykgeworCQllbnVtIHBsYW5lX2lkIHBsYW5lX2lkID0gdG9faW50ZWxfcGxh bmUocGxhbmUpLT5pZDsKKwkJY29uc3Qgc3RydWN0IHNrbF9wbGFuZV93bSAqd20gPSAmcGlwZV93 bS0+cGxhbmVzW3BsYW5lX2lkXTsKKwkJY29uc3Qgc3RydWN0IHNrbF9wbGFuZV93bSAqb2xkX3dt ID0gJm9sZF9waXBlX3dtLT5wbGFuZXNbcGxhbmVfaWRdOworCisJCWlmICgoc2tsX2RkYl9lbnRy eV9lcXVhbCgmY3VyX2RkYi0+cGxhbmVbcGlwZV1bcGxhbmVfaWRdLAorCQkJCQkmbmV3X2RkYi0+ cGxhbmVbcGlwZV1bcGxhbmVfaWRdKSAmJgorCQkgICAgc2tsX2RkYl9lbnRyeV9lcXVhbCgmY3Vy X2RkYi0+eV9wbGFuZVtwaXBlXVtwbGFuZV9pZF0sCisJCQkJCSZuZXdfZGRiLT55X3BsYW5lW3Bp cGVdW3BsYW5lX2lkXSkpICYmCisJCSAgICAhbWVtY21wKHdtLCBvbGRfd20sIHNpemVvZihzdHJ1 Y3Qgc2tsX3BsYW5lX3dtKSkpCisJCQljb250aW51ZTsKKworCQlwbGFuZV9zdGF0ZSA9IGRybV9h dG9taWNfZ2V0X3BsYW5lX3N0YXRlKHN0YXRlLCBwbGFuZSk7CisJCWlmIChJU19FUlIocGxhbmVf c3RhdGUpKQorCQkJcmV0dXJuIFBUUl9FUlIocGxhbmVfc3RhdGUpOworCX0KKworCXJldHVybiAw OworfQorCiBzdGF0aWMgaW50IHNrbF91cGRhdGVfcGlwZV93bShzdHJ1Y3QgZHJtX2NydGNfc3Rh dGUgKmNzdGF0ZSwKIAkJCSAgICAgIGNvbnN0IHN0cnVjdCBza2xfcGlwZV93bSAqb2xkX3BpcGVf d20sCiAJCQkgICAgICBzdHJ1Y3Qgc2tsX3BpcGVfd20gKnBpcGVfd20sIC8qIG91dCAqLwpAQCAt NDYzMSw2ICs0NzEyLDE4IEBAIHN0YXRpYyBpbnQgc2tsX3VwZGF0ZV9waXBlX3dtKHN0cnVjdCBk cm1fY3J0Y19zdGF0ZSAqY3N0YXRlLAogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKKwlyZXQg PSBza2xfYWxsb2NhdGVfcGlwZV9kZGIoaW50ZWxfY3N0YXRlLCBkZGIsIHBpcGVfd20pOworCWlm IChyZXQpCisJCXJldHVybiByZXQ7CisJLyoKKwkgKiBUT0RPOiBEbyB3ZSBzdGlsbCBuZWVkIHRv IGFkZCBwbGFuZXMgaW4gc3RhdGUsIEFzIFdNIHVwZGF0ZSBpcworCSAqIG5vdCBwYXJ0IG9mIHVw ZGF0ZV9wbGFuZSBhbnltb3JlLCBTbyB3bSBmb3IgcGxhbmVzIGNhbiBiZSB1cGRhdGVkCisJICog aXJyZXNwZWN0aXZlIG9mIHVwZGFkZV9wbGFuZSBjYWxsLgorCSAqLworCXJldCA9IHNrbF9kZGJf YWRkX2FmZmVjdGVkX3BsYW5lcyhpbnRlbF9jc3RhdGUsIG9sZF9waXBlX3dtLCBwaXBlX3dtKTsK KwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCiAJaWYgKCFtZW1jbXAob2xkX3BpcGVfd20sIHBp cGVfd20sIHNpemVvZigqcGlwZV93bSkpKQogCQkqY2hhbmdlZCA9IGZhbHNlOwogCWVsc2UKQEAg LTQ2NTMsNDEgKzQ3NDYsNyBAQCBwaXBlc19tb2RpZmllZChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0 ZSAqc3RhdGUpCiB9CiAKIHN0YXRpYyBpbnQKLXNrbF9kZGJfYWRkX2FmZmVjdGVkX3BsYW5lcyhz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQotewotCXN0cnVjdCBkcm1fYXRvbWljX3N0 YXRlICpzdGF0ZSA9IGNzdGF0ZS0+YmFzZS5zdGF0ZTsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gc3RhdGUtPmRldjsKLQlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBjc3RhdGUtPmJhc2UuY3J0 YzsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7 Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwotCXN0 cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKmludGVsX3N0YXRlID0gdG9faW50ZWxfYXRvbWljX3N0 YXRlKHN0YXRlKTsKLQlzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0aW9uICpuZXdfZGRiID0gJmludGVs X3N0YXRlLT53bV9yZXN1bHRzLmRkYjsKLQlzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0aW9uICpjdXJf ZGRiID0gJmRldl9wcml2LT53bS5za2xfaHcuZGRiOwotCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUg KnBsYW5lX3N0YXRlOwotCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwotCWVudW0gcGlwZSBwaXBl ID0gaW50ZWxfY3J0Yy0+cGlwZTsKLQotCVdBUk5fT04oIWRybV9hdG9taWNfZ2V0X2V4aXN0aW5n X2NydGNfc3RhdGUoc3RhdGUsIGNydGMpKTsKLQotCWRybV9mb3JfZWFjaF9wbGFuZV9tYXNrKHBs YW5lLCBkZXYsIGNzdGF0ZS0+YmFzZS5wbGFuZV9tYXNrKSB7Ci0JCWVudW0gcGxhbmVfaWQgcGxh bmVfaWQgPSB0b19pbnRlbF9wbGFuZShwbGFuZSktPmlkOwotCi0JCWlmIChza2xfZGRiX2VudHJ5 X2VxdWFsKCZjdXJfZGRiLT5wbGFuZVtwaXBlXVtwbGFuZV9pZF0sCi0JCQkJCSZuZXdfZGRiLT5w bGFuZVtwaXBlXVtwbGFuZV9pZF0pICYmCi0JCSAgICBza2xfZGRiX2VudHJ5X2VxdWFsKCZjdXJf ZGRiLT55X3BsYW5lW3BpcGVdW3BsYW5lX2lkXSwKLQkJCQkJJm5ld19kZGItPnlfcGxhbmVbcGlw ZV1bcGxhbmVfaWRdKSkKLQkJCWNvbnRpbnVlOwotCi0JCXBsYW5lX3N0YXRlID0gZHJtX2F0b21p Y19nZXRfcGxhbmVfc3RhdGUoc3RhdGUsIHBsYW5lKTsKLQkJaWYgKElTX0VSUihwbGFuZV9zdGF0 ZSkpCi0JCQlyZXR1cm4gUFRSX0VSUihwbGFuZV9zdGF0ZSk7Ci0JfQotCi0JcmV0dXJuIDA7Ci19 Ci0KLXN0YXRpYyBpbnQKLXNrbF9jb21wdXRlX2RkYihzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGUpCitza2xfaW5jbHVkZV9hZmZlY3RlZF9jcnRjKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRl ICpzdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gc3RhdGUtPmRldjsKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CkBAIC00NzUxLDE0 ICs0ODEwLDYgQEAgc2tsX2NvbXB1dGVfZGRiKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSkKIAkJY3N0YXRlID0gaW50ZWxfYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBpbnRlbF9j cnRjKTsKIAkJaWYgKElTX0VSUihjc3RhdGUpKQogCQkJcmV0dXJuIFBUUl9FUlIoY3N0YXRlKTsK LQotCQlyZXQgPSBza2xfYWxsb2NhdGVfcGlwZV9kZGIoY3N0YXRlLCBkZGIpOwotCQlpZiAocmV0 KQotCQkJcmV0dXJuIHJldDsKLQotCQlyZXQgPSBza2xfZGRiX2FkZF9hZmZlY3RlZF9wbGFuZXMo Y3N0YXRlKTsKLQkJaWYgKHJldCkKLQkJCXJldHVybiByZXQ7CiAJfQogCiAJcmV0dXJuIDA7CkBA IC00ODM5LDcgKzQ4OTAsNyBAQCBza2xfY29tcHV0ZV93bShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0 ZSAqc3RhdGUpCiAJLyogQ2xlYXIgYWxsIGRpcnR5IGZsYWdzICovCiAJcmVzdWx0cy0+ZGlydHlf cGlwZXMgPSAwOwogCi0JcmV0ID0gc2tsX2NvbXB1dGVfZGRiKHN0YXRlKTsKKwlyZXQgPSBza2xf aW5jbHVkZV9hZmZlY3RlZF9jcnRjKHN0YXRlKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0Owog Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=