From: Tvrtko Ursulin Subject: [PATCH v6 3/7] drm/i915/guc: add enable_guc_loading parameter Date: Fri, 20 May 2016 11:42:42 +0100 Message-ID: <1463740962-31187-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1463425945-34047-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id C945C6EAA8 for ; Fri, 20 May 2016 10:42:49 +0000 (UTC) In-Reply-To: <1463425945-34047-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 RnJvbTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KClNwbGl0IHRoZSBm dW5jdGlvbiBvZiAiZW5hYmxlX2d1Y19zdWJtaXNzaW9uIiBpbnRvIHR3byBzZXBhcmF0ZQpvcHRp b25zLiAgVGhlIG5ldyBvbmUgKCJlbmFibGVfZ3VjX2xvYWRpbmciKSBjb250cm9scyBvbmx5IHRo ZQoqZmV0Y2hpbmcgYW5kIGxvYWRpbmcqIG9mIHRoZSBHdUMgZmlybXdhcmUgaW1hZ2UuIFRoZSBl eGlzdGluZwpvbmUgaXMgcmVkZWZpbmVkIHRvIGNvbnRyb2wgb25seSB0aGUgKnVzZSogb2YgdGhl IEd1QyBmb3IgYmF0Y2gKc3VibWlzc2lvbiBvbmNlIHRoZSBmaXJtd2FyZSBpcyBsb2FkZWQuCgpJ biBhZGRpdGlvbiwgdGhlIGRlZ3JlZSBvZiBjb250cm9sIGhhcyBiZWVuIHJlZmluZWQgZnJvbSBh IHNpbXBsZQpib29sIHRvIGFuIGludGVnZXIga2V5LCBhbGxvd2luZyBzZXZlcmFsIG9wdGlvbnM6 Ci0xIChkZWZhdWx0KSAgICAgd2hhdGV2ZXIgdGhlIHBsYXRmb3JtIGRlZmF1bHQgaXMKIDAgIERJ U0FCTEUgICAgICBkb24ndCBsb2FkL3VzZSB0aGUgR3VDCiAxICBCRVNUIEVGRk9SVCAgdHJ5IHRv IGxvYWQvdXNlIHRoZSBHdUMsIGZhbGxiYWNrIGlmIG5vdCBhdmFpbGFibGUKIDIgIFJFUVVJUkUg ICAgICBtdXN0IGxvYWQvdXNlIHRoZSBHdUMsIGVsc2UgbGVhdmUgdGhlIEdQVSB3ZWRnZWQKClRo ZSBuZXcgcGxhdGZvcm0gZGVmYXVsdCAoYXMgY29kZWQgaGVyZSkgd2lsbCBiZSB0byBhdHRlbXB0 IHRvCmxvYWQgdGhlIEd1QyBpZmYgdGhlIGRldmljZSBoYXMgYSBHdUMgdGhhdCByZXF1aXJlcyBm aXJtd2FyZSwKYnV0IG5vdCB5ZXQgdG8gdXNlIGl0IGZvciBzdWJtaXNzaW9uLiBBIGxhdGVyIHBh dGNoIHdpbGwgY2hhbmdlCnRvIGVuYWJsZSBpdCBpZiBhcHByb3ByaWF0ZS4KCnY0OgogICAgQ2hh bmdlZCBzb21lIGVycm9yLW1lc3NhZ2UgbGV2ZWxzLCBtb3N0bHkgRVJST1ItPklORk8sIHBlcgog ICAgcmV2aWV3IGNvbW1lbnRzIGJ5IFR2cnRrbyBVcnN1bGluLgoKdjU6CiAgICBEcm9wcGVkIG9u ZSBtb3JlIGVycm9yIG1lc3NhZ2UsIGRpc2FibGVkIEd1QyBzdWJtaXNzaW9uIG9uCiAgICBoeXBv dGhldGljYWwgZmlybXdhcmUtZnJlZSBkZXZpY2VzIFtUdnJ0a28gVXJzdWxpbl0uCgp2NjoKICAg IExvZ2dpbmcgdGlkeSBieSBUdnJ0a28gVXJzdWxpbjoKICAgICAqIERvIG5vdCBsb2cgZmFsbGlu ZyBiYWNrIHRvIGV4ZWNsaXN0cyB3aGVuIHdlZGdpbmcgdGhlIEdQVS4KICAgICAqIERvIG5vdCBs b2cgZncgbG9hZCBlcnJvcnMgd2hlbiBsb2FkIHdhcyBkaXNhYmxlZCBieSB1c2VyLgogICAgICog UGFzcyBkb3duIHNvbWUgZXJyb3IgY29kZSBmcm9tIGZ3IGxvYWQgZm9yIGxvZyBtZXNzYWdlIHRv CiAgICAgICBtYWtlIG1vcmUgc2Vuc2UuCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2 aWQucy5nb3Jkb25AaW50ZWwuY29tPgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGlu QGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJz dWxpbkBpbnRlbC5jb20+ICh2NSkKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRr by51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j ICAgICAgICAgICAgfCAgIDUgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1p c3Npb24uYyB8ICAgNCArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuYyAgICAg ICAgIHwgIDE0ICsrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmggICAgICAg ICB8ICAgMyArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jICAgIHwg MTIzICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiA1IGZpbGVzIGNoYW5nZWQsIDg5IGlu c2VydGlvbnMoKyksIDYwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4 IDg4ZGNlNTQ4MmYyZi4uMWEzYTA3ZWNhMGQwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAg LTQ4NjgsMTEgKzQ4NjgsOCBAQCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJLyogV2UgY2FuJ3QgZW5hYmxlIGNvbnRleHRzIHVudGlsIGFsbCBmaXJtd2FyZSBpcyBs b2FkZWQgKi8KIAlpZiAoSEFTX0dVQyhkZXYpKSB7CiAJCXJldCA9IGludGVsX2d1Y19zZXR1cChk ZXYpOwotCQlpZiAocmV0KSB7Ci0JCQlEUk1fRVJST1IoIkZhaWxlZCB0byBpbml0aWFsaXplIEd1 QywgZXJyb3IgJWRcbiIsIHJldCk7Ci0JCQlyZXQgPSAtRUlPOworCQlpZiAocmV0KQogCQkJZ290 byBvdXQ7Ci0JCX0KIAl9CiAKIAkvKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3Vi bWlzc2lvbi5jCmluZGV4IDE2OTI0MmE4YWRmZi4uOTE2Y2Q2Nzc4Y2YzIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC05NjksNyArOTY5LDcgQEAgaW50 IGludGVsX2d1Y19zdXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJc3RydWN0IGludGVs X2NvbnRleHQgKmN0eDsKIAl1MzIgZGF0YVszXTsKIAotCWlmICghaTkxNS5lbmFibGVfZ3VjX3N1 Ym1pc3Npb24pCisJaWYgKGd1Yy0+Z3VjX2Z3Lmd1Y19md19sb2FkX3N0YXR1cyAhPSBHVUNfRklS TVdBUkVfU1VDQ0VTUykKIAkJcmV0dXJuIDA7CiAKIAljdHggPSBkZXZfcHJpdi0+a2VybmVsX2Nv bnRleHQ7CkBAIC05OTUsNyArOTk1LDcgQEAgaW50IGludGVsX2d1Y19yZXN1bWUoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4OwogCXUzMiBkYXRhWzNd OwogCi0JaWYgKCFpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbikKKwlpZiAoZ3VjLT5ndWNfZncu Z3VjX2Z3X2xvYWRfc3RhdHVzICE9IEdVQ19GSVJNV0FSRV9TVUNDRVNTKQogCQlyZXR1cm4gMDsK IAogCWN0eCA9IGRldl9wcml2LT5rZXJuZWxfY29udGV4dDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Bh cmFtcy5jCmluZGV4IGNkNzRmYjhlOTM4Ny4uMjFhMzIzYzAxY2RiIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfcGFyYW1zLmMKQEAgLTUzLDcgKzUzLDggQEAgc3RydWN0IGk5MTVfcGFyYW1zIGk5MTUg X19yZWFkX21vc3RseSA9IHsKIAkudmVyYm9zZV9zdGF0ZV9jaGVja3MgPSAxLAogCS5udWNsZWFy X3BhZ2VmbGlwID0gMCwKIAkuZWRwX3Zzd2luZyA9IDAsCi0JLmVuYWJsZV9ndWNfc3VibWlzc2lv biA9IGZhbHNlLAorCS5lbmFibGVfZ3VjX2xvYWRpbmcgPSAtMSwKKwkuZW5hYmxlX2d1Y19zdWJt aXNzaW9uID0gMCwKIAkuZ3VjX2xvZ19sZXZlbCA9IC0xLAogCS5lbmFibGVfZHBfbXN0ID0gdHJ1 ZSwKIAkuaW5qZWN0X2xvYWRfZmFpbHVyZSA9IDAsCkBAIC0xOTMsOCArMTk0LDE1IEBAIE1PRFVM RV9QQVJNX0RFU0MoZWRwX3Zzd2luZywKIAkJICIoMD11c2UgdmFsdWUgZnJvbSB2YnQgW2RlZmF1 bHRdLCAxPWxvdyBwb3dlciBzd2luZygyMDBtViksIgogCQkgIjI9ZGVmYXVsdCBzd2luZyg0MDBt VikpIik7CiAKLW1vZHVsZV9wYXJhbV9uYW1lZF91bnNhZmUoZW5hYmxlX2d1Y19zdWJtaXNzaW9u LCBpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiwgYm9vbCwgMDQwMCk7Ci1NT0RVTEVfUEFSTV9E RVNDKGVuYWJsZV9ndWNfc3VibWlzc2lvbiwgIkVuYWJsZSBHdUMgc3VibWlzc2lvbiAoZGVmYXVs dDpmYWxzZSkiKTsKK21vZHVsZV9wYXJhbV9uYW1lZF91bnNhZmUoZW5hYmxlX2d1Y19sb2FkaW5n LCBpOTE1LmVuYWJsZV9ndWNfbG9hZGluZywgaW50LCAwNDAwKTsKK01PRFVMRV9QQVJNX0RFU0Mo ZW5hYmxlX2d1Y19sb2FkaW5nLAorCQkiRW5hYmxlIEd1QyBmaXJtd2FyZSBsb2FkaW5nICIKKwkJ IigtMT1hdXRvIFtkZWZhdWx0XSwgMD1uZXZlciwgMT1pZiBhdmFpbGFibGUsIDI9cmVxdWlyZWQp Iik7CisKK21vZHVsZV9wYXJhbV9uYW1lZF91bnNhZmUoZW5hYmxlX2d1Y19zdWJtaXNzaW9uLCBp OTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiwgaW50LCAwNDAwKTsKK01PRFVMRV9QQVJNX0RFU0Mo ZW5hYmxlX2d1Y19zdWJtaXNzaW9uLAorCQkiRW5hYmxlIEd1QyBzdWJtaXNzaW9uICIKKwkJIigt MT1hdXRvLCAwPW5ldmVyIFtkZWZhdWx0XSwgMT1pZiBhdmFpbGFibGUsIDI9cmVxdWlyZWQpIik7 CiAKIG1vZHVsZV9wYXJhbV9uYW1lZChndWNfbG9nX2xldmVsLCBpOTE1Lmd1Y19sb2dfbGV2ZWws IGludCwgMDQwMCk7CiBNT0RVTEVfUEFSTV9ERVNDKGd1Y19sb2dfbGV2ZWwsCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9wYXJhbXMuaAppbmRleCBkZDBkMGJiY2MwNWIuLjY1OGNlNzM3OTY3MSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5oCkBAIC00NSw2ICs0NSw4IEBAIHN0cnVjdCBpOTE1X3Bh cmFtcyB7CiAJaW50IGVuYWJsZV9pcHM7CiAJaW50IGludmVydF9icmlnaHRuZXNzOwogCWludCBl bmFibGVfY21kX3BhcnNlcjsKKwlpbnQgZW5hYmxlX2d1Y19sb2FkaW5nOworCWludCBlbmFibGVf Z3VjX3N1Ym1pc3Npb247CiAJaW50IGd1Y19sb2dfbGV2ZWw7CiAJaW50IG1taW9fZGVidWc7CiAJ aW50IGVkcF92c3dpbmc7CkBAIC01Niw3ICs1OCw2IEBAIHN0cnVjdCBpOTE1X3BhcmFtcyB7CiAJ Ym9vbCBsb2FkX2RldGVjdF90ZXN0OwogCWJvb2wgcmVzZXQ7CiAJYm9vbCBkaXNhYmxlX2Rpc3Bs YXk7Ci0JYm9vbCBlbmFibGVfZ3VjX3N1Ym1pc3Npb247CiAJYm9vbCB2ZXJib3NlX3N0YXRlX2No ZWNrczsKIAlib29sIG51Y2xlYXJfcGFnZWZsaXA7CiAJYm9vbCBlbmFibGVfZHBfbXN0OwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IDMwZWM4MjA4ZGJiYy4uMjky NzNlNWZlZTIyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9h ZGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCkBAIC00 MDIsNTAgKzQwMiw0MiBAQCBpbnQgaW50ZWxfZ3VjX3NldHVwKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJp dmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncgPSAmZGV2X3ByaXYtPmd1Yy5ndWNf Znc7Ci0JaW50IHJldHJpZXMsIGVyciA9IDA7CisJY29uc3QgY2hhciAqZndfcGF0aCA9IGd1Y19m dy0+Z3VjX2Z3X3BhdGg7CisJaW50IHJldHJpZXMsIHJldCwgZXJyOwogCi0JaWYgKCFpOTE1LmVu YWJsZV9ndWNfc3VibWlzc2lvbikKLQkJcmV0dXJuIDA7Ci0KLQlEUk1fREVCVUdfRFJJVkVSKCJH dUMgZncgc3RhdHVzOiBmZXRjaCAlcywgbG9hZCAlc1xuIiwKKwlEUk1fREVCVUdfRFJJVkVSKCJH dUMgZncgc3RhdHVzOiBwYXRoICVzLCBmZXRjaCAlcywgbG9hZCAlc1xuIiwKKwkJZndfcGF0aCwK IAkJaW50ZWxfZ3VjX2Z3X3N0YXR1c19yZXByKGd1Y19mdy0+Z3VjX2Z3X2ZldGNoX3N0YXR1cyks CiAJCWludGVsX2d1Y19md19zdGF0dXNfcmVwcihndWNfZnctPmd1Y19md19sb2FkX3N0YXR1cykp OwogCi0JZGlyZWN0X2ludGVycnVwdHNfdG9faG9zdChkZXZfcHJpdik7Ci0KLQlpZiAoZ3VjX2Z3 LT5ndWNfZndfZmV0Y2hfc3RhdHVzID09IEdVQ19GSVJNV0FSRV9OT05FKQotCQlyZXR1cm4gMDsK LQotCWlmIChndWNfZnctPmd1Y19md19mZXRjaF9zdGF0dXMgPT0gR1VDX0ZJUk1XQVJFX1NVQ0NF U1MgJiYKLQkgICAgZ3VjX2Z3LT5ndWNfZndfbG9hZF9zdGF0dXMgPT0gR1VDX0ZJUk1XQVJFX0ZB SUwpCi0JCXJldHVybiAtRU5PRVhFQzsKLQotCWd1Y19mdy0+Z3VjX2Z3X2xvYWRfc3RhdHVzID0g R1VDX0ZJUk1XQVJFX1BFTkRJTkc7Ci0KLQlEUk1fREVCVUdfRFJJVkVSKCJHdUMgZncgZmV0Y2gg c3RhdHVzICVzXG4iLAotCQlpbnRlbF9ndWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5ndWNfZndf ZmV0Y2hfc3RhdHVzKSk7CisJLyogTG9hZGluZyBmb3JiaWRkZW4sIG9yIG5vIGZpcm13YXJlIHRv IGxvYWQ/ICovCisJaWYgKCFpOTE1LmVuYWJsZV9ndWNfbG9hZGluZykgeworCQllcnIgPSAwOwor CQlnb3RvIGZhaWw7CisJfSBlbHNlIGlmIChmd19wYXRoID09IE5VTEwgfHwgKmZ3X3BhdGggPT0g J1wwJykgeworCQlpZiAoKmZ3X3BhdGggPT0gJ1wwJykKKwkJCURSTV9JTkZPKCJObyBHdUMgZmly bXdhcmUga25vd24gZm9yIHRoaXMgcGxhdGZvcm1cbiIpOworCQllcnIgPSAtRU5PREVWOworCQln b3RvIGZhaWw7CisJfQogCi0Jc3dpdGNoIChndWNfZnctPmd1Y19md19mZXRjaF9zdGF0dXMpIHsK LQljYXNlIEdVQ19GSVJNV0FSRV9GQUlMOgotCQkvKiBzb21ldGhpbmcgd2VudCB3cm9uZyA6KCAq LworCS8qIEZldGNoIGZhaWxlZCwgb3IgYWxyZWFkeSBmZXRjaGVkIGJ1dCBmYWlsZWQgdG8gbG9h ZD8gKi8KKwlpZiAoZ3VjX2Z3LT5ndWNfZndfZmV0Y2hfc3RhdHVzICE9IEdVQ19GSVJNV0FSRV9T VUNDRVNTKSB7CiAJCWVyciA9IC1FSU87CiAJCWdvdG8gZmFpbDsKLQotCWNhc2UgR1VDX0ZJUk1X QVJFX05PTkU6Ci0JY2FzZSBHVUNfRklSTVdBUkVfUEVORElORzoKLQlkZWZhdWx0OgotCQkvKiAi Y2FuJ3QgaGFwcGVuIiAqLwotCQlXQVJOX09OQ0UoMSwgIkd1QyBmdyAlcyBpbnZhbGlkIGd1Y19m d19mZXRjaF9zdGF0dXMgJXMgWyVkXVxuIiwKLQkJCWd1Y19mdy0+Z3VjX2Z3X3BhdGgsCi0JCQlp bnRlbF9ndWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5ndWNfZndfZmV0Y2hfc3RhdHVzKSwKLQkJ CWd1Y19mdy0+Z3VjX2Z3X2ZldGNoX3N0YXR1cyk7Ci0JCWVyciA9IC1FTlhJTzsKKwl9IGVsc2Ug aWYgKGd1Y19mdy0+Z3VjX2Z3X2xvYWRfc3RhdHVzID09IEdVQ19GSVJNV0FSRV9GQUlMKSB7CisJ CWVyciA9IC1FTk9FWEVDOwogCQlnb3RvIGZhaWw7Ci0KLQljYXNlIEdVQ19GSVJNV0FSRV9TVUND RVNTOgotCQlicmVhazsKIAl9CiAKKwlkaXJlY3RfaW50ZXJydXB0c190b19ob3N0KGRldl9wcml2 KTsKKworCWd1Y19mdy0+Z3VjX2Z3X2xvYWRfc3RhdHVzID0gR1VDX0ZJUk1XQVJFX1BFTkRJTkc7 CisKKwlEUk1fREVCVUdfRFJJVkVSKCJHdUMgZncgc3RhdHVzOiBmZXRjaCAlcywgbG9hZCAlc1xu IiwKKwkJaW50ZWxfZ3VjX2Z3X3N0YXR1c19yZXByKGd1Y19mdy0+Z3VjX2Z3X2ZldGNoX3N0YXR1 cyksCisJCWludGVsX2d1Y19md19zdGF0dXNfcmVwcihndWNfZnctPmd1Y19md19sb2FkX3N0YXR1 cykpOworCiAJZXJyID0gaTkxNV9ndWNfc3VibWlzc2lvbl9pbml0KGRldik7CiAJaWYgKGVycikK IAkJZ290byBmYWlsOwpAQCAtNDYzLDcgKzQ1NSw3IEBAIGludCBpbnRlbF9ndWNfc2V0dXAoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAkJICovCiAJCWVyciA9IGk5MTVfcmVzZXRfZ3VjKGRldl9w cml2KTsKIAkJaWYgKGVycikgewotCQkJRFJNX0VSUk9SKCJHdUMgcmVzZXQgZmFpbGVkLCBlcnIg JWRcbiIsIGVycik7CisJCQlEUk1fRVJST1IoIkd1QyByZXNldCBmYWlsZWQ6ICVkXG4iLCBlcnIp OwogCQkJZ290byBmYWlsOwogCQl9CiAKQEAgLTQ3NCw4ICs0NjYsOCBAQCBpbnQgaW50ZWxfZ3Vj X3NldHVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWlmICgtLXJldHJpZXMgPT0gMCkKIAkJ CWdvdG8gZmFpbDsKIAotCQlEUk1fSU5GTygiR3VDIGZ3IGxvYWQgZmFpbGVkLCBlcnIgJWQ7IHdp bGwgcmVzZXQgYW5kICIKLQkJCSJyZXRyeSAlZCBtb3JlIHRpbWUocylcbiIsIGVyciwgcmV0cmll cyk7CisJCURSTV9JTkZPKCJHdUMgZncgbG9hZCBmYWlsZWQ6ICVkOyB3aWxsIHJlc2V0IGFuZCAi CisJCQkgInJldHJ5ICVkIG1vcmUgdGltZShzKVxuIiwgZXJyLCByZXRyaWVzKTsKIAl9CiAKIAln dWNfZnctPmd1Y19md19sb2FkX3N0YXR1cyA9IEdVQ19GSVJNV0FSRV9TVUNDRVNTOwpAQCAtNDk3 LDcgKzQ4OSw2IEBAIGludCBpbnRlbF9ndWNfc2V0dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAlyZXR1cm4gMDsKIAogZmFpbDoKLQlEUk1fRVJST1IoIkd1QyBmaXJtd2FyZSBsb2FkIGZhaWxl ZCwgZXJyICVkXG4iLCBlcnIpOwogCWlmIChndWNfZnctPmd1Y19md19sb2FkX3N0YXR1cyA9PSBH VUNfRklSTVdBUkVfUEVORElORykKIAkJZ3VjX2Z3LT5ndWNfZndfbG9hZF9zdGF0dXMgPSBHVUNf RklSTVdBUkVfRkFJTDsKIApAQCAtNTA1LDcgKzQ5Niw0MSBAQCBmYWlsOgogCWk5MTVfZ3VjX3N1 Ym1pc3Npb25fZGlzYWJsZShkZXYpOwogCWk5MTVfZ3VjX3N1Ym1pc3Npb25fZmluaShkZXYpOwog Ci0JcmV0dXJuIGVycjsKKwkvKgorCSAqIFdlJ3ZlIGZhaWxlZCB0byBsb2FkIHRoZSBmaXJtd2Fy ZSA6KAorCSAqCisJICogRGVjaWRlIHdoZXRoZXIgdG8gZGlzYWJsZSBHdUMgc3VibWlzc2lvbiBh bmQgZmFsbCBiYWNrIHRvCisJICogZXhlY2xpc3QgbW9kZSwgYW5kIHdoZXRoZXIgdG8gaGlkZSB0 aGUgZXJyb3IgYnkgcmV0dXJuaW5nCisJICogemVybyBvciB0byByZXR1cm4gLUVJTywgd2hpY2gg dGhlIGNhbGxlciB3aWxsIHRyZWF0IGFzIGEKKwkgKiBub25mYXRhbCBlcnJvciAoaS5lLiBpdCBk b2Vzbid0IHByZXZlbnQgZHJpdmVyIGxvYWQsIGJ1dAorCSAqIG1hcmtzIHRoZSBHUFUgYXMgd2Vk Z2VkIHVudGlsIHJlc2V0KS4KKwkgKi8KKwlpZiAoaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcgPiAx KSB7CisJCXJldCA9IC1FSU87CisJfSBlbHNlIGlmIChpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lv biA+IDEpIHsKKwkJcmV0ID0gLUVJTzsKKwl9IGVsc2UgeworCQlyZXQgPSAwOworCX0KKworCWlm IChlcnIgPT0gMCkKKwkJRFJNX0lORk8oIkd1QyBmaXJtd2FyZSBsb2FkIHNraXBwZWRcbiIpOwor CWVsc2UgaWYgKHJldCA9PSAtRUlPKQorCQlEUk1fRVJST1IoIkd1QyBmaXJtd2FyZSBsb2FkIGZh aWxlZDogJWRcbiIsIGVycik7CisJZWxzZQorCQlEUk1fSU5GTygiR3VDIGZpcm13YXJlIGxvYWQg ZmFpbGVkOiAlZFxuIiwgZXJyKTsKKworCWlmIChpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbikg eworCQlpZiAoZndfcGF0aCA9PSBOVUxMKQorCQkJRFJNX0lORk8oIkd1QyBzdWJtaXNzaW9uIHdp dGhvdXQgZmlybXdhcmUgbm90IHN1cHBvcnRlZFxuIik7CisJCWlmIChyZXQgPT0gMCkKKwkJCURS TV9JTkZPKCJGYWxsaW5nIGJhY2sgdG8gZXhlY2xpc3QgbW9kZVxuIik7CisJCWVsc2UKKwkJCURS TV9FUlJPUigiR3VDIGluaXQgZmFpbGVkOiAlZFxuIiwgcmV0KTsKKwl9CisJaTkxNS5lbmFibGVf Z3VjX3N1Ym1pc3Npb24gPSAwOworCisJcmV0dXJuIHJldDsKIH0KIAogc3RhdGljIHZvaWQgZ3Vj X2Z3X2ZldGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpbnRlbF9ndWNfZncgKmd1 Y19mdykKQEAgLTY0NCw4ICs2NjksMTEgQEAgdm9pZCBpbnRlbF9ndWNfaW5pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCXN0cnVjdCBpbnRlbF9ndWNfZncgKmd1Y19mdyA9ICZkZXZfcHJpdi0+ Z3VjLmd1Y19mdzsKIAljb25zdCBjaGFyICpmd19wYXRoOwogCi0JaWYgKCFIQVNfR1VDX1NDSEVE KGRldikpCi0JCWk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uID0gZmFsc2U7CisJLyogQSBuZWdh dGl2ZSB2YWx1ZSBtZWFucyAidXNlIHBsYXRmb3JtIGRlZmF1bHQiICovCisJaWYgKGk5MTUuZW5h YmxlX2d1Y19sb2FkaW5nIDwgMCkKKwkJaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcgPSBIQVNfR1VD X1VDT0RFKGRldik7CisJaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uIDwgMCkKKwkJaTkx NS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24gPSBIQVNfR1VDX1NDSEVEKGRldik7CiAKIAlpZiAoIUhB U19HVUNfVUNPREUoZGV2KSkgewogCQlmd19wYXRoID0gTlVMTDsKQEAgLTY1OCwyNiArNjg2LDIx IEBAIHZvaWQgaW50ZWxfZ3VjX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJZ3VjX2Z3 LT5ndWNfZndfbWFqb3Jfd2FudGVkID0gODsKIAkJZ3VjX2Z3LT5ndWNfZndfbWlub3Jfd2FudGVk ID0gNzsKIAl9IGVsc2UgewotCQlpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiA9IGZhbHNlOwog CQlmd19wYXRoID0gIiI7CS8qIHVua25vd24gZGV2aWNlICovCiAJfQogCi0JaWYgKCFpOTE1LmVu YWJsZV9ndWNfc3VibWlzc2lvbikKLQkJcmV0dXJuOwotCiAJZ3VjX2Z3LT5ndWNfZGV2ID0gZGV2 OwogCWd1Y19mdy0+Z3VjX2Z3X3BhdGggPSBmd19wYXRoOwogCWd1Y19mdy0+Z3VjX2Z3X2ZldGNo X3N0YXR1cyA9IEdVQ19GSVJNV0FSRV9OT05FOwogCWd1Y19mdy0+Z3VjX2Z3X2xvYWRfc3RhdHVz ID0gR1VDX0ZJUk1XQVJFX05PTkU7CiAKKwkvKiBFYXJseSAoYW5kIHNpbGVudCkgcmV0dXJuIGlm IEd1QyBsb2FkaW5nIGlzIGRpc2FibGVkICovCisJaWYgKCFpOTE1LmVuYWJsZV9ndWNfbG9hZGlu ZykKKwkJcmV0dXJuOwogCWlmIChmd19wYXRoID09IE5VTEwpCiAJCXJldHVybjsKLQotCWlmICgq ZndfcGF0aCA9PSAnXDAnKSB7Ci0JCURSTV9FUlJPUigiTm8gR3VDIGZpcm13YXJlIGtub3duIGZv ciB0aGlzIHBsYXRmb3JtXG4iKTsKLQkJZ3VjX2Z3LT5ndWNfZndfZmV0Y2hfc3RhdHVzID0gR1VD X0ZJUk1XQVJFX0ZBSUw7CisJaWYgKCpmd19wYXRoID09ICdcMCcpCiAJCXJldHVybjsKLQl9CiAK IAlndWNfZnctPmd1Y19md19mZXRjaF9zdGF0dXMgPSBHVUNfRklSTVdBUkVfUEVORElORzsKIAlE Uk1fREVCVUdfRFJJVkVSKCJHdUMgZmlybXdhcmUgcGVuZGluZywgcGF0aCAlc1xuIiwgZndfcGF0 aCk7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==