From: Oscar Mateo Subject: [PATCH 1/2] drm/i915/guc: Get rid of the enable_guc_loading module parameter Date: Fri, 5 May 2017 13:23:17 +0000 Message-ID: <1493990598-36155-1-git-send-email-oscar.mateo@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 ESMTPS id 6ECA66E0D4 for ; Fri, 5 May 2017 20:23:44 +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 List-Id: intel-gfx@lists.freedesktop.org VGhlIGRlY2lzc2lvbiB0byBlbmFibGUgR3VDIGxvYWRpbmcgc2hvdWxkbid0IGJlIGxlZnQgdG8g dGhlIHVzZXIuClByb3ZpZGVkIHRoZSBIVyBzdXBwb3J0cyB0aGUgR3VDLCB0aGVyZSBhcmUgb25s eSB0d28gcmVhc29ucyB0byBsb2FkIGl0OgoKLSBUaGUgdXNlciBoYXMgcmVxdWVzdGVkIEd1QyBz dWJtaXNzaW9uLgotIFdlIGhhdmUgYSBIdUMgZmlybXdhcmUgYXZhaWxhYmxlIChzbyB3ZSBuZWVk IHRoZSBHdUMgdG8gdmFsaWRhdGUgaXQpLgoKV2UgbGVhdmUgdGhlIGVuYWJsZV9ndWNfc3VibWlz c2lvbiBwYXJhbWV0ZXIgdW50b3VjaGVkICgiYXV0byIsICJuZXZlciIsCiJpZiBzdXBwb3J0ZWQi LCAicmVxdWlyZWQiKSBidXQgbWFrZSBpdHMgYmVoYXZpb3IgYSBsaXR0bGUgYml0IG1vcmUKY29u c2lzdGVudC4gQWxzbywgaWYgbm90IHJlYWxseSByZXF1aXJlZCwgd2UgZG8gbm90IHRyeSB0byBm ZXRjaCBhbnkKZmlybXdhcmUuCgpDYzogQW51c2hhIFNyaXZhdHNhIDxhbnVzaGEuc3JpdmF0c2FA aW50ZWwuY29tPgpDYzogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xvc3B1 cmlvQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVr PgpTaWduZWQtb2ZmLWJ5OiBPc2NhciBNYXRlbyA8b3NjYXIubWF0ZW9AaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICAgICB8IDEwICsrKystLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICB8IDE2ICsrKysrLS0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5jICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2ly cS5jICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuYyAg ICAgIHwgIDYgLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuaCAgICAgIHwg IDIgLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyB8IDQ4ICsrKysr KysrKysrKysrKysrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMg ICAgICAgIHwgIDUgKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jICAgICAgICAg fCA1OCArKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3VjLmggICAgICAgICB8ICA0ICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfdW5jb3JlLmMgICAgIHwgIDMgKy0KIDEzIGZpbGVzIGNoYW5nZWQsIDgyIGluc2VydGlvbnMo KyksIDc4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXgg ODcwYzQ3MC4uZTAzMGI0MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTIz NjYsOCArMjM2NiwxMCBAQCBzdGF0aWMgaW50IGk5MTVfaHVjX2xvYWRfc3RhdHVzX2luZm8oc3Ry dWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IG5vZGVfdG9faTkxNShtLT5wcml2YXRlKTsKIAlzdHJ1Y3QgaW50ZWxfdWNfZncg Kmh1Y19mdyA9ICZkZXZfcHJpdi0+aHVjLmZ3OwogCi0JaWYgKCFIQVNfSFVDX1VDT0RFKGRldl9w cml2KSkKKwlpZiAoIUhBU19HVUMoZGV2X3ByaXYpKSB7CisJCXNlcV9wdXRzKG0sICJObyBIdUMg c3VwcG9ydCBpbiBIV1xuIik7CiAJCXJldHVybiAwOworCX0KIAogCXNlcV9wdXRzKG0sICJIdUMg ZmlybXdhcmUgc3RhdHVzOlxuIik7CiAJc2VxX3ByaW50ZihtLCAiXHRwYXRoOiAlc1xuIiwgaHVj X2Z3LT5wYXRoKTsKQEAgLTIzOTksOCArMjQwMSwxMCBAQCBzdGF0aWMgaW50IGk5MTVfZ3VjX2xv YWRfc3RhdHVzX2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogCXN0cnVjdCBp bnRlbF91Y19mdyAqZ3VjX2Z3ID0gJmRldl9wcml2LT5ndWMuZnc7CiAJdTMyIHRtcCwgaTsKIAot CWlmICghSEFTX0dVQ19VQ09ERShkZXZfcHJpdikpCisJaWYgKCFIQVNfR1VDKGRldl9wcml2KSkg eworCQlzZXFfcHV0cyhtLCAiTm8gR3VDIHN1cHBvcnQgaW4gSFdcbiIpOwogCQlyZXR1cm4gMDsK Kwl9CiAKIAlzZXFfcHJpbnRmKG0sICJHdUMgZmlybXdhcmUgc3RhdHVzOlxuIik7CiAJc2VxX3By aW50ZihtLCAiXHRwYXRoOiAlc1xuIiwKQEAgLTI1MDQsNyArMjUwOCw3IEBAIHN0YXRpYyBpbnQg aTkxNV9ndWNfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiAKIAlpZiAoIWd1 Yy0+ZXhlY2J1Zl9jbGllbnQpIHsKIAkJc2VxX3ByaW50ZihtLCAiR3VDIHN1Ym1pc3Npb24gJXNc biIsCi0JCQkgICBIQVNfR1VDX1NDSEVEKGRldl9wcml2KSA/CisJCQkgICBIQVNfR1VDKGRldl9w cml2KSA/CiAJCQkgICAiZGlzYWJsZWQiIDoKIAkJCSAgICJub3Qgc3VwcG9ydGVkIik7CiAJCXJl dHVybiAwOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggNzJmYjQ3YS4uMDA2ZWQ5MSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC05OTYsNyArOTk2LDcgQEAgc3RhdGljIHZvaWQgaW50 ZWxfc2FuaXRpemVfb3B0aW9ucyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJ aTkxNS5zZW1hcGhvcmVzID0gaW50ZWxfc2FuaXRpemVfc2VtYXBob3JlcyhkZXZfcHJpdiwgaTkx NS5zZW1hcGhvcmVzKTsKIAlEUk1fREVCVUdfRFJJVkVSKCJ1c2UgR1BVIHNlbWFwaG9yZXM/ICVz XG4iLCB5ZXNubyhpOTE1LnNlbWFwaG9yZXMpKTsKIAotCWludGVsX3VjX3Nhbml0aXplX29wdGlv bnMoZGV2X3ByaXYpOworCWludGVsX2d1Y19zYW5pdGl6ZV9zdWJtaXNzaW9uKGRldl9wcml2KTsK IH0KIAogLyoqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBiMjBlZDE2Li41ZDAwMTIwIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI5MjEsMTUgKzI5MjEsMTcgQEAgc3RhdGljIGlu bGluZSBzdHJ1Y3Qgc2NhdHRlcmxpc3QgKl9fc2dfbmV4dChzdHJ1Y3Qgc2NhdHRlcmxpc3QgKnNn KQogI2RlZmluZSBIQVNfUlVOVElNRV9QTShkZXZfcHJpdikgKChkZXZfcHJpdiktPmluZm8uaGFz X3J1bnRpbWVfcG0pCiAjZGVmaW5lIEhBU182NEJJVF9SRUxPQyhkZXZfcHJpdikgKChkZXZfcHJp diktPmluZm8uaGFzXzY0Yml0X3JlbG9jKQogCisjZGVmaW5lIEhBU19HVUMoZGV2X3ByaXYpCSgo ZGV2X3ByaXYpLT5pbmZvLmhhc19ndWMpCisjZGVmaW5lIEhBU19HVUNfVUNPREUoZGV2X3ByaXYp CSgoZGV2X3ByaXYpLT5ndWMuZncucGF0aCAhPSBOVUxMKQorI2RlZmluZSBIQVNfSFVDX1VDT0RF KGRldl9wcml2KQkoKGRldl9wcml2KS0+aHVjLmZ3LnBhdGggIT0gTlVMTCkKKwogLyoKLSAqIEZv ciBub3csIGFueXRoaW5nIHdpdGggYSBHdUMgcmVxdWlyZXMgdUNvZGUgbG9hZGluZywgYW5kIHRo ZW4gc3VwcG9ydHMKLSAqIGNvbW1hbmQgc3VibWlzc2lvbiBvbmNlIGxvYWRlZC4gQnV0IHRoZXNl IGFyZSBsb2dpY2FsbHkgaW5kZXBlbmRlbnQKLSAqIHByb3BlcnRpZXMsIHNvIHdlIGhhdmUgc2Vw YXJhdGUgbWFjcm9zIHRvIHRlc3QgdGhlbS4KKyAqIE9ubHkgdHdvIHRoaW5ncyByZXF1aXJlIHVz IHRvIGxvYWQgdGhlIEd1QyBmaXJtd2FyZTogZWl0aGVyIHdlIHdhbnQKKyAqIHRvIGVuYWJsZSBH dUMgc3VibWlzc2lvbiBvciB3ZSBuZWVkIGl0IHRvIHRvIHZhbGlkYXRlIGEgSHVDIGZpcm13YXJl CiAgKi8KLSNkZWZpbmUgSEFTX0dVQyhkZXZfcHJpdikJKChkZXZfcHJpdiktPmluZm8uaGFzX2d1 YykKLSNkZWZpbmUgSEFTX0dVQ19VQ09ERShkZXZfcHJpdikJKEhBU19HVUMoZGV2X3ByaXYpKQot I2RlZmluZSBIQVNfR1VDX1NDSEVEKGRldl9wcml2KQkoSEFTX0dVQyhkZXZfcHJpdikpCi0jZGVm aW5lIEhBU19IVUNfVUNPREUoZGV2X3ByaXYpCShIQVNfR1VDKGRldl9wcml2KSkKKyNkZWZpbmUg TkVFRFNfR1VDX0xPQURJTkcoZGV2X3ByaXYpIFwKKwkoSEFTX0dVQyhkZXZfcHJpdikgJiYgXAor CShpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiB8fCBIQVNfSFVDX1VDT0RFKGRldl9wcml2KSkp CiAKICNkZWZpbmUgSEFTX1JFU09VUkNFX1NUUkVBTUVSKGRldl9wcml2KSAoKGRldl9wcml2KS0+ aW5mby5oYXNfcmVzb3VyY2Vfc3RyZWFtZXIpCiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2NvbnRleHQuYwppbmRleCAzMWE3M2MzLi5hOWY4MjViIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fY29udGV4dC5jCkBAIC0yMzcsNyArMjM3LDcgQEAgc3RhdGljIHUzMiBkZWZhdWx0 X2Rlc2NfdGVtcGxhdGUoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsCiAJICog cHJlc2VudCBvciBub3QgaW4gdXNlIHdlIHN0aWxsIG5lZWQgYSBzbWFsbCBiaWFzIGFzIHJpbmcg d3JhcGFyb3VuZAogCSAqIGF0IG9mZnNldCAwIHNvbWV0aW1lcyBoYW5ncy4gTm8gaWRlYSB3aHku CiAJICovCi0JaWYgKEhBU19HVUMoZGV2X3ByaXYpICYmIGk5MTUuZW5hYmxlX2d1Y19sb2FkaW5n KQorCWlmIChORUVEU19HVUNfTE9BRElORyhkZXZfcHJpdikpCiAJCWN0eC0+Z2d0dF9vZmZzZXRf YmlhcyA9IEdVQ19XT1BDTV9UT1A7CiAJZWxzZQogCQljdHgtPmdndHRfb2Zmc2V0X2JpYXMgPSBJ OTE1X0dUVF9QQUdFX1NJWkU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IDhi YWI0YWUuLjI4M2Q3ZTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0yODk3 LDcgKzI4OTcsNyBAQCBpbnQgaTkxNV9nZ3R0X3Byb2JlX2h3KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIAkgKiBjdXJyZW50bHkgZG9uJ3QgaGF2ZSBhbnkgYml0cyBzcGFyZSB0 byBwYXNzIGluIHRoaXMgdXBwZXIKIAkgKiByZXN0cmljdGlvbiEKIAkgKi8KLQlpZiAoSEFTX0dV QyhkZXZfcHJpdikgJiYgaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcpIHsKKwlpZiAoTkVFRFNfR1VD X0xPQURJTkcoZGV2X3ByaXYpKSB7CiAJCWdndHQtPmJhc2UudG90YWwgPSBtaW5fdCh1NjQsIGdn dHQtPmJhc2UudG90YWwsIEdVQ19HR1RUX1RPUCk7CiAJCWdndHQtPm1hcHBhYmxlX2VuZCA9IG1p bihnZ3R0LT5tYXBwYWJsZV9lbmQsIGdndHQtPmJhc2UudG90YWwpOwogCX0KZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2lycS5jCmluZGV4IGM5OWY1MWMuLjc1Y2QwYTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEu YwpAQCAtNDI0MCw3ICs0MjQwLDcgQEAgdm9pZCBpbnRlbF9pcnFfaW5pdChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJZm9yIChpID0gMDsgaSA8IE1BWF9MM19TTElDRVM7ICsr aSkKIAkJZGV2X3ByaXYtPmwzX3Bhcml0eS5yZW1hcF9pbmZvW2ldID0gTlVMTDsKIAotCWlmIChI QVNfR1VDX1NDSEVEKGRldl9wcml2KSkKKwlpZiAoTkVFRFNfR1VDX0xPQURJTkcoZGV2X3ByaXYp KQogCQlkZXZfcHJpdi0+cG1fZ3VjX2V2ZW50cyA9IEdFTjlfR1VDX1RPX0hPU1RfSU5UX0VWRU5U OwogCiAJLyogTGV0J3MgdHJhY2sgdGhlIGVuYWJsZWQgcnBzIGV2ZW50cyAqLwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfcGFyYW1zLmMKaW5kZXggYjZhN2UzNi4uZjkwYjdjMSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3BhcmFtcy5jCkBAIC01Niw3ICs1Niw2IEBAIHN0cnVjdCBpOTE1X3BhcmFtcyBpOTE1 IF9fcmVhZF9tb3N0bHkgPSB7CiAJLnZlcmJvc2Vfc3RhdGVfY2hlY2tzID0gMSwKIAkubnVjbGVh cl9wYWdlZmxpcCA9IDAsCiAJLmVkcF92c3dpbmcgPSAwLAotCS5lbmFibGVfZ3VjX2xvYWRpbmcg PSAwLAogCS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24gPSAwLAogCS5ndWNfbG9nX2xldmVsID0gLTEs CiAJLmd1Y19maXJtd2FyZV9wYXRoID0gTlVMTCwKQEAgLTIxOCwxMSArMjE3LDYgQEAgc3RydWN0 IGk5MTVfcGFyYW1zIGk5MTUgX19yZWFkX21vc3RseSA9IHsKIAkJICIoMD11c2UgdmFsdWUgZnJv bSB2YnQgW2RlZmF1bHRdLCAxPWxvdyBwb3dlciBzd2luZygyMDBtViksIgogCQkgIjI9ZGVmYXVs dCBzd2luZyg0MDBtVikpIik7CiAKLW1vZHVsZV9wYXJhbV9uYW1lZF91bnNhZmUoZW5hYmxlX2d1 Y19sb2FkaW5nLCBpOTE1LmVuYWJsZV9ndWNfbG9hZGluZywgaW50LCAwNDAwKTsKLU1PRFVMRV9Q QVJNX0RFU0MoZW5hYmxlX2d1Y19sb2FkaW5nLAotCQkiRW5hYmxlIEd1QyBmaXJtd2FyZSBsb2Fk aW5nICIKLQkJIigtMT1hdXRvLCAwPW5ldmVyIFtkZWZhdWx0XSwgMT1pZiBhdmFpbGFibGUsIDI9 cmVxdWlyZWQpIik7Ci0KIG1vZHVsZV9wYXJhbV9uYW1lZF91bnNhZmUoZW5hYmxlX2d1Y19zdWJt aXNzaW9uLCBpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiwgaW50LCAwNDAwKTsKIE1PRFVMRV9Q QVJNX0RFU0MoZW5hYmxlX2d1Y19zdWJtaXNzaW9uLAogCQkiRW5hYmxlIEd1QyBzdWJtaXNzaW9u ICIKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5oCmluZGV4IDM0MTQ4Y2MuLjMzZTEyZjYgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuaApAQCAtNDMsNyArNDMsNiBAQAogCWZ1bmMoaW50 LCBkaXNhYmxlX3Bvd2VyX3dlbGwpOyBcCiAJZnVuYyhpbnQsIGVuYWJsZV9pcHMpOyBcCiAJZnVu YyhpbnQsIGludmVydF9icmlnaHRuZXNzKTsgXAotCWZ1bmMoaW50LCBlbmFibGVfZ3VjX2xvYWRp bmcpOyBcCiAJZnVuYyhpbnQsIGVuYWJsZV9ndWNfc3VibWlzc2lvbik7IFwKIAlmdW5jKGludCwg Z3VjX2xvZ19sZXZlbCk7IFwKIAlmdW5jKGNoYXIgKiwgZ3VjX2Zpcm13YXJlX3BhdGgpOyBcCkBA IC03OCw0ICs3NywzIEBAIHN0cnVjdCBpOTE1X3BhcmFtcyB7CiBleHRlcm4gc3RydWN0IGk5MTVf cGFyYW1zIGk5MTUgX19yZWFkX21vc3RseTsKIAogI2VuZGlmCi0KZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Y19sb2FkZXIuYwppbmRleCBkOTA0NWI2Li43NjJmMGYyIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCkBAIC0zNzUsMTMgKzM3NSw0OCBAQCBpbnQgaW50 ZWxfZ3VjX2luaXRfaHcoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCXJldHVybiAwOwogfQogCit2 b2lkIGludGVsX2d1Y19zYW5pdGl6ZV9zdWJtaXNzaW9uKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKK3sKKwkvKiBWZXJpZnkgaGFyZHdhcmUgc3VwcG9ydCAqLworCWlmICghSEFT X0dVQyhkZXZfcHJpdikpIHsKKwkJaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uID4gMCkK KwkJCURSTV9JTkZPKCJJZ25vcmluZyBHdUMgc3VibWlzc2lvbiBlbmFibGUsIG5vIEhXXG4iKTsK KwkJaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24gPSAwOworCQlyZXR1cm47CisJfQorCisJLyog VmVyaWZ5IGZpcm13YXJlIHN1cHBvcnQgKi8KKwlpZiAoIUhBU19HVUNfVUNPREUoZGV2X3ByaXYp KSB7CisJCWlmIChpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiA9PSAxKSB7CisJCQlEUk1fSU5G TygiSWdub3JpbmcgR3VDIHN1Ym1pc3Npb24gZW5hYmxlLCBubyBGV1xuIik7CisJCQlpOTE1LmVu YWJsZV9ndWNfc3VibWlzc2lvbiA9IDA7CisJCQlyZXR1cm47CisJCX0KKworCQlpZiAoaTkxNS5l bmFibGVfZ3VjX3N1Ym1pc3Npb24gPCAwKSB7CisJCQlpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lv biA9IDA7CisJCQlyZXR1cm47CisJCX0KKworCQkvKgorCQkgKiBJZiAicmVxdWlyZWQiICg+IDEp LCBsZXQgaXQgY29udGludWUgYW5kIHdlIHdpbGwgZmFpbCBsYXRlcgorCQkgKiBkdWUgdG8gdGhl IGxhY2sgb2YgZmlybXdhcmUKKwkJICovCisJfQorCisJLyoKKwkgKiBBIG5lZ2F0aXZlIHZhbHVl IG1lYW5zICJ1c2UgcGxhdGZvcm0gZGVmYXVsdCIgKGVuYWJsZWQgaWYgd2UgaGF2ZQorCSAqIHN1 cnZpdmVkIHRvIGdldCBoZXJlKQorCSAqLworCWlmIChpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lv biA8IDApCisJCWk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uID0gMTsKK30KKwogLyoqCiAgKiBp bnRlbF9ndWNfc2VsZWN0X2Z3KCkgLSBzZWxlY3RzIEd1QyBmaXJtd2FyZSBmb3IgbG9hZGluZwog ICogQGd1YzoJaW50ZWxfZ3VjIHN0cnVjdAotICoKLSAqIFJldHVybjogemVybyB3aGVuIHdlIGtu b3cgZmlybXdhcmUsIG5vbi16ZXJvIGluIG90aGVyIGNhc2UKICAqLwotaW50IGludGVsX2d1Y19z ZWxlY3RfZncoc3RydWN0IGludGVsX2d1YyAqZ3VjKQordm9pZCBpbnRlbF9ndWNfc2VsZWN0X2Z3 KHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSBndWNfdG9faTkxNShndWMpOwogCkBAIC00MTEsOSArNDQ2LDggQEAgaW50IGludGVs X2d1Y19zZWxlY3RfZncoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCQlndWMtPmZ3Lm1ham9yX3Zl cl93YW50ZWQgPSBHTEtfRldfTUFKT1I7CiAJCWd1Yy0+ZncubWlub3JfdmVyX3dhbnRlZCA9IEdM S19GV19NSU5PUjsKIAl9IGVsc2UgewotCQlEUk1fRVJST1IoIk5vIEd1QyBmaXJtd2FyZSBrbm93 biBmb3IgcGxhdGZvcm0gd2l0aCBHdUMhXG4iKTsKLQkJcmV0dXJuIC1FTk9FTlQ7CisJCWlmIChI QVNfR1VDKGRldl9wcml2KSkKKwkJCURSTV9FUlJPUigiTm8gR3VDIEZXIGtub3duIGZvciBhIHBs YXRmb3JtIHdpdGggR3VDIVxuIik7CisJCXJldHVybjsKIAl9Ci0KLQlyZXR1cm4gMDsKIH0KZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfaHVjLmMKaW5kZXggODhiNGNmMy4uNDlhNmQ4OCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfaHVjLmMKQEAgLTE3Niw3ICsxNzYsOSBAQCB2b2lkIGludGVsX2h1Y19zZWxlY3Rf Zncoc3RydWN0IGludGVsX2h1YyAqaHVjKQogCQlodWMtPmZ3Lm1ham9yX3Zlcl93YW50ZWQgPSBH TEtfSFVDX0ZXX01BSk9SOwogCQlodWMtPmZ3Lm1pbm9yX3Zlcl93YW50ZWQgPSBHTEtfSFVDX0ZX X01JTk9SOwogCX0gZWxzZSB7Ci0JCURSTV9FUlJPUigiTm8gSHVDIGZpcm13YXJlIGtub3duIGZv ciBwbGF0Zm9ybSB3aXRoIEh1QyFcbiIpOworCQkvKiBGb3Igbm93LCBldmVyeXRoaW5nIHdpdGgg YSBHdUMgYWxzbyBoYXMgYSBIdUMgKi8KKwkJaWYgKEhBU19HVUMoZGV2X3ByaXYpKQorCQkJRFJN X0VSUk9SKCJObyBIdUMgRlcga25vd24gZm9yIGEgcGxhdGZvcm0gd2l0aCBIdUMhXG4iKTsKIAkJ cmV0dXJuOwogCX0KIH0KQEAgLTI3NSw0ICsyNzcsMyBAQCB2b2lkIGludGVsX2d1Y19hdXRoX2h1 YyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiBvdXQ6CiAJaTkxNV92bWFfdW5w aW4odm1hKTsKIH0KLQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMKaW5kZXggN2ZkNzVjYS4uMmYxZjc5 YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCkBAIC02MCw0NCArNjAsMTMgQEAgc3RhdGljIGlu dCBfX2ludGVsX3VjX3Jlc2V0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IAlyZXR1cm4gcmV0OwogfQogCi12b2lkIGludGVsX3VjX3Nhbml0aXplX29wdGlvbnMoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQotewotCWlmICghSEFTX0dVQyhkZXZfcHJpdikp IHsKLQkJaWYgKGk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nID4gMCB8fAotCQkgICAgaTkxNS5lbmFi bGVfZ3VjX3N1Ym1pc3Npb24gPiAwKQotCQkJRFJNX0lORk8oIklnbm9yaW5nIEd1QyBvcHRpb25z LCBubyBoYXJkd2FyZVxuIik7Ci0KLQkJaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcgPSAwOwotCQlp OTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiA9IDA7Ci0JCXJldHVybjsKLQl9Ci0KLQkvKiBBIG5l Z2F0aXZlIHZhbHVlIG1lYW5zICJ1c2UgcGxhdGZvcm0gZGVmYXVsdCIgKi8KLQlpZiAoaTkxNS5l bmFibGVfZ3VjX2xvYWRpbmcgPCAwKQotCQlpOTE1LmVuYWJsZV9ndWNfbG9hZGluZyA9IEhBU19H VUNfVUNPREUoZGV2X3ByaXYpOwotCi0JLyogVmVyaWZ5IGZpcm13YXJlIHZlcnNpb24gKi8KLQlp ZiAoaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcpIHsKLQkJaWYgKEhBU19IVUNfVUNPREUoZGV2X3By aXYpKQotCQkJaW50ZWxfaHVjX3NlbGVjdF9mdygmZGV2X3ByaXYtPmh1Yyk7Ci0KLQkJaWYgKGlu dGVsX2d1Y19zZWxlY3RfZncoJmRldl9wcml2LT5ndWMpKQotCQkJaTkxNS5lbmFibGVfZ3VjX2xv YWRpbmcgPSAwOwotCX0KLQotCS8qIENhbid0IGVuYWJsZSBndWMgc3VibWlzc2lvbiB3aXRob3V0 IGd1YyBsb2FkZWQgKi8KLQlpZiAoIWk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nKQotCQlpOTE1LmVu YWJsZV9ndWNfc3VibWlzc2lvbiA9IDA7Ci0KLQkvKiBBIG5lZ2F0aXZlIHZhbHVlIG1lYW5zICJ1 c2UgcGxhdGZvcm0gZGVmYXVsdCIgKi8KLQlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24g PCAwKQotCQlpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiA9IEhBU19HVUNfU0NIRUQoZGV2X3By aXYpOwotfQotCiB2b2lkIGludGVsX3VjX2luaXRfZWFybHkoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogewogCXN0cnVjdCBpbnRlbF9ndWMgKmd1YyA9ICZkZXZfcHJpdi0+Z3Vj OwogCisJaW50ZWxfZ3VjX3NlbGVjdF9mdygmZGV2X3ByaXYtPmd1Yyk7CisJaW50ZWxfaHVjX3Nl bGVjdF9mdygmZGV2X3ByaXYtPmh1Yyk7CisKIAltdXRleF9pbml0KCZndWMtPnNlbmRfbXV0ZXgp OwogCWd1Yy0+c2VuZCA9IGludGVsX2d1Y19zZW5kX25vcDsKIH0KQEAgLTI0Miw2ICsyMTEsOSBA QCBzdGF0aWMgdm9pZCBmZXRjaF91Y19mdyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCiAKIHZvaWQgaW50ZWxfdWNfaW5pdF9mdyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiB7CisJaWYgKCFIQVNfR1VDKGRldl9wcml2KSkKKwkJcmV0dXJuOworCiAJZmV0Y2hf dWNfZncoZGV2X3ByaXYsICZkZXZfcHJpdi0+aHVjLmZ3KTsKIAlmZXRjaF91Y19mdyhkZXZfcHJp diwgJmRldl9wcml2LT5ndWMuZncpOwogfQpAQCAtMjY5LDcgKzI0MSw3IEBAIGludCBpbnRlbF91 Y19pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlzdHJ1Y3QgaW50 ZWxfZ3VjICpndWMgPSAmZGV2X3ByaXYtPmd1YzsKIAlpbnQgcmV0LCBhdHRlbXB0czsKIAotCWlm ICghaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcpCisJaWYgKCFORUVEU19HVUNfTE9BRElORyhkZXZf cHJpdikpCiAJCXJldHVybiAwOwogCiAJZ3VjX2Rpc2FibGVfY29tbXVuaWNhdGlvbihndWMpOwpA QCAtMzU3LDIyICszMjksMjIgQEAgaW50IGludGVsX3VjX2luaXRfaHcoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogCWk5MTVfZ2d0dF9kaXNhYmxlX2d1YyhkZXZfcHJpdik7CiAK IAlEUk1fRVJST1IoIkd1QyBpbml0IGZhaWxlZFxuIik7Ci0JaWYgKGk5MTUuZW5hYmxlX2d1Y19s b2FkaW5nID4gMSB8fCBpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiA+IDEpCisJaWYgKGk5MTUu ZW5hYmxlX2d1Y19zdWJtaXNzaW9uID4gMSkgeworCQlEUk1fTk9URSgiR3VDIGlzIHJlcXVpcmVk LCBzbyBtYXJraW5nIHRoZSBHUFUgYXMgd2VkZ2VkXG4iKTsKIAkJcmV0ID0gLUVJTzsKLQllbHNl Ci0JCXJldCA9IDA7Ci0KLQlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pIHsKLQkJaTkx NS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24gPSAwOworCX0gZWxzZSBpZiAoaTkxNS5lbmFibGVfZ3Vj X3N1Ym1pc3Npb24gPT0gMSkgewogCQlEUk1fTk9URSgiRmFsbGluZyBiYWNrIGZyb20gR3VDIHN1 Ym1pc3Npb24gdG8gZXhlY2xpc3QgbW9kZVxuIik7Ci0JfQorCQlpOTE1LmVuYWJsZV9ndWNfc3Vi bWlzc2lvbiA9IDA7CisJCXJldCA9IDA7CisJfSBlbHNlCisJCXJldCA9IDA7CiAKIAlyZXR1cm4g cmV0OwogfQogCiB2b2lkIGludGVsX3VjX2ZpbmlfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQogewotCWlmICghaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcpCisJaWYgKCFORUVE U19HVUNfTE9BRElORyhkZXZfcHJpdikpCiAJCXJldHVybjsKIAogCWlmIChpOTE1LmVuYWJsZV9n dWNfc3VibWlzc2lvbikgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf dWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmgKaW5kZXggMWUwZWVjZC4uMmRh NDg0NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5oCkBAIC0yMjAsNyArMjIwLDYgQEAgc3RydWN0 IGludGVsX2h1YyB7CiB9OwogCiAvKiBpbnRlbF91Yy5jICovCi12b2lkIGludGVsX3VjX3Nhbml0 aXplX29wdGlvbnMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaW50 ZWxfdWNfaW5pdF9lYXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9p ZCBpbnRlbF91Y19pbml0X2Z3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2 b2lkIGludGVsX3VjX2ZpbmlfZncoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsK QEAgLTIzNSwxMyArMjM0LDE0IEBAIHN0YXRpYyBpbmxpbmUgaW50IGludGVsX2d1Y19zZW5kKHN0 cnVjdCBpbnRlbF9ndWMgKmd1YywgY29uc3QgdTMyICphY3Rpb24sIHUzMiBsCiB9CiAKIC8qIGlu dGVsX2d1Y19sb2FkZXIuYyAqLwotaW50IGludGVsX2d1Y19zZWxlY3RfZncoc3RydWN0IGludGVs X2d1YyAqZ3VjKTsKK3ZvaWQgaW50ZWxfZ3VjX3NlbGVjdF9mdyhzdHJ1Y3QgaW50ZWxfZ3VjICpn dWMpOwogaW50IGludGVsX2d1Y19pbml0X2h3KHN0cnVjdCBpbnRlbF9ndWMgKmd1Yyk7CiBpbnQg aW50ZWxfZ3VjX3N1c3BlbmQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGlu dCBpbnRlbF9ndWNfcmVzdW1lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB1 MzIgaW50ZWxfZ3VjX3dvcGNtX3NpemUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KTsKIAogLyogaTkxNV9ndWNfc3VibWlzc2lvbi5jICovCit2b2lkIGludGVsX2d1Y19zYW5pdGl6 ZV9zdWJtaXNzaW9uKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiBpbnQgaTkx NV9ndWNfc3VibWlzc2lvbl9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7 CiBpbnQgaTkxNV9ndWNfc3VibWlzc2lvbl9lbmFibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KTsKIGludCBpOTE1X2d1Y193cV9yZXNlcnZlKHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcnEpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5j b3JlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwppbmRleCBhYTlkMzA2 Li43MDg0MDg4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwpAQCAtMTc2Miw4ICsx NzYyLDcgQEAgaW50IGludGVsX2d1Y19yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiB7CiAJaW50IHJldDsKIAotCWlmICghSEFTX0dVQyhkZXZfcHJpdikpCi0JCXJldHVy biAtRUlOVkFMOworCUdFTV9CVUdfT04oIUhBU19VQyhkZXZfcHJpdikpOwogCiAJaW50ZWxfdW5j b3JlX2ZvcmNld2FrZV9nZXQoZGV2X3ByaXYsIEZPUkNFV0FLRV9BTEwpOwogCXJldCA9IGdlbjZf aHdfZG9tYWluX3Jlc2V0KGRldl9wcml2LCBHRU45X0dSRE9NX0dVQyk7Ci0tIAoxLjkuMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==