From: Dave Gordon Subject: [PATCH v4 3/7] drm/i915/guc: add enable_guc_loading parameter Date: Fri, 13 May 2016 15:36:31 +0100 Message-ID: <1463150195-28805-4-git-send-email-david.s.gordon@intel.com> References: <1463150195-28805-1-git-send-email-david.s.gordon@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 B1E9C6E41C for ; Fri, 13 May 2016 14:37:10 +0000 (UTC) In-Reply-To: <1463150195-28805-1-git-send-email-david.s.gordon@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 List-Id: intel-gfx@lists.freedesktop.org U3BsaXQgdGhlIGZ1bmN0aW9uIG9mICJlbmFibGVfZ3VjX3N1Ym1pc3Npb24iIGludG8gdHdvIHNl cGFyYXRlCm9wdGlvbnMuICBUaGUgbmV3IG9uZSAoImVuYWJsZV9ndWNfbG9hZGluZyIpIGNvbnRy b2xzIG9ubHkgdGhlCipmZXRjaGluZyBhbmQgbG9hZGluZyogb2YgdGhlIEd1QyBmaXJtd2FyZSBp bWFnZS4gVGhlIGV4aXN0aW5nCm9uZSBpcyByZWRlZmluZWQgdG8gY29udHJvbCBvbmx5IHRoZSAq dXNlKiBvZiB0aGUgR3VDIGZvciBiYXRjaApzdWJtaXNzaW9uIG9uY2UgdGhlIGZpcm13YXJlIGlz IGxvYWRlZC4KCkluIGFkZGl0aW9uLCB0aGUgZGVncmVlIG9mIGNvbnRyb2wgaGFzIGJlZW4gcmVm aW5lZCBmcm9tIGEgc2ltcGxlCmJvb2wgdG8gYW4gaW50ZWdlciBrZXksIGFsbG93aW5nIHNldmVy YWwgb3B0aW9uczoKLTEgKGRlZmF1bHQpICAgICB3aGF0ZXZlciB0aGUgcGxhdGZvcm0gZGVmYXVs dCBpcwogMCAgRElTQUJMRSAgICAgIGRvbid0IGxvYWQvdXNlIHRoZSBHdUMKIDEgIEJFU1QgRUZG T1JUICB0cnkgdG8gbG9hZC91c2UgdGhlIEd1QywgZmFsbGJhY2sgaWYgbm90IGF2YWlsYWJsZQog MiAgUkVRVUlSRSAgICAgIG11c3QgbG9hZC91c2UgdGhlIEd1QywgZWxzZSBsZWF2ZSB0aGUgR1BV IHdlZGdlZAoKVGhlIG5ldyBwbGF0Zm9ybSBkZWZhdWx0IChhcyBjb2RlZCBoZXJlKSB3aWxsIGJl IHRvIGF0dGVtcHQgdG8KbG9hZCB0aGUgR3VDIGlmZiB0aGUgZGV2aWNlIGhhcyBhIEd1QyB0aGF0 IHJlcXVpcmVzIGZpcm13YXJlLApidXQgbm90IHlldCB0byB1c2UgaXQgZm9yIHN1Ym1pc3Npb24u IEEgbGF0ZXIgcGF0Y2ggd2lsbCBjaGFuZ2UKdG8gZW5hYmxlIGl0IGlmIGFwcHJvcHJpYXRlLgoK djQ6CiAgICBDaGFuZ2VkIHNvbWUgZXJyb3ItbWVzc2FnZSBsZXZlbHMsIG1vc3RseSBFUlJPUi0+ SU5GTywgcGVyCiAgICByZXZpZXcgY29tbWVudHMgYnkgVHZydGtvIFVyc3VsaW4uCgpTaWduZWQt b2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICAgICB8ICAgMSAtCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgfCAgIDQgKy0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfcGFyYW1zLmMgICAgICAgICB8ICAxNCArKystCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3BhcmFtcy5oICAgICAgICAgfCAgIDMgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Y19sb2FkZXIuYyAgICB8IDEwOCArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LQogNSBmaWxlcyBjaGFuZ2VkLCA3NiBpbnNlcnRpb25zKCspLCA1NCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCAyYTdiZTcxLi4yYmY4NzQzIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMKQEAgLTQ4NzAsNyArNDg3MCw2IEBAIGludCBpOTE1X2dlbV9pbml0X2VuZ2lu ZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJcmV0ID0gaW50ZWxfZ3VjX3NldHVwKGRldik7 CiAJCWlmIChyZXQpIHsKIAkJCURSTV9FUlJPUigiRmFpbGVkIHRvIGluaXRpYWxpemUgR3VDLCBl cnJvciAlZFxuIiwgcmV0KTsKLQkJCXJldCA9IC1FSU87CiAJCQlnb3RvIG91dDsKIAkJfQogCX0K ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCAxNjkyNDJh Li45MTZjZDY3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJt aXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5j CkBAIC05NjksNyArOTY5LDcgQEAgaW50IGludGVsX2d1Y19zdXNwZW5kKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eDsKIAl1MzIgZGF0YVszXTsKIAot CWlmICghaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pCisJaWYgKGd1Yy0+Z3VjX2Z3Lmd1Y19m d19sb2FkX3N0YXR1cyAhPSBHVUNfRklSTVdBUkVfU1VDQ0VTUykKIAkJcmV0dXJuIDA7CiAKIAlj dHggPSBkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQ7CkBAIC05OTUsNyArOTk1LDcgQEAgaW50IGlu dGVsX2d1Y19yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlzdHJ1Y3QgaW50ZWxfY29u dGV4dCAqY3R4OwogCXUzMiBkYXRhWzNdOwogCi0JaWYgKCFpOTE1LmVuYWJsZV9ndWNfc3VibWlz c2lvbikKKwlpZiAoZ3VjLT5ndWNfZncuZ3VjX2Z3X2xvYWRfc3RhdHVzICE9IEdVQ19GSVJNV0FS RV9TVUNDRVNTKQogCQlyZXR1cm4gMDsKIAogCWN0eCA9IGRldl9wcml2LT5rZXJuZWxfY29udGV4 dDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5jCmluZGV4IDM4M2MwNzYuLjZhNTU3OGMgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuYwpAQCAtNTQsNyArNTQsOCBAQCBzdHJ1Y3QgaTkx NV9wYXJhbXMgaTkxNSBfX3JlYWRfbW9zdGx5ID0gewogCS52ZXJib3NlX3N0YXRlX2NoZWNrcyA9 IDEsCiAJLm51Y2xlYXJfcGFnZWZsaXAgPSAwLAogCS5lZHBfdnN3aW5nID0gMCwKLQkuZW5hYmxl X2d1Y19zdWJtaXNzaW9uID0gZmFsc2UsCisJLmVuYWJsZV9ndWNfbG9hZGluZyA9IC0xLAorCS5l bmFibGVfZ3VjX3N1Ym1pc3Npb24gPSAwLAogCS5ndWNfbG9nX2xldmVsID0gLTEsCiAJLmVuYWJs ZV9kcF9tc3QgPSB0cnVlLAogCS5pbmplY3RfbG9hZF9mYWlsdXJlID0gMCwKQEAgLTE5OCw4ICsx OTksMTUgQEAgc3RydWN0IGk5MTVfcGFyYW1zIGk5MTUgX19yZWFkX21vc3RseSA9IHsKIAkJICIo MD11c2UgdmFsdWUgZnJvbSB2YnQgW2RlZmF1bHRdLCAxPWxvdyBwb3dlciBzd2luZygyMDBtViks IgogCQkgIjI9ZGVmYXVsdCBzd2luZyg0MDBtVikpIik7CiAKLW1vZHVsZV9wYXJhbV9uYW1lZF91 bnNhZmUoZW5hYmxlX2d1Y19zdWJtaXNzaW9uLCBpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiwg Ym9vbCwgMDQwMCk7Ci1NT0RVTEVfUEFSTV9ERVNDKGVuYWJsZV9ndWNfc3VibWlzc2lvbiwgIkVu YWJsZSBHdUMgc3VibWlzc2lvbiAoZGVmYXVsdDpmYWxzZSkiKTsKK21vZHVsZV9wYXJhbV9uYW1l ZF91bnNhZmUoZW5hYmxlX2d1Y19sb2FkaW5nLCBpOTE1LmVuYWJsZV9ndWNfbG9hZGluZywgaW50 LCAwNDAwKTsKK01PRFVMRV9QQVJNX0RFU0MoZW5hYmxlX2d1Y19sb2FkaW5nLAorCQkiRW5hYmxl IEd1QyBmaXJtd2FyZSBsb2FkaW5nICIKKwkJIigtMT1hdXRvIFtkZWZhdWx0XSwgMD1uZXZlciwg MT1pZiBhdmFpbGFibGUsIDI9cmVxdWlyZWQpIik7CisKK21vZHVsZV9wYXJhbV9uYW1lZF91bnNh ZmUoZW5hYmxlX2d1Y19zdWJtaXNzaW9uLCBpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiwgaW50 LCAwNDAwKTsKK01PRFVMRV9QQVJNX0RFU0MoZW5hYmxlX2d1Y19zdWJtaXNzaW9uLAorCQkiRW5h YmxlIEd1QyBzdWJtaXNzaW9uICIKKwkJIigtMT1hdXRvLCAwPW5ldmVyIFtkZWZhdWx0XSwgMT1p ZiBhdmFpbGFibGUsIDI9cmVxdWlyZWQpIik7CiAKIG1vZHVsZV9wYXJhbV9uYW1lZChndWNfbG9n X2xldmVsLCBpOTE1Lmd1Y19sb2dfbGV2ZWwsIGludCwgMDQwMCk7CiBNT0RVTEVfUEFSTV9ERVND KGd1Y19sb2dfbGV2ZWwsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Bh cmFtcy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuaAppbmRleCA2NWU3M2Rk Li4xMzIzMjYxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmgKQEAgLTQ1LDYgKzQ1LDgg QEAgc3RydWN0IGk5MTVfcGFyYW1zIHsKIAlpbnQgZW5hYmxlX2lwczsKIAlpbnQgaW52ZXJ0X2Jy aWdodG5lc3M7CiAJaW50IGVuYWJsZV9jbWRfcGFyc2VyOworCWludCBlbmFibGVfZ3VjX2xvYWRp bmc7CisJaW50IGVuYWJsZV9ndWNfc3VibWlzc2lvbjsKIAlpbnQgZ3VjX2xvZ19sZXZlbDsKIAlp bnQgdXNlX21taW9fZmxpcDsKIAlpbnQgbW1pb19kZWJ1ZzsKQEAgLTU3LDcgKzU5LDYgQEAgc3Ry dWN0IGk5MTVfcGFyYW1zIHsKIAlib29sIGxvYWRfZGV0ZWN0X3Rlc3Q7CiAJYm9vbCByZXNldDsK IAlib29sIGRpc2FibGVfZGlzcGxheTsKLQlib29sIGVuYWJsZV9ndWNfc3VibWlzc2lvbjsKIAli b29sIHZlcmJvc2Vfc3RhdGVfY2hlY2tzOwogCWJvb2wgbnVjbGVhcl9wYWdlZmxpcDsKIAlib29s IGVuYWJsZV9kcF9tc3Q7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWNfbG9hZGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKaW5k ZXggYjE0YTNhMy4uM2QzMzk0NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZ3VjX2xvYWRlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2Fk ZXIuYwpAQCAtMzkxLDQ5ICszOTEsMzcgQEAgaW50IGludGVsX2d1Y19zZXR1cChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRl di0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3ID0gJmRldl9wcml2 LT5ndWMuZ3VjX2Z3OwotCWludCByZXRyaWVzLCBlcnIgPSAwOworCWNvbnN0IGNoYXIgKmZ3X3Bh dGggPSBndWNfZnctPmd1Y19md19wYXRoOworCWludCByZXRyaWVzLCByZXQsIGVyciA9IDA7CiAK LQlpZiAoIWk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uKQotCQlyZXR1cm4gMDsKLQotCURSTV9E RUJVR19EUklWRVIoIkd1QyBmdyBzdGF0dXM6IGZldGNoICVzLCBsb2FkICVzXG4iLAorCURSTV9E RUJVR19EUklWRVIoIkd1QyBmdyBzdGF0dXM6IHBhdGggJXMsIGZldGNoICVzLCBsb2FkICVzXG4i LAorCQlmd19wYXRoLAogCQlpbnRlbF9ndWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5ndWNfZndf ZmV0Y2hfc3RhdHVzKSwKIAkJaW50ZWxfZ3VjX2Z3X3N0YXR1c19yZXByKGd1Y19mdy0+Z3VjX2Z3 X2xvYWRfc3RhdHVzKSk7CiAKLQlkaXJlY3RfaW50ZXJydXB0c190b19ob3N0KGRldl9wcml2KTsK KwkvKiBMb2FkaW5nIGZvcmJpZGRlbiwgb3Igbm8gZmlybXdhcmUgdG8gbG9hZD8gKi8KKwlpZiAo IWk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nKQorCQlnb3RvIGZhaWw7CisJaWYgKGZ3X3BhdGggPT0g TlVMTCkKKwkJZ290byBmYWlsOworCWlmICgqZndfcGF0aCA9PSAnXDAnKSB7CisJCURSTV9JTkZP KCJObyBHdUMgZmlybXdhcmUga25vd24gZm9yIHRoaXMgcGxhdGZvcm1cbiIpOworCQlnb3RvIGZh aWw7CisJfQogCi0JaWYgKGd1Y19mdy0+Z3VjX2Z3X2ZldGNoX3N0YXR1cyA9PSBHVUNfRklSTVdB UkVfTk9ORSkKLQkJcmV0dXJuIDA7CisJLyogRmV0Y2ggZmFpbGVkLCBvciBhbHJlYWR5IGZldGNo ZWQgYnV0IGZhaWxlZCB0byBsb2FkPyAqLworCWlmIChndWNfZnctPmd1Y19md19mZXRjaF9zdGF0 dXMgIT0gR1VDX0ZJUk1XQVJFX1NVQ0NFU1MpCisJCWdvdG8gZmFpbDsKKwlpZiAoZ3VjX2Z3LT5n dWNfZndfbG9hZF9zdGF0dXMgPT0gR1VDX0ZJUk1XQVJFX0ZBSUwpCisJCWdvdG8gZmFpbDsKIAot CWlmIChndWNfZnctPmd1Y19md19mZXRjaF9zdGF0dXMgPT0gR1VDX0ZJUk1XQVJFX1NVQ0NFU1Mg JiYKLQkgICAgZ3VjX2Z3LT5ndWNfZndfbG9hZF9zdGF0dXMgPT0gR1VDX0ZJUk1XQVJFX0ZBSUwp Ci0JCXJldHVybiAtRU5PRVhFQzsKKwlkaXJlY3RfaW50ZXJydXB0c190b19ob3N0KGRldl9wcml2 KTsKIAogCWd1Y19mdy0+Z3VjX2Z3X2xvYWRfc3RhdHVzID0gR1VDX0ZJUk1XQVJFX1BFTkRJTkc7 CiAKLQlEUk1fREVCVUdfRFJJVkVSKCJHdUMgZncgZmV0Y2ggc3RhdHVzICVzXG4iLAotCQlpbnRl bF9ndWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5ndWNfZndfZmV0Y2hfc3RhdHVzKSk7Ci0KLQlz d2l0Y2ggKGd1Y19mdy0+Z3VjX2Z3X2ZldGNoX3N0YXR1cykgewotCWNhc2UgR1VDX0ZJUk1XQVJF X0ZBSUw6Ci0JCS8qIHNvbWV0aGluZyB3ZW50IHdyb25nIDooICovCi0JCWVyciA9IC1FSU87Ci0J CWdvdG8gZmFpbDsKLQotCWNhc2UgR1VDX0ZJUk1XQVJFX05PTkU6Ci0JY2FzZSBHVUNfRklSTVdB UkVfUEVORElORzoKLQlkZWZhdWx0OgotCQkvKiAiY2FuJ3QgaGFwcGVuIiAqLwotCQlXQVJOX09O Q0UoMSwgIkd1QyBmdyAlcyBpbnZhbGlkIGd1Y19md19mZXRjaF9zdGF0dXMgJXMgWyVkXVxuIiwK LQkJCWd1Y19mdy0+Z3VjX2Z3X3BhdGgsCi0JCQlpbnRlbF9ndWNfZndfc3RhdHVzX3JlcHIoZ3Vj X2Z3LT5ndWNfZndfZmV0Y2hfc3RhdHVzKSwKLQkJCWd1Y19mdy0+Z3VjX2Z3X2ZldGNoX3N0YXR1 cyk7Ci0JCWVyciA9IC1FTlhJTzsKLQkJZ290byBmYWlsOwotCi0JY2FzZSBHVUNfRklSTVdBUkVf U1VDQ0VTUzoKLQkJYnJlYWs7Ci0JfQorCURSTV9ERUJVR19EUklWRVIoIkd1QyBmdyBzdGF0dXM6 IGZldGNoICVzLCBsb2FkICVzXG4iLAorCQlpbnRlbF9ndWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3 LT5ndWNfZndfZmV0Y2hfc3RhdHVzKSwKKwkJaW50ZWxfZ3VjX2Z3X3N0YXR1c19yZXByKGd1Y19m dy0+Z3VjX2Z3X2xvYWRfc3RhdHVzKSk7CiAKIAllcnIgPSBpOTE1X2d1Y19zdWJtaXNzaW9uX2lu aXQoZGV2KTsKIAlpZiAoZXJyKQpAQCAtNDg2LDcgKzQ3NCw2IEBAIGludCBpbnRlbF9ndWNfc2V0 dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlyZXR1cm4gMDsKIAogZmFpbDoKLQlEUk1fRVJS T1IoIkd1QyBmaXJtd2FyZSBsb2FkIGZhaWxlZCwgZXJyICVkXG4iLCBlcnIpOwogCWlmIChndWNf ZnctPmd1Y19md19sb2FkX3N0YXR1cyA9PSBHVUNfRklSTVdBUkVfUEVORElORykKIAkJZ3VjX2Z3 LT5ndWNfZndfbG9hZF9zdGF0dXMgPSBHVUNfRklSTVdBUkVfRkFJTDsKIApAQCAtNDk0LDcgKzQ4 MSwzNiBAQCBpbnQgaW50ZWxfZ3VjX3NldHVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaTkx NV9ndWNfc3VibWlzc2lvbl9kaXNhYmxlKGRldik7CiAJaTkxNV9ndWNfc3VibWlzc2lvbl9maW5p KGRldik7CiAKLQlyZXR1cm4gZXJyOworCS8qCisJICogV2UndmUgZmFpbGVkIHRvIGxvYWQgdGhl IGZpcm13YXJlIDooCisJICoKKwkgKiBEZWNpZGUgd2hldGhlciB0byBkaXNhYmxlIEd1QyBzdWJt aXNzaW9uIGFuZCBmYWxsIGJhY2sgdG8KKwkgKiBleGVjbGlzdCBtb2RlLCBhbmQgd2hldGhlciB0 byBoaWRlIHRoZSBlcnJvciBieSByZXR1cm5pbmcKKwkgKiB6ZXJvIG9yIHRvIHJldHVybiAtRUlP LCB3aGljaCB0aGUgY2FsbGVyIHdpbGwgdHJlYXQgYXMgYQorCSAqIG5vbmZhdGFsIGVycm9yIChp LmUuIGl0IGRvZXNuJ3QgcHJldmVudCBkcml2ZXIgbG9hZCwgYnV0CisJICogbWFya3MgdGhlIEdQ VSBhcyB3ZWRnZWQgdW50aWwgcmVzZXQpLgorCSAqLworCWlmIChpOTE1LmVuYWJsZV9ndWNfbG9h ZGluZyA+IDEpIHsKKwkJcmV0ID0gLUVJTzsKKwl9IGVsc2UgaWYgKEhBU19HVUNfU0NIRUQoZGV2 KSAmJiAhSEFTX0dVQ19VQ09ERShkZXYpKSB7CisJCS8qIFRoaXMgR3VDIHdvcmtzIGV2ZW4gd2l0 aG91dCBmaXJtd2FyZSA6KSAqLworCQlyZXR1cm4gMDsKKwl9IGVsc2UgaWYgKGk5MTUuZW5hYmxl X2d1Y19zdWJtaXNzaW9uID4gMSkgeworCQlyZXQgPSAtRUlPOworCX0gZWxzZSB7CisJCXJldCA9 IDA7CisJfQorCisJaWYgKHJldCA9PSAtRUlPKQorCQlEUk1fRVJST1IoIkd1QyBmaXJtd2FyZSBs b2FkIGZhaWxlZCwgZXJyICVkXG4iLCBlcnIpOworCWVsc2UKKwkJRFJNX0lORk8oIkd1QyBmaXJt d2FyZSBsb2FkIGZhaWxlZCwgZXJyICVkXG4iLCBlcnIpOworCisJaWYgKGk5MTUuZW5hYmxlX2d1 Y19zdWJtaXNzaW9uKQorCQlEUk1fSU5GTygiZmFsbGluZyBiYWNrIHRvIGV4ZWNsaXN0IG1vZGUs IHJldCAlZFxuIiwgcmV0KTsKKwlpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiA9IDA7CisKKwly ZXR1cm4gcmV0OwogfQogCiBzdGF0aWMgdm9pZCBndWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgc3RydWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3KQpAQCAtNjM1LDggKzY1MSwxMSBA QCB2b2lkIGludGVsX2d1Y19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJc3RydWN0IGlu dGVsX2d1Y19mdyAqZ3VjX2Z3ID0gJmRldl9wcml2LT5ndWMuZ3VjX2Z3OwogCWNvbnN0IGNoYXIg KmZ3X3BhdGg7CiAKLQlpZiAoIUhBU19HVUNfU0NIRUQoZGV2KSkKLQkJaTkxNS5lbmFibGVfZ3Vj X3N1Ym1pc3Npb24gPSBmYWxzZTsKKwkvKiBBIG5lZ2F0aXZlIHZhbHVlIG1lYW5zICJ1c2UgcGxh dGZvcm0gZGVmYXVsdCIgKi8KKwlpZiAoaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcgPCAwKQorCQlp OTE1LmVuYWJsZV9ndWNfbG9hZGluZyA9IEhBU19HVUNfVUNPREUoZGV2KTsKKwlpZiAoaTkxNS5l bmFibGVfZ3VjX3N1Ym1pc3Npb24gPCAwKQorCQlpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiA9 IEhBU19HVUNfU0NIRUQoZGV2KTsKIAogCWlmICghSEFTX0dVQ19VQ09ERShkZXYpKSB7CiAJCWZ3 X3BhdGggPSBOVUxMOwpAQCAtNjQ5LDI2ICs2NjgsMjEgQEAgdm9pZCBpbnRlbF9ndWNfaW5pdChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlndWNfZnctPmd1Y19md19tYWpvcl93YW50ZWQgPSA4 OwogCQlndWNfZnctPmd1Y19md19taW5vcl93YW50ZWQgPSA3OwogCX0gZWxzZSB7Ci0JCWk5MTUu ZW5hYmxlX2d1Y19zdWJtaXNzaW9uID0gZmFsc2U7CiAJCWZ3X3BhdGggPSAiIjsJLyogdW5rbm93 biBkZXZpY2UgKi8KIAl9CiAKLQlpZiAoIWk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uKQotCQly ZXR1cm47Ci0KIAlndWNfZnctPmd1Y19kZXYgPSBkZXY7CiAJZ3VjX2Z3LT5ndWNfZndfcGF0aCA9 IGZ3X3BhdGg7CiAJZ3VjX2Z3LT5ndWNfZndfZmV0Y2hfc3RhdHVzID0gR1VDX0ZJUk1XQVJFX05P TkU7CiAJZ3VjX2Z3LT5ndWNfZndfbG9hZF9zdGF0dXMgPSBHVUNfRklSTVdBUkVfTk9ORTsKIAor CS8qIEVhcmx5IChhbmQgc2lsZW50KSByZXR1cm4gaWYgR3VDIGxvYWRpbmcgaXMgZGlzYWJsZWQg Ki8KKwlpZiAoIWk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nKQorCQlyZXR1cm47CiAJaWYgKGZ3X3Bh dGggPT0gTlVMTCkKIAkJcmV0dXJuOwotCi0JaWYgKCpmd19wYXRoID09ICdcMCcpIHsKLQkJRFJN X0VSUk9SKCJObyBHdUMgZmlybXdhcmUga25vd24gZm9yIHRoaXMgcGxhdGZvcm1cbiIpOwotCQln dWNfZnctPmd1Y19md19mZXRjaF9zdGF0dXMgPSBHVUNfRklSTVdBUkVfRkFJTDsKKwlpZiAoKmZ3 X3BhdGggPT0gJ1wwJykKIAkJcmV0dXJuOwotCX0KIAogCWd1Y19mdy0+Z3VjX2Z3X2ZldGNoX3N0 YXR1cyA9IEdVQ19GSVJNV0FSRV9QRU5ESU5HOwogCURSTV9ERUJVR19EUklWRVIoIkd1QyBmaXJt d2FyZSBwZW5kaW5nLCBwYXRoICVzXG4iLCBmd19wYXRoKTsKLS0gCjEuOS4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK