From: Rob Clark Subject: [RFC] drm/i915: tame the chattermouth Date: Thu, 11 Dec 2014 18:18:12 -0500 Message-ID: <1418339892-24053-1-git-send-email-robdclark@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qa0-f46.google.com (mail-qa0-f46.google.com [209.85.216.46]) by gabe.freedesktop.org (Postfix) with ESMTP id D2D456E13B for ; Thu, 11 Dec 2014 15:18:16 -0800 (PST) Received: by mail-qa0-f46.google.com with SMTP id n8so4328863qaq.19 for ; Thu, 11 Dec 2014 15:18:16 -0800 (PST) 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 List-Id: dri-devel@lists.freedesktop.org TWFueSBkaXN0cm8ncyBoYXZlIG1lY2hhbmlzbSBpbiBwbGFjZSB0byBjb2xsZWN0IGFuZCBhdXRv bWF0aWNhbGx5IGZpbGUKYnVncyBmb3IgZmFpbGVkIFdBUk4oKXMuICBBbmQgc2luY2UgZXZlcnkg dGhpcmQgbGluZSBpbiBpOTE1IGlzIGEgV0FSTigpCml0IGdlbmVyYXRlcyBxdWl0ZSBhIGxvdCBv ZiBub2lzZSB3aGljaCBpcyBzb21ld2hhdCBkaXNjb25jZXJ0aW5nIHRvIHRoZQplbmQgdXNlci4K ClNlcGFyYXRlIG91dCB0aGUgaW50ZXJuYWwgaHctaXMtaW4tdGhlLXN0YXRlLUktZXhwZWN0ZWQg Y2hlY2tzIGludG8KSTkxNV9XQVJOKClzIGFuZCBhbGxvdyBjb25maWd1cmF0aW9uIHZpYSBpOTE1 LnZlcmJvc2VfY2hlY2tzIG1vZHVsZQpwYXJhbSBhYm91dCB3aGV0aGVyIHRoaXMgd2lsbCBnZW5l cmF0ZSBhIGZ1bGwgYmxvd24gc3RhY2t0cmFjZSBvciBqdXN0CkRSTV9FUlJPUigpLgoKU2lnbmVk LW9mZi1ieTogUm9iIENsYXJrIDxyb2JkY2xhcmtAZ21haWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICB8ICAyOSArKysrKysrCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3BhcmFtcy5jICAgICAgfCAgIDUgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYyAgICB8IDEzNCArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyAgICAgICAgIHwgICA0ICstCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgfCAgIDIgKy0KIDUgZmlsZXMgY2hh bmdlZCwgMTA0IGluc2VydGlvbnMoKyksIDcwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCmluZGV4IGJiMTg5MmQuLjlmYWJhZmYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApA QCAtNjAsNiArNjAsMzQgQEAKICN1bmRlZiBXQVJOX09OCiAjZGVmaW5lIFdBUk5fT04oeCkJCVdB Uk4oeCwgIldBUk5fT04oIiAjeCAiKSIpCiAKKy8qIFVzZSBJOTE1X1dBUk4oeCkgYW5kIEk5MTVf V0FSTl9PTigpIChyYXRoZXIgdGhhbiBXQVJOKCkgYW5kIFdBUk5fT04oKSkKKyAqIHRvIGNoZWNr IGZvciB1bmV4cGVjdGVkIGNvbmRpdGlvbnMgd2hpY2ggbWF5IG5vdCBuZWNlc3NhcmlseSBiZSBh IHVzZXIKKyAqIHZpc2libGUgcHJvYmxlbS4gIFRoaXMgd2lsbCBlaXRoZXIgV0FSTigpIG9yIERS TV9FUlJPUigpIGRlcGVuZGluZyBvbgorICogdGhlIHZlcmJvc2VfY2hlY2tzIG1vZHVsZXBhcmFt LCBlbmFibGluZyBkaXN0cm9zIGFuZCB1c2VycyB0byB0YWlsb3IKKyAqIHRoZWlyIHByZWZlcnJl ZCBhbW91bnQgb2YgaTkxNSBhYnJ0IHNwYW0uCisgKi8KKyNkZWZpbmUgSTkxNV9XQVJOKGNvbmRp dGlvbiwgZm9ybWF0Li4uKSAoewkJCQlcCisJaW50IF9fcmV0X3dhcm5fb24gPSAhIShjb25kaXRp b24pOwkJCQlcCisJaWYgKHVubGlrZWx5KF9fcmV0X3dhcm5fb24pKSB7CQkJCQlcCisJCWlmIChp OTE1LnZlcmJvc2VfY2hlY2tzKQkJCQlcCisJCQlfX1dBUk5fcHJpbnRmKGZvcm1hdCk7CQkJCVwK KwkJZWxzZSAJCQkJCQkJXAorCQkJRFJNX0VSUk9SKGZvcm1hdCk7CQkJCVwKKwl9CQkJCQkJCQlc CisJdW5saWtlbHkoX19yZXRfd2Fybl9vbik7CQkJCQlcCit9KQorCisjZGVmaW5lIEk5MTVfV0FS Tl9PTihjb25kaXRpb24pICh7CQkJCQlcCisJaW50IF9fcmV0X3dhcm5fb24gPSAhIShjb25kaXRp b24pOwkJCQlcCisJaWYgKHVubGlrZWx5KF9fcmV0X3dhcm5fb24pKSB7CQkJCQlcCisJCWlmIChp OTE1LnZlcmJvc2VfY2hlY2tzKQkJCQlcCisJCQlfX1dBUk5fcHJpbnRmKCJXQVJOX09OKCIgI2Nv bmRpdGlvbiAiKVxuIik7CVwKKwkJZWxzZSAJCQkJCQkJXAorCQkJRFJNX0VSUk9SKCJXQVJOX09O KCIgI2NvbmRpdGlvbiAiKVxuIik7CQlcCisJfQkJCQkJCQkJXAorCXVubGlrZWx5KF9fcmV0X3dh cm5fb24pOwkJCQkJXAorfSkKKwogZW51bSBwaXBlIHsKIAlJTlZBTElEX1BJUEUgPSAtMSwKIAlQ SVBFX0EgPSAwLApAQCAtMjMxMSw2ICsyMzM5LDcgQEAgc3RydWN0IGk5MTVfcGFyYW1zIHsKIAli b29sIGRpc2FibGVfdnRkX3dhOwogCWludCB1c2VfbW1pb19mbGlwOwogCWJvb2wgbW1pb19kZWJ1 ZzsKKwlib29sIHZlcmJvc2VfY2hlY2tzOwogfTsKIGV4dGVybiBzdHJ1Y3QgaTkxNV9wYXJhbXMg aTkxNSBfX3JlYWRfbW9zdGx5OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3BhcmFtcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuYwppbmRleCBj OTFjYjIwLi43Mjc3N2RhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Bh cmFtcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmMKQEAgLTUxLDYg KzUxLDcgQEAgc3RydWN0IGk5MTVfcGFyYW1zIGk5MTUgX19yZWFkX21vc3RseSA9IHsKIAkuZGlz YWJsZV92dGRfd2EgPSAwLAogCS51c2VfbW1pb19mbGlwID0gMCwKIAkubW1pb19kZWJ1ZyA9IDAs CisJLnZlcmJvc2VfY2hlY2tzID0gMSwKIH07CiAKIG1vZHVsZV9wYXJhbV9uYW1lZChtb2Rlc2V0 LCBpOTE1Lm1vZGVzZXQsIGludCwgMDQwMCk7CkBAIC0xNzMsMyArMTc0LDcgQEAgbW9kdWxlX3Bh cmFtX25hbWVkKG1taW9fZGVidWcsIGk5MTUubW1pb19kZWJ1ZywgYm9vbCwgMDYwMCk7CiBNT0RV TEVfUEFSTV9ERVNDKG1taW9fZGVidWcsCiAJIkVuYWJsZSB0aGUgTU1JTyBkZWJ1ZyBjb2RlIChk ZWZhdWx0OiBmYWxzZSkuIFRoaXMgbWF5IG5lZ2F0aXZlbHkgIgogCSJhZmZlY3QgcGVyZm9ybWFu Y2UuIik7CisKK21vZHVsZV9wYXJhbV9uYW1lZCh2ZXJib3NlX2NoZWNrcywgaTkxNS52ZXJib3Nl X2NoZWNrcywgYm9vbCwgMDYwMCk7CitNT0RVTEVfUEFSTV9ERVNDKHZlcmJvc2VfY2hlY2tzLAor CSJFbmFibGUgdmVyYm9zZSBsb2dzIChpZS4gV0FSTl9PTigpKSBpbiBjYXNlIG9mIHVuZXhwZWN0 ZWQgY29uZGl0aW9ucy4iKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA2 MzI0N2M2Li43YjRlZDE4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0x MDI0LDcgKzEwMjQsNyBAQCB2b2lkIGFzc2VydF9wbGwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAogCXJlZyA9IERQTEwocGlwZSk7CiAJdmFsID0gSTkxNV9SRUFEKHJlZyk7CiAJ Y3VyX3N0YXRlID0gISEodmFsICYgRFBMTF9WQ09fRU5BQkxFKTsKLQlXQVJOKGN1cl9zdGF0ZSAh PSBzdGF0ZSwKKwlJOTE1X1dBUk4oY3VyX3N0YXRlICE9IHN0YXRlLAogCSAgICAgIlBMTCBzdGF0 ZSBhc3NlcnRpb24gZmFpbHVyZSAoZXhwZWN0ZWQgJXMsIGN1cnJlbnQgJXMpXG4iLAogCSAgICAg c3RhdGVfc3RyaW5nKHN0YXRlKSwgc3RhdGVfc3RyaW5nKGN1cl9zdGF0ZSkpOwogfQpAQCAtMTA0 MCw3ICsxMDQwLDcgQEAgc3RhdGljIHZvaWQgYXNzZXJ0X2RzaV9wbGwoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LCBib29sIHN0YXRlKQogCW11dGV4X3VubG9jaygmZGV2X3ByaXYt PmRwaW9fbG9jayk7CiAKIAljdXJfc3RhdGUgPSB2YWwgJiBEU0lfUExMX1ZDT19FTjsKLQlXQVJO KGN1cl9zdGF0ZSAhPSBzdGF0ZSwKKwlJOTE1X1dBUk4oY3VyX3N0YXRlICE9IHN0YXRlLAogCSAg ICAgIkRTSSBQTEwgc3RhdGUgYXNzZXJ0aW9uIGZhaWx1cmUgKGV4cGVjdGVkICVzLCBjdXJyZW50 ICVzKVxuIiwKIAkgICAgIHN0YXRlX3N0cmluZyhzdGF0ZSksIHN0YXRlX3N0cmluZyhjdXJfc3Rh dGUpKTsKIH0KQEAgLTEwNzEsNyArMTA3MSw3IEBAIHZvaWQgYXNzZXJ0X3NoYXJlZF9kcGxsKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJcmV0dXJuOwogCiAJY3VyX3N0YXRl ID0gcGxsLT5nZXRfaHdfc3RhdGUoZGV2X3ByaXYsIHBsbCwgJmh3X3N0YXRlKTsKLQlXQVJOKGN1 cl9zdGF0ZSAhPSBzdGF0ZSwKKwlJOTE1X1dBUk4oY3VyX3N0YXRlICE9IHN0YXRlLAogCSAgICAg IiVzIGFzc2VydGlvbiBmYWlsdXJlIChleHBlY3RlZCAlcywgY3VycmVudCAlcylcbiIsCiAJICAg ICBwbGwtPm5hbWUsIHN0YXRlX3N0cmluZyhzdGF0ZSksIHN0YXRlX3N0cmluZyhjdXJfc3RhdGUp KTsKIH0KQEAgLTEwOTUsNyArMTA5NSw3IEBAIHN0YXRpYyB2b2lkIGFzc2VydF9mZGlfdHgoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQl2YWwgPSBJOTE1X1JFQUQocmVnKTsK IAkJY3VyX3N0YXRlID0gISEodmFsICYgRkRJX1RYX0VOQUJMRSk7CiAJfQotCVdBUk4oY3VyX3N0 YXRlICE9IHN0YXRlLAorCUk5MTVfV0FSTihjdXJfc3RhdGUgIT0gc3RhdGUsCiAJICAgICAiRkRJ IFRYIHN0YXRlIGFzc2VydGlvbiBmYWlsdXJlIChleHBlY3RlZCAlcywgY3VycmVudCAlcylcbiIs CiAJICAgICBzdGF0ZV9zdHJpbmcoc3RhdGUpLCBzdGF0ZV9zdHJpbmcoY3VyX3N0YXRlKSk7CiB9 CkBAIC0xMTEyLDcgKzExMTIsNyBAQCBzdGF0aWMgdm9pZCBhc3NlcnRfZmRpX3J4KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlyZWcgPSBGRElfUlhfQ1RMKHBpcGUpOwogCXZh bCA9IEk5MTVfUkVBRChyZWcpOwogCWN1cl9zdGF0ZSA9ICEhKHZhbCAmIEZESV9SWF9FTkFCTEUp OwotCVdBUk4oY3VyX3N0YXRlICE9IHN0YXRlLAorCUk5MTVfV0FSTihjdXJfc3RhdGUgIT0gc3Rh dGUsCiAJICAgICAiRkRJIFJYIHN0YXRlIGFzc2VydGlvbiBmYWlsdXJlIChleHBlY3RlZCAlcywg Y3VycmVudCAlcylcbiIsCiAJICAgICBzdGF0ZV9zdHJpbmcoc3RhdGUpLCBzdGF0ZV9zdHJpbmco Y3VyX3N0YXRlKSk7CiB9CkBAIC0xMTM1LDcgKzExMzUsNyBAQCBzdGF0aWMgdm9pZCBhc3NlcnRf ZmRpX3R4X3BsbF9lbmFibGVkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAog CXJlZyA9IEZESV9UWF9DVEwocGlwZSk7CiAJdmFsID0gSTkxNV9SRUFEKHJlZyk7Ci0JV0FSTigh KHZhbCAmIEZESV9UWF9QTExfRU5BQkxFKSwgIkZESSBUWCBQTEwgYXNzZXJ0aW9uIGZhaWx1cmUs IHNob3VsZCBiZSBhY3RpdmUgYnV0IGlzIGRpc2FibGVkXG4iKTsKKwlJOTE1X1dBUk4oISh2YWwg JiBGRElfVFhfUExMX0VOQUJMRSksICJGREkgVFggUExMIGFzc2VydGlvbiBmYWlsdXJlLCBzaG91 bGQgYmUgYWN0aXZlIGJ1dCBpcyBkaXNhYmxlZFxuIik7CiB9CiAKIHZvaWQgYXNzZXJ0X2ZkaV9y eF9wbGwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LApAQCAtMTE0OCw3ICsxMTQ4 LDcgQEAgdm9pZCBhc3NlcnRfZmRpX3J4X3BsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJcmVnID0gRkRJX1JYX0NUTChwaXBlKTsKIAl2YWwgPSBJOTE1X1JFQUQocmVnKTsK IAljdXJfc3RhdGUgPSAhISh2YWwgJiBGRElfUlhfUExMX0VOQUJMRSk7Ci0JV0FSTihjdXJfc3Rh dGUgIT0gc3RhdGUsCisJSTkxNV9XQVJOKGN1cl9zdGF0ZSAhPSBzdGF0ZSwKIAkgICAgICJGREkg UlggUExMIGFzc2VydGlvbiBmYWlsdXJlIChleHBlY3RlZCAlcywgY3VycmVudCAlcylcbiIsCiAJ ICAgICBzdGF0ZV9zdHJpbmcoc3RhdGUpLCBzdGF0ZV9zdHJpbmcoY3VyX3N0YXRlKSk7CiB9CkBA IC0xMTkwLDcgKzExOTAsNyBAQCB2b2lkIGFzc2VydF9wYW5lbF91bmxvY2tlZChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJICAgICgodmFsICYgUEFORUxfVU5MT0NLX01BU0sp ID09IFBBTkVMX1VOTE9DS19SRUdTKSkKIAkJbG9ja2VkID0gZmFsc2U7CiAKLQlXQVJOKHBhbmVs X3BpcGUgPT0gcGlwZSAmJiBsb2NrZWQsCisJSTkxNV9XQVJOKHBhbmVsX3BpcGUgPT0gcGlwZSAm JiBsb2NrZWQsCiAJICAgICAicGFuZWwgYXNzZXJ0aW9uIGZhaWx1cmUsIHBpcGUgJWMgcmVncyBs b2NrZWRcbiIsCiAJICAgICBwaXBlX25hbWUocGlwZSkpOwogfQpAQCAtMTIwNiw3ICsxMjA2LDcg QEAgc3RhdGljIHZvaWQgYXNzZXJ0X2N1cnNvcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJZWxzZQogCQljdXJfc3RhdGUgPSBJOTE1X1JFQUQoQ1VSQ05UUihwaXBlKSkgJiBD VVJTT1JfTU9ERTsKIAotCVdBUk4oY3VyX3N0YXRlICE9IHN0YXRlLAorCUk5MTVfV0FSTihjdXJf c3RhdGUgIT0gc3RhdGUsCiAJICAgICAiY3Vyc29yIG9uIHBpcGUgJWMgYXNzZXJ0aW9uIGZhaWx1 cmUgKGV4cGVjdGVkICVzLCBjdXJyZW50ICVzKVxuIiwKIAkgICAgIHBpcGVfbmFtZShwaXBlKSwg c3RhdGVfc3RyaW5nKHN0YXRlKSwgc3RhdGVfc3RyaW5nKGN1cl9zdGF0ZSkpOwogfQpAQCAtMTIz Niw3ICsxMjM2LDcgQEAgdm9pZCBhc3NlcnRfcGlwZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAJCWN1cl9zdGF0ZSA9ICEhKHZhbCAmIFBJUEVDT05GX0VOQUJMRSk7CiAJfQog Ci0JV0FSTihjdXJfc3RhdGUgIT0gc3RhdGUsCisJSTkxNV9XQVJOKGN1cl9zdGF0ZSAhPSBzdGF0 ZSwKIAkgICAgICJwaXBlICVjIGFzc2VydGlvbiBmYWlsdXJlIChleHBlY3RlZCAlcywgY3VycmVu dCAlcylcbiIsCiAJICAgICBwaXBlX25hbWUocGlwZSksIHN0YXRlX3N0cmluZyhzdGF0ZSksIHN0 YXRlX3N0cmluZyhjdXJfc3RhdGUpKTsKIH0KQEAgLTEyNTEsNyArMTI1MSw3IEBAIHN0YXRpYyB2 b2lkIGFzc2VydF9wbGFuZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJcmVn ID0gRFNQQ05UUihwbGFuZSk7CiAJdmFsID0gSTkxNV9SRUFEKHJlZyk7CiAJY3VyX3N0YXRlID0g ISEodmFsICYgRElTUExBWV9QTEFORV9FTkFCTEUpOwotCVdBUk4oY3VyX3N0YXRlICE9IHN0YXRl LAorCUk5MTVfV0FSTihjdXJfc3RhdGUgIT0gc3RhdGUsCiAJICAgICAicGxhbmUgJWMgYXNzZXJ0 aW9uIGZhaWx1cmUgKGV4cGVjdGVkICVzLCBjdXJyZW50ICVzKVxuIiwKIAkgICAgIHBsYW5lX25h bWUocGxhbmUpLCBzdGF0ZV9zdHJpbmcoc3RhdGUpLCBzdGF0ZV9zdHJpbmcoY3VyX3N0YXRlKSk7 CiB9CkBAIC0xMjcxLDcgKzEyNzEsNyBAQCBzdGF0aWMgdm9pZCBhc3NlcnRfcGxhbmVzX2Rpc2Fi bGVkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlpZiAoSU5URUxfSU5GTyhk ZXYpLT5nZW4gPj0gNCkgewogCQlyZWcgPSBEU1BDTlRSKHBpcGUpOwogCQl2YWwgPSBJOTE1X1JF QUQocmVnKTsKLQkJV0FSTih2YWwgJiBESVNQTEFZX1BMQU5FX0VOQUJMRSwKKwkJSTkxNV9XQVJO KHZhbCAmIERJU1BMQVlfUExBTkVfRU5BQkxFLAogCQkgICAgICJwbGFuZSAlYyBhc3NlcnRpb24g ZmFpbHVyZSwgc2hvdWxkIGJlIGRpc2FibGVkIGJ1dCBub3RcbiIsCiAJCSAgICAgcGxhbmVfbmFt ZShwaXBlKSk7CiAJCXJldHVybjsKQEAgLTEyODMsNyArMTI4Myw3IEBAIHN0YXRpYyB2b2lkIGFz c2VydF9wbGFuZXNfZGlzYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAog CQl2YWwgPSBJOTE1X1JFQUQocmVnKTsKIAkJY3VyX3BpcGUgPSAodmFsICYgRElTUFBMQU5FX1NF TF9QSVBFX01BU0spID4+CiAJCQlESVNQUExBTkVfU0VMX1BJUEVfU0hJRlQ7Ci0JCVdBUk4oKHZh bCAmIERJU1BMQVlfUExBTkVfRU5BQkxFKSAmJiBwaXBlID09IGN1cl9waXBlLAorCQlJOTE1X1dB Uk4oKHZhbCAmIERJU1BMQVlfUExBTkVfRU5BQkxFKSAmJiBwaXBlID09IGN1cl9waXBlLAogCQkg ICAgICJwbGFuZSAlYyBhc3NlcnRpb24gZmFpbHVyZSwgc2hvdWxkIGJlIG9mZiBvbiBwaXBlICVj IGJ1dCBpcyBzdGlsbCBhY3RpdmVcbiIsCiAJCSAgICAgcGxhbmVfbmFtZShpKSwgcGlwZV9uYW1l KHBpcGUpKTsKIAl9CkBAIC0xMjk5LDcgKzEyOTksNyBAQCBzdGF0aWMgdm9pZCBhc3NlcnRfc3By aXRlc19kaXNhYmxlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJaWYgKElO VEVMX0lORk8oZGV2KS0+Z2VuID49IDkpIHsKIAkJZm9yX2VhY2hfc3ByaXRlKHBpcGUsIHNwcml0 ZSkgewogCQkJdmFsID0gSTkxNV9SRUFEKFBMQU5FX0NUTChwaXBlLCBzcHJpdGUpKTsKLQkJCVdB Uk4odmFsICYgUExBTkVfQ1RMX0VOQUJMRSwKKwkJCUk5MTVfV0FSTih2YWwgJiBQTEFORV9DVExf RU5BQkxFLAogCQkJICAgICAicGxhbmUgJWQgYXNzZXJ0aW9uIGZhaWx1cmUsIHNob3VsZCBiZSBv ZmYgb24gcGlwZSAlYyBidXQgaXMgc3RpbGwgYWN0aXZlXG4iLAogCQkJICAgICBzcHJpdGUsIHBp cGVfbmFtZShwaXBlKSk7CiAJCX0KQEAgLTEzMDcsMjAgKzEzMDcsMjAgQEAgc3RhdGljIHZvaWQg YXNzZXJ0X3Nwcml0ZXNfZGlzYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LAogCQlmb3JfZWFjaF9zcHJpdGUocGlwZSwgc3ByaXRlKSB7CiAJCQlyZWcgPSBTUENOVFIocGlw ZSwgc3ByaXRlKTsKIAkJCXZhbCA9IEk5MTVfUkVBRChyZWcpOwotCQkJV0FSTih2YWwgJiBTUF9F TkFCTEUsCisJCQlJOTE1X1dBUk4odmFsICYgU1BfRU5BQkxFLAogCQkJICAgICAic3ByaXRlICVj IGFzc2VydGlvbiBmYWlsdXJlLCBzaG91bGQgYmUgb2ZmIG9uIHBpcGUgJWMgYnV0IGlzIHN0aWxs IGFjdGl2ZVxuIiwKIAkJCSAgICAgc3ByaXRlX25hbWUocGlwZSwgc3ByaXRlKSwgcGlwZV9uYW1l KHBpcGUpKTsKIAkJfQogCX0gZWxzZSBpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNykgewog CQlyZWcgPSBTUFJDVEwocGlwZSk7CiAJCXZhbCA9IEk5MTVfUkVBRChyZWcpOwotCQlXQVJOKHZh bCAmIFNQUklURV9FTkFCTEUsCisJCUk5MTVfV0FSTih2YWwgJiBTUFJJVEVfRU5BQkxFLAogCQkg ICAgICJzcHJpdGUgJWMgYXNzZXJ0aW9uIGZhaWx1cmUsIHNob3VsZCBiZSBvZmYgb24gcGlwZSAl YyBidXQgaXMgc3RpbGwgYWN0aXZlXG4iLAogCQkgICAgIHBsYW5lX25hbWUocGlwZSksIHBpcGVf bmFtZShwaXBlKSk7CiAJfSBlbHNlIGlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA1KSB7CiAJ CXJlZyA9IERWU0NOVFIocGlwZSk7CiAJCXZhbCA9IEk5MTVfUkVBRChyZWcpOwotCQlXQVJOKHZh bCAmIERWU19FTkFCTEUsCisJCUk5MTVfV0FSTih2YWwgJiBEVlNfRU5BQkxFLAogCQkgICAgICJz cHJpdGUgJWMgYXNzZXJ0aW9uIGZhaWx1cmUsIHNob3VsZCBiZSBvZmYgb24gcGlwZSAlYyBidXQg aXMgc3RpbGwgYWN0aXZlXG4iLAogCQkgICAgIHBsYW5lX25hbWUocGlwZSksIHBpcGVfbmFtZShw aXBlKSk7CiAJfQpAQCAtMTMyOCw3ICsxMzI4LDcgQEAgc3RhdGljIHZvaWQgYXNzZXJ0X3Nwcml0 ZXNfZGlzYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCiBzdGF0aWMg dm9pZCBhc3NlcnRfdmJsYW5rX2Rpc2FibGVkKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKLQlp ZiAoV0FSTl9PTihkcm1fY3J0Y192YmxhbmtfZ2V0KGNydGMpID09IDApKQorCWlmIChJOTE1X1dB Uk5fT04oZHJtX2NydGNfdmJsYW5rX2dldChjcnRjKSA9PSAwKSkKIAkJZHJtX2NydGNfdmJsYW5r X3B1dChjcnRjKTsKIH0KIApAQCAtMTMzNywxMiArMTMzNywxMiBAQCBzdGF0aWMgdm9pZCBpYnhf YXNzZXJ0X3BjaF9yZWZjbGtfZW5hYmxlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpCiAJdTMyIHZhbDsKIAlib29sIGVuYWJsZWQ7CiAKLQlXQVJOX09OKCEoSEFTX1BDSF9JQlgo ZGV2X3ByaXYtPmRldikgfHwgSEFTX1BDSF9DUFQoZGV2X3ByaXYtPmRldikpKTsKKwlJOTE1X1dB Uk5fT04oIShIQVNfUENIX0lCWChkZXZfcHJpdi0+ZGV2KSB8fCBIQVNfUENIX0NQVChkZXZfcHJp di0+ZGV2KSkpOwogCiAJdmFsID0gSTkxNV9SRUFEKFBDSF9EUkVGX0NPTlRST0wpOwogCWVuYWJs ZWQgPSAhISh2YWwgJiAoRFJFRl9TU0NfU09VUkNFX01BU0sgfCBEUkVGX05PTlNQUkVBRF9TT1VS Q0VfTUFTSyB8CiAJCQkgICAgRFJFRl9TVVBFUlNQUkVBRF9TT1VSQ0VfTUFTSykpOwotCVdBUk4o IWVuYWJsZWQsICJQQ0ggcmVmY2xrIGFzc2VydGlvbiBmYWlsdXJlLCBzaG91bGQgYmUgYWN0aXZl IGJ1dCBpcyBkaXNhYmxlZFxuIik7CisJSTkxNV9XQVJOKCFlbmFibGVkLCAiUENIIHJlZmNsayBh c3NlcnRpb24gZmFpbHVyZSwgc2hvdWxkIGJlIGFjdGl2ZSBidXQgaXMgZGlzYWJsZWRcbiIpOwog fQogCiBzdGF0aWMgdm9pZCBhc3NlcnRfcGNoX3RyYW5zY29kZXJfZGlzYWJsZWQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LApAQCAtMTM1NSw3ICsxMzU1LDcgQEAgc3RhdGljIHZv aWQgYXNzZXJ0X3BjaF90cmFuc2NvZGVyX2Rpc2FibGVkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAlyZWcgPSBQQ0hfVFJBTlNDT05GKHBpcGUpOwogCXZhbCA9IEk5MTVfUkVB RChyZWcpOwogCWVuYWJsZWQgPSAhISh2YWwgJiBUUkFOU19FTkFCTEUpOwotCVdBUk4oZW5hYmxl ZCwKKwlJOTE1X1dBUk4oZW5hYmxlZCwKIAkgICAgICJ0cmFuc2NvZGVyIGFzc2VydGlvbiBmYWls ZWQsIHNob3VsZCBiZSBvZmYgb24gcGlwZSAlYyBidXQgaXMgc3RpbGwgYWN0aXZlXG4iLAogCSAg ICAgcGlwZV9uYW1lKHBpcGUpKTsKIH0KQEAgLTE0MzUsMTEgKzE0MzUsMTEgQEAgc3RhdGljIHZv aWQgYXNzZXJ0X3BjaF9kcF9kaXNhYmxlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCiAJCQkJICAgZW51bSBwaXBlIHBpcGUsIGludCByZWcsIHUzMiBwb3J0X3NlbCkKIHsKIAl1 MzIgdmFsID0gSTkxNV9SRUFEKHJlZyk7Ci0JV0FSTihkcF9waXBlX2VuYWJsZWQoZGV2X3ByaXYs IHBpcGUsIHBvcnRfc2VsLCB2YWwpLAorCUk5MTVfV0FSTihkcF9waXBlX2VuYWJsZWQoZGV2X3By aXYsIHBpcGUsIHBvcnRfc2VsLCB2YWwpLAogCSAgICAgIlBDSCBEUCAoMHglMDh4KSBlbmFibGVk IG9uIHRyYW5zY29kZXIgJWMsIHNob3VsZCBiZSBkaXNhYmxlZFxuIiwKIAkgICAgIHJlZywgcGlw ZV9uYW1lKHBpcGUpKTsKIAotCVdBUk4oSEFTX1BDSF9JQlgoZGV2X3ByaXYtPmRldikgJiYgKHZh bCAmIERQX1BPUlRfRU4pID09IDAKKwlJOTE1X1dBUk4oSEFTX1BDSF9JQlgoZGV2X3ByaXYtPmRl dikgJiYgKHZhbCAmIERQX1BPUlRfRU4pID09IDAKIAkgICAgICYmICh2YWwgJiBEUF9QSVBFQl9T RUxFQ1QpLAogCSAgICAgIklCWCBQQ0ggZHAgcG9ydCBzdGlsbCB1c2luZyB0cmFuc2NvZGVyIEJc biIpOwogfQpAQCAtMTQ0OCwxMSArMTQ0OCwxMSBAQCBzdGF0aWMgdm9pZCBhc3NlcnRfcGNoX2hk bWlfZGlzYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCSAgICAg ZW51bSBwaXBlIHBpcGUsIGludCByZWcpCiB7CiAJdTMyIHZhbCA9IEk5MTVfUkVBRChyZWcpOwot CVdBUk4oaGRtaV9waXBlX2VuYWJsZWQoZGV2X3ByaXYsIHBpcGUsIHZhbCksCisJSTkxNV9XQVJO KGhkbWlfcGlwZV9lbmFibGVkKGRldl9wcml2LCBwaXBlLCB2YWwpLAogCSAgICAgIlBDSCBIRE1J ICgweCUwOHgpIGVuYWJsZWQgb24gdHJhbnNjb2RlciAlYywgc2hvdWxkIGJlIGRpc2FibGVkXG4i LAogCSAgICAgcmVnLCBwaXBlX25hbWUocGlwZSkpOwogCi0JV0FSTihIQVNfUENIX0lCWChkZXZf cHJpdi0+ZGV2KSAmJiAodmFsICYgU0RWT19FTkFCTEUpID09IDAKKwlJOTE1X1dBUk4oSEFTX1BD SF9JQlgoZGV2X3ByaXYtPmRldikgJiYgKHZhbCAmIFNEVk9fRU5BQkxFKSA9PSAwCiAJICAgICAm JiAodmFsICYgU0RWT19QSVBFX0JfU0VMRUNUKSwKIAkgICAgICJJQlggUENIIGhkbWkgcG9ydCBz dGlsbCB1c2luZyB0cmFuc2NvZGVyIEJcbiIpOwogfQpAQCAtMTQ2OSwxMyArMTQ2OSwxMyBAQCBz dGF0aWMgdm9pZCBhc3NlcnRfcGNoX3BvcnRzX2Rpc2FibGVkKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKIAogCXJlZyA9IFBDSF9BRFBBOwogCXZhbCA9IEk5MTVfUkVBRChyZWcp OwotCVdBUk4oYWRwYV9waXBlX2VuYWJsZWQoZGV2X3ByaXYsIHBpcGUsIHZhbCksCisJSTkxNV9X QVJOKGFkcGFfcGlwZV9lbmFibGVkKGRldl9wcml2LCBwaXBlLCB2YWwpLAogCSAgICAgIlBDSCBW R0EgZW5hYmxlZCBvbiB0cmFuc2NvZGVyICVjLCBzaG91bGQgYmUgZGlzYWJsZWRcbiIsCiAJICAg ICBwaXBlX25hbWUocGlwZSkpOwogCiAJcmVnID0gUENIX0xWRFM7CiAJdmFsID0gSTkxNV9SRUFE KHJlZyk7Ci0JV0FSTihsdmRzX3BpcGVfZW5hYmxlZChkZXZfcHJpdiwgcGlwZSwgdmFsKSwKKwlJ OTE1X1dBUk4obHZkc19waXBlX2VuYWJsZWQoZGV2X3ByaXYsIHBpcGUsIHZhbCksCiAJICAgICAi UENIIExWRFMgZW5hYmxlZCBvbiB0cmFuc2NvZGVyICVjLCBzaG91bGQgYmUgZGlzYWJsZWRcbiIs CiAJICAgICBwaXBlX25hbWUocGlwZSkpOwogCkBAIC01MzgyLDI1ICs1MzgyLDI1IEBAIHN0YXRp YyB2b2lkIGludGVsX2Nvbm5lY3Rvcl9jaGVja19zdGF0ZShzdHJ1Y3QgaW50ZWxfY29ubmVjdG9y ICpjb25uZWN0b3IpCiAJCWlmIChjb25uZWN0b3ItPm1zdF9wb3J0KQogCQkJcmV0dXJuOwogCi0J CVdBUk4oY29ubmVjdG9yLT5iYXNlLmRwbXMgPT0gRFJNX01PREVfRFBNU19PRkYsCisJCUk5MTVf V0FSTihjb25uZWN0b3ItPmJhc2UuZHBtcyA9PSBEUk1fTU9ERV9EUE1TX09GRiwKIAkJICAgICAi d3JvbmcgY29ubmVjdG9yIGRwbXMgc3RhdGVcbiIpOwotCQlXQVJOKGNvbm5lY3Rvci0+YmFzZS5l bmNvZGVyICE9ICZlbmNvZGVyLT5iYXNlLAorCQlJOTE1X1dBUk4oY29ubmVjdG9yLT5iYXNlLmVu Y29kZXIgIT0gJmVuY29kZXItPmJhc2UsCiAJCSAgICAgImFjdGl2ZSBjb25uZWN0b3Igbm90IGxp bmtlZCB0byBlbmNvZGVyXG4iKTsKIAogCQlpZiAoZW5jb2RlcikgewotCQkJV0FSTighZW5jb2Rl ci0+Y29ubmVjdG9yc19hY3RpdmUsCisJCQlJOTE1X1dBUk4oIWVuY29kZXItPmNvbm5lY3RvcnNf YWN0aXZlLAogCQkJICAgICAiZW5jb2Rlci0+Y29ubmVjdG9yc19hY3RpdmUgbm90IHNldFxuIik7 CiAKIAkJCWVuY29kZXJfZW5hYmxlZCA9IGVuY29kZXItPmdldF9od19zdGF0ZShlbmNvZGVyLCAm cGlwZSk7Ci0JCQlXQVJOKCFlbmNvZGVyX2VuYWJsZWQsICJlbmNvZGVyIG5vdCBlbmFibGVkXG4i KTsKLQkJCWlmIChXQVJOX09OKCFlbmNvZGVyLT5iYXNlLmNydGMpKQorCQkJSTkxNV9XQVJOKCFl bmNvZGVyX2VuYWJsZWQsICJlbmNvZGVyIG5vdCBlbmFibGVkXG4iKTsKKwkJCWlmIChJOTE1X1dB Uk5fT04oIWVuY29kZXItPmJhc2UuY3J0YykpCiAJCQkJcmV0dXJuOwogCiAJCQljcnRjID0gZW5j b2Rlci0+YmFzZS5jcnRjOwogCi0JCQlXQVJOKCFjcnRjLT5lbmFibGVkLCAiY3J0YyBub3QgZW5h YmxlZFxuIik7Ci0JCQlXQVJOKCF0b19pbnRlbF9jcnRjKGNydGMpLT5hY3RpdmUsICJjcnRjIG5v dCBhY3RpdmVcbiIpOwotCQkJV0FSTihwaXBlICE9IHRvX2ludGVsX2NydGMoY3J0YyktPnBpcGUs CisJCQlJOTE1X1dBUk4oIWNydGMtPmVuYWJsZWQsICJjcnRjIG5vdCBlbmFibGVkXG4iKTsKKwkJ CUk5MTVfV0FSTighdG9faW50ZWxfY3J0YyhjcnRjKS0+YWN0aXZlLCAiY3J0YyBub3QgYWN0aXZl XG4iKTsKKwkJCUk5MTVfV0FSTihwaXBlICE9IHRvX2ludGVsX2NydGMoY3J0YyktPnBpcGUsCiAJ CQkgICAgICJlbmNvZGVyIGFjdGl2ZSBvbiB0aGUgd3JvbmcgcGlwZVxuIik7CiAJCX0KIAl9CkBA IC03ODEwLDI0ICs3ODEwLDI0IEBAIHN0YXRpYyB2b2lkIGFzc2VydF9jYW5fZGlzYWJsZV9sY3Bs bChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJc3RydWN0IGludGVsX2NydGMg KmNydGM7CiAKIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0YykKLQkJV0FSTihjcnRjLT5h Y3RpdmUsICJDUlRDIGZvciBwaXBlICVjIGVuYWJsZWRcbiIsCisJCUk5MTVfV0FSTihjcnRjLT5h Y3RpdmUsICJDUlRDIGZvciBwaXBlICVjIGVuYWJsZWRcbiIsCiAJCSAgICAgcGlwZV9uYW1lKGNy dGMtPnBpcGUpKTsKIAotCVdBUk4oSTkxNV9SRUFEKEhTV19QV1JfV0VMTF9EUklWRVIpLCAiUG93 ZXIgd2VsbCBvblxuIik7Ci0JV0FSTihJOTE1X1JFQUQoU1BMTF9DVEwpICYgU1BMTF9QTExfRU5B QkxFLCAiU1BMTCBlbmFibGVkXG4iKTsKLQlXQVJOKEk5MTVfUkVBRChXUlBMTF9DVEwxKSAmIFdS UExMX1BMTF9FTkFCTEUsICJXUlBMTDEgZW5hYmxlZFxuIik7Ci0JV0FSTihJOTE1X1JFQUQoV1JQ TExfQ1RMMikgJiBXUlBMTF9QTExfRU5BQkxFLCAiV1JQTEwyIGVuYWJsZWRcbiIpOwotCVdBUk4o STkxNV9SRUFEKFBDSF9QUF9TVEFUVVMpICYgUFBfT04sICJQYW5lbCBwb3dlciBvblxuIik7Ci0J V0FSTihJOTE1X1JFQUQoQkxDX1BXTV9DUFVfQ1RMMikgJiBCTE1fUFdNX0VOQUJMRSwKKwlJOTE1 X1dBUk4oSTkxNV9SRUFEKEhTV19QV1JfV0VMTF9EUklWRVIpLCAiUG93ZXIgd2VsbCBvblxuIik7 CisJSTkxNV9XQVJOKEk5MTVfUkVBRChTUExMX0NUTCkgJiBTUExMX1BMTF9FTkFCTEUsICJTUExM IGVuYWJsZWRcbiIpOworCUk5MTVfV0FSTihJOTE1X1JFQUQoV1JQTExfQ1RMMSkgJiBXUlBMTF9Q TExfRU5BQkxFLCAiV1JQTEwxIGVuYWJsZWRcbiIpOworCUk5MTVfV0FSTihJOTE1X1JFQUQoV1JQ TExfQ1RMMikgJiBXUlBMTF9QTExfRU5BQkxFLCAiV1JQTEwyIGVuYWJsZWRcbiIpOworCUk5MTVf V0FSTihJOTE1X1JFQUQoUENIX1BQX1NUQVRVUykgJiBQUF9PTiwgIlBhbmVsIHBvd2VyIG9uXG4i KTsKKwlJOTE1X1dBUk4oSTkxNV9SRUFEKEJMQ19QV01fQ1BVX0NUTDIpICYgQkxNX1BXTV9FTkFC TEUsCiAJICAgICAiQ1BVIFBXTTEgZW5hYmxlZFxuIik7CiAJaWYgKElTX0hBU1dFTEwoZGV2KSkK LQkJV0FSTihJOTE1X1JFQUQoSFNXX0JMQ19QV00yX0NUTCkgJiBCTE1fUFdNX0VOQUJMRSwKKwkJ STkxNV9XQVJOKEk5MTVfUkVBRChIU1dfQkxDX1BXTTJfQ1RMKSAmIEJMTV9QV01fRU5BQkxFLAog CQkgICAgICJDUFUgUFdNMiBlbmFibGVkXG4iKTsKLQlXQVJOKEk5MTVfUkVBRChCTENfUFdNX1BD SF9DVEwxKSAmIEJMTV9QQ0hfUFdNX0VOQUJMRSwKKwlJOTE1X1dBUk4oSTkxNV9SRUFEKEJMQ19Q V01fUENIX0NUTDEpICYgQkxNX1BDSF9QV01fRU5BQkxFLAogCSAgICAgIlBDSCBQV00xIGVuYWJs ZWRcbiIpOwotCVdBUk4oSTkxNV9SRUFEKFVUSUxfUElOX0NUTCkgJiBVVElMX1BJTl9FTkFCTEUs CisJSTkxNV9XQVJOKEk5MTVfUkVBRChVVElMX1BJTl9DVEwpICYgVVRJTF9QSU5fRU5BQkxFLAog CSAgICAgIlV0aWxpdHkgcGluIGVuYWJsZWRcbiIpOwotCVdBUk4oSTkxNV9SRUFEKFBDSF9HVENf Q1RMKSAmIFBDSF9HVENfRU5BQkxFLCAiUENIIEdUQyBlbmFibGVkXG4iKTsKKwlJOTE1X1dBUk4o STkxNV9SRUFEKFBDSF9HVENfQ1RMKSAmIFBDSF9HVENfRU5BQkxFLCAiUENIIEdUQyBlbmFibGVk XG4iKTsKIAogCS8qCiAJICogSW4gdGhlb3J5IHdlIGNhbiBzdGlsbCBsZWF2ZSBJUlFzIGVuYWJs ZWQsIGFzIGxvbmcgYXMgb25seSB0aGUgSFBECkBAIC03ODM1LDcgKzc4MzUsNyBAQCBzdGF0aWMg dm9pZCBhc3NlcnRfY2FuX2Rpc2FibGVfbGNwbGwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogCSAqIGdlbi1zcGVjaWZpYyBhbmQgc2luY2Ugd2Ugb25seSBkaXNhYmxlIExDUExM IGFmdGVyIHdlIGZ1bGx5IGRpc2FibGUKIAkgKiB0aGUgaW50ZXJydXB0cywgdGhlIGNoZWNrIGJl bG93IHNob3VsZCBiZSBlbm91Z2guCiAJICovCi0JV0FSTihpbnRlbF9pcnFzX2VuYWJsZWQoZGV2 X3ByaXYpLCAiSVJRcyBlbmFibGVkXG4iKTsKKwlJOTE1X1dBUk4oaW50ZWxfaXJxc19lbmFibGVk KGRldl9wcml2KSwgIklSUXMgZW5hYmxlZFxuIik7CiB9CiAKIHN0YXRpYyB1aW50MzJfdCBoc3df cmVhZF9kY29tcChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCkBAIC0xMDc0Miw3 ICsxMDc0Miw3IEBAIGNoZWNrX2Nvbm5lY3Rvcl9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCQkgKiAtPmdldF9od19zdGF0ZSBjYWxsYmFja3MuICovCiAJCWludGVsX2Nvbm5lY3Rvcl9j aGVja19zdGF0ZShjb25uZWN0b3IpOwogCi0JCVdBUk4oJmNvbm5lY3Rvci0+bmV3X2VuY29kZXIt PmJhc2UgIT0gY29ubmVjdG9yLT5iYXNlLmVuY29kZXIsCisJCUk5MTVfV0FSTigmY29ubmVjdG9y LT5uZXdfZW5jb2Rlci0+YmFzZSAhPSBjb25uZWN0b3ItPmJhc2UuZW5jb2RlciwKIAkJICAgICAi Y29ubmVjdG9yJ3Mgc3RhZ2VkIGVuY29kZXIgZG9lc24ndCBtYXRjaCBjdXJyZW50IGVuY29kZXJc biIpOwogCX0KIH0KQEAgLTEwNzYyLDkgKzEwNzYyLDkgQEAgY2hlY2tfZW5jb2Rlcl9zdGF0ZShz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJICAgICAgZW5jb2Rlci0+YmFzZS5iYXNlLmlkLAog CQkJICAgICAgZW5jb2Rlci0+YmFzZS5uYW1lKTsKIAotCQlXQVJOKCZlbmNvZGVyLT5uZXdfY3J0 Yy0+YmFzZSAhPSBlbmNvZGVyLT5iYXNlLmNydGMsCisJCUk5MTVfV0FSTigmZW5jb2Rlci0+bmV3 X2NydGMtPmJhc2UgIT0gZW5jb2Rlci0+YmFzZS5jcnRjLAogCQkgICAgICJlbmNvZGVyJ3Mgc3Rh Z2UgY3J0YyBkb2Vzbid0IG1hdGNoIGN1cnJlbnQgY3J0Y1xuIik7Ci0JCVdBUk4oZW5jb2Rlci0+ Y29ubmVjdG9yc19hY3RpdmUgJiYgIWVuY29kZXItPmJhc2UuY3J0YywKKwkJSTkxNV9XQVJOKGVu Y29kZXItPmNvbm5lY3RvcnNfYWN0aXZlICYmICFlbmNvZGVyLT5iYXNlLmNydGMsCiAJCSAgICAg ImVuY29kZXIncyBhY3RpdmVfY29ubmVjdG9ycyBzZXQsIGJ1dCBubyBjcnRjXG4iKTsKIAogCQls aXN0X2Zvcl9lYWNoX2VudHJ5KGNvbm5lY3RvciwgJmRldi0+bW9kZV9jb25maWcuY29ubmVjdG9y X2xpc3QsCkBAIC0xMDc4MywxOSArMTA3ODMsMTkgQEAgY2hlY2tfZW5jb2Rlcl9zdGF0ZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCQlpZiAoIWVuYWJsZWQgJiYgZW5jb2Rlci0+YmFzZS5lbmNv ZGVyX3R5cGUgPT0gRFJNX01PREVfRU5DT0RFUl9EUE1TVCkKIAkJCWNvbnRpbnVlOwogCi0JCVdB Uk4oISFlbmNvZGVyLT5iYXNlLmNydGMgIT0gZW5hYmxlZCwKKwkJSTkxNV9XQVJOKCEhZW5jb2Rl ci0+YmFzZS5jcnRjICE9IGVuYWJsZWQsCiAJCSAgICAgImVuY29kZXIncyBlbmFibGVkIHN0YXRl IG1pc21hdGNoICIKIAkJICAgICAiKGV4cGVjdGVkICVpLCBmb3VuZCAlaSlcbiIsCiAJCSAgICAg ISFlbmNvZGVyLT5iYXNlLmNydGMsIGVuYWJsZWQpOwotCQlXQVJOKGFjdGl2ZSAmJiAhZW5jb2Rl ci0+YmFzZS5jcnRjLAorCQlJOTE1X1dBUk4oYWN0aXZlICYmICFlbmNvZGVyLT5iYXNlLmNydGMs CiAJCSAgICAgImFjdGl2ZSBlbmNvZGVyIHdpdGggbm8gY3J0Y1xuIik7CiAKLQkJV0FSTihlbmNv ZGVyLT5jb25uZWN0b3JzX2FjdGl2ZSAhPSBhY3RpdmUsCisJCUk5MTVfV0FSTihlbmNvZGVyLT5j b25uZWN0b3JzX2FjdGl2ZSAhPSBhY3RpdmUsCiAJCSAgICAgImVuY29kZXIncyBjb21wdXRlZCBh Y3RpdmUgc3RhdGUgZG9lc24ndCBtYXRjaCB0cmFja2VkIGFjdGl2ZSBzdGF0ZSAiCiAJCSAgICAg IihleHBlY3RlZCAlaSwgZm91bmQgJWkpXG4iLCBhY3RpdmUsIGVuY29kZXItPmNvbm5lY3RvcnNf YWN0aXZlKTsKIAogCQlhY3RpdmUgPSBlbmNvZGVyLT5nZXRfaHdfc3RhdGUoZW5jb2RlciwgJnBp cGUpOwotCQlXQVJOKGFjdGl2ZSAhPSBlbmNvZGVyLT5jb25uZWN0b3JzX2FjdGl2ZSwKKwkJSTkx NV9XQVJOKGFjdGl2ZSAhPSBlbmNvZGVyLT5jb25uZWN0b3JzX2FjdGl2ZSwKIAkJICAgICAiZW5j b2RlcidzIGh3IHN0YXRlIGRvZXNuJ3QgbWF0Y2ggc3cgdHJhY2tpbmcgIgogCQkgICAgICIoZXhw ZWN0ZWQgJWksIGZvdW5kICVpKVxuIiwKIAkJICAgICBlbmNvZGVyLT5jb25uZWN0b3JzX2FjdGl2 ZSwgYWN0aXZlKTsKQEAgLTEwODA0LDcgKzEwODA0LDcgQEAgY2hlY2tfZW5jb2Rlcl9zdGF0ZShz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJY29udGludWU7CiAKIAkJdHJhY2tlZF9waXBlID0g dG9faW50ZWxfY3J0YyhlbmNvZGVyLT5iYXNlLmNydGMpLT5waXBlOwotCQlXQVJOKGFjdGl2ZSAm JiBwaXBlICE9IHRyYWNrZWRfcGlwZSwKKwkJSTkxNV9XQVJOKGFjdGl2ZSAmJiBwaXBlICE9IHRy YWNrZWRfcGlwZSwKIAkJICAgICAiYWN0aXZlIGVuY29kZXIncyBwaXBlIGRvZXNuJ3QgbWF0Y2gi CiAJCSAgICAgIihleHBlY3RlZCAlaSwgZm91bmQgJWkpXG4iLAogCQkgICAgIHRyYWNrZWRfcGlw ZSwgcGlwZSk7CkBAIC0xMDgyOSw3ICsxMDgyOSw3IEBAIGNoZWNrX2NydGNfc3RhdGUoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAkJRFJNX0RFQlVHX0tNUygiW0NSVEM6JWRdXG4iLAogCQkJICAg ICAgY3J0Yy0+YmFzZS5iYXNlLmlkKTsKIAotCQlXQVJOKGNydGMtPmFjdGl2ZSAmJiAhY3J0Yy0+ YmFzZS5lbmFibGVkLAorCQlJOTE1X1dBUk4oY3J0Yy0+YWN0aXZlICYmICFjcnRjLT5iYXNlLmVu YWJsZWQsCiAJCSAgICAgImFjdGl2ZSBjcnRjLCBidXQgbm90IGVuYWJsZWQgaW4gc3cgdHJhY2tp bmdcbiIpOwogCiAJCWZvcl9lYWNoX2ludGVsX2VuY29kZXIoZGV2LCBlbmNvZGVyKSB7CkBAIC0x MDg0MCwxMCArMTA4NDAsMTAgQEAgY2hlY2tfY3J0Y19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogCQkJCWFjdGl2ZSA9IHRydWU7CiAJCX0KIAotCQlXQVJOKGFjdGl2ZSAhPSBjcnRjLT5h Y3RpdmUsCisJCUk5MTVfV0FSTihhY3RpdmUgIT0gY3J0Yy0+YWN0aXZlLAogCQkgICAgICJjcnRj J3MgY29tcHV0ZWQgYWN0aXZlIHN0YXRlIGRvZXNuJ3QgbWF0Y2ggdHJhY2tlZCBhY3RpdmUgc3Rh dGUgIgogCQkgICAgICIoZXhwZWN0ZWQgJWksIGZvdW5kICVpKVxuIiwgYWN0aXZlLCBjcnRjLT5h Y3RpdmUpOwotCQlXQVJOKGVuYWJsZWQgIT0gY3J0Yy0+YmFzZS5lbmFibGVkLAorCQlJOTE1X1dB Uk4oZW5hYmxlZCAhPSBjcnRjLT5iYXNlLmVuYWJsZWQsCiAJCSAgICAgImNydGMncyBjb21wdXRl ZCBlbmFibGVkIHN0YXRlIGRvZXNuJ3QgbWF0Y2ggdHJhY2tlZCBlbmFibGVkIHN0YXRlICIKIAkJ ICAgICAiKGV4cGVjdGVkICVpLCBmb3VuZCAlaSlcbiIsIGVuYWJsZWQsIGNydGMtPmJhc2UuZW5h YmxlZCk7CiAKQEAgLTEwODYzLDEzICsxMDg2MywxMyBAQCBjaGVja19jcnRjX3N0YXRlKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAJCQkJZW5jb2Rlci0+Z2V0X2NvbmZpZyhlbmNvZGVyLCAmcGlw ZV9jb25maWcpOwogCQl9CiAKLQkJV0FSTihjcnRjLT5hY3RpdmUgIT0gYWN0aXZlLAorCQlJOTE1 X1dBUk4oY3J0Yy0+YWN0aXZlICE9IGFjdGl2ZSwKIAkJICAgICAiY3J0YyBhY3RpdmUgc3RhdGUg ZG9lc24ndCBtYXRjaCB3aXRoIGh3IHN0YXRlICIKIAkJICAgICAiKGV4cGVjdGVkICVpLCBmb3Vu ZCAlaSlcbiIsIGNydGMtPmFjdGl2ZSwgYWN0aXZlKTsKIAogCQlpZiAoYWN0aXZlICYmCiAJCSAg ICAhaW50ZWxfcGlwZV9jb25maWdfY29tcGFyZShkZXYsICZjcnRjLT5jb25maWcsICZwaXBlX2Nv bmZpZykpIHsKLQkJCVdBUk4oMSwgInBpcGUgc3RhdGUgZG9lc24ndCBtYXRjaCFcbiIpOworCQkJ STkxNV9XQVJOKDEsICJwaXBlIHN0YXRlIGRvZXNuJ3QgbWF0Y2ghXG4iKTsKIAkJCWludGVsX2R1 bXBfcGlwZV9jb25maWcoY3J0YywgJnBpcGVfY29uZmlnLAogCQkJCQkgICAgICAgIltodyBzdGF0 ZV0iKTsKIAkJCWludGVsX2R1bXBfcGlwZV9jb25maWcoY3J0YywgJmNydGMtPmNvbmZpZywKQEAg LTEwODk3LDE0ICsxMDg5NywxNCBAQCBjaGVja19zaGFyZWRfZHBsbF9zdGF0ZShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCiAJCWFjdGl2ZSA9IHBsbC0+Z2V0X2h3X3N0YXRlKGRldl9wcml2LCBw bGwsICZkcGxsX2h3X3N0YXRlKTsKIAotCQlXQVJOKHBsbC0+YWN0aXZlID4gaHdlaWdodDMyKHBs bC0+Y29uZmlnLmNydGNfbWFzayksCisJCUk5MTVfV0FSTihwbGwtPmFjdGl2ZSA+IGh3ZWlnaHQz MihwbGwtPmNvbmZpZy5jcnRjX21hc2spLAogCQkgICAgICJtb3JlIGFjdGl2ZSBwbGwgdXNlcnMg dGhhbiByZWZlcmVuY2VzOiAlaSB2cyAlaVxuIiwKIAkJICAgICBwbGwtPmFjdGl2ZSwgaHdlaWdo dDMyKHBsbC0+Y29uZmlnLmNydGNfbWFzaykpOwotCQlXQVJOKHBsbC0+YWN0aXZlICYmICFwbGwt Pm9uLAorCQlJOTE1X1dBUk4ocGxsLT5hY3RpdmUgJiYgIXBsbC0+b24sCiAJCSAgICAgInBsbCBp biBhY3RpdmUgdXNlIGJ1dCBub3Qgb24gaW4gc3cgdHJhY2tpbmdcbiIpOwotCQlXQVJOKHBsbC0+ b24gJiYgIXBsbC0+YWN0aXZlLAorCQlJOTE1X1dBUk4ocGxsLT5vbiAmJiAhcGxsLT5hY3RpdmUs CiAJCSAgICAgInBsbCBpbiBvbiBidXQgbm90IG9uIGluIHVzZSBpbiBzdyB0cmFja2luZ1xuIik7 Ci0JCVdBUk4ocGxsLT5vbiAhPSBhY3RpdmUsCisJCUk5MTVfV0FSTihwbGwtPm9uICE9IGFjdGl2 ZSwKIAkJICAgICAicGxsIG9uIHN0YXRlIG1pc21hdGNoIChleHBlY3RlZCAlaSwgZm91bmQgJWkp XG4iLAogCQkgICAgIHBsbC0+b24sIGFjdGl2ZSk7CiAKQEAgLTEwOTE0LDE0ICsxMDkxNCwxNCBA QCBjaGVja19zaGFyZWRfZHBsbF9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJaWYg KGNydGMtPmFjdGl2ZSAmJiBpbnRlbF9jcnRjX3RvX3NoYXJlZF9kcGxsKGNydGMpID09IHBsbCkK IAkJCQlhY3RpdmVfY3J0Y3MrKzsKIAkJfQotCQlXQVJOKHBsbC0+YWN0aXZlICE9IGFjdGl2ZV9j cnRjcywKKwkJSTkxNV9XQVJOKHBsbC0+YWN0aXZlICE9IGFjdGl2ZV9jcnRjcywKIAkJICAgICAi cGxsIGFjdGl2ZSBjcnRjcyBtaXNtYXRjaCAoZXhwZWN0ZWQgJWksIGZvdW5kICVpKVxuIiwKIAkJ ICAgICBwbGwtPmFjdGl2ZSwgYWN0aXZlX2NydGNzKTsKLQkJV0FSTihod2VpZ2h0MzIocGxsLT5j b25maWcuY3J0Y19tYXNrKSAhPSBlbmFibGVkX2NydGNzLAorCQlJOTE1X1dBUk4oaHdlaWdodDMy KHBsbC0+Y29uZmlnLmNydGNfbWFzaykgIT0gZW5hYmxlZF9jcnRjcywKIAkJICAgICAicGxsIGVu YWJsZWQgY3J0Y3MgbWlzbWF0Y2ggKGV4cGVjdGVkICVpLCBmb3VuZCAlaSlcbiIsCiAJCSAgICAg aHdlaWdodDMyKHBsbC0+Y29uZmlnLmNydGNfbWFzayksIGVuYWJsZWRfY3J0Y3MpOwogCi0JCVdB Uk4ocGxsLT5vbiAmJiBtZW1jbXAoJnBsbC0+Y29uZmlnLmh3X3N0YXRlLCAmZHBsbF9od19zdGF0 ZSwKKwkJSTkxNV9XQVJOKHBsbC0+b24gJiYgbWVtY21wKCZwbGwtPmNvbmZpZy5od19zdGF0ZSwg JmRwbGxfaHdfc3RhdGUsCiAJCQkJICAgICAgIHNpemVvZihkcGxsX2h3X3N0YXRlKSksCiAJCSAg ICAgInBsbCBodyBzdGF0ZSBtaXNtYXRjaFxuIik7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMK aW5kZXggNWNlY2MyMC4uNmQ1YmY2ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCkBAIC0xNTU4 LDcgKzE1NTgsNyBAQCB2b2lkIGludGVsX2VkcF9wYW5lbF92ZGRfb24oc3RydWN0IGludGVsX2Rw ICppbnRlbF9kcCkKIAl2ZGQgPSBlZHBfcGFuZWxfdmRkX29uKGludGVsX2RwKTsKIAlwcHNfdW5s b2NrKGludGVsX2RwKTsKIAotCVdBUk4oIXZkZCwgImVEUCBwb3J0ICVjIFZERCBhbHJlYWR5IHJl cXVlc3RlZCBvblxuIiwKKwlJOTE1X1dBUk4oIXZkZCwgImVEUCBwb3J0ICVjIFZERCBhbHJlYWR5 IHJlcXVlc3RlZCBvblxuIiwKIAkgICAgIHBvcnRfbmFtZShkcF90b19kaWdfcG9ydChpbnRlbF9k cCktPnBvcnQpKTsKIH0KIApAQCAtMTY0Miw3ICsxNjQyLDcgQEAgc3RhdGljIHZvaWQgZWRwX3Bh bmVsX3ZkZF9vZmYoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwgYm9vbCBzeW5jKQogCWlmICgh aXNfZWRwKGludGVsX2RwKSkKIAkJcmV0dXJuOwogCi0JV0FSTighaW50ZWxfZHAtPndhbnRfcGFu ZWxfdmRkLCAiZURQIHBvcnQgJWMgVkREIG5vdCBmb3JjZWQgb24iLAorCUk5MTVfV0FSTighaW50 ZWxfZHAtPndhbnRfcGFuZWxfdmRkLCAiZURQIHBvcnQgJWMgVkREIG5vdCBmb3JjZWQgb24iLAog CSAgICAgcG9ydF9uYW1lKGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKS0+cG9ydCkpOwogCiAJaW50 ZWxfZHAtPndhbnRfcGFuZWxfdmRkID0gZmFsc2U7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y dW50aW1lX3BtLmMKaW5kZXggZjVhNzhkNS4uNzcwYzVmNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3J1bnRpbWVfcG0uYwpAQCAtNjMzLDcgKzYzMyw3IEBAIHN0YXRpYyB2b2lkIGNoZWNr X3Bvd2VyX3dlbGxfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXJl dHVybjsKIAogbWlzbWF0Y2g6Ci0JV0FSTigxLCAic3RhdGUgbWlzbWF0Y2ggZm9yICclcycgKGFs d2F5c19vbiAlZCBodyBzdGF0ZSAlZCB1c2UtY291bnQgJWQgZGlzYWJsZV9wb3dlcl93ZWxsICVk XG4iLAorCUk5MTVfV0FSTigxLCAic3RhdGUgbWlzbWF0Y2ggZm9yICclcycgKGFsd2F5c19vbiAl ZCBodyBzdGF0ZSAlZCB1c2UtY291bnQgJWQgZGlzYWJsZV9wb3dlcl93ZWxsICVkXG4iLAogCQkg IHBvd2VyX3dlbGwtPm5hbWUsIHBvd2VyX3dlbGwtPmFsd2F5c19vbiwgZW5hYmxlZCwKIAkJICBw b3dlcl93ZWxsLT5jb3VudCwgaTkxNS5kaXNhYmxlX3Bvd2VyX3dlbGwpOwogfQotLSAKMi4xLjAK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==