From: Michel Thierry Subject: [PATCH] drm/i915: page table abstractions Date: Tue, 24 Feb 2015 11:14:22 +0000 Message-ID: <1424776462-25328-1-git-send-email-michel.thierry@intel.com> References: <1424706272-3016-2-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 9943B6E410 for ; Tue, 24 Feb 2015 03:14:23 -0800 (PST) In-Reply-To: <1424706272-3016-2-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 Cc: Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQmVuIFdpZGF3c2t5IDxiZW5qYW1pbi53aWRhd3NreUBpbnRlbC5jb20+CgpXaGVuIHdl IG1vdmUgdG8gZHluYW1pYyBwYWdlIGFsbG9jYXRpb24sIGtlZXBpbmcgcGFnZV9kaXJlY3Rvcnkg YW5kIHBhZ2V0YWJzIGFzCnNlcGFyYXRlIHN0cnVjdHVyZXMgd2lsbCBoZWxwIHRvIGJyZWFrIGFj dGlvbnMgaW50byBzaW1wbGVyIHRhc2tzLgoKVG8gaGVscCB0cmFuc2l0aW9uIHRoZSBjb2RlIG5p Y2VseSB0aGVyZSBpcyBzb21lIHdhc3RlZCBzcGFjZSBpbiBnZW42LzcuClRoaXMgd2lsbCBiZSBh bWVsaW9yYXRlZCBzaG9ydGx5LgoKRm9sbG93aW5nIHRoZSB4ODYgcGFnZXRhYmxlIHRlcm1pbm9s b2d5OgpQRFBFID0gc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlcl9lbnRyeS4KUERF ID0gc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfZW50cnkgW3BhZ2VfZGlyZWN0b3J5XS4KUFRF ID0gc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSBbcGFnZV90YWJsZXNdLgoKdjI6IGZpeGVk IG1pc21hdGNoZXMgYWZ0ZXIgY2xlYW4tdXAvcmViYXNlLgoKdjM6IENsYXJpZnkgdGhlIG5hbWVz IG9mIHRoZSBtdWx0aXBsZSBsZXZlbHMgb2YgcGFnZSB0YWJsZXMgKERhbmllbCkKCnY0OiBBZGRy ZXNzaW5nIE1pa2EncyByZXZpZXcgY29tbWVudHMuCnMvZ2VuOF9mcmVlX3BhZ2VfZGlyZWN0b3Jp ZXMvZ2VuOF9mcmVlX3BhZ2VfZGlyZWN0b3J5IGFuZCBmcmVlIHRoZQpwYWdlIHRhYmxlcyBmb3Ig dGhlIGRpcmVjdG9yeSB0aGVyZS4KSW4gZ2VuOF9wcGd0dF9hbGxvY2F0ZV9wYWdlX2RpcmVjdG9y aWVzLCBkbyBub3QgbGVhayBwcmV2aW91c2x5IGFsbG9jYXRlZApwdCBpbiBjYXNlIHRoZSBwYWdl X2RpcmVjdG9yeSBhbGxvYyBmYWlscy4KVXBkYXRlIGVycm9yIHJldHVybiBoYW5kbGluZyBpbiBn ZW44X3BwZ3R0X2FsbG9jLgoKdjU6IERvIG5vdCBsZWFrIHB0IG9uIGVycm9yIGluIGdlbjZfcHBn dHRfYWxsb2NhdGVfcGFnZV90YWJsZXMuIChNaWthKQoKQ2M6IE1pa2EgS3VvcHBhbGEgPG1pa2Eu a3VvcHBhbGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBCZW4gV2lkYXdza3kgPGJl bkBid2lkYXdzay5uZXQ+ClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhp ZXJyeUBpbnRlbC5jb20+ICh2MispCi0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmMgfCAxODAgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCB8ICAyMyArKysrLQogMiBmaWxlcyBjaGFuZ2Vk LCAxMTEgaW5zZXJ0aW9ucygrKSwgOTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuYwppbmRleCBlNTRiMmEwLi5iNGRlZTM0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuYwpAQCAtMzM4LDcgKzMzOCw4IEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfY2xl YXJfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCQkJICAgICAgSTkxNV9D QUNIRV9MTEMsIHVzZV9zY3JhdGNoKTsKIAogCXdoaWxlIChudW1fZW50cmllcykgewotCQlzdHJ1 Y3QgcGFnZSAqcGFnZV90YWJsZSA9IHBwZ3R0LT5nZW44X3B0X3BhZ2VzW3BkcGVdW3BkZV07CisJ CXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwZCA9ICZwcGd0dC0+cGRwLnBhZ2Vf ZGlyZWN0b3J5W3BkcGVdOworCQlzdHJ1Y3QgcGFnZSAqcGFnZV90YWJsZSA9IHBkLT5wYWdlX3Rh Ymxlc1twZGVdLnBhZ2U7CiAKIAkJbGFzdF9wdGUgPSBwdGUgKyBudW1fZW50cmllczsKIAkJaWYg KGxhc3RfcHRlID4gR0VOOF9QVEVTX1BFUl9QQUdFKQpAQCAtMzgyLDggKzM4MywxMiBAQCBzdGF0 aWMgdm9pZCBnZW44X3BwZ3R0X2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3Bh Y2UgKnZtLAogCQlpZiAoV0FSTl9PTihwZHBlID49IEdFTjhfTEVHQUNZX1BEUEVTKSkKIAkJCWJy ZWFrOwogCi0JCWlmIChwdF92YWRkciA9PSBOVUxMKQotCQkJcHRfdmFkZHIgPSBrbWFwX2F0b21p YyhwcGd0dC0+Z2VuOF9wdF9wYWdlc1twZHBlXVtwZGVdKTsKKwkJaWYgKHB0X3ZhZGRyID09IE5V TEwpIHsKKwkJCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwZCA9ICZwcGd0dC0+ cGRwLnBhZ2VfZGlyZWN0b3J5W3BkcGVdOworCQkJc3RydWN0IHBhZ2UgKnBhZ2VfdGFibGUgPSBw ZC0+cGFnZV90YWJsZXNbcGRlXS5wYWdlOworCisJCQlwdF92YWRkciA9IGttYXBfYXRvbWljKHBh Z2VfdGFibGUpOworCQl9CiAKIAkJcHRfdmFkZHJbcHRlXSA9CiAJCQlnZW44X3B0ZV9lbmNvZGUo c2dfcGFnZV9pdGVyX2RtYV9hZGRyZXNzKCZzZ19pdGVyKSwKQEAgLTQwNywyOSArNDEyLDMzIEBA IHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfaW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVz c19zcGFjZSAqdm0sCiAJfQogfQogCi1zdGF0aWMgdm9pZCBnZW44X2ZyZWVfcGFnZV90YWJsZXMo c3RydWN0IHBhZ2UgKipwdF9wYWdlcykKK3N0YXRpYyB2b2lkIGdlbjhfZnJlZV9wYWdlX3RhYmxl cyhzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSAqcGQpCiB7CiAJaW50IGk7CiAKLQlp ZiAocHRfcGFnZXMgPT0gTlVMTCkKKwlpZiAocGQtPnBhZ2VfdGFibGVzID09IE5VTEwpCiAJCXJl dHVybjsKIAogCWZvciAoaSA9IDA7IGkgPCBHRU44X1BERVNfUEVSX1BBR0U7IGkrKykKLQkJaWYg KHB0X3BhZ2VzW2ldKQotCQkJX19mcmVlX3BhZ2VzKHB0X3BhZ2VzW2ldLCAwKTsKKwkJaWYgKHBk LT5wYWdlX3RhYmxlc1tpXS5wYWdlKQorCQkJX19mcmVlX3BhZ2UocGQtPnBhZ2VfdGFibGVzW2ld LnBhZ2UpOwogfQogCi1zdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2ZyZWUoY29uc3Qgc3RydWN0IGk5 MTVfaHdfcHBndHQgKnBwZ3R0KQorc3RhdGljIHZvaWQgZ2VuOF9mcmVlX3BhZ2VfZGlyZWN0b3J5 KHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwZCkKK3sKKwlnZW44X2ZyZWVfcGFn ZV90YWJsZXMocGQpOworCWtmcmVlKHBkLT5wYWdlX3RhYmxlcyk7CisJX19mcmVlX3BhZ2UocGQt PnBhZ2UpOworfQorCitzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2ZyZWUoc3RydWN0IGk5MTVfaHdf cHBndHQgKnBwZ3R0KQogewogCWludCBpOwogCiAJZm9yIChpID0gMDsgaSA8IHBwZ3R0LT5udW1f cGRfcGFnZXM7IGkrKykgewotCQlnZW44X2ZyZWVfcGFnZV90YWJsZXMocHBndHQtPmdlbjhfcHRf cGFnZXNbaV0pOwotCQlrZnJlZShwcGd0dC0+Z2VuOF9wdF9wYWdlc1tpXSk7CisJCWdlbjhfZnJl ZV9wYWdlX2RpcmVjdG9yeSgmcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXSk7CiAJCWtmcmVl KHBwZ3R0LT5nZW44X3B0X2RtYV9hZGRyW2ldKTsKIAl9Ci0KLQlfX2ZyZWVfcGFnZXMocHBndHQt PnBkX3BhZ2VzLCBnZXRfb3JkZXIocHBndHQtPm51bV9wZF9wYWdlcyA8PCBQQUdFX1NISUZUKSk7 CiB9CiAKIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfdW5tYXBfcGFnZXMoc3RydWN0IGk5MTVfaHdf cHBndHQgKnBwZ3R0KQpAQCAtNDY0LDg2ICs0NzMsNzcgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0 dF9jbGVhbnVwKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQogCWdlbjhfcHBndHRfZnJl ZShwcGd0dCk7CiB9CiAKLXN0YXRpYyBzdHJ1Y3QgcGFnZSAqKl9fZ2VuOF9hbGxvY19wYWdlX3Rh Ymxlcyh2b2lkKQorc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9jYXRlX2RtYShzdHJ1Y3QgaTkx NV9od19wcGd0dCAqcHBndHQpCiB7Ci0Jc3RydWN0IHBhZ2UgKipwdF9wYWdlczsKIAlpbnQgaTsK IAotCXB0X3BhZ2VzID0ga2NhbGxvYyhHRU44X1BERVNfUEVSX1BBR0UsIHNpemVvZihzdHJ1Y3Qg cGFnZSAqKSwgR0ZQX0tFUk5FTCk7Ci0JaWYgKCFwdF9wYWdlcykKLQkJcmV0dXJuIEVSUl9QVFIo LUVOT01FTSk7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgR0VOOF9QREVTX1BFUl9QQUdFOyBpKyspIHsK LQkJcHRfcGFnZXNbaV0gPSBhbGxvY19wYWdlKEdGUF9LRVJORUwpOwotCQlpZiAoIXB0X3BhZ2Vz W2ldKQotCQkJZ290byBiYWlsOworCWZvciAoaSA9IDA7IGkgPCBwcGd0dC0+bnVtX3BkX3BhZ2Vz OyBpKyspIHsKKwkJcHBndHQtPmdlbjhfcHRfZG1hX2FkZHJbaV0gPSBrY2FsbG9jKEdFTjhfUERF U19QRVJfUEFHRSwKKwkJCQkJCSAgICAgc2l6ZW9mKGRtYV9hZGRyX3QpLAorCQkJCQkJICAgICBH RlBfS0VSTkVMKTsKKwkJaWYgKCFwcGd0dC0+Z2VuOF9wdF9kbWFfYWRkcltpXSkKKwkJCXJldHVy biAtRU5PTUVNOwogCX0KIAotCXJldHVybiBwdF9wYWdlczsKLQotYmFpbDoKLQlnZW44X2ZyZWVf cGFnZV90YWJsZXMocHRfcGFnZXMpOwotCWtmcmVlKHB0X3BhZ2VzKTsKLQlyZXR1cm4gRVJSX1BU UigtRU5PTUVNKTsKKwlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9j YXRlX3BhZ2VfdGFibGVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKLQkJCQkJICAgY29u c3QgaW50IG1heF9wZHApCitzdGF0aWMgaW50IGdlbjhfcHBndHRfYWxsb2NhdGVfcGFnZV90YWJs ZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogewotCXN0cnVjdCBwYWdlICoqcHRfcGFn ZXNbR0VOOF9MRUdBQ1lfUERQRVNdOwotCWludCBpLCByZXQ7CisJaW50IGksIGo7CiAKLQlmb3Ig KGkgPSAwOyBpIDwgbWF4X3BkcDsgaSsrKSB7Ci0JCXB0X3BhZ2VzW2ldID0gX19nZW44X2FsbG9j X3BhZ2VfdGFibGVzKCk7Ci0JCWlmIChJU19FUlIocHRfcGFnZXNbaV0pKSB7Ci0JCQlyZXQgPSBQ VFJfRVJSKHB0X3BhZ2VzW2ldKTsKLQkJCWdvdG8gdW53aW5kX291dDsKKwlmb3IgKGkgPSAwOyBp IDwgcHBndHQtPm51bV9wZF9wYWdlczsgaSsrKSB7CisJCWZvciAoaiA9IDA7IGogPCBHRU44X1BE RVNfUEVSX1BBR0U7IGorKykgeworCQkJc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQg PSAmcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXS5wYWdlX3RhYmxlc1tqXTsKKworCQkJcHQt PnBhZ2UgPSBhbGxvY19wYWdlKEdGUF9LRVJORUwgfCBfX0dGUF9aRVJPKTsKKwkJCWlmICghcHQt PnBhZ2UpCisJCQkJZ290byB1bndpbmRfb3V0OwogCQl9CiAJfQogCi0JLyogTkI6IEF2b2lkIHRv dWNoaW5nIGdlbjhfcHRfcGFnZXMgdW50aWwgbGFzdCB0byBrZWVwIHRoZSBhbGxvY2F0aW9uLAot CSAqICJhdG9taWMiIC0gZm9yIGNsZWFudXAgcHVycG9zZXMuCi0JICovCi0JZm9yIChpID0gMDsg aSA8IG1heF9wZHA7IGkrKykKLQkJcHBndHQtPmdlbjhfcHRfcGFnZXNbaV0gPSBwdF9wYWdlc1tp XTsKLQogCXJldHVybiAwOwogCiB1bndpbmRfb3V0OgotCXdoaWxlIChpLS0pIHsKLQkJZ2VuOF9m cmVlX3BhZ2VfdGFibGVzKHB0X3BhZ2VzW2ldKTsKLQkJa2ZyZWUocHRfcGFnZXNbaV0pOwotCX0K Kwl3aGlsZSAoaS0tKQorCQlnZW44X2ZyZWVfcGFnZV90YWJsZXMoJnBwZ3R0LT5wZHAucGFnZV9k aXJlY3RvcnlbaV0pOwogCi0JcmV0dXJuIHJldDsKKwlyZXR1cm4gLUVOT01FTTsKIH0KIAotc3Rh dGljIGludCBnZW44X3BwZ3R0X2FsbG9jYXRlX2RtYShzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBn dHQpCitzdGF0aWMgaW50IGdlbjhfcHBndHRfYWxsb2NhdGVfcGFnZV9kaXJlY3RvcmllcyhzdHJ1 Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCisJCQkJCQljb25zdCBpbnQgbWF4X3BkcCkKIHsKIAlp bnQgaTsKIAotCWZvciAoaSA9IDA7IGkgPCBwcGd0dC0+bnVtX3BkX3BhZ2VzOyBpKyspIHsKLQkJ cHBndHQtPmdlbjhfcHRfZG1hX2FkZHJbaV0gPSBrY2FsbG9jKEdFTjhfUERFU19QRVJfUEFHRSwK LQkJCQkJCSAgICAgc2l6ZW9mKGRtYV9hZGRyX3QpLAotCQkJCQkJICAgICBHRlBfS0VSTkVMKTsK LQkJaWYgKCFwcGd0dC0+Z2VuOF9wdF9kbWFfYWRkcltpXSkKLQkJCXJldHVybiAtRU5PTUVNOwot CX0KKwlmb3IgKGkgPSAwOyBpIDwgbWF4X3BkcDsgaSsrKSB7CisJCXN0cnVjdCBpOTE1X3BhZ2Vf dGFibGVfZW50cnkgKnB0OwogCi0JcmV0dXJuIDA7Ci19CisJCXB0ID0ga2NhbGxvYyhHRU44X1BE RVNfUEVSX1BBR0UsIHNpemVvZigqcHQpLCBHRlBfS0VSTkVMKTsKKwkJaWYgKCFwdCkKKwkJCWdv dG8gdW53aW5kX291dDsKIAotc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9jYXRlX3BhZ2VfZGly ZWN0b3JpZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAotCQkJCQkJY29uc3QgaW50IG1h eF9wZHApCi17Ci0JcHBndHQtPnBkX3BhZ2VzID0gYWxsb2NfcGFnZXMoR0ZQX0tFUk5FTCwgZ2V0 X29yZGVyKG1heF9wZHAgPDwgUEFHRV9TSElGVCkpOwotCWlmICghcHBndHQtPnBkX3BhZ2VzKQot CQlyZXR1cm4gLUVOT01FTTsKKwkJcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXS5wYWdlID0g YWxsb2NfcGFnZShHRlBfS0VSTkVMKTsKKwkJaWYgKCFwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5 W2ldLnBhZ2UpIHsKKwkJCWtmcmVlKHB0KTsKKwkJCWdvdG8gdW53aW5kX291dDsKKwkJfQorCisJ CXBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbaV0ucGFnZV90YWJsZXMgPSBwdDsKKwl9CiAKLQlw cGd0dC0+bnVtX3BkX3BhZ2VzID0gMSA8PCBnZXRfb3JkZXIobWF4X3BkcCA8PCBQQUdFX1NISUZU KTsKKwlwcGd0dC0+bnVtX3BkX3BhZ2VzID0gbWF4X3BkcDsKIAlCVUdfT04ocHBndHQtPm51bV9w ZF9wYWdlcyA+IEdFTjhfTEVHQUNZX1BEUEVTKTsKIAogCXJldHVybiAwOworCit1bndpbmRfb3V0 OgorCXdoaWxlIChpLS0pIHsKKwkJa2ZyZWUocHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXS5w YWdlX3RhYmxlcyk7CisJCV9fZnJlZV9wYWdlKHBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbaV0u cGFnZSk7CisJfQorCisJcmV0dXJuIC1FTk9NRU07CiB9CiAKIHN0YXRpYyBpbnQgZ2VuOF9wcGd0 dF9hbGxvYyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCkBAIC01NTUsMTggKzU1NSwyMCBA QCBzdGF0aWMgaW50IGdlbjhfcHBndHRfYWxsb2Moc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0 LAogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlyZXQgPSBnZW44X3BwZ3R0X2FsbG9jYXRl X3BhZ2VfdGFibGVzKHBwZ3R0LCBtYXhfcGRwKTsKLQlpZiAocmV0KSB7Ci0JCV9fZnJlZV9wYWdl cyhwcGd0dC0+cGRfcGFnZXMsIGdldF9vcmRlcihtYXhfcGRwIDw8IFBBR0VfU0hJRlQpKTsKLQkJ cmV0dXJuIHJldDsKLQl9CisJcmV0ID0gZ2VuOF9wcGd0dF9hbGxvY2F0ZV9wYWdlX3RhYmxlcyhw cGd0dCk7CisJaWYgKHJldCkKKwkJZ290byBlcnJfb3V0OwogCiAJcHBndHQtPm51bV9wZF9lbnRy aWVzID0gbWF4X3BkcCAqIEdFTjhfUERFU19QRVJfUEFHRTsKIAogCXJldCA9IGdlbjhfcHBndHRf YWxsb2NhdGVfZG1hKHBwZ3R0KTsKIAlpZiAocmV0KQotCQlnZW44X3BwZ3R0X2ZyZWUocHBndHQp OworCQlnb3RvIGVycl9vdXQ7CisKKwlyZXR1cm4gMDsKIAorZXJyX291dDoKKwlnZW44X3BwZ3R0 X2ZyZWUocHBndHQpOwogCXJldHVybiByZXQ7CiB9CiAKQEAgLTU3Nyw3ICs1NzksNyBAQCBzdGF0 aWMgaW50IGdlbjhfcHBndHRfc2V0dXBfcGFnZV9kaXJlY3RvcmllcyhzdHJ1Y3QgaTkxNV9od19w cGd0dCAqcHBndHQsCiAJaW50IHJldDsKIAogCXBkX2FkZHIgPSBwY2lfbWFwX3BhZ2UocHBndHQt PmJhc2UuZGV2LT5wZGV2LAotCQkJICAgICAgICZwcGd0dC0+cGRfcGFnZXNbcGRdLCAwLAorCQkJ ICAgICAgIHBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbcGRdLnBhZ2UsIDAsCiAJCQkgICAgICAg UEFHRV9TSVpFLCBQQ0lfRE1BX0JJRElSRUNUSU9OQUwpOwogCiAJcmV0ID0gcGNpX2RtYV9tYXBw aW5nX2Vycm9yKHBwZ3R0LT5iYXNlLmRldi0+cGRldiwgcGRfYWRkcik7CkBAIC01OTcsNyArNTk5 LDcgQEAgc3RhdGljIGludCBnZW44X3BwZ3R0X3NldHVwX3BhZ2VfdGFibGVzKHN0cnVjdCBpOTE1 X2h3X3BwZ3R0ICpwcGd0dCwKIAlzdHJ1Y3QgcGFnZSAqcDsKIAlpbnQgcmV0OwogCi0JcCA9IHBw Z3R0LT5nZW44X3B0X3BhZ2VzW3BkXVtwdF07CisJcCA9IHBwZ3R0LT5wZHAucGFnZV9kaXJlY3Rv cnlbcGRdLnBhZ2VfdGFibGVzW3B0XS5wYWdlOwogCXB0X2FkZHIgPSBwY2lfbWFwX3BhZ2UocHBn dHQtPmJhc2UuZGV2LT5wZGV2LAogCQkJICAgICAgIHAsIDAsIFBBR0VfU0laRSwgUENJX0RNQV9C SURJUkVDVElPTkFMKTsKIAlyZXQgPSBwY2lfZG1hX21hcHBpbmdfZXJyb3IocHBndHQtPmJhc2Uu ZGV2LT5wZGV2LCBwdF9hZGRyKTsKQEAgLTY1OCw3ICs2NjAsNyBAQCBzdGF0aWMgaW50IGdlbjhf cHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsIHVpbnQ2NF90IHNpemUpCiAJ ICovCiAJZm9yIChpID0gMDsgaSA8IG1heF9wZHA7IGkrKykgewogCQlnZW44X3BwZ3R0X3BkZV90 ICpwZF92YWRkcjsKLQkJcGRfdmFkZHIgPSBrbWFwX2F0b21pYygmcHBndHQtPnBkX3BhZ2VzW2ld KTsKKwkJcGRfdmFkZHIgPSBrbWFwX2F0b21pYyhwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W2ld LnBhZ2UpOwogCQlmb3IgKGogPSAwOyBqIDwgR0VOOF9QREVTX1BFUl9QQUdFOyBqKyspIHsKIAkJ CWRtYV9hZGRyX3QgYWRkciA9IHBwZ3R0LT5nZW44X3B0X2RtYV9hZGRyW2ldW2pdOwogCQkJcGRf dmFkZHJbal0gPSBnZW44X3BkZV9lbmNvZGUocHBndHQtPmJhc2UuZGV2LCBhZGRyLApAQCAtNzIx LDcgKzcyMyw3IEBAIHN0YXRpYyB2b2lkIGdlbjZfZHVtcF9wcGd0dChzdHJ1Y3QgaTkxNV9od19w cGd0dCAqcHBndHQsIHN0cnVjdCBzZXFfZmlsZSAqbSkKIAkJCQkgICBleHBlY3RlZCk7CiAJCXNl cV9wcmludGYobSwgIlx0UERFOiAleFxuIiwgcGRfZW50cnkpOwogCi0JCXB0X3ZhZGRyID0ga21h cF9hdG9taWMocHBndHQtPnB0X3BhZ2VzW3BkZV0pOworCQlwdF92YWRkciA9IGttYXBfYXRvbWlj KHBwZ3R0LT5wZC5wYWdlX3RhYmxlc1twZGVdLnBhZ2UpOwogCQlmb3IgKHB0ZSA9IDA7IHB0ZSA8 IEk5MTVfUFBHVFRfUFRfRU5UUklFUzsgcHRlKz00KSB7CiAJCQl1bnNpZ25lZCBsb25nIHZhID0K IAkJCQkocGRlICogUEFHRV9TSVpFICogSTkxNV9QUEdUVF9QVF9FTlRSSUVTKSArCkBAIC05MzYs NyArOTM4LDcgQEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9jbGVhcl9yYW5nZShzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJaWYgKGxhc3RfcHRlID4gSTkxNV9QUEdUVF9QVF9FTlRS SUVTKQogCQkJbGFzdF9wdGUgPSBJOTE1X1BQR1RUX1BUX0VOVFJJRVM7CiAKLQkJcHRfdmFkZHIg PSBrbWFwX2F0b21pYyhwcGd0dC0+cHRfcGFnZXNbYWN0X3B0XSk7CisJCXB0X3ZhZGRyID0ga21h cF9hdG9taWMocHBndHQtPnBkLnBhZ2VfdGFibGVzW2FjdF9wdF0ucGFnZSk7CiAKIAkJZm9yIChp ID0gZmlyc3RfcHRlOyBpIDwgbGFzdF9wdGU7IGkrKykKIAkJCXB0X3ZhZGRyW2ldID0gc2NyYXRj aF9wdGU7CkBAIC05NjUsNyArOTY3LDcgQEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9pbnNlcnRf ZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAlwdF92YWRkciA9IE5VTEw7 CiAJZm9yX2VhY2hfc2dfcGFnZShwYWdlcy0+c2dsLCAmc2dfaXRlciwgcGFnZXMtPm5lbnRzLCAw KSB7CiAJCWlmIChwdF92YWRkciA9PSBOVUxMKQotCQkJcHRfdmFkZHIgPSBrbWFwX2F0b21pYyhw cGd0dC0+cHRfcGFnZXNbYWN0X3B0XSk7CisJCQlwdF92YWRkciA9IGttYXBfYXRvbWljKHBwZ3R0 LT5wZC5wYWdlX3RhYmxlc1thY3RfcHRdLnBhZ2UpOwogCiAJCXB0X3ZhZGRyW2FjdF9wdGVdID0K IAkJCXZtLT5wdGVfZW5jb2RlKHNnX3BhZ2VfaXRlcl9kbWFfYWRkcmVzcygmc2dfaXRlciksCkBA IC0xMDAwLDggKzEwMDIsOSBAQCBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0X2ZyZWUoc3RydWN0IGk5 MTVfaHdfcHBndHQgKnBwZ3R0KQogCiAJa2ZyZWUocHBndHQtPnB0X2RtYV9hZGRyKTsKIAlmb3Ig KGkgPSAwOyBpIDwgcHBndHQtPm51bV9wZF9lbnRyaWVzOyBpKyspCi0JCV9fZnJlZV9wYWdlKHBw Z3R0LT5wdF9wYWdlc1tpXSk7Ci0Ja2ZyZWUocHBndHQtPnB0X3BhZ2VzKTsKKwkJaWYgKHBwZ3R0 LT5wZC5wYWdlX3RhYmxlc1tpXS5wYWdlKQorCQkJX19mcmVlX3BhZ2UocHBndHQtPnBkLnBhZ2Vf dGFibGVzW2ldLnBhZ2UpOworCWtmcmVlKHBwZ3R0LT5wZC5wYWdlX3RhYmxlcyk7CiB9CiAKIHN0 YXRpYyB2b2lkIGdlbjZfcHBndHRfY2xlYW51cChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2 bSkKQEAgLTEwNTgsMTcgKzEwNjEsMTggQEAgYWxsb2M6CiAKIHN0YXRpYyBpbnQgZ2VuNl9wcGd0 dF9hbGxvY2F0ZV9wYWdlX3RhYmxlcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiB7CisJ c3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQ7CiAJaW50IGk7CiAKLQlwcGd0dC0+cHRf cGFnZXMgPSBrY2FsbG9jKHBwZ3R0LT5udW1fcGRfZW50cmllcywgc2l6ZW9mKHN0cnVjdCBwYWdl ICopLAotCQkJCSAgR0ZQX0tFUk5FTCk7Ci0KLQlpZiAoIXBwZ3R0LT5wdF9wYWdlcykKKwlwdCA9 IGtjYWxsb2MocHBndHQtPm51bV9wZF9lbnRyaWVzLCBzaXplb2YoKnB0KSwgR0ZQX0tFUk5FTCk7 CisJaWYgKCFwdCkKIAkJcmV0dXJuIC1FTk9NRU07CiAKKwlwcGd0dC0+cGQucGFnZV90YWJsZXMg PSBwdDsKKwogCWZvciAoaSA9IDA7IGkgPCBwcGd0dC0+bnVtX3BkX2VudHJpZXM7IGkrKykgewot CQlwcGd0dC0+cHRfcGFnZXNbaV0gPSBhbGxvY19wYWdlKEdGUF9LRVJORUwpOwotCQlpZiAoIXBw Z3R0LT5wdF9wYWdlc1tpXSkgeworCQlwdFtpXS5wYWdlID0gYWxsb2NfcGFnZShHRlBfS0VSTkVM KTsKKwkJaWYgKCFwdC0+cGFnZSkgewogCQkJZ2VuNl9wcGd0dF9mcmVlKHBwZ3R0KTsKIAkJCXJl dHVybiAtRU5PTUVNOwogCQl9CkBAIC0xMTA4LDkgKzExMTIsMTEgQEAgc3RhdGljIGludCBnZW42 X3BwZ3R0X3NldHVwX3BhZ2VfdGFibGVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAlp bnQgaTsKIAogCWZvciAoaSA9IDA7IGkgPCBwcGd0dC0+bnVtX3BkX2VudHJpZXM7IGkrKykgewor CQlzdHJ1Y3QgcGFnZSAqcGFnZTsKIAkJZG1hX2FkZHJfdCBwdF9hZGRyOwogCi0JCXB0X2FkZHIg PSBwY2lfbWFwX3BhZ2UoZGV2LT5wZGV2LCBwcGd0dC0+cHRfcGFnZXNbaV0sIDAsIDQwOTYsCisJ CXBhZ2UgPSBwcGd0dC0+cGQucGFnZV90YWJsZXNbaV0ucGFnZTsKKwkJcHRfYWRkciA9IHBjaV9t YXBfcGFnZShkZXYtPnBkZXYsIHBhZ2UsIDAsIDQwOTYsCiAJCQkJICAgICAgIFBDSV9ETUFfQklE SVJFQ1RJT05BTCk7CiAKIAkJaWYgKHBjaV9kbWFfbWFwcGluZ19lcnJvcihkZXYtPnBkZXYsIHB0 X2FkZHIpKSB7CkBAIC0xMTU3LDcgKzExNjMsNyBAQCBzdGF0aWMgaW50IGdlbjZfcHBndHRfaW5p dChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJcHBndHQtPmJhc2UuaW5zZXJ0X2VudHJp ZXMgPSBnZW42X3BwZ3R0X2luc2VydF9lbnRyaWVzOwogCXBwZ3R0LT5iYXNlLmNsZWFudXAgPSBn ZW42X3BwZ3R0X2NsZWFudXA7CiAJcHBndHQtPmJhc2Uuc3RhcnQgPSAwOwotCXBwZ3R0LT5iYXNl LnRvdGFsID0gIHBwZ3R0LT5udW1fcGRfZW50cmllcyAqIEk5MTVfUFBHVFRfUFRfRU5UUklFUyAq IFBBR0VfU0laRTsKKwlwcGd0dC0+YmFzZS50b3RhbCA9IHBwZ3R0LT5udW1fcGRfZW50cmllcyAq IEk5MTVfUFBHVFRfUFRfRU5UUklFUyAqIFBBR0VfU0laRTsKIAlwcGd0dC0+ZGVidWdfZHVtcCA9 IGdlbjZfZHVtcF9wcGd0dDsKIAogCXBwZ3R0LT5wZF9vZmZzZXQgPQpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuaAppbmRleCA4Zjc2OTkwLi5kOWJjMzc1IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuaApAQCAtMTg3LDYgKzE4NywyMCBAQCBzdHJ1Y3QgaTkxNV92bWEgewogCQkJ IHUzMiBmbGFncyk7CiB9OwogCitzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5IHsKKwlzdHJ1 Y3QgcGFnZSAqcGFnZTsKK307CisKK3N0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5IHsK KwlzdHJ1Y3QgcGFnZSAqcGFnZTsgLyogTlVMTCBmb3IgR0VONi1HRU43ICovCisJc3RydWN0IGk5 MTVfcGFnZV90YWJsZV9lbnRyeSAqcGFnZV90YWJsZXM7Cit9OworCitzdHJ1Y3QgaTkxNV9wYWdl X2RpcmVjdG9yeV9wb2ludGVyX2VudHJ5IHsKKwkvKiBzdHJ1Y3QgcGFnZSAqcGFnZTsgKi8KKwlz dHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSBwYWdlX2RpcmVjdG9yeVtHRU44X0xFR0FD WV9QRFBFU107Cit9OworCiBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlIHsKIAlzdHJ1Y3QgZHJt X21tIG1tOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXY7CkBAIC0yNzIsMTEgKzI4Niw2IEBAIHN0 cnVjdCBpOTE1X2h3X3BwZ3R0IHsKIAl1bnNpZ25lZCBudW1fcGRfZW50cmllczsKIAl1bnNpZ25l ZCBudW1fcGRfcGFnZXM7IC8qIGdlbjgrICovCiAJdW5pb24gewotCQlzdHJ1Y3QgcGFnZSAqKnB0 X3BhZ2VzOwotCQlzdHJ1Y3QgcGFnZSAqKmdlbjhfcHRfcGFnZXNbR0VOOF9MRUdBQ1lfUERQRVNd OwotCX07Ci0Jc3RydWN0IHBhZ2UgKnBkX3BhZ2VzOwotCXVuaW9uIHsKIAkJdWludDMyX3QgcGRf b2Zmc2V0OwogCQlkbWFfYWRkcl90IHBkX2RtYV9hZGRyW0dFTjhfTEVHQUNZX1BEUEVTXTsKIAl9 OwpAQCAtMjg0LDYgKzI5MywxMCBAQCBzdHJ1Y3QgaTkxNV9od19wcGd0dCB7CiAJCWRtYV9hZGRy X3QgKnB0X2RtYV9hZGRyOwogCQlkbWFfYWRkcl90ICpnZW44X3B0X2RtYV9hZGRyW0dFTjhfTEVH QUNZX1BEUEVTXTsKIAl9OworCXVuaW9uIHsKKwkJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3Rvcnlf cG9pbnRlcl9lbnRyeSBwZHA7CisJCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5IHBk OworCX07CiAKIAlzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlICpmaWxlX3ByaXY7CiAKLS0g CjIuMS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=