From: Michel Thierry Subject: [PATCH v4 13/24] drm/i915: Finish gen6/7 dynamic page table allocation Date: Thu, 22 Jan 2015 17:01:35 +0000 Message-ID: <1421946106-7921-14-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1421946106-7921-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 E314E720A2 for ; Thu, 22 Jan 2015 09:01:38 -0800 (PST) In-Reply-To: <1421946106-7921-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 ciBhbGlhc2luZyBwcGd0dCBpbnRvIGdlbjZfcHBndHRfaW5pdC4KCnY3OiB0ZWFyZG93bl92YV9y YW5nZSByZW1vdmVkIChEYW5pZWwpLgogICAgSW4gaW5pdCwgZ2VuNl9wcGd0dF9jbGVhcl9yYW5n ZSBjYWxsIGlzIG9ubHkgbmVlZGVkIGZvciBhbGlhc2luZyBwcGd0dC4KCkNjOiBEYW5pZWwgVmV0 dGVyIDxkYW5pZWxAZmZ3bGwuY2g+ClNpZ25lZC1vZmYtYnk6IEJlbiBXaWRhd3NreSA8YmVuQGJ3 aWRhd3NrLm5ldD4KU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5 QGludGVsLmNvbT4gKHY0KykKLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMu YyB8ICAgMyArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgfCAgIDkgKysr CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDEyNSArKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5oIHwgICAzICsKIDQgZmlsZXMgY2hhbmdlZCwgMTIzIGluc2VydGlvbnMoKyksIDE3IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXggNjBmOTFiYy4uMGY2 MzA3NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTIxNDksNiArMjE0OSw4 IEBAIHN0YXRpYyB2b2lkIGdlbjZfcHBndHRfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAJCXNlcV9wcmludGYobSwgIlBQX0RJUl9CQVNFX1JFQUQ6IDB4 JTA4eFxuIiwgSTkxNV9SRUFEKFJJTkdfUFBfRElSX0JBU0VfUkVBRChyaW5nKSkpOwogCQlzZXFf cHJpbnRmKG0sICJQUF9ESVJfRENMVjogMHglMDh4XG4iLCBJOTE1X1JFQUQoUklOR19QUF9ESVJf RENMVihyaW5nKSkpOwogCX0KKwlzZXFfcHJpbnRmKG0sICJFQ09DSEs6IDB4JTA4eFxuXG4iLCBJ OTE1X1JFQUQoR0FNX0VDT0NISykpOworCiAJaWYgKGRldl9wcml2LT5tbS5hbGlhc2luZ19wcGd0 dCkgewogCQlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPSBkZXZfcHJpdi0+bW0uYWxpYXNp bmdfcHBndHQ7CiAKQEAgLTIxNjUsNyArMjE2Nyw2IEBAIHN0YXRpYyB2b2lkIGdlbjZfcHBndHRf aW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQkgICBn ZXRfcGlkX3Rhc2soZmlsZS0+cGlkLCBQSURUWVBFX1BJRCktPmNvbW0pOwogCQlpZHJfZm9yX2Vh Y2goJmZpbGVfcHJpdi0+Y29udGV4dF9pZHIsIHBlcl9maWxlX2N0eCwgbSk7CiAJfQotCXNlcV9w cmludGYobSwgIkVDT0NISzogMHglMDh4XG4iLCBJOTE1X1JFQUQoR0FNX0VDT0NISykpOwogfQog CiBzdGF0aWMgaW50IGk5MTVfcHBndHRfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRh dGEpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA5ODY1N2IzLi43OTQ0OTMxIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTM1NjYsNiArMzU2NiwxNSBAQCBzZWFyY2hfZnJlZToKIAlp ZiAocmV0KQogCQlnb3RvIGVycl9yZW1vdmVfbm9kZTsKIAorCS8qICBhbGxvY2F0ZSBiZWZvcmUg aW5zZXJ0IC8gYmluZCAqLworCWlmICh2bWEtPnZtLT5hbGxvY2F0ZV92YV9yYW5nZSkgeworCQly ZXQgPSB2bWEtPnZtLT5hbGxvY2F0ZV92YV9yYW5nZSh2bWEtPnZtLAorCQkJCQkJdm1hLT5ub2Rl LnN0YXJ0LAorCQkJCQkJdm1hLT5ub2RlLnNpemUpOworCQlpZiAocmV0KQorCQkJZ290byBlcnJf cmVtb3ZlX25vZGU7CisJfQorCiAJdHJhY2VfaTkxNV92bWFfYmluZCh2bWEsIGZsYWdzKTsKIAly ZXQgPSBpOTE1X3ZtYV9iaW5kKHZtYSwgb2JqLT5jYWNoZV9sZXZlbCwKIAkJCSAgICBmbGFncyAm IFBJTl9HTE9CQUwgPyBHTE9CQUxfQklORCA6IDApOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuYwppbmRleCA3NGM3NzdkLi44NWM5MTRmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuYwpAQCAtMzU4LDYgKzM1OCwxNiBAQCBmYWlsX2JpdG1hcDoKIAlyZXR1cm4gRVJSX1BUUihy ZXQpOwogfQogCitzdGF0aWMgaW5saW5lIHN0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkgKmFs bG9jX3B0X3NjcmF0Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3QgaTkxNV9w YWdlX3RhYmxlX2VudHJ5ICpwdCA9IGFsbG9jX3B0X3NpbmdsZShkZXYpOworCisJaWYgKCFJU19F UlIocHQpKQorCQlwdC0+c2NyYXRjaCA9IDE7CisKKwlyZXR1cm4gcHQ7Cit9CisKIC8qKgogICog YWxsb2NfcHRfcmFuZ2UoKSAtIEFsbG9jYXRlIGEgbXVsdGlwbGUgcGFnZSB0YWJsZXMKICAqIEBw ZDoJCVRoZSBwYWdlIGRpcmVjdG9yeSB3aGljaCB3aWxsIGhhdmUgYXQgbGVhc3QgQGNvdW50IGVu dHJpZXMKQEAgLTExNTMsMTAgKzExNjMsNDYgQEAgc3RhdGljIGlubGluZSB2b2lkIG1hcmtfdGxi c19kaXJ0eShzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiBzdGF0aWMgaW50IGdlbjZfYWxs b2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCQkgICAgICAgdWlu dDY0X3Qgc3RhcnQsIHVpbnQ2NF90IGxlbmd0aCkKIHsKKwlERUNMQVJFX0JJVE1BUChuZXdfcGFn ZV90YWJsZXMsIEdFTjZfUFBHVFRfUERfRU5UUklFUyk7CisJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IHZtLT5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5k ZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPQogCQkJCWNvbnRhaW5l cl9vZih2bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpOwogCXN0cnVjdCBpOTE1X3BhZ2Vf dGFibGVfZW50cnkgKnB0OworCWNvbnN0IHVpbnQzMl90IHN0YXJ0X3NhdmUgPSBzdGFydCwgbGVu Z3RoX3NhdmUgPSBsZW5ndGg7CiAJdWludDMyX3QgcGRlLCB0ZW1wOworCWludCByZXQ7CisKKwlC VUdfT04odXBwZXJfMzJfYml0cyhzdGFydCkpOworCisJYml0bWFwX3plcm8obmV3X3BhZ2VfdGFi bGVzLCBHRU42X1BQR1RUX1BEX0VOVFJJRVMpOworCisJLyogVGhlIGFsbG9jYXRpb24gaXMgZG9u ZSBpbiB0d28gc3RhZ2VzIHNvIHRoYXQgd2UgY2FuIGJhaWwgb3V0IHdpdGgKKwkgKiBtaW5pbWFs IGFtb3VudCBvZiBwYWluLiBUaGUgZmlyc3Qgc3RhZ2UgZmluZHMgbmV3IHBhZ2UgdGFibGVzIHRo YXQKKwkgKiBuZWVkIGFsbG9jYXRpb24uIFRoZSBzZWNvbmQgc3RhZ2UgbWFya3MgdXNlIHB0ZXMg d2l0aGluIHRoZSBwYWdlCisJICogdGFibGVzLgorCSAqLworCWdlbjZfZm9yX2VhY2hfcGRlKHB0 LCAmcHBndHQtPnBkLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBwZGUpIHsKKwkJaWYgKHB0ICE9IHBw Z3R0LT5zY3JhdGNoX3B0KSB7CisJCQlXQVJOX09OKGJpdG1hcF9lbXB0eShwdC0+dXNlZF9wdGVz LCBJOTE1X1BQR1RUX1BUX0VOVFJJRVMpKTsKKwkJCWNvbnRpbnVlOworCQl9CisKKwkJLyogV2Un dmUgYWxyZWFkeSBhbGxvY2F0ZWQgYSBwYWdlIHRhYmxlICovCisJCVdBUk5fT04oIWJpdG1hcF9l bXB0eShwdC0+dXNlZF9wdGVzLCBJOTE1X1BQR1RUX1BUX0VOVFJJRVMpKTsKKworCQlwdCA9IGFs bG9jX3B0X3NpbmdsZShkZXYpOworCQlpZiAoSVNfRVJSKHB0KSkgeworCQkJcmV0ID0gUFRSX0VS UihwdCk7CisJCQlnb3RvIHVud2luZF9vdXQ7CisJCX0KKworCQlwcGd0dC0+cGQucGFnZV90YWJs ZXNbcGRlXSA9IHB0OworCQlzZXRfYml0KHBkZSwgbmV3X3BhZ2VfdGFibGVzKTsKKwl9CisKKwlz dGFydCA9IHN0YXJ0X3NhdmU7CisJbGVuZ3RoID0gbGVuZ3RoX3NhdmU7CiAKIAlnZW42X2Zvcl9l YWNoX3BkZShwdCwgJnBwZ3R0LT5wZCwgc3RhcnQsIGxlbmd0aCwgdGVtcCwgcGRlKSB7CiAJCURF Q0xBUkVfQklUTUFQKHRtcF9iaXRtYXAsIEk5MTVfUFBHVFRfUFRfRU5UUklFUyk7CkBAIC0xMTY1 LDIxICsxMjExLDQ2IEBAIHN0YXRpYyBpbnQgZ2VuNl9hbGxvY192YV9yYW5nZShzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJYml0bWFwX3NldCh0bXBfYml0bWFwLCBnZW42X3B0ZV9p bmRleChzdGFydCksCiAJCQkgICBnZW42X3B0ZV9jb3VudChzdGFydCwgbGVuZ3RoKSk7CiAKLQkJ Yml0bWFwX29yKHB0LT51c2VkX3B0ZXMsIHB0LT51c2VkX3B0ZXMsIHRtcF9iaXRtYXAsCisJCWlm ICh0ZXN0X2FuZF9jbGVhcl9iaXQocGRlLCBuZXdfcGFnZV90YWJsZXMpKQorCQkJZ2VuNl93cml0 ZV9wZGVzKCZwcGd0dC0+cGQsIHBkZSwgcHQpOworCisJCWJpdG1hcF9vcihwdC0+dXNlZF9wdGVz LCB0bXBfYml0bWFwLCBwdC0+dXNlZF9wdGVzLAogCQkJCUk5MTVfUFBHVFRfUFRfRU5UUklFUyk7 CiAJfQogCisJV0FSTl9PTighYml0bWFwX2VtcHR5KG5ld19wYWdlX3RhYmxlcywgR0VONl9QUEdU VF9QRF9FTlRSSUVTKSk7CisKKwkvKiBNYWtlIHN1cmUgd3JpdGUgaXMgY29tcGxldGUgYmVmb3Jl IG90aGVyIGNvZGUgY2FuIHVzZSB0aGlzIHBhZ2UKKwkgKiB0YWJsZS4gQWxzbyByZXF1aXJlIGZv ciBXQyBtYXBwZWQgUFRFcyAqLworCXJlYWRsKGRldl9wcml2LT5ndHQuZ3NtKTsKKwogCW1hcmtf dGxic19kaXJ0eShwcGd0dCk7CiAJcmV0dXJuIDA7CisKK3Vud2luZF9vdXQ6CisJZm9yX2VhY2hf c2V0X2JpdChwZGUsIG5ld19wYWdlX3RhYmxlcywgR0VONl9QUEdUVF9QRF9FTlRSSUVTKSB7CisJ CXN0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkgKnB0ID0gcHBndHQtPnBkLnBhZ2VfdGFibGVz W3BkZV07CisKKwkJcHBndHQtPnBkLnBhZ2VfdGFibGVzW3BkZV0gPSBOVUxMOworCQl1bm1hcF9h bmRfZnJlZV9wdChwdCwgdm0tPmRldik7CisJfQorCisJbWFya190bGJzX2RpcnR5KHBwZ3R0KTsK KwlyZXR1cm4gcmV0OwogfQogCiBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0X2ZyZWUoc3RydWN0IGk5 MTVfaHdfcHBndHQgKnBwZ3R0KQogewogCWludCBpOwogCi0JZm9yIChpID0gMDsgaSA8IHBwZ3R0 LT5udW1fcGRfZW50cmllczsgaSsrKQotCQl1bm1hcF9hbmRfZnJlZV9wdChwcGd0dC0+cGQucGFn ZV90YWJsZXNbaV0sIHBwZ3R0LT5iYXNlLmRldik7CisJZm9yIChpID0gMDsgaSA8IHBwZ3R0LT5u dW1fcGRfZW50cmllczsgaSsrKSB7CisJCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkgKnB0 ID0gcHBndHQtPnBkLnBhZ2VfdGFibGVzW2ldOwogCisJCWlmIChwdCAhPSBwcGd0dC0+c2NyYXRj aF9wdCkKKwkJCXVubWFwX2FuZF9mcmVlX3B0KHBwZ3R0LT5wZC5wYWdlX3RhYmxlc1tpXSwgcHBn dHQtPmJhc2UuZGV2KTsKKwl9CisKKwl1bm1hcF9hbmRfZnJlZV9wdChwcGd0dC0+c2NyYXRjaF9w dCwgcHBndHQtPmJhc2UuZGV2KTsKIAl1bm1hcF9hbmRfZnJlZV9wZCgmcHBndHQtPnBkKTsKIH0K IApAQCAtMTIwNiw2ICsxMjc3LDkgQEAgc3RhdGljIGludCBnZW42X3BwZ3R0X2FsbG9jYXRlX3Bh Z2VfZGlyZWN0b3JpZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogCSAqIHNpemUuIFdl IGFsbG9jYXRlIGF0IHRoZSB0b3Agb2YgdGhlIEdUVCB0byBhdm9pZCBmcmFnbWVudGF0aW9uLgog CSAqLwogCUJVR19PTighZHJtX21tX2luaXRpYWxpemVkKCZkZXZfcHJpdi0+Z3R0LmJhc2UubW0p KTsKKwlwcGd0dC0+c2NyYXRjaF9wdCA9IGFsbG9jX3B0X3NjcmF0Y2gocHBndHQtPmJhc2UuZGV2 KTsKKwlpZiAoSVNfRVJSKHBwZ3R0LT5zY3JhdGNoX3B0KSkKKwkJcmV0dXJuIFBUUl9FUlIocHBn dHQtPnNjcmF0Y2hfcHQpOwogYWxsb2M6CiAJcmV0ID0gZHJtX21tX2luc2VydF9ub2RlX2luX3Jh bmdlX2dlbmVyaWMoJmRldl9wcml2LT5ndHQuYmFzZS5tbSwKIAkJCQkJCSAgJnBwZ3R0LT5ub2Rl LCBHRU42X1BEX1NJWkUsCkBAIC0xMjM2LDYgKzEzMTAsNyBAQCBhbGxvYzoKIAlyZXR1cm4gMDsK IAogZXJyX291dDoKKwl1bm1hcF9hbmRfZnJlZV9wdChwcGd0dC0+c2NyYXRjaF9wdCwgcHBndHQt PmJhc2UuZGV2KTsKIAlyZXR1cm4gcmV0OwogfQogCkBAIC0xMjQ3LDE4ICsxMzIyLDIwIEBAIHN0 YXRpYyBpbnQgZ2VuNl9wcGd0dF9hbGxvYyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJ aWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotCXJldCA9IGFsbG9jX3B0X3JhbmdlKCZwcGd0dC0+ cGQsIDAsIHBwZ3R0LT5udW1fcGRfZW50cmllcywKLQkJCXBwZ3R0LT5iYXNlLmRldik7CisJcmV0 dXJuIDA7Cit9CiAKLQlpZiAocmV0KSB7Ci0JCWRybV9tbV9yZW1vdmVfbm9kZSgmcHBndHQtPm5v ZGUpOwotCQlyZXR1cm4gcmV0OwotCX0KK3N0YXRpYyB2b2lkIGdlbjZfc2NyYXRjaF92YV9yYW5n ZShzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCisJCQkJICB1aW50NjRfdCBzdGFydCwgdWlu dDY0X3QgbGVuZ3RoKQoreworCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkgKnVudXNlZDsK Kwl1aW50MzJfdCBwZGUsIHRlbXA7CiAKLQlyZXR1cm4gMDsKKwlnZW42X2Zvcl9lYWNoX3BkZSh1 bnVzZWQsICZwcGd0dC0+cGQsIHN0YXJ0LCBsZW5ndGgsIHRlbXAsIHBkZSkKKwkJcHBndHQtPnBk LnBhZ2VfdGFibGVzW3BkZV0gPSBwcGd0dC0+c2NyYXRjaF9wdDsKIH0KIAotc3RhdGljIGludCBn ZW42X3BwZ3R0X2luaXQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQorc3RhdGljIGludCBn ZW42X3BwZ3R0X2luaXQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LCBib29sIGFsaWFzaW5n KQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwcGd0dC0+YmFzZS5kZXY7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTEyNzgs NiArMTM1NSwxOCBAQCBzdGF0aWMgaW50IGdlbjZfcHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9od19w cGd0dCAqcHBndHQpCiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAorCWlmIChhbGlhc2luZykg eworCQkvKiBwcmVhbGxvY2F0ZSBhbGwgcHRzICovCisJCXJldCA9IGFsbG9jX3B0X3JhbmdlKCZw cGd0dC0+cGQsIDAsIHBwZ3R0LT5udW1fcGRfZW50cmllcywKKwkJCQlwcGd0dC0+YmFzZS5kZXYp OworCisJCWlmIChyZXQpIHsKKwkJCXVubWFwX2FuZF9mcmVlX3B0KHBwZ3R0LT5zY3JhdGNoX3B0 LCBwcGd0dC0+YmFzZS5kZXYpOworCQkJZHJtX21tX3JlbW92ZV9ub2RlKCZwcGd0dC0+bm9kZSk7 CisJCQlyZXR1cm4gcmV0OworCQl9CisJfQorCiAJcHBndHQtPmJhc2UuYWxsb2NhdGVfdmFfcmFu Z2UgPSBnZW42X2FsbG9jX3ZhX3JhbmdlOwogCXBwZ3R0LT5iYXNlLmNsZWFyX3JhbmdlID0gZ2Vu Nl9wcGd0dF9jbGVhcl9yYW5nZTsKIAlwcGd0dC0+YmFzZS5pbnNlcnRfZW50cmllcyA9IGdlbjZf cHBndHRfaW5zZXJ0X2VudHJpZXM7CkBAIC0xMjkyLDcgKzEzODEsMTAgQEAgc3RhdGljIGludCBn ZW42X3BwZ3R0X2luaXQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogCXBwZ3R0LT5wZF9h ZGRyID0gKGdlbjZfZ3R0X3B0ZV90IF9faW9tZW0gKilkZXZfcHJpdi0+Z3R0LmdzbSArCiAJCXBw Z3R0LT5wZC5wZF9vZmZzZXQgLyBzaXplb2YoZ2VuNl9ndHRfcHRlX3QpOwogCi0JcHBndHQtPmJh c2UuY2xlYXJfcmFuZ2UoJnBwZ3R0LT5iYXNlLCAwLCBwcGd0dC0+YmFzZS50b3RhbCwgdHJ1ZSk7 CisJaWYgKGFsaWFzaW5nKQorCQlwcGd0dC0+YmFzZS5jbGVhcl9yYW5nZSgmcHBndHQtPmJhc2Us IDAsIHBwZ3R0LT5iYXNlLnRvdGFsLCB0cnVlKTsKKwllbHNlCisJCWdlbjZfc2NyYXRjaF92YV9y YW5nZShwcGd0dCwgMCwgcHBndHQtPmJhc2UudG90YWwpOwogCiAJZ2VuNl93cml0ZV9wYWdlX3Jh bmdlKGRldl9wcml2LCAmcHBndHQtPnBkLCAwLCBwcGd0dC0+YmFzZS50b3RhbCk7CiAKQEAgLTEz MDYsNyArMTM5OCw4IEBAIHN0YXRpYyBpbnQgZ2VuNl9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3 X3BwZ3R0ICpwcGd0dCkKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCBfX2h3X3BwZ3R0X2lu aXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQor c3RhdGljIGludCBfX2h3X3BwZ3R0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0 IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAorCQlib29sIGFsaWFzaW5nKQogewogCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAKQEAgLTEzMTQsNyAr MTQwNyw3IEBAIHN0YXRpYyBpbnQgX19od19wcGd0dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAlwcGd0dC0+YmFzZS5zY3JhdGNoID0g ZGV2X3ByaXYtPmd0dC5iYXNlLnNjcmF0Y2g7CiAKIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4g PCA4KQotCQlyZXR1cm4gZ2VuNl9wcGd0dF9pbml0KHBwZ3R0KTsKKwkJcmV0dXJuIGdlbjZfcHBn dHRfaW5pdChwcGd0dCwgYWxpYXNpbmcpOwogCWVsc2UKIAkJcmV0dXJuIGdlbjhfcHBndHRfaW5p dChwcGd0dCwgZGV2X3ByaXYtPmd0dC5iYXNlLnRvdGFsKTsKIH0KQEAgLTEzMjMsNyArMTQxNiw3 IEBAIGludCBpOTE1X3BwZ3R0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGk5 MTVfaHdfcHBndHQgKnBwZ3R0KQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGRldi0+ZGV2X3ByaXZhdGU7CiAJaW50IHJldCA9IDA7CiAKLQlyZXQgPSBfX2h3X3BwZ3R0X2lu aXQoZGV2LCBwcGd0dCk7CisJcmV0ID0gX19od19wcGd0dF9pbml0KGRldiwgcHBndHQsIGZhbHNl KTsKIAlpZiAocmV0ID09IDApIHsKIAkJa3JlZl9pbml0KCZwcGd0dC0+cmVmKTsKIAkJZHJtX21t X2luaXQoJnBwZ3R0LT5iYXNlLm1tLCBwcGd0dC0+YmFzZS5zdGFydCwKQEAgLTE5NDQsNyArMjAz Nyw3IEBAIHN0YXRpYyBpbnQgaTkxNV9nZW1fc2V0dXBfZ2xvYmFsX2d0dChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCQlpZiAoIXBwZ3R0KQogCQkJcmV0dXJuIC1FTk9NRU07CiAKLQkJcmV0ID0g X19od19wcGd0dF9pbml0KGRldiwgcHBndHQpOworCQlyZXQgPSBfX2h3X3BwZ3R0X2luaXQoZGV2 LCBwcGd0dCwgdHJ1ZSk7CiAJCWlmIChyZXQgIT0gMCkKIAkJCXJldHVybiByZXQ7CiAKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKaW5kZXggZWFmNTMwZi4uNDNiNWFkZiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKQEAgLTE5NSw2ICsxOTUsNyBAQCBzdHJ1Y3QgaTkxNV9w YWdlX3RhYmxlX2VudHJ5IHsKIAlkbWFfYWRkcl90IGRhZGRyOwogCiAJdW5zaWduZWQgbG9uZyAq dXNlZF9wdGVzOworCXVuc2lnbmVkIGludCBzY3JhdGNoOjE7CiB9OwogCiBzdHJ1Y3QgaTkxNV9w YWdlX2RpcmVjdG9yeV9lbnRyeSB7CkBAIC0zMDUsNiArMzA2LDggQEAgc3RydWN0IGk5MTVfaHdf cHBndHQgewogCQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSBwZDsKIAl9OwogCisJ c3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqc2NyYXRjaF9wdDsKKwogCXN0cnVjdCBkcm1f aTkxNV9maWxlX3ByaXZhdGUgKmZpbGVfcHJpdjsKIAogCWdlbjZfZ3R0X3B0ZV90IF9faW9tZW0g KnBkX2FkZHI7Ci0tIAoyLjEuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK