From: Michel Thierry Subject: [PATCH v2 08/24] drm/i915: Complete page table structures Date: Tue, 23 Dec 2014 17:16:11 +0000 Message-ID: <1419354987-4622-9-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 389E96E3A6 for ; Tue, 23 Dec 2014 09:16:19 -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+CgpNb3ZlIHRo ZSByZW1haW5pbmcgbWVtYmVycyBvdmVyIHRvIHRoZSBuZXcgcGFnZSB0YWJsZSBzdHJ1Y3R1cmVz LgoKVGhpcyBjYW4gYmUgc3F1YXNoZWQgd2l0aCB0aGUgcHJldmlvdXMgY29tbWl0IGlmIGRlc2ly ZS4gVGhlIHJlYXNvbmluZwppcyB0aGUgc2FtZSBhcyB0aGF0IHBhdGNoLiBJIHNpbXBseSBmZWx0 IGl0IGlzIGVhc2llciB0byByZXZpZXcgaWYgc3BsaXQuCgp2MjogSW4gbHJjOiBzL3BwZ3R0LT5w ZF9kbWFfYWRkcltpXS9wcGd0dC0+cGRwLnBhZ2VkaXJbaV0uZGFkZHIvCgpTaWduZWQtb2ZmLWJ5 OiBCZW4gV2lkYXdza3kgPGJlbkBid2lkYXdzay5uZXQ+ClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBU aGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+ICh2MikKLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuYyB8IDg1ICsrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIHwgMTQgKysrLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICB8IDE2ICsrKy0tLS0KIDQgZmlsZXMgY2hhbmdlZCwg NDUgaW5zZXJ0aW9ucygrKSwgNzIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rl YnVnZnMuYwppbmRleCBlNTE1YWFkLi42MGY5MWJjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rl YnVnZnMuYwpAQCAtMjE1Myw3ICsyMTUzLDcgQEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9pbmZv KHN0cnVjdCBzZXFfZmlsZSAqbSwgc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJc3RydWN0IGk5 MTVfaHdfcHBndHQgKnBwZ3R0ID0gZGV2X3ByaXYtPm1tLmFsaWFzaW5nX3BwZ3R0OwogCiAJCXNl cV9wdXRzKG0sICJhbGlhc2luZyBQUEdUVDpcbiIpOwotCQlzZXFfcHJpbnRmKG0sICJwZCBndHQg b2Zmc2V0OiAweCUwOHhcbiIsIHBwZ3R0LT5wZF9vZmZzZXQpOworCQlzZXFfcHJpbnRmKG0sICJw ZCBndHQgb2Zmc2V0OiAweCUwOHhcbiIsIHBwZ3R0LT5wZC5wZF9vZmZzZXQpOwogCiAJCXBwZ3R0 LT5kZWJ1Z19kdW1wKHBwZ3R0LCBtKTsKIAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5j CmluZGV4IDY5MDI0NjIuLmEyNmMxOGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5j CkBAIC0zMDcsNyArMzA3LDcgQEAgc3RhdGljIGludCBnZW44X21tX3N3aXRjaChzdHJ1Y3QgaTkx NV9od19wcGd0dCAqcHBndHQsCiAJaW50IHVzZWRfcGQgPSBwcGd0dC0+bnVtX3BkX2VudHJpZXMg LyBHRU44X1BERVNfUEVSX1BBR0U7CiAKIAlmb3IgKGkgPSB1c2VkX3BkIC0gMTsgaSA+PSAwOyBp LS0pIHsKLQkJZG1hX2FkZHJfdCBhZGRyID0gcHBndHQtPnBkX2RtYV9hZGRyW2ldOworCQlkbWFf YWRkcl90IGFkZHIgPSBwcGd0dC0+cGRwLnBhZ2VkaXJbaV0uZGFkZHI7CiAJCXJldCA9IGdlbjhf d3JpdGVfcGRwKHJpbmcsIGksIGFkZHIpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKQEAg LTQzMyw3ICs0MzMsNiBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2ZyZWUoc3RydWN0IGk5MTVf aHdfcHBndHQgKnBwZ3R0KQogCWZvciAoaSA9IDA7IGkgPCBwcGd0dC0+bnVtX3BkX3BhZ2VzOyBp KyspIHsKIAkJZ2VuOF9mcmVlX3BhZ2VfdGFibGVzKCZwcGd0dC0+cGRwLnBhZ2VkaXJbaV0pOwog CQlnZW44X2ZyZWVfcGFnZV9kaXJlY3RvcmllcygmcHBndHQtPnBkcC5wYWdlZGlyW2ldKTsKLQkJ a2ZyZWUocHBndHQtPmdlbjhfcHRfZG1hX2FkZHJbaV0pOwogCX0KIH0KIApAQCAtNDQ1LDE0ICs0 NDQsMTQgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF91bm1hcF9wYWdlcyhzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQpCiAJZm9yIChpID0gMDsgaSA8IHBwZ3R0LT5udW1fcGRfcGFnZXM7IGkr KykgewogCQkvKiBUT0RPOiBJbiB0aGUgZnV0dXJlIHdlJ2xsIHN1cHBvcnQgc3BhcnNlIG1hcHBp bmdzLCBzbyB0aGlzCiAJCSAqIHdpbGwgaGF2ZSB0byBjaGFuZ2UuICovCi0JCWlmICghcHBndHQt PnBkX2RtYV9hZGRyW2ldKQorCQlpZiAoIXBwZ3R0LT5wZHAucGFnZWRpcltpXS5kYWRkcikKIAkJ CWNvbnRpbnVlOwogCi0JCXBjaV91bm1hcF9wYWdlKGh3ZGV2LCBwcGd0dC0+cGRfZG1hX2FkZHJb aV0sIFBBR0VfU0laRSwKKwkJcGNpX3VubWFwX3BhZ2UoaHdkZXYsIHBwZ3R0LT5wZHAucGFnZWRp cltpXS5kYWRkciwgUEFHRV9TSVpFLAogCQkJICAgICAgIFBDSV9ETUFfQklESVJFQ1RJT05BTCk7 CiAKIAkJZm9yIChqID0gMDsgaiA8IEdFTjhfUERFU19QRVJfUEFHRTsgaisrKSB7Ci0JCQlkbWFf YWRkcl90IGFkZHIgPSBwcGd0dC0+Z2VuOF9wdF9kbWFfYWRkcltpXVtqXTsKKwkJCWRtYV9hZGRy X3QgYWRkciA9IHBwZ3R0LT5wZHAucGFnZWRpcltpXS5wYWdlX3RhYmxlc1tqXS5kYWRkcjsKIAkJ CWlmIChhZGRyKQogCQkJCXBjaV91bm1hcF9wYWdlKGh3ZGV2LCBhZGRyLCBQQUdFX1NJWkUsCiAJ CQkJCSAgICAgICBQQ0lfRE1BX0JJRElSRUNUSU9OQUwpOwpAQCAtNDY5LDMyICs0NjgsMTkgQEAg c3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9jbGVhbnVwKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2Ug KnZtKQogCWdlbjhfcHBndHRfZnJlZShwcGd0dCk7CiB9CiAKLXN0YXRpYyBpbnQgZ2VuOF9wcGd0 dF9hbGxvY2F0ZV9kbWEoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQotewotCWludCBpOwot Ci0JZm9yIChpID0gMDsgaSA8IHBwZ3R0LT5udW1fcGRfcGFnZXM7IGkrKykgewotCQlwcGd0dC0+ Z2VuOF9wdF9kbWFfYWRkcltpXSA9IGtjYWxsb2MoR0VOOF9QREVTX1BFUl9QQUdFLAotCQkJCQkJ ICAgICBzaXplb2YoZG1hX2FkZHJfdCksCi0JCQkJCQkgICAgIEdGUF9LRVJORUwpOwotCQlpZiAo IXBwZ3R0LT5nZW44X3B0X2RtYV9hZGRyW2ldKQotCQkJcmV0dXJuIC1FTk9NRU07Ci0JfQotCi0J cmV0dXJuIDA7Ci19Ci0KIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY2F0ZV9wYWdlX3RhYmxl cyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiB7CiAJaW50IGksIGo7CiAKIAlmb3IgKGkg PSAwOyBpIDwgcHBndHQtPm51bV9wZF9wYWdlczsgaSsrKSB7CisJCXN0cnVjdCBpOTE1X3BhZ2Vk aXIgKnBkID0gJnBwZ3R0LT5wZHAucGFnZWRpcltpXTsKIAkJZm9yIChqID0gMDsgaiA8IEdFTjhf UERFU19QRVJfUEFHRTsgaisrKSB7Ci0JCQlzdHJ1Y3QgaTkxNV9wYWdldGFiICpwdCA9ICZwcGd0 dC0+cGRwLnBhZ2VkaXJbaV0ucGFnZV90YWJsZXNbal07CisJCQlzdHJ1Y3QgaTkxNV9wYWdldGFi ICpwdCA9ICZwZC0+cGFnZV90YWJsZXNbal07CiAKIAkJCXB0LT5wYWdlID0gYWxsb2NfcGFnZShH RlBfS0VSTkVMIHwgX19HRlBfWkVSTyk7CiAJCQlpZiAoIXB0LT5wYWdlKQogCQkJCWdvdG8gdW53 aW5kX291dDsKKwogCQl9CiAJfQogCkBAIC01NTUsOSArNTQxLDcgQEAgc3RhdGljIGludCBnZW44 X3BwZ3R0X2FsbG9jKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAogCXBwZ3R0LT5udW1f cGRfZW50cmllcyA9IG1heF9wZHAgKiBHRU44X1BERVNfUEVSX1BBR0U7CiAKLQlyZXQgPSBnZW44 X3BwZ3R0X2FsbG9jYXRlX2RtYShwcGd0dCk7Ci0JaWYgKCFyZXQpCi0JCXJldHVybiByZXQ7CisJ cmV0dXJuIDA7CiAKIAkvKiBUT0RPOiBDaGVjayB0aGlzIGZvciBhbGwgY2FzZXMgKi8KIGVycl9v dXQ6CkBAIC01NzksNyArNTYzLDcgQEAgc3RhdGljIGludCBnZW44X3BwZ3R0X3NldHVwX3BhZ2Vf ZGlyZWN0b3JpZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogCWlmIChyZXQpCiAJCXJl dHVybiByZXQ7CiAKLQlwcGd0dC0+cGRfZG1hX2FkZHJbcGRdID0gcGRfYWRkcjsKKwlwcGd0dC0+ cGRwLnBhZ2VkaXJbcGRdLmRhZGRyID0gcGRfYWRkcjsKIAogCXJldHVybiAwOwogfQpAQCAtNTg5 LDE3ICs1NzMsMTggQEAgc3RhdGljIGludCBnZW44X3BwZ3R0X3NldHVwX3BhZ2VfdGFibGVzKHN0 cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAkJCQkJY29uc3QgaW50IHB0KQogewogCWRtYV9h ZGRyX3QgcHRfYWRkcjsKLQlzdHJ1Y3QgcGFnZSAqcDsKKwlzdHJ1Y3QgaTkxNV9wYWdlZGlyICpw ZGlyID0gJnBwZ3R0LT5wZHAucGFnZWRpcltwZF07CisJc3RydWN0IGk5MTVfcGFnZXRhYiAqcHRh YiA9ICZwZGlyLT5wYWdlX3RhYmxlc1twdF07CisJc3RydWN0IHBhZ2UgKnAgPSBwdGFiLT5wYWdl OwogCWludCByZXQ7CiAKLQlwID0gcHBndHQtPnBkcC5wYWdlZGlyW3BkXS5wYWdlX3RhYmxlc1tw dF0ucGFnZTsKIAlwdF9hZGRyID0gcGNpX21hcF9wYWdlKHBwZ3R0LT5iYXNlLmRldi0+cGRldiwK IAkJCSAgICAgICBwLCAwLCBQQUdFX1NJWkUsIFBDSV9ETUFfQklESVJFQ1RJT05BTCk7CiAJcmV0 ID0gcGNpX2RtYV9tYXBwaW5nX2Vycm9yKHBwZ3R0LT5iYXNlLmRldi0+cGRldiwgcHRfYWRkcik7 CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotCXBwZ3R0LT5nZW44X3B0X2RtYV9hZGRyW3Bk XVtwdF0gPSBwdF9hZGRyOworCXB0YWItPmRhZGRyID0gcHRfYWRkcjsKIAogCXJldHVybiAwOwog fQpAQCAtNjU1LDcgKzY0MCw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9pbml0KHN0cnVjdCBp OTE1X2h3X3BwZ3R0ICpwcGd0dCwgdWludDY0X3Qgc2l6ZSkKIAkJZ2VuOF9wcGd0dF9wZGVfdCAq cGRfdmFkZHI7CiAJCXBkX3ZhZGRyID0ga21hcF9hdG9taWMocHBndHQtPnBkcC5wYWdlZGlyW2ld LnBhZ2UpOwogCQlmb3IgKGogPSAwOyBqIDwgR0VOOF9QREVTX1BFUl9QQUdFOyBqKyspIHsKLQkJ CWRtYV9hZGRyX3QgYWRkciA9IHBwZ3R0LT5nZW44X3B0X2RtYV9hZGRyW2ldW2pdOworCQkJZG1h X2FkZHJfdCBhZGRyID0gcHBndHQtPnBkcC5wYWdlZGlyW2ldLnBhZ2VfdGFibGVzW2pdLmRhZGRy OwogCQkJcGRfdmFkZHJbal0gPSBnZW44X3BkZV9lbmNvZGUocHBndHQtPmJhc2UuZGV2LCBhZGRy LAogCQkJCQkJICAgICAgSTkxNV9DQUNIRV9MTEMpOwogCQl9CkBAIC02OTYsMTQgKzY4MSwxNSBA QCBzdGF0aWMgdm9pZCBnZW42X2R1bXBfcHBndHQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0 LCBzdHJ1Y3Qgc2VxX2ZpbGUgKm0pCiAJc2NyYXRjaF9wdGUgPSB2bS0+cHRlX2VuY29kZSh2bS0+ c2NyYXRjaC5hZGRyLCBJOTE1X0NBQ0hFX0xMQywgdHJ1ZSwgMCk7CiAKIAlwZF9hZGRyID0gKGdl bjZfZ3R0X3B0ZV90IF9faW9tZW0gKilkZXZfcHJpdi0+Z3R0LmdzbSArCi0JCXBwZ3R0LT5wZF9v ZmZzZXQgLyBzaXplb2YoZ2VuNl9ndHRfcHRlX3QpOworCQlwcGd0dC0+cGQucGRfb2Zmc2V0IC8g c2l6ZW9mKGdlbjZfZ3R0X3B0ZV90KTsKIAogCXNlcV9wcmludGYobSwgIiAgVk0gJXAgKHBkX29m ZnNldCAleC0leCk6XG4iLCB2bSwKLQkJICAgcHBndHQtPnBkX29mZnNldCwgcHBndHQtPnBkX29m ZnNldCArIHBwZ3R0LT5udW1fcGRfZW50cmllcyk7CisJCSAgIHBwZ3R0LT5wZC5wZF9vZmZzZXQs CisJCSAgIHBwZ3R0LT5wZC5wZF9vZmZzZXQgKyBwcGd0dC0+bnVtX3BkX2VudHJpZXMpOwogCWZv ciAocGRlID0gMDsgcGRlIDwgcHBndHQtPm51bV9wZF9lbnRyaWVzOyBwZGUrKykgewogCQl1MzIg ZXhwZWN0ZWQ7CiAJCWdlbjZfZ3R0X3B0ZV90ICpwdF92YWRkcjsKLQkJZG1hX2FkZHJfdCBwdF9h ZGRyID0gcHBndHQtPnB0X2RtYV9hZGRyW3BkZV07CisJCWRtYV9hZGRyX3QgcHRfYWRkciA9IHBw Z3R0LT5wZC5wYWdlX3RhYmxlc1twZGVdLmRhZGRyOwogCQlwZF9lbnRyeSA9IHJlYWRsKHBkX2Fk ZHIgKyBwZGUpOwogCQlleHBlY3RlZCA9IChHRU42X1BERV9BRERSX0VOQ09ERShwdF9hZGRyKSB8 IEdFTjZfUERFX1ZBTElEKTsKIApAQCAtNzQ3LDEzICs3MzMsMTMgQEAgc3RhdGljIHZvaWQgZ2Vu Nl93cml0ZV9wZGVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAl1aW50MzJfdCBwZF9l bnRyeTsKIAlpbnQgaTsKIAotCVdBUk5fT04ocHBndHQtPnBkX29mZnNldCAmIDB4M2YpOworCVdB Uk5fT04ocHBndHQtPnBkLnBkX29mZnNldCAmIDB4M2YpOwogCXBkX2FkZHIgPSAoZ2VuNl9ndHRf cHRlX3QgX19pb21lbSopZGV2X3ByaXYtPmd0dC5nc20gKwotCQlwcGd0dC0+cGRfb2Zmc2V0IC8g c2l6ZW9mKGdlbjZfZ3R0X3B0ZV90KTsKKwkJcHBndHQtPnBkLnBkX29mZnNldCAvIHNpemVvZihn ZW42X2d0dF9wdGVfdCk7CiAJZm9yIChpID0gMDsgaSA8IHBwZ3R0LT5udW1fcGRfZW50cmllczsg aSsrKSB7CiAJCWRtYV9hZGRyX3QgcHRfYWRkcjsKIAotCQlwdF9hZGRyID0gcHBndHQtPnB0X2Rt YV9hZGRyW2ldOworCQlwdF9hZGRyID0gcHBndHQtPnBkLnBhZ2VfdGFibGVzW2ldLmRhZGRyOwog CQlwZF9lbnRyeSA9IEdFTjZfUERFX0FERFJfRU5DT0RFKHB0X2FkZHIpOwogCQlwZF9lbnRyeSB8 PSBHRU42X1BERV9WQUxJRDsKIApAQCAtNzY0LDkgKzc1MCw5IEBAIHN0YXRpYyB2b2lkIGdlbjZf d3JpdGVfcGRlcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAKIHN0YXRpYyB1aW50MzJf dCBnZXRfcGRfb2Zmc2V0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIHsKLQlCVUdfT04o cHBndHQtPnBkX29mZnNldCAmIDB4M2YpOworCUJVR19PTihwcGd0dC0+cGQucGRfb2Zmc2V0ICYg MHgzZik7CiAKLQlyZXR1cm4gKHBwZ3R0LT5wZF9vZmZzZXQgLyA2NCkgPDwgMTY7CisJcmV0dXJu IChwcGd0dC0+cGQucGRfb2Zmc2V0IC8gNjQpIDw8IDE2OwogfQogCiBzdGF0aWMgaW50IGhzd19t bV9zd2l0Y2goc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LApAQCAtOTY5LDE5ICs5NTUsMTYg QEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF91bm1hcF9wYWdlcyhzdHJ1Y3QgaTkxNV9od19wcGd0 dCAqcHBndHQpCiB7CiAJaW50IGk7CiAKLQlpZiAocHBndHQtPnB0X2RtYV9hZGRyKSB7Ci0JCWZv ciAoaSA9IDA7IGkgPCBwcGd0dC0+bnVtX3BkX2VudHJpZXM7IGkrKykKLQkJCXBjaV91bm1hcF9w YWdlKHBwZ3R0LT5iYXNlLmRldi0+cGRldiwKLQkJCQkgICAgICAgcHBndHQtPnB0X2RtYV9hZGRy W2ldLAotCQkJCSAgICAgICA0MDk2LCBQQ0lfRE1BX0JJRElSRUNUSU9OQUwpOwotCX0KKwlmb3Ig KGkgPSAwOyBpIDwgcHBndHQtPm51bV9wZF9lbnRyaWVzOyBpKyspCisJCXBjaV91bm1hcF9wYWdl KHBwZ3R0LT5iYXNlLmRldi0+cGRldiwKKwkJCSAgICAgICBwcGd0dC0+cGQucGFnZV90YWJsZXNb aV0uZGFkZHIsCisJCQkgICAgICAgNDA5NiwgUENJX0RNQV9CSURJUkVDVElPTkFMKTsKIH0KIAog c3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9mcmVlKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkK IHsKIAlpbnQgaTsKIAotCWtmcmVlKHBwZ3R0LT5wdF9kbWFfYWRkcik7CiAJZm9yIChpID0gMDsg aSA8IHBwZ3R0LT5udW1fcGRfZW50cmllczsgaSsrKQogCQlfX2ZyZWVfcGFnZShwcGd0dC0+cGQu cGFnZV90YWJsZXNbaV0ucGFnZSk7CiAJa2ZyZWUocHBndHQtPnBkLnBhZ2VfdGFibGVzKTsKQEAg LTEwNzQsMTQgKzEwNTcsNiBAQCBzdGF0aWMgaW50IGdlbjZfcHBndHRfYWxsb2Moc3RydWN0IGk5 MTVfaHdfcHBndHQgKnBwZ3R0KQogCQlyZXR1cm4gcmV0OwogCX0KIAotCXBwZ3R0LT5wdF9kbWFf YWRkciA9IGtjYWxsb2MocHBndHQtPm51bV9wZF9lbnRyaWVzLCBzaXplb2YoZG1hX2FkZHJfdCks Ci0JCQkJICAgICBHRlBfS0VSTkVMKTsKLQlpZiAoIXBwZ3R0LT5wdF9kbWFfYWRkcikgewotCQlk cm1fbW1fcmVtb3ZlX25vZGUoJnBwZ3R0LT5ub2RlKTsKLQkJZ2VuNl9wcGd0dF9mcmVlKHBwZ3R0 KTsKLQkJcmV0dXJuIC1FTk9NRU07Ci0JfQotCiAJcmV0dXJuIDA7CiB9CiAKQEAgLTExMDMsNyAr MTA3OCw3IEBAIHN0YXRpYyBpbnQgZ2VuNl9wcGd0dF9zZXR1cF9wYWdlX3RhYmxlcyhzdHJ1Y3Qg aTkxNV9od19wcGd0dCAqcHBndHQpCiAJCQlyZXR1cm4gLUVJTzsKIAkJfQogCi0JCXBwZ3R0LT5w dF9kbWFfYWRkcltpXSA9IHB0X2FkZHI7CisJCXBwZ3R0LT5wZC5wYWdlX3RhYmxlc1tpXS5kYWRk ciA9IHB0X2FkZHI7CiAJfQogCiAJcmV0dXJuIDA7CkBAIC0xMTQyLDcgKzExMTcsNyBAQCBzdGF0 aWMgaW50IGdlbjZfcHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJcHBn dHQtPmJhc2UudG90YWwgPSBwcGd0dC0+bnVtX3BkX2VudHJpZXMgKiBJOTE1X1BQR1RUX1BUX0VO VFJJRVMgKiBQQUdFX1NJWkU7CiAJcHBndHQtPmRlYnVnX2R1bXAgPSBnZW42X2R1bXBfcHBndHQ7 CiAKLQlwcGd0dC0+cGRfb2Zmc2V0ID0KKwlwcGd0dC0+cGQucGRfb2Zmc2V0ID0KIAkJcHBndHQt Pm5vZGUuc3RhcnQgLyBQQUdFX1NJWkUgKiBzaXplb2YoZ2VuNl9ndHRfcHRlX3QpOwogCiAJRFJN X0RFQlVHX0RSSVZFUigiQWxsb2NhdGVkIHBkZSBzcGFjZSAoJWxkTSkgYXQgR1RUIGVudHJ5OiAl bHhcbiIsCkBAIC0xMTUxLDcgKzExMjYsNyBAQCBzdGF0aWMgaW50IGdlbjZfcHBndHRfaW5pdChz dHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAKIAlnZW42X3dyaXRlX3BkZXMocHBndHQpOwog CURSTV9ERUJVRygiQWRkaW5nIFBQR1RUIGF0IG9mZnNldCAleFxuIiwKLQkJICBwcGd0dC0+cGRf b2Zmc2V0IDw8IDEwKTsKKwkJICBwcGd0dC0+cGQucGRfb2Zmc2V0IDw8IDEwKTsKIAogCXJldHVy biAwOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCAxZmYzYzA1Li45YmM5 NzNlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaApAQCAtMjY3LDEwICsyNjcsMTYg QEAgc3RydWN0IGk5MTVfZ3R0IHsKIAogc3RydWN0IGk5MTVfcGFnZXRhYiB7CiAJc3RydWN0IHBh Z2UgKnBhZ2U7CisJZG1hX2FkZHJfdCBkYWRkcjsKIH07CiAKIHN0cnVjdCBpOTE1X3BhZ2VkaXIg ewogCXN0cnVjdCBwYWdlICpwYWdlOyAvKiBOVUxMIGZvciBHRU42LUdFTjcgKi8KKwl1bmlvbiB7 CisJCXVpbnQzMl90IHBkX29mZnNldDsKKwkJZG1hX2FkZHJfdCBkYWRkcjsKKwl9OworCiAJc3Ry dWN0IGk5MTVfcGFnZXRhYiAqcGFnZV90YWJsZXM7CiB9OwogCkBAIC0yODYsMTQgKzI5Miw2IEBA IHN0cnVjdCBpOTE1X2h3X3BwZ3R0IHsKIAl1bnNpZ25lZCBudW1fcGRfZW50cmllczsKIAl1bnNp Z25lZCBudW1fcGRfcGFnZXM7IC8qIGdlbjgrICovCiAJdW5pb24gewotCQl1aW50MzJfdCBwZF9v ZmZzZXQ7Ci0JCWRtYV9hZGRyX3QgcGRfZG1hX2FkZHJbR0VOOF9MRUdBQ1lfUERQRVNdOwotCX07 Ci0JdW5pb24gewotCQlkbWFfYWRkcl90ICpwdF9kbWFfYWRkcjsKLQkJZG1hX2FkZHJfdCAqZ2Vu OF9wdF9kbWFfYWRkcltHRU44X0xFR0FDWV9QRFBFU107Ci0JfTsKLQl1bmlvbiB7CiAJCXN0cnVj dCBpOTE1X3BhZ2VkaXJwbyBwZHA7CiAJCXN0cnVjdCBpOTE1X3BhZ2VkaXIgcGQ7CiAJfTsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggNTdiMWNhMC4uMDc1Y2Y2OCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMKQEAgLTE3MzEsMTQgKzE3MzEsMTQgQEAgcG9wdWxhdGVfbHJfY29udGV4 dChzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq Y3R4X28KIAlyZWdfc3RhdGVbQ1RYX1BEUDFfTERXXSA9IEdFTjhfUklOR19QRFBfTERXKHJpbmcs IDEpOwogCXJlZ19zdGF0ZVtDVFhfUERQMF9VRFddID0gR0VOOF9SSU5HX1BEUF9VRFcocmluZywg MCk7CiAJcmVnX3N0YXRlW0NUWF9QRFAwX0xEV10gPSBHRU44X1JJTkdfUERQX0xEVyhyaW5nLCAw KTsKLQlyZWdfc3RhdGVbQ1RYX1BEUDNfVURXKzFdID0gdXBwZXJfMzJfYml0cyhwcGd0dC0+cGRf ZG1hX2FkZHJbM10pOwotCXJlZ19zdGF0ZVtDVFhfUERQM19MRFcrMV0gPSBsb3dlcl8zMl9iaXRz KHBwZ3R0LT5wZF9kbWFfYWRkclszXSk7Ci0JcmVnX3N0YXRlW0NUWF9QRFAyX1VEVysxXSA9IHVw cGVyXzMyX2JpdHMocHBndHQtPnBkX2RtYV9hZGRyWzJdKTsKLQlyZWdfc3RhdGVbQ1RYX1BEUDJf TERXKzFdID0gbG93ZXJfMzJfYml0cyhwcGd0dC0+cGRfZG1hX2FkZHJbMl0pOwotCXJlZ19zdGF0 ZVtDVFhfUERQMV9VRFcrMV0gPSB1cHBlcl8zMl9iaXRzKHBwZ3R0LT5wZF9kbWFfYWRkclsxXSk7 Ci0JcmVnX3N0YXRlW0NUWF9QRFAxX0xEVysxXSA9IGxvd2VyXzMyX2JpdHMocHBndHQtPnBkX2Rt YV9hZGRyWzFdKTsKLQlyZWdfc3RhdGVbQ1RYX1BEUDBfVURXKzFdID0gdXBwZXJfMzJfYml0cyhw cGd0dC0+cGRfZG1hX2FkZHJbMF0pOwotCXJlZ19zdGF0ZVtDVFhfUERQMF9MRFcrMV0gPSBsb3dl cl8zMl9iaXRzKHBwZ3R0LT5wZF9kbWFfYWRkclswXSk7CisJcmVnX3N0YXRlW0NUWF9QRFAzX1VE VysxXSA9IHVwcGVyXzMyX2JpdHMocHBndHQtPnBkcC5wYWdlZGlyWzNdLmRhZGRyKTsKKwlyZWdf c3RhdGVbQ1RYX1BEUDNfTERXKzFdID0gbG93ZXJfMzJfYml0cyhwcGd0dC0+cGRwLnBhZ2VkaXJb M10uZGFkZHIpOworCXJlZ19zdGF0ZVtDVFhfUERQMl9VRFcrMV0gPSB1cHBlcl8zMl9iaXRzKHBw Z3R0LT5wZHAucGFnZWRpclsyXS5kYWRkcik7CisJcmVnX3N0YXRlW0NUWF9QRFAyX0xEVysxXSA9 IGxvd2VyXzMyX2JpdHMocHBndHQtPnBkcC5wYWdlZGlyWzJdLmRhZGRyKTsKKwlyZWdfc3RhdGVb Q1RYX1BEUDFfVURXKzFdID0gdXBwZXJfMzJfYml0cyhwcGd0dC0+cGRwLnBhZ2VkaXJbMV0uZGFk ZHIpOworCXJlZ19zdGF0ZVtDVFhfUERQMV9MRFcrMV0gPSBsb3dlcl8zMl9iaXRzKHBwZ3R0LT5w ZHAucGFnZWRpclsxXS5kYWRkcik7CisJcmVnX3N0YXRlW0NUWF9QRFAwX1VEVysxXSA9IHVwcGVy XzMyX2JpdHMocHBndHQtPnBkcC5wYWdlZGlyWzBdLmRhZGRyKTsKKwlyZWdfc3RhdGVbQ1RYX1BE UDBfTERXKzFdID0gbG93ZXJfMzJfYml0cyhwcGd0dC0+cGRwLnBhZ2VkaXJbMF0uZGFkZHIpOwog CWlmIChyaW5nLT5pZCA9PSBSQ1MpIHsKIAkJcmVnX3N0YXRlW0NUWF9MUklfSEVBREVSXzJdID0g TUlfTE9BRF9SRUdJU1RFUl9JTU0oMSk7CiAJCXJlZ19zdGF0ZVtDVFhfUl9QV1JfQ0xLX1NUQVRF XSA9IDB4MjBjODsKLS0gCjIuMS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=