From: Arkadiusz Hiler Subject: [PATCH 03/10] drm/i915/uc: Rename intel_?uc_{setup, load}() to _init_hw() Date: Tue, 7 Mar 2017 16:24:53 +0100 Message-ID: <20170307152500.6760-4-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 4AB896E71E for ; Tue, 7 Mar 2017 15:25:22 +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 R3VDIGhpc3RvcmljYWxseSBoYXMgdHdvICJzdGFydHVwIiBmdW5jdGlvbnMgY2FsbGVkIF9pbml0 KCkgYW5kIF9zZXR1cCgpCgpUaGVuIEh1QyBjYW1lIHdpdGggaXQncyBfaW5pdCgpIGFuZCBfbG9h ZCgpLgoKVGhpcyBjb21taXQgcmVuYW1lcyBpbnRlbF9ndWNfc2V0dXAoKSBhbmQgaW50ZWxfaHVj X2xvYWQoKSB0bwoqdWNfaW5pdF9odygpIGFzIHRoZXkgY2FsbGVkIGZyb20gdGhlIGk5MTVfZ2Vt X2luaXRfaHcoKS4KClRoZSBhaW0gaXMgdG8gYmUgY29uc2lzdGVudCBpbiB0aGF0IGVudHJ5IHBv aW50cyBjYWxsZWQgZHVyaW5nCnBhcnRpY3VsYXIgZHJpdmVyIGluaXQgcGhhc2VzIChlLmcuIGlu aXRfaHcpIGFyZSBhbGwgc3VmZml4ZWQgYnkgdGhhdApwaGFzZS4gV2hlbiByZWFkaW5nIHRoZSBs ZWFmIGZ1bmN0aW9ucywgaXQgc2hvdWxkIGJlIGNsZWFyIGF0IHdoYXQgc3RhZ2UKZHVyaW5nIHRo ZSBkcml2ZXIgbG9hZCBpdCBpcyBjYWxsZWQgYW5kIHRoZXJlZm9yZSB3aGF0IG9wZXJhdGlvbnMg YXJlCmxlZ2FsIGF0IHRoYXQgcG9pbnQuCgpBbHNvLCBzaW5jZSB0aGUgZnVuY3Rpb25zIHN0YXJ0 IHdpdGggaW50ZWxfZ3VjIGFuZCBpbnRlbF9odWMgdGhleSB0YWtlCmFwcHJvcGlhdGUgc3RydWN0 dXJlLgoKdjI6IGNvbW1pdCBtZXNzYWdlIHVwZGF0ZSAoQ2hyaXMgV2lsc29uKQp2MzogY2hhbmdl IHRha2VuIHBhcmFtZXRlcnMgdG8gYmUgbW9yZSAic2VtYW50aWMiIChNLiBXYWpkZWN6a28pCgpD YzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBNaWNoYWwgV2lu aWFyc2tpIDxtaWNoYWwud2luaWFyc2tpQGludGVsLmNvbT4KQ2M6IE1pY2hhbCBXYWpkZWN6a28g PG1pY2hhbC53YWpkZWN6a29AaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBcmthZGl1c3ogSGls ZXIgPGFya2FkaXVzei5oaWxlckBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBKb29uYXMgTGFodGlu ZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Y19sb2FkZXIuYyB8IDQ0ICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMgICAgICAgIHwgNDQgKysrKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5oICAg ICAgICAgfCAgNCArLS0KIDQgZmlsZXMgY2hhbmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgNDcgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggN2MyMDYwMS4uMmMzMDU3YyAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC00NDU0LDcgKzQ0NTQsNyBAQCBpbnQgaTkxNV9n ZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJaW50ZWxfbW9j c19pbml0X2wzY2NfdGFibGUoZGV2X3ByaXYpOwogCiAJLyogV2UgY2FuJ3QgZW5hYmxlIGNvbnRl eHRzIHVudGlsIGFsbCBmaXJtd2FyZSBpcyBsb2FkZWQgKi8KLQlyZXQgPSBpbnRlbF9ndWNfc2V0 dXAoZGV2X3ByaXYpOworCXJldCA9IGludGVsX2d1Y19pbml0X2h3KCZkZXZfcHJpdi0+Z3VjKTsK IAlpZiAocmV0KQogCQlnb3RvIG91dDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZ3VjX2xvYWRlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xv YWRlci5jCmluZGV4IDk4ODVmNzYuLmNmZmZhZmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWNfbG9hZGVyLmMKQEAgLTQyOCwyOCArNDI4LDI4IEBAIHN0YXRpYyBpbnQgZ3VjX2h3X3Jl c2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIH0KIAogLyoqCi0gKiBpbnRl bF9ndWNfc2V0dXAoKSAtIGZpbmlzaCBwcmVwYXJpbmcgdGhlIEd1QyBmb3IgYWN0aXZpdHkKLSAq IEBkZXZfcHJpdjoJaTkxNSBkZXZpY2UgcHJpdmF0ZQorICogaW50ZWxfZ3VjX2luaXRfaHcoKSAt IGZpbmlzaCBwcmVwYXJpbmcgdGhlIEd1QyBmb3IgYWN0aXZpdHkKKyAqIEBndWM6IGludGVsX2d1 YyBzdHJ1Y3R1cmUKICAqCi0gKiBDYWxsZWQgZnJvbSBnZW1faW5pdF9odygpIGR1cmluZyBkcml2 ZXIgbG9hZGluZyBhbmQgYWxzbyBhZnRlciBhIEdQVSByZXNldC4KKyAqIENhbGxlZCBkdXJpbmcg ZHJpdmVyIGxvYWRpbmcgYW5kIGFsc28gYWZ0ZXIgYSBHUFUgcmVzZXQuCiAgKgogICogVGhlIG1h aW4gYWN0aW9uIHJlcXVpcmVkIGhlcmUgaXQgdG8gbG9hZCB0aGUgR3VDIHVDb2RlIGludG8gdGhl IGRldmljZS4KICAqIFRoZSBmaXJtd2FyZSBpbWFnZSBzaG91bGQgaGF2ZSBhbHJlYWR5IGJlZW4g ZmV0Y2hlZCBpbnRvIG1lbW9yeSBieSB0aGUKLSAqIGVhcmxpZXIgY2FsbCB0byBpbnRlbF9ndWNf aW5pdCgpLCBzbyBoZXJlIHdlIG5lZWQgb25seSBjaGVjayB0aGF0IHdvcmtlZCwKLSAqIGFuZCB0 aGVuIHRyYW5zZmVyIHRoZSBpbWFnZSB0byB0aGUgaC93LgorICogZWFybGllciBjYWxsIHRvIGlu dGVsX2d1Y19pbml0KCksIHNvIGhlcmUgd2UgbmVlZCBvbmx5IGNoZWNrIHRoYXQKKyAqIHdvcmtl ZCwgYW5kIHRoZW4gdHJhbnNmZXIgdGhlIGltYWdlIHRvIHRoZSBoL3cuCiAgKgogICogUmV0dXJu Oglub24temVybyBjb2RlIG9uIGVycm9yCiAgKi8KLWludCBpbnRlbF9ndWNfc2V0dXAoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoraW50IGludGVsX2d1Y19pbml0X2h3KHN0cnVj dCBpbnRlbF9ndWMgKmd1YykKIHsKLQlzdHJ1Y3QgaW50ZWxfdWNfZncgKmd1Y19mdyA9ICZkZXZf cHJpdi0+Z3VjLmZ3OwotCWNvbnN0IGNoYXIgKmZ3X3BhdGggPSBndWNfZnctPnBhdGg7CisJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5MTUoZ3VjKTsKKwljb25z dCBjaGFyICpmd19wYXRoID0gZ3VjLT5mdy5wYXRoOwogCWludCByZXRyaWVzLCByZXQsIGVycjsK IAogCURSTV9ERUJVR19EUklWRVIoIkd1QyBmdyBzdGF0dXM6IHBhdGggJXMsIGZldGNoICVzLCBs b2FkICVzXG4iLAogCQlmd19wYXRoLAotCQlpbnRlbF91Y19md19zdGF0dXNfcmVwcihndWNfZnct PmZldGNoX3N0YXR1cyksCi0JCWludGVsX3VjX2Z3X3N0YXR1c19yZXByKGd1Y19mdy0+bG9hZF9z dGF0dXMpKTsKKwkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoZ3VjLT5mdy5mZXRjaF9zdGF0dXMp LAorCQlpbnRlbF91Y19md19zdGF0dXNfcmVwcihndWMtPmZ3LmxvYWRfc3RhdHVzKSk7CiAKIAkv KiBMb2FkaW5nIGZvcmJpZGRlbiwgb3Igbm8gZmlybXdhcmUgdG8gbG9hZD8gKi8KIAlpZiAoIWk5 MTUuZW5hYmxlX2d1Y19sb2FkaW5nKSB7CkBAIC00NjcsMTAgKzQ2NywxMCBAQCBpbnQgaW50ZWxf Z3VjX3NldHVwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAl9CiAKIAkvKiBG ZXRjaCBmYWlsZWQsIG9yIGFscmVhZHkgZmV0Y2hlZCBidXQgZmFpbGVkIHRvIGxvYWQ/ICovCi0J aWYgKGd1Y19mdy0+ZmV0Y2hfc3RhdHVzICE9IElOVEVMX1VDX0ZJUk1XQVJFX1NVQ0NFU1MpIHsK KwlpZiAoZ3VjLT5mdy5mZXRjaF9zdGF0dXMgIT0gSU5URUxfVUNfRklSTVdBUkVfU1VDQ0VTUykg ewogCQllcnIgPSAtRUlPOwogCQlnb3RvIGZhaWw7Ci0JfSBlbHNlIGlmIChndWNfZnctPmxvYWRf c3RhdHVzID09IElOVEVMX1VDX0ZJUk1XQVJFX0ZBSUwpIHsKKwl9IGVsc2UgaWYgKGd1Yy0+Zncu bG9hZF9zdGF0dXMgPT0gSU5URUxfVUNfRklSTVdBUkVfRkFJTCkgewogCQllcnIgPSAtRU5PRVhF QzsKIAkJZ290byBmYWlsOwogCX0KQEAgLTQ4MSwxMSArNDgxLDExIEBAIGludCBpbnRlbF9ndWNf c2V0dXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCS8qIFdlIG5lZWQgdG8g bm90aWZ5IHRoZSBndWMgd2hlbmV2ZXIgd2UgY2hhbmdlIHRoZSBHR1RUICovCiAJaTkxNV9nZ3R0 X2VuYWJsZV9ndWMoZGV2X3ByaXYpOwogCi0JZ3VjX2Z3LT5sb2FkX3N0YXR1cyA9IElOVEVMX1VD X0ZJUk1XQVJFX1BFTkRJTkc7CisJZ3VjLT5mdy5sb2FkX3N0YXR1cyA9IElOVEVMX1VDX0ZJUk1X QVJFX1BFTkRJTkc7CiAKIAlEUk1fREVCVUdfRFJJVkVSKCJHdUMgZncgc3RhdHVzOiBmZXRjaCAl cywgbG9hZCAlc1xuIiwKLQkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5mZXRjaF9z dGF0dXMpLAotCQlpbnRlbF91Y19md19zdGF0dXNfcmVwcihndWNfZnctPmxvYWRfc3RhdHVzKSk7 CisJCWludGVsX3VjX2Z3X3N0YXR1c19yZXByKGd1Yy0+ZncuZmV0Y2hfc3RhdHVzKSwKKwkJaW50 ZWxfdWNfZndfc3RhdHVzX3JlcHIoZ3VjLT5mdy5sb2FkX3N0YXR1cykpOwogCiAJZXJyID0gaTkx NV9ndWNfc3VibWlzc2lvbl9pbml0KGRldl9wcml2KTsKIAlpZiAoZXJyKQpAQCAtNTA2LDcgKzUw Niw3IEBAIGludCBpbnRlbF9ndWNfc2V0dXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogCQlpZiAoZXJyKQogCQkJZ290byBmYWlsOwogCi0JCWludGVsX2h1Y19sb2FkKGRldl9w cml2KTsKKwkJaW50ZWxfaHVjX2luaXRfaHcoJmRldl9wcml2LT5odWMpOwogCQllcnIgPSBndWNf dWNvZGVfeGZlcihkZXZfcHJpdik7CiAJCWlmICghZXJyKQogCQkJYnJlYWs7CkBAIC01MTgsNyAr NTE4LDcgQEAgaW50IGludGVsX2d1Y19zZXR1cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiAJCQkgInJldHJ5ICVkIG1vcmUgdGltZShzKVxuIiwgZXJyLCByZXRyaWVzKTsKIAl9 CiAKLQlndWNfZnctPmxvYWRfc3RhdHVzID0gSU5URUxfVUNfRklSTVdBUkVfU1VDQ0VTUzsKKwln dWMtPmZ3LmxvYWRfc3RhdHVzID0gSU5URUxfVUNfRklSTVdBUkVfU1VDQ0VTUzsKIAogCWludGVs X2d1Y19hdXRoX2h1YyhkZXZfcHJpdik7CiAKQEAgLTUzNCwxNCArNTM0LDE0IEBAIGludCBpbnRl bF9ndWNfc2V0dXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJRFJNX0lO Rk8oIkd1QyAlcyAoZmlybXdhcmUgJXMgW3ZlcnNpb24gJXUuJXVdKVxuIiwKIAkJIGk5MTUuZW5h YmxlX2d1Y19zdWJtaXNzaW9uID8gInN1Ym1pc3Npb24gZW5hYmxlZCIgOiAibG9hZGVkIiwKLQkJ IGd1Y19mdy0+cGF0aCwKLQkJIGd1Y19mdy0+bWFqb3JfdmVyX2ZvdW5kLCBndWNfZnctPm1pbm9y X3Zlcl9mb3VuZCk7CisJCSBndWMtPmZ3LnBhdGgsCisJCSBndWMtPmZ3Lm1ham9yX3Zlcl9mb3Vu ZCwgZ3VjLT5mdy5taW5vcl92ZXJfZm91bmQpOwogCiAJcmV0dXJuIDA7CiAKIGZhaWw6Ci0JaWYg KGd1Y19mdy0+bG9hZF9zdGF0dXMgPT0gSU5URUxfVUNfRklSTVdBUkVfUEVORElORykKLQkJZ3Vj X2Z3LT5sb2FkX3N0YXR1cyA9IElOVEVMX1VDX0ZJUk1XQVJFX0ZBSUw7CisJaWYgKGd1Yy0+Zncu bG9hZF9zdGF0dXMgPT0gSU5URUxfVUNfRklSTVdBUkVfUEVORElORykKKwkJZ3VjLT5mdy5sb2Fk X3N0YXR1cyA9IElOVEVMX1VDX0ZJUk1XQVJFX0ZBSUw7CiAKIAlndWNfaW50ZXJydXB0c19yZWxl YXNlKGRldl9wcml2KTsKIAlpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoZGV2X3ByaXYpOwpA QCAtNzI5LDcgKzcyOSw3IEBAIHZvaWQgaW50ZWxfdWNfZndfZmV0Y2goc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAogICogQ2FsbGVkIGVhcmx5IGR1cmluZyBkcml2ZXIgbG9hZCwg YnV0IGFmdGVyIEdFTSBpcyBpbml0aWFsaXNlZC4KICAqCiAgKiBUaGUgZmlybXdhcmUgd2lsbCBi ZSB0cmFuc2ZlcnJlZCB0byB0aGUgR3VDJ3MgbWVtb3J5IGxhdGVyLAotICogd2hlbiBpbnRlbF9n dWNfc2V0dXAoKSBpcyBjYWxsZWQuCisgKiB3aGVuIGludGVsX2d1Y19pbml0X2h3KCkgaXMgY2Fs bGVkLgogICovCiB2b2lkIGludGVsX2d1Y19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKaW5kZXggZTY2MDEwOS4uZTQyMDIx ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKQEAgLTE1MCw3ICsxNTAsNyBAQCBzdGF0aWMg aW50IGh1Y191Y29kZV94ZmVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKICAq IGlzIG5vdCBjYXBhYmxlIG9yIGRyaXZlciB5ZXQgc3VwcG9ydCBpdC4gQW5kIHRoZXJlIHdpbGwg YmUgbm8gZXJyb3IgbWVzc2FnZQogICogZm9yIElOVEVMX1VDX0ZJUk1XQVJFX05PTkUgY2FzZXMu CiAgKgotICogVGhlIERNQS1jb3B5aW5nIHRvIEhXIGlzIGRvbmUgbGF0ZXIgd2hlbiBpbnRlbF9o dWNfbG9hZCgpIGlzIGNhbGxlZC4KKyAqIFRoZSBETUEtY29weWluZyB0byBIVyBpcyBkb25lIGxh dGVyIHdoZW4gaW50ZWxfaHVjX2luaXRfaHcoKSBpcyBjYWxsZWQuCiAgKi8KIHZvaWQgaW50ZWxf aHVjX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewpAQCAtMTkzLDgg KzE5Myw4IEBAIHZvaWQgaW50ZWxfaHVjX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogfQogCiAvKioKLSAqIGludGVsX2h1Y19sb2FkKCkgLSBsb2FkIEh1QyB1Q29kZSB0 byBkZXZpY2UKLSAqIEBkZXZfcHJpdjogdGhlIGRybV9pOTE1X3ByaXZhdGUgZGV2aWNlCisgKiBp bnRlbF9odWNfaW5pdF9odygpIC0gbG9hZCBIdUMgdUNvZGUgdG8gZGV2aWNlCisgKiBAaHVjOiBp bnRlbF9odWMgc3RydWN0dXJlCiAgKgogICogQ2FsbGVkIGZyb20gZ3VjX3NldHVwKCkgZHVyaW5n IGRyaXZlciBsb2FkaW5nIGFuZCBhbHNvIGFmdGVyIGEgR1BVIHJlc2V0LgogICogQmUgbm90ZSB0 aGF0IEh1QyBsb2FkaW5nIG11c3QgYmUgZG9uZSBiZWZvcmUgR3VDIGxvYWRpbmcuCkBAIC0yMDUs MjYgKzIwNSwyNiBAQCB2b2lkIGludGVsX2h1Y19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKICAqCiAgKiBSZXR1cm46CW5vbi16ZXJvIGNvZGUgb24gZXJyb3IKICAqLwot aW50IGludGVsX2h1Y19sb2FkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK2lu dCBpbnRlbF9odWNfaW5pdF9odyhzdHJ1Y3QgaW50ZWxfaHVjICpodWMpCiB7Ci0Jc3RydWN0IGlu dGVsX3VjX2Z3ICpodWNfZncgPSAmZGV2X3ByaXYtPmh1Yy5mdzsKKwlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSBodWNfdG9faTkxNShodWMpOwogCWludCBlcnI7CiAKLQlpZiAo aHVjX2Z3LT5mZXRjaF9zdGF0dXMgPT0gSU5URUxfVUNfRklSTVdBUkVfTk9ORSkKKwlpZiAoaHVj LT5mdy5mZXRjaF9zdGF0dXMgPT0gSU5URUxfVUNfRklSTVdBUkVfTk9ORSkKIAkJcmV0dXJuIDA7 CiAKIAlEUk1fREVCVUdfRFJJVkVSKCIlcyBmdyBzdGF0dXM6IGZldGNoICVzLCBsb2FkICVzXG4i LAotCQlodWNfZnctPnBhdGgsCi0JCWludGVsX3VjX2Z3X3N0YXR1c19yZXByKGh1Y19mdy0+ZmV0 Y2hfc3RhdHVzKSwKLQkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoaHVjX2Z3LT5sb2FkX3N0YXR1 cykpOworCQlodWMtPmZ3LnBhdGgsCisJCWludGVsX3VjX2Z3X3N0YXR1c19yZXByKGh1Yy0+Zncu ZmV0Y2hfc3RhdHVzKSwKKwkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoaHVjLT5mdy5sb2FkX3N0 YXR1cykpOwogCi0JaWYgKGh1Y19mdy0+ZmV0Y2hfc3RhdHVzID09IElOVEVMX1VDX0ZJUk1XQVJF X1NVQ0NFU1MgJiYKLQkgICAgaHVjX2Z3LT5sb2FkX3N0YXR1cyA9PSBJTlRFTF9VQ19GSVJNV0FS RV9GQUlMKQorCWlmIChodWMtPmZ3LmZldGNoX3N0YXR1cyA9PSBJTlRFTF9VQ19GSVJNV0FSRV9T VUNDRVNTICYmCisJICAgIGh1Yy0+ZncubG9hZF9zdGF0dXMgPT0gSU5URUxfVUNfRklSTVdBUkVf RkFJTCkKIAkJcmV0dXJuIC1FTk9FWEVDOwogCi0JaHVjX2Z3LT5sb2FkX3N0YXR1cyA9IElOVEVM X1VDX0ZJUk1XQVJFX1BFTkRJTkc7CisJaHVjLT5mdy5sb2FkX3N0YXR1cyA9IElOVEVMX1VDX0ZJ Uk1XQVJFX1BFTkRJTkc7CiAKLQlzd2l0Y2ggKGh1Y19mdy0+ZmV0Y2hfc3RhdHVzKSB7CisJc3dp dGNoIChodWMtPmZ3LmZldGNoX3N0YXR1cykgewogCWNhc2UgSU5URUxfVUNfRklSTVdBUkVfRkFJ TDoKIAkJLyogc29tZXRoaW5nIHdlbnQgd3JvbmcgOiggKi8KIAkJZXJyID0gLUVJTzsKQEAgLTIz NSw5ICsyMzUsOSBAQCBpbnQgaW50ZWxfaHVjX2xvYWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQogCWRlZmF1bHQ6CiAJCS8qICJjYW4ndCBoYXBwZW4iICovCiAJCVdBUk5fT05D RSgxLCAiSHVDIGZ3ICVzIGludmFsaWQgZmV0Y2hfc3RhdHVzICVzIFslZF1cbiIsCi0JCQlodWNf ZnctPnBhdGgsCi0JCQlpbnRlbF91Y19md19zdGF0dXNfcmVwcihodWNfZnctPmZldGNoX3N0YXR1 cyksCi0JCQlodWNfZnctPmZldGNoX3N0YXR1cyk7CisJCQlodWMtPmZ3LnBhdGgsCisJCQlpbnRl bF91Y19md19zdGF0dXNfcmVwcihodWMtPmZ3LmZldGNoX3N0YXR1cyksCisJCQlodWMtPmZ3LmZl dGNoX3N0YXR1cyk7CiAJCWVyciA9IC1FTlhJTzsKIAkJZ290byBmYWlsOwogCkBAIC0yNDksMTgg KzI0OSwxOCBAQCBpbnQgaW50ZWxfaHVjX2xvYWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogCWlmIChlcnIpCiAJCWdvdG8gZmFpbDsKIAotCWh1Y19mdy0+bG9hZF9zdGF0dXMg PSBJTlRFTF9VQ19GSVJNV0FSRV9TVUNDRVNTOworCWh1Yy0+ZncubG9hZF9zdGF0dXMgPSBJTlRF TF9VQ19GSVJNV0FSRV9TVUNDRVNTOwogCiAJRFJNX0RFQlVHX0RSSVZFUigiJXMgZncgc3RhdHVz OiBmZXRjaCAlcywgbG9hZCAlc1xuIiwKLQkJaHVjX2Z3LT5wYXRoLAotCQlpbnRlbF91Y19md19z dGF0dXNfcmVwcihodWNfZnctPmZldGNoX3N0YXR1cyksCi0JCWludGVsX3VjX2Z3X3N0YXR1c19y ZXByKGh1Y19mdy0+bG9hZF9zdGF0dXMpKTsKKwkJaHVjLT5mdy5wYXRoLAorCQlpbnRlbF91Y19m d19zdGF0dXNfcmVwcihodWMtPmZ3LmZldGNoX3N0YXR1cyksCisJCWludGVsX3VjX2Z3X3N0YXR1 c19yZXByKGh1Yy0+ZncubG9hZF9zdGF0dXMpKTsKIAogCXJldHVybiAwOwogCiBmYWlsOgotCWlm IChodWNfZnctPmxvYWRfc3RhdHVzID09IElOVEVMX1VDX0ZJUk1XQVJFX1BFTkRJTkcpCi0JCWh1 Y19mdy0+bG9hZF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9GQUlMOworCWlmIChodWMtPmZ3 LmxvYWRfc3RhdHVzID09IElOVEVMX1VDX0ZJUk1XQVJFX1BFTkRJTkcpCisJCWh1Yy0+ZncubG9h ZF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9GQUlMOwogCiAJRFJNX0VSUk9SKCJGYWlsZWQg dG8gY29tcGxldGUgSHVDIHVDb2RlIGxvYWQgd2l0aCByZXQgJWRcbiIsIGVycik7CiAKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF91Yy5oCmluZGV4IGJmNzIzNDIuLjdiOTA0MTQgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfdWMuaApAQCAtMTkwLDcgKzE5MCw3IEBAIGludCBpbnRlbF9ndWNfc2FtcGxlX2ZvcmNld2Fr ZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpOwogCiAvKiBpbnRlbF9ndWNfbG9hZGVyLmMgKi8KIHZv aWQgaW50ZWxfZ3VjX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKLWlu dCBpbnRlbF9ndWNfc2V0dXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKK2lu dCBpbnRlbF9ndWNfaW5pdF9odyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpOwogdm9pZCBpbnRlbF9n dWNfZmluaShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogY29uc3QgY2hhciAq aW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoZW51bSBpbnRlbF91Y19md19zdGF0dXMgc3RhdHVzKTsK IGludCBpbnRlbF9ndWNfc3VzcGVuZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp OwpAQCAtMjI1LDcgKzIyNSw3IEBAIHN0YXRpYyBpbmxpbmUgdTMyIGd1Y19nZ3R0X29mZnNldChz dHJ1Y3QgaTkxNV92bWEgKnZtYSkKIC8qIGludGVsX2h1Yy5jICovCiB2b2lkIGludGVsX2h1Y19p bml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGludGVsX2h1Y19m aW5pKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICAqZGV2X3ByaXYpOwotaW50IGludGVsX2h1Y19s b2FkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CitpbnQgaW50ZWxfaHVjX2lu aXRfaHcoc3RydWN0IGludGVsX2h1YyAqaHVjKTsKIHZvaWQgaW50ZWxfZ3VjX2F1dGhfaHVjKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiAKICNlbmRpZgotLSAKMi45LjMKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=