From: Tvrtko Ursulin Subject: [PATCH 16/22] drm/i915: Make IS_BROXTON only take dev_priv Date: Wed, 5 Oct 2016 13:33:43 +0100 Message-ID: <1475670829-14025-17-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1475670829-14025-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-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6DD8F6E830 for ; Wed, 5 Oct 2016 12:34:17 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id b184so24370925wma.3 for ; Wed, 05 Oct 2016 05:34:17 -0700 (PDT) In-Reply-To: <1475670829-14025-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDEz OTIgYnl0ZXMgb2YgLnJvZGF0YSBzdHJpbmdzLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3Vs aW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5jICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aCAgICAgICAgIHwgIDUgKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5j ICAgICB8IDQwICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9pcnEuYyAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RkaS5jICAgICAgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYyAgICB8IDMxICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RwLmMgICAgICAgICB8IDE2ICsrKysrKy0tLS0tLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kc2kuYyAgICAgICAgfCAyNyArKysrKysrKysrKy0tLS0tLS0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2lfcGxsLmMgICAgfCAyNiArKysrKysrKysrLS0tLS0t LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyB8ICA4ICsrKy0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYyAgICAgICB8ICA2ICsrLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgfCAgMiArLQogMTMgZmlsZXMg Y2hhbmdlZCwgODkgaW5zZXJ0aW9ucygrKSwgODIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmMKaW5kZXggZDg1NGVhNGE3ZTkyLi4xOGFmNmQxY2NlYzkgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuYwpAQCAtMjQzNyw3ICsyNDM3LDcgQEAgc3RhdGljIGludCBpbnRlbF9ydW50aW1l X3Jlc3VtZShzdHJ1Y3QgZGV2aWNlICprZGV2KQogCWlmIChJU19HRU42KGRldl9wcml2KSkKIAkJ aW50ZWxfaW5pdF9wY2hfcmVmY2xrKGRldik7CiAKLQlpZiAoSVNfQlJPWFRPTihkZXYpKSB7CisJ aWYgKElTX0JST1hUT04oZGV2X3ByaXYpKSB7CiAJCWJ4dF9kaXNhYmxlX2RjOShkZXZfcHJpdik7 CiAJCWJ4dF9kaXNwbGF5X2NvcmVfaW5pdChkZXZfcHJpdiwgdHJ1ZSk7CiAJCWlmIChkZXZfcHJp di0+Y3NyLmRtY19wYXlsb2FkICYmCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAwYWVlZDFl MzFjMTcuLjNhNWFhYzIxZjEzMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yNjY2LDcg KzI2NjYsNyBAQCBzdHJ1Y3QgZHJtX2k5MTVfY21kX3RhYmxlIHsKICNkZWZpbmUgSVNfSEFTV0VM TChkZXZfcHJpdikJKGRldl9wcml2LT5pbmZvLmlzX2hhc3dlbGwpCiAjZGVmaW5lIElTX0JST0FE V0VMTChkZXZfcHJpdikJKGRldl9wcml2LT5pbmZvLmlzX2Jyb2Fkd2VsbCkKICNkZWZpbmUgSVNf U0tZTEFLRShkZXZfcHJpdikJKGRldl9wcml2LT5pbmZvLmlzX3NreWxha2UpCi0jZGVmaW5lIElT X0JST1hUT04oZGV2KQkJKElOVEVMX0lORk8oZGV2KS0+aXNfYnJveHRvbikKKyNkZWZpbmUgSVNf QlJPWFRPTihkZXZfcHJpdikJKGRldl9wcml2LT5pbmZvLmlzX2Jyb3h0b24pCiAjZGVmaW5lIElT X0tBQllMQUtFKGRldl9wcml2KQkoZGV2X3ByaXYtPmluZm8uaXNfa2FieWxha2UpCiAjZGVmaW5l IElTX01PQklMRShkZXYpCQkoSU5URUxfSU5GTyhkZXYpLT5pc19tb2JpbGUpCiAjZGVmaW5lIElT X0hTV19FQVJMWV9TRFYoZGV2X3ByaXYpIChJU19IQVNXRUxMKGRldl9wcml2KSAmJiBcCkBAIC0y NzI2LDcgKzI3MjYsOCBAQCBzdHJ1Y3QgZHJtX2k5MTVfY21kX3RhYmxlIHsKICNkZWZpbmUgQlhU X1JFVklEX0IwCQkweDMKICNkZWZpbmUgQlhUX1JFVklEX0MwCQkweDkKIAotI2RlZmluZSBJU19C WFRfUkVWSUQocCwgc2luY2UsIHVudGlsKSAoSVNfQlJPWFRPTihwKSAmJiBJU19SRVZJRChwLCBz aW5jZSwgdW50aWwpKQorI2RlZmluZSBJU19CWFRfUkVWSUQoZGV2X3ByaXYsIHNpbmNlLCB1bnRp bCkgXAorCShJU19CUk9YVE9OKGRldl9wcml2KSAmJiBJU19SRVZJRChkZXZfcHJpdiwgc2luY2Us IHVudGlsKSkKIAogI2RlZmluZSBLQkxfUkVWSURfQTAJCTB4MAogI2RlZmluZSBLQkxfUkVWSURf QjAJCTB4MQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCBjZjQzYTU2MzI5NjEu LmU2Mjg2OTFmZTk3ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTM3Mywy NyArMzczLDI5IEBAIHN0YXRpYyB2b2lkICprbWFwX3BhZ2VfZG1hKHN0cnVjdCBpOTE1X3BhZ2Vf ZG1hICpwKQogLyogV2UgdXNlIHRoZSBmbHVzaGluZyB1bm1hcCBvbmx5IHdpdGggcHBndHQgc3Ry dWN0dXJlczoKICAqIHBhZ2UgZGlyZWN0b3JpZXMsIHBhZ2UgdGFibGVzIGFuZCBzY3JhdGNoIHBh Z2VzLgogICovCi1zdGF0aWMgdm9pZCBrdW5tYXBfcGFnZV9kbWEoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgdm9pZCAqdmFkZHIpCitzdGF0aWMgdm9pZCBrdW5tYXBfcGFnZV9kbWEoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB2b2lkICp2YWRkcikKIHsKIAkvKiBUaGVyZSBhcmUg b25seSBmZXcgZXhjZXB0aW9ucyBmb3IgZ2VuID49Ni4gY2h2IGFuZCBieHQuCiAJICogQW5kIHdl IGFyZSBub3Qgc3VyZSBhYm91dCB0aGUgbGF0dGVyIHNvIHBsYXkgc2FmZSBmb3Igbm93LgogCSAq LwotCWlmIChJU19DSEVSUllWSUVXKGRldikgfHwgSVNfQlJPWFRPTihkZXYpKQorCWlmIChJU19D SEVSUllWSUVXKGRldl9wcml2KSB8fCBJU19CUk9YVE9OKGRldl9wcml2KSkKIAkJZHJtX2NsZmx1 c2hfdmlydF9yYW5nZSh2YWRkciwgUEFHRV9TSVpFKTsKIAogCWt1bm1hcF9hdG9taWModmFkZHIp OwogfQogCiAjZGVmaW5lIGttYXBfcHgocHgpIGttYXBfcGFnZV9kbWEocHhfYmFzZShweCkpCi0j ZGVmaW5lIGt1bm1hcF9weChwcGd0dCwgdmFkZHIpIGt1bm1hcF9wYWdlX2RtYSgocHBndHQpLT5i YXNlLmRldiwgKHZhZGRyKSkKKyNkZWZpbmUga3VubWFwX3B4KHBwZ3R0LCB2YWRkcikgXAorCQlr dW5tYXBfcGFnZV9kbWEodG9faTkxNSgocHBndHQpLT5iYXNlLmRldiksICh2YWRkcikpCiAKICNk ZWZpbmUgc2V0dXBfcHgoZGV2LCBweCkgc2V0dXBfcGFnZV9kbWEoKGRldiksIHB4X2Jhc2UocHgp KQogI2RlZmluZSBjbGVhbnVwX3B4KGRldiwgcHgpIGNsZWFudXBfcGFnZV9kbWEoKGRldiksIHB4 X2Jhc2UocHgpKQotI2RlZmluZSBmaWxsX3B4KGRldiwgcHgsIHYpIGZpbGxfcGFnZV9kbWEoKGRl diksIHB4X2Jhc2UocHgpLCAodikpCi0jZGVmaW5lIGZpbGwzMl9weChkZXYsIHB4LCB2KSBmaWxs X3BhZ2VfZG1hXzMyKChkZXYpLCBweF9iYXNlKHB4KSwgKHYpKQorI2RlZmluZSBmaWxsX3B4KGRl dl9wcml2LCBweCwgdikgZmlsbF9wYWdlX2RtYSgoZGV2X3ByaXYpLCBweF9iYXNlKHB4KSwgKHYp KQorI2RlZmluZSBmaWxsMzJfcHgoZGV2X3ByaXYsIHB4LCB2KSBcCisJCWZpbGxfcGFnZV9kbWFf MzIoKGRldl9wcml2KSwgcHhfYmFzZShweCksICh2KSkKIAotc3RhdGljIHZvaWQgZmlsbF9wYWdl X2RtYShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaTkxNV9wYWdlX2RtYSAqcCwKLQkJ CSAgY29uc3QgdWludDY0X3QgdmFsKQorc3RhdGljIHZvaWQgZmlsbF9wYWdlX2RtYShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkgIHN0cnVjdCBpOTE1X3BhZ2VfZG1hICpw LCBjb25zdCB1aW50NjRfdCB2YWwpCiB7CiAJaW50IGk7CiAJdWludDY0X3QgKiBjb25zdCB2YWRk ciA9IGttYXBfcGFnZV9kbWEocCk7CkBAIC00MDEsMTcgKzQwMywxNyBAQCBzdGF0aWMgdm9pZCBm aWxsX3BhZ2VfZG1hKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpOTE1X3BhZ2VfZG1h ICpwLAogCWZvciAoaSA9IDA7IGkgPCA1MTI7IGkrKykKIAkJdmFkZHJbaV0gPSB2YWw7CiAKLQlr dW5tYXBfcGFnZV9kbWEoZGV2LCB2YWRkcik7CisJa3VubWFwX3BhZ2VfZG1hKGRldl9wcml2LCB2 YWRkcik7CiB9CiAKLXN0YXRpYyB2b2lkIGZpbGxfcGFnZV9kbWFfMzIoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgc3RydWN0IGk5MTVfcGFnZV9kbWEgKnAsCi0JCQkgICAgIGNvbnN0IHVpbnQzMl90 IHZhbDMyKQorc3RhdGljIHZvaWQgZmlsbF9wYWdlX2RtYV8zMihzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCisJCQkgICAgIHN0cnVjdCBpOTE1X3BhZ2VfZG1hICpwLCBjb25zdCB1 aW50MzJfdCB2YWwzMikKIHsKIAl1aW50NjRfdCB2ID0gdmFsMzI7CiAKIAl2ID0gdiA8PCAzMiB8 IHZhbDMyOwogCi0JZmlsbF9wYWdlX2RtYShkZXYsIHAsIHYpOworCWZpbGxfcGFnZV9kbWEoZGV2 X3ByaXYsIHAsIHYpOwogfQogCiBzdGF0aWMgaW50CkBAIC00NzQsNyArNDc2LDcgQEAgc3RhdGlj IHZvaWQgZ2VuOF9pbml0aWFsaXplX3B0KHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAog CXNjcmF0Y2hfcHRlID0gZ2VuOF9wdGVfZW5jb2RlKHZtLT5zY3JhdGNoX3BhZ2UuZGFkZHIsCiAJ CQkJICAgICAgSTkxNV9DQUNIRV9MTEMsIHRydWUpOwogCi0JZmlsbF9weCh2bS0+ZGV2LCBwdCwg c2NyYXRjaF9wdGUpOworCWZpbGxfcHgodG9faTkxNSh2bS0+ZGV2KSwgcHQsIHNjcmF0Y2hfcHRl KTsKIH0KIAogc3RhdGljIHZvaWQgZ2VuNl9pbml0aWFsaXplX3B0KHN0cnVjdCBpOTE1X2FkZHJl c3Nfc3BhY2UgKnZtLApAQCAtNDg3LDcgKzQ4OSw3IEBAIHN0YXRpYyB2b2lkIGdlbjZfaW5pdGlh bGl6ZV9wdChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAlzY3JhdGNoX3B0ZSA9IHZt LT5wdGVfZW5jb2RlKHZtLT5zY3JhdGNoX3BhZ2UuZGFkZHIsCiAJCQkJICAgICBJOTE1X0NBQ0hF X0xMQywgdHJ1ZSwgMCk7CiAKLQlmaWxsMzJfcHgodm0tPmRldiwgcHQsIHNjcmF0Y2hfcHRlKTsK KwlmaWxsMzJfcHgodG9faTkxNSh2bS0+ZGV2KSwgcHQsIHNjcmF0Y2hfcHRlKTsKIH0KIAogc3Rh dGljIHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICphbGxvY19wZChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQpAQCAtNTM0LDcgKzUzNiw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfaW5pdGlhbGl6ZV9w ZChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAogCXNjcmF0Y2hfcGRlID0gZ2VuOF9w ZGVfZW5jb2RlKHB4X2RtYSh2bS0+c2NyYXRjaF9wdCksIEk5MTVfQ0FDSEVfTExDKTsKIAotCWZp bGxfcHgodm0tPmRldiwgcGQsIHNjcmF0Y2hfcGRlKTsKKwlmaWxsX3B4KHRvX2k5MTUodm0tPmRl diksIHBkLCBzY3JhdGNoX3BkZSk7CiB9CiAKIHN0YXRpYyBpbnQgX19wZHBfaW5pdChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LApAQCAtNjE1LDcgKzYxNyw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfaW5p dGlhbGl6ZV9wZHAoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAKIAlzY3JhdGNoX3Bk cGUgPSBnZW44X3BkcGVfZW5jb2RlKHB4X2RtYSh2bS0+c2NyYXRjaF9wZCksIEk5MTVfQ0FDSEVf TExDKTsKIAotCWZpbGxfcHgodm0tPmRldiwgcGRwLCBzY3JhdGNoX3BkcGUpOworCWZpbGxfcHgo dG9faTkxNSh2bS0+ZGV2KSwgcGRwLCBzY3JhdGNoX3BkcGUpOwogfQogCiBzdGF0aWMgdm9pZCBn ZW44X2luaXRpYWxpemVfcG1sNChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKQEAgLTYy Niw3ICs2MjgsNyBAQCBzdGF0aWMgdm9pZCBnZW44X2luaXRpYWxpemVfcG1sNChzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKIAlzY3JhdGNoX3BtbDRlID0gZ2VuOF9wbWw0ZV9lbmNvZGUo cHhfZG1hKHZtLT5zY3JhdGNoX3BkcCksCiAJCQkJCSAgSTkxNV9DQUNIRV9MTEMpOwogCi0JZmls bF9weCh2bS0+ZGV2LCBwbWw0LCBzY3JhdGNoX3BtbDRlKTsKKwlmaWxsX3B4KHRvX2k5MTUodm0t PmRldiksIHBtbDQsIHNjcmF0Y2hfcG1sNGUpOwogfQogCiBzdGF0aWMgdm9pZApAQCAtMjEzNSw3 ICsyMTM3LDcgQEAgc3RhdGljIHZvaWQgZ3R0X3dyaXRlX3dvcmthcm91bmRzKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJCUk5MTVfV1JJVEUoR0VOOF9MM19MUkFfMV9HUEdQVSwgR0VOOF9MM19M UkFfMV9HUEdQVV9ERUZBVUxUX1ZBTFVFX0NIVik7CiAJZWxzZSBpZiAoSVNfU0tZTEFLRShkZXZf cHJpdikpCiAJCUk5MTVfV1JJVEUoR0VOOF9MM19MUkFfMV9HUEdQVSwgR0VOOV9MM19MUkFfMV9H UEdQVV9ERUZBVUxUX1ZBTFVFX1NLTCk7Ci0JZWxzZSBpZiAoSVNfQlJPWFRPTihkZXYpKQorCWVs c2UgaWYgKElTX0JST1hUT04oZGV2X3ByaXYpKQogCQlJOTE1X1dSSVRFKEdFTjhfTDNfTFJBXzFf R1BHUFUsIEdFTjlfTDNfTFJBXzFfR1BHUFVfREVGQVVMVF9WQUxVRV9CWFQpOwogfQogCkBAIC0y ODk1LDcgKzI4OTcsNyBAQCBzdGF0aWMgaW50IGdndHRfcHJvYmVfY29tbW9uKHN0cnVjdCBpOTE1 X2dndHQgKmdndHQsIHU2NCBzaXplKQogCSAqIHJlc29ydCB0byBhbiB1bmNhY2hlZCBtYXBwaW5n LiBUaGUgV0MgaXNzdWUgaXMgZWFzaWx5IGNhdWdodCBieSB0aGUKIAkgKiByZWFkYmFjayBjaGVj ayB3aGVuIHdyaXRpbmcgR1RUIFBURSBlbnRyaWVzLgogCSAqLwotCWlmIChJU19CUk9YVE9OKGdn dHQtPmJhc2UuZGV2KSkKKwlpZiAoSVNfQlJPWFRPTih0b19pOTE1KGdndHQtPmJhc2UuZGV2KSkp CiAJCWdndHQtPmdzbSA9IGlvcmVtYXBfbm9jYWNoZShwaHlzX2FkZHIsIHNpemUpOwogCWVsc2UK IAkJZ2d0dC0+Z3NtID0gaW9yZW1hcF93YyhwaHlzX2FkZHIsIHNpemUpOwpAQCAtMzI2Nyw3ICsz MjY5LDcgQEAgdm9pZCBpOTE1X2dlbV9yZXN0b3JlX2d0dF9tYXBwaW5ncyhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCWdndHQtPmJhc2UuY2xvc2VkID0gZmFsc2U7CiAKIAlpZiAoSU5URUxfSU5G TyhkZXYpLT5nZW4gPj0gOCkgewotCQlpZiAoSVNfQ0hFUlJZVklFVyhkZXYpIHx8IElTX0JST1hU T04oZGV2KSkKKwkJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpIHx8IElTX0JST1hUT04oZGV2 X3ByaXYpKQogCQkJY2h2X3NldHVwX3ByaXZhdGVfcHBhdChkZXZfcHJpdik7CiAJCWVsc2UKIAkJ CWJkd19zZXR1cF9wcml2YXRlX3BwYXQoZGV2X3ByaXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMK aW5kZXggNDczMzdhYWJjMzI2Li43NWY0YmE5MzVlYmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEu YwpAQCAtNDU5Nyw3ICs0NTk3LDcgQEAgdm9pZCBpbnRlbF9pcnFfaW5pdChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCWRldi0+ZHJpdmVyLT5pcnFfdW5pbnN0YWxsID0gZ2Vu OF9pcnFfdW5pbnN0YWxsOwogCQlkZXYtPmRyaXZlci0+ZW5hYmxlX3ZibGFuayA9IGdlbjhfZW5h YmxlX3ZibGFuazsKIAkJZGV2LT5kcml2ZXItPmRpc2FibGVfdmJsYW5rID0gZ2VuOF9kaXNhYmxl X3ZibGFuazsKLQkJaWYgKElTX0JST1hUT04oZGV2KSkKKwkJaWYgKElTX0JST1hUT04oZGV2X3By aXYpKQogCQkJZGV2X3ByaXYtPmRpc3BsYXkuaHBkX2lycV9zZXR1cCA9IGJ4dF9ocGRfaXJxX3Nl dHVwOwogCQllbHNlIGlmIChIQVNfUENIX1NQVChkZXZfcHJpdikgfHwgSEFTX1BDSF9LQlAoZGV2 X3ByaXYpKQogCQkJZGV2X3ByaXYtPmRpc3BsYXkuaHBkX2lycV9zZXR1cCA9IHNwdF9ocGRfaXJx X3NldHVwOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYwppbmRleCAwNzE2NGUyNTBhZGYuLmE3NmFm ZDdhNjYxNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKQEAgLTI1MDksNyArMjUwOSw3IEBA IHZvaWQgaW50ZWxfZGRpX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBwb3J0IHBv cnQpCiAJICogY29uZmlndXJhdGlvbiBzbyB0aGF0IHdlIHVzZSB0aGUgcHJvcGVyIGxhbmUgY291 bnQgZm9yIG91cgogCSAqIGNhbGN1bGF0aW9ucy4KIAkgKi8KLQlpZiAoSVNfQlJPWFRPTihkZXYp ICYmIHBvcnQgPT0gUE9SVF9BKSB7CisJaWYgKElTX0JST1hUT04oZGV2X3ByaXYpICYmIHBvcnQg PT0gUE9SVF9BKSB7CiAJCWlmICghKGludGVsX2RpZ19wb3J0LT5zYXZlZF9wb3J0X2JpdHMgJiBE RElfQV80X0xBTkVTKSkgewogCQkJRFJNX0RFQlVHX0tNUygiQlhUIEJJT1MgZm9yZ290IHRvIHNl dCBERElfQV80X0xBTkVTIGZvciBwb3J0IEE7IGZpeGluZ1xuIik7CiAJCQlpbnRlbF9kaWdfcG9y dC0+c2F2ZWRfcG9ydF9iaXRzIHw9IERESV9BXzRfTEFORVM7CkBAIC0yNTMzLDcgKzI1MzMsNyBA QCB2b2lkIGludGVsX2RkaV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVudW0gcG9ydCBw b3J0KQogCQkgKiBPbiBCWFQgQTAvQTEsIHN3IG5lZWRzIHRvIGFjdGl2YXRlIERESUEgSFBEIGxv Z2ljIGFuZAogCQkgKiBpbnRlcnJ1cHRzIHRvIGNoZWNrIHRoZSBleHRlcm5hbCBwYW5lbCBjb25u ZWN0aW9uLgogCQkgKi8KLQkJaWYgKElTX0JYVF9SRVZJRChkZXYsIDAsIEJYVF9SRVZJRF9BMSkg JiYgcG9ydCA9PSBQT1JUX0IpCisJCWlmIChJU19CWFRfUkVWSUQoZGV2X3ByaXYsIDAsIEJYVF9S RVZJRF9BMSkgJiYgcG9ydCA9PSBQT1JUX0IpCiAJCQlkZXZfcHJpdi0+aG90cGx1Zy5pcnFfcG9y dFtQT1JUX0FdID0gaW50ZWxfZGlnX3BvcnQ7CiAJCWVsc2UKIAkJCWRldl9wcml2LT5ob3RwbHVn LmlycV9wb3J0W3BvcnRdID0gaW50ZWxfZGlnX3BvcnQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKaW5kZXggNmUyODAxMTExODYwLi5lMTFlZDkxOGE0NTIgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTYwMCw3ICs2MDAsNyBAQCBpbnQgY2h2X2NhbGNfZHBs bF9wYXJhbXMoaW50IHJlZmNsaywgc3RydWN0IGRwbGwgKmNsb2NrKQogICogdGhlIGdpdmVuIGNv bm5lY3RvcnMuCiAgKi8KIAotc3RhdGljIGJvb2wgaW50ZWxfUExMX2lzX3ZhbGlkKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCitzdGF0aWMgYm9vbCBpbnRlbF9QTExfaXNfdmFsaWQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9s aW1pdCAqbGltaXQsCiAJCQkgICAgICAgY29uc3Qgc3RydWN0IGRwbGwgKmNsb2NrKQogewpAQCAt NjEzLDEyICs2MTMsMTMgQEAgc3RhdGljIGJvb2wgaW50ZWxfUExMX2lzX3ZhbGlkKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCiAJaWYgKGNsb2NrLT5tMSAgPCBsaW1pdC0+bTEubWluICB8fCBsaW1p dC0+bTEubWF4ICA8IGNsb2NrLT5tMSkKIAkJSU5URUxQbGxJbnZhbGlkKCJtMSBvdXQgb2YgcmFu Z2VcbiIpOwogCi0JaWYgKCFJU19QSU5FVklFVyhkZXYpICYmICFJU19WQUxMRVlWSUVXKGRldikg JiYKLQkgICAgIUlTX0NIRVJSWVZJRVcoZGV2KSAmJiAhSVNfQlJPWFRPTihkZXYpKQorCWlmICgh SVNfUElORVZJRVcoZGV2X3ByaXYpICYmICFJU19WQUxMRVlWSUVXKGRldl9wcml2KSAmJgorCSAg ICAhSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikgJiYgIUlTX0JST1hUT04oZGV2X3ByaXYpKQogCQlp ZiAoY2xvY2stPm0xIDw9IGNsb2NrLT5tMikKIAkJCUlOVEVMUGxsSW52YWxpZCgibTEgPD0gbTJc biIpOwogCi0JaWYgKCFJU19WQUxMRVlWSUVXKGRldikgJiYgIUlTX0NIRVJSWVZJRVcoZGV2KSAm JiAhSVNfQlJPWFRPTihkZXYpKSB7CisJaWYgKCFJU19WQUxMRVlWSUVXKGRldl9wcml2KSAmJiAh SVNfQ0hFUlJZVklFVyhkZXZfcHJpdikgJiYKKwkgICAgIUlTX0JST1hUT04oZGV2X3ByaXYpKSB7 CiAJCWlmIChjbG9jay0+cCA8IGxpbWl0LT5wLm1pbiB8fCBsaW1pdC0+cC5tYXggPCBjbG9jay0+ cCkKIAkJCUlOVEVMUGxsSW52YWxpZCgicCBvdXQgb2YgcmFuZ2VcbiIpOwogCQlpZiAoY2xvY2st Pm0gPCBsaW1pdC0+bS5taW4gfHwgbGltaXQtPm0ubWF4IDwgY2xvY2stPm0pCkBAIC02OTgsNyAr Njk5LDggQEAgaTl4eF9maW5kX2Jlc3RfZHBsbChjb25zdCBzdHJ1Y3QgaW50ZWxfbGltaXQgKmxp bWl0LAogCQkJCQlpbnQgdGhpc19lcnI7CiAKIAkJCQkJaTl4eF9jYWxjX2RwbGxfcGFyYW1zKHJl ZmNsaywgJmNsb2NrKTsKLQkJCQkJaWYgKCFpbnRlbF9QTExfaXNfdmFsaWQoZGV2LCBsaW1pdCwK KwkJCQkJaWYgKCFpbnRlbF9QTExfaXNfdmFsaWQodG9faTkxNShkZXYpLAorCQkJCQkJCQlsaW1p dCwKIAkJCQkJCQkJJmNsb2NrKSkKIAkJCQkJCWNvbnRpbnVlOwogCQkJCQlpZiAobWF0Y2hfY2xv Y2sgJiYKQEAgLTc1Myw3ICs3NTUsOCBAQCBwbnZfZmluZF9iZXN0X2RwbGwoY29uc3Qgc3RydWN0 IGludGVsX2xpbWl0ICpsaW1pdCwKIAkJCQkJaW50IHRoaXNfZXJyOwogCiAJCQkJCXBudl9jYWxj X2RwbGxfcGFyYW1zKHJlZmNsaywgJmNsb2NrKTsKLQkJCQkJaWYgKCFpbnRlbF9QTExfaXNfdmFs aWQoZGV2LCBsaW1pdCwKKwkJCQkJaWYgKCFpbnRlbF9QTExfaXNfdmFsaWQodG9faTkxNShkZXYp LAorCQkJCQkJCQlsaW1pdCwKIAkJCQkJCQkJJmNsb2NrKSkKIAkJCQkJCWNvbnRpbnVlOwogCQkJ CQlpZiAobWF0Y2hfY2xvY2sgJiYKQEAgLTgxMyw3ICs4MTYsOCBAQCBnNHhfZmluZF9iZXN0X2Rw bGwoY29uc3Qgc3RydWN0IGludGVsX2xpbWl0ICpsaW1pdCwKIAkJCQkJaW50IHRoaXNfZXJyOwog CiAJCQkJCWk5eHhfY2FsY19kcGxsX3BhcmFtcyhyZWZjbGssICZjbG9jayk7Ci0JCQkJCWlmICgh aW50ZWxfUExMX2lzX3ZhbGlkKGRldiwgbGltaXQsCisJCQkJCWlmICghaW50ZWxfUExMX2lzX3Zh bGlkKHRvX2k5MTUoZGV2KSwKKwkJCQkJCQkJbGltaXQsCiAJCQkJCQkJCSZjbG9jaykpCiAJCQkJ CQljb250aW51ZTsKIApAQCAtOTA5LDcgKzkxMyw4IEBAIHZsdl9maW5kX2Jlc3RfZHBsbChjb25z dCBzdHJ1Y3QgaW50ZWxfbGltaXQgKmxpbWl0LAogCiAJCQkJCXZsdl9jYWxjX2RwbGxfcGFyYW1z KHJlZmNsaywgJmNsb2NrKTsKIAotCQkJCQlpZiAoIWludGVsX1BMTF9pc192YWxpZChkZXYsIGxp bWl0LAorCQkJCQlpZiAoIWludGVsX1BMTF9pc192YWxpZCh0b19pOTE1KGRldiksCisJCQkJCQkJ CWxpbWl0LAogCQkJCQkJCQkmY2xvY2spKQogCQkJCQkJY29udGludWU7CiAKQEAgLTk3Nyw3ICs5 ODIsNyBAQCBjaHZfZmluZF9iZXN0X2RwbGwoY29uc3Qgc3RydWN0IGludGVsX2xpbWl0ICpsaW1p dCwKIAogCQkJY2h2X2NhbGNfZHBsbF9wYXJhbXMocmVmY2xrLCAmY2xvY2spOwogCi0JCQlpZiAo IWludGVsX1BMTF9pc192YWxpZChkZXYsIGxpbWl0LCAmY2xvY2spKQorCQkJaWYgKCFpbnRlbF9Q TExfaXNfdmFsaWQodG9faTkxNShkZXYpLCBsaW1pdCwgJmNsb2NrKSkKIAkJCQljb250aW51ZTsK IAogCQkJaWYgKCF2bHZfUExMX2lzX29wdGltYWwoZGV2LCB0YXJnZXQsICZjbG9jaywgYmVzdF9j bG9jaywKQEAgLTU4NDksNyArNTg1NCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3VwZGF0ZV9tYXhf Y2RjbGsoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCW1heF9jZGNsayA9IDMwODU3MTsKIAog CQlkZXZfcHJpdi0+bWF4X2NkY2xrX2ZyZXEgPSBza2xfY2FsY19jZGNsayhtYXhfY2RjbGssIHZj byk7Ci0JfSBlbHNlIGlmIChJU19CUk9YVE9OKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX0JST1hU T04oZGV2X3ByaXYpKSB7CiAJCWRldl9wcml2LT5tYXhfY2RjbGtfZnJlcSA9IDYyNDAwMDsKIAl9 IGVsc2UgaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikpICB7CiAJCS8qCkBAIC0xMDY0Nyw3ICsx MDY1Miw3IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxfZ2V0X2RkaV9wb3J0X3N0YXRlKHN0cnVjdCBp bnRlbF9jcnRjICpjcnRjLAogCiAJaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpIHx8IElTX0tBQllM QUtFKGRldl9wcml2KSkKIAkJc2t5bGFrZV9nZXRfZGRpX3BsbChkZXZfcHJpdiwgcG9ydCwgcGlw ZV9jb25maWcpOwotCWVsc2UgaWYgKElTX0JST1hUT04oZGV2KSkKKwllbHNlIGlmIChJU19CUk9Y VE9OKGRldl9wcml2KSkKIAkJYnh0X2dldF9kZGlfcGxsKGRldl9wcml2LCBwb3J0LCBwaXBlX2Nv bmZpZyk7CiAJZWxzZQogCQloYXN3ZWxsX2dldF9kZGlfcGxsKGRldl9wcml2LCBwb3J0LCBwaXBl X2NvbmZpZyk7CkBAIC0xMjgwNSw3ICsxMjgxMCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2R1bXBf cGlwZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJRFJNX0RFQlVHX0tNUygiaXBz OiAlaVxuIiwgcGlwZV9jb25maWctPmlwc19lbmFibGVkKTsKIAlEUk1fREVCVUdfS01TKCJkb3Vi bGUgd2lkZTogJWlcbiIsIHBpcGVfY29uZmlnLT5kb3VibGVfd2lkZSk7CiAKLQlpZiAoSVNfQlJP WFRPTihkZXYpKSB7CisJaWYgKElTX0JST1hUT04oZGV2X3ByaXYpKSB7CiAJCURSTV9ERUJVR19L TVMoImRwbGxfaHdfc3RhdGU6IGViYjA6IDB4JXgsIGViYjQ6IDB4JXgsIgogCQkJICAgICAgInBs bDA6IDB4JXgsIHBsbDE6IDB4JXgsIHBsbDI6IDB4JXgsIHBsbDM6IDB4JXgsICIKIAkJCSAgICAg ICJwbGw2OiAweCV4LCBwbGw4OiAweCV4LCBwbGw5OiAweCV4LCBwbGwxMDogMHgleCwgcGNzZHcx MjogMHgleFxuIiwKQEAgLTE1Mzk4LDcgKzE1NDAzLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2V0 dXBfb3V0cHV0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChpbnRlbF9jcnRfcHJlc2Vu dChkZXYpKQogCQlpbnRlbF9jcnRfaW5pdChkZXYpOwogCi0JaWYgKElTX0JST1hUT04oZGV2KSkg eworCWlmIChJU19CUk9YVE9OKGRldl9wcml2KSkgewogCQkvKgogCQkgKiBGSVhNRTogQnJveHRv biBkb2Vzbid0IHN1cHBvcnQgcG9ydCBkZXRlY3Rpb24gdmlhIHRoZQogCQkgKiBERElfQlVGX0NU TF9BIG9yIFNGVVNFX1NUUkFQIHJlZ2lzdGVycywgZmluZCBhbm90aGVyIHdheSB0bwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RwLmMKaW5kZXggMDJlNzRjNDY3YTU1Li5iNmM4YjI1ZWUxZDQgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHAuYwpAQCAtNTcxLDcgKzU3MSw3IEBAIHZvaWQgaW50ZWxfcG93ZXJfc2Vx dWVuY2VyX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKIAogCWlmIChXQVJOX09OKCFJU19WQUxMRVlWSUVXKGRl dikgJiYgIUlTX0NIRVJSWVZJRVcoZGV2KSAmJgotCQkgICAgIUlTX0JST1hUT04oZGV2KSkpCisJ CSAgICAhSVNfQlJPWFRPTihkZXZfcHJpdikpKQogCQlyZXR1cm47CiAKIAkvKgpAQCAtNTkxLDcg KzU5MSw3IEBAIHZvaWQgaW50ZWxfcG93ZXJfc2VxdWVuY2VyX3Jlc2V0KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAkJCWNvbnRpbnVlOwogCiAJCWludGVsX2RwID0gZW5jX3Rv X2ludGVsX2RwKCZlbmNvZGVyLT5iYXNlKTsKLQkJaWYgKElTX0JST1hUT04oZGV2KSkKKwkJaWYg KElTX0JST1hUT04oZGV2X3ByaXYpKQogCQkJaW50ZWxfZHAtPnBwc19yZXNldCA9IHRydWU7CiAJ CWVsc2UKIAkJCWludGVsX2RwLT5wcHNfcGlwZSA9IElOVkFMSURfUElQRTsKQEAgLTI5ODEsNyAr Mjk4MSw3IEBAIGludGVsX2RwX3ZvbHRhZ2VfbWF4KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAp CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCWVu dW0gcG9ydCBwb3J0ID0gZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApLT5wb3J0OwogCi0JaWYgKElT X0JST1hUT04oZGV2KSkKKwlpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpCiAJCXJldHVybiBEUF9U UkFJTl9WT0xUQUdFX1NXSU5HX0xFVkVMXzM7CiAJZWxzZSBpZiAoSU5URUxfSU5GTyhkZXYpLT5n ZW4gPj0gOSkgewogCQlpZiAoZGV2X3ByaXYtPnZidC5lZHAubG93X3Zzd2luZyAmJiBwb3J0ID09 IFBPUlRfQSkKQEAgLTMzNDQsNyArMzM0NCw3IEBAIGludGVsX2RwX3NldF9zaWduYWxfbGV2ZWxz KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJaWYgKEhBU19EREkoZGV2X3ByaXYpKSB7CiAJ CXNpZ25hbF9sZXZlbHMgPSBkZGlfc2lnbmFsX2xldmVscyhpbnRlbF9kcCk7CiAKLQkJaWYgKElT X0JST1hUT04oZGV2KSkKKwkJaWYgKElTX0JST1hUT04oZGV2X3ByaXYpKQogCQkJc2lnbmFsX2xl dmVscyA9IDA7CiAJCWVsc2UKIAkJCW1hc2sgPSBERElfQlVGX0VNUF9NQVNLOwpAQCAtNTA3Miw3 ICs1MDcyLDcgQEAgaW50ZWxfZHBfaW5pdF9wYW5lbF9wb3dlcl9zZXF1ZW5jZXJfcmVnaXN0ZXJz KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCSAoc2VxLT50MTAgPDwgUEFORUxfUE9XRVJfRE9X Tl9ERUxBWV9TSElGVCk7CiAJLyogQ29tcHV0ZSB0aGUgZGl2aXNvciBmb3IgdGhlIHBwIGNsb2Nr LCBzaW1wbHkgbWF0Y2ggdGhlIEJzcGVjCiAJICogZm9ybXVsYS4gKi8KLQlpZiAoSVNfQlJPWFRP TihkZXYpKSB7CisJaWYgKElTX0JST1hUT04oZGV2X3ByaXYpKSB7CiAJCXBwX2RpdiA9IEk5MTVf UkVBRChyZWdzLnBwX2N0cmwpOwogCQlwcF9kaXYgJj0gfkJYVF9QT1dFUl9DWUNMRV9ERUxBWV9N QVNLOwogCQlwcF9kaXYgfD0gKERJVl9ST1VORF9VUCgoc2VxLT50MTFfdDEyICsgMSksIDEwMDAp CkBAIC01MDk4LDcgKzUwOTgsNyBAQCBpbnRlbF9kcF9pbml0X3BhbmVsX3Bvd2VyX3NlcXVlbmNl cl9yZWdpc3RlcnMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogCUk5MTVfV1JJVEUocmVncy5w cF9vbiwgcHBfb24pOwogCUk5MTVfV1JJVEUocmVncy5wcF9vZmYsIHBwX29mZik7Ci0JaWYgKElT X0JST1hUT04oZGV2KSkKKwlpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpCiAJCUk5MTVfV1JJVEUo cmVncy5wcF9jdHJsLCBwcF9kaXYpOwogCWVsc2UKIAkJSTkxNV9XUklURShyZWdzLnBwX2Rpdiwg cHBfZGl2KTsKQEAgLTUxMDYsNyArNTEwNiw3IEBAIGludGVsX2RwX2luaXRfcGFuZWxfcG93ZXJf c2VxdWVuY2VyX3JlZ2lzdGVycyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCURSTV9ERUJVR19L TVMoInBhbmVsIHBvd2VyIHNlcXVlbmNlciByZWdpc3RlciBzZXR0aW5nczogUFBfT04gJSN4LCBQ UF9PRkYgJSN4LCBQUF9ESVYgJSN4XG4iLAogCQkgICAgICBJOTE1X1JFQUQocmVncy5wcF9vbiks CiAJCSAgICAgIEk5MTVfUkVBRChyZWdzLnBwX29mZiksCi0JCSAgICAgIElTX0JST1hUT04oZGV2 KSA/CisJCSAgICAgIElTX0JST1hUT04oZGV2X3ByaXYpID8KIAkJICAgICAgKEk5MTVfUkVBRChy ZWdzLnBwX2N0cmwpICYgQlhUX1BPV0VSX0NZQ0xFX0RFTEFZX01BU0spIDoKIAkJICAgICAgSTkx NV9SRUFEKHJlZ3MucHBfZGl2KSk7CiB9CkBAIC01NzE1LDcgKzU3MTUsNyBAQCBpbnRlbF9kcF9p bml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwK IAkJYnJlYWs7CiAJY2FzZSBQT1JUX0I6CiAJCWludGVsX2VuY29kZXItPmhwZF9waW4gPSBIUERf UE9SVF9COwotCQlpZiAoSVNfQlhUX1JFVklEKGRldiwgMCwgQlhUX1JFVklEX0ExKSkKKwkJaWYg KElTX0JYVF9SRVZJRChkZXZfcHJpdiwgMCwgQlhUX1JFVklEX0ExKSkKIAkJCWludGVsX2VuY29k ZXItPmhwZF9waW4gPSBIUERfUE9SVF9BOwogCQlicmVhazsKIAljYXNlIFBPUlRfQzoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5jCmluZGV4IDdjZjlkOTFjMDc0Ni4uNjA1ZDBiNTA5 ZjI0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMKQEAgLTE4NTMsNyArMTg1 Myw3IEBAIHZvaWQgaW50ZWxfc2hhcmVkX2RwbGxfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCiAJaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2KSkK IAkJZHBsbF9tZ3IgPSAmc2tsX3BsbF9tZ3I7Ci0JZWxzZSBpZiAoSVNfQlJPWFRPTihkZXYpKQor CWVsc2UgaWYgKElTX0JST1hUT04oZGV2X3ByaXYpKQogCQlkcGxsX21nciA9ICZieHRfcGxsX21n cjsKIAllbHNlIGlmIChIQVNfRERJKGRldl9wcml2KSkKIAkJZHBsbF9tZ3IgPSAmaHN3X3BsbF9t Z3I7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RzaS5jCmluZGV4IDViMWU0NDVhODBkMC4uNDhlOGRkMTA4 ZjRmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYwpAQCAtNDM3LDExICs0MzcsMTEgQEAgc3Rh dGljIHZvaWQgdmx2X2RzaV9kZXZpY2VfcmVhZHkoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29k ZXIpCiAKIHN0YXRpYyB2b2lkIGludGVsX2RzaV9kZXZpY2VfcmVhZHkoc3RydWN0IGludGVsX2Vu Y29kZXIgKmVuY29kZXIpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuY29kZXItPmJh c2UuZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5j b2Rlci0+YmFzZS5kZXYpOwogCi0JaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllW SUVXKGRldikpCisJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVco ZGV2X3ByaXYpKQogCQl2bHZfZHNpX2RldmljZV9yZWFkeShlbmNvZGVyKTsKLQllbHNlIGlmIChJ U19CUk9YVE9OKGRldikpCisJZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpCiAJCWJ4dF9k c2lfZGV2aWNlX3JlYWR5KGVuY29kZXIpOwogfQogCkBAIC00NjQsNyArNDY0LDcgQEAgc3RhdGlj IHZvaWQgaW50ZWxfZHNpX3BvcnRfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVy KQogCX0KIAogCWZvcl9lYWNoX2RzaV9wb3J0KHBvcnQsIGludGVsX2RzaS0+cG9ydHMpIHsKLQkJ aTkxNV9yZWdfdCBwb3J0X2N0cmwgPSBJU19CUk9YVE9OKGRldikgPworCQlpOTE1X3JlZ190IHBv cnRfY3RybCA9IElTX0JST1hUT04oZGV2X3ByaXYpID8KIAkJCUJYVF9NSVBJX1BPUlRfQ1RSTChw b3J0KSA6IE1JUElfUE9SVF9DVFJMKHBvcnQpOwogCQl1MzIgdGVtcDsKIApAQCAtNDk0LDcgKzQ5 NCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2RzaV9wb3J0X2Rpc2FibGUoc3RydWN0IGludGVsX2Vu Y29kZXIgKmVuY29kZXIpCiAJZW51bSBwb3J0IHBvcnQ7CiAKIAlmb3JfZWFjaF9kc2lfcG9ydChw b3J0LCBpbnRlbF9kc2ktPnBvcnRzKSB7Ci0JCWk5MTVfcmVnX3QgcG9ydF9jdHJsID0gSVNfQlJP WFRPTihkZXYpID8KKwkJaTkxNV9yZWdfdCBwb3J0X2N0cmwgPSBJU19CUk9YVE9OKGRldl9wcml2 KSA/CiAJCQlCWFRfTUlQSV9QT1JUX0NUUkwocG9ydCkgOiBNSVBJX1BPUlRfQ1RSTChwb3J0KTsK IAkJdTMyIHRlbXA7CiAKQEAgLTY1Niw3ICs2NTYsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kc2lf ZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIAogc3RhdGljIHZvaWQgaW50 ZWxfZHNpX2NsZWFyX2RldmljZV9yZWFkeShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikK IHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7 CiAJc3RydWN0IGludGVsX2RzaSAqaW50ZWxfZHNpID0gZW5jX3RvX2ludGVsX2RzaSgmZW5jb2Rl ci0+YmFzZSk7CiAJZW51bSBwb3J0IHBvcnQ7CkBAIC02NjQsNyArNjYzLDcgQEAgc3RhdGljIHZv aWQgaW50ZWxfZHNpX2NsZWFyX2RldmljZV9yZWFkeShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5j b2RlcikKIAlEUk1fREVCVUdfS01TKCJcbiIpOwogCWZvcl9lYWNoX2RzaV9wb3J0KHBvcnQsIGlu dGVsX2RzaS0+cG9ydHMpIHsKIAkJLyogQ29tbW9uIGJpdCBmb3IgYm90aCBNSVBJIFBvcnQgQSAm IE1JUEkgUG9ydCBDIG9uIFZMVi9DSFYgKi8KLQkJaTkxNV9yZWdfdCBwb3J0X2N0cmwgPSBJU19C Uk9YVE9OKGRldikgPworCQlpOTE1X3JlZ190IHBvcnRfY3RybCA9IElTX0JST1hUT04oZGV2X3By aXYpID8KIAkJCUJYVF9NSVBJX1BPUlRfQ1RSTChwb3J0KSA6IE1JUElfUE9SVF9DVFJMKFBPUlRf QSk7CiAJCXUzMiB2YWw7CiAKQEAgLTc2Miw3ICs3NjEsNyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9k c2lfZ2V0X2h3X3N0YXRlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCiAJLyogWFhY OiB0aGlzIG9ubHkgd29ya3MgZm9yIG9uZSBEU0kgb3V0cHV0ICovCiAJZm9yX2VhY2hfZHNpX3Bv cnQocG9ydCwgaW50ZWxfZHNpLT5wb3J0cykgewotCQlpOTE1X3JlZ190IGN0cmxfcmVnID0gSVNf QlJPWFRPTihkZXYpID8KKwkJaTkxNV9yZWdfdCBjdHJsX3JlZyA9IElTX0JST1hUT04oZGV2X3By aXYpID8KIAkJCUJYVF9NSVBJX1BPUlRfQ1RSTChwb3J0KSA6IE1JUElfUE9SVF9DVFJMKHBvcnQp OwogCQlib29sIGVuYWJsZWQgPSBJOTE1X1JFQUQoY3RybF9yZWcpICYgRFBJX0VOQUJMRTsKIApA QCAtOTcwLDExICs5NjksMTEgQEAgc3RhdGljIHZvaWQgYnh0X2RzaV9nZXRfcGlwZV9jb25maWco c3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiBzdGF0aWMgdm9pZCBpbnRlbF9kc2lfZ2V0 X2NvbmZpZyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCQkgc3RydWN0IGludGVs X2NydGNfc3RhdGUgKnBpcGVfY29uZmlnKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBl bmNvZGVyLT5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0 b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsKIAl1MzIgcGNsazsKIAlEUk1fREVCVUdfS01TKCJc biIpOwogCi0JaWYgKElTX0JST1hUT04oZGV2KSkKKwlpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikp CiAJCWJ4dF9kc2lfZ2V0X3BpcGVfY29uZmlnKGVuY29kZXIsIHBpcGVfY29uZmlnKTsKIAogCXBj bGsgPSBpbnRlbF9kc2lfZ2V0X3BjbGsoZW5jb2RlciwgcGlwZV9jb25maWctPnBpcGVfYnBwLApA QCAtMTA2Niw3ICsxMDY1LDcgQEAgc3RhdGljIHZvaWQgc2V0X2RzaV90aW1pbmdzKHN0cnVjdCBk cm1fZW5jb2RlciAqZW5jb2RlciwKIAloYnAgPSB0eGJ5dGVjbGtocyhoYnAsIGJwcCwgbGFuZV9j b3VudCwgaW50ZWxfZHNpLT5idXJzdF9tb2RlX3JhdGlvKTsKIAogCWZvcl9lYWNoX2RzaV9wb3J0 KHBvcnQsIGludGVsX2RzaS0+cG9ydHMpIHsKLQkJaWYgKElTX0JST1hUT04oZGV2KSkgeworCQlp ZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpIHsKIAkJCS8qCiAJCQkgKiBQcm9ncmFtIGhkaXNwbGF5 IGFuZCB2ZGlzcGxheSBvbiBNSVBJIHRyYW5zY29kZXIuCiAJCQkgKiBUaGlzIGlzIGRpZmZlcmVu dCBmcm9tIGNhbGN1bGF0ZWQgaGFjdGl2ZSBhbmQKQEAgLTExNTMsNyArMTE1Miw3IEBAIHN0YXRp YyB2b2lkIGludGVsX2RzaV9wcmVwYXJlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNv ZGVyLAogCQkJdG1wICY9IH5SRUFEX1JFUVVFU1RfUFJJT1JJVFlfTUFTSzsKIAkJCUk5MTVfV1JJ VEUoTUlQSV9DVFJMKHBvcnQpLCB0bXAgfAogCQkJCQlSRUFEX1JFUVVFU1RfUFJJT1JJVFlfSElH SCk7Ci0JCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXYpKSB7CisJCX0gZWxzZSBpZiAoSVNfQlJP WFRPTihkZXZfcHJpdikpIHsKIAkJCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsK IAogCQkJdG1wID0gSTkxNV9SRUFEKE1JUElfQ1RSTChwb3J0KSk7CkBAIC0xMjQyLDcgKzEyNDEs NyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kc2lfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAq aW50ZWxfZW5jb2RlciwKIAkJSTkxNV9XUklURShNSVBJX0lOSVRfQ09VTlQocG9ydCksCiAJCQkJ dHhjbGtlc2MoaW50ZWxfZHNpLT5lc2NhcGVfY2xrX2RpdiwgMTAwKSk7CiAKLQkJaWYgKElTX0JS T1hUT04oZGV2KSAmJiAoIWludGVsX2RzaS0+ZHVhbF9saW5rKSkgeworCQlpZiAoSVNfQlJPWFRP TihkZXZfcHJpdikgJiYgKCFpbnRlbF9kc2ktPmR1YWxfbGluaykpIHsKIAkJCS8qCiAJCQkgKiBC WFQgc3BlYyBzYXlzIHdyaXRlIE1JUElfSU5JVF9DT1VOVCBmb3IKIAkJCSAqIGJvdGggdGhlIHBv cnRzLCBldmVuIGlmIG9ubHkgb25lIGlzCkBAIC0xNDUyLDcgKzE0NTEsNyBAQCB2b2lkIGludGVs X2RzaV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlpZiAoSVNfVkFMTEVZVklFVyhk ZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkgewogCQlkZXZfcHJpdi0+bWlwaV9tbWlvX2Jhc2Ug PSBWTFZfTUlQSV9CQVNFOwotCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXYpKSB7CisJfSBlbHNl IGlmIChJU19CUk9YVE9OKGRldl9wcml2KSkgewogCQlkZXZfcHJpdi0+bWlwaV9tbWlvX2Jhc2Ug PSBCWFRfTUlQSV9CQVNFOwogCX0gZWxzZSB7CiAJCURSTV9FUlJPUigiVW5zdXBwb3J0ZWQgTWlw aSBkZXZpY2UgdG8gcmVnIGJhc2UiKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RzaV9wbGwuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RzaV9wbGwuYwpp bmRleCA2YWI1OGEwMWIxOGUuLjU2ZWZmNjAwNGJjMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHNpX3BsbC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2RzaV9wbGwuYwpAQCAtMzUxLDcgKzM1MSw3IEBAIHN0YXRpYyB1MzIgYnh0X2RzaV9nZXRfcGNs ayhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwgaW50IHBpcGVfYnBwLAogdTMyIGludGVs X2RzaV9nZXRfcGNsayhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwgaW50IHBpcGVfYnBw LAogCQkgICAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNvbmZpZykKIHsKLQlpZiAoSVNf QlJPWFRPTihlbmNvZGVyLT5iYXNlLmRldikpCisJaWYgKElTX0JST1hUT04odG9faTkxNShlbmNv ZGVyLT5iYXNlLmRldikpKQogCQlyZXR1cm4gYnh0X2RzaV9nZXRfcGNsayhlbmNvZGVyLCBwaXBl X2JwcCwgY29uZmlnKTsKIAllbHNlCiAJCXJldHVybiB2bHZfZHNpX2dldF9wY2xrKGVuY29kZXIs IHBpcGVfYnBwLCBjb25maWcpOwpAQCAtNTE1LDExICs1MTUsMTEgQEAgYm9vbCBpbnRlbF9kc2lf cGxsX2lzX2VuYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogaW50IGlu dGVsX2NvbXB1dGVfZHNpX3BsbChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCSAg c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNvbmZpZykKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7CiAKLQlpZiAoSVNfVkFMTEVZVklFVyhk ZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkKKwlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikg fHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCXJldHVybiB2bHZfY29tcHV0ZV9kc2lfcGxs KGVuY29kZXIsIGNvbmZpZyk7Ci0JZWxzZSBpZiAoSVNfQlJPWFRPTihkZXYpKQorCWVsc2UgaWYg KElTX0JST1hUT04oZGV2X3ByaXYpKQogCQlyZXR1cm4gYnh0X2NvbXB1dGVfZHNpX3BsbChlbmNv ZGVyLCBjb25maWcpOwogCiAJcmV0dXJuIC1FTk9ERVY7CkBAIC01MjgsMjEgKzUyOCwyMSBAQCBp bnQgaW50ZWxfY29tcHV0ZV9kc2lfcGxsKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAog dm9pZCBpbnRlbF9lbmFibGVfZHNpX3BsbChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwK IAkJCSAgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNvbmZpZykKIHsKLQlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7CisJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7CiAKLQlpZiAoSVNf VkFMTEVZVklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkKKwlpZiAoSVNfVkFMTEVZVklF VyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCXZsdl9lbmFibGVfZHNp X3BsbChlbmNvZGVyLCBjb25maWcpOwotCWVsc2UgaWYgKElTX0JST1hUT04oZGV2KSkKKwllbHNl IGlmIChJU19CUk9YVE9OKGRldl9wcml2KSkKIAkJYnh0X2VuYWJsZV9kc2lfcGxsKGVuY29kZXIs IGNvbmZpZyk7CiB9CiAKIHZvaWQgaW50ZWxfZGlzYWJsZV9kc2lfcGxsKHN0cnVjdCBpbnRlbF9l bmNvZGVyICplbmNvZGVyKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBlbmNvZGVyLT5i YXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGVu Y29kZXItPmJhc2UuZGV2KTsKIAotCWlmIChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZ VklFVyhkZXYpKQorCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVX KGRldl9wcml2KSkKIAkJdmx2X2Rpc2FibGVfZHNpX3BsbChlbmNvZGVyKTsKLQllbHNlIGlmIChJ U19CUk9YVE9OKGRldikpCisJZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpCiAJCWJ4dF9k aXNhYmxlX2RzaV9wbGwoZW5jb2Rlcik7CiB9CiAKQEAgLTU2NCwxMCArNTY0LDEwIEBAIHN0YXRp YyB2b2lkIGJ4dF9kc2lfcmVzZXRfY2xvY2tzKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVy LCBlbnVtIHBvcnQgcG9ydCkKIAogdm9pZCBpbnRlbF9kc2lfcmVzZXRfY2xvY2tzKHN0cnVjdCBp bnRlbF9lbmNvZGVyICplbmNvZGVyLCBlbnVtIHBvcnQgcG9ydCkKIHsKLQlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7CiAKLQlpZiAoSVNfQlJPWFRP TihkZXYpKQorCWlmIChJU19CUk9YVE9OKGRldl9wcml2KSkKIAkJYnh0X2RzaV9yZXNldF9jbG9j a3MoZW5jb2RlciwgcG9ydCk7Ci0JZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NI RVJSWVZJRVcoZGV2KSkKKwllbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19D SEVSUllWSUVXKGRldl9wcml2KSkKIAkJdmx2X2RzaV9yZXNldF9jbG9ja3MoZW5jb2RlciwgcG9y dCk7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVy LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKaW5kZXggMTgyMjA0 MzczOTMxLi41ZDVkNjA5ZWQ1ZTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Y19sb2FkZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9h ZGVyLmMKQEAgLTM3NiwxNiArMzc2LDE2IEBAIHN0YXRpYyBpbnQgZ3VjX3Vjb2RlX3hmZXIoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCUk5MTVfV1JJVEUoR1VDX1NISU1fQ09O VFJPTCwgR1VDX1NISU1fQ09OVFJPTF9WQUxVRSk7CiAKIAkvKiBXYURpc2FibGVNaW51dGVJYUNs b2NrR2F0aW5nOmJ4dCAqLwotCWlmIChJU19CWFRfUkVWSUQoZGV2LCAwLCBCWFRfUkVWSURfQTEp KSB7CisJaWYgKElTX0JYVF9SRVZJRChkZXZfcHJpdiwgMCwgQlhUX1JFVklEX0ExKSkgewogCQlJ OTE1X1dSSVRFKEdVQ19TSElNX0NPTlRST0wsIChJOTE1X1JFQUQoR1VDX1NISU1fQ09OVFJPTCkg JgogCQkJCQkgICAgICB+R1VDX0VOQUJMRV9NSUFfQ0xPQ0tfR0FUSU5HKSk7CiAJfQogCiAJLyog V2FDNkRpc2FsbG93QnlHZnhQYXVzZTpieHQgKi8KLQlpZiAoSVNfQlhUX1JFVklEKGRldiwgMCwg QlhUX1JFVklEX0IwKSkKKwlpZiAoSVNfQlhUX1JFVklEKGRldl9wcml2LCAwLCBCWFRfUkVWSURf QjApKQogCQlJOTE1X1dSSVRFKEdFTjZfR0ZYUEFVU0UsIDB4MzBGRkYpOwogCi0JaWYgKElTX0JS T1hUT04oZGV2KSkKKwlpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpCiAJCUk5MTVfV1JJVEUoR0VO OUxQX0dUX1BNX0NPTkZJRywgR1RfRE9PUkJFTExfRU5BQkxFKTsKIAllbHNlCiAJCUk5MTVfV1JJ VEUoR0VOOV9HVF9QTV9DT05GSUcsIEdUX0RPT1JCRUxMX0VOQUJMRSk7CkBAIC03MzAsNyArNzMw LDcgQEAgdm9pZCBpbnRlbF9ndWNfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlmd19w YXRoID0gSTkxNV9TS0xfR1VDX1VDT0RFOwogCQlndWNfZnctPmd1Y19md19tYWpvcl93YW50ZWQg PSBTS0xfRldfTUFKT1I7CiAJCWd1Y19mdy0+Z3VjX2Z3X21pbm9yX3dhbnRlZCA9IFNLTF9GV19N SU5PUjsKLQl9IGVsc2UgaWYgKElTX0JST1hUT04oZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfQlJP WFRPTihkZXZfcHJpdikpIHsKIAkJZndfcGF0aCA9IEk5MTVfQlhUX0dVQ19VQ09ERTsKIAkJZ3Vj X2Z3LT5ndWNfZndfbWFqb3Jfd2FudGVkID0gQlhUX0ZXX01BSk9SOwogCQlndWNfZnctPmd1Y19m d19taW5vcl93YW50ZWQgPSBCWFRfRldfTUlOT1I7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9oZG1pLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMK aW5kZXggNjYwN2M0ZTNjMzZjLi5mNjU2MjQ1MWM0N2UgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2hkbWkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9o ZG1pLmMKQEAgLTEyNDEsNyArMTI0MSw3IEBAIHN0YXRpYyBlbnVtIGRybV9tb2RlX3N0YXR1cwog aGRtaV9wb3J0X2Nsb2NrX3ZhbGlkKHN0cnVjdCBpbnRlbF9oZG1pICpoZG1pLAogCQkgICAgICBp bnQgY2xvY2ssIGJvb2wgcmVzcGVjdF9kb3duc3RyZWFtX2xpbWl0cykKIHsKLQlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gaW50ZWxfaGRtaV90b19kZXYoaGRtaSk7CisJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRlbF9oZG1pX3RvX2RldihoZG1pKSk7CiAK IAlpZiAoY2xvY2sgPCAyNTAwMCkKIAkJcmV0dXJuIE1PREVfQ0xPQ0tfTE9XOwpAQCAtMTI0OSwx MSArMTI0OSwxMSBAQCBoZG1pX3BvcnRfY2xvY2tfdmFsaWQoc3RydWN0IGludGVsX2hkbWkgKmhk bWksCiAJCXJldHVybiBNT0RFX0NMT0NLX0hJR0g7CiAKIAkvKiBCWFQgRFBMTCBjYW4ndCBnZW5l cmF0ZSAyMjMtMjQwIE1IeiAqLwotCWlmIChJU19CUk9YVE9OKGRldikgJiYgY2xvY2sgPiAyMjMz MzMgJiYgY2xvY2sgPCAyNDAwMDApCisJaWYgKElTX0JST1hUT04oZGV2X3ByaXYpICYmIGNsb2Nr ID4gMjIzMzMzICYmIGNsb2NrIDwgMjQwMDAwKQogCQlyZXR1cm4gTU9ERV9DTE9DS19SQU5HRTsK IAogCS8qIENIViBEUExMIGNhbid0IGdlbmVyYXRlIDIxNi0yNDAgTUh6ICovCi0JaWYgKElTX0NI RVJSWVZJRVcoZGV2KSAmJiBjbG9jayA+IDIxNjAwMCAmJiBjbG9jayA8IDI0MDAwMCkKKwlpZiAo SVNfQ0hFUlJZVklFVyhkZXZfcHJpdikgJiYgY2xvY2sgPiAyMTYwMDAgJiYgY2xvY2sgPCAyNDAw MDApCiAJCXJldHVybiBNT0RFX0NMT0NLX1JBTkdFOwogCiAJcmV0dXJuIE1PREVfT0s7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKaW5kZXggMDI1ZmJkNTIyODE5Li5lNGJi ODVjOWM2ZTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVf cG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKQEAgLTI1 OTYsNyArMjU5Niw3IEBAIHZvaWQgaW50ZWxfcG93ZXJfZG9tYWluc19pbml0X2h3KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgYm9vbCByZXN1bWUpCiAKIAlpZiAoSVNfU0tZTEFL RShkZXZfcHJpdikgfHwgSVNfS0FCWUxBS0UoZGV2X3ByaXYpKSB7CiAJCXNrbF9kaXNwbGF5X2Nv cmVfaW5pdChkZXZfcHJpdiwgcmVzdW1lKTsKLQl9IGVsc2UgaWYgKElTX0JST1hUT04oZGV2KSkg eworCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpIHsKIAkJYnh0X2Rpc3BsYXlfY29y ZV9pbml0KGRldl9wcml2LCByZXN1bWUpOwogCX0gZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXYp KSB7CiAJCW11dGV4X2xvY2soJnBvd2VyX2RvbWFpbnMtPmxvY2spOwotLSAKMi43LjQKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=