From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 06/32] drm/i915: Tighten reset_counter for reset status Date: Wed, 16 Dec 2015 10:35:51 +0100 Message-ID: <20151216093551.GN30437@phenom.ffwll.local> References: <1449833608-22125-1-git-send-email-chris@chris-wilson.co.uk> <1449833608-22125-7-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by gabe.freedesktop.org (Postfix) with ESMTPS id ACA6F6E86C for ; Wed, 16 Dec 2015 01:35:54 -0800 (PST) Received: by mail-wm0-f44.google.com with SMTP id l126so30030952wml.0 for ; Wed, 16 Dec 2015 01:35:54 -0800 (PST) Content-Disposition: inline In-Reply-To: <1449833608-22125-7-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gRnJpLCBEZWMgMTEsIDIwMTUgYXQgMTE6MzM6MDJBTSArMDAwMCwgQ2hyaXMgV2lsc29uIHdy b3RlOgo+IEluIHRoZSByZXNldF9jb3VudGVyLCB3ZSB1c2UgdHdvIGJpdHMgdG8gdHJhY2sgYSBH UFUgaGFuZyBhbmQgcmVzZXQuIFRoZQo+IGxvdyBiaXQgaXMgYSAicmVzZXQtaW4tcHJvZ3Jlc3Mi IGZsYWcgdGhhdCB3ZSBzZXQgdG8gc2lnbmFsIHdoZW4gd2UgbmVlZAo+IHRvIGJyZWFrIHdhaXRl cnMgaW4gb3JkZXIgZm9yIHRoZSByZWNvdmVyeSB0YXNrIHRvIGdyYWIgdGhlIG11dGV4LiBBcwo+ IHNvb24gYXMgdGhlIHJlY292ZXJ5IHRhc2sgaGFzIHRoZSBtdXRleCwgd2UgY2FuIGNsZWFyIHRo YXQgZmxhZyAod2hpY2gKPiB3ZSBkbyBieSBpbmNyZW1lbnRpbmcgdGhlIHJlc2V0X2NvdW50ZXIg dGhlcmVieSBpbmNyZW1lbnRpbmcgdGhlIGdvYmFsCj4gcmVzZXQgZXBvY2gpLiBCeSBjbGVhcmlu ZyB0aGF0IGZsYWcgd2hlbiB0aGUgcmVjb3ZlcnkgdGFzayBob2xkcyB0aGUKPiBzdHJ1Y3RfbXV0 ZXgsIHdlIGNhbiBmb3JnbyBhIHNlY29uZCBmbGFnIHRoYXQgc2ltcGx5IHRlbGxzIEdFTSB0byBp Z25vcmUKPiB0aGUgInJlc2V0LWluLXByb2dyZXNzIiBmbGFnLgo+IAo+IFRoZSBzZWNvbmQgZmxh ZyB3ZSBzdG9yZSBpbiB0aGUgcmVzZXRfY291bnRlciBpcyB3aGV0aGVyIHRoZQo+IHJlc2V0IGZh aWxlZCBhbmQgd2UgY29uc2lkZXIgdGhlIEdQVSB0ZXJtaW5hbGx5IHdlZGdlZC4gV2hpbHN0IHRo aXMgZmxhZwo+IGlzIHNldCwgYWxsIGFjY2VzcyB0byB0aGUgR1BVIChhdCBsZWFzdCB0aHJvdWdo IEdFTSByYXRoZXIgdGhhbiBkaXJlY3QgbW1pbwo+IGFjY2VzcykgaXMgdmVyYm90ZW4uCj4gCj4g U2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Cj4g Q2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+CgpSZXZpZXdlZC1ieTog RGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KCj4gLS0tCj4gIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIHwgIDQgKystLQo+ICBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5jICAgICB8IDM5ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgfCAgMyAtLS0KPiAg ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgfCAyNyArKysrKysrKystLS0tLS0t LS0tLS0tLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgICAgIHwgMjEgKyst LS0tLS0tLS0tLS0tLS0tLS0KPiAgNSBmaWxlcyBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCA1 OCBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwo+IGluZGV4 IGMyNmE0YzA4N2Y0OS4uZDVmNjZiYmRiMTYwIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZGVidWdmcy5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMKPiBAQCAtNDY3Miw3ICs0NjcyLDcgQEAgaTkxNV93ZWRnZWRfZ2V0KHZvaWQgKmRh dGEsIHU2NCAqdmFsKQo+ICAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGRhdGE7Cj4gIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwo+ICAKPiAt CSp2YWwgPSBpOTE1X3Jlc2V0X2NvdW50ZXIoJmRldl9wcml2LT5ncHVfZXJyb3IpOwo+ICsJKnZh bCA9IGk5MTVfdGVybWluYWxseV93ZWRnZWQoJmRldl9wcml2LT5ncHVfZXJyb3IpOwo+ICAKPiAg CXJldHVybiAwOwo+ICB9Cj4gQEAgLTQ2OTEsNyArNDY5MSw3IEBAIGk5MTVfd2VkZ2VkX3NldCh2 b2lkICpkYXRhLCB1NjQgdmFsKQo+ICAJICogd2hpbGUgaXQgaXMgd3JpdGluZyB0byAnaTkxNV93 ZWRnZWQnCj4gIAkgKi8KPiAgCj4gLQlpZiAoaTkxNV9yZXNldF9pbl9wcm9ncmVzc19vcl93ZWRn ZWQoJmRldl9wcml2LT5ncHVfZXJyb3IpKQo+ICsJaWYgKGk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3Mo JmRldl9wcml2LT5ncHVfZXJyb3IpKQo+ICAJCXJldHVybiAtRUFHQUlOOwo+ICAKPiAgCWludGVs X3J1bnRpbWVfcG1fZ2V0KGRldl9wcml2KTsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKPiBpbmRl eCA4ZGRmY2NlOTJjZjEuLjhiZGM1MWJjMDBhNCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu Ywo+IEBAIC04NTgsMjMgKzg1OCwzMiBAQCBpbnQgaTkxNV9yZXN1bWVfc3dpdGNoZXJvbyhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQo+ICBpbnQgaTkxNV9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQo+ICB7Cj4gIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRl dl9wcml2YXRlOwo+IC0JYm9vbCBzaW11bGF0ZWQ7Cj4gKwlzdHJ1Y3QgaTkxNV9ncHVfZXJyb3Ig KmVycm9yID0gJmRldl9wcml2LT5ncHVfZXJyb3I7Cj4gKwl1bnNpZ25lZCByZXNldF9jb3VudGVy Owo+ICAJaW50IHJldDsKPiAgCj4gIAlpbnRlbF9yZXNldF9ndF9wb3dlcnNhdmUoZGV2KTsKPiAg Cj4gIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Cj4gIAo+IC0JaTkxNV9nZW1fcmVz ZXQoZGV2KTsKPiArCS8qIENsZWFyIGFueSBwcmV2aW91cyBmYWlsZWQgYXR0ZW1wdHMgYXQgcmVj b3ZlcnkuIFRpbWUgdG8gdHJ5IGFnYWluLiAqLwo+ICsJYXRvbWljX2FuZG5vdChJOTE1X1dFREdF RCwgJmVycm9yLT5yZXNldF9jb3VudGVyKTsKPiAgCj4gLQlzaW11bGF0ZWQgPSBkZXZfcHJpdi0+ Z3B1X2Vycm9yLnN0b3BfcmluZ3MgIT0gMDsKPiArCS8qIENsZWFyIHRoZSByZXNldC1pbi1wcm9n cmVzcyBmbGFnIGFuZCBpbmNyZW1lbnQgdGhlIHJlc2V0IGVwb2NoLiAqLwo+ICsJcmVzZXRfY291 bnRlciA9IGF0b21pY19pbmNfcmV0dXJuKCZlcnJvci0+cmVzZXRfY291bnRlcik7Cj4gKwlpZiAo V0FSTl9PTihfX2k5MTVfcmVzZXRfaW5fcHJvZ3Jlc3MocmVzZXRfY291bnRlcikpKSB7Cj4gKwkJ cmV0ID0gLUVJTzsKPiArCQlnb3RvIGVycm9yOwo+ICsJfQo+ICsKPiArCWk5MTVfZ2VtX3Jlc2V0 KGRldik7Cj4gIAo+ICAJcmV0ID0gaW50ZWxfZ3B1X3Jlc2V0KGRldik7Cj4gIAo+ICAJLyogQWxz byByZXNldCB0aGUgZ3B1IGhhbmdtYW4uICovCj4gLQlpZiAoc2ltdWxhdGVkKSB7Cj4gKwlpZiAo ZXJyb3ItPnN0b3BfcmluZ3MgIT0gMCkgewo+ICAJCURSTV9JTkZPKCJTaW11bGF0ZWQgZ3B1IGhh bmcsIHJlc2V0dGluZyBzdG9wX3JpbmdzXG4iKTsKPiAtCQlkZXZfcHJpdi0+Z3B1X2Vycm9yLnN0 b3BfcmluZ3MgPSAwOwo+ICsJCWVycm9yLT5zdG9wX3JpbmdzID0gMDsKPiAgCQlpZiAocmV0ID09 IC1FTk9ERVYpIHsKPiAgCQkJRFJNX0lORk8oIlJlc2V0IG5vdCBpbXBsZW1lbnRlZCwgYnV0IGln bm9yaW5nICIKPiAgCQkJCSAiZXJyb3IgZm9yIHNpbXVsYXRlZCBncHUgaGFuZ3NcbiIpOwo+IEBA IC04ODcsOCArODk2LDcgQEAgaW50IGk5MTVfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikK PiAgCj4gIAlpZiAocmV0KSB7Cj4gIAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gcmVzZXQgY2hpcDog JWlcbiIsIHJldCk7Cj4gLQkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Cj4gLQkJ cmV0dXJuIHJldDsKPiArCQlnb3RvIGVycm9yOwo+ICAJfQo+ICAKPiAgCWludGVsX292ZXJsYXlf cmVzZXQoZGV2X3ByaXYpOwo+IEBAIC05MDcsMjAgKzkxNSwxNCBAQCBpbnQgaTkxNV9yZXNldChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAJICogd2FzIHJ1bm5pbmcgYXQgdGhlIHRpbWUgb2Yg dGhlIHJlc2V0IChpLmUuIHdlIHdlcmVuJ3QgVlQKPiAgCSAqIHN3aXRjaGVkIGF3YXkpLgo+ICAJ ICovCj4gLQo+IC0JLyogVXNlZCB0byBwcmV2ZW50IGdlbV9jaGVja193ZWRnZWQgcmV0dXJuaW5n IC1FQUdBSU4gZHVyaW5nIGdwdSByZXNldCAqLwo+IC0JZGV2X3ByaXYtPmdwdV9lcnJvci5yZWxv YWRfaW5fcmVzZXQgPSB0cnVlOwo+IC0KPiAgCXJldCA9IGk5MTVfZ2VtX2luaXRfaHcoZGV2KTsK PiAtCj4gLQlkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlbG9hZF9pbl9yZXNldCA9IGZhbHNlOwo+IC0K PiAtCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwo+ICAJaWYgKHJldCkgewo+ICAJ CURSTV9FUlJPUigiRmFpbGVkIGh3IGluaXQgb24gcmVzZXQgJWRcbiIsIHJldCk7Cj4gLQkJcmV0 dXJuIHJldDsKPiArCQlnb3RvIGVycm9yOwo+ICAJfQo+ICAKPiArCW11dGV4X3VubG9jaygmZGV2 LT5zdHJ1Y3RfbXV0ZXgpOwo+ICsKPiAgCS8qCj4gIAkgKiBycHMvcmM2IHJlLWluaXQgaXMgbmVj ZXNzYXJ5IHRvIHJlc3RvcmUgc3RhdGUgbG9zdCBhZnRlciB0aGUKPiAgCSAqIHJlc2V0IGFuZCB0 aGUgcmUtaW5zdGFsbCBvZiBndCBpcnFzLiBTa2lwIGZvciBpcm9ubGFrZSBwZXIKPiBAQCAtOTMx LDYgKzkzMywxMSBAQCBpbnQgaTkxNV9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAJ CWludGVsX2VuYWJsZV9ndF9wb3dlcnNhdmUoZGV2KTsKPiAgCj4gIAlyZXR1cm4gMDsKPiArCj4g K2Vycm9yOgo+ICsJYXRvbWljX29yKEk5MTVfV0VER0VELCAmZXJyb3ItPnJlc2V0X2NvdW50ZXIp Owo+ICsJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Cj4gKwlyZXR1cm4gcmV0Owo+ ICB9Cj4gIAo+ICBzdGF0aWMgaW50IGk5MTVfcGNpX3Byb2JlKHN0cnVjdCBwY2lfZGV2ICpwZGV2 LCBjb25zdCBzdHJ1Y3QgcGNpX2RldmljZV9pZCAqZW50KQo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aAo+IGluZGV4IDQ2NmNhYTBiYzA0My4uMTA0M2RkZDY3MGE1IDEwMDY0NAo+IC0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCj4gQEAgLTEzODQsOSArMTM4NCw2IEBAIHN0cnVjdCBpOTE1X2dwdV9lcnJvciB7 Cj4gIAo+ICAJLyogRm9yIG1pc3NlZCBpcnEvc2Vxbm8gc2ltdWxhdGlvbi4gKi8KPiAgCXVuc2ln bmVkIGludCB0ZXN0X2lycV9yaW5nczsKPiAtCj4gLQkvKiBVc2VkIHRvIHByZXZlbnQgZ2VtX2No ZWNrX3dlZGdlZCByZXR1cm5pbmcgLUVBR0FJTiBkdXJpbmcgZ3B1IHJlc2V0ICAgKi8KPiAtCWJv b2wgcmVsb2FkX2luX3Jlc2V0Owo+ICB9Owo+ICAKPiAgZW51bSBtb2Rlc2V0X3Jlc3RvcmUgewo+ IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+IGluZGV4IDBiM2UwNTM0YmFhMy4uMjdlNjE3Yjc2NDE4 IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKPiArKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gQEAgLTg1LDkgKzg1LDcgQEAgaTkxNV9n ZW1fd2FpdF9mb3JfZXJyb3Ioc3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvcikKPiAgewo+ICAJ aW50IHJldDsKPiAgCj4gLSNkZWZpbmUgRVhJVF9DT05EICghaTkxNV9yZXNldF9pbl9wcm9ncmVz c19vcl93ZWRnZWQoZXJyb3IpIHx8IFwKPiAtCQkgICBpOTE1X3Rlcm1pbmFsbHlfd2VkZ2VkKGVy cm9yKSkKPiAtCWlmIChFWElUX0NPTkQpCj4gKwlpZiAoIWk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3Mo ZXJyb3IpKQo+ICAJCXJldHVybiAwOwo+ICAKPiAgCS8qCj4gQEAgLTk2LDE3ICs5NCwxNiBAQCBp OTE1X2dlbV93YWl0X2Zvcl9lcnJvcihzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yKQo+ICAJ ICogd2Ugc2hvdWxkIHNpbXBseSB0cnkgdG8gYmFpbCBvdXQgYW5kIGZhaWwgYXMgZ3JhY2VmdWxs eSBhcyBwb3NzaWJsZS4KPiAgCSAqLwo+ICAJcmV0ID0gd2FpdF9ldmVudF9pbnRlcnJ1cHRpYmxl X3RpbWVvdXQoZXJyb3ItPnJlc2V0X3F1ZXVlLAo+IC0JCQkJCSAgICAgICBFWElUX0NPTkQsCj4g KwkJCQkJICAgICAgICFpOTE1X3Jlc2V0X2luX3Byb2dyZXNzKGVycm9yKSwKPiAgCQkJCQkgICAg ICAgMTAqSFopOwo+ICAJaWYgKHJldCA9PSAwKSB7Cj4gIAkJRFJNX0VSUk9SKCJUaW1lZCBvdXQg d2FpdGluZyBmb3IgdGhlIGdwdSByZXNldCB0byBjb21wbGV0ZVxuIik7Cj4gIAkJcmV0dXJuIC1F SU87Cj4gIAl9IGVsc2UgaWYgKHJldCA8IDApIHsKPiAgCQlyZXR1cm4gcmV0Owo+ICsJfSBlbHNl IHsKPiArCQlyZXR1cm4gMDsKPiAgCX0KPiAtI3VuZGVmIEVYSVRfQ09ORAo+IC0KPiAtCXJldHVy biAwOwo+ICB9Cj4gIAo+ICBpbnQgaTkxNV9tdXRleF9sb2NrX2ludGVycnVwdGlibGUoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKPiBAQCAtMTExNCwyMiArMTExMSwxNiBAQCBpOTE1X2dlbV9jaGVj a193ZWRnZShzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yLAo+ICAJCSAgICAgYm9vbCBpbnRl cnJ1cHRpYmxlKQo+ICB7Cj4gIAlpZiAoaTkxNV9yZXNldF9pbl9wcm9ncmVzc19vcl93ZWRnZWQo ZXJyb3IpKSB7Cj4gKwkJLyogUmVjb3ZlcnkgY29tcGxldGUsIGJ1dCB0aGUgcmVzZXQgZmFpbGVk IC4uLiAqLwo+ICsJCWlmIChpOTE1X3Rlcm1pbmFsbHlfd2VkZ2VkKGVycm9yKSkKPiArCQkJcmV0 dXJuIC1FSU87Cj4gKwo+ICAJCS8qIE5vbi1pbnRlcnJ1cHRpYmxlIGNhbGxlcnMgY2FuJ3QgaGFu ZGxlIC1FQUdBSU4sIGhlbmNlIHJldHVybgo+ICAJCSAqIC1FSU8gdW5jb25kaXRpb25hbGx5IGZv ciB0aGVzZS4gKi8KPiAgCQlpZiAoIWludGVycnVwdGlibGUpCj4gIAkJCXJldHVybiAtRUlPOwo+ ICAKPiAtCQkvKiBSZWNvdmVyeSBjb21wbGV0ZSwgYnV0IHRoZSByZXNldCBmYWlsZWQgLi4uICov Cj4gLQkJaWYgKGk5MTVfdGVybWluYWxseV93ZWRnZWQoZXJyb3IpKQo+IC0JCQlyZXR1cm4gLUVJ TzsKPiAtCj4gLQkJLyoKPiAtCQkgKiBDaGVjayBpZiBHUFUgUmVzZXQgaXMgaW4gcHJvZ3Jlc3Mg LSB3ZSBuZWVkIGludGVsX3JpbmdfYmVnaW4KPiAtCQkgKiB0byB3b3JrIHByb3Blcmx5IHRvIHJl aW5pdCB0aGUgaHcgc3RhdGUgd2hpbGUgdGhlIGdwdSBpcwo+IC0JCSAqIHN0aWxsIG1hcmtlZCBh cyByZXNldC1pbi1wcm9ncmVzcy4gSGFuZGxlIHRoaXMgd2l0aCBhIGZsYWcuCj4gLQkJICovCj4g LQkJaWYgKCFlcnJvci0+cmVsb2FkX2luX3Jlc2V0KQo+IC0JCQlyZXR1cm4gLUVBR0FJTjsKPiAr CQlyZXR1cm4gLUVBR0FJTjsKPiAgCX0KPiAgCj4gIAlyZXR1cm4gMDsKPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfaXJxLmMKPiBpbmRleCA2MGRmZjNmODk1MzEuLjg4MjA2YzA0MDRkNyAxMDA2NDQKPiAtLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9pcnEuYwo+IEBAIC0yNDM0LDcgKzI0MzQsNiBAQCBzdGF0aWMgdm9pZCBpOTE1 X2Vycm9yX3dha2VfdXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+ICBzdGF0 aWMgdm9pZCBpOTE1X3Jlc2V0X2FuZF93YWtldXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAg ewo+ICAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwo+ IC0Jc3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvciA9ICZkZXZfcHJpdi0+Z3B1X2Vycm9yOwo+ ICAJY2hhciAqZXJyb3JfZXZlbnRbXSA9IHsgSTkxNV9FUlJPUl9VRVZFTlQgIj0xIiwgTlVMTCB9 Owo+ICAJY2hhciAqcmVzZXRfZXZlbnRbXSA9IHsgSTkxNV9SRVNFVF9VRVZFTlQgIj0xIiwgTlVM TCB9Owo+ICAJY2hhciAqcmVzZXRfZG9uZV9ldmVudFtdID0geyBJOTE1X0VSUk9SX1VFVkVOVCAi PTAiLCBOVUxMIH07Cj4gQEAgLTI0NTIsNyArMjQ1MSw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfcmVz ZXRfYW5kX3dha2V1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAJICogdGhlIHJlc2V0IGlu LXByb2dyZXNzIGJpdCBpcyBvbmx5IGV2ZXIgc2V0IGJ5IGNvZGUgb3V0c2lkZSBvZiB0aGlzCj4g IAkgKiB3b3JrIHdlIGRvbid0IG5lZWQgdG8gd29ycnkgYWJvdXQgYW55IG90aGVyIHJhY2VzLgo+ ICAJICovCj4gLQlpZiAoaTkxNV9yZXNldF9pbl9wcm9ncmVzc19vcl93ZWRnZWQoZXJyb3IpICYm ICFpOTE1X3Rlcm1pbmFsbHlfd2VkZ2VkKGVycm9yKSkgewo+ICsJaWYgKGk5MTVfcmVzZXRfaW5f cHJvZ3Jlc3MoJmRldl9wcml2LT5ncHVfZXJyb3IpKSB7Cj4gIAkJRFJNX0RFQlVHX0RSSVZFUigi cmVzZXR0aW5nIGNoaXBcbiIpOwo+ICAJCWtvYmplY3RfdWV2ZW50X2VudigmZGV2LT5wcmltYXJ5 LT5rZGV2LT5rb2JqLCBLT0JKX0NIQU5HRSwKPiAgCQkJCSAgIHJlc2V0X2V2ZW50KTsKPiBAQCAt MjQ4MCwyNSArMjQ3OSw5IEBAIHN0YXRpYyB2b2lkIGk5MTVfcmVzZXRfYW5kX3dha2V1cChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAKPiAgCQlpbnRlbF9ydW50aW1lX3BtX3B1dChkZXZfcHJp dik7Cj4gIAo+IC0JCWlmIChyZXQgPT0gMCkgewo+IC0JCQkvKgo+IC0JCQkgKiBBZnRlciBhbGwg dGhlIGdlbSBzdGF0ZSBpcyByZXNldCwgaW5jcmVtZW50IHRoZSByZXNldAo+IC0JCQkgKiBjb3Vu dGVyIGFuZCB3YWtlIHVwIGV2ZXJ5b25lIHdhaXRpbmcgZm9yIHRoZSByZXNldCB0bwo+IC0JCQkg KiBjb21wbGV0ZS4KPiAtCQkJICoKPiAtCQkJICogU2luY2UgdW5sb2NrIG9wZXJhdGlvbnMgYXJl IGEgb25lLXNpZGVkIGJhcnJpZXIgb25seSwKPiAtCQkJICogd2UgbmVlZCB0byBpbnNlcnQgYSBi YXJyaWVyIGhlcmUgdG8gb3JkZXIgYW55IHNlcW5vCj4gLQkJCSAqIHVwZGF0ZXMgYmVmb3JlCj4g LQkJCSAqIHRoZSBjb3VudGVyIGluY3JlbWVudC4KPiAtCQkJICovCj4gLQkJCXNtcF9tYl9fYmVm b3JlX2F0b21pYygpOwo+IC0JCQlhdG9taWNfaW5jKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0 X2NvdW50ZXIpOwo+IC0KPiArCQlpZiAocmV0ID09IDApCj4gIAkJCWtvYmplY3RfdWV2ZW50X2Vu digmZGV2LT5wcmltYXJ5LT5rZGV2LT5rb2JqLAo+ICAJCQkJCSAgIEtPQkpfQ0hBTkdFLCByZXNl dF9kb25lX2V2ZW50KTsKPiAtCQl9IGVsc2Ugewo+IC0JCQlhdG9taWNfb3IoSTkxNV9XRURHRUQs ICZlcnJvci0+cmVzZXRfY291bnRlcik7Cj4gLQkJfQo+ICAKPiAgCQkvKgo+ICAJCSAqIE5vdGU6 IFRoZSB3YWtlX3VwIGFsc28gc2VydmVzIGFzIGEgbWVtb3J5IGJhcnJpZXIgc28gdGhhdAo+IC0t IAo+IDIuNi4zCj4gCgotLSAKRGFuaWVsIFZldHRlcgpTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwg Q29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwuY2gKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK