From: Tvrtko Ursulin Subject: [PATCH 12/22] drm/i915: Make IS_BROADWELL only take dev_priv Date: Wed, 5 Oct 2016 13:33:39 +0100 Message-ID: <1475670829-14025-13-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-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id B3ABF6E830 for ; Wed, 5 Oct 2016 12:34:12 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id p138so24361154wmb.0 for ; Wed, 05 Oct 2016 05:34:12 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDE4 MDggYnl0ZXMgb2YgLnJvZGF0YSBzdHJpbmdzLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3Vs aW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5jICAgICAgICAgfCAgNiArKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggICAgICAgICB8ICA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YyAgICAgICAgIHwgIDUgKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5j ICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jICAgICAgfCAg NCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICAgfCAyMSArKysr KysrKysrKy0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgICAgICAg ICB8IDE5ICsrKysrKysrKystLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMgICAgICAgICB8IDIwICsrKysrKysrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wc3IuYyAgICAgICAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ydW50aW1lX3BtLmMgfCAgMyArLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0 ZS5jICAgICB8ICA4ICsrKystLS0tCiAxMSBmaWxlcyBjaGFuZ2VkLCA1MiBpbnNlcnRpb25zKCsp LCA0NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCBmNmJhOGYyNjIy MzguLjg4OTk4MzVmZmZhYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC0xODksMTMgKzE4 OSwxNSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kZXRlY3RfcGNoKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJCQl9IGVsc2UgaWYgKGlkID09IElOVEVMX1BDSF9MUFRfREVWSUNFX0lEX1RZUEUpIHsK IAkJCQlkZXZfcHJpdi0+cGNoX3R5cGUgPSBQQ0hfTFBUOwogCQkJCURSTV9ERUJVR19LTVMoIkZv dW5kIEx5bnhQb2ludCBQQ0hcbiIpOwotCQkJCVdBUk5fT04oIUlTX0hBU1dFTEwoZGV2KSAmJiAh SVNfQlJPQURXRUxMKGRldikpOworCQkJCVdBUk5fT04oIUlTX0hBU1dFTEwoZGV2X3ByaXYpICYm CisJCQkJCSFJU19CUk9BRFdFTEwoZGV2X3ByaXYpKTsKIAkJCQlXQVJOX09OKElTX0hTV19VTFQo ZGV2X3ByaXYpIHx8CiAJCQkJCUlTX0JEV19VTFQoZGV2X3ByaXYpKTsKIAkJCX0gZWxzZSBpZiAo aWQgPT0gSU5URUxfUENIX0xQVF9MUF9ERVZJQ0VfSURfVFlQRSkgewogCQkJCWRldl9wcml2LT5w Y2hfdHlwZSA9IFBDSF9MUFQ7CiAJCQkJRFJNX0RFQlVHX0tNUygiRm91bmQgTHlueFBvaW50IExQ IFBDSFxuIik7Ci0JCQkJV0FSTl9PTighSVNfSEFTV0VMTChkZXYpICYmICFJU19CUk9BRFdFTEwo ZGV2KSk7CisJCQkJV0FSTl9PTighSVNfSEFTV0VMTChkZXZfcHJpdikgJiYKKwkJCQkJIUlTX0JS T0FEV0VMTChkZXZfcHJpdikpOwogCQkJCVdBUk5fT04oIUlTX0hTV19VTFQoZGV2X3ByaXYpICYm CiAJCQkJCSFJU19CRFdfVUxUKGRldl9wcml2KSk7CiAJCQl9IGVsc2UgaWYgKGlkID09IElOVEVM X1BDSF9TUFRfREVWSUNFX0lEX1RZUEUpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDEz MTk1NDRmOTdjNS4uYjNjZmVlYmVjODA2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI2 NjQsNyArMjY2NCw3IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogI2RlZmluZSBJU19W QUxMRVlWSUVXKGRldikJKElOVEVMX0lORk8oZGV2KS0+aXNfdmFsbGV5dmlldykKICNkZWZpbmUg SVNfQ0hFUlJZVklFVyhkZXYpCShJTlRFTF9JTkZPKGRldiktPmlzX2NoZXJyeXZpZXcpCiAjZGVm aW5lIElTX0hBU1dFTEwoZGV2KQkoSU5URUxfSU5GTyhkZXYpLT5pc19oYXN3ZWxsKQotI2RlZmlu ZSBJU19CUk9BRFdFTEwoZGV2KQkoSU5URUxfSU5GTyhkZXYpLT5pc19icm9hZHdlbGwpCisjZGVm aW5lIElTX0JST0FEV0VMTChkZXZfcHJpdikJKGRldl9wcml2LT5pbmZvLmlzX2Jyb2Fkd2VsbCkK ICNkZWZpbmUgSVNfU0tZTEFLRShkZXYpCShJTlRFTF9JTkZPKGRldiktPmlzX3NreWxha2UpCiAj ZGVmaW5lIElTX0JST1hUT04oZGV2KQkJKElOVEVMX0lORk8oZGV2KS0+aXNfYnJveHRvbikKICNk ZWZpbmUgSVNfS0FCWUxBS0UoZGV2KQkoSU5URUxfSU5GTyhkZXYpLT5pc19rYWJ5bGFrZSkKQEAg LTI3NzEsOCArMjc3MSw4IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogI2RlZmluZSBI QVNfTExDKGRldikJCShJTlRFTF9JTkZPKGRldiktPmhhc19sbGMpCiAjZGVmaW5lIEhBU19TTk9P UChkZXYpCQkoSU5URUxfSU5GTyhkZXYpLT5oYXNfc25vb3ApCiAjZGVmaW5lIEhBU19FRFJBTShk ZXYpCQkoISEoX19JOTE1X18oZGV2KS0+ZWRyYW1fY2FwICYgRURSQU1fRU5BQkxFRCkpCi0jZGVm aW5lIEhBU19XVChkZXYpCQkoKElTX0hBU1dFTEwoZGV2KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkg JiYgXAotCQkJCSBIQVNfRURSQU0oZGV2KSkKKyNkZWZpbmUgSEFTX1dUKGRldl9wcml2KQkoKElT X0hBU1dFTEwoZGV2X3ByaXYpIHx8IFwKKwkJCQkgSVNfQlJPQURXRUxMKGRldl9wcml2KSkgJiYg SEFTX0VEUkFNKGRldl9wcml2KSkKICNkZWZpbmUgSFdTX05FRURTX1BIWVNJQ0FMKGRldikJKElO VEVMX0lORk8oZGV2KS0+aHdzX25lZWRzX3BoeXNpY2FsKQogCiAjZGVmaW5lIEhBU19IV19DT05U RVhUUyhkZXYpCShJTlRFTF9JTkZPKGRldiktPmhhc19od19jb250ZXh0cykKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jCmluZGV4IGI2NTBjOWM3YWRkYy4uNTA2NDgwOTQyOTQ2IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMKQEAgLTM0NjksNyArMzQ2OSw3IEBAIGludCBpOTE1X2dlbV9zZXRfY2FjaGlu Z19pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQlsZXZlbCA9IEk5 MTVfQ0FDSEVfTExDOwogCQlicmVhazsKIAljYXNlIEk5MTVfQ0FDSElOR19ESVNQTEFZOgotCQls ZXZlbCA9IEhBU19XVChkZXYpID8gSTkxNV9DQUNIRV9XVCA6IEk5MTVfQ0FDSEVfTk9ORTsKKwkJ bGV2ZWwgPSBIQVNfV1QoZGV2X3ByaXYpID8gSTkxNV9DQUNIRV9XVCA6IEk5MTVfQ0FDSEVfTk9O RTsKIAkJYnJlYWs7CiAJZGVmYXVsdDoKIAkJcmV0dXJuIC1FSU5WQUw7CkBAIC0zNTI3LDcgKzM1 MjcsOCBAQCBpOTE1X2dlbV9vYmplY3RfcGluX3RvX2Rpc3BsYXlfcGxhbmUoc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm9iaiwKIAkgKiB3aXRoIHRoYXQgYml0IGluIHRoZSBQVEUgdG8gbWFp biBtZW1vcnkgd2l0aCBqdXN0IG9uZSBQSVBFX0NPTlRST0wuCiAJICovCiAJcmV0ID0gaTkxNV9n ZW1fb2JqZWN0X3NldF9jYWNoZV9sZXZlbChvYmosCi0JCQkJCSAgICAgIEhBU19XVChvYmotPmJh c2UuZGV2KSA/IEk5MTVfQ0FDSEVfV1QgOiBJOTE1X0NBQ0hFX05PTkUpOworCQkJCQkgICAgICBI QVNfV1QodG9faTkxNShvYmotPmJhc2UuZGV2KSkgPworCQkJCQkgICAgICBJOTE1X0NBQ0hFX1dU IDogSTkxNV9DQUNIRV9OT05FKTsKIAlpZiAocmV0KSB7CiAJCXZtYSA9IEVSUl9QVFIocmV0KTsK IAkJZ290byBlcnJfdW5waW5fZGlzcGxheTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMK aW5kZXggMGJiNDIzMmY2NmJjLi4wZjhmMDczYzU4OWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2d0dC5jCkBAIC0yMTI5LDcgKzIxMjksNyBAQCBzdGF0aWMgdm9pZCBndHRfd3JpdGVfd29y a2Fyb3VuZHMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkgKiB3b3JrYXJvdW5kcyBoZXJlIGV2 ZW4gaWYgdGhleSBnZXQgb3ZlcndyaXR0ZW4gYnkgR1BVIHJlc2V0LgogCSAqLwogCS8qIFdhSW5j cmVhc2VEZWZhdWx0VExCRW50cmllczpjaHYsYmR3LHNrbCxieHQgKi8KLQlpZiAoSVNfQlJPQURX RUxMKGRldikpCisJaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikpCiAJCUk5MTVfV1JJVEUoR0VO OF9MM19MUkFfMV9HUEdQVSwgR0VOOF9MM19MUkFfMV9HUEdQVV9ERUZBVUxUX1ZBTFVFX0JEVyk7 CiAJZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKQogCQlJOTE1X1dSSVRFKEdFTjhfTDNfTFJB XzFfR1BHUFUsIEdFTjhfTDNfTFJBXzFfR1BHUFVfREVGQVVMVF9WQUxVRV9DSFYpOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY29sb3IuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2NvbG9yLmMKaW5kZXggNTM2MmMwNzkzMmQzLi5iZTc2ZWY4ODY3OGMgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfY29sb3IuYwpAQCAtNTQwLDggKzU0MCw4IEBAIHZvaWQgaW50 ZWxfY29sb3JfaW5pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJfSBlbHNlIGlmIChJU19IQVNX RUxMKGRldikpIHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkubG9hZF9jc2NfbWF0cml4ID0gaTl4eF9s b2FkX2NzY19tYXRyaXg7CiAJCWRldl9wcml2LT5kaXNwbGF5LmxvYWRfbHV0cyA9IGhhc3dlbGxf bG9hZF9sdXRzOwotCX0gZWxzZSBpZiAoSVNfQlJPQURXRUxMKGRldikgfHwgSVNfU0tZTEFLRShk ZXYpIHx8Ci0JCSAgIElTX0JST1hUT04oZGV2KSB8fCBJU19LQUJZTEFLRShkZXYpKSB7CisJfSBl bHNlIGlmIChJU19CUk9BRFdFTEwoZGV2X3ByaXYpIHx8IElTX1NLWUxBS0UoZGV2X3ByaXYpIHx8 CisJCSAgIElTX0JST1hUT04oZGV2X3ByaXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2KSkgewog CQlkZXZfcHJpdi0+ZGlzcGxheS5sb2FkX2NzY19tYXRyaXggPSBpOXh4X2xvYWRfY3NjX21hdHJp eDsKIAkJZGV2X3ByaXYtPmRpc3BsYXkubG9hZF9sdXRzID0gYnJvYWR3ZWxsX2xvYWRfbHV0czsK IAl9IGVsc2UgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGQ1ZTFjZDEy MDZhYi4uMDFhN2EyYzFjYjVjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBA IC0zMTM5LDcgKzMxMzksNyBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV91cGRhdGVfcHJpbWFyeV9w bGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5LAogCWRzcGNudHIgPSBESVNQUExBTkVfR0FN TUFfRU5BQkxFOwogCWRzcGNudHIgfD0gRElTUExBWV9QTEFORV9FTkFCTEU7CiAKLQlpZiAoSVNf SEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYpKQorCWlmIChJU19IQVNXRUxMKGRldl9w cml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKQogCQlkc3BjbnRyIHw9IERJU1BQTEFORV9Q SVBFX0NTQ19FTkFCTEU7CiAKIAlzd2l0Y2ggKGZiLT5waXhlbF9mb3JtYXQpIHsKQEAgLTMxNjgs NyArMzE2OCw3IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0 cnVjdCBkcm1fcGxhbmUgKnByaW1hcnksCiAJaWYgKGZiLT5tb2RpZmllclswXSA9PSBJOTE1X0ZP Uk1BVF9NT0RfWF9USUxFRCkKIAkJZHNwY250ciB8PSBESVNQUExBTkVfVElMRUQ7CiAKLQlpZiAo IUlTX0hBU1dFTEwoZGV2KSAmJiAhSVNfQlJPQURXRUxMKGRldikpCisJaWYgKCFJU19IQVNXRUxM KGRldl9wcml2KSAmJiAhSVNfQlJPQURXRUxMKGRldl9wcml2KSkKIAkJZHNwY250ciB8PSBESVNQ UExBTkVfVFJJQ0tMRV9GRUVEX0RJU0FCTEU7CiAKIAlpbnRlbF9hZGRfZmJfb2Zmc2V0cygmeCwg JnksIHBsYW5lX3N0YXRlLCAwKTsKQEAgLTMxNzksNyArMzE3OSw3IEBAIHN0YXRpYyB2b2lkIGly b25sYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnksCiAJ aWYgKHJvdGF0aW9uID09IERSTV9ST1RBVEVfMTgwKSB7CiAJCWRzcGNudHIgfD0gRElTUFBMQU5F X1JPVEFURV8xODA7CiAKLQkJaWYgKCFJU19IQVNXRUxMKGRldikgJiYgIUlTX0JST0FEV0VMTChk ZXYpKSB7CisJCWlmICghSVNfSEFTV0VMTChkZXZfcHJpdikgJiYgIUlTX0JST0FEV0VMTChkZXZf cHJpdikpIHsKIAkJCXggKz0gKGNydGNfc3RhdGUtPnBpcGVfc3JjX3cgLSAxKTsKIAkJCXkgKz0g KGNydGNfc3RhdGUtPnBpcGVfc3JjX2ggLSAxKTsKIAkJfQpAQCAtMzE5Niw3ICszMTk2LDcgQEAg c3RhdGljIHZvaWQgaXJvbmxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFu ZSAqcHJpbWFyeSwKIAlJOTE1X1dSSVRFKERTUFNVUkYocGxhbmUpLAogCQkgICBpbnRlbF9mYl9n dHRfb2Zmc2V0KGZiLCByb3RhdGlvbikgKwogCQkgICBpbnRlbF9jcnRjLT5kc3BhZGRyX29mZnNl dCk7Ci0JaWYgKElTX0hBU1dFTEwoZGV2KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkgeworCWlmIChJ U19IQVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKSB7CiAJCUk5MTVf V1JJVEUoRFNQT0ZGU0VUKHBsYW5lKSwgKHkgPDwgMTYpIHwgeCk7CiAJfSBlbHNlIHsKIAkJSTkx NV9XUklURShEU1BUSUxFT0ZGKHBsYW5lKSwgKHkgPDwgMTYpIHwgeCk7CkBAIC00ODc2LDcgKzQ4 NzYsNyBAQCB2b2lkIGhzd19lbmFibGVfaXBzKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCSAq LwogCiAJYXNzZXJ0X3BsYW5lX2VuYWJsZWQoZGV2X3ByaXYsIGNydGMtPnBsYW5lKTsKLQlpZiAo SVNfQlJPQURXRUxMKGRldikpIHsKKwlpZiAoSVNfQlJPQURXRUxMKGRldl9wcml2KSkgewogCQlt dXRleF9sb2NrKCZkZXZfcHJpdi0+cnBzLmh3X2xvY2spOwogCQlXQVJOX09OKHNhbmR5YnJpZGdl X3Bjb2RlX3dyaXRlKGRldl9wcml2LCBESVNQTEFZX0lQU19DT05UUk9MLCAweGMwMDAwMDAwKSk7 CiAJCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPnJwcy5od19sb2NrKTsKQEAgLTQ5MDgsNyArNDkw OCw3IEBAIHZvaWQgaHN3X2Rpc2FibGVfaXBzKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCQly ZXR1cm47CiAKIAlhc3NlcnRfcGxhbmVfZW5hYmxlZChkZXZfcHJpdiwgY3J0Yy0+cGxhbmUpOwot CWlmIChJU19CUk9BRFdFTEwoZGV2KSkgeworCWlmIChJU19CUk9BRFdFTEwoZGV2X3ByaXYpKSB7 CiAJCW11dGV4X2xvY2soJmRldl9wcml2LT5ycHMuaHdfbG9jayk7CiAJCVdBUk5fT04oc2FuZHli cmlkZ2VfcGNvZGVfd3JpdGUoZGV2X3ByaXYsIERJU1BMQVlfSVBTX0NPTlRST0wsIDApKTsKIAkJ bXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+cnBzLmh3X2xvY2spOwpAQCAtNTg1MSw3ICs1ODUxLDcg QEAgc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX21heF9jZGNsayhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogCQlkZXZfcHJpdi0+bWF4X2NkY2xrX2ZyZXEgPSBza2xfY2FsY19jZGNsayhtYXhfY2Rj bGssIHZjbyk7CiAJfSBlbHNlIGlmIChJU19CUk9YVE9OKGRldikpIHsKIAkJZGV2X3ByaXYtPm1h eF9jZGNsa19mcmVxID0gNjI0MDAwOwotCX0gZWxzZSBpZiAoSVNfQlJPQURXRUxMKGRldikpICB7 CisJfSBlbHNlIGlmIChJU19CUk9BRFdFTEwoZGV2X3ByaXYpKSAgewogCQkvKgogCQkgKiBGSVhN RSB3aXRoIGV4dHJhIGNvb2xpbmcgd2UgY2FuIGFsbG93CiAJCSAqIDU0MCBNSHogZm9yIFVMWCBh bmQgNjc1IE1oeiBmb3IgVUxULgpAQCAtNzAyMCw2ICs3MDIwLDcgQEAgc3RhdGljIGludCBwaXBl X3JlcXVpcmVkX2ZkaV9sYW5lcyhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkK IHN0YXRpYyBpbnQgaXJvbmxha2VfY2hlY2tfZmRpX2xhbmVzKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIGVudW0gcGlwZSBwaXBlLAogCQkJCSAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBp cGVfY29uZmlnKQogeworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoZGV2KTsKIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUgPSBwaXBlX2NvbmZpZy0+ YmFzZS5zdGF0ZTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqb3RoZXJfY3J0YzsKIAlzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqb3RoZXJfY3J0Y19zdGF0ZTsKQEAgLTcwMzIsNyArNzAzMyw3IEBAIHN0 YXRpYyBpbnQgaXJvbmxha2VfY2hlY2tfZmRpX2xhbmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IGVudW0gcGlwZSBwaXBlLAogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKLQlpZiAoSVNfSEFTV0VM TChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYpKSB7CisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYp IHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpIHsKIAkJaWYgKHBpcGVfY29uZmlnLT5mZGlfbGFu ZXMgPiAyKSB7CiAJCQlEUk1fREVCVUdfS01TKCJvbmx5IDIgbGFuZXMgb24gaGFzd2VsbCwgcmVx dWlyZWQ6ICVpIGxhbmVzXG4iLAogCQkJCSAgICAgIHBpcGVfY29uZmlnLT5mZGlfbGFuZXMpOwpA QCAtOTg4MCw3ICs5ODgxLDcgQEAgaXJvbmxha2VfZ2V0X2luaXRpYWxfcGxhbmVfY29uZmlnKHN0 cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCWZiLT5iaXRzX3Blcl9waXhlbCA9IGRybV9mb3JtYXRf cGxhbmVfY3BwKGZvdXJjYywgMCkgKiA4OwogCiAJYmFzZSA9IEk5MTVfUkVBRChEU1BTVVJGKHBp cGUpKSAmIDB4ZmZmZmYwMDA7Ci0JaWYgKElTX0hBU1dFTEwoZGV2KSB8fCBJU19CUk9BRFdFTEwo ZGV2KSkgeworCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3By aXYpKSB7CiAJCW9mZnNldCA9IEk5MTVfUkVBRChEU1BPRkZTRVQocGlwZSkpOwogCX0gZWxzZSB7 CiAJCWlmIChwbGFuZV9jb25maWctPnRpbGluZykKQEAgLTE3MjQxLDcgKzE3MjQyLDcgQEAgaW50 ZWxfZGlzcGxheV9wcmludF9lcnJvcl9zdGF0ZShzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVf YnVmICptLAogCQlyZXR1cm47CiAKIAllcnJfcHJpbnRmKG0sICJOdW0gUGlwZXM6ICVkXG4iLCBJ TlRFTF9JTkZPKGRldiktPm51bV9waXBlcyk7Ci0JaWYgKElTX0hBU1dFTEwoZGV2KSB8fCBJU19C Uk9BRFdFTEwoZGV2KSkKKwlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxM KGRldl9wcml2KSkKIAkJZXJyX3ByaW50ZihtLCAiUFdSX1dFTExfQ1RMMjogJTA4eFxuIiwKIAkJ CSAgIGVycm9yLT5wb3dlcl93ZWxsX2RyaXZlcik7CiAJZm9yX2VhY2hfcGlwZShkZXZfcHJpdiwg aSkgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXggMmUwNmRmYjY0YmQ0Li4wMmU3NGM0Njdh NTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtODIxLDE1ICs4MjEsMTYgQEAgc3RhdGlj IHVpbnQzMl90IGc0eF9nZXRfYXV4X3NlbmRfY3RsKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAs CiAJCQkJICAgICB1aW50MzJfdCBhdXhfY2xvY2tfZGl2aWRlcikKIHsKIAlzdHJ1Y3QgaW50ZWxf ZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsK LQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfZGlnX3BvcnQtPmJhc2UuYmFzZS5kZXY7 CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0KKwkJCXRvX2k5MTUoaW50ZWxf ZGlnX3BvcnQtPmJhc2UuYmFzZS5kZXYpOwogCXVpbnQzMl90IHByZWNoYXJnZSwgdGltZW91dDsK IAotCWlmIChJU19HRU42KGRldikpCisJaWYgKElTX0dFTjYoZGV2X3ByaXYpKQogCQlwcmVjaGFy Z2UgPSAzOwogCWVsc2UKIAkJcHJlY2hhcmdlID0gNTsKIAotCWlmIChJU19CUk9BRFdFTEwoZGV2 KSAmJiBpbnRlbF9kaWdfcG9ydC0+cG9ydCA9PSBQT1JUX0EpCisJaWYgKElTX0JST0FEV0VMTChk ZXZfcHJpdikgJiYgaW50ZWxfZGlnX3BvcnQtPnBvcnQgPT0gUE9SVF9BKQogCQl0aW1lb3V0ID0g RFBfQVVYX0NIX0NUTF9USU1FX09VVF82MDB1czsKIAllbHNlCiAJCXRpbWVvdXQgPSBEUF9BVVhf Q0hfQ1RMX1RJTUVfT1VUXzQwMHVzOwpAQCAtMjk5OSwxMCArMzAwMCwxMCBAQCBpbnRlbF9kcF92 b2x0YWdlX21heChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogdWludDhfdAogaW50ZWxfZHBf cHJlX2VtcGhhc2lzX21heChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLCB1aW50OF90IHZvbHRh Z2Vfc3dpbmcpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2RwX3RvX2Rldihp bnRlbF9kcCk7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShp bnRlbF9kcF90b19kZXYoaW50ZWxfZHApKTsKIAllbnVtIHBvcnQgcG9ydCA9IGRwX3RvX2RpZ19w b3J0KGludGVsX2RwKS0+cG9ydDsKIAotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KSB7 CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkgewogCQlzd2l0Y2ggKHZvbHRhZ2Vfc3dp bmcgJiBEUF9UUkFJTl9WT0xUQUdFX1NXSU5HX01BU0spIHsKIAkJY2FzZSBEUF9UUkFJTl9WT0xU QUdFX1NXSU5HX0xFVkVMXzA6CiAJCQlyZXR1cm4gRFBfVFJBSU5fUFJFX0VNUEhfTEVWRUxfMzsK QEAgLTMwMTUsNyArMzAxNiw3IEBAIGludGVsX2RwX3ByZV9lbXBoYXNpc19tYXgoc3RydWN0IGlu dGVsX2RwICppbnRlbF9kcCwgdWludDhfdCB2b2x0YWdlX3N3aW5nKQogCQlkZWZhdWx0OgogCQkJ cmV0dXJuIERQX1RSQUlOX1BSRV9FTVBIX0xFVkVMXzA7CiAJCX0KLQl9IGVsc2UgaWYgKElTX0hB U1dFTEwoZGV2KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfSEFTV0VM TChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkgewogCQlzd2l0Y2ggKHZvbHRh Z2Vfc3dpbmcgJiBEUF9UUkFJTl9WT0xUQUdFX1NXSU5HX01BU0spIHsKIAkJY2FzZSBEUF9UUkFJ Tl9WT0xUQUdFX1NXSU5HX0xFVkVMXzA6CiAJCQlyZXR1cm4gRFBfVFJBSU5fUFJFX0VNUEhfTEVW RUxfMzsKQEAgLTMwMjcsNyArMzAyOCw3IEBAIGludGVsX2RwX3ByZV9lbXBoYXNpc19tYXgoc3Ry dWN0IGludGVsX2RwICppbnRlbF9kcCwgdWludDhfdCB2b2x0YWdlX3N3aW5nKQogCQlkZWZhdWx0 OgogCQkJcmV0dXJuIERQX1RSQUlOX1BSRV9FTVBIX0xFVkVMXzA7CiAJCX0KLQl9IGVsc2UgaWYg KElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVXKGRldikpIHsKKwl9IGVsc2UgaWYg KElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJ CXN3aXRjaCAodm9sdGFnZV9zd2luZyAmIERQX1RSQUlOX1ZPTFRBR0VfU1dJTkdfTUFTSykgewog CQljYXNlIERQX1RSQUlOX1ZPTFRBR0VfU1dJTkdfTEVWRUxfMDoKIAkJCXJldHVybiBEUF9UUkFJ Tl9QUkVfRU1QSF9MRVZFTF8zOwpAQCAtMzAzOSw3ICszMDQwLDcgQEAgaW50ZWxfZHBfcHJlX2Vt cGhhc2lzX21heChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLCB1aW50OF90IHZvbHRhZ2Vfc3dp bmcpCiAJCWRlZmF1bHQ6CiAJCQlyZXR1cm4gRFBfVFJBSU5fUFJFX0VNUEhfTEVWRUxfMDsKIAkJ fQotCX0gZWxzZSBpZiAoSVNfR0VONyhkZXYpICYmIHBvcnQgPT0gUE9SVF9BKSB7CisJfSBlbHNl IGlmIChJU19HRU43KGRldl9wcml2KSAmJiBwb3J0ID09IFBPUlRfQSkgewogCQlzd2l0Y2ggKHZv bHRhZ2Vfc3dpbmcgJiBEUF9UUkFJTl9WT0xUQUdFX1NXSU5HX01BU0spIHsKIAkJY2FzZSBEUF9U UkFJTl9WT0xUQUdFX1NXSU5HX0xFVkVMXzA6CiAJCQlyZXR1cm4gRFBfVFJBSU5fUFJFX0VNUEhf TEVWRUxfMjsKQEAgLTU2NDgsNyArNTY0OSw3IEBAIGludGVsX2RwX2luaXRfY29ubmVjdG9yKHN0 cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0LAogCS8qIGludGVsX2RwIHZm dW5jcyAqLwogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KQogCQlpbnRlbF9kcC0+Z2V0 X2F1eF9jbG9ja19kaXZpZGVyID0gc2tsX2dldF9hdXhfY2xvY2tfZGl2aWRlcjsKLQllbHNlIGlm IChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRldikpCisJZWxzZSBpZiAoSVNfSEFT V0VMTChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkKIAkJaW50ZWxfZHAtPmdl dF9hdXhfY2xvY2tfZGl2aWRlciA9IGhzd19nZXRfYXV4X2Nsb2NrX2RpdmlkZXI7CiAJZWxzZSBp ZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikpCiAJCWludGVsX2RwLT5nZXRfYXV4X2Nsb2NrX2Rp dmlkZXIgPSBpbGtfZ2V0X2F1eF9jbG9ja19kaXZpZGVyOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMK aW5kZXggYzgyZTU0N2NiYzQ2Li4yODEzM2M5NzJjNTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YwpAQCAtMjE1Nyw3ICsyMTU3LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfcmVhZF93bV9sYXRlbmN5 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVpbnQxNl90IHdtWzhdKQogCQkJfQogCQl9CiAKLQl9 IGVsc2UgaWYgKElTX0hBU1dFTEwoZGV2KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkgeworCX0gZWxz ZSBpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkgewog CQl1aW50NjRfdCBzc2twZCA9IEk5MTVfUkVBRDY0KE1DSF9TU0tQRCk7CiAKIAkJd21bMF0gPSAo c3NrcGQgPj4gNTYpICYgMHhGRjsKQEAgLTIyMDUsMTIgKzIyMDUsMTQgQEAgc3RhdGljIHZvaWQg aW50ZWxfZml4dXBfY3VyX3dtX2xhdGVuY3koc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAogCiBpbnQgaWxrX3dtX21heF9sZXZlbChjb25zdCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogeworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsK KwogCS8qIGhvdyBtYW55IFdNIGxldmVscyBhcmUgd2UgZXhwZWN0aW5nICovCi0JaWYgKElOVEVM X0lORk8oZGV2KS0+Z2VuID49IDkpCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkKIAkJ cmV0dXJuIDc7Ci0JZWxzZSBpZiAoSVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYp KQorCWVsc2UgaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJp dikpCiAJCXJldHVybiA0OwotCWVsc2UgaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDYpCisJ ZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA2KQogCQlyZXR1cm4gMzsKIAllbHNlCiAJ CXJldHVybiAyOwpAQCAtMjM5Myw3ICsyMzk1LDcgQEAgc3RhdGljIGludCBpbGtfY29tcHV0ZV9w aXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUpCiAJbWVtc2V0KCZwaXBlX3dt LT53bSwgMCwgc2l6ZW9mKHBpcGVfd20tPndtKSk7CiAJcGlwZV93bS0+d21bMF0gPSBwaXBlX3dt LT5yYXdfd21bMF07CiAKLQlpZiAoSVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYp KQorCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKQog CQlwaXBlX3dtLT5saW5ldGltZSA9IGhzd19jb21wdXRlX2xpbmV0aW1lX3dtKGNzdGF0ZSk7CiAK IAlpZiAoIWlsa192YWxpZGF0ZV9waXBlX3dtKGRldiwgcGlwZV93bSkpCkBAIC0yNTgwLDcgKzI1 ODIsNyBAQCBzdGF0aWMgdW5zaWduZWQgaW50IGlsa193bV9scF9sYXRlbmN5KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIGludCBsZXZlbCkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KGRldik7CiAKLQlpZiAoSVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FE V0VMTChkZXYpKQorCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2 X3ByaXYpKQogCQlyZXR1cm4gMiAqIGxldmVsOwogCWVsc2UKIAkJcmV0dXJuIGRldl9wcml2LT53 bS5wcmlfbGF0ZW5jeVtsZXZlbF07CkBAIC0yODA0LDcgKzI4MDYsNyBAQCBzdGF0aWMgdm9pZCBp bGtfd3JpdGVfd21fdmFsdWVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJ STkxNV9XUklURShQSVBFX1dNX0xJTkVUSU1FKFBJUEVfQyksIHJlc3VsdHMtPndtX2xpbmV0aW1l WzJdKTsKIAogCWlmIChkaXJ0eSAmIFdNX0RJUlRZX0REQikgewotCQlpZiAoSVNfSEFTV0VMTChk ZXYpIHx8IElTX0JST0FEV0VMTChkZXYpKSB7CisJCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSB8 fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKSB7CiAJCQl2YWwgPSBJOTE1X1JFQUQoV01fTUlTQyk7 CiAJCQlpZiAocmVzdWx0cy0+cGFydGl0aW9uaW5nID09IElOVEVMX0REQl9QQVJUXzFfMikKIAkJ CQl2YWwgJj0gfldNX01JU0NfREFUQV9QQVJUSVRJT05fNV82OwpAQCAtNDQwNyw3ICs0NDA5LDcg QEAgc3RhdGljIHZvaWQgaWxrX3BpcGVfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YykKIAl9OwogCiAJaHctPndtX3BpcGVbcGlwZV0gPSBJOTE1X1JFQUQod20wX3BpcGVfcmVn W3BpcGVdKTsKLQlpZiAoSVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYpKQorCWlm IChJU19IQVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKQogCQlody0+ d21fbGluZXRpbWVbcGlwZV0gPSBJOTE1X1JFQUQoUElQRV9XTV9MSU5FVElNRShwaXBlKSk7CiAK IAltZW1zZXQoYWN0aXZlLCAwLCBzaXplb2YoKmFjdGl2ZSkpOwpAQCAtNDYxNSw3ICs0NjE3LDcg QEAgdm9pZCBpbGtfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWh3 LT53bV9scF9zcHJbMl0gPSBJOTE1X1JFQUQoV00zU19MUF9JVkIpOwogCX0KIAotCWlmIChJU19I QVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRldikpCisJaWYgKElTX0hBU1dFTEwoZGV2X3By aXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpCiAJCWh3LT5wYXJ0aXRpb25pbmcgPSAoSTkx NV9SRUFEKFdNX01JU0MpICYgV01fTUlTQ19EQVRBX1BBUlRJVElPTl81XzYpID8KIAkJCUlOVEVM X0REQl9QQVJUXzVfNiA6IElOVEVMX0REQl9QQVJUXzFfMjsKIAllbHNlIGlmIChJU19JVllCUklE R0UoZGV2X3ByaXYpKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNy LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYwppbmRleCA5ZTJmYmFjOTc3NmUu LmQwNjY3ZjlkOTE3OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNy LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKQEAgLTgyNywxNCArODI3 LDE0IEBAIHZvaWQgaW50ZWxfcHNyX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCS8q IFBlciBwbGF0Zm9ybSBkZWZhdWx0ICovCiAJaWYgKGk5MTUuZW5hYmxlX3BzciA9PSAtMSkgewot CQlpZiAoSVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYpKQorCQlpZiAoSVNfSEFT V0VMTChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkKIAkJCWk5MTUuZW5hYmxl X3BzciA9IDE7CiAJCWVsc2UKIAkJCWk5MTUuZW5hYmxlX3BzciA9IDA7CiAJfQogCiAJLyogU2V0 IGxpbmtfc3RhbmRieSB4IGxpbmtfb2ZmIGRlZmF1bHRzICovCi0JaWYgKElTX0hBU1dFTEwoZGV2 KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkKKwlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwgSVNf QlJPQURXRUxMKGRldl9wcml2KSkKIAkJLyogSFNXIGFuZCBCRFcgcmVxdWlyZSB3b3JrYXJvdW5k cyB0aGF0IHdlIGRvbid0IGltcGxlbWVudC4gKi8KIAkJZGV2X3ByaXYtPnBzci5saW5rX3N0YW5k YnkgPSBmYWxzZTsKIAllbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklF VyhkZXYpKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9w bS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCmluZGV4IGVkMWZh ZjE0Zjc3Ny4uNzdlZjAzY2I2MTYzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9ydW50aW1lX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGlt ZV9wbS5jCkBAIC0yODgsNyArMjg4LDYgQEAgdm9pZCBpbnRlbF9kaXNwbGF5X3NldF9pbml0X3Bv d2VyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIHN0YXRpYyB2b2lkIGhzd19w b3dlcl93ZWxsX3Bvc3RfZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IHsKIAlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IGRldl9wcml2LT5kcm0ucGRldjsKLQlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2ID0gJmRldl9wcml2LT5kcm07CiAKIAkvKgogCSAqIEFmdGVyIHdlIHJl LWVuYWJsZSB0aGUgcG93ZXIgd2VsbCwgaWYgd2UgdG91Y2ggVkdBIHJlZ2lzdGVyIDB4M2Q1CkBA IC0zMDQsNyArMzAzLDcgQEAgc3RhdGljIHZvaWQgaHN3X3Bvd2VyX3dlbGxfcG9zdF9lbmFibGUo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCW91dGIoaW5iKFZHQV9NU1JfUkVB RCksIFZHQV9NU1JfV1JJVEUpOwogCXZnYV9wdXQocGRldiwgVkdBX1JTUkNfTEVHQUNZX0lPKTsK IAotCWlmIChJU19CUk9BRFdFTEwoZGV2KSkKKwlpZiAoSVNfQlJPQURXRUxMKGRldl9wcml2KSkK IAkJZ2VuOF9pcnFfcG93ZXJfd2VsbF9wb3N0X2VuYWJsZShkZXZfcHJpdiwKIAkJCQkJCTEgPDwg UElQRV9DIHwgMSA8PCBQSVBFX0IpOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpp bmRleCBkMGY3OThjZTZiYjIuLmZlZmQzMDM0YWVhZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf c3ByaXRlLmMKQEAgLTU0MiwxMiArNTQyLDEyIEBAIGl2Yl91cGRhdGVfcGxhbmUoc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUsCiAJaWYgKGZiLT5tb2RpZmllclswXSA9PSBJOTE1X0ZPUk1BVF9NT0Rf WF9USUxFRCkKIAkJc3ByY3RsIHw9IFNQUklURV9USUxFRDsKIAotCWlmIChJU19IQVNXRUxMKGRl dikgfHwgSVNfQlJPQURXRUxMKGRldikpCisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpIHx8IElT X0JST0FEV0VMTChkZXZfcHJpdikpCiAJCXNwcmN0bCAmPSB+U1BSSVRFX1RSSUNLTEVfRkVFRF9E SVNBQkxFOwogCWVsc2UKIAkJc3ByY3RsIHw9IFNQUklURV9UUklDS0xFX0ZFRURfRElTQUJMRTsK IAotCWlmIChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRldikpCisJaWYgKElTX0hB U1dFTEwoZGV2X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpCiAJCXNwcmN0bCB8PSBT UFJJVEVfUElQRV9DU0NfRU5BQkxFOwogCiAJLyogU2l6ZXMgYXJlIDAgYmFzZWQgKi8KQEAgLTU2 Niw3ICs1NjYsNyBAQCBpdmJfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAog CQlzcHJjdGwgfD0gU1BSSVRFX1JPVEFURV8xODA7CiAKIAkJLyogSFNXIGFuZCBCRFcgZG9lcyB0 aGlzIGF1dG9tYWdpY2FsbHkgaW4gaGFyZHdhcmUgKi8KLQkJaWYgKCFJU19IQVNXRUxMKGRldikg JiYgIUlTX0JST0FEV0VMTChkZXYpKSB7CisJCWlmICghSVNfSEFTV0VMTChkZXZfcHJpdikgJiYg IUlTX0JST0FEV0VMTChkZXZfcHJpdikpIHsKIAkJCXggKz0gc3JjX3c7CiAJCQl5ICs9IHNyY19o OwogCQl9CkBAIC01OTAsNyArNTkwLDcgQEAgaXZiX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwKIAogCS8qIEhTVyBjb25zb2xpZGF0ZXMgU1BSVElMRU9GRiBhbmQgU1BSTElO T0ZGIGludG8gYSBzaW5nbGUgU1BST0ZGU0VUCiAJICogcmVnaXN0ZXIgKi8KLQlpZiAoSVNfSEFT V0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYpKQorCWlmIChJU19IQVNXRUxMKGRldl9wcml2 KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKQogCQlJOTE1X1dSSVRFKFNQUk9GRlNFVChwaXBl KSwgKHkgPDwgMTYpIHwgeCk7CiAJZWxzZSBpZiAoZmItPm1vZGlmaWVyWzBdID09IEk5MTVfRk9S TUFUX01PRF9YX1RJTEVEKQogCQlJOTE1X1dSSVRFKFNQUlRJTEVPRkYocGlwZSksICh5IDw8IDE2 KSB8IHgpOwotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=