From: Matt Roper Subject: [PATCH] drm/i915: Add two-stage ILK-style watermark programming (v11) Date: Tue, 23 Feb 2016 17:20:13 -0800 Message-ID: <1456276813-5689-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id E95C16E3D9 for ; Wed, 24 Feb 2016 01:21:03 +0000 (UTC) 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 SW4gYWRkaXRpb24gdG8gY2FsY3VsYXRpbmcgZmluYWwgd2F0ZXJtYXJrcywgbGV0J3MgYWxzbyBw cmUtY2FsY3VsYXRlIGEKc2V0IG9mIGludGVybWVkaWF0ZSB3YXRlcm1hcmsgdmFsdWVzIGF0IGF0 b21pYyBjaGVjayB0aW1lLiAgVGhlc2UKaW50ZXJtZWRpYXRlIHdhdGVybWFya3MgYXJlIGEgY29t YmluYXRpb24gb2YgdGhlIHdhdGVybWFya3MgZm9yIHRoZSBvbGQKc3RhdGUgYW5kIHRoZSBuZXcg c3RhdGU7IHRoZXkgc2hvdWxkIHNhdGlzZnkgdGhlIHJlcXVpcmVtZW50cyBvZiBib3RoCnN0YXRl cyB3aGljaCBtZWFucyB0aGV5IGNhbiBiZSBwcm9ncmFtbWVkIGltbWVkaWF0ZWx5IHdoZW4gd2Ug Y29tbWl0IHRoZQphdG9taWMgc3RhdGUgKHdpdGhvdXQgd2FpdGluZyBmb3IgYSB2YmxhbmspLiAg T25jZSB0aGUgdmJsYW5rIGRvZXMKaGFwcGVuLCB3ZSBjYW4gdGhlbiByZS1wcm9ncmFtIHdhdGVy bWFya3MgdG8gdGhlIG1vcmUgb3B0aW1hbCBmaW5hbAp2YWx1ZS4KCnYyOiBTaWduaWZpY2FudCBy ZWJhc2luZy9yZXdyaXRpbmcuCgp2MzoKIC0gTW92ZSAnbmVlZF9wb3N0dmJsX3VwZGF0ZScgZmxh ZyB0byBDUlRDIHN0YXRlIChEYW5pZWwpCiAtIERvbid0IGZvcmdldCB0byBjaGVjayBpbnRlcm1l ZGlhdGUgd2F0ZXJtYXJrIHZhbHVlcyBmb3IgdmFsaWRpdHkKICAgKE1hYXJ0ZW4pCiAtIERvbid0 IGR1ZSBhc3luYyB3YXRlcm1hcmsgb3B0aW1pemF0aW9uOyBqdXN0IGRvIGl0IGF0IHRoZSBlbmQg b2YgdGhlCiAgIGF0b21pYyB0cmFuc2FjdGlvbiwgYWZ0ZXIgd2FpdGluZyBmb3IgdmJsYW5rcy4g IFdlIGRvIHdhbnQgaXQgdG8gYmUKICAgYXN5bmMgZXZlbnR1YWxseSwgYnV0IGFkZGluZyB0aGF0 IG5vdyB3aWxsIGNhdXNlIG1vcmUgdHJvdWJsZSBmb3IKICAgTWFhcnRlbidzIGluLXByb2dyZXNz IHdvcmsuICAoTWFhcnRlbikKIC0gRG9uJ3QgYWxsb2NhdGUgc3BhY2UgaW4gY3J0Y19zdGF0ZSBm b3IgaW50ZXJtZWRpYXRlIHdhdGVybWFya3Mgb24KICAgcGxhdGZvcm1zIHRoYXQgZG9uJ3QgbmVl ZCBpdCAoZ2VuOSspLgogLSBNb3ZlIFdhQ3hTUkRpc2FibGVkRm9yU3ByaXRlU2NhbGluZzppdmIg aW50byBpbnRlbF9iZWdpbl9jcnRjX2NvbW1pdAogICBub3cgdGhhdCBpbGtfdXBkYXRlX3dtIGlz IGdvbmUuCgp2NDoKIC0gQWRkIGEgd21fbXV0ZXggdG8gY292ZXIgdXBkYXRlcyB0byBpbnRlbF9j cnRjLT5hY3RpdmUgYW5kIHRoZQogICBuZWVkX3Bvc3R2YmxfdXBkYXRlIGZsYWcuICBTaW5jZSB3 ZSBkb24ndCBoYXZlIGFzeW5jIHlldCBpdCBpc24ndAogICB0ZXJyaWJseSBpbXBvcnRhbnQgeWV0 LCBidXQgbWlnaHQgYXMgd2VsbCBhZGQgaXQgbm93LgogLSBDaGFuZ2UgaW50ZXJmYWNlIHRvIHBy b2dyYW0gd2F0ZXJtYXJrcy4gIFBsYXRmb3JtcyB3aWxsIG5vdyBleHBvc2UKICAgLmluaXRpYWxf d2F0ZXJtYXJrcygpIGFuZCAub3B0aW1pemVfd2F0ZXJtYXJrcygpIGZ1bmN0aW9ucyB0byBkbwog ICB3YXRlcm1hcmsgcHJvZ3JhbW1pbmcuICBUaGVzZSBzaG91bGQgbG9jayB3bV9tdXRleCwgY29w eSB0aGUKICAgYXBwcm9wcmlhdGUgc3RhdGUgdmFsdWVzIGludG8gaW50ZWxfY3J0Yy0+YWN0aXZl LCBhbmQgdGhlbiBjYWxsCiAgIHRoZSBpbnRlcm5hbCBwcm9ncmFtIHdhdGVybWFya3MgZnVuY3Rp b24uCgp2NToKIC0gU2tpcCBpbnRlcm1lZGlhdGUgd2F0ZXJtYXJrIGNhbGN1bGF0aW9uL2NoZWNr IGR1cmluZyBpbml0aWFsIGhhcmR3YXJlCiAgIHJlYWRvdXQgc2luY2Ugd2UgZG9uJ3QgdHJ1c3Qg dGhlIGV4aXN0aW5nIEhXIHZhbHVlcyAoYW5kIGRvbid0IGhhdmUKICAgdmFsaWQgdmFsdWVzIG9m IG91ciBvd24geWV0KS4KIC0gRG9uJ3QgdHJ5IHRvIGNhbGwgLm9wdGltaXplX3dhdGVybWFya3Mo KSBvbiBwbGF0Zm9ybXMgdGhhdCBkb24ndCBoYXZlCiAgIGF0b21pYyB3YXRlcm1hcmtzIHlldC4g IChNYWFydGVuKQoKdjY6CiAtIFJlYmFzZQoKdjc6CiAtIEZ1cnRoZXIgcmViYXNlCgp2ODoKIC0g QSBmZXcgbWlub3IgaW5kZW50YXRpb24gYW5kIGxpbmUgbGVuZ3RoIGZpeGVzCgp2OToKIC0gWWV0 IGFub3RoZXIgcmViYXNlIHNpbmNlIE1hYXJ0ZW4ncyBwYXRjaGVzIHJld29ya2VkIGEgYnVuY2gg b2YgdGhlCiAgIGNvZGUgKHdtX3ByZSwgd21fcG9zdCwgZXRjLikgdGhhdCB0aGlzIHdhcyBwcmV2 aW91c2x5IGJhc2VkIG9uLgoKdjEwOgogLSBNb3ZlIHdtX211dGV4IHRvIGRldl9wcml2IHRvIHBy b3RlY3QgYWdhaW5zdCByYWNpbmcgY29tbWl0cyBhZ2FpbnN0CiAgIGRpc2pvaW50IENSVEMgc2V0 cy4gKE1hYXJ0ZW4pCiAtIERyb3AgdW5uZWNlc3NhcnkgY2xlYXJpbmcgb2YgY3N0YXRlLT53bS5u ZWVkX3Bvc3R2YmxfdXBkYXRlIChNYWFydGVuKQoKdjExOgogLSBOb3cgdGhhdCB3ZSd2ZSBtb3Zl ZCB0byBhdG9taWMgd2F0ZXJtYXJrIHVwZGF0ZXMsIG1ha2Ugc3VyZSB3ZSBjYWxsCiAgIHRoZSBw cm9wZXIgZnVuY3Rpb24gdG8gcHJvZ3JhbSB3YXRlcm1hcmtzIGluCiAgIHtpcm9ubGFrZSxoYXN3 ZWxsfV9jcnRjX2VuYWJsZSgpOyB0aGUgZmFpbHVyZSB0byBkbyBzbyBvbiB0aGUKICAgcHJldmlv dXMgcGF0Y2ggaXRlcmF0aW9uIGxlZCB0byB1cyBub3QgYWN0dWFsbHkgcHJvZ3JhbW1pbmcgdGhl CiAgIHdhdGVybWFya3MgYmVmb3JlIHR1cm5pbmcgb24gdGhlIENSVEMsIHdoaWNoIHdhcyB0aGUg Y2F1c2Ugb2YgdGhlCiAgIHVuZGVycnVucyB0aGF0IHRoZSBDSSBzeXN0ZW0gd2FzIHNlZWluZy4K IC0gRml4IGludmVydGVkIGxvZ2ljIGZvciBkZXRlcm1pbmluZyB3aGVuIHRvIG9wdGltaXplIHdh dGVybWFya3MuICBXZQogICB3ZXJlIG5lZWRsZXNzbHkgb3B0aW1pemluZyB3aGVuIHRoZSBpbnRl cm1lZGlhdGUvb3B0aW1hbCB2YWx1ZXMgd2VyZQogICB0aGUgc2FtZSAoaGFybWxlc3MpLCBidXQg bm90IGFjdHVhbGx5IG9wdGltaXppbmcgd2hlbiB0aGV5IGRpZmZlcmVkCiAgIChhbHNvIGhhcm1s ZXNzLCBidXQgd2FzdGVmdWwgZnJvbSBhIHBvd2VyL2JhbmR3aWR0aCBwZXJzcGVjdGl2ZSkuCgpD YzogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4K U2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jICAgICAgfCAgIDEgKwogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgIDEzICsrLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfYXRvbWljLmMgIHwgICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyB8ICA5NyArKysrKysrKysrKysrKysrKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rydi5oICAgICB8ICAyOCArKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMgICAgICB8IDE2MiArKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLQogNiBm aWxlcyBjaGFuZ2VkLCAyNDQgaW5zZXJ0aW9ucygrKSwgNTggZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZG1hLmMKaW5kZXggMWM2ZDIyNy4uMzZjMGNmMSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RtYS5jCkBAIC0xMDEwLDYgKzEwMTAsNyBAQCBpbnQgaTkxNV9kcml2ZXJfbG9hZChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBsb25nIGZsYWdzKQogCW11dGV4X2luaXQoJmRldl9w cml2LT5zYl9sb2NrKTsKIAltdXRleF9pbml0KCZkZXZfcHJpdi0+bW9kZXNldF9yZXN0b3JlX2xv Y2spOwogCW11dGV4X2luaXQoJmRldl9wcml2LT5hdl9tdXRleCk7CisJbXV0ZXhfaW5pdCgmZGV2 X3ByaXYtPndtLndtX211dGV4KTsKIAogCXJldCA9IGk5MTVfd29ya3F1ZXVlc19pbml0KGRldl9w cml2KTsKIAlpZiAocmV0IDwgMCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDllNzZiZmMu LmNmMTdkNjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtNjMxLDcgKzYzMSwxMSBAQCBz dHJ1Y3QgZHJtX2k5MTVfZGlzcGxheV9mdW5jcyB7CiAJCQkgIHN0cnVjdCBkcGxsICpiZXN0X2Ns b2NrKTsKIAlpbnQgKCpjb21wdXRlX3BpcGVfd20pKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAog CQkJICAgICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7Ci0Jdm9pZCAoKnByb2dy YW1fd2F0ZXJtYXJrcykoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSk7CisJaW50ICgq Y29tcHV0ZV9pbnRlcm1lZGlhdGVfd20pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJCQkJICAg ICAgIHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAorCQkJCSAgICAgICBzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqbmV3c3RhdGUpOworCXZvaWQgKCppbml0aWFsX3dhdGVybWFya3MpKHN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUpOworCXZvaWQgKCpvcHRpbWl6ZV93YXRlcm1h cmtzKShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKTsKIAl2b2lkICgqdXBkYXRlX3dt KShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogCWludCAoKm1vZGVzZXRfY2FsY19jZGNsaykoc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKTsKIAl2b2lkICgqbW9kZXNldF9jb21taXRfY2Rj bGspKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7CkBAIC0xOTgwLDYgKzE5ODQsMTMg QEAgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgewogCQl9OwogCiAJCXVpbnQ4X3QgbWF4X2xldmVs OworCisJCS8qCisJCSAqIFNob3VsZCBiZSBoZWxkIGFyb3VuZCBhdG9taWMgV00gcmVnaXN0ZXIg d3JpdGluZzsgYWxzbworCQkgKiBwcm90ZWN0cyAqIGludGVsX2NydGMtPndtLmFjdGl2ZSBhbmQK KwkJICogY3N0YXRlLT53bS5uZWVkX3Bvc3R2YmxfdXBkYXRlLgorCQkgKi8KKwkJc3RydWN0IG11 dGV4IHdtX211dGV4OwogCX0gd207CiAKIAlzdHJ1Y3QgaTkxNV9ydW50aW1lX3BtIHBtOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYwppbmRleCA0NjI1ZjhhLi45NjgyZDk0IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYwpAQCAtOTcsNiArOTcsNyBAQCBpbnRlbF9jcnRjX2R1 cGxpY2F0ZV9zdGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJY3J0Y19zdGF0ZS0+ZGlzYWJs ZV9scF93bSA9IGZhbHNlOwogCWNydGNfc3RhdGUtPmRpc2FibGVfY3hzciA9IGZhbHNlOwogCWNy dGNfc3RhdGUtPndtX2NoYW5nZWQgPSBmYWxzZTsKKwljcnRjX3N0YXRlLT53bS5uZWVkX3Bvc3R2 YmxfdXBkYXRlID0gZmFsc2U7CiAKIAlyZXR1cm4gJmNydGNfc3RhdGUtPmJhc2U7CiB9CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggZGVlZTU2MC4uNDIzYjk5ZSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNDg0Niw3ICs0ODQ2LDQyIEBAIHN0YXRp YyB2b2lkIGludGVsX3ByZV9wbGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9s ZF9jcnRjX3N0YXRlKQogCQkJaW50ZWxfc2V0X21lbW9yeV9jeHNyKGRldl9wcml2LCBmYWxzZSk7 CiAJfQogCi0JaWYgKCFuZWVkc19tb2Rlc2V0KCZwaXBlX2NvbmZpZy0+YmFzZSkgJiYgcGlwZV9j b25maWctPndtX2NoYW5nZWQpCisJLyoKKwkgKiBJVkIgd29ya2Fyb3VuZDogbXVzdCBkaXNhYmxl IGxvdyBwb3dlciB3YXRlcm1hcmtzIGZvciBhdCBsZWFzdAorCSAqIG9uZSBmcmFtZSBiZWZvcmUg ZW5hYmxpbmcgc2NhbGluZy4gIExQIHdhdGVybWFya3MgY2FuIGJlIHJlLWVuYWJsZWQKKwkgKiB3 aGVuIHNjYWxpbmcgaXMgZGlzYWJsZWQuCisJICoKKwkgKiBXYUN4U1JEaXNhYmxlZEZvclNwcml0 ZVNjYWxpbmc6aXZiCisJICovCisJaWYgKHBpcGVfY29uZmlnLT5kaXNhYmxlX2xwX3dtKSB7CisJ CWlsa19kaXNhYmxlX2xwX3dtKGRldik7CisJCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIGNy dGMtPnBpcGUpOworCX0KKworCS8qCisJICogSWYgd2UncmUgZG9pbmcgYSBtb2Rlc2V0LCB3ZSdy ZSBkb25lLiAgTm8gbmVlZCB0byBkbyBhbnkgcHJlLXZibGFuaworCSAqIHdhdGVybWFyayBwcm9n cmFtbWluZyBoZXJlLgorCSAqLworCWlmIChuZWVkc19tb2Rlc2V0KCZwaXBlX2NvbmZpZy0+YmFz ZSkpCisJCXJldHVybjsKKworCS8qCisJICogRm9yIHBsYXRmb3JtcyB0aGF0IHN1cHBvcnQgYXRv bWljIHdhdGVybWFya3MsIHByb2dyYW0gdGhlCisJICogJ2ludGVybWVkaWF0ZScgd2F0ZXJtYXJr cyBpbW1lZGlhdGVseS4gIE9uIHByZS1nZW45IHBsYXRmb3JtcywgdGhlc2UKKwkgKiB3aWxsIGJl IHRoZSBpbnRlcm1lZGlhdGUgdmFsdWVzIHRoYXQgYXJlIHNhZmUgZm9yIGJvdGggcHJlLSBhbmQK KwkgKiBwb3N0LSB2Ymxhbms7IHdoZW4gdmJsYW5rIGhhcHBlbnMsIHRoZSAnYWN0aXZlJyB2YWx1 ZXMgd2lsbCBiZSBzZXQKKwkgKiB0byB0aGUgZmluYWwgJ3RhcmdldCcgdmFsdWVzIGFuZCB3ZSds bCBkbyB0aGlzIGFnYWluIHRvIGdldCB0aGUKKwkgKiBvcHRpbWFsIHdhdGVybWFya3MuICBGb3Ig Z2VuOSsgcGxhdGZvcm1zLCB0aGUgdmFsdWVzIHdlIHByb2dyYW0gaGVyZQorCSAqIHdpbGwgYmUg dGhlIGZpbmFsIHRhcmdldCB2YWx1ZXMgd2hpY2ggd2lsbCBnZXQgYXV0b21hdGljYWxseSBsYXRj aGVkCisJICogYXQgdmJsYW5rIHRpbWU7IG5vIGZ1cnRoZXIgcHJvZ3JhbW1pbmcgd2lsbCBiZSBu ZWNlc3NhcnkuCisJICoKKwkgKiBJZiBhIHBsYXRmb3JtIGhhc24ndCBiZWVuIHRyYW5zaXRpb25l ZCB0byBhdG9taWMgd2F0ZXJtYXJrcyB5ZXQsCisJICogd2UnbGwgY29udGludWUgdG8gdXBkYXRl IHdhdGVybWFya3MgdGhlIG9sZCB3YXksIGlmIGZsYWdzIHRlbGwKKwkgKiB1cyB0by4KKwkgKi8K KwlpZiAoZGV2X3ByaXYtPmRpc3BsYXkuaW5pdGlhbF93YXRlcm1hcmtzICE9IE5VTEwpCisJCWRl dl9wcml2LT5kaXNwbGF5LmluaXRpYWxfd2F0ZXJtYXJrcyhwaXBlX2NvbmZpZyk7CisJZWxzZSBp ZiAocGlwZV9jb25maWctPndtX2NoYW5nZWQpCiAJCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKCZj cnRjLT5iYXNlKTsKIH0KIApAQCAtNDkyNSw3ICs0OTYwLDcgQEAgc3RhdGljIHZvaWQgaXJvbmxh a2VfY3J0Y19lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCSAqLwogCWludGVsX2NydGNf bG9hZF9sdXQoY3J0Yyk7CiAKLQlpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhjcnRjKTsKKwlkZXZf cHJpdi0+ZGlzcGxheS5pbml0aWFsX3dhdGVybWFya3MoaW50ZWxfY3J0Yy0+Y29uZmlnKTsKIAlp bnRlbF9lbmFibGVfcGlwZShpbnRlbF9jcnRjKTsKIAogCWlmIChpbnRlbF9jcnRjLT5jb25maWct Pmhhc19wY2hfZW5jb2RlcikKQEAgLTUwMjQsNyArNTA1OSw3IEBAIHN0YXRpYyB2b2lkIGhhc3dl bGxfY3J0Y19lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWlmICghaW50ZWxfY3J0Yy0+ Y29uZmlnLT5oYXNfZHNpX2VuY29kZXIpCiAJCWludGVsX2RkaV9lbmFibGVfdHJhbnNjb2Rlcl9m dW5jKGNydGMpOwogCi0JaW50ZWxfdXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7CisJZGV2X3ByaXYt PmRpc3BsYXkuaW5pdGlhbF93YXRlcm1hcmtzKHBpcGVfY29uZmlnKTsKIAlpbnRlbF9lbmFibGVf cGlwZShpbnRlbF9jcnRjKTsKIAogCWlmIChpbnRlbF9jcnRjLT5jb25maWctPmhhc19wY2hfZW5j b2RlcikKQEAgLTExODAwLDYgKzExODM1LDcgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxj X2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCXN0cnVjdCBpbnRl bF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSA9IHBsYW5lX3N0YXRlLT5wbGFuZTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gY3J0Yy0+ZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm9sZF9wbGFuZV9zdGF0ZSA9CiAJ CXRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5zdGF0ZSk7CiAJaW50IGlkeCA9IGludGVsX2Ny dGMtPmJhc2UuYmFzZS5pZCwgcmV0OwpAQCAtMTE4NTksNiArMTE4OTUsMTEgQEAgaW50IGludGVs X3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlLAogCQlwaXBlX2NvbmZpZy0+d21fY2hhbmdlZCA9IHRydWU7CiAJfQogCisJLyogUHJlLWdl bjkgcGxhdGZvcm1zIG5lZWQgdHdvLXN0ZXAgd2F0ZXJtYXJrIHVwZGF0ZXMgKi8KKwlpZiAocGlw ZV9jb25maWctPndtX2NoYW5nZWQgJiYgSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA5ICYmCisJICAg IGRldl9wcml2LT5kaXNwbGF5Lm9wdGltaXplX3dhdGVybWFya3MpCisJCXRvX2ludGVsX2NydGNf c3RhdGUoY3J0Y19zdGF0ZSktPndtLm5lZWRfcG9zdHZibF91cGRhdGUgPSB0cnVlOworCiAJaWYg KHZpc2libGUgfHwgd2FzX3Zpc2libGUpCiAJCWludGVsX2NydGMtPmF0b21pYy5mYl9iaXRzIHw9 CiAJCQl0b19pbnRlbF9wbGFuZShwbGFuZSktPmZyb250YnVmZmVyX2JpdDsKQEAgLTExOTgzLDgg KzEyMDI0LDI5IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19hdG9taWNfY2hlY2soc3RydWN0IGRy bV9jcnRjICpjcnRjLAogCXJldCA9IDA7CiAJaWYgKGRldl9wcml2LT5kaXNwbGF5LmNvbXB1dGVf cGlwZV93bSkgewogCQlyZXQgPSBkZXZfcHJpdi0+ZGlzcGxheS5jb21wdXRlX3BpcGVfd20oaW50 ZWxfY3J0Yywgc3RhdGUpOwotCQlpZiAocmV0KQorCQlpZiAocmV0KSB7CisJCQlEUk1fREVCVUdf S01TKCJUYXJnZXQgcGlwZSB3YXRlcm1hcmtzIGFyZSBpbnZhbGlkXG4iKTsKIAkJCXJldHVybiBy ZXQ7CisJCX0KKwl9CisKKwlpZiAoZGV2X3ByaXYtPmRpc3BsYXkuY29tcHV0ZV9pbnRlcm1lZGlh dGVfd20gJiYKKwkgICAgIXRvX2ludGVsX2F0b21pY19zdGF0ZShzdGF0ZSktPnNraXBfaW50ZXJt ZWRpYXRlX3dtKSB7CisJCWlmIChXQVJOX09OKCFkZXZfcHJpdi0+ZGlzcGxheS5jb21wdXRlX3Bp cGVfd20pKQorCQkJcmV0dXJuIDA7CisKKwkJLyoKKwkJICogQ2FsY3VsYXRlICdpbnRlcm1lZGlh dGUnIHdhdGVybWFya3MgdGhhdCBzYXRpc2Z5IGJvdGggdGhlCisJCSAqIG9sZCBzdGF0ZSBhbmQg dGhlIG5ldyBzdGF0ZS4gIFdlIGNhbiBwcm9ncmFtIHRoZXNlCisJCSAqIGltbWVkaWF0ZWx5Lgor CQkgKi8KKwkJcmV0ID0gZGV2X3ByaXYtPmRpc3BsYXkuY29tcHV0ZV9pbnRlcm1lZGlhdGVfd20o Y3J0Yy0+ZGV2LAorCQkJCQkJCQlpbnRlbF9jcnRjLAorCQkJCQkJCQlwaXBlX2NvbmZpZyk7CisJ CWlmIChyZXQpIHsKKwkJCURSTV9ERUJVR19LTVMoIk5vIHZhbGlkIGludGVybWVkaWF0ZSBwaXBl IHdhdGVybWFya3MgYXJlIHBvc3NpYmxlXG4iKTsKKwkJCXJldHVybiByZXQ7CisJCX0KIAl9CiAK IAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkgewpAQCAtMTM0NTIsNiArMTM1MTQsNyBA QCBzdGF0aWMgaW50IGludGVsX2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwog CXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNy dGM7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX2NzdGF0ZTsKIAlpbnQgcmV0ID0g MCwgaTsKIAlib29sIGh3X2NoZWNrID0gaW50ZWxfc3RhdGUtPm1vZGVzZXQ7CiAKQEAgLTEzNTU1 LDYgKzEzNjE4LDIwIEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCiAJZHJtX2F0b21pY19oZWxwZXJfd2FpdF9mb3JfdmJsYW5rcyhkZXYs IHN0YXRlKTsKIAorCS8qCisJICogTm93IHRoYXQgdGhlIHZibGFuayBoYXMgcGFzc2VkLCB3ZSBj YW4gZ28gYWhlYWQgYW5kIHByb2dyYW0gdGhlCisJICogb3B0aW1hbCB3YXRlcm1hcmtzIG9uIHBs YXRmb3JtcyB0aGF0IG5lZWQgdHdvLXN0ZXAgd2F0ZXJtYXJrCisJICogcHJvZ3JhbW1pbmcuCisJ ICoKKwkgKiBUT0RPOiBNb3ZlIHRoaXMgKGFuZCBvdGhlciBjbGVhbnVwKSB0byBhbiBhc3luYyB3 b3JrZXIgZXZlbnR1YWxseS4KKwkgKi8KKwlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBj cnRjLCBjcnRjX3N0YXRlLCBpKSB7CisJCWludGVsX2NzdGF0ZSA9IHRvX2ludGVsX2NydGNfc3Rh dGUoY3J0Yy0+c3RhdGUpOworCisJCWlmIChkZXZfcHJpdi0+ZGlzcGxheS5vcHRpbWl6ZV93YXRl cm1hcmtzKQorCQkJZGV2X3ByaXYtPmRpc3BsYXkub3B0aW1pemVfd2F0ZXJtYXJrcyhpbnRlbF9j c3RhdGUpOworCX0KKwogCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAlkcm1fYXRv bWljX2hlbHBlcl9jbGVhbnVwX3BsYW5lcyhkZXYsIHN0YXRlKTsKIAltdXRleF91bmxvY2soJmRl di0+c3RydWN0X211dGV4KTsKQEAgLTE1MjI1LDcgKzE1MzAyLDcgQEAgc3RhdGljIHZvaWQgc2Fu aXRpemVfd2F0ZXJtYXJrcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWludCBpOwogCiAJLyog T25seSBzdXBwb3J0ZWQgb24gcGxhdGZvcm1zIHRoYXQgdXNlIGF0b21pYyB3YXRlcm1hcmsgZGVz aWduICovCi0JaWYgKCFkZXZfcHJpdi0+ZGlzcGxheS5wcm9ncmFtX3dhdGVybWFya3MpCisJaWYg KCFkZXZfcHJpdi0+ZGlzcGxheS5vcHRpbWl6ZV93YXRlcm1hcmtzKQogCQlyZXR1cm47CiAKIAkv KgpAQCAtMTUyNDYsNiArMTUzMjMsMTMgQEAgcmV0cnk6CiAJaWYgKFdBUk5fT04oSVNfRVJSKHN0 YXRlKSkpCiAJCWdvdG8gZmFpbDsKIAorCS8qCisJICogSGFyZHdhcmUgcmVhZG91dCBpcyB0aGUg b25seSB0aW1lIHdlIGRvbid0IHdhbnQgdG8gY2FsY3VsYXRlCisJICogaW50ZXJtZWRpYXRlIHdh dGVybWFya3MgKHNpbmNlIHdlIGRvbid0IHRydXN0IHRoZSBjdXJyZW50CisJICogd2F0ZXJtYXJr cykuCisJICovCisJdG9faW50ZWxfYXRvbWljX3N0YXRlKHN0YXRlKS0+c2tpcF9pbnRlcm1lZGlh dGVfd20gPSB0cnVlOworCiAJcmV0ID0gaW50ZWxfYXRvbWljX2NoZWNrKGRldiwgc3RhdGUpOwog CWlmIChyZXQpIHsKIAkJLyoKQEAgLTE1MjY4LDcgKzE1MzUyLDggQEAgcmV0cnk6CiAJZm9yX2Vh Y2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3N0YXRlLCBpKSB7CiAJCXN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpjcyA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3N0YXRlKTsKIAotCQlkZXZf cHJpdi0+ZGlzcGxheS5wcm9ncmFtX3dhdGVybWFya3MoY3MpOworCQljcy0+d20ubmVlZF9wb3N0 dmJsX3VwZGF0ZSA9IHRydWU7CisJCWRldl9wcml2LT5kaXNwbGF5Lm9wdGltaXplX3dhdGVybWFy a3MoY3MpOwogCX0KIAogCWRybV9hdG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rydi5oCmluZGV4IDQ4NTIwNDkuLmE5Zjc2NDEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rydi5oCkBAIC0yNjAsNiArMjYwLDEyIEBAIHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgewog CiAJc3RydWN0IGludGVsX3NoYXJlZF9kcGxsX2NvbmZpZyBzaGFyZWRfZHBsbFtJOTE1X05VTV9Q TExTXTsKIAlzdHJ1Y3QgaW50ZWxfd21fY29uZmlnIHdtX2NvbmZpZzsKKworCS8qCisJICogQ3Vy cmVudCB3YXRlcm1hcmtzIGNhbid0IGJlIHRydXN0ZWQgZHVyaW5nIGhhcmR3YXJlIHJlYWRvdXQs IHNvCisJICogZG9uJ3QgYm90aGVyIGNhbGN1bGF0aW5nIGludGVybWVkaWF0ZSB3YXRlcm1hcmtz LgorCSAqLworCWJvb2wgc2tpcF9pbnRlcm1lZGlhdGVfd207CiB9OwogCiBzdHJ1Y3QgaW50ZWxf cGxhbmVfc3RhdGUgewpAQCAtNTA5LDEzICs1MTUsMjkgQEAgc3RydWN0IGludGVsX2NydGNfc3Rh dGUgewogCiAJc3RydWN0IHsKIAkJLyoKLQkJICogb3B0aW1hbCB3YXRlcm1hcmtzLCBwcm9ncmFt bWVkIHBvc3QtdmJsYW5rIHdoZW4gdGhpcyBzdGF0ZQotCQkgKiBpcyBjb21taXR0ZWQKKwkJICog T3B0aW1hbCB3YXRlcm1hcmtzLCBwcm9ncmFtbWVkIHBvc3QtdmJsYW5rIHdoZW4gdGhpcyBzdGF0 ZQorCQkgKiBpcyBjb21taXR0ZWQuCiAJCSAqLwogCQl1bmlvbiB7CiAJCQlzdHJ1Y3QgaW50ZWxf cGlwZV93bSBpbGs7CiAJCQlzdHJ1Y3Qgc2tsX3BpcGVfd20gc2tsOwogCQl9IG9wdGltYWw7CisK KwkJLyoKKwkJICogSW50ZXJtZWRpYXRlIHdhdGVybWFya3M7IHRoZXNlIGNhbiBiZSBwcm9ncmFt bWVkIGltbWVkaWF0ZWx5CisJCSAqIHNpbmNlIHRoZXkgc2F0aXNmeSBib3RoIHRoZSBjdXJyZW50 IGNvbmZpZ3VyYXRpb24gd2UncmUKKwkJICogc3dpdGNoaW5nIGF3YXkgZnJvbSBhbmQgdGhlIG5l dyBjb25maWd1cmF0aW9uIHdlJ3JlIHN3aXRjaGluZworCQkgKiB0by4KKwkJICovCisJCXN0cnVj dCBpbnRlbF9waXBlX3dtIGludGVybWVkaWF0ZTsKKworCQkvKgorCQkgKiBQbGF0Zm9ybXMgd2l0 aCB0d28tc3RlcCB3YXRlcm1hcmsgcHJvZ3JhbW1pbmcgd2lsbCBuZWVkIHRvCisJCSAqIHVwZGF0 ZSB3YXRlcm1hcmsgcHJvZ3JhbW1pbmcgcG9zdC12YmxhbmsgdG8gc3dpdGNoIGZyb20gdGhlCisJ CSAqIHNhZmUgaW50ZXJtZWRpYXRlIHdhdGVybWFya3MgdG8gdGhlIG9wdGltYWwgZmluYWwKKwkJ ICogd2F0ZXJtYXJrcy4KKwkJICovCisJCWJvb2wgbmVlZF9wb3N0dmJsX3VwZGF0ZTsKIAl9IHdt OwogfTsKIApAQCAtNjAxLDYgKzYyMyw3IEBAIHN0cnVjdCBpbnRlbF9jcnRjIHsKIAkJCXN0cnVj dCBpbnRlbF9waXBlX3dtIGlsazsKIAkJCXN0cnVjdCBza2xfcGlwZV93bSBza2w7CiAJCX0gYWN0 aXZlOworCiAJCS8qIGFsbG93IEN4U1Igb24gdGhpcyBwaXBlICovCiAJCWJvb2wgY3hzcl9hbGxv d2VkOwogCX0gd207CkBAIC0xNTY2LDYgKzE1ODksNyBAQCB2b2lkIHNrbF93bV9nZXRfaHdfc3Rh dGUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIHNrbF9kZGJfZ2V0X2h3X3N0YXRlKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgc3RydWN0IHNrbF9kZGJfYWxs b2NhdGlvbiAqZGRiIC8qIG91dCAqLyk7CiB1aW50MzJfdCBpbGtfcGlwZV9waXhlbF9yYXRlKGNv bnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyk7Citib29sIGlsa19kaXNh YmxlX2xwX3dtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50IHNhbml0aXplX3JjNl9vcHRp b24oY29uc3Qgc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IGVuYWJsZV9yYzYpOwogCiAvKiBp bnRlbF9zZHZvLmMgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDM0N2Q0ZGYuLmNjZGI1 ODEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMjI3OCw2ICsyMjc4LDI5IEBAIHN0YXRp YyB2b2lkIHNrbF9zZXR1cF93bV9sYXRlbmN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaW50 ZWxfcHJpbnRfd21fbGF0ZW5jeShkZXYsICJHZW45IFBsYW5lIiwgZGV2X3ByaXYtPndtLnNrbF9s YXRlbmN5KTsKIH0KIAorc3RhdGljIGJvb2wgaWxrX3ZhbGlkYXRlX3BpcGVfd20oc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKKwkJCQkgc3RydWN0IGludGVsX3BpcGVfd20gKnBpcGVfd20pCit7CisJ LyogTFAwIHdhdGVybWFyayBtYXhpbXVtcyBkZXBlbmQgb24gdGhpcyBwaXBlIGFsb25lICovCisJ Y29uc3Qgc3RydWN0IGludGVsX3dtX2NvbmZpZyBjb25maWcgPSB7CisJCS5udW1fcGlwZXNfYWN0 aXZlID0gMSwKKwkJLnNwcml0ZXNfZW5hYmxlZCA9IHBpcGVfd20tPnNwcml0ZXNfZW5hYmxlZCwK KwkJLnNwcml0ZXNfc2NhbGVkID0gcGlwZV93bS0+c3ByaXRlc19zY2FsZWQsCisJfTsKKwlzdHJ1 Y3QgaWxrX3dtX21heGltdW1zIG1heDsKKworCS8qIExQMCB3YXRlcm1hcmtzIGFsd2F5cyB1c2Ug MS8yIEREQiBwYXJ0aXRpb25pbmcgKi8KKwlpbGtfY29tcHV0ZV93bV9tYXhpbXVtcyhkZXYsIDAs ICZjb25maWcsIElOVEVMX0REQl9QQVJUXzFfMiwgJm1heCk7CisKKwkvKiBBdCBsZWFzdCBMUDAg bXVzdCBiZSB2YWxpZCAqLworCWlmICghaWxrX3ZhbGlkYXRlX3dtX2xldmVsKDAsICZtYXgsICZw aXBlX3dtLT53bVswXSkpIHsKKwkJRFJNX0RFQlVHX0tNUygiTFAwIHdhdGVybWFyayBpbnZhbGlk XG4iKTsKKwkJcmV0dXJuIGZhbHNlOworCX0KKworCXJldHVybiB0cnVlOworfQorCiAvKiBDb21w dXRlIG5ldyB3YXRlcm1hcmtzIGZvciB0aGUgcGlwZSAqLwogc3RhdGljIGludCBpbGtfY29tcHV0 ZV9waXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCQkJICAgICAgIHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKQEAgLTIyOTIsMTAgKzIzMTUsNiBAQCBzdGF0aWMg aW50IGlsa19jb21wdXRlX3BpcGVfd20oc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCiAJ c3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzcHJzdGF0ZSA9IE5VTEw7CiAJc3RydWN0IGludGVs X3BsYW5lX3N0YXRlICpjdXJzdGF0ZSA9IE5VTEw7CiAJaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBp bGtfd21fbWF4X2xldmVsKGRldik7Ci0JLyogTFAwIHdhdGVybWFyayBtYXhpbXVtcyBkZXBlbmQg b24gdGhpcyBwaXBlIGFsb25lICovCi0Jc3RydWN0IGludGVsX3dtX2NvbmZpZyBjb25maWcgPSB7 Ci0JCS5udW1fcGlwZXNfYWN0aXZlID0gMSwKLQl9OwogCXN0cnVjdCBpbGtfd21fbWF4aW11bXMg bWF4OwogCiAJY3N0YXRlID0gaW50ZWxfYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBpbnRl bF9jcnRjKTsKQEAgLTIzMTksMjEgKzIzMzgsMTggQEAgc3RhdGljIGludCBpbGtfY29tcHV0ZV9w aXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCQkJY3Vyc3RhdGUgPSB0b19p bnRlbF9wbGFuZV9zdGF0ZShwcyk7CiAJfQogCi0JY29uZmlnLnNwcml0ZXNfZW5hYmxlZCA9IHNw cnN0YXRlLT52aXNpYmxlOwotCWNvbmZpZy5zcHJpdGVzX3NjYWxlZCA9IHNwcnN0YXRlLT52aXNp YmxlICYmCisJcGlwZV93bS0+cGlwZV9lbmFibGVkID0gY3N0YXRlLT5iYXNlLmFjdGl2ZTsKKwlw aXBlX3dtLT5zcHJpdGVzX2VuYWJsZWQgPSBzcHJzdGF0ZS0+dmlzaWJsZTsKKwlwaXBlX3dtLT5z cHJpdGVzX3NjYWxlZCA9IHNwcnN0YXRlLT52aXNpYmxlICYmCiAJCShkcm1fcmVjdF93aWR0aCgm c3Byc3RhdGUtPmRzdCkgIT0gZHJtX3JlY3Rfd2lkdGgoJnNwcnN0YXRlLT5zcmMpID4+IDE2IHx8 CiAJCWRybV9yZWN0X2hlaWdodCgmc3Byc3RhdGUtPmRzdCkgIT0gZHJtX3JlY3RfaGVpZ2h0KCZz cHJzdGF0ZS0+c3JjKSA+PiAxNik7CiAKLQlwaXBlX3dtLT5waXBlX2VuYWJsZWQgPSBjc3RhdGUt PmJhc2UuYWN0aXZlOwotCXBpcGVfd20tPnNwcml0ZXNfZW5hYmxlZCA9IGNvbmZpZy5zcHJpdGVz X2VuYWJsZWQ7Ci0JcGlwZV93bS0+c3ByaXRlc19zY2FsZWQgPSBjb25maWcuc3ByaXRlc19zY2Fs ZWQ7Ci0KIAkvKiBJTEsvU05COiBMUDIrIHdhdGVybWFya3Mgb25seSB3L28gc3ByaXRlcyAqLwog CWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8PSA2ICYmIHNwcnN0YXRlLT52aXNpYmxlKQogCQlt YXhfbGV2ZWwgPSAxOwogCiAJLyogSUxLL1NOQi9JVkI6IExQMSsgd2F0ZXJtYXJrcyBvbmx5IHcv byBzY2FsaW5nICovCi0JaWYgKGNvbmZpZy5zcHJpdGVzX3NjYWxlZCkKKwlpZiAocGlwZV93bS0+ c3ByaXRlc19zY2FsZWQpCiAJCW1heF9sZXZlbCA9IDA7CiAKIAlpbGtfY29tcHV0ZV93bV9sZXZl bChkZXZfcHJpdiwgaW50ZWxfY3J0YywgMCwgY3N0YXRlLApAQCAtMjM0MiwxMiArMjM1OCw4IEBA IHN0YXRpYyBpbnQgaWxrX2NvbXB1dGVfcGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxf Y3J0YywKIAlpZiAoSVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYpKQogCQlwaXBl X3dtLT5saW5ldGltZSA9IGhzd19jb21wdXRlX2xpbmV0aW1lX3dtKGRldiwgY3N0YXRlKTsKIAot CS8qIExQMCB3YXRlcm1hcmtzIGFsd2F5cyB1c2UgMS8yIEREQiBwYXJ0aXRpb25pbmcgKi8KLQlp bGtfY29tcHV0ZV93bV9tYXhpbXVtcyhkZXYsIDAsICZjb25maWcsIElOVEVMX0REQl9QQVJUXzFf MiwgJm1heCk7Ci0KLQkvKiBBdCBsZWFzdCBMUDAgbXVzdCBiZSB2YWxpZCAqLwotCWlmICghaWxr X3ZhbGlkYXRlX3dtX2xldmVsKDAsICZtYXgsICZwaXBlX3dtLT53bVswXSkpCi0JCXJldHVybiAt RUlOVkFMOworCWlmICghaWxrX3ZhbGlkYXRlX3BpcGVfd20oZGV2LCBwaXBlX3dtKSkKKwkJcmV0 dXJuIGZhbHNlOwogCiAJaWxrX2NvbXB1dGVfd21fcmVnX21heGltdW1zKGRldiwgMSwgJm1heCk7 CiAKQEAgLTIzNzIsNiArMjM4NCw1OSBAQCBzdGF0aWMgaW50IGlsa19jb21wdXRlX3BpcGVfd20o c3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCiB9CiAKIC8qCisgKiBCdWlsZCBhIHNldCBv ZiAnaW50ZXJtZWRpYXRlJyB3YXRlcm1hcmsgdmFsdWVzIHRoYXQgc2F0aXNmeSBib3RoIHRoZSBv bGQKKyAqIHN0YXRlIGFuZCB0aGUgbmV3IHN0YXRlLiAgVGhlc2UgY2FuIGJlIHByb2dyYW1tZWQg dG8gdGhlIGhhcmR3YXJlCisgKiBpbW1lZGlhdGVseS4KKyAqLworc3RhdGljIGludCBpbGtfY29t cHV0ZV9pbnRlcm1lZGlhdGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCQkgICAgICAg c3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCisJCQkJICAgICAgIHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpuZXdzdGF0ZSkKK3sKKwlzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqYSA9ICZuZXdz dGF0ZS0+d20uaW50ZXJtZWRpYXRlOworCXN0cnVjdCBpbnRlbF9waXBlX3dtICpiID0gJmludGVs X2NydGMtPndtLmFjdGl2ZS5pbGs7CisJaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtfd21fbWF4 X2xldmVsKGRldik7CisKKwkvKgorCSAqIFN0YXJ0IHdpdGggdGhlIGZpbmFsLCB0YXJnZXQgd2F0 ZXJtYXJrcywgdGhlbiBjb21iaW5lIHdpdGggdGhlCisJICogY3VycmVudGx5IGFjdGl2ZSB3YXRl cm1hcmtzIHRvIGdldCB2YWx1ZXMgdGhhdCBhcmUgc2FmZSBib3RoIGJlZm9yZQorCSAqIGFuZCBh ZnRlciB0aGUgdmJsYW5rLgorCSAqLworCSphID0gbmV3c3RhdGUtPndtLm9wdGltYWwuaWxrOwor CWEtPnBpcGVfZW5hYmxlZCB8PSBiLT5waXBlX2VuYWJsZWQ7CisJYS0+c3ByaXRlc19lbmFibGVk IHw9IGItPnNwcml0ZXNfZW5hYmxlZDsKKwlhLT5zcHJpdGVzX3NjYWxlZCB8PSBiLT5zcHJpdGVz X3NjYWxlZDsKKworCWZvciAobGV2ZWwgPSAwOyBsZXZlbCA8PSBtYXhfbGV2ZWw7IGxldmVsKysp IHsKKwkJc3RydWN0IGludGVsX3dtX2xldmVsICphX3dtID0gJmEtPndtW2xldmVsXTsKKwkJY29u c3Qgc3RydWN0IGludGVsX3dtX2xldmVsICpiX3dtID0gJmItPndtW2xldmVsXTsKKworCQlhX3dt LT5lbmFibGUgJj0gYl93bS0+ZW5hYmxlOworCQlhX3dtLT5wcmlfdmFsID0gbWF4KGFfd20tPnBy aV92YWwsIGJfd20tPnByaV92YWwpOworCQlhX3dtLT5zcHJfdmFsID0gbWF4KGFfd20tPnNwcl92 YWwsIGJfd20tPnNwcl92YWwpOworCQlhX3dtLT5jdXJfdmFsID0gbWF4KGFfd20tPmN1cl92YWws IGJfd20tPmN1cl92YWwpOworCQlhX3dtLT5mYmNfdmFsID0gbWF4KGFfd20tPmZiY192YWwsIGJf d20tPmZiY192YWwpOworCX0KKworCS8qCisJICogV2UgbmVlZCB0byBtYWtlIHN1cmUgdGhhdCB0 aGVzZSBtZXJnZWQgd2F0ZXJtYXJrIHZhbHVlcyBhcmUKKwkgKiBhY3R1YWxseSBhIHZhbGlkIGNv bmZpZ3VyYXRpb24gdGhlbXNlbHZlcy4gIElmIHRoZXkncmUgbm90LAorCSAqIHRoZXJlJ3Mgbm8g c2FmZSB3YXkgdG8gdHJhbnNpdGlvbiBmcm9tIHRoZSBvbGQgc3RhdGUgdG8KKwkgKiB0aGUgbmV3 IHN0YXRlLCBzbyB3ZSBuZWVkIHRvIGZhaWwgdGhlIGF0b21pYyB0cmFuc2FjdGlvbi4KKwkgKi8K KwlpZiAoIWlsa192YWxpZGF0ZV9waXBlX3dtKGRldiwgYSkpCisJCXJldHVybiAtRUlOVkFMOwor CisJLyoKKwkgKiBJZiBvdXIgaW50ZXJtZWRpYXRlIFdNIGFyZSBpZGVudGljYWwgdG8gdGhlIGZp bmFsIFdNLCB0aGVuIHdlIGNhbgorCSAqIG9taXQgdGhlIHBvc3QtdmJsYW5rIHByb2dyYW1taW5n OyBvbmx5IHVwZGF0ZSBpZiBpdCdzIGRpZmZlcmVudC4KKwkgKi8KKwlpZiAobWVtY21wKGEsICZu ZXdzdGF0ZS0+d20ub3B0aW1hbC5pbGssIHNpemVvZigqYSkpID09IDApCisJCW5ld3N0YXRlLT53 bS5uZWVkX3Bvc3R2YmxfdXBkYXRlID0gZmFsc2U7CisKKwlyZXR1cm4gMDsKK30KKworLyoKICAq IE1lcmdlIHRoZSB3YXRlcm1hcmtzIGZyb20gYWxsIGFjdGl2ZSBwaXBlcyBmb3IgYSBzcGVjaWZp YyBsZXZlbC4KICAqLwogc3RhdGljIHZvaWQgaWxrX21lcmdlX3dtX2xldmVsKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCkBAIC0yMzgzLDkgKzI0NDgsNyBAQCBzdGF0aWMgdm9pZCBpbGtfbWVyZ2Vf d21fbGV2ZWwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlyZXRfd20tPmVuYWJsZSA9IHRydWU7 CiAKIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgaW50ZWxfY3J0YykgewotCQljb25zdCBzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlID0KLQkJCXRvX2ludGVsX2NydGNfc3RhdGUoaW50 ZWxfY3J0Yy0+YmFzZS5zdGF0ZSk7Ci0JCWNvbnN0IHN0cnVjdCBpbnRlbF9waXBlX3dtICphY3Rp dmUgPSAmY3N0YXRlLT53bS5vcHRpbWFsLmlsazsKKwkJY29uc3Qgc3RydWN0IGludGVsX3BpcGVf d20gKmFjdGl2ZSA9ICZpbnRlbF9jcnRjLT53bS5hY3RpdmUuaWxrOwogCQljb25zdCBzdHJ1Y3Qg aW50ZWxfd21fbGV2ZWwgKndtID0gJmFjdGl2ZS0+d21bbGV2ZWxdOwogCiAJCWlmICghYWN0aXZl LT5waXBlX2VuYWJsZWQpCkBAIC0yNTMzLDE1ICsyNTk2LDE0IEBAIHN0YXRpYyB2b2lkIGlsa19j b21wdXRlX3dtX3Jlc3VsdHMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogCS8qIExQMCByZWdp c3RlciB2YWx1ZXMgKi8KIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgaW50ZWxfY3J0Yykgewot CQljb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlID0KLQkJCXRvX2ludGVsX2Ny dGNfc3RhdGUoaW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZSk7CiAJCWVudW0gcGlwZSBwaXBlID0gaW50 ZWxfY3J0Yy0+cGlwZTsKLQkJY29uc3Qgc3RydWN0IGludGVsX3dtX2xldmVsICpyID0gJmNzdGF0 ZS0+d20ub3B0aW1hbC5pbGsud21bMF07CisJCWNvbnN0IHN0cnVjdCBpbnRlbF93bV9sZXZlbCAq ciA9CisJCQkmaW50ZWxfY3J0Yy0+d20uYWN0aXZlLmlsay53bVswXTsKIAogCQlpZiAoV0FSTl9P Tighci0+ZW5hYmxlKSkKIAkJCWNvbnRpbnVlOwogCi0JCXJlc3VsdHMtPndtX2xpbmV0aW1lW3Bp cGVdID0gY3N0YXRlLT53bS5vcHRpbWFsLmlsay5saW5ldGltZTsKKwkJcmVzdWx0cy0+d21fbGlu ZXRpbWVbcGlwZV0gPSBpbnRlbF9jcnRjLT53bS5hY3RpdmUuaWxrLmxpbmV0aW1lOwogCiAJCXJl c3VsdHMtPndtX3BpcGVbcGlwZV0gPQogCQkJKHItPnByaV92YWwgPDwgV00wX1BJUEVfUExBTkVf U0hJRlQpIHwKQEAgLTI3NDgsNyArMjgxMCw3IEBAIHN0YXRpYyB2b2lkIGlsa193cml0ZV93bV92 YWx1ZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWRldl9wcml2LT53bS5o dyA9ICpyZXN1bHRzOwogfQogCi1zdGF0aWMgYm9vbCBpbGtfZGlzYWJsZV9scF93bShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQorYm9vbCBpbGtfZGlzYWJsZV9scF93bShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2 X3ByaXZhdGU7CiAKQEAgLTM2NDMsMTEgKzM3MDUsOSBAQCBzdGF0aWMgdm9pZCBpbGtfY29tcHV0 ZV93bV9jb25maWcoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAl9CiB9CiAKLXN0YXRpYyB2b2lk IGlsa19wcm9ncmFtX3dhdGVybWFya3Moc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSkK K3N0YXRpYyB2b2lkIGlsa19wcm9ncmFtX3dhdGVybWFya3Moc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IGNzdGF0ZS0+YmFzZS5j cnRjOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7Ci0Jc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBkcm1fZGV2aWNl ICpkZXYgPSBkZXZfcHJpdi0+ZGV2OwogCXN0cnVjdCBpbnRlbF9waXBlX3dtIGxwX3dtXzFfMiA9 IHt9LCBscF93bV81XzYgPSB7fSwgKmJlc3RfbHBfd207CiAJc3RydWN0IGlsa193bV9tYXhpbXVt cyBtYXg7CiAJc3RydWN0IGludGVsX3dtX2NvbmZpZyBjb25maWcgPSB7fTsKQEAgLTM2NzgsMjgg KzM3MzgsMjggQEAgc3RhdGljIHZvaWQgaWxrX3Byb2dyYW1fd2F0ZXJtYXJrcyhzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQogCWlsa193cml0ZV93bV92YWx1ZXMoZGV2X3ByaXYsICZy ZXN1bHRzKTsKIH0KIAotc3RhdGljIHZvaWQgaWxrX3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMg KmNydGMpCitzdGF0aWMgdm9pZCBpbGtfaW5pdGlhbF93YXRlcm1hcmtzKHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjc3RhdGUpCiB7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0 b19pbnRlbF9jcnRjKGNydGMpOwotCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUgPSB0 b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKLQotCVdBUk5fT04oY3N0YXRlLT5iYXNl LmFjdGl2ZSAhPSBpbnRlbF9jcnRjLT5hY3RpdmUpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHRvX2k5MTUoY3N0YXRlLT5iYXNlLmNydGMtPmRldik7CisJc3RydWN0IGlu dGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNzdGF0ZS0+YmFzZS5jcnRjKTsK IAotCS8qCi0JICogSVZCIHdvcmthcm91bmQ6IG11c3QgZGlzYWJsZSBsb3cgcG93ZXIgd2F0ZXJt YXJrcyBmb3IgYXQgbGVhc3QKLQkgKiBvbmUgZnJhbWUgYmVmb3JlIGVuYWJsaW5nIHNjYWxpbmcu ICBMUCB3YXRlcm1hcmtzIGNhbiBiZSByZS1lbmFibGVkCi0JICogd2hlbiBzY2FsaW5nIGlzIGRp c2FibGVkLgotCSAqCi0JICogV2FDeFNSRGlzYWJsZWRGb3JTcHJpdGVTY2FsaW5nOml2YgotCSAq LwotCWlmIChjc3RhdGUtPmRpc2FibGVfbHBfd20pIHsKLQkJaWxrX2Rpc2FibGVfbHBfd20oY3J0 Yy0+ZGV2KTsKLQkJaW50ZWxfd2FpdF9mb3JfdmJsYW5rKGNydGMtPmRldiwgaW50ZWxfY3J0Yy0+ cGlwZSk7Ci0JfQorCW11dGV4X2xvY2soJmRldl9wcml2LT53bS53bV9tdXRleCk7CisJaW50ZWxf Y3J0Yy0+d20uYWN0aXZlLmlsayA9IGNzdGF0ZS0+d20uaW50ZXJtZWRpYXRlOworCWlsa19wcm9n cmFtX3dhdGVybWFya3MoZGV2X3ByaXYpOworCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPndtLndt X211dGV4KTsKK30KIAotCWludGVsX2NydGMtPndtLmFjdGl2ZS5pbGsgPSBjc3RhdGUtPndtLm9w dGltYWwuaWxrOworc3RhdGljIHZvaWQgaWxrX29wdGltaXplX3dhdGVybWFya3Moc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmNzdGF0ZSkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KGNzdGF0ZS0+YmFzZS5jcnRjLT5kZXYpOworCXN0cnVjdCBpbnRlbF9j cnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0Yyhjc3RhdGUtPmJhc2UuY3J0Yyk7CiAKLQlp bGtfcHJvZ3JhbV93YXRlcm1hcmtzKGNzdGF0ZSk7CisJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPndt LndtX211dGV4KTsKKwlpZiAoY3N0YXRlLT53bS5uZWVkX3Bvc3R2YmxfdXBkYXRlKSB7CisJCWlu dGVsX2NydGMtPndtLmFjdGl2ZS5pbGsgPSBjc3RhdGUtPndtLm9wdGltYWwuaWxrOworCQlpbGtf cHJvZ3JhbV93YXRlcm1hcmtzKGRldl9wcml2KTsKKwl9CisJbXV0ZXhfdW5sb2NrKCZkZXZfcHJp di0+d20ud21fbXV0ZXgpOwogfQogCiBzdGF0aWMgdm9pZCBza2xfcGlwZV93bV9hY3RpdmVfc3Rh dGUodWludDMyX3QgdmFsLApAQCAtNzA3Niw5ICs3MTM2LDEzIEBAIHZvaWQgaW50ZWxfaW5pdF9w bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkgICAgIGRldl9wcml2LT53bS5zcHJfbGF0ZW5j eVsxXSAmJiBkZXZfcHJpdi0+d20uY3VyX2xhdGVuY3lbMV0pIHx8CiAJCSAgICAoIUlTX0dFTjUo ZGV2KSAmJiBkZXZfcHJpdi0+d20ucHJpX2xhdGVuY3lbMF0gJiYKIAkJICAgICBkZXZfcHJpdi0+ d20uc3ByX2xhdGVuY3lbMF0gJiYgZGV2X3ByaXYtPndtLmN1cl9sYXRlbmN5WzBdKSkgewotCQkJ ZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtID0gaWxrX3VwZGF0ZV93bTsKIAkJCWRldl9wcml2 LT5kaXNwbGF5LmNvbXB1dGVfcGlwZV93bSA9IGlsa19jb21wdXRlX3BpcGVfd207Ci0JCQlkZXZf cHJpdi0+ZGlzcGxheS5wcm9ncmFtX3dhdGVybWFya3MgPSBpbGtfcHJvZ3JhbV93YXRlcm1hcmtz OworCQkJZGV2X3ByaXYtPmRpc3BsYXkuY29tcHV0ZV9pbnRlcm1lZGlhdGVfd20gPQorCQkJCWls a19jb21wdXRlX2ludGVybWVkaWF0ZV93bTsKKwkJCWRldl9wcml2LT5kaXNwbGF5LmluaXRpYWxf d2F0ZXJtYXJrcyA9CisJCQkJaWxrX2luaXRpYWxfd2F0ZXJtYXJrczsKKwkJCWRldl9wcml2LT5k aXNwbGF5Lm9wdGltaXplX3dhdGVybWFya3MgPQorCQkJCWlsa19vcHRpbWl6ZV93YXRlcm1hcmtz OwogCQl9IGVsc2UgewogCQkJRFJNX0RFQlVHX0tNUygiRmFpbGVkIHRvIHJlYWQgZGlzcGxheSBw bGFuZSBsYXRlbmN5LiAiCiAJCQkJICAgICAgIkRpc2FibGUgQ3hTUlxuIik7Ci0tIAoyLjEuNAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==