From: Arkadiusz Hiler Subject: [PATCH 07/10] drm/i915/guc: Simplify intel_guc_init_hw() Date: Tue, 7 Mar 2017 16:24:57 +0100 Message-ID: <20170307152500.6760-8-arkadiusz.hiler@intel.com> References: <20170307152500.6760-1-arkadiusz.hiler@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id C12366E72F for ; Tue, 7 Mar 2017 15:25:32 +0000 (UTC) In-Reply-To: <20170307152500.6760-1-arkadiusz.hiler@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 Q3VycmVudCB2ZXJzaW9uIG9mIGludGVsX2d1Y19pbml0X2h3KCkgZG9lcyBhIGxvdDoKIC0gY2Fy ZXMgYWJvdXQgc3VibWlzc2lvbgogLSBsb2FkcyBodWMKIC0gaW1wbGVtZW50IFdBCgpUaGlzIGNo YW5nZSBvZmZsb2FkcyBzb21lIG9mIHRoZSBsb2dpYyB0byBpbnRlbF91Y19pbml0X2h3KCksIHdo aWNoIG5vdwpjYXJlcyBhYm91dCB0aGUgYWJvdmUuCgp2MjogcmVuYW1lIGd1Y19od19yZXNldCBh bmQgZml4IHR5cG8gaW4gZGVmaW5lIG5hbWUgKE0uIFdhamRlY3prbykKdjM6IHJlbmFtZSBvbmNl IGFnYWluCnY0OiByZW1vdmUgc3B1cmlvdXMgY29tbWVudHMgYW5kIGFkZCBzb21lIHN0eWxlIChK LiBMYWh0aW5lbikKdjU6IGZsb3cgY2hhbmdlcywgZ290IHJpZCBvZiBkZWFkIGNoZWNrcyAoTS4g V2FqZGVjemtvKQoKQ2M6IEFudXNoYSBTcml2YXRzYSA8YW51c2hhLnNyaXZhdHNhQGludGVsLmNv bT4KQ2M6IE1pY2hhbCBXaW5pYXJza2kgPG1pY2hhbC53aW5pYXJza2lAaW50ZWwuY29tPgpDYzog TWljaGFsIFdhamRlY3prbyA8bWljaGFsLndhamRlY3prb0BpbnRlbC5jb20+CkNjOiBEYW5pZWxl IENlcmFvbG8gU3B1cmlvIDxkYW5pZWxlLmNlcmFvbG9zcHVyaW9AaW50ZWwuY29tPgpDYzogSm9v bmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpTaWduZWQtb2Zm LWJ5OiBBcmthZGl1c3ogSGlsZXIgPGFya2FkaXVzei5oaWxlckBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgIHwgICAyICstCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgfCAxNDcgKysrLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMgICAgICAgICB8IDEx NCArKysrKysrKysrKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91 Yy5oICAgICAgICAgfCAgIDMgKwogNCBmaWxlcyBjaGFuZ2VkLCAxMzAgaW5zZXJ0aW9ucygrKSwg MTM2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDJjMzA1N2MuLmVm OWY4ZTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDQ1NCw3ICs0NDU0LDcgQEAgaW50 IGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWlu dGVsX21vY3NfaW5pdF9sM2NjX3RhYmxlKGRldl9wcml2KTsKIAogCS8qIFdlIGNhbid0IGVuYWJs ZSBjb250ZXh0cyB1bnRpbCBhbGwgZmlybXdhcmUgaXMgbG9hZGVkICovCi0JcmV0ID0gaW50ZWxf Z3VjX2luaXRfaHcoJmRldl9wcml2LT5ndWMpOworCXJldCA9IGludGVsX3VjX2luaXRfaHcoZGV2 X3ByaXYpOwogCWlmIChyZXQpCiAJCWdvdG8gb3V0OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWNfbG9hZGVyLmMKaW5kZXggMjc2MWE3Ni4uZjYzZTdlOCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Y19sb2FkZXIuYwpAQCAtOTAsNyArOTAsNyBAQCBjb25zdCBjaGFyICppbnRl bF91Y19md19zdGF0dXNfcmVwcihlbnVtIGludGVsX3VjX2Z3X3N0YXR1cyBzdGF0dXMpCiAJfQog fTsKIAotc3RhdGljIHZvaWQgZ3VjX2ludGVycnVwdHNfcmVsZWFzZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCit2b2lkIGludGVsX2d1Y19yZWxlYXNlX2ludGVycnVwdHMoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZTsKIAllbnVtIGludGVsX2VuZ2luZV9pZCBpZDsKQEAgLTEwOCw3ICsxMDgsNyBA QCBzdGF0aWMgdm9pZCBndWNfaW50ZXJydXB0c19yZWxlYXNlKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIAlJOTE1X1dSSVRFKEdVQ19XRF9WRUNTX0lFUiwgMCk7CiB9CiAKLXN0 YXRpYyB2b2lkIGd1Y19pbnRlcnJ1cHRzX2NhcHR1cmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQordm9pZCBpbnRlbF9ndWNfY2FwdHVyZV9pbnRlcnJ1cHRzKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmU7CiAJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CkBAIC00MDgsMjQgKzQwOCw2IEBAIHN0YXRp YyBpbnQgZ3VjX3Vjb2RlX3hmZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyBpbnQgZ3VjX2h3X3Jlc2V0KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKLXsKLQlpbnQgcmV0OwotCXUzMiBndWNfc3RhdHVzOwotCi0J cmV0ID0gaW50ZWxfZ3VjX3Jlc2V0KGRldl9wcml2KTsKLQlpZiAocmV0KSB7Ci0JCURSTV9FUlJP UigiR3VDIHJlc2V0IGZhaWxlZCwgcmV0ID0gJWRcbiIsIHJldCk7Ci0JCXJldHVybiByZXQ7Ci0J fQotCi0JZ3VjX3N0YXR1cyA9IEk5MTVfUkVBRChHVUNfU1RBVFVTKTsKLQlXQVJOKCEoZ3VjX3N0 YXR1cyAmIEdTX01JQV9JTl9SRVNFVCksCi0JICAgICAiR3VDIHN0YXR1czogMHgleCwgTUlBIGNv cmUgZXhwZWN0ZWQgdG8gYmUgaW4gcmVzZXRcbiIsIGd1Y19zdGF0dXMpOwotCi0JcmV0dXJuIHJl dDsKLX0KLQogLyoqCiAgKiBpbnRlbF9ndWNfaW5pdF9odygpIC0gZmluaXNoIHByZXBhcmluZyB0 aGUgR3VDIGZvciBhY3Rpdml0eQogICogQGd1YzogaW50ZWxfZ3VjIHN0cnVjdHVyZQpAQCAtNDQz LDQyICs0MjUsMjIgQEAgaW50IGludGVsX2d1Y19pbml0X2h3KHN0cnVjdCBpbnRlbF9ndWMgKmd1 YykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBndWNfdG9faTkxNShn dWMpOwogCWNvbnN0IGNoYXIgKmZ3X3BhdGggPSBndWMtPmZ3LnBhdGg7Ci0JaW50IHJldHJpZXMs IHJldCwgZXJyOworCWludCByZXQ7CiAKIAlEUk1fREVCVUdfRFJJVkVSKCJHdUMgZncgc3RhdHVz OiBwYXRoICVzLCBmZXRjaCAlcywgbG9hZCAlc1xuIiwKIAkJZndfcGF0aCwKIAkJaW50ZWxfdWNf Zndfc3RhdHVzX3JlcHIoZ3VjLT5mdy5mZXRjaF9zdGF0dXMpLAogCQlpbnRlbF91Y19md19zdGF0 dXNfcmVwcihndWMtPmZ3LmxvYWRfc3RhdHVzKSk7CiAKLQkvKiBMb2FkaW5nIGZvcmJpZGRlbiwg b3Igbm8gZmlybXdhcmUgdG8gbG9hZD8gKi8KLQlpZiAoIWk5MTUuZW5hYmxlX2d1Y19sb2FkaW5n KSB7Ci0JCWVyciA9IDA7Ci0JCWdvdG8gZmFpbDsKLQl9IGVsc2UgaWYgKGZ3X3BhdGggPT0gTlVM TCkgewotCQkvKiBEZXZpY2UgaXMga25vd24gdG8gaGF2ZSBubyB1Q29kZSAoZS5nLiBubyBHdUMp ICovCi0JCWVyciA9IC1FTlhJTzsKLQkJZ290byBmYWlsOworCWlmICghZndfcGF0aCkgeworCQly ZXR1cm4gLUVOWElPOwogCX0gZWxzZSBpZiAoKmZ3X3BhdGggPT0gJ1wwJykgewotCQkvKiBEZXZp Y2UgaGFzIGEgR3VDIGJ1dCB3ZSBkb24ndCBrbm93IHdoYXQgZi93IHRvIGxvYWQ/ICovCiAJCVdB Uk4oMSwgIk5vIEd1QyBmaXJtd2FyZSBrbm93biBmb3IgdGhpcyBwbGF0Zm9ybSFcbiIpOwotCQll cnIgPSAtRU5PREVWOwotCQlnb3RvIGZhaWw7CisJCXJldHVybiAtRU5PREVWOwogCX0KIAotCS8q IEZldGNoIGZhaWxlZCwgb3IgYWxyZWFkeSBmZXRjaGVkIGJ1dCBmYWlsZWQgdG8gbG9hZD8gKi8K LQlpZiAoZ3VjLT5mdy5mZXRjaF9zdGF0dXMgIT0gSU5URUxfVUNfRklSTVdBUkVfU1VDQ0VTUykg ewotCQllcnIgPSAtRUlPOwotCQlnb3RvIGZhaWw7Ci0JfSBlbHNlIGlmIChndWMtPmZ3LmxvYWRf c3RhdHVzID09IElOVEVMX1VDX0ZJUk1XQVJFX0ZBSUwpIHsKLQkJZXJyID0gLUVOT0VYRUM7Ci0J CWdvdG8gZmFpbDsKLQl9Ci0KLQlndWNfaW50ZXJydXB0c19yZWxlYXNlKGRldl9wcml2KTsKLQln ZW45X3Jlc2V0X2d1Y19pbnRlcnJ1cHRzKGRldl9wcml2KTsKLQotCS8qIFdlIG5lZWQgdG8gbm90 aWZ5IHRoZSBndWMgd2hlbmV2ZXIgd2UgY2hhbmdlIHRoZSBHR1RUICovCi0JaTkxNV9nZ3R0X2Vu YWJsZV9ndWMoZGV2X3ByaXYpOworCWlmIChndWMtPmZ3LmZldGNoX3N0YXR1cyAhPSBJTlRFTF9V Q19GSVJNV0FSRV9TVUNDRVNTKQorCQlyZXR1cm4gLUVJTzsKIAogCWd1Yy0+ZncubG9hZF9zdGF0 dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9QRU5ESU5HOwogCkBAIC00ODYsMTA0ICs0NDgsMTkgQEAg aW50IGludGVsX2d1Y19pbml0X2h3KHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAkJaW50ZWxfdWNf Zndfc3RhdHVzX3JlcHIoZ3VjLT5mdy5mZXRjaF9zdGF0dXMpLAogCQlpbnRlbF91Y19md19zdGF0 dXNfcmVwcihndWMtPmZ3LmxvYWRfc3RhdHVzKSk7CiAKLQllcnIgPSBpOTE1X2d1Y19zdWJtaXNz aW9uX2luaXQoZGV2X3ByaXYpOwotCWlmIChlcnIpCi0JCWdvdG8gZmFpbDsKKwlyZXQgPSBndWNf dWNvZGVfeGZlcihkZXZfcHJpdik7CiAKLQkvKgotCSAqIFdhRW5hYmxldUtlcm5lbEhlYWRlclZh bGlkRml4OnNrbCxieHQKLQkgKiBGb3IgQlhULCB0aGlzIGlzIG9ubHkgdXB0byBCMCBidXQgYmVs b3cgV0EgaXMgcmVxdWlyZWQgZm9yIGxhdGVyCi0JICogc3RlcHBpbmdzIGFsc28gc28gdGhpcyBp cyBleHRlbmRlZCBhcyB3ZWxsLgotCSAqLwotCS8qIFdhRW5hYmxlR3VDQm9vdEhhc2hDaGVja05v dFNldDpza2wsYnh0ICovCi0JZm9yIChyZXRyaWVzID0gMzsgOyApIHsKLQkJLyoKLQkJICogQWx3 YXlzIHJlc2V0IHRoZSBHdUMganVzdCBiZWZvcmUgKHJlKWxvYWRpbmcsIHNvCi0JCSAqIHRoYXQg dGhlIHN0YXRlIGFuZCB0aW1pbmcgYXJlIGZhaXJseSBwcmVkaWN0YWJsZQotCQkgKi8KLQkJZXJy ID0gZ3VjX2h3X3Jlc2V0KGRldl9wcml2KTsKLQkJaWYgKGVycikKLQkJCWdvdG8gZmFpbDsKLQot CQlpbnRlbF9odWNfaW5pdF9odygmZGV2X3ByaXYtPmh1Yyk7Ci0JCWVyciA9IGd1Y191Y29kZV94 ZmVyKGRldl9wcml2KTsKLQkJaWYgKCFlcnIpCi0JCQlicmVhazsKLQotCQlpZiAoLS1yZXRyaWVz ID09IDApCi0JCQlnb3RvIGZhaWw7Ci0KLQkJRFJNX0lORk8oIkd1QyBmdyBsb2FkIGZhaWxlZDog JWQ7IHdpbGwgcmVzZXQgYW5kICIKLQkJCSAicmV0cnkgJWQgbW9yZSB0aW1lKHMpXG4iLCBlcnIs IHJldHJpZXMpOwotCX0KKwlpZiAocmV0KQorCQlyZXR1cm4gLUVBR0FJTjsKIAogCWd1Yy0+Zncu bG9hZF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9TVUNDRVNTOwogCi0JaW50ZWxfZ3VjX2F1 dGhfaHVjKGRldl9wcml2KTsKLQotCWlmIChpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbikgewot CQlpZiAoaTkxNS5ndWNfbG9nX2xldmVsID49IDApCi0JCQlnZW45X2VuYWJsZV9ndWNfaW50ZXJy dXB0cyhkZXZfcHJpdik7Ci0KLQkJZXJyID0gaTkxNV9ndWNfc3VibWlzc2lvbl9lbmFibGUoZGV2 X3ByaXYpOwotCQlpZiAoZXJyKQotCQkJZ290byBmYWlsOwotCQlndWNfaW50ZXJydXB0c19jYXB0 dXJlKGRldl9wcml2KTsKLQl9Ci0KIAlEUk1fSU5GTygiR3VDICVzIChmaXJtd2FyZSAlcyBbdmVy c2lvbiAldS4ldV0pXG4iLAogCQkgaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24gPyAic3VibWlz c2lvbiBlbmFibGVkIiA6ICJsb2FkZWQiLAogCQkgZ3VjLT5mdy5wYXRoLAogCQkgZ3VjLT5mdy5t YWpvcl92ZXJfZm91bmQsIGd1Yy0+ZncubWlub3JfdmVyX2ZvdW5kKTsKIAogCXJldHVybiAwOwot Ci1mYWlsOgotCWlmIChndWMtPmZ3LmxvYWRfc3RhdHVzID09IElOVEVMX1VDX0ZJUk1XQVJFX1BF TkRJTkcpCi0JCWd1Yy0+ZncubG9hZF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9GQUlMOwot Ci0JZ3VjX2ludGVycnVwdHNfcmVsZWFzZShkZXZfcHJpdik7Ci0JaTkxNV9ndWNfc3VibWlzc2lv bl9kaXNhYmxlKGRldl9wcml2KTsKLQlpOTE1X2d1Y19zdWJtaXNzaW9uX2ZpbmkoZGV2X3ByaXYp OwotCWk5MTVfZ2d0dF9kaXNhYmxlX2d1YyhkZXZfcHJpdik7Ci0KLQkvKgotCSAqIFdlJ3ZlIGZh aWxlZCB0byBsb2FkIHRoZSBmaXJtd2FyZSA6KAotCSAqCi0JICogRGVjaWRlIHdoZXRoZXIgdG8g ZGlzYWJsZSBHdUMgc3VibWlzc2lvbiBhbmQgZmFsbCBiYWNrIHRvCi0JICogZXhlY2xpc3QgbW9k ZSwgYW5kIHdoZXRoZXIgdG8gaGlkZSB0aGUgZXJyb3IgYnkgcmV0dXJuaW5nCi0JICogemVybyBv ciB0byByZXR1cm4gLUVJTywgd2hpY2ggdGhlIGNhbGxlciB3aWxsIHRyZWF0IGFzIGEKLQkgKiBu b25mYXRhbCBlcnJvciAoaS5lLiBpdCBkb2Vzbid0IHByZXZlbnQgZHJpdmVyIGxvYWQsIGJ1dAot CSAqIG1hcmtzIHRoZSBHUFUgYXMgd2VkZ2VkIHVudGlsIHJlc2V0KS4KLQkgKi8KLQlpZiAoaTkx NS5lbmFibGVfZ3VjX2xvYWRpbmcgPiAxKSB7Ci0JCXJldCA9IC1FSU87Ci0JfSBlbHNlIGlmIChp OTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiA+IDEpIHsKLQkJcmV0ID0gLUVJTzsKLQl9IGVsc2Ug ewotCQlyZXQgPSAwOwotCX0KLQotCWlmIChlcnIgPT0gMCAmJiAhSEFTX0dVQ19VQ09ERShkZXZf cHJpdikpCi0JCTsJLyogRG9uJ3QgbWVudGlvbiB0aGUgR3VDISAqLwotCWVsc2UgaWYgKGVyciA9 PSAwKQotCQlEUk1fSU5GTygiR3VDIGZpcm13YXJlIGxvYWQgc2tpcHBlZFxuIik7Ci0JZWxzZSBp ZiAocmV0ICE9IC1FSU8pCi0JCURSTV9OT1RFKCJHdUMgZmlybXdhcmUgbG9hZCBmYWlsZWQ6ICVk XG4iLCBlcnIpOwotCWVsc2UKLQkJRFJNX1dBUk4oIkd1QyBmaXJtd2FyZSBsb2FkIGZhaWxlZDog JWRcbiIsIGVycik7Ci0KLQlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pIHsKLQkJaWYg KGZ3X3BhdGggPT0gTlVMTCkKLQkJCURSTV9JTkZPKCJHdUMgc3VibWlzc2lvbiB3aXRob3V0IGZp cm13YXJlIG5vdCBzdXBwb3J0ZWRcbiIpOwotCQlpZiAocmV0ID09IDApCi0JCQlEUk1fTk9URSgi RmFsbGluZyBiYWNrIGZyb20gR3VDIHN1Ym1pc3Npb24gdG8gZXhlY2xpc3QgbW9kZVxuIik7Ci0J CWVsc2UKLQkJCURSTV9FUlJPUigiR3VDIGluaXQgZmFpbGVkOiAlZFxuIiwgcmV0KTsKLQl9Ci0J aTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24gPSAwOwotCi0JcmV0dXJuIHJldDsKIH0KIAogCkBA IC02NDIsNyArNTE5LDcgQEAgdm9pZCBpbnRlbF9ndWNfZmluaShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAogCW11 dGV4X2xvY2soJmRldl9wcml2LT5kcm0uc3RydWN0X211dGV4KTsKLQlndWNfaW50ZXJydXB0c19y ZWxlYXNlKGRldl9wcml2KTsKKwlpbnRlbF9ndWNfcmVsZWFzZV9pbnRlcnJ1cHRzKGRldl9wcml2 KTsKIAlpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoZGV2X3ByaXYpOwogCWk5MTVfZ3VjX3N1 Ym1pc3Npb25fZmluaShkZXZfcHJpdik7CiAJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+ZHJtLnN0 cnVjdF9tdXRleCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYwppbmRleCBmMGE2OWQ0Li41OTg4ZjAw IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMKQEAgLTI2LDYgKzI2LDI3IEBACiAjaW5jbHVkZSAi aW50ZWxfdWMuaCIKICNpbmNsdWRlIDxsaW51eC9maXJtd2FyZS5oPgogCisvKiBSZXNldCBHdUMg cHJvdmlkaW5nIHVzIHdpdGggZnJlc2ggc3RhdGUgZm9yIGJvdGggR3VDIGFuZCBIdUMuCisgKi8K K3N0YXRpYyBpbnQgX19pbnRlbF91Y19yZXNldF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCit7CisJaW50IHJldDsKKwl1MzIgZ3VjX3N0YXR1czsKKworCXJldCA9IGludGVs X2d1Y19yZXNldChkZXZfcHJpdik7CisJaWYgKHJldCkgeworCQlEUk1fRVJST1IoIkd1QyByZXNl dCBmYWlsZWQsIHJldCA9ICVkXG4iLCByZXQpOworCQlyZXR1cm4gcmV0OworCX0KKworCWd1Y19z dGF0dXMgPSBJOTE1X1JFQUQoR1VDX1NUQVRVUyk7CisJV0FSTighKGd1Y19zdGF0dXMgJiBHU19N SUFfSU5fUkVTRVQpLAorCSAgICAgIkd1QyBzdGF0dXM6IDB4JXgsIE1JQSBjb3JlIGV4cGVjdGVk IHRvIGJlIGluIHJlc2V0XG4iLAorCSAgICAgZ3VjX3N0YXR1cyk7CisKKwlyZXR1cm4gcmV0Owor fQorCiB2b2lkIGludGVsX3VjX3Nhbml0aXplX29wdGlvbnMoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogewogCWlmICghSEFTX0dVQyhkZXZfcHJpdikpIHsKQEAgLTYzLDYgKzg0 LDk5IEBAIHZvaWQgaW50ZWxfdWNfaW5pdF9mdyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiAJaW50ZWxfZ3VjX2luaXRfZncoJmRldl9wcml2LT5ndWMpOwogfQogCitpbnQgaW50 ZWxfdWNfaW5pdF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJaW50 IHJldCwgYXR0ZW1wdHM7CisJY29uc3QgaW50IGd1Y193YV9oYXNoX2NoZWNrX25vdF9zZXRfYXR0 ZW1wdHMgPSAzOworCisKKwkvKiBHdUMgbm90IGVuYWJsZWQsIG5vdGhpbmcgdG8gZG8gKi8KKwlp ZiAoIWk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nKQorCQlyZXR1cm4gMDsKKworCWludGVsX2d1Y19y ZWxlYXNlX2ludGVycnVwdHMoZGV2X3ByaXYpOworCWdlbjlfcmVzZXRfZ3VjX2ludGVycnVwdHMo ZGV2X3ByaXYpOworCisJLyogV2UgbmVlZCB0byBub3RpZnkgdGhlIGd1YyB3aGVuZXZlciB3ZSBj aGFuZ2UgdGhlIEdHVFQgKi8KKwlpOTE1X2dndHRfZW5hYmxlX2d1YyhkZXZfcHJpdik7CisKKwlp ZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pIHsKKwkJcmV0ID0gaTkxNV9ndWNfc3VibWlz c2lvbl9pbml0KGRldl9wcml2KTsKKwkJaWYgKHJldCkKKwkJCWdvdG8gZmFpbDsKKwl9CisKKwkv KiBXYUVuYWJsZXVLZXJuZWxIZWFkZXJWYWxpZEZpeDpza2wgKi8KKwkvKiBXYUVuYWJsZUd1Q0Jv b3RIYXNoQ2hlY2tOb3RTZXQ6c2tsLGJ4dCxrYmwgKi8KKwlpZiAoSVNfR0VOOShkZXZfcHJpdikp CisJCWF0dGVtcHRzID0gZ3VjX3dhX2hhc2hfY2hlY2tfbm90X3NldF9hdHRlbXB0czsKKwllbHNl CisJCWF0dGVtcHRzID0gMTsKKworCXdoaWxlIChhdHRlbXB0cy0tKSB7CisJCS8qCisJCSAqIEFs d2F5cyByZXNldCB0aGUgR3VDIGp1c3QgYmVmb3JlIChyZSlsb2FkaW5nLCBzbworCQkgKiB0aGF0 IHRoZSBzdGF0ZSBhbmQgdGltaW5nIGFyZSBmYWlybHkgcHJlZGljdGFibGUKKwkJICovCisJCXJl dCA9IF9faW50ZWxfdWNfcmVzZXRfaHcoZGV2X3ByaXYpOworCQlpZiAocmV0KQorCQkJZ290byBm YWlsOworCisJCWludGVsX2h1Y19pbml0X2h3KCZkZXZfcHJpdi0+aHVjKTsKKwkJcmV0ID0gaW50 ZWxfZ3VjX2luaXRfaHcoJmRldl9wcml2LT5ndWMpOworCQlpZiAocmV0ID09IDAgfHwgcmV0ICE9 IC1FQUdBSU4pCisJCQlicmVhazsKKworCQlEUk1fSU5GTygiR3VDIGZ3IGxvYWQgZmFpbGVkOiAl ZDsgd2lsbCByZXNldCBhbmQgIgorCQkJICJyZXRyeSAlZCBtb3JlIHRpbWUocylcbiIsIHJldCwg YXR0ZW1wdHMpOworCX0KKworCS8qIERpZCB3ZSBzdWNjZWRlZCBvciBydW4gb3V0IG9mIHJldHJp ZXM/ICovCisJaWYgKHJldCkKKwkJZ290byBmYWlsOworCisJaW50ZWxfZ3VjX2F1dGhfaHVjKGRl dl9wcml2KTsKKwlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pIHsKKwkJaWYgKGk5MTUu Z3VjX2xvZ19sZXZlbCA+PSAwKQorCQkJZ2VuOV9lbmFibGVfZ3VjX2ludGVycnVwdHMoZGV2X3By aXYpOworCisJCXJldCA9IGk5MTVfZ3VjX3N1Ym1pc3Npb25fZW5hYmxlKGRldl9wcml2KTsKKwkJ aWYgKHJldCkKKwkJCWdvdG8gZmFpbDsKKwkJaW50ZWxfZ3VjX2NhcHR1cmVfaW50ZXJydXB0cyhk ZXZfcHJpdik7CisJfQorCisJcmV0dXJuIDA7CisKK2ZhaWw6CisJLyoKKwkgKiBXZSd2ZSBmYWls ZWQgdG8gbG9hZCB0aGUgZmlybXdhcmUgOigKKwkgKgorCSAqIERlY2lkZSB3aGV0aGVyIHRvIGRp c2FibGUgR3VDIHN1Ym1pc3Npb24gYW5kIGZhbGwgYmFjayB0bworCSAqIGV4ZWNsaXN0IG1vZGUs IGFuZCB3aGV0aGVyIHRvIGhpZGUgdGhlIGVycm9yIGJ5IHJldHVybmluZworCSAqIHplcm8gb3Ig dG8gcmV0dXJuIC1FSU8sIHdoaWNoIHRoZSBjYWxsZXIgd2lsbCB0cmVhdCBhcyBhCisJICogbm9u ZmF0YWwgZXJyb3IgKGkuZS4gaXQgZG9lc24ndCBwcmV2ZW50IGRyaXZlciBsb2FkLCBidXQKKwkg KiBtYXJrcyB0aGUgR1BVIGFzIHdlZGdlZCB1bnRpbCByZXNldCkuCisJICovCisJRFJNX0VSUk9S KCJHdUMgaW5pdCBmYWlsZWRcbiIpOworCWlmIChpOTE1LmVuYWJsZV9ndWNfbG9hZGluZyA+IDEg fHwgaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24gPiAxKQorCQlyZXQgPSAtRUlPOworCWVsc2UK KwkJcmV0ID0gMDsKKworCWlmIChpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbikgeworCQlpOTE1 LmVuYWJsZV9ndWNfc3VibWlzc2lvbiA9IDA7CisJCURSTV9OT1RFKCJGYWxsaW5nIGJhY2sgZnJv bSBHdUMgc3VibWlzc2lvbiB0byBleGVjbGlzdCBtb2RlXG4iKTsKKwl9CisKKwlpOTE1X2dndHRf ZGlzYWJsZV9ndWMoZGV2X3ByaXYpOworCWludGVsX2d1Y19yZWxlYXNlX2ludGVycnVwdHMoZGV2 X3ByaXYpOworCWk5MTVfZ3VjX3N1Ym1pc3Npb25fZGlzYWJsZShkZXZfcHJpdik7CisJaTkxNV9n dWNfc3VibWlzc2lvbl9maW5pKGRldl9wcml2KTsKKworCXJldHVybiByZXQ7Cit9CisKIC8qCiAg KiBSZWFkIEd1QyBjb21tYW5kL3N0YXR1cyByZWdpc3RlciAoU09GVF9TQ1JBVENIXzApCiAgKiBS ZXR1cm4gdHJ1ZSBpZiBpdCBjb250YWlucyBhIHJlc3BvbnNlIHJhdGhlciB0aGFuIGEgY29tbWFu ZApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3VjLmgKaW5kZXggYzUxNzllZi4uYTlhNDE4OCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF91Yy5oCkBAIC0xODcsNiArMTg3LDcgQEAgc3RydWN0IGludGVsX2h1YyB7CiB2 b2lkIGludGVsX3VjX3Nhbml0aXplX29wdGlvbnMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KTsKIHZvaWQgaW50ZWxfdWNfaW5pdF9lYXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpOwogdm9pZCBpbnRlbF91Y19pbml0X2Z3KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdik7CitpbnQgaW50ZWxfdWNfaW5pdF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpbnRlbF91Y19wcmVwYXJlX2Z3KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSBzdHJ1Y3QgaW50ZWxfdWNfZncgKnVjX2Z3KTsKIGlu dCBpbnRlbF9ndWNfc2VuZChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsIGNvbnN0IHUzMiAqYWN0aW9u LCB1MzIgbGVuKTsKQEAgLTE5OSw2ICsyMDAsOCBAQCB2b2lkIGludGVsX2d1Y19maW5pKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiBjb25zdCBjaGFyICppbnRlbF91Y19md19z dGF0dXNfcmVwcihlbnVtIGludGVsX3VjX2Z3X3N0YXR1cyBzdGF0dXMpOwogaW50IGludGVsX2d1 Y19zdXNwZW5kKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiBpbnQgaW50ZWxf Z3VjX3Jlc3VtZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwordm9pZCBpbnRl bF9ndWNfcmVsZWFzZV9pbnRlcnJ1cHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dik7Cit2b2lkIGludGVsX2d1Y19jYXB0dXJlX2ludGVycnVwdHMoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KTsKIHUzMiBpbnRlbF9ndWNfd29wY21fc2l6ZShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogCiAvKiBpOTE1X2d1Y19zdWJtaXNzaW9uLmMgKi8KLS0g CjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK