From: Michel Thierry Subject: [PATCH 1/5] drm/i915: page table generalizations Date: Mon, 16 Mar 2015 16:00:54 +0000 Message-ID: <1426521658-28408-2-git-send-email-michel.thierry@intel.com> References: <1426521658-28408-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id E993E6E447 for ; Mon, 16 Mar 2015 09:00:48 -0700 (PDT) In-Reply-To: <1426521658-28408-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 Tm8gZnVuY3Rpb25hbCBjaGFuZ2VzLCBidXQgd2lsbCBpbXByb3ZlIGNvZGUgY2xhcml0eSBhbmQg cmVtb3ZlZCBzb21lCmR1cGxpY2F0ZWQgZGVmaW5lcy4KClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBU aGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZ3R0LmMgfCAxNjAgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCB8ICAyOCArKysrLS0tCiAy IGZpbGVzIGNoYW5nZWQsIDk2IGluc2VydGlvbnMoKyksIDkyIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggMjAzNGY3Yy4uNmQ4NWJmZiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTE0NywxMSArMTQ3LDExIEBAIHN0YXRpYyB2b2lk IHBwZ3R0X2JpbmRfdm1hKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAogCQkJICAgdTMyIGZsYWdzKTsK IHN0YXRpYyB2b2lkIHBwZ3R0X3VuYmluZF92bWEoc3RydWN0IGk5MTVfdm1hICp2bWEpOwogCi1z dGF0aWMgaW5saW5lIGdlbjhfZ3R0X3B0ZV90IGdlbjhfcHRlX2VuY29kZShkbWFfYWRkcl90IGFk ZHIsCi0JCQkJCSAgICAgZW51bSBpOTE1X2NhY2hlX2xldmVsIGxldmVsLAotCQkJCQkgICAgIGJv b2wgdmFsaWQpCitzdGF0aWMgaW5saW5lIGdlbjhfcHRlX3QgZ2VuOF9wdGVfZW5jb2RlKGRtYV9h ZGRyX3QgYWRkciwKKwkJCQkJIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBsZXZlbCwKKwkJCQkJIGJv b2wgdmFsaWQpCiB7Ci0JZ2VuOF9ndHRfcHRlX3QgcHRlID0gdmFsaWQgPyBfUEFHRV9QUkVTRU5U IHwgX1BBR0VfUlcgOiAwOworCWdlbjhfcHRlX3QgcHRlID0gdmFsaWQgPyBfUEFHRV9QUkVTRU5U IHwgX1BBR0VfUlcgOiAwOwogCXB0ZSB8PSBhZGRyOwogCiAJc3dpdGNoIChsZXZlbCkgewpAQCAt MTY5LDExICsxNjksMTEgQEAgc3RhdGljIGlubGluZSBnZW44X2d0dF9wdGVfdCBnZW44X3B0ZV9l bmNvZGUoZG1hX2FkZHJfdCBhZGRyLAogCXJldHVybiBwdGU7CiB9CiAKLXN0YXRpYyBpbmxpbmUg Z2VuOF9wcGd0dF9wZGVfdCBnZW44X3BkZV9lbmNvZGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwK LQkJCQkJICAgICBkbWFfYWRkcl90IGFkZHIsCi0JCQkJCSAgICAgZW51bSBpOTE1X2NhY2hlX2xl dmVsIGxldmVsKQorc3RhdGljIGlubGluZSBnZW44X3BkZV90IGdlbjhfcGRlX2VuY29kZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAorCQkJCQkgIGRtYV9hZGRyX3QgYWRkciwKKwkJCQkJICBlbnVt IGk5MTVfY2FjaGVfbGV2ZWwgbGV2ZWwpCiB7Ci0JZ2VuOF9wcGd0dF9wZGVfdCBwZGUgPSBfUEFH RV9QUkVTRU5UIHwgX1BBR0VfUlc7CisJZ2VuOF9wZGVfdCBwZGUgPSBfUEFHRV9QUkVTRU5UIHwg X1BBR0VfUlc7CiAJcGRlIHw9IGFkZHI7CiAJaWYgKGxldmVsICE9IEk5MTVfQ0FDSEVfTk9ORSkK IAkJcGRlIHw9IFBQQVRfQ0FDSEVEX1BERV9JTkRFWDsKQEAgLTE4MiwxMSArMTgyLDExIEBAIHN0 YXRpYyBpbmxpbmUgZ2VuOF9wcGd0dF9wZGVfdCBnZW44X3BkZV9lbmNvZGUoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAlyZXR1cm4gcGRlOwogfQogCi1zdGF0aWMgZ2VuNl9ndHRfcHRlX3Qgc25i X3B0ZV9lbmNvZGUoZG1hX2FkZHJfdCBhZGRyLAotCQkJCSAgICAgZW51bSBpOTE1X2NhY2hlX2xl dmVsIGxldmVsLAotCQkJCSAgICAgYm9vbCB2YWxpZCwgdTMyIHVudXNlZCkKK3N0YXRpYyBnZW42 X3B0ZV90IHNuYl9wdGVfZW5jb2RlKGRtYV9hZGRyX3QgYWRkciwKKwkJCQkgZW51bSBpOTE1X2Nh Y2hlX2xldmVsIGxldmVsLAorCQkJCSBib29sIHZhbGlkLCB1MzIgdW51c2VkKQogewotCWdlbjZf Z3R0X3B0ZV90IHB0ZSA9IHZhbGlkID8gR0VONl9QVEVfVkFMSUQgOiAwOworCWdlbjZfcHRlX3Qg cHRlID0gdmFsaWQgPyBHRU42X1BURV9WQUxJRCA6IDA7CiAJcHRlIHw9IEdFTjZfUFRFX0FERFJf RU5DT0RFKGFkZHIpOwogCiAJc3dpdGNoIChsZXZlbCkgewpAQCAtMjA0LDExICsyMDQsMTEgQEAg c3RhdGljIGdlbjZfZ3R0X3B0ZV90IHNuYl9wdGVfZW5jb2RlKGRtYV9hZGRyX3QgYWRkciwKIAly ZXR1cm4gcHRlOwogfQogCi1zdGF0aWMgZ2VuNl9ndHRfcHRlX3QgaXZiX3B0ZV9lbmNvZGUoZG1h X2FkZHJfdCBhZGRyLAotCQkJCSAgICAgZW51bSBpOTE1X2NhY2hlX2xldmVsIGxldmVsLAotCQkJ CSAgICAgYm9vbCB2YWxpZCwgdTMyIHVudXNlZCkKK3N0YXRpYyBnZW42X3B0ZV90IGl2Yl9wdGVf ZW5jb2RlKGRtYV9hZGRyX3QgYWRkciwKKwkJCQkgZW51bSBpOTE1X2NhY2hlX2xldmVsIGxldmVs LAorCQkJCSBib29sIHZhbGlkLCB1MzIgdW51c2VkKQogewotCWdlbjZfZ3R0X3B0ZV90IHB0ZSA9 IHZhbGlkID8gR0VONl9QVEVfVkFMSUQgOiAwOworCWdlbjZfcHRlX3QgcHRlID0gdmFsaWQgPyBH RU42X1BURV9WQUxJRCA6IDA7CiAJcHRlIHw9IEdFTjZfUFRFX0FERFJfRU5DT0RFKGFkZHIpOwog CiAJc3dpdGNoIChsZXZlbCkgewpAQCAtMjI4LDExICsyMjgsMTEgQEAgc3RhdGljIGdlbjZfZ3R0 X3B0ZV90IGl2Yl9wdGVfZW5jb2RlKGRtYV9hZGRyX3QgYWRkciwKIAlyZXR1cm4gcHRlOwogfQog Ci1zdGF0aWMgZ2VuNl9ndHRfcHRlX3QgYnl0X3B0ZV9lbmNvZGUoZG1hX2FkZHJfdCBhZGRyLAot CQkJCSAgICAgZW51bSBpOTE1X2NhY2hlX2xldmVsIGxldmVsLAotCQkJCSAgICAgYm9vbCB2YWxp ZCwgdTMyIGZsYWdzKQorc3RhdGljIGdlbjZfcHRlX3QgYnl0X3B0ZV9lbmNvZGUoZG1hX2FkZHJf dCBhZGRyLAorCQkJCSBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgbGV2ZWwsCisJCQkJIGJvb2wgdmFs aWQsIHUzMiBmbGFncykKIHsKLQlnZW42X2d0dF9wdGVfdCBwdGUgPSB2YWxpZCA/IEdFTjZfUFRF X1ZBTElEIDogMDsKKwlnZW42X3B0ZV90IHB0ZSA9IHZhbGlkID8gR0VONl9QVEVfVkFMSUQgOiAw OwogCXB0ZSB8PSBHRU42X1BURV9BRERSX0VOQ09ERShhZGRyKTsKIAogCWlmICghKGZsYWdzICYg UFRFX1JFQURfT05MWSkpCkBAIC0yNDQsMTEgKzI0NCwxMSBAQCBzdGF0aWMgZ2VuNl9ndHRfcHRl X3QgYnl0X3B0ZV9lbmNvZGUoZG1hX2FkZHJfdCBhZGRyLAogCXJldHVybiBwdGU7CiB9CiAKLXN0 YXRpYyBnZW42X2d0dF9wdGVfdCBoc3dfcHRlX2VuY29kZShkbWFfYWRkcl90IGFkZHIsCi0JCQkJ ICAgICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgbGV2ZWwsCi0JCQkJICAgICBib29sIHZhbGlkLCB1 MzIgdW51c2VkKQorc3RhdGljIGdlbjZfcHRlX3QgaHN3X3B0ZV9lbmNvZGUoZG1hX2FkZHJfdCBh ZGRyLAorCQkJCSBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgbGV2ZWwsCisJCQkJIGJvb2wgdmFsaWQs IHUzMiB1bnVzZWQpCiB7Ci0JZ2VuNl9ndHRfcHRlX3QgcHRlID0gdmFsaWQgPyBHRU42X1BURV9W QUxJRCA6IDA7CisJZ2VuNl9wdGVfdCBwdGUgPSB2YWxpZCA/IEdFTjZfUFRFX1ZBTElEIDogMDsK IAlwdGUgfD0gSFNXX1BURV9BRERSX0VOQ09ERShhZGRyKTsKIAogCWlmIChsZXZlbCAhPSBJOTE1 X0NBQ0hFX05PTkUpCkBAIC0yNTcsMTEgKzI1NywxMSBAQCBzdGF0aWMgZ2VuNl9ndHRfcHRlX3Qg aHN3X3B0ZV9lbmNvZGUoZG1hX2FkZHJfdCBhZGRyLAogCXJldHVybiBwdGU7CiB9CiAKLXN0YXRp YyBnZW42X2d0dF9wdGVfdCBpcmlzX3B0ZV9lbmNvZGUoZG1hX2FkZHJfdCBhZGRyLAotCQkJCSAg ICAgIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBsZXZlbCwKLQkJCQkgICAgICBib29sIHZhbGlkLCB1 MzIgdW51c2VkKQorc3RhdGljIGdlbjZfcHRlX3QgaXJpc19wdGVfZW5jb2RlKGRtYV9hZGRyX3Qg YWRkciwKKwkJCQkgIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBsZXZlbCwKKwkJCQkgIGJvb2wgdmFs aWQsIHUzMiB1bnVzZWQpCiB7Ci0JZ2VuNl9ndHRfcHRlX3QgcHRlID0gdmFsaWQgPyBHRU42X1BU RV9WQUxJRCA6IDA7CisJZ2VuNl9wdGVfdCBwdGUgPSB2YWxpZCA/IEdFTjZfUFRFX1ZBTElEIDog MDsKIAlwdGUgfD0gSFNXX1BURV9BRERSX0VOQ09ERShhZGRyKTsKIAogCXN3aXRjaCAobGV2ZWwp IHsKQEAgLTMyMyw3ICszMjMsNyBAQCBzdGF0aWMgaW50IGFsbG9jX3B0X3JhbmdlKHN0cnVjdCBp OTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwZCwgdWludDE2X3QgcGRlLCBzaQogCWludCBpLCBy ZXQ7CiAKIAkvKiA1MTIgaXMgdGhlIG1heCBwYWdlIHRhYmxlcyBwZXIgcGFnZV9kaXJlY3Rvcnkg b24gYW55IHBsYXRmb3JtLiAqLwotCWlmIChXQVJOX09OKHBkZSArIGNvdW50ID4gR0VONl9QUEdU VF9QRF9FTlRSSUVTKSkKKwlpZiAoV0FSTl9PTihwZGUgKyBjb3VudCA+IEk5MTVfUERFUykpCiAJ CXJldHVybiAtRUlOVkFMOwogCiAJZm9yIChpID0gcGRlOyBpIDwgcGRlICsgY291bnQ7IGkrKykg ewpAQCAtNDAxLDcgKzQwMSw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9tbV9zd2l0Y2goc3RydWN0IGk5 MTVfaHdfcHBndHQgKnBwZ3R0LAogCWludCBpLCByZXQ7CiAKIAkvKiBiaXQgb2YgYSBoYWNrIHRv IGZpbmQgdGhlIGFjdHVhbCBsYXN0IHVzZWQgcGQgKi8KLQlpbnQgdXNlZF9wZCA9IHBwZ3R0LT5u dW1fcGRfZW50cmllcyAvIEdFTjhfUERFU19QRVJfUEFHRTsKKwlpbnQgdXNlZF9wZCA9IHBwZ3R0 LT5udW1fcGRfZW50cmllcyAvIEk5MTVfUERFUzsKIAogCWZvciAoaSA9IHVzZWRfcGQgLSAxOyBp ID49IDA7IGktLSkgewogCQlkbWFfYWRkcl90IGFkZHIgPSBwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0 b3J5W2ldLT5kYWRkcjsKQEAgLTQyMCw3ICs0MjAsNyBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0 X2NsZWFyX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogewogCXN0cnVjdCBp OTE1X2h3X3BwZ3R0ICpwcGd0dCA9CiAJCWNvbnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVfaHdf cHBndHQsIGJhc2UpOwotCWdlbjhfZ3R0X3B0ZV90ICpwdF92YWRkciwgc2NyYXRjaF9wdGU7CisJ Z2VuOF9wdGVfdCAqcHRfdmFkZHIsIHNjcmF0Y2hfcHRlOwogCXVuc2lnbmVkIHBkcGUgPSBzdGFy dCA+PiBHRU44X1BEUEVfU0hJRlQgJiBHRU44X1BEUEVfTUFTSzsKIAl1bnNpZ25lZCBwZGUgPSBz dGFydCA+PiBHRU44X1BERV9TSElGVCAmIEdFTjhfUERFX01BU0s7CiAJdW5zaWduZWQgcHRlID0g c3RhcnQgPj4gR0VOOF9QVEVfU0hJRlQgJiBHRU44X1BURV9NQVNLOwpAQCAtNDUxLDggKzQ1MSw4 IEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfY2xlYXJfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVz c19zcGFjZSAqdm0sCiAJCXBhZ2VfdGFibGUgPSBwdC0+cGFnZTsKIAogCQlsYXN0X3B0ZSA9IHB0 ZSArIG51bV9lbnRyaWVzOwotCQlpZiAobGFzdF9wdGUgPiBHRU44X1BURVNfUEVSX1BBR0UpCi0J CQlsYXN0X3B0ZSA9IEdFTjhfUFRFU19QRVJfUEFHRTsKKwkJaWYgKGxhc3RfcHRlID4gR0VOOF9Q VEVTKQorCQkJbGFzdF9wdGUgPSBHRU44X1BURVM7CiAKIAkJcHRfdmFkZHIgPSBrbWFwX2F0b21p YyhwYWdlX3RhYmxlKTsKIApAQCAtNDY2LDcgKzQ2Niw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBn dHRfY2xlYXJfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCWt1bm1hcF9h dG9taWMocHRfdmFkZHIpOwogCiAJCXB0ZSA9IDA7Ci0JCWlmICgrK3BkZSA9PSBHRU44X1BERVNf UEVSX1BBR0UpIHsKKwkJaWYgKCsrcGRlID09IEk5MTVfUERFUykgewogCQkJcGRwZSsrOwogCQkJ cGRlID0gMDsKIAkJfQpAQCAtNDgwLDcgKzQ4MCw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRf aW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiB7CiAJc3RydWN0 IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KIAkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9o d19wcGd0dCwgYmFzZSk7Ci0JZ2VuOF9ndHRfcHRlX3QgKnB0X3ZhZGRyOworCWdlbjhfcHRlX3Qg KnB0X3ZhZGRyOwogCXVuc2lnbmVkIHBkcGUgPSBzdGFydCA+PiBHRU44X1BEUEVfU0hJRlQgJiBH RU44X1BEUEVfTUFTSzsKIAl1bnNpZ25lZCBwZGUgPSBzdGFydCA+PiBHRU44X1BERV9TSElGVCAm IEdFTjhfUERFX01BU0s7CiAJdW5zaWduZWQgcHRlID0gc3RhcnQgPj4gR0VOOF9QVEVfU0hJRlQg JiBHRU44X1BURV9NQVNLOwpAQCAtNTAzLDEyICs1MDMsMTIgQEAgc3RhdGljIHZvaWQgZ2VuOF9w cGd0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJcHRf dmFkZHJbcHRlXSA9CiAJCQlnZW44X3B0ZV9lbmNvZGUoc2dfcGFnZV9pdGVyX2RtYV9hZGRyZXNz KCZzZ19pdGVyKSwKIAkJCQkJY2FjaGVfbGV2ZWwsIHRydWUpOwotCQlpZiAoKytwdGUgPT0gR0VO OF9QVEVTX1BFUl9QQUdFKSB7CisJCWlmICgrK3B0ZSA9PSBHRU44X1BURVMpIHsKIAkJCWlmICgh SEFTX0xMQyhwcGd0dC0+YmFzZS5kZXYpKQogCQkJCWRybV9jbGZsdXNoX3ZpcnRfcmFuZ2UocHRf dmFkZHIsIFBBR0VfU0laRSk7CiAJCQlrdW5tYXBfYXRvbWljKHB0X3ZhZGRyKTsKIAkJCXB0X3Zh ZGRyID0gTlVMTDsKLQkJCWlmICgrK3BkZSA9PSBHRU44X1BERVNfUEVSX1BBR0UpIHsKKwkJCWlm ICgrK3BkZSA9PSBJOTE1X1BERVMpIHsKIAkJCQlwZHBlKys7CiAJCQkJcGRlID0gMDsKIAkJCX0K QEAgLTUyOSw3ICs1MjksNyBAQCBzdGF0aWMgdm9pZCBnZW44X2ZyZWVfcGFnZV90YWJsZXMoc3Ry dWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfZW50cnkgKnBkLCBzdHJ1Y3QgZAogCWlmICghcGQtPnBh Z2UpCiAJCXJldHVybjsKIAotCWZvciAoaSA9IDA7IGkgPCBHRU44X1BERVNfUEVSX1BBR0U7IGkr KykgeworCWZvciAoaSA9IDA7IGkgPCBJOTE1X1BERVM7IGkrKykgewogCQlpZiAoV0FSTl9PTigh cGQtPnBhZ2VfdGFibGVbaV0pKQogCQkJY29udGludWU7CiAKQEAgLTU2NSw3ICs1NjUsNyBAQCBz dGF0aWMgdm9pZCBnZW44X3BwZ3R0X3VubWFwX3BhZ2VzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpw cGd0dCkKIAkJcGNpX3VubWFwX3BhZ2UoaHdkZXYsIHBwZ3R0LT5wZHAucGFnZV9kaXJlY3Rvcnlb aV0tPmRhZGRyLCBQQUdFX1NJWkUsCiAJCQkgICAgICAgUENJX0RNQV9CSURJUkVDVElPTkFMKTsK IAotCQlmb3IgKGogPSAwOyBqIDwgR0VOOF9QREVTX1BFUl9QQUdFOyBqKyspIHsKKwkJZm9yIChq ID0gMDsgaiA8IEk5MTVfUERFUzsgaisrKSB7CiAJCQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9y eV9lbnRyeSAqcGQgPSBwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W2ldOwogCQkJc3RydWN0IGk5 MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQ7CiAJCQlkbWFfYWRkcl90IGFkZHI7CkBAIC01OTgsNyAr NTk4LDcgQEAgc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9jYXRlX3BhZ2VfdGFibGVzKHN0cnVj dCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAogCWZvciAoaSA9IDA7IGkgPCBwcGd0dC0+bnVtX3Bk X3BhZ2VzOyBpKyspIHsKIAkJcmV0ID0gYWxsb2NfcHRfcmFuZ2UocHBndHQtPnBkcC5wYWdlX2Rp cmVjdG9yeVtpXSwKLQkJCQkgICAgIDAsIEdFTjhfUERFU19QRVJfUEFHRSwgcHBndHQtPmJhc2Uu ZGV2KTsKKwkJCQkgICAgIDAsIEk5MTVfUERFUywgcHBndHQtPmJhc2UuZGV2KTsKIAkJaWYgKHJl dCkKIAkJCWdvdG8gdW53aW5kX291dDsKIAl9CkBAIC02NDgsNyArNjQ4LDcgQEAgc3RhdGljIGlu dCBnZW44X3BwZ3R0X2FsbG9jKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAlpZiAocmV0 KQogCQlnb3RvIGVycl9vdXQ7CiAKLQlwcGd0dC0+bnVtX3BkX2VudHJpZXMgPSBtYXhfcGRwICog R0VOOF9QREVTX1BFUl9QQUdFOworCXBwZ3R0LT5udW1fcGRfZW50cmllcyA9IG1heF9wZHAgKiBJ OTE1X1BERVM7CiAKIAlyZXR1cm4gMDsKIApAQCAtNzEwLDcgKzcxMCw3IEBAIHN0YXRpYyBpbnQg Z2VuOF9wcGd0dF9zZXR1cF9wYWdlX3RhYmxlcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQs CiBzdGF0aWMgaW50IGdlbjhfcHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQs IHVpbnQ2NF90IHNpemUpCiB7CiAJY29uc3QgaW50IG1heF9wZHAgPSBESVZfUk9VTkRfVVAoc2l6 ZSwgMSA8PCAzMCk7Ci0JY29uc3QgaW50IG1pbl9wdF9wYWdlcyA9IEdFTjhfUERFU19QRVJfUEFH RSAqIG1heF9wZHA7CisJY29uc3QgaW50IG1pbl9wdF9wYWdlcyA9IEk5MTVfUERFUyAqIG1heF9w ZHA7CiAJaW50IGksIGosIHJldDsKIAogCWlmIChzaXplICUgKDE8PDMwKSkKQEAgLTczMyw3ICs3 MzMsNyBAQCBzdGF0aWMgaW50IGdlbjhfcHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0dCAq cHBndHQsIHVpbnQ2NF90IHNpemUpCiAJCWlmIChyZXQpCiAJCQlnb3RvIGJhaWw7CiAKLQkJZm9y IChqID0gMDsgaiA8IEdFTjhfUERFU19QRVJfUEFHRTsgaisrKSB7CisJCWZvciAoaiA9IDA7IGog PCBJOTE1X1BERVM7IGorKykgewogCQkJcmV0ID0gZ2VuOF9wcGd0dF9zZXR1cF9wYWdlX3RhYmxl cyhwcGd0dCwgaSwgaik7CiAJCQlpZiAocmV0KQogCQkJCWdvdG8gYmFpbDsKQEAgLTc1MCw5ICs3 NTAsOSBAQCBzdGF0aWMgaW50IGdlbjhfcHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0dCAq cHBndHQsIHVpbnQ2NF90IHNpemUpCiAJICovCiAJZm9yIChpID0gMDsgaSA8IEdFTjhfTEVHQUNZ X1BEUEVTOyBpKyspIHsKIAkJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfZW50cnkgKnBkID0g cHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXTsKLQkJZ2VuOF9wcGd0dF9wZGVfdCAqcGRfdmFk ZHI7CisJCWdlbjhfcGRlX3QgKnBkX3ZhZGRyOwogCQlwZF92YWRkciA9IGttYXBfYXRvbWljKHBw Z3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbaV0tPnBhZ2UpOwotCQlmb3IgKGogPSAwOyBqIDwgR0VO OF9QREVTX1BFUl9QQUdFOyBqKyspIHsKKwkJZm9yIChqID0gMDsgaiA8IEk5MTVfUERFUzsgaisr KSB7CiAJCQlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpwdCA9IHBkLT5wYWdlX3RhYmxl W2pdOwogCQkJZG1hX2FkZHJfdCBhZGRyID0gcHQtPmRhZGRyOwogCQkJcGRfdmFkZHJbal0gPSBn ZW44X3BkZV9lbmNvZGUocHBndHQtPmJhc2UuZGV2LCBhZGRyLApAQCAtNzcwLDExICs3NzAsMTEg QEAgc3RhdGljIGludCBnZW44X3BwZ3R0X2luaXQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0 LCB1aW50NjRfdCBzaXplKQogCXBwZ3R0LT5iYXNlLnN0YXJ0ID0gMDsKIAogCS8qIFRoaXMgaXMg dGhlIGFyZWEgdGhhdCB3ZSBhZHZlcnRpc2UgYXMgdXNhYmxlIGZvciB0aGUgY2FsbGVyICovCi0J cHBndHQtPmJhc2UudG90YWwgPSBtYXhfcGRwICogR0VOOF9QREVTX1BFUl9QQUdFICogR0VOOF9Q VEVTX1BFUl9QQUdFICogUEFHRV9TSVpFOworCXBwZ3R0LT5iYXNlLnRvdGFsID0gbWF4X3BkcCAq IEk5MTVfUERFUyAqIEdFTjhfUFRFUyAqIFBBR0VfU0laRTsKIAogCS8qIFNldCBhbGwgcHRlcyB0 byBhIHZhbGlkIHNjcmF0Y2ggcGFnZS4gQWxzbyBhYm92ZSByZXF1ZXN0ZWQgc3BhY2UgKi8KIAlw cGd0dC0+YmFzZS5jbGVhcl9yYW5nZSgmcHBndHQtPmJhc2UsIDAsCi0JCQkJcHBndHQtPm51bV9w ZF9wYWdlcyAqIEdFTjhfUFRFU19QRVJfUEFHRSAqIFBBR0VfU0laRSwKKwkJCQlwcGd0dC0+bnVt X3BkX3BhZ2VzICogR0VOOF9QVEVTICogUEFHRV9TSVpFLAogCQkJCXRydWUpOwogCiAJRFJNX0RF QlVHX0RSSVZFUigiQWxsb2NhdGVkICVkIHBhZ2VzIGZvciBwYWdlIGRpcmVjdG9yaWVzICglZCB3 YXN0ZWQpXG4iLApAQCAtNzk0LDIyICs3OTQsMjIgQEAgc3RhdGljIHZvaWQgZ2VuNl9kdW1wX3Bw Z3R0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgc3RydWN0IHNlcV9maWxlICptKQogewog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHBwZ3R0LT5iYXNlLmRldi0+ZGV2 X3ByaXZhdGU7CiAJc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0gPSAmcHBndHQtPmJhc2U7 Ci0JZ2VuNl9ndHRfcHRlX3QgX19pb21lbSAqcGRfYWRkcjsKLQlnZW42X2d0dF9wdGVfdCBzY3Jh dGNoX3B0ZTsKKwlnZW42X3B0ZV90IF9faW9tZW0gKnBkX2FkZHI7CisJZ2VuNl9wdGVfdCBzY3Jh dGNoX3B0ZTsKIAl1aW50MzJfdCBwZF9lbnRyeTsKIAlpbnQgcHRlLCBwZGU7CiAKIAlzY3JhdGNo X3B0ZSA9IHZtLT5wdGVfZW5jb2RlKHZtLT5zY3JhdGNoLmFkZHIsIEk5MTVfQ0FDSEVfTExDLCB0 cnVlLCAwKTsKIAotCXBkX2FkZHIgPSAoZ2VuNl9ndHRfcHRlX3QgX19pb21lbSAqKWRldl9wcml2 LT5ndHQuZ3NtICsKLQkJcHBndHQtPnBkLnBkX29mZnNldCAvIHNpemVvZihnZW42X2d0dF9wdGVf dCk7CisJcGRfYWRkciA9IChnZW42X3B0ZV90IF9faW9tZW0gKilkZXZfcHJpdi0+Z3R0LmdzbSAr CisJCXBwZ3R0LT5wZC5wZF9vZmZzZXQgLyBzaXplb2YoZ2VuNl9wdGVfdCk7CiAKIAlzZXFfcHJp bnRmKG0sICIgIFZNICVwIChwZF9vZmZzZXQgJXgtJXgpOlxuIiwgdm0sCiAJCSAgIHBwZ3R0LT5w ZC5wZF9vZmZzZXQsCiAJCSAgIHBwZ3R0LT5wZC5wZF9vZmZzZXQgKyBwcGd0dC0+bnVtX3BkX2Vu dHJpZXMpOwogCWZvciAocGRlID0gMDsgcGRlIDwgcHBndHQtPm51bV9wZF9lbnRyaWVzOyBwZGUr KykgewogCQl1MzIgZXhwZWN0ZWQ7Ci0JCWdlbjZfZ3R0X3B0ZV90ICpwdF92YWRkcjsKKwkJZ2Vu Nl9wdGVfdCAqcHRfdmFkZHI7CiAJCWRtYV9hZGRyX3QgcHRfYWRkciA9IHBwZ3R0LT5wZC5wYWdl X3RhYmxlW3BkZV0tPmRhZGRyOwogCQlwZF9lbnRyeSA9IHJlYWRsKHBkX2FkZHIgKyBwZGUpOwog CQlleHBlY3RlZCA9IChHRU42X1BERV9BRERSX0VOQ09ERShwdF9hZGRyKSB8IEdFTjZfUERFX1ZB TElEKTsKQEAgLTgyMiw5ICs4MjIsOSBAQCBzdGF0aWMgdm9pZCBnZW42X2R1bXBfcHBndHQoc3Ry dWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LCBzdHJ1Y3Qgc2VxX2ZpbGUgKm0pCiAJCXNlcV9wcmlu dGYobSwgIlx0UERFOiAleFxuIiwgcGRfZW50cnkpOwogCiAJCXB0X3ZhZGRyID0ga21hcF9hdG9t aWMocHBndHQtPnBkLnBhZ2VfdGFibGVbcGRlXS0+cGFnZSk7Ci0JCWZvciAocHRlID0gMDsgcHRl IDwgSTkxNV9QUEdUVF9QVF9FTlRSSUVTOyBwdGUrPTQpIHsKKwkJZm9yIChwdGUgPSAwOyBwdGUg PCBHRU42X1BURVM7IHB0ZSs9NCkgewogCQkJdW5zaWduZWQgbG9uZyB2YSA9Ci0JCQkJKHBkZSAq IFBBR0VfU0laRSAqIEk5MTVfUFBHVFRfUFRfRU5UUklFUykgKworCQkJCShwZGUgKiBQQUdFX1NJ WkUgKiBHRU42X1BURVMpICsKIAkJCQkocHRlICogUEFHRV9TSVpFKTsKIAkJCWludCBpOwogCQkJ Ym9vbCBmb3VuZCA9IGZhbHNlOwpAQCAtODUwLDEzICs4NTAsMTMgQEAgc3RhdGljIHZvaWQgZ2Vu Nl9kdW1wX3BwZ3R0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgc3RydWN0IHNlcV9maWxl ICptKQogc3RhdGljIHZvaWQgZ2VuNl93cml0ZV9wZGVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpw cGd0dCkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBwcGd0dC0+YmFz ZS5kZXYtPmRldl9wcml2YXRlOwotCWdlbjZfZ3R0X3B0ZV90IF9faW9tZW0gKnBkX2FkZHI7CisJ Z2VuNl9wdGVfdCBfX2lvbWVtICpwZF9hZGRyOwogCXVpbnQzMl90IHBkX2VudHJ5OwogCWludCBp OwogCiAJV0FSTl9PTihwcGd0dC0+cGQucGRfb2Zmc2V0ICYgMHgzZik7Ci0JcGRfYWRkciA9IChn ZW42X2d0dF9wdGVfdCBfX2lvbWVtKilkZXZfcHJpdi0+Z3R0LmdzbSArCi0JCXBwZ3R0LT5wZC5w ZF9vZmZzZXQgLyBzaXplb2YoZ2VuNl9ndHRfcHRlX3QpOworCXBkX2FkZHIgPSAoZ2VuNl9wdGVf dCBfX2lvbWVtKilkZXZfcHJpdi0+Z3R0LmdzbSArCisJCXBwZ3R0LT5wZC5wZF9vZmZzZXQgLyBz aXplb2YoZ2VuNl9wdGVfdCk7CiAJZm9yIChpID0gMDsgaSA8IHBwZ3R0LT5udW1fcGRfZW50cmll czsgaSsrKSB7CiAJCWRtYV9hZGRyX3QgcHRfYWRkcjsKIApAQCAtMTAyMiwxOSArMTAyMiwxOSBA QCBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0X2NsZWFyX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nf c3BhY2UgKnZtLAogewogCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9CiAJCWNvbnRhaW5l cl9vZih2bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpOwotCWdlbjZfZ3R0X3B0ZV90ICpw dF92YWRkciwgc2NyYXRjaF9wdGU7CisJZ2VuNl9wdGVfdCAqcHRfdmFkZHIsIHNjcmF0Y2hfcHRl OwogCXVuc2lnbmVkIGZpcnN0X2VudHJ5ID0gc3RhcnQgPj4gUEFHRV9TSElGVDsKIAl1bnNpZ25l ZCBudW1fZW50cmllcyA9IGxlbmd0aCA+PiBQQUdFX1NISUZUOwotCXVuc2lnbmVkIGFjdF9wdCA9 IGZpcnN0X2VudHJ5IC8gSTkxNV9QUEdUVF9QVF9FTlRSSUVTOwotCXVuc2lnbmVkIGZpcnN0X3B0 ZSA9IGZpcnN0X2VudHJ5ICUgSTkxNV9QUEdUVF9QVF9FTlRSSUVTOworCXVuc2lnbmVkIGFjdF9w dCA9IGZpcnN0X2VudHJ5IC8gR0VONl9QVEVTOworCXVuc2lnbmVkIGZpcnN0X3B0ZSA9IGZpcnN0 X2VudHJ5ICUgR0VONl9QVEVTOwogCXVuc2lnbmVkIGxhc3RfcHRlLCBpOwogCiAJc2NyYXRjaF9w dGUgPSB2bS0+cHRlX2VuY29kZSh2bS0+c2NyYXRjaC5hZGRyLCBJOTE1X0NBQ0hFX0xMQywgdHJ1 ZSwgMCk7CiAKIAl3aGlsZSAobnVtX2VudHJpZXMpIHsKIAkJbGFzdF9wdGUgPSBmaXJzdF9wdGUg KyBudW1fZW50cmllczsKLQkJaWYgKGxhc3RfcHRlID4gSTkxNV9QUEdUVF9QVF9FTlRSSUVTKQot CQkJbGFzdF9wdGUgPSBJOTE1X1BQR1RUX1BUX0VOVFJJRVM7CisJCWlmIChsYXN0X3B0ZSA+IEdF TjZfUFRFUykKKwkJCWxhc3RfcHRlID0gR0VONl9QVEVTOwogCiAJCXB0X3ZhZGRyID0ga21hcF9h dG9taWMocHBndHQtPnBkLnBhZ2VfdGFibGVbYWN0X3B0XS0+cGFnZSk7CiAKQEAgLTEwNTYsMTAg KzEwNTYsMTAgQEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3Qg aTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIHsKIAlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQg PQogCQljb250YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKLQlnZW42 X2d0dF9wdGVfdCAqcHRfdmFkZHI7CisJZ2VuNl9wdGVfdCAqcHRfdmFkZHI7CiAJdW5zaWduZWQg Zmlyc3RfZW50cnkgPSBzdGFydCA+PiBQQUdFX1NISUZUOwotCXVuc2lnbmVkIGFjdF9wdCA9IGZp cnN0X2VudHJ5IC8gSTkxNV9QUEdUVF9QVF9FTlRSSUVTOwotCXVuc2lnbmVkIGFjdF9wdGUgPSBm aXJzdF9lbnRyeSAlIEk5MTVfUFBHVFRfUFRfRU5UUklFUzsKKwl1bnNpZ25lZCBhY3RfcHQgPSBm aXJzdF9lbnRyeSAvIEdFTjZfUFRFUzsKKwl1bnNpZ25lZCBhY3RfcHRlID0gZmlyc3RfZW50cnkg JSBHRU42X1BURVM7CiAJc3RydWN0IHNnX3BhZ2VfaXRlciBzZ19pdGVyOwogCiAJcHRfdmFkZHIg PSBOVUxMOwpAQCAtMTA3MSw3ICsxMDcxLDcgQEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9pbnNl cnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCXZtLT5wdGVfZW5j b2RlKHNnX3BhZ2VfaXRlcl9kbWFfYWRkcmVzcygmc2dfaXRlciksCiAJCQkJICAgICAgIGNhY2hl X2xldmVsLCB0cnVlLCBmbGFncyk7CiAKLQkJaWYgKCsrYWN0X3B0ZSA9PSBJOTE1X1BQR1RUX1BU X0VOVFJJRVMpIHsKKwkJaWYgKCsrYWN0X3B0ZSA9PSBHRU42X1BURVMpIHsKIAkJCWt1bm1hcF9h dG9taWMocHRfdmFkZHIpOwogCQkJcHRfdmFkZHIgPSBOVUxMOwogCQkJYWN0X3B0Kys7CkBAIC0x MTUwLDcgKzExNTAsNyBAQCBhbGxvYzoKIAlpZiAocHBndHQtPm5vZGUuc3RhcnQgPCBkZXZfcHJp di0+Z3R0Lm1hcHBhYmxlX2VuZCkKIAkJRFJNX0RFQlVHKCJGb3JjZWQgdG8gdXNlIGFwZXJ0dXJl IGZvciBQREVzXG4iKTsKIAotCXBwZ3R0LT5udW1fcGRfZW50cmllcyA9IEdFTjZfUFBHVFRfUERf RU5UUklFUzsKKwlwcGd0dC0+bnVtX3BkX2VudHJpZXMgPSBJOTE1X1BERVM7CiAJcmV0dXJuIDA7 CiB9CiAKQEAgLTEyMzAsMTEgKzEyMzAsMTEgQEAgc3RhdGljIGludCBnZW42X3BwZ3R0X2luaXQo c3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogCXBwZ3R0LT5iYXNlLmluc2VydF9lbnRyaWVz ID0gZ2VuNl9wcGd0dF9pbnNlcnRfZW50cmllczsKIAlwcGd0dC0+YmFzZS5jbGVhbnVwID0gZ2Vu Nl9wcGd0dF9jbGVhbnVwOwogCXBwZ3R0LT5iYXNlLnN0YXJ0ID0gMDsKLQlwcGd0dC0+YmFzZS50 b3RhbCA9IHBwZ3R0LT5udW1fcGRfZW50cmllcyAqIEk5MTVfUFBHVFRfUFRfRU5UUklFUyAqIFBB R0VfU0laRTsKKwlwcGd0dC0+YmFzZS50b3RhbCA9IHBwZ3R0LT5udW1fcGRfZW50cmllcyAqIEdF TjZfUFRFUyAqIFBBR0VfU0laRTsKIAlwcGd0dC0+ZGVidWdfZHVtcCA9IGdlbjZfZHVtcF9wcGd0 dDsKIAogCXBwZ3R0LT5wZC5wZF9vZmZzZXQgPQotCQlwcGd0dC0+bm9kZS5zdGFydCAvIFBBR0Vf U0laRSAqIHNpemVvZihnZW42X2d0dF9wdGVfdCk7CisJCXBwZ3R0LT5ub2RlLnN0YXJ0IC8gUEFH RV9TSVpFICogc2l6ZW9mKGdlbjZfcHRlX3QpOwogCiAJcHBndHQtPmJhc2UuY2xlYXJfcmFuZ2Uo JnBwZ3R0LT5iYXNlLCAwLCBwcGd0dC0+YmFzZS50b3RhbCwgdHJ1ZSk7CiAKQEAgLTE1NDAsNyAr MTU0MCw3IEBAIGludCBpOTE1X2dlbV9ndHRfcHJlcGFyZV9vYmplY3Qoc3RydWN0IGRybV9pOTE1 X2dlbV9vYmplY3QgKm9iaikKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGlubGluZSB2b2lkIGdl bjhfc2V0X3B0ZSh2b2lkIF9faW9tZW0gKmFkZHIsIGdlbjhfZ3R0X3B0ZV90IHB0ZSkKK3N0YXRp YyBpbmxpbmUgdm9pZCBnZW44X3NldF9wdGUodm9pZCBfX2lvbWVtICphZGRyLCBnZW44X3B0ZV90 IHB0ZSkKIHsKICNpZmRlZiB3cml0ZXEKIAl3cml0ZXEocHRlLCBhZGRyKTsKQEAgLTE1NTcsOCAr MTU1Nyw4IEBAIHN0YXRpYyB2b2lkIGdlbjhfZ2d0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB2bS0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAl1bnNpZ25lZCBmaXJzdF9lbnRyeSA9IHN0YXJ0 ID4+IFBBR0VfU0hJRlQ7Ci0JZ2VuOF9ndHRfcHRlX3QgX19pb21lbSAqZ3R0X2VudHJpZXMgPQot CQkoZ2VuOF9ndHRfcHRlX3QgX19pb21lbSAqKWRldl9wcml2LT5ndHQuZ3NtICsgZmlyc3RfZW50 cnk7CisJZ2VuOF9wdGVfdCBfX2lvbWVtICpndHRfZW50cmllcyA9CisJCShnZW44X3B0ZV90IF9f aW9tZW0gKilkZXZfcHJpdi0+Z3R0LmdzbSArIGZpcnN0X2VudHJ5OwogCWludCBpID0gMDsKIAlz dHJ1Y3Qgc2dfcGFnZV9pdGVyIHNnX2l0ZXI7CiAJZG1hX2FkZHJfdCBhZGRyID0gMDsgLyogc2h1 dCB1cCBnY2MgKi8KQEAgLTE2MDMsOCArMTYwMyw4IEBAIHN0YXRpYyB2b2lkIGdlbjZfZ2d0dF9p bnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIHsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB2bS0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAl1bnNp Z25lZCBmaXJzdF9lbnRyeSA9IHN0YXJ0ID4+IFBBR0VfU0hJRlQ7Ci0JZ2VuNl9ndHRfcHRlX3Qg X19pb21lbSAqZ3R0X2VudHJpZXMgPQotCQkoZ2VuNl9ndHRfcHRlX3QgX19pb21lbSAqKWRldl9w cml2LT5ndHQuZ3NtICsgZmlyc3RfZW50cnk7CisJZ2VuNl9wdGVfdCBfX2lvbWVtICpndHRfZW50 cmllcyA9CisJCShnZW42X3B0ZV90IF9faW9tZW0gKilkZXZfcHJpdi0+Z3R0LmdzbSArIGZpcnN0 X2VudHJ5OwogCWludCBpID0gMDsKIAlzdHJ1Y3Qgc2dfcGFnZV9pdGVyIHNnX2l0ZXI7CiAJZG1h X2FkZHJfdCBhZGRyID0gMDsKQEAgLTE2NDIsOCArMTY0Miw4IEBAIHN0YXRpYyB2b2lkIGdlbjhf Z2d0dF9jbGVhcl9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB2bS0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAl1bnNp Z25lZCBmaXJzdF9lbnRyeSA9IHN0YXJ0ID4+IFBBR0VfU0hJRlQ7CiAJdW5zaWduZWQgbnVtX2Vu dHJpZXMgPSBsZW5ndGggPj4gUEFHRV9TSElGVDsKLQlnZW44X2d0dF9wdGVfdCBzY3JhdGNoX3B0 ZSwgX19pb21lbSAqZ3R0X2Jhc2UgPQotCQkoZ2VuOF9ndHRfcHRlX3QgX19pb21lbSAqKSBkZXZf cHJpdi0+Z3R0LmdzbSArIGZpcnN0X2VudHJ5OworCWdlbjhfcHRlX3Qgc2NyYXRjaF9wdGUsIF9f aW9tZW0gKmd0dF9iYXNlID0KKwkJKGdlbjhfcHRlX3QgX19pb21lbSAqKSBkZXZfcHJpdi0+Z3R0 LmdzbSArIGZpcnN0X2VudHJ5OwogCWNvbnN0IGludCBtYXhfZW50cmllcyA9IGd0dF90b3RhbF9l bnRyaWVzKGRldl9wcml2LT5ndHQpIC0gZmlyc3RfZW50cnk7CiAJaW50IGk7CiAKQEAgLTE2Njgs OCArMTY2OCw4IEBAIHN0YXRpYyB2b2lkIGdlbjZfZ2d0dF9jbGVhcl9yYW5nZShzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB2bS0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAl1bnNpZ25lZCBmaXJzdF9lbnRyeSA9IHN0YXJ0ID4+ IFBBR0VfU0hJRlQ7CiAJdW5zaWduZWQgbnVtX2VudHJpZXMgPSBsZW5ndGggPj4gUEFHRV9TSElG VDsKLQlnZW42X2d0dF9wdGVfdCBzY3JhdGNoX3B0ZSwgX19pb21lbSAqZ3R0X2Jhc2UgPQotCQko Z2VuNl9ndHRfcHRlX3QgX19pb21lbSAqKSBkZXZfcHJpdi0+Z3R0LmdzbSArIGZpcnN0X2VudHJ5 OworCWdlbjZfcHRlX3Qgc2NyYXRjaF9wdGUsIF9faW9tZW0gKmd0dF9iYXNlID0KKwkJKGdlbjZf cHRlX3QgX19pb21lbSAqKSBkZXZfcHJpdi0+Z3R0LmdzbSArIGZpcnN0X2VudHJ5OwogCWNvbnN0 IGludCBtYXhfZW50cmllcyA9IGd0dF90b3RhbF9lbnRyaWVzKGRldl9wcml2LT5ndHQpIC0gZmly c3RfZW50cnk7CiAJaW50IGk7CiAKQEAgLTIxODEsNyArMjE4MSw3IEBAIHN0YXRpYyBpbnQgZ2Vu OF9nbWNoX3Byb2JlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWd0dF9zaXplID0gZ2VuOF9n ZXRfdG90YWxfZ3R0X3NpemUoc25iX2dtY2hfY3RsKTsKIAl9CiAKLQkqZ3R0X3RvdGFsID0gKGd0 dF9zaXplIC8gc2l6ZW9mKGdlbjhfZ3R0X3B0ZV90KSkgPDwgUEFHRV9TSElGVDsKKwkqZ3R0X3Rv dGFsID0gKGd0dF9zaXplIC8gc2l6ZW9mKGdlbjhfcHRlX3QpKSA8PCBQQUdFX1NISUZUOwogCiAJ aWYgKElTX0NIRVJSWVZJRVcoZGV2KSkKIAkJY2h2X3NldHVwX3ByaXZhdGVfcHBhdChkZXZfcHJp dik7CkBAIC0yMjI2LDcgKzIyMjYsNyBAQCBzdGF0aWMgaW50IGdlbjZfZ21jaF9wcm9iZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCSpzdG9sZW4gPSBnZW42X2dldF9zdG9sZW5fc2l6ZShzbmJf Z21jaF9jdGwpOwogCiAJZ3R0X3NpemUgPSBnZW42X2dldF90b3RhbF9ndHRfc2l6ZShzbmJfZ21j aF9jdGwpOwotCSpndHRfdG90YWwgPSAoZ3R0X3NpemUgLyBzaXplb2YoZ2VuNl9ndHRfcHRlX3Qp KSA8PCBQQUdFX1NISUZUOworCSpndHRfdG90YWwgPSAoZ3R0X3NpemUgLyBzaXplb2YoZ2VuNl9w dGVfdCkpIDw8IFBBR0VfU0hJRlQ7CiAKIAlyZXQgPSBnZ3R0X3Byb2JlX2NvbW1vbihkZXYsIGd0 dF9zaXplKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCBjOWU5M2Y1Li41 Y2E3YzVlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaApAQCAtMzYsMTMgKzM2LDEz IEBACiAKIHN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGU7CiAKLXR5cGVkZWYgdWludDMyX3Qg Z2VuNl9ndHRfcHRlX3Q7Ci10eXBlZGVmIHVpbnQ2NF90IGdlbjhfZ3R0X3B0ZV90OwotdHlwZWRl ZiBnZW44X2d0dF9wdGVfdCBnZW44X3BwZ3R0X3BkZV90OwordHlwZWRlZiB1aW50MzJfdCBnZW42 X3B0ZV90OwordHlwZWRlZiB1aW50NjRfdCBnZW44X3B0ZV90OwordHlwZWRlZiB1aW50NjRfdCBn ZW44X3BkZV90OwogCiAjZGVmaW5lIGd0dF90b3RhbF9lbnRyaWVzKGd0dCkgKChndHQpLmJhc2Uu dG90YWwgPj4gUEFHRV9TSElGVCkKIAotI2RlZmluZSBJOTE1X1BQR1RUX1BUX0VOVFJJRVMJCShQ QUdFX1NJWkUgLyBzaXplb2YoZ2VuNl9ndHRfcHRlX3QpKQorCiAvKiBnZW42LWhzdyBoYXMgYml0 IDExLTQgZm9yIHBoeXNpY2FsIGFkZHIgYml0IDM5LTMyICovCiAjZGVmaW5lIEdFTjZfR1RUX0FE RFJfRU5DT0RFKGFkZHIpCSgoYWRkcikgfCAoKChhZGRyKSA+PiAyOCkgJiAweGZmMCkpCiAjZGVm aW5lIEdFTjZfUFRFX0FERFJfRU5DT0RFKGFkZHIpCUdFTjZfR1RUX0FERFJfRU5DT0RFKGFkZHIp CkBAIC01MSw4ICs1MSwxMyBAQCB0eXBlZGVmIGdlbjhfZ3R0X3B0ZV90IGdlbjhfcHBndHRfcGRl X3Q7CiAjZGVmaW5lIEdFTjZfUFRFX1VOQ0FDSEVECQkoMSA8PCAxKQogI2RlZmluZSBHRU42X1BU RV9WQUxJRAkJCSgxIDw8IDApCiAKLSNkZWZpbmUgR0VONl9QUEdUVF9QRF9FTlRSSUVTCQk1MTIK LSNkZWZpbmUgR0VONl9QRF9TSVpFCQkJKEdFTjZfUFBHVFRfUERfRU5UUklFUyAqIFBBR0VfU0la RSkKKyNkZWZpbmUgSTkxNV9QVEVTKHB0ZV9sZW4pCQkoUEFHRV9TSVpFIC8gKHB0ZV9sZW4pKQor I2RlZmluZSBJOTE1X1BURV9NQVNLKHB0ZV9sZW4pCQkoSTkxNV9QVEVTKHB0ZV9sZW4pIC0gMSkK KyNkZWZpbmUgSTkxNV9QREVTCQkJNTEyCisjZGVmaW5lIEk5MTVfUERFX01BU0sJCQkoSTkxNV9Q REVTIC0gMSkKKworI2RlZmluZSBHRU42X1BURVMJCQlJOTE1X1BURVMoc2l6ZW9mKGdlbjZfcHRl X3QpKQorI2RlZmluZSBHRU42X1BEX1NJWkUJCSAgICAgICAgKEk5MTVfUERFUyAqIFBBR0VfU0la RSkKICNkZWZpbmUgR0VONl9QRF9BTElHTgkJCShQQUdFX1NJWkUgKiAxNikKICNkZWZpbmUgR0VO Nl9QREVfVkFMSUQJCQkoMSA8PCAwKQogCkBAIC04OSw4ICs5NCw3IEBAIHR5cGVkZWYgZ2VuOF9n dHRfcHRlX3QgZ2VuOF9wcGd0dF9wZGVfdDsKICNkZWZpbmUgR0VOOF9QVEVfU0hJRlQJCQkxMgog I2RlZmluZSBHRU44X1BURV9NQVNLCQkJMHgxZmYKICNkZWZpbmUgR0VOOF9MRUdBQ1lfUERQRVMJ CTQKLSNkZWZpbmUgR0VOOF9QVEVTX1BFUl9QQUdFCQkoUEFHRV9TSVpFIC8gc2l6ZW9mKGdlbjhf Z3R0X3B0ZV90KSkKLSNkZWZpbmUgR0VOOF9QREVTX1BFUl9QQUdFCQkoUEFHRV9TSVpFIC8gc2l6 ZW9mKGdlbjhfcHBndHRfcGRlX3QpKQorI2RlZmluZSBHRU44X1BURVMJCQlJOTE1X1BURVMoc2l6 ZW9mKGdlbjhfcHRlX3QpKQogCiAjZGVmaW5lIFBQQVRfVU5DQUNIRURfSU5ERVgJCShfUEFHRV9Q V1QgfCBfUEFHRV9QQ0QpCiAjZGVmaW5lIFBQQVRfQ0FDSEVEX1BERV9JTkRFWAkJMCAvKiBXQiBM TEMgKi8KQEAgLTE5OSw3ICsyMDMsNyBAQCBzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRy eSB7CiAJCWRtYV9hZGRyX3QgZGFkZHI7CiAJfTsKIAotCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGVf ZW50cnkgKnBhZ2VfdGFibGVbR0VONl9QUEdUVF9QRF9FTlRSSUVTXTsgLyogUERFcyAqLworCXN0 cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkgKnBhZ2VfdGFibGVbSTkxNV9QREVTXTsgLyogUERF cyAqLwogfTsKIAogc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlcl9lbnRyeSB7CkBA IC0yNDMsOSArMjQ3LDkgQEAgc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSB7CiAJc3RydWN0IGxp c3RfaGVhZCBpbmFjdGl2ZV9saXN0OwogCiAJLyogRklYTUU6IE5lZWQgYSBtb3JlIGdlbmVyaWMg cmV0dXJuIHR5cGUgKi8KLQlnZW42X2d0dF9wdGVfdCAoKnB0ZV9lbmNvZGUpKGRtYV9hZGRyX3Qg YWRkciwKLQkJCQkgICAgIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBsZXZlbCwKLQkJCQkgICAgIGJv b2wgdmFsaWQsIHUzMiBmbGFncyk7IC8qIENyZWF0ZSBhIHZhbGlkIFBURSAqLworCWdlbjZfcHRl X3QgKCpwdGVfZW5jb2RlKShkbWFfYWRkcl90IGFkZHIsCisJCQkJIGVudW0gaTkxNV9jYWNoZV9s ZXZlbCBsZXZlbCwKKwkJCQkgYm9vbCB2YWxpZCwgdTMyIGZsYWdzKTsgLyogQ3JlYXRlIGEgdmFs aWQgUFRFICovCiAJdm9pZCAoKmNsZWFyX3JhbmdlKShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNl ICp2bSwKIAkJCSAgICB1aW50NjRfdCBzdGFydCwKIAkJCSAgICB1aW50NjRfdCBsZW5ndGgsCi0t IAoyLjEuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK