From: Michel Thierry Subject: [PATCH 4/4] drm/i915/ppgtt: Abstract 4lvl and legacy functions Date: Fri, 7 Aug 2015 17:40:20 +0100 Message-ID: <1438965620-3776-4-git-send-email-michel.thierry@intel.com> References: <1438965620-3776-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 02E686E2C8 for ; Fri, 7 Aug 2015 09:40:43 -0700 (PDT) In-Reply-To: <1438965620-3776-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 Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org Q2xlYW51cCwgYWxsb2NhdGUsIGluc2VydCwgY2xlYXIgYW5kIGR1bXAgZnVuY3Rpb25zIHdlcmUg YWxyZWFkeSB2ZnVuY3MsCnRoaXMgcGF0Y2ggbm93IHBvaW50IHRoZW0gdG8gdGhlIDQtbGV2ZWwg KDQ4LWJpdCkgb3IgbGVnYWN5ICgzMi1iaXQpCnZlcnNpb25zLgoKVGhpcyByZW1vdmVzIHVubmVj ZXNzYXJ5IGNoZWNrcyBvZiB3aGljaCBwcGd0dCBpcyBpbiB1c2UsIGFzIGl0IG5vdyBvbmx5Cmhh cHBlbnMgb25jZSwgaW4gcHBndHRfaW5pdC4KClN1Z2dlc3RlZC1ieTogRGFuaWVsIFZldHRlciA8 ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJA ZmZ3bGwuY2g+ClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBp bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCAyNTMg KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTUz IGluc2VydGlvbnMoKyksIDEwMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jCmluZGV4IGQyOTEwYTguLmUwZDlhZTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jCkBAIC03NTUsMjggKzc1NSwzNyBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2NsZWFy X3B0ZV9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAl9CiB9CiAKLXN0YXRp YyB2b2lkIGdlbjhfcHBndHRfY2xlYXJfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAq dm0sCi0JCQkJICAgdWludDY0X3Qgc3RhcnQsCi0JCQkJICAgdWludDY0X3QgbGVuZ3RoLAotCQkJ CSAgIGJvb2wgdXNlX3NjcmF0Y2gpCitzdGF0aWMgdm9pZCBnZW44X2xlZ2FjeV9wcGd0dF9jbGVh cl9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKKwkJCQkJICB1aW50NjRfdCBz dGFydCwKKwkJCQkJICB1aW50NjRfdCBsZW5ndGgsCisJCQkJCSAgYm9vbCB1c2Vfc2NyYXRjaCkK IHsKIAlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPQogCQljb250YWluZXJfb2Yodm0sIHN0 cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKIAlnZW44X3B0ZV90IHNjcmF0Y2hfcHRlID0gZ2Vu OF9wdGVfZW5jb2RlKHB4X2RtYSh2bS0+c2NyYXRjaF9wYWdlKSwKIAkJCQkJCSBJOTE1X0NBQ0hF X0xMQywgdXNlX3NjcmF0Y2gpOwogCi0JaWYgKCFVU0VTX0ZVTExfNDhCSVRfUFBHVFQodm0tPmRl dikpIHsKLQkJZ2VuOF9wcGd0dF9jbGVhcl9wdGVfcmFuZ2Uodm0sICZwcGd0dC0+cGRwLCBzdGFy dCwgbGVuZ3RoLAotCQkJCQkgICBzY3JhdGNoX3B0ZSk7Ci0JfSBlbHNlIHsKLQkJdWludDY0X3Qg dGVtcGw0LCBwbWw0ZTsKLQkJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlciAqcGRw OworCWdlbjhfcHBndHRfY2xlYXJfcHRlX3JhbmdlKHZtLCAmcHBndHQtPnBkcCwgc3RhcnQsIGxl bmd0aCwKKwkJCQkgICBzY3JhdGNoX3B0ZSk7Cit9CiAKLQkJZ2VuOF9mb3JfZWFjaF9wbWw0ZShw ZHAsICZwcGd0dC0+cG1sNCwgc3RhcnQsIGxlbmd0aCwgdGVtcGw0LCBwbWw0ZSkgewotCQkJZ2Vu OF9wcGd0dF9jbGVhcl9wdGVfcmFuZ2Uodm0sIHBkcCwgc3RhcnQsIGxlbmd0aCwKLQkJCQkJCSAg IHNjcmF0Y2hfcHRlKTsKLQkJfQorc3RhdGljIHZvaWQgZ2VuOF80bHZsX3BwZ3R0X2NsZWFyX3Jh bmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAorCQkJCQl1aW50NjRfdCBzdGFydCwK KwkJCQkJdWludDY0X3QgbGVuZ3RoLAorCQkJCQlib29sIHVzZV9zY3JhdGNoKQoreworCXN0cnVj dCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9CisJCWNvbnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVf aHdfcHBndHQsIGJhc2UpOworCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgKnBk cDsKKwl1aW50NjRfdCB0ZW1wbDQsIHBtbDRlOworCWdlbjhfcHRlX3Qgc2NyYXRjaF9wdGUgPSBn ZW44X3B0ZV9lbmNvZGUocHhfZG1hKHZtLT5zY3JhdGNoX3BhZ2UpLAorCQkJCQkJIEk5MTVfQ0FD SEVfTExDLCB1c2Vfc2NyYXRjaCk7CisKKwlnZW44X2Zvcl9lYWNoX3BtbDRlKHBkcCwgJnBwZ3R0 LT5wbWw0LCBzdGFydCwgbGVuZ3RoLCB0ZW1wbDQsIHBtbDRlKSB7CisJCWdlbjhfcHBndHRfY2xl YXJfcHRlX3JhbmdlKHZtLCBwZHAsIHN0YXJ0LCBsZW5ndGgsCisJCQkJCSAgIHNjcmF0Y2hfcHRl KTsKIAl9CisKIH0KIAogc3RhdGljIHZvaWQKQEAgLTgyMSwxMSArODMwLDExIEBAIGdlbjhfcHBn dHRfaW5zZXJ0X3B0ZV9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQlr dW5tYXBfcHgocHBndHQsIHB0X3ZhZGRyKTsKIH0KIAotc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9p bnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKLQkJCQkgICAgICBz dHJ1Y3Qgc2dfdGFibGUgKnBhZ2VzLAotCQkJCSAgICAgIHVpbnQ2NF90IHN0YXJ0LAotCQkJCSAg ICAgIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBjYWNoZV9sZXZlbCwKLQkJCQkgICAgICB1MzIgdW51 c2VkKQorc3RhdGljIHZvaWQgZ2VuOF9sZWdhY3lfcHBndHRfaW5zZXJ0X2VudHJpZXMoc3RydWN0 IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCisJCQkJCSAgICAgc3RydWN0IHNnX3RhYmxlICpwYWdl cywKKwkJCQkJICAgICB1aW50NjRfdCBzdGFydCwKKwkJCQkJICAgICBlbnVtIGk5MTVfY2FjaGVf bGV2ZWwgY2FjaGVfbGV2ZWwsCisJCQkJCSAgICAgdTMyIHVudXNlZCkKIHsKIAlzdHJ1Y3QgaTkx NV9od19wcGd0dCAqcHBndHQgPQogCQljb250YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3Bw Z3R0LCBiYXNlKTsKQEAgLTgzMywxOCArODQyLDI4IEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRf aW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAKIAlfX3NnX3Bh Z2VfaXRlcl9zdGFydCgmc2dfaXRlciwgcGFnZXMtPnNnbCwgc2dfbmVudHMocGFnZXMtPnNnbCks IDApOwogCi0JaWYgKCFVU0VTX0ZVTExfNDhCSVRfUFBHVFQodm0tPmRldikpIHsKLQkJZ2VuOF9w cGd0dF9pbnNlcnRfcHRlX2VudHJpZXModm0sICZwcGd0dC0+cGRwLCAmc2dfaXRlciwgc3RhcnQs Ci0JCQkJCSAgICAgIGNhY2hlX2xldmVsKTsKLQl9IGVsc2UgewotCQlzdHJ1Y3QgaTkxNV9wYWdl X2RpcmVjdG9yeV9wb2ludGVyICpwZHA7Ci0JCXVpbnQ2NF90IHRlbXBsNCwgcG1sNGU7Ci0JCXVp bnQ2NF90IGxlbmd0aCA9ICh1aW50NjRfdClwYWdlcy0+b3JpZ19uZW50cyA8PCBQQUdFX1NISUZU OworCWdlbjhfcHBndHRfaW5zZXJ0X3B0ZV9lbnRyaWVzKHZtLCAmcHBndHQtPnBkcCwgJnNnX2l0 ZXIsIHN0YXJ0LAorCQkJCSAgICAgIGNhY2hlX2xldmVsKTsKK30KIAotCQlnZW44X2Zvcl9lYWNo X3BtbDRlKHBkcCwgJnBwZ3R0LT5wbWw0LCBzdGFydCwgbGVuZ3RoLCB0ZW1wbDQsIHBtbDRlKSB7 Ci0JCQlnZW44X3BwZ3R0X2luc2VydF9wdGVfZW50cmllcyh2bSwgcGRwLCAmc2dfaXRlciwKLQkJ CQkJCSAgICAgIHN0YXJ0LCBjYWNoZV9sZXZlbCk7Ci0JCX0KK3N0YXRpYyB2b2lkIGdlbjhfNGx2 bF9wcGd0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKKwkJ CQkJICAgc3RydWN0IHNnX3RhYmxlICpwYWdlcywKKwkJCQkJICAgdWludDY0X3Qgc3RhcnQsCisJ CQkJCSAgIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBjYWNoZV9sZXZlbCwKKwkJCQkJICAgdTMyIHVu dXNlZCkKK3sKKwlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPQorCQljb250YWluZXJfb2Yo dm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKKwlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVj dG9yeV9wb2ludGVyICpwZHA7CisJc3RydWN0IHNnX3BhZ2VfaXRlciBzZ19pdGVyOworCXVpbnQ2 NF90IHRlbXBsNCwgcG1sNGU7CisJdWludDY0X3QgbGVuZ3RoID0gKHVpbnQ2NF90KXBhZ2VzLT5v cmlnX25lbnRzIDw8IFBBR0VfU0hJRlQ7CisKKwlfX3NnX3BhZ2VfaXRlcl9zdGFydCgmc2dfaXRl ciwgcGFnZXMtPnNnbCwgc2dfbmVudHMocGFnZXMtPnNnbCksIDApOworCisJZ2VuOF9mb3JfZWFj aF9wbWw0ZShwZHAsICZwcGd0dC0+cG1sNCwgc3RhcnQsIGxlbmd0aCwgdGVtcGw0LCBwbWw0ZSkg eworCQlnZW44X3BwZ3R0X2luc2VydF9wdGVfZW50cmllcyh2bSwgcGRwLCAmc2dfaXRlciwKKwkJ CQkJICAgICAgc3RhcnQsIGNhY2hlX2xldmVsKTsKIAl9CiB9CiAKQEAgLTkxNSw3ICs5MzQsNyBA QCBzdGF0aWMgdm9pZCBnZW44X2ZyZWVfc2NyYXRjaChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNl ICp2bSkKIAlmcmVlX3NjcmF0Y2hfcGFnZShkZXYsIHZtLT5zY3JhdGNoX3BhZ2UpOwogfQogCi1z dGF0aWMgdm9pZCBnZW44X3BwZ3R0X2NsZWFudXBfM2x2bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAorc3RhdGljIHZvaWQgZ2VuOF8zbHZsX3BwZ3R0X2NsZWFudXAoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKIAkJCQkgICAgc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlciAqcGRwKQog ewogCWludCBpOwpAQCAtOTMxLDMwICs5NTAsMjkgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9j bGVhbnVwXzNsdmwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlmcmVlX3BkcChkZXYsIHBkcCk7 CiB9CiAKLXN0YXRpYyB2b2lkIGdlbjhfcHBndHRfY2xlYW51cF80bHZsKHN0cnVjdCBpOTE1X2h3 X3BwZ3R0ICpwcGd0dCkKK3N0YXRpYyB2b2lkIGdlbjhfbGVnYWN5X3BwZ3R0X2NsZWFudXAoc3Ry dWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0pCiB7CisJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBw Z3R0ID0KKwkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7CisK KwlnZW44XzNsdmxfcHBndHRfY2xlYW51cChwcGd0dC0+YmFzZS5kZXYsICZwcGd0dC0+cGRwKTsK KwlnZW44X2ZyZWVfc2NyYXRjaCh2bSk7Cit9CisKK3N0YXRpYyB2b2lkIGdlbjhfNGx2bF9wcGd0 dF9jbGVhbnVwKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQoreworCXN0cnVjdCBpOTE1 X2h3X3BwZ3R0ICpwcGd0dCA9CisJCWNvbnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVfaHdfcHBn dHQsIGJhc2UpOwogCWludCBpOwogCiAJZm9yX2VhY2hfc2V0X2JpdChpLCBwcGd0dC0+cG1sNC51 c2VkX3BtbDRlcywgR0VOOF9QTUw0RVNfUEVSX1BNTDQpIHsKIAkJaWYgKFdBUk5fT04oIXBwZ3R0 LT5wbWw0LnBkcHNbaV0pKQogCQkJY29udGludWU7CiAKLQkJZ2VuOF9wcGd0dF9jbGVhbnVwXzNs dmwocHBndHQtPmJhc2UuZGV2LCBwcGd0dC0+cG1sNC5wZHBzW2ldKTsKKwkJZ2VuOF8zbHZsX3Bw Z3R0X2NsZWFudXAocHBndHQtPmJhc2UuZGV2LCBwcGd0dC0+cG1sNC5wZHBzW2ldKTsKIAl9CiAK IAljbGVhbnVwX3B4KHBwZ3R0LT5iYXNlLmRldiwgJnBwZ3R0LT5wbWw0KTsKLX0KLQotc3RhdGlj IHZvaWQgZ2VuOF9wcGd0dF9jbGVhbnVwKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQot ewotCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9Ci0JCWNvbnRhaW5lcl9vZih2bSwgc3Ry dWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpOwotCi0JaWYgKCFVU0VTX0ZVTExfNDhCSVRfUFBHVFQo cHBndHQtPmJhc2UuZGV2KSkKLQkJZ2VuOF9wcGd0dF9jbGVhbnVwXzNsdmwocHBndHQtPmJhc2Uu ZGV2LCAmcHBndHQtPnBkcCk7Ci0JZWxzZQotCQlnZW44X3BwZ3R0X2NsZWFudXBfNGx2bChwcGd0 dCk7Ci0KIAlnZW44X2ZyZWVfc2NyYXRjaCh2bSk7CiB9CiAKQEAgLTExOTEsNyArMTIwOSw3IEBA IHN0YXRpYyB2b2lkIG1hcmtfdGxic19kaXJ0eShzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQp CiAJcHBndHQtPnBkX2RpcnR5X3JpbmdzID0gSU5URUxfSU5GTyhwcGd0dC0+YmFzZS5kZXYpLT5y aW5nX21hc2s7CiB9CiAKLXN0YXRpYyBpbnQgZ2VuOF9hbGxvY192YV9yYW5nZV8zbHZsKHN0cnVj dCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAorc3RhdGljIGludCBnZW44XzNsdmxfYWxsb2NfdmFf cmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCQkJICAgIHN0cnVjdCBpOTE1 X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgKnBkcCwKIAkJCQkgICAgdWludDY0X3Qgc3RhcnQsCiAJ CQkJICAgIHVpbnQ2NF90IGxlbmd0aCkKQEAgLTEzMTEsMTQgKzEzMjksMjMgQEAgZXJyX291dDoK IAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMgaW50IGdlbjhfYWxsb2NfdmFfcmFuZ2VfNGx2bChz dHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKLQkJCQkgICAgc3RydWN0IGk5MTVfcG1sNCAq cG1sNCwKK3N0YXRpYyBpbnQgZ2VuOF9sZWdhY3lfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVf YWRkcmVzc19zcGFjZSAqdm0sCisJCQkJICAgICAgdWludDY0X3Qgc3RhcnQsIHVpbnQ2NF90IGxl bmd0aCkKK3sKKwlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPQorCQljb250YWluZXJfb2Yo dm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKKworCXJldHVybiBnZW44XzNsdmxfYWxs b2NfdmFfcmFuZ2Uodm0sICZwcGd0dC0+cGRwLCBzdGFydCwgbGVuZ3RoKTsKK30KKworc3RhdGlj IGludCBnZW44XzRsdmxfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAq dm0sCiAJCQkJICAgIHVpbnQ2NF90IHN0YXJ0LAogCQkJCSAgICB1aW50NjRfdCBsZW5ndGgpCiB7 CiAJREVDTEFSRV9CSVRNQVAobmV3X3BkcHMsIEdFTjhfUE1MNEVTX1BFUl9QTUw0KTsKIAlzdHJ1 Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPQogCQkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkx NV9od19wcGd0dCwgYmFzZSk7CisJc3RydWN0IGk5MTVfcG1sNCAqcG1sNCA9ICZwcGd0dC0+cG1s NDsKIAlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpwZHA7CiAJdWludDY0X3Qg dGVtcCwgcG1sNGU7CiAJaW50IHJldCA9IDA7CkBAIC0xMzQyLDcgKzEzNjksNyBAQCBzdGF0aWMg aW50IGdlbjhfYWxsb2NfdmFfcmFuZ2VfNGx2bChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2 bSwKIAlnZW44X2Zvcl9lYWNoX3BtbDRlKHBkcCwgcG1sNCwgc3RhcnQsIGxlbmd0aCwgdGVtcCwg cG1sNGUpIHsKIAkJV0FSTl9PTighcGRwKTsKIAotCQlyZXQgPSBnZW44X2FsbG9jX3ZhX3Jhbmdl XzNsdmwodm0sIHBkcCwgc3RhcnQsIGxlbmd0aCk7CisJCXJldCA9IGdlbjhfM2x2bF9hbGxvY192 YV9yYW5nZSh2bSwgcGRwLCBzdGFydCwgbGVuZ3RoKTsKIAkJaWYgKHJldCkKIAkJCWdvdG8gZXJy X291dDsKIApAQCAtMTM1NiwyNCArMTM4MywxMiBAQCBzdGF0aWMgaW50IGdlbjhfYWxsb2NfdmFf cmFuZ2VfNGx2bChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAogZXJyX291dDoKIAlm b3JfZWFjaF9zZXRfYml0KHBtbDRlLCBuZXdfcGRwcywgR0VOOF9QTUw0RVNfUEVSX1BNTDQpCi0J CWdlbjhfcHBndHRfY2xlYW51cF8zbHZsKHZtLT5kZXYsIHBtbDQtPnBkcHNbcG1sNGVdKTsKKwkJ Z2VuOF8zbHZsX3BwZ3R0X2NsZWFudXAodm0tPmRldiwgcG1sNC0+cGRwc1twbWw0ZV0pOwogCiAJ cmV0dXJuIHJldDsKIH0KIAotc3RhdGljIGludCBnZW44X2FsbG9jX3ZhX3JhbmdlKHN0cnVjdCBp OTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAotCQkJICAgICAgIHVpbnQ2NF90IHN0YXJ0LCB1aW50NjRf dCBsZW5ndGgpCi17Ci0Jc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KLQkJY29udGFpbmVy X29mKHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7Ci0KLQlpZiAoVVNFU19GVUxMXzQ4 QklUX1BQR1RUKHZtLT5kZXYpKQotCQlyZXR1cm4gZ2VuOF9hbGxvY192YV9yYW5nZV80bHZsKHZt LCAmcHBndHQtPnBtbDQsIHN0YXJ0LCBsZW5ndGgpOwotCWVsc2UKLQkJcmV0dXJuIGdlbjhfYWxs b2NfdmFfcmFuZ2VfM2x2bCh2bSwgJnBwZ3R0LT5wZHAsIHN0YXJ0LCBsZW5ndGgpOwotfQotCi1z dGF0aWMgdm9pZCBnZW44X2R1bXBfcGRwKHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50 ZXIgKnBkcCwKK3N0YXRpYyB2b2lkIGdlbjhfcGRwX2R1bXAoc3RydWN0IGk5MTVfcGFnZV9kaXJl Y3RvcnlfcG9pbnRlciAqcGRwLAogCQkJICB1aW50NjRfdCBzdGFydCwgdWludDY0X3QgbGVuZ3Ro LAogCQkJICBnZW44X3B0ZV90IHNjcmF0Y2hfcHRlLAogCQkJICBzdHJ1Y3Qgc2VxX2ZpbGUgKm0p CkBAIC0xNDMxLDcgKzE0NDYsOCBAQCBzdGF0aWMgdm9pZCBnZW44X2R1bXBfcGRwKHN0cnVjdCBp OTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgKnBkcCwKIAl9CiB9CiAKLXN0YXRpYyB2b2lkIGdl bjhfZHVtcF9wcGd0dChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsIHN0cnVjdCBzZXFfZmls ZSAqbSkKK3N0YXRpYyB2b2lkIGdlbjhfbGVnYWN5X3BwZ3R0X2R1bXAoc3RydWN0IGk5MTVfaHdf cHBndHQgKnBwZ3R0LAorCQkJCSAgc3RydWN0IHNlcV9maWxlICptKQogewogCXN0cnVjdCBpOTE1 X2FkZHJlc3Nfc3BhY2UgKnZtID0gJnBwZ3R0LT5iYXNlOwogCXVpbnQ2NF90IHN0YXJ0ID0gcHBn dHQtPmJhc2Uuc3RhcnQ7CkBAIC0xNDM5LDIwICsxNDU1LDI3IEBAIHN0YXRpYyB2b2lkIGdlbjhf ZHVtcF9wcGd0dChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsIHN0cnVjdCBzZXFfZmlsZSAq bSkKIAlnZW44X3B0ZV90IHNjcmF0Y2hfcHRlID0gZ2VuOF9wdGVfZW5jb2RlKHB4X2RtYSh2bS0+ c2NyYXRjaF9wYWdlKSwKIAkJCQkJCSBJOTE1X0NBQ0hFX0xMQywgdHJ1ZSk7CiAKLQlpZiAoIVVT RVNfRlVMTF80OEJJVF9QUEdUVCh2bS0+ZGV2KSkgewotCQlnZW44X2R1bXBfcGRwKCZwcGd0dC0+ cGRwLCBzdGFydCwgbGVuZ3RoLCBzY3JhdGNoX3B0ZSwgbSk7Ci0JfSBlbHNlIHsKLQkJdWludDY0 X3QgdGVtcGw0LCBwbWw0ZTsKLQkJc3RydWN0IGk5MTVfcG1sNCAqcG1sNCA9ICZwcGd0dC0+cG1s NDsKLQkJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlciAqcGRwOworCWdlbjhfcGRw X2R1bXAoJnBwZ3R0LT5wZHAsIHN0YXJ0LCBsZW5ndGgsIHNjcmF0Y2hfcHRlLCBtKTsKK30KIAot CQlnZW44X2Zvcl9lYWNoX3BtbDRlKHBkcCwgcG1sNCwgc3RhcnQsIGxlbmd0aCwgdGVtcGw0LCBw bWw0ZSkgewotCQkJaWYgKCF0ZXN0X2JpdChwbWw0ZSwgcG1sNC0+dXNlZF9wbWw0ZXMpKQotCQkJ CWNvbnRpbnVlOworc3RhdGljIHZvaWQgZ2VuOF80bHZsX3BwZ3R0X2R1bXAoc3RydWN0IGk5MTVf aHdfcHBndHQgKnBwZ3R0LAorCQkJCSBzdHJ1Y3Qgc2VxX2ZpbGUgKm0pCit7CisJc3RydWN0IGk5 MTVfYWRkcmVzc19zcGFjZSAqdm0gPSAmcHBndHQtPmJhc2U7CisJdWludDY0X3Qgc3RhcnQgPSBw cGd0dC0+YmFzZS5zdGFydDsKKwl1aW50NjRfdCBsZW5ndGggPSBwcGd0dC0+YmFzZS50b3RhbDsK Kwl1aW50NjRfdCB0ZW1wbDQsIHBtbDRlOworCXN0cnVjdCBpOTE1X3BtbDQgKnBtbDQgPSAmcHBn dHQtPnBtbDQ7CisJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlciAqcGRwOworCWdl bjhfcHRlX3Qgc2NyYXRjaF9wdGUgPSBnZW44X3B0ZV9lbmNvZGUocHhfZG1hKHZtLT5zY3JhdGNo X3BhZ2UpLAorCQkJCQkJIEk5MTVfQ0FDSEVfTExDLCB0cnVlKTsKIAotCQkJc2VxX3ByaW50Ziht LCAiICAgIFBNTDRFICMlbGx1XG4iLCBwbWw0ZSk7Ci0JCQlnZW44X2R1bXBfcGRwKHBkcCwgc3Rh cnQsIGxlbmd0aCwgc2NyYXRjaF9wdGUsIG0pOwotCQl9CisJZ2VuOF9mb3JfZWFjaF9wbWw0ZShw ZHAsIHBtbDQsIHN0YXJ0LCBsZW5ndGgsIHRlbXBsNCwgcG1sNGUpIHsKKwkJaWYgKCF0ZXN0X2Jp dChwbWw0ZSwgcG1sNC0+dXNlZF9wbWw0ZXMpKQorCQkJY29udGludWU7CisKKwkJc2VxX3ByaW50 ZihtLCAiICAgIFBNTDRFICMlbGx1XG4iLCBwbWw0ZSk7CisJCWdlbjhfcGRwX2R1bXAocGRwLCBz dGFydCwgbGVuZ3RoLCBzY3JhdGNoX3B0ZSwgbSk7CiAJfQogfQogCkBAIC0xNDYzLDcgKzE0ODYs NyBAQCBzdGF0aWMgdm9pZCBnZW44X2R1bXBfcHBndHQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBw Z3R0LCBzdHJ1Y3Qgc2VxX2ZpbGUgKm0pCiAgKiBzcGFjZS4KICAqCiAgKi8KLXN0YXRpYyBpbnQg Z2VuOF9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKK3N0YXRpYyBpbnQg Z2VuOF9sZWdhY3lfcHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiB7CiAJ aW50IHJldDsKIApAQCAtMTQ3MiwzNCArMTQ5NSw2MiBAQCBzdGF0aWMgaW50IGdlbjhfcHBndHRf aW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJCXJldHVybiByZXQ7CiAKIAlwcGd0 dC0+YmFzZS5zdGFydCA9IDA7Ci0JcHBndHQtPmJhc2UuY2xlYW51cCA9IGdlbjhfcHBndHRfY2xl YW51cDsKLQlwcGd0dC0+YmFzZS5hbGxvY2F0ZV92YV9yYW5nZSA9IGdlbjhfYWxsb2NfdmFfcmFu Z2U7Ci0JcHBndHQtPmJhc2UuaW5zZXJ0X2VudHJpZXMgPSBnZW44X3BwZ3R0X2luc2VydF9lbnRy aWVzOwotCXBwZ3R0LT5iYXNlLmNsZWFyX3JhbmdlID0gZ2VuOF9wcGd0dF9jbGVhcl9yYW5nZTsK KwlwcGd0dC0+YmFzZS50b3RhbCA9IDFVTEwgPDwgMzI7CisJcHBndHQtPnN3aXRjaF9tbSA9IGdl bjhfbGVnYWN5X21tX3N3aXRjaDsKKwlwcGd0dC0+YmFzZS5jbGVhbnVwID0gZ2VuOF9sZWdhY3lf cHBndHRfY2xlYW51cDsKKwlwcGd0dC0+YmFzZS5hbGxvY2F0ZV92YV9yYW5nZSA9IGdlbjhfbGVn YWN5X2FsbG9jX3ZhX3JhbmdlOworCXBwZ3R0LT5iYXNlLmluc2VydF9lbnRyaWVzID0gZ2VuOF9s ZWdhY3lfcHBndHRfaW5zZXJ0X2VudHJpZXM7CisJcHBndHQtPmJhc2UuY2xlYXJfcmFuZ2UgPSBn ZW44X2xlZ2FjeV9wcGd0dF9jbGVhcl9yYW5nZTsKKwlwcGd0dC0+ZGVidWdfZHVtcCA9IGdlbjhf bGVnYWN5X3BwZ3R0X2R1bXA7CiAJcHBndHQtPmJhc2UudW5iaW5kX3ZtYSA9IHBwZ3R0X3VuYmlu ZF92bWE7CiAJcHBndHQtPmJhc2UuYmluZF92bWEgPSBwcGd0dF9iaW5kX3ZtYTsKLQlwcGd0dC0+ ZGVidWdfZHVtcCA9IGdlbjhfZHVtcF9wcGd0dDsKIAotCWlmIChVU0VTX0ZVTExfNDhCSVRfUFBH VFQocHBndHQtPmJhc2UuZGV2KSkgewotCQlyZXQgPSBzZXR1cF9weChwcGd0dC0+YmFzZS5kZXYs ICZwcGd0dC0+cG1sNCk7Ci0JCWlmIChyZXQpCi0JCQlnb3RvIGZyZWVfc2NyYXRjaDsKKwlyZXQg PSBfX3BkcF9pbml0KHBwZ3R0LT5iYXNlLmRldiwgJnBwZ3R0LT5wZHApOworCWlmIChyZXQpCisJ CWdvdG8gZnJlZV9zY3JhdGNoOwogCi0JCWdlbjhfaW5pdGlhbGl6ZV9wbWw0KCZwcGd0dC0+YmFz ZSwgJnBwZ3R0LT5wbWw0KTsKKwl0cmFjZV9pOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXJfZW50 cnlfYWxsb2MoJnBwZ3R0LT5iYXNlLAorCQkJCQkJICAgICAgMCwgMCwKKwkJCQkJCSAgICAgIEdF TjhfUE1MNEVfU0hJRlQpOwogCi0JCXBwZ3R0LT5iYXNlLnRvdGFsID0gMVVMTCA8PCA0ODsKLQkJ cHBndHQtPnN3aXRjaF9tbSA9IGdlbjhfNDhiX21tX3N3aXRjaDsKLQl9IGVsc2UgewotCQlyZXQg PSBfX3BkcF9pbml0KHBwZ3R0LT5iYXNlLmRldiwgJnBwZ3R0LT5wZHApOwotCQlpZiAocmV0KQot CQkJZ290byBmcmVlX3NjcmF0Y2g7CisJcmV0dXJuIDA7CiAKLQkJcHBndHQtPmJhc2UudG90YWwg PSAxVUxMIDw8IDMyOwotCQlwcGd0dC0+c3dpdGNoX21tID0gZ2VuOF9sZWdhY3lfbW1fc3dpdGNo OwotCQl0cmFjZV9pOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXJfZW50cnlfYWxsb2MoJnBwZ3R0 LT5iYXNlLAotCQkJCQkJCSAgICAgIDAsIDAsCi0JCQkJCQkJICAgICAgR0VOOF9QTUw0RV9TSElG VCk7Ci0JfQorZnJlZV9zY3JhdGNoOgorCWdlbjhfZnJlZV9zY3JhdGNoKCZwcGd0dC0+YmFzZSk7 CisJcmV0dXJuIHJldDsKK30KKworLyoKKyAqIEdFTjggNDgtYml0IHBwZ3R0IHByb2dyYW1taW5n IGlzIGFjY29tcGxpc2hlZCB0aHJvdWdoIDUxMiBQRFAgcmVnaXN0ZXJzCisgKiBwZXIgUE1MNCwg d2l0aCBhIG5ldCBlZmZlY3QgcmVzZW1ibGluZyBhIDQtbGV2ZWwgcGFnZSB0YWJsZSBpbiBub3Jt YWwKKyAqIHg4Ni02NCB0ZXJtcy4gRWFjaCBQRFAgcmVwcmVzZW50cyAxR0Igb2YgbWVtb3J5IDUx MiAqIDUxMiAqIDUxMiAqIDUxMiAqIDQwOTYKKyAqID0gMjU2VEIgNDhiIGFkZHJlc3Mgc3BhY2Uu CisgKgorICovCitzdGF0aWMgaW50IGdlbjhfNGx2bF9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3 X3BwZ3R0ICpwcGd0dCkKK3sKKwlpbnQgcmV0OworCisJcmV0ID0gZ2VuOF9pbml0X3NjcmF0Y2go JnBwZ3R0LT5iYXNlKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJcHBndHQtPmJhc2Uu c3RhcnQgPSAwOworCXBwZ3R0LT5iYXNlLnRvdGFsID0gMVVMTCA8PCA0ODsKKwlwcGd0dC0+c3dp dGNoX21tID0gZ2VuOF80OGJfbW1fc3dpdGNoOworCXBwZ3R0LT5iYXNlLmNsZWFudXAgPSBnZW44 XzRsdmxfcHBndHRfY2xlYW51cDsKKwlwcGd0dC0+YmFzZS5hbGxvY2F0ZV92YV9yYW5nZSA9IGdl bjhfNGx2bF9hbGxvY192YV9yYW5nZTsKKwlwcGd0dC0+YmFzZS5pbnNlcnRfZW50cmllcyA9IGdl bjhfNGx2bF9wcGd0dF9pbnNlcnRfZW50cmllczsKKwlwcGd0dC0+YmFzZS5jbGVhcl9yYW5nZSA9 IGdlbjhfNGx2bF9wcGd0dF9jbGVhcl9yYW5nZTsKKwlwcGd0dC0+ZGVidWdfZHVtcCA9IGdlbjhf NGx2bF9wcGd0dF9kdW1wOworCXBwZ3R0LT5iYXNlLnVuYmluZF92bWEgPSBwcGd0dF91bmJpbmRf dm1hOworCXBwZ3R0LT5iYXNlLmJpbmRfdm1hID0gcHBndHRfYmluZF92bWE7CisKKwlyZXQgPSBz ZXR1cF9weChwcGd0dC0+YmFzZS5kZXYsICZwcGd0dC0+cG1sNCk7CisJaWYgKHJldCkKKwkJZ290 byBmcmVlX3NjcmF0Y2g7CisKKwlnZW44X2luaXRpYWxpemVfcG1sNCgmcHBndHQtPmJhc2UsICZw cGd0dC0+cG1sNCk7CiAKIAlyZXR1cm4gMDsKIApAQCAtMjA3MSw4ICsyMTIyLDEwIEBAIHN0YXRp YyBpbnQgX19od19wcGd0dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpOTE1 X2h3X3BwZ3R0ICpwcGd0dCkKIAogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDgpCiAJCXJl dHVybiBnZW42X3BwZ3R0X2luaXQocHBndHQpOworCWVsc2UgaWYgKCFVU0VTX0ZVTExfNDhCSVRf UFBHVFQocHBndHQtPmJhc2UuZGV2KSkKKwkJcmV0dXJuIGdlbjhfbGVnYWN5X3BwZ3R0X2luaXQo cHBndHQpOwogCWVsc2UKLQkJcmV0dXJuIGdlbjhfcHBndHRfaW5pdChwcGd0dCk7CisJCXJldHVy biBnZW44XzRsdmxfcHBndHRfaW5pdChwcGd0dCk7CiB9CiAKIGludCBpOTE1X3BwZ3R0X2luaXQo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQotLSAK Mi41LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==