From: Maarten Lankhorst Subject: [PATCH 4/5] drm/i915: Use new atomic iterator macros in display code Date: Thu, 9 Mar 2017 15:52:04 +0100 Message-ID: <1489071125-917-5-git-send-email-maarten.lankhorst@linux.intel.com> References: <1489071125-917-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: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 208956EC75 for ; Thu, 9 Mar 2017 14:52:09 +0000 (UTC) In-Reply-To: <1489071125-917-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org QWRkIGEgYmlnIGZhdCB3YXJuaW5nIGluIF9faW50ZWxfZGlzcGxheV9yZXN1bWUgdGhhdCB0aGUg b2xkIHN0YXRlIGlzCmludmFsaWQsIGFuZCB1c2UgdGhlIGNvcnJlY3Qgc3RhdGUgZXZlcnl3aGVy ZS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBs aW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j IHwgMTYxICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgODIgaW5zZXJ0aW9ucygrKSwgNzkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCmluZGV4IDU1MjZhMTk2ZThhMi4uODNmODZjZjQ0ZjY2IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0zNDY0LDcgKzM0NjQsMTIgQEAgX19pbnRlbF9k aXNwbGF5X3Jlc3VtZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWlmICghc3RhdGUpCiAJCXJl dHVybiAwOwogCi0JZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0 ZSwgaSkgeworCS8qCisJICogV2UndmUgZHVwbGljYXRlZCB0aGUgc3RhdGUsIHBvaW50ZXJzIHRv IHRoZSBvbGQgc3RhdGUgYXJlIGludmFsaWQuCisJICoKKwkgKiBEb24ndCBhdHRlbXB0IHRvIHVz ZSB0aGUgb2xkIHN0YXRlIHVudGlsIHdlIGNvbW1pdCB0aGUgZHVwbGljYXRlZCBzdGF0ZS4KKwkg Ki8KKwlmb3JfZWFjaF9uZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwg aSkgewogCQkvKgogCQkgKiBGb3JjZSByZWNhbGN1bGF0aW9uIGV2ZW4gaWYgd2UgcmVzdG9yZQog CQkgKiBjdXJyZW50IHN0YXRlLiBXaXRoIGZhc3QgbW9kZXNldCB0aGlzIG1heSBub3QgcmVzdWx0 CkBAIC01MDAyLDEzICs1MDA3LDEyIEBAIHN0YXRpYyB2b2lkIGludGVsX3Bvc3RfcGxhbmVfdXBk YXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIAl9CiB9CiAKLXN0 YXRpYyB2b2lkIGludGVsX3ByZV9wbGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUg Km9sZF9jcnRjX3N0YXRlKQorc3RhdGljIHZvaWQgaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCisJCQkJICAgc3RydWN0IGludGVs X2NydGNfc3RhdGUgKnBpcGVfY29uZmlnKQogewogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0g dG9faW50ZWxfY3J0YyhvbGRfY3J0Y19zdGF0ZS0+YmFzZS5jcnRjKTsKIAlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gdG9faTkxNShkZXYpOwotCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2Nv bmZpZyA9Ci0JCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CiAJc3RydWN0 IGRybV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0ZSA9IG9sZF9jcnRjX3N0YXRlLT5iYXNlLnN0YXRl OwogCXN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnkgPSBjcnRjLT5iYXNlLnByaW1hcnk7CiAJc3Ry dWN0IGRybV9wbGFuZV9zdGF0ZSAqb2xkX3ByaV9zdGF0ZSA9CkBAIC01MTA1LDEyICs1MTA5LDEx IEBAIHN0YXRpYyB2b2lkIGludGVsX2VuY29kZXJzX3ByZV9wbGxfZW5hYmxlKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywKIAkJCQkJICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwK IAkJCQkJICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqb2xkX3N0YXRlKQogewotCXN0cnVjdCBk cm1fY29ubmVjdG9yX3N0YXRlICpvbGRfY29ubl9zdGF0ZTsKKwlzdHJ1Y3QgZHJtX2Nvbm5lY3Rv cl9zdGF0ZSAqY29ubl9zdGF0ZTsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubjsKIAlpbnQg aTsKIAotCWZvcl9lYWNoX2Nvbm5lY3Rvcl9pbl9zdGF0ZShvbGRfc3RhdGUsIGNvbm4sIG9sZF9j b25uX3N0YXRlLCBpKSB7Ci0JCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRl ID0gY29ubi0+c3RhdGU7CisJZm9yX2VhY2hfbmV3X2Nvbm5lY3Rvcl9pbl9zdGF0ZShvbGRfc3Rh dGUsIGNvbm4sIGNvbm5fc3RhdGUsIGkpIHsKIAkJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29k ZXIgPQogCQkJdG9faW50ZWxfZW5jb2Rlcihjb25uX3N0YXRlLT5iZXN0X2VuY29kZXIpOwogCkBA IC01MTI2LDEyICs1MTI5LDExIEBAIHN0YXRpYyB2b2lkIGludGVsX2VuY29kZXJzX3ByZV9lbmFi bGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlLAogCQkJCSAgICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRf c3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKm9sZF9jb25uX3N0YXRlOwor CXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlOwogCXN0cnVjdCBkcm1fY29u bmVjdG9yICpjb25uOwogCWludCBpOwogCi0JZm9yX2VhY2hfY29ubmVjdG9yX2luX3N0YXRlKG9s ZF9zdGF0ZSwgY29ubiwgb2xkX2Nvbm5fc3RhdGUsIGkpIHsKLQkJc3RydWN0IGRybV9jb25uZWN0 b3Jfc3RhdGUgKmNvbm5fc3RhdGUgPSBjb25uLT5zdGF0ZTsKKwlmb3JfZWFjaF9uZXdfY29ubmVj dG9yX2luX3N0YXRlKG9sZF9zdGF0ZSwgY29ubiwgY29ubl9zdGF0ZSwgaSkgewogCQlzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlciA9CiAJCQl0b19pbnRlbF9lbmNvZGVyKGNvbm5fc3RhdGUt PmJlc3RfZW5jb2Rlcik7CiAKQEAgLTUxNDcsMTIgKzUxNDksMTEgQEAgc3RhdGljIHZvaWQgaW50 ZWxfZW5jb2RlcnNfZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCQkgIHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkJCSAgc3RydWN0IGRybV9hdG9taWNfc3Rh dGUgKm9sZF9zdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqb2xkX2Nvbm5f c3RhdGU7CisJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGU7CiAJc3RydWN0 IGRybV9jb25uZWN0b3IgKmNvbm47CiAJaW50IGk7CiAKLQlmb3JfZWFjaF9jb25uZWN0b3JfaW5f c3RhdGUob2xkX3N0YXRlLCBjb25uLCBvbGRfY29ubl9zdGF0ZSwgaSkgewotCQlzdHJ1Y3QgZHJt X2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSA9IGNvbm4tPnN0YXRlOworCWZvcl9lYWNoX25l d19jb25uZWN0b3JfaW5fc3RhdGUob2xkX3N0YXRlLCBjb25uLCBjb25uX3N0YXRlLCBpKSB7CiAJ CXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyID0KIAkJCXRvX2ludGVsX2VuY29kZXIoY29u bl9zdGF0ZS0+YmVzdF9lbmNvZGVyKTsKIApAQCAtNTE3Miw3ICs1MTczLDcgQEAgc3RhdGljIHZv aWQgaW50ZWxfZW5jb2RlcnNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJc3RydWN0 IGRybV9jb25uZWN0b3IgKmNvbm47CiAJaW50IGk7CiAKLQlmb3JfZWFjaF9jb25uZWN0b3JfaW5f c3RhdGUob2xkX3N0YXRlLCBjb25uLCBvbGRfY29ubl9zdGF0ZSwgaSkgeworCWZvcl9lYWNoX29s ZF9jb25uZWN0b3JfaW5fc3RhdGUob2xkX3N0YXRlLCBjb25uLCBvbGRfY29ubl9zdGF0ZSwgaSkg ewogCQlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciA9CiAJCQl0b19pbnRlbF9lbmNvZGVy KG9sZF9jb25uX3N0YXRlLT5iZXN0X2VuY29kZXIpOwogCkBAIC01MTkyLDcgKzUxOTMsNyBAQCBz dGF0aWMgdm9pZCBpbnRlbF9lbmNvZGVyc19wb3N0X2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpj cnRjLAogCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uOwogCWludCBpOwogCi0JZm9yX2VhY2hf Y29ubmVjdG9yX2luX3N0YXRlKG9sZF9zdGF0ZSwgY29ubiwgb2xkX2Nvbm5fc3RhdGUsIGkpIHsK Kwlmb3JfZWFjaF9vbGRfY29ubmVjdG9yX2luX3N0YXRlKG9sZF9zdGF0ZSwgY29ubiwgb2xkX2Nv bm5fc3RhdGUsIGkpIHsKIAkJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIgPQogCQkJdG9f aW50ZWxfZW5jb2RlcihvbGRfY29ubl9zdGF0ZS0+YmVzdF9lbmNvZGVyKTsKIApAQCAtNTIxMiw3 ICs1MjEzLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZW5jb2RlcnNfcG9zdF9wbGxfZGlzYWJsZShz dHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm47CiAJaW50 IGk7CiAKLQlmb3JfZWFjaF9jb25uZWN0b3JfaW5fc3RhdGUob2xkX3N0YXRlLCBjb25uLCBvbGRf Y29ubl9zdGF0ZSwgaSkgeworCWZvcl9lYWNoX29sZF9jb25uZWN0b3JfaW5fc3RhdGUob2xkX3N0 YXRlLCBjb25uLCBvbGRfY29ubl9zdGF0ZSwgaSkgewogCQlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAq ZW5jb2RlciA9CiAJCQl0b19pbnRlbF9lbmNvZGVyKG9sZF9jb25uX3N0YXRlLT5iZXN0X2VuY29k ZXIpOwogCkBAIC0xMDg3Nyw3ICsxMDg3OCw3IEBAIHN0YXRpYyBib29sIGNoZWNrX3NpbmdsZV9l bmNvZGVyX2Nsb25pbmcoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCXN0cnVjdCBk cm1fY29ubmVjdG9yX3N0YXRlICpjb25uZWN0b3Jfc3RhdGU7CiAJaW50IGk7CiAKLQlmb3JfZWFj aF9jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3RvciwgY29ubmVjdG9yX3N0YXRlLCBp KSB7CisJZm9yX2VhY2hfbmV3X2Nvbm5lY3Rvcl9pbl9zdGF0ZShzdGF0ZSwgY29ubmVjdG9yLCBj b25uZWN0b3Jfc3RhdGUsIGkpIHsKIAkJaWYgKGNvbm5lY3Rvcl9zdGF0ZS0+Y3J0YyAhPSAmY3J0 Yy0+YmFzZSkKIAkJCWNvbnRpbnVlOwogCkBAIC0xMTA1MSw3ICsxMTA1Miw3IEBAIGNvbXB1dGVf YmFzZWxpbmVfcGlwZV9icHAoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJc3RhdGUgPSBwaXBl X2NvbmZpZy0+YmFzZS5zdGF0ZTsKIAogCS8qIENsYW1wIGRpc3BsYXkgYnBwIHRvIEVESUQgdmFs dWUgKi8KLQlmb3JfZWFjaF9jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3RvciwgY29u bmVjdG9yX3N0YXRlLCBpKSB7CisJZm9yX2VhY2hfbmV3X2Nvbm5lY3Rvcl9pbl9zdGF0ZShzdGF0 ZSwgY29ubmVjdG9yLCBjb25uZWN0b3Jfc3RhdGUsIGkpIHsKIAkJaWYgKGNvbm5lY3Rvcl9zdGF0 ZS0+Y3J0YyAhPSAmY3J0Yy0+YmFzZSkKIAkJCWNvbnRpbnVlOwogCkBAIC0xMTMyNCw3ICsxMTMy NSw3IEBAIGludGVsX21vZGVzZXRfcGlwZV9jb25maWcoc3RydWN0IGRybV9jcnRjICpjcnRjLAog CQkJICAgICAgICZwaXBlX2NvbmZpZy0+cGlwZV9zcmNfdywKIAkJCSAgICAgICAmcGlwZV9jb25m aWctPnBpcGVfc3JjX2gpOwogCi0JZm9yX2VhY2hfY29ubmVjdG9yX2luX3N0YXRlKHN0YXRlLCBj b25uZWN0b3IsIGNvbm5lY3Rvcl9zdGF0ZSwgaSkgeworCWZvcl9lYWNoX25ld19jb25uZWN0b3Jf aW5fc3RhdGUoc3RhdGUsIGNvbm5lY3RvciwgY29ubmVjdG9yX3N0YXRlLCBpKSB7CiAJCWlmIChj b25uZWN0b3Jfc3RhdGUtPmNydGMgIT0gY3J0YykKIAkJCWNvbnRpbnVlOwogCkBAIC0xMTM1NSw3 ICsxMTM1Niw3IEBAIGludGVsX21vZGVzZXRfcGlwZV9jb25maWcoc3RydWN0IGRybV9jcnRjICpj cnRjLAogCSAqIGFkanVzdCBpdCBhY2NvcmRpbmcgdG8gbGltaXRhdGlvbnMgb3IgY29ubmVjdG9y IHByb3BlcnRpZXMsIGFuZCBhbHNvCiAJICogYSBjaGFuY2UgdG8gcmVqZWN0IHRoZSBtb2RlIGVu dGlyZWx5LgogCSAqLwotCWZvcl9lYWNoX2Nvbm5lY3Rvcl9pbl9zdGF0ZShzdGF0ZSwgY29ubmVj dG9yLCBjb25uZWN0b3Jfc3RhdGUsIGkpIHsKKwlmb3JfZWFjaF9uZXdfY29ubmVjdG9yX2luX3N0 YXRlKHN0YXRlLCBjb25uZWN0b3IsIGNvbm5lY3Rvcl9zdGF0ZSwgaSkgewogCQlpZiAoY29ubmVj dG9yX3N0YXRlLT5jcnRjICE9IGNydGMpCiAJCQljb250aW51ZTsKIApAQCAtMTE0MDcsMTYgKzEx NDA4LDE2IEBAIHN0YXRpYyB2b2lkCiBpbnRlbF9tb2Rlc2V0X3VwZGF0ZV9jcnRjX3N0YXRlKHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7 Ci0Jc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOworCXN0cnVjdCBkcm1fY3J0Y19z dGF0ZSAqbmV3X2NydGNfc3RhdGU7CiAJaW50IGk7CiAKIAkvKiBEb3VibGUgY2hlY2sgc3RhdGUu ICovCi0JZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkg ewotCQl0b19pbnRlbF9jcnRjKGNydGMpLT5jb25maWcgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGNy dGMtPnN0YXRlKTsKKwlmb3JfZWFjaF9uZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgbmV3 X2NydGNfc3RhdGUsIGkpIHsKKwkJdG9faW50ZWxfY3J0YyhjcnRjKS0+Y29uZmlnID0gdG9faW50 ZWxfY3J0Y19zdGF0ZShuZXdfY3J0Y19zdGF0ZSk7CiAKIAkJLyogVXBkYXRlIGh3bW9kZSBmb3Ig dmJsYW5rIGZ1bmN0aW9ucyAqLwotCQlpZiAoY3J0Yy0+c3RhdGUtPmFjdGl2ZSkKLQkJCWNydGMt Pmh3bW9kZSA9IGNydGMtPnN0YXRlLT5hZGp1c3RlZF9tb2RlOworCQlpZiAobmV3X2NydGNfc3Rh dGUtPmFjdGl2ZSkKKwkJCWNydGMtPmh3bW9kZSA9IG5ld19jcnRjX3N0YXRlLT5hZGp1c3RlZF9t b2RlOwogCQllbHNlCiAJCQljcnRjLT5od21vZGUuY3J0Y19jbG9jayA9IDA7CiAKQEAgLTExODg5 LDE5ICsxMTg5MCwxOCBAQCB2ZXJpZnlfY29ubmVjdG9yX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCiAJCSAgICAgICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9j b25uZWN0b3IgKmNvbm5lY3RvcjsKLQlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqb2xkX2Nv bm5fc3RhdGU7CisJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKm9sZF9jb25uX3N0YXRlLCAq Y29ubl9zdGF0ZTsKIAlpbnQgaTsKIAotCWZvcl9lYWNoX2Nvbm5lY3Rvcl9pbl9zdGF0ZShzdGF0 ZSwgY29ubmVjdG9yLCBvbGRfY29ubl9zdGF0ZSwgaSkgeworCWZvcl9lYWNoX29sZG5ld19jb25u ZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3Rvciwgb2xkX2Nvbm5fc3RhdGUsIGNvbm5fc3Rh dGUsIGkpIHsKIAkJc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyID0gY29ubmVjdG9yLT5lbmNv ZGVyOwotCQlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqc3RhdGUgPSBjb25uZWN0b3ItPnN0 YXRlOwogCi0JCWlmIChzdGF0ZS0+Y3J0YyAhPSBjcnRjKQorCQlpZiAoY29ubl9zdGF0ZS0+Y3J0 YyAhPSBjcnRjKQogCQkJY29udGludWU7CiAKIAkJaW50ZWxfY29ubmVjdG9yX3ZlcmlmeV9zdGF0 ZSh0b19pbnRlbF9jb25uZWN0b3IoY29ubmVjdG9yKSk7CiAKLQkJSTkxNV9TVEFURV9XQVJOKHN0 YXRlLT5iZXN0X2VuY29kZXIgIT0gZW5jb2RlciwKKwkJSTkxNV9TVEFURV9XQVJOKGNvbm5fc3Rh dGUtPmJlc3RfZW5jb2RlciAhPSBlbmNvZGVyLAogCQkgICAgICJjb25uZWN0b3IncyBhdG9taWMg ZW5jb2RlciBkb2Vzbid0IG1hdGNoIGxlZ2FjeSBlbmNvZGVyXG4iKTsKIAl9CiB9CkBAIC0xMjE4 NywyMSArMTIxODcsMjEgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9jbGVhcl9wbGxzKHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g c3RhdGUtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1 KGRldik7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjOwotCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAq Y3J0Y19zdGF0ZTsKKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLCAqbmV3 X2NydGNfc3RhdGU7CiAJaW50IGk7CiAKIAlpZiAoIWRldl9wcml2LT5kaXNwbGF5LmNydGNfY29t cHV0ZV9jbG9jaykKIAkJcmV0dXJuOwogCi0JZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwg Y3J0YywgY3J0Y19zdGF0ZSwgaSkgeworCWZvcl9lYWNoX29sZG5ld19jcnRjX2luX3N0YXRlKHN0 YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgbmV3X2NydGNfc3RhdGUsIGkpIHsKIAkJc3RydWN0 IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCQlzdHJ1Y3Qg aW50ZWxfc2hhcmVkX2RwbGwgKm9sZF9kcGxsID0KLQkJCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0 Yy0+c3RhdGUpLT5zaGFyZWRfZHBsbDsKKwkJCXRvX2ludGVsX2NydGNfc3RhdGUob2xkX2NydGNf c3RhdGUpLT5zaGFyZWRfZHBsbDsKIAotCQlpZiAoIW5lZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkp CisJCWlmICghbmVlZHNfbW9kZXNldChuZXdfY3J0Y19zdGF0ZSkpCiAJCQljb250aW51ZTsKIAot CQl0b19pbnRlbF9jcnRjX3N0YXRlKGNydGNfc3RhdGUpLT5zaGFyZWRfZHBsbCA9IE5VTEw7CisJ CXRvX2ludGVsX2NydGNfc3RhdGUobmV3X2NydGNfc3RhdGUpLT5zaGFyZWRfZHBsbCA9IE5VTEw7 CiAKIAkJaWYgKCFvbGRfZHBsbCkKIAkJCWNvbnRpbnVlOwpAQCAtMTIyMjcsNyArMTIyMjcsNyBA QCBzdGF0aWMgaW50IGhhc3dlbGxfbW9kZV9zZXRfcGxhbmVzX3dvcmthcm91bmQoc3RydWN0IGRy bV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCWludCBpOwogCiAJLyogbG9vayBhdCBhbGwgY3J0Yydz IHRoYXQgYXJlIGdvaW5nIHRvIGJlIGVuYWJsZWQgaW4gZHVyaW5nIG1vZGVzZXQgKi8KLQlmb3Jf ZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7CisJZm9yX2Vh Y2hfbmV3X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKIAkJaW50 ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAKIAkJaWYgKCFjcnRjX3N0YXRlLT5hY3Rp dmUgfHwgIW5lZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkpCkBAIC0xMjMyOSw3ICsxMjMyOSw3IEBA IHN0YXRpYyBpbnQgaW50ZWxfbW9kZXNldF9jaGVja3Moc3RydWN0IGRybV9hdG9taWNfc3RhdGUg KnN0YXRlKQogCXN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKmludGVsX3N0YXRlID0gdG9faW50 ZWxfYXRvbWljX3N0YXRlKHN0YXRlKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KHN0YXRlLT5kZXYpOwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKLQlzdHJ1 Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpv bGRfY3J0Y19zdGF0ZSwgKm5ld19jcnRjX3N0YXRlOwogCWludCByZXQgPSAwLCBpOwogCiAJaWYg KCFjaGVja19kaWdpdGFsX3BvcnRfY29uZmxpY3RzKHN0YXRlKSkgewpAQCAtMTIzNDIsMTMgKzEy MzQyLDEzIEBAIHN0YXRpYyBpbnQgaW50ZWxfbW9kZXNldF9jaGVja3Moc3RydWN0IGRybV9hdG9t aWNfc3RhdGUgKnN0YXRlKQogCWludGVsX3N0YXRlLT5jZGNsay5sb2dpY2FsID0gZGV2X3ByaXYt PmNkY2xrLmxvZ2ljYWw7CiAJaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbCA9IGRldl9wcml2LT5j ZGNsay5hY3R1YWw7CiAKLQlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRj X3N0YXRlLCBpKSB7Ci0JCWlmIChjcnRjX3N0YXRlLT5hY3RpdmUpCisJZm9yX2VhY2hfb2xkbmV3 X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRlLCBuZXdfY3J0Y19zdGF0 ZSwgaSkgeworCQlpZiAobmV3X2NydGNfc3RhdGUtPmFjdGl2ZSkKIAkJCWludGVsX3N0YXRlLT5h Y3RpdmVfY3J0Y3MgfD0gMSA8PCBpOwogCQllbHNlCiAJCQlpbnRlbF9zdGF0ZS0+YWN0aXZlX2Ny dGNzICY9IH4oMSA8PCBpKTsKIAotCQlpZiAoY3J0Y19zdGF0ZS0+YWN0aXZlICE9IGNydGMtPnN0 YXRlLT5hY3RpdmUpCisJCWlmIChvbGRfY3J0Y19zdGF0ZS0+YWN0aXZlICE9IG5ld19jcnRjX3N0 YXRlLT5hY3RpdmUpCiAJCQlpbnRlbF9zdGF0ZS0+YWN0aXZlX3BpcGVfY2hhbmdlcyB8PSBkcm1f Y3J0Y19tYXNrKGNydGMpOwogCX0KIApAQCAtMTI0MjcsNyArMTI0MjcsNyBAQCBzdGF0aWMgaW50 IGludGVsX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfYXRv bWljX3N0YXRlICppbnRlbF9zdGF0ZSA9IHRvX2ludGVsX2F0b21pY19zdGF0ZShzdGF0ZSk7CiAJ c3RydWN0IGRybV9jcnRjICpjcnRjOwotCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZTsKKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLCAqY3J0Y19zdGF0ZTsK IAlpbnQgcmV0LCBpOwogCWJvb2wgYW55X21zID0gZmFsc2U7CiAKQEAgLTEyNDM1LDEyICsxMjQz NSwxMiBAQCBzdGF0aWMgaW50IGludGVsX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlmb3JfZWFjaF9jcnRjX2luX3N0YXRl KHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7CisJZm9yX2VhY2hfb2xkbmV3X2NydGNfaW5f c3RhdGUoc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRlLCBjcnRjX3N0YXRlLCBpKSB7CiAJCXN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyA9CiAJCQl0b19pbnRlbF9jcnRjX3N0 YXRlKGNydGNfc3RhdGUpOwogCiAJCS8qIENhdGNoIEk5MTVfTU9ERV9GTEFHX0lOSEVSSVRFRCAq LwotCQlpZiAoY3J0Y19zdGF0ZS0+bW9kZS5wcml2YXRlX2ZsYWdzICE9IGNydGMtPnN0YXRlLT5t b2RlLnByaXZhdGVfZmxhZ3MpCisJCWlmIChjcnRjX3N0YXRlLT5tb2RlLnByaXZhdGVfZmxhZ3Mg IT0gb2xkX2NydGNfc3RhdGUtPm1vZGUucHJpdmF0ZV9mbGFncykKIAkJCWNydGNfc3RhdGUtPm1v ZGVfY2hhbmdlZCA9IHRydWU7CiAKIAkJaWYgKCFuZWVkc19tb2Rlc2V0KGNydGNfc3RhdGUpKQpA QCAtMTI0NjcsMTAgKzEyNDY3LDEwIEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NoZWNrKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAkJaWYgKGk5MTUuZmFzdGJvb3QgJiYKIAkJICAgIGlu dGVsX3BpcGVfY29uZmlnX2NvbXBhcmUoZGV2X3ByaXYsCi0JCQkJCXRvX2ludGVsX2NydGNfc3Rh dGUoY3J0Yy0+c3RhdGUpLAorCQkJCQl0b19pbnRlbF9jcnRjX3N0YXRlKG9sZF9jcnRjX3N0YXRl KSwKIAkJCQkJcGlwZV9jb25maWcsIHRydWUpKSB7CiAJCQljcnRjX3N0YXRlLT5tb2RlX2NoYW5n ZWQgPSBmYWxzZTsKLQkJCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Y19zdGF0ZSktPnVwZGF0ZV9w aXBlID0gdHJ1ZTsKKwkJCXBpcGVfY29uZmlnLT51cGRhdGVfcGlwZSA9IHRydWU7CiAJCX0KIAog CQlpZiAobmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKSkKQEAgLTEyNTEwLDcgKzEyNTEwLDcgQEAg c3RhdGljIGludCBpbnRlbF9hdG9taWNfcHJlcGFyZV9jb21taXQoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CiAJaW50IGksIHJldDsKIAotCWZvcl9lYWNo X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKKwlmb3JfZWFjaF9u ZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgewogCQlpZiAoc3Rh dGUtPmxlZ2FjeV9jdXJzb3JfdXBkYXRlKQogCQkJY29udGludWU7CiAKQEAgLTEyNjA3LDE5ICsx MjYwNywyMSBAQCBzdGF0aWMgYm9vbCBuZWVkc192Ymxhbmtfd2FpdChzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHN0YXRpYyB2b2lkIGludGVsX3VwZGF0ZV9jcnRjKHN0cnVj dCBkcm1fY3J0YyAqY3J0YywKIAkJCSAgICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSwKIAkJCSAgICAgIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCisJCQkg ICAgICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm5ld19jcnRjX3N0YXRlLAogCQkJICAgICAgdW5z aWduZWQgaW50ICpjcnRjX3ZibGFua19tYXNrKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSBjcnRjLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkx NShkZXYpOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0Yyhj cnRjKTsKLQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcgPSB0b19pbnRlbF9j cnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKLQlib29sIG1vZGVzZXQgPSBuZWVkc19tb2Rlc2V0KGNy dGMtPnN0YXRlKTsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcgPSB0b19p bnRlbF9jcnRjX3N0YXRlKG5ld19jcnRjX3N0YXRlKTsKKwlib29sIG1vZGVzZXQgPSBuZWVkc19t b2Rlc2V0KG5ld19jcnRjX3N0YXRlKTsKIAogCWlmIChtb2Rlc2V0KSB7CiAJCXVwZGF0ZV9zY2Fu bGluZV9vZmZzZXQoaW50ZWxfY3J0Yyk7CiAJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZW5hYmxl KHBpcGVfY29uZmlnLCBzdGF0ZSk7CiAJfSBlbHNlIHsKLQkJaW50ZWxfcHJlX3BsYW5lX3VwZGF0 ZSh0b19pbnRlbF9jcnRjX3N0YXRlKG9sZF9jcnRjX3N0YXRlKSk7CisJCWludGVsX3ByZV9wbGFu ZV91cGRhdGUodG9faW50ZWxfY3J0Y19zdGF0ZShvbGRfY3J0Y19zdGF0ZSksCisJCQkJICAgICAg IHBpcGVfY29uZmlnKTsKIAl9CiAKIAlpZiAoZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfcGxhbmVf c3RhdGUoc3RhdGUsIGNydGMtPnByaW1hcnkpKSB7CkBAIC0xMjYzOCwxNSArMTI2NDAsMTUgQEAg c3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX2NydGNzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz dGF0ZSwKIAkJCSAgICAgICB1bnNpZ25lZCBpbnQgKmNydGNfdmJsYW5rX21hc2spCiB7CiAJc3Ry dWN0IGRybV9jcnRjICpjcnRjOwotCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3Rh dGU7CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwgKm5ld19jcnRjX3N0 YXRlOwogCWludCBpOwogCi0JZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0Yywgb2xk X2NydGNfc3RhdGUsIGkpIHsKLQkJaWYgKCFjcnRjLT5zdGF0ZS0+YWN0aXZlKQorCWZvcl9lYWNo X29sZG5ld19jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgbmV3X2Ny dGNfc3RhdGUsIGkpIHsKKwkJaWYgKCFuZXdfY3J0Y19zdGF0ZS0+YWN0aXZlKQogCQkJY29udGlu dWU7CiAKIAkJaW50ZWxfdXBkYXRlX2NydGMoY3J0Yywgc3RhdGUsIG9sZF9jcnRjX3N0YXRlLAot CQkJCSAgY3J0Y192YmxhbmtfbWFzayk7CisJCQkJICBuZXdfY3J0Y19zdGF0ZSwgY3J0Y192Ymxh bmtfbWFzayk7CiAJfQogfQogCkBAIC0xMjY1Nyw3ICsxMjY1OSw3IEBAIHN0YXRpYyB2b2lkIHNr bF91cGRhdGVfY3J0Y3Moc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCXN0cnVjdCBp bnRlbF9hdG9taWNfc3RhdGUgKmludGVsX3N0YXRlID0gdG9faW50ZWxfYXRvbWljX3N0YXRlKHN0 YXRlKTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVs X2NydGM7Ci0Jc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZTsKKwlzdHJ1Y3Qg ZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLCAqbmV3X2NydGNfc3RhdGU7CiAJc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZTsKIAl1bnNpZ25lZCBpbnQgdXBkYXRlZCA9IDA7CiAJ Ym9vbCBwcm9ncmVzczsKQEAgLTEyNjY2LDkgKzEyNjY4LDkgQEAgc3RhdGljIHZvaWQgc2tsX3Vw ZGF0ZV9jcnRjcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAKIAljb25zdCBzdHJ1 Y3Qgc2tsX2RkYl9lbnRyeSAqZW50cmllc1tJOTE1X01BWF9QSVBFU10gPSB7fTsKIAotCWZvcl9l YWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRlLCBpKQorCWZvcl9l YWNoX29sZG5ld19jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgbmV3 X2NydGNfc3RhdGUsIGkpCiAJCS8qIGlnbm9yZSBhbGxvY2F0aW9ucyBmb3IgY3J0YydzIHRoYXQg aGF2ZSBiZWVuIHR1cm5lZCBvZmYuICovCi0JCWlmIChjcnRjLT5zdGF0ZS0+YWN0aXZlKQorCQlp ZiAobmV3X2NydGNfc3RhdGUtPmFjdGl2ZSkKIAkJCWVudHJpZXNbaV0gPSAmdG9faW50ZWxfY3J0 Y19zdGF0ZShvbGRfY3J0Y19zdGF0ZSktPndtLnNrbC5kZGI7CiAKIAkvKgpAQCAtMTI2ODAsNyAr MTI2ODIsNyBAQCBzdGF0aWMgdm9pZCBza2xfdXBkYXRlX2NydGNzKHN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpzdGF0ZSwKIAlkbyB7CiAJCXByb2dyZXNzID0gZmFsc2U7CiAKLQkJZm9yX2VhY2hf Y3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIGkpIHsKKwkJZm9yX2Vh Y2hfb2xkbmV3X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRlLCBuZXdf Y3J0Y19zdGF0ZSwgaSkgewogCQkJYm9vbCB2Ymxfd2FpdCA9IGZhbHNlOwogCQkJdW5zaWduZWQg aW50IGNtYXNrID0gZHJtX2NydGNfbWFzayhjcnRjKTsKIApAQCAtMTI3MDUsMTIgKzEyNzA3LDEy IEBAIHN0YXRpYyB2b2lkIHNrbF91cGRhdGVfY3J0Y3Moc3RydWN0IGRybV9hdG9taWNfc3RhdGUg KnN0YXRlLAogCQkJICovCiAJCQlpZiAoIXNrbF9kZGJfZW50cnlfZXF1YWwoJmNzdGF0ZS0+d20u c2tsLmRkYiwKIAkJCQkJCSAmdG9faW50ZWxfY3J0Y19zdGF0ZShvbGRfY3J0Y19zdGF0ZSktPndt LnNrbC5kZGIpICYmCi0JCQkgICAgIWNydGMtPnN0YXRlLT5hY3RpdmVfY2hhbmdlZCAmJgorCQkJ ICAgICFuZXdfY3J0Y19zdGF0ZS0+YWN0aXZlX2NoYW5nZWQgJiYKIAkJCSAgICBpbnRlbF9zdGF0 ZS0+d21fcmVzdWx0cy5kaXJ0eV9waXBlcyAhPSB1cGRhdGVkKQogCQkJCXZibF93YWl0ID0gdHJ1 ZTsKIAogCQkJaW50ZWxfdXBkYXRlX2NydGMoY3J0Yywgc3RhdGUsIG9sZF9jcnRjX3N0YXRlLAot CQkJCQkgIGNydGNfdmJsYW5rX21hc2spOworCQkJCQkgIG5ld19jcnRjX3N0YXRlLCBjcnRjX3Zi bGFua19tYXNrKTsKIAogCQkJaWYgKHZibF93YWl0KQogCQkJCWludGVsX3dhaXRfZm9yX3ZibGFu ayhkZXZfcHJpdiwgcGlwZSk7CkBAIC0xMjc0Myw3ICsxMjc0NSw3IEBAIHN0YXRpYyB2b2lkIGlu dGVsX2F0b21pY19jb21taXRfdGFpbChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJ c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHN0YXRlLT5kZXY7CiAJc3RydWN0IGludGVsX2F0b21p Y19zdGF0ZSAqaW50ZWxfc3RhdGUgPSB0b19pbnRlbF9hdG9taWNfc3RhdGUoc3RhdGUpOwogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3Qg ZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlOworCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAq b2xkX2NydGNfc3RhdGUsICpuZXdfY3J0Y19zdGF0ZTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7 CiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX2NzdGF0ZTsKIAlib29sIGh3X2NoZWNr ID0gaW50ZWxfc3RhdGUtPm1vZGVzZXQ7CkBAIC0xMjc1NiwyMiArMTI3NTgsMjMgQEAgc3RhdGlj IHZvaWQgaW50ZWxfYXRvbWljX2NvbW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz dGF0ZSkKIAlpZiAoaW50ZWxfc3RhdGUtPm1vZGVzZXQpCiAJCWludGVsX2Rpc3BsYXlfcG93ZXJf Z2V0KGRldl9wcml2LCBQT1dFUl9ET01BSU5fTU9ERVNFVCk7CiAKLQlmb3JfZWFjaF9jcnRjX2lu X3N0YXRlKHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgaSkgeworCWZvcl9lYWNoX29sZG5l d19jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgbmV3X2NydGNfc3Rh dGUsIGkpIHsKIAkJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRj KGNydGMpOwogCi0JCWlmIChuZWVkc19tb2Rlc2V0KGNydGMtPnN0YXRlKSB8fAotCQkgICAgdG9f aW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSktPnVwZGF0ZV9waXBlKSB7CisJCWlmIChuZWVk c19tb2Rlc2V0KG5ld19jcnRjX3N0YXRlKSB8fAorCQkgICAgdG9faW50ZWxfY3J0Y19zdGF0ZShu ZXdfY3J0Y19zdGF0ZSktPnVwZGF0ZV9waXBlKSB7CiAJCQlod19jaGVjayA9IHRydWU7CiAKIAkJ CXB1dF9kb21haW5zW3RvX2ludGVsX2NydGMoY3J0YyktPnBpcGVdID0KIAkJCQltb2Rlc2V0X2dl dF9jcnRjX3Bvd2VyX2RvbWFpbnMoY3J0YywKLQkJCQkJdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRj LT5zdGF0ZSkpOworCQkJCQl0b19pbnRlbF9jcnRjX3N0YXRlKG5ld19jcnRjX3N0YXRlKSk7CiAJ CX0KIAotCQlpZiAoIW5lZWRzX21vZGVzZXQoY3J0Yy0+c3RhdGUpKQorCQlpZiAoIW5lZWRzX21v ZGVzZXQobmV3X2NydGNfc3RhdGUpKQogCQkJY29udGludWU7CiAKLQkJaW50ZWxfcHJlX3BsYW5l X3VwZGF0ZSh0b19pbnRlbF9jcnRjX3N0YXRlKG9sZF9jcnRjX3N0YXRlKSk7CisJCWludGVsX3By ZV9wbGFuZV91cGRhdGUodG9faW50ZWxfY3J0Y19zdGF0ZShvbGRfY3J0Y19zdGF0ZSksCisJCQkJ ICAgICAgIHRvX2ludGVsX2NydGNfc3RhdGUobmV3X2NydGNfc3RhdGUpKTsKIAogCQlpZiAob2xk X2NydGNfc3RhdGUtPmFjdGl2ZSkgewogCQkJaW50ZWxfY3J0Y19kaXNhYmxlX3BsYW5lcyhjcnRj LCBvbGRfY3J0Y19zdGF0ZS0+cGxhbmVfbWFzayk7CkBAIC0xMjgyMSwxNiArMTI4MjQsMTYgQEAg c3RhdGljIHZvaWQgaW50ZWxfYXRvbWljX2NvbW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0 YXRlICpzdGF0ZSkKIAl9CiAKIAkvKiBDb21wbGV0ZSB0aGUgZXZlbnRzIGZvciBwaXBlcyB0aGF0 IGhhdmUgbm93IGJlZW4gZGlzYWJsZWQgKi8KLQlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRl LCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgaSkgewotCQlib29sIG1vZGVzZXQgPSBuZWVkc19tb2Rl c2V0KGNydGMtPnN0YXRlKTsKKwlmb3JfZWFjaF9uZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0 YywgbmV3X2NydGNfc3RhdGUsIGkpIHsKKwkJYm9vbCBtb2Rlc2V0ID0gbmVlZHNfbW9kZXNldChu ZXdfY3J0Y19zdGF0ZSk7CiAKIAkJLyogQ29tcGxldGUgZXZlbnRzIGZvciBub3cgZGlzYWJsZSBw aXBlcyBoZXJlLiAqLwotCQlpZiAobW9kZXNldCAmJiAhY3J0Yy0+c3RhdGUtPmFjdGl2ZSAmJiBj cnRjLT5zdGF0ZS0+ZXZlbnQpIHsKKwkJaWYgKG1vZGVzZXQgJiYgIW5ld19jcnRjX3N0YXRlLT5h Y3RpdmUgJiYgbmV3X2NydGNfc3RhdGUtPmV2ZW50KSB7CiAJCQlzcGluX2xvY2tfaXJxKCZkZXYt PmV2ZW50X2xvY2spOwotCQkJZHJtX2NydGNfc2VuZF92YmxhbmtfZXZlbnQoY3J0YywgY3J0Yy0+ c3RhdGUtPmV2ZW50KTsKKwkJCWRybV9jcnRjX3NlbmRfdmJsYW5rX2V2ZW50KGNydGMsIG5ld19j cnRjX3N0YXRlLT5ldmVudCk7CiAJCQlzcGluX3VubG9ja19pcnEoJmRldi0+ZXZlbnRfbG9jayk7 CiAKLQkJCWNydGMtPnN0YXRlLT5ldmVudCA9IE5VTEw7CisJCQluZXdfY3J0Y19zdGF0ZS0+ZXZl bnQgPSBOVUxMOwogCQl9CiAJfQogCkBAIC0xMjg1NiwyMSArMTI4NTksMjEgQEAgc3RhdGljIHZv aWQgaW50ZWxfYXRvbWljX2NvbW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSkKIAkgKgogCSAqIFRPRE86IE1vdmUgdGhpcyAoYW5kIG90aGVyIGNsZWFudXApIHRvIGFuIGFz eW5jIHdvcmtlciBldmVudHVhbGx5LgogCSAqLwotCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUoc3Rh dGUsIGNydGMsIG9sZF9jcnRjX3N0YXRlLCBpKSB7Ci0JCWludGVsX2NzdGF0ZSA9IHRvX2ludGVs X2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpOworCWZvcl9lYWNoX25ld19jcnRjX2luX3N0YXRlKHN0 YXRlLCBjcnRjLCBuZXdfY3J0Y19zdGF0ZSwgaSkgeworCQlpbnRlbF9jc3RhdGUgPSB0b19pbnRl bF9jcnRjX3N0YXRlKG5ld19jcnRjX3N0YXRlKTsKIAogCQlpZiAoZGV2X3ByaXYtPmRpc3BsYXku b3B0aW1pemVfd2F0ZXJtYXJrcykKIAkJCWRldl9wcml2LT5kaXNwbGF5Lm9wdGltaXplX3dhdGVy bWFya3MoaW50ZWxfc3RhdGUsCiAJCQkJCQkJICAgICAgaW50ZWxfY3N0YXRlKTsKIAl9CiAKLQlm b3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgaSkgewor CWZvcl9lYWNoX29sZG5ld19jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0 ZSwgbmV3X2NydGNfc3RhdGUsIGkpIHsKIAkJaW50ZWxfcG9zdF9wbGFuZV91cGRhdGUodG9faW50 ZWxfY3J0Y19zdGF0ZShvbGRfY3J0Y19zdGF0ZSkpOwogCiAJCWlmIChwdXRfZG9tYWluc1tpXSkK IAkJCW1vZGVzZXRfcHV0X3Bvd2VyX2RvbWFpbnMoZGV2X3ByaXYsIHB1dF9kb21haW5zW2ldKTsK IAotCQlpbnRlbF9tb2Rlc2V0X3ZlcmlmeV9jcnRjKGNydGMsIHN0YXRlLCBvbGRfY3J0Y19zdGF0 ZSwgY3J0Yy0+c3RhdGUpOworCQlpbnRlbF9tb2Rlc2V0X3ZlcmlmeV9jcnRjKGNydGMsIHN0YXRl LCBvbGRfY3J0Y19zdGF0ZSwgbmV3X2NydGNfc3RhdGUpOwogCX0KIAogCWlmIChpbnRlbF9zdGF0 ZS0+bW9kZXNldCAmJiBpbnRlbF9jYW5fZW5hYmxlX3NhZ3Yoc3RhdGUpKQpAQCAtMTI5NDIsMTMg KzEyOTQ1LDEzIEBAIGludGVsX2F0b21pY19jb21taXRfcmVhZHkoc3RydWN0IGk5MTVfc3dfZmVu Y2UgKmZlbmNlLAogCiBzdGF0aWMgdm9pZCBpbnRlbF9hdG9taWNfdHJhY2tfZmJzKHN0cnVjdCBk cm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRf cGxhbmVfc3RhdGU7CisJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqb2xkX3BsYW5lX3N0YXRlLCAq bmV3X3BsYW5lX3N0YXRlOwogCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwogCWludCBpOwogCi0J Zm9yX2VhY2hfcGxhbmVfaW5fc3RhdGUoc3RhdGUsIHBsYW5lLCBvbGRfcGxhbmVfc3RhdGUsIGkp CisJZm9yX2VhY2hfb2xkbmV3X3BsYW5lX2luX3N0YXRlKHN0YXRlLCBwbGFuZSwgb2xkX3BsYW5l X3N0YXRlLCBuZXdfcGxhbmVfc3RhdGUsIGkpCiAJCWk5MTVfZ2VtX3RyYWNrX2ZiKGludGVsX2Zi X29iaihvbGRfcGxhbmVfc3RhdGUtPmZiKSwKLQkJCQkgIGludGVsX2ZiX29iaihwbGFuZS0+c3Rh dGUtPmZiKSwKKwkJCQkgIGludGVsX2ZiX29iaihuZXdfcGxhbmVfc3RhdGUtPmZiKSwKIAkJCQkg IHRvX2ludGVsX3BsYW5lKHBsYW5lKS0+ZnJvbnRidWZmZXJfYml0KTsKIH0KIApAQCAtMTQ4OTAs NyArMTQ4OTMsNyBAQCBzdGF0aWMgdm9pZCBzYW5pdGl6ZV93YXRlcm1hcmtzKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJfQogCiAJLyogV3JpdGUgY2FsY3VsYXRlZCB3YXRlcm1hcmsgdmFsdWVz IGJhY2sgKi8KLQlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjc3RhdGUsIGkp IHsKKwlmb3JfZWFjaF9uZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3N0YXRlLCBpKSB7 CiAJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcyA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3N0 YXRlKTsKIAogCQljcy0+d20ubmVlZF9wb3N0dmJsX3VwZGF0ZSA9IHRydWU7Ci0tIAoyLjcuNAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==