From: Peter Antoine Subject: [PATCH v4 1/6] drm/i915/guc: Make the GuC fw loading helper functions general Date: Thu, 4 Aug 2016 09:16:52 +0100 Message-ID: <1470298617-25848-2-git-send-email-peter.antoine@intel.com> References: <1470298617-25848-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 2CD916E728 for ; Thu, 4 Aug 2016 08:17:09 +0000 (UTC) In-Reply-To: <1470298617-25848-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: Alex Dai List-Id: intel-gfx@lists.freedesktop.org UmVuYW1lIHNvbWUgb2YgdGhlIEd1QyBmdyBsb2FkaW5nIGNvZGUgdG8gbWFrZSB0aGVtIG1vcmUg Z2VuZXJhbC4gV2UKd2lsbCB1dGlsaXNlIHRoZW0gZm9yIEh1QyBsb2FkaW5nIGFzIHdlbGwuCiAg ICAgcy9pbnRlbF9ndWNfZncvaW50ZWxfdWNfZncvZwogICAgIHMvR1VDX0ZJUk1XQVJFL1VDX0ZJ Uk1XQVJFL2cKClN0cnVjdCBpbnRlbF9ndWNfZncgaXMgcmVuYW1lZCB0byBpbnRlbF91Y19mdy4g UHJlZml4IG9mIHR0cyBtZW1iZXJzLApzdWNoIGFzICdndWMnIG9yICdndWNfZncnIGVpdGhlciBp cyByZW5hbWVkIHRvICd1Yycgb3IgcmVtb3ZlZCBmb3IKc2FtZSBwdXJwb3NlLgoKdjI6IHJlYmFz ZWQgb24gdG9wIG9mIG5pZ2h0bHkuCiAgICByZWFwcGxpZWQgdGhlIHNlYXJjaC9yZXBsYWNlIGFz IHVwc3RyZWFtIGNvZGUgYXMgY2hhbmdlZC4KdjM6IHJlYmFzZWQgYWdhaW4gb24gZHJtLW5pZ2h0 bHkuCnY0OiByZW1vdmVkIEcgZnJvbSBtZXNzYWdlcyBpbiBzaGFyZWQgZncgZmV0Y2ggZnVuY3Rp b24uCgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERhaSA8eXUuZGFpQGludGVsLmNvbT4KU2lnbmVkLW9m Zi1ieTogUGV0ZXIgQW50b2luZSA8cGV0ZXIuYW50b2luZUBpbnRlbC5jb20+ClJldmlld2VkLWJ5 OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICAgICAgICB8ICAxMiArLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyB8ICAgNCArLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZ3VjLmggICAgICAgICAgIHwgIDM5ICsrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Y19sb2FkZXIuYyAgICB8IDE2MCArKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLQogNCBmaWxlcyBjaGFuZ2VkLCAxMDggaW5zZXJ0aW9ucygrKSwgMTA3IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXggNTMxY2EwMi4uNWRmN2JkMyAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTI0OTAsNyArMjQ5MCw3IEBAIHN0 YXRpYyBpbnQgaTkxNV9ndWNfbG9hZF9zdGF0dXNfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZv aWQgKmRhdGEpCiB7CiAJc3RydWN0IGRybV9pbmZvX25vZGUgKm5vZGUgPSBtLT5wcml2YXRlOwog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUobm9kZS0+bWlub3It PmRldik7Ci0Jc3RydWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3ID0gJmRldl9wcml2LT5ndWMuZ3Vj X2Z3OworCXN0cnVjdCBpbnRlbF91Y19mdyAqZ3VjX2Z3ID0gJmRldl9wcml2LT5ndWMuZ3VjX2Z3 OwogCXUzMiB0bXAsIGk7CiAKIAlpZiAoIUhBU19HVUNfVUNPREUoZGV2X3ByaXYpKQpAQCAtMjQ5 OCwxNSArMjQ5OCwxNSBAQCBzdGF0aWMgaW50IGk5MTVfZ3VjX2xvYWRfc3RhdHVzX2luZm8oc3Ry dWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogCiAJc2VxX3ByaW50ZihtLCAiR3VDIGZpcm13 YXJlIHN0YXR1czpcbiIpOwogCXNlcV9wcmludGYobSwgIlx0cGF0aDogJXNcbiIsCi0JCWd1Y19m dy0+Z3VjX2Z3X3BhdGgpOworCQlndWNfZnctPnVjX2Z3X3BhdGgpOwogCXNlcV9wcmludGYobSwg Ilx0ZmV0Y2g6ICVzXG4iLAotCQlpbnRlbF9ndWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5ndWNf ZndfZmV0Y2hfc3RhdHVzKSk7CisJCWludGVsX3VjX2Z3X3N0YXR1c19yZXByKGd1Y19mdy0+ZmV0 Y2hfc3RhdHVzKSk7CiAJc2VxX3ByaW50ZihtLCAiXHRsb2FkOiAlc1xuIiwKLQkJaW50ZWxfZ3Vj X2Z3X3N0YXR1c19yZXByKGd1Y19mdy0+Z3VjX2Z3X2xvYWRfc3RhdHVzKSk7CisJCWludGVsX3Vj X2Z3X3N0YXR1c19yZXByKGd1Y19mdy0+bG9hZF9zdGF0dXMpKTsKIAlzZXFfcHJpbnRmKG0sICJc dHZlcnNpb24gd2FudGVkOiAlZC4lZFxuIiwKLQkJZ3VjX2Z3LT5ndWNfZndfbWFqb3Jfd2FudGVk LCBndWNfZnctPmd1Y19md19taW5vcl93YW50ZWQpOworCQlndWNfZnctPm1ham9yX3Zlcl93YW50 ZWQsIGd1Y19mdy0+bWlub3JfdmVyX3dhbnRlZCk7CiAJc2VxX3ByaW50ZihtLCAiXHR2ZXJzaW9u IGZvdW5kOiAlZC4lZFxuIiwKLQkJZ3VjX2Z3LT5ndWNfZndfbWFqb3JfZm91bmQsIGd1Y19mdy0+ Z3VjX2Z3X21pbm9yX2ZvdW5kKTsKKwkJZ3VjX2Z3LT5tYWpvcl92ZXJfZm91bmQsIGd1Y19mdy0+ bWlub3JfdmVyX2ZvdW5kKTsKIAlzZXFfcHJpbnRmKG0sICJcdGhlYWRlcjogb2Zmc2V0IGlzICVk OyBzaXplID0gJWRcbiIsCiAJCWd1Y19mdy0+aGVhZGVyX29mZnNldCwgZ3VjX2Z3LT5oZWFkZXJf c2l6ZSk7CiAJc2VxX3ByaW50ZihtLCAiXHR1Q29kZTogb2Zmc2V0IGlzICVkOyBzaXplID0gJWRc biIsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9u LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggMDFj MWMxNi4uZjY2NWE4NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNf c3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Np b24uYwpAQCAtMTA0NCw3ICsxMDQ0LDcgQEAgaW50IGludGVsX2d1Y19zdXNwZW5kKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eDsKIAl1MzIgZGF0 YVszXTsKIAotCWlmIChndWMtPmd1Y19mdy5ndWNfZndfbG9hZF9zdGF0dXMgIT0gR1VDX0ZJUk1X QVJFX1NVQ0NFU1MpCisJaWYgKGd1Yy0+Z3VjX2Z3LmxvYWRfc3RhdHVzICE9IFVDX0ZJUk1XQVJF X1NVQ0NFU1MpCiAJCXJldHVybiAwOwogCiAJY3R4ID0gZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0 OwpAQCAtMTA3MCw3ICsxMDcwLDcgQEAgaW50IGludGVsX2d1Y19yZXN1bWUoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAlzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4OwogCXUzMiBkYXRhWzNd OwogCi0JaWYgKGd1Yy0+Z3VjX2Z3Lmd1Y19md19sb2FkX3N0YXR1cyAhPSBHVUNfRklSTVdBUkVf U1VDQ0VTUykKKwlpZiAoZ3VjLT5ndWNfZncubG9hZF9zdGF0dXMgIT0gVUNfRklSTVdBUkVfU1VD Q0VTUykKIAkJcmV0dXJuIDA7CiAKIAljdHggPSBkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQ7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Yy5oCmluZGV4IDNlM2U3NDMuLjAyYWRjZmMgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Yy5oCkBAIC05MCwyOSArOTAsMjkgQEAgc3RydWN0IGk5MTVfZ3VjX2NsaWVu dCB7CiAJdWludDY0X3Qgc3VibWlzc2lvbnNbSTkxNV9OVU1fRU5HSU5FU107CiB9OwogCi1lbnVt IGludGVsX2d1Y19md19zdGF0dXMgewotCUdVQ19GSVJNV0FSRV9GQUlMID0gLTEsCi0JR1VDX0ZJ Uk1XQVJFX05PTkUgPSAwLAotCUdVQ19GSVJNV0FSRV9QRU5ESU5HLAotCUdVQ19GSVJNV0FSRV9T VUNDRVNTCitlbnVtIGludGVsX3VjX2Z3X3N0YXR1cyB7CisJVUNfRklSTVdBUkVfRkFJTCA9IC0x LAorCVVDX0ZJUk1XQVJFX05PTkUgPSAwLAorCVVDX0ZJUk1XQVJFX1BFTkRJTkcsCisJVUNfRklS TVdBUkVfU1VDQ0VTUwogfTsKIAogLyoKICAqIFRoaXMgc3RydWN0dXJlIGVuY2Fwc3VsYXRlcyBh bGwgdGhlIGRhdGEgbmVlZGVkIGR1cmluZyB0aGUgcHJvY2VzcwogICogb2YgZmV0Y2hpbmcsIGNh Y2hpbmcsIGFuZCBsb2FkaW5nIHRoZSBmaXJtd2FyZSBpbWFnZSBpbnRvIHRoZSBHdUMuCiAgKi8K LXN0cnVjdCBpbnRlbF9ndWNfZncgewotCXN0cnVjdCBkcm1fZGV2aWNlICoJCWd1Y19kZXY7Ci0J Y29uc3QgY2hhciAqCQkJZ3VjX2Z3X3BhdGg7Ci0Jc2l6ZV90CQkJCWd1Y19md19zaXplOwotCXN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICoJZ3VjX2Z3X29iajsKLQllbnVtIGludGVsX2d1Y19m d19zdGF0dXMJZ3VjX2Z3X2ZldGNoX3N0YXR1czsKLQllbnVtIGludGVsX2d1Y19md19zdGF0dXMJ Z3VjX2Z3X2xvYWRfc3RhdHVzOwotCi0JdWludDE2X3QJCQlndWNfZndfbWFqb3Jfd2FudGVkOwot CXVpbnQxNl90CQkJZ3VjX2Z3X21pbm9yX3dhbnRlZDsKLQl1aW50MTZfdAkJCWd1Y19md19tYWpv cl9mb3VuZDsKLQl1aW50MTZfdAkJCWd1Y19md19taW5vcl9mb3VuZDsKK3N0cnVjdCBpbnRlbF91 Y19mdyB7CisJc3RydWN0IGRybV9kZXZpY2UgKnVjX2RldjsKKwljb25zdCBjaGFyICp1Y19md19w YXRoOworCXNpemVfdCB1Y19md19zaXplOworCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICp1 Y19md19vYmo7CisJZW51bSBpbnRlbF91Y19md19zdGF0dXMgZmV0Y2hfc3RhdHVzOworCWVudW0g aW50ZWxfdWNfZndfc3RhdHVzIGxvYWRfc3RhdHVzOworCisJdWludDE2X3QgbWFqb3JfdmVyX3dh bnRlZDsKKwl1aW50MTZfdCBtaW5vcl92ZXJfd2FudGVkOworCXVpbnQxNl90IG1ham9yX3Zlcl9m b3VuZDsKKwl1aW50MTZfdCBtaW5vcl92ZXJfZm91bmQ7CiAKIAl1aW50MzJfdCBoZWFkZXJfc2l6 ZTsKIAl1aW50MzJfdCBoZWFkZXJfb2Zmc2V0OwpAQCAtMTIzLDcgKzEyMyw3IEBAIHN0cnVjdCBp bnRlbF9ndWNfZncgewogfTsKIAogc3RydWN0IGludGVsX2d1YyB7Ci0Jc3RydWN0IGludGVsX2d1 Y19mdyBndWNfZnc7CisJc3RydWN0IGludGVsX3VjX2Z3IGd1Y19mdzsKIAl1aW50MzJfdCBsb2df ZmxhZ3M7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmxvZ19vYmo7CiAKQEAgLTE1Miw5 ICsxNTIsMTAgQEAgc3RydWN0IGludGVsX2d1YyB7CiBleHRlcm4gdm9pZCBpbnRlbF9ndWNfaW5p dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGV4dGVybiBpbnQgaW50ZWxfZ3VjX3NldHVwKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogZXh0ZXJuIHZvaWQgaW50ZWxfZ3VjX2Zpbmkoc3RydWN0 IGRybV9kZXZpY2UgKmRldik7Ci1leHRlcm4gY29uc3QgY2hhciAqaW50ZWxfZ3VjX2Z3X3N0YXR1 c19yZXByKGVudW0gaW50ZWxfZ3VjX2Z3X3N0YXR1cyBzdGF0dXMpOworZXh0ZXJuIGNvbnN0IGNo YXIgKmludGVsX3VjX2Z3X3N0YXR1c19yZXByKGVudW0gaW50ZWxfdWNfZndfc3RhdHVzIHN0YXR1 cyk7CiBleHRlcm4gaW50IGludGVsX2d1Y19zdXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp OwogZXh0ZXJuIGludCBpbnRlbF9ndWNfcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwor dm9pZCBpbnRlbF91Y19md19mZXRjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50 ZWxfdWNfZncgKnVjX2Z3KTsKIAogLyogaTkxNV9ndWNfc3VibWlzc2lvbi5jICovCiBpbnQgaTkx NV9ndWNfc3VibWlzc2lvbl9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKaW5kZXggYjg4M2VmZC4uMjVj OWE5MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwpAQCAtNjksMTYg KzY5LDE2IEBAIE1PRFVMRV9GSVJNV0FSRShJOTE1X0JYVF9HVUNfVUNPREUpOwogTU9EVUxFX0ZJ Uk1XQVJFKEk5MTVfS0JMX0dVQ19VQ09ERSk7CiAKIC8qIFVzZXItZnJpZW5kbHkgcmVwcmVzZW50 YXRpb24gb2YgYW4gZW51bSAqLwotY29uc3QgY2hhciAqaW50ZWxfZ3VjX2Z3X3N0YXR1c19yZXBy KGVudW0gaW50ZWxfZ3VjX2Z3X3N0YXR1cyBzdGF0dXMpCitjb25zdCBjaGFyICppbnRlbF91Y19m d19zdGF0dXNfcmVwcihlbnVtIGludGVsX3VjX2Z3X3N0YXR1cyBzdGF0dXMpCiB7CiAJc3dpdGNo IChzdGF0dXMpIHsKLQljYXNlIEdVQ19GSVJNV0FSRV9GQUlMOgorCWNhc2UgVUNfRklSTVdBUkVf RkFJTDoKIAkJcmV0dXJuICJGQUlMIjsKLQljYXNlIEdVQ19GSVJNV0FSRV9OT05FOgorCWNhc2Ug VUNfRklSTVdBUkVfTk9ORToKIAkJcmV0dXJuICJOT05FIjsKLQljYXNlIEdVQ19GSVJNV0FSRV9Q RU5ESU5HOgorCWNhc2UgVUNfRklSTVdBUkVfUEVORElORzoKIAkJcmV0dXJuICJQRU5ESU5HIjsK LQljYXNlIEdVQ19GSVJNV0FSRV9TVUNDRVNTOgorCWNhc2UgVUNfRklSTVdBUkVfU1VDQ0VTUzoK IAkJcmV0dXJuICJTVUNDRVNTIjsKIAlkZWZhdWx0OgogCQlyZXR1cm4gIlVOS05PV04hIjsKQEAg LTI0MCw4ICsyNDAsOCBAQCBzdGF0aWMgaW5saW5lIGJvb2wgZ3VjX3Vjb2RlX3Jlc3BvbnNlKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKICAqLwogc3RhdGljIGludCBndWNfdWNv ZGVfeGZlcl9kbWEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVj dCBpbnRlbF9ndWNfZncgKmd1Y19mdyA9ICZkZXZfcHJpdi0+Z3VjLmd1Y19mdzsKLQlzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqZndfb2JqID0gZ3VjX2Z3LT5ndWNfZndfb2JqOworCXN0cnVj dCBpbnRlbF91Y19mdyAqZ3VjX2Z3ID0gJmRldl9wcml2LT5ndWMuZ3VjX2Z3OworCXN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpmd19vYmogPSBndWNfZnctPnVjX2Z3X29iajsKIAl1bnNpZ25l ZCBsb25nIG9mZnNldDsKIAlzdHJ1Y3Qgc2dfdGFibGUgKnNnID0gZndfb2JqLT5wYWdlczsKIAl1 MzIgc3RhdHVzLCByc2FbVU9TX1JTQV9TQ1JBVENIX01BWF9DT1VOVF07CkBAIC0zMTMsMTcgKzMx MywxNyBAQCBzdGF0aWMgdTMyIGd1Y193b3BjbV9zaXplKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKICAqLwogc3RhdGljIGludCBndWNfdWNvZGVfeGZlcihzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3ID0g JmRldl9wcml2LT5ndWMuZ3VjX2Z3OworCXN0cnVjdCBpbnRlbF91Y19mdyAqZ3VjX2Z3ID0gJmRl dl9wcml2LT5ndWMuZ3VjX2Z3OwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSAmZGV2X3ByaXYt PmRybTsKIAlpbnQgcmV0OwogCi0JcmV0ID0gaTkxNV9nZW1fb2JqZWN0X3NldF90b19ndHRfZG9t YWluKGd1Y19mdy0+Z3VjX2Z3X29iaiwgZmFsc2UpOworCXJldCA9IGk5MTVfZ2VtX29iamVjdF9z ZXRfdG9fZ3R0X2RvbWFpbihndWNfZnctPnVjX2Z3X29iaiwgZmFsc2UpOwogCWlmIChyZXQpIHsK IAkJRFJNX0RFQlVHX0RSSVZFUigic2V0LWRvbWFpbiBmYWlsZWQgJWRcbiIsIHJldCk7CiAJCXJl dHVybiByZXQ7CiAJfQogCi0JcmV0ID0gaTkxNV9nZW1fb2JqX2dndHRfcGluKGd1Y19mdy0+Z3Vj X2Z3X29iaiwgMCwgMCk7CisJcmV0ID0gaTkxNV9nZW1fb2JqX2dndHRfcGluKGd1Y19mdy0+dWNf Zndfb2JqLCAwLCAwKTsKIAlpZiAocmV0KSB7CiAJCURSTV9ERUJVR19EUklWRVIoInBpbiBmYWls ZWQgJWRcbiIsIHJldCk7CiAJCXJldHVybiByZXQ7CkBAIC0zNzcsNyArMzc3LDcgQEAgc3RhdGlj IGludCBndWNfdWNvZGVfeGZlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJ ICogV2Uga2VlcCB0aGUgb2JqZWN0IHBhZ2VzIGZvciByZXVzZSBkdXJpbmcgcmVzdW1lLiBCdXQg d2UgY2FuIHVucGluIGl0CiAJICogbm93IHRoYXQgRE1BIGhhcyBjb21wbGV0ZWQsIHNvIGl0IGRv ZXNuJ3QgY29udGludWUgdG8gdGFrZSB1cCBzcGFjZS4KIAkgKi8KLQlpOTE1X2dlbV9vYmplY3Rf Z2d0dF91bnBpbihndWNfZnctPmd1Y19md19vYmopOworCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3Vu cGluKGd1Y19mdy0+dWNfZndfb2JqKTsKIAogCXJldHVybiByZXQ7CiB9CkBAIC00MTYsMTQgKzQx NiwxNCBAQCBzdGF0aWMgaW50IGk5MTVfcmVzZXRfZ3VjKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIGludCBpbnRlbF9ndWNfc2V0dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0J c3RydWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3ID0gJmRldl9wcml2LT5ndWMuZ3VjX2Z3OwotCWNv bnN0IGNoYXIgKmZ3X3BhdGggPSBndWNfZnctPmd1Y19md19wYXRoOworCXN0cnVjdCBpbnRlbF91 Y19mdyAqZ3VjX2Z3ID0gJmRldl9wcml2LT5ndWMuZ3VjX2Z3OworCWNvbnN0IGNoYXIgKmZ3X3Bh dGggPSBndWNfZnctPnVjX2Z3X3BhdGg7CiAJaW50IHJldHJpZXMsIHJldCwgZXJyOwogCiAJRFJN X0RFQlVHX0RSSVZFUigiR3VDIGZ3IHN0YXR1czogcGF0aCAlcywgZmV0Y2ggJXMsIGxvYWQgJXNc biIsCiAJCWZ3X3BhdGgsCi0JCWludGVsX2d1Y19md19zdGF0dXNfcmVwcihndWNfZnctPmd1Y19m d19mZXRjaF9zdGF0dXMpLAotCQlpbnRlbF9ndWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5ndWNf ZndfbG9hZF9zdGF0dXMpKTsKKwkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5mZXRj aF9zdGF0dXMpLAorCQlpbnRlbF91Y19md19zdGF0dXNfcmVwcihndWNfZnctPmxvYWRfc3RhdHVz KSk7CiAKIAkvKiBMb2FkaW5nIGZvcmJpZGRlbiwgb3Igbm8gZmlybXdhcmUgdG8gbG9hZD8gKi8K IAlpZiAoIWk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nKSB7CkBAIC00NDEsMjEgKzQ0MSwyMSBAQCBp bnQgaW50ZWxfZ3VjX3NldHVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJfQogCiAJLyogRmV0 Y2ggZmFpbGVkLCBvciBhbHJlYWR5IGZldGNoZWQgYnV0IGZhaWxlZCB0byBsb2FkPyAqLwotCWlm IChndWNfZnctPmd1Y19md19mZXRjaF9zdGF0dXMgIT0gR1VDX0ZJUk1XQVJFX1NVQ0NFU1MpIHsK KwlpZiAoZ3VjX2Z3LT5mZXRjaF9zdGF0dXMgIT0gVUNfRklSTVdBUkVfU1VDQ0VTUykgewogCQll cnIgPSAtRUlPOwogCQlnb3RvIGZhaWw7Ci0JfSBlbHNlIGlmIChndWNfZnctPmd1Y19md19sb2Fk X3N0YXR1cyA9PSBHVUNfRklSTVdBUkVfRkFJTCkgeworCX0gZWxzZSBpZiAoZ3VjX2Z3LT5sb2Fk X3N0YXR1cyA9PSBVQ19GSVJNV0FSRV9GQUlMKSB7CiAJCWVyciA9IC1FTk9FWEVDOwogCQlnb3Rv IGZhaWw7CiAJfQogCiAJZGlyZWN0X2ludGVycnVwdHNfdG9faG9zdChkZXZfcHJpdik7CiAKLQln dWNfZnctPmd1Y19md19sb2FkX3N0YXR1cyA9IEdVQ19GSVJNV0FSRV9QRU5ESU5HOworCWd1Y19m dy0+bG9hZF9zdGF0dXMgPSBVQ19GSVJNV0FSRV9QRU5ESU5HOwogCiAJRFJNX0RFQlVHX0RSSVZF UigiR3VDIGZ3IHN0YXR1czogZmV0Y2ggJXMsIGxvYWQgJXNcbiIsCi0JCWludGVsX2d1Y19md19z dGF0dXNfcmVwcihndWNfZnctPmd1Y19md19mZXRjaF9zdGF0dXMpLAotCQlpbnRlbF9ndWNfZndf c3RhdHVzX3JlcHIoZ3VjX2Z3LT5ndWNfZndfbG9hZF9zdGF0dXMpKTsKKwkJaW50ZWxfdWNfZndf c3RhdHVzX3JlcHIoZ3VjX2Z3LT5mZXRjaF9zdGF0dXMpLAorCQlpbnRlbF91Y19md19zdGF0dXNf cmVwcihndWNfZnctPmxvYWRfc3RhdHVzKSk7CiAKIAllcnIgPSBpOTE1X2d1Y19zdWJtaXNzaW9u X2luaXQoZGV2X3ByaXYpOwogCWlmIChlcnIpCkBAIC00ODksMTEgKzQ4OSwxMSBAQCBpbnQgaW50 ZWxfZ3VjX3NldHVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQkgInJldHJ5ICVkIG1vcmUg dGltZShzKVxuIiwgZXJyLCByZXRyaWVzKTsKIAl9CiAKLQlndWNfZnctPmd1Y19md19sb2FkX3N0 YXR1cyA9IEdVQ19GSVJNV0FSRV9TVUNDRVNTOworCWd1Y19mdy0+bG9hZF9zdGF0dXMgPSBVQ19G SVJNV0FSRV9TVUNDRVNTOwogCiAJRFJNX0RFQlVHX0RSSVZFUigiR3VDIGZ3IHN0YXR1czogZmV0 Y2ggJXMsIGxvYWQgJXNcbiIsCi0JCWludGVsX2d1Y19md19zdGF0dXNfcmVwcihndWNfZnctPmd1 Y19md19mZXRjaF9zdGF0dXMpLAotCQlpbnRlbF9ndWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5n dWNfZndfbG9hZF9zdGF0dXMpKTsKKwkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5m ZXRjaF9zdGF0dXMpLAorCQlpbnRlbF91Y19md19zdGF0dXNfcmVwcihndWNfZnctPmxvYWRfc3Rh dHVzKSk7CiAKIAlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pIHsKIAkJZXJyID0gaTkx NV9ndWNfc3VibWlzc2lvbl9lbmFibGUoZGV2X3ByaXYpOwpAQCAtNTA1LDggKzUwNSw4IEBAIGlu dCBpbnRlbF9ndWNfc2V0dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlyZXR1cm4gMDsKIAog ZmFpbDoKLQlpZiAoZ3VjX2Z3LT5ndWNfZndfbG9hZF9zdGF0dXMgPT0gR1VDX0ZJUk1XQVJFX1BF TkRJTkcpCi0JCWd1Y19mdy0+Z3VjX2Z3X2xvYWRfc3RhdHVzID0gR1VDX0ZJUk1XQVJFX0ZBSUw7 CisJaWYgKGd1Y19mdy0+bG9hZF9zdGF0dXMgPT0gVUNfRklSTVdBUkVfUEVORElORykKKwkJZ3Vj X2Z3LT5sb2FkX3N0YXR1cyA9IFVDX0ZJUk1XQVJFX0ZBSUw7CiAKIAlkaXJlY3RfaW50ZXJydXB0 c190b19ob3N0KGRldl9wcml2KTsKIAlpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoZGV2X3By aXYpOwpAQCAtNTUxLDcgKzU1MSw3IEBAIGZhaWw6CiAJcmV0dXJuIHJldDsKIH0KIAotc3RhdGlj IHZvaWQgZ3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpbnRlbF9n dWNfZncgKmd1Y19mdykKK3ZvaWQgaW50ZWxfdWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgc3RydWN0IGludGVsX3VjX2Z3ICp1Y19mdykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqb2JqOwogCWNvbnN0IHN0cnVjdCBmaXJtd2FyZSAqZnc7CkBAIC01NTksMTcgKzU1 OSwxNyBAQCBzdGF0aWMgdm9pZCBndWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldiwg c3RydWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3KQogCXNpemVfdCBzaXplOwogCWludCBlcnI7CiAK LQlEUk1fREVCVUdfRFJJVkVSKCJiZWZvcmUgcmVxdWVzdGluZyBmaXJtd2FyZTogR3VDIGZ3IGZl dGNoIHN0YXR1cyAlc1xuIiwKLQkJaW50ZWxfZ3VjX2Z3X3N0YXR1c19yZXByKGd1Y19mdy0+Z3Vj X2Z3X2ZldGNoX3N0YXR1cykpOworCURSTV9ERUJVR19EUklWRVIoImJlZm9yZSByZXF1ZXN0aW5n IGZpcm13YXJlOiB1QyBmdyBmZXRjaCBzdGF0dXMgJXNcbiIsCisJCWludGVsX3VjX2Z3X3N0YXR1 c19yZXByKHVjX2Z3LT5mZXRjaF9zdGF0dXMpKTsKIAotCWVyciA9IHJlcXVlc3RfZmlybXdhcmUo JmZ3LCBndWNfZnctPmd1Y19md19wYXRoLCAmZGV2LT5wZGV2LT5kZXYpOworCWVyciA9IHJlcXVl c3RfZmlybXdhcmUoJmZ3LCB1Y19mdy0+dWNfZndfcGF0aCwgJmRldi0+cGRldi0+ZGV2KTsKIAlp ZiAoZXJyKQogCQlnb3RvIGZhaWw7CiAJaWYgKCFmdykKIAkJZ290byBmYWlsOwogCi0JRFJNX0RF QlVHX0RSSVZFUigiZmV0Y2ggR3VDIGZ3IGZyb20gJXMgc3VjY2VlZGVkLCBmdyAlcFxuIiwKLQkJ Z3VjX2Z3LT5ndWNfZndfcGF0aCwgZncpOworCURSTV9ERUJVR19EUklWRVIoImZldGNoIHVDIGZ3 IGZyb20gJXMgc3VjY2VlZGVkLCBmdyAlcFxuIiwKKwkJdWNfZnctPnVjX2Z3X3BhdGgsIGZ3KTsK IAogCS8qIENoZWNrIHRoZSBzaXplIG9mIHRoZSBibG9iIGJlZm9yZSBleGFtaW5pbmcgYnVmZmVy IGNvbnRlbnRzICovCiAJaWYgKGZ3LT5zaXplIDwgc2l6ZW9mKHN0cnVjdCBndWNfY3NzX2hlYWRl cikpIHsKQEAgLTU4MCwzNiArNTgwLDM2IEBAIHN0YXRpYyB2b2lkIGd1Y19md19mZXRjaChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncpCiAJY3NzID0g KHN0cnVjdCBndWNfY3NzX2hlYWRlciAqKWZ3LT5kYXRhOwogCiAJLyogRmlybXdhcmUgYml0cyBh bHdheXMgc3RhcnQgZnJvbSBoZWFkZXIgKi8KLQlndWNfZnctPmhlYWRlcl9vZmZzZXQgPSAwOwot CWd1Y19mdy0+aGVhZGVyX3NpemUgPSAoY3NzLT5oZWFkZXJfc2l6ZV9kdyAtIGNzcy0+bW9kdWx1 c19zaXplX2R3IC0KKwl1Y19mdy0+aGVhZGVyX29mZnNldCA9IDA7CisJdWNfZnctPmhlYWRlcl9z aXplID0gKGNzcy0+aGVhZGVyX3NpemVfZHcgLSBjc3MtPm1vZHVsdXNfc2l6ZV9kdyAtCiAJCWNz cy0+a2V5X3NpemVfZHcgLSBjc3MtPmV4cG9uZW50X3NpemVfZHcpICogc2l6ZW9mKHUzMik7CiAK LQlpZiAoZ3VjX2Z3LT5oZWFkZXJfc2l6ZSAhPSBzaXplb2Yoc3RydWN0IGd1Y19jc3NfaGVhZGVy KSkgeworCWlmICh1Y19mdy0+aGVhZGVyX3NpemUgIT0gc2l6ZW9mKHN0cnVjdCBndWNfY3NzX2hl YWRlcikpIHsKIAkJRFJNX0VSUk9SKCJDU1MgaGVhZGVyIGRlZmluaXRpb24gbWlzbWF0Y2hcbiIp OwogCQlnb3RvIGZhaWw7CiAJfQogCiAJLyogdGhlbiwgdUNvZGUgKi8KLQlndWNfZnctPnVjb2Rl X29mZnNldCA9IGd1Y19mdy0+aGVhZGVyX29mZnNldCArIGd1Y19mdy0+aGVhZGVyX3NpemU7Ci0J Z3VjX2Z3LT51Y29kZV9zaXplID0gKGNzcy0+c2l6ZV9kdyAtIGNzcy0+aGVhZGVyX3NpemVfZHcp ICogc2l6ZW9mKHUzMik7CisJdWNfZnctPnVjb2RlX29mZnNldCA9IHVjX2Z3LT5oZWFkZXJfb2Zm c2V0ICsgdWNfZnctPmhlYWRlcl9zaXplOworCXVjX2Z3LT51Y29kZV9zaXplID0gKGNzcy0+c2l6 ZV9kdyAtIGNzcy0+aGVhZGVyX3NpemVfZHcpICogc2l6ZW9mKHUzMik7CiAKIAkvKiBub3cgUlNB ICovCiAJaWYgKGNzcy0+a2V5X3NpemVfZHcgIT0gVU9TX1JTQV9TQ1JBVENIX01BWF9DT1VOVCkg ewogCQlEUk1fRVJST1IoIlJTQSBrZXkgc2l6ZSBpcyBiYWRcbiIpOwogCQlnb3RvIGZhaWw7CiAJ fQotCWd1Y19mdy0+cnNhX29mZnNldCA9IGd1Y19mdy0+dWNvZGVfb2Zmc2V0ICsgZ3VjX2Z3LT51 Y29kZV9zaXplOwotCWd1Y19mdy0+cnNhX3NpemUgPSBjc3MtPmtleV9zaXplX2R3ICogc2l6ZW9m KHUzMik7CisJdWNfZnctPnJzYV9vZmZzZXQgPSB1Y19mdy0+dWNvZGVfb2Zmc2V0ICsgdWNfZnct PnVjb2RlX3NpemU7CisJdWNfZnctPnJzYV9zaXplID0gY3NzLT5rZXlfc2l6ZV9kdyAqIHNpemVv Zih1MzIpOwogCiAJLyogQXQgbGVhc3QsIGl0IHNob3VsZCBoYXZlIGhlYWRlciwgdUNvZGUgYW5k IFJTQS4gU2l6ZSBvZiBhbGwgdGhyZWUuICovCi0Jc2l6ZSA9IGd1Y19mdy0+aGVhZGVyX3NpemUg KyBndWNfZnctPnVjb2RlX3NpemUgKyBndWNfZnctPnJzYV9zaXplOworCXNpemUgPSB1Y19mdy0+ aGVhZGVyX3NpemUgKyB1Y19mdy0+dWNvZGVfc2l6ZSArIHVjX2Z3LT5yc2Ffc2l6ZTsKIAlpZiAo ZnctPnNpemUgPCBzaXplKSB7CiAJCURSTV9FUlJPUigiTWlzc2luZyBmaXJtd2FyZSBjb21wb25l bnRzXG4iKTsKIAkJZ290byBmYWlsOwogCX0KIAogCS8qIEhlYWRlciBhbmQgdUNvZGUgd2lsbCBi ZSBsb2FkZWQgdG8gV09QQ00uIFNpemUgb2YgdGhlIHR3by4gKi8KLQlzaXplID0gZ3VjX2Z3LT5o ZWFkZXJfc2l6ZSArIGd1Y19mdy0+dWNvZGVfc2l6ZTsKKwlzaXplID0gdWNfZnctPmhlYWRlcl9z aXplICsgdWNfZnctPnVjb2RlX3NpemU7CiAJaWYgKHNpemUgPiBndWNfd29wY21fc2l6ZSh0b19p OTE1KGRldikpKSB7CiAJCURSTV9FUlJPUigiRmlybXdhcmUgaXMgdG9vIGxhcmdlIHRvIGZpdCBp biBXT1BDTVxuIik7CiAJCWdvdG8gZmFpbDsKQEAgLTYyMSwyMSArNjIxLDIxIEBAIHN0YXRpYyB2 b2lkIGd1Y19md19mZXRjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfZ3Vj X2Z3ICpndWNfZncpCiAJICogVFdPIGJ5dGVzIGVhY2ggKGkuZS4gdTE2KSwgYWx0aG91Z2ggYWxs IHBvaW50ZXJzIGFuZCBvZmZzZXRzIGFyZSBkZWZpbmVkCiAJICogaW4gdGVybXMgb2YgYnl0ZXMg KHU4KS4KIAkgKi8KLQlndWNfZnctPmd1Y19md19tYWpvcl9mb3VuZCA9IGNzcy0+Z3VjX3N3X3Zl cnNpb24gPj4gMTY7Ci0JZ3VjX2Z3LT5ndWNfZndfbWlub3JfZm91bmQgPSBjc3MtPmd1Y19zd192 ZXJzaW9uICYgMHhGRkZGOwotCi0JaWYgKGd1Y19mdy0+Z3VjX2Z3X21ham9yX2ZvdW5kICE9IGd1 Y19mdy0+Z3VjX2Z3X21ham9yX3dhbnRlZCB8fAotCSAgICBndWNfZnctPmd1Y19md19taW5vcl9m b3VuZCA8IGd1Y19mdy0+Z3VjX2Z3X21pbm9yX3dhbnRlZCkgewotCQlEUk1fRVJST1IoIkd1QyBm aXJtd2FyZSB2ZXJzaW9uICVkLiVkLCByZXF1aXJlZCAlZC4lZFxuIiwKLQkJCWd1Y19mdy0+Z3Vj X2Z3X21ham9yX2ZvdW5kLCBndWNfZnctPmd1Y19md19taW5vcl9mb3VuZCwKLQkJCWd1Y19mdy0+ Z3VjX2Z3X21ham9yX3dhbnRlZCwgZ3VjX2Z3LT5ndWNfZndfbWlub3Jfd2FudGVkKTsKKwl1Y19m dy0+bWFqb3JfdmVyX2ZvdW5kID0gY3NzLT5ndWNfc3dfdmVyc2lvbiA+PiAxNjsKKwl1Y19mdy0+ bWlub3JfdmVyX2ZvdW5kID0gY3NzLT5ndWNfc3dfdmVyc2lvbiAmIDB4RkZGRjsKKworCWlmICh1 Y19mdy0+bWFqb3JfdmVyX2ZvdW5kICE9IHVjX2Z3LT5tYWpvcl92ZXJfd2FudGVkIHx8CisJICAg IHVjX2Z3LT5taW5vcl92ZXJfZm91bmQgPCB1Y19mdy0+bWlub3JfdmVyX3dhbnRlZCkgeworCQlE Uk1fRVJST1IoInVDIGZpcm13YXJlIHZlcnNpb24gJWQuJWQsIHJlcXVpcmVkICVkLiVkXG4iLAor CQkJdWNfZnctPm1ham9yX3Zlcl9mb3VuZCwgdWNfZnctPm1pbm9yX3Zlcl9mb3VuZCwKKwkJCXVj X2Z3LT5tYWpvcl92ZXJfd2FudGVkLCB1Y19mdy0+bWlub3JfdmVyX3dhbnRlZCk7CiAJCWVyciA9 IC1FTk9FWEVDOwogCQlnb3RvIGZhaWw7CiAJfQogCiAJRFJNX0RFQlVHX0RSSVZFUigiZmlybXdh cmUgdmVyc2lvbiAlZC4lZCBPSyAobWluaW11bSAlZC4lZClcbiIsCi0JCQlndWNfZnctPmd1Y19m d19tYWpvcl9mb3VuZCwgZ3VjX2Z3LT5ndWNfZndfbWlub3JfZm91bmQsCi0JCQlndWNfZnctPmd1 Y19md19tYWpvcl93YW50ZWQsIGd1Y19mdy0+Z3VjX2Z3X21pbm9yX3dhbnRlZCk7CisJCQl1Y19m dy0+bWFqb3JfdmVyX2ZvdW5kLCB1Y19mdy0+bWlub3JfdmVyX2ZvdW5kLAorCQkJdWNfZnctPm1h am9yX3Zlcl93YW50ZWQsIHVjX2Z3LT5taW5vcl92ZXJfd2FudGVkKTsKIAogCW11dGV4X2xvY2so JmRldi0+c3RydWN0X211dGV4KTsKIAlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlX2Zyb21f ZGF0YShkZXYsIGZ3LT5kYXRhLCBmdy0+c2l6ZSk7CkBAIC02NDUsMzEgKzY0NSwzMSBAQCBzdGF0 aWMgdm9pZCBndWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVs X2d1Y19mdyAqZ3VjX2Z3KQogCQlnb3RvIGZhaWw7CiAJfQogCi0JZ3VjX2Z3LT5ndWNfZndfb2Jq ID0gb2JqOwotCWd1Y19mdy0+Z3VjX2Z3X3NpemUgPSBmdy0+c2l6ZTsKKwl1Y19mdy0+dWNfZndf b2JqID0gb2JqOworCXVjX2Z3LT51Y19md19zaXplID0gZnctPnNpemU7CiAKLQlEUk1fREVCVUdf RFJJVkVSKCJHdUMgZncgZmV0Y2ggc3RhdHVzIFNVQ0NFU1MsIG9iaiAlcFxuIiwKLQkJCWd1Y19m dy0+Z3VjX2Z3X29iaik7CisJRFJNX0RFQlVHX0RSSVZFUigidUMgZncgZmV0Y2ggc3RhdHVzIFNV Q0NFU1MsIG9iaiAlcFxuIiwKKwkJCXVjX2Z3LT51Y19md19vYmopOwogCiAJcmVsZWFzZV9maXJt d2FyZShmdyk7Ci0JZ3VjX2Z3LT5ndWNfZndfZmV0Y2hfc3RhdHVzID0gR1VDX0ZJUk1XQVJFX1NV Q0NFU1M7CisJdWNfZnctPmZldGNoX3N0YXR1cyA9IFVDX0ZJUk1XQVJFX1NVQ0NFU1M7CiAJcmV0 dXJuOwogCiBmYWlsOgotCURSTV9ERUJVR19EUklWRVIoIkd1QyBmdyBmZXRjaCBzdGF0dXMgRkFJ TDsgZXJyICVkLCBmdyAlcCwgb2JqICVwXG4iLAotCQllcnIsIGZ3LCBndWNfZnctPmd1Y19md19v YmopOwotCURSTV9FUlJPUigiRmFpbGVkIHRvIGZldGNoIEd1QyBmaXJtd2FyZSBmcm9tICVzIChl cnJvciAlZClcbiIsCi0JCSAgZ3VjX2Z3LT5ndWNfZndfcGF0aCwgZXJyKTsKKwlEUk1fREVCVUdf RFJJVkVSKCJ1QyBmdyBmZXRjaCBzdGF0dXMgRkFJTDsgZXJyICVkLCBmdyAlcCwgb2JqICVwXG4i LAorCQllcnIsIGZ3LCB1Y19mdy0+dWNfZndfb2JqKTsKKwlEUk1fRVJST1IoIkZhaWxlZCB0byBm ZXRjaCB1QyBmaXJtd2FyZSBmcm9tICVzIChlcnJvciAlZClcbiIsCisJCSAgdWNfZnctPnVjX2Z3 X3BhdGgsIGVycik7CiAKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0Jb2JqID0g Z3VjX2Z3LT5ndWNfZndfb2JqOworCW9iaiA9IHVjX2Z3LT51Y19md19vYmo7CiAJaWYgKG9iaikK IAkJaTkxNV9nZW1fb2JqZWN0X3B1dChvYmopOwotCWd1Y19mdy0+Z3VjX2Z3X29iaiA9IE5VTEw7 CisJdWNfZnctPnVjX2Z3X29iaiA9IE5VTEw7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9t dXRleCk7CiAKIAlyZWxlYXNlX2Zpcm13YXJlKGZ3KTsJCS8qIE9LIGV2ZW4gaWYgZncgaXMgTlVM TCAqLwotCWd1Y19mdy0+Z3VjX2Z3X2ZldGNoX3N0YXR1cyA9IEdVQ19GSVJNV0FSRV9GQUlMOwor CXVjX2Z3LT5mZXRjaF9zdGF0dXMgPSBVQ19GSVJNV0FSRV9GQUlMOwogfQogCiAvKioKQEAgLTY4 NCw3ICs2ODQsNyBAQCBmYWlsOgogdm9pZCBpbnRlbF9ndWNfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo ZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncgPSAmZGV2X3ByaXYtPmd1Yy5ndWNf Znc7CisJc3RydWN0IGludGVsX3VjX2Z3ICpndWNfZncgPSAmZGV2X3ByaXYtPmd1Yy5ndWNfZnc7 CiAJY29uc3QgY2hhciAqZndfcGF0aDsKIAogCS8qIEEgbmVnYXRpdmUgdmFsdWUgbWVhbnMgInVz ZSBwbGF0Zm9ybSBkZWZhdWx0IiAqLwpAQCAtNjk3LDI0ICs2OTcsMjQgQEAgdm9pZCBpbnRlbF9n dWNfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlmd19wYXRoID0gTlVMTDsKIAl9IGVs c2UgaWYgKElTX1NLWUxBS0UoZGV2KSkgewogCQlmd19wYXRoID0gSTkxNV9TS0xfR1VDX1VDT0RF OwotCQlndWNfZnctPmd1Y19md19tYWpvcl93YW50ZWQgPSA2OwotCQlndWNfZnctPmd1Y19md19t aW5vcl93YW50ZWQgPSAxOworCQlndWNfZnctPm1ham9yX3Zlcl93YW50ZWQgPSA2OworCQlndWNf ZnctPm1pbm9yX3Zlcl93YW50ZWQgPSAxOwogCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXYpKSB7 CiAJCWZ3X3BhdGggPSBJOTE1X0JYVF9HVUNfVUNPREU7Ci0JCWd1Y19mdy0+Z3VjX2Z3X21ham9y X3dhbnRlZCA9IDg7Ci0JCWd1Y19mdy0+Z3VjX2Z3X21pbm9yX3dhbnRlZCA9IDc7CisJCWd1Y19m dy0+bWFqb3JfdmVyX3dhbnRlZCA9IDg7CisJCWd1Y19mdy0+bWlub3JfdmVyX3dhbnRlZCA9IDc7 CiAJfSBlbHNlIGlmIChJU19LQUJZTEFLRShkZXYpKSB7CiAJCWZ3X3BhdGggPSBJOTE1X0tCTF9H VUNfVUNPREU7Ci0JCWd1Y19mdy0+Z3VjX2Z3X21ham9yX3dhbnRlZCA9IDk7Ci0JCWd1Y19mdy0+ Z3VjX2Z3X21pbm9yX3dhbnRlZCA9IDE0OworCQlndWNfZnctPm1ham9yX3Zlcl93YW50ZWQgPSA5 OworCQlndWNfZnctPm1pbm9yX3Zlcl93YW50ZWQgPSAxNDsKIAl9IGVsc2UgewogCQlmd19wYXRo ID0gIiI7CS8qIHVua25vd24gZGV2aWNlICovCiAJfQogCi0JZ3VjX2Z3LT5ndWNfZGV2ID0gZGV2 OwotCWd1Y19mdy0+Z3VjX2Z3X3BhdGggPSBmd19wYXRoOwotCWd1Y19mdy0+Z3VjX2Z3X2ZldGNo X3N0YXR1cyA9IEdVQ19GSVJNV0FSRV9OT05FOwotCWd1Y19mdy0+Z3VjX2Z3X2xvYWRfc3RhdHVz ID0gR1VDX0ZJUk1XQVJFX05PTkU7CisJZ3VjX2Z3LT51Y19kZXYgPSBkZXY7CisJZ3VjX2Z3LT51 Y19md19wYXRoID0gZndfcGF0aDsKKwlndWNfZnctPmZldGNoX3N0YXR1cyA9IFVDX0ZJUk1XQVJF X05PTkU7CisJZ3VjX2Z3LT5sb2FkX3N0YXR1cyA9IFVDX0ZJUk1XQVJFX05PTkU7CiAKIAkvKiBF YXJseSAoYW5kIHNpbGVudCkgcmV0dXJuIGlmIEd1QyBsb2FkaW5nIGlzIGRpc2FibGVkICovCiAJ aWYgKCFpOTE1LmVuYWJsZV9ndWNfbG9hZGluZykKQEAgLTcyNCw5ICs3MjQsOSBAQCB2b2lkIGlu dGVsX2d1Y19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKCpmd19wYXRoID09ICdc MCcpCiAJCXJldHVybjsKIAotCWd1Y19mdy0+Z3VjX2Z3X2ZldGNoX3N0YXR1cyA9IEdVQ19GSVJN V0FSRV9QRU5ESU5HOworCWd1Y19mdy0+ZmV0Y2hfc3RhdHVzID0gVUNfRklSTVdBUkVfUEVORElO RzsKIAlEUk1fREVCVUdfRFJJVkVSKCJHdUMgZmlybXdhcmUgcGVuZGluZywgcGF0aCAlc1xuIiwg ZndfcGF0aCk7Ci0JZ3VjX2Z3X2ZldGNoKGRldiwgZ3VjX2Z3KTsKKwlpbnRlbF91Y19md19mZXRj aChkZXYsIGd1Y19mdyk7CiAJLyogc3RhdHVzIG11c3Qgbm93IGJlIEZBSUwgb3IgU1VDQ0VTUyAq LwogfQogCkBAIC03MzcsMTcgKzczNywxNyBAQCB2b2lkIGludGVsX2d1Y19pbml0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiB2b2lkIGludGVsX2d1Y19maW5pKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYp OwotCXN0cnVjdCBpbnRlbF9ndWNfZncgKmd1Y19mdyA9ICZkZXZfcHJpdi0+Z3VjLmd1Y19mdzsK KwlzdHJ1Y3QgaW50ZWxfdWNfZncgKmd1Y19mdyA9ICZkZXZfcHJpdi0+Z3VjLmd1Y19mdzsKIAog CW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAlkaXJlY3RfaW50ZXJydXB0c190b19o b3N0KGRldl9wcml2KTsKIAlpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoZGV2X3ByaXYpOwog CWk5MTVfZ3VjX3N1Ym1pc3Npb25fZmluaShkZXZfcHJpdik7CiAKLQlpZiAoZ3VjX2Z3LT5ndWNf Zndfb2JqKQotCQlpOTE1X2dlbV9vYmplY3RfcHV0KGd1Y19mdy0+Z3VjX2Z3X29iaik7Ci0JZ3Vj X2Z3LT5ndWNfZndfb2JqID0gTlVMTDsKKwlpZiAoZ3VjX2Z3LT51Y19md19vYmopCisJCWk5MTVf Z2VtX29iamVjdF9wdXQoZ3VjX2Z3LT51Y19md19vYmopOworCWd1Y19mdy0+dWNfZndfb2JqID0g TlVMTDsKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAotCWd1Y19mdy0+Z3Vj X2Z3X2ZldGNoX3N0YXR1cyA9IEdVQ19GSVJNV0FSRV9OT05FOworCWd1Y19mdy0+ZmV0Y2hfc3Rh dHVzID0gVUNfRklSTVdBUkVfTk9ORTsKIH0KLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK