From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: [PATCH RFC 057/111] staging: etnaviv: clean up printk()s etc Date: Thu, 2 Apr 2015 17:29:59 +0200 Message-ID: <1427988653-754-58-git-send-email-l.stach@pengutronix.de> References: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [92.198.50.35]) by gabe.freedesktop.org (Postfix) with ESMTP id 51A586EA44 for ; Thu, 2 Apr 2015 08:30:59 -0700 (PDT) In-Reply-To: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Russell King , kernel@pengutronix.de List-Id: dri-devel@lists.freedesktop.org RnJvbTogUnVzc2VsbCBLaW5nIDxybWsra2VybmVsQGFybS5saW51eC5vcmcudWs+CgpSZXBvcnQg bWVzc2FnZXMgYWdhaW5zdCB0aGUgY29tcG9uZW50IGRldmljZSByYXRoZXIgdGhhbiB0aGUgc3Vi c3lzdGVtCmRldmljZSwgc28gdGhhdCB0aGUgY29tcG9uZW50IHJlc3BvbnNpYmxlIGZvciB0aGUg bWVzc2FnZSBpcyBpZGVudGlmaWVkCnJhdGhlciB0aGFuIGhhdmluZyB0byBiZSBzZXBhcmF0ZWx5 IGZvcm1hdHRlZCBpbiB0aGUgc3RyaW5nLiAgVGhpcwplbnN1cmVzIHRoYXQgbWFueSBvZiB0aGUg ZGVidWcgbWVzc2FnZXMgYXJlIHByb3Blcmx5IGF0dHJpYnV0ZWQgdG8gdGhlaXIKYXBwcm9wcmlh dGUgY29tcG9uZW50LCB3aGljaCBpcyBlc3BlY2lhbGx5IGltcG9ydGFudCB3aGVuIHdlIGhhdmUK bXVsdGlwbGUgR1BVIGNvcmVzIGluIGEgU29DLgoKU2lnbmVkLW9mZi1ieTogUnVzc2VsbCBLaW5n IDxybWsra2VybmVsQGFybS5saW51eC5vcmcudWs+Ci0tLQogZHJpdmVycy9zdGFnaW5nL2V0bmF2 aXYvZXRuYXZpdl9idWZmZXIuYyB8ICAyICstCiBkcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5h dml2X2Rydi5jICAgIHwgIDggKystLQogZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9n cHUuYyAgICB8IDgyICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL3N0 YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dwdS5oICAgIHwgIDIgKy0KIDQgZmlsZXMgY2hhbmdlZCwg NDUgaW5zZXJ0aW9ucygrKSwgNDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9z dGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9idWZmZXIuYyBiL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2 L2V0bmF2aXZfYnVmZmVyLmMKaW5kZXggYWQ4ZmY1NWE1OWI0Li4wY2UxZTRiYWFmYTQgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZfYnVmZmVyLmMKKysrIGIvZHJp dmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9idWZmZXIuYwpAQCAtMTM1LDcgKzEzNSw3IEBA IHN0YXRpYyB2b2lkIGV0bmF2aXZfYnVmZmVyX2R1bXAoc3RydWN0IGV0bmF2aXZfZ3B1ICpncHUs CiAJdTMyIHNpemUgPSBvYmotPmJhc2Uuc2l6ZTsKIAl1MzIgKnB0ciA9IG9iai0+dmFkZHIgKyBv ZmY7CiAKLQlkZXZfaW5mbyhncHUtPmRybS0+ZGV2LCAidmlydCAlcCBwaHlzIDB4JTA4eCBmcmVl IDB4JTA4eFxuIiwKKwlkZXZfaW5mbyhncHUtPmRldiwgInZpcnQgJXAgcGh5cyAweCUwOHggZnJl ZSAweCUwOHhcbiIsCiAJCQlwdHIsIG9iai0+cGFkZHIgKyBvZmYsIHNpemUgLSBsZW4gKiA0IC0g b2ZmKTsKIAogCXByaW50X2hleF9kdW1wKEtFUk5fSU5GTywgImNtZCAiLCBEVU1QX1BSRUZJWF9P RkZTRVQsIDE2LCA0LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZp dl9kcnYuYyBiL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZfZHJ2LmMKaW5kZXggNWYz ODZhNzA0NWFlLi4zZGJhMjI4MjY1ZWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3RhZ2luZy9ldG5h dml2L2V0bmF2aXZfZHJ2LmMKKysrIGIvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9k cnYuYwpAQCAtMTI2LDggKzEyNiw3IEBAIHN0YXRpYyB2b2lkIGxvYWRfZ3B1KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJCQlldG5hdml2X2dwdV9wbV9yZXN1bWUoZyk7CiAJCQlyZXQgPSBldG5h dml2X2dwdV9pbml0KGcpOwogCQkJaWYgKHJldCkgewotCQkJCWRldl9lcnIoZGV2LT5kZXYsICIl cyBodyBpbml0IGZhaWxlZDogJWRcbiIsCi0JCQkJCWctPm5hbWUsIHJldCk7CisJCQkJZGV2X2Vy cihnLT5kZXYsICJodyBpbml0IGZhaWxlZDogJWRcbiIsIHJldCk7CiAJCQkJcHJpdi0+Z3B1W2ld ID0gTlVMTDsKIAkJCX0KIAkJfQpAQCAtMjA2LDcgKzIwNSw3IEBAIHN0YXRpYyBpbnQgZXRuYXZp dl9ncHVfc2hvdyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3Qgc2VxX2ZpbGUgKm0pCiAJ Zm9yIChpID0gMDsgaSA8IEVUTkFfTUFYX1BJUEVTOyBpKyspIHsKIAkJZ3B1ID0gcHJpdi0+Z3B1 W2ldOwogCQlpZiAoZ3B1KSB7Ci0JCQlzZXFfcHJpbnRmKG0sICIlcyBTdGF0dXM6XG4iLCBncHUt Pm5hbWUpOworCQkJc2VxX3ByaW50ZihtLCAiJXMgU3RhdHVzOlxuIiwgZGV2X25hbWUoZ3B1LT5k ZXYpKTsKIAkJCWV0bmF2aXZfZ3B1X2RlYnVnZnMoZ3B1LCBtKTsKIAkJfQogCX0KQEAgLTIyMyw3 ICsyMjIsOCBAQCBzdGF0aWMgaW50IGV0bmF2aXZfZ2VtX3Nob3coc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgc3RydWN0IHNlcV9maWxlICptKQogCWZvciAoaSA9IDA7IGkgPCBFVE5BX01BWF9QSVBF UzsgaSsrKSB7CiAJCWdwdSA9IHByaXYtPmdwdVtpXTsKIAkJaWYgKGdwdSkgewotCQkJc2VxX3By aW50ZihtLCAiQWN0aXZlIE9iamVjdHMgKCVzKTpcbiIsIGdwdS0+bmFtZSk7CisJCQlzZXFfcHJp bnRmKG0sICJBY3RpdmUgT2JqZWN0cyAoJXMpOlxuIiwKKwkJCQkgICBkZXZfbmFtZShncHUtPmRl dikpOwogCQkJbXNtX2dlbV9kZXNjcmliZV9vYmplY3RzKCZncHUtPmFjdGl2ZV9saXN0LCBtKTsK IAkJfQogCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZfZ3B1 LmMgYi9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dwdS5jCmluZGV4IDdlZjkxMjBi ZDdkZS4uYTVhNDdmMzRlYmE1IDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9l dG5hdml2X2dwdS5jCisrKyBiL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZfZ3B1LmMK QEAgLTEwNCw3ICsxMDQsNyBAQCBpbnQgZXRuYXZpdl9ncHVfZ2V0X3BhcmFtKHN0cnVjdCBldG5h dml2X2dwdSAqZ3B1LCB1aW50MzJfdCBwYXJhbSwKIAkJYnJlYWs7CiAKIAlkZWZhdWx0OgotCQlE QkcoIiVzOiBpbnZhbGlkIHBhcmFtOiAldSIsIGdwdS0+bmFtZSwgcGFyYW0pOworCQlEQkcoIiVz OiBpbnZhbGlkIHBhcmFtOiAldSIsIGRldl9uYW1lKGdwdS0+ZGV2KSwgcGFyYW0pOwogCQlyZXR1 cm4gLUVJTlZBTDsKIAl9CiAKQEAgLTE1Nyw3ICsxNTcsNyBAQCBzdGF0aWMgdm9pZCBldG5hdml2 X2h3X3NwZWNzKHN0cnVjdCBldG5hdml2X2dwdSAqZ3B1KQogCQlncHUtPmlkZW50aXR5LnZlcnRl eF9vdXRwdXRfYnVmZmVyX3NpemUgPQogCQkJMSA8PCBncHUtPmlkZW50aXR5LnZlcnRleF9vdXRw dXRfYnVmZmVyX3NpemU7CiAJfSBlbHNlIHsKLQkJZGV2X2VycihncHUtPmRybS0+ZGV2LCAiVE9E TzogZGV0ZXJtaW5lIEdQVSBzcGVjcyBiYXNlZCBvbiBtb2RlbFxuIik7CisJCWRldl9lcnIoZ3B1 LT5kZXYsICJUT0RPOiBkZXRlcm1pbmUgR1BVIHNwZWNzIGJhc2VkIG9uIG1vZGVsXG4iKTsKIAl9 CiAKIAlzd2l0Y2ggKGdwdS0+aWRlbnRpdHkuaW5zdHJ1Y3Rpb25fY291bnQpIHsKQEAgLTE3OCwy NSArMTc4LDI1IEBAIHN0YXRpYyB2b2lkIGV0bmF2aXZfaHdfc3BlY3Moc3RydWN0IGV0bmF2aXZf Z3B1ICpncHUpCiAJCWJyZWFrOwogCX0KIAotCWRldl9pbmZvKGdwdS0+ZHJtLT5kZXYsICJzdHJl YW1fY291bnQ6ICAleFxuIiwKKwlkZXZfaW5mbyhncHUtPmRldiwgInN0cmVhbV9jb3VudDogICV4 XG4iLAogCQkgZ3B1LT5pZGVudGl0eS5zdHJlYW1fY291bnQpOwotCWRldl9pbmZvKGdwdS0+ZHJt LT5kZXYsICJyZWdpc3Rlcl9tYXg6ICV4XG4iLAorCWRldl9pbmZvKGdwdS0+ZGV2LCAicmVnaXN0 ZXJfbWF4OiAleFxuIiwKIAkJIGdwdS0+aWRlbnRpdHkucmVnaXN0ZXJfbWF4KTsKLQlkZXZfaW5m byhncHUtPmRybS0+ZGV2LCAidGhyZWFkX2NvdW50OiAleFxuIiwKKwlkZXZfaW5mbyhncHUtPmRl diwgInRocmVhZF9jb3VudDogJXhcbiIsCiAJCSBncHUtPmlkZW50aXR5LnRocmVhZF9jb3VudCk7 Ci0JZGV2X2luZm8oZ3B1LT5kcm0tPmRldiwgInZlcnRleF9jYWNoZV9zaXplOiAleFxuIiwKKwlk ZXZfaW5mbyhncHUtPmRldiwgInZlcnRleF9jYWNoZV9zaXplOiAleFxuIiwKIAkJIGdwdS0+aWRl bnRpdHkudmVydGV4X2NhY2hlX3NpemUpOwotCWRldl9pbmZvKGdwdS0+ZHJtLT5kZXYsICJzaGFk ZXJfY29yZV9jb3VudDogJXhcbiIsCisJZGV2X2luZm8oZ3B1LT5kZXYsICJzaGFkZXJfY29yZV9j b3VudDogJXhcbiIsCiAJCSBncHUtPmlkZW50aXR5LnNoYWRlcl9jb3JlX2NvdW50KTsKLQlkZXZf aW5mbyhncHUtPmRybS0+ZGV2LCAicGl4ZWxfcGlwZXM6ICV4XG4iLAorCWRldl9pbmZvKGdwdS0+ ZGV2LCAicGl4ZWxfcGlwZXM6ICV4XG4iLAogCQkgZ3B1LT5pZGVudGl0eS5waXhlbF9waXBlcyk7 Ci0JZGV2X2luZm8oZ3B1LT5kcm0tPmRldiwgInZlcnRleF9vdXRwdXRfYnVmZmVyX3NpemU6ICV4 XG4iLAorCWRldl9pbmZvKGdwdS0+ZGV2LCAidmVydGV4X291dHB1dF9idWZmZXJfc2l6ZTogJXhc biIsCiAJCSBncHUtPmlkZW50aXR5LnZlcnRleF9vdXRwdXRfYnVmZmVyX3NpemUpOwotCWRldl9p bmZvKGdwdS0+ZHJtLT5kZXYsICJidWZmZXJfc2l6ZTogJXhcbiIsCisJZGV2X2luZm8oZ3B1LT5k ZXYsICJidWZmZXJfc2l6ZTogJXhcbiIsCiAJCSBncHUtPmlkZW50aXR5LmJ1ZmZlcl9zaXplKTsK LQlkZXZfaW5mbyhncHUtPmRybS0+ZGV2LCAiaW5zdHJ1Y3Rpb25fY291bnQ6ICV4XG4iLAorCWRl dl9pbmZvKGdwdS0+ZGV2LCAiaW5zdHJ1Y3Rpb25fY291bnQ6ICV4XG4iLAogCQkgZ3B1LT5pZGVu dGl0eS5pbnN0cnVjdGlvbl9jb3VudCk7Ci0JZGV2X2luZm8oZ3B1LT5kcm0tPmRldiwgIm51bV9j b25zdGFudHM6ICV4XG4iLAorCWRldl9pbmZvKGdwdS0+ZGV2LCAibnVtX2NvbnN0YW50czogJXhc biIsCiAJCSBncHUtPmlkZW50aXR5Lm51bV9jb25zdGFudHMpOwogfQogCkBAIC0yNDIsOCArMjQy LDggQEAgc3RhdGljIHZvaWQgZXRuYXZpdl9od19pZGVudGlmeShzdHJ1Y3QgZXRuYXZpdl9ncHUg KmdwdSkKIAkJfQogCX0KIAotCWRldl9pbmZvKGdwdS0+ZHJtLT5kZXYsICJtb2RlbDogJXhcbiIs IGdwdS0+aWRlbnRpdHkubW9kZWwpOwotCWRldl9pbmZvKGdwdS0+ZHJtLT5kZXYsICJyZXZpc2lv bjogJXhcbiIsIGdwdS0+aWRlbnRpdHkucmV2aXNpb24pOworCWRldl9pbmZvKGdwdS0+ZGV2LCAi bW9kZWw6ICV4XG4iLCBncHUtPmlkZW50aXR5Lm1vZGVsKTsKKwlkZXZfaW5mbyhncHUtPmRldiwg InJldmlzaW9uOiAleFxuIiwgZ3B1LT5pZGVudGl0eS5yZXZpc2lvbik7CiAKIAlncHUtPmlkZW50 aXR5LmZlYXR1cmVzID0gZ3B1X3JlYWQoZ3B1LCBWSVZTX0hJX0NISVBfRkVBVFVSRSk7CiAKQEAg LTI3NSwxMyArMjc1LDEzIEBAIHN0YXRpYyB2b2lkIGV0bmF2aXZfaHdfaWRlbnRpZnkoc3RydWN0 IGV0bmF2aXZfZ3B1ICpncHUpCiAJCQkJZ3B1X3JlYWQoZ3B1LCBWSVZTX0hJX0NISVBfTUlOT1Jf RkVBVFVSRV8zKTsKIAl9CiAKLQlkZXZfaW5mbyhncHUtPmRybS0+ZGV2LCAibWlub3JfZmVhdHVy ZXM6ICAleFxuIiwKKwlkZXZfaW5mbyhncHUtPmRldiwgIm1pbm9yX2ZlYXR1cmVzOiAgJXhcbiIs CiAJCSBncHUtPmlkZW50aXR5Lm1pbm9yX2ZlYXR1cmVzMCk7Ci0JZGV2X2luZm8oZ3B1LT5kcm0t PmRldiwgIm1pbm9yX2ZlYXR1cmVzMTogJXhcbiIsCisJZGV2X2luZm8oZ3B1LT5kZXYsICJtaW5v cl9mZWF0dXJlczE6ICV4XG4iLAogCQkgZ3B1LT5pZGVudGl0eS5taW5vcl9mZWF0dXJlczEpOwot CWRldl9pbmZvKGdwdS0+ZHJtLT5kZXYsICJtaW5vcl9mZWF0dXJlczI6ICV4XG4iLAorCWRldl9p bmZvKGdwdS0+ZGV2LCAibWlub3JfZmVhdHVyZXMyOiAleFxuIiwKIAkJIGdwdS0+aWRlbnRpdHku bWlub3JfZmVhdHVyZXMyKTsKLQlkZXZfaW5mbyhncHUtPmRybS0+ZGV2LCAibWlub3JfZmVhdHVy ZXMzOiAleFxuIiwKKwlkZXZfaW5mbyhncHUtPmRldiwgIm1pbm9yX2ZlYXR1cmVzMzogJXhcbiIs CiAJCSBncHUtPmlkZW50aXR5Lm1pbm9yX2ZlYXR1cmVzMyk7CiAKIAlldG5hdml2X2h3X3NwZWNz KGdwdSk7CkBAIC0zMzQsOCArMzM0LDcgQEAgc3RhdGljIHZvaWQgZXRuYXZpdl9od19yZXNldChz dHJ1Y3QgZXRuYXZpdl9ncHUgKmdwdSkKIAogCQkvKiB0cnkgcmVzZXRpbmcgYWdhaW4gaWYgRkUg aXQgbm90IGlkbGUgKi8KIAkJaWYgKChpZGxlICYgVklWU19ISV9JRExFX1NUQVRFX0ZFKSA9PSAw KSB7Ci0JCQlkZXZfZGJnKGdwdS0+ZHJtLT5kZXYsICIlczogRkUgaXMgbm90IGlkbGVcbiIsCi0J CQkJZ3B1LT5uYW1lKTsKKwkJCWRldl9kYmcoZ3B1LT5kZXYsICJGRSBpcyBub3QgaWRsZVxuIik7 CiAJCQljb250aW51ZTsKIAkJfQogCkBAIC0zNDUsOCArMzQ0LDcgQEAgc3RhdGljIHZvaWQgZXRu YXZpdl9od19yZXNldChzdHJ1Y3QgZXRuYXZpdl9ncHUgKmdwdSkKIAkJLyogaXMgdGhlIEdQVSBp ZGxlPyAqLwogCQlpZiAoKChjb250cm9sICYgVklWU19ISV9DTE9DS19DT05UUk9MX0lETEVfM0Qp ID09IDApCiAJCXx8ICgoY29udHJvbCAmIFZJVlNfSElfQ0xPQ0tfQ09OVFJPTF9JRExFXzJEKSA9 PSAwKSkgewotCQkJZGV2X2RiZyhncHUtPmRybS0+ZGV2LCAiJXM6IEdQVSBpcyBub3QgaWRsZVxu IiwKLQkJCQlncHUtPm5hbWUpOworCQkJZGV2X2RiZyhncHUtPmRldiwgIkdQVSBpcyBub3QgaWRs ZVxuIik7CiAJCQljb250aW51ZTsKIAkJfQogCkBAIC0zODUsNyArMzgzLDcgQEAgaW50IGV0bmF2 aXZfZ3B1X2luaXQoc3RydWN0IGV0bmF2aXZfZ3B1ICpncHUpCiAJICogc2ltcGxlIGFuZCB0byBn ZXQgc29tZXRoaW5nIHdvcmtpbmcsIGp1c3QgdXNlIGEgc2luZ2xlIGFkZHJlc3Mgc3BhY2U6CiAJ ICovCiAJbW11djIgPSBncHUtPmlkZW50aXR5Lm1pbm9yX2ZlYXR1cmVzMSAmIGNoaXBNaW5vckZl YXR1cmVzMV9NTVVfVkVSU0lPTjsKLQlkZXZfZGJnKGdwdS0+ZHJtLT5kZXYsICJtbXV2MjogJWRc biIsIG1tdXYyKTsKKwlkZXZfZGJnKGdwdS0+ZGV2LCAibW11djI6ICVkXG4iLCBtbXV2Mik7CiAK IAlpZiAoIW1tdXYyKSB7CiAJCWlvbW11ID0gZXRuYXZpdl9pb21tdV9kb21haW5fYWxsb2MoZ3B1 KTsKQEAgLTQxNCw3ICs0MTIsNyBAQCBpbnQgZXRuYXZpdl9ncHVfaW5pdChzdHJ1Y3QgZXRuYXZp dl9ncHUgKmdwdSkKIAlpZiAoSVNfRVJSKGdwdS0+YnVmZmVyKSkgewogCQlyZXQgPSBQVFJfRVJS KGdwdS0+YnVmZmVyKTsKIAkJZ3B1LT5idWZmZXIgPSBOVUxMOwotCQlkZXZfZXJyKGdwdS0+ZHJt LT5kZXYsICJjb3VsZCBub3QgY3JlYXRlIGJ1ZmZlcjogJWRcbiIsIHJldCk7CisJCWRldl9lcnIo Z3B1LT5kZXYsICJjb3VsZCBub3QgY3JlYXRlIGJ1ZmZlcjogJWRcbiIsIHJldCk7CiAJCWdvdG8g ZmFpbDsKIAl9CiAKQEAgLTYyMiw3ICs2MjAsNyBAQCBpbnQgZXRuYXZpdl9ncHVfcG1fcmVzdW1l KHN0cnVjdCBldG5hdml2X2dwdSAqZ3B1KQogewogCWludCByZXQ7CiAKLQlEQkcoIiVzIiwgZ3B1 LT5uYW1lKTsKKwlEQkcoIiVzIiwgZGV2X25hbWUoZ3B1LT5kZXYpKTsKIAogCXJldCA9IGVuYWJs ZV9wd3JyYWlsKGdwdSk7CiAJaWYgKHJldCkKQEAgLTY0Myw3ICs2NDEsNyBAQCBpbnQgZXRuYXZp dl9ncHVfcG1fc3VzcGVuZChzdHJ1Y3QgZXRuYXZpdl9ncHUgKmdwdSkKIHsKIAlpbnQgcmV0Owog Ci0JREJHKCIlcyIsIGdwdS0+bmFtZSk7CisJREJHKCIlcyIsIGRldl9uYW1lKGdwdS0+ZGV2KSk7 CiAKIAlyZXQgPSBkaXNhYmxlX2F4aShncHUpOwogCWlmIChyZXQpCkBAIC02NjksNyArNjY3LDcg QEAgc3RhdGljIHZvaWQgcmVjb3Zlcl93b3JrZXIoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQog CQkJCQkgICAgICAgcmVjb3Zlcl93b3JrKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZ3B1 LT5kcm07CiAKLQlkZXZfZXJyKGRldi0+ZGV2LCAiJXM6IGhhbmdjaGVjayByZWNvdmVyIVxuIiwg Z3B1LT5uYW1lKTsKKwlkZXZfZXJyKGdwdS0+ZGV2LCAiaGFuZ2NoZWNrIHJlY292ZXIhXG4iKTsK IAogCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAkvKiBUT0RPIGdwdS0+ZnVuY3Mt PnJlY292ZXIoZ3B1KTsgKi8KQEAgLTY4MCw3ICs2NzgsNyBAQCBzdGF0aWMgdm9pZCByZWNvdmVy X3dvcmtlcihzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAKIHN0YXRpYyB2b2lkIGhhbmdjaGVj a190aW1lcl9yZXNldChzdHJ1Y3QgZXRuYXZpdl9ncHUgKmdwdSkKIHsKLQlEQkcoIiVzIiwgZ3B1 LT5uYW1lKTsKKwlEQkcoIiVzIiwgZGV2X25hbWUoZ3B1LT5kZXYpKTsKIAltb2RfdGltZXIoJmdw dS0+aGFuZ2NoZWNrX3RpbWVyLAogCQkJcm91bmRfamlmZmllc191cChqaWZmaWVzICsgRFJNX01T TV9IQU5HQ0hFQ0tfSklGRklFUykpOwogfQpAQCAtNjk4LDEyICs2OTYsMTAgQEAgc3RhdGljIHZv aWQgaGFuZ2NoZWNrX2hhbmRsZXIodW5zaWduZWQgbG9uZyBkYXRhKQogCX0gZWxzZSBpZiAoZmVu Y2VfYWZ0ZXIoZ3B1LT5zdWJtaXR0ZWRfZmVuY2UsIGZlbmNlKSkgewogCQkvKiBubyBwcm9ncmVz cyBhbmQgbm90IGRvbmUuLiBodW5nISAqLwogCQlncHUtPmhhbmdjaGVja19mZW5jZSA9IGZlbmNl OwotCQlkZXZfZXJyKGRldi0+ZGV2LCAiJXM6IGhhbmdjaGVjayBkZXRlY3RlZCBncHUgbG9ja3Vw IVxuIiwKLQkJCQlncHUtPm5hbWUpOwotCQlkZXZfZXJyKGRldi0+ZGV2LCAiJXM6ICAgICBjb21w bGV0ZWQgZmVuY2U6ICV1XG4iLAotCQkJCWdwdS0+bmFtZSwgZmVuY2UpOwotCQlkZXZfZXJyKGRl di0+ZGV2LCAiJXM6ICAgICBzdWJtaXR0ZWQgZmVuY2U6ICV1XG4iLAotCQkJCWdwdS0+bmFtZSwg Z3B1LT5zdWJtaXR0ZWRfZmVuY2UpOworCQlkZXZfZXJyKGdwdS0+ZGV2LCAiaGFuZ2NoZWNrIGRl dGVjdGVkIGdwdSBsb2NrdXAhXG4iKTsKKwkJZGV2X2VycihncHUtPmRldiwgIiAgICAgY29tcGxl dGVkIGZlbmNlOiAldVxuIiwgZmVuY2UpOworCQlkZXZfZXJyKGdwdS0+ZGV2LCAiICAgICBzdWJt aXR0ZWQgZmVuY2U6ICV1XG4iLAorCQkJZ3B1LT5zdWJtaXR0ZWRfZmVuY2UpOwogCQlxdWV1ZV93 b3JrKHByaXYtPndxLCAmZ3B1LT5yZWNvdmVyX3dvcmspOwogCX0KIApAQCAtNzI0LDcgKzcyMCw3 IEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgZXZlbnRfYWxsb2Moc3RydWN0IGV0bmF2aXZfZ3B1ICpn cHUpCiAJcmV0ID0gd2FpdF9mb3JfY29tcGxldGlvbl90aW1lb3V0KCZncHUtPmV2ZW50X2ZyZWUs CiAJCQkJCSAgbXNlY3NfdG9famlmZmllcygxMCAqIDEwMDAwKSk7CiAJaWYgKCFyZXQpCi0JCWRl dl9lcnIoZ3B1LT5kcm0tPmRldiwgIndhaXRfZm9yX2NvbXBsZXRpb25fdGltZW91dCBmYWlsZWQi KTsKKwkJZGV2X2VycihncHUtPmRldiwgIndhaXRfZm9yX2NvbXBsZXRpb25fdGltZW91dCBmYWls ZWQiKTsKIAogCXNwaW5fbG9ja19pcnFzYXZlKCZncHUtPmV2ZW50X3NwaW5sb2NrLCBmbGFncyk7 CiAKQEAgLTc0OSw3ICs3NDUsNyBAQCBzdGF0aWMgdm9pZCBldmVudF9mcmVlKHN0cnVjdCBldG5h dml2X2dwdSAqZ3B1LCB1bnNpZ25lZCBpbnQgZXZlbnQpCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmdw dS0+ZXZlbnRfc3BpbmxvY2ssIGZsYWdzKTsKIAogCWlmIChncHUtPmV2ZW50W2V2ZW50XS51c2Vk ID09IGZhbHNlKSB7Ci0JCWRldl93YXJuKGdwdS0+ZHJtLT5kZXYsICJldmVudCAldSBpcyBhbHJl YWR5IG1hcmtlZCBhcyBmcmVlIiwKKwkJZGV2X3dhcm4oZ3B1LT5kZXYsICJldmVudCAldSBpcyBh bHJlYWR5IG1hcmtlZCBhcyBmcmVlIiwKIAkJCSBldmVudCk7CiAJCXNwaW5fdW5sb2NrX2lycXJl c3RvcmUoJmdwdS0+ZXZlbnRfc3BpbmxvY2ssIGZsYWdzKTsKIAl9IGVsc2UgewpAQCAtODc4LDE0 ICs4NzQsMTQgQEAgc3RhdGljIGlycXJldHVybl90IGlycV9oYW5kbGVyKGludCBpcnEsIHZvaWQg KmRhdGEpCiAJdTMyIGludHIgPSBncHVfcmVhZChncHUsIFZJVlNfSElfSU5UUl9BQ0tOT1dMRURH RSk7CiAKIAlpZiAoaW50ciAhPSAwKSB7Ci0JCWRldl9kYmcoZ3B1LT5kcm0tPmRldiwgImludHIg MHglMDh4XG4iLCBpbnRyKTsKKwkJZGV2X2RiZyhncHUtPmRldiwgImludHIgMHglMDh4XG4iLCBp bnRyKTsKIAogCQlpZiAoaW50ciAmIFZJVlNfSElfSU5UUl9BQ0tOT1dMRURHRV9BWElfQlVTX0VS Uk9SKQotCQkJZGV2X2VycihncHUtPmRybS0+ZGV2LCAiQVhJIGJ1cyBlcnJvclxuIik7CisJCQlk ZXZfZXJyKGdwdS0+ZGV2LCAiQVhJIGJ1cyBlcnJvclxuIik7CiAJCWVsc2UgewogCQkJdWludDhf dCBldmVudCA9IF9fZmxzKGludHIpOwogCi0JCQlkZXZfZGJnKGdwdS0+ZHJtLT5kZXYsICJldmVu dCAldVxuIiwgZXZlbnQpOworCQkJZGV2X2RiZyhncHUtPmRldiwgImV2ZW50ICV1XG4iLCBldmVu dCk7CiAJCQlncHUtPnJldGlyZWRfZmVuY2UgPSBncHUtPmV2ZW50W2V2ZW50XS5mZW5jZTsKIAkJ CWdwdS0+bGFzdF9yaW5nX3BvcyA9IGdwdS0+ZXZlbnRbZXZlbnRdLnJpbmdfcG9zOwogCQkJZXZl bnRfZnJlZShncHUsIGV2ZW50KTsKQEAgLTkzOCw3ICs5MzQsNyBAQCBzdGF0aWMgdm9pZCBldG5h dml2X2dwdV91bmJpbmQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlICptYXN0ZXIs CiAKIAlkZWxfdGltZXIoJmdwdS0+aGFuZ2NoZWNrX3RpbWVyKTsKIAotCURCRygiJXMiLCBncHUt Pm5hbWUpOworCURCRygiJXMiLCBkZXZfbmFtZShncHUtPmRldikpOwogCiAJV0FSTl9PTighbGlz dF9lbXB0eSgmZ3B1LT5hY3RpdmVfbGlzdCkpOwogCkBAIC05ODUsMTAgKzk4MSwxMCBAQCBzdGF0 aWMgaW50IGV0bmF2aXZfZ3B1X3BsYXRmb3JtX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2Ug KnBkZXYpCiAJaWYgKCFtYXRjaCkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKLQlncHUtPm5hbWUgPSBw ZGV2LT5uYW1lOworCWdwdS0+ZGV2ID0gJnBkZXYtPmRldjsKIAogCS8qIE1hcCByZWdpc3RlcnM6 ICovCi0JZ3B1LT5tbWlvID0gZXRuYXZpdl9pb3JlbWFwKHBkZXYsIE5VTEwsIGdwdS0+bmFtZSk7 CisJZ3B1LT5tbWlvID0gZXRuYXZpdl9pb3JlbWFwKHBkZXYsIE5VTEwsIGRldl9uYW1lKGdwdS0+ ZGV2KSk7CiAJaWYgKElTX0VSUihncHUtPm1taW8pKQogCQlyZXR1cm4gUFRSX0VSUihncHUtPm1t aW8pOwogCkBAIC0xMDAxLDcgKzk5Nyw3IEBAIHN0YXRpYyBpbnQgZXRuYXZpdl9ncHVfcGxhdGZv cm1fcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAl9CiAKIAllcnIgPSBkZXZt X3JlcXVlc3RfaXJxKCZwZGV2LT5kZXYsIGdwdS0+aXJxLCBpcnFfaGFuZGxlciwKLQkJCUlSUUZf VFJJR0dFUl9ISUdILCBncHUtPm5hbWUsIGdwdSk7CisJCQlJUlFGX1RSSUdHRVJfSElHSCwgZGV2 X25hbWUoZ3B1LT5kZXYpLCBncHUpOwogCWlmIChlcnIpIHsKIAkJZGV2X2VycihkZXYsICJmYWls ZWQgdG8gcmVxdWVzdCBJUlEldTogJWRcbiIsIGdwdS0+aXJxLCBlcnIpOwogCQlnb3RvIGZhaWw7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dwdS5oIGIvZHJp dmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9ncHUuaAppbmRleCBjOWM0ODJhOGQ1NjkuLjg4 NWVkZGY5ZmIxYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9n cHUuaAorKysgYi9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dwdS5oCkBAIC04NSw4 ICs4NSw4IEBAIHN0cnVjdCBldG5hdml2X2V2ZW50IHsKIH07CiAKIHN0cnVjdCBldG5hdml2X2dw dSB7Ci0JY29uc3QgY2hhciAqbmFtZTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZHJtOworCXN0cnVj dCBkZXZpY2UgKmRldjsKIAlzdHJ1Y3QgZXRuYXZpdl9jaGlwX2lkZW50aXR5IGlkZW50aXR5Owog CWludCBwaXBlOwogCi0tIAoyLjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9kcmktZGV2ZWwK