From: Michel Thierry Subject: [PATCH v2 07/24] drm/i915: page table abstractions Date: Tue, 23 Dec 2014 17:16:10 +0000 Message-ID: <1419354987-4622-8-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1419354987-4622-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 4A2296E3A6 for ; Tue, 23 Dec 2014 09:16:18 -0800 (PST) In-Reply-To: <1419354987-4622-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 IG1vdmUgdG8gZHluYW1pYyBwYWdlIGFsbG9jYXRpb24sIGtlZXBpbmcgcGFnZWRpciBhbmQgcGFn ZXRhYnMgYXMKc2VwYXJhdGUgc3RydWN0dXJlcyB3aWxsIGhlbHAgdG8gYnJlYWsgYWN0aW9ucyBp bnRvIHNpbXBsZXIgdGFza3MuCgpUbyBoZWxwIHRyYW5zaXRpb24gdGhlIGNvZGUgbmljZWx5IHRo ZXJlIGlzIHNvbWUgd2FzdGVkIHNwYWNlIGluIGdlbjYvNy4KVGhpcyB3aWxsIGJlIGFtZWxpb3Jh dGVkIHNob3J0bHkuCgp2MjogZml4ZWQgbWlzbWF0Y2hlcyBhZnRlciBjbGVhbi11cC9yZWJhc2Uu CgpTaWduZWQtb2ZmLWJ5OiBCZW4gV2lkYXdza3kgPGJlbkBid2lkYXdzay5uZXQ+ClNpZ25lZC1v ZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+ICh2MikKLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDE3NyArKysrKysrKysrKysr KysrKystLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5oIHwgIDIzICsrKystCiAyIGZpbGVzIGNoYW5nZWQsIDEwNyBpbnNlcnRpb25zKCspLCA5MyBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IDBmNmExOTYu LjY5MDI0NjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0zMzQsNyArMzM0 LDggQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9jbGVhcl9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRy ZXNzX3NwYWNlICp2bSwKIAkJCQkgICAgICBJOTE1X0NBQ0hFX0xMQywgdXNlX3NjcmF0Y2gpOwog CiAJd2hpbGUgKG51bV9lbnRyaWVzKSB7Ci0JCXN0cnVjdCBwYWdlICpwYWdlX3RhYmxlID0gcHBn dHQtPmdlbjhfcHRfcGFnZXNbcGRwZV1bcGRlXTsKKwkJc3RydWN0IGk5MTVfcGFnZWRpciAqcGQg PSAmcHBndHQtPnBkcC5wYWdlZGlyW3BkcGVdOworCQlzdHJ1Y3QgcGFnZSAqcGFnZV90YWJsZSA9 IHBkLT5wYWdlX3RhYmxlc1twZGVdLnBhZ2U7CiAKIAkJbGFzdF9wdGUgPSBwdGUgKyBudW1fZW50 cmllczsKIAkJaWYgKGxhc3RfcHRlID4gR0VOOF9QVEVTX1BFUl9QQUdFKQpAQCAtMzc4LDggKzM3 OSwxMiBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1 X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQlpZiAoV0FSTl9PTihwZHBlID49IEdFTjhfTEVHQUNZX1BE UEVTKSkKIAkJCWJyZWFrOwogCi0JCWlmIChwdF92YWRkciA9PSBOVUxMKQotCQkJcHRfdmFkZHIg PSBrbWFwX2F0b21pYyhwcGd0dC0+Z2VuOF9wdF9wYWdlc1twZHBlXVtwZGVdKTsKKwkJaWYgKHB0 X3ZhZGRyID09IE5VTEwpIHsKKwkJCXN0cnVjdCBpOTE1X3BhZ2VkaXIgKnBkID0gJnBwZ3R0LT5w ZHAucGFnZWRpcltwZHBlXTsKKwkJCXN0cnVjdCBwYWdlICpwYWdlX3RhYmxlID0gcGQtPnBhZ2Vf dGFibGVzW3BkZV0ucGFnZTsKKworCQkJcHRfdmFkZHIgPSBrbWFwX2F0b21pYyhwYWdlX3RhYmxl KTsKKwkJfQogCiAJCXB0X3ZhZGRyW3B0ZV0gPQogCQkJZ2VuOF9wdGVfZW5jb2RlKHNnX3BhZ2Vf aXRlcl9kbWFfYWRkcmVzcygmc2dfaXRlciksCkBAIC00MDMsMjkgKzQwOCwzMyBAQCBzdGF0aWMg dm9pZCBnZW44X3BwZ3R0X2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2Ug KnZtLAogCX0KIH0KIAotc3RhdGljIHZvaWQgZ2VuOF9mcmVlX3BhZ2VfdGFibGVzKHN0cnVjdCBw YWdlICoqcHRfcGFnZXMpCitzdGF0aWMgdm9pZCBnZW44X2ZyZWVfcGFnZV90YWJsZXMoc3RydWN0 IGk5MTVfcGFnZWRpciAqcGQpCiB7CiAJaW50IGk7CiAKLQlpZiAocHRfcGFnZXMgPT0gTlVMTCkK KwlpZiAocGQtPnBhZ2VfdGFibGVzID09IE5VTEwpCiAJCXJldHVybjsKIAogCWZvciAoaSA9IDA7 IGkgPCBHRU44X1BERVNfUEVSX1BBR0U7IGkrKykKLQkJaWYgKHB0X3BhZ2VzW2ldKQotCQkJX19m cmVlX3BhZ2VzKHB0X3BhZ2VzW2ldLCAwKTsKKwkJaWYgKHBkLT5wYWdlX3RhYmxlc1tpXS5wYWdl KQorCQkJX19mcmVlX3BhZ2UocGQtPnBhZ2VfdGFibGVzW2ldLnBhZ2UpOwogfQogCi1zdGF0aWMg dm9pZCBnZW44X3BwZ3R0X2ZyZWUoY29uc3Qgc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQor c3RhdGljIHZvaWQgZ2VuOF9mcmVlX3BhZ2VfZGlyZWN0b3JpZXMoc3RydWN0IGk5MTVfcGFnZWRp ciAqcGQpCit7CisJa2ZyZWUocGQtPnBhZ2VfdGFibGVzKTsKKwlfX2ZyZWVfcGFnZShwZC0+cGFn ZSk7Cit9CisKK3N0YXRpYyB2b2lkIGdlbjhfcHBndHRfZnJlZShzdHJ1Y3QgaTkxNV9od19wcGd0 dCAqcHBndHQpCiB7CiAJaW50IGk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgcHBndHQtPm51bV9wZF9w YWdlczsgaSsrKSB7Ci0JCWdlbjhfZnJlZV9wYWdlX3RhYmxlcyhwcGd0dC0+Z2VuOF9wdF9wYWdl c1tpXSk7Ci0JCWtmcmVlKHBwZ3R0LT5nZW44X3B0X3BhZ2VzW2ldKTsKKwkJZ2VuOF9mcmVlX3Bh Z2VfdGFibGVzKCZwcGd0dC0+cGRwLnBhZ2VkaXJbaV0pOworCQlnZW44X2ZyZWVfcGFnZV9kaXJl Y3RvcmllcygmcHBndHQtPnBkcC5wYWdlZGlyW2ldKTsKIAkJa2ZyZWUocHBndHQtPmdlbjhfcHRf ZG1hX2FkZHJbaV0pOwogCX0KLQotCV9fZnJlZV9wYWdlcyhwcGd0dC0+cGRfcGFnZXMsIGdldF9v cmRlcihwcGd0dC0+bnVtX3BkX3BhZ2VzIDw8IFBBR0VfU0hJRlQpKTsKIH0KIAogc3RhdGljIHZv aWQgZ2VuOF9wcGd0dF91bm1hcF9wYWdlcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCkBA IC00NjAsODYgKzQ2OSw3NSBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2NsZWFudXAoc3RydWN0 IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0pCiAJZ2VuOF9wcGd0dF9mcmVlKHBwZ3R0KTsKIH0KIAot c3RhdGljIHN0cnVjdCBwYWdlICoqX19nZW44X2FsbG9jX3BhZ2VfdGFibGVzKHZvaWQpCitzdGF0 aWMgaW50IGdlbjhfcHBndHRfYWxsb2NhdGVfZG1hKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0 dCkKIHsKLQlzdHJ1Y3QgcGFnZSAqKnB0X3BhZ2VzOwogCWludCBpOwogCi0JcHRfcGFnZXMgPSBr Y2FsbG9jKEdFTjhfUERFU19QRVJfUEFHRSwgc2l6ZW9mKHN0cnVjdCBwYWdlICopLCBHRlBfS0VS TkVMKTsKLQlpZiAoIXB0X3BhZ2VzKQotCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKLQotCWZv ciAoaSA9IDA7IGkgPCBHRU44X1BERVNfUEVSX1BBR0U7IGkrKykgewotCQlwdF9wYWdlc1tpXSA9 IGFsbG9jX3BhZ2UoR0ZQX0tFUk5FTCk7Ci0JCWlmICghcHRfcGFnZXNbaV0pCi0JCQlnb3RvIGJh aWw7CisJZm9yIChpID0gMDsgaSA8IHBwZ3R0LT5udW1fcGRfcGFnZXM7IGkrKykgeworCQlwcGd0 dC0+Z2VuOF9wdF9kbWFfYWRkcltpXSA9IGtjYWxsb2MoR0VOOF9QREVTX1BFUl9QQUdFLAorCQkJ CQkJICAgICBzaXplb2YoZG1hX2FkZHJfdCksCisJCQkJCQkgICAgIEdGUF9LRVJORUwpOworCQlp ZiAoIXBwZ3R0LT5nZW44X3B0X2RtYV9hZGRyW2ldKQorCQkJcmV0dXJuIC1FTk9NRU07CiAJfQog Ci0JcmV0dXJuIHB0X3BhZ2VzOwotCi1iYWlsOgotCWdlbjhfZnJlZV9wYWdlX3RhYmxlcyhwdF9w YWdlcyk7Ci0Ja2ZyZWUocHRfcGFnZXMpOwotCXJldHVybiBFUlJfUFRSKC1FTk9NRU0pOworCXJl dHVybiAwOwogfQogCi1zdGF0aWMgaW50IGdlbjhfcHBndHRfYWxsb2NhdGVfcGFnZV90YWJsZXMo c3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAotCQkJCQkgICBjb25zdCBpbnQgbWF4X3BkcCkK K3N0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY2F0ZV9wYWdlX3RhYmxlcyhzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQpCiB7Ci0Jc3RydWN0IHBhZ2UgKipwdF9wYWdlc1tHRU44X0xFR0FDWV9Q RFBFU107Ci0JaW50IGksIHJldDsKKwlpbnQgaSwgajsKIAotCWZvciAoaSA9IDA7IGkgPCBtYXhf cGRwOyBpKyspIHsKLQkJcHRfcGFnZXNbaV0gPSBfX2dlbjhfYWxsb2NfcGFnZV90YWJsZXMoKTsK LQkJaWYgKElTX0VSUihwdF9wYWdlc1tpXSkpIHsKLQkJCXJldCA9IFBUUl9FUlIocHRfcGFnZXNb aV0pOwotCQkJZ290byB1bndpbmRfb3V0OworCWZvciAoaSA9IDA7IGkgPCBwcGd0dC0+bnVtX3Bk X3BhZ2VzOyBpKyspIHsKKwkJZm9yIChqID0gMDsgaiA8IEdFTjhfUERFU19QRVJfUEFHRTsgaisr KSB7CisJCQlzdHJ1Y3QgaTkxNV9wYWdldGFiICpwdCA9ICZwcGd0dC0+cGRwLnBhZ2VkaXJbaV0u cGFnZV90YWJsZXNbal07CisKKwkJCXB0LT5wYWdlID0gYWxsb2NfcGFnZShHRlBfS0VSTkVMIHwg X19HRlBfWkVSTyk7CisJCQlpZiAoIXB0LT5wYWdlKQorCQkJCWdvdG8gdW53aW5kX291dDsKIAkJ fQogCX0KIAotCS8qIE5COiBBdm9pZCB0b3VjaGluZyBnZW44X3B0X3BhZ2VzIHVudGlsIGxhc3Qg dG8ga2VlcCB0aGUgYWxsb2NhdGlvbiwKLQkgKiAiYXRvbWljIiAtIGZvciBjbGVhbnVwIHB1cnBv c2VzLgotCSAqLwotCWZvciAoaSA9IDA7IGkgPCBtYXhfcGRwOyBpKyspCi0JCXBwZ3R0LT5nZW44 X3B0X3BhZ2VzW2ldID0gcHRfcGFnZXNbaV07Ci0KIAlyZXR1cm4gMDsKIAogdW53aW5kX291dDoK LQl3aGlsZSAoaS0tKSB7Ci0JCWdlbjhfZnJlZV9wYWdlX3RhYmxlcyhwdF9wYWdlc1tpXSk7Ci0J CWtmcmVlKHB0X3BhZ2VzW2ldKTsKLQl9CisJd2hpbGUgKGktLSkKKwkJZ2VuOF9mcmVlX3BhZ2Vf dGFibGVzKCZwcGd0dC0+cGRwLnBhZ2VkaXJbaV0pOwogCi0JcmV0dXJuIHJldDsKKwlyZXR1cm4g LUVOT01FTTsKIH0KIAotc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9jYXRlX2RtYShzdHJ1Y3Qg aTkxNV9od19wcGd0dCAqcHBndHQpCitzdGF0aWMgaW50IGdlbjhfcHBndHRfYWxsb2NhdGVfcGFn ZV9kaXJlY3RvcmllcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCisJCQkJCQljb25zdCBp bnQgbWF4X3BkcCkKIHsKIAlpbnQgaTsKIAotCWZvciAoaSA9IDA7IGkgPCBwcGd0dC0+bnVtX3Bk X3BhZ2VzOyBpKyspIHsKLQkJcHBndHQtPmdlbjhfcHRfZG1hX2FkZHJbaV0gPSBrY2FsbG9jKEdF TjhfUERFU19QRVJfUEFHRSwKLQkJCQkJCSAgICAgc2l6ZW9mKGRtYV9hZGRyX3QpLAotCQkJCQkJ ICAgICBHRlBfS0VSTkVMKTsKLQkJaWYgKCFwcGd0dC0+Z2VuOF9wdF9kbWFfYWRkcltpXSkKLQkJ CXJldHVybiAtRU5PTUVNOwotCX0KKwlmb3IgKGkgPSAwOyBpIDwgbWF4X3BkcDsgaSsrKSB7CisJ CXN0cnVjdCBpOTE1X3BhZ2V0YWIgKnB0OwogCi0JcmV0dXJuIDA7Ci19CisJCXB0ID0ga2NhbGxv YyhHRU44X1BERVNfUEVSX1BBR0UsIHNpemVvZigqcHQpLCBHRlBfS0VSTkVMKTsKKwkJaWYgKCFw dCkKKwkJCWdvdG8gdW53aW5kX291dDsKIAotc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9jYXRl X3BhZ2VfZGlyZWN0b3JpZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAotCQkJCQkJY29u c3QgaW50IG1heF9wZHApCi17Ci0JcHBndHQtPnBkX3BhZ2VzID0gYWxsb2NfcGFnZXMoR0ZQX0tF Uk5FTCwgZ2V0X29yZGVyKG1heF9wZHAgPDwgUEFHRV9TSElGVCkpOwotCWlmICghcHBndHQtPnBk X3BhZ2VzKQotCQlyZXR1cm4gLUVOT01FTTsKKwkJcHBndHQtPnBkcC5wYWdlZGlyW2ldLnBhZ2Ug PSBhbGxvY19wYWdlKEdGUF9LRVJORUwpOworCQlpZiAoIXBwZ3R0LT5wZHAucGFnZWRpcltpXS5w YWdlKQorCQkJZ290byB1bndpbmRfb3V0OworCisJCXBwZ3R0LT5wZHAucGFnZWRpcltpXS5wYWdl X3RhYmxlcyA9IHB0OworCX0KIAotCXBwZ3R0LT5udW1fcGRfcGFnZXMgPSAxIDw8IGdldF9vcmRl cihtYXhfcGRwIDw8IFBBR0VfU0hJRlQpOworCXBwZ3R0LT5udW1fcGRfcGFnZXMgPSBtYXhfcGRw OwogCUJVR19PTihwcGd0dC0+bnVtX3BkX3BhZ2VzID4gR0VOOF9MRUdBQ1lfUERQRVMpOwogCiAJ cmV0dXJuIDA7CisKK3Vud2luZF9vdXQ6CisJd2hpbGUgKGktLSkgeworCQlrZnJlZShwcGd0dC0+ cGRwLnBhZ2VkaXJbaV0ucGFnZV90YWJsZXMpOworCQlfX2ZyZWVfcGFnZShwcGd0dC0+cGRwLnBh Z2VkaXJbaV0ucGFnZSk7CisJfQorCisJcmV0dXJuIC1FTk9NRU07CiB9CiAKIHN0YXRpYyBpbnQg Z2VuOF9wcGd0dF9hbGxvYyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCkBAIC01NTEsMTgg KzU0OSwxOSBAQCBzdGF0aWMgaW50IGdlbjhfcHBndHRfYWxsb2Moc3RydWN0IGk5MTVfaHdfcHBn dHQgKnBwZ3R0LAogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlyZXQgPSBnZW44X3BwZ3R0 X2FsbG9jYXRlX3BhZ2VfdGFibGVzKHBwZ3R0LCBtYXhfcGRwKTsKLQlpZiAocmV0KSB7Ci0JCV9f ZnJlZV9wYWdlcyhwcGd0dC0+cGRfcGFnZXMsIGdldF9vcmRlcihtYXhfcGRwIDw8IFBBR0VfU0hJ RlQpKTsKLQkJcmV0dXJuIHJldDsKLQl9CisJcmV0ID0gZ2VuOF9wcGd0dF9hbGxvY2F0ZV9wYWdl X3RhYmxlcyhwcGd0dCk7CisJaWYgKHJldCkKKwkJZ290byBlcnJfb3V0OwogCiAJcHBndHQtPm51 bV9wZF9lbnRyaWVzID0gbWF4X3BkcCAqIEdFTjhfUERFU19QRVJfUEFHRTsKIAogCXJldCA9IGdl bjhfcHBndHRfYWxsb2NhdGVfZG1hKHBwZ3R0KTsKLQlpZiAocmV0KQotCQlnZW44X3BwZ3R0X2Zy ZWUocHBndHQpOworCWlmICghcmV0KQorCQlyZXR1cm4gcmV0OwogCisJLyogVE9ETzogQ2hlY2sg dGhpcyBmb3IgYWxsIGNhc2VzICovCitlcnJfb3V0OgorCWdlbjhfcHBndHRfZnJlZShwcGd0dCk7 CiAJcmV0dXJuIHJldDsKIH0KIApAQCAtNTczLDcgKzU3Miw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9w cGd0dF9zZXR1cF9wYWdlX2RpcmVjdG9yaWVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwK IAlpbnQgcmV0OwogCiAJcGRfYWRkciA9IHBjaV9tYXBfcGFnZShwcGd0dC0+YmFzZS5kZXYtPnBk ZXYsCi0JCQkgICAgICAgJnBwZ3R0LT5wZF9wYWdlc1twZF0sIDAsCisJCQkgICAgICAgcHBndHQt PnBkcC5wYWdlZGlyW3BkXS5wYWdlLCAwLAogCQkJICAgICAgIFBBR0VfU0laRSwgUENJX0RNQV9C SURJUkVDVElPTkFMKTsKIAogCXJldCA9IHBjaV9kbWFfbWFwcGluZ19lcnJvcihwcGd0dC0+YmFz ZS5kZXYtPnBkZXYsIHBkX2FkZHIpOwpAQCAtNTkzLDcgKzU5Miw3IEBAIHN0YXRpYyBpbnQgZ2Vu OF9wcGd0dF9zZXR1cF9wYWdlX3RhYmxlcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCiAJ c3RydWN0IHBhZ2UgKnA7CiAJaW50IHJldDsKIAotCXAgPSBwcGd0dC0+Z2VuOF9wdF9wYWdlc1tw ZF1bcHRdOworCXAgPSBwcGd0dC0+cGRwLnBhZ2VkaXJbcGRdLnBhZ2VfdGFibGVzW3B0XS5wYWdl OwogCXB0X2FkZHIgPSBwY2lfbWFwX3BhZ2UocHBndHQtPmJhc2UuZGV2LT5wZGV2LAogCQkJICAg ICAgIHAsIDAsIFBBR0VfU0laRSwgUENJX0RNQV9CSURJUkVDVElPTkFMKTsKIAlyZXQgPSBwY2lf ZG1hX21hcHBpbmdfZXJyb3IocHBndHQtPmJhc2UuZGV2LT5wZGV2LCBwdF9hZGRyKTsKQEAgLTY1 NCw3ICs2NTMsNyBAQCBzdGF0aWMgaW50IGdlbjhfcHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9od19w cGd0dCAqcHBndHQsIHVpbnQ2NF90IHNpemUpCiAJICovCiAJZm9yIChpID0gMDsgaSA8IG1heF9w ZHA7IGkrKykgewogCQlnZW44X3BwZ3R0X3BkZV90ICpwZF92YWRkcjsKLQkJcGRfdmFkZHIgPSBr bWFwX2F0b21pYygmcHBndHQtPnBkX3BhZ2VzW2ldKTsKKwkJcGRfdmFkZHIgPSBrbWFwX2F0b21p YyhwcGd0dC0+cGRwLnBhZ2VkaXJbaV0ucGFnZSk7CiAJCWZvciAoaiA9IDA7IGogPCBHRU44X1BE RVNfUEVSX1BBR0U7IGorKykgewogCQkJZG1hX2FkZHJfdCBhZGRyID0gcHBndHQtPmdlbjhfcHRf ZG1hX2FkZHJbaV1bal07CiAJCQlwZF92YWRkcltqXSA9IGdlbjhfcGRlX2VuY29kZShwcGd0dC0+ YmFzZS5kZXYsIGFkZHIsCkBAIC03MTUsNyArNzE0LDcgQEAgc3RhdGljIHZvaWQgZ2VuNl9kdW1w X3BwZ3R0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgc3RydWN0IHNlcV9maWxlICptKQog CQkJCSAgIGV4cGVjdGVkKTsKIAkJc2VxX3ByaW50ZihtLCAiXHRQREU6ICV4XG4iLCBwZF9lbnRy eSk7CiAKLQkJcHRfdmFkZHIgPSBrbWFwX2F0b21pYyhwcGd0dC0+cHRfcGFnZXNbcGRlXSk7CisJ CXB0X3ZhZGRyID0ga21hcF9hdG9taWMocHBndHQtPnBkLnBhZ2VfdGFibGVzW3BkZV0ucGFnZSk7 CiAJCWZvciAocHRlID0gMDsgcHRlIDwgSTkxNV9QUEdUVF9QVF9FTlRSSUVTOyBwdGUrPTQpIHsK IAkJCXVuc2lnbmVkIGxvbmcgdmEgPQogCQkJCShwZGUgKiBQQUdFX1NJWkUgKiBJOTE1X1BQR1RU X1BUX0VOVFJJRVMpICsKQEAgLTkyMCw3ICs5MTksNyBAQCBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0 X2NsZWFyX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQlpZiAobGFzdF9w dGUgPiBJOTE1X1BQR1RUX1BUX0VOVFJJRVMpCiAJCQlsYXN0X3B0ZSA9IEk5MTVfUFBHVFRfUFRf RU5UUklFUzsKIAotCQlwdF92YWRkciA9IGttYXBfYXRvbWljKHBwZ3R0LT5wdF9wYWdlc1thY3Rf cHRdKTsKKwkJcHRfdmFkZHIgPSBrbWFwX2F0b21pYyhwcGd0dC0+cGQucGFnZV90YWJsZXNbYWN0 X3B0XS5wYWdlKTsKIAogCQlmb3IgKGkgPSBmaXJzdF9wdGU7IGkgPCBsYXN0X3B0ZTsgaSsrKQog CQkJcHRfdmFkZHJbaV0gPSBzY3JhdGNoX3B0ZTsKQEAgLTk0OSw3ICs5NDgsNyBAQCBzdGF0aWMg dm9pZCBnZW42X3BwZ3R0X2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2Ug KnZtLAogCXB0X3ZhZGRyID0gTlVMTDsKIAlmb3JfZWFjaF9zZ19wYWdlKHBhZ2VzLT5zZ2wsICZz Z19pdGVyLCBwYWdlcy0+bmVudHMsIDApIHsKIAkJaWYgKHB0X3ZhZGRyID09IE5VTEwpCi0JCQlw dF92YWRkciA9IGttYXBfYXRvbWljKHBwZ3R0LT5wdF9wYWdlc1thY3RfcHRdKTsKKwkJCXB0X3Zh ZGRyID0ga21hcF9hdG9taWMocHBndHQtPnBkLnBhZ2VfdGFibGVzW2FjdF9wdF0ucGFnZSk7CiAK IAkJcHRfdmFkZHJbYWN0X3B0ZV0gPQogCQkJdm0tPnB0ZV9lbmNvZGUoc2dfcGFnZV9pdGVyX2Rt YV9hZGRyZXNzKCZzZ19pdGVyKSwKQEAgLTk4NCw4ICs5ODMsOCBAQCBzdGF0aWMgdm9pZCBnZW42 X3BwZ3R0X2ZyZWUoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogCiAJa2ZyZWUocHBndHQt PnB0X2RtYV9hZGRyKTsKIAlmb3IgKGkgPSAwOyBpIDwgcHBndHQtPm51bV9wZF9lbnRyaWVzOyBp KyspCi0JCV9fZnJlZV9wYWdlKHBwZ3R0LT5wdF9wYWdlc1tpXSk7Ci0Ja2ZyZWUocHBndHQtPnB0 X3BhZ2VzKTsKKwkJX19mcmVlX3BhZ2UocHBndHQtPnBkLnBhZ2VfdGFibGVzW2ldLnBhZ2UpOwor CWtmcmVlKHBwZ3R0LT5wZC5wYWdlX3RhYmxlcyk7CiB9CiAKIHN0YXRpYyB2b2lkIGdlbjZfcHBn dHRfY2xlYW51cChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkKQEAgLTEwNDIsMjIgKzEw NDEsMjIgQEAgYWxsb2M6CiAKIHN0YXRpYyBpbnQgZ2VuNl9wcGd0dF9hbGxvY2F0ZV9wYWdlX3Rh YmxlcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiB7CisJc3RydWN0IGk5MTVfcGFnZXRh YiAqcHQ7CiAJaW50IGk7CiAKLQlwcGd0dC0+cHRfcGFnZXMgPSBrY2FsbG9jKHBwZ3R0LT5udW1f cGRfZW50cmllcywgc2l6ZW9mKHN0cnVjdCBwYWdlICopLAotCQkJCSAgR0ZQX0tFUk5FTCk7Ci0K LQlpZiAoIXBwZ3R0LT5wdF9wYWdlcykKKwlwdCA9IGtjYWxsb2MocHBndHQtPm51bV9wZF9lbnRy aWVzLCBzaXplb2YoKnB0KSwgR0ZQX0tFUk5FTCk7CisJaWYgKCFwdCkKIAkJcmV0dXJuIC1FTk9N RU07CiAKIAlmb3IgKGkgPSAwOyBpIDwgcHBndHQtPm51bV9wZF9lbnRyaWVzOyBpKyspIHsKLQkJ cHBndHQtPnB0X3BhZ2VzW2ldID0gYWxsb2NfcGFnZShHRlBfS0VSTkVMKTsKLQkJaWYgKCFwcGd0 dC0+cHRfcGFnZXNbaV0pIHsKKwkJcHRbaV0ucGFnZSA9IGFsbG9jX3BhZ2UoR0ZQX0tFUk5FTCk7 CisJCWlmICghcHQtPnBhZ2UpIHsKIAkJCWdlbjZfcHBndHRfZnJlZShwcGd0dCk7CiAJCQlyZXR1 cm4gLUVOT01FTTsKIAkJfQogCX0KIAorCXBwZ3R0LT5wZC5wYWdlX3RhYmxlcyA9IHB0OwogCXJl dHVybiAwOwogfQogCkBAIC0xMDkyLDkgKzEwOTEsMTEgQEAgc3RhdGljIGludCBnZW42X3BwZ3R0 X3NldHVwX3BhZ2VfdGFibGVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAlpbnQgaTsK IAogCWZvciAoaSA9IDA7IGkgPCBwcGd0dC0+bnVtX3BkX2VudHJpZXM7IGkrKykgeworCQlzdHJ1 Y3QgcGFnZSAqcGFnZTsKIAkJZG1hX2FkZHJfdCBwdF9hZGRyOwogCi0JCXB0X2FkZHIgPSBwY2lf bWFwX3BhZ2UoZGV2LT5wZGV2LCBwcGd0dC0+cHRfcGFnZXNbaV0sIDAsIDQwOTYsCisJCXBhZ2Ug PSBwcGd0dC0+cGQucGFnZV90YWJsZXNbaV0ucGFnZTsKKwkJcHRfYWRkciA9IHBjaV9tYXBfcGFn ZShkZXYtPnBkZXYsIHBhZ2UsIDAsIDQwOTYsCiAJCQkJICAgICAgIFBDSV9ETUFfQklESVJFQ1RJ T05BTCk7CiAKIAkJaWYgKHBjaV9kbWFfbWFwcGluZ19lcnJvcihkZXYtPnBkZXYsIHB0X2FkZHIp KSB7CkBAIC0xMTM4LDcgKzExMzksNyBAQCBzdGF0aWMgaW50IGdlbjZfcHBndHRfaW5pdChzdHJ1 Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJcHBndHQtPmJhc2UuaW5zZXJ0X2VudHJpZXMgPSBn ZW42X3BwZ3R0X2luc2VydF9lbnRyaWVzOwogCXBwZ3R0LT5iYXNlLmNsZWFudXAgPSBnZW42X3Bw Z3R0X2NsZWFudXA7CiAJcHBndHQtPmJhc2Uuc3RhcnQgPSAwOwotCXBwZ3R0LT5iYXNlLnRvdGFs ID0gIHBwZ3R0LT5udW1fcGRfZW50cmllcyAqIEk5MTVfUFBHVFRfUFRfRU5UUklFUyAqIFBBR0Vf U0laRTsKKwlwcGd0dC0+YmFzZS50b3RhbCA9IHBwZ3R0LT5udW1fcGRfZW50cmllcyAqIEk5MTVf UFBHVFRfUFRfRU5UUklFUyAqIFBBR0VfU0laRTsKIAlwcGd0dC0+ZGVidWdfZHVtcCA9IGdlbjZf ZHVtcF9wcGd0dDsKIAogCXBwZ3R0LT5wZF9vZmZzZXQgPQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ndHQuaAppbmRleCA4Zjc2OTkwLi4xZmYzYzA1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ndHQuaApAQCAtMjY1LDYgKzI2NSwyMCBAQCBzdHJ1Y3QgaTkxNV9ndHQgewogCQkJICB1bnNp Z25lZCBsb25nICptYXBwYWJsZV9lbmQpOwogfTsKIAorc3RydWN0IGk5MTVfcGFnZXRhYiB7CisJ c3RydWN0IHBhZ2UgKnBhZ2U7Cit9OworCitzdHJ1Y3QgaTkxNV9wYWdlZGlyIHsKKwlzdHJ1Y3Qg cGFnZSAqcGFnZTsgLyogTlVMTCBmb3IgR0VONi1HRU43ICovCisJc3RydWN0IGk5MTVfcGFnZXRh YiAqcGFnZV90YWJsZXM7Cit9OworCitzdHJ1Y3QgaTkxNV9wYWdlZGlycG8geworCS8qIHN0cnVj dCBwYWdlICpwYWdlOyAqLworCXN0cnVjdCBpOTE1X3BhZ2VkaXIgcGFnZWRpcltHRU44X0xFR0FD WV9QRFBFU107Cit9OworCiBzdHJ1Y3QgaTkxNV9od19wcGd0dCB7CiAJc3RydWN0IGk5MTVfYWRk cmVzc19zcGFjZSBiYXNlOwogCXN0cnVjdCBrcmVmIHJlZjsKQEAgLTI3MiwxMSArMjg2LDYgQEAg c3RydWN0IGk5MTVfaHdfcHBndHQgewogCXVuc2lnbmVkIG51bV9wZF9lbnRyaWVzOwogCXVuc2ln bmVkIG51bV9wZF9wYWdlczsgLyogZ2VuOCsgKi8KIAl1bmlvbiB7Ci0JCXN0cnVjdCBwYWdlICoq cHRfcGFnZXM7Ci0JCXN0cnVjdCBwYWdlICoqZ2VuOF9wdF9wYWdlc1tHRU44X0xFR0FDWV9QRFBF U107Ci0JfTsKLQlzdHJ1Y3QgcGFnZSAqcGRfcGFnZXM7Ci0JdW5pb24gewogCQl1aW50MzJfdCBw ZF9vZmZzZXQ7CiAJCWRtYV9hZGRyX3QgcGRfZG1hX2FkZHJbR0VOOF9MRUdBQ1lfUERQRVNdOwog CX07CkBAIC0yODQsNiArMjkzLDEwIEBAIHN0cnVjdCBpOTE1X2h3X3BwZ3R0IHsKIAkJZG1hX2Fk ZHJfdCAqcHRfZG1hX2FkZHI7CiAJCWRtYV9hZGRyX3QgKmdlbjhfcHRfZG1hX2FkZHJbR0VOOF9M RUdBQ1lfUERQRVNdOwogCX07CisJdW5pb24geworCQlzdHJ1Y3QgaTkxNV9wYWdlZGlycG8gcGRw OworCQlzdHJ1Y3QgaTkxNV9wYWdlZGlyIHBkOworCX07CiAKIAlzdHJ1Y3QgZHJtX2k5MTVfZmls ZV9wcml2YXRlICpmaWxlX3ByaXY7CiAKLS0gCjIuMS4xCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=