From: Dave Gordon Subject: [PATCH 2/2] drm/i915: convert uses of for_each_ring() to for_each_engine() Date: Tue, 29 Dec 2015 18:59:58 +0000 Message-ID: <1451415598-24056-2-git-send-email-david.s.gordon@intel.com> References: <1451415598-24056-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 6E8C36E03B for ; Tue, 29 Dec 2015 11:00:09 -0800 (PST) In-Reply-To: <1451415598-24056-1-git-send-email-david.s.gordon@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 Cc: Jani Nikula List-Id: intel-gfx@lists.freedesktop.org UmVwbGFjZSB0aGUgZm9yX2VhY2hfcmluZygpIG1hY3JvIHdpdGggZm9yX2VhY2hfZW5naW5lKCkg d2hlcmV2ZXIKdGhlIHRoaXJkIChpbmRleCkgYXJndW1lbnQgaXMgKG9yIGNhbiBiZSBtYWRlKSB1 bnVzZWQuIFRoaXMgb2Z0ZW4KYWxsb3dzIHVzIHRvIGRlbGV0ZSB0aGUgYXNzb2NpYXRlZCBsb2Nh bCB2YXJpYWJsZSBhcyB3ZWxsLgoKQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbEBmZndsbC5jaD4K Q2M6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24g PGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRh dmlkLnMuZ29yZG9uQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rl YnVnZnMuYyAgICAgfCAzNyArKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICB8IDQ1ICsrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIHwgIDYg KystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2RlYnVnLmMgICB8ICAzICstLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgICAgIHwgIDkgKysrLS0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyAgICAgICAgIHwgMTQgKysrKy0tLS0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIHwgIDggKysrLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgfCAgMyArLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMgICAgICAgICB8IDE5ICsrKysrLS0tLS0tLS0tCiA5IGZpbGVzIGNo YW5nZWQsIDYwIGluc2VydGlvbnMoKyksIDg0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kZWJ1Z2ZzLmMKaW5kZXggMGZjMzhiYi4uZGQ2MDdjMyAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kZWJ1Z2ZzLmMKQEAgLTQwMCwxMSArNDAwLDExIEBAIHN0YXRpYyB2b2lkIHByaW50X2Jh dGNoX3Bvb2xfc3RhdHMoc3RydWN0IHNlcV9maWxlICptLAogCXN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmo7CiAJc3RydWN0IGZpbGVfc3RhdHMgc3RhdHM7CiAJc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqcmluZzsKLQlpbnQgaSwgajsKKwlpbnQgajsKIAogCW1lbXNldCgmc3RhdHMsIDAs IHNpemVvZihzdGF0cykpOwogCi0JZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkgewor CWZvcl9lYWNoX2VuZ2luZShyaW5nLCBkZXZfcHJpdikgewogCQlmb3IgKGogPSAwOyBqIDwgQVJS QVlfU0laRShyaW5nLT5iYXRjaF9wb29sLmNhY2hlX2xpc3QpOyBqKyspIHsKIAkJCWxpc3RfZm9y X2VhY2hfZW50cnkob2JqLAogCQkJCQkgICAgJnJpbmctPmJhdGNoX3Bvb2wuY2FjaGVfbGlzdFtq XSwKQEAgLTY0MSwxMyArNjQxLDEzIEBAIHN0YXRpYyBpbnQgaTkxNV9nZW1fYmF0Y2hfcG9vbF9p bmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqb2JqOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7CiAJaW50IHRvdGFs ID0gMDsKLQlpbnQgcmV0LCBpLCBqOworCWludCByZXQsIGo7CiAKIAlyZXQgPSBtdXRleF9sb2Nr X2ludGVycnVwdGlibGUoJmRldi0+c3RydWN0X211dGV4KTsKIAlpZiAocmV0KQogCQlyZXR1cm4g cmV0OwogCi0JZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkgeworCWZvcl9lYWNoX2Vu Z2luZShyaW5nLCBkZXZfcHJpdikgewogCQlmb3IgKGogPSAwOyBqIDwgQVJSQVlfU0laRShyaW5n LT5iYXRjaF9wb29sLmNhY2hlX2xpc3QpOyBqKyspIHsKIAkJCWludCBjb3VudDsKIApAQCAtNjg1 LDE0ICs2ODUsMTQgQEAgc3RhdGljIGludCBpOTE1X2dlbV9yZXF1ZXN0X2luZm8oc3RydWN0IHNl cV9maWxlICptLCB2b2lkICpkYXRhKQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZzsKIAlz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKLQlpbnQgcmV0LCBhbnksIGk7CisJaW50 IHJldCwgYW55OwogCiAJcmV0ID0gbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKCZkZXYtPnN0cnVj dF9tdXRleCk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAogCWFueSA9IDA7Ci0JZm9yX2Vh Y2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkgeworCWZvcl9lYWNoX2VuZ2luZShyaW5nLCBkZXZf cHJpdikgewogCQlpbnQgY291bnQ7CiAKIAkJY291bnQgPSAwOwpAQCAtNzQyLDE0ICs3NDIsMTQg QEAgc3RhdGljIGludCBpOTE1X2dlbV9zZXFub19pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9p ZCAqZGF0YSkKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gbm9kZS0+bWlub3ItPmRldjsKIAlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7Ci0JaW50IHJldCwgaTsKKwlpbnQgcmV0OwogCiAJ cmV0ID0gbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJaWYg KHJldCkKIAkJcmV0dXJuIHJldDsKIAlpbnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7CiAK LQlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKQorCWZvcl9lYWNoX2VuZ2luZShyaW5n LCBkZXZfcHJpdikKIAkJaTkxNV9yaW5nX3NlcW5vX2luZm8obSwgcmluZyk7CiAKIAlpbnRlbF9y dW50aW1lX3BtX3B1dChkZXZfcHJpdik7CkBAIC05MzEsNyArOTMxLDcgQEAgc3RhdGljIGludCBp OTE1X2ludGVycnVwdF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAkJc2Vx X3ByaW50ZihtLCAiR3JhcGhpY3MgSW50ZXJydXB0IG1hc2s6CQklMDh4XG4iLAogCQkJICAgSTkx NV9SRUFEKEdUSU1SKSk7CiAJfQotCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsK Kwlmb3JfZWFjaF9lbmdpbmUocmluZywgZGV2X3ByaXYpIHsKIAkJaWYgKElOVEVMX0lORk8oZGV2 KS0+Z2VuID49IDYpIHsKIAkJCXNlcV9wcmludGYobSwKIAkJCQkgICAiR3JhcGhpY3MgSW50ZXJy dXB0IG1hc2sgKCVzKToJJTA4eFxuIiwKQEAgLTE5NDIsNyArMTk0Miw3IEBAIHN0YXRpYyBpbnQg aTkxNV9jb250ZXh0X3N0YXR1cyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNlZCkKIAog CQlzZXFfcHV0cyhtLCAiSFcgY29udGV4dCAiKTsKIAkJZGVzY3JpYmVfY3R4KG0sIGN0eCk7Ci0J CWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKKwkJZm9yX2VhY2hfZW5naW5lKHJp bmcsIGRldl9wcml2KSB7CiAJCQlpZiAocmluZy0+ZGVmYXVsdF9jb250ZXh0ID09IGN0eCkKIAkJ CQlzZXFfcHJpbnRmKG0sICIoZGVmYXVsdCBjb250ZXh0ICVzKSAiLAogCQkJCQkgICByaW5nLT5u YW1lKTsKQEAgLTIyMzcsMTIgKzIyMzcsMTIgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9pbmZv KHN0cnVjdCBzZXFfZmlsZSAqbSwgc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnJpbmc7CiAJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0gZGV2X3By aXYtPm1tLmFsaWFzaW5nX3BwZ3R0OwotCWludCB1bnVzZWQsIGk7CisJaW50IGk7CiAKIAlpZiAo IXBwZ3R0KQogCQlyZXR1cm47CiAKLQlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCB1bnVz ZWQpIHsKKwlmb3JfZWFjaF9lbmdpbmUocmluZywgZGV2X3ByaXYpIHsKIAkJc2VxX3ByaW50Ziht LCAiJXNcbiIsIHJpbmctPm5hbWUpOwogCQlmb3IgKGkgPSAwOyBpIDwgNDsgaSsrKSB7CiAJCQl1 NjQgcGRwID0gSTkxNV9SRUFEKEdFTjhfUklOR19QRFBfVURXKHJpbmcsIGkpKTsKQEAgLTIyNTcs MTIgKzIyNTcsMTEgQEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9pbmZvKHN0cnVjdCBzZXFfZmls ZSAqbSwgc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmc7Ci0JaW50IGk7CiAKIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPT0gNikKIAkJc2Vx X3ByaW50ZihtLCAiR0ZYX01PREU6IDB4JTA4eFxuIiwgSTkxNV9SRUFEKEdGWF9NT0RFKSk7CiAK LQlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKSB7CisJZm9yX2VhY2hfZW5naW5lKHJp bmcsIGRldl9wcml2KSB7CiAJCXNlcV9wcmludGYobSwgIiVzXG4iLCByaW5nLT5uYW1lKTsKIAkJ aWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID09IDcpCiAJCQlzZXFfcHJpbnRmKG0sICJHRlhfTU9E RTogMHglMDh4XG4iLCBJOTE1X1JFQUQoUklOR19NT0RFX0dFTjcocmluZykpKTsKQEAgLTIzMjUs OSArMjMyNCw4IEBAIHN0YXRpYyBpbnQgY291bnRfaXJxX3dhaXRlcnMoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmk5MTUpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZzsKIAlpbnQg Y291bnQgPSAwOwotCWludCBpOwogCi0JZm9yX2VhY2hfcmluZyhyaW5nLCBpOTE1LCBpKQorCWZv cl9lYWNoX2VuZ2luZShyaW5nLCBpOTE1KQogCQljb3VudCArPSByaW5nLT5pcnFfcmVmY291bnQ7 CiAKIAlyZXR1cm4gY291bnQ7CkBAIC0zMTU5LDcgKzMxNTcsNyBAQCBzdGF0aWMgaW50IGk5MTVf c2VtYXBob3JlX3N0YXR1cyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNlZCkKIAkJa3Vu bWFwX2F0b21pYyhzZXFubyk7CiAJfSBlbHNlIHsKIAkJc2VxX3B1dHMobSwgIiAgTGFzdCBzaWdu YWw6Iik7Ci0JCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpCisJCWZvcl9lYWNoX2Vu Z2luZShyaW5nLCBkZXZfcHJpdikKIAkJCWZvciAoaiA9IDA7IGogPCBudW1fcmluZ3M7IGorKykK IAkJCQlzZXFfcHJpbnRmKG0sICIweCUwOHhcbiIsCiAJCQkJCSAgIEk5MTVfUkVBRChyaW5nLT5z ZW1hcGhvcmUubWJveC5zaWduYWxbal0pKTsKQEAgLTMxNjcsMTAgKzMxNjUsOSBAQCBzdGF0aWMg aW50IGk5MTVfc2VtYXBob3JlX3N0YXR1cyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNl ZCkKIAl9CiAKIAlzZXFfcHV0cyhtLCAiXG5TeW5jIHNlcW5vOlxuIik7Ci0JZm9yX2VhY2hfcmlu ZyhyaW5nLCBkZXZfcHJpdiwgaSkgewotCQlmb3IgKGogPSAwOyBqIDwgbnVtX3JpbmdzOyBqKysp IHsKKwlmb3JfZWFjaF9lbmdpbmUocmluZywgZGV2X3ByaXYpIHsKKwkJZm9yIChqID0gMDsgaiA8 IG51bV9yaW5nczsgaisrKQogCQkJc2VxX3ByaW50ZihtLCAiICAweCUwOHggIiwgcmluZy0+c2Vt YXBob3JlLnN5bmNfc2Vxbm9bal0pOwotCQl9CiAJCXNlcV9wdXRjKG0sICdcbicpOwogCX0KIAlz ZXFfcHV0YyhtLCAnXG4nKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDZjNjBlMDQuLjE3 NjZmOWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjQ2NiwxMCArMjQ2NiwxMCBAQCBp OTE1X2dlbV9pbml0X3NlcW5vKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHUzMiBzZXFubykKIHsK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwog CXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7Ci0JaW50IHJldCwgaSwgajsKKwlpbnQgcmV0 LCBqOwogCiAJLyogQ2FyZWZ1bGx5IHJldGlyZSBhbGwgcmVxdWVzdHMgd2l0aG91dCB3cml0aW5n IHRvIHRoZSByaW5ncyAqLwotCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKKwlm b3JfZWFjaF9lbmdpbmUocmluZywgZGV2X3ByaXYpIHsKIAkJcmV0ID0gaW50ZWxfcmluZ19pZGxl KHJpbmcpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKQEAgLTI0NzcsNyArMjQ3Nyw3IEBA IGk5MTVfZ2VtX2luaXRfc2Vxbm8oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdTMyIHNlcW5vKQog CWk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0cyhkZXYpOwogCiAJLyogRmluYWxseSByZXNldCBodyBz dGF0ZSAqLwotCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKKwlmb3JfZWFjaF9l bmdpbmUocmluZywgZGV2X3ByaXYpIHsKIAkJaW50ZWxfcmluZ19pbml0X3NlcW5vKHJpbmcsIHNl cW5vKTsKIAogCQlmb3IgKGogPSAwOyBqIDwgQVJSQVlfU0laRShyaW5nLT5zZW1hcGhvcmUuc3lu Y19zZXFubyk7IGorKykKQEAgLTI4NjAsMTcgKzI4NjAsMTYgQEAgdm9pZCBpOTE1X2dlbV9yZXNl dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu ZzsKLQlpbnQgaTsKIAogCS8qCiAJICogQmVmb3JlIHdlIGZyZWUgdGhlIG9iamVjdHMgZnJvbSB0 aGUgcmVxdWVzdHMsIHdlIG5lZWQgdG8gaW5zcGVjdAogCSAqIHRoZW0gZm9yIGZpbmRpbmcgdGhl IGd1aWx0eSBwYXJ0eS4gQXMgdGhlIHJlcXVlc3RzIG9ubHkgYm9ycm93CiAJICogdGhlaXIgcmVm ZXJlbmNlIHRvIHRoZSBvYmplY3RzLCB0aGUgaW5zcGVjdGlvbiBtdXN0IGJlIGRvbmUgZmlyc3Qu CiAJICovCi0JZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkKKwlmb3JfZWFjaF9lbmdp bmUocmluZywgZGV2X3ByaXYpCiAJCWk5MTVfZ2VtX3Jlc2V0X3Jpbmdfc3RhdHVzKGRldl9wcml2 LCByaW5nKTsKIAotCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpCisJZm9yX2VhY2hf ZW5naW5lKHJpbmcsIGRldl9wcml2KQogCQlpOTE1X2dlbV9yZXNldF9yaW5nX2NsZWFudXAoZGV2 X3ByaXYsIHJpbmcpOwogCiAJaTkxNV9nZW1fY29udGV4dF9yZXNldChkZXYpOwpAQCAtMjkzOCw5 ICsyOTM3LDggQEAgaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0 ZTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOwogCWJvb2wgaWRsZSA9IHRydWU7Ci0J aW50IGk7CiAKLQlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKSB7CisJZm9yX2VhY2hf ZW5naW5lKHJpbmcsIGRldl9wcml2KSB7CiAJCWk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0c19yaW5n KHJpbmcpOwogCQlpZGxlICY9IGxpc3RfZW1wdHkoJnJpbmctPnJlcXVlc3RfbGlzdCk7CiAJCWlm IChpOTE1LmVuYWJsZV9leGVjbGlzdHMpIHsKQEAgLTI5ODgsOSArMjk4Niw4IEBAIGk5MTVfZ2Vt X2lkbGVfd29ya19oYW5kbGVyKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAkJY29udGFpbmVy X29mKHdvcmssIHR5cGVvZigqZGV2X3ByaXYpLCBtbS5pZGxlX3dvcmsud29yayk7CiAJc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9IGRldl9wcml2LT5kZXY7CiAJc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZzsKLQlpbnQgaTsKIAotCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpCisJ Zm9yX2VhY2hfZW5naW5lKHJpbmcsIGRldl9wcml2KQogCQlpZiAoIWxpc3RfZW1wdHkoJnJpbmct PnJlcXVlc3RfbGlzdCkpCiAJCQlyZXR1cm47CiAKQEAgLTMwMDEsMTIgKzI5OTgsOCBAQCBpOTE1 X2dlbV9pZGxlX3dvcmtfaGFuZGxlcihzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJaW50ZWxf bWFya19pZGxlKGRldik7CiAKIAlpZiAobXV0ZXhfdHJ5bG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgp KSB7Ci0JCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7Ci0JCWludCBpOwotCi0JCWZvcl9l YWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpCisJCWZvcl9lYWNoX2VuZ2luZShyaW5nLCBkZXZf cHJpdikKIAkJCWk5MTVfZ2VtX2JhdGNoX3Bvb2xfZmluaSgmcmluZy0+YmF0Y2hfcG9vbCk7Ci0K IAkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJfQogfQpAQCAtMzM2NSwxMCAr MzM1OCwxMCBAQCBpbnQgaTkxNV9ncHVfaWRsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJ c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZzsKLQlpbnQgcmV0LCBpOworCWludCByZXQ7CiAK IAkvKiBGbHVzaCBldmVyeXRoaW5nIG9udG8gdGhlIGluYWN0aXZlIGxpc3QuICovCi0JZm9yX2Vh Y2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkgeworCWZvcl9lYWNoX2VuZ2luZShyaW5nLCBkZXZf cHJpdikgewogCQlpZiAoIWk5MTUuZW5hYmxlX2V4ZWNsaXN0cykgewogCQkJc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXE7CiAKQEAgLTQ2MjIsOSArNDYxNSw4IEBAIGk5MTVfZ2VtX3N0 b3BfcmluZ2J1ZmZlcnMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmc7Ci0JaW50IGk7CiAKLQlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2 LCBpKQorCWZvcl9lYWNoX2VuZ2luZShyaW5nLCBkZXZfcHJpdikKIAkJZGV2X3ByaXYtPmd0LnN0 b3BfcmluZyhyaW5nKTsKIH0KIApAQCAtNDc5NSw3ICs0Nzg3LDcgQEAgaTkxNV9nZW1faW5pdF9o dyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu ZzsKLQlpbnQgcmV0LCBpLCBqOworCWludCByZXQsIGo7CiAKIAlpZiAoSU5URUxfSU5GTyhkZXYp LT5nZW4gPCA2ICYmICFpbnRlbF9lbmFibGVfZ3R0KCkpCiAJCXJldHVybiAtRUlPOwpAQCAtNDg0 MSw3ICs0ODMzLDcgQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CX0KIAogCS8qIE5lZWQgdG8gZG8gYmFzaWMgaW5pdGlhbGlzYXRpb24gb2YgYWxsIHJpbmdzIGZp cnN0OiAqLwotCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKKwlmb3JfZWFjaF9l bmdpbmUocmluZywgZGV2X3ByaXYpIHsKIAkJcmV0ID0gcmluZy0+aW5pdF9odyhyaW5nKTsKIAkJ aWYgKHJldCkKIAkJCWdvdG8gb3V0OwpAQCAtNDg2Niw3ICs0ODU4LDcgQEAgaTkxNV9nZW1faW5p dF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlnb3RvIG91dDsKIAogCS8qIE5vdyBpdCBp cyBzYWZlIHRvIGdvIGJhY2sgcm91bmQgYW5kIGRvIGV2ZXJ5dGhpbmcgZWxzZTogKi8KLQlmb3Jf ZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKSB7CisJZm9yX2VhY2hfZW5naW5lKHJpbmcsIGRl dl9wcml2KSB7CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxOwogCiAJCVdBUk5f T04oIXJpbmctPmRlZmF1bHRfY29udGV4dCk7CkBAIC00ODg0LDcgKzQ4NzYsOCBAQCBpOTE1X2dl bV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAkJcmV0ID0gaTkxNV9wcGd0dF9p bml0X3JpbmcocmVxKTsKIAkJaWYgKHJldCAmJiByZXQgIT0gLUVJTykgewotCQkJRFJNX0VSUk9S KCJQUEdUVCBlbmFibGUgcmluZyAjJWQgZmFpbGVkICVkXG4iLCBpLCByZXQpOworCQkJRFJNX0VS Uk9SKCJQUEdUVCBlbmFibGUgJXMgZmFpbGVkICVkXG4iLAorCQkJCSAgcmluZy0+bmFtZSwgcmV0 KTsKIAkJCWk5MTVfZ2VtX3JlcXVlc3RfY2FuY2VsKHJlcSk7CiAJCQlpOTE1X2dlbV9jbGVhbnVw X3JpbmdidWZmZXIoZGV2KTsKIAkJCWdvdG8gb3V0OwpAQCAtNDg5Miw3ICs0ODg1LDggQEAgaTkx NV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJCXJldCA9IGk5MTVfZ2Vt X2NvbnRleHRfZW5hYmxlKHJlcSk7CiAJCWlmIChyZXQgJiYgcmV0ICE9IC1FSU8pIHsKLQkJCURS TV9FUlJPUigiQ29udGV4dCBlbmFibGUgcmluZyAjJWQgZmFpbGVkICVkXG4iLCBpLCByZXQpOwor CQkJRFJNX0VSUk9SKCJDb250ZXh0IGVuYWJsZSAlcyBmYWlsZWQgJWRcbiIsCisJCQkJICByaW5n LT5uYW1lLCByZXQpOwogCQkJaTkxNV9nZW1fcmVxdWVzdF9jYW5jZWwocmVxKTsKIAkJCWk5MTVf Z2VtX2NsZWFudXBfcmluZ2J1ZmZlcihkZXYpOwogCQkJZ290byBvdXQ7CkBAIC00OTczLDkgKzQ5 NjcsOCBAQCBpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2 YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7Ci0JaW50IGk7CiAKLQlmb3JfZWFj aF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKQorCWZvcl9lYWNoX2VuZ2luZShyaW5nLCBkZXZfcHJp dikKIAkJZGV2X3ByaXYtPmd0LmNsZWFudXBfcmluZyhyaW5nKTsKIAogICAgIGlmIChpOTE1LmVu YWJsZV9leGVjbGlzdHMpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5k ZXggOTAwZmZkMC4uZmY2NmE5NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRl eHQuYwpAQCAtNTIyLDcgKzUyMiw3IEBAIG1pX3NldF9jb250ZXh0KHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxLCB1MzIgaHdfZmxhZ3MpCiAJCWk5MTVfc2VtYXBob3JlX2lzX2VuYWJs ZWQocmluZy0+ZGV2KSA/CiAJCWh3ZWlnaHQzMihJTlRFTF9JTkZPKHJpbmctPmRldiktPnJpbmdf bWFzaykgLSAxIDoKIAkJMDsKLQlpbnQgbGVuLCBpLCByZXQ7CisJaW50IGxlbiwgcmV0OwogCiAJ Lyogdy9hOiBJZiBGbHVzaCBUTEIgSW52YWxpZGF0aW9uIE1vZGUgaXMgZW5hYmxlZCwgZHJpdmVy IG11c3QgZG8gYSBUTEIKIAkgKiBpbnZhbGlkYXRpb24gcHJpb3IgdG8gTUlfU0VUX0NPTlRFWFQu IE9uIEdFTjYgd2UgZG9uJ3Qgc2V0IHRoZSB2YWx1ZQpAQCAtNTU3LDcgKzU1Nyw3IEBAIG1pX3Nl dF9jb250ZXh0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLCB1MzIgaHdfZmxhZ3Mp CiAJCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpzaWduYWxsZXI7CiAKIAkJCWludGVsX3Jpbmdf ZW1pdChyaW5nLCBNSV9MT0FEX1JFR0lTVEVSX0lNTShudW1fcmluZ3MpKTsKLQkJCWZvcl9lYWNo X3Jpbmcoc2lnbmFsbGVyLCB0b19pOTE1KHJpbmctPmRldiksIGkpIHsKKwkJCWZvcl9lYWNoX2Vu Z2luZShzaWduYWxsZXIsIHRvX2k5MTUocmluZy0+ZGV2KSkgewogCQkJCWlmIChzaWduYWxsZXIg PT0gcmluZykKIAkJCQkJY29udGludWU7CiAKQEAgLTU4Miw3ICs1ODIsNyBAQCBtaV9zZXRfY29u dGV4dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwgdTMyIGh3X2ZsYWdzKQogCQkJ c3RydWN0IGludGVsX2VuZ2luZV9jcyAqc2lnbmFsbGVyOwogCiAJCQlpbnRlbF9yaW5nX2VtaXQo cmluZywgTUlfTE9BRF9SRUdJU1RFUl9JTU0obnVtX3JpbmdzKSk7Ci0JCQlmb3JfZWFjaF9yaW5n KHNpZ25hbGxlciwgdG9faTkxNShyaW5nLT5kZXYpLCBpKSB7CisJCQlmb3JfZWFjaF9lbmdpbmUo c2lnbmFsbGVyLCB0b19pOTE1KHJpbmctPmRldikpIHsKIAkJCQlpZiAoc2lnbmFsbGVyID09IHJp bmcpCiAJCQkJCWNvbnRpbnVlOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9kZWJ1Zy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZGVidWcuYwpp bmRleCAxNzI5OWQwLi4xMmJhY2U5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9kZWJ1Zy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2RlYnVn LmMKQEAgLTM4LDEyICszOCwxMSBAQCBpOTE1X3ZlcmlmeV9saXN0cyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJc3RydWN0IGludGVs X2VuZ2luZV9jcyAqcmluZzsKIAlpbnQgZXJyID0gMDsKLQlpbnQgaTsKIAogCWlmICh3YXJuZWQp CiAJCXJldHVybiAwOwogCi0JZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkgeworCWZv cl9lYWNoX2VuZ2luZShyaW5nLCBkZXZfcHJpdikgewogCQlsaXN0X2Zvcl9lYWNoX2VudHJ5KG9i aiwgJnJpbmctPmFjdGl2ZV9saXN0LCByaW5nX2xpc3RbcmluZy0+aWRdKSB7CiAJCQlpZiAob2Jq LT5iYXNlLmRldiAhPSBkZXYgfHwKIAkJCSAgICAhYXRvbWljX3JlYWQoJm9iai0+YmFzZS5yZWZj b3VudC5yZWZjb3VudCkpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggNTZm NGYyZS4uMGIwYmVhZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTE3MzUs OSArMTczNSw4IEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfZW5hYmxlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5k ZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOwotCWludCBqOwogCi0J Zm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaikgeworCWZvcl9lYWNoX2VuZ2luZShyaW5n LCBkZXZfcHJpdikgewogCQl1MzIgZm91cl9sZXZlbCA9IFVTRVNfRlVMTF80OEJJVF9QUEdUVChk ZXYpID8gR0VOOF9HRlhfUFBHVFRfNDhCIDogMDsKIAkJSTkxNV9XUklURShSSU5HX01PREVfR0VO NyhyaW5nKSwKIAkJCSAgIF9NQVNLRURfQklUX0VOQUJMRShHRlhfUFBHVFRfRU5BQkxFIHwgZm91 cl9sZXZlbCkpOwpAQCAtMTc0OSw3ICsxNzQ4LDYgQEAgc3RhdGljIHZvaWQgZ2VuN19wcGd0dF9l bmFibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp bmc7CiAJdWludDMyX3QgZWNvY2hrLCBlY29iaXRzOwotCWludCBpOwogCiAJZWNvYml0cyA9IEk5 MTVfUkVBRChHQUNfRUNPX0JJVFMpOwogCUk5MTVfV1JJVEUoR0FDX0VDT19CSVRTLCBlY29iaXRz IHwgRUNPQklUU19QUEdUVF9DQUNIRTY0Qik7CkBAIC0xNzYzLDcgKzE3NjEsNyBAQCBzdGF0aWMg dm9pZCBnZW43X3BwZ3R0X2VuYWJsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCX0KIAlJOTE1 X1dSSVRFKEdBTV9FQ09DSEssIGVjb2Noayk7CiAKLQlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9w cml2LCBpKSB7CisJZm9yX2VhY2hfZW5naW5lKHJpbmcsIGRldl9wcml2KSB7CiAJCS8qIEdGWF9N T0RFIGlzIHBlci1yaW5nIG9uIGdlbjcrICovCiAJCUk5MTVfV1JJVEUoUklOR19NT0RFX0dFTjco cmluZyksCiAJCQkgICBfTUFTS0VEX0JJVF9FTkFCTEUoR0ZYX1BQR1RUX0VOQUJMRSkpOwpAQCAt MjI2NCwxMiArMjI2MiwxMSBAQCB2b2lkIGk5MTVfY2hlY2tfYW5kX2NsZWFyX2ZhdWx0cyhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZzsKLQlp bnQgaTsKIAogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDYpCiAJCXJldHVybjsKIAotCWZv cl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKKwlmb3JfZWFjaF9lbmdpbmUocmluZywg ZGV2X3ByaXYpIHsKIAkJdTMyIGZhdWx0X3JlZzsKIAkJZmF1bHRfcmVnID0gSTkxNV9SRUFEKFJJ TkdfRkFVTFRfUkVHKHJpbmcpKTsKIAkJaWYgKGZhdWx0X3JlZyAmIFJJTkdfRkFVTFRfVkFMSUQp IHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCmluZGV4IDNmOGM3NTMuLjYyMmU5YTQgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9pcnEuYwpAQCAtMTA4MCw5ICsxMDgwLDggQEAgc3RhdGljIHUzMiB2bHZfd2Ff YzBfZWkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1MzIgcG1faWlyKQogc3Rh dGljIGJvb2wgYW55X3dhaXRlcnMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog ewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7Ci0JaW50IGk7CiAKLQlmb3JfZWFjaF9y aW5nKHJpbmcsIGRldl9wcml2LCBpKQorCWZvcl9lYWNoX2VuZ2luZShyaW5nLCBkZXZfcHJpdikK IAkJaWYgKHJpbmctPmlycV9yZWZjb3VudCkKIAkJCXJldHVybiB0cnVlOwogCkBAIC0yNDMyLDcg KzI0MzEsNiBAQCBzdGF0aWMgdm9pZCBpOTE1X2Vycm9yX3dha2VfdXAoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgICAgIGJvb2wgcmVzZXRfY29tcGxldGVkKQogewog CXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7Ci0JaW50IGk7CiAKIAkvKgogCSAqIE5vdGlm eSBhbGwgd2FpdGVycyBmb3IgR1BVIGNvbXBsZXRpb24gZXZlbnRzIHRoYXQgcmVzZXQgc3RhdGUg aGFzCkBAIC0yNDQyLDcgKzI0NDAsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2Vycm9yX3dha2VfdXAo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCSAqLwogCiAJLyogV2FrZSB1cCBf X3dhaXRfc2Vxbm8sIHBvdGVudGlhbGx5IGhvbGRpbmcgZGV2LT5zdHJ1Y3RfbXV0ZXguICovCi0J Zm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkKKwlmb3JfZWFjaF9lbmdpbmUocmluZywg ZGV2X3ByaXYpCiAJCXdha2VfdXBfYWxsKCZyaW5nLT5pcnFfcXVldWUpOwogCiAJLyogV2FrZSB1 cCBpbnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMsIGhvbGRpbmcgY3J0Yy0+bXV0ZXgu ICovCkBAIC0yODEwLDEwICsyODA4LDkgQEAgc2VtYXBob3JlX3dhaXRfdG9fc2lnbmFsbGVyX3Jp bmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgdTMyIGlwZWhyLCB1NjQgb2YKIHsKIAlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRl OwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnNpZ25hbGxlcjsKLQlpbnQgaTsKIAogCWlmIChJ TlRFTF9JTkZPKGRldl9wcml2LT5kZXYpLT5nZW4gPj0gOCkgewotCQlmb3JfZWFjaF9yaW5nKHNp Z25hbGxlciwgZGV2X3ByaXYsIGkpIHsKKwkJZm9yX2VhY2hfZW5naW5lKHNpZ25hbGxlciwgZGV2 X3ByaXYpIHsKIAkJCWlmIChyaW5nID09IHNpZ25hbGxlcikKIAkJCQljb250aW51ZTsKIApAQCAt MjgyMyw3ICsyODIwLDcgQEAgc2VtYXBob3JlX3dhaXRfdG9fc2lnbmFsbGVyX3Jpbmcoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZywgdTMyIGlwZWhyLCB1NjQgb2YKIAl9IGVsc2UgewogCQl1 MzIgc3luY19iaXRzID0gaXBlaHIgJiBNSV9TRU1BUEhPUkVfU1lOQ19NQVNLOwogCi0JCWZvcl9l YWNoX3Jpbmcoc2lnbmFsbGVyLCBkZXZfcHJpdiwgaSkgeworCQlmb3JfZWFjaF9lbmdpbmUoc2ln bmFsbGVyLCBkZXZfcHJpdikgewogCQkJaWYocmluZyA9PSBzaWduYWxsZXIpCiAJCQkJY29udGlu dWU7CiAKQEAgLTI5MzksOSArMjkzNiw4IEBAIHN0YXRpYyBpbnQgc2VtYXBob3JlX3Bhc3NlZChz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogc3RhdGljIHZvaWQgc2VtYXBob3JlX2NsZWFy X2RlYWRsb2NrcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZzsKLQlpbnQgaTsKIAotCWZvcl9lYWNoX3JpbmcocmluZywg ZGV2X3ByaXYsIGkpCisJZm9yX2VhY2hfZW5naW5lKHJpbmcsIGRldl9wcml2KQogCQlyaW5nLT5o YW5nY2hlY2suZGVhZGxvY2sgPSAwOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNf bG9hZGVyLmMKaW5kZXggNTUwOTIxZi4uMmIzNDA3NGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9ndWNfbG9hZGVyLmMKQEAgLTgyLDEyICs4MiwxMiBAQCBjb25zdCBjaGFyICppbnRlbF9n dWNfZndfc3RhdHVzX3JlcHIoZW51bSBpbnRlbF9ndWNfZndfc3RhdHVzIHN0YXR1cykKIHN0YXRp YyB2b2lkIGRpcmVjdF9pbnRlcnJ1cHRzX3RvX2hvc3Qoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7Ci0JaW50IGksIGly cXM7CisJaW50IGlycXM7CiAKIAkvKiB0ZWxsIGFsbCBjb21tYW5kIHN0cmVhbWVycyBOT1QgdG8g Zm9yd2FyZCBpbnRlcnJ1cHRzIGFuZCB2YmxhbmsgdG8gR3VDICovCiAJaXJxcyA9IF9NQVNLRURf RklFTEQoR0ZYX0ZPUldBUkRfVkJMQU5LX01BU0ssIEdGWF9GT1JXQVJEX1ZCTEFOS19ORVZFUik7 CiAJaXJxcyB8PSBfTUFTS0VEX0JJVF9ESVNBQkxFKEdGWF9JTlRFUlJVUFRfU1RFRVJJTkcpOwot CWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpCisJZm9yX2VhY2hfZW5naW5lKHJpbmcs IGRldl9wcml2KQogCQlJOTE1X1dSSVRFKFJJTkdfTU9ERV9HRU43KHJpbmcpLCBpcnFzKTsKIAog CS8qIHJvdXRlIGFsbCBHVCBpbnRlcnJ1cHRzIHRvIHRoZSBob3N0ICovCkBAIC05OSwxMiArOTks MTIgQEAgc3RhdGljIHZvaWQgZGlyZWN0X2ludGVycnVwdHNfdG9faG9zdChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiBzdGF0aWMgdm9pZCBkaXJlY3RfaW50ZXJydXB0c190b19n dWMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmc7Ci0JaW50IGksIGlycXM7CisJaW50IGlycXM7CiAKIAkvKiB0ZWxsIGFs bCBjb21tYW5kIHN0cmVhbWVycyB0byBmb3J3YXJkIGludGVycnVwdHMgYW5kIHZibGFuayB0byBH dUMgKi8KIAlpcnFzID0gX01BU0tFRF9GSUVMRChHRlhfRk9SV0FSRF9WQkxBTktfTUFTSywgR0ZY X0ZPUldBUkRfVkJMQU5LX0FMV0FZUyk7CiAJaXJxcyB8PSBfTUFTS0VEX0JJVF9FTkFCTEUoR0ZY X0lOVEVSUlVQVF9TVEVFUklORyk7Ci0JZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkK Kwlmb3JfZWFjaF9lbmdpbmUocmluZywgZGV2X3ByaXYpCiAJCUk5MTVfV1JJVEUoUklOR19NT0RF X0dFTjcocmluZyksIGlycXMpOwogCiAJLyogcm91dGUgVVNFUl9JTlRFUlJVUFQgdG8gSG9zdCwg YWxsIG90aGVycyBhcmUgc2VudCB0byBHdUMuICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmlu ZGV4IGNhNWMwZTguLjNhODY1YTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0yNTE2 LDkgKzI1MTYsOCBAQCB2b2lkIGludGVsX2xyX2NvbnRleHRfcmVzZXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRl dl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7Ci0JaW50IGk7CiAKLQlm b3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKSB7CisJZm9yX2VhY2hfZW5naW5lKHJpbmcs IGRldl9wcml2KSB7CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0KIAkJ CQljdHgtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGU7CiAJCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVy ICpyaW5nYnVmID0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDAyZmUwODEuLmFmNzY0NGIg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtNDY1Nyw3ICs0NjU3LDYgQEAgc3RhdGljIHZv aWQgZ2VuOV9lbmFibGVfcmM2KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nOwogCXVpbnQzMl90IHJjNl9tYXNrID0gMDsKLQlpbnQgdW51c2VkOwog CiAJLyogMWE6IFNvZnR3YXJlIFJDIHN0YXRlIC0gUkMwICovCiAJSTkxNV9XUklURShHRU42X1JD X1NUQVRFLCAwKTsKQEAgLTQ2NzgsNyArNDY3Nyw3IEBAIHN0YXRpYyB2b2lkIGdlbjlfZW5hYmxl X3JjNihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlJOTE1X1dSSVRFKEdFTjZfUkM2X1dBS0Vf UkFURV9MSU1JVCwgNTQgPDwgMTYpOwogCUk5MTVfV1JJVEUoR0VONl9SQ19FVkFMVUFUSU9OX0lO VEVSVkFMLCAxMjUwMDApOyAvKiAxMjUwMCAqIDEyODBucyAqLwogCUk5MTVfV1JJVEUoR0VONl9S Q19JRExFX0hZU1RFUlNJUywgMjUpOyAvKiAyNSAqIDEyODBucyAqLwotCWZvcl9lYWNoX3Jpbmco cmluZywgZGV2X3ByaXYsIHVudXNlZCkKKwlmb3JfZWFjaF9lbmdpbmUocmluZywgZGV2X3ByaXYp CiAJCUk5MTVfV1JJVEUoUklOR19NQVhfSURMRShyaW5nLT5tbWlvX2Jhc2UpLCAxMCk7CiAKIAlp ZiAoSEFTX0dVQ19VQ09ERShkZXYpKQpAQCAtNDcyOCw3ICs0NzI3LDYgQEAgc3RhdGljIHZvaWQg Z2VuOF9lbmFibGVfcnBzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICpyaW5nOwogCXVpbnQzMl90IHJjNl9tYXNrID0gMDsKLQlpbnQgdW51c2VkOwogCiAJ LyogMWE6IFNvZnR3YXJlIFJDIHN0YXRlIC0gUkMwICovCiAJSTkxNV9XUklURShHRU42X1JDX1NU QVRFLCAwKTsKQEAgLTQ3NDcsNyArNDc0NSw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfZW5hYmxlX3Jw cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCUk5MTVfV1JJVEUoR0VONl9SQzZfV0FLRV9SQVRF X0xJTUlULCA0MCA8PCAxNik7CiAJSTkxNV9XUklURShHRU42X1JDX0VWQUxVQVRJT05fSU5URVJW QUwsIDEyNTAwMCk7IC8qIDEyNTAwICogMTI4MG5zICovCiAJSTkxNV9XUklURShHRU42X1JDX0lE TEVfSFlTVEVSU0lTLCAyNSk7IC8qIDI1ICogMTI4MG5zICovCi0JZm9yX2VhY2hfcmluZyhyaW5n LCBkZXZfcHJpdiwgdW51c2VkKQorCWZvcl9lYWNoX2VuZ2luZShyaW5nLCBkZXZfcHJpdikKIAkJ STkxNV9XUklURShSSU5HX01BWF9JRExFKHJpbmctPm1taW9fYmFzZSksIDEwKTsKIAlJOTE1X1dS SVRFKEdFTjZfUkNfU0xFRVAsIDApOwogCWlmIChJU19CUk9BRFdFTEwoZGV2KSkKQEAgLTQ4MTIs NyArNDgxMCw3IEBAIHN0YXRpYyB2b2lkIGdlbjZfZW5hYmxlX3JwcyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCXUzMiByYzZ2aWRzLCBwY3VfbWJveCA9IDAsIHJjNl9tYXNrID0gMDsKIAl1MzIg Z3RmaWZvZGJnOwogCWludCByYzZfbW9kZTsKLQlpbnQgaSwgcmV0OworCWludCByZXQ7CiAKIAlX QVJOX09OKCFtdXRleF9pc19sb2NrZWQoJmRldl9wcml2LT5ycHMuaHdfbG9jaykpOwogCkBAIC00 ODQ0LDcgKzQ4NDIsNyBAQCBzdGF0aWMgdm9pZCBnZW42X2VuYWJsZV9ycHMoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAlJOTE1X1dSSVRFKEdFTjZfUkNfRVZBTFVBVElPTl9JTlRFUlZBTCwgMTI1 MDAwKTsKIAlJOTE1X1dSSVRFKEdFTjZfUkNfSURMRV9IWVNURVJTSVMsIDI1KTsKIAotCWZvcl9l YWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpCisJZm9yX2VhY2hfZW5naW5lKHJpbmcsIGRldl9w cml2KQogCQlJOTE1X1dSSVRFKFJJTkdfTUFYX0lETEUocmluZy0+bW1pb19iYXNlKSwgMTApOwog CiAJSTkxNV9XUklURShHRU42X1JDX1NMRUVQLCAwKTsKQEAgLTUzMzksNyArNTMzNyw2IEBAIHN0 YXRpYyB2b2lkIGNoZXJyeXZpZXdfZW5hYmxlX3JwcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJ c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZzsKIAl1MzIgZ3RmaWZvZGJnLCB2YWwsIHJjNl9t b2RlID0gMCwgcGNicjsKLQlpbnQgaTsKIAogCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmZGV2 X3ByaXYtPnJwcy5od19sb2NrKSk7CiAKQEAgLTUzNjQsNyArNTM2MSw3IEBAIHN0YXRpYyB2b2lk IGNoZXJyeXZpZXdfZW5hYmxlX3JwcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCUk5MTVfV1JJ VEUoR0VONl9SQ19FVkFMVUFUSU9OX0lOVEVSVkFMLCAxMjUwMDApOyAvKiAxMjUwMCAqIDEyODBu cyAqLwogCUk5MTVfV1JJVEUoR0VONl9SQ19JRExFX0hZU1RFUlNJUywgMjUpOyAvKiAyNSAqIDEy ODBucyAqLwogCi0JZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkKKwlmb3JfZWFjaF9l bmdpbmUocmluZywgZGV2X3ByaXYpCiAJCUk5MTVfV1JJVEUoUklOR19NQVhfSURMRShyaW5nLT5t bWlvX2Jhc2UpLCAxMCk7CiAJSTkxNV9XUklURShHRU42X1JDX1NMRUVQLCAwKTsKIApAQCAtNTQz Nyw3ICs1NDM0LDYgQEAgc3RhdGljIHZvaWQgdmFsbGV5dmlld19lbmFibGVfcnBzKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2 LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOwogCXUzMiBndGZp Zm9kYmcsIHZhbCwgcmM2X21vZGUgPSAwOwotCWludCBpOwogCiAJV0FSTl9PTighbXV0ZXhfaXNf bG9ja2VkKCZkZXZfcHJpdi0+cnBzLmh3X2xvY2spKTsKIApAQCAtNTQ3NSw3ICs1NDcxLDcgQEAg c3RhdGljIHZvaWQgdmFsbGV5dmlld19lbmFibGVfcnBzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJSTkxNV9XUklURShHRU42X1JDX0VWQUxVQVRJT05fSU5URVJWQUwsIDEyNTAwMCk7CiAJSTkx NV9XUklURShHRU42X1JDX0lETEVfSFlTVEVSU0lTLCAyNSk7CiAKLQlmb3JfZWFjaF9yaW5nKHJp bmcsIGRldl9wcml2LCBpKQorCWZvcl9lYWNoX2VuZ2luZShyaW5nLCBkZXZfcHJpdikKIAkJSTkx NV9XUklURShSSU5HX01BWF9JRExFKHJpbmctPm1taW9fYmFzZSksIDEwKTsKIAogCUk5MTVfV1JJ VEUoR0VONl9SQzZfVEhSRVNIT0xELCAweDU1Nyk7CkBAIC01ODU0LDE0ICs1ODUwLDEzIEBAIGJv b2wgaTkxNV9ncHVfYnVzeSh2b2lkKQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp djsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOwogCWJvb2wgcmV0ID0gZmFsc2U7Ci0J aW50IGk7CiAKIAlzcGluX2xvY2tfaXJxKCZtY2hkZXZfbG9jayk7CiAJaWYgKCFpOTE1X21jaF9k ZXYpCiAJCWdvdG8gb3V0X3VubG9jazsKIAlkZXZfcHJpdiA9IGk5MTVfbWNoX2RldjsKIAotCWZv cl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpCisJZm9yX2VhY2hfZW5naW5lKHJpbmcsIGRl dl9wcml2KQogCQlyZXQgfD0gIWxpc3RfZW1wdHkoJnJpbmctPnJlcXVlc3RfbGlzdCk7CiAKIG91 dF91bmxvY2s6Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK