From: yu.dai@intel.com Subject: [PATCH v6 11/14] drm/i915: Enable commands submission via GuC Date: Wed, 29 Apr 2015 15:13:32 -0700 Message-ID: <1430345615-5576-12-git-send-email-yu.dai@intel.com> References: <1430345615-5576-1-git-send-email-yu.dai@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 80A7D6E733 for ; Wed, 29 Apr 2015 15:15:14 -0700 (PDT) In-Reply-To: <1430345615-5576-1-git-send-email-yu.dai@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 RnJvbTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+CgpBZGQgZnVuY3Rpb25zIHRvIHN1Ym1p dCB3b3JrIHF1ZXVlIGl0ZW0gYW5kIHJpbmcgdGhlIGRvb3IgYmVsbC4KR3VDIFRMQiBuZWVkcyB0 byBiZSBpbnZhbGlkZWQgaWYgTFJDIGNvbnRleHQgY2hhbmdlcy4KCklzc3VlOiBWSVotNDg4NApT aWduZWQtb2ZmLWJ5OiBBbGV4IERhaSA8eXUuZGFpQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ndWMuaCAgICAgICAgfCAgIDMgKwogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZ3VjX2NsaWVudC5jIHwgMTk4ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysr KystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgfCAgMzQgKysrKyst CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCAgICAgICAgfCAgIDIgKwogNCBmaWxl cyBjaGFuZ2VkLCAyMzAgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Yy5oCmluZGV4IDg5MmY5NzQuLmY4MDY1Y2YgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2d1Yy5oCkBAIC0zMSw2ICszMSw3IEBACiAjZGVmaW5lIEdVQ19XUV9TSVpFCShQQUdFX1NJWkUg KiAyKQogCiBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50IHsKKwlzcGlubG9ja190IHdxX2xvY2s7CiAJ c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmNsaWVudF9vYmo7CiAJdTMyIHByaW9yaXR5Owog CW9mZl90IGRvb3JiZWxsX29mZnNldDsKQEAgLTM5LDYgKzQwLDggQEAgc3RydWN0IGk5MTVfZ3Vj X2NsaWVudCB7CiAJdWludDE2X3QgZG9vcmJlbGxfaWQ7CiAJdWludDMyX3QgY3R4X2luZGV4Owog CXVpbnQzMl90IHdxX3NpemU7CisJdWludDMyX3Qgd3FfdGFpbDsKKwl1aW50MzJfdCBjb29raWU7 CiB9OwogCiAjZGVmaW5lIEk5MTVfTUFYX0RPT1JCRUxMUwkyNTYKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19jbGllbnQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Y19jbGllbnQuYwppbmRleCA3OTIyNDI3Li4zMTkzNGEzIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfY2xpZW50LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZ3VjX2NsaWVudC5jCkBAIC0yMiw2ICsyMiw3IEBACiAgKgogICovCiAj aW5jbHVkZSA8bGludXgvZmlybXdhcmUuaD4KKyNpbmNsdWRlIDxsaW51eC9jaXJjX2J1Zi5oPgog I2luY2x1ZGUgImk5MTVfZHJ2LmgiCiAjaW5jbHVkZSAiaW50ZWxfZ3VjLmgiCiAKQEAgLTUyLDYg KzUzLDE0IEBACiAgKiBEb29yYmVsbHMgYXJlIGludGVycnVwdHMgdG8gdUtlcm5lbC4gQSBkb29y YmVsbCBpcyBhIHNpbmdsZSBjYWNoZSBsaW5lIChRVykKICAqIG1hcHBlZCBpbnRvIHByb2Nlc3Mg c3BhY2UuCiAgKgorICogV29yayBJdGVtczoKKyAqIFRoZXJlIGFyZSBzZXZlcmFsIHR5cGVzIG9m IHdvcmsgaXRlbXMgdGhhdCB0aGUgaG9zdCBtYXkgcGxhY2UgaW50byBhCisgKiB3b3JrcXVldWUs IGVhY2ggd2l0aCBpdHMgb3duIHJlcXVpcmVtZW50cyBhbmQgbGltaXRhdGlvbnMuIEN1cnJlbnRs eSBvbmx5CisgKiBXUV9UWVBFX0lOT1JERVIgaXMgbmVlZGVkIHRvIHN1cHBvcnQgbGVnYWN5IHN1 Ym1pc3Npb24gdmlhIEd1Qywgd2hpY2gKKyAqIHJlcHJlc2VudHMgaW4tb3JkZXIgcXVldWUuIFRo ZSBrZXJuZWwgZHJpdmVyIHBhY2tzIHJpbmcgdGFpbCBwb2ludGVyIGFuZCBhbgorICogRUxTUCBj b250ZXh0IGRlc2NyaXB0b3IgZHdvcmQgaW50byBXb3JrIEl0ZW0uCisgKiBTZWUgYWRkX3dvcmtx dWV1ZV9pdGVtKCkKKyAqCiAgKi8KIAogLyoKQEAgLTM5NSw2ICs0MDQsOCBAQCBpOTE1X2d1Y19j bGllbnRfYWxsb2Moc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdTMyIHByaW9yaXR5KQogCQkvKiBY WFg6IGV2aWN0IGEgZG9vcmJlbGwgaW5zdGVhZCAqLwogCQlnb3RvIGVycjsKIAorCXNwaW5fbG9j a19pbml0KCZjbGllbnQtPndxX2xvY2spOworCiAJaW5pdF9jdHhfZGVzYyhndWMsIGNsaWVudCk7 CiAJaW5pdF9wcm9jX2Rlc2MoZ3VjLCBjbGllbnQpOwogCWluaXRfZG9vcmJlbGwoZ3VjLCBjbGll bnQpOwpAQCAtNDE0LDYgKzQyNSwxODMgQEAgZXJyOgogCXJldHVybiBOVUxMOwogfQogCisvKiBH ZXQgdmFsaWQgd29ya3F1ZXVlIGl0ZW0gYW5kIHJldHVybiBpdCBiYWNrIHRvIG9mZnNldCAqLwor c3RhdGljIGludCBnZXRfd29ya3F1ZXVlX3NwYWNlKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdj LCB1MzIgKm9mZnNldCkKK3sKKwlzdHJ1Y3QgZ3VjX3Byb2Nlc3NfZGVzYyAqZGVzYzsKKwl2b2lk ICpiYXNlOworCXUzMiBzaXplID0gc2l6ZW9mKHN0cnVjdCBndWNfd3FfaXRlbSk7CisJaW50IHJl dCA9IDAsIHRpbWVvdXRfY291bnRlciA9IDIwMDsKKwl1bnNpZ25lZCBsb25nIGZsYWdzOworCisJ YmFzZSA9IGttYXBfYXRvbWljKGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZShnYy0+Y2xpZW50X29i aiwgMCkpOworCWRlc2MgPSBiYXNlICsgZ2MtPnByb2NfZGVzY19vZmZzZXQ7CisKKwl3aGlsZSAo dGltZW91dF9jb3VudGVyLS0gPiAwKSB7CisJCXNwaW5fbG9ja19pcnFzYXZlKCZnYy0+d3FfbG9j aywgZmxhZ3MpOworCisJCXJldCA9IHdhaXRfZm9yX2F0b21pYyhDSVJDX1NQQUNFKGdjLT53cV90 YWlsLCBkZXNjLT5oZWFkLAorCQkJCWdjLT53cV9zaXplKSA+PSBzaXplLCAxKTsKKworCQlpZiAo IXJldCkgeworCQkJKm9mZnNldCA9IGdjLT53cV90YWlsOworCisJCQkvKiBhZHZhbmNlIHRoZSB0 YWlsIGZvciBuZXh0IHdvcmtxdWV1ZSBpdGVtICovCisJCQlnYy0+d3FfdGFpbCArPSBzaXplOwor CQkJZ2MtPndxX3RhaWwgJj0gZ2MtPndxX3NpemUgLSAxOworCisJCQkvKiB0aGlzIHdpbGwgYnJl YWsgdGhlIGxvb3AgKi8KKwkJCXRpbWVvdXRfY291bnRlciA9IDA7CisJCX0KKworCQlzcGluX3Vu bG9ja19pcnFyZXN0b3JlKCZnYy0+d3FfbG9jaywgZmxhZ3MpOworCX07CisKKwlrdW5tYXBfYXRv bWljKGJhc2UpOworCisJcmV0dXJuIHJldDsKK30KKworc3RhdGljIHZvaWQgZ3VjX3VwZGF0ZV9j b250ZXh0KHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCisJCQkJc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluZykKK3sKKwlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IGN0eC0+ ZW5naW5lW3JpbmctPmlkXS5yaW5nYnVmOworCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpj dHhfb2JqID0gY3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlOworCXN0cnVjdCBwYWdlICpwYWdl OworCXVpbnQzMl90ICpyZWdfc3RhdGU7CisKKwlwYWdlID0gaTkxNV9nZW1fb2JqZWN0X2dldF9w YWdlKGN0eF9vYmosIDEpOworCXJlZ19zdGF0ZSA9IGttYXBfYXRvbWljKHBhZ2UpOworCisJcmVn X3N0YXRlW0NUWF9SSU5HX0JVRkZFUl9TVEFSVCArIDFdID0KKwkJCWk5MTVfZ2VtX29ial9nZ3R0 X29mZnNldChyaW5nYnVmLT5vYmopOworCisJLyogVHJ1ZSBQUEdUVCB3aXRoIGR5bmFtaWMgcGFn ZSBhbGxvY2F0aW9uOiB1cGRhdGUgUERQIHJlZ2lzdGVycyBhbmQKKwkgKiBwb2ludCB0aGUgdW5h bGxvY2F0ZWQgUERQcyB0byB0aGUgc2NyYXRjaCBwYWdlCisJICovCisJaWYgKGN0eC0+cHBndHQp IHsKKwkJQVNTSUdOX0NUWF9QRFAoY3R4LT5wcGd0dCwgcmVnX3N0YXRlLCAzKTsKKwkJQVNTSUdO X0NUWF9QRFAoY3R4LT5wcGd0dCwgcmVnX3N0YXRlLCAyKTsKKwkJQVNTSUdOX0NUWF9QRFAoY3R4 LT5wcGd0dCwgcmVnX3N0YXRlLCAxKTsKKwkJQVNTSUdOX0NUWF9QRFAoY3R4LT5wcGd0dCwgcmVn X3N0YXRlLCAwKTsKKwl9CisKKwlrdW5tYXBfYXRvbWljKHJlZ19zdGF0ZSk7Cit9CisKK3N0YXRp YyBpbnQgYWRkX3dvcmtxdWV1ZV9pdGVtKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjLAorCQkJ ICAgICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKKwkJCSAgICAgIHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcpCit7CisJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSBj dHgtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1ZjsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqY3R4X29iajsKKwlzdHJ1Y3QgZ3VjX3dxX2l0ZW0gKndxaTsKKwl2b2lkICpiYXNlOworCXUz MiB3cV9vZmYgPSAwLCB0YWlsID0gcmluZ2J1Zi0+dGFpbCwgd3FfbGVuOworCWludCByZXQ7CisK KwljdHhfb2JqID0gY3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlOworCisJLyogTmVlZCB0aGlz IGJlY2F1c2Ugb2YgdGhlIGRlZmVycmVkIHBpbiBjdHggYW5kIHJpbmcgKi8KKwkvKiBTaGFsbCB3 ZSBtb3ZlIHRoaXMgcmlnaHQgYWZ0ZXIgcmluZyBpcyBwaW5uZWQ/ICovCisJZ3VjX3VwZGF0ZV9j b250ZXh0KGN0eCwgcmluZyk7CisKKwlyZXQgPSBnZXRfd29ya3F1ZXVlX3NwYWNlKGdjLCAmd3Ff b2ZmKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJLyogRm9yIG5vdyB3b3JrcXVldWUg aXRlbSBpcyA0IERXczsgd29ya3F1ZXVlIGJ1ZmZlciBpcyAyIHBhZ2VzLiBTbyB3ZQorCSAqIHNo b3VsZCBub3QgaGF2ZSB0aGUgY2FzZSB3aGVyZSBzdHJ1Y3R1cmUgd3FpIGlzIGFjcm9zcyBwYWdl LCBuZWl0aGVyCisJICogd3JhcHBlZCB0byB0aGUgYmVnaW5uaW5nLiBUaGlzIHNpbXBsaWZpZXMg dGhlIGltcGxlbWVudGF0aW9uIGJlbG93LgorCSAqCisJICogWFhYOiBpZiBub3QgdGhlIGNhc2Us IHdlIG5lZWQgc2F2ZSBkYXRhIHRvIGEgdGVtcCB3cWkgYW5kIGNvcHkgaXQgdG8KKwkgKiB3b3Jr cXVldWUgYnVmZmVyIGR3IGJ5IGR3LgorCSAqLworCVdBUk5fT04oc2l6ZW9mKHN0cnVjdCBndWNf d3FfaXRlbSkgIT0gMTYpOworCVdBUk5fT04od3Ffb2ZmICYgMyk7CisKKwkvKiB3cSBzdGFydHMg ZnJvbSB0aGUgcGFnZSBhZnRlciBkb29yYmVsbCAvIHByb2Nlc3NfZGVzYyAqLworCWJhc2UgPSBr bWFwX2F0b21pYyhpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2UoZ2MtPmNsaWVudF9vYmosCisJCQko d3Ffb2ZmICsgR1VDX0RCX1NJWkUpID4+IFBBR0VfU0hJRlQpKTsKKwl3cV9vZmYgJj0gUEFHRV9T SVpFIC0gMTsKKwl3cWkgPSAoc3RydWN0IGd1Y193cV9pdGVtICopKChjaGFyICopYmFzZSArIHdx X29mZik7CisKKwkvKiBsZW4gZG9lcyBub3QgaW5jbHVkZSB0aGUgaGVhZGVyICovCisJd3FfbGVu ID0gc2l6ZW9mKHN0cnVjdCBndWNfd3FfaXRlbSkgLyBzaXplb2YodTMyKSAtIDE7CisJd3FpLT5o ZWFkZXIgPSBXUV9UWVBFX0lOT1JERVIgfAorCQkJKHdxX2xlbiA8PCBXUV9MRU5fU0hJRlQpIHwK KwkJCShyaW5nLT5pZCA8PCBXUV9UQVJHRVRfU0hJRlQpIHwKKwkJCVdRX05PX1dDRkxVU0hfV0FJ VDsKKworCXdxaS0+Y29udGV4dF9kZXNjID0gKHUzMilleGVjbGlzdHNfY3R4X2Rlc2NyaXB0b3Io cmluZywgY3R4X29iaik7CisJLyogdGFpbCBpbmRleCBpcyBpbiBxdyAqLworCXRhaWwgPj49IDM7 CisJd3FpLT5yaW5nX3RhaWwgPSB0YWlsIDw8IFdRX1JJTkdfVEFJTF9TSElGVDsKKwl3cWktPmZl bmNlX2lkID0gMDsgLypYWFg6IHdoYXQgZmVuY2UgdG8gYmUgaGVyZSAqLworCisJa3VubWFwX2F0 b21pYyhiYXNlKTsKKworCXJldHVybiAwOworfQorCitzdGF0aWMgaW50IHJpbmdfZG9vcmJlbGwo c3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MpCit7CisJc3RydWN0IGd1Y19wcm9jZXNzX2Rlc2Mg KmRlc2M7CisJdW5pb24gZ3VjX2Rvb3JiZWxsX3F3IGRiX2NtcCwgZGJfZXhjLCBkYl9yZXQ7CisJ dW5pb24gZ3VjX2Rvb3JiZWxsX3F3ICpkYjsKKwl2b2lkICpiYXNlOworCWludCBhdHRlbXB0ID0g MiwgcmV0ID0gLUVBR0FJTjsKKworCWJhc2UgPSBrbWFwX2F0b21pYyhpOTE1X2dlbV9vYmplY3Rf Z2V0X3BhZ2UoZ2MtPmNsaWVudF9vYmosIDApKTsKKwlkZXNjID0gYmFzZSArIGdjLT5wcm9jX2Rl c2Nfb2Zmc2V0OworCisJLyogVXBkYXRlIHRoZSB0YWlsIHNvIGl0IGlzIHZpc2libGUgdG8gR3VD ICovCisJZGVzYy0+dGFpbCA9IGdjLT53cV90YWlsOworCisJLyogY3VycmVudCBjb29raWUgKi8K KwlkYl9jbXAuZGJfc3RhdHVzID0gR1VDX0RPT1JCRUxMX0VOQUJMRUQ7CisJZGJfY21wLmNvb2tp ZSA9IGdjLT5jb29raWU7CisKKwkvKiBjb29raWUgdG8gYmUgdXBkYXRlZCAqLworCWRiX2V4Yy5k Yl9zdGF0dXMgPSBHVUNfRE9PUkJFTExfRU5BQkxFRDsKKwlkYl9leGMuY29va2llID0gZ2MtPmNv b2tpZSArIDE7CisJaWYgKGRiX2V4Yy5jb29raWUgPT0gMCkKKwkJZGJfZXhjLmNvb2tpZSA9IDE7 CisKKwkvKiBwb2ludGVyIG9mIGN1cnJlbnQgZG9vcmJlbGwgY2FjaGVsaW5lICovCisJZGIgPSBi YXNlICsgZ2MtPmRvb3JiZWxsX29mZnNldDsKKworCXdoaWxlIChhdHRlbXB0LS0pIHsKKwkJLyog bGV0cyByaW5nIHRoZSBkb29yYmVsbCAqLworCQlkYl9yZXQudmFsdWVfcXcgPSBhdG9taWM2NF9j bXB4Y2hnKChhdG9taWM2NF90ICopZGIsCisJCQlkYl9jbXAudmFsdWVfcXcsIGRiX2V4Yy52YWx1 ZV9xdyk7CisKKwkJLyogaWYgdGhlIGV4Y2hhbmdlIHdhcyBzdWNjZXNzZnVsbHkgZXhlY3V0ZWQg Ki8KKwkJaWYgKGRiX3JldC52YWx1ZV9xdyA9PSBkYl9jbXAudmFsdWVfcXcpIHsKKwkJCS8qIGRi IHdhcyBzdWNjZXNzZnVsbHkgcnVuZyAqLworCQkJZ2MtPmNvb2tpZSA9IGRiX2V4Yy5jb29raWU7 CisJCQlyZXQgPSAwOworCQkJYnJlYWs7CisJCX0KKworCQkvKiBYWFg6IGRvb3JiZWxsIHdhcyBs b3N0IGFuZCBuZWVkIHRvIGFjcXVpcmUgaXQgYWdhaW4gKi8KKwkJaWYgKGRiX3JldC5kYl9zdGF0 dXMgPT0gR1VDX0RPT1JCRUxMX0RJU0FCTEVEKQorCQkJYnJlYWs7CisKKwkJRFJNX0VSUk9SKCJD b29raWUgbWlzbWF0Y2guIEV4cGVjdGVkICVkLCByZXR1cm5lZCAlZFxuIiwKKwkJCSAgZGJfY21w LmNvb2tpZSwgZGJfcmV0LmNvb2tpZSk7CisKKwkJLyogdXBkYXRlIHRoZSBjb29raWUgdG8gbmV3 bHkgcmVhZCBjb29raWUgZnJvbSBHdUMgKi8KKwkJZGJfY21wLmNvb2tpZSA9IGRiX3JldC5jb29r aWU7CisJCWRiX2V4Yy5jb29raWUgPSBkYl9yZXQuY29va2llICsgMTsKKwkJaWYgKGRiX2V4Yy5j b29raWUgPT0gMCkKKwkJCWRiX2V4Yy5jb29raWUgPSAxOworCX0KKworCWt1bm1hcF9hdG9taWMo YmFzZSk7CisJcmV0dXJuIHJldDsKK30KKwogLyoqCiAgKiBpOTE1X2d1Y19jbGllbnRfc3VibWl0 KCkgLSBTdWJtaXQgY29tbWFuZHMgdGhyb3VnaCBHdUMKICAqIEBjbGllbnQ6CXRoZSBndWMgY2xp ZW50IHdoZXJlIGNvbW1hbmRzIHdpbGwgZ28gdGhyb3VnaApAQCAtNDI2LDUgKzYxNCwxMyBAQCBp bnQgaTkxNV9ndWNfY2xpZW50X3N1Ym1pdChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQs CiAJCQkgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogCQkJICAgc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqcmluZykKIHsKLQlyZXR1cm4gMDsKKwlpbnQgcmV0OworCisJcmV0ID0gYWRkX3dv cmtxdWV1ZV9pdGVtKGNsaWVudCwgY3R4LCByaW5nKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0 OworCisJcmV0ID0gcmluZ19kb29yYmVsbChjbGllbnQpOworCisJcmV0dXJuIHJldDsKIH0KZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggODY4NTIwNS4uMTUyOTVkYiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMKQEAgLTE4Nyw4ICsxODcsOCBAQCB1MzIgaW50ZWxfZXhlY2xpc3RzX2N0 eF9pZChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaikKIAlyZXR1cm4gbHJjYSA+ PiAxMjsKIH0KIAotc3RhdGljIHVpbnQ2NF90IGV4ZWNsaXN0c19jdHhfZGVzY3JpcHRvcihzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAotCQkJCQkgc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKmN0eF9vYmopCit1aW50NjRfdCBleGVjbGlzdHNfY3R4X2Rlc2NyaXB0b3Ioc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqcmluZywKKwkJCQkgIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpj dHhfb2JqKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7CiAJdWludDY0 X3QgZGVzYzsKQEAgLTY0OCwxMyArNjQ4LDE3IEBAIGludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNl X2FuZF9zdWJtaXQoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAJCQkJICAgICAg c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogewogCXN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcgPSByaW5nYnVmLT5yaW5nOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7CiAKIAlpbnRlbF9sb2dpY2FsX3Jp bmdfYWR2YW5jZShyaW5nYnVmKTsKIAogCWlmIChpbnRlbF9yaW5nX3N0b3BwZWQocmluZykpCiAJ CXJldHVybjsKIAotCWV4ZWNsaXN0c19jb250ZXh0X3F1ZXVlKHJpbmcsIGN0eCwgcmluZ2J1Zi0+ dGFpbCwgcmVxdWVzdCk7CisJaWYgKGRldl9wcml2LT5ndWMuZXhlY2J1Zl9jbGllbnQpCisJCWk5 MTVfZ3VjX2NsaWVudF9zdWJtaXQoZGV2X3ByaXYtPmd1Yy5leGVjYnVmX2NsaWVudCwgY3R4LCBy aW5nKTsKKwllbHNlCisJCWV4ZWNsaXN0c19jb250ZXh0X3F1ZXVlKHJpbmcsIGN0eCwgcmluZ2J1 Zi0+dGFpbCwgcmVxdWVzdCk7CiB9CiAKIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX3dyYXBfYnVm ZmVyKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLApAQCAtOTE4LDE4ICs5MjIsMjMg QEAgc3RhdGljIGludCBpbnRlbF9scl9jb250ZXh0X3BpbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nLAogewogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0gY3R4LT5l bmdpbmVbcmluZy0+aWRdLnN0YXRlOwogCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVm ID0gY3R4LT5lbmdpbmVbcmluZy0+aWRdLnJpbmdidWY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gcmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAlpbnQgcmV0ID0gMDsKIAog CVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmcmluZy0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKIAlp ZiAoY3R4LT5lbmdpbmVbcmluZy0+aWRdLnBpbl9jb3VudCsrID09IDApIHsKLQkJcmV0ID0gaTkx NV9nZW1fb2JqX2dndHRfcGluKGN0eF9vYmosCi0JCQkJR0VOOF9MUl9DT05URVhUX0FMSUdOLCAw KTsKKwkJcmV0ID0gaTkxNV9nZW1fb2JqX2dndHRfcGluKGN0eF9vYmosIEdFTjhfTFJfQ09OVEVY VF9BTElHTiwKKwkJCQlQSU5fT0ZGU0VUX0JJQVMgfCBHVUNfV09QQ01fU0laRV9WQUxVRSk7CiAJ CWlmIChyZXQpCiAJCQlnb3RvIHJlc2V0X3Bpbl9jb3VudDsKIAogCQlyZXQgPSBpbnRlbF9waW5f YW5kX21hcF9yaW5nYnVmZmVyX29iaihyaW5nLT5kZXYsIHJpbmdidWYpOwogCQlpZiAocmV0KQog CQkJZ290byB1bnBpbl9jdHhfb2JqOworCisJCS8qIEludmFsaWRhdGUgR3VDIFRMQi4gKi8KKwkJ aWYgKGk5MTUuZW5hYmxlX2d1Y19zY2hlZHVsaW5nKQorCQkJSTkxNV9XUklURShHRU44X0dUQ1Is IEdFTjhfR1RDUl9JTlZBTElEQVRFKTsKIAl9CiAKIAlyZXR1cm4gcmV0OwpAQCAtMTI4Myw2ICsx MjkyLDEzIEBAIHN0YXRpYyBpbnQgaW50ZWxfbHJfY29udGV4dF9yZW5kZXJfc3RhdGVfaW5pdChz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCXJldCA9IF9faTkxNV9hZGRfcmVxdWVzdChy aW5nLCBmaWxlLCBzby5vYmopOwogCS8qIGludGVsX2xvZ2ljYWxfcmluZ19hZGRfcmVxdWVzdCBt b3ZlcyBvYmplY3QgdG8gaW5hY3RpdmUgaWYgaXQKIAkgKiBmYWlscyAqLworCisJLyogR3VDIGZp cm13YXJlIHdpbGwgdHJ5IHRvIGNvbGxhcHNlIGl0cyBEUEMgd29yayBxdWV1ZSBpZiB0aGUgbmV3 IG9uZQorCSAqIGlzIGZvciBzYW1lIGNvbnRleHQuIFNvIHRoZSBmb2xsb3dpbmcgYnJlYWRjcnVt YiBjb3VsZCBiZSBhbWVuZGVkIHRvCisJICogdGhpcyBiYXRjaCBhbmQgc3VibWl0dGVkIGFzIG9u ZSBiYXRjaC4gV2FpdCBoZXJlIHRvIG1ha2Ugc3VyZSB0aGUKKwkgKiBjb250ZXh0IHN0YXRlIGlu aXQgaXMgZmluaXNoZWQgYmVmb3JlIGFueSBvdGhlciBzdWJtaXNzaW9uIHRvIEd1Qy4gKi8KKwlp ZiAoIXJldCAmJiBpOTE1LmVuYWJsZV9ndWNfc2NoZWR1bGluZykKKwkJcmV0ID0gaTkxNV93YWl0 X3JlcXVlc3Qoc28ub2JqLT5sYXN0X3JlYWRfcmVxKTsKIG91dDoKIAlpOTE1X2dlbV9yZW5kZXJf c3RhdGVfZmluaSgmc28pOwogCXJldHVybiByZXQ7CkBAIC0xMjkxLDggKzEzMDcsMTMgQEAgb3V0 Ogogc3RhdGljIGludCBnZW44X2luaXRfcmNzX2NvbnRleHQoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZywKIAkJICAgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpCiB7CisJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAlp bnQgcmV0OwogCisJLyogSW52YWxpZGF0ZSBHdUMgVExCLiAqLworCWlmIChpOTE1LmVuYWJsZV9n dWNfc2NoZWR1bGluZykKKwkJSTkxNV9XUklURShHRU44X0dUQ1IsIEdFTjhfR1RDUl9JTlZBTElE QVRFKTsKKwogCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ193b3JrYXJvdW5kc19lbWl0KHJpbmcs IGN0eCk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKQEAgLTE4MTksNyArMTg0MCw4IEBAIGlu dCBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2NyZWF0ZShzdHJ1Y3QgaW50ZWxfY29udGV4dCAq Y3R4LAogCX0KIAogCWlmIChpc19nbG9iYWxfZGVmYXVsdF9jdHgpIHsKLQkJcmV0ID0gaTkxNV9n ZW1fb2JqX2dndHRfcGluKGN0eF9vYmosIEdFTjhfTFJfQ09OVEVYVF9BTElHTiwgMCk7CisJCXJl dCA9IGk5MTVfZ2VtX29ial9nZ3R0X3BpbihjdHhfb2JqLCBHRU44X0xSX0NPTlRFWFRfQUxJR04s CisJCQkJUElOX09GRlNFVF9CSUFTIHwgR1VDX1dPUENNX1NJWkVfVkFMVUUpOwogCQlpZiAocmV0 KSB7CiAJCQlEUk1fREVCVUdfRFJJVkVSKCJQaW4gTFJDIGJhY2tpbmcgb2JqIGZhaWxlZDogJWRc biIsCiAJCQkJCXJldCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCmluZGV4IDA0ZDNhNmQuLjE5 YzlhMDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCkBAIC04NSw2ICs4NSw4IEBAIGludCBp bnRlbF9leGVjbGlzdHNfc3VibWlzc2lvbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3Qg ZHJtX2ZpbGUgKmZpbGUsCiAJCQkgICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmJh dGNoX29iaiwKIAkJCSAgICAgICB1NjQgZXhlY19zdGFydCwgdTMyIGRpc3BhdGNoX2ZsYWdzKTsK IHUzMiBpbnRlbF9leGVjbGlzdHNfY3R4X2lkKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpj dHhfb2JqKTsKK3VpbnQ2NF90IGV4ZWNsaXN0c19jdHhfZGVzY3JpcHRvcihzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nLAorCQkJCSAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9v YmopOwogCiB2b2lkIGludGVsX2xyY19pcnFfaGFuZGxlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nKTsKIHZvaWQgaW50ZWxfZXhlY2xpc3RzX3JldGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nKTsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=