From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 053/190] drm/i915: Convert i915_semaphores_is_enabled over to early sanitize Date: Mon, 11 Jan 2016 09:17:04 +0000 Message-ID: <1452503961-14837-53-git-send-email-chris@chris-wilson.co.uk> References: <1452503961-14837-1-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-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9183D6E24F for ; Mon, 11 Jan 2016 01:20:37 -0800 (PST) Received: by mail-wm0-f65.google.com with SMTP id b14so25374776wmb.1 for ; Mon, 11 Jan 2016 01:20:37 -0800 (PST) In-Reply-To: <1452503961-14837-1-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org UmF0aGVyIHRoYW4gcmVjb21wdXRpbmcgd2hldGhlciBzZW1hcGhvcmVzIGFyZSBlbmFibGVkLCB3 ZSBjYW4gZG8gdGhhdApjb21wdXRhdGlvbiBvbmNlIGR1cmluZyBlYXJseSBpbml0aWFsaXNhdGlv biBhcyB0aGUgaTkxNS5zZW1hcGhvcmVzCm1vZHVsZSBwYXJhbWV0ZXIgaXMgbm93IHJlYWQtb25s eS4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVr PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICAgICB8ICAyICstCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jICAgICAgICAgfCAgMiArLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICAgIHwgMjUgLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICB8ICAxIC0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICB8IDM1ICsrKysrKysrKysrKysrKysr KysrKysrKysrKysrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5j IHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgICB8ICAyICst CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgfCAyMCArKysrKysrKyst LS0tLS0tLS0tCiA4IGZpbGVzIGNoYW5nZWQsIDQ2IGluc2VydGlvbnMoKyksIDQzIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXggNTMzNTA3MmYyMDQ3Li4z ODdhZTc3ZDNjMjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdm cy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC0zMTQ2LDcg KzMxNDYsNyBAQCBzdGF0aWMgaW50IGk5MTVfc2VtYXBob3JlX3N0YXR1cyhzdHJ1Y3Qgc2VxX2Zp bGUgKm0sIHZvaWQgKnVudXNlZCkKIAlpbnQgbnVtX3JpbmdzID0gaHdlaWdodDMyKElOVEVMX0lO Rk8oZGV2KS0+cmluZ19tYXNrKTsKIAlpbnQgaSwgaiwgcmV0OwogCi0JaWYgKCFpOTE1X3NlbWFw aG9yZV9pc19lbmFibGVkKGRldikpIHsKKwlpZiAoIWk5MTUuc2VtYXBob3JlcykgewogCQlzZXFf cHV0cyhtLCAiU2VtYXBob3JlcyBhcmUgZGlzYWJsZWRcbiIpOwogCQlyZXR1cm4gMDsKIAl9CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kbWEuYwppbmRleCA5ZTQ5ZTMwNGRkOGUuLjRjNzJjODNjZmEyOCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2RtYS5jCkBAIC0xMjYsNyArMTI2LDcgQEAgc3RhdGljIGludCBpOTE1 X2dldHBhcmFtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJCXZhbHVlID0g MTsKIAkJYnJlYWs7CiAJY2FzZSBJOTE1X1BBUkFNX0hBU19TRU1BUEhPUkVTOgotCQl2YWx1ZSA9 IGk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQoZGV2KTsKKwkJdmFsdWUgPSBpOTE1LnNlbWFwaG9y ZXM7CiAJCWJyZWFrOwogCWNhc2UgSTkxNV9QQVJBTV9IQVNfUFJJTUVfVk1BUF9GTFVTSDoKIAkJ dmFsdWUgPSAxOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggZTlmODVmZDA1NDJmLi5jYzgz MWEzNGY3YmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtNTE1LDMxICs1MTUsNiBAQCB2 b2lkIGludGVsX2RldGVjdF9wY2goc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlwY2lfZGV2X3B1 dChwY2gpOwogfQogCi1ib29sIGk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKLXsKLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA2KQotCQlyZXR1cm4g ZmFsc2U7Ci0KLQlpZiAoaTkxNS5zZW1hcGhvcmVzID49IDApCi0JCXJldHVybiBpOTE1LnNlbWFw aG9yZXM7Ci0KLQkvKiBUT0RPOiBtYWtlIHNlbWFwaG9yZXMgYW5kIEV4ZWNsaXN0cyBwbGF5IG5p Y2VseSB0b2dldGhlciAqLwotCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMpCi0JCXJldHVybiBm YWxzZTsKLQotCS8qIFVudGlsIHdlIGdldCBmdXJ0aGVyIHRlc3RpbmcuLi4gKi8KLQlpZiAoSVNf R0VOOChkZXYpKQotCQlyZXR1cm4gZmFsc2U7Ci0KLSNpZmRlZiBDT05GSUdfSU5URUxfSU9NTVUK LQkvKiBFbmFibGUgc2VtYXBob3JlcyBvbiBTTkIgd2hlbiBJTyByZW1hcHBpbmcgaXMgb2ZmICov Ci0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID09IDYgJiYgaW50ZWxfaW9tbXVfZ2Z4X21hcHBl ZCkKLQkJcmV0dXJuIGZhbHNlOwotI2VuZGlmCi0KLQlyZXR1cm4gdHJ1ZTsKLX0KLQogc3RhdGlj IHZvaWQgaW50ZWxfc3VzcGVuZF9lbmNvZGVycyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGRldl9wcml2LT5kZXY7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAppbmRleCA1NmNmMmZmYzFlYWMuLjU4ZTllNWU1MDc2OSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0zMjI2LDcgKzMyMjYsNiBAQCBleHRlcm4gdm9pZCBpbnRl bF9zZXRfbWVtb3J5X2N4c3Ioc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogZXh0 ZXJuIHZvaWQgaW50ZWxfZGV0ZWN0X3BjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGV4dGVy biBpbnQgaW50ZWxfZW5hYmxlX3JjNihjb25zdCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIAot ZXh0ZXJuIGJvb2wgaTkxNV9zZW1hcGhvcmVfaXNfZW5hYmxlZChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KTsKIGludCBpOTE1X3JlZ19yZWFkX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZv aWQgKmRhdGEsCiAJCQlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpOwogaW50IGk5MTVfZ2V0X3Jlc2V0 X3N0YXRzX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYwppbmRleCBhNGY5YzViYmI4ODMuLjMxOTI2YTRmYjQyYSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jCkBAIC0yNTY3LDcgKzI1NjcsNyBAQCBfX2k5MTVfZ2VtX29iamVjdF9z eW5jKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJaWYgKGk5MTVfZ2VtX3JlcXVl c3RfY29tcGxldGVkKGZyb21fcmVxKSkKIAkJcmV0dXJuIDA7CiAKLQlpZiAoIWk5MTVfc2VtYXBo b3JlX2lzX2VuYWJsZWQob2JqLT5iYXNlLmRldikpIHsKKwlpZiAoIWk5MTUuc2VtYXBob3Jlcykg ewogCQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9IHRvX2k5MTUob2JqLT5iYXNlLmRl dik7CiAJCXJldCA9IF9faTkxNV93YWl0X3JlcXVlc3QoZnJvbV9yZXEsCiAJCQkJCSAgaTkxNS0+ bW0uaW50ZXJydXB0aWJsZSwKQEAgLTQzMDQsMTMgKzQzMDQsNDIgQEAgb3V0OgogCXJldHVybiBy ZXQ7CiB9CiAKK3N0YXRpYyBib29sIGk5MTVfZ2VtX3Nhbml0aXplX3NlbWFwaG9yZShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJCWludCBwYXJhbV92YWx1ZSkKK3sKKwlp ZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA8IDYpCisJCXJldHVybiBmYWxzZTsKKworCWlm IChwYXJhbV92YWx1ZSA+PSAwKQorCQlyZXR1cm4gcGFyYW1fdmFsdWU7CisKKwkvKiBUT0RPOiBt YWtlIHNlbWFwaG9yZXMgYW5kIEV4ZWNsaXN0cyBwbGF5IG5pY2VseSB0b2dldGhlciAqLworCWlm IChpOTE1LmVuYWJsZV9leGVjbGlzdHMpCisJCXJldHVybiBmYWxzZTsKKworCS8qIFVudGlsIHdl IGdldCBmdXJ0aGVyIHRlc3RpbmcuLi4gKi8KKwlpZiAoSVNfR0VOOChkZXZfcHJpdikpCisJCXJl dHVybiBmYWxzZTsKKworI2lmZGVmIENPTkZJR19JTlRFTF9JT01NVQorCS8qIEVuYWJsZSBzZW1h cGhvcmVzIG9uIFNOQiB3aGVuIElPIHJlbWFwcGluZyBpcyBvZmYgKi8KKwlpZiAoSU5URUxfSU5G TyhkZXZfcHJpdiktPmdlbiA9PSA2ICYmIGludGVsX2lvbW11X2dmeF9tYXBwZWQpCisJCXJldHVy biBmYWxzZTsKKyNlbmRpZgorCisJcmV0dXJuIHRydWU7Cit9CisKIGludCBpOTE1X2dlbV9pbml0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlpbnQgcmV0OwogCi0JaTkxNS5lbmFibGVfZXhl Y2xpc3RzID0gaW50ZWxfc2FuaXRpemVfZW5hYmxlX2V4ZWNsaXN0cyhkZXYsCi0JCQlpOTE1LmVu YWJsZV9leGVjbGlzdHMpOworCWk5MTUuZW5hYmxlX2V4ZWNsaXN0cyA9CisJCWludGVsX3Nhbml0 aXplX2VuYWJsZV9leGVjbGlzdHMoZGV2LCBpOTE1LmVuYWJsZV9leGVjbGlzdHMpOworCisJaTkx NS5zZW1hcGhvcmVzID0KKwkJaTkxNV9nZW1fc2FuaXRpemVfc2VtYXBob3JlKGRldl9wcml2LCBp OTE1LnNlbWFwaG9yZXMpOwogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggMGFlYTVjY2Y2ZDY4Li4z NjFiZTEwODVhMTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2Nv bnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKQEAg LTUyMyw3ICs1MjMsNyBAQCBtaV9zZXRfY29udGV4dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl c3QgKnJlcSwgdTMyIGh3X2ZsYWdzKQogCXUzMiBmbGFncyA9IGh3X2ZsYWdzIHwgTUlfTU1fU1BB Q0VfR1RUOwogCWNvbnN0IGludCBudW1fcmluZ3MgPQogCQkvKiBVc2UgYW4gZXh0ZW5kZWQgdy9h IG9uIGl2YisgaWYgc2lnbmFsbGluZyBmcm9tIG90aGVyIHJpbmdzICovCi0JCWk5MTVfc2VtYXBo b3JlX2lzX2VuYWJsZWQocmluZy0+ZGV2KSA/CisJCWk5MTUuc2VtYXBob3JlcyA/CiAJCWh3ZWln aHQzMihJTlRFTF9JTkZPKHJpbmctPmRldiktPnJpbmdfbWFzaykgLSAxIDoKIAkJMDsKIAlpbnQg bGVuLCBpLCByZXQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9l cnJvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwppbmRleCAwNWYw NTQ4OThhOTUuLjg0Y2U5MTI3NWZkZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9ncHVfZXJyb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJv ci5jCkBAIC04MjMsNyArODIzLDcgQEAgc3RhdGljIHZvaWQgZ2VuOF9yZWNvcmRfc2VtYXBob3Jl X3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICp0bzsKIAlpbnQgaTsKIAotCWlmICghaTkxNV9zZW1hcGhvcmVfaXNfZW5hYmxl ZChkZXZfcHJpdi0+ZGV2KSkKKwlpZiAoIWk5MTUuc2VtYXBob3JlcykKIAkJcmV0dXJuOwogCiAJ aWYgKCFlcnJvci0+c2VtYXBob3JlX29iaikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi dWZmZXIuYwppbmRleCAwMmI3MDMyZTE2ZTAuLmUxNDNkYTk2ZGNmYSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMjUxMCw3ICsyNTEwLDcgQEAgaW50IGludGVs X2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJcmluZy0+ bW1pb19iYXNlID0gUkVOREVSX1JJTkdfQkFTRTsKIAogCWlmIChJTlRFTF9JTkZPKGRldiktPmdl biA+PSA4KSB7Ci0JCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldikpIHsKKwkJaWYg KGk5MTUuc2VtYXBob3JlcykgewogCQkJb2JqID0gaTkxNV9nZW1fYWxsb2Nfb2JqZWN0KGRldiwg NDA5Nik7CiAJCQlpZiAob2JqID09IE5VTEwpIHsKIAkJCQlEUk1fRVJST1IoIkZhaWxlZCB0byBh bGxvY2F0ZSBzZW1hcGhvcmUgYm8uIERpc2FibGluZyBzZW1hcGhvcmVzXG4iKTsKQEAgLTI1MzQs NyArMjUzNCw3IEBAIGludCBpbnRlbF9pbml0X3JlbmRlcl9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCQlyaW5nLT5pcnFfZGlzYWJsZSA9IGdlbjhfcmluZ19kaXNhYmxlX2ly cTsKIAkJcmluZy0+aXJxX2VuYWJsZV9tYXNrID0gR1RfUkVOREVSX1VTRVJfSU5URVJSVVBUOwog CQlyaW5nLT5pcnFfc2Vxbm9fYmFycmllciA9IGdlbjZfc2Vxbm9fYmFycmllcjsKLQkJaWYgKGk5 MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQoZGV2KSkgeworCQlpZiAoaTkxNS5zZW1hcGhvcmVzKSB7 CiAJCQlXQVJOX09OKCFkZXZfcHJpdi0+c2VtYXBob3JlX29iaik7CiAJCQlyaW5nLT5zZW1hcGhv cmUuc3luY190byA9IGdlbjhfcmluZ19zeW5jOwogCQkJcmluZy0+c2VtYXBob3JlLnNpZ25hbCA9 IGdlbjhfcmNzX3NpZ25hbDsKQEAgLTI1NTAsNyArMjU1MCw3IEBAIGludCBpbnRlbF9pbml0X3Jl bmRlcl9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlyaW5nLT5pcnFfZGlz YWJsZSA9IGdlbjZfcmluZ19kaXNhYmxlX2lycTsKIAkJcmluZy0+aXJxX2VuYWJsZV9tYXNrID0g R1RfUkVOREVSX1VTRVJfSU5URVJSVVBUOwogCQlyaW5nLT5pcnFfc2Vxbm9fYmFycmllciA9IGdl bjZfc2Vxbm9fYmFycmllcjsKLQkJaWYgKGk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQoZGV2KSkg eworCQlpZiAoaTkxNS5zZW1hcGhvcmVzKSB7CiAJCQlyaW5nLT5zZW1hcGhvcmUuc3luY190byA9 IGdlbjZfcmluZ19zeW5jOwogCQkJcmluZy0+c2VtYXBob3JlLnNpZ25hbCA9IGdlbjZfc2lnbmFs OwogCQkJLyoKQEAgLTI2NjYsNyArMjY2Niw3IEBAIGludCBpbnRlbF9pbml0X2JzZF9yaW5nX2J1 ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJcmluZy0+aXJxX2Rpc2FibGUgPSBnZW44 X3JpbmdfZGlzYWJsZV9pcnE7CiAJCQlyaW5nLT5kaXNwYXRjaF9leGVjYnVmZmVyID0KIAkJCQln ZW44X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKLQkJCWlmIChpOTE1X3NlbWFwaG9yZV9pc19l bmFibGVkKGRldikpIHsKKwkJCWlmIChpOTE1LnNlbWFwaG9yZXMpIHsKIAkJCQlyaW5nLT5zZW1h cGhvcmUuc3luY190byA9IGdlbjhfcmluZ19zeW5jOwogCQkJCXJpbmctPnNlbWFwaG9yZS5zaWdu YWwgPSBnZW44X3hjc19zaWduYWw7CiAJCQkJR0VOOF9SSU5HX1NFTUFQSE9SRV9JTklUOwpAQCAt MjY3Nyw3ICsyNjc3LDcgQEAgaW50IGludGVsX2luaXRfYnNkX3JpbmdfYnVmZmVyKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJCQlyaW5nLT5pcnFfZGlzYWJsZSA9IGdlbjZfcmluZ19kaXNhYmxl X2lycTsKIAkJCXJpbmctPmRpc3BhdGNoX2V4ZWNidWZmZXIgPQogCQkJCWdlbjZfcmluZ19kaXNw YXRjaF9leGVjYnVmZmVyOwotCQkJaWYgKGk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQoZGV2KSkg eworCQkJaWYgKGk5MTUuc2VtYXBob3JlcykgewogCQkJCXJpbmctPnNlbWFwaG9yZS5zeW5jX3Rv ID0gZ2VuNl9yaW5nX3N5bmM7CiAJCQkJcmluZy0+c2VtYXBob3JlLnNpZ25hbCA9IGdlbjZfc2ln bmFsOwogCQkJCXJpbmctPnNlbWFwaG9yZS5tYm94LndhaXRbUkNTXSA9IE1JX1NFTUFQSE9SRV9T WU5DX1ZSOwpAQCAtMjczNCw3ICsyNzM0LDcgQEAgaW50IGludGVsX2luaXRfYnNkMl9yaW5nX2J1 ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXJpbmctPmlycV9kaXNhYmxlID0gZ2VuOF9y aW5nX2Rpc2FibGVfaXJxOwogCXJpbmctPmRpc3BhdGNoX2V4ZWNidWZmZXIgPQogCQkJZ2VuOF9y aW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXI7Ci0JaWYgKGk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQo ZGV2KSkgeworCWlmIChpOTE1LnNlbWFwaG9yZXMpIHsKIAkJcmluZy0+c2VtYXBob3JlLnN5bmNf dG8gPSBnZW44X3Jpbmdfc3luYzsKIAkJcmluZy0+c2VtYXBob3JlLnNpZ25hbCA9IGdlbjhfeGNz X3NpZ25hbDsKIAkJR0VOOF9SSU5HX1NFTUFQSE9SRV9JTklUOwpAQCAtMjc2Myw3ICsyNzYzLDcg QEAgaW50IGludGVsX2luaXRfYmx0X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJCXJpbmctPmlycV9lbmFibGUgPSBnZW44X3JpbmdfZW5hYmxlX2lycTsKIAkJcmluZy0+aXJx X2Rpc2FibGUgPSBnZW44X3JpbmdfZGlzYWJsZV9pcnE7CiAJCXJpbmctPmRpc3BhdGNoX2V4ZWNi dWZmZXIgPSBnZW44X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKLQkJaWYgKGk5MTVfc2VtYXBo b3JlX2lzX2VuYWJsZWQoZGV2KSkgeworCQlpZiAoaTkxNS5zZW1hcGhvcmVzKSB7CiAJCQlyaW5n LT5zZW1hcGhvcmUuc3luY190byA9IGdlbjhfcmluZ19zeW5jOwogCQkJcmluZy0+c2VtYXBob3Jl LnNpZ25hbCA9IGdlbjhfeGNzX3NpZ25hbDsKIAkJCUdFTjhfUklOR19TRU1BUEhPUkVfSU5JVDsK QEAgLTI3NzMsNyArMjc3Myw3IEBAIGludCBpbnRlbF9pbml0X2JsdF9yaW5nX2J1ZmZlcihzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCQlyaW5nLT5pcnFfZW5hYmxlID0gZ2VuNl9yaW5nX2VuYWJs ZV9pcnE7CiAJCXJpbmctPmlycV9kaXNhYmxlID0gZ2VuNl9yaW5nX2Rpc2FibGVfaXJxOwogCQly aW5nLT5kaXNwYXRjaF9leGVjYnVmZmVyID0gZ2VuNl9yaW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXI7 Ci0JCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldikpIHsKKwkJaWYgKGk5MTUuc2Vt YXBob3JlcykgewogCQkJcmluZy0+c2VtYXBob3JlLnNpZ25hbCA9IGdlbjZfc2lnbmFsOwogCQkJ cmluZy0+c2VtYXBob3JlLnN5bmNfdG8gPSBnZW42X3Jpbmdfc3luYzsKIAkJCS8qCkBAIC0yODIw LDcgKzI4MjAsNyBAQCBpbnQgaW50ZWxfaW5pdF92ZWJveF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCQlyaW5nLT5pcnFfZW5hYmxlID0gZ2VuOF9yaW5nX2VuYWJsZV9pcnE7 CiAJCXJpbmctPmlycV9kaXNhYmxlID0gZ2VuOF9yaW5nX2Rpc2FibGVfaXJxOwogCQlyaW5nLT5k aXNwYXRjaF9leGVjYnVmZmVyID0gZ2VuOF9yaW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXI7Ci0JCWlm IChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldikpIHsKKwkJaWYgKGk5MTUuc2VtYXBob3Jl cykgewogCQkJcmluZy0+c2VtYXBob3JlLnN5bmNfdG8gPSBnZW44X3Jpbmdfc3luYzsKIAkJCXJp bmctPnNlbWFwaG9yZS5zaWduYWwgPSBnZW44X3hjc19zaWduYWw7CiAJCQlHRU44X1JJTkdfU0VN QVBIT1JFX0lOSVQ7CkBAIC0yODMwLDcgKzI4MzAsNyBAQCBpbnQgaW50ZWxfaW5pdF92ZWJveF9y aW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlyaW5nLT5pcnFfZW5hYmxlID0g aHN3X3ZlYm94X2VuYWJsZV9pcnE7CiAJCXJpbmctPmlycV9kaXNhYmxlID0gaHN3X3ZlYm94X2Rp c2FibGVfaXJxOwogCQlyaW5nLT5kaXNwYXRjaF9leGVjYnVmZmVyID0gZ2VuNl9yaW5nX2Rpc3Bh dGNoX2V4ZWNidWZmZXI7Ci0JCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldikpIHsK KwkJaWYgKGk5MTUuc2VtYXBob3JlcykgewogCQkJcmluZy0+c2VtYXBob3JlLnN5bmNfdG8gPSBn ZW42X3Jpbmdfc3luYzsKIAkJCXJpbmctPnNlbWFwaG9yZS5zaWduYWwgPSBnZW42X3NpZ25hbDsK IAkJCXJpbmctPnNlbWFwaG9yZS5tYm94LndhaXRbUkNTXSA9IE1JX1NFTUFQSE9SRV9TWU5DX1ZF UjsKLS0gCjIuNy4wLnJjMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK