From: Michel Thierry Subject: [PATCH v4 05/24] drm/i915: page table abstractions Date: Thu, 22 Jan 2015 17:01:27 +0000 Message-ID: <1421946106-7921-6-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1421946106-7921-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 04EFE72095 for ; Thu, 22 Jan 2015 09:01:30 -0800 (PST) In-Reply-To: <1421946106-7921-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 IG9mIHRoZSBtdWx0aXBsZSBsZXZlbHMgb2YgcGFnZSB0YWJsZXMgKERhbmllbCkKClNpZ25lZC1v ZmYtYnk6IEJlbiBXaWRhd3NreSA8YmVuQGJ3aWRhd3NrLm5ldD4KU2lnbmVkLW9mZi1ieTogTWlj aGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4gKHYyLCB2MykKLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDE3NyArKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIHwg IDIzICsrKystCiAyIGZpbGVzIGNoYW5nZWQsIDEwNyBpbnNlcnRpb25zKCspLCA5MyBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IGI0OGI1ODYuLjk4YjQ2 OTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0zMzQsNyArMzM0LDggQEAg c3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9jbGVhcl9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw YWNlICp2bSwKIAkJCQkgICAgICBJOTE1X0NBQ0hFX0xMQywgdXNlX3NjcmF0Y2gpOwogCiAJd2hp bGUgKG51bV9lbnRyaWVzKSB7Ci0JCXN0cnVjdCBwYWdlICpwYWdlX3RhYmxlID0gcHBndHQtPmdl bjhfcHRfcGFnZXNbcGRwZV1bcGRlXTsKKwkJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfZW50 cnkgKnBkID0gJnBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbcGRwZV07CisJCXN0cnVjdCBwYWdl ICpwYWdlX3RhYmxlID0gcGQtPnBhZ2VfdGFibGVzW3BkZV0ucGFnZTsKIAogCQlsYXN0X3B0ZSA9 IHB0ZSArIG51bV9lbnRyaWVzOwogCQlpZiAobGFzdF9wdGUgPiBHRU44X1BURVNfUEVSX1BBR0Up CkBAIC0zNzgsOCArMzc5LDEyIEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfaW5zZXJ0X2VudHJp ZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCWlmIChXQVJOX09OKHBkcGUgPj0g R0VOOF9MRUdBQ1lfUERQRVMpKQogCQkJYnJlYWs7CiAKLQkJaWYgKHB0X3ZhZGRyID09IE5VTEwp Ci0JCQlwdF92YWRkciA9IGttYXBfYXRvbWljKHBwZ3R0LT5nZW44X3B0X3BhZ2VzW3BkcGVdW3Bk ZV0pOworCQlpZiAocHRfdmFkZHIgPT0gTlVMTCkgeworCQkJc3RydWN0IGk5MTVfcGFnZV9kaXJl Y3RvcnlfZW50cnkgKnBkID0gJnBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbcGRwZV07CisJCQlz dHJ1Y3QgcGFnZSAqcGFnZV90YWJsZSA9IHBkLT5wYWdlX3RhYmxlc1twZGVdLnBhZ2U7CisKKwkJ CXB0X3ZhZGRyID0ga21hcF9hdG9taWMocGFnZV90YWJsZSk7CisJCX0KIAogCQlwdF92YWRkcltw dGVdID0KIAkJCWdlbjhfcHRlX2VuY29kZShzZ19wYWdlX2l0ZXJfZG1hX2FkZHJlc3MoJnNnX2l0 ZXIpLApAQCAtNDAzLDI5ICs0MDgsMzMgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9pbnNlcnRf ZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAl9CiB9CiAKLXN0YXRpYyB2 b2lkIGdlbjhfZnJlZV9wYWdlX3RhYmxlcyhzdHJ1Y3QgcGFnZSAqKnB0X3BhZ2VzKQorc3RhdGlj IHZvaWQgZ2VuOF9mcmVlX3BhZ2VfdGFibGVzKHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2Vu dHJ5ICpwZCkKIHsKIAlpbnQgaTsKIAotCWlmIChwdF9wYWdlcyA9PSBOVUxMKQorCWlmIChwZC0+ cGFnZV90YWJsZXMgPT0gTlVMTCkKIAkJcmV0dXJuOwogCiAJZm9yIChpID0gMDsgaSA8IEdFTjhf UERFU19QRVJfUEFHRTsgaSsrKQotCQlpZiAocHRfcGFnZXNbaV0pCi0JCQlfX2ZyZWVfcGFnZXMo cHRfcGFnZXNbaV0sIDApOworCQlpZiAocGQtPnBhZ2VfdGFibGVzW2ldLnBhZ2UpCisJCQlfX2Zy ZWVfcGFnZShwZC0+cGFnZV90YWJsZXNbaV0ucGFnZSk7CiB9CiAKLXN0YXRpYyB2b2lkIGdlbjhf cHBndHRfZnJlZShjb25zdCBzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCitzdGF0aWMgdm9p ZCBnZW44X2ZyZWVfcGFnZV9kaXJlY3RvcmllcyhzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9l bnRyeSAqcGQpCit7CisJa2ZyZWUocGQtPnBhZ2VfdGFibGVzKTsKKwlfX2ZyZWVfcGFnZShwZC0+ cGFnZSk7Cit9CisKK3N0YXRpYyB2b2lkIGdlbjhfcHBndHRfZnJlZShzdHJ1Y3QgaTkxNV9od19w cGd0dCAqcHBndHQpCiB7CiAJaW50IGk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgcHBndHQtPm51bV9w ZF9wYWdlczsgaSsrKSB7Ci0JCWdlbjhfZnJlZV9wYWdlX3RhYmxlcyhwcGd0dC0+Z2VuOF9wdF9w YWdlc1tpXSk7Ci0JCWtmcmVlKHBwZ3R0LT5nZW44X3B0X3BhZ2VzW2ldKTsKKwkJZ2VuOF9mcmVl X3BhZ2VfdGFibGVzKCZwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W2ldKTsKKwkJZ2VuOF9mcmVl X3BhZ2VfZGlyZWN0b3JpZXMoJnBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbaV0pOwogCQlrZnJl ZShwcGd0dC0+Z2VuOF9wdF9kbWFfYWRkcltpXSk7CiAJfQotCi0JX19mcmVlX3BhZ2VzKHBwZ3R0 LT5wZF9wYWdlcywgZ2V0X29yZGVyKHBwZ3R0LT5udW1fcGRfcGFnZXMgPDwgUEFHRV9TSElGVCkp OwogfQogCiBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X3VubWFwX3BhZ2VzKHN0cnVjdCBpOTE1X2h3 X3BwZ3R0ICpwcGd0dCkKQEAgLTQ2MCw4NiArNDY5LDc1IEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBn dHRfY2xlYW51cChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkKIAlnZW44X3BwZ3R0X2Zy ZWUocHBndHQpOwogfQogCi1zdGF0aWMgc3RydWN0IHBhZ2UgKipfX2dlbjhfYWxsb2NfcGFnZV90 YWJsZXModm9pZCkKK3N0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY2F0ZV9kbWEoc3RydWN0IGk5 MTVfaHdfcHBndHQgKnBwZ3R0KQogewotCXN0cnVjdCBwYWdlICoqcHRfcGFnZXM7CiAJaW50IGk7 CiAKLQlwdF9wYWdlcyA9IGtjYWxsb2MoR0VOOF9QREVTX1BFUl9QQUdFLCBzaXplb2Yoc3RydWN0 IHBhZ2UgKiksIEdGUF9LRVJORUwpOwotCWlmICghcHRfcGFnZXMpCi0JCXJldHVybiBFUlJfUFRS KC1FTk9NRU0pOwotCi0JZm9yIChpID0gMDsgaSA8IEdFTjhfUERFU19QRVJfUEFHRTsgaSsrKSB7 Ci0JCXB0X3BhZ2VzW2ldID0gYWxsb2NfcGFnZShHRlBfS0VSTkVMKTsKLQkJaWYgKCFwdF9wYWdl c1tpXSkKLQkJCWdvdG8gYmFpbDsKKwlmb3IgKGkgPSAwOyBpIDwgcHBndHQtPm51bV9wZF9wYWdl czsgaSsrKSB7CisJCXBwZ3R0LT5nZW44X3B0X2RtYV9hZGRyW2ldID0ga2NhbGxvYyhHRU44X1BE RVNfUEVSX1BBR0UsCisJCQkJCQkgICAgIHNpemVvZihkbWFfYWRkcl90KSwKKwkJCQkJCSAgICAg R0ZQX0tFUk5FTCk7CisJCWlmICghcHBndHQtPmdlbjhfcHRfZG1hX2FkZHJbaV0pCisJCQlyZXR1 cm4gLUVOT01FTTsKIAl9CiAKLQlyZXR1cm4gcHRfcGFnZXM7Ci0KLWJhaWw6Ci0JZ2VuOF9mcmVl X3BhZ2VfdGFibGVzKHB0X3BhZ2VzKTsKLQlrZnJlZShwdF9wYWdlcyk7Ci0JcmV0dXJuIEVSUl9Q VFIoLUVOT01FTSk7CisJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxv Y2F0ZV9wYWdlX3RhYmxlcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCi0JCQkJCSAgIGNv bnN0IGludCBtYXhfcGRwKQorc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9jYXRlX3BhZ2VfdGFi bGVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIHsKLQlzdHJ1Y3QgcGFnZSAqKnB0X3Bh Z2VzW0dFTjhfTEVHQUNZX1BEUEVTXTsKLQlpbnQgaSwgcmV0OworCWludCBpLCBqOwogCi0JZm9y IChpID0gMDsgaSA8IG1heF9wZHA7IGkrKykgewotCQlwdF9wYWdlc1tpXSA9IF9fZ2VuOF9hbGxv Y19wYWdlX3RhYmxlcygpOwotCQlpZiAoSVNfRVJSKHB0X3BhZ2VzW2ldKSkgewotCQkJcmV0ID0g UFRSX0VSUihwdF9wYWdlc1tpXSk7Ci0JCQlnb3RvIHVud2luZF9vdXQ7CisJZm9yIChpID0gMDsg aSA8IHBwZ3R0LT5udW1fcGRfcGFnZXM7IGkrKykgeworCQlmb3IgKGogPSAwOyBqIDwgR0VOOF9Q REVTX1BFUl9QQUdFOyBqKyspIHsKKwkJCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkgKnB0 ID0gJnBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbaV0ucGFnZV90YWJsZXNbal07CisKKwkJCXB0 LT5wYWdlID0gYWxsb2NfcGFnZShHRlBfS0VSTkVMIHwgX19HRlBfWkVSTyk7CisJCQlpZiAoIXB0 LT5wYWdlKQorCQkJCWdvdG8gdW53aW5kX291dDsKIAkJfQogCX0KIAotCS8qIE5COiBBdm9pZCB0 b3VjaGluZyBnZW44X3B0X3BhZ2VzIHVudGlsIGxhc3QgdG8ga2VlcCB0aGUgYWxsb2NhdGlvbiwK LQkgKiAiYXRvbWljIiAtIGZvciBjbGVhbnVwIHB1cnBvc2VzLgotCSAqLwotCWZvciAoaSA9IDA7 IGkgPCBtYXhfcGRwOyBpKyspCi0JCXBwZ3R0LT5nZW44X3B0X3BhZ2VzW2ldID0gcHRfcGFnZXNb aV07Ci0KIAlyZXR1cm4gMDsKIAogdW53aW5kX291dDoKLQl3aGlsZSAoaS0tKSB7Ci0JCWdlbjhf ZnJlZV9wYWdlX3RhYmxlcyhwdF9wYWdlc1tpXSk7Ci0JCWtmcmVlKHB0X3BhZ2VzW2ldKTsKLQl9 CisJd2hpbGUgKGktLSkKKwkJZ2VuOF9mcmVlX3BhZ2VfdGFibGVzKCZwcGd0dC0+cGRwLnBhZ2Vf ZGlyZWN0b3J5W2ldKTsKIAotCXJldHVybiByZXQ7CisJcmV0dXJuIC1FTk9NRU07CiB9CiAKLXN0 YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY2F0ZV9kbWEoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBw Z3R0KQorc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9jYXRlX3BhZ2VfZGlyZWN0b3JpZXMoc3Ry dWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAorCQkJCQkJY29uc3QgaW50IG1heF9wZHApCiB7CiAJ aW50IGk7CiAKLQlmb3IgKGkgPSAwOyBpIDwgcHBndHQtPm51bV9wZF9wYWdlczsgaSsrKSB7Ci0J CXBwZ3R0LT5nZW44X3B0X2RtYV9hZGRyW2ldID0ga2NhbGxvYyhHRU44X1BERVNfUEVSX1BBR0Us Ci0JCQkJCQkgICAgIHNpemVvZihkbWFfYWRkcl90KSwKLQkJCQkJCSAgICAgR0ZQX0tFUk5FTCk7 Ci0JCWlmICghcHBndHQtPmdlbjhfcHRfZG1hX2FkZHJbaV0pCi0JCQlyZXR1cm4gLUVOT01FTTsK LQl9CisJZm9yIChpID0gMDsgaSA8IG1heF9wZHA7IGkrKykgeworCQlzdHJ1Y3QgaTkxNV9wYWdl X3RhYmxlX2VudHJ5ICpwdDsKIAotCXJldHVybiAwOwotfQorCQlwdCA9IGtjYWxsb2MoR0VOOF9Q REVTX1BFUl9QQUdFLCBzaXplb2YoKnB0KSwgR0ZQX0tFUk5FTCk7CisJCWlmICghcHQpCisJCQln b3RvIHVud2luZF9vdXQ7CiAKLXN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY2F0ZV9wYWdlX2Rp cmVjdG9yaWVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKLQkJCQkJCWNvbnN0IGludCBt YXhfcGRwKQotewotCXBwZ3R0LT5wZF9wYWdlcyA9IGFsbG9jX3BhZ2VzKEdGUF9LRVJORUwsIGdl dF9vcmRlcihtYXhfcGRwIDw8IFBBR0VfU0hJRlQpKTsKLQlpZiAoIXBwZ3R0LT5wZF9wYWdlcykK LQkJcmV0dXJuIC1FTk9NRU07CisJCXBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbaV0ucGFnZSA9 IGFsbG9jX3BhZ2UoR0ZQX0tFUk5FTCk7CisJCWlmICghcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9y eVtpXS5wYWdlKQorCQkJZ290byB1bndpbmRfb3V0OworCisJCXBwZ3R0LT5wZHAucGFnZV9kaXJl Y3RvcnlbaV0ucGFnZV90YWJsZXMgPSBwdDsKKwl9CiAKLQlwcGd0dC0+bnVtX3BkX3BhZ2VzID0g MSA8PCBnZXRfb3JkZXIobWF4X3BkcCA8PCBQQUdFX1NISUZUKTsKKwlwcGd0dC0+bnVtX3BkX3Bh Z2VzID0gbWF4X3BkcDsKIAlCVUdfT04ocHBndHQtPm51bV9wZF9wYWdlcyA+IEdFTjhfTEVHQUNZ X1BEUEVTKTsKIAogCXJldHVybiAwOworCit1bndpbmRfb3V0OgorCXdoaWxlIChpLS0pIHsKKwkJ a2ZyZWUocHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXS5wYWdlX3RhYmxlcyk7CisJCV9fZnJl ZV9wYWdlKHBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbaV0ucGFnZSk7CisJfQorCisJcmV0dXJu IC1FTk9NRU07CiB9CiAKIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvYyhzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQsCkBAIC01NTEsMTggKzU0OSwxOSBAQCBzdGF0aWMgaW50IGdlbjhfcHBn dHRfYWxsb2Moc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogCWlmIChyZXQpCiAJCXJldHVy biByZXQ7CiAKLQlyZXQgPSBnZW44X3BwZ3R0X2FsbG9jYXRlX3BhZ2VfdGFibGVzKHBwZ3R0LCBt YXhfcGRwKTsKLQlpZiAocmV0KSB7Ci0JCV9fZnJlZV9wYWdlcyhwcGd0dC0+cGRfcGFnZXMsIGdl dF9vcmRlcihtYXhfcGRwIDw8IFBBR0VfU0hJRlQpKTsKLQkJcmV0dXJuIHJldDsKLQl9CisJcmV0 ID0gZ2VuOF9wcGd0dF9hbGxvY2F0ZV9wYWdlX3RhYmxlcyhwcGd0dCk7CisJaWYgKHJldCkKKwkJ Z290byBlcnJfb3V0OwogCiAJcHBndHQtPm51bV9wZF9lbnRyaWVzID0gbWF4X3BkcCAqIEdFTjhf UERFU19QRVJfUEFHRTsKIAogCXJldCA9IGdlbjhfcHBndHRfYWxsb2NhdGVfZG1hKHBwZ3R0KTsK LQlpZiAocmV0KQotCQlnZW44X3BwZ3R0X2ZyZWUocHBndHQpOworCWlmICghcmV0KQorCQlyZXR1 cm4gcmV0OwogCisJLyogVE9ETzogQ2hlY2sgdGhpcyBmb3IgYWxsIGNhc2VzICovCitlcnJfb3V0 OgorCWdlbjhfcHBndHRfZnJlZShwcGd0dCk7CiAJcmV0dXJuIHJldDsKIH0KIApAQCAtNTczLDcg KzU3Miw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9zZXR1cF9wYWdlX2RpcmVjdG9yaWVzKHN0 cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAlpbnQgcmV0OwogCiAJcGRfYWRkciA9IHBjaV9t YXBfcGFnZShwcGd0dC0+YmFzZS5kZXYtPnBkZXYsCi0JCQkgICAgICAgJnBwZ3R0LT5wZF9wYWdl c1twZF0sIDAsCisJCQkgICAgICAgcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtwZF0ucGFnZSwg MCwKIAkJCSAgICAgICBQQUdFX1NJWkUsIFBDSV9ETUFfQklESVJFQ1RJT05BTCk7CiAKIAlyZXQg PSBwY2lfZG1hX21hcHBpbmdfZXJyb3IocHBndHQtPmJhc2UuZGV2LT5wZGV2LCBwZF9hZGRyKTsK QEAgLTU5Myw3ICs1OTIsNyBAQCBzdGF0aWMgaW50IGdlbjhfcHBndHRfc2V0dXBfcGFnZV90YWJs ZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogCXN0cnVjdCBwYWdlICpwOwogCWludCBy ZXQ7CiAKLQlwID0gcHBndHQtPmdlbjhfcHRfcGFnZXNbcGRdW3B0XTsKKwlwID0gcHBndHQtPnBk cC5wYWdlX2RpcmVjdG9yeVtwZF0ucGFnZV90YWJsZXNbcHRdLnBhZ2U7CiAJcHRfYWRkciA9IHBj aV9tYXBfcGFnZShwcGd0dC0+YmFzZS5kZXYtPnBkZXYsCiAJCQkgICAgICAgcCwgMCwgUEFHRV9T SVpFLCBQQ0lfRE1BX0JJRElSRUNUSU9OQUwpOwogCXJldCA9IHBjaV9kbWFfbWFwcGluZ19lcnJv cihwcGd0dC0+YmFzZS5kZXYtPnBkZXYsIHB0X2FkZHIpOwpAQCAtNjU0LDcgKzY1Myw3IEBAIHN0 YXRpYyBpbnQgZ2VuOF9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgdWlu dDY0X3Qgc2l6ZSkKIAkgKi8KIAlmb3IgKGkgPSAwOyBpIDwgbWF4X3BkcDsgaSsrKSB7CiAJCWdl bjhfcHBndHRfcGRlX3QgKnBkX3ZhZGRyOwotCQlwZF92YWRkciA9IGttYXBfYXRvbWljKCZwcGd0 dC0+cGRfcGFnZXNbaV0pOworCQlwZF92YWRkciA9IGttYXBfYXRvbWljKHBwZ3R0LT5wZHAucGFn ZV9kaXJlY3RvcnlbaV0ucGFnZSk7CiAJCWZvciAoaiA9IDA7IGogPCBHRU44X1BERVNfUEVSX1BB R0U7IGorKykgewogCQkJZG1hX2FkZHJfdCBhZGRyID0gcHBndHQtPmdlbjhfcHRfZG1hX2FkZHJb aV1bal07CiAJCQlwZF92YWRkcltqXSA9IGdlbjhfcGRlX2VuY29kZShwcGd0dC0+YmFzZS5kZXYs IGFkZHIsCkBAIC03MTcsNyArNzE2LDcgQEAgc3RhdGljIHZvaWQgZ2VuNl9kdW1wX3BwZ3R0KHN0 cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgc3RydWN0IHNlcV9maWxlICptKQogCQkJCSAgIGV4 cGVjdGVkKTsKIAkJc2VxX3ByaW50ZihtLCAiXHRQREU6ICV4XG4iLCBwZF9lbnRyeSk7CiAKLQkJ cHRfdmFkZHIgPSBrbWFwX2F0b21pYyhwcGd0dC0+cHRfcGFnZXNbcGRlXSk7CisJCXB0X3ZhZGRy ID0ga21hcF9hdG9taWMocHBndHQtPnBkLnBhZ2VfdGFibGVzW3BkZV0ucGFnZSk7CiAJCWZvciAo cHRlID0gMDsgcHRlIDwgSTkxNV9QUEdUVF9QVF9FTlRSSUVTOyBwdGUrPTQpIHsKIAkJCXVuc2ln bmVkIGxvbmcgdmEgPQogCQkJCShwZGUgKiBQQUdFX1NJWkUgKiBJOTE1X1BQR1RUX1BUX0VOVFJJ RVMpICsKQEAgLTkyMiw3ICs5MjEsNyBAQCBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0X2NsZWFyX3Jh bmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQlpZiAobGFzdF9wdGUgPiBJOTE1 X1BQR1RUX1BUX0VOVFJJRVMpCiAJCQlsYXN0X3B0ZSA9IEk5MTVfUFBHVFRfUFRfRU5UUklFUzsK IAotCQlwdF92YWRkciA9IGttYXBfYXRvbWljKHBwZ3R0LT5wdF9wYWdlc1thY3RfcHRdKTsKKwkJ cHRfdmFkZHIgPSBrbWFwX2F0b21pYyhwcGd0dC0+cGQucGFnZV90YWJsZXNbYWN0X3B0XS5wYWdl KTsKIAogCQlmb3IgKGkgPSBmaXJzdF9wdGU7IGkgPCBsYXN0X3B0ZTsgaSsrKQogCQkJcHRfdmFk ZHJbaV0gPSBzY3JhdGNoX3B0ZTsKQEAgLTk1MSw3ICs5NTAsNyBAQCBzdGF0aWMgdm9pZCBnZW42 X3BwZ3R0X2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCXB0 X3ZhZGRyID0gTlVMTDsKIAlmb3JfZWFjaF9zZ19wYWdlKHBhZ2VzLT5zZ2wsICZzZ19pdGVyLCBw YWdlcy0+bmVudHMsIDApIHsKIAkJaWYgKHB0X3ZhZGRyID09IE5VTEwpCi0JCQlwdF92YWRkciA9 IGttYXBfYXRvbWljKHBwZ3R0LT5wdF9wYWdlc1thY3RfcHRdKTsKKwkJCXB0X3ZhZGRyID0ga21h cF9hdG9taWMocHBndHQtPnBkLnBhZ2VfdGFibGVzW2FjdF9wdF0ucGFnZSk7CiAKIAkJcHRfdmFk ZHJbYWN0X3B0ZV0gPQogCQkJdm0tPnB0ZV9lbmNvZGUoc2dfcGFnZV9pdGVyX2RtYV9hZGRyZXNz KCZzZ19pdGVyKSwKQEAgLTk4Niw4ICs5ODUsOCBAQCBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0X2Zy ZWUoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogCiAJa2ZyZWUocHBndHQtPnB0X2RtYV9h ZGRyKTsKIAlmb3IgKGkgPSAwOyBpIDwgcHBndHQtPm51bV9wZF9lbnRyaWVzOyBpKyspCi0JCV9f ZnJlZV9wYWdlKHBwZ3R0LT5wdF9wYWdlc1tpXSk7Ci0Ja2ZyZWUocHBndHQtPnB0X3BhZ2VzKTsK KwkJX19mcmVlX3BhZ2UocHBndHQtPnBkLnBhZ2VfdGFibGVzW2ldLnBhZ2UpOworCWtmcmVlKHBw Z3R0LT5wZC5wYWdlX3RhYmxlcyk7CiB9CiAKIHN0YXRpYyB2b2lkIGdlbjZfcHBndHRfY2xlYW51 cChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkKQEAgLTEwNDQsMjIgKzEwNDMsMjIgQEAg YWxsb2M6CiAKIHN0YXRpYyBpbnQgZ2VuNl9wcGd0dF9hbGxvY2F0ZV9wYWdlX3RhYmxlcyhzdHJ1 Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiB7CisJc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRy eSAqcHQ7CiAJaW50IGk7CiAKLQlwcGd0dC0+cHRfcGFnZXMgPSBrY2FsbG9jKHBwZ3R0LT5udW1f cGRfZW50cmllcywgc2l6ZW9mKHN0cnVjdCBwYWdlICopLAotCQkJCSAgR0ZQX0tFUk5FTCk7Ci0K LQlpZiAoIXBwZ3R0LT5wdF9wYWdlcykKKwlwdCA9IGtjYWxsb2MocHBndHQtPm51bV9wZF9lbnRy aWVzLCBzaXplb2YoKnB0KSwgR0ZQX0tFUk5FTCk7CisJaWYgKCFwdCkKIAkJcmV0dXJuIC1FTk9N RU07CiAKIAlmb3IgKGkgPSAwOyBpIDwgcHBndHQtPm51bV9wZF9lbnRyaWVzOyBpKyspIHsKLQkJ cHBndHQtPnB0X3BhZ2VzW2ldID0gYWxsb2NfcGFnZShHRlBfS0VSTkVMKTsKLQkJaWYgKCFwcGd0 dC0+cHRfcGFnZXNbaV0pIHsKKwkJcHRbaV0ucGFnZSA9IGFsbG9jX3BhZ2UoR0ZQX0tFUk5FTCk7 CisJCWlmICghcHQtPnBhZ2UpIHsKIAkJCWdlbjZfcHBndHRfZnJlZShwcGd0dCk7CiAJCQlyZXR1 cm4gLUVOT01FTTsKIAkJfQogCX0KIAorCXBwZ3R0LT5wZC5wYWdlX3RhYmxlcyA9IHB0OwogCXJl dHVybiAwOwogfQogCkBAIC0xMDk0LDkgKzEwOTMsMTEgQEAgc3RhdGljIGludCBnZW42X3BwZ3R0 X3NldHVwX3BhZ2VfdGFibGVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAlpbnQgaTsK IAogCWZvciAoaSA9IDA7IGkgPCBwcGd0dC0+bnVtX3BkX2VudHJpZXM7IGkrKykgeworCQlzdHJ1 Y3QgcGFnZSAqcGFnZTsKIAkJZG1hX2FkZHJfdCBwdF9hZGRyOwogCi0JCXB0X2FkZHIgPSBwY2lf bWFwX3BhZ2UoZGV2LT5wZGV2LCBwcGd0dC0+cHRfcGFnZXNbaV0sIDAsIDQwOTYsCisJCXBhZ2Ug PSBwcGd0dC0+cGQucGFnZV90YWJsZXNbaV0ucGFnZTsKKwkJcHRfYWRkciA9IHBjaV9tYXBfcGFn ZShkZXYtPnBkZXYsIHBhZ2UsIDAsIDQwOTYsCiAJCQkJICAgICAgIFBDSV9ETUFfQklESVJFQ1RJ T05BTCk7CiAKIAkJaWYgKHBjaV9kbWFfbWFwcGluZ19lcnJvcihkZXYtPnBkZXYsIHB0X2FkZHIp KSB7CkBAIC0xMTQwLDcgKzExNDEsNyBAQCBzdGF0aWMgaW50IGdlbjZfcHBndHRfaW5pdChzdHJ1 Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJcHBndHQtPmJhc2UuaW5zZXJ0X2VudHJpZXMgPSBn ZW42X3BwZ3R0X2luc2VydF9lbnRyaWVzOwogCXBwZ3R0LT5iYXNlLmNsZWFudXAgPSBnZW42X3Bw Z3R0X2NsZWFudXA7CiAJcHBndHQtPmJhc2Uuc3RhcnQgPSAwOwotCXBwZ3R0LT5iYXNlLnRvdGFs ID0gIHBwZ3R0LT5udW1fcGRfZW50cmllcyAqIEk5MTVfUFBHVFRfUFRfRU5UUklFUyAqIFBBR0Vf U0laRTsKKwlwcGd0dC0+YmFzZS50b3RhbCA9IHBwZ3R0LT5udW1fcGRfZW50cmllcyAqIEk5MTVf UFBHVFRfUFRfRU5UUklFUyAqIFBBR0VfU0laRTsKIAlwcGd0dC0+ZGVidWdfZHVtcCA9IGdlbjZf ZHVtcF9wcGd0dDsKIAogCXBwZ3R0LT5wZF9vZmZzZXQgPQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ndHQuaAppbmRleCA4Zjc2OTkwLi5kOWJjMzc1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ndHQuaApAQCAtMTg3LDYgKzE4NywyMCBAQCBzdHJ1Y3QgaTkxNV92bWEgewogCQkJIHUzMiBm bGFncyk7CiB9OwogCitzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5IHsKKwlzdHJ1Y3QgcGFn ZSAqcGFnZTsKK307CisKK3N0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5IHsKKwlzdHJ1 Y3QgcGFnZSAqcGFnZTsgLyogTlVMTCBmb3IgR0VONi1HRU43ICovCisJc3RydWN0IGk5MTVfcGFn ZV90YWJsZV9lbnRyeSAqcGFnZV90YWJsZXM7Cit9OworCitzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVj dG9yeV9wb2ludGVyX2VudHJ5IHsKKwkvKiBzdHJ1Y3QgcGFnZSAqcGFnZTsgKi8KKwlzdHJ1Y3Qg aTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSBwYWdlX2RpcmVjdG9yeVtHRU44X0xFR0FDWV9QRFBF U107Cit9OworCiBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlIHsKIAlzdHJ1Y3QgZHJtX21tIG1t OwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXY7CkBAIC0yNzIsMTEgKzI4Niw2IEBAIHN0cnVjdCBp OTE1X2h3X3BwZ3R0IHsKIAl1bnNpZ25lZCBudW1fcGRfZW50cmllczsKIAl1bnNpZ25lZCBudW1f cGRfcGFnZXM7IC8qIGdlbjgrICovCiAJdW5pb24gewotCQlzdHJ1Y3QgcGFnZSAqKnB0X3BhZ2Vz OwotCQlzdHJ1Y3QgcGFnZSAqKmdlbjhfcHRfcGFnZXNbR0VOOF9MRUdBQ1lfUERQRVNdOwotCX07 Ci0Jc3RydWN0IHBhZ2UgKnBkX3BhZ2VzOwotCXVuaW9uIHsKIAkJdWludDMyX3QgcGRfb2Zmc2V0 OwogCQlkbWFfYWRkcl90IHBkX2RtYV9hZGRyW0dFTjhfTEVHQUNZX1BEUEVTXTsKIAl9OwpAQCAt Mjg0LDYgKzI5MywxMCBAQCBzdHJ1Y3QgaTkxNV9od19wcGd0dCB7CiAJCWRtYV9hZGRyX3QgKnB0 X2RtYV9hZGRyOwogCQlkbWFfYWRkcl90ICpnZW44X3B0X2RtYV9hZGRyW0dFTjhfTEVHQUNZX1BE UEVTXTsKIAl9OworCXVuaW9uIHsKKwkJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRl cl9lbnRyeSBwZHA7CisJCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5IHBkOworCX07 CiAKIAlzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlICpmaWxlX3ByaXY7CiAKLS0gCjIuMS4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=