From: Michel Thierry Subject: [PATCH v4 21/24] drm/i915/bdw: Split out mappings Date: Thu, 22 Jan 2015 17:01:43 +0000 Message-ID: <1421946106-7921-22-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 497DD720B9 for ; Thu, 22 Jan 2015 09:01:46 -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 IGRvIGR5bmFtaWMgcGFnZSB0YWJsZSBhbGxvY2F0aW9ucyBmb3IgZ2VuOCwgd2UnbGwgbmVlZCB0 byBoYXZlCm1vcmUgY29udHJvbCBvdmVyIGhvdyBhbmQgd2hlbiB3ZSBtYXAgcGFnZSB0YWJsZXMs IHNpbWlsYXIgdG8gZ2VuNi4KSW4gcGFydGljdWxhciwgRE1BIG1hcHBpbmdzIGZvciBwYWdlIGRp cmVjdG9yaWVzL3RhYmxlcyBvY2N1ciBhdCBhbGxvY2F0aW9uCnRpbWUuCgpUaGlzIHBhdGNoIGFk ZHMgdGhlIGZ1bmN0aW9uYWxpdHkgYW5kIGNhbGxzIGl0IGF0IGluaXQsIHdoaWNoIHNob3VsZApo YXZlIG5vIGZ1bmN0aW9uYWwgY2hhbmdlLgoKVGhlIFBEUEVzIGFyZSBzdGlsbCBhIHNwZWNpYWwg Y2FzZSBmb3Igbm93LiBXZSdsbCBuZWVkIGEgZnVuY3Rpb24gZm9yCnRoYXQgaW4gdGhlIGZ1dHVy ZSBhcyB3ZWxsLgoKdjI6IEhhbmRsZSByZW5hbWVkIHVubWFwX2FuZF9mcmVlX3BhZ2UgZnVuY3Rp b25zLgp2MzogVXBkYXRlZCBhZnRlciB0ZWFyZG93bl92YSBsb2dpYyB3YXMgcmVtb3ZlZC4KClNp Z25lZC1vZmYtYnk6IEJlbiBXaWRhd3NreSA8YmVuQGJ3aWRhd3NrLm5ldD4KU2lnbmVkLW9mZi1i eTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4gKHYyKykKLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDE3NyArKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2OSBpbnNlcnRpb25zKCspLCAx MDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCA2NmMy YTlkLi5lNjYyMDM5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtNDEzLDE3 ICs0MTMsMjAgQEAgZXJyX291dDoKIAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMgdm9pZCB1bm1h cF9hbmRfZnJlZV9wZChzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSAqcGQpCitzdGF0 aWMgdm9pZCB1bm1hcF9hbmRfZnJlZV9wZChzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRy eSAqcGQsCisJCQkgICAgICAgc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlpZiAocGQtPnBh Z2UpIHsKKwkJaTkxNV9kbWFfdW5tYXBfc2luZ2xlKHBkLCBkZXYpOwogCQlfX2ZyZWVfcGFnZShw ZC0+cGFnZSk7CiAJCWtmcmVlKHBkKTsKIAl9CiB9CiAKLXN0YXRpYyBzdHJ1Y3QgaTkxNV9wYWdl X2RpcmVjdG9yeV9lbnRyeSAqYWxsb2NfcGRfc2luZ2xlKHZvaWQpCitzdGF0aWMgc3RydWN0IGk5 MTVfcGFnZV9kaXJlY3RvcnlfZW50cnkgKmFsbG9jX3BkX3NpbmdsZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogewogCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwZDsKKwlpbnQg cmV0OwogCiAJcGQgPSBremFsbG9jKHNpemVvZigqcGQpLCBHRlBfS0VSTkVMKTsKIAlpZiAoIXBk KQpAQCAtNDM1LDYgKzQzOCwxMyBAQCBzdGF0aWMgc3RydWN0IGk5MTVfcGFnZV9kaXJlY3Rvcnlf ZW50cnkgKmFsbG9jX3BkX3NpbmdsZSh2b2lkKQogCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsK IAl9CiAKKwlyZXQgPSBpOTE1X2RtYV9tYXBfcHhfc2luZ2xlKHBkLCBkZXYpOworCWlmIChyZXQp IHsKKwkJX19mcmVlX3BhZ2UocGQtPnBhZ2UpOworCQlrZnJlZShwZCk7CisJCXJldHVybiBFUlJf UFRSKHJldCk7CisJfQorCiAJcmV0dXJuIHBkOwogfQogCkBAIC01ODksNiArNTk5LDM2IEBAIHN0 YXRpYyB2b2lkIGdlbjhfcHBndHRfaW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19z cGFjZSAqdm0sCiAJfQogfQogCitzdGF0aWMgdm9pZCBfX2dlbjhfZG9fbWFwX3B0KGdlbjhfcHBn dHRfcGRlX3QgKnBkZSwKKwkJCSAgICAgc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQs CisJCQkgICAgIHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7CisJZ2VuOF9wcGd0dF9wZGVfdCBl bnRyeSA9CisJCWdlbjhfcGRlX2VuY29kZShkZXYsIHB0LT5kYWRkciwgSTkxNV9DQUNIRV9MTEMp OworCSpwZGUgPSBlbnRyeTsKK30KKworLyogSXQncyBsaWtlbHkgd2UnbGwgbWFwIG1vcmUgdGhh biBvbmUgcGFnZXRhYmxlIGF0IGEgdGltZS4gVGhpcyBmdW5jdGlvbiB3aWxsCisgKiBzYXZlIHVz IHVubmVjZXNzYXJ5IGttYXAgY2FsbHMsIGJ1dCBkbyBubyBtb3JlIGZ1bmN0aW9uYWxseSB0aGFu IG11bHRpcGxlCisgKiBjYWxscyB0byBtYXBfcHQuICovCitzdGF0aWMgdm9pZCBnZW44X21hcF9w YWdldGFibGVfcmFuZ2Uoc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfZW50cnkgKnBkLAorCQkJ CSAgICAgdWludDY0X3Qgc3RhcnQsCisJCQkJICAgICB1aW50NjRfdCBsZW5ndGgsCisJCQkJICAg ICBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQoreworCWdlbjhfcHBndHRfcGRlX3QgKnBhZ2VfZGly ZWN0b3J5ID0ga21hcF9hdG9taWMocGQtPnBhZ2UpOworCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGVf ZW50cnkgKnB0OworCXVpbnQ2NF90IHRlbXAsIHBkZTsKKworCWdlbjhfZm9yX2VhY2hfcGRlKHB0 LCBwZCwgc3RhcnQsIGxlbmd0aCwgdGVtcCwgcGRlKQorCQlfX2dlbjhfZG9fbWFwX3B0KHBhZ2Vf ZGlyZWN0b3J5ICsgcGRlLCBwdCwgZGV2KTsKKworCWlmICghSEFTX0xMQyhkZXYpKQorCQlkcm1f Y2xmbHVzaF92aXJ0X3JhbmdlKHBhZ2VfZGlyZWN0b3J5LCBQQUdFX1NJWkUpOworCisJa3VubWFw X2F0b21pYyhwYWdlX2RpcmVjdG9yeSk7Cit9CisKIHN0YXRpYyB2b2lkIGdlbjhfZnJlZV9wYWdl X3RhYmxlcyhzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSAqcGQsIHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiB7CiAJaW50IGk7CkBAIC02NDQsNyArNjg0LDcgQEAgc3RhdGljIHZvaWQg Z2VuOF9wcGd0dF9mcmVlKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAkJCWNvbnRpbnVl OwogCiAJCWdlbjhfZnJlZV9wYWdlX3RhYmxlcyhwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W2ld LCBwcGd0dC0+YmFzZS5kZXYpOwotCQl1bm1hcF9hbmRfZnJlZV9wZChwcGd0dC0+cGRwLnBhZ2Vf ZGlyZWN0b3J5W2ldKTsKKwkJdW5tYXBfYW5kX2ZyZWVfcGQocHBndHQtPnBkcC5wYWdlX2RpcmVj dG9yeVtpXSwgcHBndHQtPmJhc2UuZGV2KTsKIAl9CiB9CiAKQEAgLTY4NCw3ICs3MjQsOCBAQCB1 bndpbmRfb3V0OgogCiBzdGF0aWMgaW50IGdlbjhfcHBndHRfYWxsb2NfcGFnZV9kaXJlY3Rvcmll cyhzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyX2VudHJ5ICpwZHAsCiAJCQkJICAg ICB1aW50NjRfdCBzdGFydCwKLQkJCQkgICAgIHVpbnQ2NF90IGxlbmd0aCkKKwkJCQkgICAgIHVp bnQ2NF90IGxlbmd0aCwKKwkJCQkgICAgIHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3Ry dWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfZW50cnkgKnVudXNlZDsKIAl1aW50NjRfdCB0ZW1wOwpA QCAtNjk1LDcgKzczNiw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY19wYWdlX2RpcmVj dG9yaWVzKHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXJfCiAKIAlnZW44X2Zvcl9l YWNoX3BkcGUodW51c2VkLCBwZHAsIHN0YXJ0LCBsZW5ndGgsIHRlbXAsIHBkcGUpIHsKIAkJQlVH X09OKHVudXNlZCk7Ci0JCXBkcC0+cGFnZV9kaXJlY3RvcnlbcGRwZV0gPSBhbGxvY19wZF9zaW5n bGUoKTsKKwkJcGRwLT5wYWdlX2RpcmVjdG9yeVtwZHBlXSA9IGFsbG9jX3BkX3NpbmdsZShkZXYp OwogCQlpZiAoSVNfRVJSKHBkcC0+cGFnZV9kaXJlY3RvcnlbcGRwZV0pKQogCQkJZ290byB1bndp bmRfb3V0OwogCX0KQEAgLTcwNCwyMSArNzQ1LDI0IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9h bGxvY19wYWdlX2RpcmVjdG9yaWVzKHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXJf CiAKIHVud2luZF9vdXQ6CiAJd2hpbGUgKHBkcGUtLSkKLQkJdW5tYXBfYW5kX2ZyZWVfcGQocGRw LT5wYWdlX2RpcmVjdG9yeVtwZHBlXSk7CisJCXVubWFwX2FuZF9mcmVlX3BkKHBkcC0+cGFnZV9k aXJlY3RvcnlbcGRwZV0sIGRldik7CiAKIAlyZXR1cm4gLUVOT01FTTsKIH0KIAotc3RhdGljIGlu dCBnZW44X3BwZ3R0X2FsbG9jKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKLQkJCSAgICB1 aW50NjRfdCBzdGFydCwKLQkJCSAgICB1aW50NjRfdCBsZW5ndGgpCitzdGF0aWMgaW50IGdlbjhf YWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCisJCQkgICAgICAg dWludDY0X3Qgc3RhcnQsCisJCQkgICAgICAgdWludDY0X3QgbGVuZ3RoKQogeworCXN0cnVjdCBp OTE1X2h3X3BwZ3R0ICpwcGd0dCA9CisJCWNvbnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVfaHdf cHBndHQsIGJhc2UpOwogCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwZDsKIAl1 aW50NjRfdCB0ZW1wOwogCXVpbnQzMl90IHBkcGU7CiAJaW50IHJldDsKIAotCXJldCA9IGdlbjhf cHBndHRfYWxsb2NfcGFnZV9kaXJlY3RvcmllcygmcHBndHQtPnBkcCwgc3RhcnQsIGxlbmd0aCk7 CisJcmV0ID0gZ2VuOF9wcGd0dF9hbGxvY19wYWdlX2RpcmVjdG9yaWVzKCZwcGd0dC0+cGRwLCBz dGFydCwgbGVuZ3RoLAorCQkJCQlwcGd0dC0+YmFzZS5kZXYpOwogCWlmIChyZXQpCiAJCXJldHVy biByZXQ7CiAKQEAgLTczMSwxMzQgKzc3NSw1MSBAQCBzdGF0aWMgaW50IGdlbjhfcHBndHRfYWxs b2Moc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogCiAJcmV0dXJuIDA7CiAKLQkvKiBUT0RP OiBDaGVjayB0aGlzIGZvciBhbGwgY2FzZXMgKi8KIGVycl9vdXQ6CiAJZ2VuOF9wcGd0dF9mcmVl KHBwZ3R0KTsKIAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMgaW50IGdlbjhfcHBndHRfc2V0dXBf cGFnZV9kaXJlY3RvcmllcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCi0JCQkJCSAgICAg Y29uc3QgaW50IHBkKQotewotCWRtYV9hZGRyX3QgcGRfYWRkcjsKLQlpbnQgcmV0OwotCi0JcGRf YWRkciA9IHBjaV9tYXBfcGFnZShwcGd0dC0+YmFzZS5kZXYtPnBkZXYsCi0JCQkgICAgICAgcHBn dHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtwZF0tPnBhZ2UsIDAsCi0JCQkgICAgICAgUEFHRV9TSVpF LCBQQ0lfRE1BX0JJRElSRUNUSU9OQUwpOwotCi0JcmV0ID0gcGNpX2RtYV9tYXBwaW5nX2Vycm9y KHBwZ3R0LT5iYXNlLmRldi0+cGRldiwgcGRfYWRkcik7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJl dDsKLQotCXBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbcGRdLT5kYWRkciA9IHBkX2FkZHI7Ci0K LQlyZXR1cm4gMDsKLX0KLQotc3RhdGljIGludCBnZW44X3BwZ3R0X3NldHVwX3BhZ2VfdGFibGVz KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKLQkJCQkJY29uc3QgaW50IHBkLAotCQkJCQlj b25zdCBpbnQgcHQpCi17Ci0JZG1hX2FkZHJfdCBwdF9hZGRyOwotCXN0cnVjdCBpOTE1X3BhZ2Vf ZGlyZWN0b3J5X2VudHJ5ICpwZGlyID0gcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtwZF07Ci0J c3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHRhYiA9IHBkaXItPnBhZ2VfdGFibGVzW3B0 XTsKLQlzdHJ1Y3QgcGFnZSAqcCA9IHB0YWItPnBhZ2U7Ci0JaW50IHJldDsKLQotCXB0X2FkZHIg PSBwY2lfbWFwX3BhZ2UocHBndHQtPmJhc2UuZGV2LT5wZGV2LAotCQkJICAgICAgIHAsIDAsIFBB R0VfU0laRSwgUENJX0RNQV9CSURJUkVDVElPTkFMKTsKLQlyZXQgPSBwY2lfZG1hX21hcHBpbmdf ZXJyb3IocHBndHQtPmJhc2UuZGV2LT5wZGV2LCBwdF9hZGRyKTsKLQlpZiAocmV0KQotCQlyZXR1 cm4gcmV0OwotCi0JcHRhYi0+ZGFkZHIgPSBwdF9hZGRyOwotCi0JcmV0dXJuIDA7Ci19Ci0KIC8q KgogICogR0VOOCBsZWdhY3kgcHBndHQgcHJvZ3JhbW1pbmcgaXMgYWNjb21wbGlzaGVkIHRocm91 Z2ggYSBtYXggNCBQRFAgcmVnaXN0ZXJzCiAgKiB3aXRoIGEgbmV0IGVmZmVjdCByZXNlbWJsaW5n IGEgMi1sZXZlbCBwYWdlIHRhYmxlIGluIG5vcm1hbCB4ODYgdGVybXMuIEVhY2gKICAqIFBEUCBy ZXByZXNlbnRzIDFHQiBvZiBtZW1vcnkgNCAqIDUxMiAqIDUxMiAqIDQwOTYgPSA0R0IgbGVnYWN5 IDMyYiBhZGRyZXNzCiAgKiBzcGFjZS4KICAqCi0gKiBGSVhNRTogc3BsaXQgYWxsb2NhdGlvbiBp bnRvIHNtYWxsZXIgcGllY2VzLiBGb3Igbm93IHdlIG9ubHkgZXZlciBkbyB0aGlzCi0gKiBvbmNl LCBidXQgd2l0aCBmdWxsIFBQR1RULCB0aGUgbXVsdGlwbGUgY29udGlndW91cyBhbGxvY2F0aW9u cyB3aWxsIGJlIGJhZC4KLSAqIFRPRE86IERvIHNvbWV0aGluZyB3aXRoIHRoZSBzaXplIHBhcmFt ZXRlcgogICovCiBzdGF0aWMgaW50IGdlbjhfcHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0 dCAqcHBndHQsIHVpbnQ2NF90IHNpemUpCiB7Ci0JY29uc3QgaW50IG1heF9wZHAgPSBESVZfUk9V TkRfVVAoc2l6ZSwgMSA8PCAzMCk7Ci0JaW50IGksIGosIHJldDsKLQotCWlmIChzaXplICUgKDE8 PDMwKSkKLQkJRFJNX0lORk8oIlBhZ2VzIHdpbGwgYmUgd2FzdGVkIHVubGVzcyBHVFQgc2l6ZSAo JWxsdSkgaXMgZGl2aXNpYmxlIGJ5IDFHQlxuIiwgc2l6ZSk7CisJc3RydWN0IGk5MTVfcGFnZV9k aXJlY3RvcnlfZW50cnkgKnBkOworCXVpbnQ2NF90IHRlbXAsIHN0YXJ0ID0gMDsKKwljb25zdCB1 aW50NjRfdCBvcmlnX2xlbmd0aCA9IHNpemU7CisJdWludDMyX3QgcGRwZTsKKwlpbnQgcmV0Owog CiAJcHBndHQtPmJhc2Uuc3RhcnQgPSAwOwogCXBwZ3R0LT5iYXNlLnRvdGFsID0gc2l6ZTsKKwlw cGd0dC0+YmFzZS5jbGVhcl9yYW5nZSA9IGdlbjhfcHBndHRfY2xlYXJfcmFuZ2U7CisJcHBndHQt PmJhc2UuaW5zZXJ0X2VudHJpZXMgPSBnZW44X3BwZ3R0X2luc2VydF9lbnRyaWVzOworCXBwZ3R0 LT5iYXNlLmNsZWFudXAgPSBnZW44X3BwZ3R0X2NsZWFudXA7CisJcHBndHQtPnN3aXRjaF9tbSA9 IGdlbjhfbW1fc3dpdGNoOwogCiAJcHBndHQtPnNjcmF0Y2hfcGQgPSBhbGxvY19wdF9zY3JhdGNo KHBwZ3R0LT5iYXNlLmRldik7CiAJaWYgKElTX0VSUihwcGd0dC0+c2NyYXRjaF9wZCkpCiAJCXJl dHVybiBQVFJfRVJSKHBwZ3R0LT5zY3JhdGNoX3BkKTsKIAotCS8qIDEuIERvIGFsbCBvdXIgYWxs b2NhdGlvbnMgZm9yIHBhZ2UgZGlyZWN0b3JpZXMgYW5kIHBhZ2UgdGFibGVzLiAqLwotCXJldCA9 IGdlbjhfcHBndHRfYWxsb2MocHBndHQsIHBwZ3R0LT5iYXNlLnN0YXJ0LCBwcGd0dC0+YmFzZS50 b3RhbCk7CisJcmV0ID0gZ2VuOF9hbGxvY192YV9yYW5nZSgmcHBndHQtPmJhc2UsIHN0YXJ0LCBz aXplKTsKIAlpZiAocmV0KSB7CiAJCXVubWFwX2FuZF9mcmVlX3B0KHBwZ3R0LT5zY3JhdGNoX3Bk LCBwcGd0dC0+YmFzZS5kZXYpOwogCQlyZXR1cm4gcmV0OwogCX0KIAotCS8qCi0JICogMi4gQ3Jl YXRlIERNQSBtYXBwaW5ncyBmb3IgdGhlIHBhZ2UgZGlyZWN0b3JpZXMgYW5kIHBhZ2UgdGFibGVz LgotCSAqLwotCWZvciAoaSA9IDA7IGkgPCBtYXhfcGRwOyBpKyspIHsKLQkJcmV0ID0gZ2VuOF9w cGd0dF9zZXR1cF9wYWdlX2RpcmVjdG9yaWVzKHBwZ3R0LCBpKTsKLQkJaWYgKHJldCkKLQkJCWdv dG8gYmFpbDsKKwlzdGFydCA9IDA7CisJc2l6ZSA9IG9yaWdfbGVuZ3RoOwogCi0JCWZvciAoaiA9 IDA7IGogPCBHRU44X1BERVNfUEVSX1BBR0U7IGorKykgewotCQkJcmV0ID0gZ2VuOF9wcGd0dF9z ZXR1cF9wYWdlX3RhYmxlcyhwcGd0dCwgaSwgaik7Ci0JCQlpZiAocmV0KQotCQkJCWdvdG8gYmFp bDsKLQkJfQotCX0KLQotCS8qCi0JICogMy4gTWFwIGFsbCB0aGUgcGFnZSBkaXJlY3RvcnkgZW50 aXJlcyB0byBwb2ludCB0byB0aGUgcGFnZSB0YWJsZXMKLQkgKiB3ZSd2ZSBhbGxvY2F0ZWQuCi0J ICoKLQkgKiBGb3Igbm93LCB0aGUgUFBHVFQgaGVscGVyIGZ1bmN0aW9ucyBhbGwgcmVxdWlyZSB0 aGF0IHRoZSBQREVzIGFyZQotCSAqIHBsdWdnZWQgaW4gY29ycmVjdGx5LiBTbyB3ZSBkbyB0aGF0 IG5vdy9oZXJlLiBGb3IgYWxpYXNpbmcgUFBHVFQsIHdlCi0JICogd2lsbCBuZXZlciBuZWVkIHRv IHRvdWNoIHRoZSBQREVzIGFnYWluLgotCSAqLwotCWZvciAoaSA9IDA7IGkgPCBtYXhfcGRwOyBp KyspIHsKLQkJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfZW50cnkgKnBkID0gcHBndHQtPnBk cC5wYWdlX2RpcmVjdG9yeVtpXTsKLQkJZ2VuOF9wcGd0dF9wZGVfdCAqcGRfdmFkZHI7Ci0JCXBk X3ZhZGRyID0ga21hcF9hdG9taWMocHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXS0+cGFnZSk7 Ci0JCWZvciAoaiA9IDA7IGogPCBHRU44X1BERVNfUEVSX1BBR0U7IGorKykgewotCQkJc3RydWN0 IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQgPSBwZC0+cGFnZV90YWJsZXNbal07Ci0JCQlkbWFf YWRkcl90IGFkZHIgPSBwdC0+ZGFkZHI7Ci0JCQlwZF92YWRkcltqXSA9IGdlbjhfcGRlX2VuY29k ZShwcGd0dC0+YmFzZS5kZXYsIGFkZHIsCi0JCQkJCQkgICAgICBJOTE1X0NBQ0hFX0xMQyk7Ci0J CX0KLQkJaWYgKCFIQVNfTExDKHBwZ3R0LT5iYXNlLmRldikpCi0JCQlkcm1fY2xmbHVzaF92aXJ0 X3JhbmdlKHBkX3ZhZGRyLCBQQUdFX1NJWkUpOwotCQlrdW5tYXBfYXRvbWljKHBkX3ZhZGRyKTsK LQl9Ci0KLQlwcGd0dC0+c3dpdGNoX21tID0gZ2VuOF9tbV9zd2l0Y2g7Ci0JcHBndHQtPmJhc2Uu Y2xlYXJfcmFuZ2UgPSBnZW44X3BwZ3R0X2NsZWFyX3JhbmdlOwotCXBwZ3R0LT5iYXNlLmluc2Vy dF9lbnRyaWVzID0gZ2VuOF9wcGd0dF9pbnNlcnRfZW50cmllczsKLQlwcGd0dC0+YmFzZS5jbGVh bnVwID0gZ2VuOF9wcGd0dF9jbGVhbnVwOworCWdlbjhfZm9yX2VhY2hfcGRwZShwZCwgJnBwZ3R0 LT5wZHAsIHN0YXJ0LCBzaXplLCB0ZW1wLCBwZHBlKQorCQlnZW44X21hcF9wYWdldGFibGVfcmFu Z2UocGQsIHN0YXJ0LCBzaXplLCBwcGd0dC0+YmFzZS5kZXYpOwogCiAJcHBndHQtPmJhc2UuY2xl YXJfcmFuZ2UoJnBwZ3R0LT5iYXNlLCAwLCBwcGd0dC0+YmFzZS50b3RhbCwgdHJ1ZSk7CiAJcmV0 dXJuIDA7Ci0KLWJhaWw6Ci0JZ2VuOF9wcGd0dF91bm1hcF9wYWdlcyhwcGd0dCk7Ci0JZ2VuOF9w cGd0dF9mcmVlKHBwZ3R0KTsKLQlyZXR1cm4gcmV0OwogfQogCiBzdGF0aWMgdm9pZCBnZW42X2R1 bXBfcHBndHQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LCBzdHJ1Y3Qgc2VxX2ZpbGUgKm0p CkBAIC0xMjY1LDcgKzEyMjYsNyBAQCBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0X2ZyZWUoc3RydWN0 IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogCX0KIAogCXVubWFwX2FuZF9mcmVlX3B0KHBwZ3R0LT5z Y3JhdGNoX3B0LCBwcGd0dC0+YmFzZS5kZXYpOwotCXVubWFwX2FuZF9mcmVlX3BkKCZwcGd0dC0+ cGQpOworCXVubWFwX2FuZF9mcmVlX3BkKCZwcGd0dC0+cGQsIHBwZ3R0LT5iYXNlLmRldik7CiB9 CiAKIHN0YXRpYyB2b2lkIGdlbjZfcHBndHRfY2xlYW51cChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw YWNlICp2bSkKLS0gCjIuMS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=