From: Michel Thierry Subject: [PATCH v3 14/25] drm/i915: Finish gen6/7 dynamic page table allocation Date: Tue, 13 Jan 2015 11:52:28 +0000 Message-ID: <1421149959-30383-15-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1421149959-30383-1-git-send-email-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id BD2C16E5D4 for ; Tue, 13 Jan 2015 03:52:28 -0800 (PST) In-Reply-To: <1421149959-30383-1-git-send-email-michel.thierry@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 RnJvbTogQmVuIFdpZGF3c2t5IDxiZW5qYW1pbi53aWRhd3NreUBpbnRlbC5jb20+CgpUaGlzIHBh dGNoIGNvbnRpbnVlcyBvbiB0aGUgaWRlYSBmcm9tIHRoZSBwcmV2aW91cyBwYXRjaC4gRnJvbSBo ZXJlIG9uLAppbiB0aGUgc3RlYWR5IHN0YXRlLCBQREVzIGFyZSBhbGwgcG9pbnRpbmcgdG8gdGhl IHNjcmF0Y2ggcGFnZSB0YWJsZSAoYXMKcmVjb21tZW5kZWQgaW4gdGhlIHNwZWMpLiBXaGVuIGFu IG9iamVjdCBpcyBhbGxvY2F0ZWQgaW4gdGhlIFZBIHJhbmdlLAp0aGUgY29kZSB3aWxsIGRldGVy bWluZSBpZiB3ZSBuZWVkIHRvIGFsbG9jYXRlIGEgcGFnZSBmb3IgdGhlIHBhZ2UKdGFibGUuIFNp bWlsYXJseSB3aGVuIHRoZSBvYmplY3QgaXMgZGVzdHJveWVkLCB3ZSB3aWxsIHJlbW92ZSwgYW5k IGZyZWUKdGhlIHBhZ2UgdGFibGUgcG9pbnRpbmcgdGhlIFBERSBiYWNrIHRvIHRoZSBzY3JhdGNo IHBhZ2UuCgpGb2xsb3dpbmcgcGF0Y2hlcyB3aWxsIHdvcmsgdG8gdW5pZnkgdGhlIGNvZGUgYSBi aXQgYXMgd2UgYnJpbmcgaW4gR0VOOApzdXBwb3J0LiBHRU42IGFuZCBHRU44IGFyZSBkaWZmZXJl bnQgZW5vdWdoIHRoYXQgSSBoYWQgYSBoYXJkIHRpbWUgdG8KZ2V0IHRvIHRoaXMgcG9pbnQgd2l0 aCBhcyBtdWNoIGNvbW1vbiBjb2RlIGFzIEkgZG8uCgpUaGUgYWxpYXNpbmcgUFBHVFQgbXVzdCBw cmUtYWxsb2NhdGUgYWxsIG9mIHRoZSBwYWdlIHRhYmxlcy4gVGhlcmUgYXJlIGEKZmV3IHJlYXNv bnMgZm9yIHRoaXMuIFR3byB0cml2aWFsIG9uZXM6IGFsaWFzaW5nIHBwZ3R0IGdvZXMgdGhyb3Vn aCB0aGUKZ2d0dCBwYXRocywgc28gaXQncyBoYXJkIHRvIG1haW50YWluLCB3ZSBjdXJyZW50bHkg ZG8gbm90IHJlc3RvcmUgdGhlCmRlZmF1bHQgY29udGV4dCAoYXNzdW1pbmcgdGhlIHByZXZpb3Vz IGZvcmNlIHJlbG9hZCBpcyBpbmRlZWQKbmVjZXNzYXJ5KS4gTW9zdCBpbXBvcnRhbnRseSB0aG91 Z2gsIHRoZSBvbmx5IHdheSAoaXQgc2VlbXMgZnJvbQplbXBpcmljYWwgZXZpZGVuY2UpIHRvIGlu dmFsaWRhdGUgdGhlIENTIFRMQnMgb24gbm9uLXJlbmRlciByaW5nIGlzIHRvCmVpdGhlciB1c2Ug cmluZyBzeW5jICh3aGljaCByZXF1aXJlcyBhY3R1YWxseSBzdG9wcGluZyB0aGUgcmluZ3MgaW4K b3JkZXIgdG8gc3luY2hyb25pemUgd2hlbiB0aGUgc3luYyBjb21wbGV0ZXMgdnMuIHdoZXJlIHlv dSBhcmUgaW4KZXhlY3V0aW9uKSwgb3IgdG8gcmVsb2FkIERDTFYuICBTaW5jZSB3aXRob3V0IGZ1 bGwgUFBHVFQgd2UgZG8gbm90IGV2ZXIKcmVsb2FkIHRoZSBEQ0xWIHJlZ2lzdGVyLCB0aGVyZSBp cyBubyBnb29kIHdheSB0byBhY2hpZXZlIHRoaXMuIFRoZQpzaW1wbGVzdCBzb2x1dGlvbiBpcyBq dXN0IHRvIG5vdCBzdXBwb3J0IGR5bmFtaWMgcGFnZSB0YWJsZQpjcmVhdGlvbi9kZXN0cnVjdGlv biBpbiB0aGUgYWxpYXNpbmcgUFBHVFQuCgpXZSBjb3VsZCBhbHdheXMgcmVsb2FkIERDTFYsIGJ1 dCB0aGlzIHNlZW1zIGxpa2UgcXVpdGUgYSBiaXQgb2YgZXhjZXNzCm92ZXJoZWFkIG9ubHkgdG8g c2F2ZSBhdCBtb3N0IDJNQi00ayBvZiBtZW1vcnkgZm9yIHRoZSBhbGlhc2luZyBQUEdUVApwYWdl IHRhYmxlcy4KCnYyOiBNYWtlIHRoZSBwYWdlIHRhYmxlIGJpdG1hcCBkZWNsYXJlZCBpbnNpZGUg dGhlIGZ1bmN0aW9uIChDaHJpcykKU2ltcGxpZnkgdGhlIHdheSBzY3JhdGNoaW5nIGFkZHJlc3Mg c3BhY2Ugd29ya3MuCk1vdmUgdGhlIGFsbG9jL3RlYXJkb3duIHRyYWNlcG9pbnRzIHVwIGEgbGV2 ZWwgaW4gdGhlIGNhbGwgc3RhY2sgc28gdGhhdApib3RoIGFsbCBpbXBsZW1lbnRhdGlvbnMgZ2V0 IHRoZSB0cmFjZS4KCnYzOiBVcGRhdGVkIHRyYWNlIGV2ZW50IHRvIHNwaXQgb3V0IGEgbmFtZQoK djQ6IEFsaWFzaW5nIHBwZ3R0IGlzIG5vdyBpbml0aWFsaXplZCBkaWZmZXJlbnRseSAoaW4gc2V0 dXAgZ2xvYmFsIGd0dCkKCnY1OiBSZWJhc2UgdG8gbGF0ZXN0IGNvZGUuIEFsc28gcmVtb3ZlZCB1 bm5lY2Vzc2FyeSBhbGlhc2luZyBwcGd0dCBjaGVjawpmb3IgdHJhY2UsIGFzIGl0IGlzIG5vIGxv bmdlciBwb3NzaWJsZSBhZnRlciB0aGUgUFBHVFQgY2xlYW51cCBwYXRjaCBzZXJpZXMKb2YgYSBj b3VwbGUgb2YgbW9udGhzIGFnbyAoRGFuaWVsKS4KCnY2OiBJbXBsZW1lbnQgY2hhbmdlcyBmcm9t IGNvZGUgcmV2aWV3IChEYW5pZWwpOgogLSBhbGxvY2F0ZS90ZWFyZG93bl92YV9yYW5nZSBjYWxs cyBhZGRlZC4KIC0gQWRkIGEgc2NyYXRjaCBwYWdlIGFsbG9jYXRpb24gaGVscGVyIChvbmx5IG5l ZWQgdGhlIGFkZHJlc3MpLgogLSBNb3ZlIHRyYWNlIGV2ZW50cyB0byBhIG5ldyBwYXRjaC4KIC0g VXNlIHVwZGF0ZWQgbWFya190bGJzX2RpcnR5LgogLSBNb3ZlZCBwdCBwcmVhbGxvY2F0aW9uIGZv ciBhbGlhc2luZyBwcGd0dCBpbnRvIGdlbjZfcHBndHRfaW5pdC4KCkNjOiBEYW5pZWwgVmV0dGVy IDxkYW5pZWxAZmZ3bGwuY2g+ClNpZ25lZC1vZmYtYnk6IEJlbiBXaWRhd3NreSA8YmVuQGJ3aWRh d3NrLm5ldD4KU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGlu dGVsLmNvbT4gKHY0KykKLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8 ICAgMyArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgfCAgIDkgKysrCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDE0MyArKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5o IHwgICAzICsKIDQgZmlsZXMgY2hhbmdlZCwgMTQyIGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXggNjBmOTFiYy4uMGY2MzA3 NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTIxNDksNiArMjE0OSw4IEBA IHN0YXRpYyB2b2lkIGdlbjZfcHBndHRfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJCXNlcV9wcmludGYobSwgIlBQX0RJUl9CQVNFX1JFQUQ6IDB4JTA4 eFxuIiwgSTkxNV9SRUFEKFJJTkdfUFBfRElSX0JBU0VfUkVBRChyaW5nKSkpOwogCQlzZXFfcHJp bnRmKG0sICJQUF9ESVJfRENMVjogMHglMDh4XG4iLCBJOTE1X1JFQUQoUklOR19QUF9ESVJfRENM VihyaW5nKSkpOwogCX0KKwlzZXFfcHJpbnRmKG0sICJFQ09DSEs6IDB4JTA4eFxuXG4iLCBJOTE1 X1JFQUQoR0FNX0VDT0NISykpOworCiAJaWYgKGRldl9wcml2LT5tbS5hbGlhc2luZ19wcGd0dCkg ewogCQlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPSBkZXZfcHJpdi0+bW0uYWxpYXNpbmdf cHBndHQ7CiAKQEAgLTIxNjUsNyArMjE2Nyw2IEBAIHN0YXRpYyB2b2lkIGdlbjZfcHBndHRfaW5m byhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQkgICBnZXRf cGlkX3Rhc2soZmlsZS0+cGlkLCBQSURUWVBFX1BJRCktPmNvbW0pOwogCQlpZHJfZm9yX2VhY2go JmZpbGVfcHJpdi0+Y29udGV4dF9pZHIsIHBlcl9maWxlX2N0eCwgbSk7CiAJfQotCXNlcV9wcmlu dGYobSwgIkVDT0NISzogMHglMDh4XG4iLCBJOTE1X1JFQUQoR0FNX0VDT0NISykpOwogfQogCiBz dGF0aWMgaW50IGk5MTVfcHBndHRfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRhdGEp CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA2YzQwMzY1Li42NWUwNTVjIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKQEAgLTM1ODUsNiArMzU4NSwxNSBAQCBzZWFyY2hfZnJlZToKIAlpZiAo cmV0KQogCQlnb3RvIGVycl9yZW1vdmVfbm9kZTsKIAorCS8qICBhbGxvY2F0ZSBiZWZvcmUgaW5z ZXJ0IC8gYmluZCAqLworCWlmICh2bWEtPnZtLT5hbGxvY2F0ZV92YV9yYW5nZSkgeworCQlyZXQg PSB2bWEtPnZtLT5hbGxvY2F0ZV92YV9yYW5nZSh2bWEtPnZtLAorCQkJCQkJdm1hLT5ub2RlLnN0 YXJ0LAorCQkJCQkJdm1hLT5ub2RlLnNpemUpOworCQlpZiAocmV0KQorCQkJZ290byBlcnJfcmVt b3ZlX25vZGU7CisJfQorCiAJdHJhY2VfaTkxNV92bWFfYmluZCh2bWEsIGZsYWdzKTsKIAlyZXQg PSBpOTE1X3ZtYV9iaW5kKHZtYSwgb2JqLT5jYWNoZV9sZXZlbCwKIAkJCSAgICBmbGFncyAmIFBJ Tl9HTE9CQUwgPyBHTE9CQUxfQklORCA6IDApOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu YwppbmRleCA2MmY0OTJmLi5kMzdiZDgzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu YwpAQCAtMzE2LDYgKzMxNiwxNCBAQCBzdGF0aWMgdm9pZCB1bm1hcF9hbmRfZnJlZV9wdChzdHJ1 Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpwdCwKIAlpZiAoV0FSTl9PTighcHQtPnBhZ2UpKQog CQlyZXR1cm47CiAKKwlpZiAoIXB0LT5zY3JhdGNoKSB7CisJCWNvbnN0IHNpemVfdCBjb3VudCA9 IElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDggPworCQkJR0VOOF9QVEVTX1BFUl9QQUdFIDogSTkx NV9QUEdUVF9QVF9FTlRSSUVTOworCQlXQVJOKCFiaXRtYXBfZW1wdHkocHQtPnVzZWRfcHRlcywg Y291bnQpLAorCQkgICAgICJGcmVlIHBhZ2UgdGFibGUgd2l0aCAlZCB1c2VkIHBhZ2VzXG4iLAor CQkgICAgIGJpdG1hcF93ZWlnaHQocHQtPnVzZWRfcHRlcywgY291bnQpKTsKKwl9CisKIAlpOTE1 X2RtYV91bm1hcF9zaW5nbGUocHQsIGRldik7CiAJX19mcmVlX3BhZ2UocHQtPnBhZ2UpOwogCWtm cmVlKHB0LT51c2VkX3B0ZXMpOwpAQCAtMzU5LDYgKzM2NywxNSBAQCBmYWlsX2JpdG1hcDoKIAly ZXR1cm4gRVJSX1BUUihyZXQpOwogfQogCitzdGF0aWMgaW5saW5lIHN0cnVjdCBpOTE1X3BhZ2Vf dGFibGVfZW50cnkgKmFsbG9jX3B0X3NjcmF0Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sK KwlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpwdCA9IGFsbG9jX3B0X3NpbmdsZShkZXYp OworCWlmICghSVNfRVJSKHB0KSkKKwkJcHQtPnNjcmF0Y2ggPSAxOworCisJcmV0dXJuIHB0Owor fQorCiAvKioKICAqIGFsbG9jX3B0X3JhbmdlKCkgLSBBbGxvY2F0ZSBhIG11bHRpcGxlIHBhZ2Ug dGFibGVzCiAgKiBAcGQ6CQlUaGUgcGFnZSBkaXJlY3Rvcnkgd2hpY2ggd2lsbCBoYXZlIGF0IGxl YXN0IEBjb3VudCBlbnRyaWVzCkBAIC0xMTIzLDEwICsxMTQwLDQ2IEBAIHN0YXRpYyBpbmxpbmUg dm9pZCBtYXJrX3RsYnNfZGlydHkoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogc3RhdGlj IGludCBnZW42X2FsbG9jX3ZhX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAog CQkJICAgICAgIHVpbnQ2NF90IHN0YXJ0LCB1aW50NjRfdCBsZW5ndGgpCiB7CisJREVDTEFSRV9C SVRNQVAobmV3X3BhZ2VfdGFibGVzLCBHRU42X1BQR1RUX1BEX0VOVFJJRVMpOworCXN0cnVjdCBk cm1fZGV2aWNlICpkZXYgPSB2bS0+ZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0K IAkJCQljb250YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKIAlzdHJ1 Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpwdDsKKwljb25zdCB1aW50MzJfdCBzdGFydF9zYXZl ID0gc3RhcnQsIGxlbmd0aF9zYXZlID0gbGVuZ3RoOwogCXVpbnQzMl90IHBkZSwgdGVtcDsKKwlp bnQgcmV0OworCisJQlVHX09OKHVwcGVyXzMyX2JpdHMoc3RhcnQpKTsKKworCWJpdG1hcF96ZXJv KG5ld19wYWdlX3RhYmxlcywgR0VONl9QUEdUVF9QRF9FTlRSSUVTKTsKKworCS8qIFRoZSBhbGxv Y2F0aW9uIGlzIGRvbmUgaW4gdHdvIHN0YWdlcyBzbyB0aGF0IHdlIGNhbiBiYWlsIG91dCB3aXRo CisJICogbWluaW1hbCBhbW91bnQgb2YgcGFpbi4gVGhlIGZpcnN0IHN0YWdlIGZpbmRzIG5ldyBw YWdlIHRhYmxlcyB0aGF0CisJICogbmVlZCBhbGxvY2F0aW9uLiBUaGUgc2Vjb25kIHN0YWdlIG1h cmtzIHVzZSBwdGVzIHdpdGhpbiB0aGUgcGFnZQorCSAqIHRhYmxlcy4KKwkgKi8KKwlnZW42X2Zv cl9lYWNoX3BkZShwdCwgJnBwZ3R0LT5wZCwgc3RhcnQsIGxlbmd0aCwgdGVtcCwgcGRlKSB7CisJ CWlmIChwdCAhPSBwcGd0dC0+c2NyYXRjaF9wdCkgeworCQkJV0FSTl9PTihiaXRtYXBfZW1wdHko cHQtPnVzZWRfcHRlcywgSTkxNV9QUEdUVF9QVF9FTlRSSUVTKSk7CisJCQljb250aW51ZTsKKwkJ fQorCisJCS8qIFdlJ3ZlIGFscmVhZHkgYWxsb2NhdGVkIGEgcGFnZSB0YWJsZSAqLworCQlXQVJO X09OKCFiaXRtYXBfZW1wdHkocHQtPnVzZWRfcHRlcywgSTkxNV9QUEdUVF9QVF9FTlRSSUVTKSk7 CisKKwkJcHQgPSBhbGxvY19wdF9zaW5nbGUoZGV2KTsKKwkJaWYgKElTX0VSUihwdCkpIHsKKwkJ CXJldCA9IFBUUl9FUlIocHQpOworCQkJZ290byB1bndpbmRfb3V0OworCQl9CisKKwkJcHBndHQt PnBkLnBhZ2VfdGFibGVzW3BkZV0gPSBwdDsKKwkJc2V0X2JpdChwZGUsIG5ld19wYWdlX3RhYmxl cyk7CisJfQorCisJc3RhcnQgPSBzdGFydF9zYXZlOworCWxlbmd0aCA9IGxlbmd0aF9zYXZlOwog CiAJZ2VuNl9mb3JfZWFjaF9wZGUocHQsICZwcGd0dC0+cGQsIHN0YXJ0LCBsZW5ndGgsIHRlbXAs IHBkZSkgewogCQlERUNMQVJFX0JJVE1BUCh0bXBfYml0bWFwLCBJOTE1X1BQR1RUX1BUX0VOVFJJ RVMpOwpAQCAtMTEzNCwxMiArMTE4NywzMSBAQCBzdGF0aWMgaW50IGdlbjZfYWxsb2NfdmFfcmFu Z2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCWJpdG1hcF9zZXQodG1wX2JpdG1h cCwgZ2VuNl9wdGVfaW5kZXgoc3RhcnQpLAogCQkJICAgZ2VuNl9wdGVfY291bnQoc3RhcnQsIGxl bmd0aCkpOwogCi0JCWJpdG1hcF9vcihwdC0+dXNlZF9wdGVzLCBwdC0+dXNlZF9wdGVzLCB0bXBf Yml0bWFwLAorCQlpZiAodGVzdF9hbmRfY2xlYXJfYml0KHBkZSwgbmV3X3BhZ2VfdGFibGVzKSkK KwkJCWdlbjZfd3JpdGVfcGRlcygmcHBndHQtPnBkLCBwZGUsIHB0KTsKKworCQliaXRtYXBfb3Io cHQtPnVzZWRfcHRlcywgdG1wX2JpdG1hcCwgcHQtPnVzZWRfcHRlcywKIAkJCQlJOTE1X1BQR1RU X1BUX0VOVFJJRVMpOwogCX0KIAorCVdBUk5fT04oIWJpdG1hcF9lbXB0eShuZXdfcGFnZV90YWJs ZXMsIEdFTjZfUFBHVFRfUERfRU5UUklFUykpOworCisJLyogTWFrZSBzdXJlIHdyaXRlIGlzIGNv bXBsZXRlIGJlZm9yZSBvdGhlciBjb2RlIGNhbiB1c2UgdGhpcyBwYWdlCisJICogdGFibGUuIEFs c28gcmVxdWlyZSBmb3IgV0MgbWFwcGVkIFBURXMgKi8KKwlyZWFkbChkZXZfcHJpdi0+Z3R0Lmdz bSk7CisKIAltYXJrX3RsYnNfZGlydHkocHBndHQpOwogCXJldHVybiAwOworCit1bndpbmRfb3V0 OgorCWZvcl9lYWNoX3NldF9iaXQocGRlLCBuZXdfcGFnZV90YWJsZXMsIEdFTjZfUFBHVFRfUERf RU5UUklFUykgeworCQlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpwdCA9IHBwZ3R0LT5w ZC5wYWdlX3RhYmxlc1twZGVdOworCQlwcGd0dC0+cGQucGFnZV90YWJsZXNbcGRlXSA9IE5VTEw7 CisJCXVubWFwX2FuZF9mcmVlX3B0KHB0LCB2bS0+ZGV2KTsKKwl9CisKKwltYXJrX3RsYnNfZGly dHkocHBndHQpOworCXJldHVybiByZXQ7CiB9CiAKIHN0YXRpYyB2b2lkIGdlbjZfdGVhcmRvd25f dmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCkBAIC0xMTUxLDggKzEyMjMs MTkgQEAgc3RhdGljIHZvaWQgZ2VuNl90ZWFyZG93bl92YV9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRy ZXNzX3NwYWNlICp2bSwKIAl1aW50MzJfdCBwZGUsIHRlbXA7CiAKIAlnZW42X2Zvcl9lYWNoX3Bk ZShwdCwgJnBwZ3R0LT5wZCwgc3RhcnQsIGxlbmd0aCwgdGVtcCwgcGRlKSB7CisKKwkJaWYgKFdB Uk4ocHQgPT0gcHBndHQtPnNjcmF0Y2hfcHQsCisJCSAgICAiVHJpZWQgdG8gdGVhcmRvd24gc2Ny YXRjaCBwYWdlIHZtICVwLiBwZGUgJXU6ICVsbHgtJWxseFxuIiwKKwkJICAgIHZtLCBwZGUsIHN0 YXJ0LCBzdGFydCArIGxlbmd0aCkpCisJCQljb250aW51ZTsKKwogCQliaXRtYXBfY2xlYXIocHQt PnVzZWRfcHRlcywgZ2VuNl9wdGVfaW5kZXgoc3RhcnQpLAogCQkJICAgICBnZW42X3B0ZV9jb3Vu dChzdGFydCwgbGVuZ3RoKSk7CisKKwkJaWYgKGJpdG1hcF9lbXB0eShwdC0+dXNlZF9wdGVzLCBJ OTE1X1BQR1RUX1BUX0VOVFJJRVMpKSB7CisJCQlnZW42X3dyaXRlX3BkZXMoJnBwZ3R0LT5wZCwg cGRlLCBwcGd0dC0+c2NyYXRjaF9wdCk7CisJCQlwcGd0dC0+cGQucGFnZV90YWJsZXNbcGRlXSA9 IHBwZ3R0LT5zY3JhdGNoX3B0OworCQl9CiAJfQogCiAJbWFya190bGJzX2RpcnR5KHBwZ3R0KTsK QEAgLTExNjIsOSArMTI0NSwxMyBAQCBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0X2ZyZWUoc3RydWN0 IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogewogCWludCBpOwogCi0JZm9yIChpID0gMDsgaSA8IHBw Z3R0LT5udW1fcGRfZW50cmllczsgaSsrKQotCQl1bm1hcF9hbmRfZnJlZV9wdChwcGd0dC0+cGQu cGFnZV90YWJsZXNbaV0sIHBwZ3R0LT5iYXNlLmRldik7CisJZm9yIChpID0gMDsgaSA8IHBwZ3R0 LT5udW1fcGRfZW50cmllczsgaSsrKSB7CisJCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkg KnB0ID0gcHBndHQtPnBkLnBhZ2VfdGFibGVzW2ldOworCQlpZiAocHQgIT0gcHBndHQtPnNjcmF0 Y2hfcHQpCisJCQl1bm1hcF9hbmRfZnJlZV9wdChwcGd0dC0+cGQucGFnZV90YWJsZXNbaV0sIHBw Z3R0LT5iYXNlLmRldik7CisJfQogCisJdW5tYXBfYW5kX2ZyZWVfcHQocHBndHQtPnNjcmF0Y2hf cHQsIHBwZ3R0LT5iYXNlLmRldik7CiAJdW5tYXBfYW5kX2ZyZWVfcGQoJnBwZ3R0LT5wZCk7CiB9 CiAKQEAgLTExOTEsNiArMTI3OCw5IEBAIHN0YXRpYyBpbnQgZ2VuNl9wcGd0dF9hbGxvY2F0ZV9w YWdlX2RpcmVjdG9yaWVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAkgKiBzaXplLiBX ZSBhbGxvY2F0ZSBhdCB0aGUgdG9wIG9mIHRoZSBHVFQgdG8gYXZvaWQgZnJhZ21lbnRhdGlvbi4K IAkgKi8KIAlCVUdfT04oIWRybV9tbV9pbml0aWFsaXplZCgmZGV2X3ByaXYtPmd0dC5iYXNlLm1t KSk7CisJcHBndHQtPnNjcmF0Y2hfcHQgPSBhbGxvY19wdF9zY3JhdGNoKHBwZ3R0LT5iYXNlLmRl dik7CisJaWYgKElTX0VSUihwcGd0dC0+c2NyYXRjaF9wdCkpCisJCXJldHVybiBQVFJfRVJSKHBw Z3R0LT5zY3JhdGNoX3B0KTsKIGFsbG9jOgogCXJldCA9IGRybV9tbV9pbnNlcnRfbm9kZV9pbl9y YW5nZV9nZW5lcmljKCZkZXZfcHJpdi0+Z3R0LmJhc2UubW0sCiAJCQkJCQkgICZwcGd0dC0+bm9k ZSwgR0VONl9QRF9TSVpFLApAQCAtMTIyMSw2ICsxMzExLDcgQEAgYWxsb2M6CiAJcmV0dXJuIDA7 CiAKIGVycl9vdXQ6CisJdW5tYXBfYW5kX2ZyZWVfcHQocHBndHQtPnNjcmF0Y2hfcHQsIHBwZ3R0 LT5iYXNlLmRldik7CiAJcmV0dXJuIHJldDsKIH0KIApAQCAtMTIzMiwxOCArMTMyMywyMCBAQCBz dGF0aWMgaW50IGdlbjZfcHBndHRfYWxsb2Moc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQog CWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlyZXQgPSBhbGxvY19wdF9yYW5nZSgmcHBndHQt PnBkLCAwLCBwcGd0dC0+bnVtX3BkX2VudHJpZXMsCi0JCQlwcGd0dC0+YmFzZS5kZXYpOworCXJl dHVybiAwOworfQogCi0JaWYgKHJldCkgewotCQlkcm1fbW1fcmVtb3ZlX25vZGUoJnBwZ3R0LT5u b2RlKTsKLQkJcmV0dXJuIHJldDsKLQl9CitzdGF0aWMgdm9pZCBnZW42X3NjcmF0Y2hfdmFfcmFu Z2Uoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAorCQkJCSAgdWludDY0X3Qgc3RhcnQsIHVp bnQ2NF90IGxlbmd0aCkKK3sKKwlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICp1bnVzZWQ7 CisJdWludDMyX3QgcGRlLCB0ZW1wOwogCi0JcmV0dXJuIDA7CisJZ2VuNl9mb3JfZWFjaF9wZGUo dW51c2VkLCAmcHBndHQtPnBkLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBwZGUpCisJCXBwZ3R0LT5w ZC5wYWdlX3RhYmxlc1twZGVdID0gcHBndHQtPnNjcmF0Y2hfcHQ7CiB9CiAKLXN0YXRpYyBpbnQg Z2VuNl9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKK3N0YXRpYyBpbnQg Z2VuNl9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgYm9vbCBhbGlhc2lu ZykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcHBndHQtPmJhc2UuZGV2OwogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC0xMjYz LDYgKzEzNTYsMTggQEAgc3RhdGljIGludCBnZW42X3BwZ3R0X2luaXQoc3RydWN0IGk5MTVfaHdf cHBndHQgKnBwZ3R0KQogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKKwlpZiAoYWxpYXNpbmcp IHsKKwkJLyogcHJlYWxsb2NhdGUgYWxsIHB0cyAqLworCQlyZXQgPSBhbGxvY19wdF9yYW5nZSgm cHBndHQtPnBkLCAwLCBwcGd0dC0+bnVtX3BkX2VudHJpZXMsCisJCQkJcHBndHQtPmJhc2UuZGV2 KTsKKworCQlpZiAocmV0KSB7CisJCQl1bm1hcF9hbmRfZnJlZV9wdChwcGd0dC0+c2NyYXRjaF9w dCwgcHBndHQtPmJhc2UuZGV2KTsKKwkJCWRybV9tbV9yZW1vdmVfbm9kZSgmcHBndHQtPm5vZGUp OworCQkJcmV0dXJuIHJldDsKKwkJfQorCX0KKwogCXBwZ3R0LT5iYXNlLmFsbG9jYXRlX3ZhX3Jh bmdlID0gZ2VuNl9hbGxvY192YV9yYW5nZTsKIAlwcGd0dC0+YmFzZS50ZWFyZG93bl92YV9yYW5n ZSA9IGdlbjZfdGVhcmRvd25fdmFfcmFuZ2U7CiAJcHBndHQtPmJhc2UuY2xlYXJfcmFuZ2UgPSBn ZW42X3BwZ3R0X2NsZWFyX3JhbmdlOwpAQCAtMTI3OCw2ICsxMzgzLDkgQEAgc3RhdGljIGludCBn ZW42X3BwZ3R0X2luaXQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogCXBwZ3R0LT5wZF9h ZGRyID0gKGdlbjZfZ3R0X3B0ZV90IF9faW9tZW0gKilkZXZfcHJpdi0+Z3R0LmdzbSArCiAJCXBw Z3R0LT5wZC5wZF9vZmZzZXQgLyBzaXplb2YoZ2VuNl9ndHRfcHRlX3QpOwogCisJaWYgKCFhbGlh c2luZykKKwkJZ2VuNl9zY3JhdGNoX3ZhX3JhbmdlKHBwZ3R0LCAwLCBwcGd0dC0+YmFzZS50b3Rh bCk7CisKIAlnZW42X3dyaXRlX3BhZ2VfcmFuZ2UoZGV2X3ByaXYsICZwcGd0dC0+cGQsIDAsIHBw Z3R0LT5iYXNlLnRvdGFsKTsKIAogCURSTV9ERUJVR19EUklWRVIoIkFsbG9jYXRlZCBwZGUgc3Bh Y2UgKCVsZE0pIGF0IEdUVCBlbnRyeTogJWx4XG4iLApAQCAtMTI5MCw3ICsxMzk4LDggQEAgc3Rh dGljIGludCBnZW42X3BwZ3R0X2luaXQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogCXJl dHVybiAwOwogfQogCi1zdGF0aWMgaW50IF9faHdfcHBndHRfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCBzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCitzdGF0aWMgaW50IF9faHdfcHBn dHRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBn dHQsCisJCWJvb2wgYWxpYXNpbmcpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIApAQCAtMTI5OCw3ICsxNDA3LDcgQEAgc3RhdGljIGlu dCBfX2h3X3BwZ3R0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGk5MTVfaHdf cHBndHQgKnBwZ3R0KQogCXBwZ3R0LT5iYXNlLnNjcmF0Y2ggPSBkZXZfcHJpdi0+Z3R0LmJhc2Uu c2NyYXRjaDsKIAogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDgpCi0JCXJldHVybiBnZW42 X3BwZ3R0X2luaXQocHBndHQpOworCQlyZXR1cm4gZ2VuNl9wcGd0dF9pbml0KHBwZ3R0LCBhbGlh c2luZyk7CiAJZWxzZQogCQlyZXR1cm4gZ2VuOF9wcGd0dF9pbml0KHBwZ3R0LCBkZXZfcHJpdi0+ Z3R0LmJhc2UudG90YWwpOwogfQpAQCAtMTMwNyw3ICsxNDE2LDcgQEAgaW50IGk5MTVfcHBndHRf aW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQp CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK IAlpbnQgcmV0ID0gMDsKIAotCXJldCA9IF9faHdfcHBndHRfaW5pdChkZXYsIHBwZ3R0KTsKKwly ZXQgPSBfX2h3X3BwZ3R0X2luaXQoZGV2LCBwcGd0dCwgZmFsc2UpOwogCWlmIChyZXQgPT0gMCkg ewogCQlrcmVmX2luaXQoJnBwZ3R0LT5yZWYpOwogCQlkcm1fbW1faW5pdCgmcHBndHQtPmJhc2Uu bW0sIHBwZ3R0LT5iYXNlLnN0YXJ0LApAQCAtMTQxNSw2ICsxNTI0LDEwIEBAIHN0YXRpYyB2b2lk IHBwZ3R0X3VuYmluZF92bWEoc3RydWN0IGk5MTVfdm1hICp2bWEpCiAJCQkgICAgIHZtYS0+bm9k ZS5zdGFydCwKIAkJCSAgICAgdm1hLT5vYmotPmJhc2Uuc2l6ZSwKIAkJCSAgICAgdHJ1ZSk7CisJ aWYgKHZtYS0+dm0tPnRlYXJkb3duX3ZhX3JhbmdlKSB7CisJCXZtYS0+dm0tPnRlYXJkb3duX3Zh X3JhbmdlKHZtYS0+dm0sCisJCQkJCSAgIHZtYS0+bm9kZS5zdGFydCwgdm1hLT5ub2RlLnNpemUp OworCX0KIH0KIAogZXh0ZXJuIGludCBpbnRlbF9pb21tdV9nZnhfbWFwcGVkOwpAQCAtMTkzMCw3 ICsyMDQzLDcgQEAgc3RhdGljIGludCBpOTE1X2dlbV9zZXR1cF9nbG9iYWxfZ3R0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCiAJCWlmICghcHBndHQpCiAJCQlyZXR1cm4gLUVOT01FTTsKIAotCQly ZXQgPSBfX2h3X3BwZ3R0X2luaXQoZGV2LCBwcGd0dCk7CisJCXJldCA9IF9faHdfcHBndHRfaW5p dChkZXYsIHBwZ3R0LCB0cnVlKTsKIAkJaWYgKHJldCAhPSAwKQogCQkJcmV0dXJuIHJldDsKIApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCAxYWU3MGJlLi4wNzRiMzY4IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaApAQCAtMTk1LDYgKzE5NSw3IEBAIHN0cnVjdCBp OTE1X3BhZ2VfdGFibGVfZW50cnkgewogCWRtYV9hZGRyX3QgZGFkZHI7CiAKIAl1bnNpZ25lZCBs b25nICp1c2VkX3B0ZXM7CisJdW5zaWduZWQgaW50IHNjcmF0Y2g6MTsKIH07CiAKIHN0cnVjdCBp OTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5IHsKQEAgLTMwOCw2ICszMDksOCBAQCBzdHJ1Y3QgaTkx NV9od19wcGd0dCB7CiAJCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5IHBkOwogCX07 CiAKKwlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpzY3JhdGNoX3B0OworCiAJc3RydWN0 IGRybV9pOTE1X2ZpbGVfcHJpdmF0ZSAqZmlsZV9wcml2OwogCiAJZ2VuNl9ndHRfcHRlX3QgX19p b21lbSAqcGRfYWRkcjsKLS0gCjIuMS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=