From: ville.syrjala@linux.intel.com Subject: [PATCH v2 1/5] drm/i915: Fix mmio vs. CS flip race on ILK+ Date: Tue, 15 Apr 2014 21:41:34 +0300 Message-ID: <1397587299-2476-2-git-send-email-ville.syrjala@linux.intel.com> References: <1397587299-2476-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 2AC156E94B for ; Tue, 15 Apr 2014 11:42:15 -0700 (PDT) In-Reply-To: <1397587299-2476-1-git-send-email-ville.syrjala@linux.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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClN0 YXJ0aW5nIGZyb20gSUxLLCBtbWlvIGZsaXBzIGFsc28gY2F1c2UgYSBmbGlwIGRvbmUgaW50ZXJy dXB0IHRvIGJlCnNpZ25hbGxlZC4gVGhpcyBtZWFucyBpZiB3ZSBmaXJzdCBkbyBhIHNldF9iYXNl IGFuZCBmb2xsb3cgaXQKaW1tZWRpYXRlbHkgd2l0aCB0aGUgQ1MgZmxpcCwgd2UgbWlnaHQgbWlz dGFrZSB0aGUgZmxpcCBkb25lIGludGVycnVwdApjYXVzZWQgYnkgdGhlIHNldF9iYXNlIGFzIHRo ZSBmbGlwIGRvbmUgaW50ZXJydXB0IGNhdXNlZCBieSB0aGUgQ1MKZmxpcC4KClRoZSBoYXJkd2Fy ZSBoYXMgYSBmbGlwIGNvdW50ZXIgd2hpY2ggaW5jcmVtZW50cyBldmVyeSB0aW1lIGEgbW1pbyBv cgpDUyBmbGlwIGlzIGlzc3VlZC4gSXQgYmFzaWNhbGx5IGNvdW50cyB0aGUgbnVtYmVyIG9mIERT UFNVUkYgcmVnaXN0ZXIKd3JpdGVzLiBUaGlzIG1lYW5zIHdlIGNhbiBzYW1wbGUgdGhlIGNvdW50 ZXIgYmVmb3JlIHdlIHB1dCB0aGUgQ1MKZmxpcCBpbnRvIHRoZSByaW5nLCBhbmQgdGhlbiB3aGVu IHdlIGdldCBhIGZsaXAgZG9uZSBpbnRlcnJ1cHQgd2UgY2FuCmNoZWNrIHdoZXRoZXIgdGhlIENT IGZsaXAgaGFzIGFjdHVhbGx5IHBlcmZvcm1lZCB0aGUgc3VyZmFjZSBhZGRyZXNzCnVwZGF0ZSwg b3IgaWYgdGhlIGludGVycnVwdCB3YXMgY2F1c2VkIGJ5IGEgcHJldmlvdXMgYnV0IHlldAp1bmZp bmlzaGVkIG1taW8gZmxpcC4KCkV2ZW4gd2l0aCB0aGUgZmxpcCBjb3VudGVyIHdlIHN0aWxsIGhh dmUgYSByYWNlIGNvbmRpdGlvbiBvZiB0aGUgQ1MgZmxpcApiYXNlIGFkZHJlc3MgdXBkYXRlIGhh cHBlbnMgYWZ0ZXIgdGhlIG1taW8gZmxpcCBkb25lIGludGVycnVwdCB3YXMKcmFpc2VkIGJ1dCBu b3QgeWV0IHByb2Nlc3NlZCBieSB0aGUgZHJpdmVyLiBXaGVuIHRoZSBpbnRlcnJ1cHQgaXMKZXZl bnR1YWxseSBwcm9jZXNzZWQsIHRoZSBmbGlwIGNvdW50ZXIgd2lsbCBhbHJlYWR5IGluZGljYXRl IHRoYXQgdGhlCkNTIGZsaXAgaGFzIGJlZW4gZXhlY3V0ZWQsIGJ1dCBpdCB3b3VsZCBub3QgYWN0 dWFsbHkgY29tcGxldGUgdW50aWwgdGhlCm5leHQgc3RhcnQgb2YgdmJsYW5rLiBXZSBjYW4gdXNl IHRoZSBEU1BTVVJGTElWRSByZWdpc3RlciB0byBjaGVjawp3aGV0aGVyIHRoZSBoYXJkd2FyZSBp cyBhY3R1YWxseSBzY2FubmluZyBvdXQgb2YgdGhlIGJ1ZmZlciB3ZSBleHBlY3QsCm9yIGlmIHdl IG1hbmFnZWQgaGl0IHRoaXMgcmFjZSB3aW5kb3cuCgpUaGlzIGNvdmVycyBhbGwgdGhlIGNhc2Vz IHdoZXJlIHRoZSBDUyBmbGlwIGFjdHVhbGx5IGNoYW5nZXMgdGhlIGJhc2UKYWRkcmVzcy4gSWYg dGhlIGJhc2UgYWRkcmVzcyByZW1haW5zIHVuY2hhbmdlZCwgd2UgbWlnaHQgc3RpbGwgY29tcGxl dGUKdGhlIENTIGZsaXAgYmVmb3JlIGl0IGhhcyBhY3R1YWxseSBjb21wbGV0ZWQuIEJ1dCBzaW5j ZSB0aGUgYWRkcmVzcwpkaWRuJ3QgY2hhbmdlIGFueXdheSwgdGhlIHByZW1hdHVyZSBmbGlwIGNv bXBsZXRpb24gY2FuJ3QgcmVzdWx0IGluCnVzZXJzcGFjZSBvdmVyd3JpdGluZyBkYXRhIHRoYXQn cyBzdGlsbCBiZWluZyBzY2FubmVkIG91dC4KCkNURyBhbHJlYWR5IGhhcyB0aGUgZmxpcCBjb3Vu dGVyIGFuZCBEU1BTVVJGTElWRSByZWdpc3RlcnMsIGFuZAphbHRob3VnaCB0aGUgZmxpcCBkb25l IGludGVycnVwdCBpcyBzdGlsbCBsaW1pdGVkIHRvIENTIGZsaXBzIGFsb25lLAp0aGUgY29kZSBu b3cgYWxzbyBjaGVja3MgdGhlIGZsaXAgY291bnRlciBvbiBDVEcgYXMgd2VsbC4KCnYyOiBzL2Rz cHN1cmYvZ3R0X29mZnNldC8gKENocmlzKQoKVGVzdGNhc2U6IGlndC9rbXNfbW1pb192c19jc19m bGlwL3NldGNydGNfdnNfY3NfZmxpcApCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9w Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzMwMjcKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOk IDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3JlZy5oICAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgfCA3MyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAyICsKIDMgZmlsZXMgY2hhbmdlZCwgNjkg aW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3JlZy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAppbmRl eCA4Zjg0NTU1Li5jMjgxNjljIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3JlZy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKQEAgLTM2MzgsNiAr MzYzOCw3IEBAIGVudW0gcHVuaXRfcG93ZXJfd2VsbCB7CiAjZGVmaW5lIF9QSVBFQV9GUk1DT1VO VF9HTTQ1CTB4NzAwNDAKICNkZWZpbmUgX1BJUEVBX0ZMSVBDT1VOVF9HTTQ1CTB4NzAwNDQKICNk ZWZpbmUgUElQRV9GUk1DT1VOVF9HTTQ1KHBpcGUpIF9QSVBFMihwaXBlLCBfUElQRUFfRlJNQ09V TlRfR000NSkKKyNkZWZpbmUgUElQRV9GTElQQ09VTlRfR000NShwaXBlKSBfUElQRTIocGlwZSwg X1BJUEVBX0ZMSVBDT1VOVF9HTTQ1KQogCiAvKiBDdXJzb3IgQSAmIEIgcmVncyAqLwogI2RlZmlu ZSBfQ1VSQUNOVFIJCShkZXZfcHJpdi0+aW5mby5kaXNwbGF5X21taW9fb2Zmc2V0ICsgMHg3MDA4 MCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAxMzkwYWI1Li4zMmM2YzE2 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC04NTc3LDYgKzg1NzcsNDgg QEAgdm9pZCBpbnRlbF9maW5pc2hfcGFnZV9mbGlwX3BsYW5lKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIGludCBwbGFuZSkKIAlkb19pbnRlbF9maW5pc2hfcGFnZV9mbGlwKGRldiwgY3J0Yyk7CiB9 CiAKKy8qIElzICdhJyBhZnRlciBvciBlcXVhbCB0byAnYic/ICovCitzdGF0aWMgYm9vbCBmbGlw X2NvdW50X2FmdGVyX2VxKHUzMiBhLCB1MzIgYikKK3sKKwlyZXR1cm4gISgoYSAtIGIpICYgMHg4 MDAwMDAwMCk7Cit9CisKK3N0YXRpYyBib29sIHBhZ2VfZmxpcF9maW5pc2hlZChzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YykKK3sKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5k ZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0 ZTsKKworCS8qCisJICogVGhlIHJlbGV2YW50IHJlZ2lzdGVycyBkb2VuJ3QgZXhpc3Qgb24gcHJl LWN0Zy4KKwkgKiBBcyB0aGUgZmxpcCBkb25lIGludGVycnVwdCBkb2Vzbid0IHRyaWdnZXIgZm9y IG1taW8KKwkgKiBmbGlwcyBvbiBnbWNoIHBsYXRmb3JtcywgYSBmbGlwIGNvdW50IGNoZWNrIGlz bid0CisJICogcmVhbGx5IG5lZWRlZCB0aGVyZS4gQnV0IHNpbmNlIGN0ZyBoYXMgdGhlIHJlZ2lz dGVycywKKwkgKiBpbmNsdWRlIGl0IGluIHRoZSBjaGVjayBhbnl3YXkuCisJICovCisJaWYgKElO VEVMX0lORk8oZGV2KS0+Z2VuIDwgNSAmJiAhSVNfRzRYKGRldikpCisJCXJldHVybiB0cnVlOwor CisJLyoKKwkgKiBBIERTUFNVUkZMSVZFIGNoZWNrIGlzbid0IGVub3VnaCBpbiBjYXNlIHRoZSBt bWlvIGFuZCBDUyBmbGlwcworCSAqIHVzZWQgdGhlIHNhbWUgYmFzZSBhZGRyZXNzLiBJbiB0aGF0 IGNhc2UgdGhlIG1taW8gZmxpcCBtaWdodAorCSAqIGhhdmUgY29tcGxldGVkLCBidXQgdGhlIENT IGhhc24ndCBldmVuIGV4ZWN1dGVkIHRoZSBmbGlwIHlldC4KKwkgKgorCSAqIEEgZmxpcCBjb3Vu dCBjaGVjayBpc24ndCBlbm91Z2ggYXMgdGhlIENTIG1pZ2h0IGhhdmUgdXBkYXRlZAorCSAqIHRo ZSBiYXNlIGFkZHJlc3MganVzdCBhZnRlciBzdGFydCBvZiB2YmxhbmssIGJ1dCBiZWZvcmUgd2UK KwkgKiBtYW5hZ2VkIHRvIHByb2Nlc3MgdGhlIGludGVycnVwdC4gVGhpcyBtZWFucyB3ZSdkIGNv bXBsZXRlIHRoZQorCSAqIENTIGZsaXAgdG9vIHNvb24uCisJICoKKwkgKiBDb21iaW5pbmcgYm90 aCBjaGVja3Mgc2hvdWxkIGdldCB1cyBhIGdvb2QgZW5vdWdoIHJlc3VsdC4gSXQgbWF5CisJICog c3RpbGwgaGFwcGVuIHRoYXQgdGhlIENTIGZsaXAgaGFzIGJlZW4gZXhlY3V0ZWQsIGJ1dCBoYXMg bm90CisJICogeWV0IGFjdHVhbGx5IGNvbXBsZXRlZC4gQnV0IGluIGNhc2UgdGhlIGJhc2UgYWRk cmVzcyBpcyB0aGUgc2FtZQorCSAqIGFueXdheSwgd2UgZG9uJ3QgcmVhbGx5IGNhcmUuCisJICov CisJcmV0dXJuIChJOTE1X1JFQUQoRFNQU1VSRkxJVkUoY3J0Yy0+cGxhbmUpKSAmIH4weGZmZikg PT0KKwkJY3J0Yy0+dW5waW5fd29yay0+Z3R0X29mZnNldCAmJgorCQlmbGlwX2NvdW50X2FmdGVy X2VxKEk5MTVfUkVBRChQSVBFX0ZMSVBDT1VOVF9HTTQ1KGNydGMtPnBpcGUpKSwKKwkJCQkgICAg Y3J0Yy0+dW5waW5fd29yay0+ZmxpcF9jb3VudCk7Cit9CisKIHZvaWQgaW50ZWxfcHJlcGFyZV9w YWdlX2ZsaXAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBsYW5lKQogewogCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC04NTg5LDcg Kzg2MzEsNyBAQCB2b2lkIGludGVsX3ByZXBhcmVfcGFnZV9mbGlwKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIGludCBwbGFuZSkKIAkgKiBpcyBhbHNvIGFjY29tcGFuaWVkIGJ5IGEgc3B1cmlvdXMg aW50ZWxfcHJlcGFyZV9wYWdlX2ZsaXAoKS4KIAkgKi8KIAlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2 LT5ldmVudF9sb2NrLCBmbGFncyk7Ci0JaWYgKGludGVsX2NydGMtPnVucGluX3dvcmspCisJaWYg KGludGVsX2NydGMtPnVucGluX3dvcmsgJiYgcGFnZV9mbGlwX2ZpbmlzaGVkKGludGVsX2NydGMp KQogCQlhdG9taWNfaW5jX25vdF96ZXJvKCZpbnRlbF9jcnRjLT51bnBpbl93b3JrLT5wZW5kaW5n KTsKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkZXYtPmV2ZW50X2xvY2ssIGZsYWdzKTsKIH0K QEAgLTg2MTksNiArODY2MSw5IEBAIHN0YXRpYyBpbnQgaW50ZWxfZ2VuMl9xdWV1ZV9mbGlwKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaWYgKHJldCkKIAkJZ290byBlcnI7CiAKKwlpbnRlbF9j cnRjLT51bnBpbl93b3JrLT5ndHRfb2Zmc2V0ID0KKwkJaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0 KG9iaikgKyBpbnRlbF9jcnRjLT5kc3BhZGRyX29mZnNldDsKKwogCXJldCA9IGludGVsX3Jpbmdf YmVnaW4ocmluZywgNik7CiAJaWYgKHJldCkKIAkJZ290byBlcnJfdW5waW47CkBAIC04NjM1LDcg Kzg2ODAsNyBAQCBzdGF0aWMgaW50IGludGVsX2dlbjJfcXVldWVfZmxpcChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCWludGVsX3JpbmdfZW1pdChyaW5nLCBNSV9ESVNQTEFZX0ZMSVAgfAogCQkJ TUlfRElTUExBWV9GTElQX1BMQU5FKGludGVsX2NydGMtPnBsYW5lKSk7CiAJaW50ZWxfcmluZ19l bWl0KHJpbmcsIGZiLT5waXRjaGVzWzBdKTsKLQlpbnRlbF9yaW5nX2VtaXQocmluZywgaTkxNV9n ZW1fb2JqX2dndHRfb2Zmc2V0KG9iaikgKyBpbnRlbF9jcnRjLT5kc3BhZGRyX29mZnNldCk7CisJ aW50ZWxfcmluZ19lbWl0KHJpbmcsIGludGVsX2NydGMtPnVucGluX3dvcmstPmd0dF9vZmZzZXQp OwogCWludGVsX3JpbmdfZW1pdChyaW5nLCAwKTsgLyogYXV4IGRpc3BsYXkgYmFzZSBhZGRyZXNz LCB1bnVzZWQgKi8KIAogCWludGVsX21hcmtfcGFnZV9mbGlwX2FjdGl2ZShpbnRlbF9jcnRjKTsK QEAgLTg2NjQsNiArODcwOSw5IEBAIHN0YXRpYyBpbnQgaW50ZWxfZ2VuM19xdWV1ZV9mbGlwKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaWYgKHJldCkKIAkJZ290byBlcnI7CiAKKwlpbnRlbF9j cnRjLT51bnBpbl93b3JrLT5ndHRfb2Zmc2V0ID0KKwkJaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0 KG9iaikgKyBpbnRlbF9jcnRjLT5kc3BhZGRyX29mZnNldDsKKwogCXJldCA9IGludGVsX3Jpbmdf YmVnaW4ocmluZywgNik7CiAJaWYgKHJldCkKIAkJZ290byBlcnJfdW5waW47CkBAIC04Njc3LDcg Kzg3MjUsNyBAQCBzdGF0aWMgaW50IGludGVsX2dlbjNfcXVldWVfZmxpcChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCWludGVsX3JpbmdfZW1pdChyaW5nLCBNSV9ESVNQTEFZX0ZMSVBfSTkxNSB8 CiAJCQlNSV9ESVNQTEFZX0ZMSVBfUExBTkUoaW50ZWxfY3J0Yy0+cGxhbmUpKTsKIAlpbnRlbF9y aW5nX2VtaXQocmluZywgZmItPnBpdGNoZXNbMF0pOwotCWludGVsX3JpbmdfZW1pdChyaW5nLCBp OTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQob2JqKSArIGludGVsX2NydGMtPmRzcGFkZHJfb2Zmc2V0 KTsKKwlpbnRlbF9yaW5nX2VtaXQocmluZywgaW50ZWxfY3J0Yy0+dW5waW5fd29yay0+Z3R0X29m ZnNldCk7CiAJaW50ZWxfcmluZ19lbWl0KHJpbmcsIE1JX05PT1ApOwogCiAJaW50ZWxfbWFya19w YWdlX2ZsaXBfYWN0aXZlKGludGVsX2NydGMpOwpAQCAtODcwNiw2ICs4NzU0LDkgQEAgc3RhdGlj IGludCBpbnRlbF9nZW40X3F1ZXVlX2ZsaXAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlpZiAo cmV0KQogCQlnb3RvIGVycjsKIAorCWludGVsX2NydGMtPnVucGluX3dvcmstPmd0dF9vZmZzZXQg PQorCQlpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQob2JqKSArIGludGVsX2NydGMtPmRzcGFkZHJf b2Zmc2V0OworCiAJcmV0ID0gaW50ZWxfcmluZ19iZWdpbihyaW5nLCA0KTsKIAlpZiAocmV0KQog CQlnb3RvIGVycl91bnBpbjsKQEAgLTg3MTcsOCArODc2OCw3IEBAIHN0YXRpYyBpbnQgaW50ZWxf Z2VuNF9xdWV1ZV9mbGlwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaW50ZWxfcmluZ19lbWl0 KHJpbmcsIE1JX0RJU1BMQVlfRkxJUCB8CiAJCQlNSV9ESVNQTEFZX0ZMSVBfUExBTkUoaW50ZWxf Y3J0Yy0+cGxhbmUpKTsKIAlpbnRlbF9yaW5nX2VtaXQocmluZywgZmItPnBpdGNoZXNbMF0pOwot CWludGVsX3JpbmdfZW1pdChyaW5nLAotCQkJKGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmop ICsgaW50ZWxfY3J0Yy0+ZHNwYWRkcl9vZmZzZXQpIHwKKwlpbnRlbF9yaW5nX2VtaXQocmluZywg aW50ZWxfY3J0Yy0+dW5waW5fd29yay0+Z3R0X29mZnNldCB8CiAJCQlvYmotPnRpbGluZ19tb2Rl KTsKIAogCS8qIFhYWCBFbmFibGluZyB0aGUgcGFuZWwtZml0dGVyIGFjcm9zcyBwYWdlLWZsaXAg aXMgc28gZmFyCkBAIC04NzU1LDYgKzg4MDUsOSBAQCBzdGF0aWMgaW50IGludGVsX2dlbjZfcXVl dWVfZmxpcChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWlmIChyZXQpCiAJCWdvdG8gZXJyOwog CisJaW50ZWxfY3J0Yy0+dW5waW5fd29yay0+Z3R0X29mZnNldCA9CisJCWk5MTVfZ2VtX29ial9n Z3R0X29mZnNldChvYmopICsgaW50ZWxfY3J0Yy0+ZHNwYWRkcl9vZmZzZXQ7CisKIAlyZXQgPSBp bnRlbF9yaW5nX2JlZ2luKHJpbmcsIDQpOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyX3VucGluOwpA QCAtODc2Miw3ICs4ODE1LDcgQEAgc3RhdGljIGludCBpbnRlbF9nZW42X3F1ZXVlX2ZsaXAoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKIAlpbnRlbF9yaW5nX2VtaXQocmluZywgTUlfRElTUExBWV9G TElQIHwKIAkJCU1JX0RJU1BMQVlfRkxJUF9QTEFORShpbnRlbF9jcnRjLT5wbGFuZSkpOwogCWlu dGVsX3JpbmdfZW1pdChyaW5nLCBmYi0+cGl0Y2hlc1swXSB8IG9iai0+dGlsaW5nX21vZGUpOwot CWludGVsX3JpbmdfZW1pdChyaW5nLCBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQob2JqKSArIGlu dGVsX2NydGMtPmRzcGFkZHJfb2Zmc2V0KTsKKwlpbnRlbF9yaW5nX2VtaXQocmluZywgaW50ZWxf Y3J0Yy0+dW5waW5fd29yay0+Z3R0X29mZnNldCk7CiAKIAkvKiBDb250cmFyeSB0byB0aGUgc3Vn Z2VzdGlvbnMgaW4gdGhlIGRvY3VtZW50YXRpb24sCiAJICogIkVuYWJsZSBQYW5lbCBGaXR0ZXIi IGRvZXMgbm90IHNlZW0gdG8gYmUgcmVxdWlyZWQgd2hlbiBwYWdlCkBAIC04ODA0LDYgKzg4NTcs OSBAQCBzdGF0aWMgaW50IGludGVsX2dlbjdfcXVldWVfZmxpcChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCWlmIChyZXQpCiAJCWdvdG8gZXJyOwogCisJaW50ZWxfY3J0Yy0+dW5waW5fd29yay0+ Z3R0X29mZnNldCA9CisJCWk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmopICsgaW50ZWxfY3J0 Yy0+ZHNwYWRkcl9vZmZzZXQ7CisKIAlzd2l0Y2goaW50ZWxfY3J0Yy0+cGxhbmUpIHsKIAljYXNl IFBMQU5FX0E6CiAJCXBsYW5lX2JpdCA9IE1JX0RJU1BMQVlfRkxJUF9JVkJfUExBTkVfQTsKQEAg LTg4ODEsNyArODkzNyw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfZ2VuN19xdWV1ZV9mbGlwKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAKIAlpbnRlbF9yaW5nX2VtaXQocmluZywgTUlfRElTUExBWV9G TElQX0k5MTUgfCBwbGFuZV9iaXQpOwogCWludGVsX3JpbmdfZW1pdChyaW5nLCAoZmItPnBpdGNo ZXNbMF0gfCBvYmotPnRpbGluZ19tb2RlKSk7Ci0JaW50ZWxfcmluZ19lbWl0KHJpbmcsIGk5MTVf Z2VtX29ial9nZ3R0X29mZnNldChvYmopICsgaW50ZWxfY3J0Yy0+ZHNwYWRkcl9vZmZzZXQpOwor CWludGVsX3JpbmdfZW1pdChyaW5nLCBpbnRlbF9jcnRjLT51bnBpbl93b3JrLT5ndHRfb2Zmc2V0 KTsKIAlpbnRlbF9yaW5nX2VtaXQocmluZywgKE1JX05PT1ApKTsKIAogCWludGVsX21hcmtfcGFn ZV9mbGlwX2FjdGl2ZShpbnRlbF9jcnRjKTsKQEAgLTg5NzksNiArOTAzNSw5IEBAIHN0YXRpYyBp bnQgaW50ZWxfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCWF0b21pY19p bmMoJmludGVsX2NydGMtPnVucGluX3dvcmtfY291bnQpOwogCWludGVsX2NydGMtPnJlc2V0X2Nv dW50ZXIgPSBhdG9taWNfcmVhZCgmZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNldF9jb3VudGVyKTsK IAorCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA1IHx8IElTX0c0WChkZXYpKQorCQl3b3Jr LT5mbGlwX2NvdW50ID0gSTkxNV9SRUFEKFBJUEVfRkxJUENPVU5UX0dNNDUoaW50ZWxfY3J0Yy0+ cGlwZSkpICsgMTsKKwogCXJldCA9IGRldl9wcml2LT5kaXNwbGF5LnF1ZXVlX2ZsaXAoZGV2LCBj cnRjLCBmYiwgb2JqLCBwYWdlX2ZsaXBfZmxhZ3MpOwogCWlmIChyZXQpCiAJCWdvdG8gY2xlYW51 cF9wZW5kaW5nOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBjNTUxNDcyLi5lZGVmMzRl IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNTkwLDYgKzU5MCw4IEBAIHN0cnVjdCBp bnRlbF91bnBpbl93b3JrIHsKICNkZWZpbmUgSU5URUxfRkxJUF9JTkFDVElWRQkwCiAjZGVmaW5l IElOVEVMX0ZMSVBfUEVORElORwkxCiAjZGVmaW5lIElOVEVMX0ZMSVBfQ09NUExFVEUJMgorCXUz MiBmbGlwX2NvdW50OworCXUzMiBndHRfb2Zmc2V0OwogCWJvb2wgZW5hYmxlX3N0YWxsX2NoZWNr OwogfTsKIAotLSAKMS44LjMuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK