From: Michel Thierry Subject: [PATCH v5 01/32] drm/i915: page table abstractions Date: Mon, 23 Feb 2015 15:44:01 +0000 Message-ID: <1424706272-3016-2-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1424706272-3016-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 3DAB16E437 for ; Mon, 23 Feb 2015 07:44:35 -0800 (PST) In-Reply-To: <1424706272-3016-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+CgpXaGVuIHdl IG1vdmUgdG8gZHluYW1pYyBwYWdlIGFsbG9jYXRpb24sIGtlZXBpbmcgcGFnZV9kaXJlY3Rvcnkg YW5kIHBhZ2V0YWJzIGFzCnNlcGFyYXRlIHN0cnVjdHVyZXMgd2lsbCBoZWxwIHRvIGJyZWFrIGFj dGlvbnMgaW50byBzaW1wbGVyIHRhc2tzLgoKVG8gaGVscCB0cmFuc2l0aW9uIHRoZSBjb2RlIG5p Y2VseSB0aGVyZSBpcyBzb21lIHdhc3RlZCBzcGFjZSBpbiBnZW42LzcuClRoaXMgd2lsbCBiZSBh bWVsaW9yYXRlZCBzaG9ydGx5LgoKRm9sbG93aW5nIHRoZSB4ODYgcGFnZXRhYmxlIHRlcm1pbm9s b2d5OgpQRFBFID0gc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlcl9lbnRyeS4KUERF ID0gc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfZW50cnkgW3BhZ2VfZGlyZWN0b3J5XS4KUFRF ID0gc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSBbcGFnZV90YWJsZXNdLgoKdjI6IGZpeGVk IG1pc21hdGNoZXMgYWZ0ZXIgY2xlYW4tdXAvcmViYXNlLgoKdjM6IENsYXJpZnkgdGhlIG5hbWVz IG9mIHRoZSBtdWx0aXBsZSBsZXZlbHMgb2YgcGFnZSB0YWJsZXMgKERhbmllbCkKCnY0OiBBZGRy ZXNzaW5nIE1pa2EncyByZXZpZXcgY29tbWVudHMuCnMvZ2VuOF9mcmVlX3BhZ2VfZGlyZWN0b3Jp ZXMvZ2VuOF9mcmVlX3BhZ2VfZGlyZWN0b3J5IGFuZCBmcmVlIHRoZQpwYWdlIHRhYmxlcyBmb3Ig dGhlIGRpcmVjdG9yeSB0aGVyZS4KSW4gZ2VuOF9wcGd0dF9hbGxvY2F0ZV9wYWdlX2RpcmVjdG9y aWVzLCBkbyBub3QgbGVhayBwcmV2aW91c2x5IGFsbG9jYXRlZApwdCBpbiBjYXNlIHRoZSBwYWdl X2RpcmVjdG9yeSBhbGxvYyBmYWlscy4KVXBkYXRlIGVycm9yIHJldHVybiBoYW5kbGluZyBpbiBn ZW44X3BwZ3R0X2FsbG9jLgoKQ2M6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXgu aW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBCZW4gV2lkYXdza3kgPGJlbkBid2lkYXdzay5uZXQ+ ClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+ ICh2MispCi0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCAxNzggKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuaCB8ICAyMyArKysrLQogMiBmaWxlcyBjaGFuZ2VkLCAxMDkgaW5zZXJ0aW9u cygrKSwgOTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRl eCBlNTRiMmEwLi4xMDAyNmQzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAt MzM4LDcgKzMzOCw4IEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfY2xlYXJfcmFuZ2Uoc3RydWN0 IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCQkJICAgICAgSTkxNV9DQUNIRV9MTEMsIHVzZV9z Y3JhdGNoKTsKIAogCXdoaWxlIChudW1fZW50cmllcykgewotCQlzdHJ1Y3QgcGFnZSAqcGFnZV90 YWJsZSA9IHBwZ3R0LT5nZW44X3B0X3BhZ2VzW3BkcGVdW3BkZV07CisJCXN0cnVjdCBpOTE1X3Bh Z2VfZGlyZWN0b3J5X2VudHJ5ICpwZCA9ICZwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W3BkcGVd OworCQlzdHJ1Y3QgcGFnZSAqcGFnZV90YWJsZSA9IHBkLT5wYWdlX3RhYmxlc1twZGVdLnBhZ2U7 CiAKIAkJbGFzdF9wdGUgPSBwdGUgKyBudW1fZW50cmllczsKIAkJaWYgKGxhc3RfcHRlID4gR0VO OF9QVEVTX1BFUl9QQUdFKQpAQCAtMzgyLDggKzM4MywxMiBAQCBzdGF0aWMgdm9pZCBnZW44X3Bw Z3R0X2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQlpZiAo V0FSTl9PTihwZHBlID49IEdFTjhfTEVHQUNZX1BEUEVTKSkKIAkJCWJyZWFrOwogCi0JCWlmIChw dF92YWRkciA9PSBOVUxMKQotCQkJcHRfdmFkZHIgPSBrbWFwX2F0b21pYyhwcGd0dC0+Z2VuOF9w dF9wYWdlc1twZHBlXVtwZGVdKTsKKwkJaWYgKHB0X3ZhZGRyID09IE5VTEwpIHsKKwkJCXN0cnVj dCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwZCA9ICZwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0 b3J5W3BkcGVdOworCQkJc3RydWN0IHBhZ2UgKnBhZ2VfdGFibGUgPSBwZC0+cGFnZV90YWJsZXNb cGRlXS5wYWdlOworCisJCQlwdF92YWRkciA9IGttYXBfYXRvbWljKHBhZ2VfdGFibGUpOworCQl9 CiAKIAkJcHRfdmFkZHJbcHRlXSA9CiAJCQlnZW44X3B0ZV9lbmNvZGUoc2dfcGFnZV9pdGVyX2Rt YV9hZGRyZXNzKCZzZ19pdGVyKSwKQEAgLTQwNywyOSArNDEyLDMzIEBAIHN0YXRpYyB2b2lkIGdl bjhfcHBndHRfaW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJ fQogfQogCi1zdGF0aWMgdm9pZCBnZW44X2ZyZWVfcGFnZV90YWJsZXMoc3RydWN0IHBhZ2UgKipw dF9wYWdlcykKK3N0YXRpYyB2b2lkIGdlbjhfZnJlZV9wYWdlX3RhYmxlcyhzdHJ1Y3QgaTkxNV9w YWdlX2RpcmVjdG9yeV9lbnRyeSAqcGQpCiB7CiAJaW50IGk7CiAKLQlpZiAocHRfcGFnZXMgPT0g TlVMTCkKKwlpZiAocGQtPnBhZ2VfdGFibGVzID09IE5VTEwpCiAJCXJldHVybjsKIAogCWZvciAo aSA9IDA7IGkgPCBHRU44X1BERVNfUEVSX1BBR0U7IGkrKykKLQkJaWYgKHB0X3BhZ2VzW2ldKQot CQkJX19mcmVlX3BhZ2VzKHB0X3BhZ2VzW2ldLCAwKTsKKwkJaWYgKHBkLT5wYWdlX3RhYmxlc1tp XS5wYWdlKQorCQkJX19mcmVlX3BhZ2UocGQtPnBhZ2VfdGFibGVzW2ldLnBhZ2UpOwogfQogCi1z dGF0aWMgdm9pZCBnZW44X3BwZ3R0X2ZyZWUoY29uc3Qgc3RydWN0IGk5MTVfaHdfcHBndHQgKnBw Z3R0KQorc3RhdGljIHZvaWQgZ2VuOF9mcmVlX3BhZ2VfZGlyZWN0b3J5KHN0cnVjdCBpOTE1X3Bh Z2VfZGlyZWN0b3J5X2VudHJ5ICpwZCkKK3sKKwlnZW44X2ZyZWVfcGFnZV90YWJsZXMocGQpOwor CWtmcmVlKHBkLT5wYWdlX3RhYmxlcyk7CisJX19mcmVlX3BhZ2UocGQtPnBhZ2UpOworfQorCitz dGF0aWMgdm9pZCBnZW44X3BwZ3R0X2ZyZWUoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQog ewogCWludCBpOwogCiAJZm9yIChpID0gMDsgaSA8IHBwZ3R0LT5udW1fcGRfcGFnZXM7IGkrKykg ewotCQlnZW44X2ZyZWVfcGFnZV90YWJsZXMocHBndHQtPmdlbjhfcHRfcGFnZXNbaV0pOwotCQlr ZnJlZShwcGd0dC0+Z2VuOF9wdF9wYWdlc1tpXSk7CisJCWdlbjhfZnJlZV9wYWdlX2RpcmVjdG9y eSgmcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXSk7CiAJCWtmcmVlKHBwZ3R0LT5nZW44X3B0 X2RtYV9hZGRyW2ldKTsKIAl9Ci0KLQlfX2ZyZWVfcGFnZXMocHBndHQtPnBkX3BhZ2VzLCBnZXRf b3JkZXIocHBndHQtPm51bV9wZF9wYWdlcyA8PCBQQUdFX1NISUZUKSk7CiB9CiAKIHN0YXRpYyB2 b2lkIGdlbjhfcHBndHRfdW5tYXBfcGFnZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQpA QCAtNDY0LDg2ICs0NzMsNzcgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9jbGVhbnVwKHN0cnVj dCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQogCWdlbjhfcHBndHRfZnJlZShwcGd0dCk7CiB9CiAK LXN0YXRpYyBzdHJ1Y3QgcGFnZSAqKl9fZ2VuOF9hbGxvY19wYWdlX3RhYmxlcyh2b2lkKQorc3Rh dGljIGludCBnZW44X3BwZ3R0X2FsbG9jYXRlX2RtYShzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBn dHQpCiB7Ci0Jc3RydWN0IHBhZ2UgKipwdF9wYWdlczsKIAlpbnQgaTsKIAotCXB0X3BhZ2VzID0g a2NhbGxvYyhHRU44X1BERVNfUEVSX1BBR0UsIHNpemVvZihzdHJ1Y3QgcGFnZSAqKSwgR0ZQX0tF Uk5FTCk7Ci0JaWYgKCFwdF9wYWdlcykKLQkJcmV0dXJuIEVSUl9QVFIoLUVOT01FTSk7Ci0KLQlm b3IgKGkgPSAwOyBpIDwgR0VOOF9QREVTX1BFUl9QQUdFOyBpKyspIHsKLQkJcHRfcGFnZXNbaV0g PSBhbGxvY19wYWdlKEdGUF9LRVJORUwpOwotCQlpZiAoIXB0X3BhZ2VzW2ldKQotCQkJZ290byBi YWlsOworCWZvciAoaSA9IDA7IGkgPCBwcGd0dC0+bnVtX3BkX3BhZ2VzOyBpKyspIHsKKwkJcHBn dHQtPmdlbjhfcHRfZG1hX2FkZHJbaV0gPSBrY2FsbG9jKEdFTjhfUERFU19QRVJfUEFHRSwKKwkJ CQkJCSAgICAgc2l6ZW9mKGRtYV9hZGRyX3QpLAorCQkJCQkJICAgICBHRlBfS0VSTkVMKTsKKwkJ aWYgKCFwcGd0dC0+Z2VuOF9wdF9kbWFfYWRkcltpXSkKKwkJCXJldHVybiAtRU5PTUVNOwogCX0K IAotCXJldHVybiBwdF9wYWdlczsKLQotYmFpbDoKLQlnZW44X2ZyZWVfcGFnZV90YWJsZXMocHRf cGFnZXMpOwotCWtmcmVlKHB0X3BhZ2VzKTsKLQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKKwly ZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9jYXRlX3BhZ2VfdGFibGVz KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKLQkJCQkJICAgY29uc3QgaW50IG1heF9wZHAp CitzdGF0aWMgaW50IGdlbjhfcHBndHRfYWxsb2NhdGVfcGFnZV90YWJsZXMoc3RydWN0IGk5MTVf aHdfcHBndHQgKnBwZ3R0KQogewotCXN0cnVjdCBwYWdlICoqcHRfcGFnZXNbR0VOOF9MRUdBQ1lf UERQRVNdOwotCWludCBpLCByZXQ7CisJaW50IGksIGo7CiAKLQlmb3IgKGkgPSAwOyBpIDwgbWF4 X3BkcDsgaSsrKSB7Ci0JCXB0X3BhZ2VzW2ldID0gX19nZW44X2FsbG9jX3BhZ2VfdGFibGVzKCk7 Ci0JCWlmIChJU19FUlIocHRfcGFnZXNbaV0pKSB7Ci0JCQlyZXQgPSBQVFJfRVJSKHB0X3BhZ2Vz W2ldKTsKLQkJCWdvdG8gdW53aW5kX291dDsKKwlmb3IgKGkgPSAwOyBpIDwgcHBndHQtPm51bV9w ZF9wYWdlczsgaSsrKSB7CisJCWZvciAoaiA9IDA7IGogPCBHRU44X1BERVNfUEVSX1BBR0U7IGor KykgeworCQkJc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQgPSAmcHBndHQtPnBkcC5w YWdlX2RpcmVjdG9yeVtpXS5wYWdlX3RhYmxlc1tqXTsKKworCQkJcHQtPnBhZ2UgPSBhbGxvY19w YWdlKEdGUF9LRVJORUwgfCBfX0dGUF9aRVJPKTsKKwkJCWlmICghcHQtPnBhZ2UpCisJCQkJZ290 byB1bndpbmRfb3V0OwogCQl9CiAJfQogCi0JLyogTkI6IEF2b2lkIHRvdWNoaW5nIGdlbjhfcHRf cGFnZXMgdW50aWwgbGFzdCB0byBrZWVwIHRoZSBhbGxvY2F0aW9uLAotCSAqICJhdG9taWMiIC0g Zm9yIGNsZWFudXAgcHVycG9zZXMuCi0JICovCi0JZm9yIChpID0gMDsgaSA8IG1heF9wZHA7IGkr KykKLQkJcHBndHQtPmdlbjhfcHRfcGFnZXNbaV0gPSBwdF9wYWdlc1tpXTsKLQogCXJldHVybiAw OwogCiB1bndpbmRfb3V0OgotCXdoaWxlIChpLS0pIHsKLQkJZ2VuOF9mcmVlX3BhZ2VfdGFibGVz KHB0X3BhZ2VzW2ldKTsKLQkJa2ZyZWUocHRfcGFnZXNbaV0pOwotCX0KKwl3aGlsZSAoaS0tKQor CQlnZW44X2ZyZWVfcGFnZV90YWJsZXMoJnBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbaV0pOwog Ci0JcmV0dXJuIHJldDsKKwlyZXR1cm4gLUVOT01FTTsKIH0KIAotc3RhdGljIGludCBnZW44X3Bw Z3R0X2FsbG9jYXRlX2RtYShzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCitzdGF0aWMgaW50 IGdlbjhfcHBndHRfYWxsb2NhdGVfcGFnZV9kaXJlY3RvcmllcyhzdHJ1Y3QgaTkxNV9od19wcGd0 dCAqcHBndHQsCisJCQkJCQljb25zdCBpbnQgbWF4X3BkcCkKIHsKIAlpbnQgaTsKIAotCWZvciAo aSA9IDA7IGkgPCBwcGd0dC0+bnVtX3BkX3BhZ2VzOyBpKyspIHsKLQkJcHBndHQtPmdlbjhfcHRf ZG1hX2FkZHJbaV0gPSBrY2FsbG9jKEdFTjhfUERFU19QRVJfUEFHRSwKLQkJCQkJCSAgICAgc2l6 ZW9mKGRtYV9hZGRyX3QpLAotCQkJCQkJICAgICBHRlBfS0VSTkVMKTsKLQkJaWYgKCFwcGd0dC0+ Z2VuOF9wdF9kbWFfYWRkcltpXSkKLQkJCXJldHVybiAtRU5PTUVNOwotCX0KKwlmb3IgKGkgPSAw OyBpIDwgbWF4X3BkcDsgaSsrKSB7CisJCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkgKnB0 OwogCi0JcmV0dXJuIDA7Ci19CisJCXB0ID0ga2NhbGxvYyhHRU44X1BERVNfUEVSX1BBR0UsIHNp emVvZigqcHQpLCBHRlBfS0VSTkVMKTsKKwkJaWYgKCFwdCkKKwkJCWdvdG8gdW53aW5kX291dDsK IAotc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9jYXRlX3BhZ2VfZGlyZWN0b3JpZXMoc3RydWN0 IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAotCQkJCQkJY29uc3QgaW50IG1heF9wZHApCi17Ci0JcHBn dHQtPnBkX3BhZ2VzID0gYWxsb2NfcGFnZXMoR0ZQX0tFUk5FTCwgZ2V0X29yZGVyKG1heF9wZHAg PDwgUEFHRV9TSElGVCkpOwotCWlmICghcHBndHQtPnBkX3BhZ2VzKQotCQlyZXR1cm4gLUVOT01F TTsKKwkJcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXS5wYWdlID0gYWxsb2NfcGFnZShHRlBf S0VSTkVMKTsKKwkJaWYgKCFwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W2ldLnBhZ2UpIHsKKwkJ CWtmcmVlKHB0KTsKKwkJCWdvdG8gdW53aW5kX291dDsKKwkJfQorCisJCXBwZ3R0LT5wZHAucGFn ZV9kaXJlY3RvcnlbaV0ucGFnZV90YWJsZXMgPSBwdDsKKwl9CiAKLQlwcGd0dC0+bnVtX3BkX3Bh Z2VzID0gMSA8PCBnZXRfb3JkZXIobWF4X3BkcCA8PCBQQUdFX1NISUZUKTsKKwlwcGd0dC0+bnVt X3BkX3BhZ2VzID0gbWF4X3BkcDsKIAlCVUdfT04ocHBndHQtPm51bV9wZF9wYWdlcyA+IEdFTjhf TEVHQUNZX1BEUEVTKTsKIAogCXJldHVybiAwOworCit1bndpbmRfb3V0OgorCXdoaWxlIChpLS0p IHsKKwkJa2ZyZWUocHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXS5wYWdlX3RhYmxlcyk7CisJ CV9fZnJlZV9wYWdlKHBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbaV0ucGFnZSk7CisJfQorCisJ cmV0dXJuIC1FTk9NRU07CiB9CiAKIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvYyhzdHJ1Y3Qg aTkxNV9od19wcGd0dCAqcHBndHQsCkBAIC01NTUsMTggKzU1NSwyMCBAQCBzdGF0aWMgaW50IGdl bjhfcHBndHRfYWxsb2Moc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogCWlmIChyZXQpCiAJ CXJldHVybiByZXQ7CiAKLQlyZXQgPSBnZW44X3BwZ3R0X2FsbG9jYXRlX3BhZ2VfdGFibGVzKHBw Z3R0LCBtYXhfcGRwKTsKLQlpZiAocmV0KSB7Ci0JCV9fZnJlZV9wYWdlcyhwcGd0dC0+cGRfcGFn ZXMsIGdldF9vcmRlcihtYXhfcGRwIDw8IFBBR0VfU0hJRlQpKTsKLQkJcmV0dXJuIHJldDsKLQl9 CisJcmV0ID0gZ2VuOF9wcGd0dF9hbGxvY2F0ZV9wYWdlX3RhYmxlcyhwcGd0dCk7CisJaWYgKHJl dCkKKwkJZ290byBlcnJfb3V0OwogCiAJcHBndHQtPm51bV9wZF9lbnRyaWVzID0gbWF4X3BkcCAq IEdFTjhfUERFU19QRVJfUEFHRTsKIAogCXJldCA9IGdlbjhfcHBndHRfYWxsb2NhdGVfZG1hKHBw Z3R0KTsKIAlpZiAocmV0KQotCQlnZW44X3BwZ3R0X2ZyZWUocHBndHQpOworCQlnb3RvIGVycl9v dXQ7CiAKKwlyZXR1cm4gMDsKKworZXJyX291dDoKKwlnZW44X3BwZ3R0X2ZyZWUocHBndHQpOwog CXJldHVybiByZXQ7CiB9CiAKQEAgLTU3Nyw3ICs1NzksNyBAQCBzdGF0aWMgaW50IGdlbjhfcHBn dHRfc2V0dXBfcGFnZV9kaXJlY3RvcmllcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCiAJ aW50IHJldDsKIAogCXBkX2FkZHIgPSBwY2lfbWFwX3BhZ2UocHBndHQtPmJhc2UuZGV2LT5wZGV2 LAotCQkJICAgICAgICZwcGd0dC0+cGRfcGFnZXNbcGRdLCAwLAorCQkJICAgICAgIHBwZ3R0LT5w ZHAucGFnZV9kaXJlY3RvcnlbcGRdLnBhZ2UsIDAsCiAJCQkgICAgICAgUEFHRV9TSVpFLCBQQ0lf RE1BX0JJRElSRUNUSU9OQUwpOwogCiAJcmV0ID0gcGNpX2RtYV9tYXBwaW5nX2Vycm9yKHBwZ3R0 LT5iYXNlLmRldi0+cGRldiwgcGRfYWRkcik7CkBAIC01OTcsNyArNTk5LDcgQEAgc3RhdGljIGlu dCBnZW44X3BwZ3R0X3NldHVwX3BhZ2VfdGFibGVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0 dCwKIAlzdHJ1Y3QgcGFnZSAqcDsKIAlpbnQgcmV0OwogCi0JcCA9IHBwZ3R0LT5nZW44X3B0X3Bh Z2VzW3BkXVtwdF07CisJcCA9IHBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbcGRdLnBhZ2VfdGFi bGVzW3B0XS5wYWdlOwogCXB0X2FkZHIgPSBwY2lfbWFwX3BhZ2UocHBndHQtPmJhc2UuZGV2LT5w ZGV2LAogCQkJICAgICAgIHAsIDAsIFBBR0VfU0laRSwgUENJX0RNQV9CSURJUkVDVElPTkFMKTsK IAlyZXQgPSBwY2lfZG1hX21hcHBpbmdfZXJyb3IocHBndHQtPmJhc2UuZGV2LT5wZGV2LCBwdF9h ZGRyKTsKQEAgLTY1OCw3ICs2NjAsNyBAQCBzdGF0aWMgaW50IGdlbjhfcHBndHRfaW5pdChzdHJ1 Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsIHVpbnQ2NF90IHNpemUpCiAJICovCiAJZm9yIChpID0g MDsgaSA8IG1heF9wZHA7IGkrKykgewogCQlnZW44X3BwZ3R0X3BkZV90ICpwZF92YWRkcjsKLQkJ cGRfdmFkZHIgPSBrbWFwX2F0b21pYygmcHBndHQtPnBkX3BhZ2VzW2ldKTsKKwkJcGRfdmFkZHIg PSBrbWFwX2F0b21pYyhwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W2ldLnBhZ2UpOwogCQlmb3Ig KGogPSAwOyBqIDwgR0VOOF9QREVTX1BFUl9QQUdFOyBqKyspIHsKIAkJCWRtYV9hZGRyX3QgYWRk ciA9IHBwZ3R0LT5nZW44X3B0X2RtYV9hZGRyW2ldW2pdOwogCQkJcGRfdmFkZHJbal0gPSBnZW44 X3BkZV9lbmNvZGUocHBndHQtPmJhc2UuZGV2LCBhZGRyLApAQCAtNzIxLDcgKzcyMyw3IEBAIHN0 YXRpYyB2b2lkIGdlbjZfZHVtcF9wcGd0dChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsIHN0 cnVjdCBzZXFfZmlsZSAqbSkKIAkJCQkgICBleHBlY3RlZCk7CiAJCXNlcV9wcmludGYobSwgIlx0 UERFOiAleFxuIiwgcGRfZW50cnkpOwogCi0JCXB0X3ZhZGRyID0ga21hcF9hdG9taWMocHBndHQt PnB0X3BhZ2VzW3BkZV0pOworCQlwdF92YWRkciA9IGttYXBfYXRvbWljKHBwZ3R0LT5wZC5wYWdl X3RhYmxlc1twZGVdLnBhZ2UpOwogCQlmb3IgKHB0ZSA9IDA7IHB0ZSA8IEk5MTVfUFBHVFRfUFRf RU5UUklFUzsgcHRlKz00KSB7CiAJCQl1bnNpZ25lZCBsb25nIHZhID0KIAkJCQkocGRlICogUEFH RV9TSVpFICogSTkxNV9QUEdUVF9QVF9FTlRSSUVTKSArCkBAIC05MzYsNyArOTM4LDcgQEAgc3Rh dGljIHZvaWQgZ2VuNl9wcGd0dF9jbGVhcl9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNl ICp2bSwKIAkJaWYgKGxhc3RfcHRlID4gSTkxNV9QUEdUVF9QVF9FTlRSSUVTKQogCQkJbGFzdF9w dGUgPSBJOTE1X1BQR1RUX1BUX0VOVFJJRVM7CiAKLQkJcHRfdmFkZHIgPSBrbWFwX2F0b21pYyhw cGd0dC0+cHRfcGFnZXNbYWN0X3B0XSk7CisJCXB0X3ZhZGRyID0ga21hcF9hdG9taWMocHBndHQt PnBkLnBhZ2VfdGFibGVzW2FjdF9wdF0ucGFnZSk7CiAKIAkJZm9yIChpID0gZmlyc3RfcHRlOyBp IDwgbGFzdF9wdGU7IGkrKykKIAkJCXB0X3ZhZGRyW2ldID0gc2NyYXRjaF9wdGU7CkBAIC05NjUs NyArOTY3LDcgQEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3Qg aTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAlwdF92YWRkciA9IE5VTEw7CiAJZm9yX2VhY2hfc2df cGFnZShwYWdlcy0+c2dsLCAmc2dfaXRlciwgcGFnZXMtPm5lbnRzLCAwKSB7CiAJCWlmIChwdF92 YWRkciA9PSBOVUxMKQotCQkJcHRfdmFkZHIgPSBrbWFwX2F0b21pYyhwcGd0dC0+cHRfcGFnZXNb YWN0X3B0XSk7CisJCQlwdF92YWRkciA9IGttYXBfYXRvbWljKHBwZ3R0LT5wZC5wYWdlX3RhYmxl c1thY3RfcHRdLnBhZ2UpOwogCiAJCXB0X3ZhZGRyW2FjdF9wdGVdID0KIAkJCXZtLT5wdGVfZW5j b2RlKHNnX3BhZ2VfaXRlcl9kbWFfYWRkcmVzcygmc2dfaXRlciksCkBAIC0xMDAwLDggKzEwMDIs OCBAQCBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0X2ZyZWUoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBw Z3R0KQogCiAJa2ZyZWUocHBndHQtPnB0X2RtYV9hZGRyKTsKIAlmb3IgKGkgPSAwOyBpIDwgcHBn dHQtPm51bV9wZF9lbnRyaWVzOyBpKyspCi0JCV9fZnJlZV9wYWdlKHBwZ3R0LT5wdF9wYWdlc1tp XSk7Ci0Ja2ZyZWUocHBndHQtPnB0X3BhZ2VzKTsKKwkJX19mcmVlX3BhZ2UocHBndHQtPnBkLnBh Z2VfdGFibGVzW2ldLnBhZ2UpOworCWtmcmVlKHBwZ3R0LT5wZC5wYWdlX3RhYmxlcyk7CiB9CiAK IHN0YXRpYyB2b2lkIGdlbjZfcHBndHRfY2xlYW51cChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNl ICp2bSkKQEAgLTEwNTgsMjIgKzEwNjAsMjIgQEAgYWxsb2M6CiAKIHN0YXRpYyBpbnQgZ2VuNl9w cGd0dF9hbGxvY2F0ZV9wYWdlX3RhYmxlcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiB7 CisJc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQ7CiAJaW50IGk7CiAKLQlwcGd0dC0+ cHRfcGFnZXMgPSBrY2FsbG9jKHBwZ3R0LT5udW1fcGRfZW50cmllcywgc2l6ZW9mKHN0cnVjdCBw YWdlICopLAotCQkJCSAgR0ZQX0tFUk5FTCk7Ci0KLQlpZiAoIXBwZ3R0LT5wdF9wYWdlcykKKwlw dCA9IGtjYWxsb2MocHBndHQtPm51bV9wZF9lbnRyaWVzLCBzaXplb2YoKnB0KSwgR0ZQX0tFUk5F TCk7CisJaWYgKCFwdCkKIAkJcmV0dXJuIC1FTk9NRU07CiAKIAlmb3IgKGkgPSAwOyBpIDwgcHBn dHQtPm51bV9wZF9lbnRyaWVzOyBpKyspIHsKLQkJcHBndHQtPnB0X3BhZ2VzW2ldID0gYWxsb2Nf cGFnZShHRlBfS0VSTkVMKTsKLQkJaWYgKCFwcGd0dC0+cHRfcGFnZXNbaV0pIHsKKwkJcHRbaV0u cGFnZSA9IGFsbG9jX3BhZ2UoR0ZQX0tFUk5FTCk7CisJCWlmICghcHQtPnBhZ2UpIHsKIAkJCWdl bjZfcHBndHRfZnJlZShwcGd0dCk7CiAJCQlyZXR1cm4gLUVOT01FTTsKIAkJfQogCX0KIAorCXBw Z3R0LT5wZC5wYWdlX3RhYmxlcyA9IHB0OwogCXJldHVybiAwOwogfQogCkBAIC0xMTA4LDkgKzEx MTAsMTEgQEAgc3RhdGljIGludCBnZW42X3BwZ3R0X3NldHVwX3BhZ2VfdGFibGVzKHN0cnVjdCBp OTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAlpbnQgaTsKIAogCWZvciAoaSA9IDA7IGkgPCBwcGd0dC0+ bnVtX3BkX2VudHJpZXM7IGkrKykgeworCQlzdHJ1Y3QgcGFnZSAqcGFnZTsKIAkJZG1hX2FkZHJf dCBwdF9hZGRyOwogCi0JCXB0X2FkZHIgPSBwY2lfbWFwX3BhZ2UoZGV2LT5wZGV2LCBwcGd0dC0+ cHRfcGFnZXNbaV0sIDAsIDQwOTYsCisJCXBhZ2UgPSBwcGd0dC0+cGQucGFnZV90YWJsZXNbaV0u cGFnZTsKKwkJcHRfYWRkciA9IHBjaV9tYXBfcGFnZShkZXYtPnBkZXYsIHBhZ2UsIDAsIDQwOTYs CiAJCQkJICAgICAgIFBDSV9ETUFfQklESVJFQ1RJT05BTCk7CiAKIAkJaWYgKHBjaV9kbWFfbWFw cGluZ19lcnJvcihkZXYtPnBkZXYsIHB0X2FkZHIpKSB7CkBAIC0xMTU3LDcgKzExNjEsNyBAQCBz dGF0aWMgaW50IGdlbjZfcHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJ cHBndHQtPmJhc2UuaW5zZXJ0X2VudHJpZXMgPSBnZW42X3BwZ3R0X2luc2VydF9lbnRyaWVzOwog CXBwZ3R0LT5iYXNlLmNsZWFudXAgPSBnZW42X3BwZ3R0X2NsZWFudXA7CiAJcHBndHQtPmJhc2Uu c3RhcnQgPSAwOwotCXBwZ3R0LT5iYXNlLnRvdGFsID0gIHBwZ3R0LT5udW1fcGRfZW50cmllcyAq IEk5MTVfUFBHVFRfUFRfRU5UUklFUyAqIFBBR0VfU0laRTsKKwlwcGd0dC0+YmFzZS50b3RhbCA9 IHBwZ3R0LT5udW1fcGRfZW50cmllcyAqIEk5MTVfUFBHVFRfUFRfRU5UUklFUyAqIFBBR0VfU0la RTsKIAlwcGd0dC0+ZGVidWdfZHVtcCA9IGdlbjZfZHVtcF9wcGd0dDsKIAogCXBwZ3R0LT5wZF9v ZmZzZXQgPQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCA4Zjc2OTkwLi5kOWJj Mzc1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaApAQCAtMTg3LDYgKzE4NywyMCBA QCBzdHJ1Y3QgaTkxNV92bWEgewogCQkJIHUzMiBmbGFncyk7CiB9OwogCitzdHJ1Y3QgaTkxNV9w YWdlX3RhYmxlX2VudHJ5IHsKKwlzdHJ1Y3QgcGFnZSAqcGFnZTsKK307CisKK3N0cnVjdCBpOTE1 X3BhZ2VfZGlyZWN0b3J5X2VudHJ5IHsKKwlzdHJ1Y3QgcGFnZSAqcGFnZTsgLyogTlVMTCBmb3Ig R0VONi1HRU43ICovCisJc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcGFnZV90YWJsZXM7 Cit9OworCitzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyX2VudHJ5IHsKKwkvKiBz dHJ1Y3QgcGFnZSAqcGFnZTsgKi8KKwlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSBw YWdlX2RpcmVjdG9yeVtHRU44X0xFR0FDWV9QRFBFU107Cit9OworCiBzdHJ1Y3QgaTkxNV9hZGRy ZXNzX3NwYWNlIHsKIAlzdHJ1Y3QgZHJtX21tIG1tOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXY7 CkBAIC0yNzIsMTEgKzI4Niw2IEBAIHN0cnVjdCBpOTE1X2h3X3BwZ3R0IHsKIAl1bnNpZ25lZCBu dW1fcGRfZW50cmllczsKIAl1bnNpZ25lZCBudW1fcGRfcGFnZXM7IC8qIGdlbjgrICovCiAJdW5p b24gewotCQlzdHJ1Y3QgcGFnZSAqKnB0X3BhZ2VzOwotCQlzdHJ1Y3QgcGFnZSAqKmdlbjhfcHRf cGFnZXNbR0VOOF9MRUdBQ1lfUERQRVNdOwotCX07Ci0Jc3RydWN0IHBhZ2UgKnBkX3BhZ2VzOwot CXVuaW9uIHsKIAkJdWludDMyX3QgcGRfb2Zmc2V0OwogCQlkbWFfYWRkcl90IHBkX2RtYV9hZGRy W0dFTjhfTEVHQUNZX1BEUEVTXTsKIAl9OwpAQCAtMjg0LDYgKzI5MywxMCBAQCBzdHJ1Y3QgaTkx NV9od19wcGd0dCB7CiAJCWRtYV9hZGRyX3QgKnB0X2RtYV9hZGRyOwogCQlkbWFfYWRkcl90ICpn ZW44X3B0X2RtYV9hZGRyW0dFTjhfTEVHQUNZX1BEUEVTXTsKIAl9OworCXVuaW9uIHsKKwkJc3Ry dWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlcl9lbnRyeSBwZHA7CisJCXN0cnVjdCBpOTE1 X3BhZ2VfZGlyZWN0b3J5X2VudHJ5IHBkOworCX07CiAKIAlzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9w cml2YXRlICpmaWxlX3ByaXY7CiAKLS0gCjIuMS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=