From: Maarten Lankhorst Subject: [PATCH 2/2] Revert "drm/i915: Read hw state into an atomic state struct, v2." Date: Wed, 10 Jun 2015 10:24:20 +0200 Message-ID: <1433924660-2228-3-git-send-email-maarten.lankhorst@linux.intel.com> References: <1433924660-2228-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 ESMTP id F01E56E476 for ; Wed, 10 Jun 2015 01:24:26 -0700 (PDT) In-Reply-To: <1433924660-2228-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 VGhpcyByZXZlcnRzIGNvbW1pdCAzYmFlMjZlYjI5OTFjMDA2NzBkZjM3N2NmNmMzYmMyYjA1Nzdl ODJhLgoKU2VlbXMgaXQgaW50cm9kdWNlcyByZWdyZXNzaW9ucyBmb3IgMyBkaWZmZXJlbnQgcmVh c29ucywgb2ggYm95Li4KCkluIGJ1ZyAjOTA4NjggYXMgSSBjYW4gc2VlIHRoZSBhdG9taWMgc3Rh dGUgd2lsbCBiZSByZXN0b3JlZCBvbgpyZXN1bWUgd2l0aG91dCB0aGUgcGxhbmVzIGJlaW5nIHNl dCB1cCBwcm9wZXJseS4gQmVjYXVzZSBwbGFuZQpzZXR1cCBoZXJlIHJlcXVpcmVzIHRoZSBhdG9t aWMgc3RhdGUsIHdlJ2xsIGhhdmUgdG8gc2V0dGxlCmZvciBjb21taXR0aW5nIGF0b21pYyBwbGFu ZXMgZmlyc3QuCgpJbiBidWcgIzkwODYxIHRoZSBmYWlsdXJlIGFwcGVhcnMgdG8gYWZmZWN0IG1v c3RseSBEUCBkZXZpY2VzLAphbmQgaGFwcGVucyBiZWNhdXNlIHJlYWRpbmcgb3V0IHRoZSBhdG9t aWMgc3RhdGUgcHJldmVudHMgYSBtb2Rlc2V0Cm9uIGJvb3QsIHdoaWNoIHdvdWxkIHJlcXVpcmUg YmV0dGVyIGh3IHN0YXRlIHJlYWRvdXQuCgpJbiBidWcgIzkwODc0IGl0J3Mgc2hvd24gdGhhdCBj ZGNsayBzaG91bGQgYmUgcGFydCBvZiB0aGUgYXRvbWljCnN0YXRlLCBzbyBvbmx5IHBlcmZvcm1p bmcgYSBzaW5nbGUgbW9kZXNldCBkdXJpbmcgcmVzdW1lIGV4Y2FyYmF0ZWQKdGhlIGlzc3VlLgoK SXQncyBiZXR0ZXIgdG8gZml4IHRob3NlIGlzc3VlcyBmaXJzdCwgYW5kIHRoZW4gY29tbWl0IHRo aXMgcGF0Y2gsCnNvIGRvIHRoYXQgdGVtcG9yYXJpbHkuCgpCdWd6aWxsYTogaHR0cHM6Ly9idWdz LmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTA4NjgKQnVnemlsbGE6IGh0dHBzOi8v YnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTkwODYxCkJ1Z3ppbGxhOiBodHRw czovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD05MDg3NApTaWduZWQtb2Zm LWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jICB8ICAgMiArLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMzc5ICsrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAg fCAgMTQgKy0KIDMgZmlsZXMgY2hhbmdlZCwgMTUyIGluc2VydGlvbnMoKyksIDI0MyBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jCmluZGV4IGU0N2UwMGU1YjEzMC4u NGRmNmQyZDdhOWM4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9t aWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYwpAQCAtMzk1LDcg KzM5NSw3IEBAIGludCBpbnRlbF9hdG9taWNfc2V0dXBfc2NhbGVycyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAogCXJldHVybiAwOwogfQogCi12b2lkCitzdGF0aWMgdm9pZAogaW50ZWxfYXRvbWlj X2R1cGxpY2F0ZV9kcGxsX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK IAkJCQkgIHN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbF9jb25maWcgKnNoYXJlZF9kcGxsKQogewpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDM1MGVlZTIyYjllMi4uZTVjMmRk NzI5NTJiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMDI4OCw3ICsx MDI4OCw3IEBAIGJvb2wgaW50ZWxfZ2V0X2xvYWRfZGV0ZWN0X3BpcGUoc3RydWN0IGRybV9jb25u ZWN0b3IgKmNvbm5lY3RvciwKIHJldHJ5OgogCXJldCA9IGRybV9tb2Rlc2V0X2xvY2soJmNvbmZp Zy0+Y29ubmVjdGlvbl9tdXRleCwgY3R4KTsKIAlpZiAocmV0KQotCQlnb3RvIGZhaWw7CisJCWdv dG8gZmFpbF91bmxvY2s7CiAKIAkvKgogCSAqIEFsZ29yaXRobSBnZXRzIGEgbGl0dGxlIG1lc3N5 OgpAQCAtMTAzMDYsMTAgKzEwMzA2LDEwIEBAIHJldHJ5OgogCiAJCXJldCA9IGRybV9tb2Rlc2V0 X2xvY2soJmNydGMtPm11dGV4LCBjdHgpOwogCQlpZiAocmV0KQotCQkJZ290byBmYWlsOworCQkJ Z290byBmYWlsX3VubG9jazsKIAkJcmV0ID0gZHJtX21vZGVzZXRfbG9jaygmY3J0Yy0+cHJpbWFy eS0+bXV0ZXgsIGN0eCk7CiAJCWlmIChyZXQpCi0JCQlnb3RvIGZhaWw7CisJCQlnb3RvIGZhaWxf dW5sb2NrOwogCiAJCW9sZC0+ZHBtc19tb2RlID0gY29ubmVjdG9yLT5kcG1zOwogCQlvbGQtPmxv YWRfZGV0ZWN0X3RlbXAgPSBmYWxzZTsKQEAgLTEwMzI4LDYgKzEwMzI4LDkgQEAgcmV0cnk6CiAJ CQljb250aW51ZTsKIAkJaWYgKHBvc3NpYmxlX2NydGMtPnN0YXRlLT5lbmFibGUpCiAJCQljb250 aW51ZTsKKwkJLyogVGhpcyBjYW4gb2NjdXIgd2hlbiBhcHBseWluZyB0aGUgcGlwZSBBIHF1aXJr IG9uIHJlc3VtZS4gKi8KKwkJaWYgKHRvX2ludGVsX2NydGMocG9zc2libGVfY3J0YyktPm5ld19l bmFibGVkKQorCQkJY29udGludWU7CiAKIAkJY3J0YyA9IHBvc3NpYmxlX2NydGM7CiAJCWJyZWFr OwpAQCAtMTAzMzgsMTcgKzEwMzQxLDIwIEBAIHJldHJ5OgogCSAqLwogCWlmICghY3J0Yykgewog CQlEUk1fREVCVUdfS01TKCJubyBwaXBlIGF2YWlsYWJsZSBmb3IgbG9hZC1kZXRlY3RcbiIpOwot CQlnb3RvIGZhaWw7CisJCWdvdG8gZmFpbF91bmxvY2s7CiAJfQogCiAJcmV0ID0gZHJtX21vZGVz ZXRfbG9jaygmY3J0Yy0+bXV0ZXgsIGN0eCk7CiAJaWYgKHJldCkKLQkJZ290byBmYWlsOworCQln b3RvIGZhaWxfdW5sb2NrOwogCXJldCA9IGRybV9tb2Rlc2V0X2xvY2soJmNydGMtPnByaW1hcnkt Pm11dGV4LCBjdHgpOwogCWlmIChyZXQpCi0JCWdvdG8gZmFpbDsKKwkJZ290byBmYWlsX3VubG9j azsKKwlpbnRlbF9lbmNvZGVyLT5uZXdfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJdG9f aW50ZWxfY29ubmVjdG9yKGNvbm5lY3RvciktPm5ld19lbmNvZGVyID0gaW50ZWxfZW5jb2RlcjsK IAogCWludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOworCWludGVsX2NydGMtPm5ld19l bmFibGVkID0gdHJ1ZTsKIAlvbGQtPmRwbXNfbW9kZSA9IGNvbm5lY3Rvci0+ZHBtczsKIAlvbGQt PmxvYWRfZGV0ZWN0X3RlbXAgPSB0cnVlOwogCW9sZC0+cmVsZWFzZV9mYiA9IE5VTEw7CkBAIC0x MDQxNiw3ICsxMDQyMiw5IEBAIHJldHJ5OgogCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIGlu dGVsX2NydGMtPnBpcGUpOwogCXJldHVybiB0cnVlOwogCi1mYWlsOgorIGZhaWw6CisJaW50ZWxf Y3J0Yy0+bmV3X2VuYWJsZWQgPSBjcnRjLT5zdGF0ZS0+ZW5hYmxlOworZmFpbF91bmxvY2s6CiAJ ZHJtX2F0b21pY19zdGF0ZV9mcmVlKHN0YXRlKTsKIAlzdGF0ZSA9IE5VTEw7CiAKQEAgLTEwNDYy LDYgKzEwNDcwLDEwIEBAIHZvaWQgaW50ZWxfcmVsZWFzZV9sb2FkX2RldGVjdF9waXBlKHN0cnVj dCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJCWlmIChJU19FUlIoY3J0Y19zdGF0ZSkpCiAJ CQlnb3RvIGZhaWw7CiAKKwkJdG9faW50ZWxfY29ubmVjdG9yKGNvbm5lY3RvciktPm5ld19lbmNv ZGVyID0gTlVMTDsKKwkJaW50ZWxfZW5jb2Rlci0+bmV3X2NydGMgPSBOVUxMOworCQlpbnRlbF9j cnRjLT5uZXdfZW5hYmxlZCA9IGZhbHNlOworCiAJCWNvbm5lY3Rvcl9zdGF0ZS0+YmVzdF9lbmNv ZGVyID0gTlVMTDsKIAkJY29ubmVjdG9yX3N0YXRlLT5jcnRjID0gTlVMTDsKIApAQCAtMTE2MDgs NiArMTE2MjAsMzMgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fY3J0Y19oZWxwZXJfZnVuY3Mg aW50ZWxfaGVscGVyX2Z1bmNzID0gewogCS5hdG9taWNfZmx1c2ggPSBpbnRlbF9maW5pc2hfY3J0 Y19jb21taXQsCiB9OwogCisvKioKKyAqIGludGVsX21vZGVzZXRfdXBkYXRlX3N0YWdlZF9vdXRw dXRfc3RhdGUKKyAqCisgKiBVcGRhdGVzIHRoZSBzdGFnZWQgb3V0cHV0IGNvbmZpZ3VyYXRpb24g c3RhdGUsIGUuZy4gYWZ0ZXIgd2UndmUgcmVhZCBvdXQgdGhlCisgKiBjdXJyZW50IGh3IHN0YXRl LgorICovCitzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3VwZGF0ZV9zdGFnZWRfb3V0cHV0X3N0 YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7CisJc3RydWN0IGludGVsX2NydGMgKmNydGM7 CisJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXI7CisJc3RydWN0IGludGVsX2Nvbm5lY3Rv ciAqY29ubmVjdG9yOworCisJZm9yX2VhY2hfaW50ZWxfY29ubmVjdG9yKGRldiwgY29ubmVjdG9y KSB7CisJCWNvbm5lY3Rvci0+bmV3X2VuY29kZXIgPQorCQkJdG9faW50ZWxfZW5jb2Rlcihjb25u ZWN0b3ItPmJhc2UuZW5jb2Rlcik7CisJfQorCisJZm9yX2VhY2hfaW50ZWxfZW5jb2RlcihkZXYs IGVuY29kZXIpIHsKKwkJZW5jb2Rlci0+bmV3X2NydGMgPQorCQkJdG9faW50ZWxfY3J0YyhlbmNv ZGVyLT5iYXNlLmNydGMpOworCX0KKworCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBjcnRjKSB7 CisJCWNydGMtPm5ld19lbmFibGVkID0gY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlOworCX0KK30K KwogLyogVHJhbnNpdGlvbmFsIGhlbHBlciB0byBjb3B5IGN1cnJlbnQgY29ubmVjdG9yL2VuY29k ZXIgc3RhdGUgdG8KICAqIGNvbm5lY3Rvci0+c3RhdGUuIFRoaXMgaXMgbmVlZGVkIHNvIHRoYXQg Y29kZSB0aGF0IGlzIHBhcnRpYWxseQogICogY29udmVydGVkIHRvIGF0b21pYyBkb2VzIHRoZSBy aWdodCB0aGluZy4KQEAgLTEyMTM3LDYgKzEyMTc2LDcgQEAgaW50ZWxfbW9kZXNldF91cGRhdGVf c3RhdGUoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCX0KIAogCWRybV9hdG9taWNf aGVscGVyX3VwZGF0ZV9sZWdhY3lfbW9kZXNldF9zdGF0ZShzdGF0ZS0+ZGV2LCBzdGF0ZSk7CisJ aW50ZWxfbW9kZXNldF91cGRhdGVfc3RhZ2VkX291dHB1dF9zdGF0ZShzdGF0ZS0+ZGV2KTsKIAog CS8qIERvdWJsZSBjaGVjayBzdGF0ZS4gKi8KIAlmb3JfZWFjaF9jcnRjKGRldiwgY3J0YykgewpA QCAtMTI0NDYsMTQgKzEyNDg2LDExIEBAIGNoZWNrX2Nvbm5lY3Rvcl9zdGF0ZShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcjsKIAogCWZv cl9lYWNoX2ludGVsX2Nvbm5lY3RvcihkZXYsIGNvbm5lY3RvcikgewotCQlzdHJ1Y3QgZHJtX2Vu Y29kZXIgKmVuY29kZXIgPSBjb25uZWN0b3ItPmJhc2UuZW5jb2RlcjsKLQkJc3RydWN0IGRybV9j b25uZWN0b3Jfc3RhdGUgKnN0YXRlID0gY29ubmVjdG9yLT5iYXNlLnN0YXRlOwotCiAJCS8qIFRo aXMgYWxzbyBjaGVja3MgdGhlIGVuY29kZXIvY29ubmVjdG9yIGh3IHN0YXRlIHdpdGggdGhlCiAJ CSAqIC0+Z2V0X2h3X3N0YXRlIGNhbGxiYWNrcy4gKi8KIAkJaW50ZWxfY29ubmVjdG9yX2NoZWNr X3N0YXRlKGNvbm5lY3Rvcik7CiAKLQkJSTkxNV9TVEFURV9XQVJOKHN0YXRlLT5iZXN0X2VuY29k ZXIgIT0gZW5jb2RlciwKKwkJSTkxNV9TVEFURV9XQVJOKCZjb25uZWN0b3ItPm5ld19lbmNvZGVy LT5iYXNlICE9IGNvbm5lY3Rvci0+YmFzZS5lbmNvZGVyLAogCQkgICAgICJjb25uZWN0b3IncyBz dGFnZWQgZW5jb2RlciBkb2Vzbid0IG1hdGNoIGN1cnJlbnQgZW5jb2RlclxuIik7CiAJfQogfQpA QCAtMTI0NzMsNiArMTI1MTAsOCBAQCBjaGVja19lbmNvZGVyX3N0YXRlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJCQkgICAgICBlbmNvZGVyLT5iYXNlLmJhc2UuaWQsCiAJCQkgICAgICBlbmNv ZGVyLT5iYXNlLm5hbWUpOwogCisJCUk5MTVfU1RBVEVfV0FSTigmZW5jb2Rlci0+bmV3X2NydGMt PmJhc2UgIT0gZW5jb2Rlci0+YmFzZS5jcnRjLAorCQkgICAgICJlbmNvZGVyJ3Mgc3RhZ2UgY3J0 YyBkb2Vzbid0IG1hdGNoIGN1cnJlbnQgY3J0Y1xuIik7CiAJCUk5MTVfU1RBVEVfV0FSTihlbmNv ZGVyLT5jb25uZWN0b3JzX2FjdGl2ZSAmJiAhZW5jb2Rlci0+YmFzZS5jcnRjLAogCQkgICAgICJl bmNvZGVyJ3MgYWN0aXZlX2Nvbm5lY3RvcnMgc2V0LCBidXQgbm8gY3J0Y1xuIik7CiAKQEAgLTEy NDgyLDkgKzEyNTIxLDYgQEAgY2hlY2tfZW5jb2Rlcl9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogCQkJZW5hYmxlZCA9IHRydWU7CiAJCQlpZiAoY29ubmVjdG9yLT5iYXNlLmRwbXMgIT0g RFJNX01PREVfRFBNU19PRkYpCiAJCQkJYWN0aXZlID0gdHJ1ZTsKLQotCQkJSTkxNV9TVEFURV9X QVJOKGNvbm5lY3Rvci0+YmFzZS5zdGF0ZS0+Y3J0YyAhPSBlbmNvZGVyLT5iYXNlLmNydGMsCi0J CQkgICAgICJlbmNvZGVyJ3Mgc3RhZ2UgY3J0YyBkb2Vzbid0IG1hdGNoIGN1cnJlbnQgY3J0Y1xu Iik7CiAJCX0KIAkJLyoKIAkJICogZm9yIE1TVCBjb25uZWN0b3JzIGlmIHdlIHVucGx1ZyB0aGUg Y29ubmVjdG9yIGlzIGdvbmUKQEAgLTEyOTg4LDExICsxMzAyNCwxMSBAQCB2b2lkIGludGVsX2Ny dGNfcmVzdG9yZV9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkgKiBuZWVkIHRvIGNvcHkg dGhlIHN0YWdlZCBjb25maWcgdG8gdGhlIGF0b21pYyBzdGF0ZSwgb3RoZXJ3aXNlIHRoZQogCSAq IG1vZGUgc2V0IHdpbGwganVzdCByZWFwcGx5IHRoZSBzdGF0ZSB0aGUgSFcgaXMgYWxyZWFkeSBp bi4gKi8KIAlmb3JfZWFjaF9pbnRlbF9lbmNvZGVyKGRldiwgZW5jb2RlcikgewotCQlpZiAoZW5j b2Rlci0+YmFzZS5jcnRjICE9IGNydGMpCisJCWlmICgmZW5jb2Rlci0+bmV3X2NydGMtPmJhc2Ug IT0gY3J0YykKIAkJCWNvbnRpbnVlOwogCiAJCWZvcl9lYWNoX2ludGVsX2Nvbm5lY3RvcihkZXYs IGNvbm5lY3RvcikgewotCQkJaWYgKGNvbm5lY3Rvci0+YmFzZS5zdGF0ZS0+YmVzdF9lbmNvZGVy ICE9ICZlbmNvZGVyLT5iYXNlKQorCQkJaWYgKGNvbm5lY3Rvci0+bmV3X2VuY29kZXIgIT0gZW5j b2RlcikKIAkJCQljb250aW51ZTsKIAogCQkJY29ubmVjdG9yX3N0YXRlID0gZHJtX2F0b21pY19n ZXRfY29ubmVjdG9yX3N0YXRlKHN0YXRlLCAmY29ubmVjdG9yLT5iYXNlKTsKQEAgLTEzMDA1LDEw ICsxMzA0MSwxNCBAQCB2b2lkIGludGVsX2NydGNfcmVzdG9yZV9tb2RlKHN0cnVjdCBkcm1fY3J0 YyAqY3J0YykKIAkJCX0KIAogCQkJY29ubmVjdG9yX3N0YXRlLT5jcnRjID0gY3J0YzsKKwkJCWNv bm5lY3Rvcl9zdGF0ZS0+YmVzdF9lbmNvZGVyID0gJmVuY29kZXItPmJhc2U7CiAJCX0KIAl9CiAK IAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgaW50ZWxfY3J0YykgeworCQlpZiAoaW50ZWxfY3J0 Yy0+bmV3X2VuYWJsZWQgPT0gaW50ZWxfY3J0Yy0+YmFzZS5lbmFibGVkKQorCQkJY29udGludWU7 CisKIAkJY3J0Y19zdGF0ZSA9IGludGVsX2F0b21pY19nZXRfY3J0Y19zdGF0ZShzdGF0ZSwgaW50 ZWxfY3J0Yyk7CiAJCWlmIChJU19FUlIoY3J0Y19zdGF0ZSkpIHsKIAkJCURSTV9ERUJVR19LTVMo IkZhaWxlZCB0byBhZGQgW0NSVEM6JWRdIHRvIHN0YXRlOiAlbGRcbiIsCkBAIC0xMzAxNyw2ICsx MzA1Nyw5IEBAIHZvaWQgaW50ZWxfY3J0Y19yZXN0b3JlX21vZGUoc3RydWN0IGRybV9jcnRjICpj cnRjKQogCQkJY29udGludWU7CiAJCX0KIAorCQljcnRjX3N0YXRlLT5iYXNlLmFjdGl2ZSA9IGNy dGNfc3RhdGUtPmJhc2UuZW5hYmxlID0KKwkJCWludGVsX2NydGMtPm5ld19lbmFibGVkOworCiAJ CWlmICgmaW50ZWxfY3J0Yy0+YmFzZSA9PSBjcnRjKQogCQkJZHJtX21vZGVfY29weSgmY3J0Y19z dGF0ZS0+YmFzZS5tb2RlLCAmY3J0Yy0+bW9kZSk7CiAJfQpAQCAtMTUwOTMsNyArMTUxMzYsNiBA QCBzdGF0aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9jcnRjKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRj KQogCQkgKiAuLi4gICovCiAJCXBsYW5lID0gY3J0Yy0+cGxhbmU7CiAJCXRvX2ludGVsX3BsYW5l X3N0YXRlKGNydGMtPmJhc2UucHJpbWFyeS0+c3RhdGUpLT52aXNpYmxlID0gdHJ1ZTsKLQkJY3J0 Yy0+YmFzZS5wcmltYXJ5LT5jcnRjID0gJmNydGMtPmJhc2U7CiAJCWNydGMtPnBsYW5lID0gIXBs YW5lOwogCQlpbnRlbF9jcnRjX2NvbnRyb2woJmNydGMtPmJhc2UsIGZhbHNlKTsKIAkJY3J0Yy0+ cGxhbmUgPSBwbGFuZTsKQEAgLTE1MjU3LDE4MiArMTUyOTksNzggQEAgc3RhdGljIGJvb2wgcHJp bWFyeV9nZXRfaHdfc3RhdGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gY3J0Yy0+YmFzZS5kZXYtPmRldl9wcml2YXRlOwog Ci0JaWYgKCFjcnRjLT5iYXNlLmVuYWJsZWQpCisJaWYgKCFjcnRjLT5hY3RpdmUpCiAJCXJldHVy biBmYWxzZTsKIAogCXJldHVybiBJOTE1X1JFQUQoRFNQQ05UUihjcnRjLT5wbGFuZSkpICYgRElT UExBWV9QTEFORV9FTkFCTEU7CiB9CiAKLXN0YXRpYyBpbnQgcmVhZG91dF9od19jcnRjX3N0YXRl KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKLQkJCQkgc3RydWN0IGludGVsX2NydGMg KmNydGMpCitzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3RhdGUoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KHN0YXRlLT5kZXYpOwotCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlOwotCXN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnkgPSBjcnRjLT5iYXNlLnByaW1hcnk7Ci0J c3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqZHJtX3BsYW5lX3N0YXRlOwotCXN0cnVjdCBpbnRlbF9w bGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7Ci0JaW50IHJldDsKLQotCWNydGNfc3RhdGUgPSBpbnRl bF9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIGNydGMpOwotCWlmIChJU19FUlIoY3J0Y19z dGF0ZSkpCi0JCXJldHVybiBQVFJfRVJSKGNydGNfc3RhdGUpOwotCi0JcmV0ID0gZHJtX2F0b21p Y19hZGRfYWZmZWN0ZWRfcGxhbmVzKHN0YXRlLCAmY3J0Yy0+YmFzZSk7Ci0JaWYgKHJldCkKLQkJ cmV0dXJuIHJldDsKLQotCW1lbXNldChjcnRjX3N0YXRlLCAwLCBzaXplb2YoKmNydGNfc3RhdGUp KTsKLQljcnRjX3N0YXRlLT5iYXNlLmNydGMgPSAmY3J0Yy0+YmFzZTsKLQljcnRjX3N0YXRlLT5i YXNlLnN0YXRlID0gc3RhdGU7Ci0KLQljcnRjX3N0YXRlLT5xdWlya3MgfD0gUElQRV9DT05GSUdf UVVJUktfSU5IRVJJVEVEX01PREU7Ci0KLQljcnRjX3N0YXRlLT5iYXNlLmVuYWJsZSA9IGNydGNf c3RhdGUtPmJhc2UuYWN0aXZlID0KLQljcnRjLT5iYXNlLmVuYWJsZWQgPSBkZXZfcHJpdi0+ZGlz cGxheS5nZXRfcGlwZV9jb25maWcoY3J0YywgY3J0Y19zdGF0ZSk7CisJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwllbnVtIHBpcGUgcGlwZTsK KwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YzsKKwlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rl cjsKKwlzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3I7CisJaW50IGk7CiAKLQkvKiB1 cGRhdGUgdHJhbnNpdGlvbmFsIHN0YXRlICovCi0JY3J0Yy0+YWN0aXZlID0gY3J0Y19zdGF0ZS0+ YmFzZS5hY3RpdmU7Ci0JY3J0Yy0+Y29uZmlnID0gY3J0Y19zdGF0ZTsKKwlmb3JfZWFjaF9pbnRl bF9jcnRjKGRldiwgY3J0YykgeworCQlzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5ID0gY3J0Yy0+ YmFzZS5wcmltYXJ5OworCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOwog Ci0JZHJtX3BsYW5lX3N0YXRlID0gZHJtX2F0b21pY19nZXRfcGxhbmVfc3RhdGUoc3RhdGUsIHBy aW1hcnkpOwotCWlmIChJU19FUlIoZHJtX3BsYW5lX3N0YXRlKSkKLQkJcmV0dXJuIFBUUl9FUlIo ZHJtX3BsYW5lX3N0YXRlKTsKKwkJbWVtc2V0KGNydGMtPmNvbmZpZywgMCwgc2l6ZW9mKCpjcnRj LT5jb25maWcpKTsKKwkJY3J0Yy0+Y29uZmlnLT5iYXNlLmNydGMgPSAmY3J0Yy0+YmFzZTsKIAot CXBsYW5lX3N0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUoZHJtX3BsYW5lX3N0YXRlKTsKLQlw bGFuZV9zdGF0ZS0+dmlzaWJsZSA9IHByaW1hcnlfZ2V0X2h3X3N0YXRlKGNydGMpOworCQljcnRj LT5jb25maWctPnF1aXJrcyB8PSBQSVBFX0NPTkZJR19RVUlSS19JTkhFUklURURfTU9ERTsKIAot CWlmIChwbGFuZV9zdGF0ZS0+dmlzaWJsZSkgewotCQlwcmltYXJ5LT5jcnRjID0gJmNydGMtPmJh c2U7Ci0JCWNydGNfc3RhdGUtPmJhc2UucGxhbmVfbWFzayB8PSAxIDw8IGRybV9wbGFuZV9pbmRl eChwcmltYXJ5KTsKLQl9IGVsc2UKLQkJY3J0Y19zdGF0ZS0+YmFzZS5wbGFuZV9tYXNrICY9IH4o MSA8PCBkcm1fcGxhbmVfaW5kZXgocHJpbWFyeSkpOworCQljcnRjLT5hY3RpdmUgPSBkZXZfcHJp di0+ZGlzcGxheS5nZXRfcGlwZV9jb25maWcoY3J0YywKKwkJCQkJCQkJIGNydGMtPmNvbmZpZyk7 CiAKLQlEUk1fREVCVUdfS01TKCJbQ1JUQzolZF0gaHcgc3RhdGUgcmVhZG91dDogJXNcbiIsCi0J CSAgICAgIGNydGMtPmJhc2UuYmFzZS5pZCwKLQkJICAgICAgY3J0Y19zdGF0ZS0+YmFzZS5hY3Rp dmUgPyAiZW5hYmxlZCIgOiAiZGlzYWJsZWQiKTsKKwkJY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxl ID0gY3J0Yy0+YWN0aXZlOworCQljcnRjLT5iYXNlLnN0YXRlLT5hY3RpdmUgPSBjcnRjLT5hY3Rp dmU7CisJCWNydGMtPmJhc2UuZW5hYmxlZCA9IGNydGMtPmFjdGl2ZTsKIAotCXJldHVybiAwOwot fQorCQlwbGFuZV9zdGF0ZSA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHByaW1hcnktPnN0YXRlKTsK KwkJcGxhbmVfc3RhdGUtPnZpc2libGUgPSBwcmltYXJ5X2dldF9od19zdGF0ZShjcnRjKTsKIAot c3RhdGljIGludCByZWFkb3V0X2h3X3BsbF9zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGUpCi17Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShz dGF0ZS0+ZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGxfY29uZmlnICpzaGFyZWRfZHBs bDsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YzsKLQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq Y3J0Y19zdGF0ZTsKLQlpbnQgaTsKKwkJRFJNX0RFQlVHX0tNUygiW0NSVEM6JWRdIGh3IHN0YXRl IHJlYWRvdXQ6ICVzXG4iLAorCQkJICAgICAgY3J0Yy0+YmFzZS5iYXNlLmlkLAorCQkJICAgICAg Y3J0Yy0+YWN0aXZlID8gImVuYWJsZWQiIDogImRpc2FibGVkIik7CisJfQogCi0Jc2hhcmVkX2Rw bGwgPSBpbnRlbF9hdG9taWNfZ2V0X3NoYXJlZF9kcGxsX3N0YXRlKHN0YXRlKTsKIAlmb3IgKGkg PSAwOyBpIDwgZGV2X3ByaXYtPm51bV9zaGFyZWRfZHBsbDsgaSsrKSB7CiAJCXN0cnVjdCBpbnRl bF9zaGFyZWRfZHBsbCAqcGxsID0gJmRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV07CiAKIAkJcGxs LT5vbiA9IHBsbC0+Z2V0X2h3X3N0YXRlKGRldl9wcml2LCBwbGwsCi0JCQkJCSAgICAmc2hhcmVk X2RwbGxbaV0uaHdfc3RhdGUpOwotCisJCQkJCSAgICAmcGxsLT5jb25maWcuaHdfc3RhdGUpOwog CQlwbGwtPmFjdGl2ZSA9IDA7Ci0JCXNoYXJlZF9kcGxsW2ldLmNydGNfbWFzayA9IDA7Ci0KLQkJ Zm9yX2VhY2hfaW50ZWxfY3J0YyhzdGF0ZS0+ZGV2LCBjcnRjKSB7Ci0JCQljcnRjX3N0YXRlID0g aW50ZWxfYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKLQkJCWlmIChJU19FUlIo Y3J0Y19zdGF0ZSkpCi0JCQkJcmV0dXJuIFBUUl9FUlIoY3J0Y19zdGF0ZSk7Ci0KLQkJCWlmIChj cnRjX3N0YXRlLT5iYXNlLmFjdGl2ZSAmJgotCQkJICAgIGNydGNfc3RhdGUtPnNoYXJlZF9kcGxs ID09IGkpIHsKKwkJcGxsLT5jb25maWcuY3J0Y19tYXNrID0gMDsKKwkJZm9yX2VhY2hfaW50ZWxf Y3J0YyhkZXYsIGNydGMpIHsKKwkJCWlmIChjcnRjLT5hY3RpdmUgJiYgaW50ZWxfY3J0Y190b19z aGFyZWRfZHBsbChjcnRjKSA9PSBwbGwpIHsKIAkJCQlwbGwtPmFjdGl2ZSsrOwotCQkJCXNoYXJl ZF9kcGxsW2ldLmNydGNfbWFzayB8PQotCQkJCQkxIDw8IGNydGMtPnBpcGU7CisJCQkJcGxsLT5j b25maWcuY3J0Y19tYXNrIHw9IDEgPDwgY3J0Yy0+cGlwZTsKIAkJCX0KIAkJfQogCiAJCURSTV9E RUJVR19LTVMoIiVzIGh3IHN0YXRlIHJlYWRvdXQ6IGNydGNfbWFzayAweCUwOHgsIG9uICVpXG4i LAotCQkJICAgICAgcGxsLT5uYW1lLCBzaGFyZWRfZHBsbFtpXS5jcnRjX21hc2ssCi0JCQkgICAg ICBwbGwtPm9uKTsKKwkJCSAgICAgIHBsbC0+bmFtZSwgcGxsLT5jb25maWcuY3J0Y19tYXNrLCBw bGwtPm9uKTsKIAotCQlpZiAoc2hhcmVkX2RwbGxbaV0uY3J0Y19tYXNrKQorCQlpZiAocGxsLT5j b25maWcuY3J0Y19tYXNrKQogCQkJaW50ZWxfZGlzcGxheV9wb3dlcl9nZXQoZGV2X3ByaXYsIFBP V0VSX0RPTUFJTl9QTExTKTsKIAl9CiAKLQlyZXR1cm4gMDsKLX0KLQotc3RhdGljIHN0cnVjdCBk cm1fY29ubmVjdG9yX3N0YXRlICoKLWdldF9jb25uZWN0b3Jfc3RhdGVfZm9yX2VuY29kZXIoc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAotCQkJCXN0cnVjdCBpbnRlbF9lbmNvZGVyICpl bmNvZGVyKQotewotCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7Ci0Jc3RydWN0IGRy bV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5lY3Rvcl9zdGF0ZTsKLQlpbnQgaTsKLQotCWZvcl9lYWNo X2Nvbm5lY3Rvcl9pbl9zdGF0ZShzdGF0ZSwgY29ubmVjdG9yLCBjb25uZWN0b3Jfc3RhdGUsIGkp Ci0JCWlmIChjb25uZWN0b3Jfc3RhdGUtPmJlc3RfZW5jb2RlciA9PSAmZW5jb2Rlci0+YmFzZSkK LQkJCXJldHVybiBjb25uZWN0b3Jfc3RhdGU7Ci0KLQlyZXR1cm4gTlVMTDsKLX0KLQotc3RhdGlj IGludCByZWFkb3V0X2h3X2Nvbm5lY3Rvcl9lbmNvZGVyX3N0YXRlKHN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpzdGF0ZSkKLXsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gc3RhdGUtPmRldjsK LQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KHN0YXRlLT5kZXYp OwotCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjOwotCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqZHJt X2NydGNfc3RhdGU7Ci0Jc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7Ci0Jc3Ry dWN0IGludGVsX2VuY29kZXIgKmVuY29kZXI7Ci0Jc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29u bmVjdG9yOwotCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uZWN0b3Jfc3RhdGU7Ci0J ZW51bSBwaXBlIHBpcGU7Ci0KLQlmb3JfZWFjaF9pbnRlbF9jb25uZWN0b3IoZGV2LCBjb25uZWN0 b3IpIHsKLQkJY29ubmVjdG9yX3N0YXRlID0KLQkJCWRybV9hdG9taWNfZ2V0X2Nvbm5lY3Rvcl9z dGF0ZShzdGF0ZSwgJmNvbm5lY3Rvci0+YmFzZSk7Ci0JCWlmIChJU19FUlIoY29ubmVjdG9yX3N0 YXRlKSkKLQkJCXJldHVybiBQVFJfRVJSKGNvbm5lY3Rvcl9zdGF0ZSk7Ci0KLQkJaWYgKGNvbm5l Y3Rvci0+Z2V0X2h3X3N0YXRlKGNvbm5lY3RvcikpIHsKLQkJCWNvbm5lY3Rvci0+YmFzZS5kcG1z ID0gRFJNX01PREVfRFBNU19PTjsKLQkJCWNvbm5lY3Rvci0+YmFzZS5lbmNvZGVyID0gJmNvbm5l Y3Rvci0+ZW5jb2Rlci0+YmFzZTsKLQkJfSBlbHNlIHsKLQkJCWNvbm5lY3Rvci0+YmFzZS5kcG1z ID0gRFJNX01PREVfRFBNU19PRkY7Ci0JCQljb25uZWN0b3ItPmJhc2UuZW5jb2RlciA9IE5VTEw7 Ci0JCX0KLQotCQkvKiBXZSdsbCB1cGRhdGUgdGhlIGNydGMgZmllbGQgd2hlbiByZWFkaW5nIGVu Y29kZXIgc3RhdGUgKi8KLQkJY29ubmVjdG9yX3N0YXRlLT5jcnRjID0gTlVMTDsKLQotCQljb25u ZWN0b3Jfc3RhdGUtPmJlc3RfZW5jb2RlciA9IGNvbm5lY3Rvci0+YmFzZS5lbmNvZGVyOwotCi0J CURSTV9ERUJVR19LTVMoIltDT05ORUNUT1I6JWQ6JXNdIGh3IHN0YXRlIHJlYWRvdXQ6ICVzXG4i LAotCQkJICAgICAgY29ubmVjdG9yLT5iYXNlLmJhc2UuaWQsCi0JCQkgICAgICBjb25uZWN0b3It PmJhc2UubmFtZSwKLQkJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5lbmNvZGVyID8gImVuYWJsZWQi IDogImRpc2FibGVkIik7Ci0JfQotCiAJZm9yX2VhY2hfaW50ZWxfZW5jb2RlcihkZXYsIGVuY29k ZXIpIHsKIAkJcGlwZSA9IDA7CiAKLQkJY29ubmVjdG9yX3N0YXRlID0KLQkJCWdldF9jb25uZWN0 b3Jfc3RhdGVfZm9yX2VuY29kZXIoc3RhdGUsIGVuY29kZXIpOwotCi0JCWVuY29kZXItPmNvbm5l Y3RvcnNfYWN0aXZlID0gISFjb25uZWN0b3Jfc3RhdGU7Ci0KIAkJaWYgKGVuY29kZXItPmdldF9o d19zdGF0ZShlbmNvZGVyLCAmcGlwZSkpIHsKLQkJCWVuY29kZXItPmJhc2UuY3J0YyA9Ci0JCQkJ ZGV2X3ByaXYtPnBpcGVfdG9fY3J0Y19tYXBwaW5nW3BpcGVdOwotCQkJY3J0YyA9IHRvX2ludGVs X2NydGMoZW5jb2Rlci0+YmFzZS5jcnRjKTsKLQotCQkJZHJtX2NydGNfc3RhdGUgPQotCQkJCXN0 YXRlLT5jcnRjX3N0YXRlc1tkcm1fY3J0Y19pbmRleCgmY3J0Yy0+YmFzZSldOwotCQkJY3J0Y19z dGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoZHJtX2NydGNfc3RhdGUpOwotCi0JCQllbmNvZGVy LT5nZXRfY29uZmlnKGVuY29kZXIsIGNydGNfc3RhdGUpOwotCi0JCQlpZiAoY29ubmVjdG9yX3N0 YXRlKQotCQkJCWNvbm5lY3Rvcl9zdGF0ZS0+Y3J0YyA9ICZjcnRjLT5iYXNlOworCQkJY3J0YyA9 IHRvX2ludGVsX2NydGMoZGV2X3ByaXYtPnBpcGVfdG9fY3J0Y19tYXBwaW5nW3BpcGVdKTsKKwkJ CWVuY29kZXItPmJhc2UuY3J0YyA9ICZjcnRjLT5iYXNlOworCQkJZW5jb2Rlci0+Z2V0X2NvbmZp ZyhlbmNvZGVyLCBjcnRjLT5jb25maWcpOwogCQl9IGVsc2UgewogCQkJZW5jb2Rlci0+YmFzZS5j cnRjID0gTlVMTDsKIAkJfQogCisJCWVuY29kZXItPmNvbm5lY3RvcnNfYWN0aXZlID0gZmFsc2U7 CiAJCURSTV9ERUJVR19LTVMoIltFTkNPREVSOiVkOiVzXSBodyBzdGF0ZSByZWFkb3V0OiAlcywg cGlwZSAlY1xuIiwKIAkJCSAgICAgIGVuY29kZXItPmJhc2UuYmFzZS5pZCwKIAkJCSAgICAgIGVu Y29kZXItPmJhc2UubmFtZSwKQEAgLTE1NDQwLDQyICsxNTM3OCwyMCBAQCBzdGF0aWMgaW50IHJl YWRvdXRfaHdfY29ubmVjdG9yX2VuY29kZXJfc3RhdGUoc3RydWN0IGRybV9hdG9taWNfc3RhdGUg KnN0YXRlKQogCQkJICAgICAgcGlwZV9uYW1lKHBpcGUpKTsKIAl9CiAKLQlyZXR1cm4gMDsKLX0K LQotc3RhdGljIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICoKLWludGVsX21vZGVzZXRfcmVhZG91 dF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQotewotCXN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjOwotCWludCByZXQgPSAwOwotCi0Jc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRl OwotCi0Jc3RhdGUgPSBkcm1fYXRvbWljX3N0YXRlX2FsbG9jKGRldik7Ci0JaWYgKCFzdGF0ZSkK LQkJcmV0dXJuIEVSUl9QVFIoLUVOT01FTSk7Ci0KLQlzdGF0ZS0+YWNxdWlyZV9jdHggPSBkZXYt Pm1vZGVfY29uZmlnLmFjcXVpcmVfY3R4OwotCi0JZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGNy dGMpIHsKLQkJcmV0ID0gcmVhZG91dF9od19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKLQkJaWYg KHJldCkKLQkJCWdvdG8gZXJyX2ZyZWU7CisJZm9yX2VhY2hfaW50ZWxfY29ubmVjdG9yKGRldiwg Y29ubmVjdG9yKSB7CisJCWlmIChjb25uZWN0b3ItPmdldF9od19zdGF0ZShjb25uZWN0b3IpKSB7 CisJCQljb25uZWN0b3ItPmJhc2UuZHBtcyA9IERSTV9NT0RFX0RQTVNfT047CisJCQljb25uZWN0 b3ItPmVuY29kZXItPmNvbm5lY3RvcnNfYWN0aXZlID0gdHJ1ZTsKKwkJCWNvbm5lY3Rvci0+YmFz ZS5lbmNvZGVyID0gJmNvbm5lY3Rvci0+ZW5jb2Rlci0+YmFzZTsKKwkJfSBlbHNlIHsKKwkJCWNv bm5lY3Rvci0+YmFzZS5kcG1zID0gRFJNX01PREVfRFBNU19PRkY7CisJCQljb25uZWN0b3ItPmJh c2UuZW5jb2RlciA9IE5VTEw7CisJCX0KKwkJRFJNX0RFQlVHX0tNUygiW0NPTk5FQ1RPUjolZDol c10gaHcgc3RhdGUgcmVhZG91dDogJXNcbiIsCisJCQkgICAgICBjb25uZWN0b3ItPmJhc2UuYmFz ZS5pZCwKKwkJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5uYW1lLAorCQkJICAgICAgY29ubmVjdG9y LT5iYXNlLmVuY29kZXIgPyAiZW5hYmxlZCIgOiAiZGlzYWJsZWQiKTsKIAl9Ci0KLQlyZXQgPSBy ZWFkb3V0X2h3X3BsbF9zdGF0ZShzdGF0ZSk7Ci0JaWYgKHJldCkKLQkJZ290byBlcnJfZnJlZTsK LQotCXJldCA9IHJlYWRvdXRfaHdfY29ubmVjdG9yX2VuY29kZXJfc3RhdGUoc3RhdGUpOwotCWlm IChyZXQpCi0JCWdvdG8gZXJyX2ZyZWU7Ci0KLQlyZXR1cm4gc3RhdGU7Ci0KLWVycl9mcmVlOgot CWRybV9hdG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7Ci0JcmV0dXJuIEVSUl9QVFIocmV0KTsKIH0K IAogLyogU2NhbiBvdXQgdGhlIGN1cnJlbnQgaHcgbW9kZXNldCBzdGF0ZSwgc2FuaXRpemVzIGl0 IGFuZCBtYXBzIGl0IGludG8gdGhlIGRybQpAQCAtMTU0ODQsNTcgKzE1NDAwLDM3IEBAIHZvaWQg aW50ZWxfbW9kZXNldF9zZXR1cF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJ CSAgYm9vbCBmb3JjZV9yZXN0b3JlKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGRybV9jcnRjICpjcnRjOwotCXN0cnVj dCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKKwllbnVtIHBpcGUgcGlwZTsKKwlzdHJ1Y3Qg aW50ZWxfY3J0YyAqY3J0YzsKIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKLQlzdHJ1 Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7Ci0Jc3RydWN0IGludGVsX3NoYXJlZF9kcGxsX2Nv bmZpZyBzaGFyZWRfZHBsbHNbSTkxNV9OVU1fUExMU107CiAJaW50IGk7CiAKLQlzdGF0ZSA9IGlu dGVsX21vZGVzZXRfcmVhZG91dF9od19zdGF0ZShkZXYpOwotCWlmIChJU19FUlIoc3RhdGUpKSB7 Ci0JCURSTV9FUlJPUigiRmFpbGVkIHRvIHJlYWQgb3V0IGh3IHN0YXRlXG4iKTsKLQkJcmV0dXJu OwotCX0KLQotCWRybV9hdG9taWNfaGVscGVyX3N3YXBfc3RhdGUoZGV2LCBzdGF0ZSk7CisJaW50 ZWxfbW9kZXNldF9yZWFkb3V0X2h3X3N0YXRlKGRldik7CiAKLQkvKiBzd2FwIHN3L2h3IGRwbGwg c3RhdGUgKi8KLQlpbnRlbF9hdG9taWNfZHVwbGljYXRlX2RwbGxfc3RhdGUoZGV2X3ByaXYsIHNo YXJlZF9kcGxscyk7Ci0JaW50ZWxfc2hhcmVkX2RwbGxfY29tbWl0KHN0YXRlKTsKLQltZW1jcHko dG9faW50ZWxfYXRvbWljX3N0YXRlKHN0YXRlKS0+c2hhcmVkX2RwbGwsCi0JICAgICAgIHNoYXJl ZF9kcGxscywgc2l6ZW9mKCpzaGFyZWRfZHBsbHMpICogZGV2X3ByaXYtPm51bV9zaGFyZWRfZHBs bCk7CisJLyoKKwkgKiBOb3cgdGhhdCB3ZSBoYXZlIHRoZSBjb25maWcsIGNvcHkgaXQgdG8gZWFj aCBDUlRDIHN0cnVjdAorCSAqIE5vdGUgdGhhdCB0aGlzIGNvdWxkIGdvIGF3YXkgaWYgd2UgbW92 ZSB0byB1c2luZyBjcnRjX2NvbmZpZworCSAqIGNoZWNraW5nIGV2ZXJ5d2hlcmUuCisJICovCisJ Zm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGNydGMpIHsKKwkJaWYgKGNydGMtPmFjdGl2ZSAmJiBp OTE1LmZhc3Rib290KSB7CisJCQlpbnRlbF9tb2RlX2Zyb21fcGlwZV9jb25maWcoJmNydGMtPmJh c2UubW9kZSwKKwkJCQkJCSAgICBjcnRjLT5jb25maWcpOworCQkJRFJNX0RFQlVHX0tNUygiW0NS VEM6JWRdIGZvdW5kIGFjdGl2ZSBtb2RlOiAiLAorCQkJCSAgICAgIGNydGMtPmJhc2UuYmFzZS5p ZCk7CisJCQlkcm1fbW9kZV9kZWJ1Z19wcmludG1vZGVsaW5lKCZjcnRjLT5iYXNlLm1vZGUpOwor CQl9CisJfQogCiAJLyogSFcgc3RhdGUgaXMgcmVhZCBvdXQsIG5vdyB3ZSBuZWVkIHRvIHNhbml0 aXplIHRoaXMgbWVzcy4gKi8KIAlmb3JfZWFjaF9pbnRlbF9lbmNvZGVyKGRldiwgZW5jb2Rlcikg ewogCQlpbnRlbF9zYW5pdGl6ZV9lbmNvZGVyKGVuY29kZXIpOwogCX0KIAotCWZvcl9lYWNoX2Ny dGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKLQkJc3RydWN0IGludGVs X2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwotCi0JCS8qIHByZXZlbnQg dW5ubmVlZGVkIHJlc3RvcmVzIHdpdGggZm9yY2VfcmVzdG9yZSAqLwotCQljcnRjX3N0YXRlLT5h Y3RpdmVfY2hhbmdlZCA9Ci0JCWNydGNfc3RhdGUtPm1vZGVfY2hhbmdlZCA9Ci0JCWNydGNfc3Rh dGUtPnBsYW5lc19jaGFuZ2VkID0gZmFsc2U7Ci0KLQkJaWYgKGNydGMtPmVuYWJsZWQpIHsKLQkJ CWludGVsX21vZGVfZnJvbV9waXBlX2NvbmZpZygmY3J0Yy0+c3RhdGUtPm1vZGUsCi0JCQkJdG9f aW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSkpOwotCi0JCQlkcm1fbW9kZV9jb3B5KCZjcnRj LT5tb2RlLCAmY3J0Yy0+c3RhdGUtPm1vZGUpOwotCQkJZHJtX21vZGVfY29weSgmY3J0Yy0+aHdt b2RlLAotCQkJCSAgICAgICZjcnRjLT5zdGF0ZS0+YWRqdXN0ZWRfbW9kZSk7Ci0JCX0KLQotCQlp bnRlbF9zYW5pdGl6ZV9jcnRjKGludGVsX2NydGMpOwotCi0JCS8qCi0JCSAqIHNhbml0aXplX2Ny dGMgbWF5IGhhdmUgZm9yY2VkIGFuIHVwZGF0ZSBvZiBjcnRjLT5zdGF0ZSwKLQkJICogc28gcmVs b2FkIGluIGludGVsX2R1bXBfcGlwZV9jb25maWcKLQkJICovCi0JCWludGVsX2R1bXBfcGlwZV9j b25maWcoaW50ZWxfY3J0YywKLQkJCQkgICAgICAgdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5z dGF0ZSksCisJZm9yX2VhY2hfcGlwZShkZXZfcHJpdiwgcGlwZSkgeworCQljcnRjID0gdG9faW50 ZWxfY3J0YyhkZXZfcHJpdi0+cGlwZV90b19jcnRjX21hcHBpbmdbcGlwZV0pOworCQlpbnRlbF9z YW5pdGl6ZV9jcnRjKGNydGMpOworCQlpbnRlbF9kdW1wX3BpcGVfY29uZmlnKGNydGMsIGNydGMt PmNvbmZpZywKIAkJCQkgICAgICAgIltzZXR1cF9od19zdGF0ZV0iKTsKIAl9CiAKQEAgLTE1NTU4 LDE3ICsxNTQ1NCwyMCBAQCB2b2lkIGludGVsX21vZGVzZXRfc2V0dXBfaHdfc3RhdGUoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKIAkJaWxrX3dtX2dldF9od19zdGF0ZShkZXYpOwogCiAJaWYgKGZv cmNlX3Jlc3RvcmUpIHsKLQkJaW50IHJldDsKLQogCQlpOTE1X3JlZGlzYWJsZV92Z2EoZGV2KTsK IAotCQlyZXQgPSBpbnRlbF9zZXRfbW9kZShzdGF0ZSk7Ci0JCWlmIChyZXQpIHsKLQkJCURSTV9F UlJPUigiRmFpbGVkIHRvIHJlc3RvcmUgcHJldmlvdXMgbW9kZVxuIik7Ci0JCQlkcm1fYXRvbWlj X3N0YXRlX2ZyZWUoc3RhdGUpOworCQkvKgorCQkgKiBXZSBuZWVkIHRvIHVzZSByYXcgaW50ZXJm YWNlcyBmb3IgcmVzdG9yaW5nIHN0YXRlIHRvIGF2b2lkCisJCSAqIGNoZWNraW5nIChib2d1cykg aW50ZXJtZWRpYXRlIHN0YXRlcy4KKwkJICovCisJCWZvcl9lYWNoX3BpcGUoZGV2X3ByaXYsIHBp cGUpIHsKKwkJCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9CisJCQkJZGV2X3ByaXYtPnBpcGVfdG9f Y3J0Y19tYXBwaW5nW3BpcGVdOworCisJCQlpbnRlbF9jcnRjX3Jlc3RvcmVfbW9kZShjcnRjKTsK IAkJfQogCX0gZWxzZSB7Ci0JCWRybV9hdG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7CisJCWludGVs X21vZGVzZXRfdXBkYXRlX3N0YWdlZF9vdXRwdXRfc3RhdGUoZGV2KTsKIAl9CiAKIAlpbnRlbF9t b2Rlc2V0X2NoZWNrX3N0YXRlKGRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDU4 YmQwZWRiYTJhNC4uZDg3Yjg1ZjE2MTI3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAt MTMwLDYgKzEzMCwxMSBAQCBzdHJ1Y3QgaW50ZWxfZmJkZXYgewogCiBzdHJ1Y3QgaW50ZWxfZW5j b2RlciB7CiAJc3RydWN0IGRybV9lbmNvZGVyIGJhc2U7CisJLyoKKwkgKiBUaGUgbmV3IGNydGMg dGhpcyBlbmNvZGVyIHdpbGwgYmUgZHJpdmVuIGZyb20uIE9ubHkgZGlmZmVycyBmcm9tCisJICog YmFzZS0+Y3J0YyB3aGlsZSBhIG1vZGVzZXQgaXMgaW4gcHJvZ3Jlc3MuCisJICovCisJc3RydWN0 IGludGVsX2NydGMgKm5ld19jcnRjOwogCiAJZW51bSBpbnRlbF9vdXRwdXRfdHlwZSB0eXBlOwog CXVuc2lnbmVkIGludCBjbG9uZWFibGU7CkBAIC0xOTAsNiArMTk1LDEyIEBAIHN0cnVjdCBpbnRl bF9jb25uZWN0b3IgewogCSAqLwogCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyOwogCisJ LyoKKwkgKiBUaGUgbmV3IGVuY29kZXIgdGhpcyBjb25uZWN0b3Igd2lsbCBiZSBkcml2ZW4uIE9u bHkgZGlmZmVycyBmcm9tCisJICogZW5jb2RlciB3aGlsZSBhIG1vZGVzZXQgaXMgaW4gcHJvZ3Jl c3MuCisJICovCisJc3RydWN0IGludGVsX2VuY29kZXIgKm5ld19lbmNvZGVyOworCiAJLyogUmVh ZHMgb3V0IHRoZSBjdXJyZW50IGh3LCByZXR1cm5pbmcgdHJ1ZSBpZiB0aGUgY29ubmVjdG9yIGlz IGVuYWJsZWQKIAkgKiBhbmQgYWN0aXZlIChpLmUuIGRwbXMgT04gc3RhdGUpLiAqLwogCWJvb2wg KCpnZXRfaHdfc3RhdGUpKHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKik7CkBAIC01MjcsNiArNTM4 LDcgQEAgc3RydWN0IGludGVsX2NydGMgewogCiAJc3RydWN0IGludGVsX2luaXRpYWxfcGxhbmVf Y29uZmlnIHBsYW5lX2NvbmZpZzsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY29uZmlnOwor CWJvb2wgbmV3X2VuYWJsZWQ7CiAKIAkvKiByZXNldCBjb3VudGVyIHZhbHVlIHdoZW4gdGhlIGxh c3QgZmxpcCB3YXMgc3VibWl0dGVkICovCiAJdW5zaWduZWQgaW50IHJlc2V0X2NvdW50ZXI7CkBA IC0xNDA4LDggKzE0MjAsNiBAQCBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqaW50ZWxfYXRvbWlj X3N0YXRlX2FsbG9jKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBpbnRlbF9hdG9taWNf c3RhdGVfY2xlYXIoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKik7CiBzdHJ1Y3QgaW50ZWxfc2hh cmVkX2RwbGxfY29uZmlnICoKIGludGVsX2F0b21pY19nZXRfc2hhcmVkX2RwbGxfc3RhdGUoc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnMpOwotdm9pZCBpbnRlbF9hdG9taWNfZHVwbGljYXRlX2Rw bGxfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKiwKLQkJCQkgICAgICAgc3RydWN0IGlu dGVsX3NoYXJlZF9kcGxsX2NvbmZpZyAqKTsKIAogc3RhdGljIGlubGluZSBzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqCiBpbnRlbF9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RydWN0IGRybV9hdG9t aWNfc3RhdGUgKnN0YXRlLAotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==