From: Peter Antoine Subject: [PATCH 1/6] drm/i915/guc: Make the GuC fw loading helper functions general Date: Tue, 21 Jun 2016 19:11:20 +0100 Message-ID: <1466532685-5101-2-git-send-email-peter.antoine@intel.com> References: <1466532685-5101-1-git-send-email-peter.antoine@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 9F3FB6E2C7 for ; Tue, 21 Jun 2016 18:14:19 +0000 (UTC) In-Reply-To: <1466532685-5101-1-git-send-email-peter.antoine@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: sean.v.kelley@intel.com, lawrence.t.li@intel.com, rodrigo.vivi@intel.com List-Id: intel-gfx@lists.freedesktop.org UmVuYW1lIHNvbWUgb2YgdGhlIEd1QyBmdyBsb2FkaW5nIGNvZGUgdG8gbWFrZSB0aGVtIG1vcmUg Z2VuZXJhbC4gV2UKd2lsbCB1dGlsaXplIHRoZW0gZm9yIEh1QyBsb2FkaW5nIGFzIHdlbGwuCiAg ICBzL2ludGVsX2d1Y19mdy9pbnRlbF91Y19mdy9nCiAgICBzL0dVQ19GSVJNV0FSRS9VQ19GSVJN V0FSRS9nCgpTdHJ1Y3QgaW50ZWxfZ3VjX2Z3IGlzIHJlbmFtZWQgdG8gaW50ZWxfdWNfZncuIFBy ZWZpeCBvZiB0dHMgbWVtYmVycywKc3VjaCBhcyAnZ3VjJyBvciAnZ3VjX2Z3JyBlaXRoZXIgaXMg cmVuYW1lZCB0byAndWMnIG9yIHJlbW92ZWQgZm9yCnNhbWUgcHVycG9zZS4KClNpZ25lZC1vZmYt Ynk6IEFsZXggRGFpIDx5dS5kYWlAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBQZXRlciBBbnRv aW5lIDxwZXRlci5hbnRvaW5lQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2RlYnVnZnMuYyAgICAgICAgfCAgMTIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z3VjX3N1Ym1pc3Npb24uYyB8ICAgNCArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3Vj LmggICAgICAgICAgIHwgIDM5ICsrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNf bG9hZGVyLmMgICAgfCAyMjEgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDQgZmlsZXMg Y2hhbmdlZCwgMTUxIGluc2VydGlvbnMoKyksIDEyNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IDdkNjNhZjAuLjY5OTY0YzIgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZGVidWdmcy5jCkBAIC0yNDgzLDcgKzI0ODMsNyBAQCBzdGF0aWMgaW50IGk5MTVf Z3VjX2xvYWRfc3RhdHVzX2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogewog CXN0cnVjdCBkcm1faW5mb19ub2RlICpub2RlID0gbS0+cHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBub2RlLT5taW5vci0+ZGV2LT5kZXZfcHJpdmF0ZTsKLQlz dHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncgPSAmZGV2X3ByaXYtPmd1Yy5ndWNfZnc7CisJc3Ry dWN0IGludGVsX3VjX2Z3ICpndWNfZncgPSAmZGV2X3ByaXYtPmd1Yy5ndWNfZnc7CiAJdTMyIHRt cCwgaTsKIAogCWlmICghSEFTX0dVQ19VQ09ERShkZXZfcHJpdikpCkBAIC0yNDkxLDE1ICsyNDkx LDE1IEBAIHN0YXRpYyBpbnQgaTkxNV9ndWNfbG9hZF9zdGF0dXNfaW5mbyhzdHJ1Y3Qgc2VxX2Zp bGUgKm0sIHZvaWQgKmRhdGEpCiAKIAlzZXFfcHJpbnRmKG0sICJHdUMgZmlybXdhcmUgc3RhdHVz OlxuIik7CiAJc2VxX3ByaW50ZihtLCAiXHRwYXRoOiAlc1xuIiwKLQkJZ3VjX2Z3LT5ndWNfZndf cGF0aCk7CisJCWd1Y19mdy0+dWNfZndfcGF0aCk7CiAJc2VxX3ByaW50ZihtLCAiXHRmZXRjaDog JXNcbiIsCi0JCWludGVsX2d1Y19md19zdGF0dXNfcmVwcihndWNfZnctPmd1Y19md19mZXRjaF9z dGF0dXMpKTsKKwkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5mZXRjaF9zdGF0dXMp KTsKIAlzZXFfcHJpbnRmKG0sICJcdGxvYWQ6ICVzXG4iLAotCQlpbnRlbF9ndWNfZndfc3RhdHVz X3JlcHIoZ3VjX2Z3LT5ndWNfZndfbG9hZF9zdGF0dXMpKTsKKwkJaW50ZWxfdWNfZndfc3RhdHVz X3JlcHIoZ3VjX2Z3LT5sb2FkX3N0YXR1cykpOwogCXNlcV9wcmludGYobSwgIlx0dmVyc2lvbiB3 YW50ZWQ6ICVkLiVkXG4iLAotCQlndWNfZnctPmd1Y19md19tYWpvcl93YW50ZWQsIGd1Y19mdy0+ Z3VjX2Z3X21pbm9yX3dhbnRlZCk7CisJCWd1Y19mdy0+bWFqb3JfdmVyX3dhbnRlZCwgZ3VjX2Z3 LT5taW5vcl92ZXJfd2FudGVkKTsKIAlzZXFfcHJpbnRmKG0sICJcdHZlcnNpb24gZm91bmQ6ICVk LiVkXG4iLAotCQlndWNfZnctPmd1Y19md19tYWpvcl9mb3VuZCwgZ3VjX2Z3LT5ndWNfZndfbWlu b3JfZm91bmQpOworCQlndWNfZnctPm1ham9yX3Zlcl9mb3VuZCwgZ3VjX2Z3LT5taW5vcl92ZXJf Zm91bmQpOwogCXNlcV9wcmludGYobSwgIlx0aGVhZGVyOiBvZmZzZXQgaXMgJWQ7IHNpemUgPSAl ZFxuIiwKIAkJZ3VjX2Z3LT5oZWFkZXJfb2Zmc2V0LCBndWNfZnctPmhlYWRlcl9zaXplKTsKIAlz ZXFfcHJpbnRmKG0sICJcdHVDb2RlOiBvZmZzZXQgaXMgJWQ7IHNpemUgPSAlZFxuIiwKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCAwMWM3Y2RmLi5iZmI4 NDAwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9u LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC0x MDM5LDcgKzEwMzksNyBAQCBpbnQgaW50ZWxfZ3VjX3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAlzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4OwogCXUzMiBkYXRhWzNdOwogCi0J aWYgKGd1Yy0+Z3VjX2Z3Lmd1Y19md19sb2FkX3N0YXR1cyAhPSBHVUNfRklSTVdBUkVfU1VDQ0VT UykKKwlpZiAoZ3VjLT5ndWNfZncubG9hZF9zdGF0dXMgIT0gVUNfRklSTVdBUkVfU1VDQ0VTUykK IAkJcmV0dXJuIDA7CiAKIAljdHggPSBkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQ7CkBAIC0xMDY1 LDcgKzEwNjUsNyBAQCBpbnQgaW50ZWxfZ3VjX3Jlc3VtZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCXN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHg7CiAJdTMyIGRhdGFbM107CiAKLQlpZiAo Z3VjLT5ndWNfZncuZ3VjX2Z3X2xvYWRfc3RhdHVzICE9IEdVQ19GSVJNV0FSRV9TVUNDRVNTKQor CWlmIChndWMtPmd1Y19mdy5sb2FkX3N0YXR1cyAhPSBVQ19GSVJNV0FSRV9TVUNDRVNTKQogCQly ZXR1cm4gMDsKIAogCWN0eCA9IGRldl9wcml2LT5rZXJuZWxfY29udGV4dDsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZ3VjLmgKaW5kZXggM2UzZTc0My4uODM2NDIwYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Z3VjLmgKQEAgLTkwLDI5ICs5MCwyOSBAQCBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50IHsKIAl1aW50 NjRfdCBzdWJtaXNzaW9uc1tJOTE1X05VTV9FTkdJTkVTXTsKIH07CiAKLWVudW0gaW50ZWxfZ3Vj X2Z3X3N0YXR1cyB7Ci0JR1VDX0ZJUk1XQVJFX0ZBSUwgPSAtMSwKLQlHVUNfRklSTVdBUkVfTk9O RSA9IDAsCi0JR1VDX0ZJUk1XQVJFX1BFTkRJTkcsCi0JR1VDX0ZJUk1XQVJFX1NVQ0NFU1MKK2Vu dW0gaW50ZWxfdWNfZndfc3RhdHVzIHsKKwlVQ19GSVJNV0FSRV9GQUlMID0gLTEsCisJVUNfRklS TVdBUkVfTk9ORSA9IDAsCisJVUNfRklSTVdBUkVfUEVORElORywKKwlVQ19GSVJNV0FSRV9TVUND RVNTCiB9OwogCiAvKgogICogVGhpcyBzdHJ1Y3R1cmUgZW5jYXBzdWxhdGVzIGFsbCB0aGUgZGF0 YSBuZWVkZWQgZHVyaW5nIHRoZSBwcm9jZXNzCiAgKiBvZiBmZXRjaGluZywgY2FjaGluZywgYW5k IGxvYWRpbmcgdGhlIGZpcm13YXJlIGltYWdlIGludG8gdGhlIEd1Qy4KICAqLwotc3RydWN0IGlu dGVsX2d1Y19mdyB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKgkJZ3VjX2RldjsKLQljb25zdCBjaGFy ICoJCQlndWNfZndfcGF0aDsKLQlzaXplX3QJCQkJZ3VjX2Z3X3NpemU7Ci0Jc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKglndWNfZndfb2JqOwotCWVudW0gaW50ZWxfZ3VjX2Z3X3N0YXR1cwln dWNfZndfZmV0Y2hfc3RhdHVzOwotCWVudW0gaW50ZWxfZ3VjX2Z3X3N0YXR1cwlndWNfZndfbG9h ZF9zdGF0dXM7Ci0KLQl1aW50MTZfdAkJCWd1Y19md19tYWpvcl93YW50ZWQ7Ci0JdWludDE2X3QJ CQlndWNfZndfbWlub3Jfd2FudGVkOwotCXVpbnQxNl90CQkJZ3VjX2Z3X21ham9yX2ZvdW5kOwot CXVpbnQxNl90CQkJZ3VjX2Z3X21pbm9yX2ZvdW5kOworc3RydWN0IGludGVsX3VjX2Z3IHsKKwlz dHJ1Y3QgZHJtX2RldmljZSAqdWNfZGV2OworCWNvbnN0IGNoYXIgKnVjX2Z3X3BhdGg7CisJc2l6 ZV90IHVjX2Z3X3NpemU7CisJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKnVjX2Z3X29iajsK KwllbnVtIGludGVsX3VjX2Z3X3N0YXR1cyBmZXRjaF9zdGF0dXM7CisJZW51bSBpbnRlbF91Y19m d19zdGF0dXMJbG9hZF9zdGF0dXM7CisKKwl1aW50MTZfdCBtYWpvcl92ZXJfd2FudGVkOworCXVp bnQxNl90IG1pbm9yX3Zlcl93YW50ZWQ7CisJdWludDE2X3QgbWFqb3JfdmVyX2ZvdW5kOworCXVp bnQxNl90IG1pbm9yX3Zlcl9mb3VuZDsKIAogCXVpbnQzMl90IGhlYWRlcl9zaXplOwogCXVpbnQz Ml90IGhlYWRlcl9vZmZzZXQ7CkBAIC0xMjMsNyArMTIzLDcgQEAgc3RydWN0IGludGVsX2d1Y19m dyB7CiB9OwogCiBzdHJ1Y3QgaW50ZWxfZ3VjIHsKLQlzdHJ1Y3QgaW50ZWxfZ3VjX2Z3IGd1Y19m dzsKKwlzdHJ1Y3QgaW50ZWxfdWNfZncgZ3VjX2Z3OwogCXVpbnQzMl90IGxvZ19mbGFnczsKIAlz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqbG9nX29iajsKIApAQCAtMTUyLDkgKzE1MiwxMCBA QCBzdHJ1Y3QgaW50ZWxfZ3VjIHsKIGV4dGVybiB2b2lkIGludGVsX2d1Y19pbml0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpOwogZXh0ZXJuIGludCBpbnRlbF9ndWNfc2V0dXAoc3RydWN0IGRybV9k ZXZpY2UgKmRldik7CiBleHRlcm4gdm9pZCBpbnRlbF9ndWNfZmluaShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KTsKLWV4dGVybiBjb25zdCBjaGFyICppbnRlbF9ndWNfZndfc3RhdHVzX3JlcHIoZW51 bSBpbnRlbF9ndWNfZndfc3RhdHVzIHN0YXR1cyk7CitleHRlcm4gY29uc3QgY2hhciAqaW50ZWxf dWNfZndfc3RhdHVzX3JlcHIoZW51bSBpbnRlbF91Y19md19zdGF0dXMgc3RhdHVzKTsKIGV4dGVy biBpbnQgaW50ZWxfZ3VjX3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBleHRlcm4g aW50IGludGVsX2d1Y19yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Cit2b2lkIGludGVs X3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpbnRlbF91Y19mdyAq dWNfZncpOwogCiAvKiBpOTE1X2d1Y19zdWJtaXNzaW9uLmMgKi8KIGludCBpOTE1X2d1Y19zdWJt aXNzaW9uX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwppbmRleCA4ZmU5NmEyLi5mZjA1NGY1IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCkBAIC02NiwxNiArNjYsMTYgQEAg TU9EVUxFX0ZJUk1XQVJFKEk5MTVfU0tMX0dVQ19VQ09ERSk7CiBNT0RVTEVfRklSTVdBUkUoSTkx NV9CWFRfR1VDX1VDT0RFKTsKIAogLyogVXNlci1mcmllbmRseSByZXByZXNlbnRhdGlvbiBvZiBh biBlbnVtICovCi1jb25zdCBjaGFyICppbnRlbF9ndWNfZndfc3RhdHVzX3JlcHIoZW51bSBpbnRl bF9ndWNfZndfc3RhdHVzIHN0YXR1cykKK2NvbnN0IGNoYXIgKmludGVsX3VjX2Z3X3N0YXR1c19y ZXByKGVudW0gaW50ZWxfdWNfZndfc3RhdHVzIHN0YXR1cykKIHsKIAlzd2l0Y2ggKHN0YXR1cykg ewotCWNhc2UgR1VDX0ZJUk1XQVJFX0ZBSUw6CisJY2FzZSBVQ19GSVJNV0FSRV9GQUlMOgogCQly ZXR1cm4gIkZBSUwiOwotCWNhc2UgR1VDX0ZJUk1XQVJFX05PTkU6CisJY2FzZSBVQ19GSVJNV0FS RV9OT05FOgogCQlyZXR1cm4gIk5PTkUiOwotCWNhc2UgR1VDX0ZJUk1XQVJFX1BFTkRJTkc6CisJ Y2FzZSBVQ19GSVJNV0FSRV9QRU5ESU5HOgogCQlyZXR1cm4gIlBFTkRJTkciOwotCWNhc2UgR1VD X0ZJUk1XQVJFX1NVQ0NFU1M6CisJY2FzZSBVQ19GSVJNV0FSRV9TVUNDRVNTOgogCQlyZXR1cm4g IlNVQ0NFU1MiOwogCWRlZmF1bHQ6CiAJCXJldHVybiAiVU5LTk9XTiEiOwpAQCAtMjM4LDggKzIz OCw4IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBndWNfdWNvZGVfcmVzcG9uc2Uoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAogICovCiBzdGF0aWMgaW50IGd1Y191Y29kZV94ZmVyX2Rt YShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGludGVsX2d1 Y19mdyAqZ3VjX2Z3ID0gJmRldl9wcml2LT5ndWMuZ3VjX2Z3OwotCXN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICpmd19vYmogPSBndWNfZnctPmd1Y19md19vYmo7CisJc3RydWN0IGludGVsX3Vj X2Z3ICpndWNfZncgPSAmZGV2X3ByaXYtPmd1Yy5ndWNfZnc7CisJc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKmZ3X29iaiA9IGd1Y19mdy0+dWNfZndfb2JqOwogCXVuc2lnbmVkIGxvbmcgb2Zm c2V0OwogCXN0cnVjdCBzZ190YWJsZSAqc2cgPSBmd19vYmotPnBhZ2VzOwogCXUzMiBzdGF0dXMs IHJzYVtVT1NfUlNBX1NDUkFUQ0hfTUFYX0NPVU5UXTsKQEAgLTMxMSwxNyArMzExLDE3IEBAIHN0 YXRpYyB1MzIgZ3VjX3dvcGNtX3NpemUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogICovCiBzdGF0aWMgaW50IGd1Y191Y29kZV94ZmVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncgPSAmZGV2X3ByaXYt Pmd1Yy5ndWNfZnc7CisJc3RydWN0IGludGVsX3VjX2Z3ICpndWNfZncgPSAmZGV2X3ByaXYtPmd1 Yy5ndWNfZnc7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGRldl9wcml2LT5kZXY7CiAJaW50 IHJldDsKIAotCXJldCA9IGk5MTVfZ2VtX29iamVjdF9zZXRfdG9fZ3R0X2RvbWFpbihndWNfZnct Pmd1Y19md19vYmosIGZhbHNlKTsKKwlyZXQgPSBpOTE1X2dlbV9vYmplY3Rfc2V0X3RvX2d0dF9k b21haW4oZ3VjX2Z3LT51Y19md19vYmosIGZhbHNlKTsKIAlpZiAocmV0KSB7CiAJCURSTV9ERUJV R19EUklWRVIoInNldC1kb21haW4gZmFpbGVkICVkXG4iLCByZXQpOwogCQlyZXR1cm4gcmV0Owog CX0KIAotCXJldCA9IGk5MTVfZ2VtX29ial9nZ3R0X3BpbihndWNfZnctPmd1Y19md19vYmosIDAs IDApOworCXJldCA9IGk5MTVfZ2VtX29ial9nZ3R0X3BpbihndWNfZnctPnVjX2Z3X29iaiwgMCwg MCk7CiAJaWYgKHJldCkgewogCQlEUk1fREVCVUdfRFJJVkVSKCJwaW4gZmFpbGVkICVkXG4iLCBy ZXQpOwogCQlyZXR1cm4gcmV0OwpAQCAtMzczLDcgKzM3Myw3IEBAIHN0YXRpYyBpbnQgZ3VjX3Vj b2RlX3hmZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCSAqIFdlIGtlZXAg dGhlIG9iamVjdCBwYWdlcyBmb3IgcmV1c2UgZHVyaW5nIHJlc3VtZS4gQnV0IHdlIGNhbiB1bnBp biBpdAogCSAqIG5vdyB0aGF0IERNQSBoYXMgY29tcGxldGVkLCBzbyBpdCBkb2Vzbid0IGNvbnRp bnVlIHRvIHRha2UgdXAgc3BhY2UuCiAJICovCi0JaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4o Z3VjX2Z3LT5ndWNfZndfb2JqKTsKKwlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihndWNfZnct PnVjX2Z3X29iaik7CiAKIAlyZXR1cm4gcmV0OwogfQpAQCAtNDEyLDQ2ICs0MTIsNTggQEAgc3Rh dGljIGludCBpOTE1X3Jlc2V0X2d1YyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiBpbnQgaW50ZWxfZ3VjX3NldHVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQlzdHJ1Y3Qg aW50ZWxfZ3VjX2Z3ICpndWNfZncgPSAmZGV2X3ByaXYtPmd1Yy5ndWNfZnc7Ci0JY29uc3QgY2hh ciAqZndfcGF0aCA9IGd1Y19mdy0+Z3VjX2Z3X3BhdGg7Ci0JaW50IHJldHJpZXMsIHJldCwgZXJy OwotCi0JRFJNX0RFQlVHX0RSSVZFUigiR3VDIGZ3IHN0YXR1czogcGF0aCAlcywgZmV0Y2ggJXMs IGxvYWQgJXNcbiIsCi0JCWZ3X3BhdGgsCi0JCWludGVsX2d1Y19md19zdGF0dXNfcmVwcihndWNf ZnctPmd1Y19md19mZXRjaF9zdGF0dXMpLAotCQlpbnRlbF9ndWNfZndfc3RhdHVzX3JlcHIoZ3Vj X2Z3LT5ndWNfZndfbG9hZF9zdGF0dXMpKTsKLQotCS8qIExvYWRpbmcgZm9yYmlkZGVuLCBvciBu byBmaXJtd2FyZSB0byBsb2FkPyAqLwotCWlmICghaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcpIHsK LQkJZXJyID0gMDsKLQkJZ290byBmYWlsOwotCX0gZWxzZSBpZiAoZndfcGF0aCA9PSBOVUxMKSB7 Ci0JCS8qIERldmljZSBpcyBrbm93biB0byBoYXZlIG5vIHVDb2RlIChlLmcuIG5vIEd1QykgKi8K LQkJZXJyID0gLUVOWElPOwotCQlnb3RvIGZhaWw7Ci0JfSBlbHNlIGlmICgqZndfcGF0aCA9PSAn XDAnKSB7Ci0JCS8qIERldmljZSBoYXMgYSBHdUMgYnV0IHdlIGRvbid0IGtub3cgd2hhdCBmL3cg dG8gbG9hZD8gKi8KLQkJRFJNX0lORk8oIk5vIEd1QyBmaXJtd2FyZSBrbm93biBmb3IgdGhpcyBw bGF0Zm9ybVxuIik7Ci0JCWVyciA9IC1FTk9ERVY7Ci0JCWdvdG8gZmFpbDsKLQl9CisJc3RydWN0 IGludGVsX3VjX2Z3ICpndWNfZncgPSAmZGV2X3ByaXYtPmd1Yy5ndWNfZnc7CisJaW50IHJldHJp ZXMsIHJldCwgZXJyID0gMDsKKworCWlmICghaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcpCisJCXJl dHVybiAwOworCisJRFJNX0RFQlVHX0RSSVZFUigiR3VDIGZ3IHN0YXR1czogZmV0Y2ggJXMsIGxv YWQgJXNcbiIsCisJCWludGVsX3VjX2Z3X3N0YXR1c19yZXByKGd1Y19mdy0+ZmV0Y2hfc3RhdHVz KSwKKwkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5sb2FkX3N0YXR1cykpOworCisJ ZGlyZWN0X2ludGVycnVwdHNfdG9faG9zdChkZXZfcHJpdik7CisKKwlpZiAoZ3VjX2Z3LT5mZXRj aF9zdGF0dXMgPT0gVUNfRklSTVdBUkVfTk9ORSkKKwkJcmV0dXJuIDA7CisKKwlpZiAoZ3VjX2Z3 LT5mZXRjaF9zdGF0dXMgPT0gVUNfRklSTVdBUkVfU1VDQ0VTUyAmJgorCSAgICBndWNfZnctPmxv YWRfc3RhdHVzID09IFVDX0ZJUk1XQVJFX0ZBSUwpCisJCXJldHVybiAtRU5PRVhFQzsKIAotCS8q IEZldGNoIGZhaWxlZCwgb3IgYWxyZWFkeSBmZXRjaGVkIGJ1dCBmYWlsZWQgdG8gbG9hZD8gKi8K LQlpZiAoZ3VjX2Z3LT5ndWNfZndfZmV0Y2hfc3RhdHVzICE9IEdVQ19GSVJNV0FSRV9TVUNDRVNT KSB7CisJZ3VjX2Z3LT5sb2FkX3N0YXR1cyA9IFVDX0ZJUk1XQVJFX1BFTkRJTkc7CisKKwlEUk1f REVCVUdfRFJJVkVSKCJHdUMgZncgZmV0Y2ggc3RhdHVzICVzXG4iLAorCQlpbnRlbF91Y19md19z dGF0dXNfcmVwcihndWNfZnctPmZldGNoX3N0YXR1cykpOworCisJc3dpdGNoIChndWNfZnctPmZl dGNoX3N0YXR1cykgeworCWNhc2UgVUNfRklSTVdBUkVfRkFJTDoKKwkJLyogc29tZXRoaW5nIHdl bnQgd3JvbmcgOiggKi8KIAkJZXJyID0gLUVJTzsKIAkJZ290byBmYWlsOwotCX0gZWxzZSBpZiAo Z3VjX2Z3LT5ndWNfZndfbG9hZF9zdGF0dXMgPT0gR1VDX0ZJUk1XQVJFX0ZBSUwpIHsKLQkJZXJy ID0gLUVOT0VYRUM7CisKKwljYXNlIFVDX0ZJUk1XQVJFX05PTkU6CisJY2FzZSBVQ19GSVJNV0FS RV9QRU5ESU5HOgorCWRlZmF1bHQ6CisJCS8qICJjYW4ndCBoYXBwZW4iICovCisJCVdBUk5fT05D RSgxLCAiR3VDIGZ3ICVzIGludmFsaWQgZ3VjX2Z3X2ZldGNoX3N0YXR1cyAlcyBbJWRdXG4iLAor CQkJZ3VjX2Z3LT51Y19md19wYXRoLAorCQkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3 LT5mZXRjaF9zdGF0dXMpLAorCQkJZ3VjX2Z3LT5mZXRjaF9zdGF0dXMpOworCQllcnIgPSAtRU5Y SU87CiAJCWdvdG8gZmFpbDsKKworCWNhc2UgVUNfRklSTVdBUkVfU1VDQ0VTUzoKKwkJYnJlYWs7 CiAJfQogCiAJZGlyZWN0X2ludGVycnVwdHNfdG9faG9zdChkZXZfcHJpdik7CiAKLQlndWNfZnct Pmd1Y19md19sb2FkX3N0YXR1cyA9IEdVQ19GSVJNV0FSRV9QRU5ESU5HOworCWd1Y19mdy0+bG9h ZF9zdGF0dXMgPSBVQ19GSVJNV0FSRV9QRU5ESU5HOwogCiAJRFJNX0RFQlVHX0RSSVZFUigiR3VD IGZ3IHN0YXR1czogZmV0Y2ggJXMsIGxvYWQgJXNcbiIsCi0JCWludGVsX2d1Y19md19zdGF0dXNf cmVwcihndWNfZnctPmd1Y19md19mZXRjaF9zdGF0dXMpLAotCQlpbnRlbF9ndWNfZndfc3RhdHVz X3JlcHIoZ3VjX2Z3LT5ndWNfZndfbG9hZF9zdGF0dXMpKTsKKwkJaW50ZWxfdWNfZndfc3RhdHVz X3JlcHIoZ3VjX2Z3LT5mZXRjaF9zdGF0dXMpLAorCQlpbnRlbF91Y19md19zdGF0dXNfcmVwcihn dWNfZnctPmxvYWRfc3RhdHVzKSk7CiAKIAllcnIgPSBpOTE1X2d1Y19zdWJtaXNzaW9uX2luaXQo ZGV2X3ByaXYpOwogCWlmIChlcnIpCkBAIC00ODUsMTEgKzQ5NywxMSBAQCBpbnQgaW50ZWxfZ3Vj X3NldHVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQkgInJldHJ5ICVkIG1vcmUgdGltZShz KVxuIiwgZXJyLCByZXRyaWVzKTsKIAl9CiAKLQlndWNfZnctPmd1Y19md19sb2FkX3N0YXR1cyA9 IEdVQ19GSVJNV0FSRV9TVUNDRVNTOworCWd1Y19mdy0+bG9hZF9zdGF0dXMgPSBVQ19GSVJNV0FS RV9TVUNDRVNTOwogCiAJRFJNX0RFQlVHX0RSSVZFUigiR3VDIGZ3IHN0YXR1czogZmV0Y2ggJXMs IGxvYWQgJXNcbiIsCi0JCWludGVsX2d1Y19md19zdGF0dXNfcmVwcihndWNfZnctPmd1Y19md19m ZXRjaF9zdGF0dXMpLAotCQlpbnRlbF9ndWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5ndWNfZndf bG9hZF9zdGF0dXMpKTsKKwkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5mZXRjaF9z dGF0dXMpLAorCQlpbnRlbF91Y19md19zdGF0dXNfcmVwcihndWNfZnctPmxvYWRfc3RhdHVzKSk7 CiAKIAlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pIHsKIAkJZXJyID0gaTkxNV9ndWNf c3VibWlzc2lvbl9lbmFibGUoZGV2X3ByaXYpOwpAQCAtNTAxLDggKzUxMyw4IEBAIGludCBpbnRl bF9ndWNfc2V0dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlyZXR1cm4gMDsKIAogZmFpbDoK LQlpZiAoZ3VjX2Z3LT5ndWNfZndfbG9hZF9zdGF0dXMgPT0gR1VDX0ZJUk1XQVJFX1BFTkRJTkcp Ci0JCWd1Y19mdy0+Z3VjX2Z3X2xvYWRfc3RhdHVzID0gR1VDX0ZJUk1XQVJFX0ZBSUw7CisJaWYg KGd1Y19mdy0+bG9hZF9zdGF0dXMgPT0gVUNfRklSTVdBUkVfUEVORElORykKKwkJZ3VjX2Z3LT5s b2FkX3N0YXR1cyA9IFVDX0ZJUk1XQVJFX0ZBSUw7CiAKIAlkaXJlY3RfaW50ZXJydXB0c190b19o b3N0KGRldl9wcml2KTsKIAlpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoZGV2X3ByaXYpOwpA QCAtNTM1LDcgKzU0Nyw3IEBAIGZhaWw6CiAJCURSTV9FUlJPUigiR3VDIGZpcm13YXJlIGxvYWQg ZmFpbGVkOiAlZFxuIiwgZXJyKTsKIAogCWlmIChpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbikg ewotCQlpZiAoZndfcGF0aCA9PSBOVUxMKQorCQlpZiAoZ3VjX2Z3LT51Y19md19wYXRoID09IE5V TEwpCiAJCQlEUk1fSU5GTygiR3VDIHN1Ym1pc3Npb24gd2l0aG91dCBmaXJtd2FyZSBub3Qgc3Vw cG9ydGVkXG4iKTsKIAkJaWYgKHJldCA9PSAwKQogCQkJRFJNX0lORk8oIkZhbGxpbmcgYmFjayBm cm9tIEd1QyBzdWJtaXNzaW9uIHRvIGV4ZWNsaXN0IG1vZGVcbiIpOwpAQCAtNTQ3LDcgKzU1OSwx OCBAQCBmYWlsOgogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyB2b2lkIGd1Y19md19mZXRjaChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncpCisvKioK KyAqIGludGVsX3VjX2Z3X2ZldGNoKCkgLSBmZXRjaCBmdyBibG9iIGFuZCBzYXZlIGl0IHRvIGlu dGVybmFsIG9iagorICogQGRldjoJZHJtIGRldmljZQorICogQHVjX2Z3Ogl0aGUgaW50ZWxfdWNf ZncgdG8gYmUgc2V0dXAKKyAqCisgKiBUaGUgY2FsbGVyIHNob3VsZCBoYXZlIHNldHVwIGZ3IHBh dGggYW5kIGZ3IHZlcnNpb24gcmVxdWlyZWQuIFRoaXMgZnVuY3Rpb24KKyAqIGZpcnN0IGZldGNo IHRoZSBmdyBibG9iIGZyb20gZmlsZSBzeXN0ZW0uIElmIHN1Y2NlZWQsIGl0IHdpbGwgZG8gc29t ZSBiYXNpYworICogY2hlY2sgYmFzZWQgb24gY3NzIGhlYWRlciBpbmZvcm1hdGlvbi4gQXQgbGFz dCwgYSBHRU0gb2JqIGlzIGNyZWF0ZWQgYW5kCisgKiBmaWxsZWQgd2l0aCB0aGUgZncgZGF0YS4g VGhpcyBvYmogd2lsbCBiZSBsb2FkZWQgdG8gSFcgYXQgbGF0ZXIgc3RhZ2Ugb2YKKyAqIGRyaXZl ciBpbml0IHByb2Nlc3MuCisgKi8KK3ZvaWQgaW50ZWxfdWNfZndfZmV0Y2goc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgc3RydWN0IGludGVsX3VjX2Z3ICp1Y19mdykKIHsKIAlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqOwogCWNvbnN0IHN0cnVjdCBmaXJtd2FyZSAqZnc7CkBAIC01NTUs MTcgKzU3OCwxNyBAQCBzdGF0aWMgdm9pZCBndWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgc3RydWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3KQogCXNpemVfdCBzaXplOwogCWludCBl cnI7CiAKLQlEUk1fREVCVUdfRFJJVkVSKCJiZWZvcmUgcmVxdWVzdGluZyBmaXJtd2FyZTogR3VD IGZ3IGZldGNoIHN0YXR1cyAlc1xuIiwKLQkJaW50ZWxfZ3VjX2Z3X3N0YXR1c19yZXByKGd1Y19m dy0+Z3VjX2Z3X2ZldGNoX3N0YXR1cykpOworCURSTV9ERUJVR19EUklWRVIoImJlZm9yZSByZXF1 ZXN0aW5nIGZpcm13YXJlOiB1QyBmdyBmZXRjaCBzdGF0dXMgJXNcbiIsCisJCWludGVsX3VjX2Z3 X3N0YXR1c19yZXByKHVjX2Z3LT5mZXRjaF9zdGF0dXMpKTsKIAotCWVyciA9IHJlcXVlc3RfZmly bXdhcmUoJmZ3LCBndWNfZnctPmd1Y19md19wYXRoLCAmZGV2LT5wZGV2LT5kZXYpOworCWVyciA9 IHJlcXVlc3RfZmlybXdhcmUoJmZ3LCB1Y19mdy0+dWNfZndfcGF0aCwgJmRldi0+cGRldi0+ZGV2 KTsKIAlpZiAoZXJyKQogCQlnb3RvIGZhaWw7CiAJaWYgKCFmdykKIAkJZ290byBmYWlsOwogCi0J RFJNX0RFQlVHX0RSSVZFUigiZmV0Y2ggR3VDIGZ3IGZyb20gJXMgc3VjY2VlZGVkLCBmdyAlcFxu IiwKLQkJZ3VjX2Z3LT5ndWNfZndfcGF0aCwgZncpOworCURSTV9ERUJVR19EUklWRVIoImZldGNo IHVDIGZ3IGZyb20gJXMgc3VjY2VlZGVkLCBmdyAlcFxuIiwKKwkJdWNfZnctPnVjX2Z3X3BhdGgs IGZ3KTsKIAogCS8qIENoZWNrIHRoZSBzaXplIG9mIHRoZSBibG9iIGJlZm9yZSBleGFtaW5pbmcg YnVmZmVyIGNvbnRlbnRzICovCiAJaWYgKGZ3LT5zaXplIDwgc2l6ZW9mKHN0cnVjdCBndWNfY3Nz X2hlYWRlcikpIHsKQEAgLTU3Niw2MiArNTk5LDY0IEBAIHN0YXRpYyB2b2lkIGd1Y19md19mZXRj aChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncpCiAJ Y3NzID0gKHN0cnVjdCBndWNfY3NzX2hlYWRlciAqKWZ3LT5kYXRhOwogCiAJLyogRmlybXdhcmUg Yml0cyBhbHdheXMgc3RhcnQgZnJvbSBoZWFkZXIgKi8KLQlndWNfZnctPmhlYWRlcl9vZmZzZXQg PSAwOwotCWd1Y19mdy0+aGVhZGVyX3NpemUgPSAoY3NzLT5oZWFkZXJfc2l6ZV9kdyAtIGNzcy0+ bW9kdWx1c19zaXplX2R3IC0KKwl1Y19mdy0+aGVhZGVyX29mZnNldCA9IDA7CisJdWNfZnctPmhl YWRlcl9zaXplID0gKGNzcy0+aGVhZGVyX3NpemVfZHcgLSBjc3MtPm1vZHVsdXNfc2l6ZV9kdyAt CiAJCWNzcy0+a2V5X3NpemVfZHcgLSBjc3MtPmV4cG9uZW50X3NpemVfZHcpICogc2l6ZW9mKHUz Mik7CiAKLQlpZiAoZ3VjX2Z3LT5oZWFkZXJfc2l6ZSAhPSBzaXplb2Yoc3RydWN0IGd1Y19jc3Nf aGVhZGVyKSkgeworCWlmICh1Y19mdy0+aGVhZGVyX3NpemUgIT0gc2l6ZW9mKHN0cnVjdCBndWNf Y3NzX2hlYWRlcikpIHsKIAkJRFJNX0VSUk9SKCJDU1MgaGVhZGVyIGRlZmluaXRpb24gbWlzbWF0 Y2hcbiIpOwogCQlnb3RvIGZhaWw7CiAJfQogCiAJLyogdGhlbiwgdUNvZGUgKi8KLQlndWNfZnct PnVjb2RlX29mZnNldCA9IGd1Y19mdy0+aGVhZGVyX29mZnNldCArIGd1Y19mdy0+aGVhZGVyX3Np emU7Ci0JZ3VjX2Z3LT51Y29kZV9zaXplID0gKGNzcy0+c2l6ZV9kdyAtIGNzcy0+aGVhZGVyX3Np emVfZHcpICogc2l6ZW9mKHUzMik7CisJdWNfZnctPnVjb2RlX29mZnNldCA9IHVjX2Z3LT5oZWFk ZXJfb2Zmc2V0ICsgdWNfZnctPmhlYWRlcl9zaXplOworCXVjX2Z3LT51Y29kZV9zaXplID0gKGNz cy0+c2l6ZV9kdyAtIGNzcy0+aGVhZGVyX3NpemVfZHcpICogc2l6ZW9mKHUzMik7CiAKIAkvKiBu b3cgUlNBICovCiAJaWYgKGNzcy0+a2V5X3NpemVfZHcgIT0gVU9TX1JTQV9TQ1JBVENIX01BWF9D T1VOVCkgewogCQlEUk1fRVJST1IoIlJTQSBrZXkgc2l6ZSBpcyBiYWRcbiIpOwogCQlnb3RvIGZh aWw7CiAJfQotCWd1Y19mdy0+cnNhX29mZnNldCA9IGd1Y19mdy0+dWNvZGVfb2Zmc2V0ICsgZ3Vj X2Z3LT51Y29kZV9zaXplOwotCWd1Y19mdy0+cnNhX3NpemUgPSBjc3MtPmtleV9zaXplX2R3ICog c2l6ZW9mKHUzMik7CisJdWNfZnctPnJzYV9vZmZzZXQgPSB1Y19mdy0+dWNvZGVfb2Zmc2V0ICsg dWNfZnctPnVjb2RlX3NpemU7CisJdWNfZnctPnJzYV9zaXplID0gY3NzLT5rZXlfc2l6ZV9kdyAq IHNpemVvZih1MzIpOwogCiAJLyogQXQgbGVhc3QsIGl0IHNob3VsZCBoYXZlIGhlYWRlciwgdUNv ZGUgYW5kIFJTQS4gU2l6ZSBvZiBhbGwgdGhyZWUuICovCi0Jc2l6ZSA9IGd1Y19mdy0+aGVhZGVy X3NpemUgKyBndWNfZnctPnVjb2RlX3NpemUgKyBndWNfZnctPnJzYV9zaXplOworCXNpemUgPSB1 Y19mdy0+aGVhZGVyX3NpemUgKyB1Y19mdy0+dWNvZGVfc2l6ZSArIHVjX2Z3LT5yc2Ffc2l6ZTsK IAlpZiAoZnctPnNpemUgPCBzaXplKSB7CiAJCURSTV9FUlJPUigiTWlzc2luZyBmaXJtd2FyZSBj b21wb25lbnRzXG4iKTsKIAkJZ290byBmYWlsOwogCX0KIAogCS8qIEhlYWRlciBhbmQgdUNvZGUg d2lsbCBiZSBsb2FkZWQgdG8gV09QQ00uIFNpemUgb2YgdGhlIHR3by4gKi8KLQlzaXplID0gZ3Vj X2Z3LT5oZWFkZXJfc2l6ZSArIGd1Y19mdy0+dWNvZGVfc2l6ZTsKKwlzaXplID0gdWNfZnctPmhl YWRlcl9zaXplICsgdWNfZnctPnVjb2RlX3NpemU7CisKKwkvKiBUb3AgMzJrIG9mIFdPUENNIGlz IHJlc2VydmVkICg4SyBzdGFjayArIDI0ayBSQzYgY29udGV4dCkuICovCiAJaWYgKHNpemUgPiBn dWNfd29wY21fc2l6ZShkZXYtPmRldl9wcml2YXRlKSkgewogCQlEUk1fRVJST1IoIkZpcm13YXJl IGlzIHRvbyBsYXJnZSB0byBmaXQgaW4gV09QQ01cbiIpOwogCQlnb3RvIGZhaWw7CiAJfQogCiAJ LyoKLQkgKiBUaGUgR3VDIGZpcm13YXJlIGltYWdlIGhhcyB0aGUgdmVyc2lvbiBudW1iZXIgZW1i ZWRkZWQgYXQgYSB3ZWxsLWtub3duCisJICogVGhlIHVDIGZpcm13YXJlIGltYWdlIGhhcyB0aGUg dmVyc2lvbiBudW1iZXIgZW1iZWRkZWQgYXQgYSB3ZWxsLWtub3duCiAJICogb2Zmc2V0IHdpdGhp biB0aGUgZmlybXdhcmUgYmxvYjsgbm90ZSB0aGF0IG1ham9yIC8gbWlub3IgdmVyc2lvbiBhcmUK IAkgKiBUV08gYnl0ZXMgZWFjaCAoaS5lLiB1MTYpLCBhbHRob3VnaCBhbGwgcG9pbnRlcnMgYW5k IG9mZnNldHMgYXJlIGRlZmluZWQKIAkgKiBpbiB0ZXJtcyBvZiBieXRlcyAodTgpLgogCSAqLwot CWd1Y19mdy0+Z3VjX2Z3X21ham9yX2ZvdW5kID0gY3NzLT5ndWNfc3dfdmVyc2lvbiA+PiAxNjsK LQlndWNfZnctPmd1Y19md19taW5vcl9mb3VuZCA9IGNzcy0+Z3VjX3N3X3ZlcnNpb24gJiAweEZG RkY7Ci0KLQlpZiAoZ3VjX2Z3LT5ndWNfZndfbWFqb3JfZm91bmQgIT0gZ3VjX2Z3LT5ndWNfZndf bWFqb3Jfd2FudGVkIHx8Ci0JICAgIGd1Y19mdy0+Z3VjX2Z3X21pbm9yX2ZvdW5kIDwgZ3VjX2Z3 LT5ndWNfZndfbWlub3Jfd2FudGVkKSB7Ci0JCURSTV9FUlJPUigiR3VDIGZpcm13YXJlIHZlcnNp b24gJWQuJWQsIHJlcXVpcmVkICVkLiVkXG4iLAotCQkJZ3VjX2Z3LT5ndWNfZndfbWFqb3JfZm91 bmQsIGd1Y19mdy0+Z3VjX2Z3X21pbm9yX2ZvdW5kLAotCQkJZ3VjX2Z3LT5ndWNfZndfbWFqb3Jf d2FudGVkLCBndWNfZnctPmd1Y19md19taW5vcl93YW50ZWQpOworCXVjX2Z3LT5tYWpvcl92ZXJf Zm91bmQgPSBjc3MtPmd1Y19zd192ZXJzaW9uID4+IDE2OworCXVjX2Z3LT5taW5vcl92ZXJfZm91 bmQgPSBjc3MtPmd1Y19zd192ZXJzaW9uICYgMHhGRkZGOworCisJaWYgKHVjX2Z3LT5tYWpvcl92 ZXJfZm91bmQgIT0gdWNfZnctPm1ham9yX3Zlcl93YW50ZWQgfHwKKwkgICAgdWNfZnctPm1pbm9y X3Zlcl9mb3VuZCA8IHVjX2Z3LT5taW5vcl92ZXJfd2FudGVkKSB7CisJCURSTV9FUlJPUigiRmly bXdhcmUgdmVyc2lvbiAlZC4lZCwgcmVxdWlyZWQgJWQuJWRcbiIsCisJCQl1Y19mdy0+bWFqb3Jf dmVyX2ZvdW5kLCB1Y19mdy0+bWlub3JfdmVyX2ZvdW5kLAorCQkJdWNfZnctPm1ham9yX3Zlcl93 YW50ZWQsIHVjX2Z3LT5taW5vcl92ZXJfd2FudGVkKTsKIAkJZXJyID0gLUVOT0VYRUM7CiAJCWdv dG8gZmFpbDsKIAl9CiAKIAlEUk1fREVCVUdfRFJJVkVSKCJmaXJtd2FyZSB2ZXJzaW9uICVkLiVk IE9LIChtaW5pbXVtICVkLiVkKVxuIiwKLQkJCWd1Y19mdy0+Z3VjX2Z3X21ham9yX2ZvdW5kLCBn dWNfZnctPmd1Y19md19taW5vcl9mb3VuZCwKLQkJCWd1Y19mdy0+Z3VjX2Z3X21ham9yX3dhbnRl ZCwgZ3VjX2Z3LT5ndWNfZndfbWlub3Jfd2FudGVkKTsKKwkJCXVjX2Z3LT5tYWpvcl92ZXJfZm91 bmQsIHVjX2Z3LT5taW5vcl92ZXJfZm91bmQsCisJCQl1Y19mdy0+bWFqb3JfdmVyX3dhbnRlZCwg dWNfZnctPm1pbm9yX3Zlcl93YW50ZWQpOwogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0 ZXgpOwogCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfZnJvbV9kYXRhKGRldiwgZnctPmRh dGEsIGZ3LT5zaXplKTsKQEAgLTY0MSwzMSArNjY2LDMxIEBAIHN0YXRpYyB2b2lkIGd1Y19md19m ZXRjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncp CiAJCWdvdG8gZmFpbDsKIAl9CiAKLQlndWNfZnctPmd1Y19md19vYmogPSBvYmo7Ci0JZ3VjX2Z3 LT5ndWNfZndfc2l6ZSA9IGZ3LT5zaXplOworCXVjX2Z3LT51Y19md19vYmogPSBvYmo7CisJdWNf ZnctPnVjX2Z3X3NpemUgPSBmdy0+c2l6ZTsKIAogCURSTV9ERUJVR19EUklWRVIoIkd1QyBmdyBm ZXRjaCBzdGF0dXMgU1VDQ0VTUywgb2JqICVwXG4iLAotCQkJZ3VjX2Z3LT5ndWNfZndfb2JqKTsK KwkJCXVjX2Z3LT51Y19md19vYmopOwogCiAJcmVsZWFzZV9maXJtd2FyZShmdyk7Ci0JZ3VjX2Z3 LT5ndWNfZndfZmV0Y2hfc3RhdHVzID0gR1VDX0ZJUk1XQVJFX1NVQ0NFU1M7CisJdWNfZnctPmZl dGNoX3N0YXR1cyA9IFVDX0ZJUk1XQVJFX1NVQ0NFU1M7CiAJcmV0dXJuOwogCiBmYWlsOgogCURS TV9ERUJVR19EUklWRVIoIkd1QyBmdyBmZXRjaCBzdGF0dXMgRkFJTDsgZXJyICVkLCBmdyAlcCwg b2JqICVwXG4iLAotCQllcnIsIGZ3LCBndWNfZnctPmd1Y19md19vYmopOworCQllcnIsIGZ3LCB1 Y19mdy0+dWNfZndfb2JqKTsKIAlEUk1fRVJST1IoIkZhaWxlZCB0byBmZXRjaCBHdUMgZmlybXdh cmUgZnJvbSAlcyAoZXJyb3IgJWQpXG4iLAotCQkgIGd1Y19mdy0+Z3VjX2Z3X3BhdGgsIGVycik7 CisJCSAgdWNfZnctPnVjX2Z3X3BhdGgsIGVycik7CiAKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVj dF9tdXRleCk7Ci0Jb2JqID0gZ3VjX2Z3LT5ndWNfZndfb2JqOworCW9iaiA9IHVjX2Z3LT51Y19m d19vYmo7CiAJaWYgKG9iaikKIAkJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJm9iai0+YmFz ZSk7Ci0JZ3VjX2Z3LT5ndWNfZndfb2JqID0gTlVMTDsKKwl1Y19mdy0+dWNfZndfb2JqID0gTlVM TDsKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAogCXJlbGVhc2VfZmlybXdh cmUoZncpOwkJLyogT0sgZXZlbiBpZiBmdyBpcyBOVUxMICovCi0JZ3VjX2Z3LT5ndWNfZndfZmV0 Y2hfc3RhdHVzID0gR1VDX0ZJUk1XQVJFX0ZBSUw7CisJdWNfZnctPmZldGNoX3N0YXR1cyA9IFVD X0ZJUk1XQVJFX0ZBSUw7CiB9CiAKIC8qKgpAQCAtNjgwLDcgKzcwNSw3IEBAIGZhaWw6CiB2b2lk IGludGVsX2d1Y19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQlzdHJ1Y3QgaW50ZWxf Z3VjX2Z3ICpndWNfZncgPSAmZGV2X3ByaXYtPmd1Yy5ndWNfZnc7CisJc3RydWN0IGludGVsX3Vj X2Z3ICpndWNfZncgPSAmZGV2X3ByaXYtPmd1Yy5ndWNfZnc7CiAJY29uc3QgY2hhciAqZndfcGF0 aDsKIAogCS8qIEEgbmVnYXRpdmUgdmFsdWUgbWVhbnMgInVzZSBwbGF0Zm9ybSBkZWZhdWx0IiAq LwpAQCAtNjkzLDIwICs3MTgsMjAgQEAgdm9pZCBpbnRlbF9ndWNfaW5pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCQlmd19wYXRoID0gTlVMTDsKIAl9IGVsc2UgaWYgKElTX1NLWUxBS0UoZGV2 KSkgewogCQlmd19wYXRoID0gSTkxNV9TS0xfR1VDX1VDT0RFOwotCQlndWNfZnctPmd1Y19md19t YWpvcl93YW50ZWQgPSA2OwotCQlndWNfZnctPmd1Y19md19taW5vcl93YW50ZWQgPSAxOworCQln dWNfZnctPm1ham9yX3Zlcl93YW50ZWQgPSA2OworCQlndWNfZnctPm1pbm9yX3Zlcl93YW50ZWQg PSAxOwogCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXYpKSB7CiAJCWZ3X3BhdGggPSBJOTE1X0JY VF9HVUNfVUNPREU7Ci0JCWd1Y19mdy0+Z3VjX2Z3X21ham9yX3dhbnRlZCA9IDg7Ci0JCWd1Y19m dy0+Z3VjX2Z3X21pbm9yX3dhbnRlZCA9IDc7CisJCWd1Y19mdy0+bWFqb3JfdmVyX3dhbnRlZCA9 IDg7CisJCWd1Y19mdy0+bWlub3JfdmVyX3dhbnRlZCA9IDc7CiAJfSBlbHNlIHsKIAkJZndfcGF0 aCA9ICIiOwkvKiB1bmtub3duIGRldmljZSAqLwogCX0KIAotCWd1Y19mdy0+Z3VjX2RldiA9IGRl djsKLQlndWNfZnctPmd1Y19md19wYXRoID0gZndfcGF0aDsKLQlndWNfZnctPmd1Y19md19mZXRj aF9zdGF0dXMgPSBHVUNfRklSTVdBUkVfTk9ORTsKLQlndWNfZnctPmd1Y19md19sb2FkX3N0YXR1 cyA9IEdVQ19GSVJNV0FSRV9OT05FOworCWd1Y19mdy0+dWNfZGV2ID0gZGV2OworCWd1Y19mdy0+ dWNfZndfcGF0aCA9IGZ3X3BhdGg7CisJZ3VjX2Z3LT5mZXRjaF9zdGF0dXMgPSBVQ19GSVJNV0FS RV9OT05FOworCWd1Y19mdy0+bG9hZF9zdGF0dXMgPSBVQ19GSVJNV0FSRV9OT05FOwogCiAJLyog RWFybHkgKGFuZCBzaWxlbnQpIHJldHVybiBpZiBHdUMgbG9hZGluZyBpcyBkaXNhYmxlZCAqLwog CWlmICghaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcpCkBAIC03MTYsOSArNzQxLDkgQEAgdm9pZCBp bnRlbF9ndWNfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmICgqZndfcGF0aCA9PSAn XDAnKQogCQlyZXR1cm47CiAKLQlndWNfZnctPmd1Y19md19mZXRjaF9zdGF0dXMgPSBHVUNfRklS TVdBUkVfUEVORElORzsKKwlndWNfZnctPmZldGNoX3N0YXR1cyA9IFVDX0ZJUk1XQVJFX1BFTkRJ Tkc7CiAJRFJNX0RFQlVHX0RSSVZFUigiR3VDIGZpcm13YXJlIHBlbmRpbmcsIHBhdGggJXNcbiIs IGZ3X3BhdGgpOwotCWd1Y19md19mZXRjaChkZXYsIGd1Y19mdyk7CisJaW50ZWxfdWNfZndfZmV0 Y2goZGV2LCBndWNfZncpOwogCS8qIHN0YXR1cyBtdXN0IG5vdyBiZSBGQUlMIG9yIFNVQ0NFU1Mg Ki8KIH0KIApAQCAtNzI5LDE3ICs3NTQsMTcgQEAgdm9pZCBpbnRlbF9ndWNfaW5pdChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogdm9pZCBpbnRlbF9ndWNfZmluaShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3By aXZhdGU7Ci0Jc3RydWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3ID0gJmRldl9wcml2LT5ndWMuZ3Vj X2Z3OworCXN0cnVjdCBpbnRlbF91Y19mdyAqZ3VjX2Z3ID0gJmRldl9wcml2LT5ndWMuZ3VjX2Z3 OwogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCWRpcmVjdF9pbnRlcnJ1cHRz X3RvX2hvc3QoZGV2X3ByaXYpOwogCWk5MTVfZ3VjX3N1Ym1pc3Npb25fZGlzYWJsZShkZXZfcHJp dik7CiAJaTkxNV9ndWNfc3VibWlzc2lvbl9maW5pKGRldl9wcml2KTsKIAotCWlmIChndWNfZnct Pmd1Y19md19vYmopCi0JCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZndWNfZnctPmd1Y19m d19vYmotPmJhc2UpOwotCWd1Y19mdy0+Z3VjX2Z3X29iaiA9IE5VTEw7CisJaWYgKGd1Y19mdy0+ dWNfZndfb2JqKQorCQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgmZ3VjX2Z3LT51Y19md19v YmotPmJhc2UpOworCWd1Y19mdy0+dWNfZndfb2JqID0gTlVMTDsKIAltdXRleF91bmxvY2soJmRl di0+c3RydWN0X211dGV4KTsKIAotCWd1Y19mdy0+Z3VjX2Z3X2ZldGNoX3N0YXR1cyA9IEdVQ19G SVJNV0FSRV9OT05FOworCWd1Y19mdy0+ZmV0Y2hfc3RhdHVzID0gVUNfRklSTVdBUkVfTk9ORTsK IH0KLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK