From: Dave Gordon Subject: [PATCH] drm/i915: prefer INTEL_GEN(dev_priv) to INTEL_INFO(dev)->gen Date: Fri, 9 Sep 2016 22:37:46 +0100 Message-ID: <1473457066-6627-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id D43066E076 for ; Fri, 9 Sep 2016 21:38:00 +0000 (UTC) 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 TW9yZSBDb2NjaW5lbGxlcnkgLi4uCgpXaGVyZXZlciB3ZSBmaW5kICJJTlRFTF9JTkZPKGRldikt PmdlbiIsIGFuZCBoYXZlIGEgc3VpdGFibGUKImRldl9wcml2IiBpbiBzY29wZSwgcmVwbGFjZSBp dCB3aXRoICJJTlRFTF9HRU4oZGV2X3ByaXYpIiwKd2hpY2ggaXMgdGhlIHByZWZlcnJlZCB3YXN5 IHRvIGFjY2VzcyB0aGlzIGRldmljZSBwcm9wZXJ0eS4KClRoaXMgcGF0Y2ggY292ZXJzIGFsbCB0 aGUgZmlsZXMgdGhhdCBjb250YWluZWQgb25seSByZWxhdGl2ZWx5CmZldyBpbnN0YW5jZXMsIGFu ZCB3aGVyZSBubyBtYW51YWwgZml4dXAgd2FzIHJlcXVpcmVkLiBBIGZldwptb3JlIGNvbXBsZXgg aW5zdGFuY2VzIG1heSBiZSB1cGRhdGVkIGluIGEgbGF0ZXIgcGF0Y2guCgpAZGV2X3ByaXZfcGFy YW1ACmZ1bmN0aW9uIEZVTkM7CmlkZXhwcmVzc2lvbiBzdHJ1Y3QgZHJtX2RldmljZSAqREVWOwpp ZGVudGlmaWVyIERFVl9QUklWOwpAQApGVU5DKC4uLiwgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KkRFVl9QUklWLCAuLi4pCnsKICAgIDwuLi4KLSAgIElOVEVMX0lORk8oREVWKS0+Z2VuCisgICBJ TlRFTF9HRU4oREVWX1BSSVYpCiAgICAuLi4+Cn0KCkBkZXZfcHJpdl9sb2NhbEAKaWRleHByZXNz aW9uIHN0cnVjdCBkcm1fZGV2aWNlICpERVY7CmlkZW50aWZpZXIgREVWX1BSSVY7CmV4cHJlc3Np b24gRTsKQEAKewogICAgLi4uCigKICAgIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpERVZfUFJJ VjsKfAogICAgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKkRFVl9QUklWID0gRTsKKQogICAgPC4u LgotICAgSU5URUxfSU5GTyhERVYpLT5nZW4KKyAgIElOVEVMX0dFTihERVZfUFJJVikKICAgIC4u Lj4KfQoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgICAgfCAgNCAr Ky0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgfCAgNiArKyst LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jICAgICAgICB8ICA0ICsrLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgICAgICB8IDE0ICsrKysrKyst LS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jICAgICAgICAgICAgfCAxMiAr KysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMgICAgICAgICB8 ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYyAgICAgICAgICAgfCAgNiAr KystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jICAgICAgICAgICB8ICA0ICsr LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgICAgICAgICAgICB8IDE0ICsrKysr KystLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5jICAgICAgfCAg MiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jICAgICAgICAgIHwgIDQgKyst LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgICAgICAgIHwgMTggKysrKysr KysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYyAgICAgICAgICAg fCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMgICAgICAgICAgfCAg OCArKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdHYuYyAgICAgICAgICAgIHwg IDIgKy0KIDE1IGZpbGVzIGNoYW5nZWQsIDUyIGluc2VydGlvbnMoKyksIDUyIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDI0MDE4MTguLmRhOWI0ZmEgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYwpAQCAtNDM0Myw3ICs0MzQzLDcgQEAgdm9pZCBpOTE1X2dlbV9pbml0 X3N3aXp6bGluZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAotCWlmIChJTlRFTF9JTkZPKGRldikt PmdlbiA8IDUgfHwKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDUgfHwKIAkgICAgZGV2X3By aXYtPm1tLmJpdF82X3N3aXp6bGVfeCA9PSBJOTE1X0JJVF82X1NXSVpaTEVfTk9ORSkKIAkJcmV0 dXJuOwogCkBAIC00NDEzLDcgKzQ0MTMsNyBAQCBzdGF0aWMgdm9pZCBpbml0X3VudXNlZF9yaW5n cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJdTMyIHRlbXAgPSBJOTE1X1JFQUQoR0VON19N U0dfQ1RMKTsKIAkJCXRlbXAgJj0gfihXQUlUX0ZPUl9QQ0hfRkxSX0FDSyB8IFdBSVRfRk9SX1BD SF9SRVNFVF9BQ0spOwogCQkJSTkxNV9XUklURShHRU43X01TR19DVEwsIHRlbXApOwotCQl9IGVs c2UgaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDcpIHsKKwkJfSBlbHNlIGlmIChJTlRFTF9H RU4oZGV2X3ByaXYpID49IDcpIHsKIAkJCXUzMiB0ZW1wID0gSTkxNV9SRUFEKEhTV19OREVfUlNU V1JOX09QVCk7CiAJCQl0ZW1wICY9IH5SRVNFVF9QQ0hfSEFORFNIQUtFX0VOQUJMRTsKIAkJCUk5 MTVfV1JJVEUoSFNXX05ERV9SU1RXUk5fT1BULCB0ZW1wKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwppbmRleCA5NDMyZDRjLi5iMDY1MTE2IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBAIC0xNDYwLDE5ICsxNDYwLDE5 IEBAIHN0YXRpYyB2b2lkIGViX2V4cG9ydF9mZW5jZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqb2JqLAogCQl9CiAKIAkJaWYgKGluc3RwX21vZGUgIT0gZGV2X3ByaXYtPnJlbGF0aXZlX2Nv bnN0YW50c19tb2RlKSB7Ci0JCQlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA8IDQpIHsK KwkJCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgNCkgewogCQkJCURSTV9ERUJVRygibm8gcmVs IGNvbnN0YW50cyBvbiBwcmUtZ2VuNFxuIik7CiAJCQkJcmV0dXJuIC1FSU5WQUw7CiAJCQl9CiAK LQkJCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuID4gNSAmJgorCQkJaWYgKElOVEVMX0dF TihkZXZfcHJpdikgPiA1ICYmCiAJCQkgICAgaW5zdHBfbW9kZSA9PSBJOTE1X0VYRUNfQ09OU1RB TlRTX1JFTF9TVVJGQUNFKSB7CiAJCQkJRFJNX0RFQlVHKCJyZWwgc3VyZmFjZSBjb25zdGFudHMg bW9kZSBpbnZhbGlkIG9uIGdlbjUrXG4iKTsKIAkJCQlyZXR1cm4gLUVJTlZBTDsKIAkJCX0KIAog CQkJLyogVGhlIEhXIGNoYW5nZWQgdGhlIG1lYW5pbmcgb24gdGhpcyBiaXQgb24gZ2VuNiAqLwot CQkJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPj0gNikKKwkJCWlmIChJTlRFTF9HRU4o ZGV2X3ByaXYpID49IDYpCiAJCQkJaW5zdHBfbWFzayAmPSB+STkxNV9FWEVDX0NPTlNUQU5UU19S RUxfU1VSRkFDRTsKIAkJfQogCQlicmVhazsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMK aW5kZXggZTE2YzM4MC4uYmE2NjFiOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMK QEAgLTIyODEsNyArMjI4MSw3IEBAIHZvaWQgaTkxNV9nZW1fc3VzcGVuZF9ndHRfbWFwcGluZ3Mo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkvKiBEb24ndCBib3RoZXIgbWVzc2luZyB3aXRoIGZh dWx0cyBwcmUgR0VONiBhcyB3ZSBoYXZlIGxpdHRsZQogCSAqIGRvY3VtZW50YXRpb24gc3VwcG9y dGluZyB0aGF0IGl0J3MgYSBnb29kIGlkZWEuCiAJICovCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+ Z2VuIDwgNikKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDYpCiAJCXJldHVybjsKIAogCWk5 MTVfY2hlY2tfYW5kX2NsZWFyX2ZhdWx0cyhkZXZfcHJpdik7CkBAIC0zMjYwLDcgKzMyNjAsNyBA QCB2b2lkIGk5MTVfZ2VtX3Jlc3RvcmVfZ3R0X21hcHBpbmdzKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJCQlXQVJOX09OKGk5MTVfZ2VtX29iamVjdF9zZXRfdG9fZ3R0X2RvbWFpbihvYmosIGZh bHNlKSk7CiAJfQogCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDgpIHsKKwlpZiAoSU5U RUxfR0VOKGRldl9wcml2KSA+PSA4KSB7CiAJCWlmIChJU19DSEVSUllWSUVXKGRldikgfHwgSVNf QlJPWFRPTihkZXYpKQogCQkJY2h2X3NldHVwX3ByaXZhdGVfcHBhdChkZXZfcHJpdik7CiAJCWVs c2UKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCmluZGV4IDMzNGYxNWQuLjlhMGZj MmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwpAQCAtMzg3LDcgKzM4Nyw3 IEBAIGludCBpOTE1X2Vycm9yX3N0YXRlX3RvX3N0cihzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3Rh dGVfYnVmICptLAogCiAJZXJyX3ByaW50ZihtLCAiRUlSOiAweCUwOHhcbiIsIGVycm9yLT5laXIp OwogCWVycl9wcmludGYobSwgIklFUjogMHglMDh4XG4iLCBlcnJvci0+aWVyKTsKLQlpZiAoSU5U RUxfSU5GTyhkZXYpLT5nZW4gPj0gOCkgeworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgp IHsKIAkJZm9yIChpID0gMDsgaSA8IDQ7IGkrKykKIAkJCWVycl9wcmludGYobSwgIkdUSUVSIGd0 ICVkOiAweCUwOHhcbiIsIGksCiAJCQkJICAgZXJyb3ItPmd0aWVyW2ldKTsKQEAgLTQwNiwxMCAr NDA2LDEwIEBAIGludCBpOTE1X2Vycm9yX3N0YXRlX3RvX3N0cihzdHJ1Y3QgZHJtX2k5MTVfZXJy b3Jfc3RhdGVfYnVmICptLAogCQllcnJfcHJpbnRmKG0sICIgIElOU1RET05FXyVkOiAweCUwOHhc biIsIGksCiAJCQkgICBlcnJvci0+ZXh0cmFfaW5zdGRvbmVbaV0pOwogCi0JaWYgKElOVEVMX0lO Rk8oZGV2KS0+Z2VuID49IDYpIHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA2KSB7CiAJ CWVycl9wcmludGYobSwgIkVSUk9SOiAweCUwOHhcbiIsIGVycm9yLT5lcnJvcik7CiAKLQkJaWYg KElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDgpCisJCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49 IDgpCiAJCQllcnJfcHJpbnRmKG0sICJGQVVMVF9UTEJfREFUQTogMHglMDh4IDB4JTA4eFxuIiwK IAkJCQkgICBlcnJvci0+ZmF1bHRfZGF0YTEsIGVycm9yLT5mYXVsdF9kYXRhMCk7CiAKQEAgLTEz MjcsNyArMTMyNyw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfY2FwdHVyZV9yZWdfc3RhdGUoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWlmIChJU19HRU43KGRldikpCiAJCWVycm9y LT5lcnJfaW50ID0gSTkxNV9SRUFEKEdFTjdfRVJSX0lOVCk7CiAKLQlpZiAoSU5URUxfSU5GTyhk ZXYpLT5nZW4gPj0gOCkgeworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgpIHsKIAkJZXJy b3ItPmZhdWx0X2RhdGEwID0gSTkxNV9SRUFEKEdFTjhfRkFVTFRfVExCX0RBVEEwKTsKIAkJZXJy b3ItPmZhdWx0X2RhdGExID0gSTkxNV9SRUFEKEdFTjhfRkFVTFRfVExCX0RBVEExKTsKIAl9CkBA IC0xMzM5LDEwICsxMzM5LDEwIEBAIHN0YXRpYyB2b2lkIGk5MTVfY2FwdHVyZV9yZWdfc3RhdGUo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCX0KIAogCS8qIDI6IFJlZ2lzdGVy cyB3aGljaCBiZWxvbmcgdG8gbXVsdGlwbGUgZ2VuZXJhdGlvbnMgKi8KLQlpZiAoSU5URUxfSU5G TyhkZXYpLT5nZW4gPj0gNykKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA3KQogCQllcnJv ci0+Zm9yY2V3YWtlID0gSTkxNV9SRUFEX0ZXKEZPUkNFV0FLRV9NVCk7CiAKLQlpZiAoSU5URUxf SU5GTyhkZXYpLT5nZW4gPj0gNikgeworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDYpIHsK IAkJZXJyb3ItPmRlcnJtciA9IEk5MTVfUkVBRChERVJSTVIpOwogCQllcnJvci0+ZXJyb3IgPSBJ OTE1X1JFQUQoRVJST1JfR0VONik7CiAJCWVycm9yLT5kb25lX3JlZyA9IEk5MTVfUkVBRChET05F X1JFRyk7CkBAIC0xMzU4LDcgKzEzNTgsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2NhcHR1cmVfcmVn X3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlpZiAoSEFTX0hXX0NP TlRFWFRTKGRldikpCiAJCWVycm9yLT5jY2lkID0gSTkxNV9SRUFEKENDSUQpOwogCi0JaWYgKElO VEVMX0lORk8oZGV2KS0+Z2VuID49IDgpIHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4 KSB7CiAJCWVycm9yLT5pZXIgPSBJOTE1X1JFQUQoR0VOOF9ERV9NSVNDX0lFUik7CiAJCWZvciAo aSA9IDA7IGkgPCA0OyBpKyspCiAJCQllcnJvci0+Z3RpZXJbaV0gPSBJOTE1X1JFQUQoR0VOOF9H VF9JRVIoaSkpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKaW5kZXggODIzNThkNC4uZmU3N2EyOSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC0yNjk4LDcgKzI2OTgsNyBAQCBzdGF0aWMgaW50 IGk5MTVfZW5hYmxlX3ZibGFuayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQg cGlwZSkKIAl1bnNpZ25lZCBsb25nIGlycWZsYWdzOwogCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmRl dl9wcml2LT5pcnFfbG9jaywgaXJxZmxhZ3MpOwotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+ PSA0KQorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDQpCiAJCWk5MTVfZW5hYmxlX3BpcGVz dGF0KGRldl9wcml2LCBwaXBlLAogCQkJCSAgICAgUElQRV9TVEFSVF9WQkxBTktfSU5URVJSVVBU X1NUQVRVUyk7CiAJZWxzZQpAQCAtMjcxMyw3ICsyNzEzLDcgQEAgc3RhdGljIGludCBpcm9ubGFr ZV9lbmFibGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBl KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsK IAl1bnNpZ25lZCBsb25nIGlycWZsYWdzOwotCXVpbnQzMl90IGJpdCA9IChJTlRFTF9JTkZPKGRl diktPmdlbiA+PSA3KSA/IERFX1BJUEVfVkJMQU5LX0lWQihwaXBlKSA6CisJdWludDMyX3QgYml0 ID0gKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNykgPyBERV9QSVBFX1ZCTEFOS19JVkIocGlwZSkg OgogCQkJCQkJICAgICBERV9QSVBFX1ZCTEFOSyhwaXBlKTsKIAogCXNwaW5fbG9ja19pcnFzYXZl KCZkZXZfcHJpdi0+aXJxX2xvY2ssIGlycWZsYWdzKTsKQEAgLTI3NjcsNyArMjc2Nyw3IEBAIHN0 YXRpYyB2b2lkIGlyb25sYWtlX2Rpc2FibGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHVuc2lnbmVkIGludCBwaXBlKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHRvX2k5MTUoZGV2KTsKIAl1bnNpZ25lZCBsb25nIGlycWZsYWdzOwotCXVpbnQzMl90IGJp dCA9IChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA3KSA/IERFX1BJUEVfVkJMQU5LX0lWQihwaXBl KSA6CisJdWludDMyX3QgYml0ID0gKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNykgPyBERV9QSVBF X1ZCTEFOS19JVkIocGlwZSkgOgogCQkJCQkJICAgICBERV9QSVBFX1ZCTEFOSyhwaXBlKTsKIAog CXNwaW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+aXJxX2xvY2ssIGlycWZsYWdzKTsKQEAgLTMy MzAsNyArMzIzMCw3IEBAIHN0YXRpYyB2b2lkIGdlbjVfZ3RfaXJxX3Jlc2V0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkx NShkZXYpOwogCiAJR0VONV9JUlFfUkVTRVQoR1QpOwotCWlmIChJTlRFTF9JTkZPKGRldiktPmdl biA+PSA2KQorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDYpCiAJCUdFTjVfSVJRX1JFU0VU KEdFTjZfUE0pOwogfQogCkBAIC0zNTY2LDcgKzM1NjYsNyBAQCBzdGF0aWMgdm9pZCBnZW41X2d0 X2lycV9wb3N0aW5zdGFsbChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJR0VONV9JUlFfSU5J VChHVCwgZGV2X3ByaXYtPmd0X2lycV9tYXNrLCBndF9pcnFzKTsKIAotCWlmIChJTlRFTF9JTkZP KGRldiktPmdlbiA+PSA2KSB7CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNikgewogCQkv KgogCQkgKiBSUFMgaW50ZXJydXB0cyB3aWxsIGdldCBlbmFibGVkL2Rpc2FibGVkIG9uIGRlbWFu ZCB3aGVuIFJQUwogCQkgKiBpdHNlbGYgaXMgZW5hYmxlZC9kaXNhYmxlZC4KQEAgLTM1ODQsNyAr MzU4NCw3IEBAIHN0YXRpYyBpbnQgaXJvbmxha2VfaXJxX3Bvc3RpbnN0YWxsKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkx NShkZXYpOwogCXUzMiBkaXNwbGF5X21hc2ssIGV4dHJhX21hc2s7CiAKLQlpZiAoSU5URUxfSU5G TyhkZXYpLT5nZW4gPj0gNykgeworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDcpIHsKIAkJ ZGlzcGxheV9tYXNrID0gKERFX01BU1RFUl9JUlFfQ09OVFJPTCB8IERFX0dTRV9JVkIgfAogCQkJ CURFX1BDSF9FVkVOVF9JVkIgfCBERV9QTEFORUNfRkxJUF9ET05FX0lWQiB8CiAJCQkJREVfUExB TkVCX0ZMSVBfRE9ORV9JVkIgfApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfY29sb3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMKaW5kZXggOTVh NzI3Ny4uNzMyMmM4NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY29s b3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jCkBAIC0xODAsNyAr MTgwLDcgQEAgc3RhdGljIHZvaWQgaTl4eF9sb2FkX2NzY19tYXRyaXgoc3RydWN0IGRybV9jcnRj X3N0YXRlICpjcnRjX3N0YXRlKQogCUk5MTVfV1JJVEUoUElQRV9DU0NfUFJFT0ZGX01FKHBpcGUp LCAwKTsKIAlJOTE1X1dSSVRFKFBJUEVfQ1NDX1BSRU9GRl9MTyhwaXBlKSwgMCk7CiAKLQlpZiAo SU5URUxfSU5GTyhkZXYpLT5nZW4gPiA2KSB7CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPiA2 KSB7CiAJCXVpbnQxNl90IHBvc3RvZmYgPSAwOwogCiAJCWlmIChpbnRlbF9jcnRjX3N0YXRlLT5s aW1pdGVkX2NvbG9yX3JhbmdlKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfY3J0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYwppbmRleCBkZmJjZjE2 Li4xYzU0NDU0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYwpAQCAtMTU0LDcgKzE1NCw3IEBA IHN0YXRpYyB2b2lkIGludGVsX2NydF9zZXRfZHBtcyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5j b2RlciwKIAljb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9ICZj cnRjX3N0YXRlLT5iYXNlLmFkanVzdGVkX21vZGU7CiAJdTMyIGFkcGE7CiAKLQlpZiAoSU5URUxf SU5GTyhkZXYpLT5nZW4gPj0gNSkKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA1KQogCQlh ZHBhID0gQURQQV9IT1RQTFVHX0JJVFM7CiAJZWxzZQogCQlhZHBhID0gMDsKQEAgLTcwMCw3ICs3 MDAsNyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9jcnRfZGV0ZWN0X2RkYyhzdHJ1Y3QgZHJtX2Nvbm5l Y3RvciAqY29ubmVjdG9yKQogCWlmIChpbnRlbF9nZXRfbG9hZF9kZXRlY3RfcGlwZShjb25uZWN0 b3IsIE5VTEwsICZ0bXAsICZjdHgpKSB7CiAJCWlmIChpbnRlbF9jcnRfZGV0ZWN0X2RkYyhjb25u ZWN0b3IpKQogCQkJc3RhdHVzID0gY29ubmVjdG9yX3N0YXR1c19jb25uZWN0ZWQ7Ci0JCWVsc2Ug aWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgNCkKKwkJZWxzZSBpZiAoSU5URUxfR0VOKGRldl9w cml2KSA8IDQpCiAJCQlzdGF0dXMgPSBpbnRlbF9jcnRfbG9hZF9kZXRlY3QoY3J0LAogCQkJCXRv X2ludGVsX2NydGMoY29ubmVjdG9yLT5zdGF0ZS0+Y3J0YyktPnBpcGUpOwogCQllbHNlIGlmIChp OTE1LmxvYWRfZGV0ZWN0X3Rlc3QpCkBAIC03NjYsNyArNzY2LDcgQEAgdm9pZCBpbnRlbF9jcnRf cmVzZXQoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfY3J0ICpjcnQgPSBp bnRlbF9lbmNvZGVyX3RvX2NydCh0b19pbnRlbF9lbmNvZGVyKGVuY29kZXIpKTsKIAotCWlmIChJ TlRFTF9JTkZPKGRldiktPmdlbiA+PSA1KSB7CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0g NSkgewogCQl1MzIgYWRwYTsKIAogCQlhZHBhID0gSTkxNV9SRUFEKGNydC0+YWRwYV9yZWcpOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kZGkuYwppbmRleCBlNGI4NzVlLi4wNWZmMTZmIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kZGkuYwpAQCAtMTc0NSw3ICsxNzQ1LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxf ZGRpX3Bvc3RfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlciwKIAlp ZiAoSVNfU0tZTEFLRShkZXYpIHx8IElTX0tBQllMQUtFKGRldikpCiAJCUk5MTVfV1JJVEUoRFBM TF9DVFJMMiwgKEk5MTVfUkVBRChEUExMX0NUUkwyKSB8CiAJCQkJCURQTExfQ1RSTDJfRERJX0NM S19PRkYocG9ydCkpKTsKLQllbHNlIGlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDkpCisJZWxz ZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDkpCiAJCUk5MTVfV1JJVEUoUE9SVF9DTEtfU0VM KHBvcnQpLCBQT1JUX0NMS19TRUxfTk9ORSk7CiAKIAlpZiAodHlwZSA9PSBJTlRFTF9PVVRQVVRf SERNSSkgewpAQCAtMTgxNCw3ICsxODE0LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZW5hYmxlX2Rk aShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlciwKIAl9IGVsc2UgaWYgKHR5cGUg PT0gSU5URUxfT1VUUFVUX0VEUCkgewogCQlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gZW5j X3RvX2ludGVsX2RwKGVuY29kZXIpOwogCi0JCWlmIChwb3J0ID09IFBPUlRfQSAmJiBJTlRFTF9J TkZPKGRldiktPmdlbiA8IDkpCisJCWlmIChwb3J0ID09IFBPUlRfQSAmJiBJTlRFTF9HRU4oZGV2 X3ByaXYpIDwgOSkKIAkJCWludGVsX2RwX3N0b3BfbGlua190cmFpbihpbnRlbF9kcCk7CiAKIAkJ aW50ZWxfZWRwX2JhY2tsaWdodF9vbihpbnRlbF9kcCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpp bmRleCA3NWFjNjJmLi42OTIwNjc4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKQEAgLTE1MDIs NyArMTUwMiw3IEBAIHZvaWQgaW50ZWxfZHBfY29tcHV0ZV9yYXRlKHN0cnVjdCBpbnRlbF9kcCAq aW50ZWxfZHAsIGludCBwb3J0X2Nsb2NrLAogCQlpbnRlbF9maXhlZF9wYW5lbF9tb2RlKGludGVs X2Nvbm5lY3Rvci0+cGFuZWwuZml4ZWRfbW9kZSwKIAkJCQkgICAgICAgYWRqdXN0ZWRfbW9kZSk7 CiAKLQkJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDkpIHsKKwkJaWYgKElOVEVMX0dFTihk ZXZfcHJpdikgPj0gOSkgewogCQkJaW50IHJldDsKIAkJCXJldCA9IHNrbF91cGRhdGVfc2NhbGVy X2NydGMocGlwZV9jb25maWcpOwogCQkJaWYgKHJldCkKQEAgLTI5MDgsNyArMjkwOCw3IEBAIHN0 YXRpYyB2b2lkIGNodl9kcF9wb3N0X3BsbF9kaXNhYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICpl bmNvZGVyLAogCiAJaWYgKElTX0JST1hUT04oZGV2KSkKIAkJcmV0dXJuIERQX1RSQUlOX1ZPTFRB R0VfU1dJTkdfTEVWRUxfMzsKLQllbHNlIGlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KSB7 CisJZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KSB7CiAJCWlmIChkZXZfcHJpdi0+ dmJ0LmVkcC5sb3dfdnN3aW5nICYmIHBvcnQgPT0gUE9SVF9BKQogCQkJcmV0dXJuIERQX1RSQUlO X1ZPTFRBR0VfU1dJTkdfTEVWRUxfMzsKIAkJcmV0dXJuIERQX1RSQUlOX1ZPTFRBR0VfU1dJTkdf TEVWRUxfMjsKQEAgLTQ4MDEsNyArNDgwMSw3IEBAIGJvb2wgaW50ZWxfZHBfaXNfZWRwKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIGVudW0gcG9ydCBwb3J0KQogCSAqIGVEUCBub3Qgc3VwcG9ydGVk IG9uIGc0eC4gc28gYmFpbCBvdXQgZWFybHkganVzdAogCSAqIGZvciBhIGJpdCBleHRyYSBzYWZl dHkgaW4gY2FzZSB0aGUgVkJUIGlzIGJvbmtlcnMuCiAJICovCi0JaWYgKElOVEVMX0lORk8oZGV2 KS0+Z2VuIDwgNSkKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDUpCiAJCXJldHVybiBmYWxz ZTsKIAogCWlmIChwb3J0ID09IFBPUlRfQSkKQEAgLTU0MDEsNyArNTQwMSw3IEBAIHZvaWQgaW50 ZWxfZWRwX2RycnNfZmx1c2goc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCUlO SVRfREVMQVlFRF9XT1JLKCZkZXZfcHJpdi0+ZHJycy53b3JrLCBpbnRlbF9lZHBfZHJyc19kb3du Y2xvY2tfd29yayk7CiAJbXV0ZXhfaW5pdCgmZGV2X3ByaXYtPmRycnMubXV0ZXgpOwogCi0JaWYg KElOVEVMX0lORk8oZGV2KS0+Z2VuIDw9IDYpIHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8 PSA2KSB7CiAJCURSTV9ERUJVR19LTVMoIkRSUlMgc3VwcG9ydGVkIGZvciBHZW43IGFuZCBhYm92 ZVxuIik7CiAJCXJldHVybiBOVUxMOwogCX0KQEAgLTU1NzUsNyArNTU3NSw3IEBAIHN0YXRpYyBi b29sIGludGVsX2VkcF9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAog CWludGVsX2RwLT5wcHNfcGlwZSA9IElOVkFMSURfUElQRTsKIAogCS8qIGludGVsX2RwIHZmdW5j cyAqLwotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KQorCWlmIChJTlRFTF9HRU4oZGV2 X3ByaXYpID49IDkpCiAJCWludGVsX2RwLT5nZXRfYXV4X2Nsb2NrX2RpdmlkZXIgPSBza2xfZ2V0 X2F1eF9jbG9ja19kaXZpZGVyOwogCWVsc2UgaWYgKElTX0hBU1dFTEwoZGV2KSB8fCBJU19CUk9B RFdFTEwoZGV2KSkKIAkJaW50ZWxfZHAtPmdldF9hdXhfY2xvY2tfZGl2aWRlciA9IGhzd19nZXRf YXV4X2Nsb2NrX2RpdmlkZXI7CkBAIC01NTg0LDcgKzU1ODQsNyBAQCBzdGF0aWMgYm9vbCBpbnRl bF9lZHBfaW5pdF9jb25uZWN0b3Ioc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAllbHNlCiAJ CWludGVsX2RwLT5nZXRfYXV4X2Nsb2NrX2RpdmlkZXIgPSBnNHhfZ2V0X2F1eF9jbG9ja19kaXZp ZGVyOwogCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDkpCisJaWYgKElOVEVMX0dFTihk ZXZfcHJpdikgPj0gOSkKIAkJaW50ZWxfZHAtPmdldF9hdXhfc2VuZF9jdGwgPSBza2xfZ2V0X2F1 eF9zZW5kX2N0bDsKIAllbHNlCiAJCWludGVsX2RwLT5nZXRfYXV4X3NlbmRfY3RsID0gZzR4X2dl dF9hdXhfc2VuZF9jdGw7CkBAIC01NzM0LDcgKzU3MzQsNyBAQCBib29sIGludGVsX2RwX2luaXQo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAl9IGVsc2UgewogCQlpbnRlbF9lbmNvZGVyLT5wcmVf ZW5hYmxlID0gZzR4X3ByZV9lbmFibGVfZHA7CiAJCWludGVsX2VuY29kZXItPmVuYWJsZSA9IGc0 eF9lbmFibGVfZHA7Ci0JCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA1KQorCQlpZiAoSU5U RUxfR0VOKGRldl9wcml2KSA+PSA1KQogCQkJaW50ZWxfZW5jb2Rlci0+cG9zdF9kaXNhYmxlID0g aWxrX3Bvc3RfZGlzYWJsZV9kcDsKIAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RwbGxfbWdyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21n ci5jCmluZGV4IDlhMWRhOTguLjZmNGJhOWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RwbGxfbWdyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBs bF9tZ3IuYwpAQCAtMTU2LDcgKzE1Niw3IEBAIHZvaWQgaW50ZWxfZGlzYWJsZV9zaGFyZWRfZHBs bChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAl1bnNpZ25lZCBjcnRjX21hc2sgPSAxIDw8IGRy bV9jcnRjX2luZGV4KCZjcnRjLT5iYXNlKTsKIAogCS8qIFBDSCBvbmx5IGF2YWlsYWJsZSBvbiBJ TEsrICovCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgNSkKKwlpZiAoSU5URUxfR0VOKGRl dl9wcml2KSA8IDUpCiAJCXJldHVybjsKIAogCWlmIChwbGwgPT0gTlVMTCkKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2x2ZHMuYwppbmRleCBlMWQ0N2Q1Li4yMGI3ODFmIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHZkcy5jCkBAIC0xMzksMTIgKzEzOSwxMiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9sdmRzX2dl dF9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAKIAlwaXBlX2NvbmZpZy0+ YmFzZS5hZGp1c3RlZF9tb2RlLmZsYWdzIHw9IGZsYWdzOwogCi0JaWYgKElOVEVMX0lORk8oZGV2 KS0+Z2VuIDwgNSkKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDUpCiAJCXBpcGVfY29uZmln LT5nbWNoX3BmaXQubHZkc19ib3JkZXJfYml0cyA9CiAJCQl0bXAgJiBMVkRTX0JPUkRFUl9FTkFC TEU7CiAKIAkvKiBnZW4yLzMgc3RvcmUgZGl0aGVyIHN0YXRlIGluIHBmaXQgY29udHJvbCwgbmVl ZHMgdG8gbWF0Y2ggKi8KLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA0KSB7CisJaWYgKElO VEVMX0dFTihkZXZfcHJpdikgPCA0KSB7CiAJCXRtcCA9IEk5MTVfUkVBRChQRklUX0NPTlRST0wp OwogCiAJCXBpcGVfY29uZmlnLT5nbWNoX3BmaXQuY29udHJvbCB8PSB0bXAgJiBQQU5FTF84VE82 X0RJVEhFUl9FTkFCTEU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCA0ZjgzM2EwLi5mMGE1 YTMzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTIxNjMsMTQgKzIxNjMsMTQgQEAgc3Rh dGljIHZvaWQgaW50ZWxfcmVhZF93bV9sYXRlbmN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVp bnQxNl90IHdtWzhdKQogCQl3bVsyXSA9IChzc2twZCA+PiAxMikgJiAweEZGOwogCQl3bVszXSA9 IChzc2twZCA+PiAyMCkgJiAweDFGRjsKIAkJd21bNF0gPSAoc3NrcGQgPj4gMzIpICYgMHgxRkY7 Ci0JfSBlbHNlIGlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA2KSB7CisJfSBlbHNlIGlmIChJ TlRFTF9HRU4oZGV2X3ByaXYpID49IDYpIHsKIAkJdWludDMyX3Qgc3NrcGQgPSBJOTE1X1JFQUQo TUNIX1NTS1BEKTsKIAogCQl3bVswXSA9IChzc2twZCA+PiBTU0tQRF9XTTBfU0hJRlQpICYgU1NL UERfV01fTUFTSzsKIAkJd21bMV0gPSAoc3NrcGQgPj4gU1NLUERfV00xX1NISUZUKSAmIFNTS1BE X1dNX01BU0s7CiAJCXdtWzJdID0gKHNza3BkID4+IFNTS1BEX1dNMl9TSElGVCkgJiBTU0tQRF9X TV9NQVNLOwogCQl3bVszXSA9IChzc2twZCA+PiBTU0tQRF9XTTNfU0hJRlQpICYgU1NLUERfV01f TUFTSzsKLQl9IGVsc2UgaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDUpIHsKKwl9IGVsc2Ug aWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNSkgewogCQl1aW50MzJfdCBtbHRyID0gSTkxNV9S RUFEKE1MVFJfSUxLKTsKIAogCQkvKiBJTEsgcHJpbWFyeSBMUDAgbGF0ZW5jeSBpcyA3MDAgbnMg Ki8KQEAgLTIzNzUsNyArMjM3NSw3IEBAIHN0YXRpYyBpbnQgaWxrX2NvbXB1dGVfcGlwZV93bShz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQogCXVzYWJsZV9sZXZlbCA9IG1heF9sZXZl bDsKIAogCS8qIElMSy9TTkI6IExQMisgd2F0ZXJtYXJrcyBvbmx5IHcvbyBzcHJpdGVzICovCi0J aWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDw9IDYgJiYgcGlwZV93bS0+c3ByaXRlc19lbmFibGVk KQorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDw9IDYgJiYgcGlwZV93bS0+c3ByaXRlc19lbmFi bGVkKQogCQl1c2FibGVfbGV2ZWwgPSAxOwogCiAJLyogSUxLL1NOQi9JVkI6IExQMSsgd2F0ZXJt YXJrcyBvbmx5IHcvbyBzY2FsaW5nICovCkBAIC0yNTE4LDEyICsyNTE4LDEyIEBAIHN0YXRpYyB2 b2lkIGlsa193bV9tZXJnZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWludCBsYXN0X2VuYWJs ZWRfbGV2ZWwgPSBtYXhfbGV2ZWw7CiAKIAkvKiBJTEsvU05CL0lWQjogTFAxKyB3YXRlcm1hcmtz IG9ubHkgdy8gc2luZ2xlIHBpcGUgKi8KLQlpZiAoKElOVEVMX0lORk8oZGV2KS0+Z2VuIDw9IDYg fHwgSVNfSVZZQlJJREdFKGRldikpICYmCisJaWYgKChJTlRFTF9HRU4oZGV2X3ByaXYpIDw9IDYg fHwgSVNfSVZZQlJJREdFKGRldikpICYmCiAJICAgIGNvbmZpZy0+bnVtX3BpcGVzX2FjdGl2ZSA+ IDEpCiAJCWxhc3RfZW5hYmxlZF9sZXZlbCA9IDA7CiAKIAkvKiBJTEs6IEZCQyBXTSBtdXN0IGJl IGRpc2FibGVkIGFsd2F5cyAqLwotCW1lcmdlZC0+ZmJjX3dtX2VuYWJsZWQgPSBJTlRFTF9JTkZP KGRldiktPmdlbiA+PSA2OworCW1lcmdlZC0+ZmJjX3dtX2VuYWJsZWQgPSBJTlRFTF9HRU4oZGV2 X3ByaXYpID49IDY7CiAKIAkvKiBtZXJnZSBlYWNoIFdNMSsgbGV2ZWwgKi8KIAlmb3IgKGxldmVs ID0gMTsgbGV2ZWwgPD0gbWF4X2xldmVsOyBsZXZlbCsrKSB7CkBAIC0yODI5LDcgKzI4MjksNyBA QCBzdGF0aWMgdm9pZCBpbGtfd3JpdGVfd21fdmFsdWVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAkgICAgcHJldmlvdXMtPndtX2xwX3NwclswXSAhPSByZXN1bHRzLT53bV9s cF9zcHJbMF0pCiAJCUk5MTVfV1JJVEUoV00xU19MUF9JTEssIHJlc3VsdHMtPndtX2xwX3Nwclsw XSk7CiAKLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNykgeworCWlmIChJTlRFTF9HRU4o ZGV2X3ByaXYpID49IDcpIHsKIAkJaWYgKGRpcnR5ICYgV01fRElSVFlfTFAoMikgJiYgcHJldmlv dXMtPndtX2xwX3NwclsxXSAhPSByZXN1bHRzLT53bV9scF9zcHJbMV0pCiAJCQlJOTE1X1dSSVRF KFdNMlNfTFBfSVZCLCByZXN1bHRzLT53bV9scF9zcHJbMV0pOwogCQlpZiAoZGlydHkgJiBXTV9E SVJUWV9MUCgzKSAmJiBwcmV2aW91cy0+d21fbHBfc3ByWzJdICE9IHJlc3VsdHMtPndtX2xwX3Nw clsyXSkKQEAgLTQxNzUsNyArNDE3NSw3IEBAIHN0YXRpYyB2b2lkIGlsa19wcm9ncmFtX3dhdGVy bWFya3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWlsa193bV9tZXJnZShk ZXYsICZjb25maWcsICZtYXgsICZscF93bV8xXzIpOwogCiAJLyogNS82IHNwbGl0IG9ubHkgaW4g c2luZ2xlIHBpcGUgY29uZmlnIG9uIElWQisgKi8KLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4g Pj0gNyAmJgorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDcgJiYKIAkgICAgY29uZmlnLm51 bV9waXBlc19hY3RpdmUgPT0gMSAmJiBjb25maWcuc3ByaXRlc19lbmFibGVkKSB7CiAJCWlsa19j b21wdXRlX3dtX21heGltdW1zKGRldiwgMSwgJmNvbmZpZywgSU5URUxfRERCX1BBUlRfNV82LCAm bWF4KTsKIAkJaWxrX3dtX21lcmdlKGRldiwgJmNvbmZpZywgJm1heCwgJmxwX3dtXzVfNik7CkBA IC00NTU0LDcgKzQ1NTQsNyBAQCB2b2lkIGlsa193bV9nZXRfaHdfc3RhdGUoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAlody0+d21fbHBbMl0gPSBJOTE1X1JFQUQoV00zX0xQX0lMSyk7CiAKIAlo dy0+d21fbHBfc3ByWzBdID0gSTkxNV9SRUFEKFdNMVNfTFBfSUxLKTsKLQlpZiAoSU5URUxfSU5G TyhkZXYpLT5nZW4gPj0gNykgeworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDcpIHsKIAkJ aHctPndtX2xwX3NwclsxXSA9IEk5MTVfUkVBRChXTTJTX0xQX0lWQik7CiAJCWh3LT53bV9scF9z cHJbMl0gPSBJOTE1X1JFQUQoV00zU19MUF9JVkIpOwogCX0KQEAgLTc2NzgsNyArNzY3OCw3IEBA IHZvaWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlpOTE1X2lyb25s YWtlX2dldF9tZW1fZnJlcShkZXYpOwogCiAJLyogRm9yIEZJRk8gd2F0ZXJtYXJrIHVwZGF0ZXMg Ki8KLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkgeworCWlmIChJTlRFTF9HRU4oZGV2 X3ByaXYpID49IDkpIHsKIAkJc2tsX3NldHVwX3dtX2xhdGVuY3koZGV2KTsKIAkJZGV2X3ByaXYt PmRpc3BsYXkudXBkYXRlX3dtID0gc2tsX3VwZGF0ZV93bTsKIAkJZGV2X3ByaXYtPmRpc3BsYXku Y29tcHV0ZV9nbG9iYWxfd2F0ZXJtYXJrcyA9IHNrbF9jb21wdXRlX3dtOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wc3IuYwppbmRleCA1OWEyMWM5Li42NzQxY2VjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wc3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w c3IuYwpAQCAtNDcyLDcgKzQ3Miw3IEBAIHZvaWQgaW50ZWxfcHNyX2VuYWJsZShzdHJ1Y3QgaW50 ZWxfZHAgKmludGVsX2RwKQogCQkvKiBFbmFibGUgUFNSIG9uIHRoZSBwYW5lbCAqLwogCQloc3df cHNyX2VuYWJsZV9zaW5rKGludGVsX2RwKTsKIAotCQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4g Pj0gOSkKKwkJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkKIAkJCWludGVsX3Bzcl9hY3Rp dmF0ZShpbnRlbF9kcCk7CiAJfSBlbHNlIHsKIAkJdmx2X3Bzcl9zZXR1cF92c2MoaW50ZWxfZHAp OwpAQCAtNDk4LDcgKzQ5OCw3IEBAIHZvaWQgaW50ZWxfcHNyX2VuYWJsZShzdHJ1Y3QgaW50ZWxf ZHAgKmludGVsX2RwKQogCSAqICAgICAtIE9uIEhTVy9CRFcgd2UgZ2V0IGEgcmVjb3ZlcmFibGUg ZnJvemVuIHNjcmVlbiB1bnRpbCBuZXh0CiAJICogICAgICAgZXhpdC1hY3RpdmF0ZSBzZXF1ZW5j ZS4KIAkgKi8KLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA5KQorCWlmIChJTlRFTF9HRU4o ZGV2X3ByaXYpIDwgOSkKIAkJc2NoZWR1bGVfZGVsYXllZF93b3JrKCZkZXZfcHJpdi0+cHNyLndv cmssCiAJCQkJICAgICAgbXNlY3NfdG9famlmZmllcyhpbnRlbF9kcC0+cGFuZWxfcG93ZXJfY3lj bGVfZGVsYXkgKiA1KSk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3Nkdm8uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nkdm8uYwppbmRleCBjNTUxMDI0 Li41Y2ExMDJjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jCkBAIC0xMjY5LDEzICsxMjY5 LDEzIEBAIHN0YXRpYyB2b2lkIGludGVsX3Nkdm9fcHJlX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5j b2RlciAqaW50ZWxfZW5jb2RlciwKIAkJcmV0dXJuOwogCiAJLyogU2V0IHRoZSBTRFZPIGNvbnRy b2wgcmVncy4gKi8KLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNCkgeworCWlmIChJTlRF TF9HRU4oZGV2X3ByaXYpID49IDQpIHsKIAkJLyogVGhlIHJlYWwgbW9kZSBwb2xhcml0eSBpcyBz ZXQgYnkgdGhlIFNEVk8gY29tbWFuZHMsIHVzaW5nCiAJCSAqIHN0cnVjdCBpbnRlbF9zZHZvX2R0 ZC4gKi8KIAkJc2R2b3ggPSBTRFZPX1ZTWU5DX0FDVElWRV9ISUdIIHwgU0RWT19IU1lOQ19BQ1RJ VkVfSElHSDsKIAkJaWYgKCFIQVNfUENIX1NQTElUKGRldikgJiYgY3J0Y19zdGF0ZS0+bGltaXRl ZF9jb2xvcl9yYW5nZSkKIAkJCXNkdm94IHw9IEhETUlfQ09MT1JfUkFOR0VfMTZfMjM1OwotCQlp ZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA1KQorCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8 IDUpCiAJCQlzZHZveCB8PSBTRFZPX0JPUkRFUl9FTkFCTEU7CiAJfSBlbHNlIHsKIAkJc2R2b3gg PSBJOTE1X1JFQUQoaW50ZWxfc2R2by0+c2R2b19yZWcpOwpAQCAtMTI5NCw3ICsxMjk0LDcgQEAg c3RhdGljIHZvaWQgaW50ZWxfc2R2b19wcmVfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICpp bnRlbF9lbmNvZGVyLAogCWlmIChpbnRlbF9zZHZvLT5oYXNfaGRtaV9hdWRpbykKIAkJc2R2b3gg fD0gU0RWT19BVURJT19FTkFCTEU7CiAKLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNCkg eworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDQpIHsKIAkJLyogZG9uZSBpbiBjcnRjX21v ZGVfc2V0IGFzIHRoZSBkcGxsX21kIHJlZyBtdXN0IGJlIHdyaXR0ZW4gZWFybHkgKi8KIAl9IGVs c2UgaWYgKElTX0k5NDVHKGRldikgfHwgSVNfSTk0NUdNKGRldikgfHwgSVNfRzMzKGRldikpIHsK IAkJLyogZG9uZSBpbiBjcnRjX21vZGVfc2V0IGFzIGl0IGxpdmVzIGluc2lkZSB0aGUgZHBsbCBy ZWdpc3RlciAqLwpAQCAtMTMwNCw3ICsxMzA0LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2R2b19w cmVfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyLAogCX0KIAogCWlm IChpbnB1dF9kdGQucGFydDIuc2R2b19mbGFncyAmIFNEVk9fTkVFRF9UT19TVEFMTCAmJgotCSAg ICBJTlRFTF9JTkZPKGRldiktPmdlbiA8IDUpCisJICAgIElOVEVMX0dFTihkZXZfcHJpdikgPCA1 KQogCQlzZHZveCB8PSBTRFZPX1NUQUxMX1NFTEVDVDsKIAlpbnRlbF9zZHZvX3dyaXRlX3Nkdm94 KGludGVsX3Nkdm8sIHNkdm94KTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3R2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF90di5jCmluZGV4IGQ5NjBl NDguLjI5NTg4MGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3R2LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdHYuYwpAQCAtMTEwNiw3ICsxMTA2LDcg QEAgc3RhdGljIHZvaWQgaW50ZWxfdHZfcHJlX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAq ZW5jb2RlciwKIAogCXNldF9jb2xvcl9jb252ZXJzaW9uKGRldl9wcml2LCBjb2xvcl9jb252ZXJz aW9uKTsKIAotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA0KQorCWlmIChJTlRFTF9HRU4o ZGV2X3ByaXYpID49IDQpCiAJCUk5MTVfV1JJVEUoVFZfQ0xSX0tOT0JTLCAweDAwNDA0MDAwKTsK IAllbHNlCiAJCUk5MTVfV1JJVEUoVFZfQ0xSX0tOT0JTLCAweDAwNjA2MDAwKTsKLS0gCjEuOS4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK