From: Michel Thierry Subject: [PATCH v3 07/25] drm/i915: Complete page table structures Date: Tue, 13 Jan 2015 11:52:21 +0000 Message-ID: <1421149959-30383-8-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1421149959-30383-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 5721B6E5CA for ; Tue, 13 Jan 2015 03:52:22 -0800 (PST) In-Reply-To: <1421149959-30383-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+cGRwLnBhZ2VfZGlyZWN0b3J5W2ldLmRhZGRyLwp2MzogUmVi YXNlLgoKU2lnbmVkLW9mZi1ieTogQmVuIFdpZGF3c2t5IDxiZW5AYndpZGF3c2submV0PgpTaWdu ZWQtb2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPiAodjIs IHYzKQotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIHwgIDIgKy0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgODUgKysrKysrKysrKysrKy0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0Lmgg fCAxNCArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgIHwgMTYgKysr LS0tLQogNCBmaWxlcyBjaGFuZ2VkLCA0NSBpbnNlcnRpb25zKCspLCA3MiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IGU1MTVhYWQuLjYwZjkxYmMgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC0yMTUzLDcgKzIxNTMsNyBAQCBzdGF0 aWMgdm9pZCBnZW42X3BwZ3R0X2luZm8oc3RydWN0IHNlcV9maWxlICptLCBzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCQlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPSBkZXZfcHJpdi0+bW0u YWxpYXNpbmdfcHBndHQ7CiAKIAkJc2VxX3B1dHMobSwgImFsaWFzaW5nIFBQR1RUOlxuIik7Ci0J CXNlcV9wcmludGYobSwgInBkIGd0dCBvZmZzZXQ6IDB4JTA4eFxuIiwgcHBndHQtPnBkX29mZnNl dCk7CisJCXNlcV9wcmludGYobSwgInBkIGd0dCBvZmZzZXQ6IDB4JTA4eFxuIiwgcHBndHQtPnBk LnBkX29mZnNldCk7CiAKIAkJcHBndHQtPmRlYnVnX2R1bXAocHBndHQsIG0pOwogCX0KZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggYzlmOTI2Ni4uOTQ1OTE5NSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTMwNyw3ICszMDcsNyBAQCBzdGF0aWMgaW50IGdl bjhfbW1fc3dpdGNoKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAlpbnQgdXNlZF9wZCA9 IHBwZ3R0LT5udW1fcGRfZW50cmllcyAvIEdFTjhfUERFU19QRVJfUEFHRTsKIAogCWZvciAoaSA9 IHVzZWRfcGQgLSAxOyBpID49IDA7IGktLSkgewotCQlkbWFfYWRkcl90IGFkZHIgPSBwcGd0dC0+ cGRfZG1hX2FkZHJbaV07CisJCWRtYV9hZGRyX3QgYWRkciA9IHBwZ3R0LT5wZHAucGFnZV9kaXJl Y3RvcnlbaV0uZGFkZHI7CiAJCXJldCA9IGdlbjhfd3JpdGVfcGRwKHJpbmcsIGksIGFkZHIpOwog CQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKQEAgLTQzMyw3ICs0MzMsNiBAQCBzdGF0aWMgdm9p ZCBnZW44X3BwZ3R0X2ZyZWUoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogCWZvciAoaSA9 IDA7IGkgPCBwcGd0dC0+bnVtX3BkX3BhZ2VzOyBpKyspIHsKIAkJZ2VuOF9mcmVlX3BhZ2VfdGFi bGVzKCZwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W2ldKTsKIAkJZ2VuOF9mcmVlX3BhZ2VfZGly ZWN0b3JpZXMoJnBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbaV0pOwotCQlrZnJlZShwcGd0dC0+ Z2VuOF9wdF9kbWFfYWRkcltpXSk7CiAJfQogfQogCkBAIC00NDUsMTQgKzQ0NCwxNCBAQCBzdGF0 aWMgdm9pZCBnZW44X3BwZ3R0X3VubWFwX3BhZ2VzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0 dCkKIAlmb3IgKGkgPSAwOyBpIDwgcHBndHQtPm51bV9wZF9wYWdlczsgaSsrKSB7CiAJCS8qIFRP RE86IEluIHRoZSBmdXR1cmUgd2UnbGwgc3VwcG9ydCBzcGFyc2UgbWFwcGluZ3MsIHNvIHRoaXMK IAkJICogd2lsbCBoYXZlIHRvIGNoYW5nZS4gKi8KLQkJaWYgKCFwcGd0dC0+cGRfZG1hX2FkZHJb aV0pCisJCWlmICghcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXS5kYWRkcikKIAkJCWNvbnRp bnVlOwogCi0JCXBjaV91bm1hcF9wYWdlKGh3ZGV2LCBwcGd0dC0+cGRfZG1hX2FkZHJbaV0sIFBB R0VfU0laRSwKKwkJcGNpX3VubWFwX3BhZ2UoaHdkZXYsIHBwZ3R0LT5wZHAucGFnZV9kaXJlY3Rv cnlbaV0uZGFkZHIsIFBBR0VfU0laRSwKIAkJCSAgICAgICBQQ0lfRE1BX0JJRElSRUNUSU9OQUwp OwogCiAJCWZvciAoaiA9IDA7IGogPCBHRU44X1BERVNfUEVSX1BBR0U7IGorKykgewotCQkJZG1h X2FkZHJfdCBhZGRyID0gcHBndHQtPmdlbjhfcHRfZG1hX2FkZHJbaV1bal07CisJCQlkbWFfYWRk cl90IGFkZHIgPSBwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W2ldLnBhZ2VfdGFibGVzW2pdLmRh ZGRyOwogCQkJaWYgKGFkZHIpCiAJCQkJcGNpX3VubWFwX3BhZ2UoaHdkZXYsIGFkZHIsIFBBR0Vf U0laRSwKIAkJCQkJICAgICAgIFBDSV9ETUFfQklESVJFQ1RJT05BTCk7CkBAIC00NjksMzIgKzQ2 OCwxOSBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2NsZWFudXAoc3RydWN0IGk5MTVfYWRkcmVz c19zcGFjZSAqdm0pCiAJZ2VuOF9wcGd0dF9mcmVlKHBwZ3R0KTsKIH0KIAotc3RhdGljIGludCBn ZW44X3BwZ3R0X2FsbG9jYXRlX2RtYShzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCi17Ci0J aW50IGk7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgcHBndHQtPm51bV9wZF9wYWdlczsgaSsrKSB7Ci0J CXBwZ3R0LT5nZW44X3B0X2RtYV9hZGRyW2ldID0ga2NhbGxvYyhHRU44X1BERVNfUEVSX1BBR0Us Ci0JCQkJCQkgICAgIHNpemVvZihkbWFfYWRkcl90KSwKLQkJCQkJCSAgICAgR0ZQX0tFUk5FTCk7 Ci0JCWlmICghcHBndHQtPmdlbjhfcHRfZG1hX2FkZHJbaV0pCi0JCQlyZXR1cm4gLUVOT01FTTsK LQl9Ci0KLQlyZXR1cm4gMDsKLX0KLQogc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9jYXRlX3Bh Z2VfdGFibGVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIHsKIAlpbnQgaSwgajsKIAog CWZvciAoaSA9IDA7IGkgPCBwcGd0dC0+bnVtX3BkX3BhZ2VzOyBpKyspIHsKKwkJc3RydWN0IGk5 MTVfcGFnZV9kaXJlY3RvcnlfZW50cnkgKnBkID0gJnBwZ3R0LT5wZHAucGFnZV9kaXJlY3Rvcnlb aV07CiAJCWZvciAoaiA9IDA7IGogPCBHRU44X1BERVNfUEVSX1BBR0U7IGorKykgewotCQkJc3Ry dWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQgPSAmcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9y eVtpXS5wYWdlX3RhYmxlc1tqXTsKKwkJCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkgKnB0 ID0gJnBkLT5wYWdlX3RhYmxlc1tqXTsKIAogCQkJcHQtPnBhZ2UgPSBhbGxvY19wYWdlKEdGUF9L RVJORUwgfCBfX0dGUF9aRVJPKTsKIAkJCWlmICghcHQtPnBhZ2UpCiAJCQkJZ290byB1bndpbmRf b3V0OworCiAJCX0KIAl9CiAKQEAgLTU1NSw5ICs1NDEsNyBAQCBzdGF0aWMgaW50IGdlbjhfcHBn dHRfYWxsb2Moc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogCiAJcHBndHQtPm51bV9wZF9l bnRyaWVzID0gbWF4X3BkcCAqIEdFTjhfUERFU19QRVJfUEFHRTsKIAotCXJldCA9IGdlbjhfcHBn dHRfYWxsb2NhdGVfZG1hKHBwZ3R0KTsKLQlpZiAoIXJldCkKLQkJcmV0dXJuIHJldDsKKwlyZXR1 cm4gMDsKIAogCS8qIFRPRE86IENoZWNrIHRoaXMgZm9yIGFsbCBjYXNlcyAqLwogZXJyX291dDoK QEAgLTU3OSw3ICs1NjMsNyBAQCBzdGF0aWMgaW50IGdlbjhfcHBndHRfc2V0dXBfcGFnZV9kaXJl Y3RvcmllcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCiAJaWYgKHJldCkKIAkJcmV0dXJu IHJldDsKIAotCXBwZ3R0LT5wZF9kbWFfYWRkcltwZF0gPSBwZF9hZGRyOworCXBwZ3R0LT5wZHAu cGFnZV9kaXJlY3RvcnlbcGRdLmRhZGRyID0gcGRfYWRkcjsKIAogCXJldHVybiAwOwogfQpAQCAt NTg5LDE3ICs1NzMsMTggQEAgc3RhdGljIGludCBnZW44X3BwZ3R0X3NldHVwX3BhZ2VfdGFibGVz KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAkJCQkJY29uc3QgaW50IHB0KQogewogCWRt YV9hZGRyX3QgcHRfYWRkcjsKLQlzdHJ1Y3QgcGFnZSAqcDsKKwlzdHJ1Y3QgaTkxNV9wYWdlX2Rp cmVjdG9yeV9lbnRyeSAqcGRpciA9ICZwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W3BkXTsKKwlz dHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpwdGFiID0gJnBkaXItPnBhZ2VfdGFibGVzW3B0 XTsKKwlzdHJ1Y3QgcGFnZSAqcCA9IHB0YWItPnBhZ2U7CiAJaW50IHJldDsKIAotCXAgPSBwcGd0 dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W3BkXS5wYWdlX3RhYmxlc1twdF0ucGFnZTsKIAlwdF9hZGRy ID0gcGNpX21hcF9wYWdlKHBwZ3R0LT5iYXNlLmRldi0+cGRldiwKIAkJCSAgICAgICBwLCAwLCBQ QUdFX1NJWkUsIFBDSV9ETUFfQklESVJFQ1RJT05BTCk7CiAJcmV0ID0gcGNpX2RtYV9tYXBwaW5n X2Vycm9yKHBwZ3R0LT5iYXNlLmRldi0+cGRldiwgcHRfYWRkcik7CiAJaWYgKHJldCkKIAkJcmV0 dXJuIHJldDsKIAotCXBwZ3R0LT5nZW44X3B0X2RtYV9hZGRyW3BkXVtwdF0gPSBwdF9hZGRyOwor CXB0YWItPmRhZGRyID0gcHRfYWRkcjsKIAogCXJldHVybiAwOwogfQpAQCAtNjU1LDcgKzY0MCw3 IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0 dCwgdWludDY0X3Qgc2l6ZSkKIAkJZ2VuOF9wcGd0dF9wZGVfdCAqcGRfdmFkZHI7CiAJCXBkX3Zh ZGRyID0ga21hcF9hdG9taWMocHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXS5wYWdlKTsKIAkJ Zm9yIChqID0gMDsgaiA8IEdFTjhfUERFU19QRVJfUEFHRTsgaisrKSB7Ci0JCQlkbWFfYWRkcl90 IGFkZHIgPSBwcGd0dC0+Z2VuOF9wdF9kbWFfYWRkcltpXVtqXTsKKwkJCWRtYV9hZGRyX3QgYWRk ciA9IHBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbaV0ucGFnZV90YWJsZXNbal0uZGFkZHI7CiAJ CQlwZF92YWRkcltqXSA9IGdlbjhfcGRlX2VuY29kZShwcGd0dC0+YmFzZS5kZXYsIGFkZHIsCiAJ CQkJCQkgICAgICBJOTE1X0NBQ0hFX0xMQyk7CiAJCX0KQEAgLTY5NiwxNCArNjgxLDE1IEBAIHN0 YXRpYyB2b2lkIGdlbjZfZHVtcF9wcGd0dChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsIHN0 cnVjdCBzZXFfZmlsZSAqbSkKIAlzY3JhdGNoX3B0ZSA9IHZtLT5wdGVfZW5jb2RlKHZtLT5zY3Jh dGNoLmFkZHIsIEk5MTVfQ0FDSEVfTExDLCB0cnVlLCAwKTsKIAogCXBkX2FkZHIgPSAoZ2VuNl9n dHRfcHRlX3QgX19pb21lbSAqKWRldl9wcml2LT5ndHQuZ3NtICsKLQkJcHBndHQtPnBkX29mZnNl dCAvIHNpemVvZihnZW42X2d0dF9wdGVfdCk7CisJCXBwZ3R0LT5wZC5wZF9vZmZzZXQgLyBzaXpl b2YoZ2VuNl9ndHRfcHRlX3QpOwogCiAJc2VxX3ByaW50ZihtLCAiICBWTSAlcCAocGRfb2Zmc2V0 ICV4LSV4KTpcbiIsIHZtLAotCQkgICBwcGd0dC0+cGRfb2Zmc2V0LCBwcGd0dC0+cGRfb2Zmc2V0 ICsgcHBndHQtPm51bV9wZF9lbnRyaWVzKTsKKwkJICAgcHBndHQtPnBkLnBkX29mZnNldCwKKwkJ ICAgcHBndHQtPnBkLnBkX29mZnNldCArIHBwZ3R0LT5udW1fcGRfZW50cmllcyk7CiAJZm9yIChw ZGUgPSAwOyBwZGUgPCBwcGd0dC0+bnVtX3BkX2VudHJpZXM7IHBkZSsrKSB7CiAJCXUzMiBleHBl Y3RlZDsKIAkJZ2VuNl9ndHRfcHRlX3QgKnB0X3ZhZGRyOwotCQlkbWFfYWRkcl90IHB0X2FkZHIg PSBwcGd0dC0+cHRfZG1hX2FkZHJbcGRlXTsKKwkJZG1hX2FkZHJfdCBwdF9hZGRyID0gcHBndHQt PnBkLnBhZ2VfdGFibGVzW3BkZV0uZGFkZHI7CiAJCXBkX2VudHJ5ID0gcmVhZGwocGRfYWRkciAr IHBkZSk7CiAJCWV4cGVjdGVkID0gKEdFTjZfUERFX0FERFJfRU5DT0RFKHB0X2FkZHIpIHwgR0VO Nl9QREVfVkFMSUQpOwogCkBAIC03NDcsMTMgKzczMywxMyBAQCBzdGF0aWMgdm9pZCBnZW42X3dy aXRlX3BkZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogCXVpbnQzMl90IHBkX2VudHJ5 OwogCWludCBpOwogCi0JV0FSTl9PTihwcGd0dC0+cGRfb2Zmc2V0ICYgMHgzZik7CisJV0FSTl9P TihwcGd0dC0+cGQucGRfb2Zmc2V0ICYgMHgzZik7CiAJcGRfYWRkciA9IChnZW42X2d0dF9wdGVf dCBfX2lvbWVtKilkZXZfcHJpdi0+Z3R0LmdzbSArCi0JCXBwZ3R0LT5wZF9vZmZzZXQgLyBzaXpl b2YoZ2VuNl9ndHRfcHRlX3QpOworCQlwcGd0dC0+cGQucGRfb2Zmc2V0IC8gc2l6ZW9mKGdlbjZf Z3R0X3B0ZV90KTsKIAlmb3IgKGkgPSAwOyBpIDwgcHBndHQtPm51bV9wZF9lbnRyaWVzOyBpKysp IHsKIAkJZG1hX2FkZHJfdCBwdF9hZGRyOwogCi0JCXB0X2FkZHIgPSBwcGd0dC0+cHRfZG1hX2Fk ZHJbaV07CisJCXB0X2FkZHIgPSBwcGd0dC0+cGQucGFnZV90YWJsZXNbaV0uZGFkZHI7CiAJCXBk X2VudHJ5ID0gR0VONl9QREVfQUREUl9FTkNPREUocHRfYWRkcik7CiAJCXBkX2VudHJ5IHw9IEdF TjZfUERFX1ZBTElEOwogCkBAIC03NjQsOSArNzUwLDkgQEAgc3RhdGljIHZvaWQgZ2VuNl93cml0 ZV9wZGVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAogc3RhdGljIHVpbnQzMl90IGdl dF9wZF9vZmZzZXQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogewotCUJVR19PTihwcGd0 dC0+cGRfb2Zmc2V0ICYgMHgzZik7CisJQlVHX09OKHBwZ3R0LT5wZC5wZF9vZmZzZXQgJiAweDNm KTsKIAotCXJldHVybiAocHBndHQtPnBkX29mZnNldCAvIDY0KSA8PCAxNjsKKwlyZXR1cm4gKHBw Z3R0LT5wZC5wZF9vZmZzZXQgLyA2NCkgPDwgMTY7CiB9CiAKIHN0YXRpYyBpbnQgaHN3X21tX3N3 aXRjaChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCkBAIC05NjksMTkgKzk1NSwxNiBAQCBz dGF0aWMgdm9pZCBnZW42X3BwZ3R0X3VubWFwX3BhZ2VzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpw cGd0dCkKIHsKIAlpbnQgaTsKIAotCWlmIChwcGd0dC0+cHRfZG1hX2FkZHIpIHsKLQkJZm9yIChp ID0gMDsgaSA8IHBwZ3R0LT5udW1fcGRfZW50cmllczsgaSsrKQotCQkJcGNpX3VubWFwX3BhZ2Uo cHBndHQtPmJhc2UuZGV2LT5wZGV2LAotCQkJCSAgICAgICBwcGd0dC0+cHRfZG1hX2FkZHJbaV0s Ci0JCQkJICAgICAgIDQwOTYsIFBDSV9ETUFfQklESVJFQ1RJT05BTCk7Ci0JfQorCWZvciAoaSA9 IDA7IGkgPCBwcGd0dC0+bnVtX3BkX2VudHJpZXM7IGkrKykKKwkJcGNpX3VubWFwX3BhZ2UocHBn dHQtPmJhc2UuZGV2LT5wZGV2LAorCQkJICAgICAgIHBwZ3R0LT5wZC5wYWdlX3RhYmxlc1tpXS5k YWRkciwKKwkJCSAgICAgICA0MDk2LCBQQ0lfRE1BX0JJRElSRUNUSU9OQUwpOwogfQogCiBzdGF0 aWMgdm9pZCBnZW42X3BwZ3R0X2ZyZWUoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogewog CWludCBpOwogCi0Ja2ZyZWUocHBndHQtPnB0X2RtYV9hZGRyKTsKIAlmb3IgKGkgPSAwOyBpIDwg cHBndHQtPm51bV9wZF9lbnRyaWVzOyBpKyspCiAJCV9fZnJlZV9wYWdlKHBwZ3R0LT5wZC5wYWdl X3RhYmxlc1tpXS5wYWdlKTsKIAlrZnJlZShwcGd0dC0+cGQucGFnZV90YWJsZXMpOwpAQCAtMTA3 NCwxNCArMTA1Nyw2IEBAIHN0YXRpYyBpbnQgZ2VuNl9wcGd0dF9hbGxvYyhzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQpCiAJCXJldHVybiByZXQ7CiAJfQogCi0JcHBndHQtPnB0X2RtYV9hZGRy ID0ga2NhbGxvYyhwcGd0dC0+bnVtX3BkX2VudHJpZXMsIHNpemVvZihkbWFfYWRkcl90KSwKLQkJ CQkgICAgIEdGUF9LRVJORUwpOwotCWlmICghcHBndHQtPnB0X2RtYV9hZGRyKSB7Ci0JCWRybV9t bV9yZW1vdmVfbm9kZSgmcHBndHQtPm5vZGUpOwotCQlnZW42X3BwZ3R0X2ZyZWUocHBndHQpOwot CQlyZXR1cm4gLUVOT01FTTsKLQl9Ci0KIAlyZXR1cm4gMDsKIH0KIApAQCAtMTEwMyw3ICsxMDc4 LDcgQEAgc3RhdGljIGludCBnZW42X3BwZ3R0X3NldHVwX3BhZ2VfdGFibGVzKHN0cnVjdCBpOTE1 X2h3X3BwZ3R0ICpwcGd0dCkKIAkJCXJldHVybiAtRUlPOwogCQl9CiAKLQkJcHBndHQtPnB0X2Rt YV9hZGRyW2ldID0gcHRfYWRkcjsKKwkJcHBndHQtPnBkLnBhZ2VfdGFibGVzW2ldLmRhZGRyID0g cHRfYWRkcjsKIAl9CiAKIAlyZXR1cm4gMDsKQEAgLTExNDIsNyArMTExNyw3IEBAIHN0YXRpYyBp bnQgZ2VuNl9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAlwcGd0dC0+ YmFzZS50b3RhbCA9IHBwZ3R0LT5udW1fcGRfZW50cmllcyAqIEk5MTVfUFBHVFRfUFRfRU5UUklF UyAqIFBBR0VfU0laRTsKIAlwcGd0dC0+ZGVidWdfZHVtcCA9IGdlbjZfZHVtcF9wcGd0dDsKIAot CXBwZ3R0LT5wZF9vZmZzZXQgPQorCXBwZ3R0LT5wZC5wZF9vZmZzZXQgPQogCQlwcGd0dC0+bm9k ZS5zdGFydCAvIFBBR0VfU0laRSAqIHNpemVvZihnZW42X2d0dF9wdGVfdCk7CiAKIAlEUk1fREVC VUdfRFJJVkVSKCJBbGxvY2F0ZWQgcGRlIHNwYWNlICglbGRNKSBhdCBHVFQgZW50cnk6ICVseFxu IiwKQEAgLTExNTEsNyArMTEyNiw3IEBAIHN0YXRpYyBpbnQgZ2VuNl9wcGd0dF9pbml0KHN0cnVj dCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAogCWdlbjZfd3JpdGVfcGRlcyhwcGd0dCk7CiAJRFJN X0RFQlVHKCJBZGRpbmcgUFBHVFQgYXQgb2Zmc2V0ICV4XG4iLAotCQkgIHBwZ3R0LT5wZF9vZmZz ZXQgPDwgMTApOworCQkgIHBwZ3R0LT5wZC5wZF9vZmZzZXQgPDwgMTApOwogCiAJcmV0dXJuIDA7 CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCmluZGV4IGQ5YmMzNzUuLjZlZmViMTgg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCkBAIC0xODksMTAgKzE4OSwxNiBAQCBz dHJ1Y3QgaTkxNV92bWEgewogCiBzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5IHsKIAlzdHJ1 Y3QgcGFnZSAqcGFnZTsKKwlkbWFfYWRkcl90IGRhZGRyOwogfTsKIAogc3RydWN0IGk5MTVfcGFn ZV9kaXJlY3RvcnlfZW50cnkgewogCXN0cnVjdCBwYWdlICpwYWdlOyAvKiBOVUxMIGZvciBHRU42 LUdFTjcgKi8KKwl1bmlvbiB7CisJCXVpbnQzMl90IHBkX29mZnNldDsKKwkJZG1hX2FkZHJfdCBk YWRkcjsKKwl9OworCiAJc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcGFnZV90YWJsZXM7 CiB9OwogCkBAIC0yODYsMTQgKzI5Miw2IEBAIHN0cnVjdCBpOTE1X2h3X3BwZ3R0IHsKIAl1bnNp Z25lZCBudW1fcGRfZW50cmllczsKIAl1bnNpZ25lZCBudW1fcGRfcGFnZXM7IC8qIGdlbjgrICov CiAJdW5pb24gewotCQl1aW50MzJfdCBwZF9vZmZzZXQ7Ci0JCWRtYV9hZGRyX3QgcGRfZG1hX2Fk ZHJbR0VOOF9MRUdBQ1lfUERQRVNdOwotCX07Ci0JdW5pb24gewotCQlkbWFfYWRkcl90ICpwdF9k bWFfYWRkcjsKLQkJZG1hX2FkZHJfdCAqZ2VuOF9wdF9kbWFfYWRkcltHRU44X0xFR0FDWV9QRFBF U107Ci0JfTsKLQl1bmlvbiB7CiAJCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXJf ZW50cnkgcGRwOwogCQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSBwZDsKIAl9Owpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBhNjhmMTgwLi5hNzg0ZDFkIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYwpAQCAtMTczMSwxNCArMTczMSwxNCBAQCBwb3B1bGF0ZV9scl9jb250 ZXh0KHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpjdHhfbwogCXJlZ19zdGF0ZVtDVFhfUERQMV9MRFddID0gR0VOOF9SSU5HX1BEUF9MRFcocmlu ZywgMSk7CiAJcmVnX3N0YXRlW0NUWF9QRFAwX1VEV10gPSBHRU44X1JJTkdfUERQX1VEVyhyaW5n LCAwKTsKIAlyZWdfc3RhdGVbQ1RYX1BEUDBfTERXXSA9IEdFTjhfUklOR19QRFBfTERXKHJpbmcs IDApOwotCXJlZ19zdGF0ZVtDVFhfUERQM19VRFcrMV0gPSB1cHBlcl8zMl9iaXRzKHBwZ3R0LT5w ZF9kbWFfYWRkclszXSk7Ci0JcmVnX3N0YXRlW0NUWF9QRFAzX0xEVysxXSA9IGxvd2VyXzMyX2Jp dHMocHBndHQtPnBkX2RtYV9hZGRyWzNdKTsKLQlyZWdfc3RhdGVbQ1RYX1BEUDJfVURXKzFdID0g dXBwZXJfMzJfYml0cyhwcGd0dC0+cGRfZG1hX2FkZHJbMl0pOwotCXJlZ19zdGF0ZVtDVFhfUERQ Ml9MRFcrMV0gPSBsb3dlcl8zMl9iaXRzKHBwZ3R0LT5wZF9kbWFfYWRkclsyXSk7Ci0JcmVnX3N0 YXRlW0NUWF9QRFAxX1VEVysxXSA9IHVwcGVyXzMyX2JpdHMocHBndHQtPnBkX2RtYV9hZGRyWzFd KTsKLQlyZWdfc3RhdGVbQ1RYX1BEUDFfTERXKzFdID0gbG93ZXJfMzJfYml0cyhwcGd0dC0+cGRf ZG1hX2FkZHJbMV0pOwotCXJlZ19zdGF0ZVtDVFhfUERQMF9VRFcrMV0gPSB1cHBlcl8zMl9iaXRz KHBwZ3R0LT5wZF9kbWFfYWRkclswXSk7Ci0JcmVnX3N0YXRlW0NUWF9QRFAwX0xEVysxXSA9IGxv d2VyXzMyX2JpdHMocHBndHQtPnBkX2RtYV9hZGRyWzBdKTsKKwlyZWdfc3RhdGVbQ1RYX1BEUDNf VURXKzFdID0gdXBwZXJfMzJfYml0cyhwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5WzNdLmRhZGRy KTsKKwlyZWdfc3RhdGVbQ1RYX1BEUDNfTERXKzFdID0gbG93ZXJfMzJfYml0cyhwcGd0dC0+cGRw LnBhZ2VfZGlyZWN0b3J5WzNdLmRhZGRyKTsKKwlyZWdfc3RhdGVbQ1RYX1BEUDJfVURXKzFdID0g dXBwZXJfMzJfYml0cyhwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5WzJdLmRhZGRyKTsKKwlyZWdf c3RhdGVbQ1RYX1BEUDJfTERXKzFdID0gbG93ZXJfMzJfYml0cyhwcGd0dC0+cGRwLnBhZ2VfZGly ZWN0b3J5WzJdLmRhZGRyKTsKKwlyZWdfc3RhdGVbQ1RYX1BEUDFfVURXKzFdID0gdXBwZXJfMzJf Yml0cyhwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5WzFdLmRhZGRyKTsKKwlyZWdfc3RhdGVbQ1RY X1BEUDFfTERXKzFdID0gbG93ZXJfMzJfYml0cyhwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5WzFd LmRhZGRyKTsKKwlyZWdfc3RhdGVbQ1RYX1BEUDBfVURXKzFdID0gdXBwZXJfMzJfYml0cyhwcGd0 dC0+cGRwLnBhZ2VfZGlyZWN0b3J5WzBdLmRhZGRyKTsKKwlyZWdfc3RhdGVbQ1RYX1BEUDBfTERX KzFdID0gbG93ZXJfMzJfYml0cyhwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5WzBdLmRhZGRyKTsK IAlpZiAocmluZy0+aWQgPT0gUkNTKSB7CiAJCXJlZ19zdGF0ZVtDVFhfTFJJX0hFQURFUl8yXSA9 IE1JX0xPQURfUkVHSVNURVJfSU1NKDEpOwogCQlyZWdfc3RhdGVbQ1RYX1JfUFdSX0NMS19TVEFU RV0gPSAweDIwYzg7Ci0tIAoyLjEuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK