From: Peter Antoine Subject: [PATCH v3 1/6] drm/i915/guc: Make the GuC fw loading helper functions general Date: Wed, 6 Jul 2016 15:24:26 +0100 Message-ID: <1467815071-35665-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id C0F036E67D for ; Wed, 6 Jul 2016 14:25:24 +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 Cc: Alex Dai , rodrigo.vivi@intel.com List-Id: intel-gfx@lists.freedesktop.org UmVuYW1lIHNvbWUgb2YgdGhlIEd1QyBmdyBsb2FkaW5nIGNvZGUgdG8gbWFrZSB0aGVtIG1vcmUg Z2VuZXJhbC4gV2UKd2lsbCB1dGlsaXNlIHRoZW0gZm9yIEh1QyBsb2FkaW5nIGFzIHdlbGwuCiAg ICAgcy9pbnRlbF9ndWNfZncvaW50ZWxfdWNfZncvZwogICAgIHMvR1VDX0ZJUk1XQVJFL1VDX0ZJ Uk1XQVJFL2cKClN0cnVjdCBpbnRlbF9ndWNfZncgaXMgcmVuYW1lZCB0byBpbnRlbF91Y19mdy4g UHJlZml4IG9mIHR0cyBtZW1iZXJzLApzdWNoIGFzICdndWMnIG9yICdndWNfZncnIGVpdGhlciBp cyByZW5hbWVkIHRvICd1Yycgb3IgcmVtb3ZlZCBmb3IKc2FtZSBwdXJwb3NlLgoKdjI6IHJlYmFz ZWQgb24gdG9wIG9mIG5pZ2h0bHkuCiAgICByZWFwcGxpZWQgdGhlIHNlYXJjaC9yZXBsYWNlIGFz IHVwc3RyZWFtIGNvZGUgYXMgY2hhbmdlZC4KdjM6IHJlYmFzZWQgYWdhaW4gb24gZHJtLW5pZ2h0 bHkuCgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERhaSA8eXUuZGFpQGludGVsLmNvbT4KU2lnbmVkLW9m Zi1ieTogUGV0ZXIgQW50b2luZSA8cGV0ZXIuYW50b2luZUBpbnRlbC5jb20+ClJldmlld2VkLWJ5 OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICAgICAgICB8ICAxMiArLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyB8ICAgNCArLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZ3VjLmggICAgICAgICAgIHwgIDM5ICsrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgICAgfCAxNDYgKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTAxIGluc2VydGlvbnMoKyksIDEwMCBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IDNkMDVjYWUuLjlhNmRlZmYg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC0yNDk4LDcgKzI0OTgsNyBAQCBz dGF0aWMgaW50IGk5MTVfZ3VjX2xvYWRfc3RhdHVzX2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2 b2lkICpkYXRhKQogewogCXN0cnVjdCBkcm1faW5mb19ub2RlICpub2RlID0gbS0+cHJpdmF0ZTsK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KG5vZGUtPm1pbm9y LT5kZXYpOwotCXN0cnVjdCBpbnRlbF9ndWNfZncgKmd1Y19mdyA9ICZkZXZfcHJpdi0+Z3VjLmd1 Y19mdzsKKwlzdHJ1Y3QgaW50ZWxfdWNfZncgKmd1Y19mdyA9ICZkZXZfcHJpdi0+Z3VjLmd1Y19m dzsKIAl1MzIgdG1wLCBpOwogCiAJaWYgKCFIQVNfR1VDX1VDT0RFKGRldl9wcml2KSkKQEAgLTI1 MDYsMTUgKzI1MDYsMTUgQEAgc3RhdGljIGludCBpOTE1X2d1Y19sb2FkX3N0YXR1c19pbmZvKHN0 cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAogCXNlcV9wcmludGYobSwgIkd1QyBmaXJt d2FyZSBzdGF0dXM6XG4iKTsKIAlzZXFfcHJpbnRmKG0sICJcdHBhdGg6ICVzXG4iLAotCQlndWNf ZnctPmd1Y19md19wYXRoKTsKKwkJZ3VjX2Z3LT51Y19md19wYXRoKTsKIAlzZXFfcHJpbnRmKG0s ICJcdGZldGNoOiAlc1xuIiwKLQkJaW50ZWxfZ3VjX2Z3X3N0YXR1c19yZXByKGd1Y19mdy0+Z3Vj X2Z3X2ZldGNoX3N0YXR1cykpOworCQlpbnRlbF91Y19md19zdGF0dXNfcmVwcihndWNfZnctPmZl dGNoX3N0YXR1cykpOwogCXNlcV9wcmludGYobSwgIlx0bG9hZDogJXNcbiIsCi0JCWludGVsX2d1 Y19md19zdGF0dXNfcmVwcihndWNfZnctPmd1Y19md19sb2FkX3N0YXR1cykpOworCQlpbnRlbF91 Y19md19zdGF0dXNfcmVwcihndWNfZnctPmxvYWRfc3RhdHVzKSk7CiAJc2VxX3ByaW50ZihtLCAi XHR2ZXJzaW9uIHdhbnRlZDogJWQuJWRcbiIsCi0JCWd1Y19mdy0+Z3VjX2Z3X21ham9yX3dhbnRl ZCwgZ3VjX2Z3LT5ndWNfZndfbWlub3Jfd2FudGVkKTsKKwkJZ3VjX2Z3LT5tYWpvcl92ZXJfd2Fu dGVkLCBndWNfZnctPm1pbm9yX3Zlcl93YW50ZWQpOwogCXNlcV9wcmludGYobSwgIlx0dmVyc2lv biBmb3VuZDogJWQuJWRcbiIsCi0JCWd1Y19mdy0+Z3VjX2Z3X21ham9yX2ZvdW5kLCBndWNfZnct Pmd1Y19md19taW5vcl9mb3VuZCk7CisJCWd1Y19mdy0+bWFqb3JfdmVyX2ZvdW5kLCBndWNfZnct Pm1pbm9yX3Zlcl9mb3VuZCk7CiAJc2VxX3ByaW50ZihtLCAiXHRoZWFkZXI6IG9mZnNldCBpcyAl ZDsgc2l6ZSA9ICVkXG4iLAogCQlndWNfZnctPmhlYWRlcl9vZmZzZXQsIGd1Y19mdy0+aGVhZGVy X3NpemUpOwogCXNlcV9wcmludGYobSwgIlx0dUNvZGU6IG9mZnNldCBpcyAlZDsgc2l6ZSA9ICVk XG4iLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lv bi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IGJm YzhiZjYuLjVmODg1MDAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3Vj X3N1Ym1pc3Npb24uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNz aW9uLmMKQEAgLTEwMzgsNyArMTAzOCw3IEBAIGludCBpbnRlbF9ndWNfc3VzcGVuZChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogCXN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHg7CiAJdTMyIGRh dGFbM107CiAKLQlpZiAoZ3VjLT5ndWNfZncuZ3VjX2Z3X2xvYWRfc3RhdHVzICE9IEdVQ19GSVJN V0FSRV9TVUNDRVNTKQorCWlmIChndWMtPmd1Y19mdy5sb2FkX3N0YXR1cyAhPSBVQ19GSVJNV0FS RV9TVUNDRVNTKQogCQlyZXR1cm4gMDsKIAogCWN0eCA9IGRldl9wcml2LT5rZXJuZWxfY29udGV4 dDsKQEAgLTEwNjQsNyArMTA2NCw3IEBAIGludCBpbnRlbF9ndWNfcmVzdW1lKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eDsKIAl1MzIgZGF0YVsz XTsKIAotCWlmIChndWMtPmd1Y19mdy5ndWNfZndfbG9hZF9zdGF0dXMgIT0gR1VDX0ZJUk1XQVJF X1NVQ0NFU1MpCisJaWYgKGd1Yy0+Z3VjX2Z3LmxvYWRfc3RhdHVzICE9IFVDX0ZJUk1XQVJFX1NV Q0NFU1MpCiAJCXJldHVybiAwOwogCiAJY3R4ID0gZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0Owpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ndWMuaAppbmRleCAzZTNlNzQzLi4wMmFkY2ZjIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWMuaApAQCAtOTAsMjkgKzkwLDI5IEBAIHN0cnVjdCBpOTE1X2d1Y19jbGll bnQgewogCXVpbnQ2NF90IHN1Ym1pc3Npb25zW0k5MTVfTlVNX0VOR0lORVNdOwogfTsKIAotZW51 bSBpbnRlbF9ndWNfZndfc3RhdHVzIHsKLQlHVUNfRklSTVdBUkVfRkFJTCA9IC0xLAotCUdVQ19G SVJNV0FSRV9OT05FID0gMCwKLQlHVUNfRklSTVdBUkVfUEVORElORywKLQlHVUNfRklSTVdBUkVf U1VDQ0VTUworZW51bSBpbnRlbF91Y19md19zdGF0dXMgeworCVVDX0ZJUk1XQVJFX0ZBSUwgPSAt MSwKKwlVQ19GSVJNV0FSRV9OT05FID0gMCwKKwlVQ19GSVJNV0FSRV9QRU5ESU5HLAorCVVDX0ZJ Uk1XQVJFX1NVQ0NFU1MKIH07CiAKIC8qCiAgKiBUaGlzIHN0cnVjdHVyZSBlbmNhcHN1bGF0ZXMg YWxsIHRoZSBkYXRhIG5lZWRlZCBkdXJpbmcgdGhlIHByb2Nlc3MKICAqIG9mIGZldGNoaW5nLCBj YWNoaW5nLCBhbmQgbG9hZGluZyB0aGUgZmlybXdhcmUgaW1hZ2UgaW50byB0aGUgR3VDLgogICov Ci1zdHJ1Y3QgaW50ZWxfZ3VjX2Z3IHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqCQlndWNfZGV2Owot CWNvbnN0IGNoYXIgKgkJCWd1Y19md19wYXRoOwotCXNpemVfdAkJCQlndWNfZndfc2l6ZTsKLQlz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqCWd1Y19md19vYmo7Ci0JZW51bSBpbnRlbF9ndWNf Zndfc3RhdHVzCWd1Y19md19mZXRjaF9zdGF0dXM7Ci0JZW51bSBpbnRlbF9ndWNfZndfc3RhdHVz CWd1Y19md19sb2FkX3N0YXR1czsKLQotCXVpbnQxNl90CQkJZ3VjX2Z3X21ham9yX3dhbnRlZDsK LQl1aW50MTZfdAkJCWd1Y19md19taW5vcl93YW50ZWQ7Ci0JdWludDE2X3QJCQlndWNfZndfbWFq b3JfZm91bmQ7Ci0JdWludDE2X3QJCQlndWNfZndfbWlub3JfZm91bmQ7CitzdHJ1Y3QgaW50ZWxf dWNfZncgeworCXN0cnVjdCBkcm1fZGV2aWNlICp1Y19kZXY7CisJY29uc3QgY2hhciAqdWNfZndf cGF0aDsKKwlzaXplX3QgdWNfZndfc2l6ZTsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq dWNfZndfb2JqOworCWVudW0gaW50ZWxfdWNfZndfc3RhdHVzIGZldGNoX3N0YXR1czsKKwllbnVt IGludGVsX3VjX2Z3X3N0YXR1cyBsb2FkX3N0YXR1czsKKworCXVpbnQxNl90IG1ham9yX3Zlcl93 YW50ZWQ7CisJdWludDE2X3QgbWlub3JfdmVyX3dhbnRlZDsKKwl1aW50MTZfdCBtYWpvcl92ZXJf Zm91bmQ7CisJdWludDE2X3QgbWlub3JfdmVyX2ZvdW5kOwogCiAJdWludDMyX3QgaGVhZGVyX3Np emU7CiAJdWludDMyX3QgaGVhZGVyX29mZnNldDsKQEAgLTEyMyw3ICsxMjMsNyBAQCBzdHJ1Y3Qg aW50ZWxfZ3VjX2Z3IHsKIH07CiAKIHN0cnVjdCBpbnRlbF9ndWMgewotCXN0cnVjdCBpbnRlbF9n dWNfZncgZ3VjX2Z3OworCXN0cnVjdCBpbnRlbF91Y19mdyBndWNfZnc7CiAJdWludDMyX3QgbG9n X2ZsYWdzOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpsb2dfb2JqOwogCkBAIC0xNTIs OSArMTUyLDEwIEBAIHN0cnVjdCBpbnRlbF9ndWMgewogZXh0ZXJuIHZvaWQgaW50ZWxfZ3VjX2lu aXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBleHRlcm4gaW50IGludGVsX2d1Y19zZXR1cChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGV4dGVybiB2b2lkIGludGVsX2d1Y19maW5pKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpOwotZXh0ZXJuIGNvbnN0IGNoYXIgKmludGVsX2d1Y19md19zdGF0 dXNfcmVwcihlbnVtIGludGVsX2d1Y19md19zdGF0dXMgc3RhdHVzKTsKK2V4dGVybiBjb25zdCBj aGFyICppbnRlbF91Y19md19zdGF0dXNfcmVwcihlbnVtIGludGVsX3VjX2Z3X3N0YXR1cyBzdGF0 dXMpOwogZXh0ZXJuIGludCBpbnRlbF9ndWNfc3VzcGVuZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KTsKIGV4dGVybiBpbnQgaW50ZWxfZ3VjX3Jlc3VtZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK K3ZvaWQgaW50ZWxfdWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGlu dGVsX3VjX2Z3ICp1Y19mdyk7CiAKIC8qIGk5MTVfZ3VjX3N1Ym1pc3Npb24uYyAqLwogaW50IGk5 MTVfZ3VjX3N1Ym1pc3Npb25faW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IDYwNWM2OTYuLjFh ZmE0OWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKQEAgLTY5LDE2 ICs2OSwxNiBAQCBNT0RVTEVfRklSTVdBUkUoSTkxNV9CWFRfR1VDX1VDT0RFKTsKIE1PRFVMRV9G SVJNV0FSRShJOTE1X0tCTF9HVUNfVUNPREUpOwogCiAvKiBVc2VyLWZyaWVuZGx5IHJlcHJlc2Vu dGF0aW9uIG9mIGFuIGVudW0gKi8KLWNvbnN0IGNoYXIgKmludGVsX2d1Y19md19zdGF0dXNfcmVw cihlbnVtIGludGVsX2d1Y19md19zdGF0dXMgc3RhdHVzKQorY29uc3QgY2hhciAqaW50ZWxfdWNf Zndfc3RhdHVzX3JlcHIoZW51bSBpbnRlbF91Y19md19zdGF0dXMgc3RhdHVzKQogewogCXN3aXRj aCAoc3RhdHVzKSB7Ci0JY2FzZSBHVUNfRklSTVdBUkVfRkFJTDoKKwljYXNlIFVDX0ZJUk1XQVJF X0ZBSUw6CiAJCXJldHVybiAiRkFJTCI7Ci0JY2FzZSBHVUNfRklSTVdBUkVfTk9ORToKKwljYXNl IFVDX0ZJUk1XQVJFX05PTkU6CiAJCXJldHVybiAiTk9ORSI7Ci0JY2FzZSBHVUNfRklSTVdBUkVf UEVORElORzoKKwljYXNlIFVDX0ZJUk1XQVJFX1BFTkRJTkc6CiAJCXJldHVybiAiUEVORElORyI7 Ci0JY2FzZSBHVUNfRklSTVdBUkVfU1VDQ0VTUzoKKwljYXNlIFVDX0ZJUk1XQVJFX1NVQ0NFU1M6 CiAJCXJldHVybiAiU1VDQ0VTUyI7CiAJZGVmYXVsdDoKIAkJcmV0dXJuICJVTktOT1dOISI7CkBA IC0yNDAsOCArMjQwLDggQEAgc3RhdGljIGlubGluZSBib29sIGd1Y191Y29kZV9yZXNwb25zZShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAgKi8KIHN0YXRpYyBpbnQgZ3VjX3Vj b2RlX3hmZXJfZG1hKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1 Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncgPSAmZGV2X3ByaXYtPmd1Yy5ndWNfZnc7Ci0Jc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKmZ3X29iaiA9IGd1Y19mdy0+Z3VjX2Z3X29iajsKKwlzdHJ1 Y3QgaW50ZWxfdWNfZncgKmd1Y19mdyA9ICZkZXZfcHJpdi0+Z3VjLmd1Y19mdzsKKwlzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqZndfb2JqID0gZ3VjX2Z3LT51Y19md19vYmo7CiAJdW5zaWdu ZWQgbG9uZyBvZmZzZXQ7CiAJc3RydWN0IHNnX3RhYmxlICpzZyA9IGZ3X29iai0+cGFnZXM7CiAJ dTMyIHN0YXR1cywgcnNhW1VPU19SU0FfU0NSQVRDSF9NQVhfQ09VTlRdOwpAQCAtMzEzLDE3ICsz MTMsMTcgQEAgc3RhdGljIHUzMiBndWNfd29wY21fc2l6ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiAgKi8KIHN0YXRpYyBpbnQgZ3VjX3Vjb2RlX3hmZXIoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBpbnRlbF9ndWNfZncgKmd1Y19mdyA9 ICZkZXZfcHJpdi0+Z3VjLmd1Y19mdzsKKwlzdHJ1Y3QgaW50ZWxfdWNfZncgKmd1Y19mdyA9ICZk ZXZfcHJpdi0+Z3VjLmd1Y19mdzsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gJmRldl9wcml2 LT5kcm07CiAJaW50IHJldDsKIAotCXJldCA9IGk5MTVfZ2VtX29iamVjdF9zZXRfdG9fZ3R0X2Rv bWFpbihndWNfZnctPmd1Y19md19vYmosIGZhbHNlKTsKKwlyZXQgPSBpOTE1X2dlbV9vYmplY3Rf c2V0X3RvX2d0dF9kb21haW4oZ3VjX2Z3LT51Y19md19vYmosIGZhbHNlKTsKIAlpZiAocmV0KSB7 CiAJCURSTV9ERUJVR19EUklWRVIoInNldC1kb21haW4gZmFpbGVkICVkXG4iLCByZXQpOwogCQly ZXR1cm4gcmV0OwogCX0KIAotCXJldCA9IGk5MTVfZ2VtX29ial9nZ3R0X3BpbihndWNfZnctPmd1 Y19md19vYmosIDAsIDApOworCXJldCA9IGk5MTVfZ2VtX29ial9nZ3R0X3BpbihndWNfZnctPnVj X2Z3X29iaiwgMCwgMCk7CiAJaWYgKHJldCkgewogCQlEUk1fREVCVUdfRFJJVkVSKCJwaW4gZmFp bGVkICVkXG4iLCByZXQpOwogCQlyZXR1cm4gcmV0OwpAQCAtMzc1LDcgKzM3NSw3IEBAIHN0YXRp YyBpbnQgZ3VjX3Vjb2RlX3hmZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CSAqIFdlIGtlZXAgdGhlIG9iamVjdCBwYWdlcyBmb3IgcmV1c2UgZHVyaW5nIHJlc3VtZS4gQnV0 IHdlIGNhbiB1bnBpbiBpdAogCSAqIG5vdyB0aGF0IERNQSBoYXMgY29tcGxldGVkLCBzbyBpdCBk b2Vzbid0IGNvbnRpbnVlIHRvIHRha2UgdXAgc3BhY2UuCiAJICovCi0JaTkxNV9nZW1fb2JqZWN0 X2dndHRfdW5waW4oZ3VjX2Z3LT5ndWNfZndfb2JqKTsKKwlpOTE1X2dlbV9vYmplY3RfZ2d0dF91 bnBpbihndWNfZnctPnVjX2Z3X29iaik7CiAKIAlyZXR1cm4gcmV0OwogfQpAQCAtNDE0LDE0ICs0 MTQsMTQgQEAgc3RhdGljIGludCBpOTE1X3Jlc2V0X2d1YyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiBpbnQgaW50ZWxfZ3VjX3NldHVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwot CXN0cnVjdCBpbnRlbF9ndWNfZncgKmd1Y19mdyA9ICZkZXZfcHJpdi0+Z3VjLmd1Y19mdzsKLQlj b25zdCBjaGFyICpmd19wYXRoID0gZ3VjX2Z3LT5ndWNfZndfcGF0aDsKKwlzdHJ1Y3QgaW50ZWxf dWNfZncgKmd1Y19mdyA9ICZkZXZfcHJpdi0+Z3VjLmd1Y19mdzsKKwljb25zdCBjaGFyICpmd19w YXRoID0gZ3VjX2Z3LT51Y19md19wYXRoOwogCWludCByZXRyaWVzLCByZXQsIGVycjsKIAogCURS TV9ERUJVR19EUklWRVIoIkd1QyBmdyBzdGF0dXM6IHBhdGggJXMsIGZldGNoICVzLCBsb2FkICVz XG4iLAogCQlmd19wYXRoLAotCQlpbnRlbF9ndWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5ndWNf ZndfZmV0Y2hfc3RhdHVzKSwKLQkJaW50ZWxfZ3VjX2Z3X3N0YXR1c19yZXByKGd1Y19mdy0+Z3Vj X2Z3X2xvYWRfc3RhdHVzKSk7CisJCWludGVsX3VjX2Z3X3N0YXR1c19yZXByKGd1Y19mdy0+ZmV0 Y2hfc3RhdHVzKSwKKwkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5sb2FkX3N0YXR1 cykpOwogCiAJLyogTG9hZGluZyBmb3JiaWRkZW4sIG9yIG5vIGZpcm13YXJlIHRvIGxvYWQ/ICov CiAJaWYgKCFpOTE1LmVuYWJsZV9ndWNfbG9hZGluZykgewpAQCAtNDM5LDIxICs0MzksMjEgQEAg aW50IGludGVsX2d1Y19zZXR1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCX0KIAogCS8qIEZl dGNoIGZhaWxlZCwgb3IgYWxyZWFkeSBmZXRjaGVkIGJ1dCBmYWlsZWQgdG8gbG9hZD8gKi8KLQlp ZiAoZ3VjX2Z3LT5ndWNfZndfZmV0Y2hfc3RhdHVzICE9IEdVQ19GSVJNV0FSRV9TVUNDRVNTKSB7 CisJaWYgKGd1Y19mdy0+ZmV0Y2hfc3RhdHVzICE9IFVDX0ZJUk1XQVJFX1NVQ0NFU1MpIHsKIAkJ ZXJyID0gLUVJTzsKIAkJZ290byBmYWlsOwotCX0gZWxzZSBpZiAoZ3VjX2Z3LT5ndWNfZndfbG9h ZF9zdGF0dXMgPT0gR1VDX0ZJUk1XQVJFX0ZBSUwpIHsKKwl9IGVsc2UgaWYgKGd1Y19mdy0+bG9h ZF9zdGF0dXMgPT0gVUNfRklSTVdBUkVfRkFJTCkgewogCQllcnIgPSAtRU5PRVhFQzsKIAkJZ290 byBmYWlsOwogCX0KIAogCWRpcmVjdF9pbnRlcnJ1cHRzX3RvX2hvc3QoZGV2X3ByaXYpOwogCi0J Z3VjX2Z3LT5ndWNfZndfbG9hZF9zdGF0dXMgPSBHVUNfRklSTVdBUkVfUEVORElORzsKKwlndWNf ZnctPmxvYWRfc3RhdHVzID0gVUNfRklSTVdBUkVfUEVORElORzsKIAogCURSTV9ERUJVR19EUklW RVIoIkd1QyBmdyBzdGF0dXM6IGZldGNoICVzLCBsb2FkICVzXG4iLAotCQlpbnRlbF9ndWNfZndf c3RhdHVzX3JlcHIoZ3VjX2Z3LT5ndWNfZndfZmV0Y2hfc3RhdHVzKSwKLQkJaW50ZWxfZ3VjX2Z3 X3N0YXR1c19yZXByKGd1Y19mdy0+Z3VjX2Z3X2xvYWRfc3RhdHVzKSk7CisJCWludGVsX3VjX2Z3 X3N0YXR1c19yZXByKGd1Y19mdy0+ZmV0Y2hfc3RhdHVzKSwKKwkJaW50ZWxfdWNfZndfc3RhdHVz X3JlcHIoZ3VjX2Z3LT5sb2FkX3N0YXR1cykpOwogCiAJZXJyID0gaTkxNV9ndWNfc3VibWlzc2lv bl9pbml0KGRldl9wcml2KTsKIAlpZiAoZXJyKQpAQCAtNDg3LDExICs0ODcsMTEgQEAgaW50IGlu dGVsX2d1Y19zZXR1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJICJyZXRyeSAlZCBtb3Jl IHRpbWUocylcbiIsIGVyciwgcmV0cmllcyk7CiAJfQogCi0JZ3VjX2Z3LT5ndWNfZndfbG9hZF9z dGF0dXMgPSBHVUNfRklSTVdBUkVfU1VDQ0VTUzsKKwlndWNfZnctPmxvYWRfc3RhdHVzID0gVUNf RklSTVdBUkVfU1VDQ0VTUzsKIAogCURSTV9ERUJVR19EUklWRVIoIkd1QyBmdyBzdGF0dXM6IGZl dGNoICVzLCBsb2FkICVzXG4iLAotCQlpbnRlbF9ndWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5n dWNfZndfZmV0Y2hfc3RhdHVzKSwKLQkJaW50ZWxfZ3VjX2Z3X3N0YXR1c19yZXByKGd1Y19mdy0+ Z3VjX2Z3X2xvYWRfc3RhdHVzKSk7CisJCWludGVsX3VjX2Z3X3N0YXR1c19yZXByKGd1Y19mdy0+ ZmV0Y2hfc3RhdHVzKSwKKwkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5sb2FkX3N0 YXR1cykpOwogCiAJaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uKSB7CiAJCWVyciA9IGk5 MTVfZ3VjX3N1Ym1pc3Npb25fZW5hYmxlKGRldl9wcml2KTsKQEAgLTUwMyw4ICs1MDMsOCBAQCBp bnQgaW50ZWxfZ3VjX3NldHVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJcmV0dXJuIDA7CiAK IGZhaWw6Ci0JaWYgKGd1Y19mdy0+Z3VjX2Z3X2xvYWRfc3RhdHVzID09IEdVQ19GSVJNV0FSRV9Q RU5ESU5HKQotCQlndWNfZnctPmd1Y19md19sb2FkX3N0YXR1cyA9IEdVQ19GSVJNV0FSRV9GQUlM OworCWlmIChndWNfZnctPmxvYWRfc3RhdHVzID09IFVDX0ZJUk1XQVJFX1BFTkRJTkcpCisJCWd1 Y19mdy0+bG9hZF9zdGF0dXMgPSBVQ19GSVJNV0FSRV9GQUlMOwogCiAJZGlyZWN0X2ludGVycnVw dHNfdG9faG9zdChkZXZfcHJpdik7CiAJaTkxNV9ndWNfc3VibWlzc2lvbl9kaXNhYmxlKGRldl9w cml2KTsKQEAgLTU0OSw3ICs1NDksNyBAQCBmYWlsOgogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRp YyB2b2lkIGd1Y19md19mZXRjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxf Z3VjX2Z3ICpndWNfZncpCit2b2lkIGludGVsX3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHN0cnVjdCBpbnRlbF91Y19mdyAqdWNfZncpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKm9iajsKIAljb25zdCBzdHJ1Y3QgZmlybXdhcmUgKmZ3OwpAQCAtNTU4LDE2ICs1 NTgsMTYgQEAgc3RhdGljIHZvaWQgZ3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHN0cnVjdCBpbnRlbF9ndWNfZncgKmd1Y19mdykKIAlpbnQgZXJyOwogCiAJRFJNX0RFQlVHX0RS SVZFUigiYmVmb3JlIHJlcXVlc3RpbmcgZmlybXdhcmU6IEd1QyBmdyBmZXRjaCBzdGF0dXMgJXNc biIsCi0JCWludGVsX2d1Y19md19zdGF0dXNfcmVwcihndWNfZnctPmd1Y19md19mZXRjaF9zdGF0 dXMpKTsKKwkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIodWNfZnctPmZldGNoX3N0YXR1cykpOwog Ci0JZXJyID0gcmVxdWVzdF9maXJtd2FyZSgmZncsIGd1Y19mdy0+Z3VjX2Z3X3BhdGgsICZkZXYt PnBkZXYtPmRldik7CisJZXJyID0gcmVxdWVzdF9maXJtd2FyZSgmZncsIHVjX2Z3LT51Y19md19w YXRoLCAmZGV2LT5wZGV2LT5kZXYpOwogCWlmIChlcnIpCiAJCWdvdG8gZmFpbDsKIAlpZiAoIWZ3 KQogCQlnb3RvIGZhaWw7CiAKIAlEUk1fREVCVUdfRFJJVkVSKCJmZXRjaCBHdUMgZncgZnJvbSAl cyBzdWNjZWVkZWQsIGZ3ICVwXG4iLAotCQlndWNfZnctPmd1Y19md19wYXRoLCBmdyk7CisJCXVj X2Z3LT51Y19md19wYXRoLCBmdyk7CiAKIAkvKiBDaGVjayB0aGUgc2l6ZSBvZiB0aGUgYmxvYiBi ZWZvcmUgZXhhbWluaW5nIGJ1ZmZlciBjb250ZW50cyAqLwogCWlmIChmdy0+c2l6ZSA8IHNpemVv ZihzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIpKSB7CkBAIC01NzgsMzYgKzU3OCwzNiBAQCBzdGF0aWMg dm9pZCBndWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVsX2d1 Y19mdyAqZ3VjX2Z3KQogCWNzcyA9IChzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIgKilmdy0+ZGF0YTsK IAogCS8qIEZpcm13YXJlIGJpdHMgYWx3YXlzIHN0YXJ0IGZyb20gaGVhZGVyICovCi0JZ3VjX2Z3 LT5oZWFkZXJfb2Zmc2V0ID0gMDsKLQlndWNfZnctPmhlYWRlcl9zaXplID0gKGNzcy0+aGVhZGVy X3NpemVfZHcgLSBjc3MtPm1vZHVsdXNfc2l6ZV9kdyAtCisJdWNfZnctPmhlYWRlcl9vZmZzZXQg PSAwOworCXVjX2Z3LT5oZWFkZXJfc2l6ZSA9IChjc3MtPmhlYWRlcl9zaXplX2R3IC0gY3NzLT5t b2R1bHVzX3NpemVfZHcgLQogCQljc3MtPmtleV9zaXplX2R3IC0gY3NzLT5leHBvbmVudF9zaXpl X2R3KSAqIHNpemVvZih1MzIpOwogCi0JaWYgKGd1Y19mdy0+aGVhZGVyX3NpemUgIT0gc2l6ZW9m KHN0cnVjdCBndWNfY3NzX2hlYWRlcikpIHsKKwlpZiAodWNfZnctPmhlYWRlcl9zaXplICE9IHNp emVvZihzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIpKSB7CiAJCURSTV9FUlJPUigiQ1NTIGhlYWRlciBk ZWZpbml0aW9uIG1pc21hdGNoXG4iKTsKIAkJZ290byBmYWlsOwogCX0KIAogCS8qIHRoZW4sIHVD b2RlICovCi0JZ3VjX2Z3LT51Y29kZV9vZmZzZXQgPSBndWNfZnctPmhlYWRlcl9vZmZzZXQgKyBn dWNfZnctPmhlYWRlcl9zaXplOwotCWd1Y19mdy0+dWNvZGVfc2l6ZSA9IChjc3MtPnNpemVfZHcg LSBjc3MtPmhlYWRlcl9zaXplX2R3KSAqIHNpemVvZih1MzIpOworCXVjX2Z3LT51Y29kZV9vZmZz ZXQgPSB1Y19mdy0+aGVhZGVyX29mZnNldCArIHVjX2Z3LT5oZWFkZXJfc2l6ZTsKKwl1Y19mdy0+ dWNvZGVfc2l6ZSA9IChjc3MtPnNpemVfZHcgLSBjc3MtPmhlYWRlcl9zaXplX2R3KSAqIHNpemVv Zih1MzIpOwogCiAJLyogbm93IFJTQSAqLwogCWlmIChjc3MtPmtleV9zaXplX2R3ICE9IFVPU19S U0FfU0NSQVRDSF9NQVhfQ09VTlQpIHsKIAkJRFJNX0VSUk9SKCJSU0Ega2V5IHNpemUgaXMgYmFk XG4iKTsKIAkJZ290byBmYWlsOwogCX0KLQlndWNfZnctPnJzYV9vZmZzZXQgPSBndWNfZnctPnVj b2RlX29mZnNldCArIGd1Y19mdy0+dWNvZGVfc2l6ZTsKLQlndWNfZnctPnJzYV9zaXplID0gY3Nz LT5rZXlfc2l6ZV9kdyAqIHNpemVvZih1MzIpOworCXVjX2Z3LT5yc2Ffb2Zmc2V0ID0gdWNfZnct PnVjb2RlX29mZnNldCArIHVjX2Z3LT51Y29kZV9zaXplOworCXVjX2Z3LT5yc2Ffc2l6ZSA9IGNz cy0+a2V5X3NpemVfZHcgKiBzaXplb2YodTMyKTsKIAogCS8qIEF0IGxlYXN0LCBpdCBzaG91bGQg aGF2ZSBoZWFkZXIsIHVDb2RlIGFuZCBSU0EuIFNpemUgb2YgYWxsIHRocmVlLiAqLwotCXNpemUg PSBndWNfZnctPmhlYWRlcl9zaXplICsgZ3VjX2Z3LT51Y29kZV9zaXplICsgZ3VjX2Z3LT5yc2Ff c2l6ZTsKKwlzaXplID0gdWNfZnctPmhlYWRlcl9zaXplICsgdWNfZnctPnVjb2RlX3NpemUgKyB1 Y19mdy0+cnNhX3NpemU7CiAJaWYgKGZ3LT5zaXplIDwgc2l6ZSkgewogCQlEUk1fRVJST1IoIk1p c3NpbmcgZmlybXdhcmUgY29tcG9uZW50c1xuIik7CiAJCWdvdG8gZmFpbDsKIAl9CiAKIAkvKiBI ZWFkZXIgYW5kIHVDb2RlIHdpbGwgYmUgbG9hZGVkIHRvIFdPUENNLiBTaXplIG9mIHRoZSB0d28u ICovCi0Jc2l6ZSA9IGd1Y19mdy0+aGVhZGVyX3NpemUgKyBndWNfZnctPnVjb2RlX3NpemU7CisJ c2l6ZSA9IHVjX2Z3LT5oZWFkZXJfc2l6ZSArIHVjX2Z3LT51Y29kZV9zaXplOwogCWlmIChzaXpl ID4gZ3VjX3dvcGNtX3NpemUodG9faTkxNShkZXYpKSkgewogCQlEUk1fRVJST1IoIkZpcm13YXJl IGlzIHRvbyBsYXJnZSB0byBmaXQgaW4gV09QQ01cbiIpOwogCQlnb3RvIGZhaWw7CkBAIC02MTks MjEgKzYxOSwyMSBAQCBzdGF0aWMgdm9pZCBndWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgc3RydWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3KQogCSAqIFRXTyBieXRlcyBlYWNoIChp LmUuIHUxNiksIGFsdGhvdWdoIGFsbCBwb2ludGVycyBhbmQgb2Zmc2V0cyBhcmUgZGVmaW5lZAog CSAqIGluIHRlcm1zIG9mIGJ5dGVzICh1OCkuCiAJICovCi0JZ3VjX2Z3LT5ndWNfZndfbWFqb3Jf Zm91bmQgPSBjc3MtPmd1Y19zd192ZXJzaW9uID4+IDE2OwotCWd1Y19mdy0+Z3VjX2Z3X21pbm9y X2ZvdW5kID0gY3NzLT5ndWNfc3dfdmVyc2lvbiAmIDB4RkZGRjsKKwl1Y19mdy0+bWFqb3JfdmVy X2ZvdW5kID0gY3NzLT5ndWNfc3dfdmVyc2lvbiA+PiAxNjsKKwl1Y19mdy0+bWlub3JfdmVyX2Zv dW5kID0gY3NzLT5ndWNfc3dfdmVyc2lvbiAmIDB4RkZGRjsKIAotCWlmIChndWNfZnctPmd1Y19m d19tYWpvcl9mb3VuZCAhPSBndWNfZnctPmd1Y19md19tYWpvcl93YW50ZWQgfHwKLQkgICAgZ3Vj X2Z3LT5ndWNfZndfbWlub3JfZm91bmQgPCBndWNfZnctPmd1Y19md19taW5vcl93YW50ZWQpIHsK KwlpZiAodWNfZnctPm1ham9yX3Zlcl9mb3VuZCAhPSB1Y19mdy0+bWFqb3JfdmVyX3dhbnRlZCB8 fAorCSAgICB1Y19mdy0+bWlub3JfdmVyX2ZvdW5kIDwgdWNfZnctPm1pbm9yX3Zlcl93YW50ZWQp IHsKIAkJRFJNX0VSUk9SKCJHdUMgZmlybXdhcmUgdmVyc2lvbiAlZC4lZCwgcmVxdWlyZWQgJWQu JWRcbiIsCi0JCQlndWNfZnctPmd1Y19md19tYWpvcl9mb3VuZCwgZ3VjX2Z3LT5ndWNfZndfbWlu b3JfZm91bmQsCi0JCQlndWNfZnctPmd1Y19md19tYWpvcl93YW50ZWQsIGd1Y19mdy0+Z3VjX2Z3 X21pbm9yX3dhbnRlZCk7CisJCQl1Y19mdy0+bWFqb3JfdmVyX2ZvdW5kLCB1Y19mdy0+bWlub3Jf dmVyX2ZvdW5kLAorCQkJdWNfZnctPm1ham9yX3Zlcl93YW50ZWQsIHVjX2Z3LT5taW5vcl92ZXJf d2FudGVkKTsKIAkJZXJyID0gLUVOT0VYRUM7CiAJCWdvdG8gZmFpbDsKIAl9CiAKIAlEUk1fREVC VUdfRFJJVkVSKCJmaXJtd2FyZSB2ZXJzaW9uICVkLiVkIE9LIChtaW5pbXVtICVkLiVkKVxuIiwK LQkJCWd1Y19mdy0+Z3VjX2Z3X21ham9yX2ZvdW5kLCBndWNfZnctPmd1Y19md19taW5vcl9mb3Vu ZCwKLQkJCWd1Y19mdy0+Z3VjX2Z3X21ham9yX3dhbnRlZCwgZ3VjX2Z3LT5ndWNfZndfbWlub3Jf d2FudGVkKTsKKwkJCXVjX2Z3LT5tYWpvcl92ZXJfZm91bmQsIHVjX2Z3LT5taW5vcl92ZXJfZm91 bmQsCisJCQl1Y19mdy0+bWFqb3JfdmVyX3dhbnRlZCwgdWNfZnctPm1pbm9yX3Zlcl93YW50ZWQp OwogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCW9iaiA9IGk5MTVfZ2VtX29i amVjdF9jcmVhdGVfZnJvbV9kYXRhKGRldiwgZnctPmRhdGEsIGZ3LT5zaXplKTsKQEAgLTY0Mywz MSArNjQzLDMxIEBAIHN0YXRpYyB2b2lkIGd1Y19md19mZXRjaChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCBzdHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncpCiAJCWdvdG8gZmFpbDsKIAl9CiAKLQln dWNfZnctPmd1Y19md19vYmogPSBvYmo7Ci0JZ3VjX2Z3LT5ndWNfZndfc2l6ZSA9IGZ3LT5zaXpl OworCXVjX2Z3LT51Y19md19vYmogPSBvYmo7CisJdWNfZnctPnVjX2Z3X3NpemUgPSBmdy0+c2l6 ZTsKIAogCURSTV9ERUJVR19EUklWRVIoIkd1QyBmdyBmZXRjaCBzdGF0dXMgU1VDQ0VTUywgb2Jq ICVwXG4iLAotCQkJZ3VjX2Z3LT5ndWNfZndfb2JqKTsKKwkJCXVjX2Z3LT51Y19md19vYmopOwog CiAJcmVsZWFzZV9maXJtd2FyZShmdyk7Ci0JZ3VjX2Z3LT5ndWNfZndfZmV0Y2hfc3RhdHVzID0g R1VDX0ZJUk1XQVJFX1NVQ0NFU1M7CisJdWNfZnctPmZldGNoX3N0YXR1cyA9IFVDX0ZJUk1XQVJF X1NVQ0NFU1M7CiAJcmV0dXJuOwogCiBmYWlsOgogCURSTV9ERUJVR19EUklWRVIoIkd1QyBmdyBm ZXRjaCBzdGF0dXMgRkFJTDsgZXJyICVkLCBmdyAlcCwgb2JqICVwXG4iLAotCQllcnIsIGZ3LCBn dWNfZnctPmd1Y19md19vYmopOworCQllcnIsIGZ3LCB1Y19mdy0+dWNfZndfb2JqKTsKIAlEUk1f RVJST1IoIkZhaWxlZCB0byBmZXRjaCBHdUMgZmlybXdhcmUgZnJvbSAlcyAoZXJyb3IgJWQpXG4i LAotCQkgIGd1Y19mdy0+Z3VjX2Z3X3BhdGgsIGVycik7CisJCSAgdWNfZnctPnVjX2Z3X3BhdGgs IGVycik7CiAKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0Jb2JqID0gZ3VjX2Z3 LT5ndWNfZndfb2JqOworCW9iaiA9IHVjX2Z3LT51Y19md19vYmo7CiAJaWYgKG9iaikKIAkJZHJt X2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJm9iai0+YmFzZSk7Ci0JZ3VjX2Z3LT5ndWNfZndfb2Jq ID0gTlVMTDsKKwl1Y19mdy0+dWNfZndfb2JqID0gTlVMTDsKIAltdXRleF91bmxvY2soJmRldi0+ c3RydWN0X211dGV4KTsKIAogCXJlbGVhc2VfZmlybXdhcmUoZncpOwkJLyogT0sgZXZlbiBpZiBm dyBpcyBOVUxMICovCi0JZ3VjX2Z3LT5ndWNfZndfZmV0Y2hfc3RhdHVzID0gR1VDX0ZJUk1XQVJF X0ZBSUw7CisJdWNfZnctPmZldGNoX3N0YXR1cyA9IFVDX0ZJUk1XQVJFX0ZBSUw7CiB9CiAKIC8q KgpAQCAtNjgyLDcgKzY4Miw3IEBAIGZhaWw6CiB2b2lkIGludGVsX2d1Y19pbml0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShkZXYpOwotCXN0cnVjdCBpbnRlbF9ndWNfZncgKmd1Y19mdyA9ICZkZXZfcHJpdi0+ Z3VjLmd1Y19mdzsKKwlzdHJ1Y3QgaW50ZWxfdWNfZncgKmd1Y19mdyA9ICZkZXZfcHJpdi0+Z3Vj Lmd1Y19mdzsKIAljb25zdCBjaGFyICpmd19wYXRoOwogCiAJLyogQSBuZWdhdGl2ZSB2YWx1ZSBt ZWFucyAidXNlIHBsYXRmb3JtIGRlZmF1bHQiICovCkBAIC02OTUsMjQgKzY5NSwyNCBAQCB2b2lk IGludGVsX2d1Y19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWZ3X3BhdGggPSBOVUxM OwogCX0gZWxzZSBpZiAoSVNfU0tZTEFLRShkZXYpKSB7CiAJCWZ3X3BhdGggPSBJOTE1X1NLTF9H VUNfVUNPREU7Ci0JCWd1Y19mdy0+Z3VjX2Z3X21ham9yX3dhbnRlZCA9IDY7Ci0JCWd1Y19mdy0+ Z3VjX2Z3X21pbm9yX3dhbnRlZCA9IDE7CisJCWd1Y19mdy0+bWFqb3JfdmVyX3dhbnRlZCA9IDY7 CisJCWd1Y19mdy0+bWlub3JfdmVyX3dhbnRlZCA9IDE7CiAJfSBlbHNlIGlmIChJU19CUk9YVE9O KGRldikpIHsKIAkJZndfcGF0aCA9IEk5MTVfQlhUX0dVQ19VQ09ERTsKLQkJZ3VjX2Z3LT5ndWNf ZndfbWFqb3Jfd2FudGVkID0gODsKLQkJZ3VjX2Z3LT5ndWNfZndfbWlub3Jfd2FudGVkID0gNzsK KwkJZ3VjX2Z3LT5tYWpvcl92ZXJfd2FudGVkID0gODsKKwkJZ3VjX2Z3LT5taW5vcl92ZXJfd2Fu dGVkID0gNzsKIAl9IGVsc2UgaWYgKElTX0tBQllMQUtFKGRldikpIHsKIAkJZndfcGF0aCA9IEk5 MTVfS0JMX0dVQ19VQ09ERTsKLQkJZ3VjX2Z3LT5ndWNfZndfbWFqb3Jfd2FudGVkID0gOTsKLQkJ Z3VjX2Z3LT5ndWNfZndfbWlub3Jfd2FudGVkID0gMTQ7CisJCWd1Y19mdy0+bWFqb3JfdmVyX3dh bnRlZCA9IDk7CisJCWd1Y19mdy0+bWlub3JfdmVyX3dhbnRlZCA9IDE0OwogCX0gZWxzZSB7CiAJ CWZ3X3BhdGggPSAiIjsJLyogdW5rbm93biBkZXZpY2UgKi8KIAl9CiAKLQlndWNfZnctPmd1Y19k ZXYgPSBkZXY7Ci0JZ3VjX2Z3LT5ndWNfZndfcGF0aCA9IGZ3X3BhdGg7Ci0JZ3VjX2Z3LT5ndWNf ZndfZmV0Y2hfc3RhdHVzID0gR1VDX0ZJUk1XQVJFX05PTkU7Ci0JZ3VjX2Z3LT5ndWNfZndfbG9h ZF9zdGF0dXMgPSBHVUNfRklSTVdBUkVfTk9ORTsKKwlndWNfZnctPnVjX2RldiA9IGRldjsKKwln dWNfZnctPnVjX2Z3X3BhdGggPSBmd19wYXRoOworCWd1Y19mdy0+ZmV0Y2hfc3RhdHVzID0gVUNf RklSTVdBUkVfTk9ORTsKKwlndWNfZnctPmxvYWRfc3RhdHVzID0gVUNfRklSTVdBUkVfTk9ORTsK IAogCS8qIEVhcmx5IChhbmQgc2lsZW50KSByZXR1cm4gaWYgR3VDIGxvYWRpbmcgaXMgZGlzYWJs ZWQgKi8KIAlpZiAoIWk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nKQpAQCAtNzIyLDkgKzcyMiw5IEBA IHZvaWQgaW50ZWxfZ3VjX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAoKmZ3X3Bh dGggPT0gJ1wwJykKIAkJcmV0dXJuOwogCi0JZ3VjX2Z3LT5ndWNfZndfZmV0Y2hfc3RhdHVzID0g R1VDX0ZJUk1XQVJFX1BFTkRJTkc7CisJZ3VjX2Z3LT5mZXRjaF9zdGF0dXMgPSBVQ19GSVJNV0FS RV9QRU5ESU5HOwogCURSTV9ERUJVR19EUklWRVIoIkd1QyBmaXJtd2FyZSBwZW5kaW5nLCBwYXRo ICVzXG4iLCBmd19wYXRoKTsKLQlndWNfZndfZmV0Y2goZGV2LCBndWNfZncpOworCWludGVsX3Vj X2Z3X2ZldGNoKGRldiwgZ3VjX2Z3KTsKIAkvKiBzdGF0dXMgbXVzdCBub3cgYmUgRkFJTCBvciBT VUNDRVNTICovCiB9CiAKQEAgLTczNSwxNyArNzM1LDE3IEBAIHZvaWQgaW50ZWxfZ3VjX2luaXQo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIHZvaWQgaW50ZWxfZ3VjX2Zpbmkoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19p OTE1KGRldik7Ci0Jc3RydWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3ID0gJmRldl9wcml2LT5ndWMu Z3VjX2Z3OworCXN0cnVjdCBpbnRlbF91Y19mdyAqZ3VjX2Z3ID0gJmRldl9wcml2LT5ndWMuZ3Vj X2Z3OwogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCWRpcmVjdF9pbnRlcnJ1 cHRzX3RvX2hvc3QoZGV2X3ByaXYpOwogCWk5MTVfZ3VjX3N1Ym1pc3Npb25fZGlzYWJsZShkZXZf cHJpdik7CiAJaTkxNV9ndWNfc3VibWlzc2lvbl9maW5pKGRldl9wcml2KTsKIAotCWlmIChndWNf ZnctPmd1Y19md19vYmopCi0JCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZndWNfZnctPmd1 Y19md19vYmotPmJhc2UpOwotCWd1Y19mdy0+Z3VjX2Z3X29iaiA9IE5VTEw7CisJaWYgKGd1Y19m dy0+dWNfZndfb2JqKQorCQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgmZ3VjX2Z3LT51Y19m d19vYmotPmJhc2UpOworCWd1Y19mdy0+dWNfZndfb2JqID0gTlVMTDsKIAltdXRleF91bmxvY2so JmRldi0+c3RydWN0X211dGV4KTsKIAotCWd1Y19mdy0+Z3VjX2Z3X2ZldGNoX3N0YXR1cyA9IEdV Q19GSVJNV0FSRV9OT05FOworCWd1Y19mdy0+ZmV0Y2hfc3RhdHVzID0gVUNfRklSTVdBUkVfTk9O RTsKIH0KLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK