From: Tvrtko Ursulin Subject: [CI 09/19] drm/i915: Make IS_BROADWELL only take dev_priv Date: Thu, 13 Oct 2016 11:03:00 +0100 Message-ID: <1476352990-2504-9-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1476352990-2504-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-lf0-x244.google.com (mail-lf0-x244.google.com [IPv6:2a00:1450:4010:c07::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3508A6EA05 for ; Thu, 13 Oct 2016 10:03:28 +0000 (UTC) Received: by mail-lf0-x244.google.com with SMTP id b75so11686427lfg.3 for ; Thu, 13 Oct 2016 03:03:28 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:9b6d:e300:916a:6cab:ac67:71c2]) by smtp.gmail.com with ESMTPSA id yo1sm21209210wjc.16.2016.10.13.03.03.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Oct 2016 03:03:25 -0700 (PDT) In-Reply-To: <1476352990-2504-1-git-send-email-tvrtko.ursulin@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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDE4 MDggYnl0ZXMgb2YgLnJvZGF0YSBzdHJpbmdzLgoKdjI6IEFkZCBwYXJhbnRoZXNlcyBhcm91bmQg ZGV2X3ByaXYuIChWaWxsZSBTeXJqYWxhKQoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4g PHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IERhdmlkIFdlaW5laGFsbCA8 ZGF2aWQud2VpbmVoYWxsQGxpbnV4LmludGVsLmNvbT4KQWNrZWQtYnk6IERhbmllbCBWZXR0ZXIg PGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+CkFja2VkLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1 bGFAbGludXguaW50ZWwuY29tPgpBY2tlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13 aWxzb24uY28udWs+CkFja2VkLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9y c3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMg ICAgICAgICB8ICA2ICsrKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAg ICAgIHwgIDYgKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAg fCAgNSArKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgICAgIHwgIDIg Ky0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMgICAgICB8ICA0ICsrLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICB8IDIxICsrKysrKysrKysrLS0t LS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyAgICAgICAgIHwgMTkgKysr KysrKysrKy0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgICAg IHwgMjAgKysrKysrKysrKystLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bz ci5jICAgICAgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVf cG0uYyB8ICAzICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgICAgIHwg IDggKysrKy0tLS0KIDExIGZpbGVzIGNoYW5nZWQsIDUyIGluc2VydGlvbnMoKyksIDQ2IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4IDVhMmUwZDBjN2Y0YS4uN2M1OTc0 ZGU5ODliIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTE4OSwxMyArMTg5LDE1IEBAIHN0 YXRpYyB2b2lkIGludGVsX2RldGVjdF9wY2goc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCX0g ZWxzZSBpZiAoaWQgPT0gSU5URUxfUENIX0xQVF9ERVZJQ0VfSURfVFlQRSkgewogCQkJCWRldl9w cml2LT5wY2hfdHlwZSA9IFBDSF9MUFQ7CiAJCQkJRFJNX0RFQlVHX0tNUygiRm91bmQgTHlueFBv aW50IFBDSFxuIik7Ci0JCQkJV0FSTl9PTighSVNfSEFTV0VMTChkZXYpICYmICFJU19CUk9BRFdF TEwoZGV2KSk7CisJCQkJV0FSTl9PTighSVNfSEFTV0VMTChkZXZfcHJpdikgJiYKKwkJCQkJIUlT X0JST0FEV0VMTChkZXZfcHJpdikpOwogCQkJCVdBUk5fT04oSVNfSFNXX1VMVChkZXZfcHJpdikg fHwKIAkJCQkJSVNfQkRXX1VMVChkZXZfcHJpdikpOwogCQkJfSBlbHNlIGlmIChpZCA9PSBJTlRF TF9QQ0hfTFBUX0xQX0RFVklDRV9JRF9UWVBFKSB7CiAJCQkJZGV2X3ByaXYtPnBjaF90eXBlID0g UENIX0xQVDsKIAkJCQlEUk1fREVCVUdfS01TKCJGb3VuZCBMeW54UG9pbnQgTFAgUENIXG4iKTsK LQkJCQlXQVJOX09OKCFJU19IQVNXRUxMKGRldikgJiYgIUlTX0JST0FEV0VMTChkZXYpKTsKKwkJ CQlXQVJOX09OKCFJU19IQVNXRUxMKGRldl9wcml2KSAmJgorCQkJCQkhSVNfQlJPQURXRUxMKGRl dl9wcml2KSk7CiAJCQkJV0FSTl9PTighSVNfSFNXX1VMVChkZXZfcHJpdikgJiYKIAkJCQkJIUlT X0JEV19VTFQoZGV2X3ByaXYpKTsKIAkJCX0gZWxzZSBpZiAoaWQgPT0gSU5URUxfUENIX1NQVF9E RVZJQ0VfSURfVFlQRSkgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggNzMxODAwOTA1NGMx Li44ZjI5NDVmMjU4ZjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjY2NSw3ICsyNjY1 LDcgQEAgc3RydWN0IGRybV9pOTE1X2NtZF90YWJsZSB7CiAjZGVmaW5lIElTX1ZBTExFWVZJRVco ZGV2KQkoSU5URUxfSU5GTyhkZXYpLT5pc192YWxsZXl2aWV3KQogI2RlZmluZSBJU19DSEVSUllW SUVXKGRldikJKElOVEVMX0lORk8oZGV2KS0+aXNfY2hlcnJ5dmlldykKICNkZWZpbmUgSVNfSEFT V0VMTChkZXYpCShJTlRFTF9JTkZPKGRldiktPmlzX2hhc3dlbGwpCi0jZGVmaW5lIElTX0JST0FE V0VMTChkZXYpCShJTlRFTF9JTkZPKGRldiktPmlzX2Jyb2Fkd2VsbCkKKyNkZWZpbmUgSVNfQlJP QURXRUxMKGRldl9wcml2KQkoKGRldl9wcml2KS0+aW5mby5pc19icm9hZHdlbGwpCiAjZGVmaW5l IElTX1NLWUxBS0UoZGV2KQkoSU5URUxfSU5GTyhkZXYpLT5pc19za3lsYWtlKQogI2RlZmluZSBJ U19CUk9YVE9OKGRldikJCShJTlRFTF9JTkZPKGRldiktPmlzX2Jyb3h0b24pCiAjZGVmaW5lIElT X0tBQllMQUtFKGRldikJKElOVEVMX0lORk8oZGV2KS0+aXNfa2FieWxha2UpCkBAIC0yNzcyLDgg KzI3NzIsOCBAQCBzdHJ1Y3QgZHJtX2k5MTVfY21kX3RhYmxlIHsKICNkZWZpbmUgSEFTX0xMQyhk ZXYpCQkoSU5URUxfSU5GTyhkZXYpLT5oYXNfbGxjKQogI2RlZmluZSBIQVNfU05PT1AoZGV2KQkJ KElOVEVMX0lORk8oZGV2KS0+aGFzX3Nub29wKQogI2RlZmluZSBIQVNfRURSQU0oZGV2KQkJKCEh KF9fSTkxNV9fKGRldiktPmVkcmFtX2NhcCAmIEVEUkFNX0VOQUJMRUQpKQotI2RlZmluZSBIQVNf V1QoZGV2KQkJKChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRldikpICYmIFwKLQkJ CQkgSEFTX0VEUkFNKGRldikpCisjZGVmaW5lIEhBU19XVChkZXZfcHJpdikJKChJU19IQVNXRUxM KGRldl9wcml2KSB8fCBcCisJCQkJIElTX0JST0FEV0VMTChkZXZfcHJpdikpICYmIEhBU19FRFJB TShkZXZfcHJpdikpCiAjZGVmaW5lIEhXU19ORUVEU19QSFlTSUNBTChkZXYpCShJTlRFTF9JTkZP KGRldiktPmh3c19uZWVkc19waHlzaWNhbCkKIAogI2RlZmluZSBIQVNfSFdfQ09OVEVYVFMoZGV2 KQkoSU5URUxfSU5GTyhkZXYpLT5oYXNfaHdfY29udGV4dHMpCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YwppbmRleCBhMDE4MTFjYWJkYzMuLjhhMTU4NzIxOGVjYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jCkBAIC0zNDczLDcgKzM0NzMsNyBAQCBpbnQgaTkxNV9nZW1fc2V0X2NhY2hpbmdfaW9jdGwo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJbGV2ZWwgPSBJOTE1X0NBQ0hF X0xMQzsKIAkJYnJlYWs7CiAJY2FzZSBJOTE1X0NBQ0hJTkdfRElTUExBWToKLQkJbGV2ZWwgPSBI QVNfV1QoZGV2KSA/IEk5MTVfQ0FDSEVfV1QgOiBJOTE1X0NBQ0hFX05PTkU7CisJCWxldmVsID0g SEFTX1dUKGRldl9wcml2KSA/IEk5MTVfQ0FDSEVfV1QgOiBJOTE1X0NBQ0hFX05PTkU7CiAJCWJy ZWFrOwogCWRlZmF1bHQ6CiAJCXJldHVybiAtRUlOVkFMOwpAQCAtMzUzMSw3ICszNTMxLDggQEAg aTkxNV9nZW1fb2JqZWN0X3Bpbl90b19kaXNwbGF5X3BsYW5lKHN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmosCiAJICogd2l0aCB0aGF0IGJpdCBpbiB0aGUgUFRFIHRvIG1haW4gbWVtb3J5 IHdpdGgganVzdCBvbmUgUElQRV9DT05UUk9MLgogCSAqLwogCXJldCA9IGk5MTVfZ2VtX29iamVj dF9zZXRfY2FjaGVfbGV2ZWwob2JqLAotCQkJCQkgICAgICBIQVNfV1Qob2JqLT5iYXNlLmRldikg PyBJOTE1X0NBQ0hFX1dUIDogSTkxNV9DQUNIRV9OT05FKTsKKwkJCQkJICAgICAgSEFTX1dUKHRv X2k5MTUob2JqLT5iYXNlLmRldikpID8KKwkJCQkJICAgICAgSTkxNV9DQUNIRV9XVCA6IEk5MTVf Q0FDSEVfTk9ORSk7CiAJaWYgKHJldCkgewogCQl2bWEgPSBFUlJfUFRSKHJldCk7CiAJCWdvdG8g ZXJyX3VucGluX2Rpc3BsYXk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IDJk ODQ2YWEzOWNhNS4uODQxNTJjYTM2N2E3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu YwpAQCAtMjEyOSw3ICsyMTI5LDcgQEAgc3RhdGljIHZvaWQgZ3R0X3dyaXRlX3dvcmthcm91bmRz KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJICogd29ya2Fyb3VuZHMgaGVyZSBldmVuIGlmIHRo ZXkgZ2V0IG92ZXJ3cml0dGVuIGJ5IEdQVSByZXNldC4KIAkgKi8KIAkvKiBXYUluY3JlYXNlRGVm YXVsdFRMQkVudHJpZXM6Y2h2LGJkdyxza2wsYnh0ICovCi0JaWYgKElTX0JST0FEV0VMTChkZXYp KQorCWlmIChJU19CUk9BRFdFTEwoZGV2X3ByaXYpKQogCQlJOTE1X1dSSVRFKEdFTjhfTDNfTFJB XzFfR1BHUFUsIEdFTjhfTDNfTFJBXzFfR1BHUFVfREVGQVVMVF9WQUxVRV9CRFcpOwogCWVsc2Ug aWYgKElTX0NIRVJSWVZJRVcoZGV2KSkKIAkJSTkxNV9XUklURShHRU44X0wzX0xSQV8xX0dQR1BV LCBHRU44X0wzX0xSQV8xX0dQR1BVX0RFRkFVTFRfVkFMVUVfQ0hWKTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9jb2xvci5jCmluZGV4IDUzNjJjMDc5MzJkMy4uYmU3NmVmODg2NzhjIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2NvbG9yLmMKQEAgLTU0MCw4ICs1NDAsOCBAQCB2b2lkIGludGVsX2NvbG9y X2luaXQoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCX0gZWxzZSBpZiAoSVNfSEFTV0VMTChkZXYp KSB7CiAJCWRldl9wcml2LT5kaXNwbGF5LmxvYWRfY3NjX21hdHJpeCA9IGk5eHhfbG9hZF9jc2Nf bWF0cml4OwogCQlkZXZfcHJpdi0+ZGlzcGxheS5sb2FkX2x1dHMgPSBoYXN3ZWxsX2xvYWRfbHV0 czsKLQl9IGVsc2UgaWYgKElTX0JST0FEV0VMTChkZXYpIHx8IElTX1NLWUxBS0UoZGV2KSB8fAot CQkgICBJU19CUk9YVE9OKGRldikgfHwgSVNfS0FCWUxBS0UoZGV2KSkgeworCX0gZWxzZSBpZiAo SVNfQlJPQURXRUxMKGRldl9wcml2KSB8fCBJU19TS1lMQUtFKGRldl9wcml2KSB8fAorCQkgICBJ U19CUk9YVE9OKGRldl9wcml2KSB8fCBJU19LQUJZTEFLRShkZXZfcHJpdikpIHsKIAkJZGV2X3By aXYtPmRpc3BsYXkubG9hZF9jc2NfbWF0cml4ID0gaTl4eF9sb2FkX2NzY19tYXRyaXg7CiAJCWRl dl9wcml2LT5kaXNwbGF5LmxvYWRfbHV0cyA9IGJyb2Fkd2VsbF9sb2FkX2x1dHM7CiAJfSBlbHNl IHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAxZGEwZmQwNDAyM2IuLjU5 NDJkYWE2MzBmZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMzEzOSw3 ICszMTM5LDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3Ry dWN0IGRybV9wbGFuZSAqcHJpbWFyeSwKIAlkc3BjbnRyID0gRElTUFBMQU5FX0dBTU1BX0VOQUJM RTsKIAlkc3BjbnRyIHw9IERJU1BMQVlfUExBTkVfRU5BQkxFOwogCi0JaWYgKElTX0hBU1dFTEwo ZGV2KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkKKwlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwg SVNfQlJPQURXRUxMKGRldl9wcml2KSkKIAkJZHNwY250ciB8PSBESVNQUExBTkVfUElQRV9DU0Nf RU5BQkxFOwogCiAJc3dpdGNoIChmYi0+cGl4ZWxfZm9ybWF0KSB7CkBAIC0zMTY4LDcgKzMxNjgs NyBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJt X3BsYW5lICpwcmltYXJ5LAogCWlmIChmYi0+bW9kaWZpZXJbMF0gPT0gSTkxNV9GT1JNQVRfTU9E X1hfVElMRUQpCiAJCWRzcGNudHIgfD0gRElTUFBMQU5FX1RJTEVEOwogCi0JaWYgKCFJU19IQVNX RUxMKGRldikgJiYgIUlTX0JST0FEV0VMTChkZXYpKQorCWlmICghSVNfSEFTV0VMTChkZXZfcHJp dikgJiYgIUlTX0JST0FEV0VMTChkZXZfcHJpdikpCiAJCWRzcGNudHIgfD0gRElTUFBMQU5FX1RS SUNLTEVfRkVFRF9ESVNBQkxFOwogCiAJaW50ZWxfYWRkX2ZiX29mZnNldHMoJngsICZ5LCBwbGFu ZV9zdGF0ZSwgMCk7CkBAIC0zMTc5LDcgKzMxNzksNyBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV91 cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5LAogCWlmIChyb3Rh dGlvbiA9PSBEUk1fUk9UQVRFXzE4MCkgewogCQlkc3BjbnRyIHw9IERJU1BQTEFORV9ST1RBVEVf MTgwOwogCi0JCWlmICghSVNfSEFTV0VMTChkZXYpICYmICFJU19CUk9BRFdFTEwoZGV2KSkgewor CQlpZiAoIUlTX0hBU1dFTEwoZGV2X3ByaXYpICYmICFJU19CUk9BRFdFTEwoZGV2X3ByaXYpKSB7 CiAJCQl4ICs9IChjcnRjX3N0YXRlLT5waXBlX3NyY193IC0gMSk7CiAJCQl5ICs9IChjcnRjX3N0 YXRlLT5waXBlX3NyY19oIC0gMSk7CiAJCX0KQEAgLTMxOTYsNyArMzE5Niw3IEBAIHN0YXRpYyB2 b2lkIGlyb25sYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnByaW1h cnksCiAJSTkxNV9XUklURShEU1BTVVJGKHBsYW5lKSwKIAkJICAgaW50ZWxfZmJfZ3R0X29mZnNl dChmYiwgcm90YXRpb24pICsKIAkJICAgaW50ZWxfY3J0Yy0+ZHNwYWRkcl9vZmZzZXQpOwotCWlm IChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRldikpIHsKKwlpZiAoSVNfSEFTV0VM TChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkgewogCQlJOTE1X1dSSVRFKERT UE9GRlNFVChwbGFuZSksICh5IDw8IDE2KSB8IHgpOwogCX0gZWxzZSB7CiAJCUk5MTVfV1JJVEUo RFNQVElMRU9GRihwbGFuZSksICh5IDw8IDE2KSB8IHgpOwpAQCAtNDg3Nyw3ICs0ODc3LDcgQEAg dm9pZCBoc3dfZW5hYmxlX2lwcyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkgKi8KIAogCWFz c2VydF9wbGFuZV9lbmFibGVkKGRldl9wcml2LCBjcnRjLT5wbGFuZSk7Ci0JaWYgKElTX0JST0FE V0VMTChkZXYpKSB7CisJaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikpIHsKIAkJbXV0ZXhfbG9j aygmZGV2X3ByaXYtPnJwcy5od19sb2NrKTsKIAkJV0FSTl9PTihzYW5keWJyaWRnZV9wY29kZV93 cml0ZShkZXZfcHJpdiwgRElTUExBWV9JUFNfQ09OVFJPTCwgMHhjMDAwMDAwMCkpOwogCQltdXRl eF91bmxvY2soJmRldl9wcml2LT5ycHMuaHdfbG9jayk7CkBAIC00OTA5LDcgKzQ5MDksNyBAQCB2 b2lkIGhzd19kaXNhYmxlX2lwcyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJcmV0dXJuOwog CiAJYXNzZXJ0X3BsYW5lX2VuYWJsZWQoZGV2X3ByaXYsIGNydGMtPnBsYW5lKTsKLQlpZiAoSVNf QlJPQURXRUxMKGRldikpIHsKKwlpZiAoSVNfQlJPQURXRUxMKGRldl9wcml2KSkgewogCQltdXRl eF9sb2NrKCZkZXZfcHJpdi0+cnBzLmh3X2xvY2spOwogCQlXQVJOX09OKHNhbmR5YnJpZGdlX3Bj b2RlX3dyaXRlKGRldl9wcml2LCBESVNQTEFZX0lQU19DT05UUk9MLCAwKSk7CiAJCW11dGV4X3Vu bG9jaygmZGV2X3ByaXYtPnJwcy5od19sb2NrKTsKQEAgLTU4NTIsNyArNTg1Miw3IEBAIHN0YXRp YyB2b2lkIGludGVsX3VwZGF0ZV9tYXhfY2RjbGsoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJ ZGV2X3ByaXYtPm1heF9jZGNsa19mcmVxID0gc2tsX2NhbGNfY2RjbGsobWF4X2NkY2xrLCB2Y28p OwogCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXYpKSB7CiAJCWRldl9wcml2LT5tYXhfY2RjbGtf ZnJlcSA9IDYyNDAwMDsKLQl9IGVsc2UgaWYgKElTX0JST0FEV0VMTChkZXYpKSAgeworCX0gZWxz ZSBpZiAoSVNfQlJPQURXRUxMKGRldl9wcml2KSkgIHsKIAkJLyoKIAkJICogRklYTUUgd2l0aCBl eHRyYSBjb29saW5nIHdlIGNhbiBhbGxvdwogCQkgKiA1NDAgTUh6IGZvciBVTFggYW5kIDY3NSBN aHogZm9yIFVMVC4KQEAgLTcwMjEsNiArNzAyMSw3IEBAIHN0YXRpYyBpbnQgcGlwZV9yZXF1aXJl ZF9mZGlfbGFuZXMoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiBzdGF0aWMg aW50IGlyb25sYWtlX2NoZWNrX2ZkaV9sYW5lcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBlbnVt IHBpcGUgcGlwZSwKIAkJCQkgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZp ZykKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7 CiAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0gcGlwZV9jb25maWctPmJhc2Uuc3Rh dGU7CiAJc3RydWN0IGludGVsX2NydGMgKm90aGVyX2NydGM7CiAJc3RydWN0IGludGVsX2NydGNf c3RhdGUgKm90aGVyX2NydGNfc3RhdGU7CkBAIC03MDMzLDcgKzcwMzQsNyBAQCBzdGF0aWMgaW50 IGlyb25sYWtlX2NoZWNrX2ZkaV9sYW5lcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBlbnVtIHBp cGUgcGlwZSwKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCi0JaWYgKElTX0hBU1dFTEwoZGV2KSB8 fCBJU19CUk9BRFdFTEwoZGV2KSkgeworCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSB8fCBJU19C Uk9BRFdFTEwoZGV2X3ByaXYpKSB7CiAJCWlmIChwaXBlX2NvbmZpZy0+ZmRpX2xhbmVzID4gMikg ewogCQkJRFJNX0RFQlVHX0tNUygib25seSAyIGxhbmVzIG9uIGhhc3dlbGwsIHJlcXVpcmVkOiAl aSBsYW5lc1xuIiwKIAkJCQkgICAgICBwaXBlX2NvbmZpZy0+ZmRpX2xhbmVzKTsKQEAgLTk4ODEs NyArOTg4Miw3IEBAIGlyb25sYWtlX2dldF9pbml0aWFsX3BsYW5lX2NvbmZpZyhzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YywKIAlmYi0+Yml0c19wZXJfcGl4ZWwgPSBkcm1fZm9ybWF0X3BsYW5lX2Nw cChmb3VyY2MsIDApICogODsKIAogCWJhc2UgPSBJOTE1X1JFQUQoRFNQU1VSRihwaXBlKSkgJiAw eGZmZmZmMDAwOwotCWlmIChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRldikpIHsK KwlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkgewog CQlvZmZzZXQgPSBJOTE1X1JFQUQoRFNQT0ZGU0VUKHBpcGUpKTsKIAl9IGVsc2UgewogCQlpZiAo cGxhbmVfY29uZmlnLT50aWxpbmcpCkBAIC0xNzI0NCw3ICsxNzI0NSw3IEBAIGludGVsX2Rpc3Bs YXlfcHJpbnRfZXJyb3Jfc3RhdGUoc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwK IAkJcmV0dXJuOwogCiAJZXJyX3ByaW50ZihtLCAiTnVtIFBpcGVzOiAlZFxuIiwgSU5URUxfSU5G TyhkZXYpLT5udW1fcGlwZXMpOwotCWlmIChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxM KGRldikpCisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJp dikpCiAJCWVycl9wcmludGYobSwgIlBXUl9XRUxMX0NUTDI6ICUwOHhcbiIsCiAJCQkgICBlcnJv ci0+cG93ZXJfd2VsbF9kcml2ZXIpOwogCWZvcl9lYWNoX3BpcGUoZGV2X3ByaXYsIGkpIHsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcC5jCmluZGV4IDJlMDZkZmI2NGJkNC4uMDJlNzRjNDY3YTU1IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RwLmMKQEAgLTgyMSwxNSArODIxLDE2IEBAIHN0YXRpYyB1aW50MzJf dCBnNHhfZ2V0X2F1eF9zZW5kX2N0bChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCQkJCSAg ICAgdWludDMyX3QgYXV4X2Nsb2NrX2RpdmlkZXIpCiB7CiAJc3RydWN0IGludGVsX2RpZ2l0YWxf cG9ydCAqaW50ZWxfZGlnX3BvcnQgPSBkcF90b19kaWdfcG9ydChpbnRlbF9kcCk7Ci0Jc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2RpZ19wb3J0LT5iYXNlLmJhc2UuZGV2OworCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9CisJCQl0b19pOTE1KGludGVsX2RpZ19wb3J0 LT5iYXNlLmJhc2UuZGV2KTsKIAl1aW50MzJfdCBwcmVjaGFyZ2UsIHRpbWVvdXQ7CiAKLQlpZiAo SVNfR0VONihkZXYpKQorCWlmIChJU19HRU42KGRldl9wcml2KSkKIAkJcHJlY2hhcmdlID0gMzsK IAllbHNlCiAJCXByZWNoYXJnZSA9IDU7CiAKLQlpZiAoSVNfQlJPQURXRUxMKGRldikgJiYgaW50 ZWxfZGlnX3BvcnQtPnBvcnQgPT0gUE9SVF9BKQorCWlmIChJU19CUk9BRFdFTEwoZGV2X3ByaXYp ICYmIGludGVsX2RpZ19wb3J0LT5wb3J0ID09IFBPUlRfQSkKIAkJdGltZW91dCA9IERQX0FVWF9D SF9DVExfVElNRV9PVVRfNjAwdXM7CiAJZWxzZQogCQl0aW1lb3V0ID0gRFBfQVVYX0NIX0NUTF9U SU1FX09VVF80MDB1czsKQEAgLTI5OTksMTAgKzMwMDAsMTAgQEAgaW50ZWxfZHBfdm9sdGFnZV9t YXgoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIHVpbnQ4X3QKIGludGVsX2RwX3ByZV9lbXBo YXNpc19tYXgoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwgdWludDhfdCB2b2x0YWdlX3N3aW5n KQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9kcF90b19kZXYoaW50ZWxfZHAp OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxfZHBf dG9fZGV2KGludGVsX2RwKSk7CiAJZW51bSBwb3J0IHBvcnQgPSBkcF90b19kaWdfcG9ydChpbnRl bF9kcCktPnBvcnQ7CiAKLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkgeworCWlmIChJ TlRFTF9HRU4oZGV2X3ByaXYpID49IDkpIHsKIAkJc3dpdGNoICh2b2x0YWdlX3N3aW5nICYgRFBf VFJBSU5fVk9MVEFHRV9TV0lOR19NQVNLKSB7CiAJCWNhc2UgRFBfVFJBSU5fVk9MVEFHRV9TV0lO R19MRVZFTF8wOgogCQkJcmV0dXJuIERQX1RSQUlOX1BSRV9FTVBIX0xFVkVMXzM7CkBAIC0zMDE1 LDcgKzMwMTYsNyBAQCBpbnRlbF9kcF9wcmVfZW1waGFzaXNfbWF4KHN0cnVjdCBpbnRlbF9kcCAq aW50ZWxfZHAsIHVpbnQ4X3Qgdm9sdGFnZV9zd2luZykKIAkJZGVmYXVsdDoKIAkJCXJldHVybiBE UF9UUkFJTl9QUkVfRU1QSF9MRVZFTF8wOwogCQl9Ci0JfSBlbHNlIGlmIChJU19IQVNXRUxMKGRl dikgfHwgSVNfQlJPQURXRUxMKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX0hBU1dFTEwoZGV2X3By aXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpIHsKIAkJc3dpdGNoICh2b2x0YWdlX3N3aW5n ICYgRFBfVFJBSU5fVk9MVEFHRV9TV0lOR19NQVNLKSB7CiAJCWNhc2UgRFBfVFJBSU5fVk9MVEFH RV9TV0lOR19MRVZFTF8wOgogCQkJcmV0dXJuIERQX1RSQUlOX1BSRV9FTVBIX0xFVkVMXzM7CkBA IC0zMDI3LDcgKzMwMjgsNyBAQCBpbnRlbF9kcF9wcmVfZW1waGFzaXNfbWF4KHN0cnVjdCBpbnRl bF9kcCAqaW50ZWxfZHAsIHVpbnQ4X3Qgdm9sdGFnZV9zd2luZykKIAkJZGVmYXVsdDoKIAkJCXJl dHVybiBEUF9UUkFJTl9QUkVfRU1QSF9MRVZFTF8wOwogCQl9Ci0JfSBlbHNlIGlmIChJU19WQUxM RVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJfSBlbHNlIGlmIChJU19WQUxM RVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQlzd2l0Y2gg KHZvbHRhZ2Vfc3dpbmcgJiBEUF9UUkFJTl9WT0xUQUdFX1NXSU5HX01BU0spIHsKIAkJY2FzZSBE UF9UUkFJTl9WT0xUQUdFX1NXSU5HX0xFVkVMXzA6CiAJCQlyZXR1cm4gRFBfVFJBSU5fUFJFX0VN UEhfTEVWRUxfMzsKQEAgLTMwMzksNyArMzA0MCw3IEBAIGludGVsX2RwX3ByZV9lbXBoYXNpc19t YXgoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwgdWludDhfdCB2b2x0YWdlX3N3aW5nKQogCQlk ZWZhdWx0OgogCQkJcmV0dXJuIERQX1RSQUlOX1BSRV9FTVBIX0xFVkVMXzA7CiAJCX0KLQl9IGVs c2UgaWYgKElTX0dFTjcoZGV2KSAmJiBwb3J0ID09IFBPUlRfQSkgeworCX0gZWxzZSBpZiAoSVNf R0VONyhkZXZfcHJpdikgJiYgcG9ydCA9PSBQT1JUX0EpIHsKIAkJc3dpdGNoICh2b2x0YWdlX3N3 aW5nICYgRFBfVFJBSU5fVk9MVEFHRV9TV0lOR19NQVNLKSB7CiAJCWNhc2UgRFBfVFJBSU5fVk9M VEFHRV9TV0lOR19MRVZFTF8wOgogCQkJcmV0dXJuIERQX1RSQUlOX1BSRV9FTVBIX0xFVkVMXzI7 CkBAIC01NjQ4LDcgKzU2NDksNyBAQCBpbnRlbF9kcF9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50 ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwKIAkvKiBpbnRlbF9kcCB2ZnVuY3MgKi8K IAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkKIAkJaW50ZWxfZHAtPmdldF9hdXhfY2xv Y2tfZGl2aWRlciA9IHNrbF9nZXRfYXV4X2Nsb2NrX2RpdmlkZXI7Ci0JZWxzZSBpZiAoSVNfSEFT V0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYpKQorCWVsc2UgaWYgKElTX0hBU1dFTEwoZGV2 X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpCiAJCWludGVsX2RwLT5nZXRfYXV4X2Ns b2NrX2RpdmlkZXIgPSBoc3dfZ2V0X2F1eF9jbG9ja19kaXZpZGVyOwogCWVsc2UgaWYgKEhBU19Q Q0hfU1BMSVQoZGV2X3ByaXYpKQogCQlpbnRlbF9kcC0+Z2V0X2F1eF9jbG9ja19kaXZpZGVyID0g aWxrX2dldF9hdXhfY2xvY2tfZGl2aWRlcjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDk5 NjFkN2IwNjFkOC4uNTVjOWM3NDM2MjY1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTIx NTcsNyArMjE1Nyw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3JlYWRfd21fbGF0ZW5jeShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCB1aW50MTZfdCB3bVs4XSkKIAkJCX0KIAkJfQogCi0JfSBlbHNlIGlm IChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRldikpIHsKKwl9IGVsc2UgaWYgKElT X0hBU1dFTEwoZGV2X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpIHsKIAkJdWludDY0 X3Qgc3NrcGQgPSBJOTE1X1JFQUQ2NChNQ0hfU1NLUEQpOwogCiAJCXdtWzBdID0gKHNza3BkID4+ IDU2KSAmIDB4RkY7CkBAIC0yMjA1LDEyICsyMjA1LDE0IEBAIHN0YXRpYyB2b2lkIGludGVsX2Zp eHVwX2N1cl93bV9sYXRlbmN5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAog aW50IGlsa193bV9tYXhfbGV2ZWwoY29uc3Qgc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKKwlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisKIAkvKiBo b3cgbWFueSBXTSBsZXZlbHMgYXJlIHdlIGV4cGVjdGluZyAqLwotCWlmIChJTlRFTF9JTkZPKGRl diktPmdlbiA+PSA5KQorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCiAJCXJldHVybiA3 OwotCWVsc2UgaWYgKElTX0hBU1dFTEwoZGV2KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkKKwllbHNl IGlmIChJU19IQVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKQogCQly ZXR1cm4gNDsKLQllbHNlIGlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA2KQorCWVsc2UgaWYg KElOVEVMX0dFTihkZXZfcHJpdikgPj0gNikKIAkJcmV0dXJuIDM7CiAJZWxzZQogCQlyZXR1cm4g MjsKQEAgLTIzOTMsNyArMjM5NSw3IEBAIHN0YXRpYyBpbnQgaWxrX2NvbXB1dGVfcGlwZV93bShz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQogCW1lbXNldCgmcGlwZV93bS0+d20sIDAs IHNpemVvZihwaXBlX3dtLT53bSkpOwogCXBpcGVfd20tPndtWzBdID0gcGlwZV93bS0+cmF3X3dt WzBdOwogCi0JaWYgKElTX0hBU1dFTEwoZGV2KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkKKwlpZiAo SVNfSEFTV0VMTChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkKIAkJcGlwZV93 bS0+bGluZXRpbWUgPSBoc3dfY29tcHV0ZV9saW5ldGltZV93bShjc3RhdGUpOwogCiAJaWYgKCFp bGtfdmFsaWRhdGVfcGlwZV93bShkZXYsIHBpcGVfd20pKQpAQCAtMjU4MCw3ICsyNTgyLDcgQEAg c3RhdGljIHVuc2lnbmVkIGludCBpbGtfd21fbHBfbGF0ZW5jeShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCBpbnQgbGV2ZWwpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShkZXYpOwogCi0JaWYgKElTX0hBU1dFTEwoZGV2KSB8fCBJU19CUk9BRFdFTEwoZGV2 KSkKKwlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkK IAkJcmV0dXJuIDIgKiBsZXZlbDsKIAllbHNlCiAJCXJldHVybiBkZXZfcHJpdi0+d20ucHJpX2xh dGVuY3lbbGV2ZWxdOwpAQCAtMjgwNCw3ICsyODA2LDcgQEAgc3RhdGljIHZvaWQgaWxrX3dyaXRl X3dtX3ZhbHVlcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCUk5MTVfV1JJ VEUoUElQRV9XTV9MSU5FVElNRShQSVBFX0MpLCByZXN1bHRzLT53bV9saW5ldGltZVsyXSk7CiAK IAlpZiAoZGlydHkgJiBXTV9ESVJUWV9EREIpIHsKLQkJaWYgKElTX0hBU1dFTEwoZGV2KSB8fCBJ U19CUk9BRFdFTEwoZGV2KSkgeworCQlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwgSVNfQlJP QURXRUxMKGRldl9wcml2KSkgewogCQkJdmFsID0gSTkxNV9SRUFEKFdNX01JU0MpOwogCQkJaWYg KHJlc3VsdHMtPnBhcnRpdGlvbmluZyA9PSBJTlRFTF9EREJfUEFSVF8xXzIpCiAJCQkJdmFsICY9 IH5XTV9NSVNDX0RBVEFfUEFSVElUSU9OXzVfNjsKQEAgLTQ0MTUsNyArNDQxNyw3IEBAIHN0YXRp YyB2b2lkIGlsa19waXBlX3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJ fTsKIAogCWh3LT53bV9waXBlW3BpcGVdID0gSTkxNV9SRUFEKHdtMF9waXBlX3JlZ1twaXBlXSk7 Ci0JaWYgKElTX0hBU1dFTEwoZGV2KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkKKwlpZiAoSVNfSEFT V0VMTChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkKIAkJaHctPndtX2xpbmV0 aW1lW3BpcGVdID0gSTkxNV9SRUFEKFBJUEVfV01fTElORVRJTUUocGlwZSkpOwogCiAJbWVtc2V0 KGFjdGl2ZSwgMCwgc2l6ZW9mKCphY3RpdmUpKTsKQEAgLTQ2MjMsNyArNDYyNSw3IEBAIHZvaWQg aWxrX3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlody0+d21fbHBf c3ByWzJdID0gSTkxNV9SRUFEKFdNM1NfTFBfSVZCKTsKIAl9CiAKLQlpZiAoSVNfSEFTV0VMTChk ZXYpIHx8IElTX0JST0FEV0VMTChkZXYpKQorCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSB8fCBJ U19CUk9BRFdFTEwoZGV2X3ByaXYpKQogCQlody0+cGFydGl0aW9uaW5nID0gKEk5MTVfUkVBRChX TV9NSVNDKSAmIFdNX01JU0NfREFUQV9QQVJUSVRJT05fNV82KSA/CiAJCQlJTlRFTF9EREJfUEFS VF81XzYgOiBJTlRFTF9EREJfUEFSVF8xXzI7CiAJZWxzZSBpZiAoSVNfSVZZQlJJREdFKGRldl9w cml2KSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKaW5kZXggOWUyZmJhYzk3NzZlLi5kMDY2N2Y5 ZDkxNzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCkBAIC04MjcsMTQgKzgyNywxNCBAQCB2 b2lkIGludGVsX3Bzcl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAkvKiBQZXIgcGxh dGZvcm0gZGVmYXVsdCAqLwogCWlmIChpOTE1LmVuYWJsZV9wc3IgPT0gLTEpIHsKLQkJaWYgKElT X0hBU1dFTEwoZGV2KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkKKwkJaWYgKElTX0hBU1dFTEwoZGV2 X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpCiAJCQlpOTE1LmVuYWJsZV9wc3IgPSAx OwogCQllbHNlCiAJCQlpOTE1LmVuYWJsZV9wc3IgPSAwOwogCX0KIAogCS8qIFNldCBsaW5rX3N0 YW5kYnkgeCBsaW5rX29mZiBkZWZhdWx0cyAqLwotCWlmIChJU19IQVNXRUxMKGRldikgfHwgSVNf QlJPQURXRUxMKGRldikpCisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpIHx8IElTX0JST0FEV0VM TChkZXZfcHJpdikpCiAJCS8qIEhTVyBhbmQgQkRXIHJlcXVpcmUgd29ya2Fyb3VuZHMgdGhhdCB3 ZSBkb24ndCBpbXBsZW1lbnQuICovCiAJCWRldl9wcml2LT5wc3IubGlua19zdGFuZGJ5ID0gZmFs c2U7CiAJZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYwppbmRleCBlZDFmYWYxNGY3Nzcu Ljc3ZWYwM2NiNjE2MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVu dGltZV9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYwpA QCAtMjg4LDcgKzI4OCw2IEBAIHZvaWQgaW50ZWxfZGlzcGxheV9zZXRfaW5pdF9wb3dlcihzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiBzdGF0aWMgdm9pZCBoc3dfcG93ZXJfd2Vs bF9wb3N0X2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3Ry dWN0IHBjaV9kZXYgKnBkZXYgPSBkZXZfcHJpdi0+ZHJtLnBkZXY7Ci0Jc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9ICZkZXZfcHJpdi0+ZHJtOwogCiAJLyoKIAkgKiBBZnRlciB3ZSByZS1lbmFibGUg dGhlIHBvd2VyIHdlbGwsIGlmIHdlIHRvdWNoIFZHQSByZWdpc3RlciAweDNkNQpAQCAtMzA0LDcg KzMwMyw3IEBAIHN0YXRpYyB2b2lkIGhzd19wb3dlcl93ZWxsX3Bvc3RfZW5hYmxlKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlvdXRiKGluYihWR0FfTVNSX1JFQUQpLCBWR0Ff TVNSX1dSSVRFKTsKIAl2Z2FfcHV0KHBkZXYsIFZHQV9SU1JDX0xFR0FDWV9JTyk7CiAKLQlpZiAo SVNfQlJPQURXRUxMKGRldikpCisJaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikpCiAJCWdlbjhf aXJxX3Bvd2VyX3dlbGxfcG9zdF9lbmFibGUoZGV2X3ByaXYsCiAJCQkJCQkxIDw8IFBJUEVfQyB8 IDEgPDwgUElQRV9CKTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggZDBm Nzk4Y2U2YmIyLi5mZWZkMzAzNGFlYWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5j CkBAIC01NDIsMTIgKzU0MiwxMiBAQCBpdmJfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lLAogCWlmIChmYi0+bW9kaWZpZXJbMF0gPT0gSTkxNV9GT1JNQVRfTU9EX1hfVElMRUQp CiAJCXNwcmN0bCB8PSBTUFJJVEVfVElMRUQ7CiAKLQlpZiAoSVNfSEFTV0VMTChkZXYpIHx8IElT X0JST0FEV0VMTChkZXYpKQorCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdF TEwoZGV2X3ByaXYpKQogCQlzcHJjdGwgJj0gflNQUklURV9UUklDS0xFX0ZFRURfRElTQUJMRTsK IAllbHNlCiAJCXNwcmN0bCB8PSBTUFJJVEVfVFJJQ0tMRV9GRUVEX0RJU0FCTEU7CiAKLQlpZiAo SVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYpKQorCWlmIChJU19IQVNXRUxMKGRl dl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKQogCQlzcHJjdGwgfD0gU1BSSVRFX1BJ UEVfQ1NDX0VOQUJMRTsKIAogCS8qIFNpemVzIGFyZSAwIGJhc2VkICovCkBAIC01NjYsNyArNTY2 LDcgQEAgaXZiX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJc3ByY3Rs IHw9IFNQUklURV9ST1RBVEVfMTgwOwogCiAJCS8qIEhTVyBhbmQgQkRXIGRvZXMgdGhpcyBhdXRv bWFnaWNhbGx5IGluIGhhcmR3YXJlICovCi0JCWlmICghSVNfSEFTV0VMTChkZXYpICYmICFJU19C Uk9BRFdFTEwoZGV2KSkgeworCQlpZiAoIUlTX0hBU1dFTEwoZGV2X3ByaXYpICYmICFJU19CUk9B RFdFTEwoZGV2X3ByaXYpKSB7CiAJCQl4ICs9IHNyY193OwogCQkJeSArPSBzcmNfaDsKIAkJfQpA QCAtNTkwLDcgKzU5MCw3IEBAIGl2Yl91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxh bmUsCiAKIAkvKiBIU1cgY29uc29saWRhdGVzIFNQUlRJTEVPRkYgYW5kIFNQUkxJTk9GRiBpbnRv IGEgc2luZ2xlIFNQUk9GRlNFVAogCSAqIHJlZ2lzdGVyICovCi0JaWYgKElTX0hBU1dFTEwoZGV2 KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkKKwlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwgSVNf QlJPQURXRUxMKGRldl9wcml2KSkKIAkJSTkxNV9XUklURShTUFJPRkZTRVQocGlwZSksICh5IDw8 IDE2KSB8IHgpOwogCWVsc2UgaWYgKGZiLT5tb2RpZmllclswXSA9PSBJOTE1X0ZPUk1BVF9NT0Rf WF9USUxFRCkKIAkJSTkxNV9XUklURShTUFJUSUxFT0ZGKHBpcGUpLCAoeSA8PCAxNikgfCB4KTsK LS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK