From: Maarten Lankhorst Subject: [PATCH 07/19] drm/atomic: Fix atomic helpers to use the new iterator macros. Date: Mon, 17 Oct 2016 14:37:06 +0200 Message-ID: <1476707838-25253-8-git-send-email-maarten.lankhorst@linux.intel.com> References: <1476707838-25253-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1476707838-25253-1-git-send-email-maarten.lankhorst@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: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyB8IDMw MiArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAx NTcgaW5zZXJ0aW9ucygrKSwgMTQ1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNf aGVscGVyLmMKaW5kZXggZmNiNmU1YjU1MjE3Li5jOGFiYTQ5M2ZjMTcgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9k cm1fYXRvbWljX2hlbHBlci5jCkBAIC0xMDMsNyArMTAzLDcgQEAgc3RhdGljIGludCBoYW5kbGVf Y29uZmxpY3RpbmdfZW5jb2RlcnMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCSAq IHBhcnQgb2YgdGhlIHN0YXRlLiBJZiB0aGUgc2FtZSBlbmNvZGVyIGlzIGFzc2lnbmVkIHRvIG11 bHRpcGxlCiAJICogY29ubmVjdG9ycyBiYWlsIG91dC4KIAkgKi8KLQlmb3JfZWFjaF9jb25uZWN0 b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3RvciwgY29ubl9zdGF0ZSwgaSkgeworCWZvcl9lYWNo X25ld19jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3RvciwgY29ubl9zdGF0ZSwgaSkg ewogCQljb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9oZWxwZXJfZnVuY3MgKmZ1bmNzID0gY29u bmVjdG9yLT5oZWxwZXJfcHJpdmF0ZTsKIAkJc3RydWN0IGRybV9lbmNvZGVyICpuZXdfZW5jb2Rl cjsKIApAQCAtMjM4LDIyICsyMzgsMjIgQEAgc3RlYWxfZW5jb2RlcihzdHJ1Y3QgZHJtX2F0b21p Y19zdGF0ZSAqc3RhdGUsCiB7CiAJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwog CXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7Ci0Jc3RydWN0IGRybV9jb25uZWN0b3Jf c3RhdGUgKmNvbm5lY3Rvcl9zdGF0ZTsKKwlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqb2xk X2Nvbm5lY3Rvcl9zdGF0ZSwgKm5ld19jb25uZWN0b3Jfc3RhdGU7CiAJaW50IGk7CiAKLQlmb3Jf ZWFjaF9jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3RvciwgY29ubmVjdG9yX3N0YXRl LCBpKSB7CisJZm9yX2VhY2hfb2xkbmV3X2Nvbm5lY3Rvcl9pbl9zdGF0ZShzdGF0ZSwgY29ubmVj dG9yLCBvbGRfY29ubmVjdG9yX3N0YXRlLCBuZXdfY29ubmVjdG9yX3N0YXRlLCBpKSB7CiAJCXN0 cnVjdCBkcm1fY3J0YyAqZW5jb2Rlcl9jcnRjOwogCi0JCWlmIChjb25uZWN0b3Jfc3RhdGUtPmJl c3RfZW5jb2RlciAhPSBlbmNvZGVyKQorCQlpZiAobmV3X2Nvbm5lY3Rvcl9zdGF0ZS0+YmVzdF9l bmNvZGVyICE9IGVuY29kZXIpCiAJCQljb250aW51ZTsKIAotCQllbmNvZGVyX2NydGMgPSBjb25u ZWN0b3ItPnN0YXRlLT5jcnRjOworCQllbmNvZGVyX2NydGMgPSBvbGRfY29ubmVjdG9yX3N0YXRl LT5jcnRjOwogCiAJCURSTV9ERUJVR19BVE9NSUMoIltFTkNPREVSOiVkOiVzXSBpbiB1c2Ugb24g W0NSVEM6JWQ6JXNdLCBzdGVhbGluZyBpdFxuIiwKIAkJCQkgZW5jb2Rlci0+YmFzZS5pZCwgZW5j b2Rlci0+bmFtZSwKIAkJCQkgZW5jb2Rlcl9jcnRjLT5iYXNlLmlkLCBlbmNvZGVyX2NydGMtPm5h bWUpOwogCi0JCXNldF9iZXN0X2VuY29kZXIoc3RhdGUsIGNvbm5lY3Rvcl9zdGF0ZSwgTlVMTCk7 CisJCXNldF9iZXN0X2VuY29kZXIoc3RhdGUsIG5ld19jb25uZWN0b3Jfc3RhdGUsIE5VTEwpOwog CiAJCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRl LCBlbmNvZGVyX2NydGMpOwogCQljcnRjX3N0YXRlLT5jb25uZWN0b3JzX2NoYW5nZWQgPSB0cnVl OwpAQCAtMjY1LDcgKzI2NSw4IEBAIHN0ZWFsX2VuY29kZXIoc3RydWN0IGRybV9hdG9taWNfc3Rh dGUgKnN0YXRlLAogc3RhdGljIGludAogdXBkYXRlX2Nvbm5lY3Rvcl9yb3V0aW5nKHN0cnVjdCBk cm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAkJCSBzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVj dG9yLAotCQkJIHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uZWN0b3Jfc3RhdGUpCisJ CQkgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKm9sZF9jb25uZWN0b3Jfc3RhdGUsCisJCQkg c3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKm5ld19jb25uZWN0b3Jfc3RhdGUpCiB7CiAJY29u c3Qgc3RydWN0IGRybV9jb25uZWN0b3JfaGVscGVyX2Z1bmNzICpmdW5jczsKIAlzdHJ1Y3QgZHJt X2VuY29kZXIgKm5ld19lbmNvZGVyOwpAQCAtMjc1LDI0ICsyNzYsMjQgQEAgdXBkYXRlX2Nvbm5l Y3Rvcl9yb3V0aW5nKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAkJCSBjb25uZWN0 b3ItPmJhc2UuaWQsCiAJCQkgY29ubmVjdG9yLT5uYW1lKTsKIAotCWlmIChjb25uZWN0b3ItPnN0 YXRlLT5jcnRjICE9IGNvbm5lY3Rvcl9zdGF0ZS0+Y3J0YykgewotCQlpZiAoY29ubmVjdG9yLT5z dGF0ZS0+Y3J0YykgewotCQkJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2Ny dGNfc3RhdGUoc3RhdGUsIGNvbm5lY3Rvci0+c3RhdGUtPmNydGMpOworCWlmIChvbGRfY29ubmVj dG9yX3N0YXRlLT5jcnRjICE9IG5ld19jb25uZWN0b3Jfc3RhdGUtPmNydGMpIHsKKwkJaWYgKG9s ZF9jb25uZWN0b3Jfc3RhdGUtPmNydGMpIHsKKwkJCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dl dF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCBvbGRfY29ubmVjdG9yX3N0YXRlLT5jcnRjKTsK IAkJCWNydGNfc3RhdGUtPmNvbm5lY3RvcnNfY2hhbmdlZCA9IHRydWU7CiAJCX0KIAotCQlpZiAo Y29ubmVjdG9yX3N0YXRlLT5jcnRjKSB7Ci0JCQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRf ZXhpc3RpbmdfY3J0Y19zdGF0ZShzdGF0ZSwgY29ubmVjdG9yX3N0YXRlLT5jcnRjKTsKKwkJaWYg KG5ld19jb25uZWN0b3Jfc3RhdGUtPmNydGMpIHsKKwkJCWNydGNfc3RhdGUgPSBkcm1fYXRvbWlj X2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCBuZXdfY29ubmVjdG9yX3N0YXRlLT5jcnRj KTsKIAkJCWNydGNfc3RhdGUtPmNvbm5lY3RvcnNfY2hhbmdlZCA9IHRydWU7CiAJCX0KIAl9CiAK LQlpZiAoIWNvbm5lY3Rvcl9zdGF0ZS0+Y3J0YykgeworCWlmICghbmV3X2Nvbm5lY3Rvcl9zdGF0 ZS0+Y3J0YykgewogCQlEUk1fREVCVUdfQVRPTUlDKCJEaXNhYmxpbmcgW0NPTk5FQ1RPUjolZDol c11cbiIsCiAJCQkJY29ubmVjdG9yLT5iYXNlLmlkLAogCQkJCWNvbm5lY3Rvci0+bmFtZSk7CiAK LQkJc2V0X2Jlc3RfZW5jb2RlcihzdGF0ZSwgY29ubmVjdG9yX3N0YXRlLCBOVUxMKTsKKwkJc2V0 X2Jlc3RfZW5jb2RlcihzdGF0ZSwgbmV3X2Nvbm5lY3Rvcl9zdGF0ZSwgTlVMTCk7CiAKIAkJcmV0 dXJuIDA7CiAJfQpAQCAtMzAxLDcgKzMwMiw3IEBAIHVwZGF0ZV9jb25uZWN0b3Jfcm91dGluZyhz dHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAKIAlpZiAoZnVuY3MtPmF0b21pY19iZXN0 X2VuY29kZXIpCiAJCW5ld19lbmNvZGVyID0gZnVuY3MtPmF0b21pY19iZXN0X2VuY29kZXIoY29u bmVjdG9yLAotCQkJCQkJCSBjb25uZWN0b3Jfc3RhdGUpOworCQkJCQkJCSBuZXdfY29ubmVjdG9y X3N0YXRlKTsKIAllbHNlIGlmIChmdW5jcy0+YmVzdF9lbmNvZGVyKQogCQluZXdfZW5jb2RlciA9 IGZ1bmNzLT5iZXN0X2VuY29kZXIoY29ubmVjdG9yKTsKIAllbHNlCkBAIC0zMTQsMzMgKzMxNSwz MyBAQCB1cGRhdGVfY29ubmVjdG9yX3JvdXRpbmcoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0 YXRlLAogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKLQlpZiAoIWRybV9lbmNvZGVyX2NydGNfb2so bmV3X2VuY29kZXIsIGNvbm5lY3Rvcl9zdGF0ZS0+Y3J0YykpIHsKKwlpZiAoIWRybV9lbmNvZGVy X2NydGNfb2sobmV3X2VuY29kZXIsIG5ld19jb25uZWN0b3Jfc3RhdGUtPmNydGMpKSB7CiAJCURS TV9ERUJVR19BVE9NSUMoIltFTkNPREVSOiVkOiVzXSBpbmNvbXBhdGlibGUgd2l0aCBbQ1JUQzol ZF1cbiIsCiAJCQkJIG5ld19lbmNvZGVyLT5iYXNlLmlkLAogCQkJCSBuZXdfZW5jb2Rlci0+bmFt ZSwKLQkJCQkgY29ubmVjdG9yX3N0YXRlLT5jcnRjLT5iYXNlLmlkKTsKKwkJCQkgbmV3X2Nvbm5l Y3Rvcl9zdGF0ZS0+Y3J0Yy0+YmFzZS5pZCk7CiAJCXJldHVybiAtRUlOVkFMOwogCX0KIAotCWlm IChuZXdfZW5jb2RlciA9PSBjb25uZWN0b3Jfc3RhdGUtPmJlc3RfZW5jb2RlcikgewotCQlzZXRf YmVzdF9lbmNvZGVyKHN0YXRlLCBjb25uZWN0b3Jfc3RhdGUsIG5ld19lbmNvZGVyKTsKKwlpZiAo bmV3X2VuY29kZXIgPT0gbmV3X2Nvbm5lY3Rvcl9zdGF0ZS0+YmVzdF9lbmNvZGVyKSB7CisJCXNl dF9iZXN0X2VuY29kZXIoc3RhdGUsIG5ld19jb25uZWN0b3Jfc3RhdGUsIG5ld19lbmNvZGVyKTsK IAogCQlEUk1fREVCVUdfQVRPTUlDKCJbQ09OTkVDVE9SOiVkOiVzXSBrZWVwcyBbRU5DT0RFUjol ZDolc10sIG5vdyBvbiBbQ1JUQzolZDolc11cbiIsCiAJCQkJIGNvbm5lY3Rvci0+YmFzZS5pZCwK IAkJCQkgY29ubmVjdG9yLT5uYW1lLAogCQkJCSBuZXdfZW5jb2Rlci0+YmFzZS5pZCwKIAkJCQkg bmV3X2VuY29kZXItPm5hbWUsCi0JCQkJIGNvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yy0+YmFzZS5pZCwK LQkJCQkgY29ubmVjdG9yX3N0YXRlLT5jcnRjLT5uYW1lKTsKKwkJCQkgbmV3X2Nvbm5lY3Rvcl9z dGF0ZS0+Y3J0Yy0+YmFzZS5pZCwKKwkJCQkgbmV3X2Nvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yy0+bmFt ZSk7CiAKIAkJcmV0dXJuIDA7CiAJfQogCiAJc3RlYWxfZW5jb2RlcihzdGF0ZSwgbmV3X2VuY29k ZXIpOwogCi0Jc2V0X2Jlc3RfZW5jb2RlcihzdGF0ZSwgY29ubmVjdG9yX3N0YXRlLCBuZXdfZW5j b2Rlcik7CisJc2V0X2Jlc3RfZW5jb2RlcihzdGF0ZSwgbmV3X2Nvbm5lY3Rvcl9zdGF0ZSwgbmV3 X2VuY29kZXIpOwogCi0JY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNf c3RhdGUoc3RhdGUsIGNvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yyk7CisJY3J0Y19zdGF0ZSA9IGRybV9h dG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3RhdGUoc3RhdGUsIG5ld19jb25uZWN0b3Jfc3RhdGUt PmNydGMpOwogCWNydGNfc3RhdGUtPmNvbm5lY3RvcnNfY2hhbmdlZCA9IHRydWU7CiAKIAlEUk1f REVCVUdfQVRPTUlDKCJbQ09OTkVDVE9SOiVkOiVzXSB1c2luZyBbRU5DT0RFUjolZDolc10gb24g W0NSVEM6JWQ6JXNdXG4iLApAQCAtMzQ4LDggKzM0OSw4IEBAIHVwZGF0ZV9jb25uZWN0b3Jfcm91 dGluZyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJCQkgY29ubmVjdG9yLT5uYW1l LAogCQkJIG5ld19lbmNvZGVyLT5iYXNlLmlkLAogCQkJIG5ld19lbmNvZGVyLT5uYW1lLAotCQkJ IGNvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yy0+YmFzZS5pZCwKLQkJCSBjb25uZWN0b3Jfc3RhdGUtPmNy dGMtPm5hbWUpOworCQkJIG5ld19jb25uZWN0b3Jfc3RhdGUtPmNydGMtPmJhc2UuaWQsCisJCQkg bmV3X2Nvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yy0+bmFtZSk7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTM2 NCw3ICszNjUsNyBAQCBtb2RlX2ZpeHVwKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkK IAlpbnQgaTsKIAlib29sIHJldDsKIAotCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNy dGMsIGNydGNfc3RhdGUsIGkpIHsKKwlmb3JfZWFjaF9uZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwg Y3J0YywgY3J0Y19zdGF0ZSwgaSkgewogCQlpZiAoIWNydGNfc3RhdGUtPm1vZGVfY2hhbmdlZCAm JgogCQkgICAgIWNydGNfc3RhdGUtPmNvbm5lY3RvcnNfY2hhbmdlZCkKIAkJCWNvbnRpbnVlOwpA QCAtMzcyLDcgKzM3Myw3IEBAIG1vZGVfZml4dXAoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0 YXRlKQogCQlkcm1fbW9kZV9jb3B5KCZjcnRjX3N0YXRlLT5hZGp1c3RlZF9tb2RlLCAmY3J0Y19z dGF0ZS0+bW9kZSk7CiAJfQogCi0JZm9yX2VhY2hfY29ubmVjdG9yX2luX3N0YXRlKHN0YXRlLCBj b25uZWN0b3IsIGNvbm5fc3RhdGUsIGkpIHsKKwlmb3JfZWFjaF9uZXdfY29ubmVjdG9yX2luX3N0 YXRlKHN0YXRlLCBjb25uZWN0b3IsIGNvbm5fc3RhdGUsIGkpIHsKIAkJY29uc3Qgc3RydWN0IGRy bV9lbmNvZGVyX2hlbHBlcl9mdW5jcyAqZnVuY3M7CiAJCXN0cnVjdCBkcm1fZW5jb2RlciAqZW5j b2RlcjsKIApAQCAtNDE3LDcgKzQxOCw3IEBAIG1vZGVfZml4dXAoc3RydWN0IGRybV9hdG9taWNf c3RhdGUgKnN0YXRlKQogCQl9CiAJfQogCi0JZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwg Y3J0YywgY3J0Y19zdGF0ZSwgaSkgeworCWZvcl9lYWNoX25ld19jcnRjX2luX3N0YXRlKHN0YXRl LCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7CiAJCWNvbnN0IHN0cnVjdCBkcm1fY3J0Y19oZWxwZXJf ZnVuY3MgKmZ1bmNzOwogCiAJCWlmICghY3J0Y19zdGF0ZS0+ZW5hYmxlKQpAQCAtNDc2LDE5ICs0 NzcsMTkgQEAgZHJtX2F0b21pY19oZWxwZXJfY2hlY2tfbW9kZXNldChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAogCQkJCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKIAlzdHJ1Y3Qg ZHJtX2NydGMgKmNydGM7Ci0Jc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOworCXN0 cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsICpuZXdfY3J0Y19zdGF0ZTsKIAlz dHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwotCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0 YXRlICpjb25uZWN0b3Jfc3RhdGU7CisJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKm9sZF9j b25uZWN0b3Jfc3RhdGUsICpuZXdfY29ubmVjdG9yX3N0YXRlOwogCWludCBpLCByZXQ7CiAKLQlm b3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7Ci0JCWlm ICghZHJtX21vZGVfZXF1YWwoJmNydGMtPnN0YXRlLT5tb2RlLCAmY3J0Y19zdGF0ZS0+bW9kZSkp IHsKKwlmb3JfZWFjaF9vbGRuZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0Yywgb2xkX2NydGNf c3RhdGUsIG5ld19jcnRjX3N0YXRlLCBpKSB7CisJCWlmICghZHJtX21vZGVfZXF1YWwoJm9sZF9j cnRjX3N0YXRlLT5tb2RlLCAmbmV3X2NydGNfc3RhdGUtPm1vZGUpKSB7CiAJCQlEUk1fREVCVUdf QVRPTUlDKCJbQ1JUQzolZDolc10gbW9kZSBjaGFuZ2VkXG4iLAogCQkJCQkgY3J0Yy0+YmFzZS5p ZCwgY3J0Yy0+bmFtZSk7Ci0JCQljcnRjX3N0YXRlLT5tb2RlX2NoYW5nZWQgPSB0cnVlOworCQkJ bmV3X2NydGNfc3RhdGUtPm1vZGVfY2hhbmdlZCA9IHRydWU7CiAJCX0KIAotCQlpZiAoY3J0Yy0+ c3RhdGUtPmVuYWJsZSAhPSBjcnRjX3N0YXRlLT5lbmFibGUpIHsKKwkJaWYgKG9sZF9jcnRjX3N0 YXRlLT5lbmFibGUgIT0gbmV3X2NydGNfc3RhdGUtPmVuYWJsZSkgewogCQkJRFJNX0RFQlVHX0FU T01JQygiW0NSVEM6JWQ6JXNdIGVuYWJsZSBjaGFuZ2VkXG4iLAogCQkJCQkgY3J0Yy0+YmFzZS5p ZCwgY3J0Yy0+bmFtZSk7CiAKQEAgLTUwMCw4ICs1MDEsOCBAQCBkcm1fYXRvbWljX2hlbHBlcl9j aGVja19tb2Rlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkgKiBUaGUgb3RoZXIgd2F5 IGFyb3VuZCBpcyB0cnVlIGFzIHdlbGwuIGVuYWJsZSAhPSAwCiAJCQkgKiBpZmYgY29ubmVjdG9y cyBhcmUgYXR0YWNoZWQgYW5kIGEgbW9kZSBpcyBzZXQuCiAJCQkgKi8KLQkJCWNydGNfc3RhdGUt Pm1vZGVfY2hhbmdlZCA9IHRydWU7Ci0JCQljcnRjX3N0YXRlLT5jb25uZWN0b3JzX2NoYW5nZWQg PSB0cnVlOworCQkJbmV3X2NydGNfc3RhdGUtPm1vZGVfY2hhbmdlZCA9IHRydWU7CisJCQluZXdf Y3J0Y19zdGF0ZS0+Y29ubmVjdG9yc19jaGFuZ2VkID0gdHJ1ZTsKIAkJfQogCX0KIApAQCAtNTA5 LDE0ICs1MTAsMTUgQEAgZHJtX2F0b21pY19oZWxwZXJfY2hlY2tfbW9kZXNldChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlmb3JfZWFjaF9jb25u ZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3RvciwgY29ubmVjdG9yX3N0YXRlLCBpKSB7CisJ Zm9yX2VhY2hfb2xkbmV3X2Nvbm5lY3Rvcl9pbl9zdGF0ZShzdGF0ZSwgY29ubmVjdG9yLCBvbGRf Y29ubmVjdG9yX3N0YXRlLCBuZXdfY29ubmVjdG9yX3N0YXRlLCBpKSB7CiAJCS8qCiAJCSAqIFRo aXMgb25seSBzZXRzIGNydGMtPmNvbm5lY3RvcnNfY2hhbmdlZCBmb3Igcm91dGluZyBjaGFuZ2Vz LAogCQkgKiBkcml2ZXJzIG11c3Qgc2V0IGNydGMtPmNvbm5lY3RvcnNfY2hhbmdlZCB0aGVtc2Vs dmVzIHdoZW4KIAkJICogY29ubmVjdG9yIHByb3BlcnRpZXMgbmVlZCB0byBiZSB1cGRhdGVkLgog CQkgKi8KIAkJcmV0ID0gdXBkYXRlX2Nvbm5lY3Rvcl9yb3V0aW5nKHN0YXRlLCBjb25uZWN0b3Is Ci0JCQkJCSAgICAgICBjb25uZWN0b3Jfc3RhdGUpOworCQkJCQkgICAgICAgb2xkX2Nvbm5lY3Rv cl9zdGF0ZSwKKwkJCQkJICAgICAgIG5ld19jb25uZWN0b3Jfc3RhdGUpOwogCQlpZiAocmV0KQog CQkJcmV0dXJuIHJldDsKIAl9CkBAIC01MjcsMjggKzUyOSwyOCBAQCBkcm1fYXRvbWljX2hlbHBl cl9jaGVja19tb2Rlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJICogY29uZmlndXJhdGlv bi4gVGhpcyBtdXN0IGJlIGRvbmUgYmVmb3JlIGNhbGxpbmcgbW9kZV9maXh1cCBpbiBjYXNlIGEK IAkgKiBjcnRjIG9ubHkgY2hhbmdlZCBpdHMgbW9kZSBidXQgaGFzIHRoZSBzYW1lIHNldCBvZiBj b25uZWN0b3JzLgogCSAqLwotCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNy dGNfc3RhdGUsIGkpIHsKKwlmb3JfZWFjaF9vbGRuZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0 Yywgb2xkX2NydGNfc3RhdGUsIG5ld19jcnRjX3N0YXRlLCBpKSB7CiAJCWJvb2wgaGFzX2Nvbm5l Y3RvcnMgPQotCQkJISFjcnRjX3N0YXRlLT5jb25uZWN0b3JfbWFzazsKKwkJCSEhbmV3X2NydGNf c3RhdGUtPmNvbm5lY3Rvcl9tYXNrOwogCiAJCS8qCiAJCSAqIFdlIG11c3Qgc2V0IC0+YWN0aXZl X2NoYW5nZWQgYWZ0ZXIgd2Fsa2luZyBjb25uZWN0b3JzIGZvcgogCQkgKiBvdGhlcndpc2UgYW4g dXBkYXRlIHRoYXQgb25seSBjaGFuZ2VzIGFjdGl2ZSB3b3VsZCByZXN1bHQgaW4KIAkJICogYSBm dWxsIG1vZGVzZXQgYmVjYXVzZSB1cGRhdGVfY29ubmVjdG9yX3JvdXRpbmcgZm9yY2UgdGhhdC4K IAkJICovCi0JCWlmIChjcnRjLT5zdGF0ZS0+YWN0aXZlICE9IGNydGNfc3RhdGUtPmFjdGl2ZSkg eworCQlpZiAob2xkX2NydGNfc3RhdGUtPmFjdGl2ZSAhPSBuZXdfY3J0Y19zdGF0ZS0+YWN0aXZl KSB7CiAJCQlEUk1fREVCVUdfQVRPTUlDKCJbQ1JUQzolZDolc10gYWN0aXZlIGNoYW5nZWRcbiIs CiAJCQkJCSBjcnRjLT5iYXNlLmlkLCBjcnRjLT5uYW1lKTsKLQkJCWNydGNfc3RhdGUtPmFjdGl2 ZV9jaGFuZ2VkID0gdHJ1ZTsKKwkJCW5ld19jcnRjX3N0YXRlLT5hY3RpdmVfY2hhbmdlZCA9IHRy dWU7CiAJCX0KIAotCQlpZiAoIWRybV9hdG9taWNfY3J0Y19uZWVkc19tb2Rlc2V0KGNydGNfc3Rh dGUpKQorCQlpZiAoIWRybV9hdG9taWNfY3J0Y19uZWVkc19tb2Rlc2V0KG5ld19jcnRjX3N0YXRl KSkKIAkJCWNvbnRpbnVlOwogCiAJCURSTV9ERUJVR19BVE9NSUMoIltDUlRDOiVkOiVzXSBuZWVk cyBhbGwgY29ubmVjdG9ycywgZW5hYmxlOiAlYywgYWN0aXZlOiAlY1xuIiwKIAkJCQkgY3J0Yy0+ YmFzZS5pZCwgY3J0Yy0+bmFtZSwKLQkJCQkgY3J0Y19zdGF0ZS0+ZW5hYmxlID8gJ3knIDogJ24n LAotCQkJCSBjcnRjX3N0YXRlLT5hY3RpdmUgPyAneScgOiAnbicpOworCQkJCSBuZXdfY3J0Y19z dGF0ZS0+ZW5hYmxlID8gJ3knIDogJ24nLAorCQkJCSBuZXdfY3J0Y19zdGF0ZS0+YWN0aXZlID8g J3knIDogJ24nKTsKIAogCQlyZXQgPSBkcm1fYXRvbWljX2FkZF9hZmZlY3RlZF9jb25uZWN0b3Jz KHN0YXRlLCBjcnRjKTsKIAkJaWYgKHJldCAhPSAwKQpAQCAtNTU4LDcgKzU2MCw3IEBAIGRybV9h dG9taWNfaGVscGVyX2NoZWNrX21vZGVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJaWYg KHJldCAhPSAwKQogCQkJcmV0dXJuIHJldDsKIAotCQlpZiAoY3J0Y19zdGF0ZS0+ZW5hYmxlICE9 IGhhc19jb25uZWN0b3JzKSB7CisJCWlmIChuZXdfY3J0Y19zdGF0ZS0+ZW5hYmxlICE9IGhhc19j b25uZWN0b3JzKSB7CiAJCQlEUk1fREVCVUdfQVRPTUlDKCJbQ1JUQzolZDolc10gZW5hYmxlZC9j b25uZWN0b3JzIG1pc21hdGNoXG4iLAogCQkJCQkgY3J0Yy0+YmFzZS5pZCwgY3J0Yy0+bmFtZSk7 CiAKQEAgLTU5OSw3ICs2MDEsNyBAQCBkcm1fYXRvbWljX2hlbHBlcl9jaGVja19wbGFuZXMoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JZm9yX2Vh Y2hfcGxhbmVfaW5fc3RhdGUoc3RhdGUsIHBsYW5lLCBwbGFuZV9zdGF0ZSwgaSkgeworCWZvcl9l YWNoX25ld19wbGFuZV9pbl9zdGF0ZShzdGF0ZSwgcGxhbmUsIHBsYW5lX3N0YXRlLCBpKSB7CiAJ CWNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfaGVscGVyX2Z1bmNzICpmdW5jczsKIAogCQlmdW5jcyA9 IHBsYW5lLT5oZWxwZXJfcHJpdmF0ZTsKQEAgLTYxNyw3ICs2MTksNyBAQCBkcm1fYXRvbWljX2hl bHBlcl9jaGVja19wbGFuZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJfQogCX0KIAotCWZv cl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKKwlmb3Jf ZWFjaF9uZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgewogCQlj b25zdCBzdHJ1Y3QgZHJtX2NydGNfaGVscGVyX2Z1bmNzICpmdW5jczsKIAogCQlmdW5jcyA9IGNy dGMtPmhlbHBlcl9wcml2YXRlOwpAQCAtNjc4LDEyICs2ODAsMTIgQEAgc3RhdGljIHZvaWQKIGRp c2FibGVfb3V0cHV0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2F0b21pY19z dGF0ZSAqb2xkX3N0YXRlKQogewogCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7Ci0J c3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKm9sZF9jb25uX3N0YXRlOworCXN0cnVjdCBkcm1f Y29ubmVjdG9yX3N0YXRlICpvbGRfY29ubl9zdGF0ZSwgKm5ld19jb25uX3N0YXRlOwogCXN0cnVj dCBkcm1fY3J0YyAqY3J0YzsKLQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRl OworCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsICpuZXdfY3J0Y19zdGF0 ZTsKIAlpbnQgaTsKIAotCWZvcl9lYWNoX2Nvbm5lY3Rvcl9pbl9zdGF0ZShvbGRfc3RhdGUsIGNv bm5lY3Rvciwgb2xkX2Nvbm5fc3RhdGUsIGkpIHsKKwlmb3JfZWFjaF9vbGRuZXdfY29ubmVjdG9y X2luX3N0YXRlKG9sZF9zdGF0ZSwgY29ubmVjdG9yLCBvbGRfY29ubl9zdGF0ZSwgbmV3X2Nvbm5f c3RhdGUsIGkpIHsKIAkJY29uc3Qgc3RydWN0IGRybV9lbmNvZGVyX2hlbHBlcl9mdW5jcyAqZnVu Y3M7CiAJCXN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcjsKIApAQCAtNzIwLDcgKzcyMiw3IEBA IGRpc2FibGVfb3V0cHV0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2F0b21p Y19zdGF0ZSAqb2xkX3N0YXRlKQogCiAJCS8qIFJpZ2h0IGZ1bmN0aW9uIGRlcGVuZHMgdXBvbiB0 YXJnZXQgc3RhdGUuICovCiAJCWlmIChmdW5jcykgewotCQkJaWYgKGNvbm5lY3Rvci0+c3RhdGUt PmNydGMgJiYgZnVuY3MtPnByZXBhcmUpCisJCQlpZiAobmV3X2Nvbm5fc3RhdGUtPmNydGMgJiYg ZnVuY3MtPnByZXBhcmUpCiAJCQkJZnVuY3MtPnByZXBhcmUoZW5jb2Rlcik7CiAJCQllbHNlIGlm IChmdW5jcy0+ZGlzYWJsZSkKIAkJCQlmdW5jcy0+ZGlzYWJsZShlbmNvZGVyKTsKQEAgLTczMSwx MSArNzMzLDExIEBAIGRpc2FibGVfb3V0cHV0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1 Y3QgZHJtX2F0b21pY19zdGF0ZSAqb2xkX3N0YXRlKQogCQlkcm1fYnJpZGdlX3Bvc3RfZGlzYWJs ZShlbmNvZGVyLT5icmlkZ2UpOwogCX0KIAotCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUob2xkX3N0 YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgaSkgeworCWZvcl9lYWNoX29sZG5ld19jcnRjX2lu X3N0YXRlKG9sZF9zdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIG5ld19jcnRjX3N0YXRlLCBp KSB7CiAJCWNvbnN0IHN0cnVjdCBkcm1fY3J0Y19oZWxwZXJfZnVuY3MgKmZ1bmNzOwogCiAJCS8q IFNodXQgZG93biBldmVyeXRoaW5nIHRoYXQgbmVlZHMgYSBmdWxsIG1vZGVzZXQuICovCi0JCWlm ICghZHJtX2F0b21pY19jcnRjX25lZWRzX21vZGVzZXQoY3J0Yy0+c3RhdGUpKQorCQlpZiAoIWRy bV9hdG9taWNfY3J0Y19uZWVkc19tb2Rlc2V0KG5ld19jcnRjX3N0YXRlKSkKIAkJCWNvbnRpbnVl OwogCiAJCWlmICghb2xkX2NydGNfc3RhdGUtPmFjdGl2ZSkKQEAgLTc0OCw3ICs3NTAsNyBAQCBk aXNhYmxlX291dHB1dHMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9hdG9taWNf c3RhdGUgKm9sZF9zdGF0ZSkKIAogCiAJCS8qIFJpZ2h0IGZ1bmN0aW9uIGRlcGVuZHMgdXBvbiB0 YXJnZXQgc3RhdGUuICovCi0JCWlmIChjcnRjLT5zdGF0ZS0+ZW5hYmxlICYmIGZ1bmNzLT5wcmVw YXJlKQorCQlpZiAobmV3X2NydGNfc3RhdGUtPmVuYWJsZSAmJiBmdW5jcy0+cHJlcGFyZSkKIAkJ CWZ1bmNzLT5wcmVwYXJlKGNydGMpOwogCQllbHNlIGlmIChmdW5jcy0+YXRvbWljX2Rpc2FibGUp CiAJCQlmdW5jcy0+YXRvbWljX2Rpc2FibGUoY3J0Yywgb2xkX2NydGNfc3RhdGUpOwpAQCAtNzc3 LDEzICs3NzksMTMgQEAgZHJtX2F0b21pY19oZWxwZXJfdXBkYXRlX2xlZ2FjeV9tb2Rlc2V0X3N0 YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJCSAgICAgIHN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpvbGRfc3RhdGUpCiB7CiAJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsK LQlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqb2xkX2Nvbm5fc3RhdGU7CisJc3RydWN0IGRy bV9jb25uZWN0b3Jfc3RhdGUgKm9sZF9jb25uX3N0YXRlLCAqbmV3X2Nvbm5fc3RhdGU7CiAJc3Ry dWN0IGRybV9jcnRjICpjcnRjOwotCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3Rh dGU7CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwogCWludCBpOwogCiAJLyog Y2xlYXIgb3V0IGV4aXN0aW5nIGxpbmtzIGFuZCB1cGRhdGUgZHBtcyAqLwotCWZvcl9lYWNoX2Nv bm5lY3Rvcl9pbl9zdGF0ZShvbGRfc3RhdGUsIGNvbm5lY3Rvciwgb2xkX2Nvbm5fc3RhdGUsIGkp IHsKKwlmb3JfZWFjaF9vbGRuZXdfY29ubmVjdG9yX2luX3N0YXRlKG9sZF9zdGF0ZSwgY29ubmVj dG9yLCBvbGRfY29ubl9zdGF0ZSwgbmV3X2Nvbm5fc3RhdGUsIGkpIHsKIAkJaWYgKGNvbm5lY3Rv ci0+ZW5jb2RlcikgewogCQkJV0FSTl9PTighY29ubmVjdG9yLT5lbmNvZGVyLT5jcnRjKTsKIApA QCAtNzkxLDcgKzc5Myw3IEBAIGRybV9hdG9taWNfaGVscGVyX3VwZGF0ZV9sZWdhY3lfbW9kZXNl dF9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJY29ubmVjdG9yLT5lbmNvZGVyID0g TlVMTDsKIAkJfQogCi0JCWNydGMgPSBjb25uZWN0b3ItPnN0YXRlLT5jcnRjOworCQljcnRjID0g bmV3X2Nvbm5fc3RhdGUtPmNydGM7CiAJCWlmICgoIWNydGMgJiYgb2xkX2Nvbm5fc3RhdGUtPmNy dGMpIHx8CiAJCSAgICAoY3J0YyAmJiBkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9kZXNldChjcnRj LT5zdGF0ZSkpKSB7CiAJCQlzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpkcG1zX3Byb3AgPQpAQCAtODA4 LDIzICs4MTAsMjMgQEAgZHJtX2F0b21pY19oZWxwZXJfdXBkYXRlX2xlZ2FjeV9tb2Rlc2V0X3N0 YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJfQogCiAJLyogc2V0IG5ldyBsaW5rcyAqLwot CWZvcl9lYWNoX2Nvbm5lY3Rvcl9pbl9zdGF0ZShvbGRfc3RhdGUsIGNvbm5lY3Rvciwgb2xkX2Nv bm5fc3RhdGUsIGkpIHsKLQkJaWYgKCFjb25uZWN0b3ItPnN0YXRlLT5jcnRjKQorCWZvcl9lYWNo X25ld19jb25uZWN0b3JfaW5fc3RhdGUob2xkX3N0YXRlLCBjb25uZWN0b3IsIG5ld19jb25uX3N0 YXRlLCBpKSB7CisJCWlmICghbmV3X2Nvbm5fc3RhdGUtPmNydGMpCiAJCQljb250aW51ZTsKIAot CQlpZiAoV0FSTl9PTighY29ubmVjdG9yLT5zdGF0ZS0+YmVzdF9lbmNvZGVyKSkKKwkJaWYgKFdB Uk5fT04oIW5ld19jb25uX3N0YXRlLT5iZXN0X2VuY29kZXIpKQogCQkJY29udGludWU7CiAKLQkJ Y29ubmVjdG9yLT5lbmNvZGVyID0gY29ubmVjdG9yLT5zdGF0ZS0+YmVzdF9lbmNvZGVyOwotCQlj b25uZWN0b3ItPmVuY29kZXItPmNydGMgPSBjb25uZWN0b3ItPnN0YXRlLT5jcnRjOworCQljb25u ZWN0b3ItPmVuY29kZXIgPSBuZXdfY29ubl9zdGF0ZS0+YmVzdF9lbmNvZGVyOworCQljb25uZWN0 b3ItPmVuY29kZXItPmNydGMgPSBuZXdfY29ubl9zdGF0ZS0+Y3J0YzsKIAl9CiAKIAkvKiBzZXQg bGVnYWN5IHN0YXRlIGluIHRoZSBjcnRjIHN0cnVjdHVyZSAqLwotCWZvcl9lYWNoX2NydGNfaW5f c3RhdGUob2xkX3N0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgaSkgeworCWZvcl9lYWNoX25l d19jcnRjX2luX3N0YXRlKG9sZF9zdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgewogCQlzdHJ1 Y3QgZHJtX3BsYW5lICpwcmltYXJ5ID0gY3J0Yy0+cHJpbWFyeTsKIAotCQljcnRjLT5tb2RlID0g Y3J0Yy0+c3RhdGUtPm1vZGU7Ci0JCWNydGMtPmVuYWJsZWQgPSBjcnRjLT5zdGF0ZS0+ZW5hYmxl OworCQljcnRjLT5tb2RlID0gY3J0Y19zdGF0ZS0+bW9kZTsKKwkJY3J0Yy0+ZW5hYmxlZCA9IGNy dGNfc3RhdGUtPmVuYWJsZTsKIAogCQlpZiAoZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfcGxhbmVf c3RhdGUob2xkX3N0YXRlLCBwcmltYXJ5KSAmJgogCQkgICAgcHJpbWFyeS0+c3RhdGUtPmNydGMg PT0gY3J0YykgewpAQCAtODMyLDkgKzgzNCw5IEBAIGRybV9hdG9taWNfaGVscGVyX3VwZGF0ZV9s ZWdhY3lfbW9kZXNldF9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJY3J0Yy0+eSA9 IHByaW1hcnktPnN0YXRlLT5zcmNfeSA+PiAxNjsKIAkJfQogCi0JCWlmIChjcnRjLT5zdGF0ZS0+ ZW5hYmxlKQorCQlpZiAoY3J0Y19zdGF0ZS0+ZW5hYmxlKQogCQkJZHJtX2NhbGNfdGltZXN0YW1w aW5nX2NvbnN0YW50cyhjcnRjLAotCQkJCQkJCSZjcnRjLT5zdGF0ZS0+YWRqdXN0ZWRfbW9kZSk7 CisJCQkJCQkJJmNydGNfc3RhdGUtPmFkanVzdGVkX21vZGUpOwogCX0KIH0KIEVYUE9SVF9TWU1C T0woZHJtX2F0b21pY19oZWxwZXJfdXBkYXRlX2xlZ2FjeV9tb2Rlc2V0X3N0YXRlKTsKQEAgLTg0 MywyMCArODQ1LDIwIEBAIHN0YXRpYyB2b2lkCiBjcnRjX3NldF9tb2RlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUpCiB7CiAJc3RydWN0 IGRybV9jcnRjICpjcnRjOwotCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGU7 CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwogCXN0cnVjdCBkcm1fY29ubmVj dG9yICpjb25uZWN0b3I7Ci0Jc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKm9sZF9jb25uX3N0 YXRlOworCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlOwogCWludCBpOwog Ci0JZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShvbGRfc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRl LCBpKSB7CisJZm9yX2VhY2hfbmV3X2NydGNfaW5fc3RhdGUob2xkX3N0YXRlLCBjcnRjLCBjcnRj X3N0YXRlLCBpKSB7CiAJCWNvbnN0IHN0cnVjdCBkcm1fY3J0Y19oZWxwZXJfZnVuY3MgKmZ1bmNz OwogCi0JCWlmICghY3J0Yy0+c3RhdGUtPm1vZGVfY2hhbmdlZCkKKwkJaWYgKCFjcnRjX3N0YXRl LT5tb2RlX2NoYW5nZWQpCiAJCQljb250aW51ZTsKIAogCQlmdW5jcyA9IGNydGMtPmhlbHBlcl9w cml2YXRlOwogCi0JCWlmIChjcnRjLT5zdGF0ZS0+ZW5hYmxlICYmIGZ1bmNzLT5tb2RlX3NldF9u b2ZiKSB7CisJCWlmIChjcnRjX3N0YXRlLT5lbmFibGUgJiYgZnVuY3MtPm1vZGVfc2V0X25vZmIp IHsKIAkJCURSTV9ERUJVR19BVE9NSUMoIm1vZGVzZXQgb24gW0NSVEM6JWQ6JXNdXG4iLAogCQkJ CQkgY3J0Yy0+YmFzZS5pZCwgY3J0Yy0+bmFtZSk7CiAKQEAgLTg2NCwxOCArODY2LDE4IEBAIGNy dGNfc2V0X21vZGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9hdG9taWNfc3Rh dGUgKm9sZF9zdGF0ZSkKIAkJfQogCX0KIAotCWZvcl9lYWNoX2Nvbm5lY3Rvcl9pbl9zdGF0ZShv bGRfc3RhdGUsIGNvbm5lY3Rvciwgb2xkX2Nvbm5fc3RhdGUsIGkpIHsKKwlmb3JfZWFjaF9uZXdf Y29ubmVjdG9yX2luX3N0YXRlKG9sZF9zdGF0ZSwgY29ubmVjdG9yLCBjb25uX3N0YXRlLCBpKSB7 CiAJCWNvbnN0IHN0cnVjdCBkcm1fZW5jb2Rlcl9oZWxwZXJfZnVuY3MgKmZ1bmNzOwogCQlzdHJ1 Y3QgZHJtX2NydGNfc3RhdGUgKm5ld19jcnRjX3N0YXRlOwogCQlzdHJ1Y3QgZHJtX2VuY29kZXIg KmVuY29kZXI7CiAJCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlLCAqYWRqdXN0ZWRfbW9k ZTsKIAotCQlpZiAoIWNvbm5lY3Rvci0+c3RhdGUtPmJlc3RfZW5jb2RlcikKKwkJaWYgKCFjb25u X3N0YXRlLT5iZXN0X2VuY29kZXIpCiAJCQljb250aW51ZTsKIAotCQllbmNvZGVyID0gY29ubmVj dG9yLT5zdGF0ZS0+YmVzdF9lbmNvZGVyOworCQllbmNvZGVyID0gY29ubl9zdGF0ZS0+YmVzdF9l bmNvZGVyOwogCQlmdW5jcyA9IGVuY29kZXItPmhlbHBlcl9wcml2YXRlOwotCQluZXdfY3J0Y19z dGF0ZSA9IGNvbm5lY3Rvci0+c3RhdGUtPmNydGMtPnN0YXRlOworCQluZXdfY3J0Y19zdGF0ZSA9 IGNvbm5fc3RhdGUtPmNydGMtPnN0YXRlOwogCQltb2RlID0gJm5ld19jcnRjX3N0YXRlLT5tb2Rl OwogCQlhZGp1c3RlZF9tb2RlID0gJm5ld19jcnRjX3N0YXRlLT5hZGp1c3RlZF9tb2RlOwogCkBA IC04OTEsNyArODkzLDcgQEAgY3J0Y19zZXRfbW9kZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBz dHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqb2xkX3N0YXRlKQogCQkgKi8KIAkJaWYgKGZ1bmNzICYm IGZ1bmNzLT5hdG9taWNfbW9kZV9zZXQpIHsKIAkJCWZ1bmNzLT5hdG9taWNfbW9kZV9zZXQoZW5j b2RlciwgbmV3X2NydGNfc3RhdGUsCi0JCQkJCSAgICAgICBjb25uZWN0b3ItPnN0YXRlKTsKKwkJ CQkJICAgICAgIGNvbm5fc3RhdGUpOwogCQl9IGVsc2UgaWYgKGZ1bmNzICYmIGZ1bmNzLT5tb2Rl X3NldCkgewogCQkJZnVuY3MtPm1vZGVfc2V0KGVuY29kZXIsIG1vZGUsIGFkanVzdGVkX21vZGUp OwogCQl9CkBAIC05NDMsMjQgKzk0NSwyNCBAQCB2b2lkIGRybV9hdG9taWNfaGVscGVyX2NvbW1p dF9tb2Rlc2V0X2VuYWJsZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkJICAgICAgc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNy dGM7Ci0Jc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZTsKKwlzdHJ1Y3QgZHJt X2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CiAJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rv cjsKLQlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqb2xkX2Nvbm5fc3RhdGU7CisJc3RydWN0 IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGU7CiAJaW50IGk7CiAKLQlmb3JfZWFjaF9j cnRjX2luX3N0YXRlKG9sZF9zdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIGkpIHsKKwlmb3Jf ZWFjaF9uZXdfY3J0Y19pbl9zdGF0ZShvbGRfc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsK IAkJY29uc3Qgc3RydWN0IGRybV9jcnRjX2hlbHBlcl9mdW5jcyAqZnVuY3M7CiAKIAkJLyogTmVl ZCB0byBmaWx0ZXIgb3V0IENSVENzIHdoZXJlIG9ubHkgcGxhbmVzIGNoYW5nZS4gKi8KLQkJaWYg KCFkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9kZXNldChjcnRjLT5zdGF0ZSkpCisJCWlmICghZHJt X2F0b21pY19jcnRjX25lZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkpCiAJCQljb250aW51ZTsKIAot CQlpZiAoIWNydGMtPnN0YXRlLT5hY3RpdmUpCisJCWlmICghY3J0Y19zdGF0ZS0+YWN0aXZlKQog CQkJY29udGludWU7CiAKIAkJZnVuY3MgPSBjcnRjLT5oZWxwZXJfcHJpdmF0ZTsKIAotCQlpZiAo Y3J0Yy0+c3RhdGUtPmVuYWJsZSkgeworCQlpZiAoY3J0Y19zdGF0ZS0+ZW5hYmxlKSB7CiAJCQlE Uk1fREVCVUdfQVRPTUlDKCJlbmFibGluZyBbQ1JUQzolZDolc11cbiIsCiAJCQkJCSBjcnRjLT5i YXNlLmlkLCBjcnRjLT5uYW1lKTsKIApAQCAtOTcxLDE4ICs5NzMsMTggQEAgdm9pZCBkcm1fYXRv bWljX2hlbHBlcl9jb21taXRfbW9kZXNldF9lbmFibGVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs CiAJCX0KIAl9CiAKLQlmb3JfZWFjaF9jb25uZWN0b3JfaW5fc3RhdGUob2xkX3N0YXRlLCBjb25u ZWN0b3IsIG9sZF9jb25uX3N0YXRlLCBpKSB7CisJZm9yX2VhY2hfbmV3X2Nvbm5lY3Rvcl9pbl9z dGF0ZShvbGRfc3RhdGUsIGNvbm5lY3RvciwgY29ubl9zdGF0ZSwgaSkgewogCQljb25zdCBzdHJ1 Y3QgZHJtX2VuY29kZXJfaGVscGVyX2Z1bmNzICpmdW5jczsKIAkJc3RydWN0IGRybV9lbmNvZGVy ICplbmNvZGVyOwogCi0JCWlmICghY29ubmVjdG9yLT5zdGF0ZS0+YmVzdF9lbmNvZGVyKQorCQlp ZiAoIWNvbm5fc3RhdGUtPmJlc3RfZW5jb2RlcikKIAkJCWNvbnRpbnVlOwogCi0JCWlmICghY29u bmVjdG9yLT5zdGF0ZS0+Y3J0Yy0+c3RhdGUtPmFjdGl2ZSB8fAotCQkgICAgIWRybV9hdG9taWNf Y3J0Y19uZWVkc19tb2Rlc2V0KGNvbm5lY3Rvci0+c3RhdGUtPmNydGMtPnN0YXRlKSkKKwkJaWYg KCFjb25uX3N0YXRlLT5jcnRjLT5zdGF0ZS0+YWN0aXZlIHx8CisJCSAgICAhZHJtX2F0b21pY19j cnRjX25lZWRzX21vZGVzZXQoY29ubl9zdGF0ZS0+Y3J0Yy0+c3RhdGUpKQogCQkJY29udGludWU7 CiAKLQkJZW5jb2RlciA9IGNvbm5lY3Rvci0+c3RhdGUtPmJlc3RfZW5jb2RlcjsKKwkJZW5jb2Rl ciA9IGNvbm5fc3RhdGUtPmJlc3RfZW5jb2RlcjsKIAkJZnVuY3MgPSBlbmNvZGVyLT5oZWxwZXJf cHJpdmF0ZTsKIAogCQlEUk1fREVCVUdfQVRPTUlDKCJlbmFibGluZyBbRU5DT0RFUjolZDolc11c biIsCkBAIC0xMDI3LDEwICsxMDI5LDcgQEAgaW50IGRybV9hdG9taWNfaGVscGVyX3dhaXRfZm9y X2ZlbmNlcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUg KnBsYW5lX3N0YXRlOwogCWludCBpLCByZXQ7CiAKLQlmb3JfZWFjaF9wbGFuZV9pbl9zdGF0ZShz dGF0ZSwgcGxhbmUsIHBsYW5lX3N0YXRlLCBpKSB7Ci0JCWlmICghcHJlX3N3YXApCi0JCQlwbGFu ZV9zdGF0ZSA9IHBsYW5lLT5zdGF0ZTsKLQorCWZvcl9lYWNoX25ld19wbGFuZV9pbl9zdGF0ZShz dGF0ZSwgcGxhbmUsIHBsYW5lX3N0YXRlLCBpKSB7CiAJCWlmICghcGxhbmVfc3RhdGUtPmZlbmNl KQogCQkJY29udGludWU7CiAKQEAgLTEwNzIsMTUgKzEwNzEsMTUgQEAgYm9vbCBkcm1fYXRvbWlj X2hlbHBlcl9mcmFtZWJ1ZmZlcl9jaGFuZ2VkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJ CSAgIHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsK LQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRfcGxhbmVfc3RhdGU7CisJc3RydWN0IGRybV9w bGFuZV9zdGF0ZSAqb2xkX3BsYW5lX3N0YXRlLCAqbmV3X3BsYW5lX3N0YXRlOwogCWludCBpOwog Ci0JZm9yX2VhY2hfcGxhbmVfaW5fc3RhdGUob2xkX3N0YXRlLCBwbGFuZSwgb2xkX3BsYW5lX3N0 YXRlLCBpKSB7Ci0JCWlmIChwbGFuZS0+c3RhdGUtPmNydGMgIT0gY3J0YyAmJgorCWZvcl9lYWNo X29sZG5ld19wbGFuZV9pbl9zdGF0ZShvbGRfc3RhdGUsIHBsYW5lLCBvbGRfcGxhbmVfc3RhdGUs IG5ld19wbGFuZV9zdGF0ZSwgaSkgeworCQlpZiAobmV3X3BsYW5lX3N0YXRlLT5jcnRjICE9IGNy dGMgJiYKIAkJICAgIG9sZF9wbGFuZV9zdGF0ZS0+Y3J0YyAhPSBjcnRjKQogCQkJY29udGludWU7 CiAKLQkJaWYgKHBsYW5lLT5zdGF0ZS0+ZmIgIT0gb2xkX3BsYW5lX3N0YXRlLT5mYikKKwkJaWYg KG5ld19wbGFuZV9zdGF0ZS0+ZmIgIT0gb2xkX3BsYW5lX3N0YXRlLT5mYikKIAkJCXJldHVybiB0 cnVlOwogCX0KIApAQCAtMTEwNCwyMSArMTEwMywyMSBAQCBkcm1fYXRvbWljX2hlbHBlcl93YWl0 X2Zvcl92YmxhbmtzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCXN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpvbGRfc3RhdGUpCiB7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjOwotCXN0cnVjdCBk cm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGU7CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpv bGRfY3J0Y19zdGF0ZSwgKm5ld19jcnRjX3N0YXRlOwogCWludCBpLCByZXQ7CiAKLQlmb3JfZWFj aF9jcnRjX2luX3N0YXRlKG9sZF9zdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIGkpIHsKKwkv KiBMZWdhY3kgY3Vyc29yIGlvY3RscyBhcmUgY29tcGxldGVseSB1bnN5bmNlZCwgYW5kIHVzZXJz cGFjZQorCSAqIHJlbGllcyBvbiB0aGF0IChieSBkb2luZyB0b25zIG9mIGN1cnNvciB1cGRhdGVz KS4gKi8KKwlpZiAob2xkX3N0YXRlLT5sZWdhY3lfY3Vyc29yX3VwZGF0ZSkKKwkJcmV0dXJuOwor CisJZm9yX2VhY2hfb2xkbmV3X2NydGNfaW5fc3RhdGUob2xkX3N0YXRlLCBjcnRjLCBvbGRfY3J0 Y19zdGF0ZSwgbmV3X2NydGNfc3RhdGUsIGkpIHsKIAkJLyogTm8gb25lIGNhcmVzIGFib3V0IHRo ZSBvbGQgc3RhdGUsIHNvIGFidXNlIGl0IGZvciB0cmFja2luZwogCQkgKiBhbmQgc3RvcmUgd2hl dGhlciB3ZSBob2xkIGEgdmJsYW5rIHJlZmVyZW5jZSAoYW5kIHNob3VsZCBkbyBhCiAJCSAqIHZi bGFuayB3YWl0KSBpbiB0aGUgLT5lbmFibGUgYm9vbGVhbi4gKi8KIAkJb2xkX2NydGNfc3RhdGUt PmVuYWJsZSA9IGZhbHNlOwogCi0JCWlmICghY3J0Yy0+c3RhdGUtPmVuYWJsZSkKLQkJCWNvbnRp bnVlOwotCi0JCS8qIExlZ2FjeSBjdXJzb3IgaW9jdGxzIGFyZSBjb21wbGV0ZWx5IHVuc3luY2Vk LCBhbmQgdXNlcnNwYWNlCi0JCSAqIHJlbGllcyBvbiB0aGF0IChieSBkb2luZyB0b25zIG9mIGN1 cnNvciB1cGRhdGVzKS4gKi8KLQkJaWYgKG9sZF9zdGF0ZS0+bGVnYWN5X2N1cnNvcl91cGRhdGUp CisJCWlmICghbmV3X2NydGNfc3RhdGUtPmVuYWJsZSkKIAkJCWNvbnRpbnVlOwogCiAJCWlmICgh ZHJtX2F0b21pY19oZWxwZXJfZnJhbWVidWZmZXJfY2hhbmdlZChkZXYsCkBAIC0xMTMzLDcgKzEx MzIsNyBAQCBkcm1fYXRvbWljX2hlbHBlcl93YWl0X2Zvcl92YmxhbmtzKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCiAJCW9sZF9jcnRjX3N0YXRlLT5sYXN0X3ZibGFua19jb3VudCA9IGRybV9jcnRj X3ZibGFua19jb3VudChjcnRjKTsKIAl9CiAKLQlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKG9sZF9z dGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIGkpIHsKKwlmb3JfZWFjaF9vbGRfY3J0Y19pbl9z dGF0ZShvbGRfc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRlLCBpKSB7CiAJCWlmICghb2xkX2Ny dGNfc3RhdGUtPmVuYWJsZSkKIAkJCWNvbnRpbnVlOwogCkBAIC0xNDMyLDExICsxNDMxLDExIEBA IGludCBkcm1fYXRvbWljX2hlbHBlcl9zZXR1cF9jb21taXQoc3RydWN0IGRybV9hdG9taWNfc3Rh dGUgKnN0YXRlLAogCQkJCSAgIGJvb2wgbm9uYmxvY2spCiB7CiAJc3RydWN0IGRybV9jcnRjICpj cnRjOwotCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKKwlzdHJ1Y3QgZHJtX2Ny dGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLCAqY3J0Y19zdGF0ZTsKIAlzdHJ1Y3QgZHJtX2NydGNf Y29tbWl0ICpjb21taXQ7CiAJaW50IGksIHJldDsKIAotCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUo c3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKKwlmb3JfZWFjaF9vbGRuZXdfY3J0Y19pbl9z dGF0ZShzdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIGNydGNfc3RhdGUsIGkpIHsKIAkJY29t bWl0ID0ga3phbGxvYyhzaXplb2YoKmNvbW1pdCksIEdGUF9LRVJORUwpOwogCQlpZiAoIWNvbW1p dCkKIAkJCXJldHVybiAtRU5PTUVNOwpAQCAtMTQ1Nyw3ICsxNDU2LDcgQEAgaW50IGRybV9hdG9t aWNfaGVscGVyX3NldHVwX2NvbW1pdChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJ CS8qIERyaXZlcnMgb25seSBzZW5kIG91dCBldmVudHMgd2hlbiBhdCBsZWFzdCBlaXRoZXIgY3Vy cmVudCBvcgogCQkgKiBuZXcgQ1JUQyBzdGF0ZSBpcyBhY3RpdmUuIENvbXBsZXRlIHJpZ2h0IGF3 YXkgaWYgZXZlcnl0aGluZwogCQkgKiBzdGF5cyBvZmYuICovCi0JCWlmICghY3J0Yy0+c3RhdGUt PmFjdGl2ZSAmJiAhY3J0Y19zdGF0ZS0+YWN0aXZlKSB7CisJCWlmICghb2xkX2NydGNfc3RhdGUt PmFjdGl2ZSAmJiAhY3J0Y19zdGF0ZS0+YWN0aXZlKSB7CiAJCQljb21wbGV0ZV9hbGwoJmNvbW1p dC0+ZmxpcF9kb25lKTsKIAkJCWNvbnRpbnVlOwogCQl9CkBAIC0xNTIxLDcgKzE1MjAsNyBAQCB2 b2lkIGRybV9hdG9taWNfaGVscGVyX3dhaXRfZm9yX2RlcGVuZGVuY2llcyhzdHJ1Y3QgZHJtX2F0 b21pY19zdGF0ZSAqc3RhdGUpCiAJaW50IGk7CiAJbG9uZyByZXQ7CiAKLQlmb3JfZWFjaF9jcnRj X2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7CisJZm9yX2VhY2hfbmV3X2Ny dGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKIAkJc3Bpbl9sb2NrKCZj cnRjLT5jb21taXRfbG9jayk7CiAJCWNvbW1pdCA9IHByZWNlZWRpbmdfY29tbWl0KGNydGMpOwog CQlpZiAoY29tbWl0KQpAQCAtMTU3MiwxMyArMTU3MSwxMyBAQCB2b2lkIGRybV9hdG9taWNfaGVs cGVyX2NvbW1pdF9od19kb25lKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAlzdHJ1 Y3QgZHJtX2NydGNfY29tbWl0ICpjb21taXQ7CiAJaW50IGk7CiAKLQlmb3JfZWFjaF9jcnRjX2lu X3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7CisJZm9yX2VhY2hfbmV3X2NydGNf aW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKIAkJY29tbWl0ID0gc3RhdGUt PmNydGNzW2ldLmNvbW1pdDsKIAkJaWYgKCFjb21taXQpCiAJCQljb250aW51ZTsKIAogCQkvKiBi YWNrZW5kIG11c3QgaGF2ZSBjb25zdW1lZCBhbnkgZXZlbnQgYnkgbm93ICovCi0JCVdBUk5fT04o Y3J0Yy0+c3RhdGUtPmV2ZW50KTsKKwkJV0FSTl9PTihjcnRjX3N0YXRlLT5ldmVudCk7CiAJCXNw aW5fbG9jaygmY3J0Yy0+Y29tbWl0X2xvY2spOwogCQljb21wbGV0ZV9hbGwoJmNvbW1pdC0+aHdf ZG9uZSk7CiAJCXNwaW5fdW5sb2NrKCZjcnRjLT5jb21taXRfbG9jayk7CkBAIC0xNjA1LDcgKzE2 MDQsNyBAQCB2b2lkIGRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9jbGVhbnVwX2RvbmUoc3RydWN0 IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCWludCBpOwogCWxvbmcgcmV0OwogCi0JZm9yX2Vh Y2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgeworCWZvcl9lYWNo X25ld19jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7CiAJCWNvbW1p dCA9IHN0YXRlLT5jcnRjc1tpXS5jb21taXQ7CiAJCWlmIChXQVJOX09OKCFjb21taXQpKQogCQkJ Y29udGludWU7CkBAIC0xNjU4LDcgKzE2NTcsNyBAQCBpbnQgZHJtX2F0b21pY19oZWxwZXJfcHJl cGFyZV9wbGFuZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlzdHJ1Y3QgZHJtX3BsYW5lX3N0 YXRlICpwbGFuZV9zdGF0ZTsKIAlpbnQgcmV0LCBpLCBqOwogCi0JZm9yX2VhY2hfcGxhbmVfaW5f c3RhdGUoc3RhdGUsIHBsYW5lLCBwbGFuZV9zdGF0ZSwgaSkgeworCWZvcl9lYWNoX25ld19wbGFu ZV9pbl9zdGF0ZShzdGF0ZSwgcGxhbmUsIHBsYW5lX3N0YXRlLCBpKSB7CiAJCWNvbnN0IHN0cnVj dCBkcm1fcGxhbmVfaGVscGVyX2Z1bmNzICpmdW5jczsKIAogCQlmdW5jcyA9IHBsYW5lLT5oZWxw ZXJfcHJpdmF0ZTsKQEAgLTE2NzYsNyArMTY3NSw3IEBAIGludCBkcm1fYXRvbWljX2hlbHBlcl9w cmVwYXJlX3BsYW5lcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXJldHVybiAwOwogCiBmYWls OgotCWZvcl9lYWNoX3BsYW5lX2luX3N0YXRlKHN0YXRlLCBwbGFuZSwgcGxhbmVfc3RhdGUsIGop IHsKKwlmb3JfZWFjaF9uZXdfcGxhbmVfaW5fc3RhdGUoc3RhdGUsIHBsYW5lLCBwbGFuZV9zdGF0 ZSwgaikgewogCQljb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2hlbHBlcl9mdW5jcyAqZnVuY3M7CiAK IAkJaWYgKGogPj0gaSkKQEAgLTE3NDYsMTQgKzE3NDUsMTQgQEAgdm9pZCBkcm1fYXRvbWljX2hl bHBlcl9jb21taXRfcGxhbmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJICAgICB1aW50 MzJfdCBmbGFncykKIHsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7Ci0Jc3RydWN0IGRybV9jcnRj X3N0YXRlICpvbGRfY3J0Y19zdGF0ZTsKKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRj X3N0YXRlLCAqbmV3X2NydGNfc3RhdGU7CiAJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7Ci0Jc3Ry dWN0IGRybV9wbGFuZV9zdGF0ZSAqb2xkX3BsYW5lX3N0YXRlOworCXN0cnVjdCBkcm1fcGxhbmVf c3RhdGUgKm9sZF9wbGFuZV9zdGF0ZSwgKm5ld19wbGFuZV9zdGF0ZTsKIAlpbnQgaTsKIAlib29s IGFjdGl2ZV9vbmx5ID0gZmxhZ3MgJiBEUk1fUExBTkVfQ09NTUlUX0FDVElWRV9PTkxZOwogCWJv b2wgbm9fZGlzYWJsZSA9IGZsYWdzICYgRFJNX1BMQU5FX0NPTU1JVF9OT19ESVNBQkxFX0FGVEVS X01PREVTRVQ7CiAKLQlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKG9sZF9zdGF0ZSwgY3J0Yywgb2xk X2NydGNfc3RhdGUsIGkpIHsKKwlmb3JfZWFjaF9vbGRuZXdfY3J0Y19pbl9zdGF0ZShvbGRfc3Rh dGUsIGNydGMsIG9sZF9jcnRjX3N0YXRlLCBuZXdfY3J0Y19zdGF0ZSwgaSkgewogCQljb25zdCBz dHJ1Y3QgZHJtX2NydGNfaGVscGVyX2Z1bmNzICpmdW5jczsKIAogCQlmdW5jcyA9IGNydGMtPmhl bHBlcl9wcml2YXRlOwpAQCAtMTc2MSwxMyArMTc2MCwxMyBAQCB2b2lkIGRybV9hdG9taWNfaGVs cGVyX2NvbW1pdF9wbGFuZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJaWYgKCFmdW5jcyB8 fCAhZnVuY3MtPmF0b21pY19iZWdpbikKIAkJCWNvbnRpbnVlOwogCi0JCWlmIChhY3RpdmVfb25s eSAmJiAhY3J0Yy0+c3RhdGUtPmFjdGl2ZSkKKwkJaWYgKGFjdGl2ZV9vbmx5ICYmICFuZXdfY3J0 Y19zdGF0ZS0+YWN0aXZlKQogCQkJY29udGludWU7CiAKIAkJZnVuY3MtPmF0b21pY19iZWdpbihj cnRjLCBvbGRfY3J0Y19zdGF0ZSk7CiAJfQogCi0JZm9yX2VhY2hfcGxhbmVfaW5fc3RhdGUob2xk X3N0YXRlLCBwbGFuZSwgb2xkX3BsYW5lX3N0YXRlLCBpKSB7CisJZm9yX2VhY2hfb2xkbmV3X3Bs YW5lX2luX3N0YXRlKG9sZF9zdGF0ZSwgcGxhbmUsIG9sZF9wbGFuZV9zdGF0ZSwgbmV3X3BsYW5l X3N0YXRlLCBpKSB7CiAJCWNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfaGVscGVyX2Z1bmNzICpmdW5j czsKIAkJYm9vbCBkaXNhYmxpbmc7CiAKQEAgLTE3ODYsNyArMTc4NSw3IEBAIHZvaWQgZHJtX2F0 b21pY19oZWxwZXJfY29tbWl0X3BsYW5lcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJICog Q1JUQyB0byBhdm9pZCBza2lwcGluZyBwbGFuZXMgYmVpbmcgZGlzYWJsZWQgb24gYW4KIAkJCSAq IGFjdGl2ZSBDUlRDLgogCQkJICovCi0JCQlpZiAoIWRpc2FibGluZyAmJiAhcGxhbmVfY3J0Y19h Y3RpdmUocGxhbmUtPnN0YXRlKSkKKwkJCWlmICghZGlzYWJsaW5nICYmICFwbGFuZV9jcnRjX2Fj dGl2ZShuZXdfcGxhbmVfc3RhdGUpKQogCQkJCWNvbnRpbnVlOwogCQkJaWYgKGRpc2FibGluZyAm JiAhcGxhbmVfY3J0Y19hY3RpdmUob2xkX3BsYW5lX3N0YXRlKSkKIAkJCQljb250aW51ZTsKQEAg LTE4MDUsMTIgKzE4MDQsMTIgQEAgdm9pZCBkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfcGxhbmVz KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJY29udGludWU7CiAKIAkJCWZ1bmNzLT5hdG9t aWNfZGlzYWJsZShwbGFuZSwgb2xkX3BsYW5lX3N0YXRlKTsKLQkJfSBlbHNlIGlmIChwbGFuZS0+ c3RhdGUtPmNydGMgfHwgZGlzYWJsaW5nKSB7CisJCX0gZWxzZSBpZiAobmV3X3BsYW5lX3N0YXRl LT5jcnRjIHx8IGRpc2FibGluZykgewogCQkJZnVuY3MtPmF0b21pY191cGRhdGUocGxhbmUsIG9s ZF9wbGFuZV9zdGF0ZSk7CiAJCX0KIAl9CiAKLQlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKG9sZF9z dGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIGkpIHsKKwlmb3JfZWFjaF9vbGRuZXdfY3J0Y19p bl9zdGF0ZShvbGRfc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRlLCBuZXdfY3J0Y19zdGF0ZSwg aSkgewogCQljb25zdCBzdHJ1Y3QgZHJtX2NydGNfaGVscGVyX2Z1bmNzICpmdW5jczsKIAogCQlm dW5jcyA9IGNydGMtPmhlbHBlcl9wcml2YXRlOwpAQCAtMTgxOCw3ICsxODE3LDcgQEAgdm9pZCBk cm1fYXRvbWljX2hlbHBlcl9jb21taXRfcGxhbmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ CWlmICghZnVuY3MgfHwgIWZ1bmNzLT5hdG9taWNfZmx1c2gpCiAJCQljb250aW51ZTsKIAotCQlp ZiAoYWN0aXZlX29ubHkgJiYgIWNydGMtPnN0YXRlLT5hY3RpdmUpCisJCWlmIChhY3RpdmVfb25s eSAmJiAhbmV3X2NydGNfc3RhdGUtPmFjdGl2ZSkKIAkJCWNvbnRpbnVlOwogCiAJCWZ1bmNzLT5h dG9taWNfZmx1c2goY3J0Yywgb2xkX2NydGNfc3RhdGUpOwpAQCAtMTk0NSwxMiArMTk0NCwxOSBA QCB2b2lkIGRybV9hdG9taWNfaGVscGVyX2NsZWFudXBfcGxhbmVzKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCiAJCQkJICAgICAgc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0ZSkKIHsK IAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKLQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFu ZV9zdGF0ZTsKKwlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSwgKm5ld19wbGFu ZV9zdGF0ZTsKIAlpbnQgaTsKIAotCWZvcl9lYWNoX3BsYW5lX2luX3N0YXRlKG9sZF9zdGF0ZSwg cGxhbmUsIHBsYW5lX3N0YXRlLCBpKSB7CisJZm9yX2VhY2hfb2xkbmV3X3BsYW5lX2luX3N0YXRl KG9sZF9zdGF0ZSwgcGxhbmUsIHBsYW5lX3N0YXRlLCBuZXdfcGxhbmVfc3RhdGUsIGkpIHsKIAkJ Y29uc3Qgc3RydWN0IGRybV9wbGFuZV9oZWxwZXJfZnVuY3MgKmZ1bmNzOwogCisJCS8qCisJCSAq IFRoaXMgbWlnaHQgYmUgY2FsbGVkIGJlZm9yZSBzd2FwcGluZyB3aGVuIGNvbW1pdCBpcyBhYm9y dGVkLAorCQkgKiBpbiB3aGljaCBjYXNlIHdlIGhhdmUgdG8gZnJlZSB0aGUgbmV3IHN0YXRlLgor CQkgKi8KKwkJaWYgKHBsYW5lX3N0YXRlID09IHBsYW5lLT5zdGF0ZSkKKwkJCXBsYW5lX3N0YXRl ID0gbmV3X3BsYW5lX3N0YXRlOworCiAJCWlmICghZHJtX2F0b21pY19oZWxwZXJfZnJhbWVidWZm ZXJfY2hhbmdlZChkZXYsIG9sZF9zdGF0ZSwgcGxhbmVfc3RhdGUtPmNydGMpKQogCQkJY29udGlu dWU7CiAKQEAgLTE5OTgsMTUgKzIwMDQsMTUgQEAgdm9pZCBkcm1fYXRvbWljX2hlbHBlcl9zd2Fw X3N0YXRlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAlpbnQgaTsKIAlsb25nIHJl dDsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwotCXN0cnVjdCBkcm1fY29ubmVj dG9yX3N0YXRlICpjb25uX3N0YXRlOworCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpvbGRf Y29ubl9zdGF0ZSwgKm5ld19jb25uX3N0YXRlOwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKLQlz dHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CisJc3RydWN0IGRybV9jcnRjX3N0YXRl ICpvbGRfY3J0Y19zdGF0ZSwgKm5ld19jcnRjX3N0YXRlOwogCXN0cnVjdCBkcm1fcGxhbmUgKnBs YW5lOwotCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOworCXN0cnVjdCBkcm1f cGxhbmVfc3RhdGUgKm9sZF9wbGFuZV9zdGF0ZSwgKm5ld19wbGFuZV9zdGF0ZTsKIAlzdHJ1Y3Qg ZHJtX2NydGNfY29tbWl0ICpjb21taXQ7CiAKIAlpZiAoc3RhbGwpIHsKLQkJZm9yX2VhY2hfY3J0 Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgeworCQlmb3JfZWFjaF9uZXdf Y3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgbmV3X2NydGNfc3RhdGUsIGkpIHsKIAkJCXNwaW5f bG9jaygmY3J0Yy0+Y29tbWl0X2xvY2spOwogCQkJY29tbWl0ID0gbGlzdF9maXJzdF9lbnRyeV9v cl9udWxsKCZjcnRjLT5jb21taXRfbGlzdCwKIAkJCQkJc3RydWN0IGRybV9jcnRjX2NvbW1pdCwg Y29tbWl0X2VudHJ5KTsKQEAgLTIwMjYsMTYgKzIwMzIsMjAgQEAgdm9pZCBkcm1fYXRvbWljX2hl bHBlcl9zd2FwX3N0YXRlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAkJfQogCX0K IAotCWZvcl9lYWNoX2Nvbm5lY3Rvcl9pbl9zdGF0ZShzdGF0ZSwgY29ubmVjdG9yLCBjb25uX3N0 YXRlLCBpKSB7Ci0JCWNvbm5lY3Rvci0+c3RhdGUtPnN0YXRlID0gc3RhdGU7Ci0JCXN3YXAoc3Rh dGUtPmNvbm5lY3RvcnNbaV0uc3RhdGUsIGNvbm5lY3Rvci0+c3RhdGUpOwotCQljb25uZWN0b3It PnN0YXRlLT5zdGF0ZSA9IE5VTEw7CisJZm9yX2VhY2hfb2xkbmV3X2Nvbm5lY3Rvcl9pbl9zdGF0 ZShzdGF0ZSwgY29ubmVjdG9yLCBvbGRfY29ubl9zdGF0ZSwgbmV3X2Nvbm5fc3RhdGUsIGkpIHsK KwkJb2xkX2Nvbm5fc3RhdGUtPnN0YXRlID0gc3RhdGU7CisJCW5ld19jb25uX3N0YXRlLT5zdGF0 ZSA9IE5VTEw7CisKKwkJc3RhdGUtPmNvbm5lY3RvcnNbaV0uc3RhdGUgPSBvbGRfY29ubl9zdGF0 ZTsKKwkJY29ubmVjdG9yLT5zdGF0ZSA9IG5ld19jb25uX3N0YXRlOwogCX0KIAotCWZvcl9lYWNo X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKLQkJY3J0Yy0+c3Rh dGUtPnN0YXRlID0gc3RhdGU7Ci0JCXN3YXAoc3RhdGUtPmNydGNzW2ldLnN0YXRlLCBjcnRjLT5z dGF0ZSk7Ci0JCWNydGMtPnN0YXRlLT5zdGF0ZSA9IE5VTEw7CisJZm9yX2VhY2hfb2xkbmV3X2Ny dGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRlLCBuZXdfY3J0Y19zdGF0ZSwg aSkgeworCQlvbGRfY3J0Y19zdGF0ZS0+c3RhdGUgPSBzdGF0ZTsKKwkJbmV3X2NydGNfc3RhdGUt PnN0YXRlID0gTlVMTDsKKworCQlzdGF0ZS0+Y3J0Y3NbaV0uc3RhdGUgPSBvbGRfY3J0Y19zdGF0 ZTsKKwkJY3J0Yy0+c3RhdGUgPSBuZXdfY3J0Y19zdGF0ZTsKIAogCQlpZiAoc3RhdGUtPmNydGNz W2ldLmNvbW1pdCkgewogCQkJc3Bpbl9sb2NrKCZjcnRjLT5jb21taXRfbG9jayk7CkBAIC0yMDQ3 LDEwICsyMDU3LDEyIEBAIHZvaWQgZHJtX2F0b21pY19oZWxwZXJfc3dhcF9zdGF0ZShzdHJ1Y3Qg ZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJCX0KIAl9CiAKLQlmb3JfZWFjaF9wbGFuZV9pbl9z dGF0ZShzdGF0ZSwgcGxhbmUsIHBsYW5lX3N0YXRlLCBpKSB7Ci0JCXBsYW5lLT5zdGF0ZS0+c3Rh dGUgPSBzdGF0ZTsKLQkJc3dhcChzdGF0ZS0+cGxhbmVzW2ldLnN0YXRlLCBwbGFuZS0+c3RhdGUp OwotCQlwbGFuZS0+c3RhdGUtPnN0YXRlID0gTlVMTDsKKwlmb3JfZWFjaF9vbGRuZXdfcGxhbmVf aW5fc3RhdGUoc3RhdGUsIHBsYW5lLCBvbGRfcGxhbmVfc3RhdGUsIG5ld19wbGFuZV9zdGF0ZSwg aSkgeworCQlvbGRfcGxhbmVfc3RhdGUtPnN0YXRlID0gc3RhdGU7CisJCW5ld19wbGFuZV9zdGF0 ZS0+c3RhdGUgPSBOVUxMOworCisJCXN0YXRlLT5wbGFuZXNbaV0uc3RhdGUgPSBvbGRfcGxhbmVf c3RhdGU7CisJCXBsYW5lLT5zdGF0ZSA9IG5ld19wbGFuZV9zdGF0ZTsKIAl9CiB9CiBFWFBPUlRf U1lNQk9MKGRybV9hdG9taWNfaGVscGVyX3N3YXBfc3RhdGUpOwpAQCAtMjI0OCw3ICsyMjYwLDcg QEAgc3RhdGljIGludCB1cGRhdGVfb3V0cHV0X3N0YXRlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRl ICpzdGF0ZSwKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JZm9yX2VhY2hfY29ubmVjdG9y X2luX3N0YXRlKHN0YXRlLCBjb25uZWN0b3IsIGNvbm5fc3RhdGUsIGkpIHsKKwlmb3JfZWFjaF9u ZXdfY29ubmVjdG9yX2luX3N0YXRlKHN0YXRlLCBjb25uZWN0b3IsIGNvbm5fc3RhdGUsIGkpIHsK IAkJaWYgKGNvbm5fc3RhdGUtPmNydGMgPT0gc2V0LT5jcnRjKSB7CiAJCQlyZXQgPSBkcm1fYXRv bWljX3NldF9jcnRjX2Zvcl9jb25uZWN0b3IoY29ubl9zdGF0ZSwKIAkJCQkJCQkJTlVMTCk7CkBA IC0yMjcwLDcgKzIyODIsNyBAQCBzdGF0aWMgaW50IHVwZGF0ZV9vdXRwdXRfc3RhdGUoc3RydWN0 IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQkJcmV0dXJuIHJldDsKIAl9CiAKLQlmb3JfZWFj aF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7CisJZm9yX2VhY2hf bmV3X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKIAkJLyogRG9u J3QgdXBkYXRlIC0+ZW5hYmxlIGZvciB0aGUgQ1JUQyBpbiB0aGUgc2V0X2NvbmZpZyByZXF1ZXN0 LAogCQkgKiBzaW5jZSBhIG1pc21hdGNoIHdvdWxkIGluZGljYXRlIGEgYnVnIGluIHRoZSB1cHBl ciBsYXllcnMuCiAJCSAqIFRoZSBhY3R1YWwgbW9kZXNldCBjb2RlIGxhdGVyIG9uIHdpbGwgY2F0 Y2ggYW55Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==